diff --git a/.gitignore b/.gitignore
index 874b1050..c36a0ec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,6 @@ scripts/.vscode/*
 source/official/*
 !source/official/README.md
 
-dist/table.md
\ No newline at end of file
+dist/table.md
+**/Thumbs.db
+/source/icon-collection
diff --git a/dist/.vscode/snippets/diagram.json b/dist/.vscode/snippets/diagram.json
index b0b5a9a2..a621c175 100644
--- a/dist/.vscode/snippets/diagram.json
+++ b/dist/.vscode/snippets/diagram.json
@@ -143,6 +143,38 @@
       "$0"
     ]
   },
+  "AzureMachineLearningStudioWebService": {
+    "prefix": "Azure Machine Learning Studio Web Service",
+    "description": "Add Azure Machine Learning Studio Web Service to diagram",
+    "body": [
+      "AzureMachineLearningStudioWebService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMachineLearningStudioWebService_Descr": {
+    "prefix": "Azure Machine Learning Studio Web Service with Description",
+    "description": "Add Azure Machine Learning Studio Web Service with Description to diagram",
+    "body": [
+      "AzureMachineLearningStudioWebService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMachineLearningStudioWebServicePlan": {
+    "prefix": "Azure Machine Learning Studio Web Service Plan",
+    "description": "Add Azure Machine Learning Studio Web Service Plan to diagram",
+    "body": [
+      "AzureMachineLearningStudioWebServicePlan(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMachineLearningStudioWebServicePlan_Descr": {
+    "prefix": "Azure Machine Learning Studio Web Service Plan with Description",
+    "description": "Add Azure Machine Learning Studio Web Service Plan with Description to diagram",
+    "body": [
+      "AzureMachineLearningStudioWebServicePlan(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
   "MicrosoftGenomics": {
     "prefix": "Microsoft Genomics",
     "description": "Add Microsoft Genomics to diagram",
@@ -223,6 +255,22 @@
       "$0"
     ]
   },
+  "AzureDataFactory": {
+    "prefix": "Azure Data Factory",
+    "description": "Add Azure Data Factory to diagram",
+    "body": [
+      "AzureDataFactory(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDataFactory_Descr": {
+    "prefix": "Azure Data Factory with Description",
+    "description": "Add Azure Data Factory with Description to diagram",
+    "body": [
+      "AzureDataFactory(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
   "AzureDataLakeAnalytics": {
     "prefix": "Azure Data Lake Analytics",
     "description": "Add Azure Data Lake Analytics to diagram",
@@ -239,6 +287,22 @@
       "$0"
     ]
   },
+  "AzureDataLakeStoreGen1": {
+    "prefix": "Azure Data Lake Store Gen1",
+    "description": "Add Azure Data Lake Store Gen1 to diagram",
+    "body": [
+      "AzureDataLakeStoreGen1(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDataLakeStoreGen1_Descr": {
+    "prefix": "Azure Data Lake Store Gen1 with Description",
+    "description": "Add Azure Data Lake Store Gen1 with Description to diagram",
+    "body": [
+      "AzureDataLakeStoreGen1(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
   "AzureEventHub": {
     "prefix": "Azure Event Hub",
     "description": "Add Azure Event Hub to diagram",
@@ -271,6 +335,22 @@
       "$0"
     ]
   },
+  "AzurePipeline": {
+    "prefix": "Azure Pipeline",
+    "description": "Add Azure Pipeline to diagram",
+    "body": [
+      "AzurePipeline(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzurePipeline_Descr": {
+    "prefix": "Azure Pipeline with Description",
+    "description": "Add Azure Pipeline with Description to diagram",
+    "body": [
+      "AzurePipeline(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
   "AzureStreamAnalytics": {
     "prefix": "Azure Stream Analytics",
     "description": "Add Azure Stream Analytics to diagram",
@@ -287,6 +367,22 @@
       "$0"
     ]
   },
+  "AzureSynapseAnalytics": {
+    "prefix": "Azure Synapse Analytics",
+    "description": "Add Azure Synapse Analytics to diagram",
+    "body": [
+      "AzureSynapseAnalytics(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSynapseAnalytics_Descr": {
+    "prefix": "Azure Synapse Analytics with Description",
+    "description": "Add Azure Synapse Analytics with Description to diagram",
+    "body": [
+      "AzureSynapseAnalytics(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
   "AzureAppService": {
     "prefix": "Azure App Service",
     "description": "Add Azure App Service to diagram",
@@ -303,6 +399,22 @@
       "$0"
     ]
   },
+  "AzureAvailabilitySet": {
+    "prefix": "Azure Availability Set",
+    "description": "Add Azure Availability Set to diagram",
+    "body": [
+      "AzureAvailabilitySet(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAvailabilitySet_Descr": {
+    "prefix": "Azure Availability Set with Description",
+    "description": "Add Azure Availability Set with Description to diagram",
+    "body": [
+      "AzureAvailabilitySet(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
   "AzureBatch": {
     "prefix": "Azure Batch",
     "description": "Add Azure Batch to diagram",
@@ -319,419 +431,915 @@
       "$0"
     ]
   },
-  "AzureFunction": {
-    "prefix": "Azure Function",
-    "description": "Add Azure Function to diagram",
+  "AzureBatchAccount": {
+    "prefix": "Azure Batch Account",
+    "description": "Add Azure Batch Account to diagram",
     "body": [
-      "AzureFunction(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureBatchAccount(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureFunction_Descr": {
-    "prefix": "Azure Function with Description",
-    "description": "Add Azure Function with Description to diagram",
+  "AzureBatchAccount_Descr": {
+    "prefix": "Azure Batch Account with Description",
+    "description": "Add Azure Batch Account with Description to diagram",
     "body": [
-      "AzureFunction(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureBatchAccount(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureServiceFabric": {
-    "prefix": "Azure Service Fabric",
-    "description": "Add Azure Service Fabric to diagram",
+  "AzureCloudService": {
+    "prefix": "Azure Cloud Service",
+    "description": "Add Azure Cloud Service to diagram",
     "body": [
-      "AzureServiceFabric(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureCloudService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureServiceFabric_Descr": {
-    "prefix": "Azure Service Fabric with Description",
-    "description": "Add Azure Service Fabric with Description to diagram",
+  "AzureCloudService_Descr": {
+    "prefix": "Azure Cloud Service with Description",
+    "description": "Add Azure Cloud Service with Description to diagram",
     "body": [
-      "AzureServiceFabric(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureCloudService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureVirtualMachine": {
-    "prefix": "Azure Virtual Machine",
-    "description": "Add Azure Virtual Machine to diagram",
+  "AzureCloudServiceClassic": {
+    "prefix": "Azure Cloud Service Classic",
+    "description": "Add Azure Cloud Service Classic to diagram",
     "body": [
-      "AzureVirtualMachine(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureCloudServiceClassic(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureVirtualMachine_Descr": {
-    "prefix": "Azure Virtual Machine with Description",
-    "description": "Add Azure Virtual Machine with Description to diagram",
+  "AzureCloudServiceClassic_Descr": {
+    "prefix": "Azure Cloud Service Classic with Description",
+    "description": "Add Azure Cloud Service Classic with Description to diagram",
     "body": [
-      "AzureVirtualMachine(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureCloudServiceClassic(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureVirtualMachineScaleSet": {
-    "prefix": "Azure Virtual Machine Scale Set",
-    "description": "Add Azure Virtual Machine Scale Set to diagram",
+  "AzureCloudSimpleVirtualMachine": {
+    "prefix": "Azure Cloud Simple Virtual Machine",
+    "description": "Add Azure Cloud Simple Virtual Machine to diagram",
     "body": [
-      "AzureVirtualMachineScaleSet(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureCloudSimpleVirtualMachine(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureVirtualMachineScaleSet_Descr": {
-    "prefix": "Azure Virtual Machine Scale Set with Description",
-    "description": "Add Azure Virtual Machine Scale Set with Description to diagram",
+  "AzureCloudSimpleVirtualMachine_Descr": {
+    "prefix": "Azure Cloud Simple Virtual Machine with Description",
+    "description": "Add Azure Cloud Simple Virtual Machine with Description to diagram",
     "body": [
-      "AzureVirtualMachineScaleSet(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureCloudSimpleVirtualMachine(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureContainerInstance": {
-    "prefix": "Azure Container Instance",
-    "description": "Add Azure Container Instance to diagram",
+  "AzureDisk": {
+    "prefix": "Azure Disk",
+    "description": "Add Azure Disk to diagram",
     "body": [
-      "AzureContainerInstance(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureDisk(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureContainerInstance_Descr": {
-    "prefix": "Azure Container Instance with Description",
-    "description": "Add Azure Container Instance with Description to diagram",
+  "AzureDisk_Descr": {
+    "prefix": "Azure Disk with Description",
+    "description": "Add Azure Disk with Description to diagram",
     "body": [
-      "AzureContainerInstance(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureDisk(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureContainerRegistry": {
-    "prefix": "Azure Container Registry",
-    "description": "Add Azure Container Registry to diagram",
+  "AzureDiskSnapshot": {
+    "prefix": "Azure Disk Snapshot",
+    "description": "Add Azure Disk Snapshot to diagram",
     "body": [
-      "AzureContainerRegistry(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureDiskSnapshot(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureContainerRegistry_Descr": {
-    "prefix": "Azure Container Registry with Description",
-    "description": "Add Azure Container Registry with Description to diagram",
+  "AzureDiskSnapshot_Descr": {
+    "prefix": "Azure Disk Snapshot with Description",
+    "description": "Add Azure Disk Snapshot with Description to diagram",
     "body": [
-      "AzureContainerRegistry(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureDiskSnapshot(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureKubernetesService": {
-    "prefix": "Azure Kubernetes Service",
-    "description": "Add Azure Kubernetes Service to diagram",
+  "AzureFunction": {
+    "prefix": "Azure Function",
+    "description": "Add Azure Function to diagram",
     "body": [
-      "AzureKubernetesService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureFunction(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureKubernetesService_Descr": {
-    "prefix": "Azure Kubernetes Service with Description",
-    "description": "Add Azure Kubernetes Service with Description to diagram",
+  "AzureFunction_Descr": {
+    "prefix": "Azure Function with Description",
+    "description": "Add Azure Function with Description to diagram",
     "body": [
-      "AzureKubernetesService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureFunction(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureServiceFabricMesh": {
-    "prefix": "Azure Service Fabric Mesh",
-    "description": "Add Azure Service Fabric Mesh to diagram",
+  "AzureMeshApplication": {
+    "prefix": "Azure Mesh Application",
+    "description": "Add Azure Mesh Application to diagram",
     "body": [
-      "AzureServiceFabricMesh(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureMeshApplication(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureServiceFabricMesh_Descr": {
-    "prefix": "Azure Service Fabric Mesh with Description",
-    "description": "Add Azure Service Fabric Mesh with Description to diagram",
+  "AzureMeshApplication_Descr": {
+    "prefix": "Azure Mesh Application with Description",
+    "description": "Add Azure Mesh Application with Description to diagram",
     "body": [
-      "AzureServiceFabricMesh(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureMeshApplication(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureWebAppForContainers": {
-    "prefix": "Azure Web App For Containers",
-    "description": "Add Azure Web App For Containers to diagram",
+  "AzureNon-azure-machine": {
+    "prefix": "Azure Non-azure-machine",
+    "description": "Add Azure Non-azure-machine to diagram",
     "body": [
-      "AzureWebAppForContainers(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureNon-azure-machine(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureWebAppForContainers_Descr": {
-    "prefix": "Azure Web App For Containers with Description",
-    "description": "Add Azure Web App For Containers with Description to diagram",
+  "AzureNon-azure-machine_Descr": {
+    "prefix": "Azure Non-azure-machine with Description",
+    "description": "Add Azure Non-azure-machine with Description to diagram",
     "body": [
-      "AzureWebAppForContainers(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureNon-azure-machine(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureCosmosDb": {
-    "prefix": "Azure Cosmos Db",
-    "description": "Add Azure Cosmos Db to diagram",
+  "AzureOSImagesClassic": {
+    "prefix": "Azure O S Images Classic",
+    "description": "Add Azure O S Images Classic to diagram",
     "body": [
-      "AzureCosmosDb(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureOSImagesClassic(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureCosmosDb_Descr": {
-    "prefix": "Azure Cosmos Db with Description",
-    "description": "Add Azure Cosmos Db with Description to diagram",
+  "AzureOSImagesClassic_Descr": {
+    "prefix": "Azure O S Images Classic with Description",
+    "description": "Add Azure O S Images Classic with Description to diagram",
     "body": [
-      "AzureCosmosDb(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureOSImagesClassic(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureDatabaseForMariaDB": {
-    "prefix": "Azure Database For Maria D B",
-    "description": "Add Azure Database For Maria D B to diagram",
+  "AzureSapHana": {
+    "prefix": "Azure Sap Hana",
+    "description": "Add Azure Sap Hana to diagram",
     "body": [
-      "AzureDatabaseForMariaDB(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureSapHana(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureDatabaseForMariaDB_Descr": {
-    "prefix": "Azure Database For Maria D B with Description",
-    "description": "Add Azure Database For Maria D B with Description to diagram",
+  "AzureSapHana_Descr": {
+    "prefix": "Azure Sap Hana with Description",
+    "description": "Add Azure Sap Hana with Description to diagram",
     "body": [
-      "AzureDatabaseForMariaDB(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureSapHana(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureDatabaseForMySQL": {
-    "prefix": "Azure Database For My S Q L",
-    "description": "Add Azure Database For My S Q L to diagram",
+  "AzureServiceFabric": {
+    "prefix": "Azure Service Fabric",
+    "description": "Add Azure Service Fabric to diagram",
     "body": [
-      "AzureDatabaseForMySQL(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureServiceFabric(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureDatabaseForMySQL_Descr": {
-    "prefix": "Azure Database For My S Q L with Description",
-    "description": "Add Azure Database For My S Q L with Description to diagram",
+  "AzureServiceFabric_Descr": {
+    "prefix": "Azure Service Fabric with Description",
+    "description": "Add Azure Service Fabric with Description to diagram",
     "body": [
-      "AzureDatabaseForMySQL(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureServiceFabric(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureDatabaseForPostgreSQL": {
-    "prefix": "Azure Database For Postgre S Q L",
-    "description": "Add Azure Database For Postgre S Q L to diagram",
+  "AzureVirtualMachine": {
+    "prefix": "Azure Virtual Machine",
+    "description": "Add Azure Virtual Machine to diagram",
     "body": [
-      "AzureDatabaseForPostgreSQL(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureVirtualMachine(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureDatabaseForPostgreSQL_Descr": {
-    "prefix": "Azure Database For Postgre S Q L with Description",
-    "description": "Add Azure Database For Postgre S Q L with Description to diagram",
+  "AzureVirtualMachine_Descr": {
+    "prefix": "Azure Virtual Machine with Description",
+    "description": "Add Azure Virtual Machine with Description to diagram",
     "body": [
-      "AzureDatabaseForPostgreSQL(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureVirtualMachine(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureDataFactory": {
-    "prefix": "Azure Data Factory",
-    "description": "Add Azure Data Factory to diagram",
+  "AzureVirtualMachineImage": {
+    "prefix": "Azure Virtual Machine Image",
+    "description": "Add Azure Virtual Machine Image to diagram",
     "body": [
-      "AzureDataFactory(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureVirtualMachineImage(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureDataFactory_Descr": {
-    "prefix": "Azure Data Factory with Description",
-    "description": "Add Azure Data Factory with Description to diagram",
+  "AzureVirtualMachineImage_Descr": {
+    "prefix": "Azure Virtual Machine Image with Description",
+    "description": "Add Azure Virtual Machine Image with Description to diagram",
     "body": [
-      "AzureDataFactory(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureVirtualMachineImage(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureRedisCache": {
-    "prefix": "Azure Redis Cache",
-    "description": "Add Azure Redis Cache to diagram",
+  "AzureVirtualMachineLinux": {
+    "prefix": "Azure Virtual Machine Linux",
+    "description": "Add Azure Virtual Machine Linux to diagram",
     "body": [
-      "AzureRedisCache(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureVirtualMachineLinux(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureRedisCache_Descr": {
-    "prefix": "Azure Redis Cache with Description",
-    "description": "Add Azure Redis Cache with Description to diagram",
+  "AzureVirtualMachineLinux_Descr": {
+    "prefix": "Azure Virtual Machine Linux with Description",
+    "description": "Add Azure Virtual Machine Linux with Description to diagram",
     "body": [
-      "AzureRedisCache(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureVirtualMachineLinux(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureSqlDatabase": {
-    "prefix": "Azure Sql Database",
-    "description": "Add Azure Sql Database to diagram",
+  "AzureVirtualMachineScaleSet": {
+    "prefix": "Azure Virtual Machine Scale Set",
+    "description": "Add Azure Virtual Machine Scale Set to diagram",
     "body": [
-      "AzureSqlDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureVirtualMachineScaleSet(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureSqlDatabase_Descr": {
-    "prefix": "Azure Sql Database with Description",
-    "description": "Add Azure Sql Database with Description to diagram",
+  "AzureVirtualMachineScaleSet_Descr": {
+    "prefix": "Azure Virtual Machine Scale Set with Description",
+    "description": "Add Azure Virtual Machine Scale Set with Description to diagram",
     "body": [
-      "AzureSqlDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureVirtualMachineScaleSet(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureSqlDataWarehouse": {
-    "prefix": "Azure Sql Data Warehouse",
-    "description": "Add Azure Sql Data Warehouse to diagram",
+  "AzureVirtualMachineWindows": {
+    "prefix": "Azure Virtual Machine Windows",
+    "description": "Add Azure Virtual Machine Windows to diagram",
     "body": [
-      "AzureSqlDataWarehouse(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureVirtualMachineWindows(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureSqlDataWarehouse_Descr": {
-    "prefix": "Azure Sql Data Warehouse with Description",
-    "description": "Add Azure Sql Data Warehouse with Description to diagram",
+  "AzureVirtualMachineWindows_Descr": {
+    "prefix": "Azure Virtual Machine Windows with Description",
+    "description": "Add Azure Virtual Machine Windows with Description to diagram",
     "body": [
-      "AzureSqlDataWarehouse(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureVirtualMachineWindows(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureSqlStretchDatabase": {
-    "prefix": "Azure Sql Stretch Database",
-    "description": "Add Azure Sql Stretch Database to diagram",
+  "AzureWindowsVirtualDesktop": {
+    "prefix": "Azure Windows Virtual Desktop",
+    "description": "Add Azure Windows Virtual Desktop to diagram",
     "body": [
-      "AzureSqlStretchDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureWindowsVirtualDesktop(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureSqlStretchDatabase_Descr": {
-    "prefix": "Azure Sql Stretch Database with Description",
-    "description": "Add Azure Sql Stretch Database with Description to diagram",
+  "AzureWindowsVirtualDesktop_Descr": {
+    "prefix": "Azure Windows Virtual Desktop with Description",
+    "description": "Add Azure Windows Virtual Desktop with Description to diagram",
     "body": [
-      "AzureSqlStretchDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureWindowsVirtualDesktop(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureApplicationInsights": {
-    "prefix": "Azure Application Insights",
-    "description": "Add Azure Application Insights to diagram",
+  "AzureWindowsVirtualDesktopApplicationGroups": {
+    "prefix": "Azure Windows Virtual Desktop Application Groups",
+    "description": "Add Azure Windows Virtual Desktop Application Groups to diagram",
     "body": [
-      "AzureApplicationInsights(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureWindowsVirtualDesktopApplicationGroups(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureApplicationInsights_Descr": {
-    "prefix": "Azure Application Insights with Description",
-    "description": "Add Azure Application Insights with Description to diagram",
+  "AzureWindowsVirtualDesktopApplicationGroups_Descr": {
+    "prefix": "Azure Windows Virtual Desktop Application Groups with Description",
+    "description": "Add Azure Windows Virtual Desktop Application Groups with Description to diagram",
     "body": [
-      "AzureApplicationInsights(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureWindowsVirtualDesktopApplicationGroups(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureArtifacts": {
-    "prefix": "Azure Artifacts",
-    "description": "Add Azure Artifacts to diagram",
+  "AzureWindowsVirtualDesktopHostPools": {
+    "prefix": "Azure Windows Virtual Desktop Host Pools",
+    "description": "Add Azure Windows Virtual Desktop Host Pools to diagram",
     "body": [
-      "AzureArtifacts(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureWindowsVirtualDesktopHostPools(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureArtifacts_Descr": {
-    "prefix": "Azure Artifacts with Description",
-    "description": "Add Azure Artifacts with Description to diagram",
+  "AzureWindowsVirtualDesktopHostPools_Descr": {
+    "prefix": "Azure Windows Virtual Desktop Host Pools with Description",
+    "description": "Add Azure Windows Virtual Desktop Host Pools with Description to diagram",
     "body": [
-      "AzureArtifacts(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureWindowsVirtualDesktopHostPools(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureBoards": {
-    "prefix": "Azure Boards",
-    "description": "Add Azure Boards to diagram",
+  "AzureWindowsVirtualDesktopUsers": {
+    "prefix": "Azure Windows Virtual Desktop Users",
+    "description": "Add Azure Windows Virtual Desktop Users to diagram",
     "body": [
-      "AzureBoards(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureWindowsVirtualDesktopUsers(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureBoards_Descr": {
-    "prefix": "Azure Boards with Description",
-    "description": "Add Azure Boards with Description to diagram",
+  "AzureWindowsVirtualDesktopUsers_Descr": {
+    "prefix": "Azure Windows Virtual Desktop Users with Description",
+    "description": "Add Azure Windows Virtual Desktop Users with Description to diagram",
     "body": [
-      "AzureBoards(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureWindowsVirtualDesktopUsers(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureDevOps": {
-    "prefix": "Azure Dev Ops",
-    "description": "Add Azure Dev Ops to diagram",
+  "AzureWindowsVirtualDesktopWorkspaces": {
+    "prefix": "Azure Windows Virtual Desktop Workspaces",
+    "description": "Add Azure Windows Virtual Desktop Workspaces to diagram",
     "body": [
-      "AzureDevOps(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureWindowsVirtualDesktopWorkspaces(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureDevOps_Descr": {
-    "prefix": "Azure Dev Ops with Description",
-    "description": "Add Azure Dev Ops with Description to diagram",
+  "AzureWindowsVirtualDesktopWorkspaces_Descr": {
+    "prefix": "Azure Windows Virtual Desktop Workspaces with Description",
+    "description": "Add Azure Windows Virtual Desktop Workspaces with Description to diagram",
     "body": [
-      "AzureDevOps(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureWindowsVirtualDesktopWorkspaces(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureDevTestLabs": {
-    "prefix": "Azure Dev Test Labs",
-    "description": "Add Azure Dev Test Labs to diagram",
+  "CitrixVirtualDesktopsEssential": {
+    "prefix": "Citrix Virtual Desktops Essential",
+    "description": "Add Citrix Virtual Desktops Essential to diagram",
     "body": [
-      "AzureDevTestLabs(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "CitrixVirtualDesktopsEssential(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureDevTestLabs_Descr": {
-    "prefix": "Azure Dev Test Labs with Description",
-    "description": "Add Azure Dev Test Labs with Description to diagram",
+  "CitrixVirtualDesktopsEssential_Descr": {
+    "prefix": "Citrix Virtual Desktops Essential with Description",
+    "description": "Add Citrix Virtual Desktops Essential with Description to diagram",
     "body": [
-      "AzureDevTestLabs(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "CitrixVirtualDesktopsEssential(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureLabServices": {
-    "prefix": "Azure Lab Services",
-    "description": "Add Azure Lab Services to diagram",
+  "VirtualMachine": {
+    "prefix": "Virtual Machine",
+    "description": "Add Virtual Machine to diagram",
     "body": [
-      "AzureLabServices(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "VirtualMachine(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureLabServices_Descr": {
-    "prefix": "Azure Lab Services with Description",
-    "description": "Add Azure Lab Services with Description to diagram",
+  "VirtualMachine_Descr": {
+    "prefix": "Virtual Machine with Description",
+    "description": "Add Virtual Machine with Description to diagram",
     "body": [
-      "AzureLabServices(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "VirtualMachine(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzurePipelines": {
-    "prefix": "Azure Pipelines",
-    "description": "Add Azure Pipelines to diagram",
+  "VirtualMachineClassic": {
+    "prefix": "Virtual Machine Classic",
+    "description": "Add Virtual Machine Classic to diagram",
     "body": [
-      "AzurePipelines(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "VirtualMachineClassic(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzurePipelines_Descr": {
-    "prefix": "Azure Pipelines with Description",
-    "description": "Add Azure Pipelines with Description to diagram",
+  "VirtualMachineClassic_Descr": {
+    "prefix": "Virtual Machine Classic with Description",
+    "description": "Add Virtual Machine Classic with Description to diagram",
     "body": [
-      "AzurePipelines(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "VirtualMachineClassic(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureRepos": {
-    "prefix": "Azure Repos",
-    "description": "Add Azure Repos to diagram",
+  "VirtualMachineLinux": {
+    "prefix": "Virtual Machine Linux",
+    "description": "Add Virtual Machine Linux to diagram",
     "body": [
-      "AzureRepos(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "VirtualMachineLinux(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureRepos_Descr": {
-    "prefix": "Azure Repos with Description",
-    "description": "Add Azure Repos with Description to diagram",
+  "VirtualMachineLinux_Descr": {
+    "prefix": "Virtual Machine Linux with Description",
+    "description": "Add Virtual Machine Linux with Description to diagram",
     "body": [
-      "AzureRepos(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "VirtualMachineLinux(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "VirtualMachineWindows": {
+    "prefix": "Virtual Machine Windows",
+    "description": "Add Virtual Machine Windows to diagram",
+    "body": [
+      "VirtualMachineWindows(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "VirtualMachineWindows_Descr": {
+    "prefix": "Virtual Machine Windows with Description",
+    "description": "Add Virtual Machine Windows with Description to diagram",
+    "body": [
+      "VirtualMachineWindows(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureContainerInstance": {
+    "prefix": "Azure Container Instance",
+    "description": "Add Azure Container Instance to diagram",
+    "body": [
+      "AzureContainerInstance(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureContainerInstance_Descr": {
+    "prefix": "Azure Container Instance with Description",
+    "description": "Add Azure Container Instance with Description to diagram",
+    "body": [
+      "AzureContainerInstance(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureContainerRegistry": {
+    "prefix": "Azure Container Registry",
+    "description": "Add Azure Container Registry to diagram",
+    "body": [
+      "AzureContainerRegistry(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureContainerRegistry_Descr": {
+    "prefix": "Azure Container Registry with Description",
+    "description": "Add Azure Container Registry with Description to diagram",
+    "body": [
+      "AzureContainerRegistry(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureKubernetesService": {
+    "prefix": "Azure Kubernetes Service",
+    "description": "Add Azure Kubernetes Service to diagram",
+    "body": [
+      "AzureKubernetesService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureKubernetesService_Descr": {
+    "prefix": "Azure Kubernetes Service with Description",
+    "description": "Add Azure Kubernetes Service with Description to diagram",
+    "body": [
+      "AzureKubernetesService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureServiceFabricMesh": {
+    "prefix": "Azure Service Fabric Mesh",
+    "description": "Add Azure Service Fabric Mesh to diagram",
+    "body": [
+      "AzureServiceFabricMesh(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureServiceFabricMesh_Descr": {
+    "prefix": "Azure Service Fabric Mesh with Description",
+    "description": "Add Azure Service Fabric Mesh with Description to diagram",
+    "body": [
+      "AzureServiceFabricMesh(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureWebAppForContainers": {
+    "prefix": "Azure Web App For Containers",
+    "description": "Add Azure Web App For Containers to diagram",
+    "body": [
+      "AzureWebAppForContainers(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureWebAppForContainers_Descr": {
+    "prefix": "Azure Web App For Containers with Description",
+    "description": "Add Azure Web App For Containers with Description to diagram",
+    "body": [
+      "AzureWebAppForContainers(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureCacheplusRedis": {
+    "prefix": "Azure Cacheplus Redis",
+    "description": "Add Azure Cacheplus Redis to diagram",
+    "body": [
+      "AzureCacheplusRedis(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureCacheplusRedis_Descr": {
+    "prefix": "Azure Cacheplus Redis with Description",
+    "description": "Add Azure Cacheplus Redis with Description to diagram",
+    "body": [
+      "AzureCacheplusRedis(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureCosmosDB": {
+    "prefix": "Azure Cosmos D B",
+    "description": "Add Azure Cosmos D B to diagram",
+    "body": [
+      "AzureCosmosDB(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureCosmosDB_Descr": {
+    "prefix": "Azure Cosmos D B with Description",
+    "description": "Add Azure Cosmos D B with Description to diagram",
+    "body": [
+      "AzureCosmosDB(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDatabase": {
+    "prefix": "Azure Database",
+    "description": "Add Azure Database to diagram",
+    "body": [
+      "AzureDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDatabase_Descr": {
+    "prefix": "Azure Database with Description",
+    "description": "Add Azure Database with Description to diagram",
+    "body": [
+      "AzureDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDatabaseforMariaDB": {
+    "prefix": "Azure Databasefor Maria D B",
+    "description": "Add Azure Databasefor Maria D B to diagram",
+    "body": [
+      "AzureDatabaseforMariaDB(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDatabaseforMariaDB_Descr": {
+    "prefix": "Azure Databasefor Maria D B with Description",
+    "description": "Add Azure Databasefor Maria D B with Description to diagram",
+    "body": [
+      "AzureDatabaseforMariaDB(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDatabaseforMySql": {
+    "prefix": "Azure Databasefor My Sql",
+    "description": "Add Azure Databasefor My Sql to diagram",
+    "body": [
+      "AzureDatabaseforMySql(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDatabaseforMySql_Descr": {
+    "prefix": "Azure Databasefor My Sql with Description",
+    "description": "Add Azure Databasefor My Sql with Description to diagram",
+    "body": [
+      "AzureDatabaseforMySql(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDatabaseforPostgreSql": {
+    "prefix": "Azure Databasefor Postgre Sql",
+    "description": "Add Azure Databasefor Postgre Sql to diagram",
+    "body": [
+      "AzureDatabaseforPostgreSql(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDatabaseforPostgreSql_Descr": {
+    "prefix": "Azure Databasefor Postgre Sql with Description",
+    "description": "Add Azure Databasefor Postgre Sql with Description to diagram",
+    "body": [
+      "AzureDatabaseforPostgreSql(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDataLake": {
+    "prefix": "Azure Data Lake",
+    "description": "Add Azure Data Lake to diagram",
+    "body": [
+      "AzureDataLake(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDataLake_Descr": {
+    "prefix": "Azure Data Lake with Description",
+    "description": "Add Azure Data Lake with Description to diagram",
+    "body": [
+      "AzureDataLake(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureElasticDatabasePool": {
+    "prefix": "Azure Elastic Database Pool",
+    "description": "Add Azure Elastic Database Pool to diagram",
+    "body": [
+      "AzureElasticDatabasePool(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureElasticDatabasePool_Descr": {
+    "prefix": "Azure Elastic Database Pool with Description",
+    "description": "Add Azure Elastic Database Pool with Description to diagram",
+    "body": [
+      "AzureElasticDatabasePool(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureElasticJobAgent": {
+    "prefix": "Azure Elastic Job Agent",
+    "description": "Add Azure Elastic Job Agent to diagram",
+    "body": [
+      "AzureElasticJobAgent(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureElasticJobAgent_Descr": {
+    "prefix": "Azure Elastic Job Agent with Description",
+    "description": "Add Azure Elastic Job Agent with Description to diagram",
+    "body": [
+      "AzureElasticJobAgent(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureManagedDatabase": {
+    "prefix": "Azure Managed Database",
+    "description": "Add Azure Managed Database to diagram",
+    "body": [
+      "AzureManagedDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureManagedDatabase_Descr": {
+    "prefix": "Azure Managed Database with Description",
+    "description": "Add Azure Managed Database with Description to diagram",
+    "body": [
+      "AzureManagedDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureRedisCacheforRedis": {
+    "prefix": "Azure Redis Cachefor Redis",
+    "description": "Add Azure Redis Cachefor Redis to diagram",
+    "body": [
+      "AzureRedisCacheforRedis(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureRedisCacheforRedis_Descr": {
+    "prefix": "Azure Redis Cachefor Redis with Description",
+    "description": "Add Azure Redis Cachefor Redis with Description to diagram",
+    "body": [
+      "AzureRedisCacheforRedis(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSqlDatabase": {
+    "prefix": "Azure Sql Database",
+    "description": "Add Azure Sql Database to diagram",
+    "body": [
+      "AzureSqlDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSqlDatabase_Descr": {
+    "prefix": "Azure Sql Database with Description",
+    "description": "Add Azure Sql Database with Description to diagram",
+    "body": [
+      "AzureSqlDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSqlDataWarehouse": {
+    "prefix": "Azure Sql Data Warehouse",
+    "description": "Add Azure Sql Data Warehouse to diagram",
+    "body": [
+      "AzureSqlDataWarehouse(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSqlDataWarehouse_Descr": {
+    "prefix": "Azure Sql Data Warehouse with Description",
+    "description": "Add Azure Sql Data Warehouse with Description to diagram",
+    "body": [
+      "AzureSqlDataWarehouse(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSqlManagedInstance": {
+    "prefix": "Azure Sql Managed Instance",
+    "description": "Add Azure Sql Managed Instance to diagram",
+    "body": [
+      "AzureSqlManagedInstance(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSqlManagedInstance_Descr": {
+    "prefix": "Azure Sql Managed Instance with Description",
+    "description": "Add Azure Sql Managed Instance with Description to diagram",
+    "body": [
+      "AzureSqlManagedInstance(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSqlServer": {
+    "prefix": "Azure Sql Server",
+    "description": "Add Azure Sql Server to diagram",
+    "body": [
+      "AzureSqlServer(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSqlServer_Descr": {
+    "prefix": "Azure Sql Server with Description",
+    "description": "Add Azure Sql Server with Description to diagram",
+    "body": [
+      "AzureSqlServer(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSqlStretchDatabase": {
+    "prefix": "Azure Sql Stretch Database",
+    "description": "Add Azure Sql Stretch Database to diagram",
+    "body": [
+      "AzureSqlStretchDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSqlStretchDatabase_Descr": {
+    "prefix": "Azure Sql Stretch Database with Description",
+    "description": "Add Azure Sql Stretch Database with Description to diagram",
+    "body": [
+      "AzureSqlStretchDatabase(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureVirtualCluster": {
+    "prefix": "Azure Virtual Cluster",
+    "description": "Add Azure Virtual Cluster to diagram",
+    "body": [
+      "AzureVirtualCluster(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureVirtualCluster_Descr": {
+    "prefix": "Azure Virtual Cluster with Description",
+    "description": "Add Azure Virtual Cluster with Description to diagram",
+    "body": [
+      "AzureVirtualCluster(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureVirtualDatacenter": {
+    "prefix": "Azure Virtual Datacenter",
+    "description": "Add Azure Virtual Datacenter to diagram",
+    "body": [
+      "AzureVirtualDatacenter(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureVirtualDatacenter_Descr": {
+    "prefix": "Azure Virtual Datacenter with Description",
+    "description": "Add Azure Virtual Datacenter with Description to diagram",
+    "body": [
+      "AzureVirtualDatacenter(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureApplicationInsights": {
+    "prefix": "Azure Application Insights",
+    "description": "Add Azure Application Insights to diagram",
+    "body": [
+      "AzureApplicationInsights(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureApplicationInsights_Descr": {
+    "prefix": "Azure Application Insights with Description",
+    "description": "Add Azure Application Insights with Description to diagram",
+    "body": [
+      "AzureApplicationInsights(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureArtifacts": {
+    "prefix": "Azure Artifacts",
+    "description": "Add Azure Artifacts to diagram",
+    "body": [
+      "AzureArtifacts(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureArtifacts_Descr": {
+    "prefix": "Azure Artifacts with Description",
+    "description": "Add Azure Artifacts with Description to diagram",
+    "body": [
+      "AzureArtifacts(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureBoards": {
+    "prefix": "Azure Boards",
+    "description": "Add Azure Boards to diagram",
+    "body": [
+      "AzureBoards(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureBoards_Descr": {
+    "prefix": "Azure Boards with Description",
+    "description": "Add Azure Boards with Description to diagram",
+    "body": [
+      "AzureBoards(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDevOps": {
+    "prefix": "Azure Dev Ops",
+    "description": "Add Azure Dev Ops to diagram",
+    "body": [
+      "AzureDevOps(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDevOps_Descr": {
+    "prefix": "Azure Dev Ops with Description",
+    "description": "Add Azure Dev Ops with Description to diagram",
+    "body": [
+      "AzureDevOps(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDevTestLabs": {
+    "prefix": "Azure Dev Test Labs",
+    "description": "Add Azure Dev Test Labs to diagram",
+    "body": [
+      "AzureDevTestLabs(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDevTestLabs_Descr": {
+    "prefix": "Azure Dev Test Labs with Description",
+    "description": "Add Azure Dev Test Labs with Description to diagram",
+    "body": [
+      "AzureDevTestLabs(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzurePipelines": {
+    "prefix": "Azure Pipelines",
+    "description": "Add Azure Pipelines to diagram",
+    "body": [
+      "AzurePipelines(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzurePipelines_Descr": {
+    "prefix": "Azure Pipelines with Description",
+    "description": "Add Azure Pipelines with Description to diagram",
+    "body": [
+      "AzurePipelines(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureRepos": {
+    "prefix": "Azure Repos",
+    "description": "Add Azure Repos to diagram",
+    "body": [
+      "AzureRepos(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureRepos_Descr": {
+    "prefix": "Azure Repos with Description",
+    "description": "Add Azure Repos with Description to diagram",
+    "body": [
+      "AzureRepos(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
@@ -739,623 +1347,2687 @@
     "prefix": "Azure Test Plans",
     "description": "Add Azure Test Plans to diagram",
     "body": [
-      "AzureTestPlans(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureTestPlans(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureTestPlans_Descr": {
+    "prefix": "Azure Test Plans with Description",
+    "description": "Add Azure Test Plans with Description to diagram",
+    "body": [
+      "AzureTestPlans(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "Azure": {
+    "prefix": "Azure",
+    "description": "Add Azure to diagram",
+    "body": [
+      "Azure(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "Azure_Descr": {
+    "prefix": "Azure with Description",
+    "description": "Add Azure with Description to diagram",
+    "body": [
+      "Azure(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAllResources": {
+    "prefix": "Azure All Resources",
+    "description": "Add Azure All Resources to diagram",
+    "body": [
+      "AzureAllResources(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAllResources_Descr": {
+    "prefix": "Azure All Resources with Description",
+    "description": "Add Azure All Resources with Description to diagram",
+    "body": [
+      "AzureAllResources(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDeveloperTool": {
+    "prefix": "Azure Developer Tool",
+    "description": "Add Azure Developer Tool to diagram",
+    "body": [
+      "AzureDeveloperTool(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDeveloperTool_Descr": {
+    "prefix": "Azure Developer Tool with Description",
+    "description": "Add Azure Developer Tool with Description to diagram",
+    "body": [
+      "AzureDeveloperTool(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureHelpAndSupport": {
+    "prefix": "Azure Help And Support",
+    "description": "Add Azure Help And Support to diagram",
+    "body": [
+      "AzureHelpAndSupport(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureHelpAndSupport_Descr": {
+    "prefix": "Azure Help And Support with Description",
+    "description": "Add Azure Help And Support with Description to diagram",
+    "body": [
+      "AzureHelpAndSupport(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureHome": {
+    "prefix": "Azure Home",
+    "description": "Add Azure Home to diagram",
+    "body": [
+      "AzureHome(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureHome_Descr": {
+    "prefix": "Azure Home with Description",
+    "description": "Add Azure Home with Description to diagram",
+    "body": [
+      "AzureHome(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureInformation": {
+    "prefix": "Azure Information",
+    "description": "Add Azure Information to diagram",
+    "body": [
+      "AzureInformation(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureInformation_Descr": {
+    "prefix": "Azure Information with Description",
+    "description": "Add Azure Information with Description to diagram",
+    "body": [
+      "AzureInformation(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureManagementGroup": {
+    "prefix": "Azure Management Group",
+    "description": "Add Azure Management Group to diagram",
+    "body": [
+      "AzureManagementGroup(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureManagementGroup_Descr": {
+    "prefix": "Azure Management Group with Description",
+    "description": "Add Azure Management Group with Description to diagram",
+    "body": [
+      "AzureManagementGroup(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMarketplace": {
+    "prefix": "Azure Marketplace",
+    "description": "Add Azure Marketplace to diagram",
+    "body": [
+      "AzureMarketplace(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMarketplace_Descr": {
+    "prefix": "Azure Marketplace with Description",
+    "description": "Add Azure Marketplace with Description to diagram",
+    "body": [
+      "AzureMarketplace(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureQuickStartCenter": {
+    "prefix": "Azure Quick Start Center",
+    "description": "Add Azure Quick Start Center to diagram",
+    "body": [
+      "AzureQuickStartCenter(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureQuickStartCenter_Descr": {
+    "prefix": "Azure Quick Start Center with Description",
+    "description": "Add Azure Quick Start Center with Description to diagram",
+    "body": [
+      "AzureQuickStartCenter(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureRecent": {
+    "prefix": "Azure Recent",
+    "description": "Add Azure Recent to diagram",
+    "body": [
+      "AzureRecent(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureRecent_Descr": {
+    "prefix": "Azure Recent with Description",
+    "description": "Add Azure Recent with Description to diagram",
+    "body": [
+      "AzureRecent(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureReservation": {
+    "prefix": "Azure Reservation",
+    "description": "Add Azure Reservation to diagram",
+    "body": [
+      "AzureReservation(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureReservation_Descr": {
+    "prefix": "Azure Reservation with Description",
+    "description": "Add Azure Reservation with Description to diagram",
+    "body": [
+      "AzureReservation(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureResource": {
+    "prefix": "Azure Resource",
+    "description": "Add Azure Resource to diagram",
+    "body": [
+      "AzureResource(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureResource_Descr": {
+    "prefix": "Azure Resource with Description",
+    "description": "Add Azure Resource with Description to diagram",
+    "body": [
+      "AzureResource(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureResourceGroup": {
+    "prefix": "Azure Resource Group",
+    "description": "Add Azure Resource Group to diagram",
+    "body": [
+      "AzureResourceGroup(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureResourceGroup_Descr": {
+    "prefix": "Azure Resource Group with Description",
+    "description": "Add Azure Resource Group with Description to diagram",
+    "body": [
+      "AzureResourceGroup(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureServiceHealth": {
+    "prefix": "Azure Service Health",
+    "description": "Add Azure Service Health to diagram",
+    "body": [
+      "AzureServiceHealth(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureServiceHealth_Descr": {
+    "prefix": "Azure Service Health with Description",
+    "description": "Add Azure Service Health with Description to diagram",
+    "body": [
+      "AzureServiceHealth(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSharedDashboard": {
+    "prefix": "Azure Shared Dashboard",
+    "description": "Add Azure Shared Dashboard to diagram",
+    "body": [
+      "AzureSharedDashboard(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSharedDashboard_Descr": {
+    "prefix": "Azure Shared Dashboard with Description",
+    "description": "Add Azure Shared Dashboard with Description to diagram",
+    "body": [
+      "AzureSharedDashboard(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSupport": {
+    "prefix": "Azure Support",
+    "description": "Add Azure Support to diagram",
+    "body": [
+      "AzureSupport(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSupport_Descr": {
+    "prefix": "Azure Support with Description",
+    "description": "Add Azure Support with Description to diagram",
+    "body": [
+      "AzureSupport(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSupportRequest": {
+    "prefix": "Azure Support Request",
+    "description": "Add Azure Support Request to diagram",
+    "body": [
+      "AzureSupportRequest(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSupportRequest_Descr": {
+    "prefix": "Azure Support Request with Description",
+    "description": "Add Azure Support Request with Description to diagram",
+    "body": [
+      "AzureSupportRequest(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureTag": {
+    "prefix": "Azure Tag",
+    "description": "Add Azure Tag to diagram",
+    "body": [
+      "AzureTag(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureTag_Descr": {
+    "prefix": "Azure Tag with Description",
+    "description": "Add Azure Tag with Description to diagram",
+    "body": [
+      "AzureTag(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureTemplate": {
+    "prefix": "Azure Template",
+    "description": "Add Azure Template to diagram",
+    "body": [
+      "AzureTemplate(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureTemplate_Descr": {
+    "prefix": "Azure Template with Description",
+    "description": "Add Azure Template with Description to diagram",
+    "body": [
+      "AzureTemplate(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureTwoUserIcon": {
+    "prefix": "Azure Two User Icon",
+    "description": "Add Azure Two User Icon to diagram",
+    "body": [
+      "AzureTwoUserIcon(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureTwoUserIcon_Descr": {
+    "prefix": "Azure Two User Icon with Description",
+    "description": "Add Azure Two User Icon with Description to diagram",
+    "body": [
+      "AzureTwoUserIcon(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureUserHealthIcon": {
+    "prefix": "Azure User Health Icon",
+    "description": "Add Azure User Health Icon to diagram",
+    "body": [
+      "AzureUserHealthIcon(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureUserHealthIcon_Descr": {
+    "prefix": "Azure User Health Icon with Description",
+    "description": "Add Azure User Health Icon with Description to diagram",
+    "body": [
+      "AzureUserHealthIcon(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureUserIcon": {
+    "prefix": "Azure User Icon",
+    "description": "Add Azure User Icon to diagram",
+    "body": [
+      "AzureUserIcon(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureUserIcon_Descr": {
+    "prefix": "Azure User Icon with Description",
+    "description": "Add Azure User Icon with Description to diagram",
+    "body": [
+      "AzureUserIcon(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureUserPrivacy": {
+    "prefix": "Azure User Privacy",
+    "description": "Add Azure User Privacy to diagram",
+    "body": [
+      "AzureUserPrivacy(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureUserPrivacy_Descr": {
+    "prefix": "Azure User Privacy with Description",
+    "description": "Add Azure User Privacy with Description to diagram",
+    "body": [
+      "AzureUserPrivacy(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureUserResource": {
+    "prefix": "Azure User Resource",
+    "description": "Add Azure User Resource to diagram",
+    "body": [
+      "AzureUserResource(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureUserResource_Descr": {
+    "prefix": "Azure User Resource with Description",
+    "description": "Add Azure User Resource with Description to diagram",
+    "body": [
+      "AzureUserResource(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureWhatsNew": {
+    "prefix": "Azure Whats New",
+    "description": "Add Azure Whats New to diagram",
+    "body": [
+      "AzureWhatsNew(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureWhatsNew_Descr": {
+    "prefix": "Azure Whats New with Description",
+    "description": "Add Azure Whats New with Description to diagram",
+    "body": [
+      "AzureWhatsNew(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAccessReview": {
+    "prefix": "Azure Access Review",
+    "description": "Add Azure Access Review to diagram",
+    "body": [
+      "AzureAccessReview(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAccessReview_Descr": {
+    "prefix": "Azure Access Review with Description",
+    "description": "Add Azure Access Review with Description to diagram",
+    "body": [
+      "AzureAccessReview(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectory": {
+    "prefix": "Azure Active Directory",
+    "description": "Add Azure Active Directory to diagram",
+    "body": [
+      "AzureActiveDirectory(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectory_Descr": {
+    "prefix": "Azure Active Directory with Description",
+    "description": "Add Azure Active Directory with Description to diagram",
+    "body": [
+      "AzureActiveDirectory(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryB2C": {
+    "prefix": "Azure Active Directory B2 C",
+    "description": "Add Azure Active Directory B2 C to diagram",
+    "body": [
+      "AzureActiveDirectoryB2C(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryB2C_Descr": {
+    "prefix": "Azure Active Directory B2 C with Description",
+    "description": "Add Azure Active Directory B2 C with Description to diagram",
+    "body": [
+      "AzureActiveDirectoryB2C(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryConnectHealth": {
+    "prefix": "Azure Active Directory Connect Health",
+    "description": "Add Azure Active Directory Connect Health to diagram",
+    "body": [
+      "AzureActiveDirectoryConnectHealth(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryConnectHealth_Descr": {
+    "prefix": "Azure Active Directory Connect Health with Description",
+    "description": "Add Azure Active Directory Connect Health with Description to diagram",
+    "body": [
+      "AzureActiveDirectoryConnectHealth(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryDomainServices": {
+    "prefix": "Azure Active Directory Domain Services",
+    "description": "Add Azure Active Directory Domain Services to diagram",
+    "body": [
+      "AzureActiveDirectoryDomainServices(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryDomainServices_Descr": {
+    "prefix": "Azure Active Directory Domain Services with Description",
+    "description": "Add Azure Active Directory Domain Services with Description to diagram",
+    "body": [
+      "AzureActiveDirectoryDomainServices(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryIdentityProtection": {
+    "prefix": "Azure Active Directory Identity Protection",
+    "description": "Add Azure Active Directory Identity Protection to diagram",
+    "body": [
+      "AzureActiveDirectoryIdentityProtection(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryIdentityProtection_Descr": {
+    "prefix": "Azure Active Directory Identity Protection with Description",
+    "description": "Add Azure Active Directory Identity Protection with Description to diagram",
+    "body": [
+      "AzureActiveDirectoryIdentityProtection(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryPrivilegedIdentityManagement": {
+    "prefix": "Azure Active Directory Privileged Identity Management",
+    "description": "Add Azure Active Directory Privileged Identity Management to diagram",
+    "body": [
+      "AzureActiveDirectoryPrivilegedIdentityManagement(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryPrivilegedIdentityManagement_Descr": {
+    "prefix": "Azure Active Directory Privileged Identity Management with Description",
+    "description": "Add Azure Active Directory Privileged Identity Management with Description to diagram",
+    "body": [
+      "AzureActiveDirectoryPrivilegedIdentityManagement(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAppRegistration": {
+    "prefix": "Azure App Registration",
+    "description": "Add Azure App Registration to diagram",
+    "body": [
+      "AzureAppRegistration(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAppRegistration_Descr": {
+    "prefix": "Azure App Registration with Description",
+    "description": "Add Azure App Registration with Description to diagram",
+    "body": [
+      "AzureAppRegistration(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureConditionalAccess": {
+    "prefix": "Azure Conditional Access",
+    "description": "Add Azure Conditional Access to diagram",
+    "body": [
+      "AzureConditionalAccess(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureConditionalAccess_Descr": {
+    "prefix": "Azure Conditional Access with Description",
+    "description": "Add Azure Conditional Access with Description to diagram",
+    "body": [
+      "AzureConditionalAccess(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureEnterpriseApplication": {
+    "prefix": "Azure Enterprise Application",
+    "description": "Add Azure Enterprise Application to diagram",
+    "body": [
+      "AzureEnterpriseApplication(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureEnterpriseApplication_Descr": {
+    "prefix": "Azure Enterprise Application with Description",
+    "description": "Add Azure Enterprise Application with Description to diagram",
+    "body": [
+      "AzureEnterpriseApplication(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureIdentitygovernance": {
+    "prefix": "Azure Identitygovernance",
+    "description": "Add Azure Identitygovernance to diagram",
+    "body": [
+      "AzureIdentitygovernance(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureIdentitygovernance_Descr": {
+    "prefix": "Azure Identitygovernance with Description",
+    "description": "Add Azure Identitygovernance with Description to diagram",
+    "body": [
+      "AzureIdentitygovernance(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureInformationProtection": {
+    "prefix": "Azure Information Protection",
+    "description": "Add Azure Information Protection to diagram",
+    "body": [
+      "AzureInformationProtection(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureInformationProtection_Descr": {
+    "prefix": "Azure Information Protection with Description",
+    "description": "Add Azure Information Protection with Description to diagram",
+    "body": [
+      "AzureInformationProtection(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureManagedIdentities": {
+    "prefix": "Azure Managed Identities",
+    "description": "Add Azure Managed Identities to diagram",
+    "body": [
+      "AzureManagedIdentities(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureManagedIdentities_Descr": {
+    "prefix": "Azure Managed Identities with Description",
+    "description": "Add Azure Managed Identities with Description to diagram",
+    "body": [
+      "AzureManagedIdentities(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAPIforFHIR": {
+    "prefix": "Azure A P Ifor F H I R",
+    "description": "Add Azure A P Ifor F H I R to diagram",
+    "body": [
+      "AzureAPIforFHIR(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAPIforFHIR_Descr": {
+    "prefix": "Azure A P Ifor F H I R with Description",
+    "description": "Add Azure A P Ifor F H I R with Description to diagram",
+    "body": [
+      "AzureAPIforFHIR(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAppConfiguration": {
+    "prefix": "Azure App Configuration",
+    "description": "Add Azure App Configuration to diagram",
+    "body": [
+      "AzureAppConfiguration(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAppConfiguration_Descr": {
+    "prefix": "Azure App Configuration with Description",
+    "description": "Add Azure App Configuration with Description to diagram",
+    "body": [
+      "AzureAppConfiguration(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureEventGrid": {
+    "prefix": "Azure Event Grid",
+    "description": "Add Azure Event Grid to diagram",
+    "body": [
+      "AzureEventGrid(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureEventGrid_Descr": {
+    "prefix": "Azure Event Grid with Description",
+    "description": "Add Azure Event Grid with Description to diagram",
+    "body": [
+      "AzureEventGrid(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureEventGridTopic": {
+    "prefix": "Azure Event Grid Topic",
+    "description": "Add Azure Event Grid Topic to diagram",
+    "body": [
+      "AzureEventGridTopic(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureEventGridTopic_Descr": {
+    "prefix": "Azure Event Grid Topic with Description",
+    "description": "Add Azure Event Grid Topic with Description to diagram",
+    "body": [
+      "AzureEventGridTopic(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureIntegrationAccount": {
+    "prefix": "Azure Integration Account",
+    "description": "Add Azure Integration Account to diagram",
+    "body": [
+      "AzureIntegrationAccount(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureIntegrationAccount_Descr": {
+    "prefix": "Azure Integration Account with Description",
+    "description": "Add Azure Integration Account with Description to diagram",
+    "body": [
+      "AzureIntegrationAccount(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureIntegrationServiceEnvironment": {
+    "prefix": "Azure Integration Service Environment",
+    "description": "Add Azure Integration Service Environment to diagram",
+    "body": [
+      "AzureIntegrationServiceEnvironment(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureIntegrationServiceEnvironment_Descr": {
+    "prefix": "Azure Integration Service Environment with Description",
+    "description": "Add Azure Integration Service Environment with Description to diagram",
+    "body": [
+      "AzureIntegrationServiceEnvironment(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureLogicApps": {
+    "prefix": "Azure Logic Apps",
+    "description": "Add Azure Logic Apps to diagram",
+    "body": [
+      "AzureLogicApps(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureLogicApps_Descr": {
+    "prefix": "Azure Logic Apps with Description",
+    "description": "Add Azure Logic Apps with Description to diagram",
+    "body": [
+      "AzureLogicApps(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureLogicAppsCustomConnector": {
+    "prefix": "Azure Logic Apps Custom Connector",
+    "description": "Add Azure Logic Apps Custom Connector to diagram",
+    "body": [
+      "AzureLogicAppsCustomConnector(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureLogicAppsCustomConnector_Descr": {
+    "prefix": "Azure Logic Apps Custom Connector with Description",
+    "description": "Add Azure Logic Apps Custom Connector with Description to diagram",
+    "body": [
+      "AzureLogicAppsCustomConnector(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSendGridAccount": {
+    "prefix": "Azure Send Grid Account",
+    "description": "Add Azure Send Grid Account to diagram",
+    "body": [
+      "AzureSendGridAccount(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSendGridAccount_Descr": {
+    "prefix": "Azure Send Grid Account with Description",
+    "description": "Add Azure Send Grid Account with Description to diagram",
+    "body": [
+      "AzureSendGridAccount(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureServiceBus": {
+    "prefix": "Azure Service Bus",
+    "description": "Add Azure Service Bus to diagram",
+    "body": [
+      "AzureServiceBus(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureServiceBus_Descr": {
+    "prefix": "Azure Service Bus with Description",
+    "description": "Add Azure Service Bus with Description to diagram",
+    "body": [
+      "AzureServiceBus(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureServiceBusRelay": {
+    "prefix": "Azure Service Bus Relay",
+    "description": "Add Azure Service Bus Relay to diagram",
+    "body": [
+      "AzureServiceBusRelay(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureServiceBusRelay_Descr": {
+    "prefix": "Azure Service Bus Relay with Description",
+    "description": "Add Azure Service Bus Relay with Description to diagram",
+    "body": [
+      "AzureServiceBusRelay(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureServiceCatalogManagedApplicationDefinition": {
+    "prefix": "Azure Service Catalog Managed Application Definition",
+    "description": "Add Azure Service Catalog Managed Application Definition to diagram",
+    "body": [
+      "AzureServiceCatalogManagedApplicationDefinition(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureServiceCatalogManagedApplicationDefinition_Descr": {
+    "prefix": "Azure Service Catalog Managed Application Definition with Description",
+    "description": "Add Azure Service Catalog Managed Application Definition with Description to diagram",
+    "body": [
+      "AzureServiceCatalogManagedApplicationDefinition(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSoftwareAsAService": {
+    "prefix": "Azure Software As A Service",
+    "description": "Add Azure Software As A Service to diagram",
+    "body": [
+      "AzureSoftwareAsAService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSoftwareAsAService_Descr": {
+    "prefix": "Azure Software As A Service with Description",
+    "description": "Add Azure Software As A Service with Description to diagram",
+    "body": [
+      "AzureSoftwareAsAService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDeviceProvisioningServices": {
+    "prefix": "Azure Device Provisioning Services",
+    "description": "Add Azure Device Provisioning Services to diagram",
+    "body": [
+      "AzureDeviceProvisioningServices(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDeviceProvisioningServices_Descr": {
+    "prefix": "Azure Device Provisioning Services with Description",
+    "description": "Add Azure Device Provisioning Services with Description to diagram",
+    "body": [
+      "AzureDeviceProvisioningServices(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDigitalTwins": {
+    "prefix": "Azure Digital Twins",
+    "description": "Add Azure Digital Twins to diagram",
+    "body": [
+      "AzureDigitalTwins(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDigitalTwins_Descr": {
+    "prefix": "Azure Digital Twins with Description",
+    "description": "Add Azure Digital Twins with Description to diagram",
+    "body": [
+      "AzureDigitalTwins(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureIoTCentral": {
+    "prefix": "Azure Io T Central",
+    "description": "Add Azure Io T Central to diagram",
+    "body": [
+      "AzureIoTCentral(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureIoTCentral_Descr": {
+    "prefix": "Azure Io T Central with Description",
+    "description": "Add Azure Io T Central with Description to diagram",
+    "body": [
+      "AzureIoTCentral(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureIoTEdge": {
+    "prefix": "Azure Io T Edge",
+    "description": "Add Azure Io T Edge to diagram",
+    "body": [
+      "AzureIoTEdge(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureIoTEdge_Descr": {
+    "prefix": "Azure Io T Edge with Description",
+    "description": "Add Azure Io T Edge with Description to diagram",
+    "body": [
+      "AzureIoTEdge(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureIoTHub": {
+    "prefix": "Azure Io T Hub",
+    "description": "Add Azure Io T Hub to diagram",
+    "body": [
+      "AzureIoTHub(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureIoTHub_Descr": {
+    "prefix": "Azure Io T Hub with Description",
+    "description": "Add Azure Io T Hub with Description to diagram",
+    "body": [
+      "AzureIoTHub(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureIoTHubSecurity": {
+    "prefix": "Azure Io T Hub Security",
+    "description": "Add Azure Io T Hub Security to diagram",
+    "body": [
+      "AzureIoTHubSecurity(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureIoTHubSecurity_Descr": {
+    "prefix": "Azure Io T Hub Security with Description",
+    "description": "Add Azure Io T Hub Security with Description to diagram",
+    "body": [
+      "AzureIoTHubSecurity(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMaps": {
+    "prefix": "Azure Maps",
+    "description": "Add Azure Maps to diagram",
+    "body": [
+      "AzureMaps(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMaps_Descr": {
+    "prefix": "Azure Maps with Description",
+    "description": "Add Azure Maps with Description to diagram",
+    "body": [
+      "AzureMaps(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSphere": {
+    "prefix": "Azure Sphere",
+    "description": "Add Azure Sphere to diagram",
+    "body": [
+      "AzureSphere(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSphere_Descr": {
+    "prefix": "Azure Sphere with Description",
+    "description": "Add Azure Sphere with Description to diagram",
+    "body": [
+      "AzureSphere(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureTimeSeriesInsights": {
+    "prefix": "Azure Time Series Insights",
+    "description": "Add Azure Time Series Insights to diagram",
+    "body": [
+      "AzureTimeSeriesInsights(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureTimeSeriesInsights_Descr": {
+    "prefix": "Azure Time Series Insights with Description",
+    "description": "Add Azure Time Series Insights with Description to diagram",
+    "body": [
+      "AzureTimeSeriesInsights(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureTimeSeriesInsightsEventsSources": {
+    "prefix": "Azure Time Series Insights Events Sources",
+    "description": "Add Azure Time Series Insights Events Sources to diagram",
+    "body": [
+      "AzureTimeSeriesInsightsEventsSources(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureTimeSeriesInsightsEventsSources_Descr": {
+    "prefix": "Azure Time Series Insights Events Sources with Description",
+    "description": "Add Azure Time Series Insights Events Sources with Description to diagram",
+    "body": [
+      "AzureTimeSeriesInsightsEventsSources(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureWindows10IoTCoreServices": {
+    "prefix": "Azure Windows10 Io T Core Services",
+    "description": "Add Azure Windows10 Io T Core Services to diagram",
+    "body": [
+      "AzureWindows10IoTCoreServices(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureWindows10IoTCoreServices_Descr": {
+    "prefix": "Azure Windows10 Io T Core Services with Description",
+    "description": "Add Azure Windows10 Io T Core Services with Description to diagram",
+    "body": [
+      "AzureWindows10IoTCoreServices(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureClientApps": {
+    "prefix": "Azure Client Apps",
+    "description": "Add Azure Client Apps to diagram",
+    "body": [
+      "AzureClientApps(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureClientApps_Descr": {
+    "prefix": "Azure Client Apps with Description",
+    "description": "Add Azure Client Apps with Description to diagram",
+    "body": [
+      "AzureClientApps(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDedicatedEventHub": {
+    "prefix": "Azure Dedicated Event Hub",
+    "description": "Add Azure Dedicated Event Hub to diagram",
+    "body": [
+      "AzureDedicatedEventHub(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDedicatedEventHub_Descr": {
+    "prefix": "Azure Dedicated Event Hub with Description",
+    "description": "Add Azure Dedicated Event Hub with Description to diagram",
+    "body": [
+      "AzureDedicatedEventHub(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDeviceCompliance": {
+    "prefix": "Azure Device Compliance",
+    "description": "Add Azure Device Compliance to diagram",
+    "body": [
+      "AzureDeviceCompliance(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDeviceCompliance_Descr": {
+    "prefix": "Azure Device Compliance with Description",
+    "description": "Add Azure Device Compliance with Description to diagram",
+    "body": [
+      "AzureDeviceCompliance(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDeviceConfig": {
+    "prefix": "Azure Device Config",
+    "description": "Add Azure Device Config to diagram",
+    "body": [
+      "AzureDeviceConfig(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDeviceConfig_Descr": {
+    "prefix": "Azure Device Config with Description",
+    "description": "Add Azure Device Config with Description to diagram",
+    "body": [
+      "AzureDeviceConfig(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDevicesGroup": {
+    "prefix": "Azure Devices Group",
+    "description": "Add Azure Devices Group to diagram",
+    "body": [
+      "AzureDevicesGroup(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDevicesGroup_Descr": {
+    "prefix": "Azure Devices Group with Description",
+    "description": "Add Azure Devices Group with Description to diagram",
+    "body": [
+      "AzureDevicesGroup(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureeBook": {
+    "prefix": "Azuree Book",
+    "description": "Add Azuree Book to diagram",
+    "body": [
+      "AzureeBook(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureeBook_Descr": {
+    "prefix": "Azuree Book with Description",
+    "description": "Add Azuree Book with Description to diagram",
+    "body": [
+      "AzureeBook(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureEnrollment": {
+    "prefix": "Azure Enrollment",
+    "description": "Add Azure Enrollment to diagram",
+    "body": [
+      "AzureEnrollment(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureEnrollment_Descr": {
+    "prefix": "Azure Enrollment with Description",
+    "description": "Add Azure Enrollment with Description to diagram",
+    "body": [
+      "AzureEnrollment(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureExchangeOn-PremisesAccess": {
+    "prefix": "Azure Exchange On-Premises Access",
+    "description": "Add Azure Exchange On-Premises Access to diagram",
+    "body": [
+      "AzureExchangeOn-PremisesAccess(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureExchangeOn-PremisesAccess_Descr": {
+    "prefix": "Azure Exchange On-Premises Access with Description",
+    "description": "Add Azure Exchange On-Premises Access with Description to diagram",
+    "body": [
+      "AzureExchangeOn-PremisesAccess(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureIntuneAppProtection": {
+    "prefix": "Azure Intune App Protection",
+    "description": "Add Azure Intune App Protection to diagram",
+    "body": [
+      "AzureIntuneAppProtection(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureIntuneAppProtection_Descr": {
+    "prefix": "Azure Intune App Protection with Description",
+    "description": "Add Azure Intune App Protection with Description to diagram",
+    "body": [
+      "AzureIntuneAppProtection(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureManagedDesktop": {
+    "prefix": "Azure Managed Desktop",
+    "description": "Add Azure Managed Desktop to diagram",
+    "body": [
+      "AzureManagedDesktop(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureManagedDesktop_Descr": {
+    "prefix": "Azure Managed Desktop with Description",
+    "description": "Add Azure Managed Desktop with Description to diagram",
+    "body": [
+      "AzureManagedDesktop(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSecurityBaseline": {
+    "prefix": "Azure Security Baseline",
+    "description": "Add Azure Security Baseline to diagram",
+    "body": [
+      "AzureSecurityBaseline(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSecurityBaseline_Descr": {
+    "prefix": "Azure Security Baseline with Description",
+    "description": "Add Azure Security Baseline with Description to diagram",
+    "body": [
+      "AzureSecurityBaseline(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSoftwareUpdate": {
+    "prefix": "Azure Software Update",
+    "description": "Add Azure Software Update to diagram",
+    "body": [
+      "AzureSoftwareUpdate(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSoftwareUpdate_Descr": {
+    "prefix": "Azure Software Update with Description",
+    "description": "Add Azure Software Update with Description to diagram",
+    "body": [
+      "AzureSoftwareUpdate(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureTool": {
+    "prefix": "Azure Tool",
+    "description": "Add Azure Tool to diagram",
+    "body": [
+      "AzureTool(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureTool_Descr": {
+    "prefix": "Azure Tool with Description",
+    "description": "Add Azure Tool with Description to diagram",
+    "body": [
+      "AzureTool(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryvisor": {
+    "prefix": "Azure Active Directoryvisor",
+    "description": "Add Azure Active Directoryvisor to diagram",
+    "body": [
+      "AzureActiveDirectoryvisor(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureActiveDirectoryvisor_Descr": {
+    "prefix": "Azure Active Directoryvisor with Description",
+    "description": "Add Azure Active Directoryvisor with Description to diagram",
+    "body": [
+      "AzureActiveDirectoryvisor(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureActivityLog": {
+    "prefix": "Azure Activity Log",
+    "description": "Add Azure Activity Log to diagram",
+    "body": [
+      "AzureActivityLog(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureActivityLog_Descr": {
+    "prefix": "Azure Activity Log with Description",
+    "description": "Add Azure Activity Log with Description to diagram",
+    "body": [
+      "AzureActivityLog(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAlert": {
+    "prefix": "Azure Alert",
+    "description": "Add Azure Alert to diagram",
+    "body": [
+      "AzureAlert(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAlert_Descr": {
+    "prefix": "Azure Alert with Description",
+    "description": "Add Azure Alert with Description to diagram",
+    "body": [
+      "AzureAlert(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAutomation": {
+    "prefix": "Azure Automation",
+    "description": "Add Azure Automation to diagram",
+    "body": [
+      "AzureAutomation(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAutomation_Descr": {
+    "prefix": "Azure Automation with Description",
+    "description": "Add Azure Automation with Description to diagram",
+    "body": [
+      "AzureAutomation(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureBackup": {
+    "prefix": "Azure Backup",
+    "description": "Add Azure Backup to diagram",
+    "body": [
+      "AzureBackup(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureBackup_Descr": {
+    "prefix": "Azure Backup with Description",
+    "description": "Add Azure Backup with Description to diagram",
+    "body": [
+      "AzureBackup(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureBlueprints": {
+    "prefix": "Azure Blueprints",
+    "description": "Add Azure Blueprints to diagram",
+    "body": [
+      "AzureBlueprints(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureBlueprints_Descr": {
+    "prefix": "Azure Blueprints with Description",
+    "description": "Add Azure Blueprints with Description to diagram",
+    "body": [
+      "AzureBlueprints(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureCostManagementAndBilling": {
+    "prefix": "Azure Cost Management And Billing",
+    "description": "Add Azure Cost Management And Billing to diagram",
+    "body": [
+      "AzureCostManagementAndBilling(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureCostManagementAndBilling_Descr": {
+    "prefix": "Azure Cost Management And Billing with Description",
+    "description": "Add Azure Cost Management And Billing with Description to diagram",
+    "body": [
+      "AzureCostManagementAndBilling(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDiagnosticSetting": {
+    "prefix": "Azure Diagnostic Setting",
+    "description": "Add Azure Diagnostic Setting to diagram",
+    "body": [
+      "AzureDiagnosticSetting(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDiagnosticSetting_Descr": {
+    "prefix": "Azure Diagnostic Setting with Description",
+    "description": "Add Azure Diagnostic Setting with Description to diagram",
+    "body": [
+      "AzureDiagnosticSetting(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureFreeService": {
+    "prefix": "Azure Free Service",
+    "description": "Add Azure Free Service to diagram",
+    "body": [
+      "AzureFreeService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureFreeService_Descr": {
+    "prefix": "Azure Free Service with Description",
+    "description": "Add Azure Free Service with Description to diagram",
+    "body": [
+      "AzureFreeService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureGuestAssignment": {
+    "prefix": "Azure Guest Assignment",
+    "description": "Add Azure Guest Assignment to diagram",
+    "body": [
+      "AzureGuestAssignment(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureGuestAssignment_Descr": {
+    "prefix": "Azure Guest Assignment with Description",
+    "description": "Add Azure Guest Assignment with Description to diagram",
+    "body": [
+      "AzureGuestAssignment(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureLogAnalytics": {
+    "prefix": "Azure Log Analytics",
+    "description": "Add Azure Log Analytics to diagram",
+    "body": [
+      "AzureLogAnalytics(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureLogAnalytics_Descr": {
+    "prefix": "Azure Log Analytics with Description",
+    "description": "Add Azure Log Analytics with Description to diagram",
+    "body": [
+      "AzureLogAnalytics(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureManagedApplications": {
+    "prefix": "Azure Managed Applications",
+    "description": "Add Azure Managed Applications to diagram",
+    "body": [
+      "AzureManagedApplications(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureManagedApplications_Descr": {
+    "prefix": "Azure Managed Applications with Description",
+    "description": "Add Azure Managed Applications with Description to diagram",
+    "body": [
+      "AzureManagedApplications(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureManagementGroups": {
+    "prefix": "Azure Management Groups",
+    "description": "Add Azure Management Groups to diagram",
+    "body": [
+      "AzureManagementGroups(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureManagementGroups_Descr": {
+    "prefix": "Azure Management Groups with Description",
+    "description": "Add Azure Management Groups with Description to diagram",
+    "body": [
+      "AzureManagementGroups(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMetric": {
+    "prefix": "Azure Metric",
+    "description": "Add Azure Metric to diagram",
+    "body": [
+      "AzureMetric(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMetric_Descr": {
+    "prefix": "Azure Metric with Description",
+    "description": "Add Azure Metric with Description to diagram",
+    "body": [
+      "AzureMetric(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMonitor": {
+    "prefix": "Azure Monitor",
+    "description": "Add Azure Monitor to diagram",
+    "body": [
+      "AzureMonitor(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMonitor_Descr": {
+    "prefix": "Azure Monitor with Description",
+    "description": "Add Azure Monitor with Description to diagram",
+    "body": [
+      "AzureMonitor(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzurePolicy": {
+    "prefix": "Azure Policy",
+    "description": "Add Azure Policy to diagram",
+    "body": [
+      "AzurePolicy(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzurePolicy_Descr": {
+    "prefix": "Azure Policy with Description",
+    "description": "Add Azure Policy with Description to diagram",
+    "body": [
+      "AzurePolicy(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureResourceGraphExplorer": {
+    "prefix": "Azure Resource Graph Explorer",
+    "description": "Add Azure Resource Graph Explorer to diagram",
+    "body": [
+      "AzureResourceGraphExplorer(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureResourceGraphExplorer_Descr": {
+    "prefix": "Azure Resource Graph Explorer with Description",
+    "description": "Add Azure Resource Graph Explorer with Description to diagram",
+    "body": [
+      "AzureResourceGraphExplorer(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureResourceGroups": {
+    "prefix": "Azure Resource Groups",
+    "description": "Add Azure Resource Groups to diagram",
+    "body": [
+      "AzureResourceGroups(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureResourceGroups_Descr": {
+    "prefix": "Azure Resource Groups with Description",
+    "description": "Add Azure Resource Groups with Description to diagram",
+    "body": [
+      "AzureResourceGroups(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureScheduler": {
+    "prefix": "Azure Scheduler",
+    "description": "Add Azure Scheduler to diagram",
+    "body": [
+      "AzureScheduler(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureScheduler_Descr": {
+    "prefix": "Azure Scheduler with Description",
+    "description": "Add Azure Scheduler with Description to diagram",
+    "body": [
+      "AzureScheduler(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSiteRecovery": {
+    "prefix": "Azure Site Recovery",
+    "description": "Add Azure Site Recovery to diagram",
+    "body": [
+      "AzureSiteRecovery(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSiteRecovery_Descr": {
+    "prefix": "Azure Site Recovery with Description",
+    "description": "Add Azure Site Recovery with Description to diagram",
+    "body": [
+      "AzureSiteRecovery(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSolution": {
+    "prefix": "Azure Solution",
+    "description": "Add Azure Solution to diagram",
+    "body": [
+      "AzureSolution(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSolution_Descr": {
+    "prefix": "Azure Solution with Description",
+    "description": "Add Azure Solution with Description to diagram",
+    "body": [
+      "AzureSolution(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSubscription": {
+    "prefix": "Azure Subscription",
+    "description": "Add Azure Subscription to diagram",
+    "body": [
+      "AzureSubscription(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSubscription_Descr": {
+    "prefix": "Azure Subscription with Description",
+    "description": "Add Azure Subscription with Description to diagram",
+    "body": [
+      "AzureSubscription(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureContentProtection": {
+    "prefix": "Azure Content Protection",
+    "description": "Add Azure Content Protection to diagram",
+    "body": [
+      "AzureContentProtection(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureContentProtection_Descr": {
+    "prefix": "Azure Content Protection with Description",
+    "description": "Add Azure Content Protection with Description to diagram",
+    "body": [
+      "AzureContentProtection(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMediaEncoding": {
+    "prefix": "Azure Media Encoding",
+    "description": "Add Azure Media Encoding to diagram",
+    "body": [
+      "AzureMediaEncoding(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMediaEncoding_Descr": {
+    "prefix": "Azure Media Encoding with Description",
+    "description": "Add Azure Media Encoding with Description to diagram",
+    "body": [
+      "AzureMediaEncoding(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMediaOnDemand": {
+    "prefix": "Azure Media On Demand",
+    "description": "Add Azure Media On Demand to diagram",
+    "body": [
+      "AzureMediaOnDemand(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMediaOnDemand_Descr": {
+    "prefix": "Azure Media On Demand with Description",
+    "description": "Add Azure Media On Demand with Description to diagram",
+    "body": [
+      "AzureMediaOnDemand(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMediaPlayer": {
+    "prefix": "Azure Media Player",
+    "description": "Add Azure Media Player to diagram",
+    "body": [
+      "AzureMediaPlayer(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMediaPlayer_Descr": {
+    "prefix": "Azure Media Player with Description",
+    "description": "Add Azure Media Player with Description to diagram",
+    "body": [
+      "AzureMediaPlayer(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMediaServices": {
+    "prefix": "Azure Media Services",
+    "description": "Add Azure Media Services to diagram",
+    "body": [
+      "AzureMediaServices(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMediaServices_Descr": {
+    "prefix": "Azure Media Services with Description",
+    "description": "Add Azure Media Services with Description to diagram",
+    "body": [
+      "AzureMediaServices(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDatabaseMigrationService": {
+    "prefix": "Azure Database Migration Service",
+    "description": "Add Azure Database Migration Service to diagram",
+    "body": [
+      "AzureDatabaseMigrationService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDatabaseMigrationService_Descr": {
+    "prefix": "Azure Database Migration Service with Description",
+    "description": "Add Azure Database Migration Service with Description to diagram",
+    "body": [
+      "AzureDatabaseMigrationService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMigrationProject": {
+    "prefix": "Azure Migration Project",
+    "description": "Add Azure Migration Project to diagram",
+    "body": [
+      "AzureMigrationProject(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMigrationProject_Descr": {
+    "prefix": "Azure Migration Project with Description",
+    "description": "Add Azure Migration Project with Description to diagram",
+    "body": [
+      "AzureMigrationProject(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureRecoveryServicesVault": {
+    "prefix": "Azure Recovery Services Vault",
+    "description": "Add Azure Recovery Services Vault to diagram",
+    "body": [
+      "AzureRecoveryServicesVault(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureRecoveryServicesVault_Descr": {
+    "prefix": "Azure Recovery Services Vault with Description",
+    "description": "Add Azure Recovery Services Vault with Description to diagram",
+    "body": [
+      "AzureRecoveryServicesVault(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "OnPremiseActiveDirectory": {
+    "prefix": "On Premise Active Directory",
+    "description": "Add On Premise Active Directory to diagram",
+    "body": [
+      "OnPremiseActiveDirectory(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "OnPremiseActiveDirectory_Descr": {
+    "prefix": "On Premise Active Directory with Description",
+    "description": "Add On Premise Active Directory with Description to diagram",
+    "body": [
+      "OnPremiseActiveDirectory(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSpatialAnchor": {
+    "prefix": "Azure Spatial Anchor",
+    "description": "Add Azure Spatial Anchor to diagram",
+    "body": [
+      "AzureSpatialAnchor(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSpatialAnchor_Descr": {
+    "prefix": "Azure Spatial Anchor with Description",
+    "description": "Add Azure Spatial Anchor with Description to diagram",
+    "body": [
+      "AzureSpatialAnchor(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMobileApp": {
+    "prefix": "Azure Mobile App",
+    "description": "Add Azure Mobile App to diagram",
+    "body": [
+      "AzureMobileApp(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMobileApp_Descr": {
+    "prefix": "Azure Mobile App with Description",
+    "description": "Add Azure Mobile App with Description to diagram",
+    "body": [
+      "AzureMobileApp(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMobileEngagement": {
+    "prefix": "Azure Mobile Engagement",
+    "description": "Add Azure Mobile Engagement to diagram",
+    "body": [
+      "AzureMobileEngagement(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMobileEngagement_Descr": {
+    "prefix": "Azure Mobile Engagement with Description",
+    "description": "Add Azure Mobile Engagement with Description to diagram",
+    "body": [
+      "AzureMobileEngagement(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureNotificationHubs": {
+    "prefix": "Azure Notification Hubs",
+    "description": "Add Azure Notification Hubs to diagram",
+    "body": [
+      "AzureNotificationHubs(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureNotificationHubs_Descr": {
+    "prefix": "Azure Notification Hubs with Description",
+    "description": "Add Azure Notification Hubs with Description to diagram",
+    "body": [
+      "AzureNotificationHubs(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureApplicationGateway": {
+    "prefix": "Azure Application Gateway",
+    "description": "Add Azure Application Gateway to diagram",
+    "body": [
+      "AzureApplicationGateway(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureApplicationGateway_Descr": {
+    "prefix": "Azure Application Gateway with Description",
+    "description": "Add Azure Application Gateway with Description to diagram",
+    "body": [
+      "AzureApplicationGateway(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureApplicationSecurityGroup": {
+    "prefix": "Azure Application Security Group",
+    "description": "Add Azure Application Security Group to diagram",
+    "body": [
+      "AzureApplicationSecurityGroup(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureApplicationSecurityGroup_Descr": {
+    "prefix": "Azure Application Security Group with Description",
+    "description": "Add Azure Application Security Group with Description to diagram",
+    "body": [
+      "AzureApplicationSecurityGroup(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureConnection": {
+    "prefix": "Azure Connection",
+    "description": "Add Azure Connection to diagram",
+    "body": [
+      "AzureConnection(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureConnection_Descr": {
+    "prefix": "Azure Connection with Description",
+    "description": "Add Azure Connection with Description to diagram",
+    "body": [
+      "AzureConnection(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDDOSProtectionPlan": {
+    "prefix": "Azure D D O S Protection Plan",
+    "description": "Add Azure D D O S Protection Plan to diagram",
+    "body": [
+      "AzureDDOSProtectionPlan(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDDOSProtectionPlan_Descr": {
+    "prefix": "Azure D D O S Protection Plan with Description",
+    "description": "Add Azure D D O S Protection Plan with Description to diagram",
+    "body": [
+      "AzureDDOSProtectionPlan(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDNS": {
+    "prefix": "Azure D N S",
+    "description": "Add Azure D N S to diagram",
+    "body": [
+      "AzureDNS(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDNS_Descr": {
+    "prefix": "Azure D N S with Description",
+    "description": "Add Azure D N S with Description to diagram",
+    "body": [
+      "AzureDNS(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureDNSPrivate": {
+    "prefix": "Azure D N S Private",
+    "description": "Add Azure D N S Private to diagram",
+    "body": [
+      "AzureDNSPrivate(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDNSPrivate_Descr": {
+    "prefix": "Azure D N S Private with Description",
+    "description": "Add Azure D N S Private with Description to diagram",
+    "body": [
+      "AzureDNSPrivate(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureExpressRoute": {
+    "prefix": "Azure Express Route",
+    "description": "Add Azure Express Route to diagram",
+    "body": [
+      "AzureExpressRoute(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureExpressRoute_Descr": {
+    "prefix": "Azure Express Route with Description",
+    "description": "Add Azure Express Route with Description to diagram",
+    "body": [
+      "AzureExpressRoute(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureFirewall": {
+    "prefix": "Azure Firewall",
+    "description": "Add Azure Firewall to diagram",
+    "body": [
+      "AzureFirewall(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureFirewall_Descr": {
+    "prefix": "Azure Firewall with Description",
+    "description": "Add Azure Firewall with Description to diagram",
+    "body": [
+      "AzureFirewall(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureFrontDoorService": {
+    "prefix": "Azure Front Door Service",
+    "description": "Add Azure Front Door Service to diagram",
+    "body": [
+      "AzureFrontDoorService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureFrontDoorService_Descr": {
+    "prefix": "Azure Front Door Service with Description",
+    "description": "Add Azure Front Door Service with Description to diagram",
+    "body": [
+      "AzureFrontDoorService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureLoadBalancer": {
+    "prefix": "Azure Load Balancer",
+    "description": "Add Azure Load Balancer to diagram",
+    "body": [
+      "AzureLoadBalancer(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureLoadBalancer_Descr": {
+    "prefix": "Azure Load Balancer with Description",
+    "description": "Add Azure Load Balancer with Description to diagram",
+    "body": [
+      "AzureLoadBalancer(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureLocalNetworkGateway": {
+    "prefix": "Azure Local Network Gateway",
+    "description": "Add Azure Local Network Gateway to diagram",
+    "body": [
+      "AzureLocalNetworkGateway(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureLocalNetworkGateway_Descr": {
+    "prefix": "Azure Local Network Gateway with Description",
+    "description": "Add Azure Local Network Gateway with Description to diagram",
+    "body": [
+      "AzureLocalNetworkGateway(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureNetworkInterface": {
+    "prefix": "Azure Network Interface",
+    "description": "Add Azure Network Interface to diagram",
+    "body": [
+      "AzureNetworkInterface(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureNetworkInterface_Descr": {
+    "prefix": "Azure Network Interface with Description",
+    "description": "Add Azure Network Interface with Description to diagram",
+    "body": [
+      "AzureNetworkInterface(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureNetworkSecurityGroups": {
+    "prefix": "Azure Network Security Groups",
+    "description": "Add Azure Network Security Groups to diagram",
+    "body": [
+      "AzureNetworkSecurityGroups(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureNetworkSecurityGroups_Descr": {
+    "prefix": "Azure Network Security Groups with Description",
+    "description": "Add Azure Network Security Groups with Description to diagram",
+    "body": [
+      "AzureNetworkSecurityGroups(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureNetworkSecurityGroupsClassic": {
+    "prefix": "Azure Network Security Groups Classic",
+    "description": "Add Azure Network Security Groups Classic to diagram",
+    "body": [
+      "AzureNetworkSecurityGroupsClassic(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureNetworkSecurityGroupsClassic_Descr": {
+    "prefix": "Azure Network Security Groups Classic with Description",
+    "description": "Add Azure Network Security Groups Classic with Description to diagram",
+    "body": [
+      "AzureNetworkSecurityGroupsClassic(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureNetworkWatcher": {
+    "prefix": "Azure Network Watcher",
+    "description": "Add Azure Network Watcher to diagram",
+    "body": [
+      "AzureNetworkWatcher(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureTestPlans_Descr": {
-    "prefix": "Azure Test Plans with Description",
-    "description": "Add Azure Test Plans with Description to diagram",
+  "AzureNetworkWatcher_Descr": {
+    "prefix": "Azure Network Watcher with Description",
+    "description": "Add Azure Network Watcher with Description to diagram",
     "body": [
-      "AzureTestPlans(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureNetworkWatcher(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "Azure": {
-    "prefix": "Azure",
-    "description": "Add Azure to diagram",
+  "AzureOnPremisesDataGateway": {
+    "prefix": "Azure On Premises Data Gateway",
+    "description": "Add Azure On Premises Data Gateway to diagram",
     "body": [
-      "Azure(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureOnPremisesDataGateway(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "Azure_Descr": {
-    "prefix": "Azure with Description",
-    "description": "Add Azure with Description to diagram",
+  "AzureOnPremisesDataGateway_Descr": {
+    "prefix": "Azure On Premises Data Gateway with Description",
+    "description": "Add Azure On Premises Data Gateway with Description to diagram",
     "body": [
-      "Azure(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureOnPremisesDataGateway(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureActiveDirectory": {
-    "prefix": "Azure Active Directory",
-    "description": "Add Azure Active Directory to diagram",
+  "AzurePrivateEndpoint": {
+    "prefix": "Azure Private Endpoint",
+    "description": "Add Azure Private Endpoint to diagram",
     "body": [
-      "AzureActiveDirectory(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzurePrivateEndpoint(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureActiveDirectory_Descr": {
-    "prefix": "Azure Active Directory with Description",
-    "description": "Add Azure Active Directory with Description to diagram",
+  "AzurePrivateEndpoint_Descr": {
+    "prefix": "Azure Private Endpoint with Description",
+    "description": "Add Azure Private Endpoint with Description to diagram",
     "body": [
-      "AzureActiveDirectory(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzurePrivateEndpoint(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureActiveDirectoryB2C": {
-    "prefix": "Azure Active Directory B2 C",
-    "description": "Add Azure Active Directory B2 C to diagram",
+  "AzurePrivateLink": {
+    "prefix": "Azure Private Link",
+    "description": "Add Azure Private Link to diagram",
     "body": [
-      "AzureActiveDirectoryB2C(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzurePrivateLink(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureActiveDirectoryB2C_Descr": {
-    "prefix": "Azure Active Directory B2 C with Description",
-    "description": "Add Azure Active Directory B2 C with Description to diagram",
+  "AzurePrivateLink_Descr": {
+    "prefix": "Azure Private Link with Description",
+    "description": "Add Azure Private Link with Description to diagram",
     "body": [
-      "AzureActiveDirectoryB2C(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzurePrivateLink(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureActiveDirectoryDomainServices": {
-    "prefix": "Azure Active Directory Domain Services",
-    "description": "Add Azure Active Directory Domain Services to diagram",
+  "AzurePublicIPAddress": {
+    "prefix": "Azure Public I P Address",
+    "description": "Add Azure Public I P Address to diagram",
     "body": [
-      "AzureActiveDirectoryDomainServices(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzurePublicIPAddress(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureActiveDirectoryDomainServices_Descr": {
-    "prefix": "Azure Active Directory Domain Services with Description",
-    "description": "Add Azure Active Directory Domain Services with Description to diagram",
+  "AzurePublicIPAddress_Descr": {
+    "prefix": "Azure Public I P Address with Description",
+    "description": "Add Azure Public I P Address with Description to diagram",
     "body": [
-      "AzureActiveDirectoryDomainServices(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzurePublicIPAddress(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureEventGrid": {
-    "prefix": "Azure Event Grid",
-    "description": "Add Azure Event Grid to diagram",
+  "AzureReservedIPAddressClassic": {
+    "prefix": "Azure Reserved I P Address Classic",
+    "description": "Add Azure Reserved I P Address Classic to diagram",
     "body": [
-      "AzureEventGrid(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureReservedIPAddressClassic(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureEventGrid_Descr": {
-    "prefix": "Azure Event Grid with Description",
-    "description": "Add Azure Event Grid with Description to diagram",
+  "AzureReservedIPAddressClassic_Descr": {
+    "prefix": "Azure Reserved I P Address Classic with Description",
+    "description": "Add Azure Reserved I P Address Classic with Description to diagram",
     "body": [
-      "AzureEventGrid(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureReservedIPAddressClassic(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureLogicApps": {
-    "prefix": "Azure Logic Apps",
-    "description": "Add Azure Logic Apps to diagram",
+  "AzureRouteFilter": {
+    "prefix": "Azure Route Filter",
+    "description": "Add Azure Route Filter to diagram",
     "body": [
-      "AzureLogicApps(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureRouteFilter(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureLogicApps_Descr": {
-    "prefix": "Azure Logic Apps with Description",
-    "description": "Add Azure Logic Apps with Description to diagram",
+  "AzureRouteFilter_Descr": {
+    "prefix": "Azure Route Filter with Description",
+    "description": "Add Azure Route Filter with Description to diagram",
     "body": [
-      "AzureLogicApps(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureRouteFilter(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureServiceBus": {
-    "prefix": "Azure Service Bus",
-    "description": "Add Azure Service Bus to diagram",
+  "AzureRouteTable": {
+    "prefix": "Azure Route Table",
+    "description": "Add Azure Route Table to diagram",
     "body": [
-      "AzureServiceBus(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureRouteTable(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureServiceBus_Descr": {
-    "prefix": "Azure Service Bus with Description",
-    "description": "Add Azure Service Bus with Description to diagram",
+  "AzureRouteTable_Descr": {
+    "prefix": "Azure Route Table with Description",
+    "description": "Add Azure Route Table with Description to diagram",
     "body": [
-      "AzureServiceBus(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureRouteTable(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureDigitalTwins": {
-    "prefix": "Azure Digital Twins",
-    "description": "Add Azure Digital Twins to diagram",
+  "AzureServiceEndpoint": {
+    "prefix": "Azure Service Endpoint",
+    "description": "Add Azure Service Endpoint to diagram",
     "body": [
-      "AzureDigitalTwins(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureServiceEndpoint(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureDigitalTwins_Descr": {
-    "prefix": "Azure Digital Twins with Description",
-    "description": "Add Azure Digital Twins with Description to diagram",
+  "AzureServiceEndpoint_Descr": {
+    "prefix": "Azure Service Endpoint with Description",
+    "description": "Add Azure Service Endpoint with Description to diagram",
     "body": [
-      "AzureDigitalTwins(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureServiceEndpoint(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureIoTCentral": {
-    "prefix": "Azure Io T Central",
-    "description": "Add Azure Io T Central to diagram",
+  "AzureServiceEndpointPolicy": {
+    "prefix": "Azure Service Endpoint Policy",
+    "description": "Add Azure Service Endpoint Policy to diagram",
     "body": [
-      "AzureIoTCentral(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureServiceEndpointPolicy(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureIoTCentral_Descr": {
-    "prefix": "Azure Io T Central with Description",
-    "description": "Add Azure Io T Central with Description to diagram",
+  "AzureServiceEndpointPolicy_Descr": {
+    "prefix": "Azure Service Endpoint Policy with Description",
+    "description": "Add Azure Service Endpoint Policy with Description to diagram",
     "body": [
-      "AzureIoTCentral(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureServiceEndpointPolicy(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureIoTEdge": {
-    "prefix": "Azure Io T Edge",
-    "description": "Add Azure Io T Edge to diagram",
+  "AzureTrafficManager": {
+    "prefix": "Azure Traffic Manager",
+    "description": "Add Azure Traffic Manager to diagram",
     "body": [
-      "AzureIoTEdge(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureTrafficManager(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureIoTEdge_Descr": {
-    "prefix": "Azure Io T Edge with Description",
-    "description": "Add Azure Io T Edge with Description to diagram",
+  "AzureTrafficManager_Descr": {
+    "prefix": "Azure Traffic Manager with Description",
+    "description": "Add Azure Traffic Manager with Description to diagram",
     "body": [
-      "AzureIoTEdge(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureTrafficManager(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureIoTHub": {
-    "prefix": "Azure Io T Hub",
-    "description": "Add Azure Io T Hub to diagram",
+  "AzureVirtualNetwork": {
+    "prefix": "Azure Virtual Network",
+    "description": "Add Azure Virtual Network to diagram",
     "body": [
-      "AzureIoTHub(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureVirtualNetwork(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureIoTHub_Descr": {
-    "prefix": "Azure Io T Hub with Description",
-    "description": "Add Azure Io T Hub with Description to diagram",
+  "AzureVirtualNetwork_Descr": {
+    "prefix": "Azure Virtual Network with Description",
+    "description": "Add Azure Virtual Network with Description to diagram",
     "body": [
-      "AzureIoTHub(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureVirtualNetwork(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureMaps": {
-    "prefix": "Azure Maps",
-    "description": "Add Azure Maps to diagram",
+  "AzureVirtualNetworkClassic": {
+    "prefix": "Azure Virtual Network Classic",
+    "description": "Add Azure Virtual Network Classic to diagram",
     "body": [
-      "AzureMaps(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureVirtualNetworkClassic(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureMaps_Descr": {
-    "prefix": "Azure Maps with Description",
-    "description": "Add Azure Maps with Description to diagram",
+  "AzureVirtualNetworkClassic_Descr": {
+    "prefix": "Azure Virtual Network Classic with Description",
+    "description": "Add Azure Virtual Network Classic with Description to diagram",
     "body": [
-      "AzureMaps(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureVirtualNetworkClassic(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureTimeSeriesInsights": {
-    "prefix": "Azure Time Series Insights",
-    "description": "Add Azure Time Series Insights to diagram",
+  "AzureVirtualWAN": {
+    "prefix": "Azure Virtual W A N",
+    "description": "Add Azure Virtual W A N to diagram",
     "body": [
-      "AzureTimeSeriesInsights(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureVirtualWAN(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureTimeSeriesInsights_Descr": {
-    "prefix": "Azure Time Series Insights with Description",
-    "description": "Add Azure Time Series Insights with Description to diagram",
+  "AzureVirtualWAN_Descr": {
+    "prefix": "Azure Virtual W A N with Description",
+    "description": "Add Azure Virtual W A N with Description to diagram",
     "body": [
-      "AzureTimeSeriesInsights(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureVirtualWAN(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureAutomation": {
-    "prefix": "Azure Automation",
-    "description": "Add Azure Automation to diagram",
+  "AzureVPNGateway": {
+    "prefix": "Azure V P N Gateway",
+    "description": "Add Azure V P N Gateway to diagram",
     "body": [
-      "AzureAutomation(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureVPNGateway(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureAutomation_Descr": {
-    "prefix": "Azure Automation with Description",
-    "description": "Add Azure Automation with Description to diagram",
+  "AzureVPNGateway_Descr": {
+    "prefix": "Azure V P N Gateway with Description",
+    "description": "Add Azure V P N Gateway with Description to diagram",
     "body": [
-      "AzureAutomation(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureVPNGateway(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureBackup": {
-    "prefix": "Azure Backup",
-    "description": "Add Azure Backup to diagram",
+  "AzureCloudSimpleNode": {
+    "prefix": "Azure Cloud Simple Node",
+    "description": "Add Azure Cloud Simple Node to diagram",
     "body": [
-      "AzureBackup(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureCloudSimpleNode(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureBackup_Descr": {
-    "prefix": "Azure Backup with Description",
-    "description": "Add Azure Backup with Description to diagram",
+  "AzureCloudSimpleNode_Descr": {
+    "prefix": "Azure Cloud Simple Node with Description",
+    "description": "Add Azure Cloud Simple Node with Description to diagram",
     "body": [
-      "AzureBackup(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureCloudSimpleNode(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureBlueprints": {
-    "prefix": "Azure Blueprints",
-    "description": "Add Azure Blueprints to diagram",
+  "AzureCloudSimpleService": {
+    "prefix": "Azure Cloud Simple Service",
+    "description": "Add Azure Cloud Simple Service to diagram",
     "body": [
-      "AzureBlueprints(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureCloudSimpleService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureBlueprints_Descr": {
-    "prefix": "Azure Blueprints with Description",
-    "description": "Add Azure Blueprints with Description to diagram",
+  "AzureCloudSimpleService_Descr": {
+    "prefix": "Azure Cloud Simple Service with Description",
+    "description": "Add Azure Cloud Simple Service with Description to diagram",
     "body": [
-      "AzureBlueprints(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureCloudSimpleService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureLogAnalytics": {
-    "prefix": "Azure Log Analytics",
-    "description": "Add Azure Log Analytics to diagram",
+  "AzureControllers": {
+    "prefix": "Azure Controllers",
+    "description": "Add Azure Controllers to diagram",
     "body": [
-      "AzureLogAnalytics(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureControllers(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureLogAnalytics_Descr": {
-    "prefix": "Azure Log Analytics with Description",
-    "description": "Add Azure Log Analytics with Description to diagram",
+  "AzureControllers_Descr": {
+    "prefix": "Azure Controllers with Description",
+    "description": "Add Azure Controllers with Description to diagram",
     "body": [
-      "AzureLogAnalytics(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureControllers(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureManagedApplications": {
-    "prefix": "Azure Managed Applications",
-    "description": "Add Azure Managed Applications to diagram",
+  "AzureCustomerLockbox": {
+    "prefix": "Azure Customer Lockbox",
+    "description": "Add Azure Customer Lockbox to diagram",
     "body": [
-      "AzureManagedApplications(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureCustomerLockbox(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureManagedApplications_Descr": {
-    "prefix": "Azure Managed Applications with Description",
-    "description": "Add Azure Managed Applications with Description to diagram",
+  "AzureCustomerLockbox_Descr": {
+    "prefix": "Azure Customer Lockbox with Description",
+    "description": "Add Azure Customer Lockbox with Description to diagram",
     "body": [
-      "AzureManagedApplications(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureCustomerLockbox(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureManagementGroups": {
-    "prefix": "Azure Management Groups",
-    "description": "Add Azure Management Groups to diagram",
+  "AzureEducation": {
+    "prefix": "Azure Education",
+    "description": "Add Azure Education to diagram",
     "body": [
-      "AzureManagementGroups(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureEducation(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureManagementGroups_Descr": {
-    "prefix": "Azure Management Groups with Description",
-    "description": "Add Azure Management Groups with Description to diagram",
+  "AzureEducation_Descr": {
+    "prefix": "Azure Education with Description",
+    "description": "Add Azure Education with Description to diagram",
     "body": [
-      "AzureManagementGroups(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureEducation(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureMonitor": {
-    "prefix": "Azure Monitor",
-    "description": "Add Azure Monitor to diagram",
+  "AzureImageDefinition": {
+    "prefix": "Azure Image Definition",
+    "description": "Add Azure Image Definition to diagram",
     "body": [
-      "AzureMonitor(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureImageDefinition(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureMonitor_Descr": {
-    "prefix": "Azure Monitor with Description",
-    "description": "Add Azure Monitor with Description to diagram",
+  "AzureImageDefinition_Descr": {
+    "prefix": "Azure Image Definition with Description",
+    "description": "Add Azure Image Definition with Description to diagram",
     "body": [
-      "AzureMonitor(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureImageDefinition(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzurePolicy": {
-    "prefix": "Azure Policy",
-    "description": "Add Azure Policy to diagram",
+  "AzureImageVersion": {
+    "prefix": "Azure Image Version",
+    "description": "Add Azure Image Version to diagram",
     "body": [
-      "AzurePolicy(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureImageVersion(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzurePolicy_Descr": {
-    "prefix": "Azure Policy with Description",
-    "description": "Add Azure Policy with Description to diagram",
+  "AzureImageVersion_Descr": {
+    "prefix": "Azure Image Version with Description",
+    "description": "Add Azure Image Version with Description to diagram",
     "body": [
-      "AzurePolicy(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureImageVersion(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureResourceGroups": {
-    "prefix": "Azure Resource Groups",
-    "description": "Add Azure Resource Groups to diagram",
+  "AzureResourceExplorer": {
+    "prefix": "Azure Resource Explorer",
+    "description": "Add Azure Resource Explorer to diagram",
     "body": [
-      "AzureResourceGroups(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureResourceExplorer(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureResourceGroups_Descr": {
-    "prefix": "Azure Resource Groups with Description",
-    "description": "Add Azure Resource Groups with Description to diagram",
+  "AzureResourceExplorer_Descr": {
+    "prefix": "Azure Resource Explorer with Description",
+    "description": "Add Azure Resource Explorer with Description to diagram",
     "body": [
-      "AzureResourceGroups(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureResourceExplorer(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureSharedImageGallery": {
+    "prefix": "Azure Shared Image Gallery",
+    "description": "Add Azure Shared Image Gallery to diagram",
+    "body": [
+      "AzureSharedImageGallery(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSharedImageGallery_Descr": {
+    "prefix": "Azure Shared Image Gallery with Description",
+    "description": "Add Azure Shared Image Gallery with Description to diagram",
+    "body": [
+      "AzureSharedImageGallery(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureTenantStatus": {
+    "prefix": "Azure Tenant Status",
+    "description": "Add Azure Tenant Status to diagram",
+    "body": [
+      "AzureTenantStatus(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureTenantStatus_Descr": {
+    "prefix": "Azure Tenant Status with Description",
+    "description": "Add Azure Tenant Status with Description to diagram",
+    "body": [
+      "AzureTenantStatus(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureWebAppFirewall": {
+    "prefix": "Azure Web App Firewall",
+    "description": "Add Azure Web App Firewall to diagram",
+    "body": [
+      "AzureWebAppFirewall(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureWebAppFirewall_Descr": {
+    "prefix": "Azure Web App Firewall with Description",
+    "description": "Add Azure Web App Firewall with Description to diagram",
+    "body": [
+      "AzureWebAppFirewall(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAPIManagement": {
+    "prefix": "Azure A P I Management",
+    "description": "Add Azure A P I Management to diagram",
+    "body": [
+      "AzureAPIManagement(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAPIManagement_Descr": {
+    "prefix": "Azure A P I Management with Description",
+    "description": "Add Azure A P I Management with Description to diagram",
+    "body": [
+      "AzureAPIManagement(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureScheduler": {
-    "prefix": "Azure Scheduler",
-    "description": "Add Azure Scheduler to diagram",
+  "AzureCDN": {
+    "prefix": "Azure C D N",
+    "description": "Add Azure C D N to diagram",
     "body": [
-      "AzureScheduler(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureCDN(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureScheduler_Descr": {
-    "prefix": "Azure Scheduler with Description",
-    "description": "Add Azure Scheduler with Description to diagram",
+  "AzureCDN_Descr": {
+    "prefix": "Azure C D N with Description",
+    "description": "Add Azure C D N with Description to diagram",
     "body": [
-      "AzureScheduler(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureCDN(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureSiteRecovery": {
-    "prefix": "Azure Site Recovery",
-    "description": "Add Azure Site Recovery to diagram",
+  "AzureWebAppUmbraco": {
+    "prefix": "Azure Web App Umbraco",
+    "description": "Add Azure Web App Umbraco to diagram",
     "body": [
-      "AzureSiteRecovery(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureWebAppUmbraco(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureSiteRecovery_Descr": {
-    "prefix": "Azure Site Recovery with Description",
-    "description": "Add Azure Site Recovery with Description to diagram",
+  "AzureWebAppUmbraco_Descr": {
+    "prefix": "Azure Web App Umbraco with Description",
+    "description": "Add Azure Web App Umbraco with Description to diagram",
     "body": [
-      "AzureSiteRecovery(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureWebAppUmbraco(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureSubscription": {
-    "prefix": "Azure Subscription",
-    "description": "Add Azure Subscription to diagram",
+  "AzureWebAppWordPress": {
+    "prefix": "Azure Web App Word Press",
+    "description": "Add Azure Web App Word Press to diagram",
     "body": [
-      "AzureSubscription(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureWebAppWordPress(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureSubscription_Descr": {
-    "prefix": "Azure Subscription with Description",
-    "description": "Add Azure Subscription with Description to diagram",
+  "AzureWebAppWordPress_Descr": {
+    "prefix": "Azure Web App Word Press with Description",
+    "description": "Add Azure Web App Word Press with Description to diagram",
     "body": [
-      "AzureSubscription(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureWebAppWordPress(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureMediaServices": {
-    "prefix": "Azure Media Services",
-    "description": "Add Azure Media Services to diagram",
+  "LogoCacheRedisProducticon": {
+    "prefix": "Logo Cache Redis Producticon",
+    "description": "Add Logo Cache Redis Producticon to diagram",
     "body": [
-      "AzureMediaServices(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoCacheRedisProducticon(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureMediaServices_Descr": {
-    "prefix": "Azure Media Services with Description",
-    "description": "Add Azure Media Services with Description to diagram",
+  "LogoCacheRedisProducticon_Descr": {
+    "prefix": "Logo Cache Redis Producticon with Description",
+    "description": "Add Logo Cache Redis Producticon with Description to diagram",
     "body": [
-      "AzureMediaServices(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoCacheRedisProducticon(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureMobileApp": {
-    "prefix": "Azure Mobile App",
-    "description": "Add Azure Mobile App to diagram",
+  "LogoCloudCycle": {
+    "prefix": "Logo Cloud Cycle",
+    "description": "Add Logo Cloud Cycle to diagram",
     "body": [
-      "AzureMobileApp(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoCloudCycle(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureMobileApp_Descr": {
-    "prefix": "Azure Mobile App with Description",
-    "description": "Add Azure Mobile App with Description to diagram",
+  "LogoCloudCycle_Descr": {
+    "prefix": "Logo Cloud Cycle with Description",
+    "description": "Add Logo Cloud Cycle with Description to diagram",
     "body": [
-      "AzureMobileApp(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoCloudCycle(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureNotificationHubs": {
-    "prefix": "Azure Notification Hubs",
-    "description": "Add Azure Notification Hubs to diagram",
+  "LogoDatabrick": {
+    "prefix": "Logo Databrick",
+    "description": "Add Logo Databrick to diagram",
     "body": [
-      "AzureNotificationHubs(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoDatabrick(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureNotificationHubs_Descr": {
-    "prefix": "Azure Notification Hubs with Description",
-    "description": "Add Azure Notification Hubs with Description to diagram",
+  "LogoDatabrick_Descr": {
+    "prefix": "Logo Databrick with Description",
+    "description": "Add Logo Databrick with Description to diagram",
     "body": [
-      "AzureNotificationHubs(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoDatabrick(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureApplicationGateway": {
-    "prefix": "Azure Application Gateway",
-    "description": "Add Azure Application Gateway to diagram",
+  "LogoDCOS": {
+    "prefix": "Logo D C O S",
+    "description": "Add Logo D C O S to diagram",
     "body": [
-      "AzureApplicationGateway(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoDCOS(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureApplicationGateway_Descr": {
-    "prefix": "Azure Application Gateway with Description",
-    "description": "Add Azure Application Gateway with Description to diagram",
+  "LogoDCOS_Descr": {
+    "prefix": "Logo D C O S with Description",
+    "description": "Add Logo D C O S with Description to diagram",
     "body": [
-      "AzureApplicationGateway(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoDCOS(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureAzureDDoSProtection": {
-    "prefix": "Azure Azure D Do S Protection",
-    "description": "Add Azure Azure D Do S Protection to diagram",
+  "LogoDocker": {
+    "prefix": "Logo Docker",
+    "description": "Add Logo Docker to diagram",
     "body": [
-      "AzureAzureDDoSProtection(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoDocker(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureAzureDDoSProtection_Descr": {
-    "prefix": "Azure Azure D Do S Protection with Description",
-    "description": "Add Azure Azure D Do S Protection with Description to diagram",
+  "LogoDocker_Descr": {
+    "prefix": "Logo Docker with Description",
+    "description": "Add Logo Docker with Description to diagram",
     "body": [
-      "AzureAzureDDoSProtection(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoDocker(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureDNS": {
-    "prefix": "Azure D N S",
-    "description": "Add Azure D N S to diagram",
+  "LogoHDInsight": {
+    "prefix": "Logo H D Insight",
+    "description": "Add Logo H D Insight to diagram",
     "body": [
-      "AzureDNS(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoHDInsight(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureDNS_Descr": {
-    "prefix": "Azure D N S with Description",
-    "description": "Add Azure D N S with Description to diagram",
+  "LogoHDInsight_Descr": {
+    "prefix": "Logo H D Insight with Description",
+    "description": "Add Logo H D Insight with Description to diagram",
     "body": [
-      "AzureDNS(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoHDInsight(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureExpressRoute": {
-    "prefix": "Azure Express Route",
-    "description": "Add Azure Express Route to diagram",
+  "LogoHockeyApp": {
+    "prefix": "Logo Hockey App",
+    "description": "Add Logo Hockey App to diagram",
     "body": [
-      "AzureExpressRoute(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoHockeyApp(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureExpressRoute_Descr": {
-    "prefix": "Azure Express Route with Description",
-    "description": "Add Azure Express Route with Description to diagram",
+  "LogoHockeyApp_Descr": {
+    "prefix": "Logo Hockey App with Description",
+    "description": "Add Logo Hockey App with Description to diagram",
     "body": [
-      "AzureExpressRoute(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoHockeyApp(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureFrontDoorService": {
-    "prefix": "Azure Front Door Service",
-    "description": "Add Azure Front Door Service to diagram",
+  "LogoKubernete": {
+    "prefix": "Logo Kubernete",
+    "description": "Add Logo Kubernete to diagram",
     "body": [
-      "AzureFrontDoorService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoKubernete(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureFrontDoorService_Descr": {
-    "prefix": "Azure Front Door Service with Description",
-    "description": "Add Azure Front Door Service with Description to diagram",
+  "LogoKubernete_Descr": {
+    "prefix": "Logo Kubernete with Description",
+    "description": "Add Logo Kubernete with Description to diagram",
     "body": [
-      "AzureFrontDoorService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoKubernete(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureLoadBalancer": {
-    "prefix": "Azure Load Balancer",
-    "description": "Add Azure Load Balancer to diagram",
+  "LogoOkta": {
+    "prefix": "Logo Okta",
+    "description": "Add Logo Okta to diagram",
     "body": [
-      "AzureLoadBalancer(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoOkta(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureLoadBalancer_Descr": {
-    "prefix": "Azure Load Balancer with Description",
-    "description": "Add Azure Load Balancer with Description to diagram",
+  "LogoOkta_Descr": {
+    "prefix": "Logo Okta with Description",
+    "description": "Add Logo Okta with Description to diagram",
     "body": [
-      "AzureLoadBalancer(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoOkta(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureTrafficManager": {
-    "prefix": "Azure Traffic Manager",
-    "description": "Add Azure Traffic Manager to diagram",
+  "LogoOpenShift": {
+    "prefix": "Logo Open Shift",
+    "description": "Add Logo Open Shift to diagram",
     "body": [
-      "AzureTrafficManager(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoOpenShift(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureTrafficManager_Descr": {
-    "prefix": "Azure Traffic Manager with Description",
-    "description": "Add Azure Traffic Manager with Description to diagram",
+  "LogoOpenShift_Descr": {
+    "prefix": "Logo Open Shift with Description",
+    "description": "Add Logo Open Shift with Description to diagram",
     "body": [
-      "AzureTrafficManager(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoOpenShift(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureVirtualNetwork": {
-    "prefix": "Azure Virtual Network",
-    "description": "Add Azure Virtual Network to diagram",
+  "LogoPluralsightMono": {
+    "prefix": "Logo Pluralsight Mono",
+    "description": "Add Logo Pluralsight Mono to diagram",
     "body": [
-      "AzureVirtualNetwork(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoPluralsightMono(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureVirtualNetwork_Descr": {
-    "prefix": "Azure Virtual Network with Description",
-    "description": "Add Azure Virtual Network with Description to diagram",
+  "LogoPluralsightMono_Descr": {
+    "prefix": "Logo Pluralsight Mono with Description",
+    "description": "Add Logo Pluralsight Mono with Description to diagram",
     "body": [
-      "AzureVirtualNetwork(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoPluralsightMono(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureVirtualWAN": {
-    "prefix": "Azure Virtual W A N",
-    "description": "Add Azure Virtual W A N to diagram",
+  "LogoPluralsightTwoTone": {
+    "prefix": "Logo Pluralsight Two Tone",
+    "description": "Add Logo Pluralsight Two Tone to diagram",
     "body": [
-      "AzureVirtualWAN(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoPluralsightTwoTone(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureVirtualWAN_Descr": {
-    "prefix": "Azure Virtual W A N with Description",
-    "description": "Add Azure Virtual W A N with Description to diagram",
+  "LogoPluralsightTwoTone_Descr": {
+    "prefix": "Logo Pluralsight Two Tone with Description",
+    "description": "Add Logo Pluralsight Two Tone with Description to diagram",
     "body": [
-      "AzureVirtualWAN(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoPluralsightTwoTone(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureVPNGateway": {
-    "prefix": "Azure V P N Gateway",
-    "description": "Add Azure V P N Gateway to diagram",
+  "LogoStackOverflow": {
+    "prefix": "Logo Stack Overflow",
+    "description": "Add Logo Stack Overflow to diagram",
     "body": [
-      "AzureVPNGateway(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "LogoStackOverflow(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureVPNGateway_Descr": {
-    "prefix": "Azure V P N Gateway with Description",
-    "description": "Add Azure V P N Gateway with Description to diagram",
+  "LogoStackOverflow_Descr": {
+    "prefix": "Logo Stack Overflow with Description",
+    "description": "Add Logo Stack Overflow with Description to diagram",
     "body": [
-      "AzureVPNGateway(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "LogoStackOverflow(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
@@ -1375,6 +4047,22 @@
       "$0"
     ]
   },
+  "AzureSecurityCenter": {
+    "prefix": "Azure Security Center",
+    "description": "Add Azure Security Center to diagram",
+    "body": [
+      "AzureSecurityCenter(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureSecurityCenter_Descr": {
+    "prefix": "Azure Security Center with Description",
+    "description": "Add Azure Security Center with Description to diagram",
+    "body": [
+      "AzureSecurityCenter(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
   "AzureSentinel": {
     "prefix": "Azure Sentinel",
     "description": "Add Azure Sentinel to diagram",
@@ -1391,6 +4079,22 @@
       "$0"
     ]
   },
+  "AzureArchiveStorage": {
+    "prefix": "Azure Archive Storage",
+    "description": "Add Azure Archive Storage to diagram",
+    "body": [
+      "AzureArchiveStorage(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureArchiveStorage_Descr": {
+    "prefix": "Azure Archive Storage with Description",
+    "description": "Add Azure Archive Storage with Description to diagram",
+    "body": [
+      "AzureArchiveStorage(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
   "AzureBlobStorage": {
     "prefix": "Azure Blob Storage",
     "description": "Add Azure Blob Storage to diagram",
@@ -1423,6 +4127,22 @@
       "$0"
     ]
   },
+  "AzureDataBoxEdgeDataBoxGateway": {
+    "prefix": "Azure Data Box Edge Data Box Gateway",
+    "description": "Add Azure Data Box Edge Data Box Gateway to diagram",
+    "body": [
+      "AzureDataBoxEdgeDataBoxGateway(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureDataBoxEdgeDataBoxGateway_Descr": {
+    "prefix": "Azure Data Box Edge Data Box Gateway with Description",
+    "description": "Add Azure Data Box Edge Data Box Gateway with Description to diagram",
+    "body": [
+      "AzureDataBoxEdgeDataBoxGateway(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
   "AzureDataLakeStorage": {
     "prefix": "Azure Data Lake Storage",
     "description": "Add Azure Data Lake Storage to diagram",
@@ -1471,35 +4191,51 @@
       "$0"
     ]
   },
-  "AzureManagedDisks": {
-    "prefix": "Azure Managed Disks",
-    "description": "Add Azure Managed Disks to diagram",
+  "AzureFXTEdgeFiler": {
+    "prefix": "Azure F X T Edge Filer",
+    "description": "Add Azure F X T Edge Filer to diagram",
+    "body": [
+      "AzureFXTEdgeFiler(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureFXTEdgeFiler_Descr": {
+    "prefix": "Azure F X T Edge Filer with Description",
+    "description": "Add Azure F X T Edge Filer with Description to diagram",
+    "body": [
+      "AzureFXTEdgeFiler(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureGeneralStorage": {
+    "prefix": "Azure General Storage",
+    "description": "Add Azure General Storage to diagram",
     "body": [
-      "AzureManagedDisks(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureGeneralStorage(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureManagedDisks_Descr": {
-    "prefix": "Azure Managed Disks with Description",
-    "description": "Add Azure Managed Disks with Description to diagram",
+  "AzureGeneralStorage_Descr": {
+    "prefix": "Azure General Storage with Description",
+    "description": "Add Azure General Storage with Description to diagram",
     "body": [
-      "AzureManagedDisks(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureGeneralStorage(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureNetAppFiles": {
-    "prefix": "Azure Net App Files",
-    "description": "Add Azure Net App Files to diagram",
+  "AzureNetAppfiles": {
+    "prefix": "Azure Net Appfiles",
+    "description": "Add Azure Net Appfiles to diagram",
     "body": [
-      "AzureNetAppFiles(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureNetAppfiles(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureNetAppFiles_Descr": {
-    "prefix": "Azure Net App Files with Description",
-    "description": "Add Azure Net App Files with Description to diagram",
+  "AzureNetAppfiles_Descr": {
+    "prefix": "Azure Net Appfiles with Description",
+    "description": "Add Azure Net Appfiles with Description to diagram",
     "body": [
-      "AzureNetAppFiles(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureNetAppfiles(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
@@ -1535,6 +4271,54 @@
       "$0"
     ]
   },
+  "AzureStorageAccountClassic": {
+    "prefix": "Azure Storage Account Classic",
+    "description": "Add Azure Storage Account Classic to diagram",
+    "body": [
+      "AzureStorageAccountClassic(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureStorageAccountClassic_Descr": {
+    "prefix": "Azure Storage Account Classic with Description",
+    "description": "Add Azure Storage Account Classic with Description to diagram",
+    "body": [
+      "AzureStorageAccountClassic(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureStorageExplorer": {
+    "prefix": "Azure Storage Explorer",
+    "description": "Add Azure Storage Explorer to diagram",
+    "body": [
+      "AzureStorageExplorer(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureStorageExplorer_Descr": {
+    "prefix": "Azure Storage Explorer with Description",
+    "description": "Add Azure Storage Explorer with Description to diagram",
+    "body": [
+      "AzureStorageExplorer(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureStorageSyncService": {
+    "prefix": "Azure Storage Sync Service",
+    "description": "Add Azure Storage Sync Service to diagram",
+    "body": [
+      "AzureStorageSyncService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureStorageSyncService_Descr": {
+    "prefix": "Azure Storage Sync Service with Description",
+    "description": "Add Azure Storage Sync Service with Description to diagram",
+    "body": [
+      "AzureStorageSyncService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
   "AzureStorSimple": {
     "prefix": "Azure Stor Simple",
     "description": "Add Azure Stor Simple to diagram",
@@ -1551,35 +4335,147 @@
       "$0"
     ]
   },
-  "AzureAPIManagement": {
-    "prefix": "Azure A P I Management",
-    "description": "Add Azure A P I Management to diagram",
+  "AzureStorSimpleDataManager": {
+    "prefix": "Azure Stor Simple Data Manager",
+    "description": "Add Azure Stor Simple Data Manager to diagram",
     "body": [
-      "AzureAPIManagement(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureStorSimpleDataManager(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureAPIManagement_Descr": {
-    "prefix": "Azure A P I Management with Description",
-    "description": "Add Azure A P I Management with Description to diagram",
+  "AzureStorSimpleDataManager_Descr": {
+    "prefix": "Azure Stor Simple Data Manager with Description",
+    "description": "Add Azure Stor Simple Data Manager with Description to diagram",
     "body": [
-      "AzureAPIManagement(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureStorSimpleDataManager(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
-  "AzureCDN": {
-    "prefix": "Azure C D N",
-    "description": "Add Azure C D N to diagram",
+  "AzureTableStorage": {
+    "prefix": "Azure Table Storage",
+    "description": "Add Azure Table Storage to diagram",
     "body": [
-      "AzureCDN(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "AzureTableStorage(${1:alias}, \"${2:label}\", \"${3:technology}\")",
       "$0"
     ]
   },
-  "AzureCDN_Descr": {
-    "prefix": "Azure C D N with Description",
-    "description": "Add Azure C D N with Description to diagram",
+  "AzureTableStorage_Descr": {
+    "prefix": "Azure Table Storage with Description",
+    "description": "Add Azure Table Storage with Description to diagram",
     "body": [
-      "AzureCDN(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "AzureTableStorage(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAPIConnection": {
+    "prefix": "Azure A P I Connection",
+    "description": "Add Azure A P I Connection to diagram",
+    "body": [
+      "AzureAPIConnection(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAPIConnection_Descr": {
+    "prefix": "Azure A P I Connection with Description",
+    "description": "Add Azure A P I Connection with Description to diagram",
+    "body": [
+      "AzureAPIConnection(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAppServiceCertificate": {
+    "prefix": "Azure App Service Certificate",
+    "description": "Add Azure App Service Certificate to diagram",
+    "body": [
+      "AzureAppServiceCertificate(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAppServiceCertificate_Descr": {
+    "prefix": "Azure App Service Certificate with Description",
+    "description": "Add Azure App Service Certificate with Description to diagram",
+    "body": [
+      "AzureAppServiceCertificate(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAppServiceDomain": {
+    "prefix": "Azure App Service Domain",
+    "description": "Add Azure App Service Domain to diagram",
+    "body": [
+      "AzureAppServiceDomain(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAppServiceDomain_Descr": {
+    "prefix": "Azure App Service Domain with Description",
+    "description": "Add Azure App Service Domain with Description to diagram",
+    "body": [
+      "AzureAppServiceDomain(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAppServiceEnvironment": {
+    "prefix": "Azure App Service Environment",
+    "description": "Add Azure App Service Environment to diagram",
+    "body": [
+      "AzureAppServiceEnvironment(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAppServiceEnvironment_Descr": {
+    "prefix": "Azure App Service Environment with Description",
+    "description": "Add Azure App Service Environment with Description to diagram",
+    "body": [
+      "AzureAppServiceEnvironment(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureAppServicePlan": {
+    "prefix": "Azure App Service Plan",
+    "description": "Add Azure App Service Plan to diagram",
+    "body": [
+      "AzureAppServicePlan(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureAppServicePlan_Descr": {
+    "prefix": "Azure App Service Plan with Description",
+    "description": "Add Azure App Service Plan with Description to diagram",
+    "body": [
+      "AzureAppServicePlan(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureMediaService": {
+    "prefix": "Azure Media Service",
+    "description": "Add Azure Media Service to diagram",
+    "body": [
+      "AzureMediaService(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureMediaService_Descr": {
+    "prefix": "Azure Media Service with Description",
+    "description": "Add Azure Media Service with Description to diagram",
+    "body": [
+      "AzureMediaService(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
+      "$0"
+    ]
+  },
+  "AzureNotificationHubNamespace": {
+    "prefix": "Azure Notification Hub Namespace",
+    "description": "Add Azure Notification Hub Namespace to diagram",
+    "body": [
+      "AzureNotificationHubNamespace(${1:alias}, \"${2:label}\", \"${3:technology}\")",
+      "$0"
+    ]
+  },
+  "AzureNotificationHubNamespace_Descr": {
+    "prefix": "Azure Notification Hub Namespace with Description",
+    "description": "Add Azure Notification Hub Namespace with Description to diagram",
+    "body": [
+      "AzureNotificationHubNamespace(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")",
       "$0"
     ]
   },
diff --git a/dist/AIMachineLearning/AzureCognitiveServices(m).png b/dist/AIMachineLearning/AzureCognitiveServices(m).png
index 39a71919..3f8ac153 100644
Binary files a/dist/AIMachineLearning/AzureCognitiveServices(m).png and b/dist/AIMachineLearning/AzureCognitiveServices(m).png differ
diff --git a/dist/AIMachineLearning/AzureCognitiveServices(m).svg b/dist/AIMachineLearning/AzureCognitiveServices(m).svg
index 16b9b102..e16414f9 100644
--- a/dist/AIMachineLearning/AzureCognitiveServices(m).svg
+++ b/dist/AIMachineLearning/AzureCognitiveServices(m).svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="41pt" viewBox="0 0 70 41" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,119,208);fill-opacity:1;" d="M 69.164063 20.390625 C 67.894531 17.402344 65.265625 14.875 61.863281 13.328125 C 60.296875 8.101563 55.90625 2.871094 49.359375 2.871094 C 49.152344 2.871094 48.941406 2.878906 48.726563 2.886719 C 46 0.945313 43.347656 0 40.644531 0 C 39.015625 0 37.351563 0.355469 35.6875 1.0625 C 34.449219 0.417969 33.035156 0.0859375 31.519531 0.0859375 C 28.167969 0.0859375 24.992188 1.621094 23.03125 3.417969 C 22.398438 3.269531 21.753906 3.199219 21.105469 3.199219 C 16.109375 3.199219 11.15625 7.292969 9.816406 12.257813 C 5.511719 13.808594 2.363281 16.625 0.886719 20.285156 C -0.546875 23.839844 -0.230469 27.8125 1.75 31.1875 C 3.722656 34.539063 7.164063 36.542969 10.96875 36.542969 C 12.425781 36.542969 13.832031 36.246094 15.113281 35.675781 C 17.425781 37.761719 20.398438 39.007813 23.214844 39.007813 C 24.195313 39.007813 25.136719 38.863281 26.023438 38.578125 C 28.304688 40.4375 31.796875 41.132813 34.632813 41.132813 C 37.980469 41.132813 40.886719 40.257813 42.816406 38.726563 C 44.066406 39.300781 45.441406 39.597656 46.875 39.597656 C 50.46875 39.597656 54.175781 37.699219 56.203125 35.0625 C 57.332031 35.523438 58.523438 35.761719 59.726563 35.761719 C 63.648438 35.757813 67.292969 33.21875 69.007813 29.289063 C 70.3125 26.292969 70.371094 23.21875 69.164063 20.390625 Z M 69.164063 20.390625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 19.730469 24 L 16.199219 24 C 15.757813 22.066406 14.019531 20.621094 11.941406 20.621094 C 9.53125 20.621094 7.570313 22.5625 7.570313 24.953125 C 7.570313 27.34375 9.53125 29.289063 11.941406 29.289063 C 14.007813 29.289063 15.738281 27.855469 16.191406 25.941406 L 19.734375 25.941406 C 20.179688 25.945313 20.546875 26.304688 20.546875 26.75 L 20.546875 38.652344 C 21.1875 38.820313 21.84375 38.929688 22.507813 38.976563 L 22.507813 26.75 C 22.507813 25.234375 21.261719 24 19.730469 24 Z M 11.941406 27.488281 C 10.53125 27.488281 9.382813 26.351563 9.382813 24.953125 C 9.382813 23.554688 10.53125 22.417969 11.941406 22.417969 C 13.351563 22.417969 14.496094 23.554688 14.496094 24.953125 C 14.496094 26.351563 13.351563 27.488281 11.941406 27.488281 Z M 33.808594 24.859375 L 33.808594 20.8125 C 33.808594 19.292969 32.5625 18.058594 31.035156 18.058594 L 24.828125 18.058594 C 24.378906 18.058594 24.015625 17.699219 24.015625 17.253906 L 24.015625 2.617188 C 23.671875 2.867188 23.34375 3.132813 23.03125 3.417969 C 22.707031 3.339844 22.382813 3.285156 22.050781 3.25 L 22.050781 17.253906 C 22.050781 18.769531 23.296875 20.003906 24.828125 20.003906 L 31.035156 20.003906 C 31.484375 20.007813 31.847656 20.367188 31.847656 20.8125 L 31.847656 24.859375 C 29.910156 25.300781 28.457031 27.023438 28.457031 29.078125 C 28.457031 31.46875 30.417969 33.414063 32.828125 33.414063 C 35.238281 33.414063 37.199219 31.46875 37.199219 29.078125 C 37.199219 27.023438 35.746094 25.300781 33.808594 24.859375 Z M 32.828125 31.613281 C 31.417969 31.613281 30.273438 30.476563 30.273438 29.078125 C 30.273438 27.679688 31.417969 26.542969 32.828125 26.542969 C 34.238281 26.542969 35.382813 27.679688 35.382813 29.078125 C 35.382813 30.476563 34.238281 31.613281 32.828125 31.613281 Z M 60.554688 20.816406 C 60.554688 18.429688 58.59375 16.484375 56.183594 16.484375 C 53.773438 16.484375 51.8125 18.429688 51.8125 20.816406 C 51.8125 22.867188 53.257813 24.582031 55.183594 25.035156 L 55.183594 25.835938 C 55.183594 26.28125 54.820313 26.640625 54.375 26.640625 L 46.515625 26.640625 L 46.515625 12.695313 C 46.515625 11.179688 45.269531 9.945313 43.738281 9.945313 L 39.480469 9.945313 C 39.039063 8.015625 37.300781 6.566406 35.222656 6.566406 C 32.8125 6.566406 30.851563 8.511719 30.851563 10.902344 C 30.851563 13.292969 32.8125 15.234375 35.222656 15.234375 C 37.289063 15.234375 39.019531 13.804688 39.472656 11.890625 L 43.742188 11.890625 C 44.1875 11.890625 44.554688 12.25 44.554688 12.695313 L 44.554688 39.320313 C 45.1875 39.472656 45.84375 39.5625 46.515625 39.585938 L 46.515625 28.585938 L 54.375 28.585938 C 55.902344 28.585938 57.148438 27.351563 57.148438 25.835938 L 57.148438 25.042969 C 59.09375 24.605469 60.554688 22.878906 60.554688 20.816406 Z M 35.222656 13.4375 C 33.8125 13.4375 32.664063 12.300781 32.664063 10.902344 C 32.664063 9.503906 33.8125 8.367188 35.222656 8.367188 C 36.632813 8.367188 37.777344 9.503906 37.777344 10.902344 C 37.777344 12.300781 36.632813 13.4375 35.222656 13.4375 Z M 56.183594 23.351563 C 54.773438 23.351563 53.628906 22.214844 53.628906 20.816406 C 53.628906 19.421875 54.773438 18.28125 56.183594 18.28125 C 57.59375 18.28125 58.738281 19.421875 58.738281 20.816406 C 58.738281 22.214844 57.59375 23.351563 56.183594 23.351563 Z M 56.183594 23.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,119,208);fill-opacity:1;" d="M 69.027344 20.320313 C 67.757813 17.347656 65.140625 14.828125 61.75 13.285156 C 60.1875 8.078125 55.816406 2.867188 49.292969 2.867188 C 49.085938 2.867188 48.875 2.871094 48.664063 2.882813 C 45.941406 0.949219 43.300781 0.00390625 40.609375 0.00390625 C 38.988281 0.00390625 37.328125 0.359375 35.667969 1.0625 C 34.4375 0.425781 33.027344 0.0898438 31.515625 0.0898438 C 28.179688 0.0898438 25.015625 1.621094 23.058594 3.410156 C 22.429688 3.265625 21.789063 3.191406 21.144531 3.195313 C 16.164063 3.195313 11.230469 7.273438 9.894531 12.21875 C 5.605469 13.761719 2.46875 16.570313 0.996094 20.21875 C -0.429688 23.757813 -0.117188 27.71875 1.859375 31.078125 C 3.820313 34.417969 7.253906 36.414063 11.039063 36.414063 C 12.492188 36.414063 13.894531 36.117188 15.171875 35.550781 C 17.472656 37.628906 20.4375 38.867188 23.242188 38.867188 C 24.21875 38.867188 25.15625 38.726563 26.042969 38.441406 C 28.3125 40.292969 31.796875 40.988281 34.621094 40.988281 C 37.953125 40.988281 40.851563 40.117188 42.773438 38.589844 C 44.015625 39.160156 45.386719 39.457031 46.816406 39.457031 L 46.820313 39.457031 C 50.394531 39.457031 54.089844 37.566406 56.109375 34.941406 C 57.234375 35.398438 58.421875 35.632813 59.621094 35.632813 C 63.527344 35.632813 67.160156 33.101563 68.867188 29.1875 C 70.171875 26.203125 70.226563 23.136719 69.027344 20.320313 Z M 69.027344 20.320313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 19.773438 23.917969 L 16.253906 23.917969 C 15.816406 21.996094 14.082031 20.550781 12.011719 20.550781 C 9.609375 20.550781 7.65625 22.488281 7.65625 24.871094 C 7.65625 27.25 9.609375 29.1875 12.011719 29.1875 C 14.070313 29.1875 15.792969 27.761719 16.246094 25.855469 L 19.773438 25.855469 C 20.222656 25.855469 20.582031 26.214844 20.585938 26.660156 L 20.585938 38.515625 C 21.222656 38.683594 21.878906 38.792969 22.539063 38.839844 L 22.539063 26.660156 C 22.539063 25.148438 21.296875 23.917969 19.773438 23.917969 Z M 12.011719 27.398438 C 10.605469 27.398438 9.464844 26.261719 9.464844 24.871094 C 9.464844 23.476563 10.605469 22.34375 12.011719 22.34375 C 13.414063 22.34375 14.558594 23.476563 14.558594 24.871094 C 14.558594 26.261719 13.414063 27.398438 12.011719 27.398438 Z M 33.796875 24.777344 L 33.796875 20.742188 C 33.796875 19.230469 32.558594 18 31.035156 18 L 24.851563 18 C 24.402344 18 24.039063 17.640625 24.039063 17.199219 L 24.039063 2.613281 C 23.699219 2.863281 23.371094 3.128906 23.058594 3.410156 C 22.738281 3.335938 22.414063 3.28125 22.085938 3.246094 L 22.085938 17.199219 C 22.085938 18.710938 23.324219 19.941406 24.851563 19.941406 L 31.035156 19.941406 C 31.480469 19.941406 31.84375 20.300781 31.84375 20.742188 L 31.84375 24.777344 C 29.914063 25.21875 28.46875 26.933594 28.46875 28.980469 C 28.46875 31.359375 30.421875 33.296875 32.820313 33.296875 C 35.222656 33.296875 37.175781 31.359375 37.175781 28.980469 C 37.175781 26.933594 35.730469 25.21875 33.796875 24.777344 Z M 32.820313 31.507813 C 31.417969 31.507813 30.273438 30.371094 30.273438 28.980469 C 30.273438 27.585938 31.417969 26.453125 32.820313 26.453125 C 34.226563 26.453125 35.367188 27.585938 35.367188 28.980469 C 35.367188 30.371094 34.226563 31.507813 32.820313 31.507813 Z M 60.445313 20.75 C 60.445313 18.367188 58.492188 16.433594 56.089844 16.433594 C 53.691406 16.433594 51.738281 18.367188 51.738281 20.75 C 51.738281 22.789063 53.175781 24.5 55.097656 24.949219 L 55.097656 25.75 C 55.097656 26.191406 54.734375 26.550781 54.289063 26.550781 L 46.457031 26.550781 L 46.457031 12.65625 C 46.457031 11.148438 45.21875 9.917969 43.691406 9.917969 L 39.449219 9.917969 C 39.011719 7.992188 37.277344 6.550781 35.207031 6.550781 C 32.804688 6.550781 30.851563 8.488281 30.851563 10.871094 C 30.851563 13.25 32.804688 15.1875 35.207031 15.1875 C 37.265625 15.1875 38.988281 13.761719 39.441406 11.855469 L 43.695313 11.855469 C 44.140625 11.855469 44.503906 12.214844 44.503906 12.65625 L 44.503906 39.183594 C 45.136719 39.335938 45.789063 39.425781 46.457031 39.449219 L 46.457031 28.488281 L 54.289063 28.488281 C 55.8125 28.488281 57.050781 27.261719 57.050781 25.75 L 57.050781 24.957031 C 58.992188 24.523438 60.445313 22.800781 60.445313 20.75 Z M 35.207031 13.394531 C 33.800781 13.394531 32.660156 12.261719 32.660156 10.871094 C 32.660156 9.476563 33.800781 8.34375 35.207031 8.34375 C 36.609375 8.34375 37.753906 9.476563 37.753906 10.871094 C 37.753906 12.261719 36.609375 13.394531 35.207031 13.394531 Z M 56.089844 23.273438 C 54.6875 23.273438 53.542969 22.140625 53.542969 20.75 C 53.542969 19.355469 54.6875 18.222656 56.089844 18.222656 C 57.496094 18.222656 58.636719 19.355469 58.636719 20.75 C 58.636719 22.140625 57.496094 23.273438 56.089844 23.273438 Z M 56.089844 23.273438 "/>
 </g>
 </svg>
diff --git a/dist/AIMachineLearning/AzureCognitiveServices.png b/dist/AIMachineLearning/AzureCognitiveServices.png
index bb3ef9a9..48f6d09d 100644
Binary files a/dist/AIMachineLearning/AzureCognitiveServices.png and b/dist/AIMachineLearning/AzureCognitiveServices.png differ
diff --git a/dist/AIMachineLearning/AzureCognitiveServices.puml b/dist/AIMachineLearning/AzureCognitiveServices.puml
index aeb53b0d..7ddd6f6d 100644
--- a/dist/AIMachineLearning/AzureCognitiveServices.puml
+++ b/dist/AIMachineLearning/AzureCognitiveServices.puml
@@ -1,10 +1,9 @@
 sprite $AzureCognitiveServices [70x41/16z] {
-bTQ7pkem38RXpuuTZ_k_tpCA5cGqAky_jE1HavW8t4VIpTs4ICmZl0j-ZYsNGWa_fRajvA7JkXcJvsrXWdEaaPb9y3mLYaCjCaivvuIx97DHmlfM33eYes84
-WFqvmxag3ZHjeCWrmoxVA0qzCsL_y79Opw00ryFN0UPGOCtl5SUxdaEw3ahcTaNwML47vv1FHizgsLqMVk-kbx9_68cyKTBhfBTAUiD-jQLKRfwvAfNkaLB6
-HYMiMmnZ8xd6i9DY183g9HtOZwK2TCKQYr833VzCd-McQAXaLkhu5QrU3SegpEFByIi3LeKGutjLXxtMdDif_5RuSumVfBKDirC4ylvVHIqDVcrRF522Qg2d
--WiMN0TZPoMTfwihHcNwV1i3r6TbkN5ASL1SZ-eH8P2omGmKuo1_PJnEl1KEKYN8wysjDiio3OXIgcbOGuOva_nMh9PffO3VZRU0KLRUksSftvkbw8VFTDtE
-GwMCctLMl1QuLRA1UsTmdXMklTWhmG30SL9gF7IlN9c8PPwKaFsrMqfrL9nHaMN9JnLHYt3b-JjSxoeWVwH4mpc9ap8iuvXSTs74dUA2Pn4HqETjRDpCbF5R
-97KJHsyuzHS
+bPMBaYiX24GRGR3v__-zp-nG5iuaERjv9wSGMWVtY7ci5GQnMEHonTT8P8CJtp7p25Nm4UeHAYjlOHZUC9b_65Zv11yzoincEHA2EoopMHWUUO1oA-cM081Z
+bnQE37PB03OLmkm4JgpibW7FJCCasKoAZkR10bJnBKH49zvRuBbXBV0pJnR5lExJeOyD5iyyMXOmJ5xT3OpSiHQseoNNgC-x9PSUTrxFxWfcNfR6BCdHKZGB
+VVgFsoknpH9F5jyEe0cSOpdhl6Et161k02jzdiMf-RPRgj9vVSGI9YEO1V-nWDrIKMJrsgmMSUpHoI9WPgxAO7X9p0JsYSLWcLHufU5QsigaO7rWeK1KhWML
+9Q0r6_5dIr8169yjjRzTohbbr_RPHbzHpT01rGftGFo5xB4yTJUWMUe5i1-HOz-JRT9bYV-l3N7LOYycjwZtr9N5VonUVJaYVKUNPK5Oux-tE03UMb8XSmeq
+7osioz3HGgsJyDR2KPUGeoLpkQ-MkYwfQfgbSR3GKSoNX_pGmc4UuOQTONFQ0FmZ2mUUqVNUudZFCD7aMhb3_hVG1xx0k1KY64DzAhv5NsDcJC4Jlm4
 }
 
 AzureEntityColoring(AzureCognitiveServices)
diff --git a/dist/AIMachineLearning/AzureCognitiveServices.svg b/dist/AIMachineLearning/AzureCognitiveServices.svg
index 4ae727c5..ed4d051d 100644
--- a/dist/AIMachineLearning/AzureCognitiveServices.svg
+++ b/dist/AIMachineLearning/AzureCognitiveServices.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="41pt" viewBox="0 0 70 41" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(19.215686%,46.27451%,73.72549%);fill-opacity:1;" d="M 69.164063 20.390625 C 67.894531 17.402344 65.265625 14.875 61.863281 13.328125 C 60.296875 8.101563 55.90625 2.871094 49.359375 2.871094 C 49.152344 2.871094 48.941406 2.878906 48.726563 2.886719 C 46 0.945313 43.347656 0 40.644531 0 C 39.015625 0 37.351563 0.355469 35.6875 1.0625 C 34.449219 0.417969 33.035156 0.0859375 31.519531 0.0859375 C 28.167969 0.0859375 24.992188 1.621094 23.03125 3.417969 C 22.398438 3.269531 21.753906 3.199219 21.105469 3.199219 C 16.109375 3.199219 11.15625 7.292969 9.816406 12.257813 C 5.511719 13.808594 2.363281 16.625 0.886719 20.285156 C -0.546875 23.839844 -0.230469 27.8125 1.75 31.1875 C 3.722656 34.539063 7.164063 36.542969 10.96875 36.542969 C 12.425781 36.542969 13.832031 36.246094 15.113281 35.675781 C 17.425781 37.761719 20.398438 39.007813 23.214844 39.007813 C 24.195313 39.007813 25.136719 38.863281 26.023438 38.578125 C 28.304688 40.4375 31.796875 41.132813 34.632813 41.132813 C 37.980469 41.132813 40.886719 40.257813 42.816406 38.726563 C 44.066406 39.300781 45.441406 39.597656 46.875 39.597656 C 50.46875 39.597656 54.175781 37.699219 56.203125 35.0625 C 57.332031 35.523438 58.523438 35.761719 59.726563 35.761719 C 63.648438 35.757813 67.292969 33.21875 69.007813 29.289063 C 70.3125 26.292969 70.371094 23.21875 69.164063 20.390625 Z M 69.164063 20.390625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 19.730469 24 L 16.199219 24 C 15.757813 22.066406 14.019531 20.621094 11.941406 20.621094 C 9.53125 20.621094 7.570313 22.5625 7.570313 24.953125 C 7.570313 27.34375 9.53125 29.289063 11.941406 29.289063 C 14.007813 29.289063 15.738281 27.855469 16.191406 25.941406 L 19.734375 25.941406 C 20.179688 25.945313 20.546875 26.304688 20.546875 26.75 L 20.546875 38.652344 C 21.1875 38.820313 21.84375 38.929688 22.507813 38.976563 L 22.507813 26.75 C 22.507813 25.234375 21.261719 24 19.730469 24 Z M 11.941406 27.488281 C 10.53125 27.488281 9.382813 26.351563 9.382813 24.953125 C 9.382813 23.554688 10.53125 22.417969 11.941406 22.417969 C 13.351563 22.417969 14.496094 23.554688 14.496094 24.953125 C 14.496094 26.351563 13.351563 27.488281 11.941406 27.488281 Z M 33.808594 24.859375 L 33.808594 20.8125 C 33.808594 19.292969 32.5625 18.058594 31.035156 18.058594 L 24.828125 18.058594 C 24.378906 18.058594 24.015625 17.699219 24.015625 17.253906 L 24.015625 2.617188 C 23.671875 2.867188 23.34375 3.132813 23.03125 3.417969 C 22.707031 3.339844 22.382813 3.285156 22.050781 3.25 L 22.050781 17.253906 C 22.050781 18.769531 23.296875 20.003906 24.828125 20.003906 L 31.035156 20.003906 C 31.484375 20.007813 31.847656 20.367188 31.847656 20.8125 L 31.847656 24.859375 C 29.910156 25.300781 28.457031 27.023438 28.457031 29.078125 C 28.457031 31.46875 30.417969 33.414063 32.828125 33.414063 C 35.238281 33.414063 37.199219 31.46875 37.199219 29.078125 C 37.199219 27.023438 35.746094 25.300781 33.808594 24.859375 Z M 32.828125 31.613281 C 31.417969 31.613281 30.273438 30.476563 30.273438 29.078125 C 30.273438 27.679688 31.417969 26.542969 32.828125 26.542969 C 34.238281 26.542969 35.382813 27.679688 35.382813 29.078125 C 35.382813 30.476563 34.238281 31.613281 32.828125 31.613281 Z M 60.554688 20.816406 C 60.554688 18.429688 58.59375 16.484375 56.183594 16.484375 C 53.773438 16.484375 51.8125 18.429688 51.8125 20.816406 C 51.8125 22.867188 53.257813 24.582031 55.183594 25.035156 L 55.183594 25.835938 C 55.183594 26.28125 54.820313 26.640625 54.375 26.640625 L 46.515625 26.640625 L 46.515625 12.695313 C 46.515625 11.179688 45.269531 9.945313 43.738281 9.945313 L 39.480469 9.945313 C 39.039063 8.015625 37.300781 6.566406 35.222656 6.566406 C 32.8125 6.566406 30.851563 8.511719 30.851563 10.902344 C 30.851563 13.292969 32.8125 15.234375 35.222656 15.234375 C 37.289063 15.234375 39.019531 13.804688 39.472656 11.890625 L 43.742188 11.890625 C 44.1875 11.890625 44.554688 12.25 44.554688 12.695313 L 44.554688 39.320313 C 45.1875 39.472656 45.84375 39.5625 46.515625 39.585938 L 46.515625 28.585938 L 54.375 28.585938 C 55.902344 28.585938 57.148438 27.351563 57.148438 25.835938 L 57.148438 25.042969 C 59.09375 24.605469 60.554688 22.878906 60.554688 20.816406 Z M 35.222656 13.4375 C 33.8125 13.4375 32.664063 12.300781 32.664063 10.902344 C 32.664063 9.503906 33.8125 8.367188 35.222656 8.367188 C 36.632813 8.367188 37.777344 9.503906 37.777344 10.902344 C 37.777344 12.300781 36.632813 13.4375 35.222656 13.4375 Z M 56.183594 23.351563 C 54.773438 23.351563 53.628906 22.214844 53.628906 20.816406 C 53.628906 19.421875 54.773438 18.28125 56.183594 18.28125 C 57.59375 18.28125 58.738281 19.421875 58.738281 20.816406 C 58.738281 22.214844 57.59375 23.351563 56.183594 23.351563 Z M 56.183594 23.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(19.215686%,46.27451%,73.72549%);fill-opacity:1;" d="M 69.027344 20.320313 C 67.757813 17.347656 65.140625 14.828125 61.75 13.285156 C 60.1875 8.078125 55.816406 2.867188 49.292969 2.867188 C 49.085938 2.867188 48.875 2.871094 48.664063 2.882813 C 45.941406 0.949219 43.300781 0.00390625 40.609375 0.00390625 C 38.988281 0.00390625 37.328125 0.359375 35.667969 1.0625 C 34.4375 0.425781 33.027344 0.0898438 31.515625 0.0898438 C 28.179688 0.0898438 25.015625 1.621094 23.058594 3.410156 C 22.429688 3.265625 21.789063 3.191406 21.144531 3.195313 C 16.164063 3.195313 11.230469 7.273438 9.894531 12.21875 C 5.605469 13.761719 2.46875 16.570313 0.996094 20.21875 C -0.429688 23.757813 -0.117188 27.71875 1.859375 31.078125 C 3.820313 34.417969 7.253906 36.414063 11.039063 36.414063 C 12.492188 36.414063 13.894531 36.117188 15.171875 35.550781 C 17.472656 37.628906 20.4375 38.867188 23.242188 38.867188 C 24.21875 38.867188 25.15625 38.726563 26.042969 38.441406 C 28.3125 40.292969 31.796875 40.988281 34.621094 40.988281 C 37.953125 40.988281 40.851563 40.117188 42.773438 38.589844 C 44.015625 39.160156 45.386719 39.457031 46.816406 39.457031 L 46.820313 39.457031 C 50.394531 39.457031 54.089844 37.566406 56.109375 34.941406 C 57.234375 35.398438 58.421875 35.632813 59.621094 35.632813 C 63.527344 35.632813 67.160156 33.101563 68.867188 29.1875 C 70.171875 26.203125 70.226563 23.136719 69.027344 20.320313 Z M 69.027344 20.320313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 19.773438 23.917969 L 16.253906 23.917969 C 15.816406 21.996094 14.082031 20.550781 12.011719 20.550781 C 9.609375 20.550781 7.65625 22.488281 7.65625 24.871094 C 7.65625 27.25 9.609375 29.1875 12.011719 29.1875 C 14.070313 29.1875 15.792969 27.761719 16.246094 25.855469 L 19.773438 25.855469 C 20.222656 25.855469 20.582031 26.214844 20.585938 26.660156 L 20.585938 38.515625 C 21.222656 38.683594 21.878906 38.792969 22.539063 38.839844 L 22.539063 26.660156 C 22.539063 25.148438 21.296875 23.917969 19.773438 23.917969 Z M 12.011719 27.398438 C 10.605469 27.398438 9.464844 26.261719 9.464844 24.871094 C 9.464844 23.476563 10.605469 22.34375 12.011719 22.34375 C 13.414063 22.34375 14.558594 23.476563 14.558594 24.871094 C 14.558594 26.261719 13.414063 27.398438 12.011719 27.398438 Z M 33.796875 24.777344 L 33.796875 20.742188 C 33.796875 19.230469 32.558594 18 31.035156 18 L 24.851563 18 C 24.402344 18 24.039063 17.640625 24.039063 17.199219 L 24.039063 2.613281 C 23.699219 2.863281 23.371094 3.128906 23.058594 3.410156 C 22.738281 3.335938 22.414063 3.28125 22.085938 3.246094 L 22.085938 17.199219 C 22.085938 18.710938 23.324219 19.941406 24.851563 19.941406 L 31.035156 19.941406 C 31.480469 19.941406 31.84375 20.300781 31.84375 20.742188 L 31.84375 24.777344 C 29.914063 25.21875 28.46875 26.933594 28.46875 28.980469 C 28.46875 31.359375 30.421875 33.296875 32.820313 33.296875 C 35.222656 33.296875 37.175781 31.359375 37.175781 28.980469 C 37.175781 26.933594 35.730469 25.21875 33.796875 24.777344 Z M 32.820313 31.507813 C 31.417969 31.507813 30.273438 30.371094 30.273438 28.980469 C 30.273438 27.585938 31.417969 26.453125 32.820313 26.453125 C 34.226563 26.453125 35.367188 27.585938 35.367188 28.980469 C 35.367188 30.371094 34.226563 31.507813 32.820313 31.507813 Z M 60.445313 20.75 C 60.445313 18.367188 58.492188 16.433594 56.089844 16.433594 C 53.691406 16.433594 51.738281 18.367188 51.738281 20.75 C 51.738281 22.789063 53.175781 24.5 55.097656 24.949219 L 55.097656 25.75 C 55.097656 26.191406 54.734375 26.550781 54.289063 26.550781 L 46.457031 26.550781 L 46.457031 12.65625 C 46.457031 11.148438 45.21875 9.917969 43.691406 9.917969 L 39.449219 9.917969 C 39.011719 7.992188 37.277344 6.550781 35.207031 6.550781 C 32.804688 6.550781 30.851563 8.488281 30.851563 10.871094 C 30.851563 13.25 32.804688 15.1875 35.207031 15.1875 C 37.265625 15.1875 38.988281 13.761719 39.441406 11.855469 L 43.695313 11.855469 C 44.140625 11.855469 44.503906 12.214844 44.503906 12.65625 L 44.503906 39.183594 C 45.136719 39.335938 45.789063 39.425781 46.457031 39.449219 L 46.457031 28.488281 L 54.289063 28.488281 C 55.8125 28.488281 57.050781 27.261719 57.050781 25.75 L 57.050781 24.957031 C 58.992188 24.523438 60.445313 22.800781 60.445313 20.75 Z M 35.207031 13.394531 C 33.800781 13.394531 32.660156 12.261719 32.660156 10.871094 C 32.660156 9.476563 33.800781 8.34375 35.207031 8.34375 C 36.609375 8.34375 37.753906 9.476563 37.753906 10.871094 C 37.753906 12.261719 36.609375 13.394531 35.207031 13.394531 Z M 56.089844 23.273438 C 54.6875 23.273438 53.542969 22.140625 53.542969 20.75 C 53.542969 19.355469 54.6875 18.222656 56.089844 18.222656 C 57.496094 18.222656 58.636719 19.355469 58.636719 20.75 C 58.636719 22.140625 57.496094 23.273438 56.089844 23.273438 Z M 56.089844 23.273438 "/>
 </g>
 </svg>
diff --git a/dist/AIMachineLearning/AzureMachineLearningStudioWebService(m).png b/dist/AIMachineLearning/AzureMachineLearningStudioWebService(m).png
new file mode 100644
index 00000000..c49fb794
Binary files /dev/null and b/dist/AIMachineLearning/AzureMachineLearningStudioWebService(m).png differ
diff --git a/dist/AIMachineLearning/AzureMachineLearningStudioWebService(m).svg b/dist/AIMachineLearning/AzureMachineLearningStudioWebService(m).svg
new file mode 100644
index 00000000..6b715da6
--- /dev/null
+++ b/dist/AIMachineLearning/AzureMachineLearningStudioWebService(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 34.105469 39.859375 L 34.105469 28.195313 L 34.535156 28.195313 C 36.359375 28.195313 37.101563 26.910156 37.101563 24.304688 C 37.234375 23.332031 36.886719 22.351563 36.167969 21.679688 C 35.449219 21.003906 34.449219 20.722656 33.484375 20.921875 L 11.976563 20.921875 C 10.316406 20.878906 8.929688 22.179688 8.867188 23.839844 L 8.867188 25.238281 C 8.949219 26.941406 10.390625 28.261719 12.09375 28.195313 L 12.484375 28.195313 L 12.484375 39.859375 L 0 63.117188 L 4.316406 70 L 40.328125 70 L 45.421875 63.117188 Z M 19.445313 53.628906 L 14 62.726563 L 6.570313 62.726563 L 19.445313 39.859375 L 19.445313 28.195313 L 26.871094 28.195313 L 26.871094 39.859375 L 34.648438 53.628906 Z M 19.445313 53.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 19.40625 53.628906 L 14 62.726563 L 6.570313 62.726563 L 19.640625 39.859375 L 19.640625 28.234375 L 26.871094 28.234375 L 26.871094 39.859375 L 34.535156 53.628906 Z M 19.40625 53.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 45.734375 0 L 44.722656 0 C 34.808594 0.527344 26.011719 6.523438 21.894531 15.554688 L 21.234375 17.460938 L 25.121094 17.460938 L 25.785156 15.554688 L 31.382813 15.554688 L 31.109375 17.460938 L 35 17.460938 L 35 15.554688 L 42.777344 15.554688 L 42.777344 23.332031 L 40.445313 23.332031 C 40.480469 23.902344 40.480469 24.476563 40.445313 25.042969 C 40.449219 25.773438 40.386719 26.503906 40.25 27.222656 L 42.777344 27.222656 L 42.777344 35 L 38.890625 35 L 38.890625 38.890625 L 42.777344 38.890625 L 42.777344 46.667969 L 41.535156 46.667969 L 43.59375 50.554688 L 45.695313 50.554688 C 59.335938 50.175781 70.152344 38.925781 70 25.277344 C 69.992188 11.710938 59.289063 0.5625 45.734375 0 Z M 27.84375 11.667969 C 30.203125 8.285156 33.425781 5.597656 37.179688 3.890625 C 34.914063 6.03125 33.214844 8.703125 32.238281 11.667969 Z M 42.777344 11.667969 L 35.816406 11.667969 C 36.933594 8.046875 39.4375 5.015625 42.777344 3.226563 Z M 67.003906 23.332031 L 60.160156 23.332031 C 60.238281 20.695313 59.855469 18.0625 59.035156 15.554688 L 64.476563 15.554688 C 65.894531 17.925781 66.773438 20.582031 67.042969 23.332031 Z M 63.117188 11.667969 L 58.0625 11.667969 C 57.210938 8.839844 55.703125 6.257813 53.667969 4.121094 C 57.390625 5.800781 60.628906 8.394531 63.078125 11.667969 Z M 46.667969 3.226563 C 50.367188 4.699219 53.160156 7.824219 54.210938 11.667969 L 46.667969 11.667969 Z M 46.667969 15.554688 L 55.609375 15.554688 C 56.402344 18.074219 56.820313 20.695313 56.855469 23.332031 L 46.667969 23.332031 Z M 46.667969 27.222656 L 56.855469 27.222656 C 56.8125 29.859375 56.394531 32.480469 55.609375 35 L 46.667969 35 Z M 46.667969 46.667969 L 46.667969 38.890625 L 54.445313 38.890625 C 52.976563 42.40625 50.183594 45.199219 46.667969 46.667969 Z M 52.578125 46.667969 C 55.019531 44.503906 56.980469 41.855469 58.332031 38.890625 L 62.84375 38.890625 C 60.136719 42.308594 56.601563 44.984375 52.578125 46.667969 Z M 64.789063 35 L 59.035156 35 C 59.828125 32.480469 60.285156 29.863281 60.394531 27.222656 L 67.042969 27.222656 C 66.757813 29.925781 65.992188 32.558594 64.789063 35 Z M 64.789063 35 "/>
+</g>
+</svg>
diff --git a/dist/AIMachineLearning/AzureMachineLearningStudioWebService.png b/dist/AIMachineLearning/AzureMachineLearningStudioWebService.png
new file mode 100644
index 00000000..01cc0219
Binary files /dev/null and b/dist/AIMachineLearning/AzureMachineLearningStudioWebService.png differ
diff --git a/dist/AIMachineLearning/AzureMachineLearningStudioWebService.puml b/dist/AIMachineLearning/AzureMachineLearningStudioWebService.puml
new file mode 100644
index 00000000..ded6c38d
--- /dev/null
+++ b/dist/AIMachineLearning/AzureMachineLearningStudioWebService.puml
@@ -0,0 +1,13 @@
+sprite $AzureMachineLearningStudioWebService [70x70/16z] {
+hPU9TgmW44HxA_x_atDejKPE45jdwhqaAd2jNjoaAFD0QmrmKtadHpiBBe-bqVuh7XeYm_ah5L9NNuKEWafVkrCpH_R4Y6k7YEmKiVvNlMn7aHwG458IWssm
+0idP6PIUANd4qoXAaDZ-k92IGjzA6cfE97B5IB4a5p3dRFX8ePayXT-Ls5Mp5gQfhCscs4TxYdKLJrbOnLFKglkiFH1MLg8hDtQrRPixE3PisIh2bXjgbC8s
+OzLxwkwQM-RkCgDmiV9eIIF5periBoYqe0SltbAaqSAG64UR2tf1SOOqjFo5CAE0b3WTRWjfbgrlETNfdaAHOkjkhdefKx2QLARe9IQpg9OSez0Qk3Lv28Pj
+EXXwrIynrcWijkkcJshN_TA-e714QvJoTVISOjm9JdbEYVE58Myfl8mySJLA0DbFECJjd56aeD2vtr7i5nG8LSykP_fURvs_21eVwIaVADm4ApLzmaDrD3DG
+QCKs22wUy4evpOmKsz-oPX1bLkPcID7SI1PaRILbWvdXJLLY2Z6czYJG32cUimmPLSKApHWfbjC2F5gmmcfF6Yzaea-LHttCsFqtYS_Y-LGRWvamcUiuWwxC
+08XmkYXROO8X1R7X5cPk5RJoXHdzTorFP3KhuBcdGitAqFNFpO1LPeCyDsEZbNOflRVYozIcKBQIUo_CZ5N6YX8tlOz5QYjcq1x8V_9LzeCln9zyhHQ-d2iA
+MGhV98NIrqcX_W
+}
+
+AzureEntityColoring(AzureMachineLearningStudioWebService)
+!define AzureMachineLearningStudioWebService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMachineLearningStudioWebService, AzureMachineLearningStudioWebService)
+!define AzureMachineLearningStudioWebService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMachineLearningStudioWebService, AzureMachineLearningStudioWebService)
diff --git a/dist/AIMachineLearning/AzureMachineLearningStudioWebService.svg b/dist/AIMachineLearning/AzureMachineLearningStudioWebService.svg
new file mode 100644
index 00000000..3424d317
--- /dev/null
+++ b/dist/AIMachineLearning/AzureMachineLearningStudioWebService.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 34.105469 39.859375 L 34.105469 28.195313 L 34.535156 28.195313 C 36.359375 28.195313 37.101563 26.910156 37.101563 24.304688 C 37.234375 23.332031 36.886719 22.351563 36.167969 21.679688 C 35.449219 21.003906 34.449219 20.722656 33.484375 20.921875 L 11.976563 20.921875 C 10.316406 20.878906 8.929688 22.179688 8.867188 23.839844 L 8.867188 25.238281 C 8.949219 26.941406 10.390625 28.261719 12.09375 28.195313 L 12.484375 28.195313 L 12.484375 39.859375 L 0 63.117188 L 4.316406 70 L 40.328125 70 L 45.421875 63.117188 Z M 19.445313 53.628906 L 14 62.726563 L 6.570313 62.726563 L 19.445313 39.859375 L 19.445313 28.195313 L 26.871094 28.195313 L 26.871094 39.859375 L 34.648438 53.628906 Z M 19.445313 53.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 19.40625 53.628906 L 14 62.726563 L 6.570313 62.726563 L 19.640625 39.859375 L 19.640625 28.234375 L 26.871094 28.234375 L 26.871094 39.859375 L 34.535156 53.628906 Z M 19.40625 53.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 45.734375 0 L 44.722656 0 C 34.808594 0.527344 26.011719 6.523438 21.894531 15.554688 L 21.234375 17.460938 L 25.121094 17.460938 L 25.785156 15.554688 L 31.382813 15.554688 L 31.109375 17.460938 L 35 17.460938 L 35 15.554688 L 42.777344 15.554688 L 42.777344 23.332031 L 40.445313 23.332031 C 40.480469 23.902344 40.480469 24.476563 40.445313 25.042969 C 40.449219 25.773438 40.386719 26.503906 40.25 27.222656 L 42.777344 27.222656 L 42.777344 35 L 38.890625 35 L 38.890625 38.890625 L 42.777344 38.890625 L 42.777344 46.667969 L 41.535156 46.667969 L 43.59375 50.554688 L 45.695313 50.554688 C 59.335938 50.175781 70.152344 38.925781 70 25.277344 C 69.992188 11.710938 59.289063 0.5625 45.734375 0 Z M 27.84375 11.667969 C 30.203125 8.285156 33.425781 5.597656 37.179688 3.890625 C 34.914063 6.03125 33.214844 8.703125 32.238281 11.667969 Z M 42.777344 11.667969 L 35.816406 11.667969 C 36.933594 8.046875 39.4375 5.015625 42.777344 3.226563 Z M 67.003906 23.332031 L 60.160156 23.332031 C 60.238281 20.695313 59.855469 18.0625 59.035156 15.554688 L 64.476563 15.554688 C 65.894531 17.925781 66.773438 20.582031 67.042969 23.332031 Z M 63.117188 11.667969 L 58.0625 11.667969 C 57.210938 8.839844 55.703125 6.257813 53.667969 4.121094 C 57.390625 5.800781 60.628906 8.394531 63.078125 11.667969 Z M 46.667969 3.226563 C 50.367188 4.699219 53.160156 7.824219 54.210938 11.667969 L 46.667969 11.667969 Z M 46.667969 15.554688 L 55.609375 15.554688 C 56.402344 18.074219 56.820313 20.695313 56.855469 23.332031 L 46.667969 23.332031 Z M 46.667969 27.222656 L 56.855469 27.222656 C 56.8125 29.859375 56.394531 32.480469 55.609375 35 L 46.667969 35 Z M 46.667969 46.667969 L 46.667969 38.890625 L 54.445313 38.890625 C 52.976563 42.40625 50.183594 45.199219 46.667969 46.667969 Z M 52.578125 46.667969 C 55.019531 44.503906 56.980469 41.855469 58.332031 38.890625 L 62.84375 38.890625 C 60.136719 42.308594 56.601563 44.984375 52.578125 46.667969 Z M 64.789063 35 L 59.035156 35 C 59.828125 32.480469 60.285156 29.863281 60.394531 27.222656 L 67.042969 27.222656 C 66.757813 29.925781 65.992188 32.558594 64.789063 35 Z M 64.789063 35 "/>
+</g>
+</svg>
diff --git a/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan(m).png b/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan(m).png
new file mode 100644
index 00000000..59cdaff6
Binary files /dev/null and b/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan(m).png differ
diff --git a/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan(m).svg b/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan(m).svg
new file mode 100644
index 00000000..75f87a16
--- /dev/null
+++ b/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan(m).svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 11.472656 16.351563 L 12.160156 15.664063 L 16.226563 19.734375 L 15.542969 20.425781 Z M 58.527344 37.839844 L 65.023438 37.839844 L 65.023438 39.003906 L 58.527344 39.003906 Z M 58.742188 27.390625 L 63.796875 25.59375 L 64.109375 26.472656 L 59.054688 28.269531 Z M 45.273438 12.765625 L 46.867188 7.320313 L 47.800781 7.589844 L 46.207031 13.039063 Z M 21.039063 9.09375 L 21.820313 8.660156 L 24.09375 12.78125 L 23.308594 13.210938 Z M 33.132813 5.832031 L 34.300781 5.832031 L 34.300781 12.328125 L 33.132813 12.328125 Z M 33.132813 5.832031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 11.472656 16.351563 L 12.160156 15.664063 L 16.226563 19.734375 L 15.542969 20.425781 Z M 58.527344 37.839844 L 65.023438 37.839844 L 65.023438 39.003906 L 58.527344 39.003906 Z M 58.742188 27.390625 L 63.796875 25.59375 L 64.109375 26.472656 L 59.054688 28.269531 Z M 45.273438 12.765625 L 46.867188 7.320313 L 47.800781 7.589844 L 46.207031 13.039063 Z M 21.039063 9.09375 L 21.820313 8.660156 L 24.09375 12.78125 L 23.308594 13.210938 Z M 41.765625 28 C 40.054688 30.023438 39.277344 30.214844 35.351563 34.765625 C 37.5625 35.746094 39.363281 37.464844 40.445313 39.628906 C 43.515625 36.050781 44.917969 35.078125 46.9375 32.707031 L 58.605469 13.921875 Z M 32.433594 41.261719 L 35.390625 46.160156 C 36.925781 45.339844 37.882813 43.742188 37.878906 42 C 37.808594 40.632813 37.191406 39.351563 36.167969 38.445313 C 35.144531 37.539063 33.796875 37.082031 32.433594 37.179688 Z M 32.433594 41.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 59.460938 10.035156 C 52.851563 3.597656 43.992188 0 34.765625 0 C 15.597656 0 0.0429688 15.519531 0 34.6875 L 0 39.628906 C 0.5 43.160156 3.1875 45.988281 6.6875 46.667969 L 8.554688 43.359375 C 7.152344 43.558594 5.734375 43.121094 4.6875 42.167969 C 3.640625 41.210938 3.078125 39.835938 3.148438 38.421875 L 3.148438 32.199219 C 3.148438 32.199219 3.929688 28.621094 4.277344 27.339844 C 7.398438 12.90625 20.234375 2.652344 35 2.800781 C 52.554688 2.671875 66.894531 16.785156 67.042969 34.339844 L 67.042969 38.460938 C 67.042969 43.476563 63.738281 43.515625 60.472656 43.515625 L 40.5625 43.515625 C 40.132813 46.667969 38.890625 46.667969 38.890625 46.667969 L 62.496094 46.667969 C 64.480469 46.972656 66.496094 46.351563 67.960938 44.976563 C 69.425781 43.601563 70.179688 41.628906 70 39.628906 L 70 34.339844 C 69.945313 25.140625 66.140625 16.359375 59.460938 10.035156 Z M 59.460938 10.035156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 31.109375 42.777344 L 31.109375 32.277344 L 31.5 32.277344 C 33.132813 32.199219 33.832031 31.109375 33.832031 28.777344 C 33.96875 27.890625 33.660156 26.996094 33.007813 26.382813 C 32.355469 25.769531 31.441406 25.515625 30.566406 25.707031 L 11.121094 25.707031 C 10.359375 25.683594 9.621094 25.980469 9.089844 26.527344 C 8.554688 27.074219 8.277344 27.820313 8.320313 28.582031 L 8.320313 29.59375 C 8.355469 30.398438 8.734375 31.148438 9.359375 31.65625 C 9.984375 32.160156 10.796875 32.375 11.589844 32.238281 L 11.589844 42.777344 L 0.3125 63.777344 L 4.199219 70 L 36.710938 70 L 41.300781 63.777344 Z M 17.851563 55.222656 L 12.949219 63.429688 L 6.261719 63.429688 L 17.929688 42.777344 L 17.929688 32.277344 L 24.578125 32.277344 L 24.578125 42.777344 L 31.5 55.222656 Z M 17.851563 55.222656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(205,233,255);fill-opacity:1;" d="M 17.851563 55.222656 L 12.949219 63.429688 L 6.261719 63.429688 L 18.042969 42.777344 L 18.042969 32.277344 L 24.578125 32.277344 L 24.578125 42.777344 L 31.5 55.222656 Z M 17.851563 55.222656 "/>
+</g>
+</svg>
diff --git a/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan.png b/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan.png
new file mode 100644
index 00000000..de9f2e14
Binary files /dev/null and b/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan.png differ
diff --git a/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan.puml b/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan.puml
new file mode 100644
index 00000000..d84c5909
--- /dev/null
+++ b/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan.puml
@@ -0,0 +1,13 @@
+sprite $AzureMachineLearningStudioWebServicePlan [70x70/16z] {
+dPO9ieCm34Ezwlv7_gMW-HX8O_9cwSghefXCPOoQHoO-P8QRodiiS2DiMP4VLaIMnnMkv-L5xbPxuQ2XuDdqnE_lwVwv_WvoTuHBnV71Pa5SP6o9BKy221cH
+0FARUsGnC39oA66GZ84bjciPHmSIBbSniC3uB9urnPxnOA5zh64I0Y6gvtcHdvge4b6P4zUAZSM-G2Kl6yu1U468A02hwza2QJz8sh448NOuewrH97y-v21P
+KrTZu1S1FZC-xMhYVokSOKhLBbCOlOHXb2xA-QnXWkeMYijK7DlqQk0C6xUIkESz71jsyUPaGQgtkurVhqlYWXpFQEcrlkC9tzJ6Uy4m84klvn8JwVkLmLe2
+8xX-q4gCTgG3sR5GmcfhCRoV70EoIk9vbcbFF6DxQY8ZYzO_2lRbo1PQ9IvNM8RM_dJdCKd8kYL_IiHx5Y-IHGkdDcNPeiv5fQnR34ZbSLrGBhDbsRzXSiE-
+g0IGW4yjCJk77SYf1RCpL5d-m28vioI0lPimvGn6iRZmP_GHso_dnUmSUc2y-vp7yv3aVZjjhYHv-sNyF7_uxrSzQvGQHZaSZwJLaZPC_mc6wMD7k3CCqwL6
+8OuDMuko7YPBjOjXlEpoQXZkyXLx4yPlrPRHouKeTYRwOU8SnL5fXocxZ2Ui6wMC_VimUZvM3C_egu73W6n5SLOxGfUZzCCOex3QfJ2E9ZfVqHoVjpidvqFN
+GAPWZiaKmuoG2Ny
+}
+
+AzureEntityColoring(AzureMachineLearningStudioWebServicePlan)
+!define AzureMachineLearningStudioWebServicePlan(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMachineLearningStudioWebServicePlan, AzureMachineLearningStudioWebServicePlan)
+!define AzureMachineLearningStudioWebServicePlan(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMachineLearningStudioWebServicePlan, AzureMachineLearningStudioWebServicePlan)
diff --git a/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan.svg b/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan.svg
new file mode 100644
index 00000000..9c39ed11
--- /dev/null
+++ b/dist/AIMachineLearning/AzureMachineLearningStudioWebServicePlan.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 11.472656 16.351563 L 12.160156 15.664063 L 16.226563 19.734375 L 15.542969 20.425781 Z M 58.527344 37.839844 L 65.023438 37.839844 L 65.023438 39.003906 L 58.527344 39.003906 Z M 58.742188 27.390625 L 63.796875 25.59375 L 64.109375 26.472656 L 59.054688 28.269531 Z M 45.273438 12.765625 L 46.867188 7.320313 L 47.800781 7.589844 L 46.207031 13.039063 Z M 21.039063 9.09375 L 21.820313 8.660156 L 24.09375 12.78125 L 23.308594 13.210938 Z M 33.132813 5.832031 L 34.300781 5.832031 L 34.300781 12.328125 L 33.132813 12.328125 Z M 33.132813 5.832031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 11.472656 16.351563 L 12.160156 15.664063 L 16.226563 19.734375 L 15.542969 20.425781 Z M 58.527344 37.839844 L 65.023438 37.839844 L 65.023438 39.003906 L 58.527344 39.003906 Z M 58.742188 27.390625 L 63.796875 25.59375 L 64.109375 26.472656 L 59.054688 28.269531 Z M 45.273438 12.765625 L 46.867188 7.320313 L 47.800781 7.589844 L 46.207031 13.039063 Z M 21.039063 9.09375 L 21.820313 8.660156 L 24.09375 12.78125 L 23.308594 13.210938 Z M 41.765625 28 C 40.054688 30.023438 39.277344 30.214844 35.351563 34.765625 C 37.5625 35.746094 39.363281 37.464844 40.445313 39.628906 C 43.515625 36.050781 44.917969 35.078125 46.9375 32.707031 L 58.605469 13.921875 Z M 32.433594 41.261719 L 35.390625 46.160156 C 36.925781 45.339844 37.882813 43.742188 37.878906 42 C 37.808594 40.632813 37.191406 39.351563 36.167969 38.445313 C 35.144531 37.539063 33.796875 37.082031 32.433594 37.179688 Z M 32.433594 41.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 59.460938 10.035156 C 52.851563 3.597656 43.992188 0 34.765625 0 C 15.597656 0 0.0429688 15.519531 0 34.6875 L 0 39.628906 C 0.5 43.160156 3.1875 45.988281 6.6875 46.667969 L 8.554688 43.359375 C 7.152344 43.558594 5.734375 43.121094 4.6875 42.167969 C 3.640625 41.210938 3.078125 39.835938 3.148438 38.421875 L 3.148438 32.199219 C 3.148438 32.199219 3.929688 28.621094 4.277344 27.339844 C 7.398438 12.90625 20.234375 2.652344 35 2.800781 C 52.554688 2.671875 66.894531 16.785156 67.042969 34.339844 L 67.042969 38.460938 C 67.042969 43.476563 63.738281 43.515625 60.472656 43.515625 L 40.5625 43.515625 C 40.132813 46.667969 38.890625 46.667969 38.890625 46.667969 L 62.496094 46.667969 C 64.480469 46.972656 66.496094 46.351563 67.960938 44.976563 C 69.425781 43.601563 70.179688 41.628906 70 39.628906 L 70 34.339844 C 69.945313 25.140625 66.140625 16.359375 59.460938 10.035156 Z M 59.460938 10.035156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 31.109375 42.777344 L 31.109375 32.277344 L 31.5 32.277344 C 33.132813 32.199219 33.832031 31.109375 33.832031 28.777344 C 33.96875 27.890625 33.660156 26.996094 33.007813 26.382813 C 32.355469 25.769531 31.441406 25.515625 30.566406 25.707031 L 11.121094 25.707031 C 10.359375 25.683594 9.621094 25.980469 9.089844 26.527344 C 8.554688 27.074219 8.277344 27.820313 8.320313 28.582031 L 8.320313 29.59375 C 8.355469 30.398438 8.734375 31.148438 9.359375 31.65625 C 9.984375 32.160156 10.796875 32.375 11.589844 32.238281 L 11.589844 42.777344 L 0.3125 63.777344 L 4.199219 70 L 36.710938 70 L 41.300781 63.777344 Z M 17.851563 55.222656 L 12.949219 63.429688 L 6.261719 63.429688 L 17.929688 42.777344 L 17.929688 32.277344 L 24.578125 32.277344 L 24.578125 42.777344 L 31.5 55.222656 Z M 17.851563 55.222656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(83.529412%,92.54902%,96.470588%);fill-opacity:1;" d="M 17.851563 55.222656 L 12.949219 63.429688 L 6.261719 63.429688 L 18.042969 42.777344 L 18.042969 32.277344 L 24.578125 32.277344 L 24.578125 42.777344 L 31.5 55.222656 Z M 17.851563 55.222656 "/>
+</g>
+</svg>
diff --git a/dist/AIMachineLearning/MicrosoftGenomics(m).png b/dist/AIMachineLearning/MicrosoftGenomics(m).png
index e24d5530..460f1836 100644
Binary files a/dist/AIMachineLearning/MicrosoftGenomics(m).png and b/dist/AIMachineLearning/MicrosoftGenomics(m).png differ
diff --git a/dist/AIMachineLearning/MicrosoftGenomics(m).svg b/dist/AIMachineLearning/MicrosoftGenomics(m).svg
index dc692206..24ad0398 100644
--- a/dist/AIMachineLearning/MicrosoftGenomics(m).svg
+++ b/dist/AIMachineLearning/MicrosoftGenomics(m).svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="36pt" height="70pt" viewBox="0 0 36 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 13.929688 45.089844 C 13.648438 44.910156 13.414063 44.789063 13.210938 44.625 C 11.542969 43.304688 9.789063 42.078125 8.242188 40.625 C 5.894531 38.167969 5.3125 34.5 6.792969 31.433594 C 7.796875 29.792969 9.109375 28.363281 10.65625 27.222656 C 14.050781 24.636719 17.703125 22.414063 21.558594 20.59375 C 24.160156 19.410156 26.617188 17.925781 28.875 16.167969 C 32.410156 13.304688 34.839844 9.289063 35.746094 4.816406 C 35.835938 4.339844 35.898438 3.859375 35.9375 3.375 C 36.085938 2.316406 35.65625 1.261719 34.816406 0.613281 C 33.972656 -0.0390625 32.847656 -0.179688 31.871094 0.234375 C 30.890625 0.652344 30.214844 1.566406 30.09375 2.625 C 29.269531 7.691406 26.25 11.160156 22.007813 13.671875 C 19.992188 14.871094 17.84375 15.84375 15.777344 16.953125 C 11.992188 18.863281 8.476563 21.277344 5.328125 24.125 C 3.335938 26.023438 1.457031 28.019531 0.683594 30.78125 C -0.960938 35.789063 0.414063 41.296875 4.214844 44.933594 C 5.277344 46.023438 6.46875 46.988281 7.628906 47.976563 C 7.835938 48.152344 8.113281 48.21875 8.375 48.160156 C 10.210938 47.183594 12.019531 46.15625 13.929688 45.089844 Z M 21.925781 55.742188 C 22.566406 56.148438 23.148438 56.523438 23.738281 56.890625 C 27.046875 58.796875 29.289063 62.140625 29.804688 65.941406 C 29.878906 66.445313 29.910156 66.957031 29.988281 67.457031 C 30.1875 69.03125 31.597656 70.160156 33.167969 70.003906 C 34.695313 69.886719 35.859375 68.578125 35.804688 67.039063 C 35.785156 63.0625 34.363281 59.21875 31.796875 56.1875 C 30.722656 55.042969 29.578125 53.957031 28.375 52.945313 C 28.167969 52.773438 27.890625 52.710938 27.628906 52.777344 C 25.75 53.726563 23.894531 54.710938 21.925781 55.742188 Z M 21.925781 55.742188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 6.683594 6.273438 C 7.121094 7.644531 7.804688 8.921875 8.703125 10.042969 L 21.402344 10.042969 C 20.722656 10.558594 20.011719 11.035156 19.277344 11.46875 C 18.871094 11.710938 18.453125 11.933594 18.039063 12.167969 L 10.851563 12.167969 C 11.292969 12.519531 11.753906 12.847656 12.234375 13.148438 C 12.820313 13.515625 13.40625 13.890625 14.042969 14.292969 C 12.070313 15.324219 10.21875 16.3125 8.339844 17.253906 C 8.078125 17.320313 7.804688 17.257813 7.59375 17.085938 C 6.390625 16.070313 5.25 14.988281 4.171875 13.839844 C 1.605469 10.8125 0.1875 6.96875 0.167969 2.992188 C 0.113281 1.453125 1.273438 0.148438 2.800781 0.0273438 C 4.371094 -0.125 5.78125 1 5.980469 2.574219 C 6.058594 3.078125 6.097656 3.585938 6.164063 4.089844 C 6.164063 4.113281 6.171875 4.128906 6.175781 4.148438 L 26.214844 4.148438 L 26.214844 4.214844 C 25.886719 4.933594 25.496094 5.621094 25.050781 6.273438 Z M 0.226563 65.210938 C 1.132813 60.742188 3.566406 56.726563 7.101563 53.863281 C 9.359375 52.101563 11.8125 50.617188 14.417969 49.4375 C 18.273438 47.617188 21.925781 45.394531 25.316406 42.804688 C 25.695313 42.496094 26.066406 42.179688 26.433594 41.855469 L 13.855469 41.855469 C 13.410156 41.492188 12.976563 41.113281 12.554688 40.71875 C 12.242188 40.421875 11.960938 40.089844 11.714844 39.734375 L 28.4375 39.734375 C 28.710938 39.375 28.957031 38.996094 29.175781 38.597656 C 29.605469 37.761719 29.867188 36.84375 29.9375 35.90625 L 10.339844 35.90625 C 10.265625 35.199219 10.277344 34.488281 10.378906 33.785156 L 29.886719 33.785156 C 29.6875 32.429688 29.144531 31.152344 28.308594 30.074219 L 12.089844 30.074219 C 12.734375 29.304688 13.441406 28.59375 14.210938 27.953125 L 26 27.953125 C 24.929688 27.09375 23.835938 26.257813 22.757813 25.40625 C 22.554688 25.246094 22.324219 25.121094 22.039063 24.9375 C 23.953125 23.871094 25.757813 22.847656 27.59375 21.867188 C 27.855469 21.808594 28.132813 21.875 28.339844 22.046875 C 29.5 23.039063 30.691406 24.003906 31.757813 25.089844 C 35.558594 28.726563 36.9375 34.234375 35.296875 39.242188 C 34.519531 42.003906 32.640625 44 30.652344 45.898438 C 27.503906 48.75 23.988281 51.160156 20.203125 53.070313 C 18.132813 54.183594 15.988281 55.15625 13.972656 56.351563 C 13.082031 56.882813 12.230469 57.472656 11.421875 58.125 L 19.914063 58.125 L 20.050781 58.210938 C 20.980469 58.792969 21.84375 59.472656 22.625 60.246094 L 9.21875 60.246094 C 8.226563 61.382813 7.417969 62.671875 6.832031 64.066406 L 25.214844 64.066406 C 25.507813 64.75 25.734375 65.460938 25.898438 66.1875 L 6.15625 66.1875 C 6.054688 66.585938 5.949219 66.980469 5.882813 67.40625 C 5.761719 68.464844 5.082031 69.375 4.105469 69.789063 C 3.128906 70.207031 2.003906 70.0625 1.164063 69.414063 C 0.320313 68.765625 -0.109375 67.710938 0.0390625 66.65625 C 0.0742188 66.171875 0.140625 65.691406 0.226563 65.210938 Z M 0.226563 65.210938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 30.945313 45.074219 C 30.664063 44.894531 30.429688 44.773438 30.222656 44.609375 C 28.550781 43.285156 26.785156 42.0625 25.234375 40.609375 C 22.871094 38.152344 22.289063 34.484375 23.777344 31.414063 C 24.785156 29.777344 26.105469 28.347656 27.65625 27.207031 C 31.066406 24.621094 34.738281 22.398438 38.609375 20.578125 C 41.222656 19.394531 43.691406 17.910156 45.957031 16.152344 C 49.511719 13.289063 51.953125 9.273438 52.863281 4.800781 C 52.953125 4.324219 53.015625 3.839844 53.054688 3.355469 C 53.207031 2.300781 52.773438 1.246094 51.929688 0.59375 C 51.082031 -0.0546875 49.949219 -0.199219 48.96875 0.21875 C 47.988281 0.636719 47.304688 1.550781 47.183594 2.609375 C 46.355469 7.675781 43.320313 11.144531 39.0625 13.65625 C 37.035156 14.851563 34.878906 15.824219 32.804688 16.9375 C 28.996094 18.847656 25.464844 21.257813 22.304688 24.109375 C 20.300781 26.007813 18.414063 28.003906 17.636719 30.765625 C 15.988281 35.773438 17.367188 41.28125 21.183594 44.917969 C 22.253906 46.007813 23.449219 46.96875 24.617188 47.960938 C 24.824219 48.132813 25.101563 48.199219 25.367188 48.140625 C 27.210938 47.167969 29.027344 46.140625 30.945313 45.074219 Z M 38.980469 55.726563 C 39.621094 56.128906 40.207031 56.503906 40.800781 56.875 C 44.125 58.78125 46.378906 62.125 46.894531 65.925781 C 46.96875 66.429688 47 66.941406 47.078125 67.441406 C 47.28125 69.015625 48.695313 70.140625 50.273438 69.988281 C 51.808594 69.867188 52.976563 68.5625 52.921875 67.023438 C 52.902344 63.042969 51.476563 59.203125 48.894531 56.171875 C 47.816406 55.023438 46.667969 53.941406 45.460938 52.929688 C 45.25 52.757813 44.972656 52.695313 44.710938 52.757813 C 42.824219 53.707031 40.957031 54.695313 38.980469 55.726563 Z M 38.980469 55.726563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 23.664063 6.257813 C 24.105469 7.628906 24.792969 8.90625 25.695313 10.027344 L 38.453125 10.027344 C 37.769531 10.542969 37.054688 11.019531 36.316406 11.453125 C 35.910156 11.695313 35.492188 11.917969 35.074219 12.152344 L 27.851563 12.152344 C 28.296875 12.503906 28.761719 12.828125 29.242188 13.128906 C 29.832031 13.5 30.417969 13.875 31.0625 14.277344 C 29.078125 15.308594 27.21875 16.292969 25.332031 17.238281 C 25.066406 17.300781 24.789063 17.238281 24.582031 17.066406 C 23.375 16.054688 22.226563 14.972656 21.144531 13.824219 C 18.566406 10.792969 17.140625 6.953125 17.117188 2.972656 C 17.066406 1.4375 18.234375 0.132813 19.765625 0.0117188 C 21.34375 -0.140625 22.757813 0.984375 22.960938 2.558594 C 23.039063 3.0625 23.078125 3.570313 23.144531 4.074219 C 23.144531 4.09375 23.152344 4.113281 23.15625 4.132813 L 43.285156 4.132813 L 43.285156 4.199219 C 42.957031 4.917969 42.566406 5.605469 42.121094 6.257813 Z M 17.179688 65.195313 C 18.089844 60.722656 20.53125 56.710938 24.085938 53.84375 C 26.355469 52.085938 28.820313 50.601563 31.4375 49.421875 C 35.308594 47.597656 38.976563 45.378906 42.386719 42.789063 C 42.765625 42.476563 43.140625 42.164063 43.507813 41.839844 L 30.871094 41.839844 C 30.421875 41.472656 29.988281 41.09375 29.566406 40.703125 C 29.25 40.402344 28.96875 40.074219 28.71875 39.71875 L 45.519531 39.71875 C 45.796875 39.359375 46.042969 38.976563 46.261719 38.582031 C 46.695313 37.742188 46.957031 36.828125 47.027344 35.890625 L 27.339844 35.890625 C 27.261719 35.183594 27.277344 34.46875 27.378906 33.769531 L 46.976563 33.769531 C 46.777344 32.414063 46.230469 31.136719 45.390625 30.058594 L 29.097656 30.058594 C 29.742188 29.289063 30.457031 28.578125 31.230469 27.9375 L 43.070313 27.9375 C 41.996094 27.074219 40.894531 26.242188 39.816406 25.390625 C 39.613281 25.226563 39.378906 25.105469 39.09375 24.921875 C 41.015625 23.855469 42.828125 22.832031 44.671875 21.851563 C 44.9375 21.792969 45.214844 21.859375 45.421875 22.03125 C 46.589844 23.023438 47.785156 23.984375 48.855469 25.074219 C 52.675781 28.707031 54.058594 34.214844 52.414063 39.222656 C 51.632813 41.984375 49.746094 43.984375 47.746094 45.882813 C 44.582031 48.730469 41.050781 51.144531 37.246094 53.054688 C 35.171875 54.167969 33.015625 55.140625 30.988281 56.335938 C 30.09375 56.863281 29.238281 57.457031 28.429688 58.109375 L 36.957031 58.109375 L 37.09375 58.195313 C 38.027344 58.773438 38.894531 59.457031 39.679688 60.230469 L 26.210938 60.230469 C 25.214844 61.367188 24.40625 62.65625 23.816406 64.050781 L 42.285156 64.050781 C 42.574219 64.734375 42.804688 65.445313 42.96875 66.167969 L 23.136719 66.167969 C 23.035156 66.570313 22.929688 66.964844 22.859375 67.386719 C 22.738281 68.445313 22.054688 69.359375 21.074219 69.773438 C 20.09375 70.1875 18.964844 70.046875 18.121094 69.398438 C 17.273438 68.75 16.84375 67.695313 16.988281 66.640625 C 17.027344 66.15625 17.09375 65.671875 17.179688 65.195313 Z M 17.179688 65.195313 "/>
 </g>
 </svg>
diff --git a/dist/AIMachineLearning/MicrosoftGenomics.png b/dist/AIMachineLearning/MicrosoftGenomics.png
index 5f1d8ac4..4c35fbfa 100644
Binary files a/dist/AIMachineLearning/MicrosoftGenomics.png and b/dist/AIMachineLearning/MicrosoftGenomics.png differ
diff --git a/dist/AIMachineLearning/MicrosoftGenomics.puml b/dist/AIMachineLearning/MicrosoftGenomics.puml
index 9cf065ab..dc8eb90a 100644
--- a/dist/AIMachineLearning/MicrosoftGenomics.puml
+++ b/dist/AIMachineLearning/MicrosoftGenomics.puml
@@ -1,9 +1,9 @@
-sprite $MicrosoftGenomics [36x70/16z] {
-bPM7Ri0W34Jn_Fy_xY1MSgSS7QyRdh0DihkYEzQHlUlTFqYnTwk_EJbxjtvsUfEzLS6NujTcjc9ol3R3U-Cldb1cytC99iQatYaKwvwjc62gyCqJ54iBL7Bk
-ad5KcixiiCtaCZZanea7B844R-iD2ajbbr6ee8G67ejCgc2KBO4blQd2mKXzI4a3SPq84c_3Eqb9VApd3WgKmal32kkj-3ixKlXauyNGbvOGta2n0dgmstVG
-cLe61PanEMd7k9B98Z5VVVjPsAQw2w7Fia_yppd7AdeeXcTKIeLdb2xiteFdhLRK_Unb9obWm-GKw-8n8ll4-C_4Yb31nWcAmsSxTsUomhC5Gx_BCEmzg8ZH
-4mhH4qeRFnyI_vXGC3sJ5J1WUgOSOkKqMr8e3YiigR6UN63r48DXdGRd8Wxh1P4ICGXdewkBXN_7fTyOeYtZefa95bWIOa-VLX-8ErXEKV5Y3r5qrW6OBQcD
-AJhiF0udMArF
+sprite $MicrosoftGenomics [70x70/16z] {
+lLS5bhCn40ePkV-DVraZtNdp9THuKYT0Z8u2o_JH0f61iSNClA11_iVOmY-_P_aVS-mG-H-u_7GUQice-F_RB6DqcXl4LsZxNFX55D2GZpsojmv-TXPlz1_H
+qDwIjS7RE44M1DRSnn3444ObkrIg_NHEplBcE0MT57qnZe6y7HYnyAeq0N9eIfXDp8ydy4nAKu72mTaHuMNHw9X9nFr27kT0vT1XDLH4uZuttC5mUPhgMZLz
+jeDcw4QbSGeXNAAXU6zMZpJ5Hc-tSC5FIv97yxqEY5lmO3_SF9SwJmtPPMRZmSvm6Wn7i-mmty6Yjo0zNRa5XR0Cv8volWM2gbqFbwetD26TKRDv7zhfRx-g
+kr2bcffXybrD6gSGXOGqzGBGMmE2D-ACP58YPZ5JPaVHfBiXX0uaSFXuGWV2qpeGF1xgGFI7EqcCqaGQa8CpBjCmrBeTGmxMlZ1NWIvECU4h3PIppbUiQboG
+udtB4gG8_vBL-yXEBLbDXT50Qa7jDQIr8BSAVggqe5ufpXn5kmoKpe3BGUhy_GK
 }
 
 AzureEntityColoring(MicrosoftGenomics)
diff --git a/dist/AIMachineLearning/MicrosoftGenomics.svg b/dist/AIMachineLearning/MicrosoftGenomics.svg
index f4742f0e..62f3b567 100644
--- a/dist/AIMachineLearning/MicrosoftGenomics.svg
+++ b/dist/AIMachineLearning/MicrosoftGenomics.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="36pt" height="70pt" viewBox="0 0 36 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 13.929688 45.089844 C 13.648438 44.910156 13.414063 44.789063 13.210938 44.625 C 11.542969 43.304688 9.789063 42.078125 8.242188 40.625 C 5.894531 38.167969 5.3125 34.5 6.792969 31.433594 C 7.796875 29.792969 9.109375 28.363281 10.65625 27.222656 C 14.050781 24.636719 17.703125 22.414063 21.558594 20.59375 C 24.160156 19.410156 26.617188 17.925781 28.875 16.167969 C 32.410156 13.304688 34.839844 9.289063 35.746094 4.816406 C 35.835938 4.339844 35.898438 3.859375 35.9375 3.375 C 36.085938 2.316406 35.65625 1.261719 34.816406 0.613281 C 33.972656 -0.0390625 32.847656 -0.179688 31.871094 0.234375 C 30.890625 0.652344 30.214844 1.566406 30.09375 2.625 C 29.269531 7.691406 26.25 11.160156 22.007813 13.671875 C 19.992188 14.871094 17.84375 15.84375 15.777344 16.953125 C 11.992188 18.863281 8.476563 21.277344 5.328125 24.125 C 3.335938 26.023438 1.457031 28.019531 0.683594 30.78125 C -0.960938 35.789063 0.414063 41.296875 4.214844 44.933594 C 5.277344 46.023438 6.46875 46.988281 7.628906 47.976563 C 7.835938 48.152344 8.113281 48.21875 8.375 48.160156 C 10.210938 47.183594 12.019531 46.15625 13.929688 45.089844 Z M 21.925781 55.742188 C 22.566406 56.148438 23.148438 56.523438 23.738281 56.890625 C 27.046875 58.796875 29.289063 62.140625 29.804688 65.941406 C 29.878906 66.445313 29.910156 66.957031 29.988281 67.457031 C 30.1875 69.03125 31.597656 70.160156 33.167969 70.003906 C 34.695313 69.886719 35.859375 68.578125 35.804688 67.039063 C 35.785156 63.0625 34.363281 59.21875 31.796875 56.1875 C 30.722656 55.042969 29.578125 53.957031 28.375 52.945313 C 28.167969 52.773438 27.890625 52.710938 27.628906 52.777344 C 25.75 53.726563 23.894531 54.710938 21.925781 55.742188 Z M 21.925781 55.742188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 6.683594 6.273438 C 7.121094 7.644531 7.804688 8.921875 8.703125 10.042969 L 21.402344 10.042969 C 20.722656 10.558594 20.011719 11.035156 19.277344 11.46875 C 18.871094 11.710938 18.453125 11.933594 18.039063 12.167969 L 10.851563 12.167969 C 11.292969 12.519531 11.753906 12.847656 12.234375 13.148438 C 12.820313 13.515625 13.40625 13.890625 14.042969 14.292969 C 12.070313 15.324219 10.21875 16.3125 8.339844 17.253906 C 8.078125 17.320313 7.804688 17.257813 7.59375 17.085938 C 6.390625 16.070313 5.25 14.988281 4.171875 13.839844 C 1.605469 10.8125 0.1875 6.96875 0.167969 2.992188 C 0.113281 1.453125 1.273438 0.148438 2.800781 0.0273438 C 4.371094 -0.125 5.78125 1 5.980469 2.574219 C 6.058594 3.078125 6.097656 3.585938 6.164063 4.089844 C 6.164063 4.113281 6.171875 4.128906 6.175781 4.148438 L 26.214844 4.148438 L 26.214844 4.214844 C 25.886719 4.933594 25.496094 5.621094 25.050781 6.273438 Z M 0.226563 65.210938 C 1.132813 60.742188 3.566406 56.726563 7.101563 53.863281 C 9.359375 52.101563 11.8125 50.617188 14.417969 49.4375 C 18.273438 47.617188 21.925781 45.394531 25.316406 42.804688 C 25.695313 42.496094 26.066406 42.179688 26.433594 41.855469 L 13.855469 41.855469 C 13.410156 41.492188 12.976563 41.113281 12.554688 40.71875 C 12.242188 40.421875 11.960938 40.089844 11.714844 39.734375 L 28.4375 39.734375 C 28.710938 39.375 28.957031 38.996094 29.175781 38.597656 C 29.605469 37.761719 29.867188 36.84375 29.9375 35.90625 L 10.339844 35.90625 C 10.265625 35.199219 10.277344 34.488281 10.378906 33.785156 L 29.886719 33.785156 C 29.6875 32.429688 29.144531 31.152344 28.308594 30.074219 L 12.089844 30.074219 C 12.734375 29.304688 13.441406 28.59375 14.210938 27.953125 L 26 27.953125 C 24.929688 27.09375 23.835938 26.257813 22.757813 25.40625 C 22.554688 25.246094 22.324219 25.121094 22.039063 24.9375 C 23.953125 23.871094 25.757813 22.847656 27.59375 21.867188 C 27.855469 21.808594 28.132813 21.875 28.339844 22.046875 C 29.5 23.039063 30.691406 24.003906 31.757813 25.089844 C 35.558594 28.726563 36.9375 34.234375 35.296875 39.242188 C 34.519531 42.003906 32.640625 44 30.652344 45.898438 C 27.503906 48.75 23.988281 51.160156 20.203125 53.070313 C 18.132813 54.183594 15.988281 55.15625 13.972656 56.351563 C 13.082031 56.882813 12.230469 57.472656 11.421875 58.125 L 19.914063 58.125 L 20.050781 58.210938 C 20.980469 58.792969 21.84375 59.472656 22.625 60.246094 L 9.21875 60.246094 C 8.226563 61.382813 7.417969 62.671875 6.832031 64.066406 L 25.214844 64.066406 C 25.507813 64.75 25.734375 65.460938 25.898438 66.1875 L 6.15625 66.1875 C 6.054688 66.585938 5.949219 66.980469 5.882813 67.40625 C 5.761719 68.464844 5.082031 69.375 4.105469 69.789063 C 3.128906 70.207031 2.003906 70.0625 1.164063 69.414063 C 0.320313 68.765625 -0.109375 67.710938 0.0390625 66.65625 C 0.0742188 66.171875 0.140625 65.691406 0.226563 65.210938 Z M 0.226563 65.210938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 30.945313 45.074219 C 30.664063 44.894531 30.429688 44.773438 30.222656 44.609375 C 28.550781 43.285156 26.785156 42.0625 25.234375 40.609375 C 22.871094 38.152344 22.289063 34.484375 23.777344 31.414063 C 24.785156 29.777344 26.105469 28.347656 27.65625 27.207031 C 31.066406 24.621094 34.738281 22.398438 38.609375 20.578125 C 41.222656 19.394531 43.691406 17.910156 45.957031 16.152344 C 49.511719 13.289063 51.953125 9.273438 52.863281 4.800781 C 52.953125 4.324219 53.015625 3.839844 53.054688 3.355469 C 53.207031 2.300781 52.773438 1.246094 51.929688 0.59375 C 51.082031 -0.0546875 49.949219 -0.199219 48.96875 0.21875 C 47.988281 0.636719 47.304688 1.550781 47.183594 2.609375 C 46.355469 7.675781 43.320313 11.144531 39.0625 13.65625 C 37.035156 14.851563 34.878906 15.824219 32.804688 16.9375 C 28.996094 18.847656 25.464844 21.257813 22.304688 24.109375 C 20.300781 26.007813 18.414063 28.003906 17.636719 30.765625 C 15.988281 35.773438 17.367188 41.28125 21.183594 44.917969 C 22.253906 46.007813 23.449219 46.96875 24.617188 47.960938 C 24.824219 48.132813 25.101563 48.199219 25.367188 48.140625 C 27.210938 47.167969 29.027344 46.140625 30.945313 45.074219 Z M 38.980469 55.726563 C 39.621094 56.128906 40.207031 56.503906 40.800781 56.875 C 44.125 58.78125 46.378906 62.125 46.894531 65.925781 C 46.96875 66.429688 47 66.941406 47.078125 67.441406 C 47.28125 69.015625 48.695313 70.140625 50.273438 69.988281 C 51.808594 69.867188 52.976563 68.5625 52.921875 67.023438 C 52.902344 63.042969 51.476563 59.203125 48.894531 56.171875 C 47.816406 55.023438 46.667969 53.941406 45.460938 52.929688 C 45.25 52.757813 44.972656 52.695313 44.710938 52.757813 C 42.824219 53.707031 40.957031 54.695313 38.980469 55.726563 Z M 38.980469 55.726563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 23.664063 6.257813 C 24.105469 7.628906 24.792969 8.90625 25.695313 10.027344 L 38.453125 10.027344 C 37.769531 10.542969 37.054688 11.019531 36.316406 11.453125 C 35.910156 11.695313 35.492188 11.917969 35.074219 12.152344 L 27.851563 12.152344 C 28.296875 12.503906 28.761719 12.828125 29.242188 13.128906 C 29.832031 13.5 30.417969 13.875 31.0625 14.277344 C 29.078125 15.308594 27.21875 16.292969 25.332031 17.238281 C 25.066406 17.300781 24.789063 17.238281 24.582031 17.066406 C 23.375 16.054688 22.226563 14.972656 21.144531 13.824219 C 18.566406 10.792969 17.140625 6.953125 17.117188 2.972656 C 17.066406 1.4375 18.234375 0.132813 19.765625 0.0117188 C 21.34375 -0.140625 22.757813 0.984375 22.960938 2.558594 C 23.039063 3.0625 23.078125 3.570313 23.144531 4.074219 C 23.144531 4.09375 23.152344 4.113281 23.15625 4.132813 L 43.285156 4.132813 L 43.285156 4.199219 C 42.957031 4.917969 42.566406 5.605469 42.121094 6.257813 Z M 17.179688 65.195313 C 18.089844 60.722656 20.53125 56.710938 24.085938 53.84375 C 26.355469 52.085938 28.820313 50.601563 31.4375 49.421875 C 35.308594 47.597656 38.976563 45.378906 42.386719 42.789063 C 42.765625 42.476563 43.140625 42.164063 43.507813 41.839844 L 30.871094 41.839844 C 30.421875 41.472656 29.988281 41.09375 29.566406 40.703125 C 29.25 40.402344 28.96875 40.074219 28.71875 39.71875 L 45.519531 39.71875 C 45.796875 39.359375 46.042969 38.976563 46.261719 38.582031 C 46.695313 37.742188 46.957031 36.828125 47.027344 35.890625 L 27.339844 35.890625 C 27.261719 35.183594 27.277344 34.46875 27.378906 33.769531 L 46.976563 33.769531 C 46.777344 32.414063 46.230469 31.136719 45.390625 30.058594 L 29.097656 30.058594 C 29.742188 29.289063 30.457031 28.578125 31.230469 27.9375 L 43.070313 27.9375 C 41.996094 27.074219 40.894531 26.242188 39.816406 25.390625 C 39.613281 25.226563 39.378906 25.105469 39.09375 24.921875 C 41.015625 23.855469 42.828125 22.832031 44.671875 21.851563 C 44.9375 21.792969 45.214844 21.859375 45.421875 22.03125 C 46.589844 23.023438 47.785156 23.984375 48.855469 25.074219 C 52.675781 28.707031 54.058594 34.214844 52.414063 39.222656 C 51.632813 41.984375 49.746094 43.984375 47.746094 45.882813 C 44.582031 48.730469 41.050781 51.144531 37.246094 53.054688 C 35.171875 54.167969 33.015625 55.140625 30.988281 56.335938 C 30.09375 56.863281 29.238281 57.457031 28.429688 58.109375 L 36.957031 58.109375 L 37.09375 58.195313 C 38.027344 58.773438 38.894531 59.457031 39.679688 60.230469 L 26.210938 60.230469 C 25.214844 61.367188 24.40625 62.65625 23.816406 64.050781 L 42.285156 64.050781 C 42.574219 64.734375 42.804688 65.445313 42.96875 66.167969 L 23.136719 66.167969 C 23.035156 66.570313 22.929688 66.964844 22.859375 67.386719 C 22.738281 68.445313 22.054688 69.359375 21.074219 69.773438 C 20.09375 70.1875 18.964844 70.046875 18.121094 69.398438 C 17.273438 68.75 16.84375 67.695313 16.988281 66.640625 C 17.027344 66.15625 17.09375 65.671875 17.179688 65.195313 Z M 17.179688 65.195313 "/>
 </g>
 </svg>
diff --git a/dist/AIMachineLearning/all.puml b/dist/AIMachineLearning/all.puml
index 79c1f82e..5322f758 100644
--- a/dist/AIMachineLearning/all.puml
+++ b/dist/AIMachineLearning/all.puml
@@ -25,12 +25,11 @@ AzureEntityColoring(AzureBotService)
 !define AzureBotService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureBotService, AzureBotService)
 
 sprite $AzureCognitiveServices [70x41/16z] {
-bTQ7pkem38RXpuuTZ_k_tpCA5cGqAky_jE1HavW8t4VIpTs4ICmZl0j-ZYsNGWa_fRajvA7JkXcJvsrXWdEaaPb9y3mLYaCjCaivvuIx97DHmlfM33eYes84
-WFqvmxag3ZHjeCWrmoxVA0qzCsL_y79Opw00ryFN0UPGOCtl5SUxdaEw3ahcTaNwML47vv1FHizgsLqMVk-kbx9_68cyKTBhfBTAUiD-jQLKRfwvAfNkaLB6
-HYMiMmnZ8xd6i9DY183g9HtOZwK2TCKQYr833VzCd-McQAXaLkhu5QrU3SegpEFByIi3LeKGutjLXxtMdDif_5RuSumVfBKDirC4ylvVHIqDVcrRF522Qg2d
--WiMN0TZPoMTfwihHcNwV1i3r6TbkN5ASL1SZ-eH8P2omGmKuo1_PJnEl1KEKYN8wysjDiio3OXIgcbOGuOva_nMh9PffO3VZRU0KLRUksSftvkbw8VFTDtE
-GwMCctLMl1QuLRA1UsTmdXMklTWhmG30SL9gF7IlN9c8PPwKaFsrMqfrL9nHaMN9JnLHYt3b-JjSxoeWVwH4mpc9ap8iuvXSTs74dUA2Pn4HqETjRDpCbF5R
-97KJHsyuzHS
+bPMBaYiX24GRGR3v__-zp-nG5iuaERjv9wSGMWVtY7ci5GQnMEHonTT8P8CJtp7p25Nm4UeHAYjlOHZUC9b_65Zv11yzoincEHA2EoopMHWUUO1oA-cM081Z
+bnQE37PB03OLmkm4JgpibW7FJCCasKoAZkR10bJnBKH49zvRuBbXBV0pJnR5lExJeOyD5iyyMXOmJ5xT3OpSiHQseoNNgC-x9PSUTrxFxWfcNfR6BCdHKZGB
+VVgFsoknpH9F5jyEe0cSOpdhl6Et161k02jzdiMf-RPRgj9vVSGI9YEO1V-nWDrIKMJrsgmMSUpHoI9WPgxAO7X9p0JsYSLWcLHufU5QsigaO7rWeK1KhWML
+9Q0r6_5dIr8169yjjRzTohbbr_RPHbzHpT01rGftGFo5xB4yTJUWMUe5i1-HOz-JRT9bYV-l3N7LOYycjwZtr9N5VonUVJaYVKUNPK5Oux-tE03UMb8XSmeq
+7osioz3HGgsJyDR2KPUGeoLpkQ-MkYwfQfgbSR3GKSoNX_pGmc4UuOQTONFQ0FmZ2mUUqVNUudZFCD7aMhb3_hVG1xx0k1KY64DzAhv5NsDcJC4Jlm4
 }
 
 AzureEntityColoring(AzureCognitiveServices)
@@ -59,12 +58,40 @@ AzureEntityColoring(AzureMachineLearningStudio)
 !define AzureMachineLearningStudio(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMachineLearningStudio, AzureMachineLearningStudio)
 !define AzureMachineLearningStudio(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMachineLearningStudio, AzureMachineLearningStudio)
 
-sprite $MicrosoftGenomics [36x70/16z] {
-bPM7Ri0W34Jn_Fy_xY1MSgSS7QyRdh0DihkYEzQHlUlTFqYnTwk_EJbxjtvsUfEzLS6NujTcjc9ol3R3U-Cldb1cytC99iQatYaKwvwjc62gyCqJ54iBL7Bk
-ad5KcixiiCtaCZZanea7B844R-iD2ajbbr6ee8G67ejCgc2KBO4blQd2mKXzI4a3SPq84c_3Eqb9VApd3WgKmal32kkj-3ixKlXauyNGbvOGta2n0dgmstVG
-cLe61PanEMd7k9B98Z5VVVjPsAQw2w7Fia_yppd7AdeeXcTKIeLdb2xiteFdhLRK_Unb9obWm-GKw-8n8ll4-C_4Yb31nWcAmsSxTsUomhC5Gx_BCEmzg8ZH
-4mhH4qeRFnyI_vXGC3sJ5J1WUgOSOkKqMr8e3YiigR6UN63r48DXdGRd8Wxh1P4ICGXdewkBXN_7fTyOeYtZefa95bWIOa-VLX-8ErXEKV5Y3r5qrW6OBQcD
-AJhiF0udMArF
+sprite $AzureMachineLearningStudioWebService [70x70/16z] {
+hPU9TgmW44HxA_x_atDejKPE45jdwhqaAd2jNjoaAFD0QmrmKtadHpiBBe-bqVuh7XeYm_ah5L9NNuKEWafVkrCpH_R4Y6k7YEmKiVvNlMn7aHwG458IWssm
+0idP6PIUANd4qoXAaDZ-k92IGjzA6cfE97B5IB4a5p3dRFX8ePayXT-Ls5Mp5gQfhCscs4TxYdKLJrbOnLFKglkiFH1MLg8hDtQrRPixE3PisIh2bXjgbC8s
+OzLxwkwQM-RkCgDmiV9eIIF5periBoYqe0SltbAaqSAG64UR2tf1SOOqjFo5CAE0b3WTRWjfbgrlETNfdaAHOkjkhdefKx2QLARe9IQpg9OSez0Qk3Lv28Pj
+EXXwrIynrcWijkkcJshN_TA-e714QvJoTVISOjm9JdbEYVE58Myfl8mySJLA0DbFECJjd56aeD2vtr7i5nG8LSykP_fURvs_21eVwIaVADm4ApLzmaDrD3DG
+QCKs22wUy4evpOmKsz-oPX1bLkPcID7SI1PaRILbWvdXJLLY2Z6czYJG32cUimmPLSKApHWfbjC2F5gmmcfF6Yzaea-LHttCsFqtYS_Y-LGRWvamcUiuWwxC
+08XmkYXROO8X1R7X5cPk5RJoXHdzTorFP3KhuBcdGitAqFNFpO1LPeCyDsEZbNOflRVYozIcKBQIUo_CZ5N6YX8tlOz5QYjcq1x8V_9LzeCln9zyhHQ-d2iA
+MGhV98NIrqcX_W
+}
+
+AzureEntityColoring(AzureMachineLearningStudioWebService)
+!define AzureMachineLearningStudioWebService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMachineLearningStudioWebService, AzureMachineLearningStudioWebService)
+!define AzureMachineLearningStudioWebService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMachineLearningStudioWebService, AzureMachineLearningStudioWebService)
+
+sprite $AzureMachineLearningStudioWebServicePlan [70x70/16z] {
+dPO9ieCm34Ezwlv7_gMW-HX8O_9cwSghefXCPOoQHoO-P8QRodiiS2DiMP4VLaIMnnMkv-L5xbPxuQ2XuDdqnE_lwVwv_WvoTuHBnV71Pa5SP6o9BKy221cH
+0FARUsGnC39oA66GZ84bjciPHmSIBbSniC3uB9urnPxnOA5zh64I0Y6gvtcHdvge4b6P4zUAZSM-G2Kl6yu1U468A02hwza2QJz8sh448NOuewrH97y-v21P
+KrTZu1S1FZC-xMhYVokSOKhLBbCOlOHXb2xA-QnXWkeMYijK7DlqQk0C6xUIkESz71jsyUPaGQgtkurVhqlYWXpFQEcrlkC9tzJ6Uy4m84klvn8JwVkLmLe2
+8xX-q4gCTgG3sR5GmcfhCRoV70EoIk9vbcbFF6DxQY8ZYzO_2lRbo1PQ9IvNM8RM_dJdCKd8kYL_IiHx5Y-IHGkdDcNPeiv5fQnR34ZbSLrGBhDbsRzXSiE-
+g0IGW4yjCJk77SYf1RCpL5d-m28vioI0lPimvGn6iRZmP_GHso_dnUmSUc2y-vp7yv3aVZjjhYHv-sNyF7_uxrSzQvGQHZaSZwJLaZPC_mc6wMD7k3CCqwL6
+8OuDMuko7YPBjOjXlEpoQXZkyXLx4yPlrPRHouKeTYRwOU8SnL5fXocxZ2Ui6wMC_VimUZvM3C_egu73W6n5SLOxGfUZzCCOex3QfJ2E9ZfVqHoVjpidvqFN
+GAPWZiaKmuoG2Ny
+}
+
+AzureEntityColoring(AzureMachineLearningStudioWebServicePlan)
+!define AzureMachineLearningStudioWebServicePlan(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMachineLearningStudioWebServicePlan, AzureMachineLearningStudioWebServicePlan)
+!define AzureMachineLearningStudioWebServicePlan(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMachineLearningStudioWebServicePlan, AzureMachineLearningStudioWebServicePlan)
+
+sprite $MicrosoftGenomics [70x70/16z] {
+lLS5bhCn40ePkV-DVraZtNdp9THuKYT0Z8u2o_JH0f61iSNClA11_iVOmY-_P_aVS-mG-H-u_7GUQice-F_RB6DqcXl4LsZxNFX55D2GZpsojmv-TXPlz1_H
+qDwIjS7RE44M1DRSnn3444ObkrIg_NHEplBcE0MT57qnZe6y7HYnyAeq0N9eIfXDp8ydy4nAKu72mTaHuMNHw9X9nFr27kT0vT1XDLH4uZuttC5mUPhgMZLz
+jeDcw4QbSGeXNAAXU6zMZpJ5Hc-tSC5FIv97yxqEY5lmO3_SF9SwJmtPPMRZmSvm6Wn7i-mmty6Yjo0zNRa5XR0Cv8volWM2gbqFbwetD26TKRDv7zhfRx-g
+kr2bcffXybrD6gSGXOGqzGBGMmE2D-ACP58YPZ5JPaVHfBiXX0uaSFXuGWV2qpeGF1xgGFI7EqcCqaGQa8CpBjCmrBeTGmxMlZ1NWIvECU4h3PIppbUiQboG
+udtB4gG8_vBL-yXEBLbDXT50Qa7jDQIr8BSAVggqe5ufpXn5kmoKpe3BGUhy_GK
 }
 
 AzureEntityColoring(MicrosoftGenomics)
diff --git a/dist/Analytics/AzureAnalysisServices(m).png b/dist/Analytics/AzureAnalysisServices(m).png
index c596b722..b7890bb3 100644
Binary files a/dist/Analytics/AzureAnalysisServices(m).png and b/dist/Analytics/AzureAnalysisServices(m).png differ
diff --git a/dist/Analytics/AzureAnalysisServices(m).svg b/dist/Analytics/AzureAnalysisServices(m).svg
index ba874891..d7281aaa 100644
--- a/dist/Analytics/AzureAnalysisServices(m).svg
+++ b/dist/Analytics/AzureAnalysisServices(m).svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="56pt" viewBox="0 0 70 56" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="54pt" viewBox="0 0 70 54" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 55.589844 30.414063 C 57.609375 30.414063 59.246094 28.777344 59.246094 26.753906 C 59.246094 24.734375 57.609375 23.097656 55.589844 23.097656 C 54.269531 23.097656 53.121094 23.800781 52.476563 24.847656 L 18.054688 14.332031 C 18.058594 14.277344 18.070313 14.226563 18.070313 14.171875 C 18.070313 12.152344 16.433594 10.515625 14.410156 10.515625 C 12.390625 10.515625 10.753906 12.152344 10.753906 14.171875 C 10.753906 16.074219 12.207031 17.617188 14.058594 17.796875 L 17.988281 42.617188 C 16.691406 43.179688 15.785156 44.46875 15.785156 45.96875 C 15.785156 47.992188 17.421875 49.628906 19.445313 49.628906 C 21.464844 49.628906 23.105469 47.992188 23.105469 45.96875 C 23.105469 45.675781 23.0625 45.394531 22.996094 45.121094 L 52.898438 29.222656 C 53.566406 29.949219 54.519531 30.414063 55.589844 30.414063 Z M 22.132813 43.503906 C 21.539063 42.859375 20.722656 42.433594 19.796875 42.347656 L 15.867188 17.527344 C 16.558594 17.226563 17.132813 16.714844 17.523438 16.082031 L 51.945313 26.597656 C 51.941406 26.652344 51.929688 26.703125 51.929688 26.753906 C 51.929688 27.050781 51.972656 27.332031 52.039063 27.605469 Z M 20.496094 37.800781 L 29.882813 37.800781 L 33.601563 35.824219 L 33.601563 32.21875 L 19.609375 32.210938 Z M 30.800781 53.199219 L 7 53.199219 L 7 37.800781 L 15.808594 37.800781 L 14.921875 32.207031 L 4.199219 32.199219 L 4.199219 56 L 33.601563 56 L 33.601563 41.066406 L 30.800781 42.554688 Z M 40.601563 32.101563 L 43.398438 30.613281 L 43.398438 25.453125 L 40.601563 24.597656 Z M 40.601563 12.601563 L 40.601563 19.753906 L 43.398438 20.609375 L 43.398438 18.199219 L 67.199219 18.199219 L 67.199219 33.601563 L 47.644531 33.601563 L 42.378906 36.398438 L 70 36.398438 L 70 12.617188 Z M 29.398438 21.171875 L 26.601563 20.316406 L 26.601563 21 L 17.835938 21 L 18.28125 23.800781 L 29.398438 23.800781 Z M 13.148438 21 L 2.800781 21 L 2.800781 5.601563 L 26.601563 5.601563 L 26.601563 15.476563 L 29.398438 16.332031 L 29.398438 0.0195313 L 0 0 L 0 23.800781 L 13.589844 23.800781 Z M 13.148438 21 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 41.195313 12.753906 L 41.195313 19.199219 L 28.804688 15.253906 L 28.804688 0.0078125 L 0 0.0078125 L 0 22.039063 L 14.257813 22.039063 L 15.800781 31.957031 L 4.976563 31.957031 L 4.976563 53.992188 L 33.785156 53.992188 L 33.785156 38.683594 L 41.195313 34.726563 L 41.195313 34.785156 L 70 34.785156 L 70 12.753906 Z M 59.210938 26.101563 C 58.835938 27.398438 57.777344 28.378906 56.457031 28.660156 C 55.132813 28.941406 53.765625 28.472656 52.894531 27.441406 L 43.113281 32.667969 L 41.195313 33.691406 L 33.785156 37.648438 L 31.863281 38.675781 L 22.894531 43.46875 C 23.453125 45.375 22.375 47.378906 20.476563 47.972656 C 18.574219 48.566406 16.546875 47.535156 15.910156 45.652344 C 15.273438 43.769531 16.265625 41.726563 18.136719 41.050781 L 17.46875 36.75 L 16.726563 31.957031 L 15.183594 22.039063 L 14.886719 20.125 L 14.257813 16.066406 C 12.238281 15.984375 10.667969 14.285156 10.75 12.269531 C 10.832031 10.253906 12.535156 8.6875 14.554688 8.769531 C 16.574219 8.851563 18.144531 10.550781 18.0625 12.566406 C 18.058594 12.636719 18.054688 12.710938 18.046875 12.78125 L 26.886719 15.597656 L 28.804688 16.207031 L 41.195313 20.15625 L 43.113281 20.765625 L 52.308594 23.695313 C 53.050781 21.902344 55.066406 21 56.902344 21.640625 C 58.738281 22.277344 59.75 24.238281 59.210938 26.101563 Z M 59.210938 26.101563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 52.035156 25.203125 L 43.113281 22.359375 L 41.195313 21.75 L 28.804688 17.804688 L 26.886719 17.191406 L 17.582031 14.226563 C 17.238281 14.828125 16.734375 15.320313 16.121094 15.644531 C 16.003906 15.707031 15.882813 15.761719 15.757813 15.8125 L 16.425781 20.125 L 16.726563 22.042969 L 18.265625 31.957031 L 19.007813 36.75 L 19.644531 40.839844 C 19.902344 40.859375 20.152344 40.902344 20.398438 40.972656 C 21.09375 41.171875 21.714844 41.574219 22.179688 42.125 L 31.863281 36.953125 L 33.785156 35.925781 L 41.195313 31.96875 L 43.113281 30.945313 L 52.179688 26.101563 C 52.09375 25.808594 52.042969 25.507813 52.035156 25.203125 Z M 41.195313 30.9375 L 33.785156 34.894531 L 33.785156 31.957031 L 19.191406 31.957031 L 17.648438 22.039063 L 28.804688 22.039063 L 28.804688 18.761719 L 41.195313 22.707031 Z M 41.195313 30.9375 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureAnalysisServices.png b/dist/Analytics/AzureAnalysisServices.png
index c660d552..11900d69 100644
Binary files a/dist/Analytics/AzureAnalysisServices.png and b/dist/Analytics/AzureAnalysisServices.png differ
diff --git a/dist/Analytics/AzureAnalysisServices.puml b/dist/Analytics/AzureAnalysisServices.puml
index 39731339..3acb23da 100644
--- a/dist/Analytics/AzureAnalysisServices.puml
+++ b/dist/Analytics/AzureAnalysisServices.puml
@@ -1,9 +1,8 @@
-sprite $AzureAnalysisServices [70x56/16z] {
-xTHPhkCu44JHo979sF-26m9bFa4jUgovwduR1qWZHDuhy6HSz4_fULrxIIbSf_-KM-RwiI95ikH3fN6hBHI_rq7Xw5eHtgzElqlzH47dNay38EqjHRbbbXlN
-N01vGu4cgG2WiK4L-eu2D0f6uhNVDfMcryLPIIg-yiRRRP3En7L-LfoEM-82MCxRrEuenqoPEBzI6kCsnPEA2nlgg8nathPGwbYWTqJD75yT1W1aLHoLarl4
-8htTLg6T6xXMaehBXDtd04QsL9o-KfWOMHzAB1LZF5HGZnHXUwHu7qYNfGBsjN8x9sD336kbk5G2i29J0B5Xh9H6kLPAeOriYhspaZL3qAIE9VOsenHOASMP
-6WDN3uSaMGRn_vTdPNoF_QGCepiaUTbP2R3GpaeiZ9NIq8dah0SGVQpVVDckr5wYKQnk1U1zenur5Co2Xj4ScU0bvVmzQWtZTKMP6CsHlQ60TJGqtrA4387i
-GssiTnJf9FiOAW2-fnItna3ULpXIV0j5FbCQjsgYd_ox-g42U0RmcJBw4vHQz9Aox8Sg_m4
+sprite $AzureAnalysisServices [70x54/16z] {
+xTO5hWGX48JXQgcw_urNEqj8O8JdyiTNlb54M-5eVrFvL_WEYWFmPQKXZLbMkazM5TOdELRCDneTsJbGGiTAt8lqEvIhYjBgUWfI-ZcbSgXY0B0WuxoIeDGW
+AyZEAKHAhG8UKEfu_I7RpV7KYGOZu0Z4Bfc9BG1ZABqtqHKEOfZnzTWatnvm7X36HNjiFXigbILeCwNAGk0p1KJwNAbyJn4YzfIeJpXLQ9vpfGoF-c2cf1kd
+IXcK647DbGXehYHWFB1OU88ObaehOwBOAoSohAjUkhkHqeOo7e_Lms0PXnLN7opfG1a75JFrFOnGR3LO8DNtD4ukiz4h0JZBEA4Gx0qcZZMPDFDkoB2a-Cim
+BczYp59gB-gQOW2iNjHbnUgZV9zDp3TGQWY_KI7kSLcfwERyTXlmVoMtme6k
 }
 
 AzureEntityColoring(AzureAnalysisServices)
diff --git a/dist/Analytics/AzureAnalysisServices.svg b/dist/Analytics/AzureAnalysisServices.svg
index ba874891..66d6de28 100644
--- a/dist/Analytics/AzureAnalysisServices.svg
+++ b/dist/Analytics/AzureAnalysisServices.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="56pt" viewBox="0 0 70 56" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="54pt" viewBox="0 0 70 54" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 55.589844 30.414063 C 57.609375 30.414063 59.246094 28.777344 59.246094 26.753906 C 59.246094 24.734375 57.609375 23.097656 55.589844 23.097656 C 54.269531 23.097656 53.121094 23.800781 52.476563 24.847656 L 18.054688 14.332031 C 18.058594 14.277344 18.070313 14.226563 18.070313 14.171875 C 18.070313 12.152344 16.433594 10.515625 14.410156 10.515625 C 12.390625 10.515625 10.753906 12.152344 10.753906 14.171875 C 10.753906 16.074219 12.207031 17.617188 14.058594 17.796875 L 17.988281 42.617188 C 16.691406 43.179688 15.785156 44.46875 15.785156 45.96875 C 15.785156 47.992188 17.421875 49.628906 19.445313 49.628906 C 21.464844 49.628906 23.105469 47.992188 23.105469 45.96875 C 23.105469 45.675781 23.0625 45.394531 22.996094 45.121094 L 52.898438 29.222656 C 53.566406 29.949219 54.519531 30.414063 55.589844 30.414063 Z M 22.132813 43.503906 C 21.539063 42.859375 20.722656 42.433594 19.796875 42.347656 L 15.867188 17.527344 C 16.558594 17.226563 17.132813 16.714844 17.523438 16.082031 L 51.945313 26.597656 C 51.941406 26.652344 51.929688 26.703125 51.929688 26.753906 C 51.929688 27.050781 51.972656 27.332031 52.039063 27.605469 Z M 20.496094 37.800781 L 29.882813 37.800781 L 33.601563 35.824219 L 33.601563 32.21875 L 19.609375 32.210938 Z M 30.800781 53.199219 L 7 53.199219 L 7 37.800781 L 15.808594 37.800781 L 14.921875 32.207031 L 4.199219 32.199219 L 4.199219 56 L 33.601563 56 L 33.601563 41.066406 L 30.800781 42.554688 Z M 40.601563 32.101563 L 43.398438 30.613281 L 43.398438 25.453125 L 40.601563 24.597656 Z M 40.601563 12.601563 L 40.601563 19.753906 L 43.398438 20.609375 L 43.398438 18.199219 L 67.199219 18.199219 L 67.199219 33.601563 L 47.644531 33.601563 L 42.378906 36.398438 L 70 36.398438 L 70 12.617188 Z M 29.398438 21.171875 L 26.601563 20.316406 L 26.601563 21 L 17.835938 21 L 18.28125 23.800781 L 29.398438 23.800781 Z M 13.148438 21 L 2.800781 21 L 2.800781 5.601563 L 26.601563 5.601563 L 26.601563 15.476563 L 29.398438 16.332031 L 29.398438 0.0195313 L 0 0 L 0 23.800781 L 13.589844 23.800781 Z M 13.148438 21 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 41.195313 12.753906 L 41.195313 19.199219 L 28.804688 15.253906 L 28.804688 0.0078125 L 0 0.0078125 L 0 22.039063 L 14.257813 22.039063 L 15.800781 31.957031 L 4.976563 31.957031 L 4.976563 53.992188 L 33.785156 53.992188 L 33.785156 38.683594 L 41.195313 34.726563 L 41.195313 34.785156 L 70 34.785156 L 70 12.753906 Z M 59.210938 26.101563 C 58.835938 27.398438 57.777344 28.378906 56.457031 28.660156 C 55.132813 28.941406 53.765625 28.472656 52.894531 27.441406 L 43.113281 32.667969 L 41.195313 33.691406 L 33.785156 37.648438 L 31.863281 38.675781 L 22.894531 43.46875 C 23.453125 45.375 22.375 47.378906 20.476563 47.972656 C 18.574219 48.566406 16.546875 47.535156 15.910156 45.652344 C 15.273438 43.769531 16.265625 41.726563 18.136719 41.050781 L 17.46875 36.75 L 16.726563 31.957031 L 15.183594 22.039063 L 14.886719 20.125 L 14.257813 16.066406 C 12.238281 15.984375 10.667969 14.285156 10.75 12.269531 C 10.832031 10.253906 12.535156 8.6875 14.554688 8.769531 C 16.574219 8.851563 18.144531 10.550781 18.0625 12.566406 C 18.058594 12.636719 18.054688 12.710938 18.046875 12.78125 L 26.886719 15.597656 L 28.804688 16.207031 L 41.195313 20.15625 L 43.113281 20.765625 L 52.308594 23.695313 C 53.050781 21.902344 55.066406 21 56.902344 21.640625 C 58.738281 22.277344 59.75 24.238281 59.210938 26.101563 Z M 59.210938 26.101563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 52.035156 25.203125 L 43.113281 22.359375 L 41.195313 21.75 L 28.804688 17.804688 L 26.886719 17.191406 L 17.582031 14.226563 C 17.238281 14.828125 16.734375 15.320313 16.121094 15.644531 C 16.003906 15.707031 15.882813 15.761719 15.757813 15.8125 L 16.425781 20.125 L 16.726563 22.042969 L 18.265625 31.957031 L 19.007813 36.75 L 19.644531 40.839844 C 19.902344 40.859375 20.152344 40.902344 20.398438 40.972656 C 21.09375 41.171875 21.714844 41.574219 22.179688 42.125 L 31.863281 36.953125 L 33.785156 35.925781 L 41.195313 31.96875 L 43.113281 30.945313 L 52.179688 26.101563 C 52.09375 25.808594 52.042969 25.507813 52.035156 25.203125 Z M 41.195313 30.9375 L 33.785156 34.894531 L 33.785156 31.957031 L 19.191406 31.957031 L 17.648438 22.039063 L 28.804688 22.039063 L 28.804688 18.761719 L 41.195313 22.707031 Z M 41.195313 30.9375 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureDataCatalog(m).png b/dist/Analytics/AzureDataCatalog(m).png
index 60c0c1e0..0daab60a 100644
Binary files a/dist/Analytics/AzureDataCatalog(m).png and b/dist/Analytics/AzureDataCatalog(m).png differ
diff --git a/dist/Analytics/AzureDataCatalog(m).svg b/dist/Analytics/AzureDataCatalog(m).svg
index 12d0d43f..bfee5326 100644
--- a/dist/Analytics/AzureDataCatalog(m).svg
+++ b/dist/Analytics/AzureDataCatalog(m).svg
@@ -1,10 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="59pt" height="70pt" viewBox="0 0 59 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 48.019531 54.179688 L 51.378906 49.980469 L 51.378906 2.238281 L 48.019531 5.460938 Z M 48.019531 54.179688 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 47.984375 0.835938 C 47.429688 0.148438 46.472656 0 46.472656 0 L 9.542969 0 C 4.011719 0 4.011719 4.597656 4.011719 4.597656 L 4.011719 11.171875 L 8.304688 11.171875 C 10.519531 11.171875 12.453125 12.976563 12.453125 15.359375 C 12.453125 17.59375 10.648438 19.546875 8.304688 19.546875 L 4.011719 19.546875 L 4.011719 25.5625 L 8.304688 25.5625 C 10.519531 25.5625 12.453125 27.367188 12.453125 29.730469 C 12.453125 31.964844 10.648438 33.9375 8.304688 33.9375 L 4.011719 33.9375 L 4.011719 39.933594 L 8.304688 39.933594 C 10.519531 39.933594 12.453125 41.738281 12.453125 44.121094 C 12.453125 46.355469 10.648438 48.3125 8.304688 48.3125 L 4.011719 48.3125 L 4.011719 53.058594 C 4.011719 54.175781 4.839844 55.011719 5.945313 55.011719 L 22.964844 55.011719 L 22.964844 31.554688 C 22.964844 25.5625 31.113281 21.355469 42.730469 21.355469 L 42.730469 6.703125 C 42.730469 5.585938 42.730469 5.4375 41.621094 5.4375 L 7.882813 5.4375 C 7.753906 3.203125 9.964844 2.644531 9.964844 2.644531 L 43.707031 2.644531 C 45.769531 2.644531 45.769531 4.46875 45.769531 4.46875 L 45.769531 21.355469 C 46.601563 21.355469 47.300781 21.503906 47.984375 21.503906 C 48.132813 21.503906 48.261719 21.503906 48.261719 21.503906 L 48.261719 1.804688 C 48.261719 1.527344 48.132813 1.117188 47.984375 0.835938 Z M 47.984375 0.835938 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 43.144531 24.855469 C 33.316406 24.855469 26.550781 28.054688 26.550781 31.554688 L 26.550781 62.125 C 26.550781 62.125 26.550781 62.273438 26.550781 62.402344 L 26.550781 62.832031 C 26.550781 62.960938 26.550781 63.113281 26.550781 63.242188 C 27.101563 66.59375 34.015625 69.8125 43.421875 69.8125 C 53.101563 69.8125 59.332031 66.742188 59.460938 63.242188 L 59.460938 31.835938 C 59.460938 28.335938 52.953125 24.855469 43.144531 24.855469 Z M 43.421875 34.628906 C 36.359375 34.628906 30.699219 32.953125 30.699219 30.996094 C 30.699219 28.894531 36.359375 27.367188 43.421875 27.367188 C 50.480469 27.367188 55.164063 29.042969 55.164063 31.128906 C 55.164063 33.082031 50.335938 34.628906 43.421875 34.628906 Z M 43.421875 34.628906 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 10.234375 29.601563 C 10.234375 30.71875 9.402344 31.554688 8.296875 31.554688 L 1.9375 31.554688 C 0.828125 31.554688 0 30.71875 0 29.601563 C 0 28.484375 0.828125 27.644531 1.9375 27.644531 L 8.296875 27.644531 C 9.402344 27.515625 10.234375 28.484375 10.234375 29.601563 Z M 10.234375 29.601563 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 10.234375 15.21875 C 10.234375 16.335938 9.402344 17.175781 8.296875 17.175781 L 1.9375 17.175781 C 0.828125 17.175781 0 16.335938 0 15.21875 C 0 14.101563 0.828125 13.265625 1.9375 13.265625 L 8.296875 13.265625 C 9.402344 13.265625 10.234375 14.234375 10.234375 15.21875 Z M 10.234375 15.21875 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 10.234375 43.84375 C 10.234375 44.960938 9.402344 45.796875 8.296875 45.796875 L 1.9375 45.796875 C 0.828125 45.796875 0 44.960938 0 43.84375 C 0 42.726563 0.828125 41.886719 1.9375 41.886719 L 8.296875 41.886719 C 9.402344 41.886719 10.234375 42.726563 10.234375 43.84375 Z M 10.234375 43.84375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 51.378906 49.980469 L 53.621094 49.980469 L 53.621094 0 L 9.800781 0 C 8.398438 0.140625 5.460938 3.640625 5.460938 4.058594 C 5.460938 4.199219 5.460938 52.359375 5.460938 52.359375 C 5.460938 53.761719 6.578125 55.019531 8.121094 55.019531 L 48.019531 55.019531 L 48.019531 54.179688 Z M 51.378906 49.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 11.761719 2.238281 C 10.5 2.238281 10.078125 2.378906 8.960938 3.359375 C 6.578125 5.460938 9.519531 5.460938 10.640625 5.460938 L 48.019531 5.460938 L 48.019531 54.179688 L 51.378906 49.839844 L 51.378906 2.238281 Z M 11.761719 2.238281 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 11.761719 29.679688 C 11.761719 30.800781 10.921875 31.640625 9.800781 31.640625 L 3.359375 31.640625 C 2.238281 31.640625 1.398438 30.800781 1.398438 29.679688 C 1.398438 28.558594 2.238281 27.71875 3.359375 27.71875 L 9.800781 27.71875 C 10.921875 27.578125 11.761719 28.558594 11.761719 29.679688 Z M 11.761719 29.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 11.761719 15.261719 C 11.761719 16.378906 10.921875 17.21875 9.800781 17.21875 L 3.359375 17.21875 C 2.238281 17.21875 1.398438 16.378906 1.398438 15.261719 C 1.398438 14.140625 2.238281 13.300781 3.359375 13.300781 L 9.800781 13.300781 C 10.921875 13.300781 11.761719 14.28125 11.761719 15.261719 Z M 11.761719 15.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 11.761719 43.960938 C 11.761719 45.078125 10.921875 45.921875 9.800781 45.921875 L 3.359375 45.921875 C 2.238281 45.921875 1.398438 45.078125 1.398438 43.960938 C 1.398438 42.839844 2.238281 42 3.359375 42 L 9.800781 42 C 10.921875 42 11.761719 42.839844 11.761719 43.960938 Z M 11.761719 43.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 33.039063 31.078125 L 33.039063 63.980469 C 33.039063 67.339844 40.738281 70.140625 50.121094 70.140625 L 50.121094 30.941406 L 33.039063 30.941406 Z M 33.039063 31.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 49.839844 70.28125 L 50.121094 70.28125 C 59.5 70.28125 67.199219 67.480469 67.199219 64.121094 L 67.199219 31.078125 L 49.839844 31.078125 Z M 49.839844 70.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 67.199219 31.078125 C 67.199219 34.441406 59.5 37.238281 50.121094 37.238281 C 40.738281 37.238281 33.039063 34.441406 33.039063 31.078125 C 33.039063 27.71875 40.738281 24.921875 50.121094 24.921875 C 59.5 24.921875 67.199219 27.71875 67.199219 31.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 63.699219 30.660156 C 63.699219 32.898438 57.539063 34.71875 50.121094 34.71875 C 42.699219 34.71875 36.539063 32.898438 36.539063 30.660156 C 36.539063 28.421875 42.699219 26.601563 50.121094 26.601563 C 57.539063 26.601563 63.699219 28.421875 63.699219 30.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 60.898438 33.179688 C 62.71875 32.480469 63.699219 31.640625 63.699219 30.660156 C 63.699219 28.421875 57.539063 26.601563 50.121094 26.601563 C 42.558594 26.601563 36.539063 28.421875 36.539063 30.660156 C 36.539063 31.640625 37.660156 32.480469 39.339844 33.179688 C 41.859375 32.199219 45.78125 31.640625 50.121094 31.640625 C 54.460938 31.640625 58.378906 32.199219 60.898438 33.179688 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureDataCatalog.png b/dist/Analytics/AzureDataCatalog.png
index 3783a9a1..cdced821 100644
Binary files a/dist/Analytics/AzureDataCatalog.png and b/dist/Analytics/AzureDataCatalog.png differ
diff --git a/dist/Analytics/AzureDataCatalog.puml b/dist/Analytics/AzureDataCatalog.puml
index fcd8c461..9faff53c 100644
--- a/dist/Analytics/AzureDataCatalog.puml
+++ b/dist/Analytics/AzureDataCatalog.puml
@@ -1,8 +1,8 @@
-sprite $AzureDataCatalog [59x70/16z] {
-xTP76fim443XwONx7pWUEiW4n2RrNzd0eqeVm8WzStWW1KviU2hXY6jXsAtuR8R7j1OPFE1DcdKYJqYJrZNeBGBWDdr4__MKYiIRTEQTAQfD433xKjyDREzB
-joCXM5-gmyoxZmf84-YyrZsCeJ_belcR3SGCit6-eXeyJqC9uTfr9r3wqs2uvINRsp8ZCOyi4Qw2q913d0m59Pfzfl5XD67T-XqPrzboYxtkiPfvR2yGsOtX
-s4fVpoEKu81qN8nNCuVdcU5prrvROkpcgntUIbJxXkzuFAxvo6W_TtCvA7o7jH4qKxV4ybU_ftv8SIvtQKcbvf2QmvB6H_rhqr6w2TE8HMtTiXc8JThuLrCi
-76_IcNUcv35XWEnBzyFV-z9cqZrFUMvJkuyA6tfzXp5Uf58i_m__dwVvFhNtAH2VFKvRVstwFyMRCk6Qt7vkNfDyLnQqVFyHY1fjbyxm2BBwscUu4an-
+sprite $AzureDataCatalog [70x70/16z] {
+xTH5WiCm341HiUd-zvsev2auKHd_FYzcsCIbnQjmEgdjUeLhgoh1RA1WROKm6Ej0qTOuZCYCKfA5OfbHmkdRAZ-5M2nFbNg5GhOjNw7mJabNABXJobMhIwHb
+gjvkZtxAJwdPL0XX2l4ofIZ1AYHle5HlE8ha18cex58LfZrYuHuL0a3fGaybVASB0iWefU3x8ZwIOReRZAgbgLnFAlutxL-jsrCmi4VgurKHzJdtp5QM2nnG
+Ye0xiYCw90HJ8X4b6swE2gy7PAPzdr4jfkHi1ASZPuEAPqA70ZiHLdh9L9LNMsMzc7AGzJvQOP713OWgWTiOK08lGqp1yIiLLzn1hTxddvUVmZTH8Dr40U9H
+AQ0iPpTLVifFuO32Ymf185rG649ncbC8eh4D5Er6A5OxL8GHDlq1
 }
 
 AzureEntityColoring(AzureDataCatalog)
diff --git a/dist/Analytics/AzureDataCatalog.svg b/dist/Analytics/AzureDataCatalog.svg
index 893239db..94f31c87 100644
--- a/dist/Analytics/AzureDataCatalog.svg
+++ b/dist/Analytics/AzureDataCatalog.svg
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65pt" height="70pt" viewBox="0 0 65 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="65" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 49.371094 2.238281 L 46.054688 5.460938 L 46.054688 54.179688 L 49.371094 49.980469 Z M 49.371094 2.238281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 48.019531 54.179688 L 51.378906 49.980469 L 51.378906 2.238281 L 48.019531 5.460938 Z M 48.019531 54.179688 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 49.371094 49.980469 L 51.585938 49.980469 L 51.585938 0 L 8.296875 0 C 6.914063 0.140625 4.011719 3.640625 4.011719 4.058594 C 4.011719 4.199219 4.011719 52.359375 4.011719 52.359375 C 4.011719 53.761719 5.117188 55.019531 6.636719 55.019531 L 46.054688 55.019531 L 46.054688 54.179688 Z M 49.371094 49.980469 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 10.234375 2.238281 C 8.988281 2.238281 8.574219 2.378906 7.46875 3.359375 C 5.117188 5.460938 8.019531 5.460938 9.128906 5.460938 L 46.054688 5.460938 L 46.054688 54.179688 L 49.371094 49.839844 L 49.371094 2.238281 Z M 10.234375 2.238281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 51.378906 49.980469 L 53.621094 49.980469 L 53.621094 0 L 9.800781 0 C 8.398438 0.140625 5.460938 3.640625 5.460938 4.058594 C 5.460938 4.199219 5.460938 52.359375 5.460938 52.359375 C 5.460938 53.761719 6.578125 55.019531 8.121094 55.019531 L 48.019531 55.019531 L 48.019531 54.179688 Z M 51.378906 49.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 11.761719 2.238281 C 10.5 2.238281 10.078125 2.378906 8.960938 3.359375 C 6.578125 5.460938 9.519531 5.460938 10.640625 5.460938 L 48.019531 5.460938 L 48.019531 54.179688 L 51.378906 49.839844 L 51.378906 2.238281 Z M 11.761719 2.238281 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 10.234375 29.679688 C 10.234375 30.800781 9.402344 31.640625 8.296875 31.640625 L 1.9375 31.640625 C 0.828125 31.640625 0 30.800781 0 29.679688 C 0 28.558594 0.828125 27.71875 1.9375 27.71875 L 8.296875 27.71875 C 9.402344 27.578125 10.234375 28.558594 10.234375 29.679688 Z M 10.234375 29.679688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 10.234375 15.261719 C 10.234375 16.378906 9.402344 17.21875 8.296875 17.21875 L 1.9375 17.21875 C 0.828125 17.21875 0 16.378906 0 15.261719 C 0 14.140625 0.828125 13.300781 1.9375 13.300781 L 8.296875 13.300781 C 9.402344 13.300781 10.234375 14.28125 10.234375 15.261719 Z M 10.234375 15.261719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 10.234375 43.960938 C 10.234375 45.078125 9.402344 45.921875 8.296875 45.921875 L 1.9375 45.921875 C 0.828125 45.921875 0 45.078125 0 43.960938 C 0 42.839844 0.828125 42 1.9375 42 L 8.296875 42 C 9.402344 42 10.234375 42.839844 10.234375 43.960938 Z M 10.234375 43.960938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 31.253906 31.078125 L 31.253906 63.980469 C 31.253906 67.339844 38.863281 70.140625 48.128906 70.140625 L 48.128906 30.941406 L 31.253906 30.941406 Z M 31.253906 31.078125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 47.851563 70.28125 L 48.128906 70.28125 C 57.394531 70.28125 65 67.480469 65 64.121094 L 65 31.078125 L 47.851563 31.078125 Z M 47.851563 70.28125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65 31.078125 C 65 34.441406 57.394531 37.238281 48.128906 37.238281 C 38.863281 37.238281 31.253906 34.441406 31.253906 31.078125 C 31.253906 27.71875 38.863281 24.921875 48.128906 24.921875 C 57.394531 24.921875 65 27.71875 65 31.078125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 61.542969 30.660156 C 61.542969 32.898438 55.457031 34.71875 48.128906 34.71875 C 40.796875 34.71875 34.710938 32.898438 34.710938 30.660156 C 34.710938 28.421875 40.796875 26.601563 48.128906 26.601563 C 55.457031 26.601563 61.542969 28.421875 61.542969 30.660156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 58.777344 33.179688 C 60.574219 32.480469 61.542969 31.640625 61.542969 30.660156 C 61.542969 28.421875 55.457031 26.601563 48.128906 26.601563 C 40.660156 26.601563 34.710938 28.421875 34.710938 30.660156 C 34.710938 31.640625 35.820313 32.480469 37.480469 33.179688 C 39.96875 32.199219 43.839844 31.640625 48.128906 31.640625 C 52.414063 31.640625 56.289063 32.199219 58.777344 33.179688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 11.761719 29.679688 C 11.761719 30.800781 10.921875 31.640625 9.800781 31.640625 L 3.359375 31.640625 C 2.238281 31.640625 1.398438 30.800781 1.398438 29.679688 C 1.398438 28.558594 2.238281 27.71875 3.359375 27.71875 L 9.800781 27.71875 C 10.921875 27.578125 11.761719 28.558594 11.761719 29.679688 Z M 11.761719 29.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 11.761719 15.261719 C 11.761719 16.378906 10.921875 17.21875 9.800781 17.21875 L 3.359375 17.21875 C 2.238281 17.21875 1.398438 16.378906 1.398438 15.261719 C 1.398438 14.140625 2.238281 13.300781 3.359375 13.300781 L 9.800781 13.300781 C 10.921875 13.300781 11.761719 14.28125 11.761719 15.261719 Z M 11.761719 15.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 11.761719 43.960938 C 11.761719 45.078125 10.921875 45.921875 9.800781 45.921875 L 3.359375 45.921875 C 2.238281 45.921875 1.398438 45.078125 1.398438 43.960938 C 1.398438 42.839844 2.238281 42 3.359375 42 L 9.800781 42 C 10.921875 42 11.761719 42.839844 11.761719 43.960938 Z M 11.761719 43.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 33.039063 31.078125 L 33.039063 63.980469 C 33.039063 67.339844 40.738281 70.140625 50.121094 70.140625 L 50.121094 30.941406 L 33.039063 30.941406 Z M 33.039063 31.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 49.839844 70.28125 L 50.121094 70.28125 C 59.5 70.28125 67.199219 67.480469 67.199219 64.121094 L 67.199219 31.078125 L 49.839844 31.078125 Z M 49.839844 70.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 67.199219 31.078125 C 67.199219 34.441406 59.5 37.238281 50.121094 37.238281 C 40.738281 37.238281 33.039063 34.441406 33.039063 31.078125 C 33.039063 27.71875 40.738281 24.921875 50.121094 24.921875 C 59.5 24.921875 67.199219 27.71875 67.199219 31.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 63.699219 30.660156 C 63.699219 32.898438 57.539063 34.71875 50.121094 34.71875 C 42.699219 34.71875 36.539063 32.898438 36.539063 30.660156 C 36.539063 28.421875 42.699219 26.601563 50.121094 26.601563 C 57.539063 26.601563 63.699219 28.421875 63.699219 30.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 60.898438 33.179688 C 62.71875 32.480469 63.699219 31.640625 63.699219 30.660156 C 63.699219 28.421875 57.539063 26.601563 50.121094 26.601563 C 42.558594 26.601563 36.539063 28.421875 36.539063 30.660156 C 36.539063 31.640625 37.660156 32.480469 39.339844 33.179688 C 41.859375 32.199219 45.78125 31.640625 50.121094 31.640625 C 54.460938 31.640625 58.378906 32.199219 60.898438 33.179688 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureDataFactory(m).png b/dist/Analytics/AzureDataFactory(m).png
new file mode 100644
index 00000000..fb42d9d8
Binary files /dev/null and b/dist/Analytics/AzureDataFactory(m).png differ
diff --git a/dist/Analytics/AzureDataFactory(m).svg b/dist/Analytics/AzureDataFactory(m).svg
new file mode 100644
index 00000000..6d24fa16
--- /dev/null
+++ b/dist/Analytics/AzureDataFactory(m).svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 69.859375 41.300781 L 69.859375 24.359375 L 50.679688 41.019531 L 50.261719 41.019531 L 50.261719 24.359375 L 31.078125 41.019531 L 31.078125 6.160156 C 31.078125 3.21875 24.5 0.28125 15.820313 0.28125 C 7.140625 0.28125 0 3.078125 0 6.160156 L 0 70 L 70 70 Z M 15.820313 8.960938 C 9.519531 8.960938 4.480469 7.421875 4.480469 5.738281 C 4.480469 4.058594 9.519531 2.519531 15.820313 2.519531 C 22.121094 2.519531 27.160156 3.921875 27.160156 5.738281 C 27.019531 7.421875 21.980469 8.960938 15.820313 8.960938 Z M 48.859375 58.660156 L 41.160156 58.660156 L 41.160156 50.960938 L 48.859375 50.960938 Z M 35.28125 58.660156 L 27.578125 58.660156 L 27.578125 50.960938 L 35.28125 50.960938 Z M 54.878906 58.660156 L 54.878906 50.960938 L 62.578125 50.960938 L 62.578125 58.660156 Z M 54.878906 58.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 0 5.738281 L 15.539063 5.738281 L 15.539063 70 L 0 70 Z M 0 5.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.941406 5.738281 C 30.941406 8.820313 23.941406 11.339844 15.398438 11.339844 C 6.859375 11.339844 0 8.820313 0 5.738281 C 0 2.660156 7 0.140625 15.539063 0.140625 C 24.078125 0.140625 30.941406 2.519531 30.941406 5.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 27.859375 5.320313 C 27.859375 7.421875 22.398438 8.960938 15.539063 8.960938 C 8.679688 8.960938 3.21875 7.421875 3.21875 5.320313 C 3.21875 3.21875 8.679688 1.679688 15.539063 1.679688 C 22.398438 1.679688 27.859375 3.359375 27.859375 5.320313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 25.199219 7.558594 C 26.878906 7 27.71875 6.160156 27.71875 5.320313 C 27.71875 3.21875 22.261719 1.679688 15.398438 1.679688 C 8.539063 1.679688 3.078125 3.359375 3.078125 5.320313 C 3.21875 6.160156 4.199219 7 5.738281 7.558594 C 7.980469 6.71875 11.480469 6.160156 15.539063 6.160156 C 19.460938 6.160156 22.960938 6.71875 25.199219 7.558594 "/>
+</g>
+</svg>
diff --git a/dist/Analytics/AzureDataFactory.png b/dist/Analytics/AzureDataFactory.png
new file mode 100644
index 00000000..d4608ee4
Binary files /dev/null and b/dist/Analytics/AzureDataFactory.png differ
diff --git a/dist/Analytics/AzureDataFactory.puml b/dist/Analytics/AzureDataFactory.puml
new file mode 100644
index 00000000..5a968d9d
--- /dev/null
+++ b/dist/Analytics/AzureDataFactory.puml
@@ -0,0 +1,9 @@
+sprite $AzureDataFactory [70x70/16z] {
+xTG5MiH040NXRNcLtF_4V16qaMaSTcerziTpkSlCRd_jylxCtCFTJwmFMAJoFcLwst1bJT538b-ejLil8HedxDmXYQs5BMbJOlmOitsbbgUH6v23ohhiCvgd
+1DlYI1d7I36gh2l-_BucZ2jRYiUIUG9TPMyvZwhOwolt0NorCfMfJCK-GyceYBfAKXGJJKKKnQ2d61J5QIf6LOAcubGbQIf1LPAcabH5D1LH58Ec8efYD1M3
+eZXDnQbAq5ISgYHD9QYAQ2f9KKpq51T5CMWeZNwLCfMfo8wIhR0ZzjpsV41vzDZsSqYFde5_GfdAl8-cCfKR
+}
+
+AzureEntityColoring(AzureDataFactory)
+!define AzureDataFactory(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataFactory, AzureDataFactory)
+!define AzureDataFactory(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataFactory, AzureDataFactory)
diff --git a/dist/Analytics/AzureDataFactory.svg b/dist/Analytics/AzureDataFactory.svg
new file mode 100644
index 00000000..a2eacde0
--- /dev/null
+++ b/dist/Analytics/AzureDataFactory.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 69.859375 41.300781 L 69.859375 24.359375 L 50.679688 41.019531 L 50.261719 41.019531 L 50.261719 24.359375 L 31.078125 41.019531 L 31.078125 6.160156 C 31.078125 3.21875 24.5 0.28125 15.820313 0.28125 C 7.140625 0.28125 0 3.078125 0 6.160156 L 0 70 L 70 70 Z M 15.820313 8.960938 C 9.519531 8.960938 4.480469 7.421875 4.480469 5.738281 C 4.480469 4.058594 9.519531 2.519531 15.820313 2.519531 C 22.121094 2.519531 27.160156 3.921875 27.160156 5.738281 C 27.019531 7.421875 21.980469 8.960938 15.820313 8.960938 Z M 48.859375 58.660156 L 41.160156 58.660156 L 41.160156 50.960938 L 48.859375 50.960938 Z M 35.28125 58.660156 L 27.578125 58.660156 L 27.578125 50.960938 L 35.28125 50.960938 Z M 54.878906 58.660156 L 54.878906 50.960938 L 62.578125 50.960938 L 62.578125 58.660156 Z M 54.878906 58.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 0 5.738281 L 15.539063 5.738281 L 15.539063 70 L 0 70 Z M 0 5.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.941406 5.738281 C 30.941406 8.820313 23.941406 11.339844 15.398438 11.339844 C 6.859375 11.339844 0 8.820313 0 5.738281 C 0 2.660156 7 0.140625 15.539063 0.140625 C 24.078125 0.140625 30.941406 2.519531 30.941406 5.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 27.859375 5.320313 C 27.859375 7.421875 22.398438 8.960938 15.539063 8.960938 C 8.679688 8.960938 3.21875 7.421875 3.21875 5.320313 C 3.21875 3.21875 8.679688 1.679688 15.539063 1.679688 C 22.398438 1.679688 27.859375 3.359375 27.859375 5.320313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 25.199219 7.558594 C 26.878906 7 27.71875 6.160156 27.71875 5.320313 C 27.71875 3.21875 22.261719 1.679688 15.398438 1.679688 C 8.539063 1.679688 3.078125 3.359375 3.078125 5.320313 C 3.21875 6.160156 4.199219 7 5.738281 7.558594 C 7.980469 6.71875 11.480469 6.160156 15.539063 6.160156 C 19.460938 6.160156 22.960938 6.71875 25.199219 7.558594 "/>
+</g>
+</svg>
diff --git a/dist/Analytics/AzureDataLakeAnalytics(m).png b/dist/Analytics/AzureDataLakeAnalytics(m).png
index b71602a9..cb2c6f81 100644
Binary files a/dist/Analytics/AzureDataLakeAnalytics(m).png and b/dist/Analytics/AzureDataLakeAnalytics(m).png differ
diff --git a/dist/Analytics/AzureDataLakeAnalytics(m).svg b/dist/Analytics/AzureDataLakeAnalytics(m).svg
index 2e89d686..89845130 100644
--- a/dist/Analytics/AzureDataLakeAnalytics(m).svg
+++ b/dist/Analytics/AzureDataLakeAnalytics(m).svg
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 28.679688 0.605469 C 27.144531 -0.0859375 25.332031 -0.226563 23.722656 0.398438 C 22.113281 0.960938 20.785156 2.148438 20.09375 3.75 L 19.183594 5.640625 L 11.988281 5.640625 C 8.5 5.640625 5.636719 8.5 5.636719 11.992188 L 5.636719 35.117188 L 0.613281 45.855469 C -0.0859375 47.390625 -0.226563 49.207031 0.398438 50.804688 C 0.960938 52.414063 2.148438 53.742188 3.746094 54.433594 L 5.636719 55.351563 L 5.636719 57.71875 C 5.636719 61.207031 8.5 64.070313 11.988281 64.070313 L 34.96875 64.070313 L 45.855469 69.167969 C 46.6875 69.589844 47.671875 69.796875 48.578125 69.796875 C 49.34375 69.796875 50.046875 69.65625 50.8125 69.382813 C 52.414063 68.824219 53.742188 67.632813 54.445313 66.023438 L 55.382813 64.070313 L 57.71875 64.070313 C 61.21875 64.070313 64.078125 61.207031 64.078125 57.71875 L 64.078125 39.625 L 69.167969 28.746094 C 69.945313 27.136719 70.011719 25.398438 69.382813 23.722656 C 68.820313 22.113281 67.632813 20.785156 66.035156 20.09375 L 64.078125 19.140625 L 64.078125 11.992188 C 64.078125 8.5 61.21875 5.640625 57.71875 5.640625 L 39.40625 5.640625 Z M 44.949219 30.496094 L 36.078125 30.496094 L 39.773438 18.136719 C 39.851563 17.78125 39.710938 17.433594 39.429688 17.296875 C 39.363281 17.230469 39.222656 17.230469 39.148438 17.230469 C 38.941406 17.230469 38.726563 17.359375 38.597656 17.5 L 24.285156 38.382813 C 24.144531 38.585938 24.144531 38.867188 24.207031 39.082031 C 24.347656 39.289063 24.554688 39.429688 24.835938 39.429688 L 33.421875 39.429688 L 29.585938 51.992188 C 29.511719 52.347656 29.652344 52.695313 29.933594 52.835938 C 30.007813 52.898438 30.148438 52.898438 30.214844 52.898438 C 30.417969 52.898438 30.636719 52.757813 30.777344 52.617188 L 45.5 31.542969 C 45.574219 31.402344 45.640625 31.261719 45.640625 31.121094 C 45.640625 30.765625 45.292969 30.496094 44.949219 30.496094 Z M 11.988281 9.820313 L 57.71875 9.820313 C 58.839844 9.820313 59.8125 10.726563 59.8125 11.914063 L 59.8125 57.652344 C 59.8125 58.765625 58.90625 59.75 57.71875 59.75 L 11.988281 59.75 C 10.878906 59.75 9.894531 58.839844 9.894531 57.652344 L 9.894531 11.914063 C 9.894531 10.804688 10.800781 9.820313 11.988281 9.820313 Z M 11.988281 9.820313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 57.890625 64.261719 L 12.039063 64.261719 C 8.539063 64.261719 5.671875 61.390625 5.671875 57.890625 L 5.671875 12.039063 C 5.671875 8.539063 8.539063 5.671875 12.039063 5.671875 L 57.890625 5.671875 C 61.390625 5.671875 64.261719 8.539063 64.261719 12.039063 L 64.261719 57.890625 C 64.261719 61.390625 61.390625 64.261719 57.890625 64.261719 Z M 12.039063 9.871094 C 10.851563 9.871094 9.941406 10.851563 9.941406 11.96875 L 9.941406 57.820313 C 9.941406 59.011719 10.921875 59.921875 12.039063 59.921875 L 57.890625 59.921875 C 59.078125 59.921875 59.988281 58.941406 59.988281 57.820313 L 59.988281 11.96875 C 59.988281 10.78125 59.011719 9.871094 57.890625 9.871094 Z M 12.039063 9.871094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 28.769531 0.628906 C 27.230469 -0.0703125 25.410156 -0.210938 23.800781 0.421875 C 22.191406 0.980469 20.859375 2.171875 20.160156 3.78125 L 19.179688 5.808594 L 39.828125 5.808594 Z M 28.769531 0.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 69.578125 23.800781 C 69.019531 22.191406 67.828125 20.859375 66.21875 20.160156 L 64.191406 19.179688 L 64.191406 39.898438 L 69.371094 28.839844 C 70.140625 27.230469 70.210938 25.480469 69.578125 23.800781 Z M 69.578125 23.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 0.628906 45.988281 C -0.0703125 47.53125 -0.210938 49.351563 0.421875 50.960938 C 0.980469 52.570313 2.171875 53.898438 3.78125 54.601563 L 5.808594 55.578125 L 5.808594 34.929688 Z M 0.628906 45.988281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 45.988281 69.371094 C 46.828125 69.789063 47.808594 70 48.71875 70 C 49.488281 70 50.191406 69.859375 50.960938 69.578125 C 52.570313 69.019531 53.898438 67.828125 54.601563 66.21875 L 55.578125 64.191406 L 34.929688 64.191406 Z M 45.988281 69.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 12.039063 9.871094 C 10.851563 9.871094 9.941406 10.851563 9.941406 11.96875 L 9.941406 57.820313 C 9.941406 59.011719 10.921875 59.921875 12.039063 59.921875 L 57.890625 59.921875 C 59.078125 59.921875 59.988281 58.941406 59.988281 57.820313 L 59.988281 11.96875 C 59.988281 10.78125 59.011719 9.871094 57.890625 9.871094 Z M 12.039063 9.871094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 45.078125 30.589844 L 36.191406 30.589844 L 39.898438 18.199219 C 39.96875 17.851563 39.828125 17.5 39.550781 17.359375 C 39.480469 17.289063 39.339844 17.289063 39.269531 17.289063 C 39.058594 17.289063 38.851563 17.429688 38.710938 17.570313 L 24.359375 38.5 C 24.21875 38.710938 24.21875 38.988281 24.289063 39.199219 C 24.429688 39.410156 24.640625 39.550781 24.921875 39.550781 L 33.53125 39.550781 L 29.679688 52.148438 C 29.609375 52.5 29.75 52.851563 30.03125 52.988281 C 30.101563 53.058594 30.238281 53.058594 30.308594 53.058594 C 30.519531 53.058594 30.730469 52.921875 30.871094 52.78125 L 45.640625 31.640625 C 45.710938 31.5 45.78125 31.359375 45.78125 31.21875 C 45.78125 30.871094 45.429688 30.589844 45.078125 30.589844 Z M 45.078125 30.589844 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureDataLakeAnalytics.png b/dist/Analytics/AzureDataLakeAnalytics.png
index 8554980c..f16d2777 100644
Binary files a/dist/Analytics/AzureDataLakeAnalytics.png and b/dist/Analytics/AzureDataLakeAnalytics.png differ
diff --git a/dist/Analytics/AzureDataLakeAnalytics.puml b/dist/Analytics/AzureDataLakeAnalytics.puml
index 5362f62b..9aa1576a 100644
--- a/dist/Analytics/AzureDataLakeAnalytics.puml
+++ b/dist/Analytics/AzureDataLakeAnalytics.puml
@@ -1,9 +1,9 @@
 sprite $AzureDataLakeAnalytics [70x70/16z] {
-xTY53kGm30JG69hOy___UtnUQ7QAWeCHBJx5SjH0cyT7PYpIhaG2Fv9TBY29IjUpIiTpXbuQIYNim9_LVcPWbN1RHMLjwC3Xn7kjbZWJVnr9ubpiMHa0a74e
-2G3nX0W0z7Om2m1egoW0jCF9rv8CG1vN0e1VLluhijoXZBn1SVHFoj2zYYJiam8CsQS4idrMaBf7MO315AHiAvg0KmMTAlLRuKfkAXr0DAvWIr40MAugMO-Y
-2nNr-X5J1bUiMa0L9Kgjajr-HUPADAeCl6RC5QEAuoqwLQAj5BRgBssg-4fXzKIRAlayzDog9sMk-FFRtAh7vvtELWLDbE3zgPyiAvFMCrVgSyL4iVuhKNDY
-glJNNYJTAlQjDK11bTgcS6LGHMlIKaL0bQNwG9NEbQXwc2995QbcKcK1LRn-I9NWogX9IvMaYW0fbnMlISkLGPM1tlOeJfMCdJko88gaxbGao5Xa_-wm9-xO
-Oqh_UtRDrqysVkyfgrQ1OrbtLd4oHfOV4hx-M-1mqjegQZvFJwmot4sFTcFb4874aopzHvmWIp_Fl06fxKfqvFoowYi
+xTY7RYCX58NXMm_m_W-ynKkM6ECpXQXi-LKZfC-vqsTadQFM4YexQMcFQkuufVqETXV9BkmvjJrNNCwdlQml5TT52o9mkPndDTmgdX35pVopyckSl1GUVLOc
+bZGFODFVShbu_csxfnY0s5V-A_uLIk0B54E-Kz9EAy3RYT2AdLC2qFTAQywLiIfCQNP20U1SASTA0b2kj4F5-zgMeW0Gkqe2W6qgZhv4bSeLVI1vf0HNyg64
+VhHMgb35CRLMaYgAALihIfMSa9Ib0c5Aq7c6ekpuvFCC1TB3Ik5tzg5yu5QxmkTPAqLwM2Y6ALqgOqvjAsLwDd1PAoazV2ZaJCgZUu0sgkIOXod9bJ4FKxHI
+nSOyJCb6bHXBJAbS6JkJAT66md-EBHQkn5XWIkKA0DrMjE_alOcyx-IzhPjzdhqz3PTpYbMYg9nKHD6LpMTCmr_trApt51yAFNDvy_Kh0I3zKl5oAJNSBCWz
+ZCJl_xxxd_JCOrtYjOnmLxcIPfiBkP5cVKAgt2m-EowoxwJivENDHvtl
 }
 
 AzureEntityColoring(AzureDataLakeAnalytics)
diff --git a/dist/Analytics/AzureDataLakeAnalytics.svg b/dist/Analytics/AzureDataLakeAnalytics.svg
index ec7d205a..0008baca 100644
--- a/dist/Analytics/AzureDataLakeAnalytics.svg
+++ b/dist/Analytics/AzureDataLakeAnalytics.svg
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 57.871094 64.242188 L 12.023438 64.242188 C 8.523438 64.242188 5.652344 61.371094 5.652344 57.871094 L 5.652344 12.023438 C 5.652344 8.523438 8.523438 5.652344 12.023438 5.652344 L 57.871094 5.652344 C 61.371094 5.652344 64.242188 8.523438 64.242188 12.023438 L 64.242188 57.871094 C 64.242188 61.371094 61.371094 64.242188 57.871094 64.242188 Z M 12.023438 9.851563 C 10.832031 9.851563 9.921875 10.832031 9.921875 11.953125 L 9.921875 57.800781 C 9.921875 58.992188 10.902344 59.902344 12.023438 59.902344 L 57.871094 59.902344 C 59.0625 59.902344 59.972656 58.921875 59.972656 57.800781 L 59.972656 11.953125 C 59.972656 10.761719 58.992188 9.851563 57.871094 9.851563 Z M 12.023438 9.851563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 28.753906 0.613281 C 27.210938 -0.0859375 25.390625 -0.226563 23.78125 0.402344 C 22.171875 0.960938 20.84375 2.152344 20.140625 3.761719 L 19.164063 5.792969 L 39.8125 5.792969 Z M 28.753906 0.613281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 69.5625 23.78125 C 69.003906 22.171875 67.8125 20.84375 66.203125 20.140625 L 64.171875 19.164063 L 64.171875 39.882813 L 69.351563 28.824219 C 70.121094 27.210938 70.191406 25.460938 69.5625 23.78125 Z M 69.5625 23.78125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 0.613281 45.972656 C -0.0859375 47.511719 -0.226563 49.332031 0.402344 50.941406 C 0.960938 52.550781 2.152344 53.882813 3.761719 54.582031 L 5.792969 55.5625 L 5.792969 34.914063 Z M 0.613281 45.972656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 45.972656 69.351563 C 46.8125 69.773438 47.792969 69.980469 48.703125 69.980469 C 49.472656 69.980469 50.171875 69.84375 50.941406 69.5625 C 52.550781 69.003906 53.882813 67.8125 54.582031 66.203125 L 55.5625 64.171875 L 34.914063 64.171875 Z M 45.972656 69.351563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 12.023438 9.851563 C 10.832031 9.851563 9.921875 10.832031 9.921875 11.953125 L 9.921875 57.800781 C 9.921875 58.992188 10.902344 59.902344 12.023438 59.902344 L 57.871094 59.902344 C 59.0625 59.902344 59.972656 58.921875 59.972656 57.800781 L 59.972656 11.953125 C 59.972656 10.761719 58.992188 9.851563 57.871094 9.851563 Z M 12.023438 9.851563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 45.0625 30.574219 L 36.171875 30.574219 L 39.882813 18.183594 C 39.953125 17.832031 39.8125 17.480469 39.53125 17.34375 C 39.460938 17.273438 39.324219 17.273438 39.253906 17.273438 C 39.042969 17.273438 38.832031 17.414063 38.691406 17.550781 L 24.34375 38.480469 C 24.203125 38.691406 24.203125 38.972656 24.273438 39.183594 C 24.414063 39.390625 24.621094 39.53125 24.902344 39.53125 L 33.511719 39.53125 L 29.664063 52.132813 C 29.59375 52.480469 29.730469 52.832031 30.011719 52.972656 C 30.082031 53.042969 30.222656 53.042969 30.292969 53.042969 C 30.503906 53.042969 30.710938 52.902344 30.851563 52.761719 L 45.621094 31.621094 C 45.691406 31.480469 45.761719 31.34375 45.761719 31.203125 C 45.761719 30.851563 45.414063 30.574219 45.0625 30.574219 Z M 45.0625 30.574219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 57.890625 64.261719 L 12.039063 64.261719 C 8.539063 64.261719 5.671875 61.390625 5.671875 57.890625 L 5.671875 12.039063 C 5.671875 8.539063 8.539063 5.671875 12.039063 5.671875 L 57.890625 5.671875 C 61.390625 5.671875 64.261719 8.539063 64.261719 12.039063 L 64.261719 57.890625 C 64.261719 61.390625 61.390625 64.261719 57.890625 64.261719 Z M 12.039063 9.871094 C 10.851563 9.871094 9.941406 10.851563 9.941406 11.96875 L 9.941406 57.820313 C 9.941406 59.011719 10.921875 59.921875 12.039063 59.921875 L 57.890625 59.921875 C 59.078125 59.921875 59.988281 58.941406 59.988281 57.820313 L 59.988281 11.96875 C 59.988281 10.78125 59.011719 9.871094 57.890625 9.871094 Z M 12.039063 9.871094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 28.769531 0.628906 C 27.230469 -0.0703125 25.410156 -0.210938 23.800781 0.421875 C 22.191406 0.980469 20.859375 2.171875 20.160156 3.78125 L 19.179688 5.808594 L 39.828125 5.808594 Z M 28.769531 0.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 69.578125 23.800781 C 69.019531 22.191406 67.828125 20.859375 66.21875 20.160156 L 64.191406 19.179688 L 64.191406 39.898438 L 69.371094 28.839844 C 70.140625 27.230469 70.210938 25.480469 69.578125 23.800781 Z M 69.578125 23.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 0.628906 45.988281 C -0.0703125 47.53125 -0.210938 49.351563 0.421875 50.960938 C 0.980469 52.570313 2.171875 53.898438 3.78125 54.601563 L 5.808594 55.578125 L 5.808594 34.929688 Z M 0.628906 45.988281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 45.988281 69.371094 C 46.828125 69.789063 47.808594 70 48.71875 70 C 49.488281 70 50.191406 69.859375 50.960938 69.578125 C 52.570313 69.019531 53.898438 67.828125 54.601563 66.21875 L 55.578125 64.191406 L 34.929688 64.191406 Z M 45.988281 69.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 12.039063 9.871094 C 10.851563 9.871094 9.941406 10.851563 9.941406 11.96875 L 9.941406 57.820313 C 9.941406 59.011719 10.921875 59.921875 12.039063 59.921875 L 57.890625 59.921875 C 59.078125 59.921875 59.988281 58.941406 59.988281 57.820313 L 59.988281 11.96875 C 59.988281 10.78125 59.011719 9.871094 57.890625 9.871094 Z M 12.039063 9.871094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 45.078125 30.589844 L 36.191406 30.589844 L 39.898438 18.199219 C 39.96875 17.851563 39.828125 17.5 39.550781 17.359375 C 39.480469 17.289063 39.339844 17.289063 39.269531 17.289063 C 39.058594 17.289063 38.851563 17.429688 38.710938 17.570313 L 24.359375 38.5 C 24.21875 38.710938 24.21875 38.988281 24.289063 39.199219 C 24.429688 39.410156 24.640625 39.550781 24.921875 39.550781 L 33.53125 39.550781 L 29.679688 52.148438 C 29.609375 52.5 29.75 52.851563 30.03125 52.988281 C 30.101563 53.058594 30.238281 53.058594 30.308594 53.058594 C 30.519531 53.058594 30.730469 52.921875 30.871094 52.78125 L 45.640625 31.640625 C 45.710938 31.5 45.78125 31.359375 45.78125 31.21875 C 45.78125 30.871094 45.429688 30.589844 45.078125 30.589844 Z M 45.078125 30.589844 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureDataLakeStoreGen1(m).png b/dist/Analytics/AzureDataLakeStoreGen1(m).png
new file mode 100644
index 00000000..920d6b81
Binary files /dev/null and b/dist/Analytics/AzureDataLakeStoreGen1(m).png differ
diff --git a/dist/Analytics/AzureDataLakeStoreGen1(m).svg b/dist/Analytics/AzureDataLakeStoreGen1(m).svg
new file mode 100644
index 00000000..9c1e10dd
--- /dev/null
+++ b/dist/Analytics/AzureDataLakeStoreGen1(m).svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 41.371094 13.160156 L 39.339844 9.660156 C 38.570313 8.328125 37.101563 7.488281 35.558594 7.488281 L 4.339844 7.488281 C 1.960938 7.488281 0 9.449219 0 11.828125 L 0 14.070313 L 42.140625 14.070313 C 41.789063 13.859375 41.578125 13.511719 41.371094 13.160156 Z M 41.371094 13.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 67.269531 16.308594 L 0 16.308594 L 0 58.101563 C 0 60.480469 1.960938 62.441406 4.339844 62.441406 L 65.660156 62.441406 C 68.039063 62.441406 70 60.480469 70 58.101563 L 70 20.300781 C 70 18.550781 68.878906 17.011719 67.269531 16.308594 Z M 43.890625 37.308594 L 31.5 55.019531 C 31.359375 55.160156 31.21875 55.300781 31.011719 55.300781 C 30.941406 55.300781 30.800781 55.300781 30.730469 55.230469 C 30.449219 55.089844 30.308594 54.808594 30.449219 54.53125 L 33.671875 43.960938 L 26.460938 43.960938 C 26.25 43.960938 26.039063 43.820313 25.898438 43.609375 C 25.828125 43.398438 25.828125 43.191406 25.96875 42.980469 L 38.011719 25.480469 C 38.148438 25.339844 38.289063 25.199219 38.5 25.199219 C 38.570313 25.199219 38.640625 25.199219 38.78125 25.269531 C 39.058594 25.410156 39.199219 25.691406 39.058594 25.96875 L 35.980469 36.328125 L 43.398438 36.328125 C 43.75 36.328125 44.03125 36.609375 44.03125 36.960938 C 44.03125 37.101563 43.960938 37.171875 43.890625 37.308594 Z M 43.890625 37.308594 "/>
+</g>
+</svg>
diff --git a/dist/Analytics/AzureDataLakeStoreGen1.png b/dist/Analytics/AzureDataLakeStoreGen1.png
new file mode 100644
index 00000000..b879aa9a
Binary files /dev/null and b/dist/Analytics/AzureDataLakeStoreGen1.png differ
diff --git a/dist/Analytics/AzureDataLakeStoreGen1.puml b/dist/Analytics/AzureDataLakeStoreGen1.puml
new file mode 100644
index 00000000..075e04db
--- /dev/null
+++ b/dist/Analytics/AzureDataLakeStoreGen1.puml
@@ -0,0 +1,8 @@
+sprite $AzureDataLakeStoreGen1 [70x70/16z] {
+xTDLKWKm40NH7hkL_MyOTqqn0pmx_v6ES3uk8hyHV2lMXkHhlhO4NzBQmvVMfXgPPTd8BE8BjerVbtq1cc2QK3eH5r7gIqfze3x3rHOC11KmqODFz90JFKpq
+O6foW9ZemUEUVeXNgj5pfn6Ml6GZFPheoOaU_yyUrRtaLWtyHk8WFb9Dz2WcUcHWQWFKbf1gSrnzeBwYr5UfCrMQ41fGfFeCFAidE1iNrm
+}
+
+AzureEntityColoring(AzureDataLakeStoreGen1)
+!define AzureDataLakeStoreGen1(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataLakeStoreGen1, AzureDataLakeStoreGen1)
+!define AzureDataLakeStoreGen1(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataLakeStoreGen1, AzureDataLakeStoreGen1)
diff --git a/dist/Analytics/AzureDataLakeStoreGen1.svg b/dist/Analytics/AzureDataLakeStoreGen1.svg
new file mode 100644
index 00000000..bb3566dd
--- /dev/null
+++ b/dist/Analytics/AzureDataLakeStoreGen1.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 41.371094 13.160156 L 39.339844 9.660156 C 38.570313 8.328125 37.101563 7.488281 35.558594 7.488281 L 4.339844 7.488281 C 1.960938 7.488281 0 9.449219 0 11.828125 L 0 14.070313 L 42.140625 14.070313 C 41.789063 13.859375 41.578125 13.511719 41.371094 13.160156 Z M 41.371094 13.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 67.269531 16.308594 L 0 16.308594 L 0 58.101563 C 0 60.480469 1.960938 62.441406 4.339844 62.441406 L 65.660156 62.441406 C 68.039063 62.441406 70 60.480469 70 58.101563 L 70 20.300781 C 70 18.550781 68.878906 17.011719 67.269531 16.308594 Z M 43.890625 37.308594 L 31.5 55.019531 C 31.359375 55.160156 31.21875 55.300781 31.011719 55.300781 C 30.941406 55.300781 30.800781 55.300781 30.730469 55.230469 C 30.449219 55.089844 30.308594 54.808594 30.449219 54.53125 L 33.671875 43.960938 L 26.460938 43.960938 C 26.25 43.960938 26.039063 43.820313 25.898438 43.609375 C 25.828125 43.398438 25.828125 43.191406 25.96875 42.980469 L 38.011719 25.480469 C 38.148438 25.339844 38.289063 25.199219 38.5 25.199219 C 38.570313 25.199219 38.640625 25.199219 38.78125 25.269531 C 39.058594 25.410156 39.199219 25.691406 39.058594 25.96875 L 35.980469 36.328125 L 43.398438 36.328125 C 43.75 36.328125 44.03125 36.609375 44.03125 36.960938 C 44.03125 37.101563 43.960938 37.171875 43.890625 37.308594 Z M 43.890625 37.308594 "/>
+</g>
+</svg>
diff --git a/dist/Analytics/AzureDatabricks(m).png b/dist/Analytics/AzureDatabricks(m).png
index b853708e..ae8c05ff 100644
Binary files a/dist/Analytics/AzureDatabricks(m).png and b/dist/Analytics/AzureDatabricks(m).png differ
diff --git a/dist/Analytics/AzureDatabricks(m).svg b/dist/Analytics/AzureDatabricks(m).svg
index 0c789194..3445009a 100644
--- a/dist/Analytics/AzureDatabricks(m).svg
+++ b/dist/Analytics/AzureDatabricks(m).svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="67pt" height="70pt" viewBox="0 0 67 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 0 40.472656 L 33.476563 23.042969 L 66.964844 40.472656 L 66.964844 51.671875 L 33.601563 70.09375 L 0 51.671875 Z M 0 40.472656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,145,252);fill-opacity:1;" d="M 33.476563 58.167969 L 0 40.484375 L 33.5 23.042969 L 67 40.484375 Z M 33.476563 58.167969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 0 17.429688 L 33.476563 0 L 66.964844 17.429688 L 66.964844 28.632813 L 33.601563 47.050781 L 0 28.632813 Z M 0 17.429688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,145,252);fill-opacity:1;" d="M 33.476563 35.113281 L 0 17.429688 L 33.5 0 L 67 17.429688 Z M 33.476563 35.113281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 0 53.023438 L 33.5 70.726563 L 67 53.023438 L 67 41.679688 L 0 41.679688 Z M 0 53.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13,152,255);fill-opacity:1;" d="M 33.5 23.972656 L 0 41.679688 L 33.5 59.386719 L 67 41.679688 Z M 33.5 23.972656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 0 29.050781 L 33.5 46.753906 L 67 29.050781 L 67 17.703125 L 0 17.703125 Z M 0 29.050781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13,152,255);fill-opacity:1;" d="M 33.5 0 L 0 17.703125 L 33.5 35.410156 L 67 17.703125 Z M 33.5 0 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureDatabricks.png b/dist/Analytics/AzureDatabricks.png
index 2dd4fe86..e07b677a 100644
Binary files a/dist/Analytics/AzureDatabricks.png and b/dist/Analytics/AzureDatabricks.png differ
diff --git a/dist/Analytics/AzureDatabricks.puml b/dist/Analytics/AzureDatabricks.puml
index 62662467..0715ce01 100644
--- a/dist/Analytics/AzureDatabricks.puml
+++ b/dist/Analytics/AzureDatabricks.puml
@@ -1,9 +1,8 @@
 sprite $AzureDatabricks [67x70/16z] {
-fTS5SiD044HHQN7W_kSDW-5RBUZ2q2jlBqnbsSuwVIoNCjpC12A1x_HpGBVRj9F05QGPfUu7ghrAEG1SGOg9pFKIe95rsgxuq2T9PsX0Prm1yDHt17GQ7CN3
-gGGSH-noHePV0ZmiKo02oFmaCi9F0f5VX404y4SSNutxD_1DCA9Bk248qG0IZ32012CC0C681hw902DS0hV4EWGYWEXVBsRkMOq72F7x51UNYFCQoiq050W2
-NX_6S22oKGACwS78gnPncFFlyZVTAivYH5wlhpm10g6MLvx57W9udj3h56S8Z-qjSWCGei-zzoFNWN_Ju2UCCE2HbYaHyIks-Hb3NlvlGYAYBfDjPVZL8I0t
-pEJ6y_A04CYn8H2kFW4G0b4lg1M1o6F_ULchxqCst_0MY6Z0cto_vI2xpJfvBcuCih4-_okIY32GjYuGxZKsMeHGhzmYXdiLBMBM0GYqYE5UkKMDU7AyBXpT
-gsvHzwfRrBt6f18qCkLHqYakMzIfhbjy1m
+xTL7OYGn28NXKce1zx_lZ3CEI3zMRVsM3by7ADu5QRDT4094v0vIfxncraFW8Px70LBU04VABu4XFpFAEU18LkYoJa_ESPVPSW0Wl0YCL5m4pgFo8Z1IS8wS
+KHXWX1U1qtcEgGbt0XWnlKcecDr2r4pC007WdJ0x19muUYDcJXmXQW4H800u4ICCE04804umuW0GZX3WnB0e27YqNTV8lf7mxyRRoSiWQa66NwqP8WHylPyr
+HdR0V0SSaH1P0N6NT8ko74DSvsgvQ5Zompyr0b79UmqmeZ_wEQW19U07uW0Y6fJyieWOy98tpJvIknwH308zmeXkhhZi_qJvjzmZ2W3qo5-F80048T5Vq_Nc
+nwzZ1V0Lvmh8NV4gWC0LPoG6v4SDD0sH9H3MGDTyZ_HhaM4Oh_CxY0DXWZM95e6GkG4c0pvXMWH6S14uJN4HE5rn4JY35Y6F0F0V
 }
 
 AzureEntityColoring(AzureDatabricks)
diff --git a/dist/Analytics/AzureDatabricks.svg b/dist/Analytics/AzureDatabricks.svg
index 2b25bd69..b501852c 100644
--- a/dist/Analytics/AzureDatabricks.svg
+++ b/dist/Analytics/AzureDatabricks.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="67pt" height="70pt" viewBox="0 0 67 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.27451%,12.941176%,14.901961%);fill-opacity:1;" d="M 0 40.472656 L 33.476563 23.042969 L 66.964844 40.472656 L 66.964844 51.671875 L 33.601563 70.09375 L 0 51.671875 Z M 0 40.472656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.117647%,32.941176%,17.647059%);fill-opacity:1;" d="M 33.476563 58.167969 L 0 40.484375 L 33.5 23.042969 L 67 40.484375 Z M 33.476563 58.167969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.27451%,12.941176%,14.901961%);fill-opacity:1;" d="M 0 17.429688 L 33.476563 0 L 66.964844 17.429688 L 66.964844 28.632813 L 33.601563 47.050781 L 0 28.632813 Z M 0 17.429688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.117647%,32.941176%,17.647059%);fill-opacity:1;" d="M 33.476563 35.113281 L 0 17.429688 L 33.5 0 L 67 17.429688 Z M 33.476563 35.113281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(87.45098%,14.901961%,16.862745%);fill-opacity:1;" d="M 0 53.023438 L 33.5 70.726563 L 67 53.023438 L 67 41.679688 L 0 41.679688 Z M 0 53.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,37.254902%,19.607843%);fill-opacity:1;" d="M 33.5 23.972656 L 0 41.679688 L 33.5 59.386719 L 67 41.679688 Z M 33.5 23.972656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(87.45098%,14.901961%,16.862745%);fill-opacity:1;" d="M 0 29.050781 L 33.5 46.753906 L 67 29.050781 L 67 17.703125 L 0 17.703125 Z M 0 29.050781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,37.254902%,19.607843%);fill-opacity:1;" d="M 33.5 0 L 0 17.703125 L 33.5 35.410156 L 67 17.703125 Z M 33.5 0 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureEventHub(m).png b/dist/Analytics/AzureEventHub(m).png
index 024ae3ad..7ffb718d 100644
Binary files a/dist/Analytics/AzureEventHub(m).png and b/dist/Analytics/AzureEventHub(m).png differ
diff --git a/dist/Analytics/AzureEventHub(m).svg b/dist/Analytics/AzureEventHub(m).svg
index b4dba8a6..7df2dca5 100644
--- a/dist/Analytics/AzureEventHub(m).svg
+++ b/dist/Analytics/AzureEventHub(m).svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="68pt" height="70pt" viewBox="0 0 68 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,43.529412%,83.137255%);fill-opacity:1;" d="M 41.648438 31.242188 C 41.648438 31.925781 41.140625 32.4375 40.460938 32.4375 L 31.449219 32.4375 C 30.769531 32.4375 30.261719 31.925781 30.261719 31.242188 L 30.261719 24.585938 C 30.261719 23.902344 30.769531 23.390625 31.449219 23.390625 L 40.460938 23.390625 C 41.140625 23.390625 41.648438 23.902344 41.648438 24.585938 Z M 41.648438 31.242188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,43.529412%,83.137255%);fill-opacity:1;" d="M 57.800781 38.242188 C 57.800781 38.925781 57.289063 39.4375 56.609375 39.4375 L 47.601563 39.4375 C 46.921875 39.4375 46.410156 38.925781 46.410156 38.242188 L 46.410156 31.585938 C 46.410156 30.902344 46.921875 30.390625 47.601563 30.390625 L 56.609375 30.390625 C 57.289063 30.390625 57.800781 30.902344 57.800781 31.585938 Z M 57.800781 38.242188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,43.529412%,83.137255%);fill-opacity:1;" d="M 41.648438 45.074219 C 41.648438 45.757813 41.140625 46.269531 40.460938 46.269531 L 31.449219 46.269531 C 30.769531 46.269531 30.261719 45.757813 30.261719 45.074219 L 30.261719 38.414063 C 30.261719 37.730469 30.769531 37.21875 31.449219 37.21875 L 40.460938 37.21875 C 41.140625 37.21875 41.648438 37.730469 41.648438 38.414063 Z M 41.648438 45.074219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,43.529412%,83.137255%);fill-opacity:1;" d="M 25.5 24.242188 C 25.5 24.925781 24.988281 25.4375 24.308594 25.4375 L 15.128906 25.4375 C 14.449219 25.4375 13.941406 24.925781 13.941406 24.242188 L 13.941406 17.242188 C 13.941406 16.5625 14.449219 16.046875 15.128906 16.046875 L 24.140625 16.046875 C 24.988281 16.046875 25.5 16.5625 25.5 17.242188 Z M 25.5 24.242188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,43.529412%,83.137255%);fill-opacity:1;" d="M 65.789063 0 L 1.191406 0 C 0.511719 0 0 0.511719 0 1.195313 L 0 15.023438 C 0 15.707031 0.511719 16.21875 1.191406 16.21875 L 8.160156 16.21875 C 8.839844 16.21875 9.351563 15.707031 9.351563 15.023438 L 9.351563 9.21875 L 57.800781 9.21875 L 57.800781 15.023438 C 57.800781 15.707031 58.308594 16.21875 59.160156 16.21875 L 65.789063 16.21875 C 66.46875 16.21875 66.980469 15.707031 66.980469 15.023438 L 66.980469 1.023438 C 66.980469 0.339844 66.46875 0 65.789063 0 Z M 65.789063 0 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,43.529412%,83.137255%);fill-opacity:1;" d="M 65.789063 53.4375 L 59.160156 53.4375 C 58.480469 53.4375 57.96875 53.953125 57.96875 54.632813 L 57.96875 60.269531 L 9.351563 60.269531 L 9.351563 54.464844 C 9.351563 53.78125 8.839844 53.269531 7.988281 53.269531 L 1.359375 53.269531 C 0.679688 53.269531 0.171875 53.78125 0.171875 54.632813 L 0.171875 68.292969 C 0.171875 68.976563 0.679688 69.488281 1.359375 69.488281 L 65.960938 69.488281 C 66.640625 69.488281 67.148438 68.976563 67.148438 68.292969 L 67.148438 54.632813 C 66.980469 53.953125 66.46875 53.4375 65.789063 53.4375 Z M 65.789063 53.4375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,43.529412%,83.137255%);fill-opacity:1;" d="M 25.328125 38.074219 C 25.328125 38.757813 24.820313 39.269531 24.140625 39.269531 L 15.128906 39.269531 C 14.449219 39.269531 13.941406 38.757813 13.941406 38.074219 L 13.941406 31.414063 C 13.941406 30.730469 14.449219 30.21875 15.128906 30.21875 L 24.140625 30.21875 C 24.820313 30.21875 25.328125 30.730469 25.328125 31.414063 Z M 25.328125 38.074219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,43.529412%,83.137255%);fill-opacity:1;" d="M 25.328125 51.902344 C 25.328125 52.585938 24.820313 53.097656 24.140625 53.097656 L 15.128906 53.097656 C 14.449219 53.097656 13.941406 52.585938 13.941406 51.902344 L 13.941406 45.242188 C 13.941406 44.5625 14.449219 44.046875 15.128906 44.046875 L 24.140625 44.046875 C 24.820313 44.046875 25.328125 44.5625 25.328125 45.242188 Z M 25.328125 51.902344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 41.5625 31.71875 C 41.5625 32.375 41.125 32.8125 40.46875 32.8125 L 31.9375 32.8125 C 31.28125 32.8125 30.84375 32.375 30.84375 31.71875 L 30.84375 25.375 C 30.84375 24.71875 31.28125 24.28125 31.9375 24.28125 L 40.46875 24.28125 C 41.125 24.28125 41.5625 24.71875 41.5625 25.375 Z M 41.5625 31.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 56.875 38.28125 C 56.875 38.9375 56.4375 39.375 55.78125 39.375 L 47.25 39.375 C 46.59375 39.375 46.15625 38.9375 46.15625 38.28125 L 46.15625 31.9375 C 46.15625 31.28125 46.59375 30.84375 47.25 30.84375 L 55.78125 30.84375 C 56.4375 30.84375 56.875 31.28125 56.875 31.9375 Z M 56.875 38.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 41.5625 44.84375 C 41.5625 45.5 41.125 45.9375 40.46875 45.9375 L 31.9375 45.9375 C 31.28125 45.9375 30.84375 45.5 30.84375 44.84375 L 30.84375 38.5 C 30.84375 37.84375 31.28125 37.40625 31.9375 37.40625 L 40.46875 37.40625 C 41.125 37.40625 41.5625 37.84375 41.5625 38.5 Z M 41.5625 44.84375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 26.25 25.15625 C 26.25 25.8125 25.8125 26.25 25.15625 26.25 L 16.40625 26.25 C 15.75 26.25 15.3125 25.8125 15.3125 25.15625 L 15.3125 18.59375 C 15.3125 17.9375 15.75 17.5 16.40625 17.5 L 24.9375 17.5 C 25.8125 17.5 26.25 17.9375 26.25 18.59375 Z M 26.25 25.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 64.53125 2.1875 L 3.28125 2.1875 C 2.625 2.1875 2.1875 2.625 2.1875 3.28125 L 2.1875 16.40625 C 2.1875 17.0625 2.625 17.5 3.28125 17.5 L 9.84375 17.5 C 10.5 17.5 10.9375 17.0625 10.9375 16.40625 L 10.9375 10.9375 L 56.875 10.9375 L 56.875 16.40625 C 56.875 17.0625 57.3125 17.5 58.1875 17.5 L 64.53125 17.5 C 65.1875 17.5 65.625 17.0625 65.625 16.40625 L 65.625 3.28125 C 65.625 2.625 65.1875 2.1875 64.53125 2.1875 Z M 64.53125 2.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 64.53125 52.71875 L 58.1875 52.71875 C 57.53125 52.71875 57.09375 53.15625 57.09375 53.8125 L 57.09375 59.0625 L 10.9375 59.0625 L 10.9375 53.59375 C 10.9375 52.9375 10.5 52.5 9.625 52.5 L 3.28125 52.5 C 2.625 52.5 2.1875 52.9375 2.1875 53.8125 L 2.1875 66.71875 C 2.1875 67.375 2.625 67.8125 3.28125 67.8125 L 64.53125 67.8125 C 65.1875 67.8125 65.625 67.375 65.625 66.71875 L 65.625 53.8125 C 65.625 53.15625 65.1875 52.71875 64.53125 52.71875 Z M 64.53125 52.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 26.25 38.28125 C 26.25 38.9375 25.8125 39.375 25.15625 39.375 L 16.40625 39.375 C 15.75 39.375 15.3125 38.9375 15.3125 38.28125 L 15.3125 31.71875 C 15.3125 31.0625 15.75 30.625 16.40625 30.625 L 24.9375 30.625 C 25.8125 30.625 26.25 31.0625 26.25 31.71875 Z M 26.25 38.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 26.25 51.40625 C 26.25 52.0625 25.8125 52.5 25.15625 52.5 L 16.40625 52.5 C 15.75 52.5 15.3125 52.0625 15.3125 51.40625 L 15.3125 44.84375 C 15.3125 44.1875 15.75 43.75 16.40625 43.75 L 24.9375 43.75 C 25.8125 43.75 26.25 44.1875 26.25 44.84375 Z M 26.25 51.40625 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureEventHub.png b/dist/Analytics/AzureEventHub.png
index 8d44b678..badcb207 100644
Binary files a/dist/Analytics/AzureEventHub.png and b/dist/Analytics/AzureEventHub.png differ
diff --git a/dist/Analytics/AzureEventHub.puml b/dist/Analytics/AzureEventHub.puml
index 5e83de54..27dd08b8 100644
--- a/dist/Analytics/AzureEventHub.puml
+++ b/dist/Analytics/AzureEventHub.puml
@@ -1,7 +1,7 @@
-sprite $AzureEventHub [68x70/16z] {
-xTF5bSKm341HaKdzzplaC4UPpxfhdsTEUbK2lUuJ6ju8T8uiD1ZEeRM6Dues2Cv1RHH0hceYbbR6tGXNqu7Q2s1mduOtK3gMXi2Ff9q81t5i1J0rfhonVwRI
-mGDtoqkDe9rqj46nW_0ZQYSVQqnv0qC73GrQljlz1aa7bXeOE-J_zXY9dTs6wTzEMDwOgM7WZPr_UnXAnPD_ox2BAe1acBSgMXN8vlrh2rSQteXoqgHXyWaD
-RqWk5oNu1W
+sprite $AzureEventHub [70x70/16z] {
+xTS5ZiDG38JXCOJlVzwbjtMbyYYS-1ErWJzCs1HlHwbBfHr6wQCookugMG6bPIfPwS6udKthml1B0bwAsHmXg0S1Bof1vwvaHVH2-4eSQGy6WWICgDmuGaN-
+4HNs68a7vdonwz-RqK9KdepEYboyg317-cOqNj60cyhjQ49UquLCSiTKhiAVTMCgjx8Ye6Y1Ns81b6OeEb2iBo-7pQWtrPfwtyrAJUdE-VMPbMPSf4EXes0w
+tm
 }
 
 AzureEntityColoring(AzureEventHub)
diff --git a/dist/Analytics/AzureEventHub.svg b/dist/Analytics/AzureEventHub.svg
index c0cf49b0..4525aeb7 100644
--- a/dist/Analytics/AzureEventHub.svg
+++ b/dist/Analytics/AzureEventHub.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="67pt" height="70pt" viewBox="0 0 67 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 41.585938 31.5 C 41.585938 32.199219 41.125 32.667969 40.429688 32.667969 L 31.421875 32.667969 C 30.726563 32.667969 30.265625 32.199219 30.265625 31.5 L 30.265625 24.734375 C 30.265625 24.035156 30.726563 23.566406 31.421875 23.566406 L 40.429688 23.566406 C 41.125 23.566406 41.585938 24.035156 41.585938 24.734375 Z M 41.585938 31.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 57.757813 38.5 C 57.757813 39.199219 57.296875 39.667969 56.601563 39.667969 L 47.59375 39.667969 C 46.898438 39.667969 46.4375 39.199219 46.4375 38.5 L 46.4375 31.734375 C 46.4375 31.035156 46.898438 30.566406 47.59375 30.566406 L 56.601563 30.566406 C 57.296875 30.566406 57.757813 31.035156 57.757813 31.734375 Z M 57.757813 38.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 41.585938 45.5 C 41.585938 46.199219 41.125 46.667969 40.429688 46.667969 L 31.421875 46.667969 C 30.726563 46.667969 30.265625 46.199219 30.265625 45.5 L 30.265625 38.734375 C 30.265625 38.035156 30.726563 37.566406 31.421875 37.566406 L 40.429688 37.566406 C 41.125 37.566406 41.585938 38.035156 41.585938 38.734375 Z M 41.585938 45.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 25.414063 24.5 C 25.414063 25.199219 24.953125 25.667969 24.257813 25.667969 L 15.015625 25.667969 C 14.324219 25.667969 13.863281 25.199219 13.863281 24.5 L 13.863281 17.5 C 13.863281 16.800781 14.324219 16.332031 15.015625 16.332031 L 24.027344 16.332031 C 24.953125 16.332031 25.414063 16.800781 25.414063 17.5 Z M 25.414063 24.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 65.84375 0 L 1.15625 0 C 0.460938 0 0 0.464844 0 1.167969 L 0 15.167969 C 0 15.867188 0.460938 16.332031 1.15625 16.332031 L 8.085938 16.332031 C 8.78125 16.332031 9.242188 15.867188 9.242188 15.167969 L 9.242188 9.332031 L 57.757813 9.332031 L 57.757813 15.167969 C 57.757813 15.867188 58.21875 16.332031 59.144531 16.332031 L 65.84375 16.332031 C 66.539063 16.332031 67 15.867188 67 15.167969 L 67 1.167969 C 67 0.464844 66.539063 0 65.84375 0 Z M 65.84375 0 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 65.84375 53.898438 L 59.144531 53.898438 C 58.453125 53.898438 57.988281 54.367188 57.988281 55.066406 L 57.988281 60.667969 L 9.242188 60.667969 L 9.242188 54.832031 C 9.242188 54.132813 8.78125 53.667969 7.855469 53.667969 L 1.15625 53.667969 C 0.460938 53.667969 0 54.132813 0 55.066406 L 0 68.832031 C 0 69.535156 0.460938 70 1.15625 70 L 65.84375 70 C 66.539063 70 67 69.535156 67 68.832031 L 67 55.066406 C 67 54.367188 66.539063 53.898438 65.84375 53.898438 Z M 65.84375 53.898438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 25.414063 38.5 C 25.414063 39.199219 24.953125 39.667969 24.257813 39.667969 L 15.015625 39.667969 C 14.324219 39.667969 13.863281 39.199219 13.863281 38.5 L 13.863281 31.5 C 13.863281 30.800781 14.324219 30.332031 15.015625 30.332031 L 24.027344 30.332031 C 24.953125 30.332031 25.414063 30.800781 25.414063 31.5 Z M 25.414063 38.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 25.414063 52.5 C 25.414063 53.199219 24.953125 53.667969 24.257813 53.667969 L 15.015625 53.667969 C 14.324219 53.667969 13.863281 53.199219 13.863281 52.5 L 13.863281 45.5 C 13.863281 44.800781 14.324219 44.332031 15.015625 44.332031 L 24.027344 44.332031 C 24.953125 44.332031 25.414063 44.800781 25.414063 45.5 Z M 25.414063 52.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 41.5625 31.71875 C 41.5625 32.375 41.125 32.8125 40.46875 32.8125 L 31.9375 32.8125 C 31.28125 32.8125 30.84375 32.375 30.84375 31.71875 L 30.84375 25.375 C 30.84375 24.71875 31.28125 24.28125 31.9375 24.28125 L 40.46875 24.28125 C 41.125 24.28125 41.5625 24.71875 41.5625 25.375 Z M 41.5625 31.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 56.875 38.28125 C 56.875 38.9375 56.4375 39.375 55.78125 39.375 L 47.25 39.375 C 46.59375 39.375 46.15625 38.9375 46.15625 38.28125 L 46.15625 31.9375 C 46.15625 31.28125 46.59375 30.84375 47.25 30.84375 L 55.78125 30.84375 C 56.4375 30.84375 56.875 31.28125 56.875 31.9375 Z M 56.875 38.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 41.5625 44.84375 C 41.5625 45.5 41.125 45.9375 40.46875 45.9375 L 31.9375 45.9375 C 31.28125 45.9375 30.84375 45.5 30.84375 44.84375 L 30.84375 38.5 C 30.84375 37.84375 31.28125 37.40625 31.9375 37.40625 L 40.46875 37.40625 C 41.125 37.40625 41.5625 37.84375 41.5625 38.5 Z M 41.5625 44.84375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 26.25 25.15625 C 26.25 25.8125 25.8125 26.25 25.15625 26.25 L 16.40625 26.25 C 15.75 26.25 15.3125 25.8125 15.3125 25.15625 L 15.3125 18.59375 C 15.3125 17.9375 15.75 17.5 16.40625 17.5 L 24.9375 17.5 C 25.8125 17.5 26.25 17.9375 26.25 18.59375 Z M 26.25 25.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 64.53125 2.1875 L 3.28125 2.1875 C 2.625 2.1875 2.1875 2.625 2.1875 3.28125 L 2.1875 16.40625 C 2.1875 17.0625 2.625 17.5 3.28125 17.5 L 9.84375 17.5 C 10.5 17.5 10.9375 17.0625 10.9375 16.40625 L 10.9375 10.9375 L 56.875 10.9375 L 56.875 16.40625 C 56.875 17.0625 57.3125 17.5 58.1875 17.5 L 64.53125 17.5 C 65.1875 17.5 65.625 17.0625 65.625 16.40625 L 65.625 3.28125 C 65.625 2.625 65.1875 2.1875 64.53125 2.1875 Z M 64.53125 2.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 64.53125 52.71875 L 58.1875 52.71875 C 57.53125 52.71875 57.09375 53.15625 57.09375 53.8125 L 57.09375 59.0625 L 10.9375 59.0625 L 10.9375 53.59375 C 10.9375 52.9375 10.5 52.5 9.625 52.5 L 3.28125 52.5 C 2.625 52.5 2.1875 52.9375 2.1875 53.8125 L 2.1875 66.71875 C 2.1875 67.375 2.625 67.8125 3.28125 67.8125 L 64.53125 67.8125 C 65.1875 67.8125 65.625 67.375 65.625 66.71875 L 65.625 53.8125 C 65.625 53.15625 65.1875 52.71875 64.53125 52.71875 Z M 64.53125 52.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 26.25 38.28125 C 26.25 38.9375 25.8125 39.375 25.15625 39.375 L 16.40625 39.375 C 15.75 39.375 15.3125 38.9375 15.3125 38.28125 L 15.3125 31.71875 C 15.3125 31.0625 15.75 30.625 16.40625 30.625 L 24.9375 30.625 C 25.8125 30.625 26.25 31.0625 26.25 31.71875 Z M 26.25 38.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 26.25 51.40625 C 26.25 52.0625 25.8125 52.5 25.15625 52.5 L 16.40625 52.5 C 15.75 52.5 15.3125 52.0625 15.3125 51.40625 L 15.3125 44.84375 C 15.3125 44.1875 15.75 43.75 16.40625 43.75 L 24.9375 43.75 C 25.8125 43.75 26.25 44.1875 26.25 44.84375 Z M 26.25 51.40625 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureHDInsight(m).png b/dist/Analytics/AzureHDInsight(m).png
index ef03c871..23b97846 100644
Binary files a/dist/Analytics/AzureHDInsight(m).png and b/dist/Analytics/AzureHDInsight(m).png differ
diff --git a/dist/Analytics/AzureHDInsight(m).svg b/dist/Analytics/AzureHDInsight(m).svg
index fc57b717..d1ccbd59 100644
--- a/dist/Analytics/AzureHDInsight(m).svg
+++ b/dist/Analytics/AzureHDInsight(m).svg
@@ -1,26 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="67pt" viewBox="0 0 70 67" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="67" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="67"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.1875 52.300781 L 33.609375 52.300781 C 34.773438 58.726563 38.464844 64.421875 43.859375 68.113281 L 46.035156 68.113281 L 50.132813 61.027344 C 46.792969 59.101563 44.3125 55.984375 43.191406 52.300781 Z M 57.691406 23.46875 C 55.253906 23.46875 52.828125 23.832031 50.5 24.546875 L 51.722656 26.65625 L 55.382813 32.988281 C 58.792969 32.429688 62.292969 33.085938 65.269531 34.84375 L 69.9375 26.765625 C 66.21875 24.605469 61.992188 23.46875 57.691406 23.46875 Z M 49.199219 35.40625 L 44.527344 27.324219 C 38.128906 31.394531 33.984375 38.199219 33.308594 45.746094 L 42.714844 45.746094 C 43.328125 41.542969 45.679688 37.792969 49.199219 35.40625 Z M 49.199219 35.40625 "/>
-</g>
-</defs>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 58.964844 7.566406 L 50.113281 7.566406 C 50.113281 11.203125 48.796875 14.71875 46.402344 17.460938 L 51.722656 26.65625 L 55.382813 32.988281 C 58.792969 32.429688 62.292969 33.085938 65.269531 34.84375 L 70 26.65625 Z M 43.1875 52.300781 L 26.730469 52.300781 C 25.613281 55.960938 23.15625 59.066406 19.847656 60.992188 L 23.964844 68.113281 L 46.035156 68.113281 L 50.128906 61.027344 C 46.792969 59.101563 44.308594 55.984375 43.1875 52.300781 Z M 27.203125 45.746094 L 42.714844 45.746094 C 43.328125 41.542969 45.679688 37.792969 49.199219 35.40625 L 41.097656 21.394531 C 37.214844 23.128906 32.777344 23.140625 28.882813 21.421875 L 20.777344 35.445313 C 24.261719 37.832031 26.59375 41.566406 27.207031 45.746094 Z M 19.804688 7.566406 L 11.035156 7.566406 L 0 26.65625 L 4.710938 34.804688 C 7.695313 33.0625 11.203125 32.421875 14.613281 33 L 18.277344 26.65625 L 23.5625 17.511719 C 21.140625 14.765625 19.804688 11.230469 19.804688 7.566406 Z M 19.804688 7.566406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 42.535156 7.566406 C 42.535156 11.746094 39.144531 15.136719 34.960938 15.136719 C 30.773438 15.136719 27.382813 11.746094 27.382813 7.566406 C 27.382813 3.386719 30.773438 0 34.960938 0 C 39.144531 0 42.535156 3.386719 42.535156 7.566406 Z M 42.535156 7.566406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 65.269531 47.929688 C 65.269531 52.109375 61.875 55.5 57.691406 55.5 C 53.507813 55.5 50.113281 52.109375 50.113281 47.929688 C 50.113281 43.75 53.507813 40.363281 57.691406 40.363281 C 61.875 40.363281 65.269531 43.75 65.269531 47.929688 Z M 65.269531 47.929688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 19.804688 47.929688 C 19.804688 52.109375 16.410156 55.5 12.226563 55.5 C 8.042969 55.5 4.648438 52.109375 4.648438 47.929688 C 4.648438 43.75 8.042969 40.363281 12.226563 40.363281 C 16.410156 40.363281 19.804688 43.75 19.804688 47.929688 Z M 19.804688 47.929688 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 55.195313 25.980469 C 59.164063 25.980469 62.789063 27 66.078125 28.929688 L 66.078125 28.816406 L 56.328125 11.8125 L 48.621094 11.8125 C 48.621094 14.988281 47.488281 18.160156 45.335938 20.542969 L 48.960938 26.773438 C 50.890625 26.207031 53.042969 25.980469 55.195313 25.980469 Z M 55.195313 25.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 14.839844 34.148438 C 15.519531 34.035156 16.316406 34.035156 16.996094 34.148438 L 20.28125 28.480469 L 24.929688 20.320313 C 22.777344 17.9375 21.640625 14.878906 21.640625 11.703125 L 13.820313 11.703125 L 4.074219 28.707031 L 8.265625 35.960938 C 10.308594 34.828125 12.574219 34.148438 14.839844 34.148438 Z M 14.839844 34.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 29.691406 24.054688 L 22.550781 36.523438 C 25.609375 38.675781 27.765625 41.960938 28.21875 45.703125 L 33.542969 45.703125 C 34.109375 38.789063 37.964844 32.894531 43.519531 29.382813 L 40.457031 24.054688 C 37.058594 25.640625 33.089844 25.640625 29.691406 24.054688 Z M 29.691406 24.054688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 33.886719 51.488281 L 27.765625 51.488281 C 26.746094 54.773438 24.59375 57.496094 21.644531 59.195313 L 25.273438 65.542969 L 42.953125 65.542969 C 38.308594 62.367188 34.90625 57.382813 33.886719 51.488281 Z M 33.886719 51.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,74,130);fill-opacity:1;" d="M 39.742188 16.554688 C 42.355469 13.941406 42.355469 9.707031 39.742188 7.097656 C 37.132813 4.484375 32.898438 4.484375 30.285156 7.097656 C 27.675781 9.707031 27.675781 13.941406 30.285156 16.554688 C 32.898438 19.164063 37.132813 19.164063 39.742188 16.554688 Z M 39.742188 16.554688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,74,130);fill-opacity:1;" d="M 56.734375 54.128906 C 60.328125 53.28125 62.554688 49.679688 61.707031 46.085938 C 60.859375 42.492188 57.257813 40.265625 53.664063 41.113281 C 50.066406 41.960938 47.84375 45.5625 48.691406 49.160156 C 49.539063 52.753906 53.140625 54.980469 56.734375 54.128906 Z M 56.734375 54.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,74,130);fill-opacity:1;" d="M 19.59375 52.386719 C 22.203125 49.773438 22.203125 45.539063 19.59375 42.925781 C 16.980469 40.316406 12.746094 40.316406 10.136719 42.925781 C 7.523438 45.539063 7.523438 49.773438 10.136719 52.386719 C 12.746094 54.996094 16.980469 54.996094 19.59375 52.386719 Z M 19.59375 52.386719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 48.84375 26.890625 L 49.976563 28.820313 L 53.265625 34.484375 C 53.945313 34.371094 54.625 34.371094 55.304688 34.484375 C 57.6875 34.484375 59.953125 35.164063 61.992188 36.300781 L 65.960938 28.933594 C 62.785156 27.117188 59.046875 25.984375 55.078125 25.984375 C 53.039063 25.984375 50.886719 26.210938 48.84375 26.890625 Z M 48.84375 26.890625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 48.84375 26.890625 L 49.976563 28.820313 L 53.265625 34.484375 C 53.945313 34.371094 54.625 34.371094 55.304688 34.484375 C 57.6875 34.484375 59.953125 35.164063 61.992188 36.300781 L 65.960938 28.933594 C 62.785156 27.117188 59.046875 25.984375 55.078125 25.984375 C 53.039063 25.984375 50.886719 26.210938 48.84375 26.890625 Z M 48.84375 26.890625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 42.953125 65.542969 L 44.652344 65.542969 L 48.28125 59.308594 C 45.332031 57.609375 43.179688 54.773438 42.273438 51.488281 L 33.773438 51.488281 C 34.90625 57.382813 38.304688 62.367188 42.953125 65.542969 Z M 42.953125 65.542969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 42.953125 65.542969 L 44.652344 65.542969 L 48.28125 59.308594 C 45.332031 57.609375 43.179688 54.773438 42.273438 51.488281 L 33.773438 51.488281 C 34.90625 57.382813 38.304688 62.367188 42.953125 65.542969 Z M 42.953125 65.542969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 33.550781 45.703125 L 41.824219 45.703125 C 42.390625 41.964844 44.429688 38.675781 47.605469 36.523438 L 43.410156 29.382813 C 37.96875 32.898438 34.230469 38.789063 33.550781 45.703125 Z M 33.550781 45.703125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 33.550781 45.703125 L 41.824219 45.703125 C 42.390625 41.964844 44.429688 38.675781 47.605469 36.523438 L 43.410156 29.382813 C 37.96875 32.898438 34.230469 38.789063 33.550781 45.703125 Z M 33.550781 45.703125 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureHDInsight.png b/dist/Analytics/AzureHDInsight.png
index a5946fed..66aa1824 100644
Binary files a/dist/Analytics/AzureHDInsight.png and b/dist/Analytics/AzureHDInsight.png differ
diff --git a/dist/Analytics/AzureHDInsight.puml b/dist/Analytics/AzureHDInsight.puml
index cc90d960..30eb0fb8 100644
--- a/dist/Analytics/AzureHDInsight.puml
+++ b/dist/Analytics/AzureHDInsight.puml
@@ -1,10 +1,10 @@
-sprite $AzureHDInsight [70x67/16z] {
-fPVhmhCW38EX9SK9zt-xtt6i0zCTU9-VmcAQEgdfDTdEriygwIUKrlzJqpxe3svf5-tElfjRVoQdBNAVm6QqVUBuC8R1aksIh-YTJ4LiyDfBiJkqH5jLf4-C
-ox21aXHSPLWzQO_C8O-we_Hv8HjBSjpdMh2voBd6vwuTCRe8ZvRTpa2Y9KvpRRstGuFRcV0kkncEBP1eoIBlfAFXcY_oJdBROljUF4DGAvpGZ7vgXM-6o_F-
-FLaI2SqeBnKU0egAgCBzyH3Zs3EF4InWXAaZ4CV4lvMuon8LgbWm88ms3XqNDBoZXQaB5afOFH61ZkPX9YVXqHOY0l20osL_YgoC_SHCNd-WqKCnVa02rkSS
-WGAFbegu6Isb34EFdc8vw28HGAPzKloA-58GBPmqapL5W8juCZ6ncQMfcp8R8Yx3GlcMg46l4Jjk5PaSWgmUhSTHB_Nb-oJOS6aKQO-Uzn50PoFjEhvfQAK4
-8sCZCrDQLOIDDUeYHeScB2fqn3gv5JSZvHywy76FcX4oaiQ03OsZKAUbbzG-KRcAbygnG2L_DQgNFe7WuwDyzP6H4oc95nG7KuC5JVDnKGQQhW_CcQb-q_NT
-W0V-fvj57FstqgfVVlLYmEb_tPciAlGrHLzICksE42CgchuZ1wVHleXXJqPi1Xj5iLFQAHkd297PE4Ls0-OptTRfY50cxpJ9sJljEO6Ltm
+sprite $AzureHDInsight [70x70/16z] {
+xTRdTYCX30LWjSiKy_wlkyL5Pf26O-Bjc-zlE1ULs8P-eq-oRDjgz9wrNbsKth3LXpTYIdKN-h3Q07sGrSP6B-Cxka9rCorfkK6Iij_lANU3QHwFQ6siNOhH
+2UjIw5AVZAx4pp2bk3W9BUtX9b0AfVJbBZvRzgRxgvpN6ih5hQcLaqCOZBQVdPK5SgZNQRxbMExu40MbCvY_ixZb8nqjmF7u5b1AniTGncCPdnlV8UeRjXTg
+BXr-tWmpWmzgD3_DPw_Pqj0ux99Fjfn6MmD0CHflsKxQj1QCyuRW5UPzsW4u7wxaIuL9LepbYyR9yiqUV-bASKZQ3o5c6WTizCHXj1f3l1WsX_1XXAc8fAE2
+tVc00VFgdefnbvg570w90JHq384vQh7GaEQbW6cAf24qIsCAQ9xrAH1wXIxRjcW_OOJ9SbcthJ1bUAzN6tinnvJkbwwMBEHIx_RxSUvImZDjeM0BZmmwfcXy
+ZYXrj3QaQGaF76wBhxIbDWgTgwsieTXm93Kfsgqlfl0mPNdrRNkfZM6bJ45Qz1h_6XlYAxdZs99GZ_T-Vz9zZCABt0Qr-cXnyWdGstsxKagmB62wazDF8sbP
+Yj9BulUBq3IBANWZv8qO-n7VtiNrCJ9NoayjXcPe7WEQKz8OfJcInO1ceNGCO9howIi
 }
 
 AzureEntityColoring(AzureHDInsight)
diff --git a/dist/Analytics/AzureHDInsight.svg b/dist/Analytics/AzureHDInsight.svg
index bc5afa18..8ad23c40 100644
--- a/dist/Analytics/AzureHDInsight.svg
+++ b/dist/Analytics/AzureHDInsight.svg
@@ -1,26 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="67pt" viewBox="0 0 70 67" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="67" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="67"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.1875 52.300781 L 33.609375 52.300781 C 34.773438 58.726563 38.464844 64.421875 43.859375 68.113281 L 46.035156 68.113281 L 50.132813 61.027344 C 46.792969 59.101563 44.3125 55.984375 43.191406 52.300781 Z M 57.691406 23.46875 C 55.253906 23.46875 52.828125 23.832031 50.5 24.546875 L 51.722656 26.65625 L 55.382813 32.988281 C 58.792969 32.429688 62.292969 33.085938 65.269531 34.84375 L 69.9375 26.765625 C 66.21875 24.605469 61.992188 23.46875 57.691406 23.46875 Z M 49.199219 35.40625 L 44.527344 27.324219 C 38.128906 31.394531 33.984375 38.199219 33.308594 45.746094 L 42.714844 45.746094 C 43.328125 41.542969 45.679688 37.792969 49.199219 35.40625 Z M 49.199219 35.40625 "/>
-</g>
-</defs>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 58.964844 7.566406 L 50.113281 7.566406 C 50.113281 11.203125 48.796875 14.71875 46.402344 17.460938 L 51.722656 26.65625 L 55.382813 32.988281 C 58.792969 32.429688 62.292969 33.085938 65.269531 34.84375 L 70 26.65625 Z M 43.1875 52.300781 L 26.730469 52.300781 C 25.613281 55.960938 23.15625 59.066406 19.847656 60.992188 L 23.964844 68.113281 L 46.035156 68.113281 L 50.128906 61.027344 C 46.792969 59.101563 44.308594 55.984375 43.1875 52.300781 Z M 27.203125 45.746094 L 42.714844 45.746094 C 43.328125 41.542969 45.679688 37.792969 49.199219 35.40625 L 41.097656 21.394531 C 37.214844 23.128906 32.777344 23.140625 28.882813 21.421875 L 20.777344 35.445313 C 24.261719 37.832031 26.59375 41.566406 27.207031 45.746094 Z M 19.804688 7.566406 L 11.035156 7.566406 L 0 26.65625 L 4.710938 34.804688 C 7.695313 33.0625 11.203125 32.421875 14.613281 33 L 18.277344 26.65625 L 23.5625 17.511719 C 21.140625 14.765625 19.804688 11.230469 19.804688 7.566406 Z M 19.804688 7.566406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 42.535156 7.566406 C 42.535156 11.746094 39.144531 15.136719 34.960938 15.136719 C 30.773438 15.136719 27.382813 11.746094 27.382813 7.566406 C 27.382813 3.386719 30.773438 0 34.960938 0 C 39.144531 0 42.535156 3.386719 42.535156 7.566406 Z M 42.535156 7.566406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 65.269531 47.929688 C 65.269531 52.109375 61.875 55.5 57.691406 55.5 C 53.507813 55.5 50.113281 52.109375 50.113281 47.929688 C 50.113281 43.75 53.507813 40.363281 57.691406 40.363281 C 61.875 40.363281 65.269531 43.75 65.269531 47.929688 Z M 65.269531 47.929688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 19.804688 47.929688 C 19.804688 52.109375 16.410156 55.5 12.226563 55.5 C 8.042969 55.5 4.648438 52.109375 4.648438 47.929688 C 4.648438 43.75 8.042969 40.363281 12.226563 40.363281 C 16.410156 40.363281 19.804688 43.75 19.804688 47.929688 Z M 19.804688 47.929688 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 55.195313 25.980469 C 59.164063 25.980469 62.789063 27 66.078125 28.929688 L 66.078125 28.816406 L 56.328125 11.8125 L 48.621094 11.8125 C 48.621094 14.988281 47.488281 18.160156 45.335938 20.542969 L 48.960938 26.773438 C 50.890625 26.207031 53.042969 25.980469 55.195313 25.980469 Z M 55.195313 25.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 14.839844 34.148438 C 15.519531 34.035156 16.316406 34.035156 16.996094 34.148438 L 20.28125 28.480469 L 24.929688 20.320313 C 22.777344 17.9375 21.640625 14.878906 21.640625 11.703125 L 13.820313 11.703125 L 4.074219 28.707031 L 8.265625 35.960938 C 10.308594 34.828125 12.574219 34.148438 14.839844 34.148438 Z M 14.839844 34.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 29.691406 24.054688 L 22.550781 36.523438 C 25.609375 38.675781 27.765625 41.960938 28.21875 45.703125 L 33.542969 45.703125 C 34.109375 38.789063 37.964844 32.894531 43.519531 29.382813 L 40.457031 24.054688 C 37.058594 25.640625 33.089844 25.640625 29.691406 24.054688 Z M 29.691406 24.054688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 33.886719 51.488281 L 27.765625 51.488281 C 26.746094 54.773438 24.59375 57.496094 21.644531 59.195313 L 25.273438 65.542969 L 42.953125 65.542969 C 38.308594 62.367188 34.90625 57.382813 33.886719 51.488281 Z M 33.886719 51.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(25.490196%,25.490196%,25.490196%);fill-opacity:1;" d="M 39.742188 16.554688 C 42.355469 13.941406 42.355469 9.707031 39.742188 7.097656 C 37.132813 4.484375 32.898438 4.484375 30.285156 7.097656 C 27.675781 9.707031 27.675781 13.941406 30.285156 16.554688 C 32.898438 19.164063 37.132813 19.164063 39.742188 16.554688 Z M 39.742188 16.554688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(25.490196%,25.490196%,25.490196%);fill-opacity:1;" d="M 56.734375 54.128906 C 60.328125 53.28125 62.554688 49.679688 61.707031 46.085938 C 60.859375 42.492188 57.257813 40.265625 53.664063 41.113281 C 50.066406 41.960938 47.84375 45.5625 48.691406 49.160156 C 49.539063 52.753906 53.140625 54.980469 56.734375 54.128906 Z M 56.734375 54.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(25.490196%,25.490196%,25.490196%);fill-opacity:1;" d="M 19.59375 52.386719 C 22.203125 49.773438 22.203125 45.539063 19.59375 42.925781 C 16.980469 40.316406 12.746094 40.316406 10.136719 42.925781 C 7.523438 45.539063 7.523438 49.773438 10.136719 52.386719 C 12.746094 54.996094 16.980469 54.996094 19.59375 52.386719 Z M 19.59375 52.386719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 48.84375 26.890625 L 49.976563 28.820313 L 53.265625 34.484375 C 53.945313 34.371094 54.625 34.371094 55.304688 34.484375 C 57.6875 34.484375 59.953125 35.164063 61.992188 36.300781 L 65.960938 28.933594 C 62.785156 27.117188 59.046875 25.984375 55.078125 25.984375 C 53.039063 25.984375 50.886719 26.210938 48.84375 26.890625 Z M 48.84375 26.890625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,78.823529%,87.843137%);fill-opacity:1;" d="M 48.84375 26.890625 L 49.976563 28.820313 L 53.265625 34.484375 C 53.945313 34.371094 54.625 34.371094 55.304688 34.484375 C 57.6875 34.484375 59.953125 35.164063 61.992188 36.300781 L 65.960938 28.933594 C 62.785156 27.117188 59.046875 25.984375 55.078125 25.984375 C 53.039063 25.984375 50.886719 26.210938 48.84375 26.890625 Z M 48.84375 26.890625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 42.953125 65.542969 L 44.652344 65.542969 L 48.28125 59.308594 C 45.332031 57.609375 43.179688 54.773438 42.273438 51.488281 L 33.773438 51.488281 C 34.90625 57.382813 38.304688 62.367188 42.953125 65.542969 Z M 42.953125 65.542969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,78.823529%,87.843137%);fill-opacity:1;" d="M 42.953125 65.542969 L 44.652344 65.542969 L 48.28125 59.308594 C 45.332031 57.609375 43.179688 54.773438 42.273438 51.488281 L 33.773438 51.488281 C 34.90625 57.382813 38.304688 62.367188 42.953125 65.542969 Z M 42.953125 65.542969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 33.550781 45.703125 L 41.824219 45.703125 C 42.390625 41.964844 44.429688 38.675781 47.605469 36.523438 L 43.410156 29.382813 C 37.96875 32.898438 34.230469 38.789063 33.550781 45.703125 Z M 33.550781 45.703125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,78.823529%,87.843137%);fill-opacity:1;" d="M 33.550781 45.703125 L 41.824219 45.703125 C 42.390625 41.964844 44.429688 38.675781 47.605469 36.523438 L 43.410156 29.382813 C 37.96875 32.898438 34.230469 38.789063 33.550781 45.703125 Z M 33.550781 45.703125 "/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzurePipeline(m).png b/dist/Analytics/AzurePipeline(m).png
new file mode 100644
index 00000000..1384153f
Binary files /dev/null and b/dist/Analytics/AzurePipeline(m).png differ
diff --git a/dist/Analytics/AzurePipeline(m).svg b/dist/Analytics/AzurePipeline(m).svg
new file mode 100644
index 00000000..0677dd1f
--- /dev/null
+++ b/dist/Analytics/AzurePipeline(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 66.449219 14.066406 L 62.449219 14.066406 C 60.492188 14.066406 58.898438 15.660156 58.898438 17.617188 L 58.898438 18.96875 L 11.171875 18.96875 L 11.171875 17.617188 C 11.171875 15.660156 9.582031 14.066406 7.621094 14.066406 L 3.550781 14.066406 C 1.59375 14.066406 0 15.660156 0 17.617188 L 0 52.382813 C 0 54.339844 1.59375 55.933594 3.550781 55.933594 L 7.621094 55.933594 C 9.582031 55.933594 11.171875 54.339844 11.171875 52.382813 L 11.171875 51.03125 L 58.898438 51.03125 L 58.898438 52.382813 C 58.898438 54.339844 60.492188 55.933594 62.449219 55.933594 L 66.449219 55.933594 C 68.40625 55.933594 70 54.339844 70 52.382813 L 70 17.617188 C 70 15.660156 68.40625 14.066406 66.449219 14.066406 Z M 8.382813 52.382813 C 8.382813 52.800781 8.042969 53.144531 7.621094 53.144531 L 3.550781 53.144531 C 3.128906 53.144531 2.789063 52.800781 2.789063 52.382813 L 2.789063 17.617188 C 2.789063 17.199219 3.128906 16.855469 3.550781 16.855469 L 7.621094 16.855469 C 8.042969 16.855469 8.382813 17.199219 8.382813 17.617188 Z M 58.898438 48.242188 L 11.171875 48.242188 L 11.171875 21.757813 L 58.898438 21.757813 Z M 67.210938 52.382813 C 67.210938 52.800781 66.871094 53.144531 66.449219 53.144531 L 62.449219 53.144531 C 62.027344 53.144531 61.6875 52.800781 61.6875 52.382813 L 61.6875 17.617188 C 61.6875 17.199219 62.027344 16.855469 62.449219 16.855469 L 66.449219 16.855469 C 66.871094 16.855469 67.210938 17.199219 67.210938 17.617188 Z M 67.210938 52.382813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 37.914063 43.695313 L 37.203125 43.695313 C 36.433594 43.695313 35.808594 44.320313 35.808594 45.089844 C 35.808594 45.859375 36.433594 46.484375 37.203125 46.484375 L 37.914063 46.484375 C 38.683594 46.484375 39.308594 45.859375 39.308594 45.089844 C 39.308594 44.320313 38.683594 43.695313 37.914063 43.695313 Z M 37.914063 43.695313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 31.804688 43.695313 L 14.894531 43.695313 C 14.125 43.695313 13.5 44.320313 13.5 45.089844 C 13.5 45.859375 14.125 46.484375 14.894531 46.484375 L 31.804688 46.484375 C 32.574219 46.484375 33.199219 45.859375 33.199219 45.089844 C 33.199219 44.320313 32.574219 43.695313 31.804688 43.695313 Z M 31.804688 43.695313 "/>
+</g>
+</svg>
diff --git a/dist/Analytics/AzurePipeline.png b/dist/Analytics/AzurePipeline.png
new file mode 100644
index 00000000..c64fe83f
Binary files /dev/null and b/dist/Analytics/AzurePipeline.png differ
diff --git a/dist/Analytics/AzurePipeline.puml b/dist/Analytics/AzurePipeline.puml
new file mode 100644
index 00000000..5afcf294
--- /dev/null
+++ b/dist/Analytics/AzurePipeline.puml
@@ -0,0 +1,9 @@
+sprite $AzurePipeline [70x70/16z] {
+xT03jaKn44JHkeoxvZ_QPxk-qNivE07-5kTSdzjQ6I7hOcqhPSR0lHcgnfrOI9ePLo0A-wrhXhL2zj3ijqIkLAmbSe2cabYRpoeq3MzLPBShrZGtA_g__92A
+LxpY5QzufRi4lT8RBrctdHCg4wzDW951g22LImd0L7BtnR-RWiPkLNIVM0cJffrMsZj-jzjL6fdY2iaEcaIMk6BapBqCqS2zYhYFT51Djelqw-Quqa4cRFqg
+phab
+}
+
+AzureEntityColoring(AzurePipeline)
+!define AzurePipeline(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzurePipeline, AzurePipeline)
+!define AzurePipeline(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzurePipeline, AzurePipeline)
diff --git a/dist/Analytics/AzurePipeline.svg b/dist/Analytics/AzurePipeline.svg
new file mode 100644
index 00000000..25a2bfb9
--- /dev/null
+++ b/dist/Analytics/AzurePipeline.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 66.449219 14.066406 L 62.449219 14.066406 C 60.492188 14.066406 58.898438 15.660156 58.898438 17.617188 L 58.898438 18.96875 L 11.171875 18.96875 L 11.171875 17.617188 C 11.171875 15.660156 9.582031 14.066406 7.621094 14.066406 L 3.550781 14.066406 C 1.59375 14.066406 0 15.660156 0 17.617188 L 0 52.382813 C 0 54.339844 1.59375 55.933594 3.550781 55.933594 L 7.621094 55.933594 C 9.582031 55.933594 11.171875 54.339844 11.171875 52.382813 L 11.171875 51.03125 L 58.898438 51.03125 L 58.898438 52.382813 C 58.898438 54.339844 60.492188 55.933594 62.449219 55.933594 L 66.449219 55.933594 C 68.40625 55.933594 70 54.339844 70 52.382813 L 70 17.617188 C 70 15.660156 68.40625 14.066406 66.449219 14.066406 Z M 8.382813 52.382813 C 8.382813 52.800781 8.042969 53.144531 7.621094 53.144531 L 3.550781 53.144531 C 3.128906 53.144531 2.789063 52.800781 2.789063 52.382813 L 2.789063 17.617188 C 2.789063 17.199219 3.128906 16.855469 3.550781 16.855469 L 7.621094 16.855469 C 8.042969 16.855469 8.382813 17.199219 8.382813 17.617188 Z M 58.898438 48.242188 L 11.171875 48.242188 L 11.171875 21.757813 L 58.898438 21.757813 Z M 67.210938 52.382813 C 67.210938 52.800781 66.871094 53.144531 66.449219 53.144531 L 62.449219 53.144531 C 62.027344 53.144531 61.6875 52.800781 61.6875 52.382813 L 61.6875 17.617188 C 61.6875 17.199219 62.027344 16.855469 62.449219 16.855469 L 66.449219 16.855469 C 66.871094 16.855469 67.210938 17.199219 67.210938 17.617188 Z M 67.210938 52.382813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 37.914063 43.695313 L 37.203125 43.695313 C 36.433594 43.695313 35.808594 44.320313 35.808594 45.089844 C 35.808594 45.859375 36.433594 46.484375 37.203125 46.484375 L 37.914063 46.484375 C 38.683594 46.484375 39.308594 45.859375 39.308594 45.089844 C 39.308594 44.320313 38.683594 43.695313 37.914063 43.695313 Z M 37.914063 43.695313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 31.804688 43.695313 L 14.894531 43.695313 C 14.125 43.695313 13.5 44.320313 13.5 45.089844 C 13.5 45.859375 14.125 46.484375 14.894531 46.484375 L 31.804688 46.484375 C 32.574219 46.484375 33.199219 45.859375 33.199219 45.089844 C 33.199219 44.320313 32.574219 43.695313 31.804688 43.695313 Z M 31.804688 43.695313 "/>
+</g>
+</svg>
diff --git a/dist/Analytics/AzureStreamAnalytics(m).png b/dist/Analytics/AzureStreamAnalytics(m).png
index a28ba428..d8373925 100644
Binary files a/dist/Analytics/AzureStreamAnalytics(m).png and b/dist/Analytics/AzureStreamAnalytics(m).png differ
diff --git a/dist/Analytics/AzureStreamAnalytics(m).svg b/dist/Analytics/AzureStreamAnalytics(m).svg
index 6220a6eb..61ef488b 100644
--- a/dist/Analytics/AzureStreamAnalytics(m).svg
+++ b/dist/Analytics/AzureStreamAnalytics(m).svg
@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="56pt" viewBox="0 0 70 56" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(225,242,255);fill-opacity:1;" d="M 34.859375 42.839844 C 34.578125 42.839844 34.441406 42.558594 34.019531 42.558594 C 33.179688 42.558594 32.339844 42.980469 31.640625 43.679688 L 31.359375 43.960938 C 28.699219 46.621094 25.761719 48.578125 22.398438 49.558594 L 21.140625 52.21875 L 23.378906 54.460938 Z M 34.859375 42.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(225,242,255);fill-opacity:1;" d="M 22.960938 22.820313 C 26.460938 20.859375 30.101563 20.019531 34.019531 20.019531 C 39.480469 20.300781 44.519531 22.261719 48.441406 25.898438 C 49.140625 26.460938 49.699219 26.878906 50.398438 27.441406 L 62.019531 15.820313 L 59.640625 13.441406 L 58.800781 13.859375 L 52.5 17.078125 L 48.160156 15.398438 L 45.359375 7.980469 L 39.058594 7.980469 L 38.78125 8.820313 L 36.679688 15.398438 L 32.339844 17.078125 L 24.921875 13.859375 L 20.441406 18.199219 L 20.859375 19.039063 Z M 22.960938 22.820313 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 60.023438 37.273438 L 61.773438 32.898438 L 69.300781 30.101563 L 69.125 23.800781 L 68.25 23.449219 L 61.601563 21.351563 L 59.5 17.148438 L 62.824219 9.800781 L 62.648438 9.625 L 58.273438 5.425781 L 57.398438 5.949219 L 51.273438 9.273438 L 46.898438 7.523438 L 44.101563 0 L 37.800781 0.175781 L 37.449219 1.050781 L 35.351563 7.699219 L 31.148438 9.625 L 23.976563 6.648438 L 19.601563 11.199219 L 20.125 12.074219 L 22.226563 15.925781 C 25.550781 13.824219 29.398438 12.773438 33.425781 12.773438 C 39.550781 12.773438 45.5 15.398438 49.875 20.300781 C 49.875 20.300781 49.875 20.476563 50.050781 20.476563 L 50.226563 20.648438 C 54.074219 25.375 53.550781 32.375 48.824219 36.226563 C 44.449219 39.898438 37.976563 39.550781 33.949219 35.699219 L 33.601563 35.699219 C 32.726563 35.699219 31.851563 36.050781 31.148438 36.925781 L 30.976563 37.101563 C 28.351563 39.898438 25.375 42 21.875 43.226563 L 20.824219 45.675781 L 25.023438 49.699219 L 25.375 50.050781 L 26.25 49.699219 L 32.375 46.375 L 36.75 48.125 L 39.550781 55.648438 L 45.851563 55.476563 L 46.199219 54.601563 L 48.300781 47.949219 L 52.5 46.023438 L 59.851563 49.351563 L 64.226563 44.800781 L 63.351563 43.398438 Z M 60.023438 37.273438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 22.925781 26.601563 C 22.925781 26.773438 22.925781 26.773438 22.925781 26.601563 L 22.75 26.773438 C 18.023438 31.851563 10.5 31.851563 5.773438 26.773438 C 5.25 26.074219 4.199219 26.074219 3.675781 26.773438 C 3.324219 27.125 3.324219 27.476563 3.324219 28 C 3.324219 28.523438 3.5 28.875 3.675781 29.226563 C 9.449219 35.699219 18.898438 35.699219 24.851563 29.226563 C 24.851563 29.226563 24.851563 29.050781 25.023438 29.050781 C 29.75 23.976563 37.273438 23.976563 42 29.050781 C 42.523438 29.75 43.574219 29.75 44.101563 29.050781 C 44.449219 28.699219 44.449219 28.351563 44.449219 27.824219 C 44.449219 27.476563 44.273438 26.949219 44.101563 26.601563 C 38.148438 20.300781 28.699219 20.300781 22.925781 26.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 33.601563 28.699219 C 30.976563 28.699219 28.699219 29.75 26.949219 31.851563 C 26.949219 31.851563 26.949219 32.023438 26.773438 32.023438 L 26.601563 32.199219 C 23.273438 35.699219 19.074219 37.800781 14.523438 37.800781 C 9.976563 37.800781 5.601563 35.875 2.449219 32.199219 C 1.925781 31.5 0.875 31.5 0.351563 32.199219 C 0 32.550781 0 32.898438 0 33.425781 C 0 33.773438 0.175781 34.300781 0.351563 34.648438 C 4.199219 38.851563 9.273438 41.125 14.523438 41.125 C 19.949219 41.125 25.023438 38.851563 28.699219 34.648438 C 28.699219 34.648438 28.699219 34.476563 28.875 34.476563 L 29.050781 34.300781 C 30.273438 32.898438 32.023438 32.199219 33.773438 32.199219 C 35.523438 32.199219 37.101563 32.898438 38.5 34.300781 C 39.023438 35 40.074219 35 40.601563 34.300781 C 40.949219 33.949219 40.949219 33.601563 40.949219 33.074219 C 40.949219 32.550781 40.773438 32.199219 40.601563 31.851563 C 38.5 29.75 36.050781 28.699219 33.601563 28.699219 M 47.601563 21.523438 C 43.75 17.324219 38.675781 15.050781 33.425781 15.050781 C 28 15.050781 22.925781 17.324219 19.25 21.523438 C 19.25 21.523438 19.25 21.699219 19.074219 21.699219 L 18.898438 21.875 C 17.675781 23.273438 15.925781 23.976563 14.175781 23.976563 C 12.425781 23.976563 10.675781 23.273438 9.449219 21.875 C 8.925781 21.175781 7.875 21.175781 7.351563 21.875 C 7 22.226563 7 22.574219 7 23.101563 C 7 23.449219 7.175781 23.976563 7.351563 24.324219 C 9.101563 26.25 11.550781 27.476563 14.175781 27.476563 C 16.800781 27.476563 19.074219 26.425781 20.824219 24.324219 C 20.824219 24.324219 20.824219 24.148438 21 24.148438 L 21.175781 23.976563 C 24.5 20.476563 28.699219 18.375 33.25 18.375 C 37.800781 18.375 42.175781 20.300781 45.324219 23.976563 C 45.851563 24.675781 46.898438 24.675781 47.425781 23.976563 C 47.773438 23.625 47.773438 23.273438 47.773438 22.75 C 48.125 22.226563 47.949219 21.875 47.601563 21.523438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 60.621094 44.800781 L 62.300781 40.460938 L 70 37.800781 L 70 31.640625 L 69.160156 31.359375 L 62.300781 29.398438 L 60.621094 25.058594 L 64.121094 17.921875 L 59.78125 13.578125 L 58.941406 14 L 52.640625 17.21875 L 48.160156 15.398438 L 45.359375 7.980469 L 39.058594 7.980469 L 38.78125 8.820313 L 36.679688 15.398438 L 32.339844 17.078125 L 24.921875 13.859375 L 20.441406 18.199219 L 20.859375 19.039063 L 22.820313 22.679688 C 26.320313 20.71875 29.960938 19.878906 33.878906 19.878906 C 39.339844 20.160156 44.378906 22.121094 48.300781 25.761719 C 49.140625 26.460938 49.980469 27.019531 50.960938 28 C 51.378906 28.421875 51.800781 29.121094 52.078125 29.539063 C 54.738281 34.160156 53.621094 40.039063 49.28125 43.539063 C 46.058594 46.199219 41.578125 46.621094 38.21875 45.078125 C 37.800781 44.800781 37.519531 44.800781 37.378906 44.660156 C 36.539063 44.238281 35.699219 43.539063 35 42.980469 C 34.71875 42.980469 34.578125 42.699219 34.160156 42.699219 C 33.320313 42.699219 32.480469 43.121094 31.78125 43.820313 L 31.5 44.101563 C 28.839844 46.761719 25.898438 48.71875 22.539063 49.699219 L 21.28125 52.359375 L 25.761719 56.839844 L 26.601563 56.421875 L 32.898438 53.199219 L 37.238281 54.878906 L 39.621094 62.300781 L 45.921875 62.300781 L 46.199219 61.460938 L 48.441406 54.878906 L 52.78125 53.199219 L 60.199219 56.421875 L 64.398438 51.800781 L 63.980469 50.960938 Z M 60.621094 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(75,178,255);fill-opacity:1;" d="M 23.101563 33.878906 C 18.339844 38.921875 10.640625 38.921875 6.160156 33.601563 C 5.738281 32.898438 4.621094 32.898438 4.199219 33.601563 C 3.921875 33.878906 3.78125 34.300781 3.78125 34.71875 C 3.78125 35.140625 4.058594 35.558594 4.199219 35.839844 C 9.800781 42.140625 19.179688 42.28125 25.199219 36.121094 C 29.960938 31.359375 37.378906 31.21875 42 36.539063 C 42.699219 37.238281 43.539063 37.238281 43.960938 36.539063 C 44.238281 36.261719 44.378906 35.839844 44.378906 35.421875 C 44.378906 35 44.101563 34.578125 43.960938 34.300781 C 38.359375 28 28.980469 27.859375 23.101563 33.878906 Z M 23.101563 33.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,145,252);fill-opacity:1;" d="M 33.601563 36.539063 C 30.941406 36.539063 28.839844 37.378906 26.878906 39.339844 L 26.601563 39.621094 L 26.320313 39.898438 C 23.101563 43.398438 18.621094 45.078125 14.140625 44.941406 C 9.519531 44.941406 5.460938 42.699219 2.101563 39.339844 C 1.398438 38.640625 0.558594 38.640625 0.140625 39.339844 C 0 39.339844 0 39.621094 0 40.039063 C 0 40.460938 0.421875 41.160156 0.699219 41.300781 C 4.339844 45.5 9.378906 47.878906 14.699219 47.878906 C 19.878906 48.160156 24.921875 45.921875 28.839844 41.71875 L 29.121094 41.441406 L 29.398438 41.160156 C 30.660156 39.898438 32.199219 39.199219 34.019531 39.199219 C 35.699219 39.199219 37.238281 40.039063 38.640625 41.441406 C 39.339844 42.140625 40.179688 42.140625 40.601563 41.441406 C 40.878906 41.160156 41.019531 40.738281 41.019531 40.320313 C 41.019531 39.898438 40.738281 39.480469 40.601563 39.199219 C 38.640625 37.660156 36.261719 36.539063 33.601563 36.539063 Z M 33.601563 36.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(129,201,255);fill-opacity:1;" d="M 21.839844 30.800781 C 25.058594 27.300781 29.539063 25.621094 34.019531 25.621094 C 38.5 25.621094 42.699219 27.859375 45.78125 31.21875 C 46.480469 31.921875 47.320313 31.921875 47.738281 31.21875 C 48.019531 30.941406 48.160156 30.519531 48.160156 30.101563 C 48.160156 29.679688 47.878906 29.261719 47.738281 28.980469 C 44.101563 24.78125 39.058594 22.398438 33.738281 22.398438 C 28.421875 22.398438 23.519531 24.359375 19.601563 28.558594 L 19.039063 29.121094 C 17.78125 30.378906 16.238281 31.078125 14.421875 31.078125 C 12.601563 31.078125 11.199219 30.238281 9.800781 28.839844 C 9.101563 28.140625 8.261719 28.140625 7.839844 28.839844 C 7.558594 29.121094 7.421875 29.539063 7.421875 29.960938 C 7.421875 30.378906 7.699219 30.800781 7.839844 31.078125 C 9.519531 33.039063 12.039063 34.160156 14.421875 34.160156 C 17.078125 34.160156 19.179688 33.320313 21.140625 31.359375 L 21.421875 31.078125 Z M 21.839844 30.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureStreamAnalytics.png b/dist/Analytics/AzureStreamAnalytics.png
index 10add7d3..b437374a 100644
Binary files a/dist/Analytics/AzureStreamAnalytics.png and b/dist/Analytics/AzureStreamAnalytics.png differ
diff --git a/dist/Analytics/AzureStreamAnalytics.puml b/dist/Analytics/AzureStreamAnalytics.puml
index 52004259..a7b35710 100644
--- a/dist/Analytics/AzureStreamAnalytics.puml
+++ b/dist/Analytics/AzureStreamAnalytics.puml
@@ -1,10 +1,11 @@
-sprite $AzureStreamAnalytics [70x56/16z] {
-fPQ9pgqW38GxNT__YUzMhnE1Fv3mPJb79H-M3geSaPbLvNA5rJzIhiXgL6we1xyjg94BuhMO49Kz458lGKTM74mVoeA8lWuwVyHxCI4Y6aNw9AAQs4cQiAo9
-vD_SI7RiBNMC7UMZyY-7jx9El1kaWNgUtWgnwaQJeLTdKMu7B38hCwmFHu_B5h08PkTR5uGST9kUE2w8asRONoAvc5x4ZZT0W-VCeDbBV7Kog5cDWUCpFbL6
-a8ycgJ6CELDAdisAPqNocIAwBrgahz7IGOFrZ6CyKdjKCjgJQF37q6gUD72VhUAdm_ZelwQgriA4F61f2HDEdlfAVCZFgrbP_FzuLLEyovGO6-qRImN6v4R_
-1z1_R6D1labbRq8OsRJkkwmi79nFnypSa-jbdqOJdJkjgxRQTD9-sk-X_VgQdcJEiQ60nR3pleg_CEuUpyE04oPO0XQtaj9my41ySnQi2AioWuV465QLXX8o
-hbMQ4CjNekETQf6O9kuz0wW5brXqUEWXvhvDrqWg9Jq3T7wr2Q5d39dL1fSHzVUv3wxx1XoyJFQ4p4njkhiPr2bnyp55TF_5lYUFAagB6d5eK7AWiSKd20Es
-aJoFFsU5S-hXbP2jnZd6Q94z-tKAkI1Oq0N6hDx0pjxWBEW2-5z-bFm6
+sprite $AzureStreamAnalytics [70x70/16z] {
+xTPRakCW30NGgpViVyFZH4LaA8_fBi_Vv7pbGIwImDMDV-_ho-F5yGX58ZoXaVHfG-bfGuaVDfGClw8kIqFf7EtqazsLy2PHxBp0QHEIZ44QC-FARNSn5hVS
+8_L-SuCuVgOVU7yzzY41R8fn4oO0n69-7T9vSrTrNa1w5HAumuf4n4JZm7qDwOmj4Xqab-iI4jXXdGa1OA-GAcMV8OVn4WVFa4Iu9RLzXkO7b3Uo3xeFuML8
+8qRxHs11LA-p_1LTn33M9NGEuVD9dql4eLfoMbB6zbmXh9v6gEHUt4jpMKSXKbC4cnUJN2N8OYQXKqpAbPdXfcRvWl1XVL7tdUHqJSdyC8vQR8wHgnHt6xCa
+v8jt1WhxeQxFTKfjLBzXb2nERbDutfdEzHCJaZdVTJIce4n4B5QpP6yleRaAWrwcWDGdahkt3qLPJxgvU13Msw6KQzl1LTzXZaBz90H0Qut715JDygH7YE5J
+55MApn47Rgtbond5kGzfWQlR8hKWjvn93MD5hIPo-uCy6ycNeHSXoTRYc_68q6XjZ4kZpNz6jVL2EDEM8Z8WcnmX1yyjg38gfP2rYUVtzWf9xntwmh5YYn4n
+Zi-ZzNkCAqHKvUNcjmAtsBA37Td_BzNt6cvKo8xYhwH2dhHadv3mrbVksrAIdvvPcSfgIdNz3FSyCvAkZmuosx7ZKItJvJrZm-z4dUm3MWqzGDNG4r4DFM_9
+y0Zv6-7_zlK7
 }
 
 AzureEntityColoring(AzureStreamAnalytics)
diff --git a/dist/Analytics/AzureStreamAnalytics.svg b/dist/Analytics/AzureStreamAnalytics.svg
index 4d5abe83..6214b7f4 100644
--- a/dist/Analytics/AzureStreamAnalytics.svg
+++ b/dist/Analytics/AzureStreamAnalytics.svg
@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="56pt" viewBox="0 0 70 56" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.509804%,94.509804%,94.509804%);fill-opacity:1;" d="M 34.859375 42.839844 C 34.578125 42.839844 34.441406 42.558594 34.019531 42.558594 C 33.179688 42.558594 32.339844 42.980469 31.640625 43.679688 L 31.359375 43.960938 C 28.699219 46.621094 25.761719 48.578125 22.398438 49.558594 L 21.140625 52.21875 L 23.378906 54.460938 Z M 34.859375 42.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.509804%,94.509804%,94.509804%);fill-opacity:1;" d="M 22.960938 22.820313 C 26.460938 20.859375 30.101563 20.019531 34.019531 20.019531 C 39.480469 20.300781 44.519531 22.261719 48.441406 25.898438 C 49.140625 26.460938 49.699219 26.878906 50.398438 27.441406 L 62.019531 15.820313 L 59.640625 13.441406 L 58.800781 13.859375 L 52.5 17.078125 L 48.160156 15.398438 L 45.359375 7.980469 L 39.058594 7.980469 L 38.78125 8.820313 L 36.679688 15.398438 L 32.339844 17.078125 L 24.921875 13.859375 L 20.441406 18.199219 L 20.859375 19.039063 Z M 22.960938 22.820313 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 60.023438 37.273438 L 61.773438 32.898438 L 69.300781 30.101563 L 69.125 23.800781 L 68.25 23.449219 L 61.601563 21.351563 L 59.5 17.148438 L 62.824219 9.800781 L 62.648438 9.625 L 58.273438 5.425781 L 57.398438 5.949219 L 51.273438 9.273438 L 46.898438 7.523438 L 44.101563 0 L 37.800781 0.175781 L 37.449219 1.050781 L 35.351563 7.699219 L 31.148438 9.625 L 23.976563 6.648438 L 19.601563 11.199219 L 20.125 12.074219 L 22.226563 15.925781 C 25.550781 13.824219 29.398438 12.773438 33.425781 12.773438 C 39.550781 12.773438 45.5 15.398438 49.875 20.300781 C 49.875 20.300781 49.875 20.476563 50.050781 20.476563 L 50.226563 20.648438 C 54.074219 25.375 53.550781 32.375 48.824219 36.226563 C 44.449219 39.898438 37.976563 39.550781 33.949219 35.699219 L 33.601563 35.699219 C 32.726563 35.699219 31.851563 36.050781 31.148438 36.925781 L 30.976563 37.101563 C 28.351563 39.898438 25.375 42 21.875 43.226563 L 20.824219 45.675781 L 25.023438 49.699219 L 25.375 50.050781 L 26.25 49.699219 L 32.375 46.375 L 36.75 48.125 L 39.550781 55.648438 L 45.851563 55.476563 L 46.199219 54.601563 L 48.300781 47.949219 L 52.5 46.023438 L 59.851563 49.351563 L 64.226563 44.800781 L 63.351563 43.398438 Z M 60.023438 37.273438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 22.925781 26.601563 C 22.925781 26.773438 22.925781 26.773438 22.925781 26.601563 L 22.75 26.773438 C 18.023438 31.851563 10.5 31.851563 5.773438 26.773438 C 5.25 26.074219 4.199219 26.074219 3.675781 26.773438 C 3.324219 27.125 3.324219 27.476563 3.324219 28 C 3.324219 28.523438 3.5 28.875 3.675781 29.226563 C 9.449219 35.699219 18.898438 35.699219 24.851563 29.226563 C 24.851563 29.226563 24.851563 29.050781 25.023438 29.050781 C 29.75 23.976563 37.273438 23.976563 42 29.050781 C 42.523438 29.75 43.574219 29.75 44.101563 29.050781 C 44.449219 28.699219 44.449219 28.351563 44.449219 27.824219 C 44.449219 27.476563 44.273438 26.949219 44.101563 26.601563 C 38.148438 20.300781 28.699219 20.300781 22.925781 26.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 33.601563 28.699219 C 30.976563 28.699219 28.699219 29.75 26.949219 31.851563 C 26.949219 31.851563 26.949219 32.023438 26.773438 32.023438 L 26.601563 32.199219 C 23.273438 35.699219 19.074219 37.800781 14.523438 37.800781 C 9.976563 37.800781 5.601563 35.875 2.449219 32.199219 C 1.925781 31.5 0.875 31.5 0.351563 32.199219 C 0 32.550781 0 32.898438 0 33.425781 C 0 33.773438 0.175781 34.300781 0.351563 34.648438 C 4.199219 38.851563 9.273438 41.125 14.523438 41.125 C 19.949219 41.125 25.023438 38.851563 28.699219 34.648438 C 28.699219 34.648438 28.699219 34.476563 28.875 34.476563 L 29.050781 34.300781 C 30.273438 32.898438 32.023438 32.199219 33.773438 32.199219 C 35.523438 32.199219 37.101563 32.898438 38.5 34.300781 C 39.023438 35 40.074219 35 40.601563 34.300781 C 40.949219 33.949219 40.949219 33.601563 40.949219 33.074219 C 40.949219 32.550781 40.773438 32.199219 40.601563 31.851563 C 38.5 29.75 36.050781 28.699219 33.601563 28.699219 M 47.601563 21.523438 C 43.75 17.324219 38.675781 15.050781 33.425781 15.050781 C 28 15.050781 22.925781 17.324219 19.25 21.523438 C 19.25 21.523438 19.25 21.699219 19.074219 21.699219 L 18.898438 21.875 C 17.675781 23.273438 15.925781 23.976563 14.175781 23.976563 C 12.425781 23.976563 10.675781 23.273438 9.449219 21.875 C 8.925781 21.175781 7.875 21.175781 7.351563 21.875 C 7 22.226563 7 22.574219 7 23.101563 C 7 23.449219 7.175781 23.976563 7.351563 24.324219 C 9.101563 26.25 11.550781 27.476563 14.175781 27.476563 C 16.800781 27.476563 19.074219 26.425781 20.824219 24.324219 C 20.824219 24.324219 20.824219 24.148438 21 24.148438 L 21.175781 23.976563 C 24.5 20.476563 28.699219 18.375 33.25 18.375 C 37.800781 18.375 42.175781 20.300781 45.324219 23.976563 C 45.851563 24.675781 46.898438 24.675781 47.425781 23.976563 C 47.773438 23.625 47.773438 23.273438 47.773438 22.75 C 48.125 22.226563 47.949219 21.875 47.601563 21.523438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 60.621094 44.800781 L 62.300781 40.460938 L 70 37.800781 L 70 31.640625 L 69.160156 31.359375 L 62.300781 29.398438 L 60.621094 25.058594 L 64.121094 17.921875 L 59.78125 13.578125 L 58.941406 14 L 52.640625 17.21875 L 48.160156 15.398438 L 45.359375 7.980469 L 39.058594 7.980469 L 38.78125 8.820313 L 36.679688 15.398438 L 32.339844 17.078125 L 24.921875 13.859375 L 20.441406 18.199219 L 20.859375 19.039063 L 22.820313 22.679688 C 26.320313 20.71875 29.960938 19.878906 33.878906 19.878906 C 39.339844 20.160156 44.378906 22.121094 48.300781 25.761719 C 49.140625 26.460938 49.980469 27.019531 50.960938 28 C 51.378906 28.421875 51.800781 29.121094 52.078125 29.539063 C 54.738281 34.160156 53.621094 40.039063 49.28125 43.539063 C 46.058594 46.199219 41.578125 46.621094 38.21875 45.078125 C 37.800781 44.800781 37.519531 44.800781 37.378906 44.660156 C 36.539063 44.238281 35.699219 43.539063 35 42.980469 C 34.71875 42.980469 34.578125 42.699219 34.160156 42.699219 C 33.320313 42.699219 32.480469 43.121094 31.78125 43.820313 L 31.5 44.101563 C 28.839844 46.761719 25.898438 48.71875 22.539063 49.699219 L 21.28125 52.359375 L 25.761719 56.839844 L 26.601563 56.421875 L 32.898438 53.199219 L 37.238281 54.878906 L 39.621094 62.300781 L 45.921875 62.300781 L 46.199219 61.460938 L 48.441406 54.878906 L 52.78125 53.199219 L 60.199219 56.421875 L 64.398438 51.800781 L 63.980469 50.960938 Z M 60.621094 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(28.235294%,78.431373%,93.72549%);fill-opacity:1;" d="M 23.101563 33.878906 C 18.339844 38.921875 10.640625 38.921875 6.160156 33.601563 C 5.738281 32.898438 4.621094 32.898438 4.199219 33.601563 C 3.921875 33.878906 3.78125 34.300781 3.78125 34.71875 C 3.78125 35.140625 4.058594 35.558594 4.199219 35.839844 C 9.800781 42.140625 19.179688 42.28125 25.199219 36.121094 C 29.960938 31.359375 37.378906 31.21875 42 36.539063 C 42.699219 37.238281 43.539063 37.238281 43.960938 36.539063 C 44.238281 36.261719 44.378906 35.839844 44.378906 35.421875 C 44.378906 35 44.101563 34.578125 43.960938 34.300781 C 38.359375 28 28.980469 27.859375 23.101563 33.878906 Z M 23.101563 33.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,67.058824%,92.54902%);fill-opacity:1;" d="M 33.601563 36.539063 C 30.941406 36.539063 28.839844 37.378906 26.878906 39.339844 L 26.601563 39.621094 L 26.320313 39.898438 C 23.101563 43.398438 18.621094 45.078125 14.140625 44.941406 C 9.519531 44.941406 5.460938 42.699219 2.101563 39.339844 C 1.398438 38.640625 0.558594 38.640625 0.140625 39.339844 C 0 39.339844 0 39.621094 0 40.039063 C 0 40.460938 0.421875 41.160156 0.699219 41.300781 C 4.339844 45.5 9.378906 47.878906 14.699219 47.878906 C 19.878906 48.160156 24.921875 45.921875 28.839844 41.71875 L 29.121094 41.441406 L 29.398438 41.160156 C 30.660156 39.898438 32.199219 39.199219 34.019531 39.199219 C 35.699219 39.199219 37.238281 40.039063 38.640625 41.441406 C 39.339844 42.140625 40.179688 42.140625 40.601563 41.441406 C 40.878906 41.160156 41.019531 40.738281 41.019531 40.320313 C 41.019531 39.898438 40.738281 39.480469 40.601563 39.199219 C 38.640625 37.660156 36.261719 36.539063 33.601563 36.539063 Z M 33.601563 36.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,83.921569%,93.72549%);fill-opacity:1;" d="M 21.839844 30.800781 C 25.058594 27.300781 29.539063 25.621094 34.019531 25.621094 C 38.5 25.621094 42.699219 27.859375 45.78125 31.21875 C 46.480469 31.921875 47.320313 31.921875 47.738281 31.21875 C 48.019531 30.941406 48.160156 30.519531 48.160156 30.101563 C 48.160156 29.679688 47.878906 29.261719 47.738281 28.980469 C 44.101563 24.78125 39.058594 22.398438 33.738281 22.398438 C 28.421875 22.398438 23.519531 24.359375 19.601563 28.558594 L 19.039063 29.121094 C 17.78125 30.378906 16.238281 31.078125 14.421875 31.078125 C 12.601563 31.078125 11.199219 30.238281 9.800781 28.839844 C 9.101563 28.140625 8.261719 28.140625 7.839844 28.839844 C 7.558594 29.121094 7.421875 29.539063 7.421875 29.960938 C 7.421875 30.378906 7.699219 30.800781 7.839844 31.078125 C 9.519531 33.039063 12.039063 34.160156 14.421875 34.160156 C 17.078125 34.160156 19.179688 33.320313 21.140625 31.359375 L 21.421875 31.078125 Z M 21.839844 30.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Analytics/AzureSynapseAnalytics(m).png b/dist/Analytics/AzureSynapseAnalytics(m).png
new file mode 100644
index 00000000..39873945
Binary files /dev/null and b/dist/Analytics/AzureSynapseAnalytics(m).png differ
diff --git a/dist/Analytics/AzureSynapseAnalytics(m).svg b/dist/Analytics/AzureSynapseAnalytics(m).svg
new file mode 100644
index 00000000..bf8ed94b
--- /dev/null
+++ b/dist/Analytics/AzureSynapseAnalytics(m).svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9" y1="5.38" x2="9" y2="0" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0.2" style="stop-color:rgb(0,81,142);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(0,108,188);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="9" y1="12.71" x2="9" y2="5.29" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0,124,216);stop-opacity:1;"/>
+<stop offset="0.17" style="stop-color:rgb(47,166,255);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(119,197,255);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(117,196,255);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(105,191,255);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(85,182,255);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(55,170,255);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(19,154,255);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(0,130,226);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(0,124,216);stop-opacity:1;"/>
+<stop offset="0.66" style="stop-color:rgb(47,166,255);stop-opacity:1;"/>
+<stop offset="0.98" style="stop-color:rgb(119,197,255);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 35 0 L 4.472656 17.460938 L 4.472656 52.460938 L 35 70 L 65.527344 52.539063 L 65.527344 17.539063 Z M 59.890625 48.882813 L 35 63.273438 L 10.109375 49.039063 L 10.109375 20.921875 L 35 6.535156 L 59.890625 20.960938 Z M 59.890625 48.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 35 0 L 4.472656 17.460938 L 10.109375 20.921875 L 35 6.535156 L 59.890625 20.921875 L 65.527344 17.460938 Z M 35 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 44.023438 45.070313 C 41.851563 36.070313 32.808594 30.523438 23.800781 32.667969 L 22.4375 26.988281 C 34.582031 24.117188 46.757813 31.613281 49.660156 43.75 Z M 44.023438 45.070313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 49.542969 40.714844 C 48.75 39.367188 47.023438 38.898438 45.65625 39.667969 L 14.039063 57.867188 L 19.871094 61.25 L 48.496094 44.722656 C 49.878906 43.894531 50.34375 42.113281 49.542969 40.714844 Z M 50.207031 8.710938 L 21.503906 25.277344 C 20.191406 26.097656 19.730469 27.796875 20.457031 29.167969 C 20.980469 30.0625 21.945313 30.609375 22.984375 30.605469 C 23.488281 30.613281 23.988281 30.480469 24.421875 30.214844 L 56.078125 11.9375 Z M 50.207031 8.710938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 47.015625 35 C 43.042969 35 39.820313 38.222656 39.820313 42.195313 C 39.820313 46.167969 43.042969 49.390625 47.015625 49.390625 C 50.988281 49.390625 54.210938 46.167969 54.210938 42.195313 C 54.210938 38.222656 50.988281 35 47.015625 35 Z M 22.984375 20.496094 C 19.011719 20.496094 15.789063 23.714844 15.789063 27.6875 C 15.789063 31.664063 19.011719 34.882813 22.984375 34.882813 C 26.957031 34.882813 30.179688 31.664063 30.179688 27.6875 C 30.179688 23.714844 26.957031 20.496094 22.984375 20.496094 Z M 22.984375 20.496094 "/>
+</g>
+</svg>
diff --git a/dist/Analytics/AzureSynapseAnalytics.png b/dist/Analytics/AzureSynapseAnalytics.png
new file mode 100644
index 00000000..20027af0
Binary files /dev/null and b/dist/Analytics/AzureSynapseAnalytics.png differ
diff --git a/dist/Analytics/AzureSynapseAnalytics.puml b/dist/Analytics/AzureSynapseAnalytics.puml
new file mode 100644
index 00000000..e586c6d1
--- /dev/null
+++ b/dist/Analytics/AzureSynapseAnalytics.puml
@@ -0,0 +1,12 @@
+sprite $AzureSynapseAnalytics [70x70/16z] {
+fPVfOeGm20P3W1oax_-wFLFzrCgMEF-wnoYpw6xJAwYPfgTK-wJdz0IrIQEq2jlOi9gMe3OEcAm46HSicaTncB7HQ358fwHZvzzvgCDvy7ayqt2GaYRvrsnL
+2hyE0ewM0B7lXrG-AHG9SgIChlA3gXV4tGvYsQWcWI10berYStly8EGvjD_DpEQkACbEmUsv2p8aNO0W-VRLCjv-6TKDmjDgRniDBfhvK2Tt68AAywYZxnOR
+NuyQkv_kCLSRNn8pj7nv5DvCT0x2QO8NXPqjHgSPyY48fIlDxYsiasEGc8Lr1uB4BAG810bPH1484h9eGM2OaAKSK17EpotmCJ-oW2TGjm85rZzaeGgex71i
+wzg6viooGm7Bhj7pLKq1Io9jlRT2rxj3nEBSxPWvhrZmPg7VI8vP417To34BeW2jMaYHvOaAGeiMBKXUj9G3l6QXylnSYALKPAKBYuXMeAI81TU_jfqSjP1C
+GCF1tINyejR-JNEl8_qx2DnvIRHeXj-kVrYiyoc8-qMTcvqjavOnY7VhfcAJZgSsAVH74ET_EB0axZQPUVnVBlZoYayBoELr44XmCsXJFmWUBzqSenStY1ZE
+Zk2yLNO2GOw8oaIhN8QfXo0ED3Nr-ifJ49-i8gLVpbhw9OYFD7W3bFU3-Al9WI1Uo79mHi0P8a6SvN22HF9Wa3XKdGs9vz7q4Ed_2F81
+}
+
+AzureEntityColoring(AzureSynapseAnalytics)
+!define AzureSynapseAnalytics(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSynapseAnalytics, AzureSynapseAnalytics)
+!define AzureSynapseAnalytics(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSynapseAnalytics, AzureSynapseAnalytics)
diff --git a/dist/Analytics/AzureSynapseAnalytics.svg b/dist/Analytics/AzureSynapseAnalytics.svg
new file mode 100644
index 00000000..f79fafa1
--- /dev/null
+++ b/dist/Analytics/AzureSynapseAnalytics.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9" y1="5.38" x2="9" y2="0" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0.2" style="stop-color:rgb(0%,35.686275%,63.137255%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(0%,47.058824%,83.137255%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="9" y1="12.71" x2="9" y2="5.29" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(9.803922%,54.117647%,70.196078%);stop-opacity:1;"/>
+<stop offset="0.17" style="stop-color:rgb(19.607843%,74.509804%,86.666667%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(31.372549%,90.196078%,100%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(30.980392%,89.411765%,99.215686%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(29.411765%,86.666667%,97.254902%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(26.666667%,82.352941%,93.333333%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(22.745098%,75.686275%,87.843137%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(17.647059%,67.058824%,80.784314%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(11.372549%,56.470588%,72.156863%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(9.803922%,54.117647%,70.196078%);stop-opacity:1;"/>
+<stop offset="0.66" style="stop-color:rgb(19.607843%,74.509804%,86.666667%);stop-opacity:1;"/>
+<stop offset="0.98" style="stop-color:rgb(31.372549%,90.196078%,100%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,83.137255%);fill-opacity:1;" d="M 35 0 L 4.472656 17.460938 L 4.472656 52.460938 L 35 70 L 65.527344 52.539063 L 65.527344 17.539063 Z M 59.890625 48.882813 L 35 63.273438 L 10.109375 49.039063 L 10.109375 20.921875 L 35 6.535156 L 59.890625 20.960938 Z M 59.890625 48.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 35 0 L 4.472656 17.460938 L 10.109375 20.921875 L 35 6.535156 L 59.890625 20.921875 L 65.527344 17.460938 Z M 35 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 44.023438 45.070313 C 41.851563 36.070313 32.808594 30.523438 23.800781 32.667969 L 22.4375 26.988281 C 34.582031 24.117188 46.757813 31.613281 49.660156 43.75 Z M 44.023438 45.070313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 49.542969 40.714844 C 48.75 39.367188 47.023438 38.898438 45.65625 39.667969 L 14.039063 57.867188 L 19.871094 61.25 L 48.496094 44.722656 C 49.878906 43.894531 50.34375 42.113281 49.542969 40.714844 Z M 50.207031 8.710938 L 21.503906 25.277344 C 20.191406 26.097656 19.730469 27.796875 20.457031 29.167969 C 20.980469 30.0625 21.945313 30.609375 22.984375 30.605469 C 23.488281 30.613281 23.988281 30.480469 24.421875 30.214844 L 56.078125 11.9375 Z M 50.207031 8.710938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 47.015625 35 C 43.042969 35 39.820313 38.222656 39.820313 42.195313 C 39.820313 46.167969 43.042969 49.390625 47.015625 49.390625 C 50.988281 49.390625 54.210938 46.167969 54.210938 42.195313 C 54.210938 38.222656 50.988281 35 47.015625 35 Z M 22.984375 20.496094 C 19.011719 20.496094 15.789063 23.714844 15.789063 27.6875 C 15.789063 31.664063 19.011719 34.882813 22.984375 34.882813 C 26.957031 34.882813 30.179688 31.664063 30.179688 27.6875 C 30.179688 23.714844 26.957031 20.496094 22.984375 20.496094 Z M 22.984375 20.496094 "/>
+</g>
+</svg>
diff --git a/dist/Analytics/all.puml b/dist/Analytics/all.puml
index 27e35b62..efccb2e2 100644
--- a/dist/Analytics/all.puml
+++ b/dist/Analytics/all.puml
@@ -1,9 +1,8 @@
-sprite $AzureAnalysisServices [70x56/16z] {
-xTHPhkCu44JHo979sF-26m9bFa4jUgovwduR1qWZHDuhy6HSz4_fULrxIIbSf_-KM-RwiI95ikH3fN6hBHI_rq7Xw5eHtgzElqlzH47dNay38EqjHRbbbXlN
-N01vGu4cgG2WiK4L-eu2D0f6uhNVDfMcryLPIIg-yiRRRP3En7L-LfoEM-82MCxRrEuenqoPEBzI6kCsnPEA2nlgg8nathPGwbYWTqJD75yT1W1aLHoLarl4
-8htTLg6T6xXMaehBXDtd04QsL9o-KfWOMHzAB1LZF5HGZnHXUwHu7qYNfGBsjN8x9sD336kbk5G2i29J0B5Xh9H6kLPAeOriYhspaZL3qAIE9VOsenHOASMP
-6WDN3uSaMGRn_vTdPNoF_QGCepiaUTbP2R3GpaeiZ9NIq8dah0SGVQpVVDckr5wYKQnk1U1zenur5Co2Xj4ScU0bvVmzQWtZTKMP6CsHlQ60TJGqtrA4387i
-GssiTnJf9FiOAW2-fnItna3ULpXIV0j5FbCQjsgYd_ox-g42U0RmcJBw4vHQz9Aox8Sg_m4
+sprite $AzureAnalysisServices [70x54/16z] {
+xTO5hWGX48JXQgcw_urNEqj8O8JdyiTNlb54M-5eVrFvL_WEYWFmPQKXZLbMkazM5TOdELRCDneTsJbGGiTAt8lqEvIhYjBgUWfI-ZcbSgXY0B0WuxoIeDGW
+AyZEAKHAhG8UKEfu_I7RpV7KYGOZu0Z4Bfc9BG1ZABqtqHKEOfZnzTWatnvm7X36HNjiFXigbILeCwNAGk0p1KJwNAbyJn4YzfIeJpXLQ9vpfGoF-c2cf1kd
+IXcK647DbGXehYHWFB1OU88ObaehOwBOAoSohAjUkhkHqeOo7e_Lms0PXnLN7opfG1a75JFrFOnGR3LO8DNtD4ukiz4h0JZBEA4Gx0qcZZMPDFDkoB2a-Cim
+BczYp59gB-gQOW2iNjHbnUgZV9zDp3TGQWY_KI7kSLcfwERyTXlmVoMtme6k
 }
 
 AzureEntityColoring(AzureAnalysisServices)
@@ -11,22 +10,21 @@ AzureEntityColoring(AzureAnalysisServices)
 !define AzureAnalysisServices(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAnalysisServices, AzureAnalysisServices)
 
 sprite $AzureDatabricks [67x70/16z] {
-fTS5SiD044HHQN7W_kSDW-5RBUZ2q2jlBqnbsSuwVIoNCjpC12A1x_HpGBVRj9F05QGPfUu7ghrAEG1SGOg9pFKIe95rsgxuq2T9PsX0Prm1yDHt17GQ7CN3
-gGGSH-noHePV0ZmiKo02oFmaCi9F0f5VX404y4SSNutxD_1DCA9Bk248qG0IZ32012CC0C681hw902DS0hV4EWGYWEXVBsRkMOq72F7x51UNYFCQoiq050W2
-NX_6S22oKGACwS78gnPncFFlyZVTAivYH5wlhpm10g6MLvx57W9udj3h56S8Z-qjSWCGei-zzoFNWN_Ju2UCCE2HbYaHyIks-Hb3NlvlGYAYBfDjPVZL8I0t
-pEJ6y_A04CYn8H2kFW4G0b4lg1M1o6F_ULchxqCst_0MY6Z0cto_vI2xpJfvBcuCih4-_okIY32GjYuGxZKsMeHGhzmYXdiLBMBM0GYqYE5UkKMDU7AyBXpT
-gsvHzwfRrBt6f18qCkLHqYakMzIfhbjy1m
+xTL7OYGn28NXKce1zx_lZ3CEI3zMRVsM3by7ADu5QRDT4094v0vIfxncraFW8Px70LBU04VABu4XFpFAEU18LkYoJa_ESPVPSW0Wl0YCL5m4pgFo8Z1IS8wS
+KHXWX1U1qtcEgGbt0XWnlKcecDr2r4pC007WdJ0x19muUYDcJXmXQW4H800u4ICCE04804umuW0GZX3WnB0e27YqNTV8lf7mxyRRoSiWQa66NwqP8WHylPyr
+HdR0V0SSaH1P0N6NT8ko74DSvsgvQ5Zompyr0b79UmqmeZ_wEQW19U07uW0Y6fJyieWOy98tpJvIknwH308zmeXkhhZi_qJvjzmZ2W3qo5-F80048T5Vq_Nc
+nwzZ1V0Lvmh8NV4gWC0LPoG6v4SDD0sH9H3MGDTyZ_HhaM4Oh_CxY0DXWZM95e6GkG4c0pvXMWH6S14uJN4HE5rn4JY35Y6F0F0V
 }
 
 AzureEntityColoring(AzureDatabricks)
 !define AzureDatabricks(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabricks, AzureDatabricks)
 !define AzureDatabricks(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabricks, AzureDatabricks)
 
-sprite $AzureDataCatalog [59x70/16z] {
-xTP76fim443XwONx7pWUEiW4n2RrNzd0eqeVm8WzStWW1KviU2hXY6jXsAtuR8R7j1OPFE1DcdKYJqYJrZNeBGBWDdr4__MKYiIRTEQTAQfD433xKjyDREzB
-joCXM5-gmyoxZmf84-YyrZsCeJ_belcR3SGCit6-eXeyJqC9uTfr9r3wqs2uvINRsp8ZCOyi4Qw2q913d0m59Pfzfl5XD67T-XqPrzboYxtkiPfvR2yGsOtX
-s4fVpoEKu81qN8nNCuVdcU5prrvROkpcgntUIbJxXkzuFAxvo6W_TtCvA7o7jH4qKxV4ybU_ftv8SIvtQKcbvf2QmvB6H_rhqr6w2TE8HMtTiXc8JThuLrCi
-76_IcNUcv35XWEnBzyFV-z9cqZrFUMvJkuyA6tfzXp5Uf58i_m__dwVvFhNtAH2VFKvRVstwFyMRCk6Qt7vkNfDyLnQqVFyHY1fjbyxm2BBwscUu4an-
+sprite $AzureDataCatalog [70x70/16z] {
+xTH5WiCm341HiUd-zvsev2auKHd_FYzcsCIbnQjmEgdjUeLhgoh1RA1WROKm6Ej0qTOuZCYCKfA5OfbHmkdRAZ-5M2nFbNg5GhOjNw7mJabNABXJobMhIwHb
+gjvkZtxAJwdPL0XX2l4ofIZ1AYHle5HlE8ha18cex58LfZrYuHuL0a3fGaybVASB0iWefU3x8ZwIOReRZAgbgLnFAlutxL-jsrCmi4VgurKHzJdtp5QM2nnG
+Ye0xiYCw90HJ8X4b6swE2gy7PAPzdr4jfkHi1ASZPuEAPqA70ZiHLdh9L9LNMsMzc7AGzJvQOP713OWgWTiOK08lGqp1yIiLLzn1hTxddvUVmZTH8Dr40U9H
+AQ0iPpTLVifFuO32Ymf185rG649ncbC8eh4D5Er6A5OxL8GHDlq1
 }
 
 AzureEntityColoring(AzureDataCatalog)
@@ -45,51 +43,94 @@ AzureEntityColoring(AzureDataExplorer)
 !define AzureDataExplorer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataExplorer, AzureDataExplorer)
 !define AzureDataExplorer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataExplorer, AzureDataExplorer)
 
+sprite $AzureDataFactory [70x70/16z] {
+xTG5MiH040NXRNcLtF_4V16qaMaSTcerziTpkSlCRd_jylxCtCFTJwmFMAJoFcLwst1bJT538b-ejLil8HedxDmXYQs5BMbJOlmOitsbbgUH6v23ohhiCvgd
+1DlYI1d7I36gh2l-_BucZ2jRYiUIUG9TPMyvZwhOwolt0NorCfMfJCK-GyceYBfAKXGJJKKKnQ2d61J5QIf6LOAcubGbQIf1LPAcabH5D1LH58Ec8efYD1M3
+eZXDnQbAq5ISgYHD9QYAQ2f9KKpq51T5CMWeZNwLCfMfo8wIhR0ZzjpsV41vzDZsSqYFde5_GfdAl8-cCfKR
+}
+
+AzureEntityColoring(AzureDataFactory)
+!define AzureDataFactory(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataFactory, AzureDataFactory)
+!define AzureDataFactory(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataFactory, AzureDataFactory)
+
 sprite $AzureDataLakeAnalytics [70x70/16z] {
-xTY53kGm30JG69hOy___UtnUQ7QAWeCHBJx5SjH0cyT7PYpIhaG2Fv9TBY29IjUpIiTpXbuQIYNim9_LVcPWbN1RHMLjwC3Xn7kjbZWJVnr9ubpiMHa0a74e
-2G3nX0W0z7Om2m1egoW0jCF9rv8CG1vN0e1VLluhijoXZBn1SVHFoj2zYYJiam8CsQS4idrMaBf7MO315AHiAvg0KmMTAlLRuKfkAXr0DAvWIr40MAugMO-Y
-2nNr-X5J1bUiMa0L9Kgjajr-HUPADAeCl6RC5QEAuoqwLQAj5BRgBssg-4fXzKIRAlayzDog9sMk-FFRtAh7vvtELWLDbE3zgPyiAvFMCrVgSyL4iVuhKNDY
-glJNNYJTAlQjDK11bTgcS6LGHMlIKaL0bQNwG9NEbQXwc2995QbcKcK1LRn-I9NWogX9IvMaYW0fbnMlISkLGPM1tlOeJfMCdJko88gaxbGao5Xa_-wm9-xO
-Oqh_UtRDrqysVkyfgrQ1OrbtLd4oHfOV4hx-M-1mqjegQZvFJwmot4sFTcFb4874aopzHvmWIp_Fl06fxKfqvFoowYi
+xTY7RYCX58NXMm_m_W-ynKkM6ECpXQXi-LKZfC-vqsTadQFM4YexQMcFQkuufVqETXV9BkmvjJrNNCwdlQml5TT52o9mkPndDTmgdX35pVopyckSl1GUVLOc
+bZGFODFVShbu_csxfnY0s5V-A_uLIk0B54E-Kz9EAy3RYT2AdLC2qFTAQywLiIfCQNP20U1SASTA0b2kj4F5-zgMeW0Gkqe2W6qgZhv4bSeLVI1vf0HNyg64
+VhHMgb35CRLMaYgAALihIfMSa9Ib0c5Aq7c6ekpuvFCC1TB3Ik5tzg5yu5QxmkTPAqLwM2Y6ALqgOqvjAsLwDd1PAoazV2ZaJCgZUu0sgkIOXod9bJ4FKxHI
+nSOyJCb6bHXBJAbS6JkJAT66md-EBHQkn5XWIkKA0DrMjE_alOcyx-IzhPjzdhqz3PTpYbMYg9nKHD6LpMTCmr_trApt51yAFNDvy_Kh0I3zKl5oAJNSBCWz
+ZCJl_xxxd_JCOrtYjOnmLxcIPfiBkP5cVKAgt2m-EowoxwJivENDHvtl
 }
 
 AzureEntityColoring(AzureDataLakeAnalytics)
 !define AzureDataLakeAnalytics(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataLakeAnalytics, AzureDataLakeAnalytics)
 !define AzureDataLakeAnalytics(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataLakeAnalytics, AzureDataLakeAnalytics)
 
-sprite $AzureEventHub [68x70/16z] {
-xTF5bSKm341HaKdzzplaC4UPpxfhdsTEUbK2lUuJ6ju8T8uiD1ZEeRM6Dues2Cv1RHH0hceYbbR6tGXNqu7Q2s1mduOtK3gMXi2Ff9q81t5i1J0rfhonVwRI
-mGDtoqkDe9rqj46nW_0ZQYSVQqnv0qC73GrQljlz1aa7bXeOE-J_zXY9dTs6wTzEMDwOgM7WZPr_UnXAnPD_ox2BAe1acBSgMXN8vlrh2rSQteXoqgHXyWaD
-RqWk5oNu1W
+sprite $AzureDataLakeStoreGen1 [70x70/16z] {
+xTDLKWKm40NH7hkL_MyOTqqn0pmx_v6ES3uk8hyHV2lMXkHhlhO4NzBQmvVMfXgPPTd8BE8BjerVbtq1cc2QK3eH5r7gIqfze3x3rHOC11KmqODFz90JFKpq
+O6foW9ZemUEUVeXNgj5pfn6Ml6GZFPheoOaU_yyUrRtaLWtyHk8WFb9Dz2WcUcHWQWFKbf1gSrnzeBwYr5UfCrMQ41fGfFeCFAidE1iNrm
+}
+
+AzureEntityColoring(AzureDataLakeStoreGen1)
+!define AzureDataLakeStoreGen1(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataLakeStoreGen1, AzureDataLakeStoreGen1)
+!define AzureDataLakeStoreGen1(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataLakeStoreGen1, AzureDataLakeStoreGen1)
+
+sprite $AzureEventHub [70x70/16z] {
+xTS5ZiDG38JXCOJlVzwbjtMbyYYS-1ErWJzCs1HlHwbBfHr6wQCookugMG6bPIfPwS6udKthml1B0bwAsHmXg0S1Bof1vwvaHVH2-4eSQGy6WWICgDmuGaN-
+4HNs68a7vdonwz-RqK9KdepEYboyg317-cOqNj60cyhjQ49UquLCSiTKhiAVTMCgjx8Ye6Y1Ns81b6OeEb2iBo-7pQWtrPfwtyrAJUdE-VMPbMPSf4EXes0w
+tm
 }
 
 AzureEntityColoring(AzureEventHub)
 !define AzureEventHub(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureEventHub, AzureEventHub)
 !define AzureEventHub(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureEventHub, AzureEventHub)
 
-sprite $AzureHDInsight [70x67/16z] {
-fPVhmhCW38EX9SK9zt-xtt6i0zCTU9-VmcAQEgdfDTdEriygwIUKrlzJqpxe3svf5-tElfjRVoQdBNAVm6QqVUBuC8R1aksIh-YTJ4LiyDfBiJkqH5jLf4-C
-ox21aXHSPLWzQO_C8O-we_Hv8HjBSjpdMh2voBd6vwuTCRe8ZvRTpa2Y9KvpRRstGuFRcV0kkncEBP1eoIBlfAFXcY_oJdBROljUF4DGAvpGZ7vgXM-6o_F-
-FLaI2SqeBnKU0egAgCBzyH3Zs3EF4InWXAaZ4CV4lvMuon8LgbWm88ms3XqNDBoZXQaB5afOFH61ZkPX9YVXqHOY0l20osL_YgoC_SHCNd-WqKCnVa02rkSS
-WGAFbegu6Isb34EFdc8vw28HGAPzKloA-58GBPmqapL5W8juCZ6ncQMfcp8R8Yx3GlcMg46l4Jjk5PaSWgmUhSTHB_Nb-oJOS6aKQO-Uzn50PoFjEhvfQAK4
-8sCZCrDQLOIDDUeYHeScB2fqn3gv5JSZvHywy76FcX4oaiQ03OsZKAUbbzG-KRcAbygnG2L_DQgNFe7WuwDyzP6H4oc95nG7KuC5JVDnKGQQhW_CcQb-q_NT
-W0V-fvj57FstqgfVVlLYmEb_tPciAlGrHLzICksE42CgchuZ1wVHleXXJqPi1Xj5iLFQAHkd297PE4Ls0-OptTRfY50cxpJ9sJljEO6Ltm
+sprite $AzureHDInsight [70x70/16z] {
+xTRdTYCX30LWjSiKy_wlkyL5Pf26O-Bjc-zlE1ULs8P-eq-oRDjgz9wrNbsKth3LXpTYIdKN-h3Q07sGrSP6B-Cxka9rCorfkK6Iij_lANU3QHwFQ6siNOhH
+2UjIw5AVZAx4pp2bk3W9BUtX9b0AfVJbBZvRzgRxgvpN6ih5hQcLaqCOZBQVdPK5SgZNQRxbMExu40MbCvY_ixZb8nqjmF7u5b1AniTGncCPdnlV8UeRjXTg
+BXr-tWmpWmzgD3_DPw_Pqj0ux99Fjfn6MmD0CHflsKxQj1QCyuRW5UPzsW4u7wxaIuL9LepbYyR9yiqUV-bASKZQ3o5c6WTizCHXj1f3l1WsX_1XXAc8fAE2
+tVc00VFgdefnbvg570w90JHq384vQh7GaEQbW6cAf24qIsCAQ9xrAH1wXIxRjcW_OOJ9SbcthJ1bUAzN6tinnvJkbwwMBEHIx_RxSUvImZDjeM0BZmmwfcXy
+ZYXrj3QaQGaF76wBhxIbDWgTgwsieTXm93Kfsgqlfl0mPNdrRNkfZM6bJ45Qz1h_6XlYAxdZs99GZ_T-Vz9zZCABt0Qr-cXnyWdGstsxKagmB62wazDF8sbP
+Yj9BulUBq3IBANWZv8qO-n7VtiNrCJ9NoayjXcPe7WEQKz8OfJcInO1ceNGCO9howIi
 }
 
 AzureEntityColoring(AzureHDInsight)
 !define AzureHDInsight(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureHDInsight, AzureHDInsight)
 !define AzureHDInsight(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureHDInsight, AzureHDInsight)
 
-sprite $AzureStreamAnalytics [70x56/16z] {
-fPQ9pgqW38GxNT__YUzMhnE1Fv3mPJb79H-M3geSaPbLvNA5rJzIhiXgL6we1xyjg94BuhMO49Kz458lGKTM74mVoeA8lWuwVyHxCI4Y6aNw9AAQs4cQiAo9
-vD_SI7RiBNMC7UMZyY-7jx9El1kaWNgUtWgnwaQJeLTdKMu7B38hCwmFHu_B5h08PkTR5uGST9kUE2w8asRONoAvc5x4ZZT0W-VCeDbBV7Kog5cDWUCpFbL6
-a8ycgJ6CELDAdisAPqNocIAwBrgahz7IGOFrZ6CyKdjKCjgJQF37q6gUD72VhUAdm_ZelwQgriA4F61f2HDEdlfAVCZFgrbP_FzuLLEyovGO6-qRImN6v4R_
-1z1_R6D1labbRq8OsRJkkwmi79nFnypSa-jbdqOJdJkjgxRQTD9-sk-X_VgQdcJEiQ60nR3pleg_CEuUpyE04oPO0XQtaj9my41ySnQi2AioWuV465QLXX8o
-hbMQ4CjNekETQf6O9kuz0wW5brXqUEWXvhvDrqWg9Jq3T7wr2Q5d39dL1fSHzVUv3wxx1XoyJFQ4p4njkhiPr2bnyp55TF_5lYUFAagB6d5eK7AWiSKd20Es
-aJoFFsU5S-hXbP2jnZd6Q94z-tKAkI1Oq0N6hDx0pjxWBEW2-5z-bFm6
+sprite $AzurePipeline [70x70/16z] {
+xT03jaKn44JHkeoxvZ_QPxk-qNivE07-5kTSdzjQ6I7hOcqhPSR0lHcgnfrOI9ePLo0A-wrhXhL2zj3ijqIkLAmbSe2cabYRpoeq3MzLPBShrZGtA_g__92A
+LxpY5QzufRi4lT8RBrctdHCg4wzDW951g22LImd0L7BtnR-RWiPkLNIVM0cJffrMsZj-jzjL6fdY2iaEcaIMk6BapBqCqS2zYhYFT51Djelqw-Quqa4cRFqg
+phab
+}
+
+AzureEntityColoring(AzurePipeline)
+!define AzurePipeline(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzurePipeline, AzurePipeline)
+!define AzurePipeline(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzurePipeline, AzurePipeline)
+
+sprite $AzureStreamAnalytics [70x70/16z] {
+xTPRakCW30NGgpViVyFZH4LaA8_fBi_Vv7pbGIwImDMDV-_ho-F5yGX58ZoXaVHfG-bfGuaVDfGClw8kIqFf7EtqazsLy2PHxBp0QHEIZ44QC-FARNSn5hVS
+8_L-SuCuVgOVU7yzzY41R8fn4oO0n69-7T9vSrTrNa1w5HAumuf4n4JZm7qDwOmj4Xqab-iI4jXXdGa1OA-GAcMV8OVn4WVFa4Iu9RLzXkO7b3Uo3xeFuML8
+8qRxHs11LA-p_1LTn33M9NGEuVD9dql4eLfoMbB6zbmXh9v6gEHUt4jpMKSXKbC4cnUJN2N8OYQXKqpAbPdXfcRvWl1XVL7tdUHqJSdyC8vQR8wHgnHt6xCa
+v8jt1WhxeQxFTKfjLBzXb2nERbDutfdEzHCJaZdVTJIce4n4B5QpP6yleRaAWrwcWDGdahkt3qLPJxgvU13Msw6KQzl1LTzXZaBz90H0Qut715JDygH7YE5J
+55MApn47Rgtbond5kGzfWQlR8hKWjvn93MD5hIPo-uCy6ycNeHSXoTRYc_68q6XjZ4kZpNz6jVL2EDEM8Z8WcnmX1yyjg38gfP2rYUVtzWf9xntwmh5YYn4n
+Zi-ZzNkCAqHKvUNcjmAtsBA37Td_BzNt6cvKo8xYhwH2dhHadv3mrbVksrAIdvvPcSfgIdNz3FSyCvAkZmuosx7ZKItJvJrZm-z4dUm3MWqzGDNG4r4DFM_9
+y0Zv6-7_zlK7
 }
 
 AzureEntityColoring(AzureStreamAnalytics)
 !define AzureStreamAnalytics(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStreamAnalytics, AzureStreamAnalytics)
 !define AzureStreamAnalytics(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStreamAnalytics, AzureStreamAnalytics)
 
+sprite $AzureSynapseAnalytics [70x70/16z] {
+fPVfOeGm20P3W1oax_-wFLFzrCgMEF-wnoYpw6xJAwYPfgTK-wJdz0IrIQEq2jlOi9gMe3OEcAm46HSicaTncB7HQ358fwHZvzzvgCDvy7ayqt2GaYRvrsnL
+2hyE0ewM0B7lXrG-AHG9SgIChlA3gXV4tGvYsQWcWI10berYStly8EGvjD_DpEQkACbEmUsv2p8aNO0W-VRLCjv-6TKDmjDgRniDBfhvK2Tt68AAywYZxnOR
+NuyQkv_kCLSRNn8pj7nv5DvCT0x2QO8NXPqjHgSPyY48fIlDxYsiasEGc8Lr1uB4BAG810bPH1484h9eGM2OaAKSK17EpotmCJ-oW2TGjm85rZzaeGgex71i
+wzg6viooGm7Bhj7pLKq1Io9jlRT2rxj3nEBSxPWvhrZmPg7VI8vP417To34BeW2jMaYHvOaAGeiMBKXUj9G3l6QXylnSYALKPAKBYuXMeAI81TU_jfqSjP1C
+GCF1tINyejR-JNEl8_qx2DnvIRHeXj-kVrYiyoc8-qMTcvqjavOnY7VhfcAJZgSsAVH74ET_EB0axZQPUVnVBlZoYayBoELr44XmCsXJFmWUBzqSenStY1ZE
+Zk2yLNO2GOw8oaIhN8QfXo0ED3Nr-ifJ49-i8gLVpbhw9OYFD7W3bFU3-Al9WI1Uo79mHi0P8a6SvN22HF9Wa3XKdGs9vz7q4Ed_2F81
+}
+
+AzureEntityColoring(AzureSynapseAnalytics)
+!define AzureSynapseAnalytics(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSynapseAnalytics, AzureSynapseAnalytics)
+!define AzureSynapseAnalytics(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSynapseAnalytics, AzureSynapseAnalytics)
+
diff --git a/dist/Azure_Symbols.pptx b/dist/Azure_Symbols.pptx
deleted file mode 100644
index 28b4996c..00000000
Binary files a/dist/Azure_Symbols.pptx and /dev/null differ
diff --git a/dist/Compute/AzureAppService(m).png b/dist/Compute/AzureAppService(m).png
index fbfa0f12..50aa5290 100644
Binary files a/dist/Compute/AzureAppService(m).png and b/dist/Compute/AzureAppService(m).png differ
diff --git a/dist/Compute/AzureAppService(m).svg b/dist/Compute/AzureAppService(m).svg
index 69c4182a..89942e77 100644
--- a/dist/Compute/AzureAppService(m).svg
+++ b/dist/Compute/AzureAppService(m).svg
@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<image id="image9" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAArElEQVR4nO3QoQ3CUBSF4fcIrqY74PEsgWMqxmALlsCh0CBJQFbABKfJS2gT0u/zJ/fmLwUAAAAA4O/U1sHn+e5L12+meGbUcHnUbnuf69yqeVH75pg/UU+z3m0PsxDCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBOvmxbm8yu5wneCXcbf9UMpx9rMAAAAAAMDSfAHK+Q2zVBdBLwAAAABJRU5ErkJggg=="/>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<use xlink:href="#image9"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 27.035156 47.167969 C 25.769531 45.902344 24.921875 44.355469 24.5 42.523438 C 23.371094 37.316406 26.472656 32.242188 31.679688 31.121094 C 32.808594 30.835938 33.792969 30.835938 34.777344 30.976563 C 35.199219 26.1875 38.160156 21.824219 42.523438 19.714844 C 41.253906 19.289063 39.847656 19.007813 38.296875 19.007813 C 32.242188 19.007813 27.035156 22.953125 25.203125 28.585938 C 24.214844 28.300781 23.234375 28.019531 22.105469 28.019531 C 16.898438 28.019531 12.675781 32.242188 12.675781 37.59375 C 12.675781 42.945313 16.898438 47.167969 22.105469 47.167969 Z M 27.035156 47.167969 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(19.607843%,46.27451%,73.72549%);fill-opacity:1;" d="M 28.339844 65.21875 L 4.953125 65.21875 L 4.953125 42 L 9.5625 42 C 9.046875 40.632813 8.707031 39.097656 8.707031 37.390625 C 8.707031 37.390625 8.707031 37.21875 8.707031 37.046875 L 0 37.046875 L 0 70 L 33.121094 70 L 33.121094 50.535156 L 28.339844 50.535156 Z M 28.339844 65.21875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(19.607843%,46.27451%,73.72549%);fill-opacity:1;" d="M 60.953125 42 L 65.21875 42 L 65.21875 65.21875 L 41.828125 65.21875 L 41.828125 50.535156 L 37.046875 50.535156 L 37.046875 70 L 70.171875 70 L 70.171875 37.046875 L 59.757813 37.046875 C 60.609375 38.414063 60.953125 39.953125 60.953125 41.660156 C 60.953125 41.828125 60.953125 41.828125 60.953125 42 Z M 60.953125 42 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(19.607843%,46.27451%,73.72549%);fill-opacity:1;" d="M 4.953125 28.171875 L 4.953125 4.953125 L 28.339844 4.953125 L 28.339844 18.4375 C 29.878906 17.414063 31.414063 16.5625 33.121094 16.046875 L 33.121094 0.171875 L 0.171875 0.171875 L 0.171875 33.121094 L 9.730469 33.121094 C 10.414063 31.242188 11.4375 29.707031 12.804688 28.339844 Z M 4.953125 28.171875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(19.607843%,46.27451%,73.72549%);fill-opacity:1;" d="M 41.828125 15.707031 L 41.828125 4.953125 L 65.21875 4.953125 L 65.21875 28.171875 L 55.144531 28.171875 C 55.488281 29.707031 55.828125 31.242188 55.828125 32.78125 C 55.828125 32.78125 55.828125 32.953125 55.828125 32.953125 L 70.171875 32.953125 L 70.171875 0 L 37.046875 0 L 37.046875 15.195313 C 37.390625 15.195313 37.902344 15.195313 38.242188 15.195313 C 39.4375 15.195313 40.632813 15.367188 41.828125 15.707031 Z M 41.828125 15.707031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(19.607843%,46.27451%,73.72549%);fill-opacity:1;" d="M 57.367188 41.660156 C 57.367188 38.757813 54.976563 36.367188 52.242188 36.367188 C 52.074219 36.367188 51.902344 36.367188 51.5625 36.367188 C 51.902344 35.171875 52.074219 33.976563 52.074219 32.609375 C 52.074219 24.925781 45.925781 18.609375 38.242188 18.609375 C 32.097656 18.609375 26.976563 22.535156 25.097656 28.171875 C 24.074219 27.828125 23.046875 27.660156 22.023438 27.660156 C 16.730469 27.660156 12.632813 31.925781 12.632813 37.21875 C 12.632813 42.511719 16.902344 46.78125 22.023438 46.78125 L 52.757813 46.78125 C 55.316406 46.609375 57.367188 44.390625 57.367188 41.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 28.300781 65.476563 L 4.925781 65.476563 L 4.925781 42.242188 L 9.714844 42.242188 C 9.152344 40.835938 8.871094 39.28125 8.871094 37.59375 C 8.871094 37.59375 8.871094 37.453125 8.871094 37.316406 L 0 37.316406 L 0 70.402344 L 33.230469 70.402344 L 33.230469 50.6875 L 28.300781 50.6875 Z M 28.300781 65.476563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 61.25 42.242188 L 65.476563 42.242188 L 65.476563 65.613281 L 42.101563 65.613281 L 42.101563 50.828125 L 37.171875 50.828125 L 37.171875 70.402344 L 70.402344 70.402344 L 70.402344 37.316406 L 59.984375 37.316406 C 60.6875 38.722656 61.25 40.128906 61.25 41.957031 C 61.25 41.957031 61.25 42.101563 61.25 42.242188 Z M 61.25 42.242188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 4.925781 28.160156 L 4.925781 4.925781 L 28.300781 4.925781 L 28.300781 18.445313 C 29.707031 17.316406 31.539063 16.613281 33.230469 16.195313 L 33.230469 0 L 0 0 L 0 33.085938 L 9.574219 33.085938 C 10.277344 31.398438 11.261719 29.566406 12.675781 28.300781 Z M 4.925781 28.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 42.101563 15.628906 L 42.101563 4.925781 L 65.476563 4.925781 L 65.476563 28.300781 L 55.195313 28.300781 C 55.617188 29.707031 55.898438 31.398438 55.898438 33.085938 C 55.898438 33.085938 55.898438 33.230469 55.898438 33.230469 L 70.402344 33.230469 L 70.402344 0 L 37.171875 0 L 37.171875 15.347656 C 37.59375 15.347656 37.875 15.207031 38.296875 15.207031 C 39.566406 15.347656 40.835938 15.347656 42.101563 15.628906 Z M 42.101563 15.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.449219 41.816406 C 57.449219 38.863281 55.054688 36.609375 52.238281 36.609375 C 51.957031 36.609375 51.816406 36.609375 51.53125 36.609375 C 51.816406 35.484375 52.097656 34.214844 52.097656 32.949219 C 52.097656 25.203125 45.902344 19.007813 38.160156 19.007813 C 32.105469 19.007813 26.890625 22.953125 25.066406 28.585938 C 24.078125 28.300781 23.09375 28.019531 21.964844 28.019531 C 16.757813 28.019531 12.53125 32.242188 12.53125 37.59375 C 12.53125 42.945313 16.757813 47.167969 21.964844 47.167969 L 52.660156 47.167969 C 55.335938 46.890625 57.449219 44.632813 57.449219 41.816406 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Compute/AzureAppService.png b/dist/Compute/AzureAppService.png
index 3aa21a33..8e732e87 100644
Binary files a/dist/Compute/AzureAppService.png and b/dist/Compute/AzureAppService.png differ
diff --git a/dist/Compute/AzureAppService.puml b/dist/Compute/AzureAppService.puml
index 5b1b8222..25308f83 100644
--- a/dist/Compute/AzureAppService.puml
+++ b/dist/Compute/AzureAppService.puml
@@ -1,8 +1,7 @@
 sprite $AzureAppService [70x70/16z] {
-xTO5WiCm34JHaUG8xd_WCjkkx7PvyygG7mQr10FGI5Wa_dC5RUMkWZRvmPMribQ8fUWR5Iz8v1KNuEqAdL-PQQfI4_NOyuLVheZ7bV5h5Ojx-aA5F1xPVCMZ
-PhCLYnQTgvHeuwcAHvkDLeW0YHxfL5INFS5UiTXnZnu5m7fcfygPOuSzCWw0k-T6FazVXW3gLPRpA58Ce5UXytf9IVLFbXE-sqJI2jsfjzOSuwaOWwSeXhXK
-4wCdrHfAGjWfUdQxTr2CAysnEdPY0W5eVskJ4sFDZK1Yd5PNZRn3gE9fXPXvgJS0ygavsfEw0XxDE9vKG5DxGLqvuyKZeuIaCk7tLMZd_4f9PUxgyETNrifQ
-MIlIfdULqljJxbn9_BtA5W
+xTX7SWCn34HHDCBS_yRElK2PGiyu1_wTqYiIekAXSZFBu-rjnTP5KzoMuGShMzaAt2Fn3YLWSrefDvLM80cjC4HcPGRUeKIzz3YZDofUZ6zPRr2Y8O_5TIKR
+GcPGz4gONrDGNM4O5BqVba8HIs6ueUHJF5UUcU6vH3XW1CkZLtscDvNY2fPn7wF2Eou5dWGfS33JKb8QF3BLNR37kMg3YhVw4PaH1XkhSygCO43cjSHBJtkL
+2gid2C4ETa7XXB7SB3JIXrFBpMgb7z9ONfiNb7obSBoue1J7Up1ZSPw9uLqgJoiO58kJJCplcCWpIkZtNNZCkPbMTBzJuVSwFd7_v_lkLhQobNNxNvnx
 }
 
 AzureEntityColoring(AzureAppService)
diff --git a/dist/Compute/AzureAppService.svg b/dist/Compute/AzureAppService.svg
index 2a196a49..f8f4de78 100644
--- a/dist/Compute/AzureAppService.svg
+++ b/dist/Compute/AzureAppService.svg
@@ -4,24 +4,25 @@
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
+<image id="image9" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAArElEQVR4nO3QoQ3CUBSF4fcIrqY74PEsgWMqxmALlsCh0CBJQFbABKfJS2gT0u/zJ/fmLwUAAAAA4O/U1sHn+e5L12+meGbUcHnUbnuf69yqeVH75pg/UU+z3m0PsxDCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBOvmxbm8yu5wneCXcbf9UMpx9rMAAAAAAMDSfAHK+Q2zVBdBLwAAAABJRU5ErkJggg=="/>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<use xlink:href="#image9"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.878906 46.898438 C 25.621094 45.640625 24.78125 44.101563 24.359375 42.28125 C 23.238281 37.101563 26.320313 32.058594 31.5 30.941406 C 32.621094 30.660156 33.601563 30.660156 34.578125 30.800781 C 35 26.039063 37.941406 21.699219 42.28125 19.601563 C 41.019531 19.179688 39.621094 18.898438 38.078125 18.898438 C 32.058594 18.898438 26.878906 22.820313 25.058594 28.421875 C 24.078125 28.140625 23.101563 27.859375 21.980469 27.859375 C 16.800781 27.859375 12.601563 32.058594 12.601563 37.378906 C 12.601563 42.699219 16.800781 46.898438 21.980469 46.898438 Z M 26.878906 46.898438 "/>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 27.035156 47.167969 C 25.769531 45.902344 24.921875 44.355469 24.5 42.523438 C 23.371094 37.316406 26.472656 32.242188 31.679688 31.121094 C 32.808594 30.835938 33.792969 30.835938 34.777344 30.976563 C 35.199219 26.1875 38.160156 21.824219 42.523438 19.714844 C 41.253906 19.289063 39.847656 19.007813 38.296875 19.007813 C 32.242188 19.007813 27.035156 22.953125 25.203125 28.585938 C 24.214844 28.300781 23.234375 28.019531 22.105469 28.019531 C 16.898438 28.019531 12.675781 32.242188 12.675781 37.59375 C 12.675781 42.945313 16.898438 47.167969 22.105469 47.167969 Z M 27.035156 47.167969 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 28.140625 65.101563 L 4.898438 65.101563 L 4.898438 42 L 9.660156 42 C 9.101563 40.601563 8.820313 39.058594 8.820313 37.378906 C 8.820313 37.378906 8.820313 37.238281 8.820313 37.101563 L 0 37.101563 L 0 70 L 33.039063 70 L 33.039063 50.398438 L 28.140625 50.398438 Z M 28.140625 65.101563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 60.898438 42 L 65.101563 42 L 65.101563 65.238281 L 41.859375 65.238281 L 41.859375 50.539063 L 36.960938 50.539063 L 36.960938 70 L 70 70 L 70 37.101563 L 59.640625 37.101563 C 60.339844 38.5 60.898438 39.898438 60.898438 41.71875 C 60.898438 41.71875 60.898438 41.859375 60.898438 42 Z M 60.898438 42 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 4.898438 28 L 4.898438 4.898438 L 28.140625 4.898438 L 28.140625 18.339844 C 29.539063 17.21875 31.359375 16.519531 33.039063 16.101563 L 33.039063 0 L 0 0 L 0 32.898438 L 9.519531 32.898438 C 10.21875 31.21875 11.199219 29.398438 12.601563 28.140625 Z M 4.898438 28 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 41.859375 15.539063 L 41.859375 4.898438 L 65.101563 4.898438 L 65.101563 28.140625 L 54.878906 28.140625 C 55.300781 29.539063 55.578125 31.21875 55.578125 32.898438 C 55.578125 32.898438 55.578125 33.039063 55.578125 33.039063 L 70 33.039063 L 70 0 L 36.960938 0 L 36.960938 15.261719 C 37.378906 15.261719 37.660156 15.121094 38.078125 15.121094 C 39.339844 15.261719 40.601563 15.261719 41.859375 15.539063 Z M 41.859375 15.539063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.121094 41.578125 C 57.121094 38.640625 54.738281 36.398438 51.941406 36.398438 C 51.660156 36.398438 51.519531 36.398438 51.238281 36.398438 C 51.519531 35.28125 51.800781 34.019531 51.800781 32.761719 C 51.800781 25.058594 45.640625 18.898438 37.941406 18.898438 C 31.921875 18.898438 26.738281 22.820313 24.921875 28.421875 C 23.941406 28.140625 22.960938 27.859375 21.839844 27.859375 C 16.660156 27.859375 12.460938 32.058594 12.460938 37.378906 C 12.460938 42.699219 16.660156 46.898438 21.839844 46.898438 L 52.359375 46.898438 C 55.019531 46.621094 57.121094 44.378906 57.121094 41.578125 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 28.300781 65.476563 L 4.925781 65.476563 L 4.925781 42.242188 L 9.714844 42.242188 C 9.152344 40.835938 8.871094 39.28125 8.871094 37.59375 C 8.871094 37.59375 8.871094 37.453125 8.871094 37.316406 L 0 37.316406 L 0 70.402344 L 33.230469 70.402344 L 33.230469 50.6875 L 28.300781 50.6875 Z M 28.300781 65.476563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 61.25 42.242188 L 65.476563 42.242188 L 65.476563 65.613281 L 42.101563 65.613281 L 42.101563 50.828125 L 37.171875 50.828125 L 37.171875 70.402344 L 70.402344 70.402344 L 70.402344 37.316406 L 59.984375 37.316406 C 60.6875 38.722656 61.25 40.128906 61.25 41.957031 C 61.25 41.957031 61.25 42.101563 61.25 42.242188 Z M 61.25 42.242188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 4.925781 28.160156 L 4.925781 4.925781 L 28.300781 4.925781 L 28.300781 18.445313 C 29.707031 17.316406 31.539063 16.613281 33.230469 16.195313 L 33.230469 0 L 0 0 L 0 33.085938 L 9.574219 33.085938 C 10.277344 31.398438 11.261719 29.566406 12.675781 28.300781 Z M 4.925781 28.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 42.101563 15.628906 L 42.101563 4.925781 L 65.476563 4.925781 L 65.476563 28.300781 L 55.195313 28.300781 C 55.617188 29.707031 55.898438 31.398438 55.898438 33.085938 C 55.898438 33.085938 55.898438 33.230469 55.898438 33.230469 L 70.402344 33.230469 L 70.402344 0 L 37.171875 0 L 37.171875 15.347656 C 37.59375 15.347656 37.875 15.207031 38.296875 15.207031 C 39.566406 15.347656 40.835938 15.347656 42.101563 15.628906 Z M 42.101563 15.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.449219 41.816406 C 57.449219 38.863281 55.054688 36.609375 52.238281 36.609375 C 51.957031 36.609375 51.816406 36.609375 51.53125 36.609375 C 51.816406 35.484375 52.097656 34.214844 52.097656 32.949219 C 52.097656 25.203125 45.902344 19.007813 38.160156 19.007813 C 32.105469 19.007813 26.890625 22.953125 25.066406 28.585938 C 24.078125 28.300781 23.09375 28.019531 21.964844 28.019531 C 16.757813 28.019531 12.53125 32.242188 12.53125 37.59375 C 12.53125 42.945313 16.757813 47.167969 21.964844 47.167969 L 52.660156 47.167969 C 55.335938 46.890625 57.449219 44.632813 57.449219 41.816406 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Compute/AzureAvailabilitySet(m).png b/dist/Compute/AzureAvailabilitySet(m).png
new file mode 100644
index 00000000..a346668b
Binary files /dev/null and b/dist/Compute/AzureAvailabilitySet(m).png differ
diff --git a/dist/Compute/AzureAvailabilitySet(m).svg b/dist/Compute/AzureAvailabilitySet(m).svg
new file mode 100644
index 00000000..29c0747b
--- /dev/null
+++ b/dist/Compute/AzureAvailabilitySet(m).svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 49.484375 12.546875 C 49.476563 12.546875 49.46875 12.542969 49.460938 12.542969 L 13.929688 12.542969 C 12.71875 12.542969 11.746094 13.621094 11.746094 14.824219 L 11.746094 39.566406 C 11.746094 40.765625 12.71875 41.832031 13.929688 41.832031 L 14.773438 41.832031 Z M 49.484375 12.546875 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 55.851563 20.460938 C 55.84375 20.460938 55.835938 20.460938 55.828125 20.460938 L 20.296875 20.460938 C 19.085938 20.460938 18.113281 21.539063 18.113281 22.742188 L 18.113281 47.484375 C 18.113281 48.683594 19.085938 49.75 20.296875 49.75 L 21.140625 49.75 Z M 55.851563 20.460938 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.605469 44.308594 C 37.566406 44.308594 37.53125 44.296875 37.496094 44.277344 L 30.453125 40.21875 C 30.382813 40.179688 30.34375 40.113281 30.34375 40.03125 L 30.34375 31.882813 C 30.34375 31.804688 30.382813 31.734375 30.453125 31.699219 C 30.515625 31.65625 30.59375 31.65625 30.667969 31.699219 L 37.714844 35.757813 C 37.773438 35.796875 37.816406 35.867188 37.816406 35.945313 L 37.816406 44.09375 C 37.816406 44.171875 37.777344 44.242188 37.714844 44.277344 C 37.679688 44.296875 37.640625 44.308594 37.605469 44.308594 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.601563 44.308594 C 39.5625 44.308594 39.527344 44.296875 39.492188 44.277344 C 39.429688 44.242188 39.386719 44.171875 39.386719 44.09375 L 39.386719 35.992188 C 39.386719 35.917969 39.429688 35.847656 39.492188 35.808594 L 46.539063 31.75 C 46.605469 31.710938 46.683594 31.710938 46.75 31.75 C 46.816406 31.789063 46.859375 31.859375 46.859375 31.933594 L 46.859375 40.035156 C 46.859375 40.113281 46.816406 40.183594 46.75 40.21875 L 39.707031 44.28125 C 39.675781 44.296875 39.636719 44.308594 39.601563 44.308594 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 30.332031 0 L 39.667969 0 L 39.667969 7 L 30.332031 7 Z M 30.332031 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 16.332031 0 L 25.667969 0 L 25.667969 7 L 16.332031 7 Z M 16.332031 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 63 63 L 58.332031 63 L 58.332031 70 L 65.332031 70 C 67.910156 70 70 67.910156 70 65.332031 L 70 58.332031 L 63 58.332031 Z M 63 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 0 44.332031 L 7 44.332031 L 7 53.667969 L 0 53.667969 Z M 0 44.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 30.332031 63 L 39.667969 63 L 39.667969 70 L 30.332031 70 Z M 30.332031 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 63 44.332031 L 70 44.332031 L 70 53.667969 L 63 53.667969 Z M 63 44.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 44.332031 63 L 53.667969 63 L 53.667969 70 L 44.332031 70 Z M 44.332031 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 16.332031 63 L 25.667969 63 L 25.667969 70 L 16.332031 70 Z M 16.332031 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 7 63 L 7 58.332031 L 0 58.332031 L 0 65.332031 C 0 67.910156 2.089844 70 4.667969 70 L 11.667969 70 L 11.667969 63 Z M 7 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 0 16.332031 L 7 16.332031 L 7 25.667969 L 0 25.667969 Z M 0 16.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 7 7 L 11.667969 7 L 11.667969 0 L 4.667969 0 C 2.089844 0 0 2.089844 0 4.667969 L 0 11.667969 L 7 11.667969 Z M 7 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 0 30.332031 L 7 30.332031 L 7 39.667969 L 0 39.667969 Z M 0 30.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 63 30.332031 L 70 30.332031 L 70 39.667969 L 63 39.667969 Z M 63 30.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 63 16.332031 L 70 16.332031 L 70 25.667969 L 63 25.667969 Z M 63 16.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 44.332031 0 L 53.667969 0 L 53.667969 7 L 44.332031 7 Z M 44.332031 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 63 7 L 63 11.667969 L 70 11.667969 L 70 4.667969 C 70 2.089844 67.910156 0 65.332031 0 L 58.332031 0 L 58.332031 7 Z M 63 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 49.460938 12.542969 L 13.929688 12.542969 C 12.71875 12.542969 11.746094 13.621094 11.746094 14.824219 L 11.746094 39.570313 C 11.746094 40.765625 12.71875 41.832031 13.929688 41.832031 L 49.460938 41.832031 C 50.664063 41.832031 51.882813 40.765625 51.882813 39.570313 L 51.882813 14.824219 C 51.886719 13.617188 50.664063 12.542969 49.460938 12.542969 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 48.832031 38.75 L 14.789063 38.75 L 14.789063 15.628906 L 48.832031 15.578125 Z M 48.832031 38.75 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 32.230469 14.222656 C 32.230469 14.539063 31.976563 14.789063 31.660156 14.789063 C 31.347656 14.789063 31.09375 14.535156 31.09375 14.222656 C 31.09375 13.90625 31.347656 13.652344 31.660156 13.652344 C 31.976563 13.652344 32.230469 13.90625 32.230469 14.222656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.253906 26.488281 C 32.21875 26.488281 32.183594 26.476563 32.148438 26.457031 L 25.078125 22.382813 C 25.015625 22.34375 24.972656 22.273438 24.972656 22.195313 C 24.972656 22.121094 25.015625 22.050781 25.078125 22.011719 L 32.101563 17.964844 C 32.167969 17.929688 32.25 17.929688 32.316406 17.964844 L 39.386719 22.042969 C 39.449219 22.078125 39.488281 22.152344 39.488281 22.226563 C 39.488281 22.304688 39.449219 22.375 39.386719 22.410156 L 32.363281 26.457031 C 32.328125 26.476563 32.292969 26.488281 32.253906 26.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 44.144531 49.75 L 33.230469 49.75 C 34.539063 54.375 32.777344 55.035156 25.0625 55.035156 L 25.0625 57.457031 L 51.304688 57.457031 L 51.304688 55.035156 C 43.585938 55.035156 42.832031 54.375 44.144531 49.75 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 55.828125 20.460938 L 20.296875 20.460938 C 19.089844 20.460938 18.117188 21.539063 18.117188 22.742188 L 18.117188 47.488281 C 18.117188 48.683594 19.089844 49.75 20.296875 49.75 L 55.828125 49.75 C 57.03125 49.75 58.253906 48.683594 58.253906 47.488281 L 58.253906 22.742188 C 58.253906 21.535156 57.03125 20.460938 55.828125 20.460938 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 55.199219 46.667969 L 21.15625 46.667969 L 21.15625 23.546875 L 55.199219 23.496094 Z M 55.199219 46.667969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 25.0625 55.035156 L 51.304688 55.035156 L 51.304688 57.457031 L 25.0625 57.457031 Z M 25.0625 55.035156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 38.597656 22.140625 C 38.597656 22.453125 38.34375 22.707031 38.03125 22.707031 C 37.714844 22.707031 37.460938 22.453125 37.460938 22.140625 C 37.460938 21.824219 37.714844 21.570313 38.03125 21.570313 C 38.34375 21.570313 38.597656 21.824219 38.597656 22.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.621094 34.40625 C 38.585938 34.40625 38.550781 34.394531 38.515625 34.375 L 31.445313 30.300781 C 31.382813 30.261719 31.339844 30.191406 31.339844 30.117188 C 31.339844 30.039063 31.382813 29.96875 31.445313 29.929688 L 38.46875 25.882813 C 38.535156 25.847656 38.617188 25.847656 38.683594 25.882813 L 45.753906 29.960938 C 45.816406 29.996094 45.855469 30.070313 45.855469 30.144531 C 45.855469 30.222656 45.816406 30.292969 45.753906 30.328125 L 38.730469 34.375 C 38.695313 34.390625 38.660156 34.40625 38.621094 34.40625 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureAvailabilitySet.png b/dist/Compute/AzureAvailabilitySet.png
new file mode 100644
index 00000000..3538648c
Binary files /dev/null and b/dist/Compute/AzureAvailabilitySet.png differ
diff --git a/dist/Compute/AzureAvailabilitySet.puml b/dist/Compute/AzureAvailabilitySet.puml
new file mode 100644
index 00000000..1f2bf6b8
--- /dev/null
+++ b/dist/Compute/AzureAvailabilitySet.puml
@@ -0,0 +1,10 @@
+sprite $AzureAvailabilitySet [70x70/16z] {
+xTW5Tkmm38LXuNtpzh_XwaJ3ZbtLJhd_eU0t63AHEZAdIB4x1ufaVyvYne059MF50OhxgfBzL8Kciv-gU4QJwSxkB8Mu1ey3b8RL4816SSq0c9xJxA9WNAE8
+RY6RLGpPM56sPSLoyPBYAfdYCPNeDSKB0JvGoWYWYmfGKZ2kLJoRLTfZkgyuIqTfwYek5EcKqcvjyuezRD1JDEifJlTnepJ7TADasZjewlyNLuTB6WAupIaY
+2ZY7uO3Ph18PO0wuhIXH6gkA0FPTbQokQ7kpaCAzWg6odmJG74VtYgEWPFPyJAUInhG2tnG7-efaFILpPAt2ieMierJFtk-eHAkArX18Nwb_9AM-qcQdQp9_
+rop_hz4Hocb1iOf2upYH34nlpH7zUmwHKJtqEqHnQfACfkeVqt_FZVTPf1I9HPqvjalNkHyxpc27A7I4eiI-h2Yz
+}
+
+AzureEntityColoring(AzureAvailabilitySet)
+!define AzureAvailabilitySet(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAvailabilitySet, AzureAvailabilitySet)
+!define AzureAvailabilitySet(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAvailabilitySet, AzureAvailabilitySet)
diff --git a/dist/Compute/AzureAvailabilitySet.svg b/dist/Compute/AzureAvailabilitySet.svg
new file mode 100644
index 00000000..d1b03d2c
--- /dev/null
+++ b/dist/Compute/AzureAvailabilitySet.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.484375 12.546875 C 49.476563 12.546875 49.46875 12.542969 49.460938 12.542969 L 13.929688 12.542969 C 12.71875 12.542969 11.746094 13.621094 11.746094 14.824219 L 11.746094 39.566406 C 11.746094 40.765625 12.71875 41.832031 13.929688 41.832031 L 14.773438 41.832031 Z M 49.484375 12.546875 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 55.851563 20.460938 C 55.84375 20.460938 55.835938 20.460938 55.828125 20.460938 L 20.296875 20.460938 C 19.085938 20.460938 18.113281 21.539063 18.113281 22.742188 L 18.113281 47.484375 C 18.113281 48.683594 19.085938 49.75 20.296875 49.75 L 21.140625 49.75 Z M 55.851563 20.460938 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.605469 44.308594 C 37.566406 44.308594 37.53125 44.296875 37.496094 44.277344 L 30.453125 40.21875 C 30.382813 40.179688 30.34375 40.113281 30.34375 40.03125 L 30.34375 31.882813 C 30.34375 31.804688 30.382813 31.734375 30.453125 31.699219 C 30.515625 31.65625 30.59375 31.65625 30.667969 31.699219 L 37.714844 35.757813 C 37.773438 35.796875 37.816406 35.867188 37.816406 35.945313 L 37.816406 44.09375 C 37.816406 44.171875 37.777344 44.242188 37.714844 44.277344 C 37.679688 44.296875 37.640625 44.308594 37.605469 44.308594 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.601563 44.308594 C 39.5625 44.308594 39.527344 44.296875 39.492188 44.277344 C 39.429688 44.242188 39.386719 44.171875 39.386719 44.09375 L 39.386719 35.992188 C 39.386719 35.917969 39.429688 35.847656 39.492188 35.808594 L 46.539063 31.75 C 46.605469 31.710938 46.683594 31.710938 46.75 31.75 C 46.816406 31.789063 46.859375 31.859375 46.859375 31.933594 L 46.859375 40.035156 C 46.859375 40.113281 46.816406 40.183594 46.75 40.21875 L 39.707031 44.28125 C 39.675781 44.296875 39.636719 44.308594 39.601563 44.308594 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 30.332031 0 L 39.667969 0 L 39.667969 7 L 30.332031 7 Z M 30.332031 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 16.332031 0 L 25.667969 0 L 25.667969 7 L 16.332031 7 Z M 16.332031 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 63 63 L 58.332031 63 L 58.332031 70 L 65.332031 70 C 67.910156 70 70 67.910156 70 65.332031 L 70 58.332031 L 63 58.332031 Z M 63 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 0 44.332031 L 7 44.332031 L 7 53.667969 L 0 53.667969 Z M 0 44.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 30.332031 63 L 39.667969 63 L 39.667969 70 L 30.332031 70 Z M 30.332031 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 63 44.332031 L 70 44.332031 L 70 53.667969 L 63 53.667969 Z M 63 44.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 44.332031 63 L 53.667969 63 L 53.667969 70 L 44.332031 70 Z M 44.332031 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 16.332031 63 L 25.667969 63 L 25.667969 70 L 16.332031 70 Z M 16.332031 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 7 63 L 7 58.332031 L 0 58.332031 L 0 65.332031 C 0 67.910156 2.089844 70 4.667969 70 L 11.667969 70 L 11.667969 63 Z M 7 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 0 16.332031 L 7 16.332031 L 7 25.667969 L 0 25.667969 Z M 0 16.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 7 7 L 11.667969 7 L 11.667969 0 L 4.667969 0 C 2.089844 0 0 2.089844 0 4.667969 L 0 11.667969 L 7 11.667969 Z M 7 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 0 30.332031 L 7 30.332031 L 7 39.667969 L 0 39.667969 Z M 0 30.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 63 30.332031 L 70 30.332031 L 70 39.667969 L 63 39.667969 Z M 63 30.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 63 16.332031 L 70 16.332031 L 70 25.667969 L 63 25.667969 Z M 63 16.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 44.332031 0 L 53.667969 0 L 53.667969 7 L 44.332031 7 Z M 44.332031 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 63 7 L 63 11.667969 L 70 11.667969 L 70 4.667969 C 70 2.089844 67.910156 0 65.332031 0 L 58.332031 0 L 58.332031 7 Z M 63 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 49.460938 12.542969 L 13.929688 12.542969 C 12.71875 12.542969 11.746094 13.621094 11.746094 14.824219 L 11.746094 39.570313 C 11.746094 40.765625 12.71875 41.832031 13.929688 41.832031 L 49.460938 41.832031 C 50.664063 41.832031 51.882813 40.765625 51.882813 39.570313 L 51.882813 14.824219 C 51.886719 13.617188 50.664063 12.542969 49.460938 12.542969 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 48.832031 38.75 L 14.789063 38.75 L 14.789063 15.628906 L 48.832031 15.578125 Z M 48.832031 38.75 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 32.230469 14.222656 C 32.230469 14.539063 31.976563 14.789063 31.660156 14.789063 C 31.347656 14.789063 31.09375 14.535156 31.09375 14.222656 C 31.09375 13.90625 31.347656 13.652344 31.660156 13.652344 C 31.976563 13.652344 32.230469 13.90625 32.230469 14.222656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.253906 26.488281 C 32.21875 26.488281 32.183594 26.476563 32.148438 26.457031 L 25.078125 22.382813 C 25.015625 22.34375 24.972656 22.273438 24.972656 22.195313 C 24.972656 22.121094 25.015625 22.050781 25.078125 22.011719 L 32.101563 17.964844 C 32.167969 17.929688 32.25 17.929688 32.316406 17.964844 L 39.386719 22.042969 C 39.449219 22.078125 39.488281 22.152344 39.488281 22.226563 C 39.488281 22.304688 39.449219 22.375 39.386719 22.410156 L 32.363281 26.457031 C 32.328125 26.476563 32.292969 26.488281 32.253906 26.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 44.144531 49.75 L 33.230469 49.75 C 34.539063 54.375 32.777344 55.035156 25.0625 55.035156 L 25.0625 57.457031 L 51.304688 57.457031 L 51.304688 55.035156 C 43.585938 55.035156 42.832031 54.375 44.144531 49.75 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 55.828125 20.460938 L 20.296875 20.460938 C 19.089844 20.460938 18.117188 21.539063 18.117188 22.742188 L 18.117188 47.488281 C 18.117188 48.683594 19.089844 49.75 20.296875 49.75 L 55.828125 49.75 C 57.03125 49.75 58.253906 48.683594 58.253906 47.488281 L 58.253906 22.742188 C 58.253906 21.535156 57.03125 20.460938 55.828125 20.460938 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 55.199219 46.667969 L 21.15625 46.667969 L 21.15625 23.546875 L 55.199219 23.496094 Z M 55.199219 46.667969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 25.0625 55.035156 L 51.304688 55.035156 L 51.304688 57.457031 L 25.0625 57.457031 Z M 25.0625 55.035156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 38.597656 22.140625 C 38.597656 22.453125 38.34375 22.707031 38.03125 22.707031 C 37.714844 22.707031 37.460938 22.453125 37.460938 22.140625 C 37.460938 21.824219 37.714844 21.570313 38.03125 21.570313 C 38.34375 21.570313 38.597656 21.824219 38.597656 22.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.621094 34.40625 C 38.585938 34.40625 38.550781 34.394531 38.515625 34.375 L 31.445313 30.300781 C 31.382813 30.261719 31.339844 30.191406 31.339844 30.117188 C 31.339844 30.039063 31.382813 29.96875 31.445313 29.929688 L 38.46875 25.882813 C 38.535156 25.847656 38.617188 25.847656 38.683594 25.882813 L 45.753906 29.960938 C 45.816406 29.996094 45.855469 30.070313 45.855469 30.144531 C 45.855469 30.222656 45.816406 30.292969 45.753906 30.328125 L 38.730469 34.375 C 38.695313 34.390625 38.660156 34.40625 38.621094 34.40625 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureBatch(m).png b/dist/Compute/AzureBatch(m).png
index d63718b8..8db00c92 100644
Binary files a/dist/Compute/AzureBatch(m).png and b/dist/Compute/AzureBatch(m).png differ
diff --git a/dist/Compute/AzureBatch(m).svg b/dist/Compute/AzureBatch(m).svg
index c59cec27..3d9a7bfc 100644
--- a/dist/Compute/AzureBatch(m).svg
+++ b/dist/Compute/AzureBatch(m).svg
@@ -1,6 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="65pt" viewBox="0 0 70 65" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="64pt" viewBox="0 0 70 64" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<image id="image9" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAArUlEQVR4nO3QsUlDUQBA0fdFrDKBI6R2B9cSHFAQnCGkDmoh4Vn/4kKsnsU5E1zuGPAX2/x4fVgdsfP9Mren68/qjG1+vj+ujtiZz9ftcDqvzrhbHfBfGROMCcYEY4IxwZhgTDAmGBOMCcYEY4IxwZhgTDAmGBOMCcYEY4IxwZhgTDAmGBOMCcYEY4IxwZhgTDAmGBOMCffj6+2yOmJnHucYp9UVAAAAAAAAcJNfEbMUFF2fIHUAAAAASUVORK5CYII="/>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<use xlink:href="#image9"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 1.6875 2.78125 C 0.703125 2.78125 0 3.476563 0 4.453125 L 0 37.84375 C 0 38.816406 0.703125 39.511719 1.6875 39.511719 L 17.882813 39.511719 L 36.890625 2.78125 Z M 1.6875 2.78125 "/>
+</g>
+<image id="image17" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAAtElEQVR4nO3aIW4CURRA0T+EpBpZgWALXVM3ABthgTV1lSQoHF3BFQwDGXGOfy//X/3GAAAAAOCdprmD95/jx9ieZs+/wnTY35batZ09+fm1G9Nls9RDnvd9H2P8LbVtRR9bF2GCMEGYIEwQJggThAnCBGGCMEGYIEwQJggThAnCBGGCMEGYIEwQJggThAnCBGGCMEGYIEwQJggThAnCBGGCMGH+Dd719zo251UdJwIAAI/6BygaCz6jUGM+AAAAAElFTkSuQmCC"/>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<use xlink:href="#image17"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface16" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 15.769531 16.695313 C 14.785156 16.695313 14.082031 17.390625 14.082031 18.363281 L 14.082031 51.757813 C 14.082031 52.730469 14.785156 53.425781 15.769531 53.425781 L 31.964844 53.425781 L 50.972656 16.695313 Z M 15.769531 16.695313 "/>
+</g>
+<image id="image25" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAAYklEQVR4nO3SsRFAUBBF0WXMb0ADOlSEbhShC20IJAIBLfiBJTingbvzZiMAAAAAAAAAAAAAeF+THbz2sY927rK7tfKHOc4hmqVkd2u1Xx/wV/kfs04lypbeBQAAAAAAeOYG1t4KUc7TSKwAAAAASUVORK5CYII="/>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<use xlink:href="#image25"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface24" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 28.160156 38.398438 L 70.402344 38.398438 L 70.402344 41.183594 L 28.160156 41.183594 Z M 28.160156 38.398438 "/>
+</g>
+<image id="image33" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAAnUlEQVR4nO3RIQpCURRF0acICnaDs7A5PMdhcmYGgwMwmESrCNv4UVgr3nJg3zEAAAAAAAAAAP7JbOrB5/myGsvTfOrdr7aH+2w8nu+n6cPcjpsx3y+m3v1qvbt+hvmtz/0QYYIwQZggTBAmCBOECcIEYYIwQZggTBAmCBOECcIEYYIwQZggTBAmCBOECcIEYYIwQZggTBAmCBOECS8BlQ1DRWsdiwAAAABJRU5ErkJggg=="/>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<use xlink:href="#image33"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface32" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 29.851563 30.609375 C 28.863281 30.609375 28.160156 31.304688 28.160156 32.277344 L 28.160156 65.667969 C 28.160156 66.644531 28.863281 67.339844 29.851563 67.339844 L 46.042969 67.339844 L 65.050781 30.609375 Z M 29.851563 30.609375 "/>
+</g>
+<image id="image41" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAAaklEQVR4nO3OsQmDUBiF0V8RV5Gs5x6O4ELaWdimT3q18rmAlU8QknPaC5cvAgAAAAAAAAAAAAAAAOAexdMBV6Wta6Ia26yTfRqKeu7PpjLr+IdVTwdclpY10ved9VG+PhHzTUEAAAD8rQNXjQ+oaA/2KAAAAABJRU5ErkJggg=="/>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<use xlink:href="#image41"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface40" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.746094 48 L 63.644531 48 L 63.644531 50.78125 L 46.746094 50.78125 Z M 46.746094 48 "/>
+</g>
+<image id="image49" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAAeUlEQVR4nO3SMQ4BURSF4TNjYis2YGX2YQk2RKeYUq8XNDwbmEJyJRN8X3lf8ucULwEAAAAAAAAAAAAAAAAAAADe1809oKJlUd7f5dGm7kM1PJd2364yHDalyPO4z3LcTT31pfAP+9ofk3a9pV1OpUa/Pifjhwbx316MyxK9JT9FEgAAAABJRU5ErkJggg=="/>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<use xlink:href="#image49"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface48" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.746094 58.992188 L 63.644531 58.992188 L 63.644531 61.773438 L 46.746094 61.773438 Z M 46.746094 58.992188 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 41.429688 1.695313 C 41.429688 0.707031 40.714844 0 39.714844 0 L 1.714844 0 C 0.714844 0 0 0.707031 0 1.695313 L 0 7.066406 L 41.429688 7.066406 Z M 16.71875 11.648438 C 16.804688 11.5625 17.015625 11.375 17.285156 11.375 L 17.550781 11.375 L 18.933594 12.4375 L 19.214844 12.714844 L 19.214844 12.71875 L 41.429688 12.71875 L 41.429688 8.476563 L 0 8.476563 L 0 35.042969 C 0 36.03125 0.714844 36.738281 1.714844 36.738281 L 12.855469 36.738281 L 12.855469 32.066406 L 11.738281 33.460938 L 7.027344 28.503906 L 6.605469 28.085938 C 6.320313 27.804688 6.320313 27.445313 6.605469 27.164063 L 7.765625 26.160156 L 7.996094 25.929688 L 8.144531 25.929688 C 8.429688 25.929688 8.585938 26.039063 8.628906 26.273438 L 11.410156 29.273438 L 12.855469 27.472656 L 12.855469 21.046875 L 11.738281 22.441406 L 7.027344 17.480469 L 6.605469 17.0625 C 6.320313 16.78125 6.320313 16.421875 6.605469 16.140625 L 7.765625 15.136719 L 7.996094 14.90625 L 8.144531 14.90625 C 8.429688 14.90625 8.585938 15.015625 8.628906 15.25 L 11.410156 18.246094 L 12.855469 16.449219 L 12.855469 15.824219 C 12.855469 14.105469 14.132813 12.804688 15.847656 12.730469 Z M 14.285156 15.824219 L 14.285156 21.195313 L 55.714844 21.195313 L 55.714844 15.824219 C 55.714844 14.835938 55 14.128906 54 14.128906 L 16 14.128906 C 15 14.128906 14.285156 14.835938 14.285156 15.824219 Z M 68.285156 28.261719 L 30.285156 28.261719 C 29.285156 28.261719 28.570313 28.96875 28.570313 29.957031 L 28.570313 35.324219 L 70 35.324219 L 70 29.957031 C 70 28.96875 69.285156 28.261719 68.285156 28.261719 Z M 31.003906 25.78125 C 31.089844 25.691406 31.300781 25.503906 31.570313 25.503906 L 31.835938 25.503906 L 33.21875 26.570313 L 33.5 26.84375 L 33.5 26.847656 L 55.714844 26.847656 L 55.714844 22.609375 L 14.285156 22.609375 L 14.285156 49.175781 C 14.285156 50.164063 15 50.871094 16 50.871094 L 27.144531 50.871094 L 27.144531 46.199219 L 26.023438 47.59375 L 21.3125 42.632813 L 20.890625 42.21875 C 20.605469 41.9375 20.605469 41.574219 20.890625 41.292969 L 22.050781 40.289063 L 22.28125 40.0625 L 22.429688 40.0625 C 22.714844 40.0625 22.871094 40.171875 22.914063 40.40625 L 25.695313 43.402344 L 27.144531 41.601563 L 27.144531 35.175781 L 26.023438 36.570313 L 21.3125 31.609375 L 20.890625 31.195313 C 20.605469 30.914063 20.605469 30.550781 20.890625 30.273438 L 22.050781 29.265625 L 22.28125 29.035156 L 22.429688 29.035156 C 22.714844 29.035156 22.871094 29.148438 22.914063 29.378906 L 25.695313 32.378906 L 27.144531 30.578125 L 27.144531 29.957031 C 27.144531 28.234375 28.421875 26.9375 30.132813 26.863281 Z M 28.570313 63.304688 C 28.570313 64.292969 29.285156 65 30.285156 65 L 68.285156 65 C 69.285156 65 70 64.292969 70 63.304688 L 70 36.738281 L 28.570313 36.738281 Z M 48.570313 45.21875 L 64.285156 45.21875 L 64.285156 48.042969 L 48.570313 48.042969 Z M 48.570313 56.523438 L 64.285156 56.523438 L 64.285156 59.347656 L 48.570313 59.347656 Z M 35.175781 44.402344 L 36.335938 43.398438 L 36.566406 43.167969 L 36.714844 43.167969 C 37 43.167969 37.15625 43.277344 37.203125 43.511719 L 39.980469 46.511719 L 45.292969 39.910156 C 45.378906 39.824219 45.585938 39.636719 45.855469 39.636719 L 46.121094 39.636719 L 47.503906 40.699219 L 47.785156 40.972656 L 47.785156 41.382813 L 40.308594 50.703125 L 35.597656 45.742188 L 35.175781 45.328125 C 34.894531 45.046875 34.894531 44.683594 35.175781 44.402344 Z M 35.175781 55.425781 L 36.335938 54.421875 L 36.566406 54.191406 L 36.714844 54.191406 C 37 54.191406 37.15625 54.304688 37.203125 54.535156 L 39.980469 57.535156 L 45.292969 50.933594 C 45.378906 50.847656 45.585938 50.660156 45.855469 50.660156 L 46.121094 50.660156 L 47.503906 51.722656 L 47.785156 51.996094 C 47.785156 51.996094 47.785156 52.40625 47.785156 52.40625 L 40.308594 61.722656 L 35.597656 56.765625 L 35.175781 56.347656 C 34.894531 56.066406 34.894531 55.707031 35.175781 55.425781 Z M 35.175781 55.425781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 0 37.84375 C 0 38.816406 0.703125 39.511719 1.6875 39.511719 L 40.550781 39.511719 C 41.539063 39.511719 42.242188 38.816406 42.242188 37.84375 L 42.242188 10.015625 L 0 10.015625 Z M 0 37.84375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 40.550781 2.78125 L 1.6875 2.78125 C 0.703125 2.78125 0 3.476563 0 4.453125 L 0 10.574219 L 42.242188 10.574219 L 42.242188 4.453125 C 42.242188 3.476563 41.539063 2.78125 40.550781 2.78125 Z M 40.550781 2.78125 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 7.183594 20.3125 L 6.757813 19.894531 C 6.617188 19.757813 6.617188 19.617188 6.757813 19.476563 L 7.886719 18.503906 C 7.886719 18.503906 8.027344 18.363281 8.027344 18.363281 C 8.167969 18.363281 8.167969 18.363281 8.167969 18.503906 L 11.261719 21.84375 L 16.757813 15.027344 C 16.757813 15.027344 16.898438 14.886719 17.039063 14.886719 C 17.039063 14.886719 17.175781 14.886719 17.175781 14.886719 L 18.445313 15.859375 C 18.445313 15.859375 18.585938 16 18.585938 16 C 18.585938 16.140625 18.585938 16.140625 18.585938 16.140625 L 11.546875 24.90625 Z M 7.183594 20.3125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 7.183594 31.164063 L 6.757813 30.746094 C 6.617188 30.609375 6.617188 30.46875 6.757813 30.332031 L 7.886719 29.355469 C 7.886719 29.355469 8.027344 29.21875 8.027344 29.21875 C 8.167969 29.21875 8.167969 29.21875 8.167969 29.355469 L 11.261719 32.695313 L 16.757813 25.878906 C 16.757813 25.878906 16.898438 25.738281 17.039063 25.738281 C 17.039063 25.738281 17.175781 25.738281 17.175781 25.738281 L 18.445313 26.714844 C 18.445313 26.714844 18.585938 26.851563 18.585938 26.851563 C 18.585938 26.992188 18.585938 26.992188 18.585938 26.992188 L 11.546875 35.757813 Z M 7.183594 31.164063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 14.082031 51.757813 C 14.082031 52.730469 14.785156 53.425781 15.769531 53.425781 L 54.632813 53.425781 C 55.617188 53.425781 56.320313 52.730469 56.320313 51.757813 L 56.320313 23.929688 L 14.082031 23.929688 Z M 14.082031 51.757813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 54.632813 16.695313 L 15.769531 16.695313 C 14.785156 16.695313 14.082031 17.390625 14.082031 18.363281 L 14.082031 24.488281 L 56.320313 24.488281 L 56.320313 18.363281 C 56.320313 17.390625 55.617188 16.695313 54.632813 16.695313 Z M 54.632813 16.695313 "/>
+<use xlink:href="#surface16" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 21.261719 34.226563 L 20.835938 33.808594 C 20.695313 33.667969 20.695313 33.53125 20.835938 33.390625 L 21.964844 32.417969 C 21.964844 32.417969 22.105469 32.277344 22.105469 32.277344 C 22.25 32.277344 22.25 32.277344 22.25 32.417969 L 25.34375 35.757813 L 30.835938 28.9375 C 30.835938 28.9375 30.976563 28.800781 31.121094 28.800781 C 31.121094 28.800781 31.257813 28.800781 31.257813 28.800781 L 32.527344 29.773438 C 32.527344 29.773438 32.667969 29.914063 32.667969 29.914063 C 32.667969 30.050781 32.667969 30.050781 32.667969 30.050781 L 25.625 38.816406 Z M 21.261719 34.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 21.261719 45.078125 L 20.835938 44.660156 C 20.695313 44.523438 20.695313 44.382813 20.835938 44.242188 L 21.964844 43.269531 C 21.964844 43.269531 22.105469 43.128906 22.105469 43.128906 C 22.25 43.128906 22.25 43.128906 22.25 43.269531 L 25.34375 46.609375 L 30.835938 39.792969 C 30.835938 39.792969 30.976563 39.652344 31.121094 39.652344 C 31.121094 39.652344 31.257813 39.652344 31.257813 39.652344 L 32.527344 40.625 C 32.527344 40.625 32.667969 40.765625 32.667969 40.765625 C 32.667969 40.90625 32.667969 40.90625 32.667969 40.90625 L 25.625 49.667969 Z M 21.261719 45.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 28.160156 65.667969 C 28.160156 66.644531 28.863281 67.339844 29.851563 67.339844 L 68.714844 67.339844 C 69.699219 67.339844 70.402344 66.644531 70.402344 65.667969 L 70.402344 37.84375 L 28.160156 37.84375 Z M 28.160156 65.667969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 68.714844 30.609375 L 29.851563 30.609375 C 28.863281 30.609375 28.160156 31.304688 28.160156 32.277344 L 28.160156 38.398438 L 70.402344 38.398438 L 70.402344 32.277344 C 70.402344 31.304688 69.699219 30.609375 68.714844 30.609375 Z M 68.714844 30.609375 "/>
+<use xlink:href="#surface24" mask="url(#mask2)"/>
+<use xlink:href="#surface32" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.34375 48.140625 L 34.917969 47.722656 C 34.777344 47.582031 34.777344 47.445313 34.917969 47.304688 L 36.046875 46.332031 C 36.046875 46.332031 36.1875 46.191406 36.1875 46.191406 C 36.328125 46.191406 36.328125 46.191406 36.328125 46.332031 L 39.425781 49.667969 L 44.917969 42.851563 C 44.917969 42.851563 45.058594 42.714844 45.199219 42.714844 C 45.199219 42.714844 45.335938 42.714844 45.335938 42.714844 L 46.605469 43.6875 C 46.605469 43.6875 46.746094 43.824219 46.746094 43.824219 C 46.746094 43.964844 46.746094 43.964844 46.746094 43.964844 L 39.707031 52.730469 Z M 35.34375 48.140625 "/>
+<use xlink:href="#surface40" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.34375 58.992188 L 34.917969 58.574219 C 34.777344 58.433594 34.777344 58.296875 34.917969 58.15625 L 36.046875 57.183594 C 36.046875 57.183594 36.1875 57.042969 36.1875 57.042969 C 36.328125 57.042969 36.328125 57.042969 36.328125 57.183594 L 39.425781 60.523438 L 44.917969 53.703125 C 44.917969 53.703125 45.058594 53.566406 45.199219 53.566406 C 45.199219 53.566406 45.335938 53.566406 45.335938 53.566406 L 46.605469 54.539063 C 46.605469 54.539063 46.746094 54.679688 46.746094 54.679688 C 46.746094 54.816406 46.746094 54.816406 46.746094 54.816406 L 39.707031 63.582031 Z M 35.34375 58.992188 "/>
+<use xlink:href="#surface48" mask="url(#mask5)"/>
 </g>
 </svg>
diff --git a/dist/Compute/AzureBatch.png b/dist/Compute/AzureBatch.png
index 9b2760e3..3f35b839 100644
Binary files a/dist/Compute/AzureBatch.png and b/dist/Compute/AzureBatch.png differ
diff --git a/dist/Compute/AzureBatch.puml b/dist/Compute/AzureBatch.puml
index 14b4c5a9..d3bd635e 100644
--- a/dist/Compute/AzureBatch.puml
+++ b/dist/Compute/AzureBatch.puml
@@ -1,9 +1,9 @@
-sprite $AzureBatch [70x65/16z] {
-xTC7Ykn038JXajIfwlxtVT5Cqo0McStXFy0tOrlLg59qF15LRE29z5pbHtdrMhNuh6-NZSzNwB2PrWjAON9b9MokMf4gpIW9NSMOAHrmQM6eMgRGWA0zIxaO
-uBcAbZrJkPZdAPi9c5TBb8iXFAeboXKnLEqTbCaxIdTcoW0cqp9bf0iOXbBd0lnK9cBKQllcOC2bq9UaPggt6LmA0QFahchf0lmlC-2wtuJl9m8CDvMzWA7D
-t5BogwFTKfWe5sFMgiNYe-FgE0DM3KV7rOMhsZiev1s5mLHnZBf2onSG06hANi24wwW3c3SKEk1uA6F-NmZGLLFswJwK3ao9048L9Lz00x1uhPDnrdDbC-RQ
-J02Wf8MpU5BH6ljB1_usbIhrgulzPjSPRoXoH7q1pbFPDVsD9UKiMS1ylj80F5iPrGMSdGjOvGNipWKiYLPSmDcvWFyxbpZELbLH01P_gUBjdfKMK5VaZpVB
-TZOAIca1TON1voYxzrMmL8k_0G
+sprite $AzureBatch [70x64/16z] {
+pTJP4jem38NXOwqMVV_txMYAWNY8KShwt_iZsm6_L2k6LQAFCyjMZfOLVawntr7iTnIhAFweFbBi5myw_HbzMqdaUUNqdueqdo_bk694rg_5JKetjPLYvK7G
+FQLxP5fMv8xIWMIeWkmh8K0FmPDAC9e2La0MIZA0FAq4WS8Ao5e9Zd2tTJxInVVIgtyJ_UjAhod-dE8MUIdcsmGo8Ikb0ycqIL4YzViftJPc3tWmjegLnnbN
+Xe5-FYwUIHMn60a0FIj0CYHLnEA6uJWh2gWB3YkPnb1S00RAYEryTGA0x4abcURrXVSTnSKEA4rlyqscrR39tg6KEwJe8KNPCx5j0ZgY0CcqIL4SKnGGPyYC
+DAigWo5W72VB6g1rPJ3WyKaX6GB4wifWo6-V1_z3cBRnMd7rePW0bD9n9RChCvwiJ6bH6OpMlrtTKKpKwWhuDhKfgIXpyo56UruHW9zG5ZEgAz8qaOQcJoXv
+V36ZYZB6J3iBg2c30TYUKv81BHPGKqmNJxQW51Vm5m
 }
 
 AzureEntityColoring(AzureBatch)
diff --git a/dist/Compute/AzureBatch.svg b/dist/Compute/AzureBatch.svg
index ac0e90ee..73d1ac9d 100644
--- a/dist/Compute/AzureBatch.svg
+++ b/dist/Compute/AzureBatch.svg
@@ -4,91 +4,97 @@
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
+<image id="image9" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAArUlEQVR4nO3QsUlDUQBA0fdFrDKBI6R2B9cSHFAQnCGkDmoh4Vn/4kKsnsU5E1zuGPAX2/x4fVgdsfP9Mren68/qjG1+vj+ujtiZz9ftcDqvzrhbHfBfGROMCcYEY4IxwZhgTDAmGBOMCcYEY4IxwZhgTDAmGBOMCcYEY4IxwZhgTDAmGBOMCcYEY4IxwZhgTDAmGBOMCffj6+2yOmJnHucYp9UVAAAAAAAAcJNfEbMUFF2fIHUAAAAASUVORK5CYII="/>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+<use xlink:href="#image9"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="70" height="64"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 1.679688 2.78125 C 0.699219 2.78125 0 3.476563 0 4.453125 L 0 37.84375 C 0 38.816406 0.699219 39.511719 1.679688 39.511719 L 17.78125 39.511719 L 36.679688 2.78125 Z M 1.679688 2.78125 "/>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 1.6875 2.78125 C 0.703125 2.78125 0 3.476563 0 4.453125 L 0 37.84375 C 0 38.816406 0.703125 39.511719 1.6875 39.511719 L 17.882813 39.511719 L 36.890625 2.78125 Z M 1.6875 2.78125 "/>
 </g>
+<image id="image17" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAAtElEQVR4nO3aIW4CURRA0T+EpBpZgWALXVM3ABthgTV1lSQoHF3BFQwDGXGOfy//X/3GAAAAAOCdprmD95/jx9ieZs+/wnTY35batZ09+fm1G9Nls9RDnvd9H2P8LbVtRR9bF2GCMEGYIEwQJggThAnCBGGCMEGYIEwQJggThAnCBGGCMEGYIEwQJggThAnCBGGCMEGYIEwQJggThAnCBGGCMGH+Dd719zo251UdJwIAAI/6BygaCz6jUGM+AAAAAElFTkSuQmCC"/>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+<use xlink:href="#image17"/>
   </g>
 </mask>
 <clipPath id="clip2">
   <rect x="0" y="0" width="70" height="64"/>
 </clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 15.679688 16.695313 C 14.699219 16.695313 14 17.390625 14 18.363281 L 14 51.757813 C 14 52.730469 14.699219 53.425781 15.679688 53.425781 L 31.78125 53.425781 L 50.679688 16.695313 Z M 15.679688 16.695313 "/>
+<g id="surface16" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 15.769531 16.695313 C 14.785156 16.695313 14.082031 17.390625 14.082031 18.363281 L 14.082031 51.757813 C 14.082031 52.730469 14.785156 53.425781 15.769531 53.425781 L 31.964844 53.425781 L 50.972656 16.695313 Z M 15.769531 16.695313 "/>
 </g>
+<image id="image25" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAAYklEQVR4nO3SsRFAUBBF0WXMb0ADOlSEbhShC20IJAIBLfiBJTingbvzZiMAAAAAAAAAAAAAeF+THbz2sY927rK7tfKHOc4hmqVkd2u1Xx/wV/kfs04lypbeBQAAAAAAeOYG1t4KUc7TSKwAAAAASUVORK5CYII="/>
 <mask id="mask2">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+<use xlink:href="#image25"/>
   </g>
 </mask>
 <clipPath id="clip3">
   <rect x="0" y="0" width="70" height="64"/>
 </clipPath>
-<g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 28 38.398438 L 70 38.398438 L 70 41.183594 L 28 41.183594 Z M 28 38.398438 "/>
+<g id="surface24" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 28.160156 38.398438 L 70.402344 38.398438 L 70.402344 41.183594 L 28.160156 41.183594 Z M 28.160156 38.398438 "/>
 </g>
+<image id="image33" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAAnUlEQVR4nO3RIQpCURRF0acICnaDs7A5PMdhcmYGgwMwmESrCNv4UVgr3nJg3zEAAAAAAAAAAP7JbOrB5/myGsvTfOrdr7aH+2w8nu+n6cPcjpsx3y+m3v1qvbt+hvmtz/0QYYIwQZggTBAmCBOECcIEYYIwQZggTBAmCBOECcIEYYIwQZggTBAmCBOECcIEYYIwQZggTBAmCBOECS8BlQ1DRWsdiwAAAABJRU5ErkJggg=="/>
 <mask id="mask3">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+<use xlink:href="#image33"/>
   </g>
 </mask>
 <clipPath id="clip4">
   <rect x="0" y="0" width="70" height="64"/>
 </clipPath>
-<g id="surface14" clip-path="url(#clip4)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 29.679688 30.609375 C 28.699219 30.609375 28 31.304688 28 32.277344 L 28 65.667969 C 28 66.644531 28.699219 67.339844 29.679688 67.339844 L 45.78125 67.339844 L 64.679688 30.609375 Z M 29.679688 30.609375 "/>
+<g id="surface32" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 29.851563 30.609375 C 28.863281 30.609375 28.160156 31.304688 28.160156 32.277344 L 28.160156 65.667969 C 28.160156 66.644531 28.863281 67.339844 29.851563 67.339844 L 46.042969 67.339844 L 65.050781 30.609375 Z M 29.851563 30.609375 "/>
 </g>
+<image id="image41" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAAaklEQVR4nO3OsQmDUBiF0V8RV5Gs5x6O4ELaWdimT3q18rmAlU8QknPaC5cvAgAAAAAAAAAAAAAAAOAexdMBV6Wta6Ia26yTfRqKeu7PpjLr+IdVTwdclpY10ved9VG+PhHzTUEAAAD8rQNXjQ+oaA/2KAAAAABJRU5ErkJggg=="/>
 <mask id="mask4">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+<use xlink:href="#image41"/>
   </g>
 </mask>
 <clipPath id="clip5">
   <rect x="0" y="0" width="70" height="64"/>
 </clipPath>
-<g id="surface17" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.480469 48 L 63.28125 48 L 63.28125 50.78125 L 46.480469 50.78125 Z M 46.480469 48 "/>
+<g id="surface40" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.746094 48 L 63.644531 48 L 63.644531 50.78125 L 46.746094 50.78125 Z M 46.746094 48 "/>
 </g>
+<image id="image49" width="70" height="64" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABACAYAAACndwGZAAAABmJLR0QA/wD/AP+gvaeTAAAAeUlEQVR4nO3SMQ4BURSF4TNjYis2YGX2YQk2RKeYUq8XNDwbmEJyJRN8X3lf8ucULwEAAAAAAAAAAAAAAAAAAADe1809oKJlUd7f5dGm7kM1PJd2364yHDalyPO4z3LcTT31pfAP+9ofk3a9pV1OpUa/Pifjhwbx316MyxK9JT9FEgAAAABJRU5ErkJggg=="/>
 <mask id="mask5">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+<use xlink:href="#image49"/>
   </g>
 </mask>
 <clipPath id="clip6">
   <rect x="0" y="0" width="70" height="64"/>
 </clipPath>
-<g id="surface20" clip-path="url(#clip6)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.480469 58.992188 L 63.28125 58.992188 L 63.28125 61.773438 L 46.480469 61.773438 Z M 46.480469 58.992188 "/>
+<g id="surface48" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.746094 58.992188 L 63.644531 58.992188 L 63.644531 61.773438 L 46.746094 61.773438 Z M 46.746094 58.992188 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 37.84375 C 0 38.816406 0.699219 39.511719 1.679688 39.511719 L 40.320313 39.511719 C 41.300781 39.511719 42 38.816406 42 37.84375 L 42 10.015625 L 0 10.015625 Z M 0 37.84375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 40.320313 2.78125 L 1.679688 2.78125 C 0.699219 2.78125 0 3.476563 0 4.453125 L 0 10.574219 L 42 10.574219 L 42 4.453125 C 42 3.476563 41.300781 2.78125 40.320313 2.78125 Z M 40.320313 2.78125 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 7.140625 20.3125 L 6.71875 19.894531 C 6.578125 19.757813 6.578125 19.617188 6.71875 19.476563 L 7.839844 18.503906 C 7.839844 18.503906 7.980469 18.363281 7.980469 18.363281 C 8.121094 18.363281 8.121094 18.363281 8.121094 18.503906 L 11.199219 21.84375 L 16.660156 15.027344 C 16.660156 15.027344 16.800781 14.886719 16.941406 14.886719 C 16.941406 14.886719 17.078125 14.886719 17.078125 14.886719 L 18.339844 15.859375 C 18.339844 15.859375 18.480469 16 18.480469 16 C 18.480469 16.140625 18.480469 16.140625 18.480469 16.140625 L 11.480469 24.90625 Z M 7.140625 20.3125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 7.140625 31.164063 L 6.71875 30.746094 C 6.578125 30.609375 6.578125 30.46875 6.71875 30.332031 L 7.839844 29.355469 C 7.839844 29.355469 7.980469 29.21875 7.980469 29.21875 C 8.121094 29.21875 8.121094 29.21875 8.121094 29.355469 L 11.199219 32.695313 L 16.660156 25.878906 C 16.660156 25.878906 16.800781 25.738281 16.941406 25.738281 C 16.941406 25.738281 17.078125 25.738281 17.078125 25.738281 L 18.339844 26.714844 C 18.339844 26.714844 18.480469 26.851563 18.480469 26.851563 C 18.480469 26.992188 18.480469 26.992188 18.480469 26.992188 L 11.480469 35.757813 Z M 7.140625 31.164063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 14 51.757813 C 14 52.730469 14.699219 53.425781 15.679688 53.425781 L 54.320313 53.425781 C 55.300781 53.425781 56 52.730469 56 51.757813 L 56 23.929688 L 14 23.929688 Z M 14 51.757813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 54.320313 16.695313 L 15.679688 16.695313 C 14.699219 16.695313 14 17.390625 14 18.363281 L 14 24.488281 L 56 24.488281 L 56 18.363281 C 56 17.390625 55.300781 16.695313 54.320313 16.695313 Z M 54.320313 16.695313 "/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21.140625 34.226563 L 20.71875 33.808594 C 20.578125 33.667969 20.578125 33.53125 20.71875 33.390625 L 21.839844 32.417969 C 21.839844 32.417969 21.980469 32.277344 21.980469 32.277344 C 22.121094 32.277344 22.121094 32.277344 22.121094 32.417969 L 25.199219 35.757813 L 30.660156 28.9375 C 30.660156 28.9375 30.800781 28.800781 30.941406 28.800781 C 30.941406 28.800781 31.078125 28.800781 31.078125 28.800781 L 32.339844 29.773438 C 32.339844 29.773438 32.480469 29.914063 32.480469 29.914063 C 32.480469 30.050781 32.480469 30.050781 32.480469 30.050781 L 25.480469 38.816406 Z M 21.140625 34.226563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21.140625 45.078125 L 20.71875 44.660156 C 20.578125 44.523438 20.578125 44.382813 20.71875 44.242188 L 21.839844 43.269531 C 21.839844 43.269531 21.980469 43.128906 21.980469 43.128906 C 22.121094 43.128906 22.121094 43.128906 22.121094 43.269531 L 25.199219 46.609375 L 30.660156 39.792969 C 30.660156 39.792969 30.800781 39.652344 30.941406 39.652344 C 30.941406 39.652344 31.078125 39.652344 31.078125 39.652344 L 32.339844 40.625 C 32.339844 40.625 32.480469 40.765625 32.480469 40.765625 C 32.480469 40.90625 32.480469 40.90625 32.480469 40.90625 L 25.480469 49.667969 Z M 21.140625 45.078125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 28 65.667969 C 28 66.644531 28.699219 67.339844 29.679688 67.339844 L 68.320313 67.339844 C 69.300781 67.339844 70 66.644531 70 65.667969 L 70 37.84375 L 28 37.84375 Z M 28 65.667969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 68.320313 30.609375 L 29.679688 30.609375 C 28.699219 30.609375 28 31.304688 28 32.277344 L 28 38.398438 L 70 38.398438 L 70 32.277344 C 70 31.304688 69.300781 30.609375 68.320313 30.609375 Z M 68.320313 30.609375 "/>
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-<use xlink:href="#surface14" mask="url(#mask3)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.140625 48.140625 L 34.71875 47.722656 C 34.578125 47.582031 34.578125 47.445313 34.71875 47.304688 L 35.839844 46.332031 C 35.839844 46.332031 35.980469 46.191406 35.980469 46.191406 C 36.121094 46.191406 36.121094 46.191406 36.121094 46.332031 L 39.199219 49.667969 L 44.660156 42.851563 C 44.660156 42.851563 44.800781 42.714844 44.941406 42.714844 C 44.941406 42.714844 45.078125 42.714844 45.078125 42.714844 L 46.339844 43.6875 C 46.339844 43.6875 46.480469 43.824219 46.480469 43.824219 C 46.480469 43.964844 46.480469 43.964844 46.480469 43.964844 L 39.480469 52.730469 Z M 35.140625 48.140625 "/>
-<use xlink:href="#surface17" mask="url(#mask4)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.140625 58.992188 L 34.71875 58.574219 C 34.578125 58.433594 34.578125 58.296875 34.71875 58.15625 L 35.839844 57.183594 C 35.839844 57.183594 35.980469 57.042969 35.980469 57.042969 C 36.121094 57.042969 36.121094 57.042969 36.121094 57.183594 L 39.199219 60.523438 L 44.660156 53.703125 C 44.660156 53.703125 44.800781 53.566406 44.941406 53.566406 C 44.941406 53.566406 45.078125 53.566406 45.078125 53.566406 L 46.339844 54.539063 C 46.339844 54.539063 46.480469 54.679688 46.480469 54.679688 C 46.480469 54.816406 46.480469 54.816406 46.480469 54.816406 L 39.480469 63.582031 Z M 35.140625 58.992188 "/>
-<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 37.84375 C 0 38.816406 0.703125 39.511719 1.6875 39.511719 L 40.550781 39.511719 C 41.539063 39.511719 42.242188 38.816406 42.242188 37.84375 L 42.242188 10.015625 L 0 10.015625 Z M 0 37.84375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 40.550781 2.78125 L 1.6875 2.78125 C 0.703125 2.78125 0 3.476563 0 4.453125 L 0 10.574219 L 42.242188 10.574219 L 42.242188 4.453125 C 42.242188 3.476563 41.539063 2.78125 40.550781 2.78125 Z M 40.550781 2.78125 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 7.183594 20.3125 L 6.757813 19.894531 C 6.617188 19.757813 6.617188 19.617188 6.757813 19.476563 L 7.886719 18.503906 C 7.886719 18.503906 8.027344 18.363281 8.027344 18.363281 C 8.167969 18.363281 8.167969 18.363281 8.167969 18.503906 L 11.261719 21.84375 L 16.757813 15.027344 C 16.757813 15.027344 16.898438 14.886719 17.039063 14.886719 C 17.039063 14.886719 17.175781 14.886719 17.175781 14.886719 L 18.445313 15.859375 C 18.445313 15.859375 18.585938 16 18.585938 16 C 18.585938 16.140625 18.585938 16.140625 18.585938 16.140625 L 11.546875 24.90625 Z M 7.183594 20.3125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 7.183594 31.164063 L 6.757813 30.746094 C 6.617188 30.609375 6.617188 30.46875 6.757813 30.332031 L 7.886719 29.355469 C 7.886719 29.355469 8.027344 29.21875 8.027344 29.21875 C 8.167969 29.21875 8.167969 29.21875 8.167969 29.355469 L 11.261719 32.695313 L 16.757813 25.878906 C 16.757813 25.878906 16.898438 25.738281 17.039063 25.738281 C 17.039063 25.738281 17.175781 25.738281 17.175781 25.738281 L 18.445313 26.714844 C 18.445313 26.714844 18.585938 26.851563 18.585938 26.851563 C 18.585938 26.992188 18.585938 26.992188 18.585938 26.992188 L 11.546875 35.757813 Z M 7.183594 31.164063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 14.082031 51.757813 C 14.082031 52.730469 14.785156 53.425781 15.769531 53.425781 L 54.632813 53.425781 C 55.617188 53.425781 56.320313 52.730469 56.320313 51.757813 L 56.320313 23.929688 L 14.082031 23.929688 Z M 14.082031 51.757813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 54.632813 16.695313 L 15.769531 16.695313 C 14.785156 16.695313 14.082031 17.390625 14.082031 18.363281 L 14.082031 24.488281 L 56.320313 24.488281 L 56.320313 18.363281 C 56.320313 17.390625 55.617188 16.695313 54.632813 16.695313 Z M 54.632813 16.695313 "/>
+<use xlink:href="#surface16" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21.261719 34.226563 L 20.835938 33.808594 C 20.695313 33.667969 20.695313 33.53125 20.835938 33.390625 L 21.964844 32.417969 C 21.964844 32.417969 22.105469 32.277344 22.105469 32.277344 C 22.25 32.277344 22.25 32.277344 22.25 32.417969 L 25.34375 35.757813 L 30.835938 28.9375 C 30.835938 28.9375 30.976563 28.800781 31.121094 28.800781 C 31.121094 28.800781 31.257813 28.800781 31.257813 28.800781 L 32.527344 29.773438 C 32.527344 29.773438 32.667969 29.914063 32.667969 29.914063 C 32.667969 30.050781 32.667969 30.050781 32.667969 30.050781 L 25.625 38.816406 Z M 21.261719 34.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21.261719 45.078125 L 20.835938 44.660156 C 20.695313 44.523438 20.695313 44.382813 20.835938 44.242188 L 21.964844 43.269531 C 21.964844 43.269531 22.105469 43.128906 22.105469 43.128906 C 22.25 43.128906 22.25 43.128906 22.25 43.269531 L 25.34375 46.609375 L 30.835938 39.792969 C 30.835938 39.792969 30.976563 39.652344 31.121094 39.652344 C 31.121094 39.652344 31.257813 39.652344 31.257813 39.652344 L 32.527344 40.625 C 32.527344 40.625 32.667969 40.765625 32.667969 40.765625 C 32.667969 40.90625 32.667969 40.90625 32.667969 40.90625 L 25.625 49.667969 Z M 21.261719 45.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 28.160156 65.667969 C 28.160156 66.644531 28.863281 67.339844 29.851563 67.339844 L 68.714844 67.339844 C 69.699219 67.339844 70.402344 66.644531 70.402344 65.667969 L 70.402344 37.84375 L 28.160156 37.84375 Z M 28.160156 65.667969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 68.714844 30.609375 L 29.851563 30.609375 C 28.863281 30.609375 28.160156 31.304688 28.160156 32.277344 L 28.160156 38.398438 L 70.402344 38.398438 L 70.402344 32.277344 C 70.402344 31.304688 69.699219 30.609375 68.714844 30.609375 Z M 68.714844 30.609375 "/>
+<use xlink:href="#surface24" mask="url(#mask2)"/>
+<use xlink:href="#surface32" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.34375 48.140625 L 34.917969 47.722656 C 34.777344 47.582031 34.777344 47.445313 34.917969 47.304688 L 36.046875 46.332031 C 36.046875 46.332031 36.1875 46.191406 36.1875 46.191406 C 36.328125 46.191406 36.328125 46.191406 36.328125 46.332031 L 39.425781 49.667969 L 44.917969 42.851563 C 44.917969 42.851563 45.058594 42.714844 45.199219 42.714844 C 45.199219 42.714844 45.335938 42.714844 45.335938 42.714844 L 46.605469 43.6875 C 46.605469 43.6875 46.746094 43.824219 46.746094 43.824219 C 46.746094 43.964844 46.746094 43.964844 46.746094 43.964844 L 39.707031 52.730469 Z M 35.34375 48.140625 "/>
+<use xlink:href="#surface40" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.34375 58.992188 L 34.917969 58.574219 C 34.777344 58.433594 34.777344 58.296875 34.917969 58.15625 L 36.046875 57.183594 C 36.046875 57.183594 36.1875 57.042969 36.1875 57.042969 C 36.328125 57.042969 36.328125 57.042969 36.328125 57.183594 L 39.425781 60.523438 L 44.917969 53.703125 C 44.917969 53.703125 45.058594 53.566406 45.199219 53.566406 C 45.199219 53.566406 45.335938 53.566406 45.335938 53.566406 L 46.605469 54.539063 C 46.605469 54.539063 46.746094 54.679688 46.746094 54.679688 C 46.746094 54.816406 46.746094 54.816406 46.746094 54.816406 L 39.707031 63.582031 Z M 35.34375 58.992188 "/>
+<use xlink:href="#surface48" mask="url(#mask5)"/>
 </g>
 </svg>
diff --git a/dist/Compute/AzureBatchAccount(m).png b/dist/Compute/AzureBatchAccount(m).png
new file mode 100644
index 00000000..fa17c52c
Binary files /dev/null and b/dist/Compute/AzureBatchAccount(m).png differ
diff --git a/dist/Compute/AzureBatchAccount(m).svg b/dist/Compute/AzureBatchAccount(m).svg
new file mode 100644
index 00000000..dd0f8e8c
--- /dev/null
+++ b/dist/Compute/AzureBatchAccount(m).svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="66pt" viewBox="0 0 70 66" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="66" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="66"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 33.351563 9.179688 L 1.179688 9.179688 L 1.179688 35.109375 C 1.179688 35.527344 1.355469 35.957031 1.660156 36.277344 C 1.957031 36.597656 38.003906 9.179688 38.003906 9.179688 Z M 61.261719 43.566406 L 42.925781 43.566406 L 42.925781 56.316406 C 42.925781 56.316406 42.875 56.757813 43.160156 57.042969 Z M 61.261719 43.566406 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 33.328125 9.179688 L 1.15625 9.179688 L 1.15625 35.109375 C 1.15625 35.515625 1.316406 35.921875 1.601563 36.226563 L 1.585938 36.238281 C 1.625 36.277344 1.671875 36.324219 1.722656 36.351563 C 2.019531 36.621094 2.398438 36.792969 2.855469 36.792969 L 36.292969 36.792969 C 37.140625 36.792969 37.992188 36.09375 37.992188 35.097656 L 37.992188 9.179688 Z M 33.328125 9.179688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.222656 14.957031 L 31.210938 14.957031 L 31.210938 17.070313 L 8.222656 17.070313 Z M 8.222656 21.855469 L 31.210938 21.855469 L 31.210938 23.96875 L 8.222656 23.96875 Z M 8.222656 28.765625 L 31.210938 28.765625 L 31.210938 30.878906 L 8.222656 30.878906 Z M 8.222656 28.765625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 54.765625 27.5 C 54.765625 27.5 56.460938 14.957031 44.894531 12.558594 C 44.894531 12.558594 43.910156 12.425781 42.640625 12.425781 C 41.226563 12.425781 40.671875 12.84375 40.671875 12.84375 L 40.671875 17.921875 C 40.671875 17.921875 41.089844 17.503906 42.925781 17.503906 C 44.058594 17.503906 44.894531 17.636719 45.324219 17.636719 C 48.007813 18.484375 50.542969 20.453125 49.976563 27.363281 L 45.042969 27.363281 L 52.796875 36.941406 L 60.414063 27.363281 L 54.765625 27.363281 Z M 54.765625 27.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 64.648438 43.566406 L 63.660156 43.566406 L 63.660156 59.625 L 47.578125 59.625 L 47.578125 60.902344 C 47.578125 61.46875 47.710938 61.886719 48.277344 61.886719 L 64.929688 61.886719 C 65.496094 61.886719 65.914063 61.46875 65.914063 60.902344 L 65.914063 44.550781 C 65.914063 43.984375 65.210938 43.566406 64.648438 43.566406 Z M 64.648438 43.566406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 68.730469 47.648438 L 67.746094 47.648438 L 67.746094 63.570313 C 67.746094 63.707031 67.613281 63.707031 67.613281 63.707031 L 51.664063 63.707031 L 51.664063 64.972656 C 51.664063 65.539063 51.796875 65.957031 52.363281 65.957031 L 68.730469 65.957031 C 69.433594 65.957031 70 65.390625 70 64.691406 L 70 48.632813 C 70 48.078125 69.296875 47.648438 68.730469 47.648438 Z M 68.730469 47.648438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 5.820313 9.179688 L 37.976563 9.179688 L 37.976563 1.703125 C 37.976563 0.855469 37.277344 0.0078125 36.28125 0.0078125 L 2.855469 0.0078125 C 2.007813 0.0078125 1.15625 0.707031 1.15625 1.703125 L 1.15625 9.179688 Z M 60.265625 39.054688 L 43.898438 39.054688 C 43.332031 39.054688 42.914063 39.472656 42.914063 40.039063 L 42.914063 43.703125 L 61.238281 43.703125 L 61.238281 40.039063 C 61.261719 39.472656 60.832031 39.054688 60.265625 39.054688 Z M 60.265625 39.054688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 58.996094 43.566406 L 42.925781 43.566406 L 42.925781 56.390625 C 42.925781 56.957031 43.34375 57.375 43.910156 57.375 L 60.277344 57.375 C 60.84375 57.375 61.261719 56.957031 61.261719 56.390625 L 61.261719 43.566406 Z M 58.996094 43.566406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.148438 45.816406 L 56.316406 45.816406 L 56.316406 48.066406 L 47.148438 48.066406 Z M 47.148438 45.816406 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureBatchAccount.png b/dist/Compute/AzureBatchAccount.png
new file mode 100644
index 00000000..ea658cd3
Binary files /dev/null and b/dist/Compute/AzureBatchAccount.png differ
diff --git a/dist/Compute/AzureBatchAccount.puml b/dist/Compute/AzureBatchAccount.puml
new file mode 100644
index 00000000..0b76e3b2
--- /dev/null
+++ b/dist/Compute/AzureBatchAccount.puml
@@ -0,0 +1,10 @@
+sprite $AzureBatchAccount [70x65/16z] {
+xT89aiGW24PX17pf-rzuLdkJL68JPvztWA-i7qMNqsvLzk8qK96TbZ-Y_2jU1vgXm0I56GhlYhcxbQG2JLdUmZOLNu-hqg9iA4LMyrkbfKUKJSPt9g4fhch6
+cy832dTAIzyO7rKWAbTcK24gBRyk4nMtc_nI3KfvLJnveslNVQEYPRKLfQuDuzkBv1J6bBAfmF6tmBQYGFk-hsbGJ5KjrbtQbviyVUbwHP2ecAuMVXqtI5JO
+xAgKfLLM54OLqNV492WmheYrPNk5SQKTgagNCP3SLP6GscxILUJBqpv9nAdF4yeIbFh35QzzBbBzg8ABW3wkcBQiGbfHQIbm_2r-exZdTW5kb4fAOOR210Kc
+A4nGO8B238K9YjK-3KggBrKAeOGYX4f2ATfL92YPiahj8gKGUWO
+}
+
+AzureEntityColoring(AzureBatchAccount)
+!define AzureBatchAccount(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureBatchAccount, AzureBatchAccount)
+!define AzureBatchAccount(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureBatchAccount, AzureBatchAccount)
diff --git a/dist/Compute/AzureBatchAccount.svg b/dist/Compute/AzureBatchAccount.svg
new file mode 100644
index 00000000..5b766b2d
--- /dev/null
+++ b/dist/Compute/AzureBatchAccount.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="66pt" viewBox="0 0 70 66" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="66" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="66"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 33.351563 9.179688 L 1.179688 9.179688 L 1.179688 35.109375 C 1.179688 35.527344 1.355469 35.957031 1.660156 36.277344 C 1.957031 36.597656 38.003906 9.179688 38.003906 9.179688 Z M 61.261719 43.566406 L 42.925781 43.566406 L 42.925781 56.316406 C 42.925781 56.316406 42.875 56.757813 43.160156 57.042969 Z M 61.261719 43.566406 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 33.328125 9.179688 L 1.15625 9.179688 L 1.15625 35.109375 C 1.15625 35.515625 1.316406 35.921875 1.601563 36.226563 L 1.585938 36.238281 C 1.625 36.277344 1.671875 36.324219 1.722656 36.351563 C 2.019531 36.621094 2.398438 36.792969 2.855469 36.792969 L 36.292969 36.792969 C 37.140625 36.792969 37.992188 36.09375 37.992188 35.097656 L 37.992188 9.179688 Z M 33.328125 9.179688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.222656 14.957031 L 31.210938 14.957031 L 31.210938 17.070313 L 8.222656 17.070313 Z M 8.222656 21.855469 L 31.210938 21.855469 L 31.210938 23.96875 L 8.222656 23.96875 Z M 8.222656 28.765625 L 31.210938 28.765625 L 31.210938 30.878906 L 8.222656 30.878906 Z M 8.222656 28.765625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 54.765625 27.5 C 54.765625 27.5 56.460938 14.957031 44.894531 12.558594 C 44.894531 12.558594 43.910156 12.425781 42.640625 12.425781 C 41.226563 12.425781 40.671875 12.84375 40.671875 12.84375 L 40.671875 17.921875 C 40.671875 17.921875 41.089844 17.503906 42.925781 17.503906 C 44.058594 17.503906 44.894531 17.636719 45.324219 17.636719 C 48.007813 18.484375 50.542969 20.453125 49.976563 27.363281 L 45.042969 27.363281 L 52.796875 36.941406 L 60.414063 27.363281 L 54.765625 27.363281 Z M 54.765625 27.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 64.648438 43.566406 L 63.660156 43.566406 L 63.660156 59.625 L 47.578125 59.625 L 47.578125 60.902344 C 47.578125 61.46875 47.710938 61.886719 48.277344 61.886719 L 64.929688 61.886719 C 65.496094 61.886719 65.914063 61.46875 65.914063 60.902344 L 65.914063 44.550781 C 65.914063 43.984375 65.210938 43.566406 64.648438 43.566406 Z M 64.648438 43.566406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 68.730469 47.648438 L 67.746094 47.648438 L 67.746094 63.570313 C 67.746094 63.707031 67.613281 63.707031 67.613281 63.707031 L 51.664063 63.707031 L 51.664063 64.972656 C 51.664063 65.539063 51.796875 65.957031 52.363281 65.957031 L 68.730469 65.957031 C 69.433594 65.957031 70 65.390625 70 64.691406 L 70 48.632813 C 70 48.078125 69.296875 47.648438 68.730469 47.648438 Z M 68.730469 47.648438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 5.820313 9.179688 L 37.976563 9.179688 L 37.976563 1.703125 C 37.976563 0.855469 37.277344 0.0078125 36.28125 0.0078125 L 2.855469 0.0078125 C 2.007813 0.0078125 1.15625 0.707031 1.15625 1.703125 L 1.15625 9.179688 Z M 60.265625 39.054688 L 43.898438 39.054688 C 43.332031 39.054688 42.914063 39.472656 42.914063 40.039063 L 42.914063 43.703125 L 61.238281 43.703125 L 61.238281 40.039063 C 61.261719 39.472656 60.832031 39.054688 60.265625 39.054688 Z M 60.265625 39.054688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 58.996094 43.566406 L 42.925781 43.566406 L 42.925781 56.390625 C 42.925781 56.957031 43.34375 57.375 43.910156 57.375 L 60.277344 57.375 C 60.84375 57.375 61.261719 56.957031 61.261719 56.390625 L 61.261719 43.566406 Z M 58.996094 43.566406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.148438 45.816406 L 56.316406 45.816406 L 56.316406 48.066406 L 47.148438 48.066406 Z M 47.148438 45.816406 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureCloudService(m).png b/dist/Compute/AzureCloudService(m).png
new file mode 100644
index 00000000..21a003f1
Binary files /dev/null and b/dist/Compute/AzureCloudService(m).png differ
diff --git a/dist/Compute/AzureCloudService(m).svg b/dist/Compute/AzureCloudService(m).svg
new file mode 100644
index 00000000..171eb35c
--- /dev/null
+++ b/dist/Compute/AzureCloudService(m).svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 60.675781 26.121094 C 60.949219 24.847656 61.082031 23.632813 61.082031 22.421875 C 61.082031 13.144531 53.523438 5.601563 44.234375 5.601563 C 37.75 5.601563 31.914063 9.269531 29.097656 15.03125 C 26.832031 12.777344 23.765625 11.5 20.539063 11.5 C 13.871094 11.5 8.445313 16.921875 8.445313 23.589844 C 8.445313 24.496094 8.546875 25.40625 8.75 26.34375 C 3.257813 28.582031 0 33.222656 0 38.867188 C 0 46.480469 6.21875 52.441406 14.15625 52.441406 L 15.0625 52.441406 C 15.214844 59.398438 20.914063 65.007813 27.890625 65.007813 C 32.589844 65.007813 36.84375 62.476563 39.085938 58.453125 C 40.773438 59.917969 42.933594 60.734375 45.191406 60.734375 C 49.980469 60.734375 53.9375 57.105469 54.5 52.441406 L 55.847656 52.441406 C 63.785156 52.441406 70 46.480469 70 38.867188 C 70 32.988281 66.4375 28.152344 60.675781 26.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 55.210938 32.46875 L 56.242188 30.027344 L 55.945313 29.769531 L 53.695313 27.816406 L 53.707031 25.839844 L 56.242188 23.574219 L 55.242188 21.117188 L 54.851563 21.144531 L 51.878906 21.359375 L 50.488281 19.949219 L 50.679688 16.550781 L 48.238281 15.523438 L 47.980469 15.820313 L 46.027344 18.070313 L 44.050781 18.058594 L 41.78125 15.523438 L 39.328125 16.519531 L 39.355469 16.910156 L 39.566406 19.886719 L 38.160156 21.273438 L 34.761719 21.085938 L 33.730469 23.523438 L 34.027344 23.78125 L 36.28125 25.738281 L 36.265625 27.714844 L 33.734375 29.984375 L 34.726563 32.4375 L 35.121094 32.40625 L 38.09375 32.199219 L 39.484375 33.605469 L 39.292969 37.003906 L 41.734375 38.03125 L 41.992188 37.734375 L 43.945313 35.484375 L 45.921875 35.496094 L 48.191406 38.035156 L 50.644531 37.035156 L 50.617188 36.640625 L 50.40625 33.667969 L 51.816406 32.28125 Z M 42.878906 31.769531 C 40.121094 30.605469 38.828125 27.425781 39.992188 24.671875 C 41.160156 21.910156 44.335938 20.621094 47.09375 21.78125 C 49.851563 22.949219 51.144531 26.125 49.980469 28.886719 C 48.816406 31.644531 45.636719 32.933594 42.878906 31.769531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.699219 44.726563 L 39.699219 42.078125 L 39.328125 41.957031 L 36.492188 41.027344 L 35.738281 39.203125 L 37.195313 36.125 L 35.324219 34.253906 L 34.972656 34.429688 L 32.3125 35.777344 L 30.488281 35.019531 L 29.339844 31.816406 L 26.695313 31.8125 L 26.570313 32.191406 L 25.644531 35.023438 L 23.816406 35.777344 L 20.742188 34.324219 L 18.871094 36.195313 L 19.046875 36.546875 L 20.394531 39.207031 L 19.636719 41.027344 L 16.433594 42.175781 L 16.429688 44.824219 L 16.804688 44.945313 L 19.640625 45.871094 L 20.394531 47.699219 L 18.9375 50.773438 L 20.808594 52.648438 L 21.160156 52.46875 L 23.820313 51.121094 L 25.644531 51.878906 L 26.789063 55.082031 L 29.4375 55.085938 L 29.558594 54.710938 L 30.488281 51.878906 L 32.316406 51.121094 L 35.390625 52.578125 L 37.265625 50.707031 L 37.085938 50.355469 L 35.738281 47.699219 L 36.496094 45.871094 Z M 28.0625 48.871094 C 25.070313 48.871094 22.644531 46.441406 22.644531 43.449219 C 22.648438 40.453125 25.074219 38.03125 28.070313 38.03125 C 31.066406 38.03125 33.488281 40.460938 33.488281 43.453125 C 33.484375 46.449219 31.054688 48.871094 28.0625 48.871094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 48.230469 28.144531 C 47.472656 29.933594 45.410156 30.773438 43.617188 30.015625 C 41.828125 29.261719 40.988281 27.199219 41.746094 25.40625 C 42.5 23.621094 44.566406 22.777344 46.355469 23.535156 C 48.144531 24.289063 48.984375 26.355469 48.230469 28.144531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 31.585938 43.453125 C 31.585938 45.394531 30.007813 46.972656 28.0625 46.96875 C 26.121094 46.96875 24.546875 45.390625 24.550781 43.449219 C 24.550781 41.503906 26.125 39.929688 28.066406 39.929688 C 30.011719 39.933594 31.585938 41.507813 31.585938 43.453125 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureCloudService.png b/dist/Compute/AzureCloudService.png
new file mode 100644
index 00000000..3976dad3
Binary files /dev/null and b/dist/Compute/AzureCloudService.png differ
diff --git a/dist/Compute/AzureCloudService.puml b/dist/Compute/AzureCloudService.puml
new file mode 100644
index 00000000..0d7c1a40
--- /dev/null
+++ b/dist/Compute/AzureCloudService.puml
@@ -0,0 +1,13 @@
+sprite $AzureCloudService [70x70/16z] {
+xTPNmgif20PWK105zh_TAVgrtnZIPav_hbAnaJV2Z-0FJ9ae8NmWY_gWak4zf7wb1A_3vhE6y28olsNvnIA-HX1BcIbZLAIBPfEhUTUuLpI_nn3kmEedpG3D
+xskmbgUH2tc4raKyeZPcu0U51RHe-WdIjWmEDxXvGFfS-_3ek_hgUleNCC6NAWOtgaSQ798V46OUoikbv-SNf2bJNqhYCWwNAVFYhCDMv-jFsnW66szDYj-3
+UnzOhNfyKvPpOPzCOIAkJ4IoLQNrlWJDRgclWEbVpVaS4wEvp0f0SgLEUkluK72HhC7-9hUzYbpRGbxhEFDoMH7TPYVgu-Q7uiP4LDrm2X62JZs4nwUqsV4b
+cVgwUenXa2q01_kQdJbOIHxjMeJwohTV0XPccJxPea2qUKBhRKp9Rsd_tBuAapvSzBkLiYY2a5iRYn0j0BprHIOS-JApjZgKMUjLofcOCrir_0JxFO561oRn
+IVYlnxL9Ei_OrgFUVvNFvfIZDqAwxjRahbBgA2F-IFDPpNq_A_s3tHC05lLOcMlWs4yReLItlKuUiRGue3cKUjc8WAwgu3MK7bV9SqERv4ieiJh1musfgtzv
+xJ5iGiHjUn9Boni7ZTCrs_9VFSImlBpbFT1D4Ffi8sMT60q6H1XoF9E3n7VG5jsnBb3ionI9e4kCmLsjPPWbbjgibo7j9pLEfsPRn5ALGh29vfw3fLG8LJz8
+qB448RvsiJHVCuYXFuFX0VN76WIY3hF7HHvtcABCLvOOslfEbaJTNGl2Kv8jKkXrg3SpUKkPylmzPqIQ9FW49gACy8a__WO
+}
+
+AzureEntityColoring(AzureCloudService)
+!define AzureCloudService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCloudService, AzureCloudService)
+!define AzureCloudService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCloudService, AzureCloudService)
diff --git a/dist/Compute/AzureCloudService.svg b/dist/Compute/AzureCloudService.svg
new file mode 100644
index 00000000..3a73af37
--- /dev/null
+++ b/dist/Compute/AzureCloudService.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 60.675781 26.121094 C 60.949219 24.847656 61.082031 23.632813 61.082031 22.421875 C 61.082031 13.144531 53.523438 5.601563 44.234375 5.601563 C 37.75 5.601563 31.914063 9.269531 29.097656 15.03125 C 26.832031 12.777344 23.765625 11.5 20.539063 11.5 C 13.871094 11.5 8.445313 16.921875 8.445313 23.589844 C 8.445313 24.496094 8.546875 25.40625 8.75 26.34375 C 3.257813 28.582031 0 33.222656 0 38.867188 C 0 46.480469 6.21875 52.441406 14.15625 52.441406 L 15.0625 52.441406 C 15.214844 59.398438 20.914063 65.007813 27.890625 65.007813 C 32.589844 65.007813 36.84375 62.476563 39.085938 58.453125 C 40.773438 59.917969 42.933594 60.734375 45.191406 60.734375 C 49.980469 60.734375 53.9375 57.105469 54.5 52.441406 L 55.847656 52.441406 C 63.785156 52.441406 70 46.480469 70 38.867188 C 70 32.988281 66.4375 28.152344 60.675781 26.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 55.210938 32.46875 L 56.242188 30.027344 L 55.945313 29.769531 L 53.695313 27.816406 L 53.707031 25.839844 L 56.242188 23.574219 L 55.242188 21.117188 L 54.851563 21.144531 L 51.878906 21.359375 L 50.488281 19.949219 L 50.679688 16.550781 L 48.238281 15.523438 L 47.980469 15.820313 L 46.027344 18.070313 L 44.050781 18.058594 L 41.78125 15.523438 L 39.328125 16.519531 L 39.355469 16.910156 L 39.566406 19.886719 L 38.160156 21.273438 L 34.761719 21.085938 L 33.730469 23.523438 L 34.027344 23.78125 L 36.28125 25.738281 L 36.265625 27.714844 L 33.734375 29.984375 L 34.726563 32.4375 L 35.121094 32.40625 L 38.09375 32.199219 L 39.484375 33.605469 L 39.292969 37.003906 L 41.734375 38.03125 L 41.992188 37.734375 L 43.945313 35.484375 L 45.921875 35.496094 L 48.191406 38.035156 L 50.644531 37.035156 L 50.617188 36.640625 L 50.40625 33.667969 L 51.816406 32.28125 Z M 42.878906 31.769531 C 40.121094 30.605469 38.828125 27.425781 39.992188 24.671875 C 41.160156 21.910156 44.335938 20.621094 47.09375 21.78125 C 49.851563 22.949219 51.144531 26.125 49.980469 28.886719 C 48.816406 31.644531 45.636719 32.933594 42.878906 31.769531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.699219 44.726563 L 39.699219 42.078125 L 39.328125 41.957031 L 36.492188 41.027344 L 35.738281 39.203125 L 37.195313 36.125 L 35.324219 34.253906 L 34.972656 34.429688 L 32.3125 35.777344 L 30.488281 35.019531 L 29.339844 31.816406 L 26.695313 31.8125 L 26.570313 32.191406 L 25.644531 35.023438 L 23.816406 35.777344 L 20.742188 34.324219 L 18.871094 36.195313 L 19.046875 36.546875 L 20.394531 39.207031 L 19.636719 41.027344 L 16.433594 42.175781 L 16.429688 44.824219 L 16.804688 44.945313 L 19.640625 45.871094 L 20.394531 47.699219 L 18.9375 50.773438 L 20.808594 52.648438 L 21.160156 52.46875 L 23.820313 51.121094 L 25.644531 51.878906 L 26.789063 55.082031 L 29.4375 55.085938 L 29.558594 54.710938 L 30.488281 51.878906 L 32.316406 51.121094 L 35.390625 52.578125 L 37.265625 50.707031 L 37.085938 50.355469 L 35.738281 47.699219 L 36.496094 45.871094 Z M 28.0625 48.871094 C 25.070313 48.871094 22.644531 46.441406 22.644531 43.449219 C 22.648438 40.453125 25.074219 38.03125 28.070313 38.03125 C 31.066406 38.03125 33.488281 40.460938 33.488281 43.453125 C 33.484375 46.449219 31.054688 48.871094 28.0625 48.871094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 48.230469 28.144531 C 47.472656 29.933594 45.410156 30.773438 43.617188 30.015625 C 41.828125 29.261719 40.988281 27.199219 41.746094 25.40625 C 42.5 23.621094 44.566406 22.777344 46.355469 23.535156 C 48.144531 24.289063 48.984375 26.355469 48.230469 28.144531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 31.585938 43.453125 C 31.585938 45.394531 30.007813 46.972656 28.0625 46.96875 C 26.121094 46.96875 24.546875 45.390625 24.550781 43.449219 C 24.550781 41.503906 26.125 39.929688 28.066406 39.929688 C 30.011719 39.933594 31.585938 41.507813 31.585938 43.453125 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureCloudServiceClassic(m).png b/dist/Compute/AzureCloudServiceClassic(m).png
new file mode 100644
index 00000000..4d27f351
Binary files /dev/null and b/dist/Compute/AzureCloudServiceClassic(m).png differ
diff --git a/dist/Compute/AzureCloudServiceClassic(m).svg b/dist/Compute/AzureCloudServiceClassic(m).svg
new file mode 100644
index 00000000..5c9044fe
--- /dev/null
+++ b/dist/Compute/AzureCloudServiceClassic(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 60.675781 26.121094 C 60.949219 24.847656 61.082031 23.632813 61.082031 22.421875 C 61.082031 13.144531 53.523438 5.601563 44.234375 5.601563 C 37.796875 5.585938 31.921875 9.25 29.097656 15.03125 C 26.824219 12.765625 23.746094 11.496094 20.539063 11.5 C 13.871094 11.5 8.445313 16.921875 8.445313 23.589844 C 8.445313 24.496094 8.546875 25.40625 8.75 26.34375 C 3.257813 28.582031 0 33.222656 0 38.867188 C 0 46.480469 6.21875 52.441406 14.15625 52.441406 L 15.0625 52.441406 C 15.214844 59.398438 20.914063 65.007813 27.890625 65.007813 C 32.535156 65.015625 36.820313 62.507813 39.085938 58.453125 C 40.78125 59.925781 42.949219 60.734375 45.191406 60.734375 C 49.980469 60.734375 53.9375 57.105469 54.5 52.441406 L 55.847656 52.441406 C 63.785156 52.441406 70 46.480469 70 38.867188 C 70 32.988281 66.4375 28.152344 60.675781 26.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 55.210938 32.46875 L 56.242188 30.027344 L 55.945313 29.769531 L 53.695313 27.816406 L 53.707031 25.839844 L 56.242188 23.574219 L 55.242188 21.117188 L 54.851563 21.144531 L 51.878906 21.359375 L 50.488281 19.949219 L 50.679688 16.550781 L 48.238281 15.523438 L 47.980469 15.820313 L 46.027344 18.070313 L 44.050781 18.058594 L 41.78125 15.523438 L 39.328125 16.519531 L 39.355469 16.910156 L 39.566406 19.886719 L 38.160156 21.273438 L 34.761719 21.085938 L 33.730469 23.523438 L 34.027344 23.78125 L 36.28125 25.738281 L 36.265625 27.714844 L 33.734375 29.984375 L 34.726563 32.4375 L 35.121094 32.40625 L 38.09375 32.199219 L 39.484375 33.605469 L 39.292969 37.003906 L 41.734375 38.03125 L 41.992188 37.734375 L 43.945313 35.484375 L 45.921875 35.496094 L 48.191406 38.035156 L 50.644531 37.035156 L 50.617188 36.640625 L 50.40625 33.667969 L 51.816406 32.28125 Z M 42.878906 31.769531 C 40.121094 30.605469 38.828125 27.425781 39.992188 24.667969 C 41.15625 21.910156 44.335938 20.617188 47.09375 21.78125 C 49.851563 22.945313 51.144531 26.125 49.980469 28.882813 C 48.816406 31.640625 45.636719 32.933594 42.878906 31.769531 M 39.699219 44.726563 L 39.699219 42.078125 L 39.328125 41.957031 L 36.492188 41.027344 L 35.738281 39.203125 L 37.195313 36.125 L 35.324219 34.253906 L 34.972656 34.429688 L 32.3125 35.777344 L 30.488281 35.019531 L 29.339844 31.816406 L 26.695313 31.8125 L 26.570313 32.191406 L 25.644531 35.023438 L 23.816406 35.777344 L 20.742188 34.324219 L 18.871094 36.195313 L 19.046875 36.546875 L 20.394531 39.207031 L 19.636719 41.027344 L 16.433594 42.175781 L 16.429688 44.824219 L 16.804688 44.945313 L 19.640625 45.871094 L 20.394531 47.699219 L 18.9375 50.773438 L 20.808594 52.648438 L 21.160156 52.46875 L 23.820313 51.121094 L 25.644531 51.878906 L 26.789063 55.082031 L 29.4375 55.085938 L 29.558594 54.710938 L 30.488281 51.878906 L 32.316406 51.121094 L 35.390625 52.578125 L 37.265625 50.707031 L 37.085938 50.355469 L 35.738281 47.699219 L 36.496094 45.871094 Z M 28.0625 48.871094 C 25.066406 48.867188 22.640625 46.4375 22.644531 43.445313 C 22.648438 40.449219 25.078125 38.027344 28.070313 38.027344 C 31.066406 38.03125 33.492188 40.460938 33.488281 43.453125 C 33.484375 46.449219 31.054688 48.875 28.0625 48.871094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 48.230469 28.144531 C 47.757813 29.328125 46.683594 30.160156 45.421875 30.328125 C 44.15625 30.496094 42.902344 29.964844 42.140625 28.945313 C 41.378906 27.925781 41.230469 26.574219 41.746094 25.410156 C 42.527344 23.660156 44.5625 22.855469 46.328125 23.597656 C 48.09375 24.34375 48.9375 26.363281 48.230469 28.144531 M 31.585938 43.453125 C 31.585938 45.394531 30.007813 46.96875 28.066406 46.96875 C 26.121094 46.964844 24.546875 45.390625 24.550781 43.449219 C 24.550781 41.503906 26.125 39.929688 28.070313 39.929688 C 30.011719 39.933594 31.585938 41.507813 31.585938 43.453125 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureCloudServiceClassic.png b/dist/Compute/AzureCloudServiceClassic.png
new file mode 100644
index 00000000..f3608de0
Binary files /dev/null and b/dist/Compute/AzureCloudServiceClassic.png differ
diff --git a/dist/Compute/AzureCloudServiceClassic.puml b/dist/Compute/AzureCloudServiceClassic.puml
new file mode 100644
index 00000000..c8c45ea6
--- /dev/null
+++ b/dist/Compute/AzureCloudServiceClassic.puml
@@ -0,0 +1,12 @@
+sprite $AzureCloudServiceClassic [70x70/16z] {
+xPO7kkCW38IHDAFxttWBneiTo7pozlQ__X96NRZz5lp7tDs-JG7C0-9hbPnvXTwUOynN-DoHtE6FHRICheKMqJA6MmejtsDQuwB3ND4fNYs7fyAbo1xE7mC-
+5g4r6oT3EiCKeDVhC9ydg3R6_O2rcqgkAiYi5SHKiLFYsz2zdblQw6MBE8w5UomgnLRdxQ-zIkGxvh7UB37I-525voa0u51r4P6OkqpYCvanRLhTbtxECj5X
+OXOqn6OjgGpmhEDcH7wFt_G4tSt5cjs1LqJoOehp45wyGMhY6ZPjCp2gzN7wxMVddrizmkFbdLITBwTnOfOhv9aFT5FTd9fRnBQoJexnPRJcGyNVtYwiN3GS
+RJzQfqHiTW_zI3MR8MkqJW0msTeQdz6Z5W9pPOYGF6Jm5Ihmda-EiR5UgTJ4TlRQN0Gn4YonRO5igfoo2ZH-1nLR5YviNKgc4uFTS77Sx03FFpJ3xgPVS7a7
+AxUlRRMTNoh6qi0OzGER5QSkzFCQrJFM5TpLVKXPA5-u6hG8y93nNfnH7VZkF11JGlYkgeCcmVsTehYAo0b0iSSKzdodwiJewr_ZLH4DzmUnXAF93NPk1qQh
+OJkHvnYLI9rGVLfdtXrXxPimzszK-Cz7
+}
+
+AzureEntityColoring(AzureCloudServiceClassic)
+!define AzureCloudServiceClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCloudServiceClassic, AzureCloudServiceClassic)
+!define AzureCloudServiceClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCloudServiceClassic, AzureCloudServiceClassic)
diff --git a/dist/Compute/AzureCloudServiceClassic.svg b/dist/Compute/AzureCloudServiceClassic.svg
new file mode 100644
index 00000000..18f81342
--- /dev/null
+++ b/dist/Compute/AzureCloudServiceClassic.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 60.675781 26.121094 C 60.949219 24.847656 61.082031 23.632813 61.082031 22.421875 C 61.082031 13.144531 53.523438 5.601563 44.234375 5.601563 C 37.796875 5.585938 31.921875 9.25 29.097656 15.03125 C 26.824219 12.765625 23.746094 11.496094 20.539063 11.5 C 13.871094 11.5 8.445313 16.921875 8.445313 23.589844 C 8.445313 24.496094 8.546875 25.40625 8.75 26.34375 C 3.257813 28.582031 0 33.222656 0 38.867188 C 0 46.480469 6.21875 52.441406 14.15625 52.441406 L 15.0625 52.441406 C 15.214844 59.398438 20.914063 65.007813 27.890625 65.007813 C 32.535156 65.015625 36.820313 62.507813 39.085938 58.453125 C 40.78125 59.925781 42.949219 60.734375 45.191406 60.734375 C 49.980469 60.734375 53.9375 57.105469 54.5 52.441406 L 55.847656 52.441406 C 63.785156 52.441406 70 46.480469 70 38.867188 C 70 32.988281 66.4375 28.152344 60.675781 26.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 55.210938 32.46875 L 56.242188 30.027344 L 55.945313 29.769531 L 53.695313 27.816406 L 53.707031 25.839844 L 56.242188 23.574219 L 55.242188 21.117188 L 54.851563 21.144531 L 51.878906 21.359375 L 50.488281 19.949219 L 50.679688 16.550781 L 48.238281 15.523438 L 47.980469 15.820313 L 46.027344 18.070313 L 44.050781 18.058594 L 41.78125 15.523438 L 39.328125 16.519531 L 39.355469 16.910156 L 39.566406 19.886719 L 38.160156 21.273438 L 34.761719 21.085938 L 33.730469 23.523438 L 34.027344 23.78125 L 36.28125 25.738281 L 36.265625 27.714844 L 33.734375 29.984375 L 34.726563 32.4375 L 35.121094 32.40625 L 38.09375 32.199219 L 39.484375 33.605469 L 39.292969 37.003906 L 41.734375 38.03125 L 41.992188 37.734375 L 43.945313 35.484375 L 45.921875 35.496094 L 48.191406 38.035156 L 50.644531 37.035156 L 50.617188 36.640625 L 50.40625 33.667969 L 51.816406 32.28125 Z M 42.878906 31.769531 C 40.121094 30.605469 38.828125 27.425781 39.992188 24.667969 C 41.15625 21.910156 44.335938 20.617188 47.09375 21.78125 C 49.851563 22.945313 51.144531 26.125 49.980469 28.882813 C 48.816406 31.640625 45.636719 32.933594 42.878906 31.769531 M 39.699219 44.726563 L 39.699219 42.078125 L 39.328125 41.957031 L 36.492188 41.027344 L 35.738281 39.203125 L 37.195313 36.125 L 35.324219 34.253906 L 34.972656 34.429688 L 32.3125 35.777344 L 30.488281 35.019531 L 29.339844 31.816406 L 26.695313 31.8125 L 26.570313 32.191406 L 25.644531 35.023438 L 23.816406 35.777344 L 20.742188 34.324219 L 18.871094 36.195313 L 19.046875 36.546875 L 20.394531 39.207031 L 19.636719 41.027344 L 16.433594 42.175781 L 16.429688 44.824219 L 16.804688 44.945313 L 19.640625 45.871094 L 20.394531 47.699219 L 18.9375 50.773438 L 20.808594 52.648438 L 21.160156 52.46875 L 23.820313 51.121094 L 25.644531 51.878906 L 26.789063 55.082031 L 29.4375 55.085938 L 29.558594 54.710938 L 30.488281 51.878906 L 32.316406 51.121094 L 35.390625 52.578125 L 37.265625 50.707031 L 37.085938 50.355469 L 35.738281 47.699219 L 36.496094 45.871094 Z M 28.0625 48.871094 C 25.066406 48.867188 22.640625 46.4375 22.644531 43.445313 C 22.648438 40.449219 25.078125 38.027344 28.070313 38.027344 C 31.066406 38.03125 33.492188 40.460938 33.488281 43.453125 C 33.484375 46.449219 31.054688 48.875 28.0625 48.871094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 48.230469 28.144531 C 47.757813 29.328125 46.683594 30.160156 45.421875 30.328125 C 44.15625 30.496094 42.902344 29.964844 42.140625 28.945313 C 41.378906 27.925781 41.230469 26.574219 41.746094 25.410156 C 42.527344 23.660156 44.5625 22.855469 46.328125 23.597656 C 48.09375 24.34375 48.9375 26.363281 48.230469 28.144531 M 31.585938 43.453125 C 31.585938 45.394531 30.007813 46.96875 28.066406 46.96875 C 26.121094 46.964844 24.546875 45.390625 24.550781 43.449219 C 24.550781 41.503906 26.125 39.929688 28.070313 39.929688 C 30.011719 39.933594 31.585938 41.507813 31.585938 43.453125 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureCloudSimpleVirtualMachine(m).png b/dist/Compute/AzureCloudSimpleVirtualMachine(m).png
new file mode 100644
index 00000000..4e0f31a4
Binary files /dev/null and b/dist/Compute/AzureCloudSimpleVirtualMachine(m).png differ
diff --git a/dist/Compute/AzureCloudSimpleVirtualMachine(m).svg b/dist/Compute/AzureCloudSimpleVirtualMachine(m).svg
new file mode 100644
index 00000000..88b0e064
--- /dev/null
+++ b/dist/Compute/AzureCloudSimpleVirtualMachine(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(59,171,255);fill-opacity:1;" d="M 38.09375 50.695313 C 37.410156 51.136719 36.699219 51.535156 35.964844 51.882813 C 35.03125 52.332031 34.066406 52.722656 33.082031 53.046875 C 31.878906 53.433594 30.648438 53.734375 29.398438 53.941406 C 27.859375 54.199219 26.300781 54.320313 24.738281 54.304688 C 22.160156 54.324219 19.601563 53.90625 17.164063 53.074219 C 14.871094 52.296875 12.761719 51.058594 10.960938 49.433594 C 9.152344 47.773438 7.722656 45.742188 6.761719 43.484375 C 5.683594 40.902344 5.152344 38.121094 5.207031 35.320313 C 5.15625 32.503906 5.671875 29.707031 6.71875 27.089844 C 7.664063 24.789063 9.09375 22.71875 10.921875 21.027344 C 12.742188 19.363281 14.894531 18.09375 17.234375 17.304688 C 19.753906 16.449219 22.398438 16.023438 25.058594 16.042969 C 27.082031 16.011719 29.101563 16.203125 31.078125 16.617188 C 32.484375 16.898438 33.847656 17.367188 35.125 18.019531 C 35.515625 18.242188 35.890625 18.488281 36.246094 18.761719 C 37.917969 19.78125 38.582031 21.878906 37.800781 23.675781 C 37.703125 23.929688 37.566406 24.164063 37.394531 24.375 C 35.992188 26.179688 33.097656 25.128906 31.445313 24.375 C 29.527344 23.574219 27.460938 23.191406 25.382813 23.253906 C 23.828125 23.238281 22.28125 23.480469 20.804688 23.96875 C 19.429688 24.417969 18.171875 25.171875 17.121094 26.164063 C 16.054688 27.207031 15.21875 28.460938 14.671875 29.847656 C 14.035156 31.519531 13.730469 33.296875 13.777344 35.085938 C 13.726563 36.933594 14.046875 38.777344 14.714844 40.503906 C 15.285156 41.914063 16.175781 43.175781 17.316406 44.183594 C 18.433594 45.152344 19.742188 45.875 21.152344 46.3125 C 22.675781 46.773438 24.257813 46.992188 25.84375 46.96875 C 27.828125 47.042969 29.804688 46.710938 31.652344 45.988281 C 32.683594 45.558594 33.683594 45.0625 34.648438 44.507813 Z M 38.09375 50.695313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,109,190);fill-opacity:1;" d="M 32.578125 44.269531 C 33.148438 44.636719 33.753906 44.949219 34.382813 45.207031 C 35.429688 45.660156 36.5 46.054688 37.589844 46.394531 C 39.019531 46.84375 40.480469 47.195313 41.957031 47.445313 C 43.722656 47.746094 45.515625 47.890625 47.304688 47.878906 C 49.394531 47.949219 51.476563 47.613281 53.4375 46.898438 C 54.894531 46.4375 55.863281 45.066406 55.816406 43.539063 C 55.882813 42.324219 55.308594 41.164063 54.304688 40.472656 C 52.632813 39.578125 50.78125 39.070313 48.886719 38.988281 L 43.289063 38.332031 C 41.496094 38.164063 39.730469 37.8125 38.011719 37.28125 C 36.5 36.84375 35.082031 36.148438 33.808594 35.222656 C 32.671875 34.375 31.746094 33.273438 31.109375 32.003906 C 30.429688 30.574219 30.097656 29.007813 30.140625 27.425781 C 30.132813 25.921875 30.4375 24.433594 31.039063 23.058594 C 31.667969 21.640625 32.628906 20.390625 33.839844 19.417969 C 35.351563 18.253906 37.085938 17.402344 38.933594 16.925781 C 41.417969 16.273438 43.980469 15.96875 46.550781 16.015625 C 50.503906 15.851563 54.457031 16.410156 58.210938 17.667969 C 59.0625 18.011719 59.871094 18.453125 60.621094 18.984375 C 62.253906 19.863281 62.878906 21.890625 62.019531 23.535156 C 60.773438 25.871094 58.140625 24.765625 57.902344 24.640625 C 57.285156 24.324219 56.652344 24.042969 56 23.800781 C 53.015625 22.726563 49.863281 22.203125 46.691406 22.246094 C 41.089844 22.246094 38.289063 23.714844 38.289063 26.65625 C 38.265625 27.808594 38.871094 28.882813 39.871094 29.457031 C 41.28125 30.207031 42.832031 30.65625 44.421875 30.773438 L 51.773438 31.738281 C 55.105469 32.027344 58.3125 33.164063 61.082031 35.042969 C 63.351563 36.792969 64.597656 39.558594 64.398438 42.421875 C 64.492188 45.84375 62.882813 49.089844 60.101563 51.085938 C 57.238281 53.25 53.113281 54.335938 47.726563 54.335938 C 45.335938 54.351563 42.953125 54.15625 40.601563 53.746094 C 38.734375 53.429688 36.890625 52.988281 35.085938 52.429688 C 33.792969 52.023438 32.535156 51.523438 31.316406 50.933594 C 30.660156 50.632813 30.03125 50.273438 29.441406 49.855469 Z M 32.578125 44.269531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(59,171,255);fill-opacity:1;" d="M 34.382813 45.191406 L 33.824219 44.953125 C 33.109375 45.332031 32.425781 45.683594 31.625 46.003906 L 30.378906 47.949219 L 29.398438 49.855469 C 29.953125 50.300781 30.558594 50.675781 31.207031 50.972656 C 32.3125 51.699219 33.566406 52.175781 34.875 52.375 L 35.9375 51.898438 C 36.671875 51.550781 37.382813 51.152344 38.066406 50.707031 L 35.167969 45.542969 Z M 34.382813 45.191406 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureCloudSimpleVirtualMachine.png b/dist/Compute/AzureCloudSimpleVirtualMachine.png
new file mode 100644
index 00000000..1799786f
Binary files /dev/null and b/dist/Compute/AzureCloudSimpleVirtualMachine.png differ
diff --git a/dist/Compute/AzureCloudSimpleVirtualMachine.puml b/dist/Compute/AzureCloudSimpleVirtualMachine.puml
new file mode 100644
index 00000000..8f834ac9
--- /dev/null
+++ b/dist/Compute/AzureCloudSimpleVirtualMachine.puml
@@ -0,0 +1,11 @@
+sprite $AzureCloudSimpleVirtualMachine [70x70/16z] {
+xTP7kkuW281XEiZ-ztlQtpGNaepko7S1twEI8lm_sxPjI2BwIvWGdaZC8yQFS1EwIeYj107OyoYqBv7QltnaAUeEzesQLX4hU9vXE2AhZ3nZzo8n7OEf_D1v
+Ztww7M4cOb7B5qFumDVG15RwIKmpfFu0P6HQln-Qsyz8GArT2iB4Yf7sg8w05xFeYJqnGBMM0NVO2wpqz6dlnYomudmBkGhnD9_Lo4Mu2kDL1OuqAyEbI4bR
+WSX6C1neNy6HdS5rfVnUUBQiMKk58pjUdqkDh0j9DIE45ebwZ3mOLONX2X9hrDzCjEfuU-Jb0JUlTC-gyvLcCRryYlAhot3Fg6QjNGRnV2tMV7SLOHBXrV8u
+dmHcOXzAECSz16558vyG5hRI7x-5v_znc7pI4YU_jOAl_-hnAsS8rnd__6ThSkVYuNv-SL2ei9KTZ-uhLKCfEj4kfCTg4sNyM-EnvBVUVXPX9bnldghse_YN
+5BPjsxu1
+}
+
+AzureEntityColoring(AzureCloudSimpleVirtualMachine)
+!define AzureCloudSimpleVirtualMachine(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCloudSimpleVirtualMachine, AzureCloudSimpleVirtualMachine)
+!define AzureCloudSimpleVirtualMachine(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCloudSimpleVirtualMachine, AzureCloudSimpleVirtualMachine)
diff --git a/dist/Compute/AzureCloudSimpleVirtualMachine.svg b/dist/Compute/AzureCloudSimpleVirtualMachine.svg
new file mode 100644
index 00000000..201e87e5
--- /dev/null
+++ b/dist/Compute/AzureCloudSimpleVirtualMachine.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.372549%,73.72549%,25.490196%);fill-opacity:1;" d="M 38.09375 50.695313 C 37.410156 51.136719 36.699219 51.535156 35.964844 51.882813 C 35.03125 52.332031 34.066406 52.722656 33.082031 53.046875 C 31.878906 53.433594 30.648438 53.734375 29.398438 53.941406 C 27.859375 54.199219 26.300781 54.320313 24.738281 54.304688 C 22.160156 54.324219 19.601563 53.90625 17.164063 53.074219 C 14.871094 52.296875 12.761719 51.058594 10.960938 49.433594 C 9.152344 47.773438 7.722656 45.742188 6.761719 43.484375 C 5.683594 40.902344 5.152344 38.121094 5.207031 35.320313 C 5.15625 32.503906 5.671875 29.707031 6.71875 27.089844 C 7.664063 24.789063 9.09375 22.71875 10.921875 21.027344 C 12.742188 19.363281 14.894531 18.09375 17.234375 17.304688 C 19.753906 16.449219 22.398438 16.023438 25.058594 16.042969 C 27.082031 16.011719 29.101563 16.203125 31.078125 16.617188 C 32.484375 16.898438 33.847656 17.367188 35.125 18.019531 C 35.515625 18.242188 35.890625 18.488281 36.246094 18.761719 C 37.917969 19.78125 38.582031 21.878906 37.800781 23.675781 C 37.703125 23.929688 37.566406 24.164063 37.394531 24.375 C 35.992188 26.179688 33.097656 25.128906 31.445313 24.375 C 29.527344 23.574219 27.460938 23.191406 25.382813 23.253906 C 23.828125 23.238281 22.28125 23.480469 20.804688 23.96875 C 19.429688 24.417969 18.171875 25.171875 17.121094 26.164063 C 16.054688 27.207031 15.21875 28.460938 14.671875 29.847656 C 14.035156 31.519531 13.730469 33.296875 13.777344 35.085938 C 13.726563 36.933594 14.046875 38.777344 14.714844 40.503906 C 15.285156 41.914063 16.175781 43.175781 17.316406 44.183594 C 18.433594 45.152344 19.742188 45.875 21.152344 46.3125 C 22.675781 46.773438 24.257813 46.992188 25.84375 46.96875 C 27.828125 47.042969 29.804688 46.710938 31.652344 45.988281 C 32.683594 45.558594 33.683594 45.0625 34.648438 44.507813 Z M 38.09375 50.695313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(28.627451%,39.215686%,52.941176%);fill-opacity:1;" d="M 32.578125 44.269531 C 33.148438 44.636719 33.753906 44.949219 34.382813 45.207031 C 35.429688 45.660156 36.5 46.054688 37.589844 46.394531 C 39.019531 46.84375 40.480469 47.195313 41.957031 47.445313 C 43.722656 47.746094 45.515625 47.890625 47.304688 47.878906 C 49.394531 47.949219 51.476563 47.613281 53.4375 46.898438 C 54.894531 46.4375 55.863281 45.066406 55.816406 43.539063 C 55.882813 42.324219 55.308594 41.164063 54.304688 40.472656 C 52.632813 39.578125 50.78125 39.070313 48.886719 38.988281 L 43.289063 38.332031 C 41.496094 38.164063 39.730469 37.8125 38.011719 37.28125 C 36.5 36.84375 35.082031 36.148438 33.808594 35.222656 C 32.671875 34.375 31.746094 33.273438 31.109375 32.003906 C 30.429688 30.574219 30.097656 29.007813 30.140625 27.425781 C 30.132813 25.921875 30.4375 24.433594 31.039063 23.058594 C 31.667969 21.640625 32.628906 20.390625 33.839844 19.417969 C 35.351563 18.253906 37.085938 17.402344 38.933594 16.925781 C 41.417969 16.273438 43.980469 15.96875 46.550781 16.015625 C 50.503906 15.851563 54.457031 16.410156 58.210938 17.667969 C 59.0625 18.011719 59.871094 18.453125 60.621094 18.984375 C 62.253906 19.863281 62.878906 21.890625 62.019531 23.535156 C 60.773438 25.871094 58.140625 24.765625 57.902344 24.640625 C 57.285156 24.324219 56.652344 24.042969 56 23.800781 C 53.015625 22.726563 49.863281 22.203125 46.691406 22.246094 C 41.089844 22.246094 38.289063 23.714844 38.289063 26.65625 C 38.265625 27.808594 38.871094 28.882813 39.871094 29.457031 C 41.28125 30.207031 42.832031 30.65625 44.421875 30.773438 L 51.773438 31.738281 C 55.105469 32.027344 58.3125 33.164063 61.082031 35.042969 C 63.351563 36.792969 64.597656 39.558594 64.398438 42.421875 C 64.492188 45.84375 62.882813 49.089844 60.101563 51.085938 C 57.238281 53.25 53.113281 54.335938 47.726563 54.335938 C 45.335938 54.351563 42.953125 54.15625 40.601563 53.746094 C 38.734375 53.429688 36.890625 52.988281 35.085938 52.429688 C 33.792969 52.023438 32.535156 51.523438 31.316406 50.933594 C 30.660156 50.632813 30.03125 50.273438 29.441406 49.855469 Z M 32.578125 44.269531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.372549%,73.72549%,25.490196%);fill-opacity:1;" d="M 34.382813 45.191406 L 33.824219 44.953125 C 33.109375 45.332031 32.425781 45.683594 31.625 46.003906 L 30.378906 47.949219 L 29.398438 49.855469 C 29.953125 50.300781 30.558594 50.675781 31.207031 50.972656 C 32.3125 51.699219 33.566406 52.175781 34.875 52.375 L 35.9375 51.898438 C 36.671875 51.550781 37.382813 51.152344 38.066406 50.707031 L 35.167969 45.542969 Z M 34.382813 45.191406 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureDisk(m).png b/dist/Compute/AzureDisk(m).png
new file mode 100644
index 00000000..c3f23f56
Binary files /dev/null and b/dist/Compute/AzureDisk(m).png differ
diff --git a/dist/Compute/AzureDisk(m).svg b/dist/Compute/AzureDisk(m).svg
new file mode 100644
index 00000000..e1358ab3
--- /dev/null
+++ b/dist/Compute/AzureDisk(m).svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.300781 36.5625 C 55.398438 34.703125 48.953125 33.382813 41.707031 32.875 L 37.167969 41.28125 C 39.402344 41.410156 41.398438 41.742188 42.945313 42.207031 Z M 60.300781 36.5625 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.261719 53.492188 C 13.304688 55.652344 20.300781 57.191406 28.265625 57.753906 L 33.578125 47.925781 C 31.367188 47.84375 29.355469 47.566406 27.742188 47.152344 Z M 8.261719 53.492188 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.300781 9.167969 C 55.398438 7.3125 48.953125 5.992188 41.707031 5.480469 L 37.167969 13.886719 C 39.402344 14.019531 41.398438 14.347656 42.945313 14.816406 Z M 60.300781 9.167969 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.261719 26.097656 C 13.304688 28.257813 20.300781 29.800781 28.265625 30.363281 L 33.578125 20.535156 C 31.367188 20.449219 29.355469 20.175781 27.742188 19.761719 Z M 8.261719 26.097656 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 70 52.078125 C 70 59.078125 54.328125 64.753906 35 64.753906 C 15.671875 64.753906 0 59.078125 0 52.078125 L 0 45.246094 L 70 45.246094 Z M 70 52.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 70 45.246094 C 70 52.246094 54.328125 57.921875 35 57.921875 C 15.671875 57.921875 0 52.246094 0 45.246094 C 0 38.246094 15.671875 32.570313 35 32.570313 C 54.328125 32.570313 70 38.246094 70 45.246094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 46.21875 44.515625 C 46.21875 46.378906 41.195313 47.886719 35 47.886719 C 28.800781 47.886719 23.777344 46.378906 23.777344 44.515625 C 23.777344 42.652344 28.800781 41.144531 35 41.144531 C 41.195313 41.144531 46.21875 42.65625 46.21875 44.515625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 70 24.753906 C 70 31.757813 54.328125 37.429688 35 37.429688 C 15.671875 37.429688 0 31.753906 0 24.753906 L 0 17.921875 L 70 17.921875 Z M 70 24.753906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 70 17.921875 C 70 24.925781 54.328125 30.597656 35 30.597656 C 15.671875 30.597656 0 24.921875 0 17.921875 C 0 10.921875 15.671875 5.246094 35 5.246094 C 54.328125 5.246094 70 10.921875 70 17.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 46.21875 17.195313 C 46.21875 19.054688 41.195313 20.5625 35 20.5625 C 28.800781 20.5625 23.777344 19.054688 23.777344 17.195313 C 23.777344 15.332031 28.800781 13.824219 35 13.824219 C 41.195313 13.824219 46.21875 15.332031 46.21875 17.195313 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureDisk.png b/dist/Compute/AzureDisk.png
new file mode 100644
index 00000000..e5caaf0a
Binary files /dev/null and b/dist/Compute/AzureDisk.png differ
diff --git a/dist/Compute/AzureDisk.puml b/dist/Compute/AzureDisk.puml
new file mode 100644
index 00000000..e93647d1
--- /dev/null
+++ b/dist/Compute/AzureDisk.puml
@@ -0,0 +1,12 @@
+sprite $AzureDisk [70x70/16z] {
+xTZNjkCW38LXGDBUWD__UQUGQa1soFGvvxjE_YMyPAU4F-5JJ4b4z4f4KefBRnSr3AnHbVDO58F3dgYau4aAd_LKucGAnI6RaMuCmse4pLCd6ixC4lkEO2s2
+FMiHnJ7okOA9U1HXBhNMxPjQIo4CdX3Xo7Nhr4BCgMAkR1ELM5EtcOmv-WSQr087ZwxjBb4BuIc7Eq8obszo9k7Bpb7j3kTOjveNDjMBR7t6R3tI57Q9XGfB
+c-InbMRB4LuNWlTLi9dJEPgQwdqXyXWw7wD1iEv-Sol-HfOG0lerpuGRQLjOjvqImpSwksLgAVc2P6vAgNKRCLn4Rcyh6kxIcvrgOIUXBYUoX56oif2WnZ2N
+bBdMyqAXfNaZ9hqmC1UdrTP0vM8CHT6E0IJp5GcOoZFz9kqQUaOwskmweciLtOd-87v41-aaShkLp5IxGfVn4-1EQyt5v3Ku0Lt4ATCrMAhOGWR-YzLb1ZmA
+C5EFqKvMHCti_FXOtRAHpKuhiXO16-iIInL3V_5byE8Wk7TaviKvX3pel7gM0D8F7UqI7rA86FPpYFZBs4W8zypm493fquO32Oto2C0ZYE4g6jy42K-Yljde
+YIqcDBg_OlaQanYE936Sp21nuVVzVYy0q-vVWYKnlEdJLm
+}
+
+AzureEntityColoring(AzureDisk)
+!define AzureDisk(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDisk, AzureDisk)
+!define AzureDisk(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDisk, AzureDisk)
diff --git a/dist/Compute/AzureDisk.svg b/dist/Compute/AzureDisk.svg
new file mode 100644
index 00000000..ef939e68
--- /dev/null
+++ b/dist/Compute/AzureDisk.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.300781 36.5625 C 55.398438 34.703125 48.953125 33.382813 41.707031 32.875 L 37.167969 41.28125 C 39.402344 41.410156 41.398438 41.742188 42.945313 42.207031 Z M 60.300781 36.5625 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.261719 53.492188 C 13.304688 55.652344 20.300781 57.191406 28.265625 57.753906 L 33.578125 47.925781 C 31.367188 47.84375 29.355469 47.566406 27.742188 47.152344 Z M 8.261719 53.492188 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.300781 9.167969 C 55.398438 7.3125 48.953125 5.992188 41.707031 5.480469 L 37.167969 13.886719 C 39.402344 14.019531 41.398438 14.347656 42.945313 14.816406 Z M 60.300781 9.167969 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.261719 26.097656 C 13.304688 28.257813 20.300781 29.800781 28.265625 30.363281 L 33.578125 20.535156 C 31.367188 20.449219 29.355469 20.175781 27.742188 19.761719 Z M 8.261719 26.097656 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 70 52.078125 C 70 59.078125 54.328125 64.753906 35 64.753906 C 15.671875 64.753906 0 59.078125 0 52.078125 L 0 45.246094 L 70 45.246094 Z M 70 52.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 70 45.246094 C 70 52.246094 54.328125 57.921875 35 57.921875 C 15.671875 57.921875 0 52.246094 0 45.246094 C 0 38.246094 15.671875 32.570313 35 32.570313 C 54.328125 32.570313 70 38.246094 70 45.246094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 46.21875 44.515625 C 46.21875 46.378906 41.195313 47.886719 35 47.886719 C 28.800781 47.886719 23.777344 46.378906 23.777344 44.515625 C 23.777344 42.652344 28.800781 41.144531 35 41.144531 C 41.195313 41.144531 46.21875 42.65625 46.21875 44.515625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 70 24.753906 C 70 31.757813 54.328125 37.429688 35 37.429688 C 15.671875 37.429688 0 31.753906 0 24.753906 L 0 17.921875 L 70 17.921875 Z M 70 24.753906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 70 17.921875 C 70 24.925781 54.328125 30.597656 35 30.597656 C 15.671875 30.597656 0 24.921875 0 17.921875 C 0 10.921875 15.671875 5.246094 35 5.246094 C 54.328125 5.246094 70 10.921875 70 17.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 46.21875 17.195313 C 46.21875 19.054688 41.195313 20.5625 35 20.5625 C 28.800781 20.5625 23.777344 19.054688 23.777344 17.195313 C 23.777344 15.332031 28.800781 13.824219 35 13.824219 C 41.195313 13.824219 46.21875 15.332031 46.21875 17.195313 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureDiskSnapshot(m).png b/dist/Compute/AzureDiskSnapshot(m).png
new file mode 100644
index 00000000..6a714c41
Binary files /dev/null and b/dist/Compute/AzureDiskSnapshot(m).png differ
diff --git a/dist/Compute/AzureDiskSnapshot(m).svg b/dist/Compute/AzureDiskSnapshot(m).svg
new file mode 100644
index 00000000..116600f6
--- /dev/null
+++ b/dist/Compute/AzureDiskSnapshot(m).svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 43.976563 42.613281 C 43.976563 44.101563 39.957031 45.308594 35 45.308594 C 30.042969 45.308594 26.027344 44.101563 26.027344 42.613281 C 26.027344 41.121094 30.046875 39.917969 35 39.917969 C 39.957031 39.917969 43.976563 41.125 43.976563 42.613281 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 55.238281 36.25 C 51.320313 34.761719 46.164063 33.707031 40.367188 33.300781 L 36.734375 40.023438 C 38.523438 40.128906 40.121094 40.394531 41.355469 40.765625 Z M 55.238281 36.25 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 13.613281 49.789063 C 17.648438 51.519531 23.246094 52.75 29.617188 53.203125 L 33.863281 45.339844 C 32.09375 45.273438 30.488281 45.050781 29.195313 44.722656 Z M 13.613281 49.789063 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 55.238281 14.335938 C 51.320313 12.851563 46.164063 11.796875 40.367188 11.390625 L 36.734375 18.113281 C 38.523438 18.21875 40.121094 18.480469 41.355469 18.855469 Z M 55.238281 14.335938 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 13.613281 27.878906 C 17.648438 29.605469 23.246094 30.839844 29.617188 31.289063 L 33.863281 23.429688 C 32.09375 23.363281 30.488281 23.140625 29.195313 22.808594 Z M 13.613281 27.878906 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 14 5.601563 L 0 5.601563 L 0 19.601563 L 4.199219 19.601563 L 4.199219 9.800781 L 14 9.800781 Z M 14 5.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 0 50.398438 L 0 64.398438 L 14 64.398438 L 14 60.199219 L 4.199219 60.199219 L 4.199219 50.398438 Z M 0 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 56 64.398438 L 70 64.398438 L 70 50.398438 L 65.800781 50.398438 L 65.800781 60.199219 L 56 60.199219 Z M 56 64.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 70 19.601563 L 70 5.601563 L 56 5.601563 L 56 9.800781 L 65.800781 9.800781 L 65.800781 19.601563 Z M 70 19.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 63 48.660156 C 63 54.261719 50.464844 58.800781 35.003906 58.800781 C 19.542969 58.800781 7.003906 54.261719 7.003906 48.660156 L 7.003906 43.195313 L 63 43.195313 Z M 63 48.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 63 43.195313 C 63 48.796875 50.464844 53.335938 35.003906 53.335938 C 19.542969 53.335938 7.003906 48.796875 7.003906 43.195313 C 7.003906 37.59375 19.542969 33.054688 35.003906 33.054688 C 50.464844 33.054688 63 37.59375 63 43.195313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 43.976563 42.613281 C 43.976563 44.101563 39.957031 45.308594 35 45.308594 C 30.042969 45.308594 26.027344 44.101563 26.027344 42.613281 C 26.027344 41.121094 30.046875 39.917969 35 39.917969 C 39.957031 39.917969 43.976563 41.125 43.976563 42.613281 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 63 26.804688 C 63 32.40625 50.464844 36.945313 35.003906 36.945313 C 19.542969 36.945313 7.003906 32.40625 7.003906 26.804688 L 7.003906 21.339844 L 63 21.339844 Z M 63 26.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 63 21.339844 C 63 26.941406 50.464844 31.480469 35.003906 31.480469 C 19.542969 31.480469 7.003906 26.9375 7.003906 21.339844 C 7.003906 15.742188 19.539063 11.199219 35.003906 11.199219 C 50.464844 11.199219 63 15.738281 63 21.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 43.976563 20.757813 C 43.976563 22.246094 39.957031 23.453125 35 23.453125 C 30.042969 23.453125 26.027344 22.246094 26.027344 20.757813 C 26.027344 19.269531 30.046875 18.0625 35 18.0625 C 39.957031 18.0625 43.976563 19.265625 43.976563 20.757813 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureDiskSnapshot.png b/dist/Compute/AzureDiskSnapshot.png
new file mode 100644
index 00000000..12f27f59
Binary files /dev/null and b/dist/Compute/AzureDiskSnapshot.png differ
diff --git a/dist/Compute/AzureDiskSnapshot.puml b/dist/Compute/AzureDiskSnapshot.puml
new file mode 100644
index 00000000..50bb6773
--- /dev/null
+++ b/dist/Compute/AzureDiskSnapshot.puml
@@ -0,0 +1,12 @@
+sprite $AzureDiskSnapshot [70x70/16z] {
+xTS7cgCm341Xh6gP-zztAUOB4WeuszkRIKz-Ufj-OFz3rpGSu3bpZIjYeTzAgNeqhh0UrQx0z2tfhL8048c8cPOGeNoc522M46zHOgKAa2JnAS9ohm1B7eSw
+b2aeCeJ86fL42KR84prA51f1n5U2aYFR6jMQMLNfH62wqfz3GbYRJpLJkSIBikhJ7iibcqDDyv5v9TVgY89EKNcOfDQgoZLoYhrPDA9gLkiXnDGhhOuitPYs
+e7Y6UGoPWpBFfa5uGcgRWs9zZU3OdR64Jf5zGLGPGtGtvZQvIfld3ccgv6i0JJxedtH9KaIrMZjzKQPOiTcrROHMU_jc6Rv1KnAr-OEQbYcFRDWGPuI0RO1G
+d1ugfDNQUw4gGxadWFPOLAkRdwrPLM72FRWtOhn5U8xMi0mOFa_qC46G1XJobG6apvub5M7AUfuSrchdQWOzZefQB66AK-YQMAWc2ZY5CqRhsKXd3Jf5A0lf
+s3imfJ4uHVbAxD5Dh47n3BwwHIwA2WTY00cAQ7SmT6Uy55XQ7aYtXCOG5jthmd4M9DgJC5ToeeVXNAheAn4coX3cBlJeSbvNH4EonKkofJ78pbHHz9FetLap
+y8T6L7fbP8I4uFbg0eXl1COoV6LJ08b5tCyfxlfp9Q-KiQiifgDfEA2ZQhs_wafONUCAXT_zkFxt1G
+}
+
+AzureEntityColoring(AzureDiskSnapshot)
+!define AzureDiskSnapshot(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDiskSnapshot, AzureDiskSnapshot)
+!define AzureDiskSnapshot(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDiskSnapshot, AzureDiskSnapshot)
diff --git a/dist/Compute/AzureDiskSnapshot.svg b/dist/Compute/AzureDiskSnapshot.svg
new file mode 100644
index 00000000..67ece178
--- /dev/null
+++ b/dist/Compute/AzureDiskSnapshot.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,9.411765%,56.078431%);fill-opacity:1;" d="M 43.976563 42.613281 C 43.976563 44.101563 39.957031 45.308594 35 45.308594 C 30.042969 45.308594 26.027344 44.101563 26.027344 42.613281 C 26.027344 41.121094 30.046875 39.917969 35 39.917969 C 39.957031 39.917969 43.976563 41.125 43.976563 42.613281 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 55.238281 36.25 C 51.320313 34.761719 46.164063 33.707031 40.367188 33.300781 L 36.734375 40.023438 C 38.523438 40.128906 40.121094 40.394531 41.355469 40.765625 Z M 55.238281 36.25 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 13.613281 49.789063 C 17.648438 51.519531 23.246094 52.75 29.617188 53.203125 L 33.863281 45.339844 C 32.09375 45.273438 30.488281 45.050781 29.195313 44.722656 Z M 13.613281 49.789063 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 55.238281 14.335938 C 51.320313 12.851563 46.164063 11.796875 40.367188 11.390625 L 36.734375 18.113281 C 38.523438 18.21875 40.121094 18.480469 41.355469 18.855469 Z M 55.238281 14.335938 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 13.613281 27.878906 C 17.648438 29.605469 23.246094 30.839844 29.617188 31.289063 L 33.863281 23.429688 C 32.09375 23.363281 30.488281 23.140625 29.195313 22.808594 Z M 13.613281 27.878906 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 14 5.601563 L 0 5.601563 L 0 19.601563 L 4.199219 19.601563 L 4.199219 9.800781 L 14 9.800781 Z M 14 5.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 0 50.398438 L 0 64.398438 L 14 64.398438 L 14 60.199219 L 4.199219 60.199219 L 4.199219 50.398438 Z M 0 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 56 64.398438 L 70 64.398438 L 70 50.398438 L 65.800781 50.398438 L 65.800781 60.199219 L 56 60.199219 Z M 56 64.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 70 19.601563 L 70 5.601563 L 56 5.601563 L 56 9.800781 L 65.800781 9.800781 L 65.800781 19.601563 Z M 70 19.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 63 48.660156 C 63 54.261719 50.464844 58.800781 35.003906 58.800781 C 19.542969 58.800781 7.003906 54.261719 7.003906 48.660156 L 7.003906 43.195313 L 63 43.195313 Z M 63 48.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 63 43.195313 C 63 48.796875 50.464844 53.335938 35.003906 53.335938 C 19.542969 53.335938 7.003906 48.796875 7.003906 43.195313 C 7.003906 37.59375 19.542969 33.054688 35.003906 33.054688 C 50.464844 33.054688 63 37.59375 63 43.195313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 43.976563 42.613281 C 43.976563 44.101563 39.957031 45.308594 35 45.308594 C 30.042969 45.308594 26.027344 44.101563 26.027344 42.613281 C 26.027344 41.121094 30.046875 39.917969 35 39.917969 C 39.957031 39.917969 43.976563 41.125 43.976563 42.613281 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63 26.804688 C 63 32.40625 50.464844 36.945313 35.003906 36.945313 C 19.542969 36.945313 7.003906 32.40625 7.003906 26.804688 L 7.003906 21.339844 L 63 21.339844 Z M 63 26.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 63 21.339844 C 63 26.941406 50.464844 31.480469 35.003906 31.480469 C 19.542969 31.480469 7.003906 26.9375 7.003906 21.339844 C 7.003906 15.742188 19.539063 11.199219 35.003906 11.199219 C 50.464844 11.199219 63 15.738281 63 21.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 43.976563 20.757813 C 43.976563 22.246094 39.957031 23.453125 35 23.453125 C 30.042969 23.453125 26.027344 22.246094 26.027344 20.757813 C 26.027344 19.269531 30.046875 18.0625 35 18.0625 C 39.957031 18.0625 43.976563 19.265625 43.976563 20.757813 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureFunction(m).png b/dist/Compute/AzureFunction(m).png
index a573f655..96f932a0 100644
Binary files a/dist/Compute/AzureFunction(m).png and b/dist/Compute/AzureFunction(m).png differ
diff --git a/dist/Compute/AzureFunction(m).svg b/dist/Compute/AzureFunction(m).svg
index 67cb8a00..1fed9187 100644
--- a/dist/Compute/AzureFunction(m).svg
+++ b/dist/Compute/AzureFunction(m).svg
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="64pt" viewBox="0 0 70 64" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 37.84375 24.5 L 52.0625 2.734375 L 40.90625 2.734375 L 29.09375 29.640625 L 43.09375 29.75 L 22.3125 67.265625 L 52.5 24.5 Z M 37.84375 24.5 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 69.578125 29.9375 L 66.1875 26.578125 L 51.09375 12.039063 C 50.4375 11.390625 49.453125 11.390625 48.6875 12.039063 C 48.03125 12.691406 47.8125 13.882813 48.6875 14.535156 L 64.546875 29.9375 C 65.203125 30.589844 65.203125 31.78125 64.546875 32.433594 L 48.359375 48.378906 C 47.703125 49.03125 47.703125 50.222656 48.359375 50.875 C 49.015625 51.527344 50.21875 51.417969 50.765625 50.875 L 65.75 36.121094 C 65.75 36.121094 65.75 36.121094 65.859375 36.011719 L 69.578125 32.433594 C 70.234375 31.78125 70.125 30.589844 69.578125 29.9375 Z M 69.578125 29.9375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 5.8125 32.433594 C 5.15625 31.78125 5.15625 30.589844 5.8125 29.9375 L 21.34375 14.535156 C 22.21875 13.882813 22 12.691406 21.34375 12.039063 C 20.578125 11.390625 19.59375 11.390625 18.9375 12.039063 L 3.84375 26.578125 L 0.453125 29.9375 C -0.09375 30.589844 -0.203125 31.78125 0.453125 32.433594 L 3.84375 36.230469 C 3.953125 36.339844 3.953125 36.339844 3.953125 36.339844 L 19.265625 50.875 C 19.8125 51.417969 21.015625 51.527344 21.671875 50.875 C 22.328125 50.222656 22.328125 49.03125 21.671875 48.378906 Z M 5.8125 32.433594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 52.078125 0 L 30.75 0 L 19.265625 32.109375 L 33.265625 32.21875 L 22.328125 64 L 52.515625 21.585938 L 37.859375 21.585938 Z M 52.078125 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 69.5625 35.4375 C 70.21875 34.78125 70.109375 33.578125 69.5625 32.921875 L 66.171875 29.53125 L 51.078125 14.875 C 50.421875 14.21875 49.4375 14.21875 48.671875 14.875 C 48.015625 15.53125 47.796875 16.734375 48.671875 17.390625 L 64.53125 32.921875 C 65.1875 33.578125 65.1875 34.78125 64.53125 35.4375 L 48.34375 51.515625 C 47.6875 52.171875 47.6875 53.375 48.34375 54.03125 C 49 54.6875 50.203125 54.578125 50.75 54.03125 L 65.734375 39.15625 C 65.734375 39.15625 65.734375 39.15625 65.84375 39.046875 Z M 69.5625 35.4375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 0.4375 35.4375 C -0.21875 34.78125 -0.109375 33.578125 0.4375 32.921875 L 3.828125 29.53125 L 18.921875 14.875 C 19.578125 14.21875 20.5625 14.21875 21.328125 14.875 C 21.984375 15.53125 22.203125 16.734375 21.328125 17.390625 L 5.796875 32.921875 C 5.140625 33.578125 5.140625 34.78125 5.796875 35.4375 L 21.65625 51.515625 C 22.3125 52.171875 22.3125 53.375 21.65625 54.03125 C 21 54.6875 19.796875 54.578125 19.25 54.03125 L 3.9375 39.375 C 3.9375 39.375 3.9375 39.375 3.828125 39.265625 Z M 0.4375 35.4375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 52.0625 2.734375 L 30.734375 2.734375 L 19.25 35.109375 L 33.25 35.21875 L 22.3125 67.265625 L 52.5 24.5 L 37.84375 24.5 Z M 52.0625 2.734375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Compute/AzureFunction.png b/dist/Compute/AzureFunction.png
index 6ef42f5a..ba0fa5af 100644
Binary files a/dist/Compute/AzureFunction.png and b/dist/Compute/AzureFunction.png differ
diff --git a/dist/Compute/AzureFunction.puml b/dist/Compute/AzureFunction.puml
index 063c9f2f..b40f9516 100644
--- a/dist/Compute/AzureFunction.puml
+++ b/dist/Compute/AzureFunction.puml
@@ -1,9 +1,9 @@
-sprite $AzureFunction [70x64/16z] {
-hTK7Ra8n48JXTVVc_lSDTKNxtMIFUe0F9cFhIJV-3w9Erf992R8O1QJ8OiA9Fb90YR8QFT17uea-KaxqSIVwI3hHH-fM7nyQfx_OgtFB52oaxd4Gw-IyYeSb
-cZrcahq_y3vERuoRG99TPzh7LMBubuWez36cltb-lJrG7sRQY1JgOxapVemunJvZfho_EmxkJp664JxzARx76nCOuUiCcpDJ3Q7h39iJyzWklAFj55W34T_l
-WunJG-1XHiyqO00HRIC9hXqZeOrKlBs0z0gf4sIg_QQfGh5nMlNtnTWTcMyVj7MF-7lAMnz0lDu_d-wCctbMXoOYae71lH8YrhC00tlLBcBCe92w3WA_XWl5
-0TBxtnGScP4seyq-uVPI5fbW8eoCY2KHKs1aHYpnbt4qCYDjnWgfe-KCmMzuPogF71bXnWeLGfAquurvAwIJ23DMo2yZnhmLIe146SMfVN-YaUiOiMUSFZv0
-8oT0EDw9FI0ZlRYIP8TYAseZxyI_Hjv8jf4t2rNPJh2HDmj5sOzcsKzGEP3ivK2I7CZgF1S
+sprite $AzureFunction [70x70/16z] {
+vTO7Sbin34NH1-0Nxd_56HK6ANVmnH5IRByKzsDUTNsS6MqPYU_RSbgS4s9Q71t5buEmfoF8j3f0GXr1wZYATIYXZijM3KTPwl5DVDb6VlLosnY793dsn1Zd
+QyWO6EJpozVCVaD2ac6FxBmnzWAoOP04J8LGa0kO4e6Wa82f40gIbBinWnaTYKZKmmmZ51GIC5uWU1JxQVFRlKPIePc00SGgnALa2gGyIaZCd8bSAx_yxlW9
+2NXyuXvWw2GAtEm1XX13PFO0amW4WMByI7B7Tkao29-ZxobpeHU39E5XxlyTnKiVxicDsvH9lBf7yx7cB1bB9RlX0SjAnlCe5IBPIAO8iWgfJsFG0mWm75GZ
+DSCzZ4XA1eFy6abcWw0R4eoKpm4vk508gHc37a9gnh674NwALGOj8C3O0x4AgPaCyWM46EfXX5_NMGRzqdC0WinK77fq08ABOvj1SACzTgtCRaVHk_EyKDuO
+zApFEdhaqT2Zs5mDGQ6EewXX7JsoKCDQ49c--Bu1
 }
 
 AzureEntityColoring(AzureFunction)
diff --git a/dist/Compute/AzureFunction.svg b/dist/Compute/AzureFunction.svg
index 626b6545..6171d841 100644
--- a/dist/Compute/AzureFunction.svg
+++ b/dist/Compute/AzureFunction.svg
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="64pt" viewBox="0 0 70 64" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="64"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 40.921875 0 L 29.109375 26.683594 L 43.109375 26.792969 L 22.328125 64 L 52.515625 21.585938 L 37.859375 21.585938 L 52.078125 0 Z M 40.921875 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 37.84375 24.5 L 52.0625 2.734375 L 40.90625 2.734375 L 29.09375 29.640625 L 43.09375 29.75 L 22.3125 67.265625 L 52.5 24.5 Z M 37.84375 24.5 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 69.578125 32.433594 C 70.234375 31.78125 70.125 30.589844 69.578125 29.9375 L 66.1875 26.578125 L 51.09375 12.039063 C 50.4375 11.390625 49.453125 11.390625 48.6875 12.039063 C 48.03125 12.691406 47.8125 13.882813 48.6875 14.535156 L 64.546875 29.9375 C 65.203125 30.589844 65.203125 31.78125 64.546875 32.433594 L 48.359375 48.378906 C 47.703125 49.03125 47.703125 50.222656 48.359375 50.875 C 49.015625 51.527344 50.21875 51.417969 50.765625 50.875 L 65.75 36.121094 C 65.75 36.121094 65.75 36.121094 65.859375 36.011719 Z M 69.578125 32.433594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 0.453125 32.433594 C -0.203125 31.78125 -0.09375 30.589844 0.453125 29.9375 L 3.84375 26.578125 L 18.9375 12.039063 C 19.59375 11.390625 20.578125 11.390625 21.34375 12.039063 C 22 12.691406 22.21875 13.882813 21.34375 14.535156 L 5.8125 29.9375 C 5.15625 30.589844 5.15625 31.78125 5.8125 32.433594 L 21.671875 48.378906 C 22.328125 49.03125 22.328125 50.222656 21.671875 50.875 C 21.015625 51.527344 19.8125 51.417969 19.265625 50.875 L 3.953125 36.339844 C 3.953125 36.339844 3.953125 36.339844 3.84375 36.230469 Z M 0.453125 32.433594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 19.265625 32.109375 L 33.265625 32.21875 L 22.328125 64 L 52.515625 21.585938 L 37.859375 21.585938 L 52.078125 0 L 30.75 0 Z M 19.265625 32.109375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 69.5625 35.4375 C 70.21875 34.78125 70.109375 33.578125 69.5625 32.921875 L 66.171875 29.53125 L 51.078125 14.875 C 50.421875 14.21875 49.4375 14.21875 48.671875 14.875 C 48.015625 15.53125 47.796875 16.734375 48.671875 17.390625 L 64.53125 32.921875 C 65.1875 33.578125 65.1875 34.78125 64.53125 35.4375 L 48.34375 51.515625 C 47.6875 52.171875 47.6875 53.375 48.34375 54.03125 C 49 54.6875 50.203125 54.578125 50.75 54.03125 L 65.734375 39.15625 C 65.734375 39.15625 65.734375 39.15625 65.84375 39.046875 Z M 69.5625 35.4375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 0.4375 35.4375 C -0.21875 34.78125 -0.109375 33.578125 0.4375 32.921875 L 3.828125 29.53125 L 18.921875 14.875 C 19.578125 14.21875 20.5625 14.21875 21.328125 14.875 C 21.984375 15.53125 22.203125 16.734375 21.328125 17.390625 L 5.796875 32.921875 C 5.140625 33.578125 5.140625 34.78125 5.796875 35.4375 L 21.65625 51.515625 C 22.3125 52.171875 22.3125 53.375 21.65625 54.03125 C 21 54.6875 19.796875 54.578125 19.25 54.03125 L 3.9375 39.375 C 3.9375 39.375 3.9375 39.375 3.828125 39.265625 Z M 0.4375 35.4375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 52.0625 2.734375 L 30.734375 2.734375 L 19.25 35.109375 L 33.25 35.21875 L 22.3125 67.265625 L 52.5 24.5 L 37.84375 24.5 Z M 52.0625 2.734375 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Compute/AzureMeshApplication(m).png b/dist/Compute/AzureMeshApplication(m).png
new file mode 100644
index 00000000..81fb274a
Binary files /dev/null and b/dist/Compute/AzureMeshApplication(m).png differ
diff --git a/dist/Compute/AzureMeshApplication(m).svg b/dist/Compute/AzureMeshApplication(m).svg
new file mode 100644
index 00000000..3e46df3f
--- /dev/null
+++ b/dist/Compute/AzureMeshApplication(m).svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 66.449219 30.148438 C 64.5625 28.261719 61.851563 27.734375 59.476563 28.507813 L 54.15625 23.1875 C 55.046875 21.085938 54.574219 18.652344 52.960938 17.039063 C 51.347656 15.425781 48.914063 14.953125 46.8125 15.84375 L 41.492188 10.523438 C 42.265625 8.148438 41.738281 5.4375 39.851563 3.550781 C 37.171875 0.871094 32.828125 0.871094 30.148438 3.550781 C 28.261719 5.4375 27.734375 8.148438 28.507813 10.523438 L 23.1875 15.84375 C 21.085938 14.953125 18.652344 15.425781 17.039063 17.039063 C 15.425781 18.652344 14.953125 21.085938 15.84375 23.1875 L 10.523438 28.507813 C 8.148438 27.734375 5.4375 28.261719 3.550781 30.148438 C 0.871094 32.828125 0.871094 37.171875 3.550781 39.851563 C 5.4375 41.738281 8.148438 42.265625 10.523438 41.492188 L 15.84375 46.8125 C 14.953125 48.914063 15.425781 51.347656 17.039063 52.960938 C 18.652344 54.574219 21.085938 55.046875 23.1875 54.15625 L 28.507813 59.476563 C 27.734375 61.851563 28.261719 64.5625 30.148438 66.449219 C 32.828125 69.128906 37.171875 69.128906 39.851563 66.449219 C 41.738281 64.5625 42.265625 61.851563 41.492188 59.476563 L 46.8125 54.15625 C 48.914063 55.046875 51.347656 54.574219 52.960938 52.960938 C 54.574219 51.347656 55.046875 48.914063 54.15625 46.8125 L 59.476563 41.492188 C 61.851563 42.265625 64.5625 41.738281 66.449219 39.851563 C 69.128906 37.171875 69.128906 32.828125 66.449219 30.148438 Z M 31.011719 56.042969 L 26.15625 51.1875 C 26.441406 50.515625 26.601563 49.777344 26.601563 49 C 26.601563 48.222656 26.441406 47.484375 26.15625 46.8125 L 35 37.96875 L 43.84375 46.8125 C 43.558594 47.484375 43.398438 48.222656 43.398438 49 C 43.398438 49.777344 43.558594 50.515625 43.84375 51.1875 L 38.988281 56.042969 C 36.605469 54.332031 33.394531 54.332031 31.011719 56.042969 Z M 13.957031 31.011719 L 18.8125 26.15625 C 19.484375 26.441406 20.222656 26.601563 21 26.601563 C 21.777344 26.601563 22.515625 26.441406 23.1875 26.15625 L 32.03125 35 L 23.1875 43.84375 C 22.515625 43.558594 21.777344 43.398438 21 43.398438 C 20.222656 43.398438 19.484375 43.558594 18.8125 43.84375 L 13.957031 38.988281 C 15.667969 36.605469 15.667969 33.394531 13.957031 31.011719 Z M 38.988281 13.957031 L 43.84375 18.8125 C 43.558594 19.484375 43.398438 20.222656 43.398438 21 C 43.398438 21.777344 43.558594 22.515625 43.84375 23.1875 L 35 32.03125 L 26.15625 23.1875 C 26.441406 22.515625 26.601563 21.777344 26.601563 21 C 26.601563 20.222656 26.441406 19.484375 26.15625 18.8125 L 31.011719 13.957031 C 33.394531 15.667969 36.605469 15.667969 38.988281 13.957031 Z M 49 43.398438 C 48.222656 43.398438 47.484375 43.558594 46.8125 43.84375 L 37.96875 35 L 46.8125 26.15625 C 47.484375 26.441406 48.222656 26.601563 49 26.601563 C 49.777344 26.601563 50.515625 26.441406 51.1875 26.15625 L 56.042969 31.011719 C 54.332031 33.394531 54.332031 36.605469 56.042969 38.988281 L 51.1875 43.84375 C 50.496094 43.550781 49.75 43.398438 49 43.398438 Z M 49 43.398438 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureMeshApplication.png b/dist/Compute/AzureMeshApplication.png
new file mode 100644
index 00000000..01b6874c
Binary files /dev/null and b/dist/Compute/AzureMeshApplication.png differ
diff --git a/dist/Compute/AzureMeshApplication.puml b/dist/Compute/AzureMeshApplication.puml
new file mode 100644
index 00000000..43d73a9d
--- /dev/null
+++ b/dist/Compute/AzureMeshApplication.puml
@@ -0,0 +1,11 @@
+sprite $AzureMeshApplication [70x70/16z] {
+rTS5Ujmm48RXrV3S_y3bAkbNFGQv-8UpwrSuXjUVYQZ9KqEhFySV8TxVacCVqPx9VQNwBVgaAyyxu_q-kqfGUTwNsbNiLyoBz0-9NGJC9a9c4md9pp_Az3OZ
+PY9lHucCkGDZgEaLOoH6yFD6jdEaWMmn2MJDo34YHmtsZ5_Uhd7GGkuhUgMes9uVJVplLhZj3KWrc2E4314oQoGimlqhGoG_lsPWbiZxnJ8WSx6MZ3gQc0oH
+zuovsy1bT29WW4m6HpZ-1OR8UWTgeyh80FcQHDF54pqP8cowXNk4PGL-VS5pg2rariYhSAaoACjjRySAHpGMo8f9LWCknaJMZB7U77yJIL--nAQJDqoi7Lim
+nRaSO8Y0GSir3z7ihfmC430JgUek7ykTf4J8J0J7an4P4o4ZEWuGxciWM5iWY0C1G-IO8KA623F-i-lqkQ9xLrZcshpezVjjlZKneBiCaV4wZNXMn5U6I7r-
+JSyDrfH6LHfgvoxpVHYrXR2cW6mmG3O6zHZXkU2lFiDI-QiZ6hYzs4nWYJPJgCndlIdP1MQ5PzZhZ-GZ
+}
+
+AzureEntityColoring(AzureMeshApplication)
+!define AzureMeshApplication(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMeshApplication, AzureMeshApplication)
+!define AzureMeshApplication(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMeshApplication, AzureMeshApplication)
diff --git a/dist/Compute/AzureMeshApplication.svg b/dist/Compute/AzureMeshApplication.svg
new file mode 100644
index 00000000..fea217ba
--- /dev/null
+++ b/dist/Compute/AzureMeshApplication.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 66.449219 30.148438 C 64.5625 28.261719 61.851563 27.734375 59.476563 28.507813 L 54.15625 23.1875 C 55.046875 21.085938 54.574219 18.652344 52.960938 17.039063 C 51.347656 15.425781 48.914063 14.953125 46.8125 15.84375 L 41.492188 10.523438 C 42.265625 8.148438 41.738281 5.4375 39.851563 3.550781 C 37.171875 0.871094 32.828125 0.871094 30.148438 3.550781 C 28.261719 5.4375 27.734375 8.148438 28.507813 10.523438 L 23.1875 15.84375 C 21.085938 14.953125 18.652344 15.425781 17.039063 17.039063 C 15.425781 18.652344 14.953125 21.085938 15.84375 23.1875 L 10.523438 28.507813 C 8.148438 27.734375 5.4375 28.261719 3.550781 30.148438 C 0.871094 32.828125 0.871094 37.171875 3.550781 39.851563 C 5.4375 41.738281 8.148438 42.265625 10.523438 41.492188 L 15.84375 46.8125 C 14.953125 48.914063 15.425781 51.347656 17.039063 52.960938 C 18.652344 54.574219 21.085938 55.046875 23.1875 54.15625 L 28.507813 59.476563 C 27.734375 61.851563 28.261719 64.5625 30.148438 66.449219 C 32.828125 69.128906 37.171875 69.128906 39.851563 66.449219 C 41.738281 64.5625 42.265625 61.851563 41.492188 59.476563 L 46.8125 54.15625 C 48.914063 55.046875 51.347656 54.574219 52.960938 52.960938 C 54.574219 51.347656 55.046875 48.914063 54.15625 46.8125 L 59.476563 41.492188 C 61.851563 42.265625 64.5625 41.738281 66.449219 39.851563 C 69.128906 37.171875 69.128906 32.828125 66.449219 30.148438 Z M 31.011719 56.042969 L 26.15625 51.1875 C 26.441406 50.515625 26.601563 49.777344 26.601563 49 C 26.601563 48.222656 26.441406 47.484375 26.15625 46.8125 L 35 37.96875 L 43.84375 46.8125 C 43.558594 47.484375 43.398438 48.222656 43.398438 49 C 43.398438 49.777344 43.558594 50.515625 43.84375 51.1875 L 38.988281 56.042969 C 36.605469 54.332031 33.394531 54.332031 31.011719 56.042969 Z M 13.957031 31.011719 L 18.8125 26.15625 C 19.484375 26.441406 20.222656 26.601563 21 26.601563 C 21.777344 26.601563 22.515625 26.441406 23.1875 26.15625 L 32.03125 35 L 23.1875 43.84375 C 22.515625 43.558594 21.777344 43.398438 21 43.398438 C 20.222656 43.398438 19.484375 43.558594 18.8125 43.84375 L 13.957031 38.988281 C 15.667969 36.605469 15.667969 33.394531 13.957031 31.011719 Z M 38.988281 13.957031 L 43.84375 18.8125 C 43.558594 19.484375 43.398438 20.222656 43.398438 21 C 43.398438 21.777344 43.558594 22.515625 43.84375 23.1875 L 35 32.03125 L 26.15625 23.1875 C 26.441406 22.515625 26.601563 21.777344 26.601563 21 C 26.601563 20.222656 26.441406 19.484375 26.15625 18.8125 L 31.011719 13.957031 C 33.394531 15.667969 36.605469 15.667969 38.988281 13.957031 Z M 49 43.398438 C 48.222656 43.398438 47.484375 43.558594 46.8125 43.84375 L 37.96875 35 L 46.8125 26.15625 C 47.484375 26.441406 48.222656 26.601563 49 26.601563 C 49.777344 26.601563 50.515625 26.441406 51.1875 26.15625 L 56.042969 31.011719 C 54.332031 33.394531 54.332031 36.605469 56.042969 38.988281 L 51.1875 43.84375 C 50.496094 43.550781 49.75 43.398438 49 43.398438 Z M 49 43.398438 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureNon-azure-machine(m).png b/dist/Compute/AzureNon-azure-machine(m).png
new file mode 100644
index 00000000..feb76c40
Binary files /dev/null and b/dist/Compute/AzureNon-azure-machine(m).png differ
diff --git a/dist/Compute/AzureNon-azure-machine(m).svg b/dist/Compute/AzureNon-azure-machine(m).svg
new file mode 100644
index 00000000..9cd58af2
--- /dev/null
+++ b/dist/Compute/AzureNon-azure-machine(m).svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 48.125 0 L 21.875 0 C 17.0625 0 13.125 3.9375 13.125 8.75 L 13.125 70 L 56.875 70 L 56.875 8.75 C 56.875 3.9375 52.9375 0 48.125 0 Z M 48.125 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 45.9375 17.5 L 24.0625 17.5 C 22.835938 17.5 21.875 16.539063 21.875 15.3125 C 21.875 14.085938 22.835938 13.125 24.0625 13.125 L 45.9375 13.125 C 47.164063 13.125 48.125 14.085938 48.125 15.3125 C 48.125 16.539063 47.164063 17.5 45.9375 17.5 Z M 45.9375 17.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 45.9375 35 L 24.0625 35 C 22.835938 35 21.875 34.039063 21.875 32.8125 C 21.875 31.585938 22.835938 30.625 24.0625 30.625 L 45.9375 30.625 C 47.164063 30.625 48.125 31.585938 48.125 32.8125 C 48.125 34.039063 47.164063 35 45.9375 35 Z M 45.9375 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 39.375 56.875 C 39.375 59.292969 37.417969 61.25 35 61.25 C 32.582031 61.25 30.625 59.292969 30.625 56.875 C 30.625 54.457031 32.582031 52.5 35 52.5 C 37.417969 52.5 39.375 54.457031 39.375 56.875 Z M 39.375 56.875 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureNon-azure-machine.png b/dist/Compute/AzureNon-azure-machine.png
new file mode 100644
index 00000000..6d43a9d6
Binary files /dev/null and b/dist/Compute/AzureNon-azure-machine.png differ
diff --git a/dist/Compute/AzureNon-azure-machine.puml b/dist/Compute/AzureNon-azure-machine.puml
new file mode 100644
index 00000000..a109a335
--- /dev/null
+++ b/dist/Compute/AzureNon-azure-machine.puml
@@ -0,0 +1,8 @@
+sprite $AzureNon [70x70/16z] {
+xTHL0eGm34LHMc8l-z_l-1SEwNZk0awztQWgvWj1gLkjgA-6VWs1Ruc3oAF5sOXl36LXAluej2RQhc1UKT_Ul68xbD94gV-eWFl9IFSeVPcfOeTIorowGw4c
+St7XwV3YCqebbLHWas6NehLCHzxwbuehyHN5T_VZxaiggQII2X1Nm4IiGGLqIs8Aqpr45D0ZRQR4LsGXHUy81qzQRWY2YaFLchw0L58v0m
+}
+
+AzureEntityColoring(AzureNon-azure-machine)
+!define AzureNon-azure-machine(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNon-azure-machine, AzureNon-azure-machine)
+!define AzureNon-azure-machine(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNon-azure-machine, AzureNon-azure-machine)
diff --git a/dist/Compute/AzureNon-azure-machine.svg b/dist/Compute/AzureNon-azure-machine.svg
new file mode 100644
index 00000000..ec39bd45
--- /dev/null
+++ b/dist/Compute/AzureNon-azure-machine.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 48.125 0 L 21.875 0 C 17.0625 0 13.125 3.9375 13.125 8.75 L 13.125 70 L 56.875 70 L 56.875 8.75 C 56.875 3.9375 52.9375 0 48.125 0 Z M 48.125 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 45.9375 17.5 L 24.0625 17.5 C 22.835938 17.5 21.875 16.539063 21.875 15.3125 C 21.875 14.085938 22.835938 13.125 24.0625 13.125 L 45.9375 13.125 C 47.164063 13.125 48.125 14.085938 48.125 15.3125 C 48.125 16.539063 47.164063 17.5 45.9375 17.5 Z M 45.9375 17.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 45.9375 35 L 24.0625 35 C 22.835938 35 21.875 34.039063 21.875 32.8125 C 21.875 31.585938 22.835938 30.625 24.0625 30.625 L 45.9375 30.625 C 47.164063 30.625 48.125 31.585938 48.125 32.8125 C 48.125 34.039063 47.164063 35 45.9375 35 Z M 45.9375 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 39.375 56.875 C 39.375 59.292969 37.417969 61.25 35 61.25 C 32.582031 61.25 30.625 59.292969 30.625 56.875 C 30.625 54.457031 32.582031 52.5 35 52.5 C 37.417969 52.5 39.375 54.457031 39.375 56.875 Z M 39.375 56.875 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureOSImagesClassic(m).png b/dist/Compute/AzureOSImagesClassic(m).png
new file mode 100644
index 00000000..a6debc02
Binary files /dev/null and b/dist/Compute/AzureOSImagesClassic(m).png differ
diff --git a/dist/Compute/AzureOSImagesClassic(m).svg b/dist/Compute/AzureOSImagesClassic(m).svg
new file mode 100644
index 00000000..6001ae92
--- /dev/null
+++ b/dist/Compute/AzureOSImagesClassic(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="64pt" viewBox="0 0 70 64" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 65.734375 0 L 3.847656 0 C 1.734375 0.0585938 0.0546875 1.785156 0.0742188 3.886719 L 0.0742188 46.785156 C 0.0546875 48.886719 1.734375 50.617188 3.847656 50.671875 L 26.339844 50.671875 C 28.574219 58.722656 25.5 59.835938 12.089844 59.835938 L 12.089844 64 L 57.628906 64 L 57.628906 59.835938 C 44.21875 59.835938 42.824219 58.722656 45.199219 50.671875 L 65.734375 50.671875 C 67.929688 50.648438 69.746094 48.960938 69.925781 46.785156 L 69.925781 3.886719 C 69.746094 1.710938 67.929688 0.0234375 65.734375 0 Z M 65.734375 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 64.476563 5.277344 L 64.476563 45.398438 L 5.382813 45.398438 L 5.382813 5.277344 Z M 64.476563 5.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 35.699219 24.15625 L 35.558594 24.15625 L 23.265625 17.074219 C 23.125 17.074219 23.125 16.9375 23.125 16.796875 C 23.140625 16.691406 23.191406 16.59375 23.265625 16.519531 L 35.558594 9.578125 L 35.976563 9.578125 L 48.269531 16.660156 C 48.410156 16.660156 48.410156 16.796875 48.410156 16.9375 C 48.410156 17.074219 48.410156 17.214844 48.269531 17.214844 L 36.117188 24.15625 L 35.699219 24.15625 M 34.023438 41.230469 L 33.882813 41.230469 L 21.589844 34.152344 C 21.449219 34.152344 21.449219 34.011719 21.449219 33.875 L 21.449219 19.714844 C 21.464844 19.609375 21.511719 19.511719 21.589844 19.4375 L 22.007813 19.4375 L 34.300781 26.515625 C 34.441406 26.515625 34.441406 26.65625 34.441406 26.792969 L 34.441406 40.953125 C 34.425781 41.058594 34.378906 41.15625 34.300781 41.230469 L 34.023438 41.230469 M 37.515625 41.230469 L 37.375 41.230469 C 37.234375 41.230469 37.234375 41.09375 37.234375 40.953125 L 37.234375 26.933594 C 37.25 26.828125 37.300781 26.730469 37.375 26.65625 L 49.667969 19.574219 L 50.085938 19.574219 C 50.226563 19.574219 50.226563 19.714844 50.226563 19.851563 L 50.226563 33.875 C 50.210938 33.980469 50.164063 34.078125 50.085938 34.152344 L 37.792969 41.230469 L 37.515625 41.230469 M 21.03125 8.746094 L 8.457031 8.746094 L 8.457031 21.242188 L 12.648438 21.242188 L 12.648438 12.910156 L 21.03125 12.910156 Z M 8.457031 29.570313 L 8.457031 42.066406 L 21.03125 42.066406 L 21.03125 37.898438 L 12.648438 37.898438 L 12.648438 29.570313 Z M 48.96875 42.066406 L 61.542969 42.066406 L 61.542969 29.570313 L 57.351563 29.570313 L 57.351563 37.898438 L 48.96875 37.898438 Z M 61.542969 21.242188 L 61.542969 8.746094 L 48.96875 8.746094 L 48.96875 12.910156 L 57.351563 12.910156 L 57.351563 21.242188 Z M 61.542969 21.242188 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureOSImagesClassic.png b/dist/Compute/AzureOSImagesClassic.png
new file mode 100644
index 00000000..5882f123
Binary files /dev/null and b/dist/Compute/AzureOSImagesClassic.png differ
diff --git a/dist/Compute/AzureOSImagesClassic.puml b/dist/Compute/AzureOSImagesClassic.puml
new file mode 100644
index 00000000..64e95e52
--- /dev/null
+++ b/dist/Compute/AzureOSImagesClassic.puml
@@ -0,0 +1,10 @@
+sprite $AzureOSImagesClassic [70x64/16z] {
+vTK7iW8X383X98GMxdzUAz7euWvWr__ruZUGRG0SximZG7X0oE4dSpWTdHM2wV092f89LYBRjUAB2S5sgQPoBdSh64k9UASIfEoIqA-8TbAyd5x0S2nAxPOI
+uJANYoaHs5oVGgbS5N5KmIXbaVWnXOrXosv4mTXM4etDXN9Z9Joo8tAwg-LKa7eLhYltOeo8nxFGhoXehqBM5s4q0wdBgmeshiRBM3UWuycitwkYhIbsc2pY
+zR3DABeFlIod59sf3cH6qOHr85EA5W52UQb2pEn65EHTpNEtMz5pzyyK279BaOWJzpfL9kzrBXjbv5wNi6OUQKQfbtQDkv-mGOmISVOvJKcLHFSyxLtUApgG
+SKN3mtkNCjd7Afxd2u_BFqHn3raAy2CG0E9sZRrwRaMm4YqLXF6M2Zn2yGzH-26Acq3m8Mln3vWkXLRKiuT3H8vzk9LtH8JxElRGqMyhMm
+}
+
+AzureEntityColoring(AzureOSImagesClassic)
+!define AzureOSImagesClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureOSImagesClassic, AzureOSImagesClassic)
+!define AzureOSImagesClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureOSImagesClassic, AzureOSImagesClassic)
diff --git a/dist/Compute/AzureOSImagesClassic.svg b/dist/Compute/AzureOSImagesClassic.svg
new file mode 100644
index 00000000..7c69d49a
--- /dev/null
+++ b/dist/Compute/AzureOSImagesClassic.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="64pt" viewBox="0 0 70 64" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 65.734375 0 L 3.847656 0 C 1.734375 0.0585938 0.0546875 1.785156 0.0742188 3.886719 L 0.0742188 46.785156 C 0.0546875 48.886719 1.734375 50.617188 3.847656 50.671875 L 26.339844 50.671875 C 28.574219 58.722656 25.5 59.835938 12.089844 59.835938 L 12.089844 64 L 57.628906 64 L 57.628906 59.835938 C 44.21875 59.835938 42.824219 58.722656 45.199219 50.671875 L 65.734375 50.671875 C 67.929688 50.648438 69.746094 48.960938 69.925781 46.785156 L 69.925781 3.886719 C 69.746094 1.710938 67.929688 0.0234375 65.734375 0 Z M 65.734375 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 64.476563 5.277344 L 64.476563 45.398438 L 5.382813 45.398438 L 5.382813 5.277344 Z M 64.476563 5.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 35.699219 24.15625 L 35.558594 24.15625 L 23.265625 17.074219 C 23.125 17.074219 23.125 16.9375 23.125 16.796875 C 23.140625 16.691406 23.191406 16.59375 23.265625 16.519531 L 35.558594 9.578125 L 35.976563 9.578125 L 48.269531 16.660156 C 48.410156 16.660156 48.410156 16.796875 48.410156 16.9375 C 48.410156 17.074219 48.410156 17.214844 48.269531 17.214844 L 36.117188 24.15625 L 35.699219 24.15625 M 34.023438 41.230469 L 33.882813 41.230469 L 21.589844 34.152344 C 21.449219 34.152344 21.449219 34.011719 21.449219 33.875 L 21.449219 19.714844 C 21.464844 19.609375 21.511719 19.511719 21.589844 19.4375 L 22.007813 19.4375 L 34.300781 26.515625 C 34.441406 26.515625 34.441406 26.65625 34.441406 26.792969 L 34.441406 40.953125 C 34.425781 41.058594 34.378906 41.15625 34.300781 41.230469 L 34.023438 41.230469 M 37.515625 41.230469 L 37.375 41.230469 C 37.234375 41.230469 37.234375 41.09375 37.234375 40.953125 L 37.234375 26.933594 C 37.25 26.828125 37.300781 26.730469 37.375 26.65625 L 49.667969 19.574219 L 50.085938 19.574219 C 50.226563 19.574219 50.226563 19.714844 50.226563 19.851563 L 50.226563 33.875 C 50.210938 33.980469 50.164063 34.078125 50.085938 34.152344 L 37.792969 41.230469 L 37.515625 41.230469 M 21.03125 8.746094 L 8.457031 8.746094 L 8.457031 21.242188 L 12.648438 21.242188 L 12.648438 12.910156 L 21.03125 12.910156 Z M 8.457031 29.570313 L 8.457031 42.066406 L 21.03125 42.066406 L 21.03125 37.898438 L 12.648438 37.898438 L 12.648438 29.570313 Z M 48.96875 42.066406 L 61.542969 42.066406 L 61.542969 29.570313 L 57.351563 29.570313 L 57.351563 37.898438 L 48.96875 37.898438 Z M 61.542969 21.242188 L 61.542969 8.746094 L 48.96875 8.746094 L 48.96875 12.910156 L 57.351563 12.910156 L 57.351563 21.242188 Z M 61.542969 21.242188 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureSapHana(m).png b/dist/Compute/AzureSapHana(m).png
new file mode 100644
index 00000000..c75b0c4e
Binary files /dev/null and b/dist/Compute/AzureSapHana(m).png differ
diff --git a/dist/Compute/AzureSapHana(m).svg b/dist/Compute/AzureSapHana(m).svg
new file mode 100644
index 00000000..4244fbfd
--- /dev/null
+++ b/dist/Compute/AzureSapHana(m).svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 1.285156 51.800781 L 35.246094 51.800781 L 68.484375 18.199219 L 1.285156 18.199219 L 1.285156 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 40.066406 25.1875 L 33.75 25.1875 L 33.75 40.210938 L 28.226563 25.183594 L 22.753906 25.183594 L 18.039063 37.757813 C 17.539063 34.589844 14.261719 33.492188 11.679688 32.675781 C 9.980469 32.128906 8.171875 31.324219 8.191406 30.4375 C 8.203125 29.707031 9.160156 29.027344 11.050781 29.132813 C 12.667969 29.179688 14.253906 29.605469 15.675781 30.378906 L 17.871094 26.554688 C 15.636719 25.472656 13.195313 24.890625 10.710938 24.851563 L 10.699219 24.851563 C 8.367188 24.742188 6.085938 25.574219 4.375 27.160156 C 3.414063 28.148438 2.871094 29.46875 2.863281 30.847656 C 2.753906 32.601563 3.578125 34.277344 5.03125 35.261719 C 6.351563 36.144531 7.800781 36.808594 9.328125 37.226563 C 11.082031 37.773438 12.515625 38.242188 12.496094 39.25 C 12.488281 39.621094 12.339844 39.972656 12.085938 40.234375 C 11.515625 40.710938 10.785156 40.941406 10.046875 40.875 C 8.1875 40.945313 6.355469 40.421875 4.816406 39.375 L 2.867188 43.253906 C 5.046875 44.492188 7.511719 45.148438 10.019531 45.160156 L 10.347656 45.160156 C 12.316406 45.1875 14.234375 44.546875 15.785156 43.335938 C 15.867188 43.269531 15.941406 43.203125 16.015625 43.136719 L 15.382813 44.828125 L 21.121094 44.828125 L 22.085938 41.898438 C 23.175781 42.261719 24.3125 42.441406 25.460938 42.433594 C 26.578125 42.441406 27.6875 42.269531 28.753906 41.925781 L 29.679688 44.828125 L 39.042969 44.828125 L 39.042969 38.757813 L 41.085938 38.757813 C 46.019531 38.757813 48.941406 36.246094 48.941406 32.035156 C 48.941406 27.339844 46.105469 25.1875 40.066406 25.1875 Z M 25.464844 38.046875 C 24.773438 38.050781 24.085938 37.933594 23.4375 37.691406 L 25.445313 31.371094 L 25.484375 31.371094 L 27.453125 37.710938 C 26.8125 37.933594 26.140625 38.046875 25.464844 38.046875 Z M 40.441406 34.414063 L 39.046875 34.414063 L 39.046875 29.324219 L 40.4375 29.324219 C 42.292969 29.324219 43.78125 29.9375 43.78125 31.835938 C 43.78125 33.796875 42.300781 34.414063 40.4375 34.414063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 44.910156 47.425781 C 46.023438 47.425781 46.925781 48.328125 46.925781 49.441406 C 46.925781 50.550781 46.023438 51.457031 44.910156 51.457031 C 43.800781 51.457031 42.894531 50.550781 42.894531 49.441406 C 42.894531 48.328125 43.800781 47.425781 44.910156 47.425781 M 44.910156 47.074219 C 43.605469 47.074219 42.542969 48.132813 42.542969 49.441406 C 42.542969 50.746094 43.605469 51.808594 44.910156 51.808594 C 46.21875 51.808594 47.277344 50.746094 47.277344 49.441406 C 47.277344 48.132813 46.21875 47.074219 44.910156 47.074219 Z M 44.910156 47.074219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 45.347656 49.585938 C 45.703125 49.589844 45.992188 49.300781 45.996094 48.945313 L 45.992188 48.902344 C 45.992188 48.417969 45.703125 48.203125 45.117188 48.203125 L 44.175781 48.203125 L 44.175781 50.679688 L 44.546875 50.679688 L 44.550781 49.605469 L 44.984375 49.605469 L 45.636719 50.675781 L 46.054688 50.675781 Z M 44.550781 49.285156 L 44.550781 48.515625 L 45.058594 48.515625 C 45.316406 48.515625 45.59375 48.574219 45.59375 48.882813 C 45.59375 49.265625 45.3125 49.285156 44.996094 49.285156 Z M 44.550781 49.285156 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureSapHana.png b/dist/Compute/AzureSapHana.png
new file mode 100644
index 00000000..c59b96c4
Binary files /dev/null and b/dist/Compute/AzureSapHana.png differ
diff --git a/dist/Compute/AzureSapHana.puml b/dist/Compute/AzureSapHana.puml
new file mode 100644
index 00000000..83ee5008
--- /dev/null
+++ b/dist/Compute/AzureSapHana.puml
@@ -0,0 +1,11 @@
+sprite $AzureSapHana [70x70/16z] {
+xTD7sYCX38HXWGG2zVtF-mUgFT1FJMPfletpIxIyGwVJwLHyEnNnQpSNADk8-3wohxX0sKNsbIQhqaiMaQIbnVYqwtVZer1aLZiZYn95VfJAzySsdkUXo2mv
+8oybL9Q-bKXutgOoFoK4IfMb5CkU6IdYZE3jX9Mu5nMfrrUwa06lMCOg2O4IonXHup6yumNMXjsBYR2Ivm4iIzHLmRFE21IaBIuqvWugI6c4OD8sJtaCrF5x
+MBmY8AJWN9751LMnhdmhLejY922iF2vC3g1-Jwc7FAg4pCDfUSx6NnCVMdagEQ2pCkeb2L8iwDw7z52C4BwCS53A2KzylbFwDH5I8i0K4KxlCq8z_L8nAItM
+kN3jjmWEWsA54Bvrb5TJA_vK9i9vP9cbnnzNfq88xKkpbr7zlbh8fy88dtHqhzNxrnDqePWHGWh50TbKW9ZbBGM8ggODPI0fMqdwdyhS4pNTK2B9Ip5vtqwd
+q-aJ
+}
+
+AzureEntityColoring(AzureSapHana)
+!define AzureSapHana(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSapHana, AzureSapHana)
+!define AzureSapHana(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSapHana, AzureSapHana)
diff --git a/dist/Compute/AzureSapHana.svg b/dist/Compute/AzureSapHana.svg
new file mode 100644
index 00000000..16830c7c
--- /dev/null
+++ b/dist/Compute/AzureSapHana.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 1.285156 51.800781 L 35.246094 51.800781 L 68.484375 18.199219 L 1.285156 18.199219 L 1.285156 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 40.066406 25.1875 L 33.75 25.1875 L 33.75 40.210938 L 28.226563 25.183594 L 22.753906 25.183594 L 18.039063 37.757813 C 17.539063 34.589844 14.261719 33.492188 11.679688 32.675781 C 9.980469 32.128906 8.171875 31.324219 8.191406 30.4375 C 8.203125 29.707031 9.160156 29.027344 11.050781 29.132813 C 12.667969 29.179688 14.253906 29.605469 15.675781 30.378906 L 17.871094 26.554688 C 15.636719 25.472656 13.195313 24.890625 10.710938 24.851563 L 10.699219 24.851563 C 8.367188 24.742188 6.085938 25.574219 4.375 27.160156 C 3.414063 28.148438 2.871094 29.46875 2.863281 30.847656 C 2.753906 32.601563 3.578125 34.277344 5.03125 35.261719 C 6.351563 36.144531 7.800781 36.808594 9.328125 37.226563 C 11.082031 37.773438 12.515625 38.242188 12.496094 39.25 C 12.488281 39.621094 12.339844 39.972656 12.085938 40.234375 C 11.515625 40.710938 10.785156 40.941406 10.046875 40.875 C 8.1875 40.945313 6.355469 40.421875 4.816406 39.375 L 2.867188 43.253906 C 5.046875 44.492188 7.511719 45.148438 10.019531 45.160156 L 10.347656 45.160156 C 12.316406 45.1875 14.234375 44.546875 15.785156 43.335938 C 15.867188 43.269531 15.941406 43.203125 16.015625 43.136719 L 15.382813 44.828125 L 21.121094 44.828125 L 22.085938 41.898438 C 23.175781 42.261719 24.3125 42.441406 25.460938 42.433594 C 26.578125 42.441406 27.6875 42.269531 28.753906 41.925781 L 29.679688 44.828125 L 39.042969 44.828125 L 39.042969 38.757813 L 41.085938 38.757813 C 46.019531 38.757813 48.941406 36.246094 48.941406 32.035156 C 48.941406 27.339844 46.105469 25.1875 40.066406 25.1875 Z M 25.464844 38.046875 C 24.773438 38.050781 24.085938 37.933594 23.4375 37.691406 L 25.445313 31.371094 L 25.484375 31.371094 L 27.453125 37.710938 C 26.8125 37.933594 26.140625 38.046875 25.464844 38.046875 Z M 40.441406 34.414063 L 39.046875 34.414063 L 39.046875 29.324219 L 40.4375 29.324219 C 42.292969 29.324219 43.78125 29.9375 43.78125 31.835938 C 43.78125 33.796875 42.300781 34.414063 40.4375 34.414063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 44.910156 47.425781 C 46.023438 47.425781 46.925781 48.328125 46.925781 49.441406 C 46.925781 50.550781 46.023438 51.457031 44.910156 51.457031 C 43.800781 51.457031 42.894531 50.550781 42.894531 49.441406 C 42.894531 48.328125 43.800781 47.425781 44.910156 47.425781 M 44.910156 47.074219 C 43.605469 47.074219 42.542969 48.132813 42.542969 49.441406 C 42.542969 50.746094 43.605469 51.808594 44.910156 51.808594 C 46.21875 51.808594 47.277344 50.746094 47.277344 49.441406 C 47.277344 48.132813 46.21875 47.074219 44.910156 47.074219 Z M 44.910156 47.074219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 45.347656 49.585938 C 45.703125 49.589844 45.992188 49.300781 45.996094 48.945313 L 45.992188 48.902344 C 45.992188 48.417969 45.703125 48.203125 45.117188 48.203125 L 44.175781 48.203125 L 44.175781 50.679688 L 44.546875 50.679688 L 44.550781 49.605469 L 44.984375 49.605469 L 45.636719 50.675781 L 46.054688 50.675781 Z M 44.550781 49.285156 L 44.550781 48.515625 L 45.058594 48.515625 C 45.316406 48.515625 45.59375 48.574219 45.59375 48.882813 C 45.59375 49.265625 45.3125 49.285156 44.996094 49.285156 Z M 44.550781 49.285156 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureServiceFabric(m).png b/dist/Compute/AzureServiceFabric(m).png
index eeb51a66..e5dec7f4 100644
Binary files a/dist/Compute/AzureServiceFabric(m).png and b/dist/Compute/AzureServiceFabric(m).png differ
diff --git a/dist/Compute/AzureServiceFabric(m).svg b/dist/Compute/AzureServiceFabric(m).svg
index 1be69c13..42e818f4 100644
--- a/dist/Compute/AzureServiceFabric(m).svg
+++ b/dist/Compute/AzureServiceFabric(m).svg
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 21.078125 69.824219 L 25.53125 50.199219 C 23.734375 48.894531 21.519531 48.125 19.125 48.125 C 18.566406 48.125 18.015625 48.167969 17.476563 48.25 L 15.082031 39.65625 C 19.066406 38.023438 21.875 34.105469 21.875 29.53125 C 21.875 27.910156 21.519531 26.371094 20.886719 24.984375 L 27.847656 19.207031 C 29.046875 20.25 30.480469 21.035156 32.054688 21.472656 L 36.894531 0.167969 C 36.277344 0.0585938 35.644531 0 35 0 C 28.960938 0 24.0625 4.898438 24.0625 10.9375 C 24.0625 12.050781 24.230469 13.121094 24.539063 14.132813 L 16.976563 20.410156 C 15.246094 19.265625 13.171875 18.59375 10.941406 18.59375 C 4.898438 18.59375 0 23.492188 0 29.53125 C 0 34.914063 3.890625 39.386719 9.015625 40.296875 L 11.945313 50.816406 C 9.644531 52.820313 8.1875 55.773438 8.1875 59.0625 C 8.1875 65.105469 13.085938 70 19.125 70 C 19.792969 70 20.445313 69.9375 21.078125 69.824219 Z M 21.078125 69.824219 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 70.78125 29.867188 C 70.78125 23.742188 65.8125 18.800781 59.710938 18.800781 C 57.464844 18.800781 55.363281 19.488281 53.613281 20.644531 L 45.949219 14.308594 C 46.28125 13.265625 46.445313 12.179688 46.445313 11.066406 C 46.445313 4.941406 41.503906 0 35.378906 0 C 29.277344 0 24.335938 4.941406 24.335938 11.066406 C 24.335938 12.179688 24.5 13.265625 24.808594 14.285156 L 16.578125 21.117188 C 14.96875 20.335938 13.078125 19.914063 11.066406 19.914063 C 4.941406 19.914063 0 23.742188 0 29.867188 C 0 35.308594 3.925781 39.824219 9.105469 40.722656 L 12.085938 51.386719 C 9.765625 53.421875 8.277344 56.378906 8.277344 59.710938 C 8.277344 65.8125 13.242188 70.78125 19.34375 70.78125 C 24.097656 70.78125 28.117188 67.777344 29.703125 63.566406 L 41.078125 63.566406 C 42.636719 67.777344 46.683594 70.78125 51.414063 70.78125 C 57.539063 70.78125 62.480469 65.8125 62.480469 59.710938 C 62.480469 56.261719 60.894531 53.164063 58.414063 51.152344 L 61.460938 40.769531 C 66.738281 39.917969 70.78125 35.378906 70.78125 29.867188 Z M 51.414063 48.667969 C 46.066406 48.667969 41.621094 52.453125 40.582031 57.488281 L 30.175781 57.488281 C 29.136719 52.453125 24.6875 48.667969 19.34375 48.667969 C 18.777344 48.667969 18.210938 48.714844 17.664063 48.789063 L 15.253906 40.085938 C 19.273438 38.429688 22.113281 34.480469 22.113281 29.867188 C 22.113281 28.164063 21.734375 26.652344 21.046875 25.328125 L 28.164063 19.414063 C 30.105469 21.09375 32.613281 22.113281 35.378906 22.113281 C 38.144531 22.113281 40.675781 21.09375 42.613281 19.414063 L 49.664063 25.28125 C 49.023438 26.675781 48.667969 28.210938 48.667969 29.84375 C 48.667969 34.410156 51.414063 38.3125 55.335938 40.011719 L 52.761719 48.738281 C 52.335938 48.691406 51.886719 48.667969 51.414063 48.667969 Z M 51.414063 48.667969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 34.996094 13.273438 L 57.085938 31.613281 L 49.636719 56.859375 L 19.875 56.859375 L 12.851563 31.652344 L 34.996094 13.273438 M 34.996094 5.453125 L 6.011719 29.515625 L 15.308594 62.875 L 54.136719 62.875 L 63.980469 29.515625 Z M 34.996094 5.453125 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(63,173,255);fill-opacity:1;" d="M 35 0 C 41.039063 0 45.9375 4.898438 45.9375 10.9375 C 45.9375 16.980469 41.039063 21.875 35 21.875 C 28.960938 21.875 24.0625 16.976563 24.0625 10.9375 C 24.0625 4.898438 28.960938 0 35 0 Z M 35 0 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(63,173,255);fill-opacity:1;" d="M 59.0625 18.59375 C 65.105469 18.59375 70 23.492188 70 29.53125 C 70 35.570313 65.101563 40.46875 59.0625 40.46875 C 53.023438 40.46875 48.125 35.570313 48.125 29.53125 C 48.125 23.492188 53.023438 18.59375 59.0625 18.59375 Z M 59.0625 18.59375 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(63,173,255);fill-opacity:1;" d="M 50.859375 48.125 C 56.898438 48.125 61.796875 53.023438 61.796875 59.0625 C 61.796875 65.101563 56.898438 70 50.859375 70 C 44.816406 70 39.921875 65.101563 39.921875 59.0625 C 39.921875 53.023438 44.816406 48.125 50.859375 48.125 Z M 50.859375 48.125 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(63,173,255);fill-opacity:1;" d="M 19.125 48.125 C 25.167969 48.125 30.066406 53.023438 30.066406 59.0625 C 30.066406 65.101563 25.167969 70 19.125 70 C 13.085938 70 8.1875 65.101563 8.1875 59.0625 C 8.1875 53.023438 13.085938 48.125 19.125 48.125 Z M 19.125 48.125 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(63,173,255);fill-opacity:1;" d="M 10.9375 18.59375 C 16.980469 18.59375 21.875 23.492188 21.875 29.53125 C 21.875 35.570313 16.976563 40.46875 10.9375 40.46875 C 4.898438 40.46875 0 35.574219 0 29.53125 C 0 23.492188 4.898438 18.59375 10.9375 18.59375 Z M 10.9375 18.59375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Compute/AzureServiceFabric.puml b/dist/Compute/AzureServiceFabric.puml
index 9ae1a92b..6dfe44d5 100644
--- a/dist/Compute/AzureServiceFabric.puml
+++ b/dist/Compute/AzureServiceFabric.puml
@@ -1,9 +1,10 @@
 sprite $AzureServiceFabric [70x70/16z] {
-jPVd0XmX28I55MLu__TDJxPaFCLild_NE1Zgbi-eTG1kMlQH7h_nRJi7ueALBMhSQLkUn9DQyY2UGFRY-UUOd5X1Eid1EDBQCYmloml2sBQLzttHODHzTVUj
-L0IbPRNbzB9CZp4kPGdn-0HqAJk_9S7TfVxd_LgAr8u8z7hrJ6ft0Dtqr1Lw7NQmYu_DyEVz9d-Fry0z_lhJ0xUnNj1xLdakHEMMEswcPfht03CZj4XnpBI_
-q-XCEx8DTj1uiitUWe1iNNimvWlc3e8XhrZHCYGO_eel_HLrUUAocIx8oL84p8fbfoB_WISF3Fu30Mt5CGesOCI9aOaPDeSDPuXI5cYNV9u_4EiWtJpDjvkm
-QcgfZTK6rf4w7O_H2QQPMs1O1bRMrUt3cko9WEhGIoHE99qhDiyp9jbBvPd_0mBUj73K77HhyNFRbJzrdM1bfC8cIzgdBKPBfwuCipfPrug5yIopfofVcSzi
-OTjazllIjW9tvKIMBlP3_x3ql6InGoEovEclMF7_4j4HEzZITOCBIzTIPmwdgqvZqW7WT_5KtpfHhg_SMeqqVMx0ZDVd_2we-7o0g0z6uLS
+tTS7SkGW48NXrn5n_mklrJKhsV2A5VRchx8zyqz3AM9DpK-ABr2Fafc6px9uoPFWK_oEV3vZCLGI-oIcYcERpvMK_L58nR19IIG3cunLyilRKkIFL8n54fkK
+LGARw8AQR4OQgno7uJd9rfACqdjtFANPtioLVagio1iKQoN7oj5Bkxym9ipZZPi0tbx2FbIylnm2MEGf31Vnk7Yq5mVKhue1UlINo9jEaPBLIFl-lynmnKbQ
+BotVypioPbB1v1qPCXwZR2dWOexKQYq85CQEdDLwHYueLEJCD0XTL9883y9NnpMpMx7_hgB9M12sklGm4iJkyU9mkg2zZH487MLh63_ZT5TsTWOd8v4LdTPJ
+pEFY9BAS9eRBBZ-TrriSEjzHCnMFI3-Erfe91j5EZaUydmvCh2g9HrfL0XDfHV14BufPLiNmWD455QzAu86eIeBGvnjpLCN0P6KKFwIz29YeMTnC5oLHiwXP
+6YXhcTTv8EjZjXtTGKa6FP_uQTWKbCP7T92ROq8UGDBv9ElC7U7lYZbHJ2ocIk8TpnacJYf6HbaEeoIIGNVbvayMbDakIJshz4jxL75QEJOhnYBP_qX5wERU
+bIC9nyX9nVMMX6AaSoKMv-BqVp8C-wcS23sdXuejxixJ_rc6Rfsmo6fH_BINMExi-F2GOQ3Kiup__mO
 }
 
 AzureEntityColoring(AzureServiceFabric)
diff --git a/dist/Compute/AzureVirtualMachine(m).png b/dist/Compute/AzureVirtualMachine(m).png
index 6be07370..28b5034d 100644
Binary files a/dist/Compute/AzureVirtualMachine(m).png and b/dist/Compute/AzureVirtualMachine(m).png differ
diff --git a/dist/Compute/AzureVirtualMachine(m).svg b/dist/Compute/AzureVirtualMachine(m).svg
index 3675be81..b5ac37b7 100644
--- a/dist/Compute/AzureVirtualMachine(m).svg
+++ b/dist/Compute/AzureVirtualMachine(m).svg
@@ -1,7 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="55pt" viewBox="0 0 70 55" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.816406 2.804688 C 65.800781 2.804688 65.785156 2.800781 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.28125 54.601563 Z M 65.816406 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 33.269531 44.445313 C 33.199219 44.445313 33.136719 44.425781 33.082031 44.394531 L 20.792969 37.300781 C 20.671875 37.234375 20.601563 37.117188 20.601563 36.976563 L 20.601563 22.746094 C 20.601563 22.613281 20.671875 22.488281 20.792969 22.421875 C 20.90625 22.355469 21.042969 22.355469 21.167969 22.421875 L 33.453125 29.511719 C 33.5625 29.582031 33.636719 29.703125 33.636719 29.839844 L 33.636719 44.070313 C 33.636719 44.207031 33.5625 44.328125 33.453125 44.394531 C 33.394531 44.425781 33.328125 44.445313 33.269531 44.445313 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.746094 44.445313 C 36.679688 44.445313 36.617188 44.425781 36.554688 44.394531 C 36.445313 44.328125 36.375 44.207031 36.375 44.070313 L 36.375 29.929688 C 36.375 29.796875 36.445313 29.671875 36.554688 29.605469 L 48.84375 22.515625 C 48.960938 22.449219 49.097656 22.449219 49.210938 22.515625 C 49.328125 22.582031 49.402344 22.703125 49.402344 22.835938 L 49.402344 36.976563 C 49.402344 37.117188 49.328125 37.234375 49.210938 37.300781 L 36.929688 44.394531 C 36.875 44.425781 36.8125 44.445313 36.746094 44.445313 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 22.75 30.171875 L 48.839844 30.171875 L 48.839844 12.886719 L 22.75 12.886719 Z M 41.523438 25.144531 L 36.589844 27.972656 L 36.589844 22.3125 L 41.523438 19.484375 Z M 36.113281 15.871094 L 41.046875 18.699219 L 36.113281 21.527344 L 31.183594 18.699219 Z M 30.863281 19.484375 L 35.796875 22.3125 L 35.796875 27.972656 L 30.863281 25.144531 Z M 30.863281 19.484375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 66.183594 0 L 3.023438 0 C 1.273438 0 0 1.414063 0 2.984375 L 0 51.699219 C 0 53.429688 1.433594 54.6875 3.023438 54.6875 L 66.183594 54.6875 C 67.933594 54.6875 69.203125 53.269531 69.203125 51.699219 L 69.203125 2.984375 C 69.203125 1.414063 67.933594 0 66.183594 0 Z M 34.363281 45.257813 L 32.453125 50.914063 C 32.453125 50.914063 32.453125 51.070313 32.453125 51.070313 C 32.453125 51.070313 32.453125 51.070313 32.296875 51.230469 C 32.296875 51.230469 32.136719 51.230469 31.976563 51.230469 C 31.816406 51.230469 31.816406 51.230469 31.5 51.230469 C 31.339844 51.230469 31.183594 51.230469 31.183594 51.230469 C 31.023438 51.230469 31.023438 51.230469 30.863281 51.230469 C 30.863281 51.230469 30.703125 51.230469 30.703125 51.230469 C 30.703125 51.230469 30.703125 51.230469 30.546875 51.230469 C 30.546875 51.230469 30.546875 51.230469 30.546875 51.070313 L 28.636719 45.414063 C 28.636719 45.257813 28.636719 45.257813 28.636719 45.101563 C 28.636719 45.101563 28.636719 44.941406 28.636719 44.941406 C 28.636719 44.941406 28.796875 44.941406 28.796875 44.941406 C 28.953125 44.941406 29.113281 44.941406 29.273438 44.941406 C 29.433594 44.941406 29.589844 44.941406 29.589844 44.941406 C 29.75 44.941406 29.75 44.941406 29.75 44.941406 C 29.75 44.941406 29.75 44.941406 29.910156 44.941406 C 29.910156 44.941406 29.910156 44.941406 29.910156 45.101563 L 31.5 49.972656 L 33.089844 45.101563 C 33.089844 45.101563 33.089844 44.941406 33.089844 44.941406 C 33.089844 44.941406 33.089844 44.941406 33.25 44.785156 C 33.25 44.785156 33.410156 44.785156 33.410156 44.785156 C 33.566406 44.785156 33.566406 44.785156 33.726563 44.785156 C 33.886719 44.785156 34.046875 44.785156 34.046875 44.785156 C 34.203125 44.785156 34.203125 44.785156 34.203125 44.785156 C 34.203125 44.785156 34.203125 44.941406 34.203125 44.941406 C 34.523438 45.101563 34.523438 45.257813 34.363281 45.257813 Z M 42.796875 51.070313 C 42.636719 51.230469 42.476563 51.230469 42.476563 51.230469 C 42.316406 51.230469 42.316406 51.230469 42.160156 51.230469 C 42 51.230469 42 51.230469 41.839844 51.230469 C 41.839844 51.230469 41.683594 51.230469 41.683594 51.230469 C 41.683594 51.230469 41.683594 51.230469 41.523438 51.230469 C 41.523438 51.230469 41.523438 51.230469 41.523438 51.070313 L 41.523438 45.886719 L 39.773438 51.070313 C 39.773438 51.070313 39.773438 51.070313 39.773438 51.230469 C 39.773438 51.230469 39.773438 51.230469 39.613281 51.230469 C 39.613281 51.230469 39.453125 51.230469 39.453125 51.230469 C 39.453125 51.230469 39.296875 51.230469 39.136719 51.230469 C 38.976563 51.230469 38.976563 51.230469 38.816406 51.230469 C 38.816406 51.230469 38.660156 51.230469 38.660156 51.230469 C 38.660156 51.230469 38.5 51.230469 38.5 51.230469 C 38.5 51.230469 38.5 51.230469 38.5 51.070313 L 36.589844 45.886719 L 36.589844 51.070313 C 36.589844 51.070313 36.589844 51.070313 36.589844 51.230469 C 36.589844 51.230469 36.589844 51.230469 36.433594 51.230469 C 36.433594 51.230469 36.273438 51.230469 36.273438 51.230469 C 36.273438 51.230469 36.113281 51.230469 35.953125 51.230469 C 35.796875 51.230469 35.796875 51.230469 35.636719 51.230469 C 35.476563 51.230469 35.476563 51.230469 35.476563 51.230469 C 35.476563 51.230469 35.316406 51.230469 35.316406 51.230469 C 35.316406 51.230469 35.316406 51.230469 35.316406 51.070313 L 35.316406 45.414063 C 35.316406 45.257813 35.316406 45.101563 35.476563 45.101563 C 35.636719 44.941406 35.636719 44.941406 35.796875 44.941406 L 36.589844 44.941406 C 36.75 44.941406 36.910156 44.941406 36.910156 44.941406 C 37.066406 44.941406 37.066406 44.941406 37.226563 45.101563 C 37.226563 45.101563 37.386719 45.257813 37.386719 45.257813 C 37.386719 45.414063 37.546875 45.414063 37.546875 45.570313 L 38.976563 49.34375 L 40.410156 45.570313 C 40.410156 45.414063 40.566406 45.257813 40.566406 45.257813 C 40.566406 45.101563 40.726563 45.101563 40.726563 45.101563 C 40.726563 45.101563 40.886719 44.941406 41.046875 44.941406 C 41.203125 44.941406 41.203125 44.941406 41.363281 44.941406 L 42.316406 44.941406 C 42.476563 44.941406 42.476563 44.941406 42.476563 44.941406 C 42.476563 44.941406 42.636719 44.941406 42.636719 45.101563 C 42.636719 45.101563 42.636719 45.257813 42.796875 45.257813 C 42.796875 45.257813 42.796875 45.414063 42.796875 45.414063 Z M 50.910156 30.644531 C 50.910156 31.585938 50.113281 32.214844 49.316406 32.214844 L 39.773438 32.214844 C 38.816406 35.828125 39.296875 36.300781 45.660156 36.300781 L 45.660156 37.871094 L 25.773438 37.871094 L 25.773438 36.300781 C 31.5 36.300781 32.453125 35.828125 31.660156 32.214844 L 22.273438 32.214844 C 21.316406 32.214844 20.683594 31.429688 20.683594 30.644531 L 20.683594 12.414063 C 20.683594 11.472656 21.476563 10.6875 22.273438 10.6875 L 49.316406 10.6875 C 50.273438 10.6875 50.910156 11.472656 50.910156 12.414063 Z M 50.910156 30.644531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 46.199219 53.199219 L 26.980469 53.199219 C 29.289063 61.597656 26.1875 62.800781 12.601563 62.800781 L 12.601563 67.199219 L 58.800781 67.199219 L 58.800781 62.800781 C 45.214844 62.800781 43.882813 61.601563 46.191406 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0.00390625 4.683594 0.00390625 6.785156 L 0.00390625 50.644531 C 0.00390625 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.773438 54.597656 C 67.875 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.875 2.800781 65.773438 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.601563 49 L 5.601563 8.398438 Z M 64.398438 8.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 12.601563 63 L 58.800781 63 L 58.800781 67.199219 L 12.601563 67.199219 Z M 12.601563 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35.726563 5.734375 C 35.726563 6.28125 35.28125 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.28125 4.738281 35.726563 5.183594 35.726563 5.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.039063 27.152344 C 34.976563 27.152344 34.910156 27.132813 34.851563 27.097656 L 22.527344 19.984375 C 22.414063 19.917969 22.339844 19.792969 22.339844 19.660156 C 22.339844 19.527344 22.414063 19.402344 22.527344 19.339844 L 34.777344 12.269531 C 34.890625 12.207031 35.03125 12.207031 35.144531 12.269531 L 47.476563 19.386719 C 47.589844 19.453125 47.660156 19.578125 47.660156 19.710938 C 47.660156 19.84375 47.589844 19.964844 47.476563 20.03125 L 35.226563 27.097656 C 35.167969 27.132813 35.105469 27.152344 35.039063 27.152344 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
 </g>
 </svg>
diff --git a/dist/Compute/AzureVirtualMachine.png b/dist/Compute/AzureVirtualMachine.png
index 5b2934c2..7482957a 100644
Binary files a/dist/Compute/AzureVirtualMachine.png and b/dist/Compute/AzureVirtualMachine.png differ
diff --git a/dist/Compute/AzureVirtualMachine.puml b/dist/Compute/AzureVirtualMachine.puml
index 47cfe7a2..e96b1833 100644
--- a/dist/Compute/AzureVirtualMachine.puml
+++ b/dist/Compute/AzureVirtualMachine.puml
@@ -1,7 +1,7 @@
-sprite $AzureVirtualMachine [70x55/16z] {
-xTPLUiKm34JXaM9Pcjd_ViiC5woKUxuy_o4JWkh5SeJwqQWT2ktH_A7Aly9v89weq70WusbA0VPkG9sgcDxDlbRX3afj66mg701WanqbSPUpewJXkgsoeS1p
-0fvftb1k7wCSQ2f00Rz7cNQdU3KKCO22pUuCuAZW5y_fldAeKnKw3kGyJP5uN-4suqCh-n5ksrgx6dTGM1lkcbnIQ8ONcP-l-Eksttdo-5TObB9Ob5Irg1HI
-iWYuD06kAVAX1CEivBwi13XSuMCKvh92f4s55uRbidBx7k5oH4C9kAwLG1rKg4EHbCYxwzqYjKERK-qIm3QQEN09
+sprite $AzureVirtualMachine [70x70/16z] {
+xTO5GiG034JHo4mezpymbgvMq-3mrwMlBlAzqcPl1jWgWYRANl6QWri1QqZMdfA-4hTADFgh2holK4N4cuh9Mug6udBEU521t6H75AhSXx9YCfEof40MieeI
+9hCfIqfmpl7wEe9EvwQacBzzuzEP8RXVCVDySxUMWPfYXgkj9asYfcGSLxgTZ4FAE5iSZIDAXiY0ZfApHVIKd2lyGULVgHmn5vNQKGgpIlrOvnE5KLU2jmgF
+dc5nfNJEzXYLxlKByz5JiZ-gPDz7YKx-7WW5VIHKnD5325aBZ_SDKiycIaWzdIXiJ4jFmNieElINhbWYjuKMfiASQKmQ0hOX-KEf1GrHohw_Ob5AvLls3
 }
 
 AzureEntityColoring(AzureVirtualMachine)
diff --git a/dist/Compute/AzureVirtualMachine.svg b/dist/Compute/AzureVirtualMachine.svg
index 67a11c5e..d9de5655 100644
--- a/dist/Compute/AzureVirtualMachine.svg
+++ b/dist/Compute/AzureVirtualMachine.svg
@@ -1,52 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="64pt" viewBox="0 0 70 64" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="64"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.816406 0.00390625 C 65.800781 0.00390625 65.785156 0 65.773438 0 L 3.804688 0 C 1.699219 0 0 1.871094 0 3.960938 L 0 46.90625 C 0 48.984375 1.699219 50.835938 3.804688 50.835938 L 5.277344 50.835938 Z M 65.816406 0.00390625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.816406 2.804688 C 65.800781 2.804688 65.785156 2.800781 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.28125 54.601563 Z M 65.816406 2.804688 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="64"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 33.992188 41.386719 C 33.921875 41.386719 33.859375 41.367188 33.804688 41.335938 L 21.515625 34.289063 C 21.398438 34.222656 21.328125 34.101563 21.328125 33.964844 L 21.328125 19.820313 C 21.328125 19.6875 21.398438 19.566406 21.515625 19.5 C 21.628906 19.433594 21.769531 19.433594 21.890625 19.5 L 34.179688 26.546875 C 34.289063 26.617188 34.363281 26.738281 34.363281 26.871094 L 34.363281 41.015625 C 34.363281 41.148438 34.289063 41.269531 34.179688 41.335938 C 34.117188 41.367188 34.054688 41.386719 33.992188 41.386719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 33.269531 44.445313 C 33.199219 44.445313 33.136719 44.425781 33.082031 44.394531 L 20.792969 37.300781 C 20.671875 37.234375 20.601563 37.117188 20.601563 36.976563 L 20.601563 22.746094 C 20.601563 22.613281 20.671875 22.488281 20.792969 22.421875 C 20.90625 22.355469 21.042969 22.355469 21.167969 22.421875 L 33.453125 29.511719 C 33.5625 29.582031 33.636719 29.703125 33.636719 29.839844 L 33.636719 44.070313 C 33.636719 44.207031 33.5625 44.328125 33.453125 44.394531 C 33.394531 44.425781 33.328125 44.445313 33.269531 44.445313 "/>
 </g>
 <mask id="mask2">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip3">
-  <rect x="0" y="0" width="70" height="64"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.472656 41.386719 C 37.40625 41.386719 37.34375 41.367188 37.277344 41.335938 C 37.171875 41.269531 37.097656 41.148438 37.097656 41.015625 L 37.097656 26.960938 C 37.097656 26.828125 37.171875 26.707031 37.277344 26.636719 L 49.566406 19.59375 C 49.683594 19.527344 49.820313 19.527344 49.9375 19.59375 C 50.054688 19.65625 50.125 19.78125 50.125 19.914063 L 50.125 33.964844 C 50.125 34.101563 50.054688 34.222656 49.9375 34.289063 L 37.652344 41.335938 C 37.601563 41.367188 37.535156 41.386719 37.472656 41.386719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.746094 44.445313 C 36.679688 44.445313 36.617188 44.425781 36.554688 44.394531 C 36.445313 44.328125 36.375 44.207031 36.375 44.070313 L 36.375 29.929688 C 36.375 29.796875 36.445313 29.671875 36.554688 29.605469 L 48.84375 22.515625 C 48.960938 22.449219 49.097656 22.449219 49.210938 22.515625 C 49.328125 22.582031 49.402344 22.703125 49.402344 22.835938 L 49.402344 36.976563 C 49.402344 37.117188 49.328125 37.234375 49.210938 37.300781 L 36.929688 44.394531 C 36.875 44.425781 36.8125 44.445313 36.746094 44.445313 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 45.394531 50.828125 L 26.363281 50.828125 C 28.648438 58.855469 25.578125 60.003906 12.117188 60.003906 L 12.117188 64.207031 L 57.886719 64.207031 L 57.886719 60.003906 C 44.425781 60.003906 43.105469 58.859375 45.394531 50.828125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 65.773438 0 L 3.804688 0 C 1.699219 0 0 1.871094 0 3.960938 L 0 46.90625 C 0 48.980469 1.699219 50.832031 3.804688 50.832031 L 65.773438 50.832031 C 67.875 50.832031 70 48.980469 70 46.90625 L 70 3.960938 C 70 1.867188 67.875 0 65.773438 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 46.199219 53.199219 L 26.980469 53.199219 C 29.289063 61.597656 26.1875 62.800781 12.601563 62.800781 L 12.601563 67.199219 L 58.800781 67.199219 L 58.800781 62.800781 C 45.214844 62.800781 43.882813 61.601563 46.191406 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0.00390625 4.683594 0.00390625 6.785156 L 0.00390625 50.644531 C 0.00390625 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.773438 54.597656 C 67.875 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.875 2.800781 65.773438 2.800781 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 5.304688 45.480469 L 5.304688 5.355469 L 64.539063 5.355469 L 64.539063 45.480469 Z M 5.304688 45.480469 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 5.386719 5.355469 L 59.539063 5.273438 L 59.542969 5.273438 L 5.304688 5.355469 L 5.304688 45.480469 L 5.386719 45.480469 Z M 5.386719 5.355469 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 12.117188 60.003906 L 57.886719 60.003906 L 57.886719 64.207031 L 12.117188 64.207031 Z M 12.117188 60.003906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35.726563 2.914063 C 35.726563 3.460938 35.28125 3.902344 34.730469 3.902344 C 34.179688 3.902344 33.738281 3.460938 33.738281 2.914063 C 33.738281 2.367188 34.179688 1.925781 34.730469 1.925781 C 35.28125 1.925781 35.726563 2.367188 35.726563 2.914063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.765625 24.199219 C 35.703125 24.199219 35.636719 24.179688 35.578125 24.148438 L 23.25 17.078125 C 23.136719 17.011719 23.066406 16.886719 23.066406 16.753906 C 23.066406 16.625 23.136719 16.5 23.25 16.433594 L 35.503906 9.410156 C 35.617188 9.347656 35.757813 9.347656 35.871094 9.410156 L 48.199219 16.484375 C 48.316406 16.550781 48.382813 16.671875 48.382813 16.804688 C 48.382813 16.9375 48.316406 17.058594 48.199219 17.125 L 35.953125 24.148438 C 35.894531 24.179688 35.832031 24.199219 35.765625 24.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.601563 49 L 5.601563 8.398438 Z M 64.398438 8.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 12.601563 63 L 58.800781 63 L 58.800781 67.199219 L 12.601563 67.199219 Z M 12.601563 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35.726563 5.734375 C 35.726563 6.28125 35.28125 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.28125 4.738281 35.726563 5.183594 35.726563 5.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.039063 27.152344 C 34.976563 27.152344 34.910156 27.132813 34.851563 27.097656 L 22.527344 19.984375 C 22.414063 19.917969 22.339844 19.792969 22.339844 19.660156 C 22.339844 19.527344 22.414063 19.402344 22.527344 19.339844 L 34.777344 12.269531 C 34.890625 12.207031 35.03125 12.207031 35.144531 12.269531 L 47.476563 19.386719 C 47.589844 19.453125 47.660156 19.578125 47.660156 19.710938 C 47.660156 19.84375 47.589844 19.964844 47.476563 20.03125 L 35.226563 27.097656 C 35.167969 27.132813 35.105469 27.152344 35.039063 27.152344 "/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
 <use xlink:href="#surface11" mask="url(#mask2)"/>
 </g>
diff --git a/dist/Compute/AzureVirtualMachineImage(m).png b/dist/Compute/AzureVirtualMachineImage(m).png
new file mode 100644
index 00000000..a896e811
Binary files /dev/null and b/dist/Compute/AzureVirtualMachineImage(m).png differ
diff --git a/dist/Compute/AzureVirtualMachineImage(m).svg b/dist/Compute/AzureVirtualMachineImage(m).svg
new file mode 100644
index 00000000..32deb4e3
--- /dev/null
+++ b/dist/Compute/AzureVirtualMachineImage(m).svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.8125 2.804688 L 65.769531 2.800781 L 3.800781 2.800781 C 1.695313 2.800781 0 4.65625 0 6.726563 L 0 49.304688 C 0 51.367188 1.695313 53.199219 3.800781 53.199219 L 5.277344 53.199219 Z M 65.8125 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 33.316406 42.851563 C 33.25 42.851563 33.1875 42.835938 33.132813 42.804688 L 21.1875 36.023438 C 21.070313 35.964844 21 35.84375 21 35.714844 L 21 22.113281 C 21 21.984375 21.070313 21.867188 21.183594 21.800781 C 21.296875 21.738281 21.4375 21.738281 21.550781 21.800781 L 33.496094 28.578125 C 33.605469 28.644531 33.671875 28.761719 33.671875 28.890625 L 33.671875 42.496094 C 33.671875 42.621094 33.605469 42.738281 33.496094 42.804688 C 33.441406 42.835938 33.378906 42.851563 33.316406 42.851563 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.699219 42.851563 C 36.632813 42.851563 36.566406 42.835938 36.511719 42.804688 C 36.402344 42.738281 36.335938 42.621094 36.335938 42.496094 L 36.335938 28.976563 C 36.335938 28.851563 36.40625 28.730469 36.511719 28.667969 L 48.457031 21.890625 C 48.566406 21.824219 48.707031 21.824219 48.816406 21.890625 C 48.929688 21.953125 49 22.070313 49 22.199219 L 49 35.714844 C 49 35.84375 48.929688 35.964844 48.816406 36.023438 L 36.875 42.804688 C 36.820313 42.835938 36.761719 42.851563 36.699219 42.851563 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 43.398438 53.199219 L 26.601563 53.199219 C 28.886719 61.273438 26.058594 63 12.601563 63 L 12.601563 67.199219 L 57.398438 67.199219 L 57.398438 63 C 43.941406 63 41.109375 61.28125 43.398438 53.199219 Z M 43.398438 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.65625 0 6.726563 L 0 49.304688 C 0 51.363281 1.699219 53.199219 3.804688 53.199219 L 65.769531 53.199219 C 67.871094 53.199219 70 51.363281 70 49.304688 L 70 6.726563 C 70 4.648438 67.871094 2.800781 65.769531 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 47.601563 L 5.601563 47.601563 L 5.601563 8.398438 Z M 64.398438 8.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 12.601563 62.96875 L 57.398438 63 L 57.398438 67.199219 L 12.601563 67.199219 Z M 12.601563 62.96875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35.722656 5.734375 C 35.722656 6.28125 35.277344 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.734375 6.28125 33.734375 5.734375 C 33.734375 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.277344 4.738281 35.722656 5.183594 35.722656 5.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.039063 26.324219 C 34.972656 26.320313 34.910156 26.304688 34.855469 26.273438 L 22.871094 19.472656 C 22.761719 19.40625 22.691406 19.289063 22.691406 19.160156 C 22.691406 19.035156 22.761719 18.917969 22.871094 18.855469 L 34.78125 12.097656 C 34.894531 12.035156 35.03125 12.035156 35.140625 12.097656 L 47.128906 18.898438 C 47.242188 18.960938 47.308594 19.082031 47.308594 19.207031 C 47.308594 19.335938 47.242188 19.453125 47.128906 19.515625 L 35.222656 26.269531 C 35.167969 26.304688 35.101563 26.320313 35.039063 26.324219 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 21 11.199219 L 8.398438 11.199219 L 8.398438 23.800781 L 12.601563 23.800781 L 12.601563 15.398438 L 21 15.398438 Z M 8.398438 32.199219 L 8.398438 44.800781 L 21 44.800781 L 21 40.601563 L 12.601563 40.601563 L 12.601563 32.199219 Z M 49 44.800781 L 61.601563 44.800781 L 61.601563 32.199219 L 57.398438 32.199219 L 57.398438 40.601563 L 49 40.601563 Z M 61.601563 23.800781 L 61.601563 11.199219 L 49 11.199219 L 49 15.398438 L 57.398438 15.398438 L 57.398438 23.800781 Z M 61.601563 23.800781 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureVirtualMachineImage.png b/dist/Compute/AzureVirtualMachineImage.png
new file mode 100644
index 00000000..cddc897b
Binary files /dev/null and b/dist/Compute/AzureVirtualMachineImage.png differ
diff --git a/dist/Compute/AzureVirtualMachineImage.puml b/dist/Compute/AzureVirtualMachineImage.puml
new file mode 100644
index 00000000..5994dc7c
--- /dev/null
+++ b/dist/Compute/AzureVirtualMachineImage.puml
@@ -0,0 +1,10 @@
+sprite $AzureVirtualMachineImage [70x70/16z] {
+rTPNSYCn38HXX4PxTVyBBqjGUIXw4eOEqdU0_u4Hybfqqhs1c4A6YSPif3744U0WqiGKFin6-Wedl6e5sk4EruMD5PSEUsx1ZahdR0NIs5mbL9AVhwW_C8N9
+0apmP5iLunEJ9nhinQcAonSMnGfKrdYjeh8EfGeXApIgwqB_qa1jTNElmrRM18MA6Vf3rrWsi5jvvjO46_Hx76WuEAYOnsDvT6dKAYcN1sG3NAaaC04pbLoU
+m6p5IU8TAp0pL2fXpUhPBLMaUPjAR5UYz69kLAgl55OgPAMIVAW4JrLqdBFwoZWtuVmFYy_Av6z_hv1pbVIhbGalMPbEpKOI9YF9lYC2yU-8YAZvkXZ0rwdi
+kGrShlWOAYfNn52Hjw-Cws9oWTy6b3hykuseKg4UsHWH9aUSTnz7blze3LZn3XLZGSYB-Wy
+}
+
+AzureEntityColoring(AzureVirtualMachineImage)
+!define AzureVirtualMachineImage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualMachineImage, AzureVirtualMachineImage)
+!define AzureVirtualMachineImage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualMachineImage, AzureVirtualMachineImage)
diff --git a/dist/Compute/AzureVirtualMachineImage.svg b/dist/Compute/AzureVirtualMachineImage.svg
new file mode 100644
index 00000000..06efc0cd
--- /dev/null
+++ b/dist/Compute/AzureVirtualMachineImage.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.8125 2.804688 L 65.769531 2.800781 L 3.800781 2.800781 C 1.695313 2.800781 0 4.65625 0 6.726563 L 0 49.304688 C 0 51.367188 1.695313 53.199219 3.800781 53.199219 L 5.277344 53.199219 Z M 65.8125 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 33.316406 42.851563 C 33.25 42.851563 33.1875 42.835938 33.132813 42.804688 L 21.1875 36.023438 C 21.070313 35.964844 21 35.84375 21 35.714844 L 21 22.113281 C 21 21.984375 21.070313 21.867188 21.183594 21.800781 C 21.296875 21.738281 21.4375 21.738281 21.550781 21.800781 L 33.496094 28.578125 C 33.605469 28.644531 33.671875 28.761719 33.671875 28.890625 L 33.671875 42.496094 C 33.671875 42.621094 33.605469 42.738281 33.496094 42.804688 C 33.441406 42.835938 33.378906 42.851563 33.316406 42.851563 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.699219 42.851563 C 36.632813 42.851563 36.566406 42.835938 36.511719 42.804688 C 36.402344 42.738281 36.335938 42.621094 36.335938 42.496094 L 36.335938 28.976563 C 36.335938 28.851563 36.40625 28.730469 36.511719 28.667969 L 48.457031 21.890625 C 48.566406 21.824219 48.707031 21.824219 48.816406 21.890625 C 48.929688 21.953125 49 22.070313 49 22.199219 L 49 35.714844 C 49 35.84375 48.929688 35.964844 48.816406 36.023438 L 36.875 42.804688 C 36.820313 42.835938 36.761719 42.851563 36.699219 42.851563 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 43.398438 53.199219 L 26.601563 53.199219 C 28.886719 61.273438 26.058594 63 12.601563 63 L 12.601563 67.199219 L 57.398438 67.199219 L 57.398438 63 C 43.941406 63 41.109375 61.28125 43.398438 53.199219 Z M 43.398438 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.65625 0 6.726563 L 0 49.304688 C 0 51.363281 1.699219 53.199219 3.804688 53.199219 L 65.769531 53.199219 C 67.871094 53.199219 70 51.363281 70 49.304688 L 70 6.726563 C 70 4.648438 67.871094 2.800781 65.769531 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 47.601563 L 5.601563 47.601563 L 5.601563 8.398438 Z M 64.398438 8.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 12.601563 62.96875 L 57.398438 63 L 57.398438 67.199219 L 12.601563 67.199219 Z M 12.601563 62.96875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35.722656 5.734375 C 35.722656 6.28125 35.277344 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.734375 6.28125 33.734375 5.734375 C 33.734375 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.277344 4.738281 35.722656 5.183594 35.722656 5.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.039063 26.324219 C 34.972656 26.320313 34.910156 26.304688 34.855469 26.273438 L 22.871094 19.472656 C 22.761719 19.40625 22.691406 19.289063 22.691406 19.160156 C 22.691406 19.035156 22.761719 18.917969 22.871094 18.855469 L 34.78125 12.097656 C 34.894531 12.035156 35.03125 12.035156 35.140625 12.097656 L 47.128906 18.898438 C 47.242188 18.960938 47.308594 19.082031 47.308594 19.207031 C 47.308594 19.335938 47.242188 19.453125 47.128906 19.515625 L 35.222656 26.269531 C 35.167969 26.304688 35.101563 26.320313 35.039063 26.324219 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21 11.199219 L 8.398438 11.199219 L 8.398438 23.800781 L 12.601563 23.800781 L 12.601563 15.398438 L 21 15.398438 Z M 8.398438 32.199219 L 8.398438 44.800781 L 21 44.800781 L 21 40.601563 L 12.601563 40.601563 L 12.601563 32.199219 Z M 49 44.800781 L 61.601563 44.800781 L 61.601563 32.199219 L 57.398438 32.199219 L 57.398438 40.601563 L 49 40.601563 Z M 61.601563 23.800781 L 61.601563 11.199219 L 49 11.199219 L 49 15.398438 L 57.398438 15.398438 L 57.398438 23.800781 Z M 61.601563 23.800781 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureVirtualMachineLinux(m).png b/dist/Compute/AzureVirtualMachineLinux(m).png
new file mode 100644
index 00000000..a2abf747
Binary files /dev/null and b/dist/Compute/AzureVirtualMachineLinux(m).png differ
diff --git a/dist/Compute/AzureVirtualMachineLinux(m).svg b/dist/Compute/AzureVirtualMachineLinux(m).svg
new file mode 100644
index 00000000..5d4c3406
--- /dev/null
+++ b/dist/Compute/AzureVirtualMachineLinux(m).svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.816406 2.804688 C 65.800781 2.804688 65.785156 2.800781 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.28125 54.601563 Z M 65.816406 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.85098;stroke:none;"/>
+  </g>
+</mask>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface9" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.386719 19.363281 L 36.671875 19.804688 L 36.050781 18.675781 C 35.8125 18.242188 35.78125 17.878906 35.941406 17.488281 C 36.078125 17.15625 36.363281 16.964844 36.71875 16.964844 L 36.804688 16.96875 C 37.203125 17 37.601563 17.414063 37.71875 17.78125 C 37.847656 18.167969 37.847656 19.082031 37.386719 19.363281 Z M 37.386719 19.363281 "/>
+</g>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip2)">
+<use xlink:href="#surface9" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(245,250,255);fill-opacity:1;" d="M 30.421875 41.089844 C 30.421875 41.046875 26.875 35.355469 27.085938 34.367188 C 28.757813 26.425781 30.742188 25.265625 31.472656 23.589844 C 32.199219 21.910156 31.78125 20.363281 32.652344 20.34375 C 33.519531 20.324219 36.070313 20.515625 36.691406 20.722656 C 37.3125 20.925781 38.195313 21.554688 38.683594 22.925781 C 39.347656 24.179688 39.996094 25.433594 40.203125 26.863281 C 40.21875 26.996094 40.28125 27.121094 40.367188 27.21875 C 42.019531 29.042969 42.355469 31.253906 42.234375 33.589844 C 42.203125 34.183594 42.128906 35.054688 42.046875 35.359375 C 41.96875 35.667969 39.734375 42.890625 36.222656 42.800781 C 32.707031 42.710938 30.835938 41.40625 30.421875 41.089844 Z M 30.421875 41.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 49.320313 39.40625 C 48.035156 39.339844 47.355469 38.566406 47.347656 37.828125 C 47.34375 36.960938 47.707031 35.875 46.453125 35.765625 C 45.199219 35.65625 42.636719 35.523438 41.949219 35.394531 C 40.449219 35.121094 40.375 35.730469 40.351563 36.167969 C 40.339844 36.371094 40.527344 38.402344 40.332031 39.195313 C 40.34375 39.539063 40.320313 39.878906 40.265625 40.222656 C 40.125 41.148438 40.015625 42.078125 39.894531 43.003906 C 39.882813 43.457031 39.878906 43.910156 39.871094 44.363281 C 40.960938 45.964844 43.078125 46.027344 44.390625 44.636719 C 45.621094 43.382813 47.105469 42.519531 48.671875 41.761719 C 49.113281 41.546875 49.53125 41.222656 49.765625 40.601563 C 50.003906 39.976563 49.78125 39.425781 49.320313 39.40625 Z M 49.320313 39.40625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 32.214844 38.628906 C 32.039063 39.496094 31.097656 40.261719 30.613281 40.195313 C 30.3125 40.03125 29.496094 38.949219 29.320313 38.683594 C 28.785156 37.878906 26.457031 34.539063 25.777344 34.792969 C 25.558594 34.820313 25.429688 34.976563 25.316406 35.144531 C 25.269531 35.160156 25.226563 35.179688 25.179688 35.199219 C 24.832031 34.449219 24.859375 33.699219 25.25 32.984375 C 26.105469 31.417969 26.503906 29.804688 26.941406 28.0625 C 27.085938 27.480469 27.445313 26.992188 27.8125 26.523438 C 28.503906 25.648438 28.484375 24.769531 29.1875 23.90625 C 29.636719 23.355469 30.03125 22.753906 29.988281 22.042969 C 29.871094 20.03125 29.613281 18.074219 29.699219 16.058594 C 29.785156 14.082031 31.507813 12.421875 33.445313 11.710938 C 35.453125 10.972656 37.351563 11.335938 38.964844 12.78125 C 40.230469 13.914063 40.785156 15.40625 40.882813 17.078125 C 40.902344 17.386719 40.917969 17.695313 40.902344 18 C 40.757813 21.148438 42.082031 23.707031 44.085938 25.992188 C 46.011719 28.1875 46.765625 30.8125 46.9375 33.652344 C 46.984375 34.394531 46.746094 35.089844 46.441406 35.757813 C 46.019531 36.722656 45.417969 37.324219 44.867188 37.570313 C 44.316406 37.820313 42.140625 37.992188 42.5625 36.5625 C 42.769531 35.859375 42.804688 35.5625 41.9375 35.386719 C 42 34.796875 42.09375 34.207031 42.125 33.617188 C 42.246094 31.277344 41.835938 29.429688 40.0625 27.769531 C 39.515625 27.253906 40.03125 27.171875 40.011719 26.710938 C 39.964844 25.460938 39.238281 24.203125 38.574219 22.953125 C 38.515625 22.71875 38.40625 22.515625 38.253906 22.332031 C 38.304688 22.136719 38.179688 21.996094 38.101563 21.839844 C 38.199219 21.445313 38.371094 21.058594 38.289063 20.636719 C 38.296875 20.273438 34.558594 20.117188 34.089844 20.304688 C 33.894531 20.238281 31.90625 20.152344 31.910156 20.183594 C 31.640625 20.386719 31.453125 20.648438 31.367188 20.96875 C 31.289063 21.273438 31.773438 21.898438 31.828125 22 C 31.804688 22.429688 31.78125 22.855469 31.757813 23.28125 C 31.71875 23.433594 31.675781 23.582031 31.632813 23.730469 C 31.316406 24.222656 30.988281 24.707031 30.683594 25.203125 C 30.40625 25.652344 30.089844 26.085938 30.050781 26.636719 C 29.835938 27.195313 30.609375 27.9375 29.90625 28.589844 C 29.199219 29.242188 28.488281 32.390625 28.480469 33.132813 C 28.464844 33.929688 29.921875 35.753906 30.480469 36.28125 C 31.503906 37.242188 32.421875 37.609375 32.214844 38.628906 Z M 32.214844 38.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 31.507813 41.632813 C 33.015625 42.058594 37.253906 42.1875 39.316406 40.121094 C 39.660156 39.804688 40.003906 39.492188 40.351563 39.175781 C 40.363281 39.519531 40.339844 39.859375 40.285156 40.207031 C 40.144531 41.128906 40.035156 42.058594 39.914063 42.988281 C 39.902344 43.4375 39.898438 43.890625 39.890625 44.34375 C 37.992188 43.820313 35.140625 43.636719 34.289063 43.679688 C 33.441406 43.726563 32.277344 43.9375 31.605469 44.117188 Z M 31.507813 41.632813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(77,179,255);fill-opacity:1;" d="M 47.460938 38.058594 C 47.433594 38.011719 47.402344 37.96875 47.367188 37.921875 C 47.398438 37.96875 47.429688 38.011719 47.460938 38.058594 Z M 47.460938 38.058594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(77,179,255);fill-opacity:1;" d="M 46.910156 36.097656 C 46.871094 36.058594 46.828125 36.019531 46.789063 35.980469 C 46.828125 36.019531 46.871094 36.058594 46.910156 36.097656 Z M 46.910156 36.097656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 30.644531 40.371094 C 30.664063 40.402344 30.683594 40.4375 30.703125 40.46875 C 30.6875 40.4375 30.664063 40.402344 30.644531 40.371094 Z M 30.644531 40.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 30.027344 39.464844 C 28.929688 38.324219 28.085938 36.9375 27.308594 35.390625 C 26.902344 34.574219 25.65625 33.925781 25.191406 35.207031 C 24.726563 36.488281 23.988281 37.007813 22.78125 36.847656 C 21.898438 36.730469 21.066406 37.40625 21.4375 38.523438 C 21.835938 39.726563 22.289063 40.671875 21.417969 41.511719 C 20.542969 42.355469 20.898438 43.226563 22.128906 43.394531 C 23.359375 43.5625 26.59375 44.296875 28.460938 45.285156 C 30.328125 46.269531 31.816406 44.40625 32.015625 43.855469 C 32.507813 42.488281 31.128906 40.605469 30.027344 39.464844 Z M 30.027344 39.464844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 34.191406 26.078125 C 33.140625 26.078125 32.4375 25.082031 31.941406 24.214844 C 31.9375 24.214844 30.316406 21.9375 30.90625 20.683594 C 30.992188 20.503906 31.128906 20.210938 32.800781 19.175781 L 33.109375 18.914063 L 33.40625 18.765625 L 33.597656 18.6875 C 33.828125 18.617188 34.089844 18.542969 34.335938 18.542969 L 34.453125 18.542969 L 34.671875 18.59375 L 35.171875 18.761719 L 39.226563 20.257813 L 39.339844 20.867188 C 39.433594 21.359375 39.308594 21.789063 39.207031 22.132813 L 39.054688 22.730469 L 38.707031 22.855469 C 38.402344 22.96875 37.921875 23.480469 37.535156 23.894531 C 37.15625 24.300781 36.792969 24.6875 36.421875 24.929688 C 36.289063 25.019531 36.144531 25.132813 36.003906 25.234375 C 35.425781 25.667969 34.875 26.078125 34.191406 26.078125 Z M 34.191406 26.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 36.898438 21.097656 C 36.179688 21.71875 35.359375 22.25 34.339844 22.277344 C 34.300781 22.308594 34.300781 22.308594 34.339844 22.277344 C 34.347656 22.046875 34.332031 21.824219 34.136719 21.652344 C 33.972656 21.515625 33.953125 21.304688 34 21.125 C 34.191406 20.390625 34.074219 19.648438 34.101563 18.910156 C 33.910156 18.84375 33.46875 19.007813 33.414063 19.019531 C 33.324219 19.066406 33.234375 19.109375 33.144531 19.15625 C 33.042969 19.238281 32.941406 19.324219 32.839844 19.410156 C 32.710938 19.492188 31.332031 20.332031 31.1875 20.632813 C 30.824219 21.40625 32.023438 23.296875 32.199219 23.519531 C 33.597656 25.976563 34.375 24.910156 35.691406 23.992188 C 36.394531 23.535156 37.3125 22.144531 38.113281 21.851563 C 38.210938 21.453125 38.378906 21.070313 38.300781 20.648438 C 37.796875 20.675781 37.347656 20.707031 36.898438 21.097656 Z M 36.898438 21.097656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(81,181,255);fill-opacity:1;" d="M 33.519531 18.921875 C 33.523438 18.925781 33.527344 18.921875 33.53125 18.925781 C 33.527344 18.917969 33.53125 18.917969 33.527344 18.910156 Z M 33.519531 18.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 37.726563 20.089844 C 38.03125 20.242188 38.308594 20.417969 38.300781 20.816406 C 37.75 20.851563 37.257813 20.886719 36.765625 21.3125 C 35.980469 21.988281 34.917969 22.996094 33.800781 23.027344 C 33.84375 22.660156 33.316406 22.132813 33.460938 21.503906 C 33.644531 20.699219 33.675781 19.722656 33.703125 18.914063 C 34.214844 18.710938 34.691406 18.898438 35.167969 19.046875 C 35.367188 19.167969 35.570313 19.289063 35.765625 19.40625 C 36.117188 19.542969 36.464844 19.675781 36.8125 19.808594 C 37.085938 19.996094 37.414063 20.019531 37.726563 20.089844 Z M 37.726563 20.089844 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.199219 17.574219 L 33.601563 17.574219 L 33.601563 18.976563 L 32.199219 18.976563 Z M 32.199219 17.574219 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.398438 17.574219 L 37.800781 17.574219 L 37.800781 18.976563 L 36.398438 18.976563 Z M 36.398438 17.574219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 46.199219 53.199219 L 26.980469 53.199219 C 29.289063 61.597656 26.1875 62.800781 12.601563 62.800781 L 12.601563 67.199219 L 58.800781 67.199219 L 58.800781 62.800781 C 45.214844 62.800781 43.882813 61.601563 46.191406 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0.00390625 4.683594 0.00390625 6.785156 L 0.00390625 50.644531 C 0.00390625 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.773438 54.597656 C 67.875 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.875 2.800781 65.773438 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.601563 49 L 5.601563 8.398438 Z M 64.398438 8.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 12.601563 63 L 58.800781 63 L 58.800781 67.199219 L 12.601563 67.199219 Z M 12.601563 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35.726563 5.734375 C 35.726563 6.28125 35.28125 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.28125 4.738281 35.726563 5.183594 35.726563 5.734375 "/>
+<use xlink:href="#surface11" mask="url(#mask1)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureVirtualMachineLinux.png b/dist/Compute/AzureVirtualMachineLinux.png
new file mode 100644
index 00000000..0ac870ce
Binary files /dev/null and b/dist/Compute/AzureVirtualMachineLinux.png differ
diff --git a/dist/Compute/AzureVirtualMachineLinux.puml b/dist/Compute/AzureVirtualMachineLinux.puml
new file mode 100644
index 00000000..374fa78d
--- /dev/null
+++ b/dist/Compute/AzureVirtualMachineLinux.puml
@@ -0,0 +1,10 @@
+sprite $AzureVirtualMachineLinux [70x70/16z] {
+vT27eHqW28LXKGH5plxhXjUkwOcIdd-0ZrB-h2ZPiy4zbKYlXNeMYHhtRyNy3IHARv9Nv4D54lrrYawR8wce0P5fHb77IokZ6DwQ2GMFrhsYs6b6SGVWMMLq
+O55MSMKnH2FnNHFXA9nvh_YKpjmb54ieIoIG2S3rLXdm8H98Ty0k5NM8gPep3G1wfqmigijN8whxfaD57Ps8meWM0BjH362A7Wh6XU90UoYCoC-L0KpQAQ9n
+eko3TXMH7IiEVmNsP_nK6O1ze1WYFLGMC7-0ul2MLbGCHhjcDt-977CZeW3cXQA0RKNTfrmeCe7-K7Q7YYolhuea56clo9mPfRzSiv1In2D48wKiE11fIXag
+8ZfcIjdzRyhkpr4aK_iHI2-SHuHAQPn3EfUlnVFZHZclVgB8XKAVA3snIqxX7w7G-07VhHlP2HriKLlVnWSDuVeDgUbHNz1OZgf_lbBbA2f_PEy
+}
+
+AzureEntityColoring(AzureVirtualMachineLinux)
+!define AzureVirtualMachineLinux(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualMachineLinux, AzureVirtualMachineLinux)
+!define AzureVirtualMachineLinux(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualMachineLinux, AzureVirtualMachineLinux)
diff --git a/dist/Compute/AzureVirtualMachineLinux.svg b/dist/Compute/AzureVirtualMachineLinux.svg
new file mode 100644
index 00000000..5cca2716
--- /dev/null
+++ b/dist/Compute/AzureVirtualMachineLinux.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.816406 2.804688 C 65.800781 2.804688 65.785156 2.800781 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.28125 54.601563 Z M 65.816406 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.85098;stroke:none;"/>
+  </g>
+</mask>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface9" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.386719 19.363281 L 36.671875 19.804688 L 36.050781 18.675781 C 35.8125 18.242188 35.78125 17.878906 35.941406 17.488281 C 36.078125 17.15625 36.363281 16.964844 36.71875 16.964844 L 36.804688 16.96875 C 37.203125 17 37.601563 17.414063 37.71875 17.78125 C 37.847656 18.167969 37.847656 19.082031 37.386719 19.363281 Z M 37.386719 19.363281 "/>
+</g>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip2)">
+<use xlink:href="#surface9" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.431373%,98.431373%,97.647059%);fill-opacity:1;" d="M 30.421875 41.089844 C 30.421875 41.046875 26.875 35.355469 27.085938 34.367188 C 28.757813 26.425781 30.742188 25.265625 31.472656 23.589844 C 32.199219 21.910156 31.78125 20.363281 32.652344 20.34375 C 33.519531 20.324219 36.070313 20.515625 36.691406 20.722656 C 37.3125 20.925781 38.195313 21.554688 38.683594 22.925781 C 39.347656 24.179688 39.996094 25.433594 40.203125 26.863281 C 40.21875 26.996094 40.28125 27.121094 40.367188 27.21875 C 42.019531 29.042969 42.355469 31.253906 42.234375 33.589844 C 42.203125 34.183594 42.128906 35.054688 42.046875 35.359375 C 41.96875 35.667969 39.734375 42.890625 36.222656 42.800781 C 32.707031 42.710938 30.835938 41.40625 30.421875 41.089844 Z M 30.421875 41.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 49.320313 39.40625 C 48.035156 39.339844 47.355469 38.566406 47.347656 37.828125 C 47.34375 36.960938 47.707031 35.875 46.453125 35.765625 C 45.199219 35.65625 42.636719 35.523438 41.949219 35.394531 C 40.449219 35.121094 40.375 35.730469 40.351563 36.167969 C 40.339844 36.371094 40.527344 38.402344 40.332031 39.195313 C 40.34375 39.539063 40.320313 39.878906 40.265625 40.222656 C 40.125 41.148438 40.015625 42.078125 39.894531 43.003906 C 39.882813 43.457031 39.878906 43.910156 39.871094 44.363281 C 40.960938 45.964844 43.078125 46.027344 44.390625 44.636719 C 45.621094 43.382813 47.105469 42.519531 48.671875 41.761719 C 49.113281 41.546875 49.53125 41.222656 49.765625 40.601563 C 50.003906 39.976563 49.78125 39.425781 49.320313 39.40625 Z M 49.320313 39.40625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 32.214844 38.628906 C 32.039063 39.496094 31.097656 40.261719 30.613281 40.195313 C 30.3125 40.03125 29.496094 38.949219 29.320313 38.683594 C 28.785156 37.878906 26.457031 34.539063 25.777344 34.792969 C 25.558594 34.820313 25.429688 34.976563 25.316406 35.144531 C 25.269531 35.160156 25.226563 35.179688 25.179688 35.199219 C 24.832031 34.449219 24.859375 33.699219 25.25 32.984375 C 26.105469 31.417969 26.503906 29.804688 26.941406 28.0625 C 27.085938 27.480469 27.445313 26.992188 27.8125 26.523438 C 28.503906 25.648438 28.484375 24.769531 29.1875 23.90625 C 29.636719 23.355469 30.03125 22.753906 29.988281 22.042969 C 29.871094 20.03125 29.613281 18.074219 29.699219 16.058594 C 29.785156 14.082031 31.507813 12.421875 33.445313 11.710938 C 35.453125 10.972656 37.351563 11.335938 38.964844 12.78125 C 40.230469 13.914063 40.785156 15.40625 40.882813 17.078125 C 40.902344 17.386719 40.917969 17.695313 40.902344 18 C 40.757813 21.148438 42.082031 23.707031 44.085938 25.992188 C 46.011719 28.1875 46.765625 30.8125 46.9375 33.652344 C 46.984375 34.394531 46.746094 35.089844 46.441406 35.757813 C 46.019531 36.722656 45.417969 37.324219 44.867188 37.570313 C 44.316406 37.820313 42.140625 37.992188 42.5625 36.5625 C 42.769531 35.859375 42.804688 35.5625 41.9375 35.386719 C 42 34.796875 42.09375 34.207031 42.125 33.617188 C 42.246094 31.277344 41.835938 29.429688 40.0625 27.769531 C 39.515625 27.253906 40.03125 27.171875 40.011719 26.710938 C 39.964844 25.460938 39.238281 24.203125 38.574219 22.953125 C 38.515625 22.71875 38.40625 22.515625 38.253906 22.332031 C 38.304688 22.136719 38.179688 21.996094 38.101563 21.839844 C 38.199219 21.445313 38.371094 21.058594 38.289063 20.636719 C 38.296875 20.273438 34.558594 20.117188 34.089844 20.304688 C 33.894531 20.238281 31.90625 20.152344 31.910156 20.183594 C 31.640625 20.386719 31.453125 20.648438 31.367188 20.96875 C 31.289063 21.273438 31.773438 21.898438 31.828125 22 C 31.804688 22.429688 31.78125 22.855469 31.757813 23.28125 C 31.71875 23.433594 31.675781 23.582031 31.632813 23.730469 C 31.316406 24.222656 30.988281 24.707031 30.683594 25.203125 C 30.40625 25.652344 30.089844 26.085938 30.050781 26.636719 C 29.835938 27.195313 30.609375 27.9375 29.90625 28.589844 C 29.199219 29.242188 28.488281 32.390625 28.480469 33.132813 C 28.464844 33.929688 29.921875 35.753906 30.480469 36.28125 C 31.503906 37.242188 32.421875 37.609375 32.214844 38.628906 Z M 32.214844 38.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 31.507813 41.632813 C 33.015625 42.058594 37.253906 42.1875 39.316406 40.121094 C 39.660156 39.804688 40.003906 39.492188 40.351563 39.175781 C 40.363281 39.519531 40.339844 39.859375 40.285156 40.207031 C 40.144531 41.128906 40.035156 42.058594 39.914063 42.988281 C 39.902344 43.4375 39.898438 43.890625 39.890625 44.34375 C 37.992188 43.820313 35.140625 43.636719 34.289063 43.679688 C 33.441406 43.726563 32.277344 43.9375 31.605469 44.117188 Z M 31.507813 41.632813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,64.705882%,8.627451%);fill-opacity:1;" d="M 47.460938 38.058594 C 47.433594 38.011719 47.402344 37.96875 47.367188 37.921875 C 47.398438 37.96875 47.429688 38.011719 47.460938 38.058594 Z M 47.460938 38.058594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,64.705882%,8.627451%);fill-opacity:1;" d="M 46.910156 36.097656 C 46.871094 36.058594 46.828125 36.019531 46.789063 35.980469 C 46.828125 36.019531 46.871094 36.058594 46.910156 36.097656 Z M 46.910156 36.097656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.901961%,37.254902%,2.745098%);fill-opacity:1;" d="M 30.644531 40.371094 C 30.664063 40.402344 30.683594 40.4375 30.703125 40.46875 C 30.6875 40.4375 30.664063 40.402344 30.644531 40.371094 Z M 30.644531 40.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 30.027344 39.464844 C 28.929688 38.324219 28.085938 36.9375 27.308594 35.390625 C 26.902344 34.574219 25.65625 33.925781 25.191406 35.207031 C 24.726563 36.488281 23.988281 37.007813 22.78125 36.847656 C 21.898438 36.730469 21.066406 37.40625 21.4375 38.523438 C 21.835938 39.726563 22.289063 40.671875 21.417969 41.511719 C 20.542969 42.355469 20.898438 43.226563 22.128906 43.394531 C 23.359375 43.5625 26.59375 44.296875 28.460938 45.285156 C 30.328125 46.269531 31.816406 44.40625 32.015625 43.855469 C 32.507813 42.488281 31.128906 40.605469 30.027344 39.464844 Z M 30.027344 39.464844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 34.191406 26.078125 C 33.140625 26.078125 32.4375 25.082031 31.941406 24.214844 C 31.9375 24.214844 30.316406 21.9375 30.90625 20.683594 C 30.992188 20.503906 31.128906 20.210938 32.800781 19.175781 L 33.109375 18.914063 L 33.40625 18.765625 L 33.597656 18.6875 C 33.828125 18.617188 34.089844 18.542969 34.335938 18.542969 L 34.453125 18.542969 L 34.671875 18.59375 L 35.171875 18.761719 L 39.226563 20.257813 L 39.339844 20.867188 C 39.433594 21.359375 39.308594 21.789063 39.207031 22.132813 L 39.054688 22.730469 L 38.707031 22.855469 C 38.402344 22.96875 37.921875 23.480469 37.535156 23.894531 C 37.15625 24.300781 36.792969 24.6875 36.421875 24.929688 C 36.289063 25.019531 36.144531 25.132813 36.003906 25.234375 C 35.425781 25.667969 34.875 26.078125 34.191406 26.078125 Z M 34.191406 26.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 36.898438 21.097656 C 36.179688 21.71875 35.359375 22.25 34.339844 22.277344 C 34.300781 22.308594 34.300781 22.308594 34.339844 22.277344 C 34.347656 22.046875 34.332031 21.824219 34.136719 21.652344 C 33.972656 21.515625 33.953125 21.304688 34 21.125 C 34.191406 20.390625 34.074219 19.648438 34.101563 18.910156 C 33.910156 18.84375 33.46875 19.007813 33.414063 19.019531 C 33.324219 19.066406 33.234375 19.109375 33.144531 19.15625 C 33.042969 19.238281 32.941406 19.324219 32.839844 19.410156 C 32.710938 19.492188 31.332031 20.332031 31.1875 20.632813 C 30.824219 21.40625 32.023438 23.296875 32.199219 23.519531 C 33.597656 25.976563 34.375 24.910156 35.691406 23.992188 C 36.394531 23.535156 37.3125 22.144531 38.113281 21.851563 C 38.210938 21.453125 38.378906 21.070313 38.300781 20.648438 C 37.796875 20.675781 37.347656 20.707031 36.898438 21.097656 Z M 36.898438 21.097656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.019608%,66.27451%,2.352941%);fill-opacity:1;" d="M 33.519531 18.921875 C 33.523438 18.925781 33.527344 18.921875 33.53125 18.925781 C 33.527344 18.917969 33.53125 18.917969 33.527344 18.910156 Z M 33.519531 18.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 37.726563 20.089844 C 38.03125 20.242188 38.308594 20.417969 38.300781 20.816406 C 37.75 20.851563 37.257813 20.886719 36.765625 21.3125 C 35.980469 21.988281 34.917969 22.996094 33.800781 23.027344 C 33.84375 22.660156 33.316406 22.132813 33.460938 21.503906 C 33.644531 20.699219 33.675781 19.722656 33.703125 18.914063 C 34.214844 18.710938 34.691406 18.898438 35.167969 19.046875 C 35.367188 19.167969 35.570313 19.289063 35.765625 19.40625 C 36.117188 19.542969 36.464844 19.675781 36.8125 19.808594 C 37.085938 19.996094 37.414063 20.019531 37.726563 20.089844 Z M 37.726563 20.089844 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.199219 17.574219 L 33.601563 17.574219 L 33.601563 18.976563 L 32.199219 18.976563 Z M 32.199219 17.574219 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.398438 17.574219 L 37.800781 17.574219 L 37.800781 18.976563 L 36.398438 18.976563 Z M 36.398438 17.574219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 46.199219 53.199219 L 26.980469 53.199219 C 29.289063 61.597656 26.1875 62.800781 12.601563 62.800781 L 12.601563 67.199219 L 58.800781 67.199219 L 58.800781 62.800781 C 45.214844 62.800781 43.882813 61.601563 46.191406 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0.00390625 4.683594 0.00390625 6.785156 L 0.00390625 50.644531 C 0.00390625 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.773438 54.597656 C 67.875 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.875 2.800781 65.773438 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.601563 49 L 5.601563 8.398438 Z M 64.398438 8.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 12.601563 63 L 58.800781 63 L 58.800781 67.199219 L 12.601563 67.199219 Z M 12.601563 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35.726563 5.734375 C 35.726563 6.28125 35.28125 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.28125 4.738281 35.726563 5.183594 35.726563 5.734375 "/>
+<use xlink:href="#surface11" mask="url(#mask1)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureVirtualMachineScaleSet(m).png b/dist/Compute/AzureVirtualMachineScaleSet(m).png
index dde363ba..5805b89e 100644
Binary files a/dist/Compute/AzureVirtualMachineScaleSet(m).png and b/dist/Compute/AzureVirtualMachineScaleSet(m).png differ
diff --git a/dist/Compute/AzureVirtualMachineScaleSet(m).svg b/dist/Compute/AzureVirtualMachineScaleSet(m).svg
index 1d564230..1d644106 100644
--- a/dist/Compute/AzureVirtualMachineScaleSet(m).svg
+++ b/dist/Compute/AzureVirtualMachineScaleSet(m).svg
@@ -1,6 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 50.042969 0.00390625 C 50.03125 0.00390625 50.023438 0 50.011719 0 L 2.890625 0 C 1.289063 0 0 1.429688 0 3.027344 L 0 35.839844 C 0 37.429688 1.289063 38.84375 2.890625 38.84375 L 4.015625 38.84375 Z M 50.042969 0.00390625 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 58.371094 10.441406 C 58.363281 10.441406 58.351563 10.4375 58.339844 10.4375 L 11.222656 10.4375 C 9.621094 10.4375 8.328125 11.867188 8.328125 13.464844 L 8.328125 46.277344 C 8.328125 47.867188 9.621094 49.28125 11.222656 49.28125 L 12.34375 49.28125 Z M 58.371094 10.441406 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 66.816406 20.941406 C 66.804688 20.941406 66.796875 20.9375 66.785156 20.9375 L 19.664063 20.9375 C 18.0625 20.9375 16.773438 22.367188 16.773438 23.964844 L 16.773438 56.777344 C 16.773438 58.367188 18.0625 59.78125 19.664063 59.78125 L 20.785156 59.78125 Z M 66.816406 20.941406 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 42.621094 52.5625 C 42.566406 52.5625 42.519531 52.550781 42.476563 52.523438 L 33.132813 47.136719 C 33.042969 47.085938 32.988281 46.996094 32.988281 46.894531 L 32.988281 36.085938 C 32.988281 35.984375 33.042969 35.890625 33.132813 35.839844 C 33.21875 35.789063 33.324219 35.789063 33.417969 35.839844 L 42.761719 41.222656 C 42.84375 41.277344 42.898438 41.371094 42.898438 41.472656 L 42.898438 52.28125 C 42.898438 52.382813 42.84375 52.476563 42.761719 52.523438 C 42.714844 52.550781 42.667969 52.5625 42.621094 52.5625 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.265625 52.5625 C 45.214844 52.5625 45.167969 52.550781 45.121094 52.523438 C 45.035156 52.472656 44.980469 52.382813 44.980469 52.277344 L 44.980469 41.539063 C 44.980469 41.4375 45.035156 41.34375 45.121094 41.292969 L 54.460938 35.910156 C 54.550781 35.859375 54.65625 35.859375 54.746094 35.910156 C 54.832031 35.960938 54.886719 36.054688 54.886719 36.15625 L 54.886719 46.894531 C 54.886719 46.996094 54.832031 47.089844 54.746094 47.140625 L 45.402344 52.523438 C 45.363281 52.550781 45.3125 52.5625 45.265625 52.5625 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 43.878906 39.355469 C 43.9375 39.355469 43.972656 39.335938 44.011719 39.320313 L 53.300781 33.957031 C 53.394531 33.921875 53.449219 33.828125 53.449219 33.714844 C 53.449219 33.621094 53.394531 33.527344 53.300781 33.472656 L 43.953125 28.09375 C 43.863281 28.039063 43.769531 28.039063 43.675781 28.09375 L 34.386719 33.4375 C 34.292969 33.492188 34.253906 33.585938 34.253906 33.679688 C 34.253906 33.789063 34.292969 33.882813 34.386719 33.921875 L 43.730469 39.320313 C 43.789063 39.335938 43.824219 39.355469 43.878906 39.355469 Z M 42.539063 52.445313 C 42.578125 52.445313 42.632813 52.445313 42.671875 52.425781 C 42.761719 52.371094 42.820313 52.277344 42.820313 52.164063 L 42.820313 41.386719 C 42.820313 41.292969 42.761719 41.199219 42.671875 41.144531 L 33.363281 35.78125 C 33.269531 35.726563 33.15625 35.726563 33.0625 35.78125 C 32.988281 35.820313 32.933594 35.914063 32.933594 36.023438 L 32.933594 46.804688 C 32.933594 46.894531 32.988281 46.988281 33.0625 47.046875 L 42.390625 52.40625 C 42.429688 52.445313 42.484375 52.445313 42.539063 52.445313 Z M 45.164063 52.445313 C 45.21875 52.445313 45.277344 52.445313 45.3125 52.425781 L 54.621094 47.046875 C 54.714844 46.988281 54.769531 46.894531 54.769531 46.804688 L 54.769531 36.097656 C 54.769531 35.988281 54.714844 35.894531 54.621094 35.835938 C 54.527344 35.800781 54.4375 35.800781 54.34375 35.835938 L 45.035156 41.21875 C 44.941406 41.273438 44.886719 41.367188 44.886719 41.460938 L 44.886719 52.164063 C 44.886719 52.277344 44.941406 52.371094 45.035156 52.40625 C 45.070313 52.445313 45.128906 52.445313 45.164063 52.445313 Z M 41.253906 20.90625 L 35.539063 17.613281 C 35.445313 17.554688 35.335938 17.554688 35.261719 17.613281 L 29.527344 20.90625 L 19.210938 20.90625 C 17.628906 20.90625 16.347656 22.339844 16.347656 23.921875 L 16.347656 45.109375 L 12.363281 45.109375 L 12.363281 14.519531 L 57.378906 14.464844 L 57.378906 20.90625 Z M 50.769531 59.648438 L 66.21875 59.648438 C 67.804688 59.648438 69.421875 58.234375 69.421875 56.652344 L 69.421875 23.921875 C 69.421875 22.339844 67.804688 20.90625 66.21875 20.90625 L 61.417969 20.90625 L 61.417969 13.460938 C 61.417969 11.859375 59.796875 10.445313 58.214844 10.445313 L 53.078125 10.445313 L 53.078125 3.015625 C 53.09375 1.414063 51.476563 0 49.875 0 L 2.886719 0 C 1.285156 0 0 1.433594 0 3.015625 L 0 35.746094 C 0 37.328125 1.285156 38.742188 2.886719 38.742188 L 8.339844 38.742188 L 8.339844 46.1875 C 8.339844 47.769531 9.625 49.1875 11.226563 49.1875 L 16.347656 49.1875 L 16.347656 56.652344 C 16.347656 58.234375 17.628906 59.648438 19.210938 59.648438 L 36.320313 59.648438 C 38.054688 65.773438 35.726563 66.648438 25.523438 66.648438 L 25.523438 69.851563 L 60.226563 69.851563 L 60.226563 66.648438 C 50.023438 66.648438 49.019531 65.773438 50.769531 59.648438 Z M 65.8125 55.570313 L 20.777344 55.570313 L 20.777344 25.003906 L 65.8125 24.929688 Z M 32.878906 10.445313 L 27.199219 7.167969 C 27.105469 7.128906 27.011719 7.128906 26.921875 7.167969 L 21.242188 10.445313 L 11.226563 10.445313 C 9.625 10.445313 8.339844 11.859375 8.339844 13.460938 L 8.339844 34.664063 L 4.019531 34.664063 L 4.019531 4.078125 L 49.054688 4.019531 L 49.054688 10.445313 Z M 32.878906 10.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 50.011719 0 L 2.890625 0 C 1.292969 0 0 1.429688 0 3.027344 L 0 35.839844 C 0 37.429688 1.292969 38.84375 2.894531 38.84375 L 50.011719 38.84375 C 51.609375 38.84375 53.226563 37.429688 53.226563 35.839844 L 53.226563 3.027344 C 53.226563 1.425781 51.609375 0 50.011719 0 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 49.179688 34.753906 L 4.035156 34.753906 L 4.035156 4.089844 L 49.179688 4.023438 Z M 49.179688 34.753906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 27.164063 2.226563 C 27.164063 2.644531 26.828125 2.980469 26.410156 2.980469 C 25.992188 2.980469 25.65625 2.644531 25.65625 2.226563 C 25.65625 1.808594 25.992188 1.472656 26.410156 1.472656 C 26.828125 1.472656 27.164063 1.808594 27.164063 2.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 27.195313 18.492188 C 27.144531 18.492188 27.097656 18.476563 27.050781 18.453125 L 17.679688 13.050781 C 17.59375 13 17.539063 12.902344 17.539063 12.804688 C 17.539063 12.703125 17.59375 12.609375 17.679688 12.558594 L 26.996094 7.191406 C 27.082031 7.144531 27.1875 7.144531 27.273438 7.191406 L 36.652344 12.597656 C 36.738281 12.648438 36.789063 12.742188 36.789063 12.84375 C 36.789063 12.945313 36.738281 13.035156 36.652344 13.085938 L 27.335938 18.453125 C 27.292969 18.476563 27.246094 18.492188 27.195313 18.492188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 58.339844 10.4375 L 11.222656 10.4375 C 9.621094 10.4375 8.328125 11.867188 8.328125 13.464844 L 8.328125 46.28125 C 8.328125 47.867188 9.621094 49.28125 11.222656 49.28125 L 58.339844 49.28125 C 59.9375 49.28125 61.554688 47.867188 61.554688 46.28125 L 61.554688 13.464844 C 61.554688 11.863281 59.9375 10.4375 58.339844 10.4375 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.507813 45.191406 L 12.363281 45.191406 L 12.363281 14.527344 L 57.507813 14.464844 Z M 57.507813 45.191406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35.492188 12.664063 C 35.492188 13.082031 35.152344 13.421875 34.738281 13.421875 C 34.316406 13.421875 33.980469 13.082031 33.980469 12.664063 C 33.980469 12.25 34.316406 11.910156 34.738281 11.910156 C 35.152344 11.910156 35.492188 12.246094 35.492188 12.664063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.523438 28.929688 C 35.472656 28.929688 35.425781 28.914063 35.378906 28.890625 L 26.007813 23.488281 C 25.921875 23.4375 25.867188 23.339844 25.867188 23.242188 C 25.867188 23.140625 25.921875 23.046875 26.007813 22.996094 L 35.324219 17.628906 C 35.410156 17.578125 35.515625 17.578125 35.601563 17.628906 L 44.980469 23.035156 C 45.066406 23.085938 45.121094 23.179688 45.121094 23.277344 C 45.121094 23.382813 45.066406 23.472656 44.980469 23.523438 L 35.667969 28.890625 C 35.621094 28.914063 35.574219 28.929688 35.523438 28.929688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 51.289063 59.777344 L 36.816406 59.777344 C 38.554688 65.910156 36.21875 66.789063 25.984375 66.789063 L 25.984375 70 L 60.785156 70 L 60.785156 66.789063 C 50.550781 66.789063 49.546875 65.914063 51.289063 59.777344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 66.785156 20.9375 L 19.664063 20.9375 C 18.0625 20.9375 16.773438 22.367188 16.773438 23.964844 L 16.773438 56.777344 C 16.773438 58.367188 18.0625 59.78125 19.664063 59.78125 L 66.785156 59.78125 C 68.382813 59.78125 70 58.367188 70 56.777344 L 70 23.964844 C 70 22.363281 68.382813 20.9375 66.785156 20.9375 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 65.953125 55.691406 L 20.808594 55.691406 L 20.808594 25.027344 L 65.953125 24.960938 Z M 65.953125 55.691406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 25.984375 66.789063 L 60.785156 66.789063 L 60.785156 70 L 25.984375 70 Z M 25.984375 66.789063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 43.9375 23.164063 C 43.9375 23.582031 43.597656 23.917969 43.179688 23.917969 C 42.761719 23.917969 42.425781 23.582031 42.425781 23.164063 C 42.425781 22.746094 42.761719 22.410156 43.179688 22.410156 C 43.597656 22.410156 43.9375 22.746094 43.9375 23.164063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.96875 39.429688 C 43.917969 39.429688 43.871094 39.414063 43.824219 39.390625 L 34.453125 33.988281 C 34.367188 33.9375 34.3125 33.839844 34.3125 33.742188 C 34.3125 33.640625 34.367188 33.546875 34.453125 33.496094 L 43.765625 28.128906 C 43.855469 28.078125 43.960938 28.078125 44.046875 28.128906 L 53.421875 33.535156 C 53.507813 33.585938 53.5625 33.679688 53.5625 33.777344 C 53.5625 33.882813 53.511719 33.972656 53.421875 34.023438 L 44.109375 39.390625 C 44.066406 39.414063 44.019531 39.429688 43.96875 39.429688 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
 </g>
 </svg>
diff --git a/dist/Compute/AzureVirtualMachineScaleSet.puml b/dist/Compute/AzureVirtualMachineScaleSet.puml
index a6c0933d..dc4ec583 100644
--- a/dist/Compute/AzureVirtualMachineScaleSet.puml
+++ b/dist/Compute/AzureVirtualMachineScaleSet.puml
@@ -1,9 +1,8 @@
 sprite $AzureVirtualMachineScaleSet [70x70/16z] {
-rTPL0kGW383X18ZU_y2xxJ2MAc7rVnlfLmU0pCSoXatauod4p1CL27cckgSW3CH72lppIcESLegw6yqfABvcRLIfxHMRUqzRIDsTsrBPKSI7aurIFL6B2daY
-YGelN_995E8ZfS50zQye1UOL5DSogVG1LN16QUQFZCQK8kP3cPIDWkR3MObAyqGS5V94kgSOdWRVwP420_qTXMXUgUfkRKufucjQymf-3EU2IQMPVsIKKOfw
-oEgUWZyxLf0z96Mhz88IZYOSILJiIj7bssfVLwLeKEXIUTnTUZYCZqayA41gQuTAlxl8xbgwjr5wVAYypwFrkvvJbgoz7-6KqjFrJxEA0-Z_fWWpwvH2_Ywl
-r2EbsLOnEb10WlAEeo88HmgKjYHR1L3UIXWqWz8x67UhTgMVJ4PPQhOgZ32Z03805O2C4llp2evqe8mMbVHQ2aAvTHt4YYRMc7Ug_fb1BWmN8TcNqlwgKhuK
-WapnvXiE0rYRUCYubRjIzSledrH-
+vTO7ijim30PX2C2_Zkz_uOoGAjEDX5BVJbVvr4LQfEOYRIWq6Q11IJqgxngLsqsQ2ggufp3HlwoagwreCpDlAcvMHKF9-97WmNeV5JGRgAsmbqs5IWiAO_SK
+9lf3YivGtBRiAc5xcpfAshTyKj5qCIgQ3T2ehFpEc-V24uM9_cKblQ_KxpoQYbkrPKC9gyhHef9so5SKRNPRpYluUqerA0_F9XXALV18oJpU6HSWZaKXF5R2
+Qx_uwGafasEsCpnNF01vNKmPe_ArUApi9P01aBcibBEdR2XL6HzHqHbArLDS5OEY6SMoTXyLY44HZnJpg4O5nK4HG_RM15W_5C6g0lbLWOu22OAcKlshIdMA
+Ga_91KGsbDD8RlPEN7ukRIskF-UsLXuKEqFvP8jnnhd4zL3OV9wNwqt4Pk_6tkLHxBs1yQBpbSy
 }
 
 AzureEntityColoring(AzureVirtualMachineScaleSet)
diff --git a/dist/Compute/AzureVirtualMachineScaleSet.svg b/dist/Compute/AzureVirtualMachineScaleSet.svg
index f6e88157..bf1be8f0 100644
--- a/dist/Compute/AzureVirtualMachineScaleSet.svg
+++ b/dist/Compute/AzureVirtualMachineScaleSet.svg
@@ -63,18 +63,18 @@
 <g id="surface1">
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 50.011719 0 L 2.890625 0 C 1.292969 0 0 1.429688 0 3.027344 L 0 35.839844 C 0 37.429688 1.292969 38.84375 2.894531 38.84375 L 50.011719 38.84375 C 51.609375 38.84375 53.226563 37.429688 53.226563 35.839844 L 53.226563 3.027344 C 53.226563 1.425781 51.609375 0 50.011719 0 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 4.035156 4.089844 L 49.179688 4.023438 L 49.179688 34.753906 L 4.035156 34.753906 Z M 4.035156 4.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 49.179688 34.753906 L 4.035156 34.753906 L 4.035156 4.089844 L 49.179688 4.023438 Z M 49.179688 34.753906 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 27.164063 2.226563 C 27.164063 2.644531 26.828125 2.980469 26.410156 2.980469 C 25.992188 2.980469 25.65625 2.644531 25.65625 2.226563 C 25.65625 1.808594 25.992188 1.472656 26.410156 1.472656 C 26.828125 1.472656 27.164063 1.808594 27.164063 2.226563 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 27.195313 18.492188 C 27.144531 18.492188 27.097656 18.476563 27.050781 18.453125 L 17.679688 13.050781 C 17.59375 13 17.539063 12.902344 17.539063 12.804688 C 17.539063 12.703125 17.59375 12.609375 17.679688 12.558594 L 26.996094 7.191406 C 27.082031 7.144531 27.1875 7.144531 27.273438 7.191406 L 36.652344 12.597656 C 36.738281 12.648438 36.789063 12.742188 36.789063 12.84375 C 36.789063 12.945313 36.738281 13.035156 36.652344 13.085938 L 27.335938 18.453125 C 27.292969 18.476563 27.246094 18.492188 27.195313 18.492188 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 58.339844 10.4375 L 11.222656 10.4375 C 9.621094 10.4375 8.328125 11.867188 8.328125 13.464844 L 8.328125 46.28125 C 8.328125 47.867188 9.621094 49.28125 11.222656 49.28125 L 58.339844 49.28125 C 59.9375 49.28125 61.554688 47.867188 61.554688 46.28125 L 61.554688 13.464844 C 61.554688 11.863281 59.9375 10.4375 58.339844 10.4375 "/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 12.363281 14.527344 L 57.507813 14.464844 L 57.507813 45.191406 L 12.363281 45.191406 Z M 12.363281 14.527344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.507813 45.191406 L 12.363281 45.191406 L 12.363281 14.527344 L 57.507813 14.464844 Z M 57.507813 45.191406 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35.492188 12.664063 C 35.492188 13.082031 35.152344 13.421875 34.738281 13.421875 C 34.316406 13.421875 33.980469 13.082031 33.980469 12.664063 C 33.980469 12.25 34.316406 11.910156 34.738281 11.910156 C 35.152344 11.910156 35.492188 12.246094 35.492188 12.664063 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.523438 28.929688 C 35.472656 28.929688 35.425781 28.914063 35.378906 28.890625 L 26.007813 23.488281 C 25.921875 23.4375 25.867188 23.339844 25.867188 23.242188 C 25.867188 23.140625 25.921875 23.046875 26.007813 22.996094 L 35.324219 17.628906 C 35.410156 17.578125 35.515625 17.578125 35.601563 17.628906 L 44.980469 23.035156 C 45.066406 23.085938 45.121094 23.179688 45.121094 23.277344 C 45.121094 23.382813 45.066406 23.472656 44.980469 23.523438 L 35.667969 28.890625 C 35.621094 28.914063 35.574219 28.929688 35.523438 28.929688 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 51.289063 59.777344 L 36.816406 59.777344 C 38.554688 65.910156 36.21875 66.789063 25.984375 66.789063 L 25.984375 70 L 60.785156 70 L 60.785156 66.789063 C 50.550781 66.789063 49.546875 65.914063 51.289063 59.777344 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 66.785156 20.9375 L 19.664063 20.9375 C 18.0625 20.9375 16.773438 22.367188 16.773438 23.964844 L 16.773438 56.777344 C 16.773438 58.367188 18.0625 59.78125 19.664063 59.78125 L 66.785156 59.78125 C 68.382813 59.78125 70 58.367188 70 56.777344 L 70 23.964844 C 70 22.363281 68.382813 20.9375 66.785156 20.9375 "/>
 <use xlink:href="#surface11" mask="url(#mask2)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 20.808594 25.027344 L 65.953125 24.960938 L 65.953125 55.691406 L 20.808594 55.691406 Z M 20.808594 25.027344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 65.953125 55.691406 L 20.808594 55.691406 L 20.808594 25.027344 L 65.953125 24.960938 Z M 65.953125 55.691406 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 25.984375 66.789063 L 60.785156 66.789063 L 60.785156 70 L 25.984375 70 Z M 25.984375 66.789063 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 43.9375 23.164063 C 43.9375 23.582031 43.597656 23.917969 43.179688 23.917969 C 42.761719 23.917969 42.425781 23.582031 42.425781 23.164063 C 42.425781 22.746094 42.761719 22.410156 43.179688 22.410156 C 43.597656 22.410156 43.9375 22.746094 43.9375 23.164063 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.96875 39.429688 C 43.917969 39.429688 43.871094 39.414063 43.824219 39.390625 L 34.453125 33.988281 C 34.367188 33.9375 34.3125 33.839844 34.3125 33.742188 C 34.3125 33.640625 34.367188 33.546875 34.453125 33.496094 L 43.765625 28.128906 C 43.855469 28.078125 43.960938 28.078125 44.046875 28.128906 L 53.421875 33.535156 C 53.507813 33.585938 53.5625 33.679688 53.5625 33.777344 C 53.5625 33.882813 53.511719 33.972656 53.421875 34.023438 L 44.109375 39.390625 C 44.066406 39.414063 44.019531 39.429688 43.96875 39.429688 "/>
diff --git a/dist/Compute/AzureVirtualMachineWindows(m).png b/dist/Compute/AzureVirtualMachineWindows(m).png
new file mode 100644
index 00000000..9289cd00
Binary files /dev/null and b/dist/Compute/AzureVirtualMachineWindows(m).png differ
diff --git a/dist/Compute/AzureVirtualMachineWindows(m).svg b/dist/Compute/AzureVirtualMachineWindows(m).svg
new file mode 100644
index 00000000..483c2c5f
--- /dev/null
+++ b/dist/Compute/AzureVirtualMachineWindows(m).svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.816406 2.804688 C 65.800781 2.804688 65.785156 2.800781 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.28125 54.601563 Z M 65.816406 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 49.609375 43.394531 L 22.152344 41.183594 C 21.507813 41.132813 21 40.582031 21 39.933594 L 21 18.863281 C 21 18.210938 21.507813 17.664063 22.15625 17.609375 C 22.15625 17.609375 49.613281 15.398438 49.617188 15.398438 C 50.40625 15.398438 50.964844 15.960938 50.964844 16.652344 L 50.964844 42.144531 C 50.964844 42.484375 50.832031 42.796875 50.59375 43.035156 C 50.355469 43.269531 50.042969 43.398438 49.710938 43.398438 Z M 49.609375 43.394531 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.980469 17.757813 L 35.980469 28.417969 L 49.707031 28.417969 L 49.707031 16.652344 Z M 35.980469 17.757813 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.253906 18.863281 L 22.253906 28.417969 L 34.019531 28.417969 L 34.019531 17.914063 Z M 22.253906 18.863281 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.980469 41.039063 L 35.980469 30.378906 L 49.707031 30.378906 L 49.707031 42.144531 Z M 35.980469 41.039063 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.253906 39.933594 L 22.253906 30.378906 L 34.019531 30.378906 L 34.019531 40.882813 Z M 22.253906 39.933594 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 46.199219 53.199219 L 26.980469 53.199219 C 29.289063 61.597656 26.1875 62.800781 12.601563 62.800781 L 12.601563 67.199219 L 58.800781 67.199219 L 58.800781 62.800781 C 45.214844 62.800781 43.882813 61.601563 46.191406 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0.00390625 4.683594 0.00390625 6.785156 L 0.00390625 50.644531 C 0.00390625 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.773438 54.597656 C 67.875 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.875 2.800781 65.773438 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.601563 49 L 5.601563 8.398438 Z M 64.398438 8.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 12.601563 63 L 58.800781 63 L 58.800781 67.199219 L 12.601563 67.199219 Z M 12.601563 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35.726563 5.734375 C 35.726563 6.28125 35.28125 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.28125 4.738281 35.726563 5.183594 35.726563 5.734375 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureVirtualMachineWindows.png b/dist/Compute/AzureVirtualMachineWindows.png
new file mode 100644
index 00000000..8df252f6
Binary files /dev/null and b/dist/Compute/AzureVirtualMachineWindows.png differ
diff --git a/dist/Compute/AzureVirtualMachineWindows.puml b/dist/Compute/AzureVirtualMachineWindows.puml
new file mode 100644
index 00000000..8e228ad4
--- /dev/null
+++ b/dist/Compute/AzureVirtualMachineWindows.puml
@@ -0,0 +1,9 @@
+sprite $AzureVirtualMachineWindows [70x70/16z] {
+xTPLGiHG38NXw4dP_u9noCnKGuhV_wdwrOL-LjpisJ1l1RWGUoyyfUPxcUqXG7jF-Wgk5JJwcyfG8k8ZIbnNKU8wk9kfYl1Z-qeYU5ypGZchACxProX36Gey
+Y-UnxBYoLK6PZMG_-UmEPIZvxMWeYAlmAXQLkPUXe6oHN_tFC9JivoZef6SWJjP7m4HgFSIDjhAxsoQg9pC5L8zdYZVsfQVO6GfF9vnTIIG35_P2rDEuQeB9
+ZgHHQaKpb9AVhmXACVt87W
+}
+
+AzureEntityColoring(AzureVirtualMachineWindows)
+!define AzureVirtualMachineWindows(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualMachineWindows, AzureVirtualMachineWindows)
+!define AzureVirtualMachineWindows(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualMachineWindows, AzureVirtualMachineWindows)
diff --git a/dist/Compute/AzureVirtualMachineWindows.svg b/dist/Compute/AzureVirtualMachineWindows.svg
new file mode 100644
index 00000000..081c08b3
--- /dev/null
+++ b/dist/Compute/AzureVirtualMachineWindows.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.816406 2.804688 C 65.800781 2.804688 65.785156 2.800781 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.28125 54.601563 Z M 65.816406 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 49.609375 43.394531 L 22.152344 41.183594 C 21.507813 41.132813 21 40.582031 21 39.933594 L 21 18.863281 C 21 18.210938 21.507813 17.664063 22.15625 17.609375 C 22.15625 17.609375 49.613281 15.398438 49.617188 15.398438 C 50.40625 15.398438 50.964844 15.960938 50.964844 16.652344 L 50.964844 42.144531 C 50.964844 42.484375 50.832031 42.796875 50.59375 43.035156 C 50.355469 43.269531 50.042969 43.398438 49.710938 43.398438 Z M 49.609375 43.394531 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.980469 17.757813 L 35.980469 28.417969 L 49.707031 28.417969 L 49.707031 16.652344 Z M 35.980469 17.757813 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.253906 18.863281 L 22.253906 28.417969 L 34.019531 28.417969 L 34.019531 17.914063 Z M 22.253906 18.863281 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.980469 41.039063 L 35.980469 30.378906 L 49.707031 30.378906 L 49.707031 42.144531 Z M 35.980469 41.039063 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.253906 39.933594 L 22.253906 30.378906 L 34.019531 30.378906 L 34.019531 40.882813 Z M 22.253906 39.933594 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 46.199219 53.199219 L 26.980469 53.199219 C 29.289063 61.597656 26.1875 62.800781 12.601563 62.800781 L 12.601563 67.199219 L 58.800781 67.199219 L 58.800781 62.800781 C 45.214844 62.800781 43.882813 61.601563 46.191406 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 65.773438 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0.00390625 4.683594 0.00390625 6.785156 L 0.00390625 50.644531 C 0.00390625 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.773438 54.597656 C 67.875 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.875 2.800781 65.773438 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.601563 49 L 5.601563 8.398438 Z M 64.398438 8.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 12.601563 63 L 58.800781 63 L 58.800781 67.199219 L 12.601563 67.199219 Z M 12.601563 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35.726563 5.734375 C 35.726563 6.28125 35.28125 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.28125 4.738281 35.726563 5.183594 35.726563 5.734375 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureWindowsVirtualDesktop(m).png b/dist/Compute/AzureWindowsVirtualDesktop(m).png
new file mode 100644
index 00000000..bbb927ed
Binary files /dev/null and b/dist/Compute/AzureWindowsVirtualDesktop(m).png differ
diff --git a/dist/Compute/AzureWindowsVirtualDesktop(m).svg b/dist/Compute/AzureWindowsVirtualDesktop(m).svg
new file mode 100644
index 00000000..660d5211
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktop(m).svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<radialGradient id="radial0" gradientUnits="userSpaceOnUse" cx="9" cy="9" fx="9" fy="9" r="8.5" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0,124,216);stop-opacity:1;"/>
+<stop offset="0.382" style="stop-color:rgb(0,126,220);stop-opacity:1;"/>
+<stop offset="0.576" style="stop-color:rgb(0,133,232);stop-opacity:1;"/>
+<stop offset="0.727" style="stop-color:rgb(0,145,252);stop-opacity:1;"/>
+<stop offset="0.856" style="stop-color:rgb(27,158,255);stop-opacity:1;"/>
+<stop offset="0.97" style="stop-color:rgb(65,174,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(79,180,255);stop-opacity:1;"/>
+</radialGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial0);" d="M 68.054688 35 C 68.054688 53.257813 53.257813 68.054688 35 68.054688 C 16.742188 68.054688 1.945313 53.257813 1.945313 35 C 1.945313 16.742188 16.742188 1.945313 35 1.945313 C 53.257813 1.945313 68.054688 16.742188 68.054688 35 Z M 68.054688 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,81,142);fill-opacity:1;" d="M 63.46875 35 C 63.46875 50.722656 50.722656 63.46875 35 63.46875 C 19.277344 63.46875 6.53125 50.722656 6.53125 35 C 6.53125 19.277344 19.277344 6.53125 35 6.53125 C 50.722656 6.53125 63.46875 19.277344 63.46875 35 Z M 63.46875 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(229,243,255);fill-opacity:1;" d="M 35.390625 38.644531 L 24.367188 27.707031 C 23.601563 26.957031 22.375 26.957031 21.609375 27.707031 L 20.222656 29.089844 C 19.867188 29.433594 19.667969 29.90625 19.667969 30.398438 C 19.664063 30.894531 19.863281 31.371094 20.214844 31.71875 L 28.503906 39.96875 L 20.035156 48.382813 C 19.683594 48.726563 19.484375 49.203125 19.484375 49.695313 C 19.484375 50.191406 19.683594 50.664063 20.035156 51.011719 L 21.4375 52.390625 C 22.203125 53.140625 23.425781 53.140625 24.191406 52.390625 L 35.386719 41.269531 C 35.734375 40.921875 35.933594 40.449219 35.933594 39.953125 C 35.9375 39.460938 35.738281 38.988281 35.386719 38.644531 Z M 34.046875 29.855469 C 34.046875 30.347656 34.246094 30.820313 34.59375 31.167969 L 45.796875 42.292969 C 46.5625 43.042969 47.785156 43.042969 48.554688 42.292969 L 49.953125 40.90625 C 50.308594 40.5625 50.507813 40.089844 50.507813 39.597656 C 50.507813 39.101563 50.3125 38.628906 49.960938 38.28125 L 41.507813 29.875 L 49.796875 21.617188 C 50.148438 21.269531 50.347656 20.796875 50.34375 20.304688 C 50.34375 19.808594 50.144531 19.335938 49.789063 18.992188 L 48.390625 17.609375 C 47.625 16.859375 46.398438 16.859375 45.632813 17.609375 L 34.609375 28.542969 C 34.253906 28.886719 34.050781 29.363281 34.046875 29.859375 Z M 34.046875 29.855469 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureWindowsVirtualDesktop.png b/dist/Compute/AzureWindowsVirtualDesktop.png
new file mode 100644
index 00000000..8044d3f8
Binary files /dev/null and b/dist/Compute/AzureWindowsVirtualDesktop.png differ
diff --git a/dist/Compute/AzureWindowsVirtualDesktop.puml b/dist/Compute/AzureWindowsVirtualDesktop.puml
new file mode 100644
index 00000000..6ae65eb6
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktop.puml
@@ -0,0 +1,13 @@
+sprite $AzureWindowsVirtualDesktop [70x70/16z] {
+rTY7ckCW30JWKEG5YVT_tIs-3F7OHD7rk_dQrl-JX0lazfyabogoVKQabfn-G4X5jdDg_Zu3nDiZToZ53H982ZlbIBI-fxNlSvB0Q5tD1cBQsuJAgq9WT8Nm
+YFLsPyH5wXtfDjPHE4vNuXjmTYOx8_cQXmutrjtXt14RhwBVkihFaJu2iVQCgJk2RYBCOiG5I9ovBdX2Es5cBwPUXX90JChR735wedu2gsDVuzpmtRxWr1CD
+nK6-qcWqvLHAZo4tePxaL8h5aDG7qd7HK2aXf8qPes84fGGHAWRBb51A644KrmmQKW_HCuBio_Heg5aSMRTqRSX4D88CcvTCHaCqXTGTX5UfOYoqGbRekX16
+E0rhNS_hh7nvLVfsDPWvNESgrUmmYl7APRWQPQ3G4iKPLl9QYJF6IfJnbIZJbWgc6sVMS-6LZZV5QrH9MJ56tzRbLLUUFQEiGY5L5WhTZOm87eLKNB75VOH7
+dOFOGBG0ETxJPJvVsheT83Esl7JvflOhGTPFp4mjHH5-IA4byzhXh5zh5QjqGIAR6DgyD8iZ_3f2AcqP6XeDROJIQITbK6B8w5GA9jDfWLo4DrDSZ3wOv2Ey
+2Pefl8LH_R5Dfe29nJhwuMoqt34aau3HW0aYbOLvEyMstzO8uHG-7Vad99uiLuC3ajyDAd4OlnpJtG3Y7DTsHzTrjDWfjXuFmanemqbOKl103KdLp5JxF4sZ
+aCY7383yZmZyPDaMq0OZd5ItHMgE2u1AbOCWnILyAkMlfDkVo0S
+}
+
+AzureEntityColoring(AzureWindowsVirtualDesktop)
+!define AzureWindowsVirtualDesktop(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktop, AzureWindowsVirtualDesktop)
+!define AzureWindowsVirtualDesktop(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktop, AzureWindowsVirtualDesktop)
diff --git a/dist/Compute/AzureWindowsVirtualDesktop.svg b/dist/Compute/AzureWindowsVirtualDesktop.svg
new file mode 100644
index 00000000..3cae16e7
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktop.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<radialGradient id="radial0" gradientUnits="userSpaceOnUse" cx="9" cy="9" fx="9" fy="9" r="8.5" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(9.803922%,54.117647%,70.196078%);stop-opacity:1;"/>
+<stop offset="0.382" style="stop-color:rgb(10.196078%,54.901961%,70.980392%);stop-opacity:1;"/>
+<stop offset="0.576" style="stop-color:rgb(10.980392%,58.039216%,73.72549%);stop-opacity:1;"/>
+<stop offset="0.727" style="stop-color:rgb(12.941176%,63.137255%,78.431373%);stop-opacity:1;"/>
+<stop offset="0.856" style="stop-color:rgb(15.294118%,70.588235%,84.705882%);stop-opacity:1;"/>
+<stop offset="0.97" style="stop-color:rgb(18.431373%,80%,93.333333%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(19.607843%,83.137255%,96.078431%);stop-opacity:1;"/>
+</radialGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial0);" d="M 68.054688 35 C 68.054688 53.257813 53.257813 68.054688 35 68.054688 C 16.742188 68.054688 1.945313 53.257813 1.945313 35 C 1.945313 16.742188 16.742188 1.945313 35 1.945313 C 53.257813 1.945313 68.054688 16.742188 68.054688 35 Z M 68.054688 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,35.686275%,63.137255%);fill-opacity:1;" d="M 63.46875 35 C 63.46875 50.722656 50.722656 63.46875 35 63.46875 C 19.277344 63.46875 6.53125 50.722656 6.53125 35 C 6.53125 19.277344 19.277344 6.53125 35 6.53125 C 50.722656 6.53125 63.46875 19.277344 63.46875 35 Z M 63.46875 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,94.901961%,94.901961%);fill-opacity:1;" d="M 35.390625 38.644531 L 24.367188 27.707031 C 23.601563 26.957031 22.375 26.957031 21.609375 27.707031 L 20.222656 29.089844 C 19.867188 29.433594 19.667969 29.90625 19.667969 30.398438 C 19.664063 30.894531 19.863281 31.371094 20.214844 31.71875 L 28.503906 39.96875 L 20.035156 48.382813 C 19.683594 48.726563 19.484375 49.203125 19.484375 49.695313 C 19.484375 50.191406 19.683594 50.664063 20.035156 51.011719 L 21.4375 52.390625 C 22.203125 53.140625 23.425781 53.140625 24.191406 52.390625 L 35.386719 41.269531 C 35.734375 40.921875 35.933594 40.449219 35.933594 39.953125 C 35.9375 39.460938 35.738281 38.988281 35.386719 38.644531 Z M 34.046875 29.855469 C 34.046875 30.347656 34.246094 30.820313 34.59375 31.167969 L 45.796875 42.292969 C 46.5625 43.042969 47.785156 43.042969 48.554688 42.292969 L 49.953125 40.90625 C 50.308594 40.5625 50.507813 40.089844 50.507813 39.597656 C 50.507813 39.101563 50.3125 38.628906 49.960938 38.28125 L 41.507813 29.875 L 49.796875 21.617188 C 50.148438 21.269531 50.347656 20.796875 50.34375 20.304688 C 50.34375 19.808594 50.144531 19.335938 49.789063 18.992188 L 48.390625 17.609375 C 47.625 16.859375 46.398438 16.859375 45.632813 17.609375 L 34.609375 28.542969 C 34.253906 28.886719 34.050781 29.363281 34.046875 29.859375 Z M 34.046875 29.855469 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups(m).png b/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups(m).png
new file mode 100644
index 00000000..833e79e7
Binary files /dev/null and b/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups(m).png differ
diff --git a/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups(m).svg b/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups(m).svg
new file mode 100644
index 00000000..6f15e474
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups(m).svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9" y1="17.5" x2="9" y2="0.5" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0,81,142);stop-opacity:1;"/>
+<stop offset="0.168" style="stop-color:rgb(0,88,154);stop-opacity:1;"/>
+<stop offset="0.577" style="stop-color:rgb(0,102,178);stop-opacity:1;"/>
+<stop offset="0.815" style="stop-color:rgb(0,108,188);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 68.054688 35 C 68.054688 53.257813 53.257813 68.054688 35 68.054688 C 16.742188 68.054688 1.945313 53.257813 1.945313 35 C 1.945313 16.742188 16.742188 1.945313 35 1.945313 C 53.257813 1.945313 68.054688 16.742188 68.054688 35 Z M 68.054688 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.238281 41.347656 L 39.761719 41.347656 L 39.761719 50.867188 L 30.238281 50.867188 Z M 19.132813 28.652344 L 28.652344 28.652344 L 28.652344 19.132813 L 20.464844 19.132813 C 20.109375 19.132813 19.769531 19.273438 19.523438 19.523438 C 19.273438 19.769531 19.132813 20.109375 19.132813 20.464844 Z M 20.464844 50.867188 L 28.652344 50.867188 L 28.652344 41.347656 L 19.132813 41.347656 L 19.132813 49.535156 C 19.132813 49.890625 19.273438 50.230469 19.523438 50.476563 C 19.769531 50.726563 20.109375 50.867188 20.464844 50.867188 Z M 19.132813 39.761719 L 28.652344 39.761719 L 28.652344 30.238281 L 19.132813 30.238281 Z M 41.347656 50.867188 L 49.535156 50.867188 C 49.890625 50.867188 50.230469 50.726563 50.476563 50.476563 C 50.726563 50.230469 50.867188 49.890625 50.867188 49.535156 L 50.867188 41.347656 L 41.347656 41.347656 Z M 30.238281 39.761719 L 39.761719 39.761719 L 39.761719 30.238281 L 30.238281 30.238281 Z M 41.347656 39.761719 L 50.867188 39.761719 L 50.867188 30.238281 L 41.347656 30.238281 Z M 41.347656 19.148438 L 41.347656 28.652344 L 50.867188 28.652344 L 50.867188 20.464844 C 50.867188 20.109375 50.726563 19.769531 50.476563 19.523438 C 50.230469 19.273438 49.890625 19.132813 49.535156 19.132813 Z M 30.238281 28.652344 L 39.761719 28.652344 L 39.761719 19.132813 L 30.238281 19.132813 Z M 30.238281 28.652344 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups.png b/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups.png
new file mode 100644
index 00000000..d736f585
Binary files /dev/null and b/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups.png differ
diff --git a/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups.puml b/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups.puml
new file mode 100644
index 00000000..1a09139e
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups.puml
@@ -0,0 +1,11 @@
+sprite $AzureWindowsVirtualDesktopApplicationGroups [70x70/16z] {
+rTC5ZkKm381Xnn2mxt_VLJNrWgUGn4lp2HxsLn2-XaBI-j33Q9KHrc4T6ZLU6uKClTPmkb7rGIUO8VgY5tX3Gz_9t41ImobTPz5zPEWyXciuT8MaHt8_6e-a
+CbtNuTOMHoD4IBUqtA8uIiydpgc4MuiVM2iwRNYIkrDJhqU9ok2qtim-3iNXN2KEHZAL0QUHgIZvdrELvckRggX_cwkWxz1-nNU9DM0yaSh5gSDOwKT5B4cF
+IhEWyaciiRFERbXmL8O522Sq1cSLtEK3cgxGRwjOkiA_hQB_IONyotIbfoi50EflkG5iGQkdPhqw6zN5XHn71RCpgd3GP8NXq9EL0WVELGPyq5J5_zDI5JXH
+fjB0zKG5uNemybmfSIWtWr5dUl7sy_GTsgOAFwk9Y_YJOJieL8fj48Z8bdNuZ6tHW2kIYpZ9HHpdriIXxkrEr6o28hmWNJpsUulS4UQ8sfs6C8-QNHXIO17L
+yKkXSO5DICp2J1E1l6y
+}
+
+AzureEntityColoring(AzureWindowsVirtualDesktopApplicationGroups)
+!define AzureWindowsVirtualDesktopApplicationGroups(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopApplicationGroups, AzureWindowsVirtualDesktopApplicationGroups)
+!define AzureWindowsVirtualDesktopApplicationGroups(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopApplicationGroups, AzureWindowsVirtualDesktopApplicationGroups)
diff --git a/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups.svg b/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups.svg
new file mode 100644
index 00000000..5d25a715
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopApplicationGroups.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9" y1="17.5" x2="9" y2="0.5" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0%,35.686275%,63.137255%);stop-opacity:1;"/>
+<stop offset="0.168" style="stop-color:rgb(0%,38.823529%,68.235294%);stop-opacity:1;"/>
+<stop offset="0.577" style="stop-color:rgb(0%,44.705882%,79.215686%);stop-opacity:1;"/>
+<stop offset="0.815" style="stop-color:rgb(0%,47.058824%,83.137255%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 68.054688 35 C 68.054688 53.257813 53.257813 68.054688 35 68.054688 C 16.742188 68.054688 1.945313 53.257813 1.945313 35 C 1.945313 16.742188 16.742188 1.945313 35 1.945313 C 53.257813 1.945313 68.054688 16.742188 68.054688 35 Z M 68.054688 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.238281 41.347656 L 39.761719 41.347656 L 39.761719 50.867188 L 30.238281 50.867188 Z M 19.132813 28.652344 L 28.652344 28.652344 L 28.652344 19.132813 L 20.464844 19.132813 C 20.109375 19.132813 19.769531 19.273438 19.523438 19.523438 C 19.273438 19.769531 19.132813 20.109375 19.132813 20.464844 Z M 20.464844 50.867188 L 28.652344 50.867188 L 28.652344 41.347656 L 19.132813 41.347656 L 19.132813 49.535156 C 19.132813 49.890625 19.273438 50.230469 19.523438 50.476563 C 19.769531 50.726563 20.109375 50.867188 20.464844 50.867188 Z M 19.132813 39.761719 L 28.652344 39.761719 L 28.652344 30.238281 L 19.132813 30.238281 Z M 41.347656 50.867188 L 49.535156 50.867188 C 49.890625 50.867188 50.230469 50.726563 50.476563 50.476563 C 50.726563 50.230469 50.867188 49.890625 50.867188 49.535156 L 50.867188 41.347656 L 41.347656 41.347656 Z M 30.238281 39.761719 L 39.761719 39.761719 L 39.761719 30.238281 L 30.238281 30.238281 Z M 41.347656 39.761719 L 50.867188 39.761719 L 50.867188 30.238281 L 41.347656 30.238281 Z M 41.347656 19.148438 L 41.347656 28.652344 L 50.867188 28.652344 L 50.867188 20.464844 C 50.867188 20.109375 50.726563 19.769531 50.476563 19.523438 C 50.230469 19.273438 49.890625 19.132813 49.535156 19.132813 Z M 30.238281 28.652344 L 39.761719 28.652344 L 39.761719 19.132813 L 30.238281 19.132813 Z M 30.238281 28.652344 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureWindowsVirtualDesktopHostPools(m).png b/dist/Compute/AzureWindowsVirtualDesktopHostPools(m).png
new file mode 100644
index 00000000..a56d1c0d
Binary files /dev/null and b/dist/Compute/AzureWindowsVirtualDesktopHostPools(m).png differ
diff --git a/dist/Compute/AzureWindowsVirtualDesktopHostPools(m).svg b/dist/Compute/AzureWindowsVirtualDesktopHostPools(m).svg
new file mode 100644
index 00000000..1a53eb63
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopHostPools(m).svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9" y1="17.5" x2="9" y2="0.5" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0,81,142);stop-opacity:1;"/>
+<stop offset="0.168" style="stop-color:rgb(0,88,154);stop-opacity:1;"/>
+<stop offset="0.577" style="stop-color:rgb(0,102,178);stop-opacity:1;"/>
+<stop offset="0.815" style="stop-color:rgb(0,108,188);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 68.054688 35 C 68.054688 53.257813 53.257813 68.054688 35 68.054688 C 16.742188 68.054688 1.945313 53.257813 1.945313 35 C 1.945313 16.742188 16.742188 1.945313 35 1.945313 C 53.257813 1.945313 68.054688 16.742188 68.054688 35 Z M 68.054688 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47,166,255);fill-opacity:1;" d="M 50.734375 25.804688 L 50.734375 44.117188 L 34.9375 53.304688 L 34.9375 34.96875 Z M 50.734375 25.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(171,219,255);fill-opacity:1;" d="M 50.734375 25.804688 L 34.960938 35 L 19.164063 25.804688 L 34.960938 16.613281 Z M 50.734375 25.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 34.9375 35 L 34.9375 53.3125 L 19.164063 44.117188 L 19.164063 25.804688 Z M 34.9375 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(171,219,255);fill-opacity:1;" d="M 19.164063 44.117188 L 34.9375 34.96875 L 34.9375 53.304688 Z M 19.164063 44.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 50.734375 44.117188 L 34.9375 34.96875 L 34.9375 53.304688 Z M 50.734375 44.117188 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureWindowsVirtualDesktopHostPools.png b/dist/Compute/AzureWindowsVirtualDesktopHostPools.png
new file mode 100644
index 00000000..f8e73b8b
Binary files /dev/null and b/dist/Compute/AzureWindowsVirtualDesktopHostPools.png differ
diff --git a/dist/Compute/AzureWindowsVirtualDesktopHostPools.puml b/dist/Compute/AzureWindowsVirtualDesktopHostPools.puml
new file mode 100644
index 00000000..79f2b109
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopHostPools.puml
@@ -0,0 +1,12 @@
+sprite $AzureWindowsVirtualDesktopHostPools [70x70/16z] {
+rTC9ijmm24LHcK48jF_zvfD9rVQZRMNENS0fG7RxFpfORNXaRbsexKVTuvp9tXJgWJDwRFHuq-17YCPDuxWrsEC-tHvaVvnZnDEuHZoU9mr77ZlfnYIxqm1a
+dncn7u4dtizF24UTHvazFSfWxb76Z_PnfO_OdknqH55d-fBu_LVJ0sPCtsCDtCqeGsXLhwLlhw9CvsIykup3PL3gvJCHU5qg0gzk-BOkz2Q-h8KNwifK9vTf
+2BvG5vLw8pFuId9LHF0uh6PNPQIYyrGgei0H-rpCro8LWqewbsMmCbDng6GgvsMmakUDGic-_utB00g_KzPvf9kj9b8cKbOgl0oioBqYhFP0YVSAauh-fC9v
+MH7jTtTnf2mZ5LbEfGoeB2ILJ4lb-51weQInbAnZ9Tf7WfGqBefeHugdGa1X9gIaSrLwo-AYf86KJ0qyD3XlNmXGf8FZeiEur8eES1QmKZQgkzY4Nsvcyrfd
+eFIOrzhNU892pehw15dBrdshy-Ww28ZQ6WPd_5rPM-DHrZ3uFAbep29gAvfL8QJm8EkxNVLPDcoMHNlDvu_49-Nu4KJRETv7HhickuWtbEuYEDr5SB9x4np5
+xklWx8aHr6xY-t5w0sqUUL1xbjRp63Pm3E_ZUhJDkFkBOBA8pOX5L8GJ-Erz0W
+}
+
+AzureEntityColoring(AzureWindowsVirtualDesktopHostPools)
+!define AzureWindowsVirtualDesktopHostPools(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopHostPools, AzureWindowsVirtualDesktopHostPools)
+!define AzureWindowsVirtualDesktopHostPools(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopHostPools, AzureWindowsVirtualDesktopHostPools)
diff --git a/dist/Compute/AzureWindowsVirtualDesktopHostPools.svg b/dist/Compute/AzureWindowsVirtualDesktopHostPools.svg
new file mode 100644
index 00000000..ba44935f
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopHostPools.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9" y1="17.5" x2="9" y2="0.5" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0%,35.686275%,63.137255%);stop-opacity:1;"/>
+<stop offset="0.168" style="stop-color:rgb(0%,38.823529%,68.235294%);stop-opacity:1;"/>
+<stop offset="0.577" style="stop-color:rgb(0%,44.705882%,79.215686%);stop-opacity:1;"/>
+<stop offset="0.815" style="stop-color:rgb(0%,47.058824%,83.137255%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 68.054688 35 C 68.054688 53.257813 53.257813 68.054688 35 68.054688 C 16.742188 68.054688 1.945313 53.257813 1.945313 35 C 1.945313 16.742188 16.742188 1.945313 35 1.945313 C 53.257813 1.945313 68.054688 16.742188 68.054688 35 Z M 68.054688 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(19.607843%,74.509804%,86.666667%);fill-opacity:1;" d="M 50.734375 25.804688 L 50.734375 44.117188 L 34.9375 53.304688 L 34.9375 34.96875 Z M 50.734375 25.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(61.176471%,92.156863%,100%);fill-opacity:1;" d="M 50.734375 25.804688 L 34.960938 35 L 19.164063 25.804688 L 34.960938 16.613281 Z M 50.734375 25.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 34.9375 35 L 34.9375 53.3125 L 19.164063 44.117188 L 19.164063 25.804688 Z M 34.9375 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(61.176471%,92.156863%,100%);fill-opacity:1;" d="M 19.164063 44.117188 L 34.9375 34.96875 L 34.9375 53.304688 Z M 19.164063 44.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 50.734375 44.117188 L 34.9375 34.96875 L 34.9375 53.304688 Z M 50.734375 44.117188 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureWindowsVirtualDesktopUsers(m).png b/dist/Compute/AzureWindowsVirtualDesktopUsers(m).png
new file mode 100644
index 00000000..106531a6
Binary files /dev/null and b/dist/Compute/AzureWindowsVirtualDesktopUsers(m).png differ
diff --git a/dist/Compute/AzureWindowsVirtualDesktopUsers(m).svg b/dist/Compute/AzureWindowsVirtualDesktopUsers(m).svg
new file mode 100644
index 00000000..baf23276
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopUsers(m).svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 52.695313 35.351563 C 50.816406 35.367188 48.976563 34.824219 47.40625 33.792969 L 52.65625 47.484375 L 57.828125 33.910156 C 56.28125 34.851563 54.503906 35.351563 52.695313 35.351563 Z M 52.695313 35.351563 "/>
+</g>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="6.7" y1="7.26" x2="6.7" y2="18.36" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0.22" style="stop-color:rgb(79,180,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(0,124,216);stop-opacity:1;"/>
+</linearGradient>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.328125 35.542969 C 23.566406 35.523438 20.867188 34.714844 18.550781 33.210938 L 26.328125 53.628906 L 34.105469 33.367188 C 31.765625 34.800781 29.070313 35.554688 26.328125 35.542969 Z M 26.328125 35.542969 "/>
+</g>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="6.42" y1="1.32" x2="7.23" y2="11.39" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0.22" style="stop-color:rgb(79,180,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(0,124,216);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 66.964844 54.132813 C 67.789063 54.144531 68.578125 53.824219 69.164063 53.246094 C 69.75 52.671875 70.078125 51.882813 70.078125 51.0625 C 70.09375 50.890625 70.066406 50.714844 70 50.554688 C 68.792969 40.832031 63.234375 32.898438 52.65625 32.898438 C 42.078125 32.898438 36.359375 39.746094 35.273438 50.554688 C 35.113281 52.269531 36.359375 53.792969 38.070313 53.976563 L 66.964844 53.976563 Z M 66.964844 54.132813 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 62.457031 25.589844 C 62.457031 30.980469 58.085938 35.351563 52.695313 35.351563 C 47.304688 35.351563 42.933594 30.980469 42.933594 25.589844 C 42.933594 20.199219 47.304688 15.828125 52.695313 15.828125 C 58.085938 15.828125 62.457031 20.199219 62.457031 25.589844 Z M 62.457031 25.589844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 47.40625 63.621094 C 49.960938 63.621094 52.035156 61.550781 52.035156 58.996094 C 52.050781 58.8125 52.050781 58.632813 52.035156 58.449219 C 50.207031 43.90625 41.921875 32.082031 26.132813 32.082031 C 10.34375 32.082031 1.710938 42.117188 0 58.332031 C -0.25 60.886719 1.609375 63.160156 4.160156 63.429688 L 47.328125 63.429688 Z M 47.40625 63.621094 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 40.792969 20.960938 C 40.792969 29.015625 34.265625 35.542969 26.210938 35.542969 C 18.15625 35.542969 11.628906 29.015625 11.628906 20.960938 C 11.628906 12.90625 18.15625 6.378906 26.210938 6.378906 C 34.265625 6.378906 40.792969 12.90625 40.792969 20.960938 Z M 40.792969 20.960938 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureWindowsVirtualDesktopUsers.png b/dist/Compute/AzureWindowsVirtualDesktopUsers.png
new file mode 100644
index 00000000..f9454cee
Binary files /dev/null and b/dist/Compute/AzureWindowsVirtualDesktopUsers.png differ
diff --git a/dist/Compute/AzureWindowsVirtualDesktopUsers.puml b/dist/Compute/AzureWindowsVirtualDesktopUsers.puml
new file mode 100644
index 00000000..0f350464
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopUsers.puml
@@ -0,0 +1,12 @@
+sprite $AzureWindowsVirtualDesktopUsers [70x70/16z] {
+xTK7ikqe30HGPO7sl-0nptvryHMg-URdS1RGHRS3yBlw1ucP2G7saQYTb7U3K6mci8FjZI8y9fRHJaX6-tNsIrb1D_liTq8hwSug6S95F0ukK56hyPNHuzBv
+qRPp9Ok9bRFKuA1ner-MufEnMxoXAiKh0D3YJOCCtMi6G94GPF-Jef4ePEOr0V1873Bn6gLPTeQ1POh3Wdg5H-5831RGa_R1uI2HC42vJ4i8XaXWpTgAN8Np
+WtuGet3fSTEXfCL91kot48GAihKRlq9IJ2j3ICoCTCfGD1E4a_RmkBHmWXLK6nYHrTpTb13PxCgHE0YfZt0QKplMDu3YJEsARZ4uNLeCl3x8GFX2zYbETE8u
+IVcZ4tmHUujH-c2nY26RuOjDOcZqeI_-L6WtZ9_OKWpJGLP_1xKRdRQTUHoC3XulKjtFbBOzjSzzOzBle-HzK_oOGuWqPbBThDEsgLCRswR3i6KqRPiEmnnt
+MFpw5GVrREph-Jz3leA3B_I8lhWAr5TuREiBBHO0VCd6jhwoJ65V8oHVwf61-fhaRUjAu1NqGcJe5VMaggJaZodTCO6qnmmIROyv9DwUGtZNDj1tIh5lqeXt
+db4cEqV9IFq9XT_IF_y1
+}
+
+AzureEntityColoring(AzureWindowsVirtualDesktopUsers)
+!define AzureWindowsVirtualDesktopUsers(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopUsers, AzureWindowsVirtualDesktopUsers)
+!define AzureWindowsVirtualDesktopUsers(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopUsers, AzureWindowsVirtualDesktopUsers)
diff --git a/dist/Compute/AzureWindowsVirtualDesktopUsers.svg b/dist/Compute/AzureWindowsVirtualDesktopUsers.svg
new file mode 100644
index 00000000..c202ab19
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopUsers.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 52.695313 35.351563 C 50.816406 35.367188 48.976563 34.824219 47.40625 33.792969 L 52.65625 47.484375 L 57.828125 33.910156 C 56.28125 34.851563 54.503906 35.351563 52.695313 35.351563 Z M 52.695313 35.351563 "/>
+</g>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="6.7" y1="7.26" x2="6.7" y2="18.36" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0.22" style="stop-color:rgb(19.607843%,83.137255%,96.078431%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(9.803922%,54.117647%,70.196078%);stop-opacity:1;"/>
+</linearGradient>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.328125 35.542969 C 23.566406 35.523438 20.867188 34.714844 18.550781 33.210938 L 26.328125 53.628906 L 34.105469 33.367188 C 31.765625 34.800781 29.070313 35.554688 26.328125 35.542969 Z M 26.328125 35.542969 "/>
+</g>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="6.42" y1="1.32" x2="7.23" y2="11.39" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0.22" style="stop-color:rgb(19.607843%,83.137255%,96.078431%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(9.803922%,54.117647%,70.196078%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,83.137255%);fill-opacity:1;" d="M 66.964844 54.132813 C 67.789063 54.144531 68.578125 53.824219 69.164063 53.246094 C 69.75 52.671875 70.078125 51.882813 70.078125 51.0625 C 70.09375 50.890625 70.066406 50.714844 70 50.554688 C 68.792969 40.832031 63.234375 32.898438 52.65625 32.898438 C 42.078125 32.898438 36.359375 39.746094 35.273438 50.554688 C 35.113281 52.269531 36.359375 53.792969 38.070313 53.976563 L 66.964844 53.976563 Z M 66.964844 54.132813 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,83.137255%);fill-opacity:1;" d="M 62.457031 25.589844 C 62.457031 30.980469 58.085938 35.351563 52.695313 35.351563 C 47.304688 35.351563 42.933594 30.980469 42.933594 25.589844 C 42.933594 20.199219 47.304688 15.828125 52.695313 15.828125 C 58.085938 15.828125 62.457031 20.199219 62.457031 25.589844 Z M 62.457031 25.589844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 47.40625 63.621094 C 49.960938 63.621094 52.035156 61.550781 52.035156 58.996094 C 52.050781 58.8125 52.050781 58.632813 52.035156 58.449219 C 50.207031 43.90625 41.921875 32.082031 26.132813 32.082031 C 10.34375 32.082031 1.710938 42.117188 0 58.332031 C -0.25 60.886719 1.609375 63.160156 4.160156 63.429688 L 47.328125 63.429688 Z M 47.40625 63.621094 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 40.792969 20.960938 C 40.792969 29.015625 34.265625 35.542969 26.210938 35.542969 C 18.15625 35.542969 11.628906 29.015625 11.628906 20.960938 C 11.628906 12.90625 18.15625 6.378906 26.210938 6.378906 C 34.265625 6.378906 40.792969 12.90625 40.792969 20.960938 Z M 40.792969 20.960938 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureWindowsVirtualDesktopWorkspaces(m).png b/dist/Compute/AzureWindowsVirtualDesktopWorkspaces(m).png
new file mode 100644
index 00000000..38b8f23b
Binary files /dev/null and b/dist/Compute/AzureWindowsVirtualDesktopWorkspaces(m).png differ
diff --git a/dist/Compute/AzureWindowsVirtualDesktopWorkspaces(m).svg b/dist/Compute/AzureWindowsVirtualDesktopWorkspaces(m).svg
new file mode 100644
index 00000000..8c6baecd
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopWorkspaces(m).svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9" y1="17.5" x2="9" y2="0.5" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0,81,142);stop-opacity:1;"/>
+<stop offset="0.168" style="stop-color:rgb(0,88,154);stop-opacity:1;"/>
+<stop offset="0.577" style="stop-color:rgb(0,102,178);stop-opacity:1;"/>
+<stop offset="0.815" style="stop-color:rgb(0,108,188);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 68.054688 35 C 68.054688 53.257813 53.257813 68.054688 35 68.054688 C 16.742188 68.054688 1.945313 53.257813 1.945313 35 C 1.945313 16.742188 16.742188 1.945313 35 1.945313 C 53.257813 1.945313 68.054688 16.742188 68.054688 35 Z M 68.054688 35 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(141,206,255);fill-opacity:1;" d="M 34.535156 18.238281 C 32.917969 18.238281 31.605469 19.546875 31.605469 21.164063 L 31.605469 35.527344 C 31.605469 37.144531 32.917969 38.453125 34.535156 38.453125 L 48.894531 38.453125 C 50.511719 38.453125 51.820313 37.144531 51.820313 35.527344 L 51.820313 21.164063 C 51.820313 19.546875 50.511719 18.238281 48.894531 18.238281 Z M 37.167969 22.042969 C 36.699219 22.042969 36.253906 22.226563 35.921875 22.554688 C 35.59375 22.882813 35.410156 23.332031 35.410156 23.796875 L 35.410156 32.890625 C 35.410156 33.863281 36.195313 34.648438 37.167969 34.648438 L 46.277344 34.648438 C 46.742188 34.648438 47.191406 34.464844 47.519531 34.136719 C 47.847656 33.804688 48.03125 33.359375 48.03125 32.890625 L 48.03125 23.796875 C 48.03125 22.828125 47.246094 22.042969 46.277344 22.042969 Z M 37.167969 22.042969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 18.179688 29.167969 C 18.179688 28.199219 18.964844 27.414063 19.933594 27.414063 L 27.132813 27.414063 C 28.101563 27.414063 28.886719 28.199219 28.886719 29.167969 L 28.886719 36.402344 C 28.886719 37.371094 28.101563 38.15625 27.132813 38.15625 L 19.933594 38.15625 C 18.964844 38.15625 18.179688 37.371094 18.179688 36.402344 Z M 18.179688 42.808594 C 18.179688 41.839844 18.964844 41.054688 19.933594 41.054688 L 27.132813 41.054688 C 28.101563 41.054688 28.886719 41.839844 28.886719 42.808594 L 28.886719 50.007813 C 28.886719 50.976563 28.101563 51.761719 27.132813 51.761719 L 19.933594 51.761719 C 18.964844 51.761719 18.179688 50.976563 18.179688 50.007813 Z M 31.605469 42.632813 C 31.605469 42.167969 31.789063 41.722656 32.121094 41.390625 C 32.449219 41.0625 32.898438 40.878906 33.363281 40.878906 L 40.558594 40.878906 C 41.527344 40.878906 42.3125 41.664063 42.316406 42.632813 L 42.316406 49.832031 C 42.3125 50.800781 41.527344 51.585938 40.558594 51.585938 L 33.363281 51.585938 C 32.898438 51.585938 32.449219 51.402344 32.121094 51.074219 C 31.789063 50.746094 31.605469 50.296875 31.605469 49.832031 Z M 31.605469 42.632813 "/>
+</g>
+</svg>
diff --git a/dist/Compute/AzureWindowsVirtualDesktopWorkspaces.png b/dist/Compute/AzureWindowsVirtualDesktopWorkspaces.png
new file mode 100644
index 00000000..1e957487
Binary files /dev/null and b/dist/Compute/AzureWindowsVirtualDesktopWorkspaces.png differ
diff --git a/dist/Compute/AzureWindowsVirtualDesktopWorkspaces.puml b/dist/Compute/AzureWindowsVirtualDesktopWorkspaces.puml
new file mode 100644
index 00000000..3dc66cf8
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopWorkspaces.puml
@@ -0,0 +1,11 @@
+sprite $AzureWindowsVirtualDesktopWorkspaces [70x70/16z] {
+rT87ikiW38NX0mY4fFslzwQHZ0i4CAz-qrBiVoZ2_y65o5dqGJYHnpoVH8-OCCD5qJhsmusaN-I04L4xiaDF4EsBOmjPMexBEYgq8wBZ27LUT4PSNabxDQAw
+diawpv-l-0B1Nj1BUF5GYZ2udvmEScjFJfkOJhWnDKcRg4AtHfOYtKf44JiLbWy-LGI5VAz4tOYbShechzyhIJVIgS9uIciLnPCiLdprXZWLWvM8EzAzX3S_
+LicuYxONyA7shDZ6is8xYZjUhHZkPBdY0UXo9KnNOgDYlGgnQ25CbGhrAsVdIcz7IXKsKDbCdPandN1jzM87ERsmbczxOhLAjbKEGB95YZkoFQLGP3DBhWXg
+3O8xVpxnmfa9YlQQotNebvlE-8ZMG7Z8YnM71_fIaNv5yA9B5S8BBrLGX9KAuoqlL3pUGgDYfhrvOQ2w674eqi3iUXId-TKN6v2mbUmInPxO5G5xpYw8E0es
+BUECR9AW9Yv6YhWOcTzKHflNAxTpnZP0FJg2JexzjKFE7cEYMWjxZ0ji5H8T9eKakmAJmqK-44MYuF07t
+}
+
+AzureEntityColoring(AzureWindowsVirtualDesktopWorkspaces)
+!define AzureWindowsVirtualDesktopWorkspaces(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopWorkspaces, AzureWindowsVirtualDesktopWorkspaces)
+!define AzureWindowsVirtualDesktopWorkspaces(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopWorkspaces, AzureWindowsVirtualDesktopWorkspaces)
diff --git a/dist/Compute/AzureWindowsVirtualDesktopWorkspaces.svg b/dist/Compute/AzureWindowsVirtualDesktopWorkspaces.svg
new file mode 100644
index 00000000..cae6ec7b
--- /dev/null
+++ b/dist/Compute/AzureWindowsVirtualDesktopWorkspaces.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9" y1="17.5" x2="9" y2="0.5" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0%,35.686275%,63.137255%);stop-opacity:1;"/>
+<stop offset="0.168" style="stop-color:rgb(0%,38.823529%,68.235294%);stop-opacity:1;"/>
+<stop offset="0.577" style="stop-color:rgb(0%,44.705882%,79.215686%);stop-opacity:1;"/>
+<stop offset="0.815" style="stop-color:rgb(0%,47.058824%,83.137255%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 68.054688 35 C 68.054688 53.257813 53.257813 68.054688 35 68.054688 C 16.742188 68.054688 1.945313 53.257813 1.945313 35 C 1.945313 16.742188 16.742188 1.945313 35 1.945313 C 53.257813 1.945313 68.054688 16.742188 68.054688 35 Z M 68.054688 35 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(49.019608%,88.627451%,98.431373%);fill-opacity:1;" d="M 34.535156 18.238281 C 32.917969 18.238281 31.605469 19.546875 31.605469 21.164063 L 31.605469 35.527344 C 31.605469 37.144531 32.917969 38.453125 34.535156 38.453125 L 48.894531 38.453125 C 50.511719 38.453125 51.820313 37.144531 51.820313 35.527344 L 51.820313 21.164063 C 51.820313 19.546875 50.511719 18.238281 48.894531 18.238281 Z M 37.167969 22.042969 C 36.699219 22.042969 36.253906 22.226563 35.921875 22.554688 C 35.59375 22.882813 35.410156 23.332031 35.410156 23.796875 L 35.410156 32.890625 C 35.410156 33.863281 36.195313 34.648438 37.167969 34.648438 L 46.277344 34.648438 C 46.742188 34.648438 47.191406 34.464844 47.519531 34.136719 C 47.847656 33.804688 48.03125 33.359375 48.03125 32.890625 L 48.03125 23.796875 C 48.03125 22.828125 47.246094 22.042969 46.277344 22.042969 Z M 37.167969 22.042969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18.179688 29.167969 C 18.179688 28.199219 18.964844 27.414063 19.933594 27.414063 L 27.132813 27.414063 C 28.101563 27.414063 28.886719 28.199219 28.886719 29.167969 L 28.886719 36.402344 C 28.886719 37.371094 28.101563 38.15625 27.132813 38.15625 L 19.933594 38.15625 C 18.964844 38.15625 18.179688 37.371094 18.179688 36.402344 Z M 18.179688 42.808594 C 18.179688 41.839844 18.964844 41.054688 19.933594 41.054688 L 27.132813 41.054688 C 28.101563 41.054688 28.886719 41.839844 28.886719 42.808594 L 28.886719 50.007813 C 28.886719 50.976563 28.101563 51.761719 27.132813 51.761719 L 19.933594 51.761719 C 18.964844 51.761719 18.179688 50.976563 18.179688 50.007813 Z M 31.605469 42.632813 C 31.605469 42.167969 31.789063 41.722656 32.121094 41.390625 C 32.449219 41.0625 32.898438 40.878906 33.363281 40.878906 L 40.558594 40.878906 C 41.527344 40.878906 42.3125 41.664063 42.316406 42.632813 L 42.316406 49.832031 C 42.3125 50.800781 41.527344 51.585938 40.558594 51.585938 L 33.363281 51.585938 C 32.898438 51.585938 32.449219 51.402344 32.121094 51.074219 C 31.789063 50.746094 31.605469 50.296875 31.605469 49.832031 Z M 31.605469 42.632813 "/>
+</g>
+</svg>
diff --git a/dist/Compute/CitrixVirtualDesktopsEssential(m).png b/dist/Compute/CitrixVirtualDesktopsEssential(m).png
new file mode 100644
index 00000000..d36c34e8
Binary files /dev/null and b/dist/Compute/CitrixVirtualDesktopsEssential(m).png differ
diff --git a/dist/Compute/CitrixVirtualDesktopsEssential(m).svg b/dist/Compute/CitrixVirtualDesktopsEssential(m).svg
new file mode 100644
index 00000000..78527461
--- /dev/null
+++ b/dist/Compute/CitrixVirtualDesktopsEssential(m).svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="69pt" viewBox="0 0 70 69" version="1.1">
+<g id="surface1">
+<path style="fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(11,151,255);stroke-opacity:1;stroke-miterlimit:4;" d="M 131.400335 161.996862 C 120.995491 161.996862 111.197344 156.80431 105.302277 148.10245 C 101.995781 143.103726 96.495067 140.196305 90.6 140.196305 C 84.603817 140.196305 79.295223 143.103726 75.897723 148.10245 C 70.103772 156.80431 60.396629 162.098877 49.799665 162.098877 C 32.397589 162.098877 18.302009 148.000435 18.302009 130.596715 C 18.302009 120.20141 23.499375 110.39779 32.195357 104.501336 C 37.200603 101.196058 40.102634 95.697461 40.102634 89.801007 C 40.102634 83.802539 37.200603 78.497771 32.195357 75.100679 C 23.499375 69.296038 18.200893 59.604635 18.200893 48.995098 C 18.200893 31.601579 32.296473 17.503138 49.698549 17.503138 C 60.103393 17.503138 69.90154 22.69569 75.796607 31.39755 C 79.103103 36.396274 84.603817 39.303695 90.498884 39.303695 C 96.404062 39.303695 101.904777 36.30446 105.201161 31.39755 C 110.995112 22.69569 120.702254 17.401123 131.299219 17.401123 C 148.701295 17.401123 162.796875 31.499565 162.796875 48.903285 C 162.796875 59.29859 157.599509 69.10221 148.903527 74.998664 C 143.898281 78.303942 140.99625 83.802539 140.99625 89.698993 C 140.99625 95.697461 143.898281 101.002229 148.903527 104.399321 C 157.599509 110.203962 162.897991 119.895365 162.897991 130.504902 C 162.897991 147.898421 148.802411 161.996862 131.400335 161.996862 Z M 90.6 131.698475 C 99.295982 131.698475 107.395379 136.003498 112.299509 143.297554 C 116.698058 149.704082 123.796406 153.499032 131.400335 153.499032 C 144.100513 153.499032 154.404241 143.19554 154.404241 130.504902 C 154.404241 122.802786 150.602277 115.702558 144.201629 111.397535 C 136.901049 106.500826 132.5025 98.298838 132.5025 89.596978 C 132.5025 80.895118 136.799933 72.795145 144.100513 67.898436 C 150.501161 63.501599 154.303125 56.401371 154.303125 48.80127 C 154.303125 36.100431 143.999397 25.796939 131.299219 25.796939 C 123.604286 25.796939 116.495826 29.60209 112.198393 35.998416 C 107.304375 43.302674 99.103862 47.699511 90.498884 47.699511 C 81.904018 47.699511 73.703504 43.404689 68.799375 36.100431 C 64.400826 29.704105 57.302478 25.898954 49.698549 25.898954 C 36.998371 25.898954 26.704754 36.202446 26.704754 48.903285 C 26.704754 56.595199 30.496607 63.695427 36.897254 68.00045 C 44.197835 72.89716 48.596384 81.099147 48.596384 89.698993 C 48.596384 98.400853 44.298951 106.500826 36.998371 111.397535 C 30.597723 115.804573 26.795759 122.904801 26.795759 130.504902 C 26.795759 143.19554 37.099487 153.499032 49.799665 153.499032 C 57.50471 153.499032 64.603058 149.704082 68.900491 143.297554 C 73.804621 136.003498 81.904018 131.698475 90.6 131.698475 Z M 90.6 131.698475 " transform="matrix(0.386313,0,0,0.38291,0,0.133807)"/>
+<path style="fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(11,151,255);stroke-opacity:1;stroke-miterlimit:4;" d="M 90.6 125.802021 C 84.199353 125.802021 77.798705 123.404674 72.904687 118.599778 L 62.004375 107.796413 C 52.196116 98.002995 52.095 81.996877 61.802143 72.101444 L 72.601339 61.196065 C 82.399487 51.402647 98.396049 51.300632 108.295312 61.002237 L 119.195625 71.7954 C 123.998638 76.498281 126.698438 82.904809 126.698438 89.596978 C 126.698438 96.401363 124.099754 102.695675 119.397857 107.500571 L 108.598661 118.395748 C 103.704643 123.302659 97.202879 125.802021 90.6 125.802021 Z M 90.498884 62.103997 C 86.201451 62.103997 81.802902 63.695427 78.496406 67.000706 L 67.798326 77.997898 C 61.296563 84.598254 61.397679 95.197589 67.899442 101.797945 L 78.799754 112.601309 C 85.402634 119.09965 95.999598 118.997635 102.602478 112.499294 L 113.401674 101.604117 C 116.596942 98.400853 118.295692 94.197844 118.295692 89.698993 C 118.295692 85.200141 116.495826 80.997132 113.300558 77.895883 L 102.400246 67.10272 C 99.103862 63.695427 94.796317 62.103997 90.498884 62.103997 Z M 90.498884 62.103997 " transform="matrix(0.386313,0,0,0.38291,0,0.133807)"/>
+</g>
+</svg>
diff --git a/dist/Compute/CitrixVirtualDesktopsEssential.png b/dist/Compute/CitrixVirtualDesktopsEssential.png
new file mode 100644
index 00000000..f88d40fa
Binary files /dev/null and b/dist/Compute/CitrixVirtualDesktopsEssential.png differ
diff --git a/dist/Compute/CitrixVirtualDesktopsEssential.puml b/dist/Compute/CitrixVirtualDesktopsEssential.puml
new file mode 100644
index 00000000..1fa6660a
--- /dev/null
+++ b/dist/Compute/CitrixVirtualDesktopsEssential.puml
@@ -0,0 +1,15 @@
+sprite $CitrixVirtualDesktopsEssential [70x69/16z] {
+xLU7bk0W25nHiUl__-t5lESQ77BrbMjiLpCP40Rsuy-p_sQii-Oh-zOv-WQ4YwMDCLeEwad3gLxRlIOsxwz9uzDQm7DSzdxX5n1kusd57aJI49PKEc5krSZE
+-f3ltmMCoJTqy7RjPmM6fyEHLe3AX7a69yq5_ZnT9ni0eNQ1-8D_De9fUQ3If0EnYUUYoK_VGpyzf7gj73xP3WIft5T15w1FOp7Tvg-r057fzhpuwVlefRJx
+9z2_o6QvalRADdhSRVNQfJPpuaOjXNA_CShEGUcIv5_1n-KMXy1EtxfGFABye3b0ASiZC7Axnj4ZTqQtQ12nz1dQfFaK8ReCxAQ5jckFG2OgfbXJhZgDQRsl
+4iVgPQK20Yf1Zvx8XJhTabxvhWI1vi4eGJO1aquOtrOC07ia8q58S6qJPbUddgVz-Pm00PWu5WYOdqxbTGpY6RVypS3syARUPOMOjKk9woMkNxH4J234RRfH
+rclXvdd-1B71fERF7ozvHat61AtSvw9Q3qjHMDGFsde-trXw5Rk9LRyASfyGceMAWapVkSHVuJ9z4IeC6a-WzEhBmeU87we-TQ0An-PhgAbTE3povVsIJ5pL
+4RIPW9SMk0uwSRJUOh2zRf3kTcMo7fEd555PC0A4ToriKOD-Mgoep6nqaCb6Xpbze1k6Lc0NY43rMlmJpWmrx9c1KNULSgq4emVE33Zne2IypuFLgJe1m5KR
+2s1cWDu8zQCPUOQP0VeqT7lTVdNoCCwp9vrcboYlYk9IlUydyvlQV7kkCw6FPTdgQdCcNRTGdNjcW0QapZnMKPwyPuOoK58SL19qgjLatLQU8xVDXTm4_TKr
+tL5ObIGcYRm6zj31AOq3DOlHsHt28IMZ16SC-TWc9cDjPhR6M4vzCqMOQNqYA998UU_3tUF_XNW8HyxHedbj0clkRybh-nJAlTzBFBp16cPsvglxtdxySVRV
+lW
+}
+
+AzureEntityColoring(CitrixVirtualDesktopsEssential)
+!define CitrixVirtualDesktopsEssential(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, CitrixVirtualDesktopsEssential, CitrixVirtualDesktopsEssential)
+!define CitrixVirtualDesktopsEssential(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, CitrixVirtualDesktopsEssential, CitrixVirtualDesktopsEssential)
diff --git a/dist/Compute/CitrixVirtualDesktopsEssential.svg b/dist/Compute/CitrixVirtualDesktopsEssential.svg
new file mode 100644
index 00000000..ba6384a4
--- /dev/null
+++ b/dist/Compute/CitrixVirtualDesktopsEssential.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="69pt" viewBox="0 0 70 69" version="1.1">
+<g id="surface1">
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(25.882353%,57.647059%,95.686275%);stroke-opacity:1;stroke-miterlimit:4;" d="M 131.400335 161.996862 C 120.995491 161.996862 111.197344 156.80431 105.302277 148.10245 C 101.995781 143.103726 96.495067 140.196305 90.6 140.196305 C 84.603817 140.196305 79.295223 143.103726 75.897723 148.10245 C 70.103772 156.80431 60.396629 162.098877 49.799665 162.098877 C 32.397589 162.098877 18.302009 148.000435 18.302009 130.596715 C 18.302009 120.20141 23.499375 110.39779 32.195357 104.501336 C 37.200603 101.196058 40.102634 95.697461 40.102634 89.801007 C 40.102634 83.802539 37.200603 78.497771 32.195357 75.100679 C 23.499375 69.296038 18.200893 59.604635 18.200893 48.995098 C 18.200893 31.601579 32.296473 17.503138 49.698549 17.503138 C 60.103393 17.503138 69.90154 22.69569 75.796607 31.39755 C 79.103103 36.396274 84.603817 39.303695 90.498884 39.303695 C 96.404062 39.303695 101.904777 36.30446 105.201161 31.39755 C 110.995112 22.69569 120.702254 17.401123 131.299219 17.401123 C 148.701295 17.401123 162.796875 31.499565 162.796875 48.903285 C 162.796875 59.29859 157.599509 69.10221 148.903527 74.998664 C 143.898281 78.303942 140.99625 83.802539 140.99625 89.698993 C 140.99625 95.697461 143.898281 101.002229 148.903527 104.399321 C 157.599509 110.203962 162.897991 119.895365 162.897991 130.504902 C 162.897991 147.898421 148.802411 161.996862 131.400335 161.996862 Z M 90.6 131.698475 C 99.295982 131.698475 107.395379 136.003498 112.299509 143.297554 C 116.698058 149.704082 123.796406 153.499032 131.400335 153.499032 C 144.100513 153.499032 154.404241 143.19554 154.404241 130.504902 C 154.404241 122.802786 150.602277 115.702558 144.201629 111.397535 C 136.901049 106.500826 132.5025 98.298838 132.5025 89.596978 C 132.5025 80.895118 136.799933 72.795145 144.100513 67.898436 C 150.501161 63.501599 154.303125 56.401371 154.303125 48.80127 C 154.303125 36.100431 143.999397 25.796939 131.299219 25.796939 C 123.604286 25.796939 116.495826 29.60209 112.198393 35.998416 C 107.304375 43.302674 99.103862 47.699511 90.498884 47.699511 C 81.904018 47.699511 73.703504 43.404689 68.799375 36.100431 C 64.400826 29.704105 57.302478 25.898954 49.698549 25.898954 C 36.998371 25.898954 26.704754 36.202446 26.704754 48.903285 C 26.704754 56.595199 30.496607 63.695427 36.897254 68.00045 C 44.197835 72.89716 48.596384 81.099147 48.596384 89.698993 C 48.596384 98.400853 44.298951 106.500826 36.998371 111.397535 C 30.597723 115.804573 26.795759 122.904801 26.795759 130.504902 C 26.795759 143.19554 37.099487 153.499032 49.799665 153.499032 C 57.50471 153.499032 64.603058 149.704082 68.900491 143.297554 C 73.804621 136.003498 81.904018 131.698475 90.6 131.698475 Z M 90.6 131.698475 " transform="matrix(0.386313,0,0,0.38291,0,0.133807)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(25.882353%,57.647059%,95.686275%);stroke-opacity:1;stroke-miterlimit:4;" d="M 90.6 125.802021 C 84.199353 125.802021 77.798705 123.404674 72.904687 118.599778 L 62.004375 107.796413 C 52.196116 98.002995 52.095 81.996877 61.802143 72.101444 L 72.601339 61.196065 C 82.399487 51.402647 98.396049 51.300632 108.295312 61.002237 L 119.195625 71.7954 C 123.998638 76.498281 126.698438 82.904809 126.698438 89.596978 C 126.698438 96.401363 124.099754 102.695675 119.397857 107.500571 L 108.598661 118.395748 C 103.704643 123.302659 97.202879 125.802021 90.6 125.802021 Z M 90.498884 62.103997 C 86.201451 62.103997 81.802902 63.695427 78.496406 67.000706 L 67.798326 77.997898 C 61.296563 84.598254 61.397679 95.197589 67.899442 101.797945 L 78.799754 112.601309 C 85.402634 119.09965 95.999598 118.997635 102.602478 112.499294 L 113.401674 101.604117 C 116.596942 98.400853 118.295692 94.197844 118.295692 89.698993 C 118.295692 85.200141 116.495826 80.997132 113.300558 77.895883 L 102.400246 67.10272 C 99.103862 63.695427 94.796317 62.103997 90.498884 62.103997 Z M 90.498884 62.103997 " transform="matrix(0.386313,0,0,0.38291,0,0.133807)"/>
+</g>
+</svg>
diff --git a/dist/Compute/VirtualMachine(m).png b/dist/Compute/VirtualMachine(m).png
new file mode 100644
index 00000000..10f8aa4a
Binary files /dev/null and b/dist/Compute/VirtualMachine(m).png differ
diff --git a/dist/Compute/VirtualMachine(m).svg b/dist/Compute/VirtualMachine(m).svg
new file mode 100644
index 00000000..56c4a7f7
--- /dev/null
+++ b/dist/Compute/VirtualMachine(m).svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.8125 2.804688 C 65.796875 2.804688 65.785156 2.800781 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.277344 54.601563 Z M 65.8125 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 33.265625 44.445313 C 33.195313 44.445313 33.132813 44.425781 33.078125 44.394531 L 20.789063 37.300781 C 20.671875 37.234375 20.597656 37.117188 20.597656 36.976563 L 20.597656 22.746094 C 20.597656 22.613281 20.671875 22.488281 20.789063 22.421875 C 20.902344 22.355469 21.042969 22.355469 21.164063 22.421875 L 33.453125 29.511719 C 33.5625 29.582031 33.636719 29.703125 33.636719 29.839844 L 33.636719 44.070313 C 33.636719 44.207031 33.5625 44.328125 33.453125 44.394531 C 33.390625 44.425781 33.328125 44.445313 33.265625 44.445313 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.746094 44.445313 C 36.679688 44.445313 36.617188 44.425781 36.550781 44.394531 C 36.445313 44.328125 36.371094 44.207031 36.371094 44.070313 L 36.371094 29.929688 C 36.371094 29.796875 36.445313 29.671875 36.550781 29.605469 L 48.839844 22.515625 C 48.957031 22.449219 49.09375 22.449219 49.210938 22.515625 C 49.328125 22.582031 49.398438 22.703125 49.398438 22.835938 L 49.398438 36.976563 C 49.398438 37.117188 49.328125 37.234375 49.210938 37.300781 L 36.925781 44.394531 C 36.875 44.425781 36.808594 44.445313 36.746094 44.445313 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.785156 L 0 50.644531 C 0 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.769531 54.597656 C 67.871094 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.871094 2.800781 65.769531 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 29.398438 54.601563 L 40.601563 54.601563 L 40.601563 61.601563 L 29.398438 61.601563 Z M 29.398438 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.039063 27.152344 C 34.976563 27.152344 34.910156 27.132813 34.851563 27.097656 L 22.523438 19.984375 C 22.410156 19.917969 22.339844 19.792969 22.339844 19.660156 C 22.339844 19.527344 22.410156 19.402344 22.523438 19.339844 L 34.777344 12.269531 C 34.890625 12.207031 35.03125 12.207031 35.144531 12.269531 L 47.472656 19.386719 C 47.589844 19.453125 47.65625 19.578125 47.65625 19.710938 C 47.65625 19.84375 47.589844 19.964844 47.472656 20.03125 L 35.226563 27.097656 C 35.167969 27.132813 35.105469 27.152344 35.039063 27.152344 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 53.199219 67.199219 L 16.800781 67.199219 C 16.800781 64.105469 19.308594 61.601563 22.398438 61.601563 L 47.601563 61.601563 C 50.691406 61.601563 53.199219 64.105469 53.199219 67.199219 Z M 53.199219 67.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35.722656 5.734375 C 35.722656 6.28125 35.277344 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.277344 4.738281 35.722656 5.183594 35.722656 5.734375 "/>
+</g>
+</svg>
diff --git a/dist/Compute/VirtualMachine.png b/dist/Compute/VirtualMachine.png
new file mode 100644
index 00000000..acd22c85
Binary files /dev/null and b/dist/Compute/VirtualMachine.png differ
diff --git a/dist/Compute/VirtualMachine.puml b/dist/Compute/VirtualMachine.puml
new file mode 100644
index 00000000..45e87f85
--- /dev/null
+++ b/dist/Compute/VirtualMachine.puml
@@ -0,0 +1,10 @@
+sprite $VirtualMachine [70x70/16z] {
+xTO7UkKW34LXjOinC_lVRfe_-LKYWzAJVm47a2jzBImfJ4zagIbhMvMaPYDFK6e4g7rjKqEbX96MFas-ykoiKgRLRrXHGRe29YBDLI3qWYrHKTen9Yj65mGJ
+5J1Tqz4AXEvW6weOTKXG2RVYc-bNWh4u7PeBxfvAC3HTiC9lbwiR1eRZ5Tuw47AsDLI7AYnsDXxrncZ5E-O3WUf4nOzLu1kPhB0eYZTcAkxbDAQQgx3wH7vU
+vQzI95Tn9ftAuBjEvKx5CFmbqUkAOUQh1hcesEmNrcIl619VUzqgXkIV1_mzbQYutrXnQvkMYxXSnA5kMiRAIpxIX0XFdRNZVBskmlGg_Dyr2dnIvQ_oRpTS
+uRAslgfqXBR0GZ5k8L1eQJ6cI3j0AL8EKFh27W4
+}
+
+AzureEntityColoring(VirtualMachine)
+!define VirtualMachine(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, VirtualMachine, VirtualMachine)
+!define VirtualMachine(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, VirtualMachine, VirtualMachine)
diff --git a/dist/Compute/VirtualMachine.svg b/dist/Compute/VirtualMachine.svg
new file mode 100644
index 00000000..6dca039e
--- /dev/null
+++ b/dist/Compute/VirtualMachine.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.8125 2.804688 C 65.796875 2.804688 65.785156 2.800781 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.277344 54.601563 Z M 65.8125 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 33.265625 44.445313 C 33.195313 44.445313 33.132813 44.425781 33.078125 44.394531 L 20.789063 37.300781 C 20.671875 37.234375 20.597656 37.117188 20.597656 36.976563 L 20.597656 22.746094 C 20.597656 22.613281 20.671875 22.488281 20.789063 22.421875 C 20.902344 22.355469 21.042969 22.355469 21.164063 22.421875 L 33.453125 29.511719 C 33.5625 29.582031 33.636719 29.703125 33.636719 29.839844 L 33.636719 44.070313 C 33.636719 44.207031 33.5625 44.328125 33.453125 44.394531 C 33.390625 44.425781 33.328125 44.445313 33.265625 44.445313 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.746094 44.445313 C 36.679688 44.445313 36.617188 44.425781 36.550781 44.394531 C 36.445313 44.328125 36.371094 44.207031 36.371094 44.070313 L 36.371094 29.929688 C 36.371094 29.796875 36.445313 29.671875 36.550781 29.605469 L 48.839844 22.515625 C 48.957031 22.449219 49.09375 22.449219 49.210938 22.515625 C 49.328125 22.582031 49.398438 22.703125 49.398438 22.835938 L 49.398438 36.976563 C 49.398438 37.117188 49.328125 37.234375 49.210938 37.300781 L 36.925781 44.394531 C 36.875 44.425781 36.808594 44.445313 36.746094 44.445313 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.785156 L 0 50.644531 C 0 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.769531 54.597656 C 67.871094 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.871094 2.800781 65.769531 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 29.398438 54.601563 L 40.601563 54.601563 L 40.601563 61.601563 L 29.398438 61.601563 Z M 29.398438 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.039063 27.152344 C 34.976563 27.152344 34.910156 27.132813 34.851563 27.097656 L 22.523438 19.984375 C 22.410156 19.917969 22.339844 19.792969 22.339844 19.660156 C 22.339844 19.527344 22.410156 19.402344 22.523438 19.339844 L 34.777344 12.269531 C 34.890625 12.207031 35.03125 12.207031 35.144531 12.269531 L 47.472656 19.386719 C 47.589844 19.453125 47.65625 19.578125 47.65625 19.710938 C 47.65625 19.84375 47.589844 19.964844 47.472656 20.03125 L 35.226563 27.097656 C 35.167969 27.132813 35.105469 27.152344 35.039063 27.152344 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 53.199219 67.199219 L 16.800781 67.199219 C 16.800781 64.105469 19.308594 61.601563 22.398438 61.601563 L 47.601563 61.601563 C 50.691406 61.601563 53.199219 64.105469 53.199219 67.199219 Z M 53.199219 67.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35.722656 5.734375 C 35.722656 6.28125 35.277344 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.277344 4.738281 35.722656 5.183594 35.722656 5.734375 "/>
+</g>
+</svg>
diff --git a/dist/Compute/VirtualMachineClassic(m).png b/dist/Compute/VirtualMachineClassic(m).png
new file mode 100644
index 00000000..3cdd0f23
Binary files /dev/null and b/dist/Compute/VirtualMachineClassic(m).png differ
diff --git a/dist/Compute/VirtualMachineClassic(m).svg b/dist/Compute/VirtualMachineClassic(m).svg
new file mode 100644
index 00000000..3d7b156c
--- /dev/null
+++ b/dist/Compute/VirtualMachineClassic(m).svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 65.800781 2.800781 L 3.78125 2.800781 C 1.679688 2.800781 0 4.621094 0 6.71875 L 0 49.980469 C 0 52.078125 1.679688 53.898438 3.78125 53.898438 L 26.320313 53.898438 C 28.558594 62.019531 25.480469 63.140625 12.039063 63.140625 L 12.039063 67.339844 L 57.679688 67.339844 L 57.679688 63.140625 C 44.238281 63.140625 42.839844 62.019531 45.21875 53.898438 L 65.800781 53.898438 C 67.898438 53.898438 70 52.078125 70 49.980469 L 70 6.71875 C 70 4.621094 67.898438 2.800781 65.800781 2.800781 Z M 65.800781 2.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 64.539063 8.121094 L 64.539063 48.578125 L 5.320313 48.578125 L 5.320313 8.121094 Z M 64.539063 8.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 35.699219 27.160156 C 35.699219 27.160156 35.558594 27.160156 35.558594 27.160156 L 23.238281 20.019531 C 23.101563 20.019531 23.101563 19.878906 23.101563 19.738281 C 23.101563 19.601563 23.238281 19.460938 23.238281 19.460938 L 35.558594 12.460938 C 35.699219 12.460938 35.839844 12.460938 35.980469 12.460938 L 48.300781 19.601563 C 48.441406 19.601563 48.441406 19.738281 48.441406 19.878906 C 48.441406 20.019531 48.441406 20.160156 48.300781 20.160156 L 36.121094 27.160156 C 35.839844 27.160156 35.839844 27.160156 35.699219 27.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 34.019531 44.378906 C 34.019531 44.378906 33.878906 44.378906 33.878906 44.378906 L 21.558594 37.238281 C 21.421875 37.238281 21.421875 37.101563 21.421875 36.960938 L 21.421875 22.679688 C 21.421875 22.539063 21.558594 22.398438 21.558594 22.398438 C 21.699219 22.398438 21.839844 22.398438 21.980469 22.398438 L 34.300781 29.539063 C 34.441406 29.539063 34.441406 29.679688 34.441406 29.820313 L 34.441406 44.101563 C 34.441406 44.238281 34.300781 44.378906 34.300781 44.378906 C 34.160156 44.378906 34.019531 44.378906 34.019531 44.378906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 37.519531 44.378906 C 37.519531 44.378906 37.378906 44.378906 37.378906 44.378906 C 37.238281 44.378906 37.238281 44.238281 37.238281 44.101563 L 37.238281 29.960938 C 37.238281 29.820313 37.378906 29.679688 37.378906 29.679688 L 49.699219 22.539063 C 49.839844 22.539063 49.980469 22.539063 50.121094 22.539063 C 50.261719 22.539063 50.261719 22.679688 50.261719 22.820313 L 50.261719 36.960938 C 50.261719 37.101563 50.121094 37.238281 50.121094 37.238281 L 37.800781 44.378906 C 37.660156 44.378906 37.519531 44.378906 37.519531 44.378906 "/>
+</g>
+</svg>
diff --git a/dist/Compute/VirtualMachineClassic.png b/dist/Compute/VirtualMachineClassic.png
new file mode 100644
index 00000000..3b5b6471
Binary files /dev/null and b/dist/Compute/VirtualMachineClassic.png differ
diff --git a/dist/Compute/VirtualMachineClassic.puml b/dist/Compute/VirtualMachineClassic.puml
new file mode 100644
index 00000000..ad53b0c5
--- /dev/null
+++ b/dist/Compute/VirtualMachineClassic.puml
@@ -0,0 +1,10 @@
+sprite $VirtualMachineClassic [70x70/16z] {
+xTT74iCW341HgmBY_kTDLteyHl8YxQzItnXNcDuhIBOtKDFX1Bf29FgL4SIxtidnFb4XoYjOUw-GLDJwBjECmjPF6KSLQlsgYX45Qx-hmAW2QlqXap65hJ-j
+qOY2DQluhisE20yVYDqPXxqBi5IHVln3UJpIRBfOyOt7vaPZ7-Q8ulzZyntYspQc-1ZKh83lfu3Y-nDzeoAA3yLtK4Jn6leEoIYz-Fkiec-d_1LihnMZ1Sef
+iUUAwTZTkzWJfKBqIN9H6aMUQcpNYadq2IlcYXM8F-sX79MAkPa7yVmCvaldTVdvxhibgoYhZ8jMMQlDh1jfwTfbcWiU5KYTJzwqXi9lf500mGT5CaZusWSK
+VHOlS6WViuZE9SoqRsPt3lG92ij8qvks1G
+}
+
+AzureEntityColoring(VirtualMachineClassic)
+!define VirtualMachineClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, VirtualMachineClassic, VirtualMachineClassic)
+!define VirtualMachineClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, VirtualMachineClassic, VirtualMachineClassic)
diff --git a/dist/Compute/VirtualMachineClassic.svg b/dist/Compute/VirtualMachineClassic.svg
new file mode 100644
index 00000000..ed08d683
--- /dev/null
+++ b/dist/Compute/VirtualMachineClassic.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 65.800781 2.800781 L 3.78125 2.800781 C 1.679688 2.800781 0 4.621094 0 6.71875 L 0 49.980469 C 0 52.078125 1.679688 53.898438 3.78125 53.898438 L 26.320313 53.898438 C 28.558594 62.019531 25.480469 63.140625 12.039063 63.140625 L 12.039063 67.339844 L 57.679688 67.339844 L 57.679688 63.140625 C 44.238281 63.140625 42.839844 62.019531 45.21875 53.898438 L 65.800781 53.898438 C 67.898438 53.898438 70 52.078125 70 49.980469 L 70 6.71875 C 70 4.621094 67.898438 2.800781 65.800781 2.800781 Z M 65.800781 2.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 64.539063 8.121094 L 64.539063 48.578125 L 5.320313 48.578125 L 5.320313 8.121094 Z M 64.539063 8.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 35.699219 27.160156 C 35.699219 27.160156 35.558594 27.160156 35.558594 27.160156 L 23.238281 20.019531 C 23.101563 20.019531 23.101563 19.878906 23.101563 19.738281 C 23.101563 19.601563 23.238281 19.460938 23.238281 19.460938 L 35.558594 12.460938 C 35.699219 12.460938 35.839844 12.460938 35.980469 12.460938 L 48.300781 19.601563 C 48.441406 19.601563 48.441406 19.738281 48.441406 19.878906 C 48.441406 20.019531 48.441406 20.160156 48.300781 20.160156 L 36.121094 27.160156 C 35.839844 27.160156 35.839844 27.160156 35.699219 27.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 34.019531 44.378906 C 34.019531 44.378906 33.878906 44.378906 33.878906 44.378906 L 21.558594 37.238281 C 21.421875 37.238281 21.421875 37.101563 21.421875 36.960938 L 21.421875 22.679688 C 21.421875 22.539063 21.558594 22.398438 21.558594 22.398438 C 21.699219 22.398438 21.839844 22.398438 21.980469 22.398438 L 34.300781 29.539063 C 34.441406 29.539063 34.441406 29.679688 34.441406 29.820313 L 34.441406 44.101563 C 34.441406 44.238281 34.300781 44.378906 34.300781 44.378906 C 34.160156 44.378906 34.019531 44.378906 34.019531 44.378906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 37.519531 44.378906 C 37.519531 44.378906 37.378906 44.378906 37.378906 44.378906 C 37.238281 44.378906 37.238281 44.238281 37.238281 44.101563 L 37.238281 29.960938 C 37.238281 29.820313 37.378906 29.679688 37.378906 29.679688 L 49.699219 22.539063 C 49.839844 22.539063 49.980469 22.539063 50.121094 22.539063 C 50.261719 22.539063 50.261719 22.679688 50.261719 22.820313 L 50.261719 36.960938 C 50.261719 37.101563 50.121094 37.238281 50.121094 37.238281 L 37.800781 44.378906 C 37.660156 44.378906 37.519531 44.378906 37.519531 44.378906 "/>
+</g>
+</svg>
diff --git a/dist/Compute/VirtualMachineLinux(m).png b/dist/Compute/VirtualMachineLinux(m).png
new file mode 100644
index 00000000..84534af4
Binary files /dev/null and b/dist/Compute/VirtualMachineLinux(m).png differ
diff --git a/dist/Compute/VirtualMachineLinux(m).svg b/dist/Compute/VirtualMachineLinux(m).svg
new file mode 100644
index 00000000..f0370d9e
--- /dev/null
+++ b/dist/Compute/VirtualMachineLinux(m).svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.8125 2.804688 C 65.796875 2.804688 65.785156 2.800781 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.277344 54.601563 Z M 65.8125 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface12" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.386719 19.363281 L 36.667969 19.804688 L 36.046875 18.675781 C 35.8125 18.242188 35.777344 17.878906 35.9375 17.488281 C 36.078125 17.15625 36.363281 16.964844 36.71875 16.964844 L 36.800781 16.96875 C 37.199219 17 37.597656 17.414063 37.71875 17.78125 C 37.847656 18.167969 37.847656 19.082031 37.386719 19.363281 Z M 37.386719 19.363281 "/>
+</g>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip3)">
+<use xlink:href="#surface12" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(245,250,255);fill-opacity:1;" d="M 30.421875 41.089844 C 30.421875 41.046875 26.875 35.355469 27.082031 34.367188 C 28.753906 26.425781 30.742188 25.265625 31.46875 23.589844 C 32.199219 21.910156 31.777344 20.363281 32.648438 20.34375 C 33.519531 20.324219 36.070313 20.515625 36.691406 20.722656 C 37.3125 20.925781 38.195313 21.554688 38.683594 22.925781 C 39.34375 24.179688 39.996094 25.433594 40.199219 26.863281 C 40.21875 26.996094 40.277344 27.121094 40.367188 27.21875 C 42.019531 29.042969 42.355469 31.253906 42.234375 33.589844 C 42.203125 34.183594 42.125 35.054688 42.046875 35.359375 C 41.964844 35.667969 39.734375 42.890625 36.222656 42.800781 C 32.707031 42.710938 30.835938 41.40625 30.421875 41.089844 Z M 30.421875 41.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 49.320313 39.40625 C 48.03125 39.339844 47.355469 38.566406 47.347656 37.828125 C 47.339844 36.960938 47.703125 35.875 46.453125 35.765625 C 45.199219 35.65625 42.636719 35.523438 41.949219 35.394531 C 40.449219 35.121094 40.375 35.730469 40.347656 36.167969 C 40.339844 36.371094 40.527344 38.402344 40.328125 39.195313 C 40.34375 39.539063 40.320313 39.878906 40.265625 40.222656 C 40.121094 41.148438 40.011719 42.078125 39.890625 43.003906 C 39.882813 43.457031 39.875 43.910156 39.867188 44.363281 C 40.957031 45.964844 43.078125 46.027344 44.390625 44.636719 C 45.621094 43.382813 47.105469 42.519531 48.667969 41.761719 C 49.113281 41.546875 49.53125 41.222656 49.765625 40.601563 C 50.003906 39.976563 49.78125 39.425781 49.320313 39.40625 Z M 49.320313 39.40625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 32.210938 38.628906 C 32.035156 39.496094 31.097656 40.261719 30.613281 40.195313 C 30.3125 40.03125 29.492188 38.949219 29.316406 38.683594 C 28.785156 37.878906 26.457031 34.539063 25.777344 34.792969 C 25.554688 34.820313 25.429688 34.976563 25.316406 35.144531 C 25.269531 35.160156 25.222656 35.179688 25.175781 35.199219 C 24.832031 34.449219 24.859375 33.699219 25.246094 32.984375 C 26.105469 31.417969 26.503906 29.804688 26.9375 28.0625 C 27.085938 27.480469 27.441406 26.992188 27.8125 26.523438 C 28.5 25.648438 28.484375 24.769531 29.1875 23.90625 C 29.636719 23.355469 30.03125 22.753906 29.988281 22.042969 C 29.867188 20.03125 29.613281 18.074219 29.699219 16.058594 C 29.78125 14.082031 31.507813 12.421875 33.441406 11.710938 C 35.449219 10.972656 37.351563 11.335938 38.964844 12.78125 C 40.230469 13.914063 40.785156 15.40625 40.882813 17.078125 C 40.898438 17.386719 40.914063 17.695313 40.902344 18 C 40.757813 21.148438 42.082031 23.707031 44.085938 25.992188 C 46.007813 28.1875 46.761719 30.8125 46.9375 33.652344 C 46.980469 34.394531 46.742188 35.089844 46.4375 35.757813 C 46.019531 36.722656 45.414063 37.324219 44.867188 37.570313 C 44.3125 37.820313 42.140625 37.992188 42.5625 36.5625 C 42.769531 35.859375 42.800781 35.5625 41.9375 35.386719 C 42 34.796875 42.09375 34.207031 42.125 33.617188 C 42.246094 31.277344 41.835938 29.429688 40.0625 27.769531 C 39.515625 27.253906 40.027344 27.171875 40.011719 26.710938 C 39.964844 25.460938 39.234375 24.203125 38.574219 22.953125 C 38.515625 22.71875 38.40625 22.515625 38.253906 22.332031 C 38.300781 22.136719 38.179688 21.996094 38.101563 21.839844 C 38.199219 21.445313 38.367188 21.058594 38.289063 20.636719 C 38.292969 20.273438 34.554688 20.117188 34.089844 20.304688 C 33.894531 20.238281 31.902344 20.152344 31.910156 20.183594 C 31.640625 20.386719 31.449219 20.648438 31.367188 20.96875 C 31.289063 21.273438 31.773438 21.898438 31.824219 22 C 31.800781 22.429688 31.78125 22.855469 31.757813 23.28125 C 31.714844 23.433594 31.671875 23.582031 31.632813 23.730469 C 31.3125 24.222656 30.988281 24.707031 30.679688 25.203125 C 30.40625 25.652344 30.089844 26.085938 30.050781 26.636719 C 29.835938 27.195313 30.609375 27.9375 29.902344 28.589844 C 29.199219 29.242188 28.488281 32.390625 28.476563 33.132813 C 28.464844 33.929688 29.921875 35.753906 30.480469 36.28125 C 31.503906 37.242188 32.421875 37.609375 32.210938 38.628906 Z M 32.210938 38.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 31.507813 41.632813 C 33.011719 42.058594 37.253906 42.1875 39.3125 40.121094 C 39.65625 39.804688 40.003906 39.492188 40.347656 39.175781 C 40.363281 39.519531 40.339844 39.859375 40.285156 40.207031 C 40.140625 41.128906 40.03125 42.058594 39.910156 42.988281 C 39.902344 43.4375 39.894531 43.890625 39.886719 44.34375 C 37.988281 43.820313 35.140625 43.636719 34.289063 43.679688 C 33.4375 43.726563 32.277344 43.9375 31.605469 44.117188 Z M 31.507813 41.632813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(77,179,255);fill-opacity:1;" d="M 47.460938 38.058594 C 47.429688 38.011719 47.398438 37.96875 47.367188 37.921875 C 47.398438 37.96875 47.429688 38.011719 47.460938 38.058594 Z M 47.460938 38.058594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(77,179,255);fill-opacity:1;" d="M 46.910156 36.097656 C 46.867188 36.058594 46.828125 36.019531 46.785156 35.980469 C 46.828125 36.019531 46.867188 36.058594 46.910156 36.097656 Z M 46.910156 36.097656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 30.644531 40.371094 C 30.664063 40.402344 30.683594 40.4375 30.703125 40.46875 C 30.683594 40.4375 30.664063 40.402344 30.644531 40.371094 Z M 30.644531 40.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 30.027344 39.464844 C 28.925781 38.324219 28.082031 36.9375 27.308594 35.390625 C 26.902344 34.574219 25.65625 33.925781 25.191406 35.207031 C 24.726563 36.488281 23.988281 37.007813 22.777344 36.847656 C 21.894531 36.730469 21.066406 37.40625 21.433594 38.523438 C 21.835938 39.726563 22.289063 40.671875 21.414063 41.511719 C 20.542969 42.355469 20.894531 43.226563 22.128906 43.394531 C 23.359375 43.5625 26.59375 44.296875 28.460938 45.285156 C 30.328125 46.269531 31.816406 44.40625 32.015625 43.855469 C 32.507813 42.488281 31.128906 40.605469 30.027344 39.464844 Z M 30.027344 39.464844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 34.191406 26.078125 C 33.140625 26.078125 32.4375 25.082031 31.941406 24.214844 C 31.9375 24.214844 30.3125 21.9375 30.90625 20.683594 C 30.988281 20.503906 31.128906 20.210938 32.796875 19.175781 L 33.109375 18.914063 L 33.40625 18.765625 L 33.597656 18.6875 C 33.828125 18.617188 34.089844 18.542969 34.335938 18.542969 L 34.453125 18.542969 L 34.671875 18.59375 L 35.167969 18.761719 L 39.226563 20.257813 L 39.339844 20.867188 C 39.429688 21.359375 39.308594 21.789063 39.207031 22.132813 L 39.054688 22.730469 L 38.707031 22.855469 C 38.398438 22.96875 37.921875 23.480469 37.535156 23.894531 C 37.152344 24.300781 36.792969 24.6875 36.421875 24.929688 C 36.289063 25.019531 36.144531 25.132813 36.003906 25.234375 C 35.421875 25.667969 34.875 26.078125 34.191406 26.078125 Z M 34.191406 26.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 36.898438 21.097656 C 36.179688 21.71875 35.359375 22.25 34.335938 22.277344 C 34.300781 22.308594 34.300781 22.308594 34.335938 22.277344 C 34.34375 22.046875 34.332031 21.824219 34.132813 21.652344 C 33.96875 21.515625 33.949219 21.304688 33.996094 21.125 C 34.1875 20.390625 34.070313 19.648438 34.101563 18.910156 C 33.90625 18.84375 33.46875 19.007813 33.410156 19.019531 C 33.320313 19.066406 33.230469 19.109375 33.144531 19.15625 C 33.042969 19.238281 32.941406 19.324219 32.839844 19.410156 C 32.707031 19.492188 31.328125 20.332031 31.1875 20.632813 C 30.824219 21.40625 32.023438 23.296875 32.195313 23.519531 C 33.597656 25.976563 34.375 24.910156 35.6875 23.992188 C 36.394531 23.535156 37.3125 22.144531 38.109375 21.851563 C 38.207031 21.453125 38.378906 21.070313 38.296875 20.648438 C 37.792969 20.675781 37.347656 20.707031 36.898438 21.097656 Z M 36.898438 21.097656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(81,181,255);fill-opacity:1;" d="M 33.519531 18.921875 C 33.523438 18.925781 33.527344 18.921875 33.53125 18.925781 C 33.527344 18.917969 33.53125 18.917969 33.527344 18.910156 Z M 33.519531 18.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 37.722656 20.089844 C 38.027344 20.242188 38.304688 20.417969 38.300781 20.816406 C 37.746094 20.851563 37.253906 20.886719 36.765625 21.3125 C 35.980469 21.988281 34.914063 22.996094 33.796875 23.027344 C 33.84375 22.660156 33.316406 22.132813 33.457031 21.503906 C 33.644531 20.699219 33.671875 19.722656 33.703125 18.914063 C 34.214844 18.710938 34.6875 18.898438 35.167969 19.046875 C 35.367188 19.167969 35.566406 19.289063 35.765625 19.40625 C 36.113281 19.542969 36.464844 19.675781 36.8125 19.808594 C 37.085938 19.996094 37.414063 20.019531 37.722656 20.089844 Z M 37.722656 20.089844 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.199219 17.574219 L 33.597656 17.574219 L 33.597656 18.976563 L 32.199219 18.976563 Z M 32.199219 17.574219 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.398438 17.574219 L 37.796875 17.574219 L 37.796875 18.976563 L 36.398438 18.976563 Z M 36.398438 17.574219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.785156 L 0 50.644531 C 0 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.769531 54.597656 C 67.871094 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.871094 2.800781 65.769531 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface14" mask="url(#mask2)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 29.398438 54.601563 L 40.601563 54.601563 L 40.601563 61.601563 L 29.398438 61.601563 Z M 29.398438 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 53.199219 67.199219 L 16.800781 67.199219 C 16.800781 64.105469 19.308594 61.601563 22.398438 61.601563 L 47.601563 61.601563 C 50.691406 61.601563 53.199219 64.105469 53.199219 67.199219 Z M 53.199219 67.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35.722656 5.734375 C 35.722656 6.28125 35.277344 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.277344 4.738281 35.722656 5.183594 35.722656 5.734375 "/>
+</g>
+</svg>
diff --git a/dist/Compute/VirtualMachineLinux.png b/dist/Compute/VirtualMachineLinux.png
new file mode 100644
index 00000000..14bacd92
Binary files /dev/null and b/dist/Compute/VirtualMachineLinux.png differ
diff --git a/dist/Compute/VirtualMachineLinux.puml b/dist/Compute/VirtualMachineLinux.puml
new file mode 100644
index 00000000..c30d79c8
--- /dev/null
+++ b/dist/Compute/VirtualMachineLinux.puml
@@ -0,0 +1,10 @@
+sprite $VirtualMachineLinux [70x70/16z] {
+xTG94jGW48NXD8HUt_tFArMKOLn64jfT_mDyx1o_LrHIqT4hegdChHv5iqYliQvgJT_d8rt6l4GylPgyOhqNXRVJdwc8cKbMSQ3dEIKmYepY-9Wb55p5lYAO
+vPK089aLQGE2iah8oOwauindpm5DACRjF1ixu0abc3jYw6qhEXPYQ01iLm7OX1qdAG3PKnHE9U2Lg028FGLeHAKRlG3WEue39_Kk1RgX0AYNSg8NpnK1b6Q2
+dZvM33XfLj3pnme0UYtGUweeuFIQxIWEs9UAF5GYW4el-ORIStYvZ58DG6pTtRccoW90DnG1h4mbOBoXi07jKlP_gK2X4ISKhiCeQXdb7Ai9Q4PXZ99AO2Gf
+HRWdQYbbzgyfC_FjCiWiWyoQZZoJaUGHByVHkcDlyfczZUduPWrNVYpwHSf_9QuUAyJcxzDw2wc-IExCn9UrjIA-ZfQAtwWk5RvHLtxVFW
+}
+
+AzureEntityColoring(VirtualMachineLinux)
+!define VirtualMachineLinux(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, VirtualMachineLinux, VirtualMachineLinux)
+!define VirtualMachineLinux(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, VirtualMachineLinux, VirtualMachineLinux)
diff --git a/dist/Compute/VirtualMachineLinux.svg b/dist/Compute/VirtualMachineLinux.svg
new file mode 100644
index 00000000..9e672356
--- /dev/null
+++ b/dist/Compute/VirtualMachineLinux.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.8125 2.804688 C 65.796875 2.804688 65.785156 2.800781 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.277344 54.601563 Z M 65.8125 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface12" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.386719 19.363281 L 36.667969 19.804688 L 36.046875 18.675781 C 35.8125 18.242188 35.777344 17.878906 35.9375 17.488281 C 36.078125 17.15625 36.363281 16.964844 36.71875 16.964844 L 36.800781 16.96875 C 37.199219 17 37.597656 17.414063 37.71875 17.78125 C 37.847656 18.167969 37.847656 19.082031 37.386719 19.363281 Z M 37.386719 19.363281 "/>
+</g>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip3)">
+<use xlink:href="#surface12" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.431373%,98.431373%,97.647059%);fill-opacity:1;" d="M 30.421875 41.089844 C 30.421875 41.046875 26.875 35.355469 27.082031 34.367188 C 28.753906 26.425781 30.742188 25.265625 31.46875 23.589844 C 32.199219 21.910156 31.777344 20.363281 32.648438 20.34375 C 33.519531 20.324219 36.070313 20.515625 36.691406 20.722656 C 37.3125 20.925781 38.195313 21.554688 38.683594 22.925781 C 39.34375 24.179688 39.996094 25.433594 40.199219 26.863281 C 40.21875 26.996094 40.277344 27.121094 40.367188 27.21875 C 42.019531 29.042969 42.355469 31.253906 42.234375 33.589844 C 42.203125 34.183594 42.125 35.054688 42.046875 35.359375 C 41.964844 35.667969 39.734375 42.890625 36.222656 42.800781 C 32.707031 42.710938 30.835938 41.40625 30.421875 41.089844 Z M 30.421875 41.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 49.320313 39.40625 C 48.03125 39.339844 47.355469 38.566406 47.347656 37.828125 C 47.339844 36.960938 47.703125 35.875 46.453125 35.765625 C 45.199219 35.65625 42.636719 35.523438 41.949219 35.394531 C 40.449219 35.121094 40.375 35.730469 40.347656 36.167969 C 40.339844 36.371094 40.527344 38.402344 40.328125 39.195313 C 40.34375 39.539063 40.320313 39.878906 40.265625 40.222656 C 40.121094 41.148438 40.011719 42.078125 39.890625 43.003906 C 39.882813 43.457031 39.875 43.910156 39.867188 44.363281 C 40.957031 45.964844 43.078125 46.027344 44.390625 44.636719 C 45.621094 43.382813 47.105469 42.519531 48.667969 41.761719 C 49.113281 41.546875 49.53125 41.222656 49.765625 40.601563 C 50.003906 39.976563 49.78125 39.425781 49.320313 39.40625 Z M 49.320313 39.40625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 32.210938 38.628906 C 32.035156 39.496094 31.097656 40.261719 30.613281 40.195313 C 30.3125 40.03125 29.492188 38.949219 29.316406 38.683594 C 28.785156 37.878906 26.457031 34.539063 25.777344 34.792969 C 25.554688 34.820313 25.429688 34.976563 25.316406 35.144531 C 25.269531 35.160156 25.222656 35.179688 25.175781 35.199219 C 24.832031 34.449219 24.859375 33.699219 25.246094 32.984375 C 26.105469 31.417969 26.503906 29.804688 26.9375 28.0625 C 27.085938 27.480469 27.441406 26.992188 27.8125 26.523438 C 28.5 25.648438 28.484375 24.769531 29.1875 23.90625 C 29.636719 23.355469 30.03125 22.753906 29.988281 22.042969 C 29.867188 20.03125 29.613281 18.074219 29.699219 16.058594 C 29.78125 14.082031 31.507813 12.421875 33.441406 11.710938 C 35.449219 10.972656 37.351563 11.335938 38.964844 12.78125 C 40.230469 13.914063 40.785156 15.40625 40.882813 17.078125 C 40.898438 17.386719 40.914063 17.695313 40.902344 18 C 40.757813 21.148438 42.082031 23.707031 44.085938 25.992188 C 46.007813 28.1875 46.761719 30.8125 46.9375 33.652344 C 46.980469 34.394531 46.742188 35.089844 46.4375 35.757813 C 46.019531 36.722656 45.414063 37.324219 44.867188 37.570313 C 44.3125 37.820313 42.140625 37.992188 42.5625 36.5625 C 42.769531 35.859375 42.800781 35.5625 41.9375 35.386719 C 42 34.796875 42.09375 34.207031 42.125 33.617188 C 42.246094 31.277344 41.835938 29.429688 40.0625 27.769531 C 39.515625 27.253906 40.027344 27.171875 40.011719 26.710938 C 39.964844 25.460938 39.234375 24.203125 38.574219 22.953125 C 38.515625 22.71875 38.40625 22.515625 38.253906 22.332031 C 38.300781 22.136719 38.179688 21.996094 38.101563 21.839844 C 38.199219 21.445313 38.367188 21.058594 38.289063 20.636719 C 38.292969 20.273438 34.554688 20.117188 34.089844 20.304688 C 33.894531 20.238281 31.902344 20.152344 31.910156 20.183594 C 31.640625 20.386719 31.449219 20.648438 31.367188 20.96875 C 31.289063 21.273438 31.773438 21.898438 31.824219 22 C 31.800781 22.429688 31.78125 22.855469 31.757813 23.28125 C 31.714844 23.433594 31.671875 23.582031 31.632813 23.730469 C 31.3125 24.222656 30.988281 24.707031 30.679688 25.203125 C 30.40625 25.652344 30.089844 26.085938 30.050781 26.636719 C 29.835938 27.195313 30.609375 27.9375 29.902344 28.589844 C 29.199219 29.242188 28.488281 32.390625 28.476563 33.132813 C 28.464844 33.929688 29.921875 35.753906 30.480469 36.28125 C 31.503906 37.242188 32.421875 37.609375 32.210938 38.628906 Z M 32.210938 38.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 31.507813 41.632813 C 33.011719 42.058594 37.253906 42.1875 39.3125 40.121094 C 39.65625 39.804688 40.003906 39.492188 40.347656 39.175781 C 40.363281 39.519531 40.339844 39.859375 40.285156 40.207031 C 40.140625 41.128906 40.03125 42.058594 39.910156 42.988281 C 39.902344 43.4375 39.894531 43.890625 39.886719 44.34375 C 37.988281 43.820313 35.140625 43.636719 34.289063 43.679688 C 33.4375 43.726563 32.277344 43.9375 31.605469 44.117188 Z M 31.507813 41.632813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,64.705882%,8.627451%);fill-opacity:1;" d="M 47.460938 38.058594 C 47.429688 38.011719 47.398438 37.96875 47.367188 37.921875 C 47.398438 37.96875 47.429688 38.011719 47.460938 38.058594 Z M 47.460938 38.058594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,64.705882%,8.627451%);fill-opacity:1;" d="M 46.910156 36.097656 C 46.867188 36.058594 46.828125 36.019531 46.785156 35.980469 C 46.828125 36.019531 46.867188 36.058594 46.910156 36.097656 Z M 46.910156 36.097656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.901961%,37.254902%,2.745098%);fill-opacity:1;" d="M 30.644531 40.371094 C 30.664063 40.402344 30.683594 40.4375 30.703125 40.46875 C 30.683594 40.4375 30.664063 40.402344 30.644531 40.371094 Z M 30.644531 40.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 30.027344 39.464844 C 28.925781 38.324219 28.082031 36.9375 27.308594 35.390625 C 26.902344 34.574219 25.65625 33.925781 25.191406 35.207031 C 24.726563 36.488281 23.988281 37.007813 22.777344 36.847656 C 21.894531 36.730469 21.066406 37.40625 21.433594 38.523438 C 21.835938 39.726563 22.289063 40.671875 21.414063 41.511719 C 20.542969 42.355469 20.894531 43.226563 22.128906 43.394531 C 23.359375 43.5625 26.59375 44.296875 28.460938 45.285156 C 30.328125 46.269531 31.816406 44.40625 32.015625 43.855469 C 32.507813 42.488281 31.128906 40.605469 30.027344 39.464844 Z M 30.027344 39.464844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 34.191406 26.078125 C 33.140625 26.078125 32.4375 25.082031 31.941406 24.214844 C 31.9375 24.214844 30.3125 21.9375 30.90625 20.683594 C 30.988281 20.503906 31.128906 20.210938 32.796875 19.175781 L 33.109375 18.914063 L 33.40625 18.765625 L 33.597656 18.6875 C 33.828125 18.617188 34.089844 18.542969 34.335938 18.542969 L 34.453125 18.542969 L 34.671875 18.59375 L 35.167969 18.761719 L 39.226563 20.257813 L 39.339844 20.867188 C 39.429688 21.359375 39.308594 21.789063 39.207031 22.132813 L 39.054688 22.730469 L 38.707031 22.855469 C 38.398438 22.96875 37.921875 23.480469 37.535156 23.894531 C 37.152344 24.300781 36.792969 24.6875 36.421875 24.929688 C 36.289063 25.019531 36.144531 25.132813 36.003906 25.234375 C 35.421875 25.667969 34.875 26.078125 34.191406 26.078125 Z M 34.191406 26.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 36.898438 21.097656 C 36.179688 21.71875 35.359375 22.25 34.335938 22.277344 C 34.300781 22.308594 34.300781 22.308594 34.335938 22.277344 C 34.34375 22.046875 34.332031 21.824219 34.132813 21.652344 C 33.96875 21.515625 33.949219 21.304688 33.996094 21.125 C 34.1875 20.390625 34.070313 19.648438 34.101563 18.910156 C 33.90625 18.84375 33.46875 19.007813 33.410156 19.019531 C 33.320313 19.066406 33.230469 19.109375 33.144531 19.15625 C 33.042969 19.238281 32.941406 19.324219 32.839844 19.410156 C 32.707031 19.492188 31.328125 20.332031 31.1875 20.632813 C 30.824219 21.40625 32.023438 23.296875 32.195313 23.519531 C 33.597656 25.976563 34.375 24.910156 35.6875 23.992188 C 36.394531 23.535156 37.3125 22.144531 38.109375 21.851563 C 38.207031 21.453125 38.378906 21.070313 38.296875 20.648438 C 37.792969 20.675781 37.347656 20.707031 36.898438 21.097656 Z M 36.898438 21.097656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.019608%,66.27451%,2.352941%);fill-opacity:1;" d="M 33.519531 18.921875 C 33.523438 18.925781 33.527344 18.921875 33.53125 18.925781 C 33.527344 18.917969 33.53125 18.917969 33.527344 18.910156 Z M 33.519531 18.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 37.722656 20.089844 C 38.027344 20.242188 38.304688 20.417969 38.300781 20.816406 C 37.746094 20.851563 37.253906 20.886719 36.765625 21.3125 C 35.980469 21.988281 34.914063 22.996094 33.796875 23.027344 C 33.84375 22.660156 33.316406 22.132813 33.457031 21.503906 C 33.644531 20.699219 33.671875 19.722656 33.703125 18.914063 C 34.214844 18.710938 34.6875 18.898438 35.167969 19.046875 C 35.367188 19.167969 35.566406 19.289063 35.765625 19.40625 C 36.113281 19.542969 36.464844 19.675781 36.8125 19.808594 C 37.085938 19.996094 37.414063 20.019531 37.722656 20.089844 Z M 37.722656 20.089844 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.199219 17.574219 L 33.597656 17.574219 L 33.597656 18.976563 L 32.199219 18.976563 Z M 32.199219 17.574219 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.398438 17.574219 L 37.796875 17.574219 L 37.796875 18.976563 L 36.398438 18.976563 Z M 36.398438 17.574219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.785156 L 0 50.644531 C 0 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.769531 54.597656 C 67.871094 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.871094 2.800781 65.769531 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface14" mask="url(#mask2)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 29.398438 54.601563 L 40.601563 54.601563 L 40.601563 61.601563 L 29.398438 61.601563 Z M 29.398438 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 53.199219 67.199219 L 16.800781 67.199219 C 16.800781 64.105469 19.308594 61.601563 22.398438 61.601563 L 47.601563 61.601563 C 50.691406 61.601563 53.199219 64.105469 53.199219 67.199219 Z M 53.199219 67.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35.722656 5.734375 C 35.722656 6.28125 35.277344 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.277344 4.738281 35.722656 5.183594 35.722656 5.734375 "/>
+</g>
+</svg>
diff --git a/dist/Compute/VirtualMachineWindows(m).png b/dist/Compute/VirtualMachineWindows(m).png
new file mode 100644
index 00000000..6cb951a8
Binary files /dev/null and b/dist/Compute/VirtualMachineWindows(m).png differ
diff --git a/dist/Compute/VirtualMachineWindows(m).svg b/dist/Compute/VirtualMachineWindows(m).svg
new file mode 100644
index 00000000..e2c70d82
--- /dev/null
+++ b/dist/Compute/VirtualMachineWindows(m).svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.8125 2.804688 C 65.796875 2.804688 65.785156 2.800781 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.277344 54.601563 Z M 65.8125 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 49.605469 43.394531 L 22.152344 41.183594 C 21.503906 41.132813 21 40.582031 21 39.933594 L 21 18.863281 C 21 18.210938 21.503906 17.664063 22.152344 17.609375 C 22.152344 17.609375 49.613281 15.398438 49.617188 15.398438 C 50.40625 15.398438 50.960938 15.960938 50.960938 16.652344 L 50.960938 42.144531 C 50.960938 42.484375 50.832031 42.796875 50.59375 43.035156 C 50.355469 43.269531 50.042969 43.398438 49.710938 43.398438 Z M 49.605469 43.394531 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.980469 17.757813 L 35.980469 28.417969 L 49.707031 28.417969 L 49.707031 16.652344 Z M 35.980469 17.757813 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.253906 18.863281 L 22.253906 28.417969 L 34.019531 28.417969 L 34.019531 17.914063 Z M 22.253906 18.863281 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.980469 41.039063 L 35.980469 30.378906 L 49.707031 30.378906 L 49.707031 42.144531 Z M 35.980469 41.039063 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.253906 39.933594 L 22.253906 30.378906 L 34.019531 30.378906 L 34.019531 40.882813 Z M 22.253906 39.933594 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.785156 L 0 50.644531 C 0 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.769531 54.597656 C 67.871094 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.871094 2.800781 65.769531 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 53.199219 67.199219 L 16.800781 67.199219 C 16.800781 64.105469 19.308594 61.601563 22.398438 61.601563 L 47.601563 61.601563 C 50.691406 61.601563 53.199219 64.105469 53.199219 67.199219 Z M 53.199219 67.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 29.398438 54.601563 L 40.601563 54.601563 L 40.601563 61.601563 L 29.398438 61.601563 Z M 29.398438 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35.722656 5.734375 C 35.722656 6.28125 35.277344 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.277344 4.738281 35.722656 5.183594 35.722656 5.734375 "/>
+</g>
+</svg>
diff --git a/dist/Compute/VirtualMachineWindows.png b/dist/Compute/VirtualMachineWindows.png
new file mode 100644
index 00000000..208ec7e4
Binary files /dev/null and b/dist/Compute/VirtualMachineWindows.png differ
diff --git a/dist/Compute/VirtualMachineWindows.puml b/dist/Compute/VirtualMachineWindows.puml
new file mode 100644
index 00000000..3023b382
--- /dev/null
+++ b/dist/Compute/VirtualMachineWindows.puml
@@ -0,0 +1,9 @@
+sprite $VirtualMachineWindows [70x70/16z] {
+xTL5WYCn341HGOGpzpzl1miMZXmclxr-eMruBqWtGTWYyvj41WFvhP4jKQ-8U5iUU4crZEJDJtDxPMTHqQlvbrL6nOvKhLaf9aKs6sOcmgt-YkaygSOukQHY
+WhFdL4PbL5HcPhBINpcdlx9EwieRlzrH6PNJ2K14DrMsRAB7P5af7NjRzg6d_QXC8gzsKsHoKsGYnqZU8j1kZoG1oBOJ3JcB9aKuI_vF4WelgepAlyd55TJ8
+DcVemLamg66M14gMDOHATc2eQ0U6D_O7
+}
+
+AzureEntityColoring(VirtualMachineWindows)
+!define VirtualMachineWindows(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, VirtualMachineWindows, VirtualMachineWindows)
+!define VirtualMachineWindows(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, VirtualMachineWindows, VirtualMachineWindows)
diff --git a/dist/Compute/VirtualMachineWindows.svg b/dist/Compute/VirtualMachineWindows.svg
new file mode 100644
index 00000000..0fa73361
--- /dev/null
+++ b/dist/Compute/VirtualMachineWindows.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.8125 2.804688 C 65.796875 2.804688 65.785156 2.800781 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.789063 L 0 50.644531 C 0 52.738281 1.699219 54.601563 3.804688 54.601563 L 5.277344 54.601563 Z M 65.8125 2.804688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 49.605469 43.394531 L 22.152344 41.183594 C 21.503906 41.132813 21 40.582031 21 39.933594 L 21 18.863281 C 21 18.210938 21.503906 17.664063 22.152344 17.609375 C 22.152344 17.609375 49.613281 15.398438 49.617188 15.398438 C 50.40625 15.398438 50.960938 15.960938 50.960938 16.652344 L 50.960938 42.144531 C 50.960938 42.484375 50.832031 42.796875 50.59375 43.035156 C 50.355469 43.269531 50.042969 43.398438 49.710938 43.398438 Z M 49.605469 43.394531 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.980469 17.757813 L 35.980469 28.417969 L 49.707031 28.417969 L 49.707031 16.652344 Z M 35.980469 17.757813 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.253906 18.863281 L 22.253906 28.417969 L 34.019531 28.417969 L 34.019531 17.914063 Z M 22.253906 18.863281 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.980469 41.039063 L 35.980469 30.378906 L 49.707031 30.378906 L 49.707031 42.144531 Z M 35.980469 41.039063 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.253906 39.933594 L 22.253906 30.378906 L 34.019531 30.378906 L 34.019531 40.882813 Z M 22.253906 39.933594 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 65.769531 2.800781 L 3.804688 2.800781 C 1.699219 2.800781 0 4.683594 0 6.785156 L 0 50.644531 C 0 52.738281 1.699219 54.597656 3.804688 54.597656 L 65.769531 54.597656 C 67.871094 54.597656 70 52.738281 70 50.644531 L 70 6.785156 C 70 4.675781 67.871094 2.800781 65.769531 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 64.398438 8.398438 L 64.398438 49 L 5.597656 49 L 5.597656 8.398438 Z M 64.398438 8.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 53.199219 67.199219 L 16.800781 67.199219 C 16.800781 64.105469 19.308594 61.601563 22.398438 61.601563 L 47.601563 61.601563 C 50.691406 61.601563 53.199219 64.105469 53.199219 67.199219 Z M 53.199219 67.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 29.398438 54.601563 L 40.601563 54.601563 L 40.601563 61.601563 L 29.398438 61.601563 Z M 29.398438 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35.722656 5.734375 C 35.722656 6.28125 35.277344 6.726563 34.730469 6.726563 C 34.179688 6.726563 33.738281 6.28125 33.738281 5.734375 C 33.738281 5.183594 34.179688 4.738281 34.730469 4.738281 C 35.277344 4.738281 35.722656 5.183594 35.722656 5.734375 "/>
+</g>
+</svg>
diff --git a/dist/Compute/all.puml b/dist/Compute/all.puml
index 7b17e923..6d7b3b53 100644
--- a/dist/Compute/all.puml
+++ b/dist/Compute/all.puml
@@ -1,69 +1,354 @@
 sprite $AzureAppService [70x70/16z] {
-xTO5WiCm34JHaUG8xd_WCjkkx7PvyygG7mQr10FGI5Wa_dC5RUMkWZRvmPMribQ8fUWR5Iz8v1KNuEqAdL-PQQfI4_NOyuLVheZ7bV5h5Ojx-aA5F1xPVCMZ
-PhCLYnQTgvHeuwcAHvkDLeW0YHxfL5INFS5UiTXnZnu5m7fcfygPOuSzCWw0k-T6FazVXW3gLPRpA58Ce5UXytf9IVLFbXE-sqJI2jsfjzOSuwaOWwSeXhXK
-4wCdrHfAGjWfUdQxTr2CAysnEdPY0W5eVskJ4sFDZK1Yd5PNZRn3gE9fXPXvgJS0ygavsfEw0XxDE9vKG5DxGLqvuyKZeuIaCk7tLMZd_4f9PUxgyETNrifQ
-MIlIfdULqljJxbn9_BtA5W
+xTX7SWCn34HHDCBS_yRElK2PGiyu1_wTqYiIekAXSZFBu-rjnTP5KzoMuGShMzaAt2Fn3YLWSrefDvLM80cjC4HcPGRUeKIzz3YZDofUZ6zPRr2Y8O_5TIKR
+GcPGz4gONrDGNM4O5BqVba8HIs6ueUHJF5UUcU6vH3XW1CkZLtscDvNY2fPn7wF2Eou5dWGfS33JKb8QF3BLNR37kMg3YhVw4PaH1XkhSygCO43cjSHBJtkL
+2gid2C4ETa7XXB7SB3JIXrFBpMgb7z9ONfiNb7obSBoue1J7Up1ZSPw9uLqgJoiO58kJJCplcCWpIkZtNNZCkPbMTBzJuVSwFd7_v_lkLhQobNNxNvnx
 }
 
 AzureEntityColoring(AzureAppService)
 !define AzureAppService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppService, AzureAppService)
 !define AzureAppService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppService, AzureAppService)
 
-sprite $AzureBatch [70x65/16z] {
-xTC7Ykn038JXajIfwlxtVT5Cqo0McStXFy0tOrlLg59qF15LRE29z5pbHtdrMhNuh6-NZSzNwB2PrWjAON9b9MokMf4gpIW9NSMOAHrmQM6eMgRGWA0zIxaO
-uBcAbZrJkPZdAPi9c5TBb8iXFAeboXKnLEqTbCaxIdTcoW0cqp9bf0iOXbBd0lnK9cBKQllcOC2bq9UaPggt6LmA0QFahchf0lmlC-2wtuJl9m8CDvMzWA7D
-t5BogwFTKfWe5sFMgiNYe-FgE0DM3KV7rOMhsZiev1s5mLHnZBf2onSG06hANi24wwW3c3SKEk1uA6F-NmZGLLFswJwK3ao9048L9Lz00x1uhPDnrdDbC-RQ
-J02Wf8MpU5BH6ljB1_usbIhrgulzPjSPRoXoH7q1pbFPDVsD9UKiMS1ylj80F5iPrGMSdGjOvGNipWKiYLPSmDcvWFyxbpZELbLH01P_gUBjdfKMK5VaZpVB
-TZOAIca1TON1voYxzrMmL8k_0G
+sprite $AzureAvailabilitySet [70x70/16z] {
+xTW5Tkmm38LXuNtpzh_XwaJ3ZbtLJhd_eU0t63AHEZAdIB4x1ufaVyvYne059MF50OhxgfBzL8Kciv-gU4QJwSxkB8Mu1ey3b8RL4816SSq0c9xJxA9WNAE8
+RY6RLGpPM56sPSLoyPBYAfdYCPNeDSKB0JvGoWYWYmfGKZ2kLJoRLTfZkgyuIqTfwYek5EcKqcvjyuezRD1JDEifJlTnepJ7TADasZjewlyNLuTB6WAupIaY
+2ZY7uO3Ph18PO0wuhIXH6gkA0FPTbQokQ7kpaCAzWg6odmJG74VtYgEWPFPyJAUInhG2tnG7-efaFILpPAt2ieMierJFtk-eHAkArX18Nwb_9AM-qcQdQp9_
+rop_hz4Hocb1iOf2upYH34nlpH7zUmwHKJtqEqHnQfACfkeVqt_FZVTPf1I9HPqvjalNkHyxpc27A7I4eiI-h2Yz
+}
+
+AzureEntityColoring(AzureAvailabilitySet)
+!define AzureAvailabilitySet(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAvailabilitySet, AzureAvailabilitySet)
+!define AzureAvailabilitySet(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAvailabilitySet, AzureAvailabilitySet)
+
+sprite $AzureBatch [70x64/16z] {
+pTJP4jem38NXOwqMVV_txMYAWNY8KShwt_iZsm6_L2k6LQAFCyjMZfOLVawntr7iTnIhAFweFbBi5myw_HbzMqdaUUNqdueqdo_bk694rg_5JKetjPLYvK7G
+FQLxP5fMv8xIWMIeWkmh8K0FmPDAC9e2La0MIZA0FAq4WS8Ao5e9Zd2tTJxInVVIgtyJ_UjAhod-dE8MUIdcsmGo8Ikb0ycqIL4YzViftJPc3tWmjegLnnbN
+Xe5-FYwUIHMn60a0FIj0CYHLnEA6uJWh2gWB3YkPnb1S00RAYEryTGA0x4abcURrXVSTnSKEA4rlyqscrR39tg6KEwJe8KNPCx5j0ZgY0CcqIL4SKnGGPyYC
+DAigWo5W72VB6g1rPJ3WyKaX6GB4wifWo6-V1_z3cBRnMd7rePW0bD9n9RChCvwiJ6bH6OpMlrtTKKpKwWhuDhKfgIXpyo56UruHW9zG5ZEgAz8qaOQcJoXv
+V36ZYZB6J3iBg2c30TYUKv81BHPGKqmNJxQW51Vm5m
 }
 
 AzureEntityColoring(AzureBatch)
 !define AzureBatch(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureBatch, AzureBatch)
 !define AzureBatch(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureBatch, AzureBatch)
 
-sprite $AzureFunction [70x64/16z] {
-hTK7Ra8n48JXTVVc_lSDTKNxtMIFUe0F9cFhIJV-3w9Erf992R8O1QJ8OiA9Fb90YR8QFT17uea-KaxqSIVwI3hHH-fM7nyQfx_OgtFB52oaxd4Gw-IyYeSb
-cZrcahq_y3vERuoRG99TPzh7LMBubuWez36cltb-lJrG7sRQY1JgOxapVemunJvZfho_EmxkJp664JxzARx76nCOuUiCcpDJ3Q7h39iJyzWklAFj55W34T_l
-WunJG-1XHiyqO00HRIC9hXqZeOrKlBs0z0gf4sIg_QQfGh5nMlNtnTWTcMyVj7MF-7lAMnz0lDu_d-wCctbMXoOYae71lH8YrhC00tlLBcBCe92w3WA_XWl5
-0TBxtnGScP4seyq-uVPI5fbW8eoCY2KHKs1aHYpnbt4qCYDjnWgfe-KCmMzuPogF71bXnWeLGfAquurvAwIJ23DMo2yZnhmLIe146SMfVN-YaUiOiMUSFZv0
-8oT0EDw9FI0ZlRYIP8TYAseZxyI_Hjv8jf4t2rNPJh2HDmj5sOzcsKzGEP3ivK2I7CZgF1S
+sprite $AzureBatchAccount [70x65/16z] {
+xT89aiGW24PX17pf-rzuLdkJL68JPvztWA-i7qMNqsvLzk8qK96TbZ-Y_2jU1vgXm0I56GhlYhcxbQG2JLdUmZOLNu-hqg9iA4LMyrkbfKUKJSPt9g4fhch6
+cy832dTAIzyO7rKWAbTcK24gBRyk4nMtc_nI3KfvLJnveslNVQEYPRKLfQuDuzkBv1J6bBAfmF6tmBQYGFk-hsbGJ5KjrbtQbviyVUbwHP2ecAuMVXqtI5JO
+xAgKfLLM54OLqNV492WmheYrPNk5SQKTgagNCP3SLP6GscxILUJBqpv9nAdF4yeIbFh35QzzBbBzg8ABW3wkcBQiGbfHQIbm_2r-exZdTW5kb4fAOOR210Kc
+A4nGO8B238K9YjK-3KggBrKAeOGYX4f2ATfL92YPiahj8gKGUWO
+}
+
+AzureEntityColoring(AzureBatchAccount)
+!define AzureBatchAccount(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureBatchAccount, AzureBatchAccount)
+!define AzureBatchAccount(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureBatchAccount, AzureBatchAccount)
+
+sprite $AzureCloudService [70x70/16z] {
+xTPNmgif20PWK105zh_TAVgrtnZIPav_hbAnaJV2Z-0FJ9ae8NmWY_gWak4zf7wb1A_3vhE6y28olsNvnIA-HX1BcIbZLAIBPfEhUTUuLpI_nn3kmEedpG3D
+xskmbgUH2tc4raKyeZPcu0U51RHe-WdIjWmEDxXvGFfS-_3ek_hgUleNCC6NAWOtgaSQ798V46OUoikbv-SNf2bJNqhYCWwNAVFYhCDMv-jFsnW66szDYj-3
+UnzOhNfyKvPpOPzCOIAkJ4IoLQNrlWJDRgclWEbVpVaS4wEvp0f0SgLEUkluK72HhC7-9hUzYbpRGbxhEFDoMH7TPYVgu-Q7uiP4LDrm2X62JZs4nwUqsV4b
+cVgwUenXa2q01_kQdJbOIHxjMeJwohTV0XPccJxPea2qUKBhRKp9Rsd_tBuAapvSzBkLiYY2a5iRYn0j0BprHIOS-JApjZgKMUjLofcOCrir_0JxFO561oRn
+IVYlnxL9Ei_OrgFUVvNFvfIZDqAwxjRahbBgA2F-IFDPpNq_A_s3tHC05lLOcMlWs4yReLItlKuUiRGue3cKUjc8WAwgu3MK7bV9SqERv4ieiJh1musfgtzv
+xJ5iGiHjUn9Boni7ZTCrs_9VFSImlBpbFT1D4Ffi8sMT60q6H1XoF9E3n7VG5jsnBb3ionI9e4kCmLsjPPWbbjgibo7j9pLEfsPRn5ALGh29vfw3fLG8LJz8
+qB448RvsiJHVCuYXFuFX0VN76WIY3hF7HHvtcABCLvOOslfEbaJTNGl2Kv8jKkXrg3SpUKkPylmzPqIQ9FW49gACy8a__WO
+}
+
+AzureEntityColoring(AzureCloudService)
+!define AzureCloudService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCloudService, AzureCloudService)
+!define AzureCloudService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCloudService, AzureCloudService)
+
+sprite $AzureCloudServiceClassic [70x70/16z] {
+xPO7kkCW38IHDAFxttWBneiTo7pozlQ__X96NRZz5lp7tDs-JG7C0-9hbPnvXTwUOynN-DoHtE6FHRICheKMqJA6MmejtsDQuwB3ND4fNYs7fyAbo1xE7mC-
+5g4r6oT3EiCKeDVhC9ydg3R6_O2rcqgkAiYi5SHKiLFYsz2zdblQw6MBE8w5UomgnLRdxQ-zIkGxvh7UB37I-525voa0u51r4P6OkqpYCvanRLhTbtxECj5X
+OXOqn6OjgGpmhEDcH7wFt_G4tSt5cjs1LqJoOehp45wyGMhY6ZPjCp2gzN7wxMVddrizmkFbdLITBwTnOfOhv9aFT5FTd9fRnBQoJexnPRJcGyNVtYwiN3GS
+RJzQfqHiTW_zI3MR8MkqJW0msTeQdz6Z5W9pPOYGF6Jm5Ihmda-EiR5UgTJ4TlRQN0Gn4YonRO5igfoo2ZH-1nLR5YviNKgc4uFTS77Sx03FFpJ3xgPVS7a7
+AxUlRRMTNoh6qi0OzGER5QSkzFCQrJFM5TpLVKXPA5-u6hG8y93nNfnH7VZkF11JGlYkgeCcmVsTehYAo0b0iSSKzdodwiJewr_ZLH4DzmUnXAF93NPk1qQh
+OJkHvnYLI9rGVLfdtXrXxPimzszK-Cz7
+}
+
+AzureEntityColoring(AzureCloudServiceClassic)
+!define AzureCloudServiceClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCloudServiceClassic, AzureCloudServiceClassic)
+!define AzureCloudServiceClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCloudServiceClassic, AzureCloudServiceClassic)
+
+sprite $AzureCloudSimpleVirtualMachine [70x70/16z] {
+xTP7kkuW281XEiZ-ztlQtpGNaepko7S1twEI8lm_sxPjI2BwIvWGdaZC8yQFS1EwIeYj107OyoYqBv7QltnaAUeEzesQLX4hU9vXE2AhZ3nZzo8n7OEf_D1v
+Ztww7M4cOb7B5qFumDVG15RwIKmpfFu0P6HQln-Qsyz8GArT2iB4Yf7sg8w05xFeYJqnGBMM0NVO2wpqz6dlnYomudmBkGhnD9_Lo4Mu2kDL1OuqAyEbI4bR
+WSX6C1neNy6HdS5rfVnUUBQiMKk58pjUdqkDh0j9DIE45ebwZ3mOLONX2X9hrDzCjEfuU-Jb0JUlTC-gyvLcCRryYlAhot3Fg6QjNGRnV2tMV7SLOHBXrV8u
+dmHcOXzAECSz16558vyG5hRI7x-5v_znc7pI4YU_jOAl_-hnAsS8rnd__6ThSkVYuNv-SL2ei9KTZ-uhLKCfEj4kfCTg4sNyM-EnvBVUVXPX9bnldghse_YN
+5BPjsxu1
+}
+
+AzureEntityColoring(AzureCloudSimpleVirtualMachine)
+!define AzureCloudSimpleVirtualMachine(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCloudSimpleVirtualMachine, AzureCloudSimpleVirtualMachine)
+!define AzureCloudSimpleVirtualMachine(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCloudSimpleVirtualMachine, AzureCloudSimpleVirtualMachine)
+
+sprite $AzureDisk [70x70/16z] {
+xTZNjkCW38LXGDBUWD__UQUGQa1soFGvvxjE_YMyPAU4F-5JJ4b4z4f4KefBRnSr3AnHbVDO58F3dgYau4aAd_LKucGAnI6RaMuCmse4pLCd6ixC4lkEO2s2
+FMiHnJ7okOA9U1HXBhNMxPjQIo4CdX3Xo7Nhr4BCgMAkR1ELM5EtcOmv-WSQr087ZwxjBb4BuIc7Eq8obszo9k7Bpb7j3kTOjveNDjMBR7t6R3tI57Q9XGfB
+c-InbMRB4LuNWlTLi9dJEPgQwdqXyXWw7wD1iEv-Sol-HfOG0lerpuGRQLjOjvqImpSwksLgAVc2P6vAgNKRCLn4Rcyh6kxIcvrgOIUXBYUoX56oif2WnZ2N
+bBdMyqAXfNaZ9hqmC1UdrTP0vM8CHT6E0IJp5GcOoZFz9kqQUaOwskmweciLtOd-87v41-aaShkLp5IxGfVn4-1EQyt5v3Ku0Lt4ATCrMAhOGWR-YzLb1ZmA
+C5EFqKvMHCti_FXOtRAHpKuhiXO16-iIInL3V_5byE8Wk7TaviKvX3pel7gM0D8F7UqI7rA86FPpYFZBs4W8zypm493fquO32Oto2C0ZYE4g6jy42K-Yljde
+YIqcDBg_OlaQanYE936Sp21nuVVzVYy0q-vVWYKnlEdJLm
+}
+
+AzureEntityColoring(AzureDisk)
+!define AzureDisk(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDisk, AzureDisk)
+!define AzureDisk(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDisk, AzureDisk)
+
+sprite $AzureDiskSnapshot [70x70/16z] {
+xTS7cgCm341Xh6gP-zztAUOB4WeuszkRIKz-Ufj-OFz3rpGSu3bpZIjYeTzAgNeqhh0UrQx0z2tfhL8048c8cPOGeNoc522M46zHOgKAa2JnAS9ohm1B7eSw
+b2aeCeJ86fL42KR84prA51f1n5U2aYFR6jMQMLNfH62wqfz3GbYRJpLJkSIBikhJ7iibcqDDyv5v9TVgY89EKNcOfDQgoZLoYhrPDA9gLkiXnDGhhOuitPYs
+e7Y6UGoPWpBFfa5uGcgRWs9zZU3OdR64Jf5zGLGPGtGtvZQvIfld3ccgv6i0JJxedtH9KaIrMZjzKQPOiTcrROHMU_jc6Rv1KnAr-OEQbYcFRDWGPuI0RO1G
+d1ugfDNQUw4gGxadWFPOLAkRdwrPLM72FRWtOhn5U8xMi0mOFa_qC46G1XJobG6apvub5M7AUfuSrchdQWOzZefQB66AK-YQMAWc2ZY5CqRhsKXd3Jf5A0lf
+s3imfJ4uHVbAxD5Dh47n3BwwHIwA2WTY00cAQ7SmT6Uy55XQ7aYtXCOG5jthmd4M9DgJC5ToeeVXNAheAn4coX3cBlJeSbvNH4EonKkofJ78pbHHz9FetLap
+y8T6L7fbP8I4uFbg0eXl1COoV6LJ08b5tCyfxlfp9Q-KiQiifgDfEA2ZQhs_wafONUCAXT_zkFxt1G
+}
+
+AzureEntityColoring(AzureDiskSnapshot)
+!define AzureDiskSnapshot(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDiskSnapshot, AzureDiskSnapshot)
+!define AzureDiskSnapshot(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDiskSnapshot, AzureDiskSnapshot)
+
+sprite $AzureFunction [70x70/16z] {
+vTO7Sbin34NH1-0Nxd_56HK6ANVmnH5IRByKzsDUTNsS6MqPYU_RSbgS4s9Q71t5buEmfoF8j3f0GXr1wZYATIYXZijM3KTPwl5DVDb6VlLosnY793dsn1Zd
+QyWO6EJpozVCVaD2ac6FxBmnzWAoOP04J8LGa0kO4e6Wa82f40gIbBinWnaTYKZKmmmZ51GIC5uWU1JxQVFRlKPIePc00SGgnALa2gGyIaZCd8bSAx_yxlW9
+2NXyuXvWw2GAtEm1XX13PFO0amW4WMByI7B7Tkao29-ZxobpeHU39E5XxlyTnKiVxicDsvH9lBf7yx7cB1bB9RlX0SjAnlCe5IBPIAO8iWgfJsFG0mWm75GZ
+DSCzZ4XA1eFy6abcWw0R4eoKpm4vk508gHc37a9gnh674NwALGOj8C3O0x4AgPaCyWM46EfXX5_NMGRzqdC0WinK77fq08ABOvj1SACzTgtCRaVHk_EyKDuO
+zApFEdhaqT2Zs5mDGQ6EewXX7JsoKCDQ49c--Bu1
 }
 
 AzureEntityColoring(AzureFunction)
 !define AzureFunction(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureFunction, AzureFunction)
 !define AzureFunction(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureFunction, AzureFunction)
 
+sprite $AzureMeshApplication [70x70/16z] {
+rTS5Ujmm48RXrV3S_y3bAkbNFGQv-8UpwrSuXjUVYQZ9KqEhFySV8TxVacCVqPx9VQNwBVgaAyyxu_q-kqfGUTwNsbNiLyoBz0-9NGJC9a9c4md9pp_Az3OZ
+PY9lHucCkGDZgEaLOoH6yFD6jdEaWMmn2MJDo34YHmtsZ5_Uhd7GGkuhUgMes9uVJVplLhZj3KWrc2E4314oQoGimlqhGoG_lsPWbiZxnJ8WSx6MZ3gQc0oH
+zuovsy1bT29WW4m6HpZ-1OR8UWTgeyh80FcQHDF54pqP8cowXNk4PGL-VS5pg2rariYhSAaoACjjRySAHpGMo8f9LWCknaJMZB7U77yJIL--nAQJDqoi7Lim
+nRaSO8Y0GSir3z7ihfmC430JgUek7ykTf4J8J0J7an4P4o4ZEWuGxciWM5iWY0C1G-IO8KA623F-i-lqkQ9xLrZcshpezVjjlZKneBiCaV4wZNXMn5U6I7r-
+JSyDrfH6LHfgvoxpVHYrXR2cW6mmG3O6zHZXkU2lFiDI-QiZ6hYzs4nWYJPJgCndlIdP1MQ5PzZhZ-GZ
+}
+
+AzureEntityColoring(AzureMeshApplication)
+!define AzureMeshApplication(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMeshApplication, AzureMeshApplication)
+!define AzureMeshApplication(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMeshApplication, AzureMeshApplication)
+
+sprite $AzureNon [70x70/16z] {
+xTHL0eGm34LHMc8l-z_l-1SEwNZk0awztQWgvWj1gLkjgA-6VWs1Ruc3oAF5sOXl36LXAluej2RQhc1UKT_Ul68xbD94gV-eWFl9IFSeVPcfOeTIorowGw4c
+St7XwV3YCqebbLHWas6NehLCHzxwbuehyHN5T_VZxaiggQII2X1Nm4IiGGLqIs8Aqpr45D0ZRQR4LsGXHUy81qzQRWY2YaFLchw0L58v0m
+}
+
+AzureEntityColoring(AzureNon-azure-machine)
+!define AzureNon-azure-machine(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNon-azure-machine, AzureNon-azure-machine)
+!define AzureNon-azure-machine(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNon-azure-machine, AzureNon-azure-machine)
+
+sprite $AzureOSImagesClassic [70x64/16z] {
+vTK7iW8X383X98GMxdzUAz7euWvWr__ruZUGRG0SximZG7X0oE4dSpWTdHM2wV092f89LYBRjUAB2S5sgQPoBdSh64k9UASIfEoIqA-8TbAyd5x0S2nAxPOI
+uJANYoaHs5oVGgbS5N5KmIXbaVWnXOrXosv4mTXM4etDXN9Z9Joo8tAwg-LKa7eLhYltOeo8nxFGhoXehqBM5s4q0wdBgmeshiRBM3UWuycitwkYhIbsc2pY
+zR3DABeFlIod59sf3cH6qOHr85EA5W52UQb2pEn65EHTpNEtMz5pzyyK279BaOWJzpfL9kzrBXjbv5wNi6OUQKQfbtQDkv-mGOmISVOvJKcLHFSyxLtUApgG
+SKN3mtkNCjd7Afxd2u_BFqHn3raAy2CG0E9sZRrwRaMm4YqLXF6M2Zn2yGzH-26Acq3m8Mln3vWkXLRKiuT3H8vzk9LtH8JxElRGqMyhMm
+}
+
+AzureEntityColoring(AzureOSImagesClassic)
+!define AzureOSImagesClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureOSImagesClassic, AzureOSImagesClassic)
+!define AzureOSImagesClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureOSImagesClassic, AzureOSImagesClassic)
+
+sprite $AzureSapHana [70x70/16z] {
+xTD7sYCX38HXWGG2zVtF-mUgFT1FJMPfletpIxIyGwVJwLHyEnNnQpSNADk8-3wohxX0sKNsbIQhqaiMaQIbnVYqwtVZer1aLZiZYn95VfJAzySsdkUXo2mv
+8oybL9Q-bKXutgOoFoK4IfMb5CkU6IdYZE3jX9Mu5nMfrrUwa06lMCOg2O4IonXHup6yumNMXjsBYR2Ivm4iIzHLmRFE21IaBIuqvWugI6c4OD8sJtaCrF5x
+MBmY8AJWN9751LMnhdmhLejY922iF2vC3g1-Jwc7FAg4pCDfUSx6NnCVMdagEQ2pCkeb2L8iwDw7z52C4BwCS53A2KzylbFwDH5I8i0K4KxlCq8z_L8nAItM
+kN3jjmWEWsA54Bvrb5TJA_vK9i9vP9cbnnzNfq88xKkpbr7zlbh8fy88dtHqhzNxrnDqePWHGWh50TbKW9ZbBGM8ggODPI0fMqdwdyhS4pNTK2B9Ip5vtqwd
+q-aJ
+}
+
+AzureEntityColoring(AzureSapHana)
+!define AzureSapHana(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSapHana, AzureSapHana)
+!define AzureSapHana(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSapHana, AzureSapHana)
+
 sprite $AzureServiceFabric [70x70/16z] {
-jPVd0XmX28I55MLu__TDJxPaFCLild_NE1Zgbi-eTG1kMlQH7h_nRJi7ueALBMhSQLkUn9DQyY2UGFRY-UUOd5X1Eid1EDBQCYmloml2sBQLzttHODHzTVUj
-L0IbPRNbzB9CZp4kPGdn-0HqAJk_9S7TfVxd_LgAr8u8z7hrJ6ft0Dtqr1Lw7NQmYu_DyEVz9d-Fry0z_lhJ0xUnNj1xLdakHEMMEswcPfht03CZj4XnpBI_
-q-XCEx8DTj1uiitUWe1iNNimvWlc3e8XhrZHCYGO_eel_HLrUUAocIx8oL84p8fbfoB_WISF3Fu30Mt5CGesOCI9aOaPDeSDPuXI5cYNV9u_4EiWtJpDjvkm
-QcgfZTK6rf4w7O_H2QQPMs1O1bRMrUt3cko9WEhGIoHE99qhDiyp9jbBvPd_0mBUj73K77HhyNFRbJzrdM1bfC8cIzgdBKPBfwuCipfPrug5yIopfofVcSzi
-OTjazllIjW9tvKIMBlP3_x3ql6InGoEovEclMF7_4j4HEzZITOCBIzTIPmwdgqvZqW7WT_5KtpfHhg_SMeqqVMx0ZDVd_2we-7o0g0z6uLS
+tTS7SkGW48NXrn5n_mklrJKhsV2A5VRchx8zyqz3AM9DpK-ABr2Fafc6px9uoPFWK_oEV3vZCLGI-oIcYcERpvMK_L58nR19IIG3cunLyilRKkIFL8n54fkK
+LGARw8AQR4OQgno7uJd9rfACqdjtFANPtioLVagio1iKQoN7oj5Bkxym9ipZZPi0tbx2FbIylnm2MEGf31Vnk7Yq5mVKhue1UlINo9jEaPBLIFl-lynmnKbQ
+BotVypioPbB1v1qPCXwZR2dWOexKQYq85CQEdDLwHYueLEJCD0XTL9883y9NnpMpMx7_hgB9M12sklGm4iJkyU9mkg2zZH487MLh63_ZT5TsTWOd8v4LdTPJ
+pEFY9BAS9eRBBZ-TrriSEjzHCnMFI3-Erfe91j5EZaUydmvCh2g9HrfL0XDfHV14BufPLiNmWD455QzAu86eIeBGvnjpLCN0P6KKFwIz29YeMTnC5oLHiwXP
+6YXhcTTv8EjZjXtTGKa6FP_uQTWKbCP7T92ROq8UGDBv9ElC7U7lYZbHJ2ocIk8TpnacJYf6HbaEeoIIGNVbvayMbDakIJshz4jxL75QEJOhnYBP_qX5wERU
+bIC9nyX9nVMMX6AaSoKMv-BqVp8C-wcS23sdXuejxixJ_rc6Rfsmo6fH_BINMExi-F2GOQ3Kiup__mO
 }
 
 AzureEntityColoring(AzureServiceFabric)
 !define AzureServiceFabric(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceFabric, AzureServiceFabric)
 !define AzureServiceFabric(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceFabric, AzureServiceFabric)
 
-sprite $AzureVirtualMachine [70x55/16z] {
-xTPLUiKm34JXaM9Pcjd_ViiC5woKUxuy_o4JWkh5SeJwqQWT2ktH_A7Aly9v89weq70WusbA0VPkG9sgcDxDlbRX3afj66mg701WanqbSPUpewJXkgsoeS1p
-0fvftb1k7wCSQ2f00Rz7cNQdU3KKCO22pUuCuAZW5y_fldAeKnKw3kGyJP5uN-4suqCh-n5ksrgx6dTGM1lkcbnIQ8ONcP-l-Eksttdo-5TObB9Ob5Irg1HI
-iWYuD06kAVAX1CEivBwi13XSuMCKvh92f4s55uRbidBx7k5oH4C9kAwLG1rKg4EHbCYxwzqYjKERK-qIm3QQEN09
+sprite $AzureVirtualMachine [70x70/16z] {
+xTO5GiG034JHo4mezpymbgvMq-3mrwMlBlAzqcPl1jWgWYRANl6QWri1QqZMdfA-4hTADFgh2holK4N4cuh9Mug6udBEU521t6H75AhSXx9YCfEof40MieeI
+9hCfIqfmpl7wEe9EvwQacBzzuzEP8RXVCVDySxUMWPfYXgkj9asYfcGSLxgTZ4FAE5iSZIDAXiY0ZfApHVIKd2lyGULVgHmn5vNQKGgpIlrOvnE5KLU2jmgF
+dc5nfNJEzXYLxlKByz5JiZ-gPDz7YKx-7WW5VIHKnD5325aBZ_SDKiycIaWzdIXiJ4jFmNieElINhbWYjuKMfiASQKmQ0hOX-KEf1GrHohw_Ob5AvLls3
 }
 
 AzureEntityColoring(AzureVirtualMachine)
 !define AzureVirtualMachine(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualMachine, AzureVirtualMachine)
 !define AzureVirtualMachine(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualMachine, AzureVirtualMachine)
 
+sprite $AzureVirtualMachineImage [70x70/16z] {
+rTPNSYCn38HXX4PxTVyBBqjGUIXw4eOEqdU0_u4Hybfqqhs1c4A6YSPif3744U0WqiGKFin6-Wedl6e5sk4EruMD5PSEUsx1ZahdR0NIs5mbL9AVhwW_C8N9
+0apmP5iLunEJ9nhinQcAonSMnGfKrdYjeh8EfGeXApIgwqB_qa1jTNElmrRM18MA6Vf3rrWsi5jvvjO46_Hx76WuEAYOnsDvT6dKAYcN1sG3NAaaC04pbLoU
+m6p5IU8TAp0pL2fXpUhPBLMaUPjAR5UYz69kLAgl55OgPAMIVAW4JrLqdBFwoZWtuVmFYy_Av6z_hv1pbVIhbGalMPbEpKOI9YF9lYC2yU-8YAZvkXZ0rwdi
+kGrShlWOAYfNn52Hjw-Cws9oWTy6b3hykuseKg4UsHWH9aUSTnz7blze3LZn3XLZGSYB-Wy
+}
+
+AzureEntityColoring(AzureVirtualMachineImage)
+!define AzureVirtualMachineImage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualMachineImage, AzureVirtualMachineImage)
+!define AzureVirtualMachineImage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualMachineImage, AzureVirtualMachineImage)
+
+sprite $AzureVirtualMachineLinux [70x70/16z] {
+vT27eHqW28LXKGH5plxhXjUkwOcIdd-0ZrB-h2ZPiy4zbKYlXNeMYHhtRyNy3IHARv9Nv4D54lrrYawR8wce0P5fHb77IokZ6DwQ2GMFrhsYs6b6SGVWMMLq
+O55MSMKnH2FnNHFXA9nvh_YKpjmb54ieIoIG2S3rLXdm8H98Ty0k5NM8gPep3G1wfqmigijN8whxfaD57Ps8meWM0BjH362A7Wh6XU90UoYCoC-L0KpQAQ9n
+eko3TXMH7IiEVmNsP_nK6O1ze1WYFLGMC7-0ul2MLbGCHhjcDt-977CZeW3cXQA0RKNTfrmeCe7-K7Q7YYolhuea56clo9mPfRzSiv1In2D48wKiE11fIXag
+8ZfcIjdzRyhkpr4aK_iHI2-SHuHAQPn3EfUlnVFZHZclVgB8XKAVA3snIqxX7w7G-07VhHlP2HriKLlVnWSDuVeDgUbHNz1OZgf_lbBbA2f_PEy
+}
+
+AzureEntityColoring(AzureVirtualMachineLinux)
+!define AzureVirtualMachineLinux(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualMachineLinux, AzureVirtualMachineLinux)
+!define AzureVirtualMachineLinux(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualMachineLinux, AzureVirtualMachineLinux)
+
 sprite $AzureVirtualMachineScaleSet [70x70/16z] {
-rTPL0kGW383X18ZU_y2xxJ2MAc7rVnlfLmU0pCSoXatauod4p1CL27cckgSW3CH72lppIcESLegw6yqfABvcRLIfxHMRUqzRIDsTsrBPKSI7aurIFL6B2daY
-YGelN_995E8ZfS50zQye1UOL5DSogVG1LN16QUQFZCQK8kP3cPIDWkR3MObAyqGS5V94kgSOdWRVwP420_qTXMXUgUfkRKufucjQymf-3EU2IQMPVsIKKOfw
-oEgUWZyxLf0z96Mhz88IZYOSILJiIj7bssfVLwLeKEXIUTnTUZYCZqayA41gQuTAlxl8xbgwjr5wVAYypwFrkvvJbgoz7-6KqjFrJxEA0-Z_fWWpwvH2_Ywl
-r2EbsLOnEb10WlAEeo88HmgKjYHR1L3UIXWqWz8x67UhTgMVJ4PPQhOgZ32Z03805O2C4llp2evqe8mMbVHQ2aAvTHt4YYRMc7Ug_fb1BWmN8TcNqlwgKhuK
-WapnvXiE0rYRUCYubRjIzSledrH-
+vTO7ijim30PX2C2_Zkz_uOoGAjEDX5BVJbVvr4LQfEOYRIWq6Q11IJqgxngLsqsQ2ggufp3HlwoagwreCpDlAcvMHKF9-97WmNeV5JGRgAsmbqs5IWiAO_SK
+9lf3YivGtBRiAc5xcpfAshTyKj5qCIgQ3T2ehFpEc-V24uM9_cKblQ_KxpoQYbkrPKC9gyhHef9so5SKRNPRpYluUqerA0_F9XXALV18oJpU6HSWZaKXF5R2
+Qx_uwGafasEsCpnNF01vNKmPe_ArUApi9P01aBcibBEdR2XL6HzHqHbArLDS5OEY6SMoTXyLY44HZnJpg4O5nK4HG_RM15W_5C6g0lbLWOu22OAcKlshIdMA
+Ga_91KGsbDD8RlPEN7ukRIskF-UsLXuKEqFvP8jnnhd4zL3OV9wNwqt4Pk_6tkLHxBs1yQBpbSy
 }
 
 AzureEntityColoring(AzureVirtualMachineScaleSet)
 !define AzureVirtualMachineScaleSet(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualMachineScaleSet, AzureVirtualMachineScaleSet)
 !define AzureVirtualMachineScaleSet(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualMachineScaleSet, AzureVirtualMachineScaleSet)
 
+sprite $AzureVirtualMachineWindows [70x70/16z] {
+xTPLGiHG38NXw4dP_u9noCnKGuhV_wdwrOL-LjpisJ1l1RWGUoyyfUPxcUqXG7jF-Wgk5JJwcyfG8k8ZIbnNKU8wk9kfYl1Z-qeYU5ypGZchACxProX36Gey
+Y-UnxBYoLK6PZMG_-UmEPIZvxMWeYAlmAXQLkPUXe6oHN_tFC9JivoZef6SWJjP7m4HgFSIDjhAxsoQg9pC5L8zdYZVsfQVO6GfF9vnTIIG35_P2rDEuQeB9
+ZgHHQaKpb9AVhmXACVt87W
+}
+
+AzureEntityColoring(AzureVirtualMachineWindows)
+!define AzureVirtualMachineWindows(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualMachineWindows, AzureVirtualMachineWindows)
+!define AzureVirtualMachineWindows(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualMachineWindows, AzureVirtualMachineWindows)
+
+sprite $AzureWindowsVirtualDesktop [70x70/16z] {
+rTY7ckCW30JWKEG5YVT_tIs-3F7OHD7rk_dQrl-JX0lazfyabogoVKQabfn-G4X5jdDg_Zu3nDiZToZ53H982ZlbIBI-fxNlSvB0Q5tD1cBQsuJAgq9WT8Nm
+YFLsPyH5wXtfDjPHE4vNuXjmTYOx8_cQXmutrjtXt14RhwBVkihFaJu2iVQCgJk2RYBCOiG5I9ovBdX2Es5cBwPUXX90JChR735wedu2gsDVuzpmtRxWr1CD
+nK6-qcWqvLHAZo4tePxaL8h5aDG7qd7HK2aXf8qPes84fGGHAWRBb51A644KrmmQKW_HCuBio_Heg5aSMRTqRSX4D88CcvTCHaCqXTGTX5UfOYoqGbRekX16
+E0rhNS_hh7nvLVfsDPWvNESgrUmmYl7APRWQPQ3G4iKPLl9QYJF6IfJnbIZJbWgc6sVMS-6LZZV5QrH9MJ56tzRbLLUUFQEiGY5L5WhTZOm87eLKNB75VOH7
+dOFOGBG0ETxJPJvVsheT83Esl7JvflOhGTPFp4mjHH5-IA4byzhXh5zh5QjqGIAR6DgyD8iZ_3f2AcqP6XeDROJIQITbK6B8w5GA9jDfWLo4DrDSZ3wOv2Ey
+2Pefl8LH_R5Dfe29nJhwuMoqt34aau3HW0aYbOLvEyMstzO8uHG-7Vad99uiLuC3ajyDAd4OlnpJtG3Y7DTsHzTrjDWfjXuFmanemqbOKl103KdLp5JxF4sZ
+aCY7383yZmZyPDaMq0OZd5ItHMgE2u1AbOCWnILyAkMlfDkVo0S
+}
+
+AzureEntityColoring(AzureWindowsVirtualDesktop)
+!define AzureWindowsVirtualDesktop(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktop, AzureWindowsVirtualDesktop)
+!define AzureWindowsVirtualDesktop(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktop, AzureWindowsVirtualDesktop)
+
+sprite $AzureWindowsVirtualDesktopApplicationGroups [70x70/16z] {
+rTC5ZkKm381Xnn2mxt_VLJNrWgUGn4lp2HxsLn2-XaBI-j33Q9KHrc4T6ZLU6uKClTPmkb7rGIUO8VgY5tX3Gz_9t41ImobTPz5zPEWyXciuT8MaHt8_6e-a
+CbtNuTOMHoD4IBUqtA8uIiydpgc4MuiVM2iwRNYIkrDJhqU9ok2qtim-3iNXN2KEHZAL0QUHgIZvdrELvckRggX_cwkWxz1-nNU9DM0yaSh5gSDOwKT5B4cF
+IhEWyaciiRFERbXmL8O522Sq1cSLtEK3cgxGRwjOkiA_hQB_IONyotIbfoi50EflkG5iGQkdPhqw6zN5XHn71RCpgd3GP8NXq9EL0WVELGPyq5J5_zDI5JXH
+fjB0zKG5uNemybmfSIWtWr5dUl7sy_GTsgOAFwk9Y_YJOJieL8fj48Z8bdNuZ6tHW2kIYpZ9HHpdriIXxkrEr6o28hmWNJpsUulS4UQ8sfs6C8-QNHXIO17L
+yKkXSO5DICp2J1E1l6y
+}
+
+AzureEntityColoring(AzureWindowsVirtualDesktopApplicationGroups)
+!define AzureWindowsVirtualDesktopApplicationGroups(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopApplicationGroups, AzureWindowsVirtualDesktopApplicationGroups)
+!define AzureWindowsVirtualDesktopApplicationGroups(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopApplicationGroups, AzureWindowsVirtualDesktopApplicationGroups)
+
+sprite $AzureWindowsVirtualDesktopHostPools [70x70/16z] {
+rTC9ijmm24LHcK48jF_zvfD9rVQZRMNENS0fG7RxFpfORNXaRbsexKVTuvp9tXJgWJDwRFHuq-17YCPDuxWrsEC-tHvaVvnZnDEuHZoU9mr77ZlfnYIxqm1a
+dncn7u4dtizF24UTHvazFSfWxb76Z_PnfO_OdknqH55d-fBu_LVJ0sPCtsCDtCqeGsXLhwLlhw9CvsIykup3PL3gvJCHU5qg0gzk-BOkz2Q-h8KNwifK9vTf
+2BvG5vLw8pFuId9LHF0uh6PNPQIYyrGgei0H-rpCro8LWqewbsMmCbDng6GgvsMmakUDGic-_utB00g_KzPvf9kj9b8cKbOgl0oioBqYhFP0YVSAauh-fC9v
+MH7jTtTnf2mZ5LbEfGoeB2ILJ4lb-51weQInbAnZ9Tf7WfGqBefeHugdGa1X9gIaSrLwo-AYf86KJ0qyD3XlNmXGf8FZeiEur8eES1QmKZQgkzY4Nsvcyrfd
+eFIOrzhNU892pehw15dBrdshy-Ww28ZQ6WPd_5rPM-DHrZ3uFAbep29gAvfL8QJm8EkxNVLPDcoMHNlDvu_49-Nu4KJRETv7HhickuWtbEuYEDr5SB9x4np5
+xklWx8aHr6xY-t5w0sqUUL1xbjRp63Pm3E_ZUhJDkFkBOBA8pOX5L8GJ-Erz0W
+}
+
+AzureEntityColoring(AzureWindowsVirtualDesktopHostPools)
+!define AzureWindowsVirtualDesktopHostPools(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopHostPools, AzureWindowsVirtualDesktopHostPools)
+!define AzureWindowsVirtualDesktopHostPools(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopHostPools, AzureWindowsVirtualDesktopHostPools)
+
+sprite $AzureWindowsVirtualDesktopUsers [70x70/16z] {
+xTK7ikqe30HGPO7sl-0nptvryHMg-URdS1RGHRS3yBlw1ucP2G7saQYTb7U3K6mci8FjZI8y9fRHJaX6-tNsIrb1D_liTq8hwSug6S95F0ukK56hyPNHuzBv
+qRPp9Ok9bRFKuA1ner-MufEnMxoXAiKh0D3YJOCCtMi6G94GPF-Jef4ePEOr0V1873Bn6gLPTeQ1POh3Wdg5H-5831RGa_R1uI2HC42vJ4i8XaXWpTgAN8Np
+WtuGet3fSTEXfCL91kot48GAihKRlq9IJ2j3ICoCTCfGD1E4a_RmkBHmWXLK6nYHrTpTb13PxCgHE0YfZt0QKplMDu3YJEsARZ4uNLeCl3x8GFX2zYbETE8u
+IVcZ4tmHUujH-c2nY26RuOjDOcZqeI_-L6WtZ9_OKWpJGLP_1xKRdRQTUHoC3XulKjtFbBOzjSzzOzBle-HzK_oOGuWqPbBThDEsgLCRswR3i6KqRPiEmnnt
+MFpw5GVrREph-Jz3leA3B_I8lhWAr5TuREiBBHO0VCd6jhwoJ65V8oHVwf61-fhaRUjAu1NqGcJe5VMaggJaZodTCO6qnmmIROyv9DwUGtZNDj1tIh5lqeXt
+db4cEqV9IFq9XT_IF_y1
+}
+
+AzureEntityColoring(AzureWindowsVirtualDesktopUsers)
+!define AzureWindowsVirtualDesktopUsers(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopUsers, AzureWindowsVirtualDesktopUsers)
+!define AzureWindowsVirtualDesktopUsers(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopUsers, AzureWindowsVirtualDesktopUsers)
+
+sprite $AzureWindowsVirtualDesktopWorkspaces [70x70/16z] {
+rT87ikiW38NX0mY4fFslzwQHZ0i4CAz-qrBiVoZ2_y65o5dqGJYHnpoVH8-OCCD5qJhsmusaN-I04L4xiaDF4EsBOmjPMexBEYgq8wBZ27LUT4PSNabxDQAw
+diawpv-l-0B1Nj1BUF5GYZ2udvmEScjFJfkOJhWnDKcRg4AtHfOYtKf44JiLbWy-LGI5VAz4tOYbShechzyhIJVIgS9uIciLnPCiLdprXZWLWvM8EzAzX3S_
+LicuYxONyA7shDZ6is8xYZjUhHZkPBdY0UXo9KnNOgDYlGgnQ25CbGhrAsVdIcz7IXKsKDbCdPandN1jzM87ERsmbczxOhLAjbKEGB95YZkoFQLGP3DBhWXg
+3O8xVpxnmfa9YlQQotNebvlE-8ZMG7Z8YnM71_fIaNv5yA9B5S8BBrLGX9KAuoqlL3pUGgDYfhrvOQ2w674eqi3iUXId-TKN6v2mbUmInPxO5G5xpYw8E0es
+BUECR9AW9Yv6YhWOcTzKHflNAxTpnZP0FJg2JexzjKFE7cEYMWjxZ0ji5H8T9eKakmAJmqK-44MYuF07t
+}
+
+AzureEntityColoring(AzureWindowsVirtualDesktopWorkspaces)
+!define AzureWindowsVirtualDesktopWorkspaces(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopWorkspaces, AzureWindowsVirtualDesktopWorkspaces)
+!define AzureWindowsVirtualDesktopWorkspaces(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindowsVirtualDesktopWorkspaces, AzureWindowsVirtualDesktopWorkspaces)
+
+sprite $CitrixVirtualDesktopsEssential [70x69/16z] {
+xLU7bk0W25nHiUl__-t5lESQ77BrbMjiLpCP40Rsuy-p_sQii-Oh-zOv-WQ4YwMDCLeEwad3gLxRlIOsxwz9uzDQm7DSzdxX5n1kusd57aJI49PKEc5krSZE
+-f3ltmMCoJTqy7RjPmM6fyEHLe3AX7a69yq5_ZnT9ni0eNQ1-8D_De9fUQ3If0EnYUUYoK_VGpyzf7gj73xP3WIft5T15w1FOp7Tvg-r057fzhpuwVlefRJx
+9z2_o6QvalRADdhSRVNQfJPpuaOjXNA_CShEGUcIv5_1n-KMXy1EtxfGFABye3b0ASiZC7Axnj4ZTqQtQ12nz1dQfFaK8ReCxAQ5jckFG2OgfbXJhZgDQRsl
+4iVgPQK20Yf1Zvx8XJhTabxvhWI1vi4eGJO1aquOtrOC07ia8q58S6qJPbUddgVz-Pm00PWu5WYOdqxbTGpY6RVypS3syARUPOMOjKk9woMkNxH4J234RRfH
+rclXvdd-1B71fERF7ozvHat61AtSvw9Q3qjHMDGFsde-trXw5Rk9LRyASfyGceMAWapVkSHVuJ9z4IeC6a-WzEhBmeU87we-TQ0An-PhgAbTE3povVsIJ5pL
+4RIPW9SMk0uwSRJUOh2zRf3kTcMo7fEd555PC0A4ToriKOD-Mgoep6nqaCb6Xpbze1k6Lc0NY43rMlmJpWmrx9c1KNULSgq4emVE33Zne2IypuFLgJe1m5KR
+2s1cWDu8zQCPUOQP0VeqT7lTVdNoCCwp9vrcboYlYk9IlUydyvlQV7kkCw6FPTdgQdCcNRTGdNjcW0QapZnMKPwyPuOoK58SL19qgjLatLQU8xVDXTm4_TKr
+tL5ObIGcYRm6zj31AOq3DOlHsHt28IMZ16SC-TWc9cDjPhR6M4vzCqMOQNqYA998UU_3tUF_XNW8HyxHedbj0clkRybh-nJAlTzBFBp16cPsvglxtdxySVRV
+lW
+}
+
+AzureEntityColoring(CitrixVirtualDesktopsEssential)
+!define CitrixVirtualDesktopsEssential(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, CitrixVirtualDesktopsEssential, CitrixVirtualDesktopsEssential)
+!define CitrixVirtualDesktopsEssential(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, CitrixVirtualDesktopsEssential, CitrixVirtualDesktopsEssential)
+
+sprite $VirtualMachine [70x70/16z] {
+xTO7UkKW34LXjOinC_lVRfe_-LKYWzAJVm47a2jzBImfJ4zagIbhMvMaPYDFK6e4g7rjKqEbX96MFas-ykoiKgRLRrXHGRe29YBDLI3qWYrHKTen9Yj65mGJ
+5J1Tqz4AXEvW6weOTKXG2RVYc-bNWh4u7PeBxfvAC3HTiC9lbwiR1eRZ5Tuw47AsDLI7AYnsDXxrncZ5E-O3WUf4nOzLu1kPhB0eYZTcAkxbDAQQgx3wH7vU
+vQzI95Tn9ftAuBjEvKx5CFmbqUkAOUQh1hcesEmNrcIl619VUzqgXkIV1_mzbQYutrXnQvkMYxXSnA5kMiRAIpxIX0XFdRNZVBskmlGg_Dyr2dnIvQ_oRpTS
+uRAslgfqXBR0GZ5k8L1eQJ6cI3j0AL8EKFh27W4
+}
+
+AzureEntityColoring(VirtualMachine)
+!define VirtualMachine(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, VirtualMachine, VirtualMachine)
+!define VirtualMachine(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, VirtualMachine, VirtualMachine)
+
+sprite $VirtualMachineClassic [70x70/16z] {
+xTT74iCW341HgmBY_kTDLteyHl8YxQzItnXNcDuhIBOtKDFX1Bf29FgL4SIxtidnFb4XoYjOUw-GLDJwBjECmjPF6KSLQlsgYX45Qx-hmAW2QlqXap65hJ-j
+qOY2DQluhisE20yVYDqPXxqBi5IHVln3UJpIRBfOyOt7vaPZ7-Q8ulzZyntYspQc-1ZKh83lfu3Y-nDzeoAA3yLtK4Jn6leEoIYz-Fkiec-d_1LihnMZ1Sef
+iUUAwTZTkzWJfKBqIN9H6aMUQcpNYadq2IlcYXM8F-sX79MAkPa7yVmCvaldTVdvxhibgoYhZ8jMMQlDh1jfwTfbcWiU5KYTJzwqXi9lf500mGT5CaZusWSK
+VHOlS6WViuZE9SoqRsPt3lG92ij8qvks1G
+}
+
+AzureEntityColoring(VirtualMachineClassic)
+!define VirtualMachineClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, VirtualMachineClassic, VirtualMachineClassic)
+!define VirtualMachineClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, VirtualMachineClassic, VirtualMachineClassic)
+
+sprite $VirtualMachineLinux [70x70/16z] {
+xTG94jGW48NXD8HUt_tFArMKOLn64jfT_mDyx1o_LrHIqT4hegdChHv5iqYliQvgJT_d8rt6l4GylPgyOhqNXRVJdwc8cKbMSQ3dEIKmYepY-9Wb55p5lYAO
+vPK089aLQGE2iah8oOwauindpm5DACRjF1ixu0abc3jYw6qhEXPYQ01iLm7OX1qdAG3PKnHE9U2Lg028FGLeHAKRlG3WEue39_Kk1RgX0AYNSg8NpnK1b6Q2
+dZvM33XfLj3pnme0UYtGUweeuFIQxIWEs9UAF5GYW4el-ORIStYvZ58DG6pTtRccoW90DnG1h4mbOBoXi07jKlP_gK2X4ISKhiCeQXdb7Ai9Q4PXZ99AO2Gf
+HRWdQYbbzgyfC_FjCiWiWyoQZZoJaUGHByVHkcDlyfczZUduPWrNVYpwHSf_9QuUAyJcxzDw2wc-IExCn9UrjIA-ZfQAtwWk5RvHLtxVFW
+}
+
+AzureEntityColoring(VirtualMachineLinux)
+!define VirtualMachineLinux(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, VirtualMachineLinux, VirtualMachineLinux)
+!define VirtualMachineLinux(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, VirtualMachineLinux, VirtualMachineLinux)
+
+sprite $VirtualMachineWindows [70x70/16z] {
+xTL5WYCn341HGOGpzpzl1miMZXmclxr-eMruBqWtGTWYyvj41WFvhP4jKQ-8U5iUU4crZEJDJtDxPMTHqQlvbrL6nOvKhLaf9aKs6sOcmgt-YkaygSOukQHY
+WhFdL4PbL5HcPhBINpcdlx9EwieRlzrH6PNJ2K14DrMsRAB7P5af7NjRzg6d_QXC8gzsKsHoKsGYnqZU8j1kZoG1oBOJ3JcB9aKuI_vF4WelgepAlyd55TJ8
+DcVemLamg66M14gMDOHATc2eQ0U6D_O7
+}
+
+AzureEntityColoring(VirtualMachineWindows)
+!define VirtualMachineWindows(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, VirtualMachineWindows, VirtualMachineWindows)
+!define VirtualMachineWindows(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, VirtualMachineWindows, VirtualMachineWindows)
+
diff --git a/dist/Containers/AzureContainerInstance(m).png b/dist/Containers/AzureContainerInstance(m).png
index 56db8747..74ccbb69 100644
Binary files a/dist/Containers/AzureContainerInstance(m).png and b/dist/Containers/AzureContainerInstance(m).png differ
diff --git a/dist/Containers/AzureContainerInstance(m).svg b/dist/Containers/AzureContainerInstance(m).svg
index f73693e1..83ca2e50 100644
--- a/dist/Containers/AzureContainerInstance(m).svg
+++ b/dist/Containers/AzureContainerInstance(m).svg
@@ -1,70 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<clipPath id="clip1">
-  <path d="M 0 0 L 69.996094 0 L 69.996094 45 L 0 45 Z M 0 0 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 0 0 L 69.996094 0 L 69.996094 70 L 0 70 Z M 0 0 "/>
-</clipPath>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip3">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13,152,255);fill-opacity:1;" d="M 58.75 15.839844 C 58.355469 8.742188 53.53125 2.664063 46.710938 0.671875 C 39.886719 -1.320313 32.550781 1.203125 28.398438 6.972656 C 23.917969 3.503906 17.730469 3.261719 12.992188 6.371094 C 8.253906 9.480469 6.011719 15.253906 7.410156 20.746094 C 2 23.191406 -0.96875 29.082031 0.28125 34.886719 C 1.53125 40.691406 6.664063 44.835938 12.601563 44.839844 L 55.300781 44.839844 C 62.746094 44.832031 69.011719 39.261719 69.890625 31.867188 C 70.773438 24.476563 65.984375 17.589844 58.75 15.839844 Z M 58.75 15.839844 "/>
-</g>
-<clipPath id="clip4">
-  <path d="M 0 0 L 69.996094 0 L 69.996094 70 L 0 70 Z M 0 0 "/>
-</clipPath>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip5">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 18.132813 30.78125 C 17.355469 30.785156 16.726563 31.414063 16.726563 32.1875 L 16.726563 68.734375 C 16.726563 69.507813 17.355469 70.136719 18.132813 70.136719 L 22.347656 70.136719 L 47.652344 30.78125 Z M 18.132813 30.78125 "/>
-</g>
-<clipPath id="clip6">
-  <path d="M 0 0 L 69.996094 0 L 69.996094 70 L 0 70 Z M 0 0 "/>
-</clipPath>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip7">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface11" clip-path="url(#clip7)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,89,156);fill-opacity:1;" d="M 46.246094 35 L 20.945313 35 L 20.945313 65.921875 L 49.054688 65.921875 L 49.054688 35 Z M 29.378906 63.113281 L 23.753906 63.113281 L 23.753906 37.8125 L 29.378906 37.8125 Z M 37.8125 63.113281 L 32.1875 63.113281 L 32.1875 37.8125 L 37.8125 37.8125 Z M 46.246094 63.113281 L 40.621094 63.113281 L 40.621094 37.8125 L 46.246094 37.8125 Z M 46.246094 63.113281 "/>
-</g>
-</defs>
 <g id="surface1">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 58.75 15.839844 C 58.355469 8.742188 53.53125 2.664063 46.710938 0.671875 C 39.886719 -1.320313 32.550781 1.203125 28.398438 6.972656 C 23.917969 3.503906 17.730469 3.261719 12.992188 6.371094 C 8.253906 9.480469 6.011719 15.253906 7.410156 20.746094 C 2 23.191406 -0.96875 29.082031 0.28125 34.886719 C 1.53125 40.691406 6.664063 44.835938 12.601563 44.839844 L 55.300781 44.839844 C 62.746094 44.832031 69.011719 39.261719 69.890625 31.867188 C 70.773438 24.476563 65.984375 17.589844 58.75 15.839844 Z M 58.75 15.839844 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,79,138);fill-opacity:1;" d="M 18.132813 30.78125 C 17.355469 30.785156 16.726563 31.414063 16.726563 32.1875 L 16.726563 68.734375 C 16.726563 69.507813 17.355469 70.136719 18.132813 70.136719 L 51.863281 70.136719 C 52.640625 70.136719 53.269531 69.507813 53.269531 68.734375 L 53.269531 32.1875 C 53.269531 31.414063 52.640625 30.785156 51.863281 30.78125 Z M 18.132813 30.78125 "/>
-<g clip-path="url(#clip4)" clip-rule="nonzero">
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 27.972656 20.945313 L 35 11.105469 L 42.027344 20.945313 L 37.8125 20.945313 L 37.8125 30.78125 L 32.1875 30.78125 L 32.1875 20.945313 Z M 27.972656 20.945313 "/>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.246094 35 L 20.945313 35 L 20.945313 65.921875 L 49.054688 65.921875 L 49.054688 35 Z M 29.378906 63.113281 L 23.753906 63.113281 L 23.753906 37.8125 L 29.378906 37.8125 Z M 37.8125 63.113281 L 32.1875 63.113281 L 32.1875 37.8125 L 37.8125 37.8125 Z M 46.246094 63.113281 L 40.621094 63.113281 L 40.621094 37.8125 L 46.246094 37.8125 Z M 46.246094 63.113281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 58.800781 15.84375 C 58.296875 6.636719 50.421875 -0.421875 41.210938 0.0820313 C 36.164063 0.359375 31.507813 2.90625 28.558594 7.015625 C 24.097656 3.5625 17.933594 3.320313 13.214844 6.417969 C 8.492188 9.515625 6.261719 15.265625 7.65625 20.734375 C 2.273438 23.175781 -0.679688 29.042969 0.566406 34.820313 C 1.8125 40.597656 6.917969 44.722656 12.828125 44.730469 L 55.359375 44.730469 C 63.449219 44.726563 70.003906 38.164063 70 30.074219 C 69.996094 23.316406 65.371094 17.4375 58.800781 15.84375 Z M 58.800781 15.84375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 18.339844 30.730469 C 17.566406 30.730469 16.941406 31.355469 16.941406 32.128906 L 16.941406 68.53125 C 16.941406 69.304688 17.566406 69.929688 18.339844 69.929688 L 51.941406 69.929688 C 52.714844 69.929688 53.339844 69.304688 53.339844 68.53125 L 53.339844 32.128906 C 53.339844 31.355469 52.714844 30.730469 51.941406 30.730469 Z M 18.339844 30.730469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.339844 30.730469 L 32.339844 20.929688 L 28.140625 20.929688 L 35.140625 11.128906 L 42.140625 20.929688 L 37.941406 20.929688 L 37.941406 30.730469 Z M 46.339844 34.929688 L 21.140625 34.929688 L 21.140625 65.730469 L 49.140625 65.730469 L 49.140625 34.929688 Z M 46.339844 34.929688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 23.894531 37.730469 L 29.492188 37.730469 L 29.492188 62.929688 L 23.894531 62.929688 Z M 32.292969 37.730469 L 37.894531 37.730469 L 37.894531 62.929688 L 32.292969 62.929688 Z M 40.695313 37.730469 L 46.292969 37.730469 L 46.292969 62.929688 L 40.695313 62.929688 Z M 40.695313 37.730469 "/>
 </g>
 </svg>
diff --git a/dist/Containers/AzureContainerInstance.png b/dist/Containers/AzureContainerInstance.png
index acce1ec4..f0d5b2ef 100644
Binary files a/dist/Containers/AzureContainerInstance.png and b/dist/Containers/AzureContainerInstance.png differ
diff --git a/dist/Containers/AzureContainerInstance.puml b/dist/Containers/AzureContainerInstance.puml
index 47a7a57b..dc75d21d 100644
--- a/dist/Containers/AzureContainerInstance.puml
+++ b/dist/Containers/AzureContainerInstance.puml
@@ -1,8 +1,8 @@
 sprite $AzureContainerInstance [70x70/16z] {
-xTDNejmW38LXbIDFWVslDqEQKcHP7aXk_PzSFnU0Ah4eHYhqT0Bpb6SC3qyuRZWZbLymukzxi2WzCE1NSemuanlkmFQI32a7taFiJ9Xv4u-J8Pry6R6zeFMN
-GVBgg0uJfsEAufpHzFCbF5DNa9ok_nP9paEvfkZ1VrCkA3YS2P1ZXSchB6zDVagPKLWG7Z6DCBATv7WXVbSi2OvCAAQEJ2ZcLymeGcBp2WWB56DReSWIHIrF
-Q6HdbTizg_L7RJjIjdjQxwFRdD9Y1N9AwR6YeI99rq0HZXHA2XGGOLuH8WaLle-CQEn_Fz1QiqZ1mBMeZF7P0WLC8zIK7YYE4AEYj41nP8I2qaD5YJp1USLV
-n6C5JYc0CEqb5MKZxtyhROdILoXzXTAMA7s5qbOehQzG-WhbyhVogMolHsbBb3wha8sKI6tquu2SKfB-jt9vTDtfNbL6hIULbJwbSE5Lkj4VVG4
+xTS54iCm34JH5HRkVzyoMudaCls1yfjQJY6eHABcxgQCgnFpOtOTn7wH4RepRnEaiQYgS8piqcICUZu0RyiPlHY0ULEwA3AlnqE8TuKuxqkIcHJhN8zu67Mz
+5OR6UCzKTEX1GnEFBf-AWv7nuq9hYYRxQHwaL5CisKAZYaBfaYMV2nVMhDaUQUbOq7oBNABXvZlGhpW5y-zNB7bAJN42r6zM5EItAmQzW-BmUoXy5qNyiibP
+YdNdTtfJCvRPF6-QAlD2iySeSWz5ALA4XlD0OKGAOxX80VHsXG74odpT1B3D5ThTOP5YQrnkLR19RrC83TElj3ys_Oes_otx5IESHs9MLzAJWehYQFf4vQ_y
+bR_oLsGT0oJhiBk3-fIXdg_CngefMKzKfWL5ST4I
 }
 
 AzureEntityColoring(AzureContainerInstance)
diff --git a/dist/Containers/AzureContainerInstance.svg b/dist/Containers/AzureContainerInstance.svg
index 6379b887..1302cae0 100644
--- a/dist/Containers/AzureContainerInstance.svg
+++ b/dist/Containers/AzureContainerInstance.svg
@@ -1,70 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<clipPath id="clip1">
-  <path d="M 0 0 L 69.996094 0 L 69.996094 45 L 0 45 Z M 0 0 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 0 0 L 69.996094 0 L 69.996094 70 L 0 70 Z M 0 0 "/>
-</clipPath>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip3">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.509804%,65.882353%,87.843137%);fill-opacity:1;" d="M 58.75 15.839844 C 58.355469 8.742188 53.53125 2.664063 46.710938 0.671875 C 39.886719 -1.320313 32.550781 1.203125 28.398438 6.972656 C 23.917969 3.503906 17.730469 3.261719 12.992188 6.371094 C 8.253906 9.480469 6.011719 15.253906 7.410156 20.746094 C 2 23.191406 -0.96875 29.082031 0.28125 34.886719 C 1.53125 40.691406 6.664063 44.835938 12.601563 44.839844 L 55.300781 44.839844 C 62.746094 44.832031 69.011719 39.261719 69.890625 31.867188 C 70.773438 24.476563 65.984375 17.589844 58.75 15.839844 Z M 58.75 15.839844 "/>
-</g>
-<clipPath id="clip4">
-  <path d="M 0 0 L 69.996094 0 L 69.996094 70 L 0 70 Z M 0 0 "/>
-</clipPath>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip5">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18.132813 30.78125 C 17.355469 30.785156 16.726563 31.414063 16.726563 32.1875 L 16.726563 68.734375 C 16.726563 69.507813 17.355469 70.136719 18.132813 70.136719 L 22.347656 70.136719 L 47.652344 30.78125 Z M 18.132813 30.78125 "/>
-</g>
-<clipPath id="clip6">
-  <path d="M 0 0 L 69.996094 0 L 69.996094 70 L 0 70 Z M 0 0 "/>
-</clipPath>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip7">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface11" clip-path="url(#clip7)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.54902%,12.54902%,14.509804%);fill-opacity:1;" d="M 46.246094 35 L 20.945313 35 L 20.945313 65.921875 L 49.054688 65.921875 L 49.054688 35 Z M 29.378906 63.113281 L 23.753906 63.113281 L 23.753906 37.8125 L 29.378906 37.8125 Z M 37.8125 63.113281 L 32.1875 63.113281 L 32.1875 37.8125 L 37.8125 37.8125 Z M 46.246094 63.113281 L 40.621094 63.113281 L 40.621094 37.8125 L 46.246094 37.8125 Z M 46.246094 63.113281 "/>
-</g>
-</defs>
 <g id="surface1">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 58.75 15.839844 C 58.355469 8.742188 53.53125 2.664063 46.710938 0.671875 C 39.886719 -1.320313 32.550781 1.203125 28.398438 6.972656 C 23.917969 3.503906 17.730469 3.261719 12.992188 6.371094 C 8.253906 9.480469 6.011719 15.253906 7.410156 20.746094 C 2 23.191406 -0.96875 29.082031 0.28125 34.886719 C 1.53125 40.691406 6.664063 44.835938 12.601563 44.839844 L 55.300781 44.839844 C 62.746094 44.832031 69.011719 39.261719 69.890625 31.867188 C 70.773438 24.476563 65.984375 17.589844 58.75 15.839844 Z M 58.75 15.839844 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.392157%,16.470588%,48.235294%);fill-opacity:1;" d="M 18.132813 30.78125 C 17.355469 30.785156 16.726563 31.414063 16.726563 32.1875 L 16.726563 68.734375 C 16.726563 69.507813 17.355469 70.136719 18.132813 70.136719 L 51.863281 70.136719 C 52.640625 70.136719 53.269531 69.507813 53.269531 68.734375 L 53.269531 32.1875 C 53.269531 31.414063 52.640625 30.785156 51.863281 30.78125 Z M 18.132813 30.78125 "/>
-<g clip-path="url(#clip4)" clip-rule="nonzero">
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 27.972656 20.945313 L 35 11.105469 L 42.027344 20.945313 L 37.8125 20.945313 L 37.8125 30.78125 L 32.1875 30.78125 L 32.1875 20.945313 Z M 27.972656 20.945313 "/>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.246094 35 L 20.945313 35 L 20.945313 65.921875 L 49.054688 65.921875 L 49.054688 35 Z M 29.378906 63.113281 L 23.753906 63.113281 L 23.753906 37.8125 L 29.378906 37.8125 Z M 37.8125 63.113281 L 32.1875 63.113281 L 32.1875 37.8125 L 37.8125 37.8125 Z M 46.246094 63.113281 L 40.621094 63.113281 L 40.621094 37.8125 L 46.246094 37.8125 Z M 46.246094 63.113281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 58.800781 15.84375 C 58.296875 6.636719 50.421875 -0.421875 41.210938 0.0820313 C 36.164063 0.359375 31.507813 2.90625 28.558594 7.015625 C 24.097656 3.5625 17.933594 3.320313 13.214844 6.417969 C 8.492188 9.515625 6.261719 15.265625 7.65625 20.734375 C 2.273438 23.175781 -0.679688 29.042969 0.566406 34.820313 C 1.8125 40.597656 6.917969 44.722656 12.828125 44.730469 L 55.359375 44.730469 C 63.449219 44.726563 70.003906 38.164063 70 30.074219 C 69.996094 23.316406 65.371094 17.4375 58.800781 15.84375 Z M 58.800781 15.84375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 18.339844 30.730469 C 17.566406 30.730469 16.941406 31.355469 16.941406 32.128906 L 16.941406 68.53125 C 16.941406 69.304688 17.566406 69.929688 18.339844 69.929688 L 51.941406 69.929688 C 52.714844 69.929688 53.339844 69.304688 53.339844 68.53125 L 53.339844 32.128906 C 53.339844 31.355469 52.714844 30.730469 51.941406 30.730469 Z M 18.339844 30.730469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.339844 30.730469 L 32.339844 20.929688 L 28.140625 20.929688 L 35.140625 11.128906 L 42.140625 20.929688 L 37.941406 20.929688 L 37.941406 30.730469 Z M 46.339844 34.929688 L 21.140625 34.929688 L 21.140625 65.730469 L 49.140625 65.730469 L 49.140625 34.929688 Z M 46.339844 34.929688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 23.894531 37.730469 L 29.492188 37.730469 L 29.492188 62.929688 L 23.894531 62.929688 Z M 32.292969 37.730469 L 37.894531 37.730469 L 37.894531 62.929688 L 32.292969 62.929688 Z M 40.695313 37.730469 L 46.292969 37.730469 L 46.292969 62.929688 L 40.695313 62.929688 Z M 40.695313 37.730469 "/>
 </g>
 </svg>
diff --git a/dist/Containers/AzureContainerRegistry(m).png b/dist/Containers/AzureContainerRegistry(m).png
index 83f5a1b0..6bf3504a 100644
Binary files a/dist/Containers/AzureContainerRegistry(m).png and b/dist/Containers/AzureContainerRegistry(m).png differ
diff --git a/dist/Containers/AzureContainerRegistry(m).svg b/dist/Containers/AzureContainerRegistry(m).svg
index 07095390..2fffd25e 100644
--- a/dist/Containers/AzureContainerRegistry(m).svg
+++ b/dist/Containers/AzureContainerRegistry(m).svg
@@ -1,10 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="60pt" viewBox="0 0 70 60" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 63 30.378906 L 63 53.761719 L 32.199219 59.640625 L 55.578125 27.441406 Z M 63 30.378906 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 24.890625 20 L 24.890625 36.921875 L 35.777344 32.308594 L 35.777344 13.847656 Z M 34.222656 18.140625 L 34.222656 29.890625 L 31.890625 30.933594 L 31.890625 20.929688 L 28.777344 22.597656 L 28.777344 32.363281 L 26.445313 33.296875 L 26.445313 22.308594 L 31.890625 19.390625 L 31.890625 19.375 Z M 34.222656 18.140625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 35.777344 13.847656 L 35.777344 32.308594 L 70 39.617188 L 70 26.152344 Z M 66.890625 29.230469 L 66.890625 36.921875 L 64.625 36.304688 L 64.625 28.304688 L 60.667969 27.078125 L 60.667969 35.382813 L 58.402344 34.769531 L 58.402344 26.152344 L 54.445313 24.921875 L 54.445313 33.847656 L 52.179688 33.230469 L 52.179688 24 L 48.222656 22.769531 L 48.222656 32.308594 L 45.957031 31.691406 L 45.957031 21.84375 L 41.605469 20.472656 L 41.613281 30.679688 L 38.890625 30 L 38.890625 18 L 45.109375 20.152344 L 48.222656 21.230469 L 51.332031 22.308594 L 52.890625 22.847656 L 58.886719 24.921875 L 60.667969 25.539063 L 63.777344 26.617188 L 66.890625 27.691406 Z M 66.890625 29.230469 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 35.777344 35.382813 L 35.777344 60 L 70 52.308594 L 70 41.921875 Z M 66.890625 50.628906 L 64.628906 51.003906 L 64.628906 44.324219 L 60.667969 43.8125 L 60.667969 51.890625 L 58.40625 52.265625 L 58.40625 43.523438 L 54.445313 43.003906 L 54.445313 53.144531 L 52.183594 53.523438 L 52.183594 42.714844 L 48.222656 42.199219 L 48.222656 54.40625 L 45.960938 54.78125 L 45.960938 41.914063 L 41.609375 41.414063 L 41.601563 55.828125 L 38.890625 56.292969 L 38.890625 39.261719 L 66.890625 43.460938 Z M 66.890625 50.628906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 21.777344 18.214844 L 35.488281 10.464844 L 62.125 20.046875 C 61.359375 12.265625 54.730469 6.152344 46.667969 6.152344 C 44.785156 6.152344 42.949219 6.488281 41.191406 7.148438 C 37.664063 2.648438 32.242188 0 26.445313 0 C 16.152344 0 7.777344 8.28125 7.777344 18.460938 C 7.777344 18.640625 7.78125 18.816406 7.789063 18.992188 C 2.957031 21.738281 0 26.75 0 32.308594 C 0 40.789063 6.976563 47.691406 15.554688 47.691406 L 21.777344 47.691406 Z M 21.777344 18.214844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 24.890625 39.617188 L 24.890625 53.847656 L 35.777344 60 L 35.777344 35.382813 Z M 34.222656 41.273438 L 34.222656 56.152344 L 31.890625 55 L 31.890625 42.035156 L 28.777344 43.046875 L 28.777344 53.457031 L 26.445313 52.308594 L 26.445313 42.269531 L 31.890625 40.496094 L 34.222656 39.738281 Z M 34.222656 41.273438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 21 47.601563 L 12.601563 47.601563 C 7 46.199219 2.660156 41.71875 2.660156 35.980469 C 2.660156 31.078125 5.738281 26.738281 10.078125 25.058594 C 10.078125 24.5 9.941406 24.078125 9.941406 23.519531 C 9.941406 15.121094 16.660156 8.398438 25.058594 8.398438 C 29.679688 8.398438 33.878906 10.5 36.820313 14 C 38.5 13.160156 40.460938 12.738281 42.28125 12.738281 C 48.859375 12.738281 54.601563 18.621094 54.738281 25.058594 L 32.199219 15.820313 L 21 22.679688 Z M 21 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(43,165,255);fill-opacity:1;" d="M 63 53.761719 L 32.058594 59.640625 L 32.199219 37.941406 L 63 43.679688 Z M 32.058594 18.621094 L 63 30.238281 L 63 42 L 32.199219 35.421875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(103,190,255);fill-opacity:1;" d="M 32.199219 35.421875 L 23.800781 39.339844 L 23.800781 23.800781 L 32.199219 18.761719 M 61.601563 40.601563 L 33.601563 34.160156 L 33.601563 20.300781 L 61.601563 30.660156 Z M 46.199219 35.558594 L 49 36.261719 L 49 27.160156 L 46.199219 26.179688 Z M 43.398438 25.480469 L 40.601563 24.5 L 40.601563 34.160156 L 43.398438 35 Z M 51.800781 37.101563 L 54.601563 37.800781 L 54.601563 29.121094 L 51.800781 28.140625 Z M 35 32.621094 L 37.800781 33.320313 L 37.800781 23.378906 L 35 22.398438 C 35 22.539063 35 32.621094 35 32.621094 Z M 60.199219 31.078125 L 57.398438 30.101563 L 57.398438 38.5 L 60.199219 39.199219 Z M 33.601563 40.320313 L 33.601563 58.238281 L 61.601563 53.058594 L 61.601563 44.519531 Z M 35 56.140625 L 35 42.28125 L 37.800781 42.558594 L 37.800781 55.578125 Z M 43.398438 54.738281 L 40.601563 55.300781 L 40.601563 43.121094 L 43.398438 43.539063 C 43.398438 43.398438 43.398438 54.738281 43.398438 54.738281 Z M 46.199219 54.320313 L 46.199219 43.679688 L 49 43.960938 L 49 53.761719 Z M 54.601563 52.78125 L 51.800781 53.199219 L 51.800781 44.238281 L 54.601563 44.660156 Z M 60.339844 51.941406 L 57.398438 52.359375 L 57.398438 45.078125 L 60.058594 45.359375 Z M 60.339844 51.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(43,165,255);fill-opacity:1;" d="M 26.601563 35.140625 L 25.199219 35.980469 L 25.199219 24.921875 L 26.601563 24.21875 C 26.601563 24.078125 26.601563 35.140625 26.601563 35.140625 Z M 29.398438 22.539063 L 28 23.519531 L 28 34.300781 L 29.398438 33.601563 Z M 29.398438 22.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(103,190,255);fill-opacity:1;" d="M 23.800781 54.738281 L 23.800781 42 L 32.199219 37.941406 L 32.199219 59.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(43,165,255);fill-opacity:1;" d="M 26.460938 54.738281 L 25.199219 54.039063 L 25.199219 43.261719 L 26.460938 42.699219 Z M 29.398438 41.300781 L 28 42 L 28 55.578125 L 29.398438 56.28125 Z M 29.398438 41.300781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 60.199219 32.058594 L 35 23.660156 L 35 22.539063 L 60.199219 31.21875 Z M 60.058594 45.359375 L 35 42.28125 L 35 43.398438 L 60.058594 46.339844 Z M 29.398438 23.941406 L 29.398438 22.539063 L 25.339844 24.78125 L 25.339844 25.898438 Z M 25.199219 44.101563 L 29.398438 42.558594 L 29.398438 41.441406 L 25.199219 43.261719 Z M 25.199219 44.101563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Containers/AzureContainerRegistry.png b/dist/Containers/AzureContainerRegistry.png
index 5069cea9..afcee780 100644
Binary files a/dist/Containers/AzureContainerRegistry.png and b/dist/Containers/AzureContainerRegistry.png differ
diff --git a/dist/Containers/AzureContainerRegistry.puml b/dist/Containers/AzureContainerRegistry.puml
index 52678002..6dcb4b59 100644
--- a/dist/Containers/AzureContainerRegistry.puml
+++ b/dist/Containers/AzureContainerRegistry.puml
@@ -1,11 +1,10 @@
-sprite $AzureContainerRegistry [70x60/16z] {
-rPP9mkCe34OHQBx_VRkh24hm82VOgtghVtmM7vASSaOZCNCpuLPk0cm-8VMEGtoFBdlGpw0r2VivkY8Hpr1uA8bg05bKXV5QI7w5JSQMIwh_JkvHJrYvjkOP
-V9gNB9KYK0gW_gO1xwHz2sJveQulo70J_rvK3nP94wngt28ykUveypqCtI6lggXEehGO3pOB0NXwCa54fF6Wot2Zgt1NeU8s8hkqM3ZUtLBZhgM5YCqTijqK
-bggZM_gXu7EGAMjkMT-69S9vMzhdhetWwu8BYxPIvMq1Ty5-a14HN4h28hs99ajSROW4BpP2MBWKFrh8k4sY5XPTiqHFDnbPrqXssLALQXT5rdhB4fi1NwBg
-3oo2K03DdPvONdCjxlBGujrYNooH8DC3omvCB7vXeN6HoEe3iyLQRFF-gYJssLUuisXg-GlNCW5jKhbE5iujHgM3r61IVSudRmjcbZ5ezVKOKyQfheeSHL4J
-zv9OEh1RlChOtOUe2gUMndw62JMOejA_5aWiPFC75qHMorGLIw5pIwpyc82_r1QoOrXwQebb7nOW74-7YYJgmL21PNiNKFVJY48uP0qvuktVw_9CcpAM0lsK
-wbuwSdSpMBmfEcYFzai9K1zReeDui6n9-3SjLPzQWjoYzTfY-fdCr6BkcbY4THeYA1S0knyiYBfP3kKhFJRNDYpL9onMmYyqyu6Q1r720hlvaYXX5OfgOaNU
-0-Hx2ly3
+sprite $AzureContainerRegistry [70x70/16z] {
+xTI7bkiW38JX8CsCoFi_y1QmoL6M9DYtb__qBHyWsro-kV_zp_mZAzz2EBNdPo5J2gSGwZuxR1HDykrtvv7ExAEYdJZEN7mLj11FdCSlHjrL3cu5NOToJnMb
+qYoDguUosHoTygyRijK3iNp284D1k_yo5X-pjUL9KgGabBGXMnaB-j8jKIGLsybSds55wOTHZQRK6XsYxPFceaBMQrLJ5BL1usJ5zGZnEoKgOrU2Z0zed6pj
+CVTP9uKnTXIqHnjPK7JRaL1coAAYYDY6JPzyXiiAoG-708bqCXvK8aIfGMKosOc2cT841K4R2eug8W6GIT4BXLHIm8bI7YgV8SIMlaLnHOGqg22cYiqLSd-K
+nTceBW57zjADaJcxX8_MfzlVSGEyZFKS4XlnLU5CsGmYFX9XPQSCl4ds_Ath1ecG8ZRA1-LWsiliIBknlo-ar33ojgjYdXIRJrSrcX8XzW3suBPsCqIDK5Dg
+lLvhhH74rg1APYPA_gPLQvzGVafs-COam6PqJ6hFA5NmIb5wznlObUmuzsQAc9JqrisRAVmU2hw7Wk-XuCSfm355MHdnfSAR8c82v2zWde536GTeSG0hELiY
+S0xe5JGb0PVZDKVak9lEvlq4Vsl_-zyx
 }
 
 AzureEntityColoring(AzureContainerRegistry)
diff --git a/dist/Containers/AzureContainerRegistry.svg b/dist/Containers/AzureContainerRegistry.svg
index 06181f1b..8c88b5da 100644
--- a/dist/Containers/AzureContainerRegistry.svg
+++ b/dist/Containers/AzureContainerRegistry.svg
@@ -13,17 +13,17 @@
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 68.445313 32.191406 L 68.445313 58.230469 L 34.222656 64.789063 L 60.152344 29.054688 Z M 68.445313 32.191406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 63 30.378906 L 63 53.761719 L 32.199219 59.640625 L 55.578125 27.441406 Z M 63 30.378906 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 21.777344 51.332031 L 12.445313 51.332031 C 6.222656 49.777344 1.421875 44.875 1.421875 38.375 C 1.421875 32.996094 4.894531 28.082031 9.609375 26.210938 C 9.554688 25.648438 9.523438 25.082031 9.523438 24.515625 C 9.523438 15.273438 17.019531 7.789063 26.257813 7.789063 C 31.324219 7.789063 36.117188 10.085938 39.289063 14.039063 C 41.179688 13.085938 43.269531 12.589844 45.390625 12.597656 C 52.707031 12.597656 59.046875 19.089844 59.304688 26.347656 L 34.316406 16.039063 L 21.777344 23.59375 Z M 21.777344 51.332031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(58.431373%,58.431373%,58.431373%);fill-opacity:1;" d="M 68.445313 58.230469 L 34.015625 64.792969 L 34.175781 40.589844 L 68.445313 46.945313 Z M 34.136719 19.207031 L 68.445313 32.121094 L 68.445313 45.050781 L 34.195313 37.75 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.196078%,70.588235%,70.980392%);fill-opacity:1;" d="M 34.195313 37.75 L 24.863281 42.089844 L 24.863281 24.851563 L 34.136719 19.207031 M 66.890625 43.554688 L 35.777344 36.457031 L 35.777344 21 L 66.890625 32.472656 Z M 49.777344 38.011719 L 52.890625 38.867188 L 52.890625 28.789063 L 49.777344 27.699219 Z M 46.667969 26.707031 L 43.554688 25.585938 L 43.554688 36.359375 L 46.667969 37.234375 Z M 56 39.714844 L 59.066406 40.523438 L 59.121094 30.917969 L 56 29.878906 Z M 37.332031 34.757813 L 40.445313 35.558594 L 40.445313 24.5625 L 37.332031 23.539063 Z M 65.332031 33.046875 L 62.222656 31.957031 L 62.222656 41.34375 L 65.332031 42.195313 Z M 35.777344 43.167969 L 35.777344 63.128906 L 66.890625 57.425781 L 66.890625 47.960938 Z M 37.332031 60.796875 L 37.332031 45.433594 L 40.445313 45.824219 L 40.445313 60.277344 Z M 46.667969 59.226563 L 43.554688 59.792969 L 43.554688 46.210938 L 46.667969 46.667969 Z M 49.777344 58.777344 L 49.777344 46.988281 L 52.890625 47.378906 L 52.890625 58.203125 Z M 59.109375 57.140625 L 56 57.667969 L 56 47.769531 L 59.109375 48.222656 Z M 65.4375 56.132813 L 62.222656 56.691406 L 62.222656 48.546875 L 65.226563 48.921875 Z M 65.4375 56.132813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(58.431373%,58.431373%,58.431373%);fill-opacity:1;" d="M 28.015625 37.453125 L 26.457031 38.363281 L 26.457031 26.105469 L 28.015625 25.269531 Z M 31.109375 23.484375 L 29.558594 24.554688 L 29.554688 36.460938 L 31.109375 35.613281 Z M 31.109375 23.484375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.196078%,70.588235%,70.980392%);fill-opacity:1;" d="M 24.863281 59.265625 L 24.804688 45.121094 L 34.171875 40.589844 L 34.222656 64.851563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(58.431373%,58.431373%,58.431373%);fill-opacity:1;" d="M 27.824219 59.214844 L 26.410156 58.492188 L 26.410156 46.546875 L 27.824219 45.910156 Z M 31.164063 44.40625 L 29.621094 45.085938 L 29.558594 60.15625 L 31.164063 60.988281 Z M 31.164063 44.40625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 65.304688 34.054688 L 37.339844 24.671875 L 37.382813 23.460938 L 65.304688 33.066406 Z M 65.226563 48.917969 L 37.382813 45.425781 L 37.382813 46.632813 L 65.253906 49.929688 Z M 31.109375 25.089844 L 31.109375 23.5625 L 26.59375 26.066406 L 26.53125 27.351563 Z M 26.414063 47.441406 L 31.15625 45.722656 L 31.167969 44.40625 L 26.40625 46.542969 Z M 26.414063 47.441406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 21 47.601563 L 12.601563 47.601563 C 7 46.199219 2.660156 41.71875 2.660156 35.980469 C 2.660156 31.078125 5.738281 26.738281 10.078125 25.058594 C 10.078125 24.5 9.941406 24.078125 9.941406 23.519531 C 9.941406 15.121094 16.660156 8.398438 25.058594 8.398438 C 29.679688 8.398438 33.878906 10.5 36.820313 14 C 38.5 13.160156 40.460938 12.738281 42.28125 12.738281 C 48.859375 12.738281 54.601563 18.621094 54.738281 25.058594 L 32.199219 15.820313 L 21 22.679688 Z M 21 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(58.431373%,58.431373%,58.431373%);fill-opacity:1;" d="M 63 53.761719 L 32.058594 59.640625 L 32.199219 37.941406 L 63 43.679688 Z M 32.058594 18.621094 L 63 30.238281 L 63 42 L 32.199219 35.421875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.196078%,70.588235%,70.980392%);fill-opacity:1;" d="M 32.199219 35.421875 L 23.800781 39.339844 L 23.800781 23.800781 L 32.199219 18.761719 M 61.601563 40.601563 L 33.601563 34.160156 L 33.601563 20.300781 L 61.601563 30.660156 Z M 46.199219 35.558594 L 49 36.261719 L 49 27.160156 L 46.199219 26.179688 Z M 43.398438 25.480469 L 40.601563 24.5 L 40.601563 34.160156 L 43.398438 35 Z M 51.800781 37.101563 L 54.601563 37.800781 L 54.601563 29.121094 L 51.800781 28.140625 Z M 35 32.621094 L 37.800781 33.320313 L 37.800781 23.378906 L 35 22.398438 C 35 22.539063 35 32.621094 35 32.621094 Z M 60.199219 31.078125 L 57.398438 30.101563 L 57.398438 38.5 L 60.199219 39.199219 Z M 33.601563 40.320313 L 33.601563 58.238281 L 61.601563 53.058594 L 61.601563 44.519531 Z M 35 56.140625 L 35 42.28125 L 37.800781 42.558594 L 37.800781 55.578125 Z M 43.398438 54.738281 L 40.601563 55.300781 L 40.601563 43.121094 L 43.398438 43.539063 C 43.398438 43.398438 43.398438 54.738281 43.398438 54.738281 Z M 46.199219 54.320313 L 46.199219 43.679688 L 49 43.960938 L 49 53.761719 Z M 54.601563 52.78125 L 51.800781 53.199219 L 51.800781 44.238281 L 54.601563 44.660156 Z M 60.339844 51.941406 L 57.398438 52.359375 L 57.398438 45.078125 L 60.058594 45.359375 Z M 60.339844 51.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(58.431373%,58.431373%,58.431373%);fill-opacity:1;" d="M 26.601563 35.140625 L 25.199219 35.980469 L 25.199219 24.921875 L 26.601563 24.21875 C 26.601563 24.078125 26.601563 35.140625 26.601563 35.140625 Z M 29.398438 22.539063 L 28 23.519531 L 28 34.300781 L 29.398438 33.601563 Z M 29.398438 22.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.196078%,70.588235%,70.980392%);fill-opacity:1;" d="M 23.800781 54.738281 L 23.800781 42 L 32.199219 37.941406 L 32.199219 59.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(58.431373%,58.431373%,58.431373%);fill-opacity:1;" d="M 26.460938 54.738281 L 25.199219 54.039063 L 25.199219 43.261719 L 26.460938 42.699219 Z M 29.398438 41.300781 L 28 42 L 28 55.578125 L 29.398438 56.28125 Z M 29.398438 41.300781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 60.199219 32.058594 L 35 23.660156 L 35 22.539063 L 60.199219 31.21875 Z M 60.058594 45.359375 L 35 42.28125 L 35 43.398438 L 60.058594 46.339844 Z M 29.398438 23.941406 L 29.398438 22.539063 L 25.339844 24.78125 L 25.339844 25.898438 Z M 25.199219 44.101563 L 29.398438 42.558594 L 29.398438 41.441406 L 25.199219 43.261719 Z M 25.199219 44.101563 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Containers/AzureServiceFabricMesh(m).png b/dist/Containers/AzureServiceFabricMesh(m).png
index 6a30ff1a..bf44f53f 100644
Binary files a/dist/Containers/AzureServiceFabricMesh(m).png and b/dist/Containers/AzureServiceFabricMesh(m).png differ
diff --git a/dist/Containers/AzureServiceFabricMesh(m).svg b/dist/Containers/AzureServiceFabricMesh(m).svg
index 1e1f31c9..719173f0 100644
--- a/dist/Containers/AzureServiceFabricMesh(m).svg
+++ b/dist/Containers/AzureServiceFabricMesh(m).svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 67.617188 29.800781 C 65.648438 27.835938 62.828125 27.285156 60.351563 28.089844 L 54.808594 22.550781 C 55.738281 20.359375 55.246094 17.828125 53.5625 16.144531 C 51.882813 14.464844 49.347656 13.972656 47.160156 14.898438 L 41.617188 9.359375 C 42.425781 6.882813 41.875 4.058594 39.90625 2.09375 C 37.117188 -0.699219 32.59375 -0.699219 29.800781 2.09375 C 27.835938 4.058594 27.285156 6.882813 28.089844 9.359375 L 22.550781 14.898438 C 20.359375 13.972656 17.828125 14.464844 16.144531 16.144531 C 14.464844 17.828125 13.972656 20.359375 14.898438 22.550781 L 9.359375 28.089844 C 6.882813 27.285156 4.058594 27.835938 2.09375 29.800781 C -0.699219 32.59375 -0.699219 37.117188 2.09375 39.90625 C 4.058594 41.875 6.882813 42.425781 9.359375 41.617188 L 14.898438 47.160156 C 13.972656 49.347656 14.464844 51.882813 16.144531 53.5625 C 17.828125 55.246094 20.359375 55.738281 22.550781 54.808594 L 28.089844 60.351563 C 27.285156 62.828125 27.835938 65.648438 29.800781 67.617188 C 32.59375 70.40625 37.117188 70.40625 39.90625 67.617188 C 41.875 65.648438 42.425781 62.828125 41.617188 60.351563 L 47.160156 54.808594 C 49.347656 55.738281 51.882813 55.246094 53.5625 53.5625 C 55.246094 51.882813 55.738281 49.347656 54.808594 47.160156 L 60.351563 41.617188 C 62.828125 42.425781 65.648438 41.875 67.617188 39.90625 C 70.40625 37.117188 70.40625 32.59375 67.617188 29.800781 Z M 30.703125 56.773438 L 25.640625 51.714844 C 25.941406 51.015625 26.105469 50.246094 26.105469 49.4375 C 26.105469 48.628906 25.941406 47.859375 25.640625 47.160156 L 34.855469 37.949219 L 44.066406 47.160156 C 43.769531 47.859375 43.605469 48.628906 43.605469 49.4375 C 43.605469 50.246094 43.769531 51.015625 44.066406 51.714844 L 39.007813 56.773438 C 36.527344 54.992188 33.183594 54.992188 30.703125 56.773438 Z M 12.933594 30.703125 L 17.992188 25.640625 C 18.695313 25.941406 19.464844 26.105469 20.269531 26.105469 C 21.078125 26.105469 21.847656 25.941406 22.550781 25.640625 L 31.761719 34.855469 L 22.550781 44.066406 C 21.847656 43.769531 21.078125 43.605469 20.269531 43.605469 C 19.464844 43.605469 18.695313 43.769531 17.992188 44.066406 L 12.933594 39.007813 C 14.714844 36.527344 14.714844 33.183594 12.933594 30.703125 Z M 39.007813 12.933594 L 44.066406 17.992188 C 43.769531 18.695313 43.605469 19.464844 43.605469 20.269531 C 43.605469 21.078125 43.769531 21.847656 44.066406 22.550781 L 34.855469 31.761719 L 25.640625 22.550781 C 25.941406 21.847656 26.105469 21.078125 26.105469 20.269531 C 26.105469 19.464844 25.941406 18.695313 25.640625 17.992188 L 30.703125 12.933594 C 33.183594 14.714844 36.527344 14.714844 39.007813 12.933594 Z M 49.4375 43.605469 C 48.628906 43.605469 47.859375 43.769531 47.160156 44.066406 L 37.949219 34.855469 L 47.160156 25.640625 C 47.859375 25.941406 48.628906 26.105469 49.4375 26.105469 C 50.246094 26.105469 51.015625 25.941406 51.714844 25.640625 L 56.773438 30.703125 C 54.992188 33.183594 54.992188 36.527344 56.773438 39.007813 L 51.714844 44.066406 C 50.996094 43.761719 50.222656 43.605469 49.4375 43.605469 Z M 49.4375 43.605469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 68.003906 29.972656 C 66.027344 27.996094 63.1875 27.441406 60.699219 28.25 L 55.125 22.679688 C 56.058594 20.476563 55.5625 17.929688 53.871094 16.238281 C 52.179688 14.546875 49.632813 14.054688 47.429688 14.984375 L 41.855469 9.414063 C 42.667969 6.921875 42.117188 4.082031 40.136719 2.105469 C 37.332031 -0.703125 32.78125 -0.703125 29.972656 2.105469 C 27.996094 4.082031 27.441406 6.921875 28.25 9.414063 L 22.679688 14.984375 C 20.476563 14.054688 17.929688 14.546875 16.238281 16.238281 C 14.546875 17.929688 14.054688 20.476563 14.984375 22.679688 L 9.414063 28.25 C 6.921875 27.441406 4.082031 27.996094 2.105469 29.972656 C -0.703125 32.78125 -0.703125 37.332031 2.105469 40.136719 C 4.082031 42.117188 6.921875 42.667969 9.414063 41.855469 L 14.984375 47.429688 C 14.054688 49.632813 14.546875 52.179688 16.238281 53.871094 C 17.929688 55.5625 20.476563 56.058594 22.679688 55.125 L 28.25 60.699219 C 27.441406 63.1875 27.996094 66.027344 29.972656 68.003906 C 32.78125 70.8125 37.332031 70.8125 40.136719 68.003906 C 42.117188 66.027344 42.667969 63.1875 41.855469 60.699219 L 47.429688 55.125 C 49.632813 56.058594 52.179688 55.5625 53.871094 53.871094 C 55.5625 52.179688 56.058594 49.632813 55.125 47.429688 L 60.699219 41.855469 C 63.1875 42.667969 66.027344 42.117188 68.003906 40.136719 C 70.8125 37.332031 70.8125 32.78125 68.003906 29.972656 Z M 30.878906 57.101563 L 25.789063 52.011719 C 26.089844 51.308594 26.253906 50.535156 26.253906 49.722656 C 26.253906 48.910156 26.089844 48.132813 25.789063 47.429688 L 35.054688 38.167969 L 44.320313 47.429688 C 44.019531 48.132813 43.855469 48.910156 43.855469 49.722656 C 43.855469 50.535156 44.019531 51.308594 44.320313 52.011719 L 39.230469 57.101563 C 36.738281 55.308594 33.375 55.308594 30.878906 57.101563 Z M 13.007813 30.878906 L 18.09375 25.789063 C 18.804688 26.089844 19.578125 26.253906 20.386719 26.253906 C 21.199219 26.253906 21.972656 26.089844 22.679688 25.789063 L 31.945313 35.054688 L 22.679688 44.320313 C 21.972656 44.019531 21.199219 43.855469 20.386719 43.855469 C 19.578125 43.855469 18.804688 44.019531 18.09375 44.320313 L 13.007813 39.230469 C 14.800781 36.738281 14.800781 33.375 13.007813 30.878906 Z M 39.230469 13.007813 L 44.320313 18.09375 C 44.019531 18.804688 43.855469 19.578125 43.855469 20.386719 C 43.855469 21.199219 44.019531 21.972656 44.320313 22.679688 L 35.054688 31.945313 L 25.789063 22.679688 C 26.089844 21.972656 26.253906 21.199219 26.253906 20.386719 C 26.253906 19.578125 26.089844 18.804688 25.789063 18.09375 L 30.878906 13.007813 C 33.375 14.800781 36.738281 14.800781 39.230469 13.007813 Z M 49.722656 43.855469 C 48.910156 43.855469 48.132813 44.019531 47.429688 44.320313 L 38.167969 35.054688 L 47.429688 25.789063 C 48.132813 26.089844 48.910156 26.253906 49.722656 26.253906 C 50.535156 26.253906 51.308594 26.089844 52.011719 25.789063 L 57.101563 30.878906 C 55.308594 33.375 55.308594 36.738281 57.101563 39.230469 L 52.011719 44.320313 C 51.289063 44.011719 50.511719 43.855469 49.722656 43.855469 Z M 49.722656 43.855469 "/>
 </g>
 </svg>
diff --git a/dist/Containers/AzureServiceFabricMesh.png b/dist/Containers/AzureServiceFabricMesh.png
index e1741108..a255be55 100644
Binary files a/dist/Containers/AzureServiceFabricMesh.png and b/dist/Containers/AzureServiceFabricMesh.png differ
diff --git a/dist/Containers/AzureServiceFabricMesh.puml b/dist/Containers/AzureServiceFabricMesh.puml
index 6a1dedc0..a5b8ac37 100644
--- a/dist/Containers/AzureServiceFabricMesh.puml
+++ b/dist/Containers/AzureServiceFabricMesh.puml
@@ -1,9 +1,9 @@
 sprite $AzureServiceFabricMesh [70x70/16z] {
-xTY7ajmm30DGWcha_tzm6gyGCnRjqQKdk5xskK9QhToaB_Sr81z9Cu-qZo3-bdwCm5Dmgeoip5F5FETKSGf-bL8VqRbYXyXoYk4OOUOOOUOCQL4awz659O-3
-rXlMMmUX3IAYmK1xWznd-bkeo9hASEiO8Hl6SBOdminwEXPOUTcqKbhP6tyuQ7L_ZrQ3rlW1-_93pikgThfJ6Mg46KQ8gH6BZs08eJykL4WJA6Ga9Y5Je7Zh
-L8L44fEHo1M3OUvc2I66aCJ4Oso0xf6444C8Cv6-GOWXPCSOALSC8wn4qAlP8fX0gbjhB2TqnyoYKt47LJqU6qIzIDjqPzmerH454anzH8D-shTuL6TtmbFw
-5JB75TFe43PtNKAu39kxRZFM9kIAKMD413EkUM88IGmXyP3v_X10P2Kc8SGm0W64anWmmWmIGc5cnKSWcNdxOua4mmLavc0I28GOGdxqhAPFPzZsRytsCej_
-JDrPKWP632FFroUWtTxiII1bj8-kgPgggO3QHYUyJZ0Qt6fb0UiZ-o6B4iClMsK9x07oVptzQr-jG5PKJjEBOUc0EKJu6VM4rFaC
+tTS7aYiX38JXGO0Gzp_mYqv_pT2cj2zkRmvy3g3fyl4cRSICNewFn6B-JFy8CX_nl1BpcPf5wdn9P1MVhx6a4b3gNrK65FkRpqkVI5WQ8PD6oEIGNkFdLuiV
+JDa7hDhH7pDOQhNlNsvCgNM7QZ7dQP1lp2tZhUCJ29ZjNMz0baoKtKCljwqfn71MnKGCfLGvVI6Kv7rHcPlFIzSdLkuHXa4Yyho0KGWP8c2AGZhcw1REqVtx
+DU8aYOJn9vuIZnZEPMGUjqxK8qOlw68WPCwtNOBJO1F8cG5ooVYYYy40kQoPrbGNTvmFqU5ihh9YmcHNlMdH3WJpZMYbF9u_gV0dMmrWrntEsLbFSPSpLzvE
+SVZLtx3EWTeLmj5yP72y7J-U4Gp3-YZL07D2m9mHBuzcheO-1mA6ir4hpWRMdH4ol1HTCtt4wAzt32jz3CUcBHWyQsIukmWP8cG4GaPsemFPKqfMOTldUZgl
+v1-HojXKJ2fbRwVzq36Cfa1qIjCJ4CFjs0YAkTwwc4Ezpw2kXaOq8mOmmsX4Cpb4Td7vPA-dyuheS1dPnTaqb6ywZij4EZNGnQjy1G
 }
 
 AzureEntityColoring(AzureServiceFabricMesh)
diff --git a/dist/Containers/AzureServiceFabricMesh.svg b/dist/Containers/AzureServiceFabricMesh.svg
index 826c5dd1..34f3aa14 100644
--- a/dist/Containers/AzureServiceFabricMesh.svg
+++ b/dist/Containers/AzureServiceFabricMesh.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 67.617188 29.800781 C 65.648438 27.835938 62.828125 27.285156 60.351563 28.089844 L 54.808594 22.550781 C 55.738281 20.359375 55.246094 17.828125 53.5625 16.144531 C 51.882813 14.464844 49.347656 13.972656 47.160156 14.898438 L 41.617188 9.359375 C 42.425781 6.882813 41.875 4.058594 39.90625 2.09375 C 37.117188 -0.699219 32.59375 -0.699219 29.800781 2.09375 C 27.835938 4.058594 27.285156 6.882813 28.089844 9.359375 L 22.550781 14.898438 C 20.359375 13.972656 17.828125 14.464844 16.144531 16.144531 C 14.464844 17.828125 13.972656 20.359375 14.898438 22.550781 L 9.359375 28.089844 C 6.882813 27.285156 4.058594 27.835938 2.09375 29.800781 C -0.699219 32.59375 -0.699219 37.117188 2.09375 39.90625 C 4.058594 41.875 6.882813 42.425781 9.359375 41.617188 L 14.898438 47.160156 C 13.972656 49.347656 14.464844 51.882813 16.144531 53.5625 C 17.828125 55.246094 20.359375 55.738281 22.550781 54.808594 L 28.089844 60.351563 C 27.285156 62.828125 27.835938 65.648438 29.800781 67.617188 C 32.59375 70.40625 37.117188 70.40625 39.90625 67.617188 C 41.875 65.648438 42.425781 62.828125 41.617188 60.351563 L 47.160156 54.808594 C 49.347656 55.738281 51.882813 55.246094 53.5625 53.5625 C 55.246094 51.882813 55.738281 49.347656 54.808594 47.160156 L 60.351563 41.617188 C 62.828125 42.425781 65.648438 41.875 67.617188 39.90625 C 70.40625 37.117188 70.40625 32.59375 67.617188 29.800781 Z M 30.703125 56.773438 L 25.640625 51.714844 C 25.941406 51.015625 26.105469 50.246094 26.105469 49.4375 C 26.105469 48.628906 25.941406 47.859375 25.640625 47.160156 L 34.855469 37.949219 L 44.066406 47.160156 C 43.769531 47.859375 43.605469 48.628906 43.605469 49.4375 C 43.605469 50.246094 43.769531 51.015625 44.066406 51.714844 L 39.007813 56.773438 C 36.527344 54.992188 33.183594 54.992188 30.703125 56.773438 Z M 12.933594 30.703125 L 17.992188 25.640625 C 18.695313 25.941406 19.464844 26.105469 20.269531 26.105469 C 21.078125 26.105469 21.847656 25.941406 22.550781 25.640625 L 31.761719 34.855469 L 22.550781 44.066406 C 21.847656 43.769531 21.078125 43.605469 20.269531 43.605469 C 19.464844 43.605469 18.695313 43.769531 17.992188 44.066406 L 12.933594 39.007813 C 14.714844 36.527344 14.714844 33.183594 12.933594 30.703125 Z M 39.007813 12.933594 L 44.066406 17.992188 C 43.769531 18.695313 43.605469 19.464844 43.605469 20.269531 C 43.605469 21.078125 43.769531 21.847656 44.066406 22.550781 L 34.855469 31.761719 L 25.640625 22.550781 C 25.941406 21.847656 26.105469 21.078125 26.105469 20.269531 C 26.105469 19.464844 25.941406 18.695313 25.640625 17.992188 L 30.703125 12.933594 C 33.183594 14.714844 36.527344 14.714844 39.007813 12.933594 Z M 49.4375 43.605469 C 48.628906 43.605469 47.859375 43.769531 47.160156 44.066406 L 37.949219 34.855469 L 47.160156 25.640625 C 47.859375 25.941406 48.628906 26.105469 49.4375 26.105469 C 50.246094 26.105469 51.015625 25.941406 51.714844 25.640625 L 56.773438 30.703125 C 54.992188 33.183594 54.992188 36.527344 56.773438 39.007813 L 51.714844 44.066406 C 50.996094 43.761719 50.222656 43.605469 49.4375 43.605469 Z M 49.4375 43.605469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 68.003906 29.972656 C 66.027344 27.996094 63.1875 27.441406 60.699219 28.25 L 55.125 22.679688 C 56.058594 20.476563 55.5625 17.929688 53.871094 16.238281 C 52.179688 14.546875 49.632813 14.054688 47.429688 14.984375 L 41.855469 9.414063 C 42.667969 6.921875 42.117188 4.082031 40.136719 2.105469 C 37.332031 -0.703125 32.78125 -0.703125 29.972656 2.105469 C 27.996094 4.082031 27.441406 6.921875 28.25 9.414063 L 22.679688 14.984375 C 20.476563 14.054688 17.929688 14.546875 16.238281 16.238281 C 14.546875 17.929688 14.054688 20.476563 14.984375 22.679688 L 9.414063 28.25 C 6.921875 27.441406 4.082031 27.996094 2.105469 29.972656 C -0.703125 32.78125 -0.703125 37.332031 2.105469 40.136719 C 4.082031 42.117188 6.921875 42.667969 9.414063 41.855469 L 14.984375 47.429688 C 14.054688 49.632813 14.546875 52.179688 16.238281 53.871094 C 17.929688 55.5625 20.476563 56.058594 22.679688 55.125 L 28.25 60.699219 C 27.441406 63.1875 27.996094 66.027344 29.972656 68.003906 C 32.78125 70.8125 37.332031 70.8125 40.136719 68.003906 C 42.117188 66.027344 42.667969 63.1875 41.855469 60.699219 L 47.429688 55.125 C 49.632813 56.058594 52.179688 55.5625 53.871094 53.871094 C 55.5625 52.179688 56.058594 49.632813 55.125 47.429688 L 60.699219 41.855469 C 63.1875 42.667969 66.027344 42.117188 68.003906 40.136719 C 70.8125 37.332031 70.8125 32.78125 68.003906 29.972656 Z M 30.878906 57.101563 L 25.789063 52.011719 C 26.089844 51.308594 26.253906 50.535156 26.253906 49.722656 C 26.253906 48.910156 26.089844 48.132813 25.789063 47.429688 L 35.054688 38.167969 L 44.320313 47.429688 C 44.019531 48.132813 43.855469 48.910156 43.855469 49.722656 C 43.855469 50.535156 44.019531 51.308594 44.320313 52.011719 L 39.230469 57.101563 C 36.738281 55.308594 33.375 55.308594 30.878906 57.101563 Z M 13.007813 30.878906 L 18.09375 25.789063 C 18.804688 26.089844 19.578125 26.253906 20.386719 26.253906 C 21.199219 26.253906 21.972656 26.089844 22.679688 25.789063 L 31.945313 35.054688 L 22.679688 44.320313 C 21.972656 44.019531 21.199219 43.855469 20.386719 43.855469 C 19.578125 43.855469 18.804688 44.019531 18.09375 44.320313 L 13.007813 39.230469 C 14.800781 36.738281 14.800781 33.375 13.007813 30.878906 Z M 39.230469 13.007813 L 44.320313 18.09375 C 44.019531 18.804688 43.855469 19.578125 43.855469 20.386719 C 43.855469 21.199219 44.019531 21.972656 44.320313 22.679688 L 35.054688 31.945313 L 25.789063 22.679688 C 26.089844 21.972656 26.253906 21.199219 26.253906 20.386719 C 26.253906 19.578125 26.089844 18.804688 25.789063 18.09375 L 30.878906 13.007813 C 33.375 14.800781 36.738281 14.800781 39.230469 13.007813 Z M 49.722656 43.855469 C 48.910156 43.855469 48.132813 44.019531 47.429688 44.320313 L 38.167969 35.054688 L 47.429688 25.789063 C 48.132813 26.089844 48.910156 26.253906 49.722656 26.253906 C 50.535156 26.253906 51.308594 26.089844 52.011719 25.789063 L 57.101563 30.878906 C 55.308594 33.375 55.308594 36.738281 57.101563 39.230469 L 52.011719 44.320313 C 51.289063 44.011719 50.511719 43.855469 49.722656 43.855469 Z M 49.722656 43.855469 "/>
 </g>
 </svg>
diff --git a/dist/Containers/AzureWebAppForContainers(m).png b/dist/Containers/AzureWebAppForContainers(m).png
index 055ffb07..7c372bdc 100644
Binary files a/dist/Containers/AzureWebAppForContainers(m).png and b/dist/Containers/AzureWebAppForContainers(m).png differ
diff --git a/dist/Containers/AzureWebAppForContainers(m).svg b/dist/Containers/AzureWebAppForContainers(m).svg
index 6352bad1..32fd9945 100644
--- a/dist/Containers/AzureWebAppForContainers(m).svg
+++ b/dist/Containers/AzureWebAppForContainers(m).svg
@@ -4,118 +4,132 @@
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
+<image id="image9" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAvElEQVRoge3bsQ2DMBQG4WeEaDMAXdLTM18WSM8aLIFEk01SJhSQBXKByqa4r7b0P13vFIVs7/s1qvGSf7lfU/N47r2qc5zy25Qi5qrc/n+nPaw0wwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMOAcn8Jltsr6vaTfXcb1ogu+6wk6YAvEeUN40B0g/gAAAAASUVORK5CYII="/>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+<use xlink:href="#image9"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.136719 0.0429688 L 60.605469 10.011719 L 60.601563 34.746094 L 30.136719 45.71875 Z M 30.136719 0.0429688 "/>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.308594 0.0429688 L 60.953125 9.972656 L 60.949219 34.609375 L 30.308594 45.539063 Z M 30.308594 0.0429688 "/>
 </g>
+<image id="image17" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAiElEQVRoge3QwQnCQBRF0cEUEFKDhaQBm9BGtFNLMMvAgN+lbt56Ap5TweW2BgAAf6W2aan9cq5tWka3HEr1ea1ej+rzOrrlCE6jA47KmMCYwJjAmMCYwJjAmMCYwJjAmMCYwJjAmMCYwJjAmMCYwJjAmMCY4Dumrlur27O976+BPQAAAADArw9hlhWeS26uWgAAAABJRU5ErkJggg=="/>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image17"/>
   </g>
 </mask>
 <clipPath id="clip2">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 3.214844 12.289063 L 4.460938 11.757813 L 4.460938 10.773438 L 2.492188 11.578125 L 2.496094 33.546875 L 3 33.769531 L 3.230469 33.875 Z M 3.214844 12.289063 "/>
+<g id="surface16" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 3.234375 12.242188 L 4.488281 11.710938 L 4.488281 10.730469 L 2.507813 11.53125 L 2.511719 33.414063 L 3.015625 33.636719 L 3.25 33.742188 Z M 3.234375 12.242188 "/>
 </g>
+<image id="image25" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAApElEQVRoge3QsQkCQRCG0T05KxEDtRpbsQkRG7IJG7AMLz1YgzP9gw0WDn0PNliYgeErBQBYuaFluM6Hcymvcfncp2F7eXS5agU2TdO1HkudT8vb7TvdtAptYf6IMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwwdg0XW/vUq7fnefU4R4AAADgZ3wAY5sTvlnhFM0AAAAASUVORK5CYII="/>
 <mask id="mask2">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image25"/>
   </g>
 </mask>
 <clipPath id="clip3">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 10.976563 8.984375 L 10.976563 36.515625 L 11.910156 37.027344 L 11.910156 9.664063 L 14.765625 8.464844 L 14.765625 7.367188 Z M 10.976563 8.984375 "/>
+<g id="surface24" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 11.039063 8.949219 L 11.039063 36.371094 L 11.980469 36.882813 L 11.980469 9.625 L 14.851563 8.433594 L 14.851563 7.339844 Z M 11.039063 8.949219 "/>
 </g>
+<image id="image33" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAuElEQVRoge3asQkCQRBG4TlRMBCs4EJjmxDR6mzBKjQQLMNML7AGQeFgjTd40YB3wvvCCX6WF2+EJOnnmuxA6Z7zaLf76tjtTs3q8MluD2maXlhcZ1Fu6+q23Fwi4q/DTIZ+wFgZBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAbk/8e8z32Ux726vY59RJueliRJkiSNyxeaCxQ1L+LHYAAAAABJRU5ErkJggg=="/>
 <mask id="mask3">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image33"/>
   </g>
 </mask>
 <clipPath id="clip4">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface14" clip-path="url(#clip4)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 20.5 6.492188 L 20.96875 6.351563 L 20.96875 5.390625 L 19.539063 5.820313 L 18.113281 6.242188 L 16.800781 6.632813 L 16.800781 38.589844 L 17.761719 38.875 L 17.761719 7.308594 L 19.074219 6.917969 Z M 20.5 6.492188 "/>
+<g id="surface32" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 20.617188 6.46875 L 21.089844 6.328125 L 21.089844 5.371094 L 19.652344 5.796875 L 18.21875 6.21875 L 16.898438 6.605469 L 16.898438 38.4375 L 17.863281 38.722656 L 17.863281 7.28125 L 19.183594 6.890625 Z M 20.617188 6.46875 "/>
 </g>
+<image id="image41" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAvklEQVRoge3QsQ3CMBQG4RcSuhRR9qCjZRdGYBPWyBgMQMMAzIBQlApFYQBzBVKeoLivtCX/1kVI36gyH1+u9bYY3M+vzM21pIVZHmMXbXsqLsbmXPXzM2t3LZtff+BfGQYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGNGkv37spdsehOL9dpohD2qwkSZL00Rt6YhErf/TtXQAAAABJRU5ErkJggg=="/>
 <mask id="mask4">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image41"/>
   </g>
 </mask>
 <clipPath id="clip5">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface17" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 27.953125 2.972656 L 22.75 4.867188 L 22.75 41.007813 L 23.71875 41.46875 L 23.71875 5.546875 L 27.953125 4.023438 Z M 27.953125 2.972656 "/>
+<g id="surface40" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 28.113281 2.960938 L 22.878906 4.847656 L 22.878906 40.847656 L 23.855469 41.308594 L 23.855469 5.523438 L 28.113281 4.007813 Z M 28.113281 2.960938 "/>
 </g>
+<image id="image49" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAApElEQVRoge3ZoQ3CUBhF4dsHiiEaNiA4xuoeDRuwQ3dAwwoYgkYhqHkI9LGloedTL/nNzbEvkSRJ0l9p6FDHbpdy3SZJxsOl2fSPqUbNwRov5d6mnvdJktVwS7KoMOXXA+bKMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMID/lerxlXp6ft/te6pBkiRJkiRJWqYPHIMTw4GvjFsAAAAASUVORK5CYII="/>
 <mask id="mask5">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image49"/>
   </g>
 </mask>
 <clipPath id="clip6">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface20" clip-path="url(#clip6)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 9.292969 10.410156 L 9.292969 9.417969 L 7.339844 10.066406 L 6.367188 10.390625 L 6.367188 34.679688 L 7.328125 35 L 7.328125 11.0625 L 8.300781 10.738281 L 9.277344 10.417969 Z M 9.292969 10.410156 "/>
+<g id="surface48" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 9.347656 10.371094 L 9.347656 9.382813 L 7.382813 10.027344 L 6.402344 10.351563 L 6.402344 34.542969 L 7.371094 34.863281 L 7.371094 11.019531 L 8.347656 10.695313 L 9.332031 10.378906 Z M 9.347656 10.371094 "/>
 </g>
+<image id="image57" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAlklEQVRoge3QsQnCUBiF0f8ZsbRwAucQbJ0rczmTXQoLQa0tLkSS14RzBrhcvioAAAAAANi41mP0U0Or5/3cY3uW12Fqx+tjycR+rS8/xrHVcDt12Z7l8q6qRWF2Kz3ZHGECYQJhAmECYQJhAmECYQJhAmECYQJhAmECYQJhAmECYQJhAmECYQJhAmECYQJhAmECYfjPF22aCbyMamJbAAAAAElFTkSuQmCC"/>
 <mask id="mask6">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+<use xlink:href="#image57"/>
   </g>
 </mask>
+<clipPath id="clip8">
+  <path d="M 21 21 L 54 21 L 54 50.800781 L 21 50.800781 Z M 21 21 "/>
+</clipPath>
 <clipPath id="clip7">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface23" clip-path="url(#clip7)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.945313 51 C 34.371094 48.410156 33.40625 44.640625 34.425781 41.144531 C 35.445313 37.648438 38.285156 34.972656 41.855469 34.152344 C 42.921875 33.886719 44.035156 33.835938 45.121094 34.003906 C 45.589844 28.914063 48.6875 24.4375 53.300781 22.179688 C 51.867188 21.695313 50.359375 21.449219 48.839844 21.441406 C 42.519531 21.453125 36.929688 25.515625 35 31.496094 C 33.945313 31.140625 32.84375 30.941406 31.734375 30.902344 C 26.230469 31.019531 21.832031 35.484375 21.832031 40.949219 C 21.832031 46.417969 26.230469 50.882813 31.734375 51 Z M 36.945313 51 "/>
+<g id="surface56" clip-path="url(#clip7)">
+<g clip-path="url(#clip8)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.15625 50.800781 C 34.570313 48.222656 33.597656 44.464844 34.625 40.984375 C 35.648438 37.5 38.503906 34.835938 42.097656 34.019531 C 43.167969 33.753906 44.289063 33.703125 45.378906 33.871094 C 45.851563 28.800781 48.96875 24.34375 53.605469 22.09375 C 52.164063 21.609375 50.648438 21.367188 49.121094 21.359375 C 42.765625 21.371094 37.140625 25.414063 35.199219 31.375 C 34.140625 31.019531 33.03125 30.820313 31.917969 30.78125 C 26.382813 30.898438 21.957031 35.347656 21.957031 40.789063 C 21.957031 46.238281 26.382813 50.683594 31.917969 50.800781 Z M 37.15625 50.800781 "/>
+</g>
 </g>
+<image id="image65" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAASklEQVRoge3OsQmAQAwAwMQhrMTecZzIPVxT+EqIva1FEO4muAj4jRrrUve213XO3Ze3qTsQMTLyyO4FAAAAAAAAAAAAAAAA8NkD3lIIwcjXNjUAAAAASUVORK5CYII="/>
 <mask id="mask7">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+<use xlink:href="#image65"/>
   </g>
 </mask>
-<clipPath id="clip8">
+<clipPath id="clip9">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface26" clip-path="url(#clip8)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 33.085938 3.019531 C 33.085938 3.460938 32.726563 3.820313 32.28125 3.820313 C 31.832031 3.820313 31.472656 3.460938 31.472656 3.019531 C 31.472656 2.574219 31.832031 2.214844 32.28125 2.214844 C 32.726563 2.214844 33.085938 2.574219 33.085938 3.019531 Z M 33.085938 3.019531 "/>
+<g id="surface64" clip-path="url(#clip9)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 33.277344 3.007813 C 33.277344 3.449219 32.914063 3.804688 32.464844 3.804688 C 32.015625 3.804688 31.652344 3.449219 31.652344 3.007813 C 31.652344 2.5625 32.015625 2.207031 32.464844 2.207031 C 32.914063 2.207031 33.277344 2.5625 33.277344 3.007813 Z M 33.277344 3.007813 "/>
 </g>
+<image id="image73" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAYklEQVRoge3QsQmDYBSF0Wd+tEgvBNf4R3QxB7ASskI2sEnzbC1txBDP6S983AgAAOBP5Hvs8ltqrstwdPM4M+hn9FMXETXa1+FjbiGjNPkZnzmX9uoWAAAAAAAAAAAAAPY2wssN/CVBPg4AAAAASUVORK5CYII="/>
 <mask id="mask8">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+<use xlink:href="#image73"/>
   </g>
 </mask>
-<clipPath id="clip9">
+<clipPath id="clip10">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface29" clip-path="url(#clip9)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 59.167969 11.34375 C 59.167969 11.789063 58.808594 12.148438 58.363281 12.148438 C 57.914063 12.148438 57.554688 11.789063 57.554688 11.34375 C 57.554688 10.902344 57.914063 10.542969 58.363281 10.542969 C 58.808594 10.542969 59.167969 10.902344 59.167969 11.34375 Z M 59.167969 11.34375 "/>
+<g id="surface72" clip-path="url(#clip10)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 59.507813 11.300781 C 59.507813 11.742188 59.148438 12.101563 58.699219 12.101563 C 58.246094 12.101563 57.886719 11.742188 57.886719 11.300781 C 57.886719 10.859375 58.246094 10.5 58.699219 10.5 C 59.148438 10.5 59.507813 10.859375 59.507813 11.300781 Z M 59.507813 11.300781 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 0 34.660156 L 27.914063 44.90625 L 30.105469 45.71875 L 30.105469 45.710938 L 60.605469 34.710938 L 60.605469 9.957031 L 30.132813 0 L 0 9.953125 Z M 0 34.660156 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-<use xlink:href="#surface14" mask="url(#mask3)"/>
-<use xlink:href="#surface17" mask="url(#mask4)"/>
-<use xlink:href="#surface20" mask="url(#mask5)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 69.300781 45.386719 C 69.304688 43.933594 68.726563 42.539063 67.691406 41.511719 C 66.65625 40.484375 65.253906 39.910156 63.792969 39.914063 L 63.050781 39.914063 C 63.40625 38.660156 63.605469 37.371094 63.648438 36.070313 C 63.695313 28.898438 58.472656 22.761719 51.34375 21.617188 C 44.214844 20.472656 37.3125 24.664063 35.085938 31.488281 C 34.03125 31.136719 32.929688 30.9375 31.816406 30.898438 C 26.230469 30.898438 21.699219 35.398438 21.699219 40.949219 C 21.699219 46.5 26.230469 51 31.816406 51 L 64.25 51 C 67.132813 50.691406 69.3125 48.265625 69.300781 45.386719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 31.8125 51.699219 C 25.839844 51.699219 20.996094 46.886719 20.996094 40.953125 C 20.996094 35.015625 25.839844 30.207031 31.8125 30.207031 C 32.769531 30.226563 33.722656 30.371094 34.640625 30.644531 C 36.84375 24.699219 42.542969 20.746094 48.921875 20.742188 C 57.441406 20.75 64.34375 27.609375 64.351563 36.074219 C 64.332031 37.136719 64.195313 38.195313 63.941406 39.226563 C 67.308594 39.3125 69.992188 42.042969 70 45.386719 C 70.011719 48.625 67.554688 51.351563 64.3125 51.691406 Z M 31.8125 31.601563 C 26.613281 31.601563 22.398438 35.789063 22.398438 40.953125 C 22.398438 46.117188 26.613281 50.304688 31.8125 50.304688 L 64.242188 50.304688 C 66.746094 50.007813 68.621094 47.890625 68.601563 45.386719 C 68.59375 42.75 66.445313 40.617188 63.792969 40.613281 L 62.152344 40.613281 L 62.371094 39.746094 C 62.707031 38.550781 62.902344 37.316406 62.945313 36.070313 C 62.933594 28.378906 56.660156 22.144531 48.914063 22.132813 C 42.898438 22.140625 37.578125 26.011719 35.746094 31.703125 L 35.535156 32.34375 L 34.886719 32.164063 C 33.894531 31.828125 32.859375 31.640625 31.8125 31.601563 Z M 31.8125 31.601563 "/>
-<use xlink:href="#surface23" mask="url(#mask6)"/>
-<use xlink:href="#surface26" mask="url(#mask7)"/>
-<use xlink:href="#surface29" mask="url(#mask8)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 0 34.523438 L 28.074219 44.730469 L 30.277344 45.539063 L 30.277344 45.53125 L 60.953125 34.574219 L 60.953125 9.917969 L 30.304688 0 L 0 9.914063 Z M 0 34.523438 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
+<use xlink:href="#surface16" mask="url(#mask1)"/>
+<use xlink:href="#surface24" mask="url(#mask2)"/>
+<use xlink:href="#surface32" mask="url(#mask3)"/>
+<use xlink:href="#surface40" mask="url(#mask4)"/>
+<use xlink:href="#surface48" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 69.699219 45.210938 C 69.703125 43.761719 69.121094 42.371094 68.082031 41.347656 C 67.039063 40.328125 65.628906 39.753906 64.160156 39.757813 L 63.414063 39.757813 C 63.769531 38.507813 63.972656 37.226563 64.015625 35.929688 C 64.0625 28.785156 58.808594 22.671875 51.640625 21.53125 C 44.46875 20.394531 37.527344 24.566406 35.289063 31.367188 C 34.226563 31.015625 33.117188 30.816406 32 30.777344 C 26.382813 30.777344 21.824219 35.261719 21.824219 40.789063 C 21.824219 46.320313 26.382813 50.800781 32 50.800781 L 64.621094 50.800781 C 67.519531 50.492188 69.710938 48.078125 69.699219 45.210938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 31.996094 51.496094 C 25.988281 51.496094 21.117188 46.703125 21.117188 40.792969 C 21.117188 34.878906 25.988281 30.089844 31.996094 30.089844 C 32.957031 30.109375 33.917969 30.253906 34.839844 30.523438 C 37.054688 24.601563 42.789063 20.664063 49.203125 20.660156 C 57.773438 20.667969 64.714844 27.5 64.722656 35.933594 C 64.703125 36.992188 64.5625 38.046875 64.308594 39.074219 C 67.695313 39.160156 70.394531 41.878906 70.402344 45.210938 C 70.414063 48.433594 67.941406 51.152344 64.683594 51.488281 Z M 31.996094 31.476563 C 26.765625 31.476563 22.527344 35.648438 22.527344 40.792969 C 22.527344 45.9375 26.765625 50.109375 31.996094 50.109375 L 64.613281 50.109375 C 67.128906 49.8125 69.015625 47.703125 68.996094 45.210938 C 68.988281 42.582031 66.828125 40.457031 64.160156 40.453125 L 62.507813 40.453125 L 62.730469 39.589844 C 63.066406 38.398438 63.265625 37.171875 63.308594 35.929688 C 63.296875 28.269531 56.984375 22.058594 49.195313 22.046875 C 43.144531 22.054688 37.792969 25.910156 35.953125 31.578125 L 35.738281 32.21875 L 35.085938 32.039063 C 34.089844 31.703125 33.046875 31.515625 31.996094 31.476563 Z M 31.996094 31.476563 "/>
+<use xlink:href="#surface56" mask="url(#mask6)"/>
+<use xlink:href="#surface64" mask="url(#mask7)"/>
+<use xlink:href="#surface72" mask="url(#mask8)"/>
 </g>
 </svg>
diff --git a/dist/Containers/AzureWebAppForContainers.png b/dist/Containers/AzureWebAppForContainers.png
index ec7ba45a..ea3637f4 100644
Binary files a/dist/Containers/AzureWebAppForContainers.png and b/dist/Containers/AzureWebAppForContainers.png differ
diff --git a/dist/Containers/AzureWebAppForContainers.puml b/dist/Containers/AzureWebAppForContainers.puml
index 35e27bed..c9e8c0e3 100644
--- a/dist/Containers/AzureWebAppForContainers.puml
+++ b/dist/Containers/AzureWebAppForContainers.puml
@@ -1,8 +1,8 @@
 sprite $AzureWebAppForContainers [70x51/16z] {
-xTO9SYqX28NX0mBsLU_-j_jCU9D53sfIS_u5V4LrE-6cb0zDsCw9KihhE0xRXKYEJdmgvN1ebwZD5S-4TeXtgn-A5w0PefHtBJrNLY1I9rfhNMWbAbuUeKZu
-56uDIe0O8TRNds_XKqGbGie3OQ_XMqHb1Yfkl5jNohpY_Q-qMcejoqeTb2wiAjw3ygFyADbKBNz9iKJmMFEcOWHm4b6H3qssb0HAwbcF0LjMCi4DHtfAa4Kb
-0p8WFewiAHIHNiAIaWBYyOfY_asYOYiAKqGycL6oC16dOPGnUbICGCnCW5ugwK5vCLZqCxb4J8UR92YL81go4BnyhYJ80p1-6FX3OLHi4d758x-ewpy5F6Mu
-4gzhLp9a3h7pvw1F9D0jPVn4J9E8OcZyHCIpIagCc7-YGR6d21VHYcAuQaaHN9I2iZtCrnLUO1JFpBF2k8vaKX7SnZB397nNlm
+xTP7TeKm341HTTU__-McoQaSWKKop9jpwRRW9BPc3B-AIt-frcg2zmcljdeFGd5YJ5Uy8fWXwY8USxmgNofAAQBtnolXIWf2TMBE-QhqfHnJXY1Qn3e-LcA8
+h3an7pkAPzyWVYMy-MA4oZdKlSTyKVg-ul4NPVO-HayhhNrJHbxnpfL_vLyffgfMVgCO8wpORYg60CIYgY84G7P7OK1MpruI14uh1O5rPHu3bOJYY7n1F0NC
+ANH4dCaeuiXIlZ89fG0T48yJ2eC6YcqepJyp0eeGuqj50P2O2K52nIwKHa2YgrZ1fRnsLAPVmHLYv8erPtue3180mLiYwzuNnJOHayFeD3uLn2t3bUFeuae5
+sKECZmDCUxyY1TrK2E8PX74JiRFfahOL5S48uat54uWAa2GZ6SKWY58APIuchs16WJ3SLmHEuar6uJmIkMIKuQzw1W
 }
 
 AzureEntityColoring(AzureWebAppForContainers)
diff --git a/dist/Containers/AzureWebAppForContainers.svg b/dist/Containers/AzureWebAppForContainers.svg
index 3aed1a8d..3ec67dc6 100644
--- a/dist/Containers/AzureWebAppForContainers.svg
+++ b/dist/Containers/AzureWebAppForContainers.svg
@@ -4,118 +4,132 @@
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
+<image id="image9" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAvElEQVRoge3bsQ2DMBQG4WeEaDMAXdLTM18WSM8aLIFEk01SJhSQBXKByqa4r7b0P13vFIVs7/s1qvGSf7lfU/N47r2qc5zy25Qi5qrc/n+nPaw0wwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMOAcn8Jltsr6vaTfXcb1ogu+6wk6YAvEeUN40B0g/gAAAAASUVORK5CYII="/>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<use xlink:href="#image9"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.136719 0.0429688 L 60.605469 10.011719 L 60.601563 34.746094 L 30.136719 45.71875 Z M 30.136719 0.0429688 "/>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.308594 0.0429688 L 60.953125 9.972656 L 60.949219 34.609375 L 30.308594 45.539063 Z M 30.308594 0.0429688 "/>
 </g>
+<image id="image17" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAiElEQVRoge3QwQnCQBRF0cEUEFKDhaQBm9BGtFNLMMvAgN+lbt56Ap5TweW2BgAAf6W2aan9cq5tWka3HEr1ea1ej+rzOrrlCE6jA47KmMCYwJjAmMCYwJjAmMCYwJjAmMCYwJjAmMCYwJjAmMCYwJjAmMCY4Dumrlur27O976+BPQAAAADArw9hlhWeS26uWgAAAABJRU5ErkJggg=="/>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image17"/>
   </g>
 </mask>
 <clipPath id="clip2">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 3.214844 12.289063 L 4.460938 11.757813 L 4.460938 10.773438 L 2.492188 11.578125 L 2.496094 33.546875 L 3 33.769531 L 3.230469 33.875 Z M 3.214844 12.289063 "/>
+<g id="surface16" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 3.234375 12.242188 L 4.488281 11.710938 L 4.488281 10.730469 L 2.507813 11.53125 L 2.511719 33.414063 L 3.015625 33.636719 L 3.25 33.742188 Z M 3.234375 12.242188 "/>
 </g>
+<image id="image25" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAApElEQVRoge3QsQkCQRCG0T05KxEDtRpbsQkRG7IJG7AMLz1YgzP9gw0WDn0PNliYgeErBQBYuaFluM6Hcymvcfncp2F7eXS5agU2TdO1HkudT8vb7TvdtAptYf6IMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwgTCBMIEwwdg0XW/vUq7fnefU4R4AAADgZ3wAY5sTvlnhFM0AAAAASUVORK5CYII="/>
 <mask id="mask2">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image25"/>
   </g>
 </mask>
 <clipPath id="clip3">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 10.976563 8.984375 L 10.976563 36.515625 L 11.910156 37.027344 L 11.910156 9.664063 L 14.765625 8.464844 L 14.765625 7.367188 Z M 10.976563 8.984375 "/>
+<g id="surface24" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 11.039063 8.949219 L 11.039063 36.371094 L 11.980469 36.882813 L 11.980469 9.625 L 14.851563 8.433594 L 14.851563 7.339844 Z M 11.039063 8.949219 "/>
 </g>
+<image id="image33" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAuElEQVRoge3asQkCQRBG4TlRMBCs4EJjmxDR6mzBKjQQLMNML7AGQeFgjTd40YB3wvvCCX6WF2+EJOnnmuxA6Z7zaLf76tjtTs3q8MluD2maXlhcZ1Fu6+q23Fwi4q/DTIZ+wFgZBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAbk/8e8z32Ux726vY59RJueliRJkiSNyxeaCxQ1L+LHYAAAAABJRU5ErkJggg=="/>
 <mask id="mask3">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image33"/>
   </g>
 </mask>
 <clipPath id="clip4">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface14" clip-path="url(#clip4)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 20.5 6.492188 L 20.96875 6.351563 L 20.96875 5.390625 L 19.539063 5.820313 L 18.113281 6.242188 L 16.800781 6.632813 L 16.800781 38.589844 L 17.761719 38.875 L 17.761719 7.308594 L 19.074219 6.917969 Z M 20.5 6.492188 "/>
+<g id="surface32" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 20.617188 6.46875 L 21.089844 6.328125 L 21.089844 5.371094 L 19.652344 5.796875 L 18.21875 6.21875 L 16.898438 6.605469 L 16.898438 38.4375 L 17.863281 38.722656 L 17.863281 7.28125 L 19.183594 6.890625 Z M 20.617188 6.46875 "/>
 </g>
+<image id="image41" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAvklEQVRoge3QsQ3CMBQG4RcSuhRR9qCjZRdGYBPWyBgMQMMAzIBQlApFYQBzBVKeoLivtCX/1kVI36gyH1+u9bYY3M+vzM21pIVZHmMXbXsqLsbmXPXzM2t3LZtff+BfGQYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGNGkv37spdsehOL9dpohD2qwkSZL00Rt6YhErf/TtXQAAAABJRU5ErkJggg=="/>
 <mask id="mask4">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image41"/>
   </g>
 </mask>
 <clipPath id="clip5">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface17" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 27.953125 2.972656 L 22.75 4.867188 L 22.75 41.007813 L 23.71875 41.46875 L 23.71875 5.546875 L 27.953125 4.023438 Z M 27.953125 2.972656 "/>
+<g id="surface40" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 28.113281 2.960938 L 22.878906 4.847656 L 22.878906 40.847656 L 23.855469 41.308594 L 23.855469 5.523438 L 28.113281 4.007813 Z M 28.113281 2.960938 "/>
 </g>
+<image id="image49" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAApElEQVRoge3ZoQ3CUBhF4dsHiiEaNiA4xuoeDRuwQ3dAwwoYgkYhqHkI9LGloedTL/nNzbEvkSRJ0l9p6FDHbpdy3SZJxsOl2fSPqUbNwRov5d6mnvdJktVwS7KoMOXXA+bKMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMMAwwDDAMID/lerxlXp6ft/te6pBkiRJkiRJWqYPHIMTw4GvjFsAAAAASUVORK5CYII="/>
 <mask id="mask5">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image49"/>
   </g>
 </mask>
 <clipPath id="clip6">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface20" clip-path="url(#clip6)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 9.292969 10.410156 L 9.292969 9.417969 L 7.339844 10.066406 L 6.367188 10.390625 L 6.367188 34.679688 L 7.328125 35 L 7.328125 11.0625 L 8.300781 10.738281 L 9.277344 10.417969 Z M 9.292969 10.410156 "/>
+<g id="surface48" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 9.347656 10.371094 L 9.347656 9.382813 L 7.382813 10.027344 L 6.402344 10.351563 L 6.402344 34.542969 L 7.371094 34.863281 L 7.371094 11.019531 L 8.347656 10.695313 L 9.332031 10.378906 Z M 9.347656 10.371094 "/>
 </g>
+<image id="image57" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAlklEQVRoge3QsQnCUBiF0f8ZsbRwAucQbJ0rczmTXQoLQa0tLkSS14RzBrhcvioAAAAAANi41mP0U0Or5/3cY3uW12Fqx+tjycR+rS8/xrHVcDt12Z7l8q6qRWF2Kz3ZHGECYQJhAmECYQJhAmECYQJhAmECYQJhAmECYQJhAmECYQJhAmECYQJhAmECYQJhAmECYfjPF22aCbyMamJbAAAAAElFTkSuQmCC"/>
 <mask id="mask6">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<use xlink:href="#image57"/>
   </g>
 </mask>
+<clipPath id="clip8">
+  <path d="M 21 21 L 54 21 L 54 50.800781 L 21 50.800781 Z M 21 21 "/>
+</clipPath>
 <clipPath id="clip7">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface23" clip-path="url(#clip7)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.945313 51 C 34.371094 48.410156 33.40625 44.640625 34.425781 41.144531 C 35.445313 37.648438 38.285156 34.972656 41.855469 34.152344 C 42.921875 33.886719 44.035156 33.835938 45.121094 34.003906 C 45.589844 28.914063 48.6875 24.4375 53.300781 22.179688 C 51.867188 21.695313 50.359375 21.449219 48.839844 21.441406 C 42.519531 21.453125 36.929688 25.515625 35 31.496094 C 33.945313 31.140625 32.84375 30.941406 31.734375 30.902344 C 26.230469 31.019531 21.832031 35.484375 21.832031 40.949219 C 21.832031 46.417969 26.230469 50.882813 31.734375 51 Z M 36.945313 51 "/>
+<g id="surface56" clip-path="url(#clip7)">
+<g clip-path="url(#clip8)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.15625 50.800781 C 34.570313 48.222656 33.597656 44.464844 34.625 40.984375 C 35.648438 37.5 38.503906 34.835938 42.097656 34.019531 C 43.167969 33.753906 44.289063 33.703125 45.378906 33.871094 C 45.851563 28.800781 48.96875 24.34375 53.605469 22.09375 C 52.164063 21.609375 50.648438 21.367188 49.121094 21.359375 C 42.765625 21.371094 37.140625 25.414063 35.199219 31.375 C 34.140625 31.019531 33.03125 30.820313 31.917969 30.78125 C 26.382813 30.898438 21.957031 35.347656 21.957031 40.789063 C 21.957031 46.238281 26.382813 50.683594 31.917969 50.800781 Z M 37.15625 50.800781 "/>
+</g>
 </g>
+<image id="image65" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAASklEQVRoge3OsQmAQAwAwMQhrMTecZzIPVxT+EqIva1FEO4muAj4jRrrUve213XO3Ze3qTsQMTLyyO4FAAAAAAAAAAAAAAAA8NkD3lIIwcjXNjUAAAAASUVORK5CYII="/>
 <mask id="mask7">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+<use xlink:href="#image65"/>
   </g>
 </mask>
-<clipPath id="clip8">
+<clipPath id="clip9">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface26" clip-path="url(#clip8)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 33.085938 3.019531 C 33.085938 3.460938 32.726563 3.820313 32.28125 3.820313 C 31.832031 3.820313 31.472656 3.460938 31.472656 3.019531 C 31.472656 2.574219 31.832031 2.214844 32.28125 2.214844 C 32.726563 2.214844 33.085938 2.574219 33.085938 3.019531 Z M 33.085938 3.019531 "/>
+<g id="surface64" clip-path="url(#clip9)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 33.277344 3.007813 C 33.277344 3.449219 32.914063 3.804688 32.464844 3.804688 C 32.015625 3.804688 31.652344 3.449219 31.652344 3.007813 C 31.652344 2.5625 32.015625 2.207031 32.464844 2.207031 C 32.914063 2.207031 33.277344 2.5625 33.277344 3.007813 Z M 33.277344 3.007813 "/>
 </g>
+<image id="image73" width="70" height="51" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAzCAYAAAAqwX72AAAABmJLR0QA/wD/AP+gvaeTAAAAYklEQVRoge3QsQmDYBSF0Wd+tEgvBNf4R3QxB7ASskI2sEnzbC1txBDP6S983AgAAOBP5Hvs8ltqrstwdPM4M+hn9FMXETXa1+FjbiGjNPkZnzmX9uoWAAAAAAAAAAAAAPY2wssN/CVBPg4AAAAASUVORK5CYII="/>
 <mask id="mask8">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+<use xlink:href="#image73"/>
   </g>
 </mask>
-<clipPath id="clip9">
+<clipPath id="clip10">
   <rect x="0" y="0" width="70" height="51"/>
 </clipPath>
-<g id="surface29" clip-path="url(#clip9)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 59.167969 11.34375 C 59.167969 11.789063 58.808594 12.148438 58.363281 12.148438 C 57.914063 12.148438 57.554688 11.789063 57.554688 11.34375 C 57.554688 10.902344 57.914063 10.542969 58.363281 10.542969 C 58.808594 10.542969 59.167969 10.902344 59.167969 11.34375 Z M 59.167969 11.34375 "/>
+<g id="surface72" clip-path="url(#clip10)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 59.507813 11.300781 C 59.507813 11.742188 59.148438 12.101563 58.699219 12.101563 C 58.246094 12.101563 57.886719 11.742188 57.886719 11.300781 C 57.886719 10.859375 58.246094 10.5 58.699219 10.5 C 59.148438 10.5 59.507813 10.859375 59.507813 11.300781 Z M 59.507813 11.300781 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 0 34.660156 L 27.914063 44.90625 L 30.105469 45.71875 L 30.105469 45.710938 L 60.605469 34.710938 L 60.605469 9.957031 L 30.132813 0 L 0 9.953125 Z M 0 34.660156 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-<use xlink:href="#surface14" mask="url(#mask3)"/>
-<use xlink:href="#surface17" mask="url(#mask4)"/>
-<use xlink:href="#surface20" mask="url(#mask5)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 69.300781 45.386719 C 69.304688 43.933594 68.726563 42.539063 67.691406 41.511719 C 66.65625 40.484375 65.253906 39.910156 63.792969 39.914063 L 63.050781 39.914063 C 63.40625 38.660156 63.605469 37.371094 63.648438 36.070313 C 63.695313 28.898438 58.472656 22.761719 51.34375 21.617188 C 44.214844 20.472656 37.3125 24.664063 35.085938 31.488281 C 34.03125 31.136719 32.929688 30.9375 31.816406 30.898438 C 26.230469 30.898438 21.699219 35.398438 21.699219 40.949219 C 21.699219 46.5 26.230469 51 31.816406 51 L 64.25 51 C 67.132813 50.691406 69.3125 48.265625 69.300781 45.386719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 31.8125 51.699219 C 25.839844 51.699219 20.996094 46.886719 20.996094 40.953125 C 20.996094 35.015625 25.839844 30.207031 31.8125 30.207031 C 32.769531 30.226563 33.722656 30.371094 34.640625 30.644531 C 36.84375 24.699219 42.542969 20.746094 48.921875 20.742188 C 57.441406 20.75 64.34375 27.609375 64.351563 36.074219 C 64.332031 37.136719 64.195313 38.195313 63.941406 39.226563 C 67.308594 39.3125 69.992188 42.042969 70 45.386719 C 70.011719 48.625 67.554688 51.351563 64.3125 51.691406 Z M 31.8125 31.601563 C 26.613281 31.601563 22.398438 35.789063 22.398438 40.953125 C 22.398438 46.117188 26.613281 50.304688 31.8125 50.304688 L 64.242188 50.304688 C 66.746094 50.007813 68.621094 47.890625 68.601563 45.386719 C 68.59375 42.75 66.445313 40.617188 63.792969 40.613281 L 62.152344 40.613281 L 62.371094 39.746094 C 62.707031 38.550781 62.902344 37.316406 62.945313 36.070313 C 62.933594 28.378906 56.660156 22.144531 48.914063 22.132813 C 42.898438 22.140625 37.578125 26.011719 35.746094 31.703125 L 35.535156 32.34375 L 34.886719 32.164063 C 33.894531 31.828125 32.859375 31.640625 31.8125 31.601563 Z M 31.8125 31.601563 "/>
-<use xlink:href="#surface23" mask="url(#mask6)"/>
-<use xlink:href="#surface26" mask="url(#mask7)"/>
-<use xlink:href="#surface29" mask="url(#mask8)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 0 34.523438 L 28.074219 44.730469 L 30.277344 45.539063 L 30.277344 45.53125 L 60.953125 34.574219 L 60.953125 9.917969 L 30.304688 0 L 0 9.914063 Z M 0 34.523438 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
+<use xlink:href="#surface16" mask="url(#mask1)"/>
+<use xlink:href="#surface24" mask="url(#mask2)"/>
+<use xlink:href="#surface32" mask="url(#mask3)"/>
+<use xlink:href="#surface40" mask="url(#mask4)"/>
+<use xlink:href="#surface48" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 69.699219 45.210938 C 69.703125 43.761719 69.121094 42.371094 68.082031 41.347656 C 67.039063 40.328125 65.628906 39.753906 64.160156 39.757813 L 63.414063 39.757813 C 63.769531 38.507813 63.972656 37.226563 64.015625 35.929688 C 64.0625 28.785156 58.808594 22.671875 51.640625 21.53125 C 44.46875 20.394531 37.527344 24.566406 35.289063 31.367188 C 34.226563 31.015625 33.117188 30.816406 32 30.777344 C 26.382813 30.777344 21.824219 35.261719 21.824219 40.789063 C 21.824219 46.320313 26.382813 50.800781 32 50.800781 L 64.621094 50.800781 C 67.519531 50.492188 69.710938 48.078125 69.699219 45.210938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 31.996094 51.496094 C 25.988281 51.496094 21.117188 46.703125 21.117188 40.792969 C 21.117188 34.878906 25.988281 30.089844 31.996094 30.089844 C 32.957031 30.109375 33.917969 30.253906 34.839844 30.523438 C 37.054688 24.601563 42.789063 20.664063 49.203125 20.660156 C 57.773438 20.667969 64.714844 27.5 64.722656 35.933594 C 64.703125 36.992188 64.5625 38.046875 64.308594 39.074219 C 67.695313 39.160156 70.394531 41.878906 70.402344 45.210938 C 70.414063 48.433594 67.941406 51.152344 64.683594 51.488281 Z M 31.996094 31.476563 C 26.765625 31.476563 22.527344 35.648438 22.527344 40.792969 C 22.527344 45.9375 26.765625 50.109375 31.996094 50.109375 L 64.613281 50.109375 C 67.128906 49.8125 69.015625 47.703125 68.996094 45.210938 C 68.988281 42.582031 66.828125 40.457031 64.160156 40.453125 L 62.507813 40.453125 L 62.730469 39.589844 C 63.066406 38.398438 63.265625 37.171875 63.308594 35.929688 C 63.296875 28.269531 56.984375 22.058594 49.195313 22.046875 C 43.144531 22.054688 37.792969 25.910156 35.953125 31.578125 L 35.738281 32.21875 L 35.085938 32.039063 C 34.089844 31.703125 33.046875 31.515625 31.996094 31.476563 Z M 31.996094 31.476563 "/>
+<use xlink:href="#surface56" mask="url(#mask6)"/>
+<use xlink:href="#surface64" mask="url(#mask7)"/>
+<use xlink:href="#surface72" mask="url(#mask8)"/>
 </g>
 </svg>
diff --git a/dist/Containers/all.puml b/dist/Containers/all.puml
index ec1676fe..487098eb 100644
--- a/dist/Containers/all.puml
+++ b/dist/Containers/all.puml
@@ -1,22 +1,21 @@
 sprite $AzureContainerInstance [70x70/16z] {
-xTDNejmW38LXbIDFWVslDqEQKcHP7aXk_PzSFnU0Ah4eHYhqT0Bpb6SC3qyuRZWZbLymukzxi2WzCE1NSemuanlkmFQI32a7taFiJ9Xv4u-J8Pry6R6zeFMN
-GVBgg0uJfsEAufpHzFCbF5DNa9ok_nP9paEvfkZ1VrCkA3YS2P1ZXSchB6zDVagPKLWG7Z6DCBATv7WXVbSi2OvCAAQEJ2ZcLymeGcBp2WWB56DReSWIHIrF
-Q6HdbTizg_L7RJjIjdjQxwFRdD9Y1N9AwR6YeI99rq0HZXHA2XGGOLuH8WaLle-CQEn_Fz1QiqZ1mBMeZF7P0WLC8zIK7YYE4AEYj41nP8I2qaD5YJp1USLV
-n6C5JYc0CEqb5MKZxtyhROdILoXzXTAMA7s5qbOehQzG-WhbyhVogMolHsbBb3wha8sKI6tquu2SKfB-jt9vTDtfNbL6hIULbJwbSE5Lkj4VVG4
+xTS54iCm34JH5HRkVzyoMudaCls1yfjQJY6eHABcxgQCgnFpOtOTn7wH4RepRnEaiQYgS8piqcICUZu0RyiPlHY0ULEwA3AlnqE8TuKuxqkIcHJhN8zu67Mz
+5OR6UCzKTEX1GnEFBf-AWv7nuq9hYYRxQHwaL5CisKAZYaBfaYMV2nVMhDaUQUbOq7oBNABXvZlGhpW5y-zNB7bAJN42r6zM5EItAmQzW-BmUoXy5qNyiibP
+YdNdTtfJCvRPF6-QAlD2iySeSWz5ALA4XlD0OKGAOxX80VHsXG74odpT1B3D5ThTOP5YQrnkLR19RrC83TElj3ys_Oes_otx5IESHs9MLzAJWehYQFf4vQ_y
+bR_oLsGT0oJhiBk3-fIXdg_CngefMKzKfWL5ST4I
 }
 
 AzureEntityColoring(AzureContainerInstance)
 !define AzureContainerInstance(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureContainerInstance, AzureContainerInstance)
 !define AzureContainerInstance(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureContainerInstance, AzureContainerInstance)
 
-sprite $AzureContainerRegistry [70x60/16z] {
-rPP9mkCe34OHQBx_VRkh24hm82VOgtghVtmM7vASSaOZCNCpuLPk0cm-8VMEGtoFBdlGpw0r2VivkY8Hpr1uA8bg05bKXV5QI7w5JSQMIwh_JkvHJrYvjkOP
-V9gNB9KYK0gW_gO1xwHz2sJveQulo70J_rvK3nP94wngt28ykUveypqCtI6lggXEehGO3pOB0NXwCa54fF6Wot2Zgt1NeU8s8hkqM3ZUtLBZhgM5YCqTijqK
-bggZM_gXu7EGAMjkMT-69S9vMzhdhetWwu8BYxPIvMq1Ty5-a14HN4h28hs99ajSROW4BpP2MBWKFrh8k4sY5XPTiqHFDnbPrqXssLALQXT5rdhB4fi1NwBg
-3oo2K03DdPvONdCjxlBGujrYNooH8DC3omvCB7vXeN6HoEe3iyLQRFF-gYJssLUuisXg-GlNCW5jKhbE5iujHgM3r61IVSudRmjcbZ5ezVKOKyQfheeSHL4J
-zv9OEh1RlChOtOUe2gUMndw62JMOejA_5aWiPFC75qHMorGLIw5pIwpyc82_r1QoOrXwQebb7nOW74-7YYJgmL21PNiNKFVJY48uP0qvuktVw_9CcpAM0lsK
-wbuwSdSpMBmfEcYFzai9K1zReeDui6n9-3SjLPzQWjoYzTfY-fdCr6BkcbY4THeYA1S0knyiYBfP3kKhFJRNDYpL9onMmYyqyu6Q1r720hlvaYXX5OfgOaNU
-0-Hx2ly3
+sprite $AzureContainerRegistry [70x70/16z] {
+xTI7bkiW38JX8CsCoFi_y1QmoL6M9DYtb__qBHyWsro-kV_zp_mZAzz2EBNdPo5J2gSGwZuxR1HDykrtvv7ExAEYdJZEN7mLj11FdCSlHjrL3cu5NOToJnMb
+qYoDguUosHoTygyRijK3iNp284D1k_yo5X-pjUL9KgGabBGXMnaB-j8jKIGLsybSds55wOTHZQRK6XsYxPFceaBMQrLJ5BL1usJ5zGZnEoKgOrU2Z0zed6pj
+CVTP9uKnTXIqHnjPK7JRaL1coAAYYDY6JPzyXiiAoG-708bqCXvK8aIfGMKosOc2cT841K4R2eug8W6GIT4BXLHIm8bI7YgV8SIMlaLnHOGqg22cYiqLSd-K
+nTceBW57zjADaJcxX8_MfzlVSGEyZFKS4XlnLU5CsGmYFX9XPQSCl4ds_Ath1ecG8ZRA1-LWsiliIBknlo-ar33ojgjYdXIRJrSrcX8XzW3suBPsCqIDK5Dg
+lLvhhH74rg1APYPA_gPLQvzGVafs-COam6PqJ6hFA5NmIb5wznlObUmuzsQAc9JqrisRAVmU2hw7Wk-XuCSfm355MHdnfSAR8c82v2zWde536GTeSG0hELiY
+S0xe5JGb0PVZDKVak9lEvlq4Vsl_-zyx
 }
 
 AzureEntityColoring(AzureContainerRegistry)
@@ -36,11 +35,11 @@ AzureEntityColoring(AzureKubernetesService)
 !define AzureKubernetesService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureKubernetesService, AzureKubernetesService)
 
 sprite $AzureServiceFabricMesh [70x70/16z] {
-xTY7ajmm30DGWcha_tzm6gyGCnRjqQKdk5xskK9QhToaB_Sr81z9Cu-qZo3-bdwCm5Dmgeoip5F5FETKSGf-bL8VqRbYXyXoYk4OOUOOOUOCQL4awz659O-3
-rXlMMmUX3IAYmK1xWznd-bkeo9hASEiO8Hl6SBOdminwEXPOUTcqKbhP6tyuQ7L_ZrQ3rlW1-_93pikgThfJ6Mg46KQ8gH6BZs08eJykL4WJA6Ga9Y5Je7Zh
-L8L44fEHo1M3OUvc2I66aCJ4Oso0xf6444C8Cv6-GOWXPCSOALSC8wn4qAlP8fX0gbjhB2TqnyoYKt47LJqU6qIzIDjqPzmerH454anzH8D-shTuL6TtmbFw
-5JB75TFe43PtNKAu39kxRZFM9kIAKMD413EkUM88IGmXyP3v_X10P2Kc8SGm0W64anWmmWmIGc5cnKSWcNdxOua4mmLavc0I28GOGdxqhAPFPzZsRytsCej_
-JDrPKWP632FFroUWtTxiII1bj8-kgPgggO3QHYUyJZ0Qt6fb0UiZ-o6B4iClMsK9x07oVptzQr-jG5PKJjEBOUc0EKJu6VM4rFaC
+tTS7aYiX38JXGO0Gzp_mYqv_pT2cj2zkRmvy3g3fyl4cRSICNewFn6B-JFy8CX_nl1BpcPf5wdn9P1MVhx6a4b3gNrK65FkRpqkVI5WQ8PD6oEIGNkFdLuiV
+JDa7hDhH7pDOQhNlNsvCgNM7QZ7dQP1lp2tZhUCJ29ZjNMz0baoKtKCljwqfn71MnKGCfLGvVI6Kv7rHcPlFIzSdLkuHXa4Yyho0KGWP8c2AGZhcw1REqVtx
+DU8aYOJn9vuIZnZEPMGUjqxK8qOlw68WPCwtNOBJO1F8cG5ooVYYYy40kQoPrbGNTvmFqU5ihh9YmcHNlMdH3WJpZMYbF9u_gV0dMmrWrntEsLbFSPSpLzvE
+SVZLtx3EWTeLmj5yP72y7J-U4Gp3-YZL07D2m9mHBuzcheO-1mA6ir4hpWRMdH4ol1HTCtt4wAzt32jz3CUcBHWyQsIukmWP8cG4GaPsemFPKqfMOTldUZgl
+v1-HojXKJ2fbRwVzq36Cfa1qIjCJ4CFjs0YAkTwwc4Ezpw2kXaOq8mOmmsX4Cpb4Td7vPA-dyuheS1dPnTaqb6ywZij4EZNGnQjy1G
 }
 
 AzureEntityColoring(AzureServiceFabricMesh)
@@ -48,10 +47,10 @@ AzureEntityColoring(AzureServiceFabricMesh)
 !define AzureServiceFabricMesh(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceFabricMesh, AzureServiceFabricMesh)
 
 sprite $AzureWebAppForContainers [70x51/16z] {
-xTO9SYqX28NX0mBsLU_-j_jCU9D53sfIS_u5V4LrE-6cb0zDsCw9KihhE0xRXKYEJdmgvN1ebwZD5S-4TeXtgn-A5w0PefHtBJrNLY1I9rfhNMWbAbuUeKZu
-56uDIe0O8TRNds_XKqGbGie3OQ_XMqHb1Yfkl5jNohpY_Q-qMcejoqeTb2wiAjw3ygFyADbKBNz9iKJmMFEcOWHm4b6H3qssb0HAwbcF0LjMCi4DHtfAa4Kb
-0p8WFewiAHIHNiAIaWBYyOfY_asYOYiAKqGycL6oC16dOPGnUbICGCnCW5ugwK5vCLZqCxb4J8UR92YL81go4BnyhYJ80p1-6FX3OLHi4d758x-ewpy5F6Mu
-4gzhLp9a3h7pvw1F9D0jPVn4J9E8OcZyHCIpIagCc7-YGR6d21VHYcAuQaaHN9I2iZtCrnLUO1JFpBF2k8vaKX7SnZB397nNlm
+xTP7TeKm341HTTU__-McoQaSWKKop9jpwRRW9BPc3B-AIt-frcg2zmcljdeFGd5YJ5Uy8fWXwY8USxmgNofAAQBtnolXIWf2TMBE-QhqfHnJXY1Qn3e-LcA8
+h3an7pkAPzyWVYMy-MA4oZdKlSTyKVg-ul4NPVO-HayhhNrJHbxnpfL_vLyffgfMVgCO8wpORYg60CIYgY84G7P7OK1MpruI14uh1O5rPHu3bOJYY7n1F0NC
+ANH4dCaeuiXIlZ89fG0T48yJ2eC6YcqepJyp0eeGuqj50P2O2K52nIwKHa2YgrZ1fRnsLAPVmHLYv8erPtue3180mLiYwzuNnJOHayFeD3uLn2t3bUFeuae5
+sKECZmDCUxyY1TrK2E8PX74JiRFfahOL5S48uat54uWAa2GZ6SKWY58APIuchs16WJ3SLmHEuar6uJmIkMIKuQzw1W
 }
 
 AzureEntityColoring(AzureWebAppForContainers)
diff --git a/dist/Databases/AzureCacheplusRedis(m).png b/dist/Databases/AzureCacheplusRedis(m).png
new file mode 100644
index 00000000..05c354bb
Binary files /dev/null and b/dist/Databases/AzureCacheplusRedis(m).png differ
diff --git a/dist/Databases/AzureCacheplusRedis(m).svg b/dist/Databases/AzureCacheplusRedis(m).svg
new file mode 100644
index 00000000..5ea04500
--- /dev/null
+++ b/dist/Databases/AzureCacheplusRedis(m).svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.949219 64.167969 L 48.183594 64.167969 C 56.234375 64.167969 62.765625 61.832031 62.765625 58.917969 L 62.765625 30.800781 L 47.949219 30.800781 Z M 47.949219 64.167969 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 5.832031 14.117188 L 5.832031 56.234375 C 5.832031 60.667969 15.632813 64.167969 27.648438 64.167969 L 27.648438 14.117188 Z M 5.832031 14.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 27.417969 64.167969 L 27.765625 64.167969 C 39.898438 64.167969 49.582031 60.667969 49.582031 56.234375 L 49.582031 14.117188 L 27.417969 14.117188 Z M 27.417969 64.167969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 49.582031 14.117188 C 49.582031 18.433594 39.785156 22.050781 27.765625 22.050781 C 15.75 22.050781 5.832031 18.433594 5.832031 14.117188 C 5.832031 9.800781 15.632813 6.183594 27.648438 6.183594 C 39.667969 6.183594 49.582031 9.800781 49.582031 14.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 45.148438 13.648438 C 45.148438 16.566406 37.332031 18.898438 27.765625 18.898438 C 18.199219 18.898438 10.265625 16.566406 10.265625 13.648438 C 10.265625 10.734375 18.082031 8.398438 27.648438 8.398438 C 37.214844 8.398438 45.148438 10.734375 45.148438 13.648438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 41.417969 16.800781 C 43.75 15.867188 45.035156 14.816406 45.035156 13.648438 C 45.035156 10.734375 37.214844 8.398438 27.648438 8.398438 C 18.082031 8.398438 10.265625 10.734375 10.265625 13.648438 C 10.265625 14.816406 11.667969 15.984375 13.882813 16.800781 C 17.035156 15.515625 22.050781 14.816406 27.648438 14.816406 C 33.25 14.816406 38.265625 15.632813 41.417969 16.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 33.601563 30.800781 L 33.601563 58.917969 C 33.601563 61.832031 40.132813 64.167969 48.183594 64.167969 L 48.183594 30.800781 Z M 33.601563 30.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 47.949219 64.167969 L 48.183594 64.167969 C 56.234375 64.167969 62.765625 61.832031 62.765625 58.917969 L 62.765625 30.800781 L 47.949219 30.800781 Z M 47.949219 64.167969 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 62.765625 30.800781 C 62.765625 33.714844 56.234375 36.050781 48.183594 36.050781 C 40.132813 36.050781 33.601563 33.714844 33.601563 30.800781 C 33.601563 27.882813 40.132813 25.550781 48.183594 25.550781 C 56.234375 25.550781 62.765625 27.882813 62.765625 30.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 59.734375 30.449219 C 59.734375 32.316406 54.484375 33.949219 48.183594 33.949219 C 41.882813 33.949219 36.632813 32.433594 36.632813 30.449219 C 36.632813 28.582031 41.882813 26.949219 48.183594 26.949219 C 54.484375 26.949219 59.734375 28.582031 59.734375 30.449219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 57.285156 32.550781 C 58.800781 31.964844 59.734375 31.265625 59.734375 30.449219 C 59.734375 28.582031 54.484375 26.949219 48.183594 26.949219 C 41.765625 26.949219 36.632813 28.464844 36.632813 30.449219 C 36.632813 31.265625 37.566406 31.964844 39.082031 32.550781 C 41.183594 31.734375 44.566406 31.148438 48.300781 31.148438 C 51.800781 31.148438 55.066406 31.734375 57.285156 32.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56.117188 47.832031 L 39.898438 61.25 L 46.199219 50.867188 L 40.714844 50.867188 L 56.933594 37.566406 L 50.632813 47.832031 Z M 56.117188 47.832031 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureCacheplusRedis.png b/dist/Databases/AzureCacheplusRedis.png
new file mode 100644
index 00000000..a41202af
Binary files /dev/null and b/dist/Databases/AzureCacheplusRedis.png differ
diff --git a/dist/Databases/AzureCacheplusRedis.puml b/dist/Databases/AzureCacheplusRedis.puml
new file mode 100644
index 00000000..69316a96
--- /dev/null
+++ b/dist/Databases/AzureCacheplusRedis.puml
@@ -0,0 +1,11 @@
+sprite $AzureCacheplusRedis [70x70/16z] {
+xTO5cjim48RXNuEIVF_xDhDH7ZEgt7wBIUJN3EZjV_yZPcanfIU0gCeY5I5SZsKtbOHBaSfn_KYaE4_Eu_iRHLURMHEEIcbS65Kpyp4pQvmoNj6-ueX8rNmx
+ixQJakuhsLDRBTr6XF0LsP6Iiw2LY4K_AsMgqyDNx529pewh96PdIkH2s8c2kAP4hjBMOBw6TaEPSQeszb395lssYhwI3aN7W-QnmZ66HVIT2AUxIXZfvDft
+gWGYc_4T1NkAt50SWBQhrhYhFagwgYW0LlDvfXpyPQKQthief2O88R9oMHc6gkFWoN-QomqbAYQ4CU8WoZsbLKlExfvBwvaIbLczYfP-9PFtAvwuT2i6v6v5
+0Ikz2WDKEfKSqtcdal5AIfzYxz5TIbL4LdgKIctqAyeFbUaKWJnI76FoU8rAH8YqRnyv8Yzz-oYr_Tob203EfKyfRPDqAPK07muKN54CAG-7Yfmh5LI6OmLo
+gWZNOQrW7lcEOcM8ijRttnbYMCQ-hVWNyxP2EK8YKbyfKGvYhHXXfyHYAyL4rCjCoIO99oLY5X5c9Xe74qjxDYJynFxt3G
+}
+
+AzureEntityColoring(AzureCacheplusRedis)
+!define AzureCacheplusRedis(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCacheplusRedis, AzureCacheplusRedis)
+!define AzureCacheplusRedis(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCacheplusRedis, AzureCacheplusRedis)
diff --git a/dist/Databases/AzureCacheplusRedis.svg b/dist/Databases/AzureCacheplusRedis.svg
new file mode 100644
index 00000000..f5223b46
--- /dev/null
+++ b/dist/Databases/AzureCacheplusRedis.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.949219 64.167969 L 48.183594 64.167969 C 56.234375 64.167969 62.765625 61.832031 62.765625 58.917969 L 62.765625 30.800781 L 47.949219 30.800781 Z M 47.949219 64.167969 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 5.832031 14.117188 L 5.832031 56.234375 C 5.832031 60.667969 15.632813 64.167969 27.648438 64.167969 L 27.648438 14.117188 Z M 5.832031 14.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 27.417969 64.167969 L 27.765625 64.167969 C 39.898438 64.167969 49.582031 60.667969 49.582031 56.234375 L 49.582031 14.117188 L 27.417969 14.117188 Z M 27.417969 64.167969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.582031 14.117188 C 49.582031 18.433594 39.785156 22.050781 27.765625 22.050781 C 15.75 22.050781 5.832031 18.433594 5.832031 14.117188 C 5.832031 9.800781 15.632813 6.183594 27.648438 6.183594 C 39.667969 6.183594 49.582031 9.800781 49.582031 14.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 45.148438 13.648438 C 45.148438 16.566406 37.332031 18.898438 27.765625 18.898438 C 18.199219 18.898438 10.265625 16.566406 10.265625 13.648438 C 10.265625 10.734375 18.082031 8.398438 27.648438 8.398438 C 37.214844 8.398438 45.148438 10.734375 45.148438 13.648438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 41.417969 16.800781 C 43.75 15.867188 45.035156 14.816406 45.035156 13.648438 C 45.035156 10.734375 37.214844 8.398438 27.648438 8.398438 C 18.082031 8.398438 10.265625 10.734375 10.265625 13.648438 C 10.265625 14.816406 11.667969 15.984375 13.882813 16.800781 C 17.035156 15.515625 22.050781 14.816406 27.648438 14.816406 C 33.25 14.816406 38.265625 15.632813 41.417969 16.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.601563 30.800781 L 33.601563 58.917969 C 33.601563 61.832031 40.132813 64.167969 48.183594 64.167969 L 48.183594 30.800781 Z M 33.601563 30.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 47.949219 64.167969 L 48.183594 64.167969 C 56.234375 64.167969 62.765625 61.832031 62.765625 58.917969 L 62.765625 30.800781 L 47.949219 30.800781 Z M 47.949219 64.167969 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 62.765625 30.800781 C 62.765625 33.714844 56.234375 36.050781 48.183594 36.050781 C 40.132813 36.050781 33.601563 33.714844 33.601563 30.800781 C 33.601563 27.882813 40.132813 25.550781 48.183594 25.550781 C 56.234375 25.550781 62.765625 27.882813 62.765625 30.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 59.734375 30.449219 C 59.734375 32.316406 54.484375 33.949219 48.183594 33.949219 C 41.882813 33.949219 36.632813 32.433594 36.632813 30.449219 C 36.632813 28.582031 41.882813 26.949219 48.183594 26.949219 C 54.484375 26.949219 59.734375 28.582031 59.734375 30.449219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 57.285156 32.550781 C 58.800781 31.964844 59.734375 31.265625 59.734375 30.449219 C 59.734375 28.582031 54.484375 26.949219 48.183594 26.949219 C 41.765625 26.949219 36.632813 28.464844 36.632813 30.449219 C 36.632813 31.265625 37.566406 31.964844 39.082031 32.550781 C 41.183594 31.734375 44.566406 31.148438 48.300781 31.148438 C 51.800781 31.148438 55.066406 31.734375 57.285156 32.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56.117188 47.832031 L 39.898438 61.25 L 46.199219 50.867188 L 40.714844 50.867188 L 56.933594 37.566406 L 50.632813 47.832031 Z M 56.117188 47.832031 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureCosmosDb(m).png b/dist/Databases/AzureCosmosDb(m).png
index 75a7946d..bec1d8f7 100644
Binary files a/dist/Databases/AzureCosmosDb(m).png and b/dist/Databases/AzureCosmosDb(m).png differ
diff --git a/dist/Databases/AzureCosmosDb(m).svg b/dist/Databases/AzureCosmosDb(m).svg
index 8532e468..4f36f7a1 100644
--- a/dist/Databases/AzureCosmosDb(m).svg
+++ b/dist/Databases/AzureCosmosDb(m).svg
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="64pt" viewBox="0 0 70 64" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="64" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.109375 43.34375 C 32.09375 39.980469 29.359375 37.253906 25.984375 37.238281 L 24.820313 37.238281 C 25.246094 35.691406 25.019531 34.039063 24.191406 32.667969 C 23.367188 31.292969 22.011719 30.316406 20.445313 29.964844 L 12.859375 29.964844 C 11.4375 37.0625 13.496094 44.410156 18.402344 49.746094 L 25.984375 49.746094 C 29.414063 49.589844 32.113281 46.769531 32.109375 43.34375 Z M 39.695313 18.035156 L 39.695313 19.199219 L 37.070313 19.199219 C 33.527344 19.199219 30.652344 22.066406 30.652344 25.601563 C 30.652344 29.132813 33.527344 32 37.070313 32 L 58.359375 32 C 57.78125 24.324219 53.257813 17.5 46.402344 13.964844 L 43.777344 13.964844 C 42.6875 13.9375 41.632813 14.359375 40.859375 15.128906 C 40.089844 15.898438 39.667969 16.949219 39.695313 18.035156 Z M 58.359375 36.363281 L 45.820313 36.363281 C 44.425781 36.359375 43.085938 36.90625 42.101563 37.890625 C 41.117188 38.875 40.5625 40.210938 40.570313 41.601563 C 40.625 42.496094 40.820313 43.382813 41.152344 44.21875 C 38.457031 45.074219 36.914063 47.894531 37.652344 50.617188 C 38.25 52.820313 40.332031 54.285156 42.609375 54.109375 L 46.109375 54.109375 C 52.878906 50.570313 57.460938 43.929688 58.359375 36.363281 Z M 58.359375 36.363281 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 23.761719 55.445313 C 28.808594 51.890625 34.601563 47.101563 40.851563 40.851563 C 47.269531 34.429688 51.988281 28.695313 55.457031 23.78125 C 51.492188 16.5625 43.820313 11.667969 35 11.667969 C 22.113281 11.667969 11.667969 22.113281 11.667969 35 C 11.667969 43.8125 16.550781 51.476563 23.761719 55.445313 Z M 23.761719 55.445313 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 47.035156 47.035156 C 42.867188 51.203125 38.613281 54.984375 34.441406 58.304688 C 34.628906 58.308594 34.8125 58.332031 35 58.332031 C 47.886719 58.332031 58.332031 47.886719 58.332031 35 C 58.332031 34.808594 58.308594 34.628906 58.304688 34.441406 C 54.890625 38.722656 51.078125 42.996094 47.035156 47.035156 Z M 47.035156 47.035156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 68.300781 1.699219 C 67.300781 0.703125 65.851563 0.230469 64.039063 0.230469 C 59.070313 0.230469 51.355469 3.804688 42.710938 9.9375 C 43.847656 10.289063 44.953125 10.703125 46.015625 11.199219 C 53.839844 5.890625 60.320313 3.148438 64.042969 3.148438 C 64.761719 3.148438 65.730469 3.253906 66.242188 3.761719 C 69.003906 6.523438 63.421875 22.402344 42.914063 42.910156 C 27.199219 58.628906 12.429688 66.851563 5.96875 66.851563 C 5.246094 66.851563 4.277344 66.742188 3.769531 66.234375 C 1.941406 64.410156 3.800781 56.820313 11.183594 45.964844 C 10.695313 44.917969 10.289063 43.824219 9.941406 42.707031 C 1.566406 54.507813 -2.015625 64.570313 1.707031 68.296875 C 2.703125 69.292969 4.152344 69.765625 5.96875 69.765625 C 14.191406 69.765625 29.914063 60.035156 44.976563 44.972656 C 63.363281 26.582031 73.804688 7.210938 68.300781 1.699219 Z M 68.300781 1.699219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 11.667969 0 C 11.667969 6.441406 6.441406 11.667969 0 11.667969 C 6.441406 11.667969 11.667969 16.890625 11.667969 23.332031 C 11.667969 16.890625 16.890625 11.667969 23.332031 11.667969 C 16.890625 11.667969 11.667969 6.441406 11.667969 0 Z M 11.667969 0 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 61.25 52.5 C 61.25 57.332031 57.332031 61.25 52.5 61.25 C 57.332031 61.25 61.25 65.167969 61.25 70 C 61.25 65.167969 65.167969 61.25 70 61.25 C 65.167969 61.25 61.25 57.332031 61.25 52.5 Z M 61.25 52.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 25.195313 38.484375 L 24.242188 38.484375 C 24.363281 38.007813 24.421875 37.527344 24.421875 36.996094 C 24.421875 33.480469 21.5625 30.625 18.050781 30.625 L 12.09375 30.625 C 11.820313 32.042969 11.667969 33.503906 11.667969 35 C 11.667969 41.3125 14.183594 47.027344 18.253906 51.226563 L 25.195313 51.226563 C 28.710938 51.226563 31.566406 48.367188 31.566406 44.855469 C 31.566406 41.339844 28.707031 38.484375 25.195313 38.484375 Z M 25.195313 38.484375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 40.835938 40.867188 C 40.84375 40.859375 40.84375 40.855469 40.851563 40.851563 C 41.714844 39.988281 42.519531 39.148438 43.320313 38.308594 C 42.234375 38.859375 41.351563 39.757813 40.835938 40.867188 Z M 40.835938 40.867188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 47.035156 47.035156 C 44.308594 49.765625 41.539063 52.332031 38.78125 54.714844 C 39.761719 55.683594 41.105469 56.289063 42.582031 56.289063 L 44.523438 56.289063 C 51.871094 52.996094 57.199219 46.023438 58.160156 37.710938 L 55.621094 37.710938 C 52.929688 40.882813 50.046875 44.023438 47.035156 47.035156 Z M 47.035156 47.035156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 36.929688 32.765625 L 48.378906 32.765625 C 51.171875 29.535156 53.507813 26.542969 55.441406 23.804688 C 53.113281 19.566406 49.515625 16.125 45.144531 14.007813 L 43.835938 14.007813 C 41.453125 14.007813 39.546875 15.914063 39.546875 18.296875 C 39.546875 18.652344 39.605469 19.070313 39.726563 19.429688 L 36.984375 19.429688 C 33.234375 19.429688 30.257813 22.40625 30.257813 26.09375 C 30.257813 29.785156 33.234375 32.765625 36.929688 32.765625 Z M 36.929688 32.765625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.777344 28.507813 C 60.128906 37.660156 56.6875 47.320313 49.070313 52.9375 C 41.457031 58.554688 31.1875 59.007813 23.101563 54.085938 C 15.019531 49.164063 10.730469 39.847656 12.261719 30.523438 C 13.792969 21.199219 20.832031 13.730469 30.070313 11.636719 C 42.371094 8.796875 54.6875 16.296875 57.777344 28.507813 Z M 57.777344 28.507813 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 9.359375 18.617188 C 9.046875 18.597656 8.800781 18.347656 8.777344 18.035156 C 8.777344 13.539063 5.121094 9.890625 0.609375 9.890625 C 0.320313 10.183594 0.0273438 9.601563 0.0273438 9.308594 C 0.0507813 8.996094 0.296875 8.75 0.609375 8.726563 C 5.121094 8.726563 8.777344 5.082031 8.777344 0.582031 C 8.777344 0 9.070313 0 9.359375 0 C 9.652344 0 10.234375 0 10.234375 0.582031 C 10.234375 5.082031 13.890625 8.726563 18.402344 8.726563 C 18.726563 8.726563 18.984375 8.988281 18.984375 9.308594 C 18.984375 9.628906 18.726563 9.890625 18.402344 9.890625 C 13.890625 9.890625 10.234375 13.539063 10.234375 18.035156 C 10.234375 18.328125 9.945313 18.617188 9.359375 18.617188 Z M 9.359375 18.617188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 59.234375 64 C 58.945313 64 58.945313 64 58.945313 63.710938 C 58.839844 61.070313 56.632813 59 53.984375 59.054688 C 53.695313 59.054688 53.695313 59.054688 53.695313 58.761719 C 53.695313 58.472656 53.695313 58.472656 53.984375 58.472656 C 56.59375 58.429688 58.742188 56.414063 58.945313 53.816406 C 58.945313 53.527344 58.945313 53.527344 59.234375 53.527344 C 59.527344 53.527344 59.527344 53.527344 59.527344 53.816406 C 59.632813 56.457031 61.835938 58.527344 64.484375 58.472656 C 64.777344 58.472656 64.777344 58.472656 64.777344 58.761719 C 64.777344 59.054688 64.777344 59.054688 64.484375 59.054688 C 61.878906 59.097656 59.730469 61.113281 59.527344 63.710938 C 59.820313 64 59.527344 64 59.234375 64 Z M 59.234375 64 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 69.152344 13.382813 C 66.820313 9.890625 61.570313 9.019531 53.109375 11.054688 C 50.53125 11.65625 48 12.433594 45.527344 13.382813 C 47.09375 14.179688 48.5625 15.15625 49.902344 16.289063 C 51.359375 16 52.820313 15.417969 53.984375 15.128906 C 56.175781 14.550781 58.429688 14.257813 60.695313 14.253906 C 63.320313 14.253906 64.777344 14.835938 65.359375 15.710938 C 66.234375 17.164063 65.359375 20.65625 60.695313 26.183594 C 59.796875 27.222656 58.820313 28.195313 57.777344 29.089844 C 52.460938 34.183594 46.589844 38.671875 40.277344 42.472656 C 34.101563 46.351563 27.429688 49.386719 20.445313 51.492188 C 11.984375 54.109375 6.152344 54.109375 4.984375 52.074219 C 3.820313 50.035156 6.152344 44.800781 12.570313 38.691406 C 12.230469 36.964844 12.035156 35.214844 11.984375 33.453125 C 2.070313 42.472656 -1.140625 50.328125 1.195313 54.398438 C 3.367188 56.914063 6.632813 58.214844 9.945313 57.890625 C 15.050781 57.695313 20.085938 56.613281 24.820313 54.691406 C 30.929688 52.371094 36.792969 49.449219 42.320313 45.964844 C 47.875 42.511719 53.140625 38.621094 58.070313 34.328125 C 60.058594 32.632813 61.914063 30.785156 63.609375 28.800781 C 69.445313 22.109375 71.195313 16.871094 69.152344 13.382813 Z M 69.152344 13.382813 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureCosmosDb.png b/dist/Databases/AzureCosmosDb.png
index 544f7f87..160c5803 100644
Binary files a/dist/Databases/AzureCosmosDb.png and b/dist/Databases/AzureCosmosDb.png differ
diff --git a/dist/Databases/AzureCosmosDb.puml b/dist/Databases/AzureCosmosDb.puml
index c8a085f6..669e4317 100644
--- a/dist/Databases/AzureCosmosDb.puml
+++ b/dist/Databases/AzureCosmosDb.puml
@@ -1,14 +1,13 @@
-sprite $AzureCosmosDb [70x70/16z] {
-dPVRbjim24K10PBu__zjEmfs5DRH6gVxfPtRzk5YMw4tJ5yYwhrtOzfftobyHgAqOVGS7R4Xz6QsnuvNZEagqdf4to96_yOn_KeG4NJJzsHdP2o7qitOB1Bn
-80ptom4jl6BQRyKKns96x98wD1p4gH0nivoKvEzWsWeYuDjzENeacHSZ3als2ELcCmfTPQ-3ppT93ff_8lNOcNhzBalJYyRdEiVLDb2GQ06BHaIZn2x9zPjD
-2-R_Q5IHY5as8GRAaPA5rJpzi-EUIJ98nIzQZH9b1NFdM1L6IUhsMzdkMIJOulQvY7NmYYNsWszepR_JLrTEAP36Sa0xYXfhZf1NxP6xiYDWnEQOQygT4630
-4CqLOmA0UZ3jLO_YA4yiEUnngaUUMlBEOnpbeOLVgzy8mGyjxRLlJgU2AgVvzDmtWDhYbp2MJH72-8L1JP8teHA6lMYWXr-RukStHT4WVYGJR0gq-5b20tKM
-M-mewVbabV-r215vZaSF5YuMAB4SJxFZf3ToRtPQFWtMmhYtNomupqgGCzPytY7CAoL9o_DMo-s3D3zhsdPe4oyMq5vObAHat1B5GGILP5LoNujXZl1pIP8z
-cNnBZ10zOasf0YLuGlbM064irrxtSd2KxQq0B4Y2k-8H0uxf9R4gKGB8-wtGIfIyHlHTubIfPndT9IqR_qIYdoSykrZ3uP4te3Xiokai8vhmTRPN805H1dYx
-jVlil_O5IVWpIgEgKRaFdkl91gUZ9Kf5-6h9M8TyVDoTvGYEQFDwxxHrH7IJkY2whUqaX4Ma_zKc0GiojxKru92x6f9_yE4o_TrRFWHnki6IrC22igtx3k6i
-Yvcl1eTNwKn7M6UycIeUTK8wIn38ssESd-XBKX04qBUFPVsZkMqvHdeVQERzt_QPSYezOX-lvVwpzYoJ7jFkN-PLmbWfCiTp9bEYSJEKliFgL6PNfcyHIlu2
+sprite $AzureCosmosDB [70x64/16z] {
+hTQ7ikmW20PWa1BJzFtVziR9TGABdhRxJJ_b7q1Y0XqZl0y_af8umVk8-HCDyGTQukRzVjwFGUxmpn69hOJuzrwilwxA8y6F95ttirxAlk1h3iLkHLHLX1C-
+2Njriez9Fe94BI44e5ngSDWOSXciaMnrQ3Lh1yOWW-dIIobxLc6MVDRcEIkomulenaSjcvXjo3O5pLH88wPEmFCfQBg9w97cAP1iI4Ip678fytQ4BpIBMQ-G
+Csvb74Y4q66zBF0YXWovKYg2n-e9ZIKxbGmUZakPzzIMhi0B2KSpavv-U5YAHLDmqVuGEJnAcHV3TNJAe07DtPCj2A6XG6XAQaE3Up1YciYr4GYO_kCOCmvH
+YCIKQvfYYhOQDp-ca7vbEMmbNb9wy5SXnSx4IsKXGwUoUO74aFgpb7ia9SiufEQG4gyhsMjp21C4s5fToM1cYGiefJORNMB8sN_di1fqMMjpjvv2ob4l1mNi
+je-FsfpYRar_xHrcUGVRrzUrxdG3fp_XQ5FYaEKqtJIZoPRMPfgcBFkTSR2zCgszNtl3bioEs5rWyDWiuhYMVFf2HYTqskyOZYdvg6uYyr88Rc4oqkke6vCn
+cifkGidIdd4AEU2XBSN7SEuP9PF3erqfemznyoMvQGpnbZvRzoR8UwdTlgXF4HocdE2mYIZReXVs8O7wMvXqAzLbtAXZXe7q_y_pajj7kNMiyOKYP5g7nrQ7
+ohven628lnQ2aWcGOmRwKq0ms3UoBzIxPHkHm1CLS3WVvtaU-xg4lyMK4YM4G5HDp9yGzme9te1a9lK7TiKJl2qfmmSemWUOKlu1
 }
 
-AzureEntityColoring(AzureCosmosDb)
-!define AzureCosmosDb(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCosmosDb, AzureCosmosDb)
-!define AzureCosmosDb(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCosmosDb, AzureCosmosDb)
+AzureEntityColoring(AzureCosmosDB)
+!define AzureCosmosDB(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCosmosDB, AzureCosmosDB)
+!define AzureCosmosDB(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCosmosDB, AzureCosmosDB)
diff --git a/dist/Databases/AzureCosmosDb.svg b/dist/Databases/AzureCosmosDb.svg
index fcd0de92..17253835 100644
--- a/dist/Databases/AzureCosmosDb.svg
+++ b/dist/Databases/AzureCosmosDb.svg
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="64pt" viewBox="0 0 70 64" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.109375 43.34375 C 32.09375 39.980469 29.359375 37.253906 25.984375 37.238281 L 24.820313 37.238281 C 25.246094 35.691406 25.019531 34.039063 24.191406 32.667969 C 23.367188 31.292969 22.011719 30.316406 20.445313 29.964844 L 12.859375 29.964844 C 11.4375 37.0625 13.496094 44.410156 18.402344 49.746094 L 25.984375 49.746094 C 29.414063 49.589844 32.113281 46.769531 32.109375 43.34375 Z M 39.695313 18.035156 L 39.695313 19.199219 L 37.070313 19.199219 C 33.527344 19.199219 30.652344 22.066406 30.652344 25.601563 C 30.652344 29.132813 33.527344 32 37.070313 32 L 58.359375 32 C 57.78125 24.324219 53.257813 17.5 46.402344 13.964844 L 43.777344 13.964844 C 42.6875 13.9375 41.632813 14.359375 40.859375 15.128906 C 40.089844 15.898438 39.667969 16.949219 39.695313 18.035156 Z M 58.359375 36.363281 L 45.820313 36.363281 C 44.425781 36.359375 43.085938 36.90625 42.101563 37.890625 C 41.117188 38.875 40.5625 40.210938 40.570313 41.601563 C 40.625 42.496094 40.820313 43.382813 41.152344 44.21875 C 38.457031 45.074219 36.914063 47.894531 37.652344 50.617188 C 38.25 52.820313 40.332031 54.285156 42.609375 54.109375 L 46.109375 54.109375 C 52.878906 50.570313 57.460938 43.929688 58.359375 36.363281 Z M 58.359375 36.363281 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 23.761719 55.445313 C 28.808594 51.890625 34.601563 47.101563 40.851563 40.851563 C 47.269531 34.429688 51.988281 28.695313 55.457031 23.78125 C 51.492188 16.5625 43.820313 11.667969 35 11.667969 C 22.113281 11.667969 11.667969 22.113281 11.667969 35 C 11.667969 43.8125 16.550781 51.476563 23.761719 55.445313 Z M 23.761719 55.445313 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 47.035156 47.035156 C 42.867188 51.203125 38.613281 54.984375 34.441406 58.304688 C 34.628906 58.308594 34.8125 58.332031 35 58.332031 C 47.886719 58.332031 58.332031 47.886719 58.332031 35 C 58.332031 34.808594 58.308594 34.628906 58.304688 34.441406 C 54.890625 38.722656 51.078125 42.996094 47.035156 47.035156 Z M 47.035156 47.035156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 68.300781 1.699219 C 67.300781 0.703125 65.851563 0.230469 64.039063 0.230469 C 59.070313 0.230469 51.355469 3.804688 42.710938 9.9375 C 43.847656 10.289063 44.953125 10.703125 46.015625 11.199219 C 53.839844 5.890625 60.320313 3.148438 64.042969 3.148438 C 64.761719 3.148438 65.730469 3.253906 66.242188 3.761719 C 69.003906 6.523438 63.421875 22.402344 42.914063 42.910156 C 27.199219 58.628906 12.429688 66.851563 5.96875 66.851563 C 5.246094 66.851563 4.277344 66.742188 3.769531 66.234375 C 1.941406 64.410156 3.800781 56.820313 11.183594 45.964844 C 10.695313 44.917969 10.289063 43.824219 9.941406 42.707031 C 1.566406 54.507813 -2.015625 64.570313 1.707031 68.296875 C 2.703125 69.292969 4.152344 69.765625 5.96875 69.765625 C 14.191406 69.765625 29.914063 60.035156 44.976563 44.972656 C 63.363281 26.582031 73.804688 7.210938 68.300781 1.699219 Z M 68.300781 1.699219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 11.667969 0 C 11.667969 6.441406 6.441406 11.667969 0 11.667969 C 6.441406 11.667969 11.667969 16.890625 11.667969 23.332031 C 11.667969 16.890625 16.890625 11.667969 23.332031 11.667969 C 16.890625 11.667969 11.667969 6.441406 11.667969 0 Z M 11.667969 0 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 61.25 52.5 C 61.25 57.332031 57.332031 61.25 52.5 61.25 C 57.332031 61.25 61.25 65.167969 61.25 70 C 61.25 65.167969 65.167969 61.25 70 61.25 C 65.167969 61.25 61.25 57.332031 61.25 52.5 Z M 61.25 52.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 25.195313 38.484375 L 24.242188 38.484375 C 24.363281 38.007813 24.421875 37.527344 24.421875 36.996094 C 24.421875 33.480469 21.5625 30.625 18.050781 30.625 L 12.09375 30.625 C 11.820313 32.042969 11.667969 33.503906 11.667969 35 C 11.667969 41.3125 14.183594 47.027344 18.253906 51.226563 L 25.195313 51.226563 C 28.710938 51.226563 31.566406 48.367188 31.566406 44.855469 C 31.566406 41.339844 28.707031 38.484375 25.195313 38.484375 Z M 25.195313 38.484375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 40.835938 40.867188 C 40.84375 40.859375 40.84375 40.855469 40.851563 40.851563 C 41.714844 39.988281 42.519531 39.148438 43.320313 38.308594 C 42.234375 38.859375 41.351563 39.757813 40.835938 40.867188 Z M 40.835938 40.867188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 47.035156 47.035156 C 44.308594 49.765625 41.539063 52.332031 38.78125 54.714844 C 39.761719 55.683594 41.105469 56.289063 42.582031 56.289063 L 44.523438 56.289063 C 51.871094 52.996094 57.199219 46.023438 58.160156 37.710938 L 55.621094 37.710938 C 52.929688 40.882813 50.046875 44.023438 47.035156 47.035156 Z M 47.035156 47.035156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 36.929688 32.765625 L 48.378906 32.765625 C 51.171875 29.535156 53.507813 26.542969 55.441406 23.804688 C 53.113281 19.566406 49.515625 16.125 45.144531 14.007813 L 43.835938 14.007813 C 41.453125 14.007813 39.546875 15.914063 39.546875 18.296875 C 39.546875 18.652344 39.605469 19.070313 39.726563 19.429688 L 36.984375 19.429688 C 33.234375 19.429688 30.257813 22.40625 30.257813 26.09375 C 30.257813 29.785156 33.234375 32.765625 36.929688 32.765625 Z M 36.929688 32.765625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.777344 28.507813 C 60.128906 37.660156 56.6875 47.320313 49.070313 52.9375 C 41.457031 58.554688 31.1875 59.007813 23.101563 54.085938 C 15.019531 49.164063 10.730469 39.847656 12.261719 30.523438 C 13.792969 21.199219 20.832031 13.730469 30.070313 11.636719 C 42.371094 8.796875 54.6875 16.296875 57.777344 28.507813 Z M 57.777344 28.507813 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 9.359375 18.617188 C 9.046875 18.597656 8.800781 18.347656 8.777344 18.035156 C 8.777344 13.539063 5.121094 9.890625 0.609375 9.890625 C 0.320313 10.183594 0.0273438 9.601563 0.0273438 9.308594 C 0.0507813 8.996094 0.296875 8.75 0.609375 8.726563 C 5.121094 8.726563 8.777344 5.082031 8.777344 0.582031 C 8.777344 0 9.070313 0 9.359375 0 C 9.652344 0 10.234375 0 10.234375 0.582031 C 10.234375 5.082031 13.890625 8.726563 18.402344 8.726563 C 18.726563 8.726563 18.984375 8.988281 18.984375 9.308594 C 18.984375 9.628906 18.726563 9.890625 18.402344 9.890625 C 13.890625 9.890625 10.234375 13.539063 10.234375 18.035156 C 10.234375 18.328125 9.945313 18.617188 9.359375 18.617188 Z M 9.359375 18.617188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 59.234375 64 C 58.945313 64 58.945313 64 58.945313 63.710938 C 58.839844 61.070313 56.632813 59 53.984375 59.054688 C 53.695313 59.054688 53.695313 59.054688 53.695313 58.761719 C 53.695313 58.472656 53.695313 58.472656 53.984375 58.472656 C 56.59375 58.429688 58.742188 56.414063 58.945313 53.816406 C 58.945313 53.527344 58.945313 53.527344 59.234375 53.527344 C 59.527344 53.527344 59.527344 53.527344 59.527344 53.816406 C 59.632813 56.457031 61.835938 58.527344 64.484375 58.472656 C 64.777344 58.472656 64.777344 58.472656 64.777344 58.761719 C 64.777344 59.054688 64.777344 59.054688 64.484375 59.054688 C 61.878906 59.097656 59.730469 61.113281 59.527344 63.710938 C 59.820313 64 59.527344 64 59.234375 64 Z M 59.234375 64 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 69.152344 13.382813 C 66.820313 9.890625 61.570313 9.019531 53.109375 11.054688 C 50.53125 11.65625 48 12.433594 45.527344 13.382813 C 47.09375 14.179688 48.5625 15.15625 49.902344 16.289063 C 51.359375 16 52.820313 15.417969 53.984375 15.128906 C 56.175781 14.550781 58.429688 14.257813 60.695313 14.253906 C 63.320313 14.253906 64.777344 14.835938 65.359375 15.710938 C 66.234375 17.164063 65.359375 20.65625 60.695313 26.183594 C 59.796875 27.222656 58.820313 28.195313 57.777344 29.089844 C 52.460938 34.183594 46.589844 38.671875 40.277344 42.472656 C 34.101563 46.351563 27.429688 49.386719 20.445313 51.492188 C 11.984375 54.109375 6.152344 54.109375 4.984375 52.074219 C 3.820313 50.035156 6.152344 44.800781 12.570313 38.691406 C 12.230469 36.964844 12.035156 35.214844 11.984375 33.453125 C 2.070313 42.472656 -1.140625 50.328125 1.195313 54.398438 C 3.367188 56.914063 6.632813 58.214844 9.945313 57.890625 C 15.050781 57.695313 20.085938 56.613281 24.820313 54.691406 C 30.929688 52.371094 36.792969 49.449219 42.320313 45.964844 C 47.875 42.511719 53.140625 38.621094 58.070313 34.328125 C 60.058594 32.632813 61.914063 30.785156 63.609375 28.800781 C 69.445313 22.109375 71.195313 16.871094 69.152344 13.382813 Z M 69.152344 13.382813 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureDataFactory(m).png b/dist/Databases/AzureDataFactory(m).png
deleted file mode 100644
index 4ae8ffb5..00000000
Binary files a/dist/Databases/AzureDataFactory(m).png and /dev/null differ
diff --git a/dist/Databases/AzureDataFactory(m).svg b/dist/Databases/AzureDataFactory(m).svg
deleted file mode 100644
index edc494ca..00000000
--- a/dist/Databases/AzureDataFactory(m).svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="68pt" viewBox="0 0 70 68" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,43.529412%,83.137255%);fill-opacity:1;" d="M 69.167969 40.46875 L 69.167969 23.882813 L 50.167969 40.300781 L 49.667969 40.300781 L 49.667969 23.882813 L 30.667969 40.300781 L 30.667969 5.804688 C 30.667969 2.984375 24.167969 0 15.667969 0 C 7.167969 0 0 2.820313 0 5.804688 L 0 68.496094 L 69.167969 68.496094 Z M 15.667969 8.625 C 9.5 8.625 4.5 7.132813 4.5 5.472656 C 4.5 3.816406 9.5 2.320313 15.667969 2.320313 C 21.832031 2.320313 26.832031 3.648438 26.832031 5.472656 C 26.832031 7.132813 21.832031 8.625 15.667969 8.625 Z M 48.332031 57.550781 L 40.667969 57.550781 L 40.667969 49.921875 L 48.332031 49.921875 Z M 35 57.550781 L 27.332031 57.550781 L 27.332031 49.921875 L 35 49.921875 Z M 54.332031 57.550781 L 54.332031 49.921875 L 62 49.921875 L 62 57.550781 Z M 54.332031 57.550781 "/>
-</g>
-</svg>
diff --git a/dist/Databases/AzureDataFactory.png b/dist/Databases/AzureDataFactory.png
deleted file mode 100644
index f7e0f609..00000000
Binary files a/dist/Databases/AzureDataFactory.png and /dev/null differ
diff --git a/dist/Databases/AzureDataFactory.puml b/dist/Databases/AzureDataFactory.puml
deleted file mode 100644
index 54f5e5a8..00000000
--- a/dist/Databases/AzureDataFactory.puml
+++ /dev/null
@@ -1,9 +0,0 @@
-sprite $AzureDataFactory [70x68/16z] {
-xTH5OYCn443HbbJuxt_V8RFBawHs0VrLuskKZdDJp2CJCiDqZQFTqE2vq1uq7O1qLP6rHDHEg3SS1N0PpxUNW7IGdCUB35WVL1AmrsyBy0yg0FdoaWv4Gu6G
--NWVovAkSf9CLKHKpHEWgzHQobQsifMjs56QsbH6P44MJMKaHH6QoagAOZGLWQ8uJKKfoWYQYbEKcVIK4HHbGKyPIL64fZAJeXXDHQ0eJbDHYZA2fk8KPIOz
-PGH5MT1JHb8KeQdCf2X6LTe53QNJLe2jvAcoKjRUKlGu5G3vCC7PUSs-Wx8LbrC9a7BA0GWv5Lzy76rbAxy1
-}
-
-AzureEntityColoring(AzureDataFactory)
-!define AzureDataFactory(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataFactory, AzureDataFactory)
-!define AzureDataFactory(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataFactory, AzureDataFactory)
diff --git a/dist/Databases/AzureDataFactory.svg b/dist/Databases/AzureDataFactory.svg
deleted file mode 100644
index 19807abd..00000000
--- a/dist/Databases/AzureDataFactory.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 69.859375 41.160156 L 69.859375 24.21875 L 50.679688 40.878906 L 50.261719 40.878906 L 50.261719 24.21875 L 31.078125 40.878906 L 31.078125 6.019531 C 31.078125 3.078125 24.5 0.140625 15.820313 0.140625 C 7.140625 0.140625 0 2.941406 0 6.019531 L 0 69.859375 L 70 69.859375 Z M 15.820313 8.820313 C 9.519531 8.820313 4.480469 7.28125 4.480469 5.601563 C 4.480469 3.921875 9.519531 2.378906 15.820313 2.378906 C 22.121094 2.378906 27.160156 3.78125 27.160156 5.601563 C 27.019531 7.28125 21.980469 8.820313 15.820313 8.820313 Z M 48.859375 58.519531 L 41.160156 58.519531 L 41.160156 50.820313 L 48.859375 50.820313 Z M 35.28125 58.519531 L 27.578125 58.519531 L 27.578125 50.820313 L 35.28125 50.820313 Z M 54.878906 58.519531 L 54.878906 50.820313 L 62.578125 50.820313 L 62.578125 58.519531 Z M 54.878906 58.519531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 0 5.601563 L 15.539063 5.601563 L 15.539063 69.859375 L 0 69.859375 Z M 0 5.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.941406 5.601563 C 30.941406 8.679688 23.941406 11.199219 15.398438 11.199219 C 6.859375 11.199219 0 8.679688 0 5.601563 C 0 2.519531 7 0 15.539063 0 C 24.078125 0 30.941406 2.378906 30.941406 5.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 27.859375 5.179688 C 27.859375 7.28125 22.398438 8.820313 15.539063 8.820313 C 8.679688 8.820313 3.21875 7.28125 3.21875 5.179688 C 3.21875 3.078125 8.679688 1.539063 15.539063 1.539063 C 22.398438 1.539063 27.859375 3.21875 27.859375 5.179688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 25.199219 7.421875 C 26.878906 6.859375 27.71875 6.019531 27.71875 5.179688 C 27.71875 3.078125 22.261719 1.539063 15.398438 1.539063 C 8.539063 1.539063 3.078125 3.21875 3.078125 5.179688 C 3.21875 6.019531 4.199219 6.859375 5.738281 7.421875 C 7.980469 6.578125 11.480469 6.019531 15.539063 6.019531 C 19.460938 6.019531 22.960938 6.578125 25.199219 7.421875 "/>
-</g>
-</svg>
diff --git a/dist/Databases/AzureDataLake(m).png b/dist/Databases/AzureDataLake(m).png
new file mode 100644
index 00000000..760911a6
Binary files /dev/null and b/dist/Databases/AzureDataLake(m).png differ
diff --git a/dist/Databases/AzureDataLake(m).svg b/dist/Databases/AzureDataLake(m).svg
new file mode 100644
index 00000000..0857cebf
--- /dev/null
+++ b/dist/Databases/AzureDataLake(m).svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 8.539063 9.519531 L 8.539063 60.339844 C 8.539063 65.660156 20.300781 69.859375 35 69.859375 L 35 9.519531 Z M 8.539063 9.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 34.578125 70 L 35 70 C 49.558594 70 61.460938 65.660156 61.460938 60.480469 L 61.460938 9.519531 L 34.578125 9.519531 Z M 34.578125 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 61.460938 9.519531 C 61.460938 14.839844 49.699219 19.039063 35 19.039063 C 20.300781 19.039063 8.539063 14.839844 8.539063 9.519531 C 8.539063 4.339844 20.441406 0 35 0 C 49.558594 0 61.460938 4.339844 61.460938 9.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 56 8.960938 C 56 12.460938 46.621094 15.261719 35 15.261719 C 23.378906 15.261719 14 12.460938 14 8.960938 C 14 5.460938 23.378906 2.660156 35 2.660156 C 46.621094 2.660156 56 5.460938 56 8.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 51.660156 12.878906 C 54.460938 11.761719 56 10.5 56 8.960938 C 56 5.460938 46.621094 2.660156 35 2.660156 C 23.378906 2.660156 14 5.460938 14 8.960938 C 14 10.359375 15.679688 11.761719 18.339844 12.878906 C 22.121094 11.339844 28.140625 10.359375 35 10.359375 C 41.71875 10.359375 47.738281 11.339844 51.660156 12.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 34.578125 70 L 34.578125 44.800781 C 30.660156 44.800781 27.300781 42.699219 25.339844 39.621094 C 23.378906 42.699219 20.160156 44.800781 16.238281 44.800781 C 13.160156 44.800781 10.5 43.539063 8.539063 41.441406 L 8.539063 60.480469 C 8.539063 65.660156 20.160156 69.859375 34.578125 70 Z M 34.578125 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 53.339844 44.800781 C 49.421875 44.800781 45.921875 42.699219 43.960938 39.621094 C 42.140625 42.699219 38.78125 44.660156 34.859375 44.800781 L 34.859375 70 C 49.421875 70 61.320313 65.660156 61.320313 60.480469 L 61.320313 41.300781 C 59.359375 43.398438 56.558594 44.800781 53.339844 44.800781 Z M 53.339844 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 34.71875 44.800781 L 34.578125 70 C 34.71875 70 34.71875 70 34.859375 70 L 34.859375 44.800781 C 34.859375 44.800781 34.859375 44.800781 34.71875 44.800781 Z M 34.71875 44.800781 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureDataLake.png b/dist/Databases/AzureDataLake.png
new file mode 100644
index 00000000..fcf32ad6
Binary files /dev/null and b/dist/Databases/AzureDataLake.png differ
diff --git a/dist/Databases/AzureDataLake.puml b/dist/Databases/AzureDataLake.puml
new file mode 100644
index 00000000..fb1b31f3
--- /dev/null
+++ b/dist/Databases/AzureDataLake.puml
@@ -0,0 +1,10 @@
+sprite $AzureDataLake [70x70/16z] {
+xTDLWYiX48NXibEDPF_RZHE34BglpWp_EnzENoOM4LKvnhGXKGFiAS1Cnp4nsDjWIWCfx6DC_GGs5FLI6uqwmKOJQiM_HT5wHpZc9G3rZgfJXZoSBk2-D3fX
+3mXPfIIwT2AMNevoqufAsQMoFZRl6FSJKMyekupd7-3L8bIOIWnlASSIw3bcESTCpx6vjvLJUL7w62lSUygf0Eq8KeYEKagXdCB3vhG07QLTpX7mgd6bEEv_
+NfdALAOobQd4tw7443SedbwGK9YEufKIOhuVHGodObwjt4Ub64envTLAk_ZNbQbC9NmhPIhOee1Usw9efTXw1LI7jGgebQnJbDvauufH9rc65ALFYVSLA0qc
+M5eAJAZP0G
+}
+
+AzureEntityColoring(AzureDataLake)
+!define AzureDataLake(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataLake, AzureDataLake)
+!define AzureDataLake(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataLake, AzureDataLake)
diff --git a/dist/Databases/AzureDataLake.svg b/dist/Databases/AzureDataLake.svg
new file mode 100644
index 00000000..3ec167d7
--- /dev/null
+++ b/dist/Databases/AzureDataLake.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 8.539063 9.519531 L 8.539063 60.339844 C 8.539063 65.660156 20.300781 69.859375 35 69.859375 L 35 9.519531 Z M 8.539063 9.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 34.578125 70 L 35 70 C 49.558594 70 61.460938 65.660156 61.460938 60.480469 L 61.460938 9.519531 L 34.578125 9.519531 Z M 34.578125 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 61.460938 9.519531 C 61.460938 14.839844 49.699219 19.039063 35 19.039063 C 20.300781 19.039063 8.539063 14.839844 8.539063 9.519531 C 8.539063 4.339844 20.441406 0 35 0 C 49.558594 0 61.460938 4.339844 61.460938 9.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 56 8.960938 C 56 12.460938 46.621094 15.261719 35 15.261719 C 23.378906 15.261719 14 12.460938 14 8.960938 C 14 5.460938 23.378906 2.660156 35 2.660156 C 46.621094 2.660156 56 5.460938 56 8.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 51.660156 12.878906 C 54.460938 11.761719 56 10.5 56 8.960938 C 56 5.460938 46.621094 2.660156 35 2.660156 C 23.378906 2.660156 14 5.460938 14 8.960938 C 14 10.359375 15.679688 11.761719 18.339844 12.878906 C 22.121094 11.339844 28.140625 10.359375 35 10.359375 C 41.71875 10.359375 47.738281 11.339844 51.660156 12.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 34.578125 70 L 34.578125 44.800781 C 30.660156 44.800781 27.300781 42.699219 25.339844 39.621094 C 23.378906 42.699219 20.160156 44.800781 16.238281 44.800781 C 13.160156 44.800781 10.5 43.539063 8.539063 41.441406 L 8.539063 60.480469 C 8.539063 65.660156 20.160156 69.859375 34.578125 70 Z M 34.578125 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 53.339844 44.800781 C 49.421875 44.800781 45.921875 42.699219 43.960938 39.621094 C 42.140625 42.699219 38.78125 44.660156 34.859375 44.800781 L 34.859375 70 C 49.421875 70 61.320313 65.660156 61.320313 60.480469 L 61.320313 41.300781 C 59.359375 43.398438 56.558594 44.800781 53.339844 44.800781 Z M 53.339844 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 34.71875 44.800781 L 34.578125 70 C 34.71875 70 34.71875 70 34.859375 70 L 34.859375 44.800781 C 34.859375 44.800781 34.859375 44.800781 34.71875 44.800781 Z M 34.71875 44.800781 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureDatabase(m).png b/dist/Databases/AzureDatabase(m).png
new file mode 100644
index 00000000..7bed729f
Binary files /dev/null and b/dist/Databases/AzureDatabase(m).png differ
diff --git a/dist/Databases/AzureDatabase(m).svg b/dist/Databases/AzureDatabase(m).svg
new file mode 100644
index 00000000..658ad07f
--- /dev/null
+++ b/dist/Databases/AzureDatabase(m).svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 8.398438 9.503906 L 8.398438 60.058594 C 8.398438 65.308594 20.148438 69.5625 34.640625 69.5625 L 34.640625 9.503906 C 34.640625 9.503906 8.398438 9.503906 8.398438 9.503906 Z M 8.398438 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 34.28125 69.5625 L 34.640625 69.5625 C 49.132813 69.5625 60.878906 65.308594 60.878906 60.058594 L 60.878906 9.503906 L 34.28125 9.503906 Z M 34.28125 69.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.878906 9.503906 C 60.878906 14.75 49.132813 19.007813 34.640625 19.007813 C 20.148438 19.007813 8.398438 14.75 8.398438 9.503906 C 8.398438 4.253906 20.148438 0 34.640625 0 C 49.132813 0 60.878906 4.253906 60.878906 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 55.515625 8.957031 C 55.515625 12.421875 46.167969 15.226563 34.640625 15.226563 C 23.109375 15.226563 13.761719 12.421875 13.761719 8.957031 C 13.761719 5.492188 23.109375 2.683594 34.640625 2.683594 C 46.167969 2.683594 55.515625 5.492188 55.515625 8.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 51.140625 12.789063 C 53.875 11.726563 55.515625 10.402344 55.515625 8.957031 C 55.515625 5.492188 46.171875 2.6875 34.640625 2.6875 C 23.109375 2.6875 13.765625 5.492188 13.765625 8.957031 C 13.765625 10.402344 15.40625 11.726563 18.140625 12.789063 C 21.957031 11.304688 27.921875 10.351563 34.640625 10.351563 C 41.363281 10.351563 47.324219 11.304688 51.140625 12.789063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.601563 50.496094 C 50.195313 51.664063 48.292969 52.253906 45.820313 52.253906 L 37.574219 52.253906 L 37.574219 30.746094 L 45.394531 30.746094 C 47.859375 30.746094 49.746094 31.195313 51.042969 32.125 C 52.257813 33 52.867188 34.222656 52.867188 35.78125 C 52.867188 37.027344 52.425781 38.085938 51.519531 39.015625 C 50.746094 39.785156 49.820313 40.320313 48.679688 40.628906 L 48.679688 40.679688 C 50.210938 40.871094 51.460938 41.453125 52.394531 42.433594 C 53.265625 43.367188 53.714844 44.507813 53.714844 45.828125 C 53.722656 47.796875 53.003906 49.335938 51.601563 50.496094 M 31.503906 49.226563 C 29.4375 51.246094 26.652344 52.253906 23.175781 52.253906 L 15.5625 52.253906 L 15.5625 30.746094 L 23.175781 30.746094 C 30.8125 30.746094 34.632813 34.222656 34.632813 41.21875 C 34.632813 44.5625 33.601563 47.238281 31.503906 49.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 22.78125 34.671875 L 20.394531 34.671875 L 20.394531 48.328125 L 22.808594 48.328125 C 24.929688 48.328125 26.570313 47.664063 27.789063 46.390625 C 28.953125 45.117188 29.542969 43.421875 29.542969 41.273438 C 29.542969 39.261719 28.953125 37.671875 27.816406 36.496094 C 26.621094 35.28125 24.949219 34.671875 22.78125 34.671875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 46.878906 38.679688 C 47.460938 38.171875 47.753906 37.507813 47.753906 36.6875 C 47.753906 35.089844 46.585938 34.296875 44.222656 34.296875 L 42.402344 34.296875 L 42.402344 39.394531 L 44.546875 39.394531 C 45.53125 39.394531 46.324219 39.148438 46.878906 38.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 47.675781 43.738281 C 47.039063 43.261719 46.167969 42.996094 45.046875 42.996094 L 42.398438 42.996094 L 42.398438 48.667969 L 45.023438 48.667969 C 46.136719 48.667969 47.039063 48.402344 47.699219 47.871094 C 48.308594 47.339844 48.625 46.65625 48.625 45.753906 C 48.632813 44.902344 48.3125 44.214844 47.675781 43.738281 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureDatabase.png b/dist/Databases/AzureDatabase.png
new file mode 100644
index 00000000..dc4da49f
Binary files /dev/null and b/dist/Databases/AzureDatabase.png differ
diff --git a/dist/Databases/AzureDatabase.puml b/dist/Databases/AzureDatabase.puml
new file mode 100644
index 00000000..6efcb0a2
--- /dev/null
+++ b/dist/Databases/AzureDatabase.puml
@@ -0,0 +1,11 @@
+sprite $AzureDatabase [70x70/16z] {
+xTS5aiGm34HHIQsMS_yJxu2SSjXUfbymw1Sc-J6fPVgwqUwajv5qM3zXJZ-CtZLRIPn4N1cWTqGxHJnx6-EzKNRJTr5ie_1Mr7ZBcwoPT9FB8oGGKNQA89lL
+ObibvYqTvQnWtT8QMsKAoSnF74Ab8dlAL21pXiqy1HtDCCI-SdDSbgcgtLBD_xV6eNAB9fUPHnmhMS1E132o4oKhT2mtf1hWaVKfRR7Jk5B-ZlAl_2kKEGMh
+ilosNycyAcqOLSHs546VejemLL7CPvmE9T-7vGzLiRY54QLTkcYL65QIuHkLwV4lR9R8nnGyHgUYxaXsJ7cEJYKpng0I6oMPDyrBXZ755-k5T7-EypTkex07
+EAB4Td_9XHjGokDFMjwav7zYgQ1xYOnqQFs-LMYvaJgK9anLQNlRkIxZa88oxIWMSQKKhx4qrm3C-RjTIVwLVmMlKMHJ6LUmLNHOeUoaPKnnsSy75AeSXjAd
+qEGqytAb42hNALYE5C9a8AtFmbD4a7I77S_22m
+}
+
+AzureEntityColoring(AzureDatabase)
+!define AzureDatabase(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabase, AzureDatabase)
+!define AzureDatabase(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabase, AzureDatabase)
diff --git a/dist/Databases/AzureDatabase.svg b/dist/Databases/AzureDatabase.svg
new file mode 100644
index 00000000..3ce0814b
--- /dev/null
+++ b/dist/Databases/AzureDatabase.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 8.398438 9.503906 L 8.398438 60.058594 C 8.398438 65.308594 20.148438 69.5625 34.640625 69.5625 L 34.640625 9.503906 C 34.640625 9.503906 8.398438 9.503906 8.398438 9.503906 Z M 8.398438 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 34.28125 69.5625 L 34.640625 69.5625 C 49.132813 69.5625 60.878906 65.308594 60.878906 60.058594 L 60.878906 9.503906 L 34.28125 9.503906 Z M 34.28125 69.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.878906 9.503906 C 60.878906 14.75 49.132813 19.007813 34.640625 19.007813 C 20.148438 19.007813 8.398438 14.75 8.398438 9.503906 C 8.398438 4.253906 20.148438 0 34.640625 0 C 49.132813 0 60.878906 4.253906 60.878906 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 55.515625 8.957031 C 55.515625 12.421875 46.167969 15.226563 34.640625 15.226563 C 23.109375 15.226563 13.761719 12.421875 13.761719 8.957031 C 13.761719 5.492188 23.109375 2.683594 34.640625 2.683594 C 46.167969 2.683594 55.515625 5.492188 55.515625 8.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 51.140625 12.789063 C 53.875 11.726563 55.515625 10.402344 55.515625 8.957031 C 55.515625 5.492188 46.171875 2.6875 34.640625 2.6875 C 23.109375 2.6875 13.765625 5.492188 13.765625 8.957031 C 13.765625 10.402344 15.40625 11.726563 18.140625 12.789063 C 21.957031 11.304688 27.921875 10.351563 34.640625 10.351563 C 41.363281 10.351563 47.324219 11.304688 51.140625 12.789063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.601563 50.496094 C 50.195313 51.664063 48.292969 52.253906 45.820313 52.253906 L 37.574219 52.253906 L 37.574219 30.746094 L 45.394531 30.746094 C 47.859375 30.746094 49.746094 31.195313 51.042969 32.125 C 52.257813 33 52.867188 34.222656 52.867188 35.78125 C 52.867188 37.027344 52.425781 38.085938 51.519531 39.015625 C 50.746094 39.785156 49.820313 40.320313 48.679688 40.628906 L 48.679688 40.679688 C 50.210938 40.871094 51.460938 41.453125 52.394531 42.433594 C 53.265625 43.367188 53.714844 44.507813 53.714844 45.828125 C 53.722656 47.796875 53.003906 49.335938 51.601563 50.496094 M 31.503906 49.226563 C 29.4375 51.246094 26.652344 52.253906 23.175781 52.253906 L 15.5625 52.253906 L 15.5625 30.746094 L 23.175781 30.746094 C 30.8125 30.746094 34.632813 34.222656 34.632813 41.21875 C 34.632813 44.5625 33.601563 47.238281 31.503906 49.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 22.78125 34.671875 L 20.394531 34.671875 L 20.394531 48.328125 L 22.808594 48.328125 C 24.929688 48.328125 26.570313 47.664063 27.789063 46.390625 C 28.953125 45.117188 29.542969 43.421875 29.542969 41.273438 C 29.542969 39.261719 28.953125 37.671875 27.816406 36.496094 C 26.621094 35.28125 24.949219 34.671875 22.78125 34.671875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 46.878906 38.679688 C 47.460938 38.171875 47.753906 37.507813 47.753906 36.6875 C 47.753906 35.089844 46.585938 34.296875 44.222656 34.296875 L 42.402344 34.296875 L 42.402344 39.394531 L 44.546875 39.394531 C 45.53125 39.394531 46.324219 39.148438 46.878906 38.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 47.675781 43.738281 C 47.039063 43.261719 46.167969 42.996094 45.046875 42.996094 L 42.398438 42.996094 L 42.398438 48.667969 L 45.023438 48.667969 C 46.136719 48.667969 47.039063 48.402344 47.699219 47.871094 C 48.308594 47.339844 48.625 46.65625 48.625 45.753906 C 48.632813 44.902344 48.3125 44.214844 47.675781 43.738281 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureDatabaseForMariaDB(m).png b/dist/Databases/AzureDatabaseForMariaDB(m).png
index 6ed24c41..4138263c 100644
Binary files a/dist/Databases/AzureDatabaseForMariaDB(m).png and b/dist/Databases/AzureDatabaseForMariaDB(m).png differ
diff --git a/dist/Databases/AzureDatabaseForMariaDB(m).svg b/dist/Databases/AzureDatabaseForMariaDB(m).svg
index 23465a4b..89531e0b 100644
--- a/dist/Databases/AzureDatabaseForMariaDB(m).svg
+++ b/dist/Databases/AzureDatabaseForMariaDB(m).svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="52pt" height="70pt" viewBox="0 0 52 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,57,100);fill-opacity:1;" d="M 0 9.585938 L 0 60.605469 C 0 65.964844 11.636719 70.1875 25.9375 70.1875 L 25.9375 9.585938 Z M 0 9.585938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,82,144);fill-opacity:1;" d="M 25.691406 70.253906 L 26.125 70.253906 C 40.546875 70.253906 52.0625 66.027344 52.0625 60.667969 L 52.0625 9.585938 L 25.691406 9.585938 Z M 25.691406 70.253906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 52.0625 9.585938 C 52.0625 14.820313 40.421875 19.171875 26.125 19.171875 C 11.824219 19.171875 0 14.820313 0 9.585938 C 0 4.351563 11.636719 0 25.9375 0 C 40.238281 0 52.0625 4.414063 52.0625 9.585938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 46.800781 9.019531 C 46.800781 12.550781 37.515625 15.386719 26.125 15.386719 C 14.734375 15.386719 5.261719 12.613281 5.261719 9.019531 C 5.261719 5.421875 14.546875 2.648438 25.9375 2.648438 C 37.328125 2.648438 46.800781 5.488281 46.800781 9.019531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 42.34375 12.863281 C 45.128906 11.730469 46.675781 10.46875 46.675781 9.019531 C 46.675781 5.488281 37.390625 2.648438 26 2.648438 C 14.609375 2.648438 5.261719 5.488281 5.261719 9.019531 C 5.261719 10.40625 6.933594 11.855469 9.59375 12.863281 C 13.371094 11.289063 19.3125 10.46875 26 10.46875 C 32.6875 10.46875 38.566406 11.476563 42.34375 12.863281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 4.023438 52.160156 C 4.023438 52.160156 6.195313 51.164063 6.851563 51.164063 C 6.851563 51.164063 9.242188 50.828125 10.332031 50.828125 C 11.421875 50.828125 12.382813 49.945313 13.160156 48.722656 C 13.941406 47.5 17.074219 43.847656 20.664063 43.046875 C 24.253906 42.246094 29.800781 41.382813 32.847656 37.28125 C 35.890625 33.183594 37.519531 28.308594 42.199219 28.089844 C 46.878906 27.867188 45.351563 26.871094 46.65625 26.871094 C 47.964844 26.871094 47.203125 29.394531 47.203125 29.394531 C 47.203125 29.394531 46.769531 29.726563 46.769531 29.835938 C 46.769531 29.941406 46.429688 31.328125 44.046875 32.792969 C 41.660156 34.253906 41.570313 37.667969 41.328125 39.097656 C 41.085938 40.53125 38.9375 47.519531 36.757813 49.402344 L 36.214844 49.625 C 36.214844 49.625 35.996094 50.179688 35.78125 50.285156 C 35.5625 50.394531 35.019531 49.84375 34.90625 49.625 C 34.796875 49.402344 33.820313 51.515625 33.496094 51.953125 C 32.0625 54.328125 29.59375 55.855469 26.859375 56.050781 C 26.859375 56.050781 30.449219 49.957031 30.121094 47.738281 C 29.71875 48.515625 29.394531 49.332031 29.144531 50.171875 C 29.144531 50.613281 28.382813 51.503906 27.1875 51.609375 C 25.992188 51.71875 18.378906 49.839844 15.230469 51.609375 C 12.078125 53.382813 10.769531 54.933594 9.039063 55.046875 C 7.304688 55.160156 5.558594 55.160156 4.902344 54.828125 C 4.902344 54.828125 6.3125 53.277344 6.425781 53.054688 C 6.414063 53.046875 4.332031 53.488281 4.023438 52.160156 Z M 4.023438 52.160156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,57,100);fill-opacity:1;" d="M 46.875 29.777344 L 47.203125 29.445313 C 47.203125 29.445313 45.679688 29.003906 45.246094 27.894531 C 45.183594 28.03125 45.183594 28.195313 45.246094 28.335938 C 45.707031 28.902344 46.257813 29.390625 46.875 29.777344 Z M 40.125 30.902344 C 40.125 30.902344 40.777344 29.347656 42.195313 29.683594 C 42.320313 30.007813 42.292969 30.371094 42.121094 30.671875 C 41.953125 30.972656 41.660156 31.179688 41.320313 31.234375 C 40.894531 31.296875 40.464844 31.175781 40.125 30.902344 Z M 40.125 30.902344 "/>
-<path style="fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0,57,100);stroke-opacity:1;stroke-miterlimit:10;" d="M 72.73017 45.998102 C 72.73017 45.998102 70.799281 48.643024 70.622598 49.689844 M 73.077225 46.518415 C 72.528247 47.596205 72.05499 48.711161 71.670074 49.857087 M 73.260218 46.518415 C 72.906853 47.596205 72.73017 48.723549 72.73017 49.857087 " transform="matrix(0.619048,0,0,0.630631,0,0.000000835342)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.5 48.058594 C 38.5 48.058594 36.542969 49.953125 36.429688 50.582031 C 36.320313 51.214844 38.605469 52.246094 40.019531 51.914063 C 40.019531 51.9375 38.5 48.5 38.5 48.058594 Z M 38.5 48.058594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,57,100);fill-opacity:1;" d="M 0.0625 9.550781 L 0.0625 60.386719 C 0.0625 65.726563 11.660156 69.9375 25.90625 69.9375 L 25.90625 9.550781 Z M 0.0625 9.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,82,144);fill-opacity:1;" d="M 25.660156 70 L 26.09375 70 C 40.464844 70 51.9375 65.789063 51.9375 60.449219 L 51.9375 9.550781 L 25.660156 9.550781 Z M 25.660156 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.9375 9.550781 C 51.9375 14.765625 40.339844 19.101563 26.09375 19.101563 C 11.84375 19.101563 0.0625 14.765625 0.0625 9.550781 C 0.0625 4.335938 11.660156 0 25.90625 0 C 40.15625 0 51.9375 4.398438 51.9375 9.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 46.695313 8.984375 C 46.695313 12.503906 37.441406 15.332031 26.09375 15.332031 C 14.742188 15.332031 5.304688 12.566406 5.304688 8.984375 C 5.304688 5.402344 14.558594 2.640625 25.90625 2.640625 C 37.257813 2.640625 46.695313 5.464844 46.695313 8.984375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 42.253906 12.820313 C 45.027344 11.6875 46.570313 10.429688 46.570313 8.984375 C 46.570313 5.464844 37.320313 2.640625 25.96875 2.640625 C 14.621094 2.640625 5.304688 5.464844 5.304688 8.984375 C 5.304688 10.367188 6.972656 11.8125 9.625 12.820313 C 13.386719 11.246094 19.308594 10.429688 25.96875 10.429688 C 32.632813 10.429688 38.492188 11.4375 42.253906 12.820313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 4.070313 51.972656 C 4.070313 51.972656 6.238281 50.980469 6.890625 50.980469 C 6.890625 50.980469 9.273438 50.644531 10.355469 50.644531 C 11.441406 50.644531 12.398438 49.765625 13.175781 48.546875 C 13.953125 47.328125 17.074219 43.691406 20.652344 42.890625 C 24.230469 42.09375 29.757813 41.234375 32.792969 37.148438 C 35.824219 33.066406 37.449219 28.207031 42.113281 27.988281 C 46.773438 27.765625 45.25 26.773438 46.550781 26.773438 C 47.855469 26.773438 47.09375 29.289063 47.09375 29.289063 C 47.09375 29.289063 46.664063 29.621094 46.664063 29.726563 C 46.664063 29.835938 46.324219 31.21875 43.949219 32.675781 C 41.574219 34.132813 41.480469 37.53125 41.242188 38.957031 C 41 40.386719 38.859375 47.347656 36.691406 49.226563 L 36.148438 49.445313 C 36.148438 49.445313 35.929688 50 35.714844 50.105469 C 35.5 50.210938 34.957031 49.667969 34.84375 49.445313 C 34.734375 49.226563 33.757813 51.332031 33.4375 51.765625 C 32.011719 54.132813 29.546875 55.65625 26.828125 55.847656 C 26.828125 55.847656 30.402344 49.777344 30.078125 47.566406 C 29.675781 48.34375 29.351563 49.152344 29.101563 49.992188 C 29.101563 50.433594 28.34375 51.320313 27.152344 51.425781 C 25.964844 51.53125 18.375 49.660156 15.238281 51.425781 C 12.097656 53.191406 10.796875 54.738281 9.066406 54.851563 C 7.339844 54.964844 5.601563 54.964844 4.949219 54.628906 C 4.949219 54.628906 6.355469 53.085938 6.464844 52.863281 C 6.453125 52.859375 4.378906 53.296875 4.070313 51.972656 Z M 4.070313 51.972656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,57,100);fill-opacity:1;" d="M 46.769531 29.671875 L 47.09375 29.339844 C 47.09375 29.339844 45.578125 28.898438 45.144531 27.792969 C 45.085938 27.933594 45.085938 28.09375 45.144531 28.234375 C 45.605469 28.800781 46.152344 29.285156 46.769531 29.671875 Z M 40.046875 30.789063 C 40.046875 30.789063 40.691406 29.246094 42.105469 29.578125 C 42.230469 29.898438 42.203125 30.261719 42.035156 30.5625 C 41.863281 30.863281 41.570313 31.070313 41.234375 31.121094 C 40.8125 31.183594 40.378906 31.0625 40.046875 30.789063 Z M 40.046875 30.789063 "/>
+<path style="fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0,57,100);stroke-opacity:1;stroke-miterlimit:10;" d="M 72.732587 46.002232 C 72.732587 46.002232 70.801072 48.638036 70.61742 49.688627 M 73.080893 46.518203 C 72.523603 47.593661 72.054973 48.712634 71.66867 49.86269 M 73.258212 46.518203 C 72.909906 47.599877 72.732587 48.725067 72.732587 49.86269 " transform="matrix(0.616825,0,0,0.628366,0.062516,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.421875 47.886719 C 38.421875 47.886719 36.472656 49.773438 36.363281 50.402344 C 36.25 51.03125 38.527344 52.058594 39.941406 51.726563 C 39.941406 51.753906 38.421875 48.328125 38.421875 47.886719 Z M 38.421875 47.886719 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureDatabaseForMariaDB.png b/dist/Databases/AzureDatabaseForMariaDB.png
index 5dfcc64b..b8973374 100644
Binary files a/dist/Databases/AzureDatabaseForMariaDB.png and b/dist/Databases/AzureDatabaseForMariaDB.png differ
diff --git a/dist/Databases/AzureDatabaseForMariaDB.puml b/dist/Databases/AzureDatabaseForMariaDB.puml
index 46725d72..8a770631 100644
--- a/dist/Databases/AzureDatabaseForMariaDB.puml
+++ b/dist/Databases/AzureDatabaseForMariaDB.puml
@@ -1,11 +1,11 @@
-sprite $AzureDatabaseForMariaDB [52x70/16z] {
-xTK5WkGm34JH4fcKtF-u2nfmECuop6-6rsZ0RupuIoBCJ8JRMDNCj1StXN4IwVhPQwc4NM9wambMaUb0HXlo5EbeziqcterDUnQbb2nQ4GwIqT7NP-PzeJk1
-JOBeAyWNVN6AY7sU58XOqmLH1Y9nd-SvemyqjHrCfa9uAtcOUSgq7QCIRGSfMVCmKL7S9jcZCD5KZN4QQO1kkclPb0dBM3HLxtMpfkwjbL9hQzwxC1r6lyby
-c4prYSdA14OUDuL0W8grOLC0cnb5p4TD1I025l5Xmq2aFcoiJ-jHK_kx31i6eZPk4X2n3vkArtJODC9hQTIKTu8oPfgYvoEcAj2JM-D52QlojOddR_ChqnW7
-oPN9EAnU6CLXxCk62CgvoLX7G2Jdfc6J8cAbCrC9crASvGoKdV6imY4uL_TMIp9XpWo0t2j3jaRn6fNLUAllNx_LhNaRlZhDAwC0x6pjjNYJkXdNDMRDcQav
-bxQR2mAfJzVu-h_iSzCtcFBS59eU6uPC3uq2eFR4D4PaFcmCxqaTCKsnYhHCbwOcna6ikKq7fcKJeFSP
+sprite $AzureDatabaseforMariaDB [52x70/16z] {
+xTM54ZCx28RX3m8HIE__TizfcKfMix_REzxXgMq4Fp5YvlH_p4GuZKLKvJDLbSJxy-FuA8MmAgcSf0b3f3AHqcKo8fdkYmsllflUou_qtkgxSGcfCPrpMNUt
+7mIvo_E_rbmEolhyhyLxLqGa-O08uKcytswDy8oJhc3MZxL3nH_crYlZCuf5ogirIjazpBscXBEaFaIOo7B2Rgm11XDvVNxxPyIYfNaqch7UtLipyw4Z4tdq
+Sym_OufsmPWc0j8LK-xpqAG-RJ9GEr7bCcqg06PGKfysX2Zxj154pQTD7JvbpX0YdpU2ACsR0aHvsbGyAxCcuvNDcSPlGZvXh30-aZFJMsQCrKFJOtwC_CXK
+RAK7fWisittJ4pOJ7ymCWUqRnHWZqh9hAXOf7YdJZl62JLDR1khIzAPCU2JjyOAteYADOW-O82sD017RiDxg-FF7xsQ4UsMnHdbSCwEHs8YtqLI0ck-PRcPz
+jHUOyxyxQo-xRYnVDnbsrHX0Tit4EilzWYc8gFH9KnYlADkviKmO8stzm3HbR4QIg_d2M2qoply7
 }
 
-AzureEntityColoring(AzureDatabaseForMariaDB)
-!define AzureDatabaseForMariaDB(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseForMariaDB, AzureDatabaseForMariaDB)
-!define AzureDatabaseForMariaDB(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseForMariaDB, AzureDatabaseForMariaDB)
+AzureEntityColoring(AzureDatabaseforMariaDB)
+!define AzureDatabaseforMariaDB(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseforMariaDB, AzureDatabaseforMariaDB)
+!define AzureDatabaseforMariaDB(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseforMariaDB, AzureDatabaseforMariaDB)
diff --git a/dist/Databases/AzureDatabaseForMariaDB.svg b/dist/Databases/AzureDatabaseForMariaDB.svg
index eb910f09..18ecbb70 100644
--- a/dist/Databases/AzureDatabaseForMariaDB.svg
+++ b/dist/Databases/AzureDatabaseForMariaDB.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="52pt" height="70pt" viewBox="0 0 52 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(10.588235%,21.176471%,38.431373%);fill-opacity:1;" d="M 0 9.585938 L 0 60.605469 C 0 65.964844 11.636719 70.1875 25.9375 70.1875 L 25.9375 9.585938 Z M 0 9.585938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(18.431373%,29.803922%,46.666667%);fill-opacity:1;" d="M 25.691406 70.253906 L 26.125 70.253906 C 40.546875 70.253906 52.0625 66.027344 52.0625 60.667969 L 52.0625 9.585938 L 25.691406 9.585938 Z M 25.691406 70.253906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 52.0625 9.585938 C 52.0625 14.820313 40.421875 19.171875 26.125 19.171875 C 11.824219 19.171875 0 14.820313 0 9.585938 C 0 4.351563 11.636719 0 25.9375 0 C 40.238281 0 52.0625 4.414063 52.0625 9.585938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.54902%,0%);fill-opacity:1;" d="M 46.800781 9.019531 C 46.800781 12.550781 37.515625 15.386719 26.125 15.386719 C 14.734375 15.386719 5.261719 12.613281 5.261719 9.019531 C 5.261719 5.421875 14.546875 2.648438 25.9375 2.648438 C 37.328125 2.648438 46.800781 5.488281 46.800781 9.019531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(71.764706%,82.745098%,19.607843%);fill-opacity:1;" d="M 42.34375 12.863281 C 45.128906 11.730469 46.675781 10.46875 46.675781 9.019531 C 46.675781 5.488281 37.390625 2.648438 26 2.648438 C 14.609375 2.648438 5.261719 5.488281 5.261719 9.019531 C 5.261719 10.40625 6.933594 11.855469 9.59375 12.863281 C 13.371094 11.289063 19.3125 10.46875 26 10.46875 C 32.6875 10.46875 38.566406 11.476563 42.34375 12.863281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 4.023438 52.160156 C 4.023438 52.160156 6.195313 51.164063 6.851563 51.164063 C 6.851563 51.164063 9.242188 50.828125 10.332031 50.828125 C 11.421875 50.828125 12.382813 49.945313 13.160156 48.722656 C 13.941406 47.5 17.074219 43.847656 20.664063 43.046875 C 24.253906 42.246094 29.800781 41.382813 32.847656 37.28125 C 35.890625 33.183594 37.519531 28.308594 42.199219 28.089844 C 46.878906 27.867188 45.351563 26.871094 46.65625 26.871094 C 47.964844 26.871094 47.203125 29.394531 47.203125 29.394531 C 47.203125 29.394531 46.769531 29.726563 46.769531 29.835938 C 46.769531 29.941406 46.429688 31.328125 44.046875 32.792969 C 41.660156 34.253906 41.570313 37.667969 41.328125 39.097656 C 41.085938 40.53125 38.9375 47.519531 36.757813 49.402344 L 36.214844 49.625 C 36.214844 49.625 35.996094 50.179688 35.78125 50.285156 C 35.5625 50.394531 35.019531 49.84375 34.90625 49.625 C 34.796875 49.402344 33.820313 51.515625 33.496094 51.953125 C 32.0625 54.328125 29.59375 55.855469 26.859375 56.050781 C 26.859375 56.050781 30.449219 49.957031 30.121094 47.738281 C 29.71875 48.515625 29.394531 49.332031 29.144531 50.171875 C 29.144531 50.613281 28.382813 51.503906 27.1875 51.609375 C 25.992188 51.71875 18.378906 49.839844 15.230469 51.609375 C 12.078125 53.382813 10.769531 54.933594 9.039063 55.046875 C 7.304688 55.160156 5.558594 55.160156 4.902344 54.828125 C 4.902344 54.828125 6.3125 53.277344 6.425781 53.054688 C 6.414063 53.046875 4.332031 53.488281 4.023438 52.160156 Z M 4.023438 52.160156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(10.588235%,21.176471%,38.431373%);fill-opacity:1;" d="M 46.875 29.777344 L 47.203125 29.445313 C 47.203125 29.445313 45.679688 29.003906 45.246094 27.894531 C 45.183594 28.03125 45.183594 28.195313 45.246094 28.335938 C 45.707031 28.902344 46.257813 29.390625 46.875 29.777344 Z M 40.125 30.902344 C 40.125 30.902344 40.777344 29.347656 42.195313 29.683594 C 42.320313 30.007813 42.292969 30.371094 42.121094 30.671875 C 41.953125 30.972656 41.660156 31.179688 41.320313 31.234375 C 40.894531 31.296875 40.464844 31.175781 40.125 30.902344 Z M 40.125 30.902344 "/>
-<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(10.588235%,21.176471%,38.431373%);stroke-opacity:1;stroke-miterlimit:10;" d="M 72.73017 45.998102 C 72.73017 45.998102 70.799281 48.643024 70.622598 49.689844 M 73.077225 46.518415 C 72.528247 47.596205 72.05499 48.711161 71.670074 49.857087 M 73.260218 46.518415 C 72.906853 47.596205 72.73017 48.723549 72.73017 49.857087 " transform="matrix(0.619048,0,0,0.630631,0,0.000000835342)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.5 48.058594 C 38.5 48.058594 36.542969 49.953125 36.429688 50.582031 C 36.320313 51.214844 38.605469 52.246094 40.019531 51.914063 C 40.019531 51.9375 38.5 48.5 38.5 48.058594 Z M 38.5 48.058594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(10.588235%,21.176471%,38.431373%);fill-opacity:1;" d="M 0.0625 9.550781 L 0.0625 60.386719 C 0.0625 65.726563 11.660156 69.9375 25.90625 69.9375 L 25.90625 9.550781 Z M 0.0625 9.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(18.431373%,29.803922%,46.666667%);fill-opacity:1;" d="M 25.660156 70 L 26.09375 70 C 40.464844 70 51.9375 65.789063 51.9375 60.449219 L 51.9375 9.550781 L 25.660156 9.550781 Z M 25.660156 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.9375 9.550781 C 51.9375 14.765625 40.339844 19.101563 26.09375 19.101563 C 11.84375 19.101563 0.0625 14.765625 0.0625 9.550781 C 0.0625 4.335938 11.660156 0 25.90625 0 C 40.15625 0 51.9375 4.398438 51.9375 9.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.54902%,0%);fill-opacity:1;" d="M 46.695313 8.984375 C 46.695313 12.503906 37.441406 15.332031 26.09375 15.332031 C 14.742188 15.332031 5.304688 12.566406 5.304688 8.984375 C 5.304688 5.402344 14.558594 2.640625 25.90625 2.640625 C 37.257813 2.640625 46.695313 5.464844 46.695313 8.984375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(71.764706%,82.745098%,19.607843%);fill-opacity:1;" d="M 42.253906 12.820313 C 45.027344 11.6875 46.570313 10.429688 46.570313 8.984375 C 46.570313 5.464844 37.320313 2.640625 25.96875 2.640625 C 14.621094 2.640625 5.304688 5.464844 5.304688 8.984375 C 5.304688 10.367188 6.972656 11.8125 9.625 12.820313 C 13.386719 11.246094 19.308594 10.429688 25.96875 10.429688 C 32.632813 10.429688 38.492188 11.4375 42.253906 12.820313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 4.070313 51.972656 C 4.070313 51.972656 6.238281 50.980469 6.890625 50.980469 C 6.890625 50.980469 9.273438 50.644531 10.355469 50.644531 C 11.441406 50.644531 12.398438 49.765625 13.175781 48.546875 C 13.953125 47.328125 17.074219 43.691406 20.652344 42.890625 C 24.230469 42.09375 29.757813 41.234375 32.792969 37.148438 C 35.824219 33.066406 37.449219 28.207031 42.113281 27.988281 C 46.773438 27.765625 45.25 26.773438 46.550781 26.773438 C 47.855469 26.773438 47.09375 29.289063 47.09375 29.289063 C 47.09375 29.289063 46.664063 29.621094 46.664063 29.726563 C 46.664063 29.835938 46.324219 31.21875 43.949219 32.675781 C 41.574219 34.132813 41.480469 37.53125 41.242188 38.957031 C 41 40.386719 38.859375 47.347656 36.691406 49.226563 L 36.148438 49.445313 C 36.148438 49.445313 35.929688 50 35.714844 50.105469 C 35.5 50.210938 34.957031 49.667969 34.84375 49.445313 C 34.734375 49.226563 33.757813 51.332031 33.4375 51.765625 C 32.011719 54.132813 29.546875 55.65625 26.828125 55.847656 C 26.828125 55.847656 30.402344 49.777344 30.078125 47.566406 C 29.675781 48.34375 29.351563 49.152344 29.101563 49.992188 C 29.101563 50.433594 28.34375 51.320313 27.152344 51.425781 C 25.964844 51.53125 18.375 49.660156 15.238281 51.425781 C 12.097656 53.191406 10.796875 54.738281 9.066406 54.851563 C 7.339844 54.964844 5.601563 54.964844 4.949219 54.628906 C 4.949219 54.628906 6.355469 53.085938 6.464844 52.863281 C 6.453125 52.859375 4.378906 53.296875 4.070313 51.972656 Z M 4.070313 51.972656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(10.588235%,21.176471%,38.431373%);fill-opacity:1;" d="M 46.769531 29.671875 L 47.09375 29.339844 C 47.09375 29.339844 45.578125 28.898438 45.144531 27.792969 C 45.085938 27.933594 45.085938 28.09375 45.144531 28.234375 C 45.605469 28.800781 46.152344 29.285156 46.769531 29.671875 Z M 40.046875 30.789063 C 40.046875 30.789063 40.691406 29.246094 42.105469 29.578125 C 42.230469 29.898438 42.203125 30.261719 42.035156 30.5625 C 41.863281 30.863281 41.570313 31.070313 41.234375 31.121094 C 40.8125 31.183594 40.378906 31.0625 40.046875 30.789063 Z M 40.046875 30.789063 "/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(10.588235%,21.176471%,38.431373%);stroke-opacity:1;stroke-miterlimit:10;" d="M 72.732587 46.002232 C 72.732587 46.002232 70.801072 48.638036 70.61742 49.688627 M 73.080893 46.518203 C 72.523603 47.593661 72.054973 48.712634 71.66867 49.86269 M 73.258212 46.518203 C 72.909906 47.599877 72.732587 48.725067 72.732587 49.86269 " transform="matrix(0.616825,0,0,0.628366,0.062516,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.421875 47.886719 C 38.421875 47.886719 36.472656 49.773438 36.363281 50.402344 C 36.25 51.03125 38.527344 52.058594 39.941406 51.726563 C 39.941406 51.753906 38.421875 48.328125 38.421875 47.886719 Z M 38.421875 47.886719 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureDatabaseForMySQL(m).png b/dist/Databases/AzureDatabaseForMySQL(m).png
index 3964f02e..c0a83537 100644
Binary files a/dist/Databases/AzureDatabaseForMySQL(m).png and b/dist/Databases/AzureDatabaseForMySQL(m).png differ
diff --git a/dist/Databases/AzureDatabaseForMySQL(m).svg b/dist/Databases/AzureDatabaseForMySQL(m).svg
index a45dc116..3f9a5b1e 100644
--- a/dist/Databases/AzureDatabaseForMySQL(m).svg
+++ b/dist/Databases/AzureDatabaseForMySQL(m).svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="52pt" height="70pt" viewBox="0 0 52 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 0 9.617188 L 0 60.660156 C 0 66.035156 11.65625 70.277344 25.957031 70.277344 L 25.957031 9.617188 Z M 0 9.617188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,114,198);fill-opacity:1;" d="M 25.679688 70.269531 L 26.09375 70.269531 C 40.527344 70.269531 52 65.914063 52 60.539063 L 52 9.460938 L 25.679688 9.617188 Z M 25.679688 70.269531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 52.050781 9.617188 C 52.050781 14.851563 40.394531 19.234375 26.09375 19.234375 C 11.792969 19.234375 0 14.84375 0 9.617188 C 0 4.390625 11.65625 0 25.957031 0 C 40.257813 0 52.050781 4.414063 52.050781 9.617188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 46.773438 9.050781 C 46.773438 12.585938 37.488281 15.414063 26.09375 15.414063 C 14.695313 15.414063 5.273438 12.613281 5.273438 9.050781 C 5.273438 5.488281 14.558594 2.6875 25.957031 2.6875 C 37.351563 2.6875 46.773438 5.511719 46.773438 9.050781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 42.332031 12.863281 C 45.105469 11.734375 46.664063 10.460938 46.664063 9.050781 C 46.640625 5.511719 37.382813 2.523438 26 2.523438 C 14.617188 2.523438 5.273438 5.511719 5.273438 9.050781 C 5.273438 10.460938 6.941406 11.875 9.609375 12.863281 C 13.328125 11.3125 19.339844 10.722656 26 10.722656 C 32.660156 10.722656 38.585938 11.453125 42.335938 12.863281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.429688 46.066406 C 46.429688 49.082031 44.410156 51.660156 41.476563 51.710938 L 30.332031 51.710938 L 30.332031 47.296875 L 40.238281 47.296875 C 40.855469 47.246094 41.371094 45.46875 41.371094 45.46875 L 40.238281 46.035156 L 34.046875 46.035156 C 31.570313 46.035156 29.714844 44.554688 29.714844 42.253906 L 29.714844 41.621094 C 29.714844 37.75 29.714844 35.988281 29.714844 35.316406 L 27.855469 34.683594 L 27.855469 46.667969 L 22.90625 46.667969 L 22.90625 37.511719 L 20.070313 43.898438 C 19.351563 45.59375 18.609375 46.667969 16.714844 46.667969 C 14.898438 46.703125 13.246094 45.605469 12.542969 43.898438 L 9.90625 37.207031 L 9.90625 46.667969 L 4.953125 46.667969 L 4.953125 32.640625 C 4.953125 31.015625 5.261719 30.019531 6.722656 29.550781 C 7.402344 29.324219 8.113281 29.199219 8.828125 29.1875 C 10.472656 29.113281 11.988281 30.097656 12.609375 31.652344 L 16.714844 39.730469 L 20.019531 31.652344 C 20.644531 30.101563 22.152344 29.117188 23.796875 29.1875 C 24.5 29.203125 25.199219 29.316406 25.875 29.527344 C 27.34375 30 27.855469 31.164063 27.855469 32.792969 L 27.855469 34.539063 C 27.855469 34.621094 27.777344 34.683594 27.855469 34.683594 L 35.285156 34.683594 L 35.285156 40.992188 C 35.601563 41.355469 36.046875 41.582031 36.523438 41.621094 L 40.855469 41.621094 L 40.855469 34.683594 L 46.429688 34.683594 Z M 46.429688 46.066406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 0.0625 9.550781 L 0.0625 60.386719 C 0.0625 65.726563 11.660156 69.9375 25.90625 69.9375 L 25.90625 9.550781 Z M 0.0625 9.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,114,198);fill-opacity:1;" d="M 25.660156 70 L 26.09375 70 C 40.464844 70 51.9375 65.789063 51.9375 60.449219 L 51.9375 9.550781 L 25.660156 9.550781 Z M 25.660156 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.9375 9.550781 C 51.9375 14.765625 40.339844 19.101563 26.09375 19.101563 C 11.84375 19.101563 0.0625 14.765625 0.0625 9.550781 C 0.0625 4.335938 11.660156 0 25.90625 0 C 40.15625 0 51.9375 4.398438 51.9375 9.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 46.695313 8.984375 C 46.695313 12.503906 37.441406 15.332031 26.09375 15.332031 C 14.742188 15.332031 5.304688 12.566406 5.304688 8.984375 C 5.304688 5.402344 14.558594 2.640625 25.90625 2.640625 C 37.257813 2.640625 46.695313 5.464844 46.695313 8.984375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 42.253906 12.820313 C 45.027344 11.6875 46.570313 10.429688 46.570313 8.984375 C 46.570313 5.464844 37.320313 2.640625 25.96875 2.640625 C 14.621094 2.640625 5.304688 5.464844 5.304688 8.984375 C 5.304688 10.367188 6.972656 11.8125 9.625 12.820313 C 13.386719 11.246094 19.308594 10.429688 25.96875 10.429688 C 32.632813 10.429688 38.492188 11.4375 42.253906 12.820313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.632813 45.683594 C 46.632813 48.699219 44.597656 51.273438 41.699219 51.273438 L 30.59375 51.273438 L 30.59375 46.875 L 40.464844 46.875 C 41.082031 46.8125 41.574219 45.054688 41.574219 45.054688 L 40.464844 45.621094 L 34.296875 45.621094 C 31.828125 45.621094 29.980469 44.175781 29.980469 41.847656 L 29.980469 34.9375 L 28.128906 34.308594 L 28.128906 46.246094 L 23.195313 46.246094 L 23.195313 37.136719 L 20.417969 43.546875 C 19.675781 45.242188 18.9375 46.3125 17.085938 46.3125 C 15.296875 46.375 13.632813 45.242188 12.953125 43.546875 L 10.300781 36.886719 L 10.300781 46.3125 L 5.367188 46.3125 L 5.367188 32.296875 C 5.367188 30.664063 5.675781 29.660156 7.15625 29.21875 C 7.835938 28.96875 8.511719 28.84375 9.253906 28.84375 C 10.917969 28.777344 12.398438 29.722656 13.015625 31.292969 L 17.085938 39.335938 L 20.355469 31.292969 C 20.972656 29.722656 22.453125 28.777344 24.117188 28.84375 C 24.796875 28.84375 25.539063 28.96875 26.214844 29.15625 C 27.695313 29.660156 28.191406 30.789063 28.191406 32.421875 L 28.191406 34.183594 C 28.191406 34.246094 28.128906 34.308594 28.191406 34.308594 L 35.589844 34.308594 L 35.589844 40.59375 C 35.898438 40.96875 36.332031 41.15625 36.824219 41.222656 L 41.144531 41.222656 L 41.144531 34.308594 L 46.695313 34.308594 L 46.695313 45.683594 Z M 46.632813 45.683594 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureDatabaseForMySQL.png b/dist/Databases/AzureDatabaseForMySQL.png
index b149a188..2122fe21 100644
Binary files a/dist/Databases/AzureDatabaseForMySQL.png and b/dist/Databases/AzureDatabaseForMySQL.png differ
diff --git a/dist/Databases/AzureDatabaseForMySQL.puml b/dist/Databases/AzureDatabaseForMySQL.puml
index a4f8537d..3c6f5352 100644
--- a/dist/Databases/AzureDatabaseForMySQL.puml
+++ b/dist/Databases/AzureDatabaseForMySQL.puml
@@ -1,11 +1,11 @@
-sprite $AzureDatabaseForMySQL [52x70/16z] {
-xTP76giw38RXNzMD_Q_t1WldnccOoUdVA06zZoOq_CI8cUKMCnDEOrNJEJDLneTe6d-1z2h4z2IJML28CqMNoOnqELmtXhs-ZMq-yz1yWhjn13fctTDpxXvq
-46sCtWru-jBkqEEwDK74-WqPZx5IjsrpZ4ZKNg6f44PMwswsveI7Y5YEc0YFQQbXTfK4fx5r4IPOLiB7I3p0PCAvofCa5ainFvkvMal9oLFAUGoVcQZLw3Sr
-_qnrjVmmxsgfV3T-tBC7gOIz_DKGUkamZ9vyCmqHnQA2Y5SCl1j5H4k6slIlHBLNUYyc5ld_9ZQcUYjZprvCB28SKKsd9XPbh1iIxCKZKXTDndqQPT5iX97K
-LUCObSb8BgMazwOEmjk3cNenco1AmvHpSunG6wRAgTdiM7CtHKxDbeKuZIDSRvMSV2yJRld2lPry50lJWX7CbUj6wsN3vQeX-tEVlVzCksvAlcwSsbLJ2DAk
-cS80k5uncT2pkcgoufwM5PC5KwIvVJKVFZt5KWquc-pAUEW_
+sprite $AzureDatabaseforMySql [52x70/16z] {
+xTQ7TYmX281XG470VV_NJP6eE_7SSURszYVR_Sxq0hym9ABq5X4YRAEScVDpp9mJVNdySVXHPbn5uho9qr5WY9t23TcXVBclDhJC6xydBNvlcJSg8Jb6YvIr
+T_j4G6hkwvgbd2JSrtMosX5WbXCojcbsgu-78lGeyGA54q4FnPjvL2Lu3cCdfMKVHNPlfgKPOLSgxiD4nkbiXmympCoBv8J7Oocng4VJhDNghgfcvj7MH1xz
+gUQ_qOH0POvF0CXsQWnQ7Jd6Vdng6A8Q9aDa9sOCuaOgVAHRCoOajqnC2E6Z8lnU76qotWup9wJGirWtkHaSgsMOEQ4qZUzCp9B7EBnc92RKNX9TCvhc5FIg
+AT2ZnrLJXoa70sbSUHRpu6xgDCTMusE5TqCxCxQJ3wDxKrCipJ1kcR15zCcK_9QrWq-ulRRBeVdCC5RX_jWMx45BhXWuPlSD-ssJ_OhHF6FzUy-z_utVDyht
+3OFTDGg0Tiyendti3ICGOQaNZH2Ca6rlZ16YoRIU6EMOn18cKVDFHelau_XN
 }
 
-AzureEntityColoring(AzureDatabaseForMySQL)
-!define AzureDatabaseForMySQL(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseForMySQL, AzureDatabaseForMySQL)
-!define AzureDatabaseForMySQL(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseForMySQL, AzureDatabaseForMySQL)
+AzureEntityColoring(AzureDatabaseforMySql)
+!define AzureDatabaseforMySql(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseforMySql, AzureDatabaseforMySql)
+!define AzureDatabaseforMySql(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseforMySql, AzureDatabaseforMySql)
diff --git a/dist/Databases/AzureDatabaseForMySQL.svg b/dist/Databases/AzureDatabaseForMySQL.svg
index bf60e222..3bec7bf5 100644
--- a/dist/Databases/AzureDatabaseForMySQL.svg
+++ b/dist/Databases/AzureDatabaseForMySQL.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="52pt" height="70pt" viewBox="0 0 52 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,37.254902%,52.941176%);fill-opacity:1;" d="M 0 9.617188 L 0 60.660156 C 0 66.035156 11.65625 70.277344 25.957031 70.277344 L 25.957031 9.617188 Z M 0 9.617188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(5.882353%,50.196078%,69.019608%);fill-opacity:1;" d="M 25.679688 70.269531 L 26.09375 70.269531 C 40.527344 70.269531 52 65.914063 52 60.539063 L 52 9.460938 L 25.679688 9.617188 Z M 25.679688 70.269531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 52.050781 9.617188 C 52.050781 14.851563 40.394531 19.234375 26.09375 19.234375 C 11.792969 19.234375 0 14.84375 0 9.617188 C 0 4.390625 11.65625 0 25.957031 0 C 40.257813 0 52.050781 4.414063 52.050781 9.617188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.54902%,0%);fill-opacity:1;" d="M 46.773438 9.050781 C 46.773438 12.585938 37.488281 15.414063 26.09375 15.414063 C 14.695313 15.414063 5.273438 12.613281 5.273438 9.050781 C 5.273438 5.488281 14.558594 2.6875 25.957031 2.6875 C 37.351563 2.6875 46.773438 5.511719 46.773438 9.050781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(71.764706%,82.745098%,19.607843%);fill-opacity:1;" d="M 42.332031 12.863281 C 45.105469 11.734375 46.664063 10.460938 46.664063 9.050781 C 46.640625 5.511719 37.382813 2.523438 26 2.523438 C 14.617188 2.523438 5.273438 5.511719 5.273438 9.050781 C 5.273438 10.460938 6.941406 11.875 9.609375 12.863281 C 13.328125 11.3125 19.339844 10.722656 26 10.722656 C 32.660156 10.722656 38.585938 11.453125 42.335938 12.863281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.429688 46.066406 C 46.429688 49.082031 44.410156 51.660156 41.476563 51.710938 L 30.332031 51.710938 L 30.332031 47.296875 L 40.238281 47.296875 C 40.855469 47.246094 41.371094 45.46875 41.371094 45.46875 L 40.238281 46.035156 L 34.046875 46.035156 C 31.570313 46.035156 29.714844 44.554688 29.714844 42.253906 L 29.714844 41.621094 C 29.714844 37.75 29.714844 35.988281 29.714844 35.316406 L 27.855469 34.683594 L 27.855469 46.667969 L 22.90625 46.667969 L 22.90625 37.511719 L 20.070313 43.898438 C 19.351563 45.59375 18.609375 46.667969 16.714844 46.667969 C 14.898438 46.703125 13.246094 45.605469 12.542969 43.898438 L 9.90625 37.207031 L 9.90625 46.667969 L 4.953125 46.667969 L 4.953125 32.640625 C 4.953125 31.015625 5.261719 30.019531 6.722656 29.550781 C 7.402344 29.324219 8.113281 29.199219 8.828125 29.1875 C 10.472656 29.113281 11.988281 30.097656 12.609375 31.652344 L 16.714844 39.730469 L 20.019531 31.652344 C 20.644531 30.101563 22.152344 29.117188 23.796875 29.1875 C 24.5 29.203125 25.199219 29.316406 25.875 29.527344 C 27.34375 30 27.855469 31.164063 27.855469 32.792969 L 27.855469 34.539063 C 27.855469 34.621094 27.777344 34.683594 27.855469 34.683594 L 35.285156 34.683594 L 35.285156 40.992188 C 35.601563 41.355469 36.046875 41.582031 36.523438 41.621094 L 40.855469 41.621094 L 40.855469 34.683594 L 46.429688 34.683594 Z M 46.429688 46.066406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,37.254902%,52.941176%);fill-opacity:1;" d="M 0.0625 9.550781 L 0.0625 60.386719 C 0.0625 65.726563 11.660156 69.9375 25.90625 69.9375 L 25.90625 9.550781 Z M 0.0625 9.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(5.882353%,50.196078%,69.019608%);fill-opacity:1;" d="M 25.660156 70 L 26.09375 70 C 40.464844 70 51.9375 65.789063 51.9375 60.449219 L 51.9375 9.550781 L 25.660156 9.550781 Z M 25.660156 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.9375 9.550781 C 51.9375 14.765625 40.339844 19.101563 26.09375 19.101563 C 11.84375 19.101563 0.0625 14.765625 0.0625 9.550781 C 0.0625 4.335938 11.660156 0 25.90625 0 C 40.15625 0 51.9375 4.398438 51.9375 9.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.54902%,0%);fill-opacity:1;" d="M 46.695313 8.984375 C 46.695313 12.503906 37.441406 15.332031 26.09375 15.332031 C 14.742188 15.332031 5.304688 12.566406 5.304688 8.984375 C 5.304688 5.402344 14.558594 2.640625 25.90625 2.640625 C 37.257813 2.640625 46.695313 5.464844 46.695313 8.984375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(71.764706%,82.745098%,19.607843%);fill-opacity:1;" d="M 42.253906 12.820313 C 45.027344 11.6875 46.570313 10.429688 46.570313 8.984375 C 46.570313 5.464844 37.320313 2.640625 25.96875 2.640625 C 14.621094 2.640625 5.304688 5.464844 5.304688 8.984375 C 5.304688 10.367188 6.972656 11.8125 9.625 12.820313 C 13.386719 11.246094 19.308594 10.429688 25.96875 10.429688 C 32.632813 10.429688 38.492188 11.4375 42.253906 12.820313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.632813 45.683594 C 46.632813 48.699219 44.597656 51.273438 41.699219 51.273438 L 30.59375 51.273438 L 30.59375 46.875 L 40.464844 46.875 C 41.082031 46.8125 41.574219 45.054688 41.574219 45.054688 L 40.464844 45.621094 L 34.296875 45.621094 C 31.828125 45.621094 29.980469 44.175781 29.980469 41.847656 L 29.980469 34.9375 L 28.128906 34.308594 L 28.128906 46.246094 L 23.195313 46.246094 L 23.195313 37.136719 L 20.417969 43.546875 C 19.675781 45.242188 18.9375 46.3125 17.085938 46.3125 C 15.296875 46.375 13.632813 45.242188 12.953125 43.546875 L 10.300781 36.886719 L 10.300781 46.3125 L 5.367188 46.3125 L 5.367188 32.296875 C 5.367188 30.664063 5.675781 29.660156 7.15625 29.21875 C 7.835938 28.96875 8.511719 28.84375 9.253906 28.84375 C 10.917969 28.777344 12.398438 29.722656 13.015625 31.292969 L 17.085938 39.335938 L 20.355469 31.292969 C 20.972656 29.722656 22.453125 28.777344 24.117188 28.84375 C 24.796875 28.84375 25.539063 28.96875 26.214844 29.15625 C 27.695313 29.660156 28.191406 30.789063 28.191406 32.421875 L 28.191406 34.183594 C 28.191406 34.246094 28.128906 34.308594 28.191406 34.308594 L 35.589844 34.308594 L 35.589844 40.59375 C 35.898438 40.96875 36.332031 41.15625 36.824219 41.222656 L 41.144531 41.222656 L 41.144531 34.308594 L 46.695313 34.308594 L 46.695313 45.683594 Z M 46.632813 45.683594 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureDatabaseForPostgreSQL(m).png b/dist/Databases/AzureDatabaseForPostgreSQL(m).png
index ee1c6af9..0226840e 100644
Binary files a/dist/Databases/AzureDatabaseForPostgreSQL(m).png and b/dist/Databases/AzureDatabaseForPostgreSQL(m).png differ
diff --git a/dist/Databases/AzureDatabaseForPostgreSQL(m).svg b/dist/Databases/AzureDatabaseForPostgreSQL(m).svg
index a8a40917..7080ae31 100644
--- a/dist/Databases/AzureDatabaseForPostgreSQL(m).svg
+++ b/dist/Databases/AzureDatabaseForPostgreSQL(m).svg
@@ -1,26 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="53pt" height="70pt" viewBox="0 0 53 70" version="1.1">
-<defs>
-<clipPath id="clip1">
-  <path d="M 25 9 L 52.621094 9 L 52.621094 70 L 25 70 Z M 25 9 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 0 0 L 52.621094 0 L 52.621094 20 L 0 20 Z M 0 0 "/>
-</clipPath>
-</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 0 9.578125 L 0 60.421875 C 0 65.773438 11.785156 70 26.238281 70 L 26.238281 9.578125 Z M 0 9.578125 "/>
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 25.957031 70 L 26.378906 70 C 40.96875 70 52.617188 65.773438 52.617188 60.421875 L 52.617188 9.578125 L 25.957031 9.578125 Z M 25.957031 70 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 52.621094 9.578125 C 52.621094 14.789063 40.832031 19.15625 26.378906 19.15625 C 11.929688 19.15625 0 14.789063 0 9.578125 C 0 4.367188 11.785156 0 26.238281 0 C 40.691406 0 52.621094 4.367188 52.621094 9.578125 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 47.28125 9.011719 C 47.28125 12.535156 37.882813 15.351563 26.375 15.351563 C 14.867188 15.351563 5.332031 12.535156 5.332031 9.011719 C 5.332031 5.492188 14.734375 2.675781 26.238281 2.675781 C 37.746094 2.675781 47.28125 5.492188 47.28125 9.011719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 42.796875 12.816406 C 45.601563 11.695313 47.144531 10.421875 47.144531 9.011719 C 47.144531 5.492188 37.746094 2.675781 26.238281 2.675781 C 14.734375 2.675781 5.332031 5.492188 5.332031 9.011719 C 5.332031 10.421875 7.015625 11.828125 9.683594 12.816406 C 13.46875 11.265625 19.503906 10.421875 26.238281 10.421875 C 31.851563 10.300781 37.445313 11.109375 42.796875 12.816406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,104,182);fill-opacity:1;" d="M 41.097656 47.34375 C 36.921875 48.207031 36.632813 46.785156 36.632813 46.785156 C 41.042969 40.214844 42.886719 31.878906 41.292969 29.84375 C 36.953125 24.277344 29.4375 26.910156 29.320313 26.980469 L 29.277344 26.988281 C 28.359375 26.800781 27.425781 26.703125 26.488281 26.695313 C 24.910156 26.617188 23.355469 27.082031 22.078125 28.019531 C 22.078125 28.019531 8.679688 22.476563 9.300781 34.984375 C 9.441406 37.644531 13.101563 55.125 17.476563 49.84375 C 19.074219 47.914063 20.621094 46.28125 20.621094 46.28125 C 21.398438 46.808594 22.335938 47.050781 23.269531 46.960938 L 23.34375 46.898438 C 23.324219 47.148438 23.332031 47.402344 23.375 47.652344 C 22.25 48.910156 22.578125 49.136719 20.328125 49.601563 C 18.046875 50.074219 19.386719 50.914063 20.261719 51.132813 C 22.164063 51.753906 24.25 51.074219 25.429688 49.453125 L 25.363281 49.71875 C 25.96875 50.988281 26.210938 52.402344 26.058594 53.804688 C 25.914063 55.121094 26.003906 56.453125 26.320313 57.738281 C 26.667969 58.6875 27.015625 60.828125 29.976563 60.191406 C 32.152344 59.972656 33.835938 58.171875 33.910156 55.976563 C 34.035156 54.34375 34.328125 54.578125 34.339844 53.121094 L 34.570313 52.429688 C 34.835938 50.210938 34.613281 49.496094 36.136719 49.832031 L 36.507813 49.863281 C 37.6875 49.914063 38.863281 49.714844 39.960938 49.277344 C 41.816406 48.414063 42.917969 46.96875 41.085938 47.347656 Z M 41.097656 47.34375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 23.46875 36.371094 C 23.28125 36.273438 23.074219 36.210938 22.863281 36.183594 C 22.5625 36.117188 22.246094 36.160156 21.972656 36.308594 C 21.898438 36.359375 21.847656 36.4375 21.835938 36.527344 C 21.796875 36.804688 22.210938 37.332031 22.730469 37.40625 C 22.769531 37.410156 22.8125 37.414063 22.855469 37.414063 C 23.234375 37.414063 23.578125 37.191406 23.738281 36.84375 L 23.753906 36.792969 C 23.769531 36.707031 23.75 36.527344 23.46875 36.371094 Z M 23.46875 36.371094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.007813 35.933594 C 34.808594 35.894531 34.605469 35.890625 34.40625 35.921875 C 33.972656 35.984375 33.554688 36.179688 33.589844 36.4375 L 33.597656 36.464844 C 33.742188 36.78125 34.054688 36.984375 34.402344 36.980469 C 34.441406 36.984375 34.480469 36.980469 34.515625 36.976563 C 34.746094 36.933594 34.953125 36.820313 35.109375 36.648438 C 35.242188 36.53125 35.320313 36.367188 35.335938 36.191406 C 35.316406 36.074219 35.199219 35.980469 35.007813 35.933594 Z M 35.007813 35.933594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 42.359375 47.289063 C 42.15625 46.671875 41.277344 46.855469 40.988281 46.914063 C 38.046875 47.523438 37.222656 46.921875 37.050781 46.753906 C 39.121094 43.605469 40.65625 40.132813 41.605469 36.484375 C 42.417969 33.21875 42.402344 30.625 41.570313 29.558594 C 39.789063 27.269531 37.066406 25.921875 34.175781 25.890625 C 32.503906 25.820313 30.828125 26.042969 29.230469 26.550781 L 29.199219 26.5625 L 29.140625 26.582031 L 29.089844 26.601563 C 28.234375 26.386719 27.355469 26.269531 26.472656 26.257813 C 24.902344 26.199219 23.351563 26.636719 22.046875 27.519531 C 20.679688 27.003906 19.261719 26.644531 17.8125 26.449219 C 15.660156 26.027344 13.425781 26.429688 11.554688 27.582031 C 9.617188 28.964844 8.714844 31.445313 8.890625 34.957031 C 8.976563 36.613281 11.390625 49.804688 15.179688 51.074219 C 16.164063 51.339844 17.207031 50.921875 17.746094 50.050781 C 19.09375 48.421875 20.355469 47.066406 20.675781 46.730469 C 21.347656 47.109375 22.101563 47.3125 22.875 47.320313 C 22.875 47.398438 22.882813 47.476563 22.890625 47.554688 C 22.753906 47.710938 22.625 47.871094 22.496094 48.039063 C 21.988281 48.6875 21.867188 48.839844 20.226563 49.179688 C 19.5625 49.320313 18.675781 49.578125 18.660156 50.242188 C 18.648438 50.902344 19.574219 51.320313 20.121094 51.453125 C 21.910156 52.039063 23.875 51.5625 25.203125 50.21875 C 25.0625 52.84375 25.226563 55.472656 25.691406 58.058594 C 26.117188 59.644531 27.546875 60.75 29.183594 60.761719 C 29.574219 60.757813 29.964844 60.710938 30.347656 60.628906 C 32.542969 60.453125 34.277344 58.6875 34.414063 56.480469 C 34.652344 55.082031 35.070313 51.679688 35.25 49.964844 C 35.75 50.140625 36.28125 50.222656 36.8125 50.203125 C 37.9375 50.214844 39.054688 50.003906 40.101563 49.582031 C 41.144531 49.082031 42.613281 48.070313 42.359375 47.289063 Z M 34.5625 49.109375 C 34.492188 50.066406 33.941406 54.671875 33.65625 56.34375 C 33.566406 58.234375 32.070313 59.757813 30.1875 59.871094 C 29.40625 60.132813 28.550781 60.054688 27.832031 59.65625 C 27.109375 59.257813 26.589844 58.574219 26.398438 57.769531 C 25.925781 54.75 25.789063 51.683594 25.992188 48.632813 C 25.992188 48.574219 25.980469 48.515625 25.953125 48.460938 C 25.941406 48.34375 25.917969 48.226563 25.882813 48.113281 C 25.734375 47.621094 25.394531 47.207031 24.941406 46.96875 L 24.894531 46.945313 C 24.523438 46.734375 24.074219 46.707031 23.679688 46.871094 C 23.800781 46.324219 23.96875 45.789063 24.179688 45.273438 L 24.257813 45.0625 C 24.347656 44.820313 24.457031 44.582031 24.570313 44.316406 C 25.1875 42.945313 26.027344 41.070313 25.109375 36.820313 C 24.996094 36.113281 24.59375 35.492188 24.003906 35.09375 C 23.414063 34.695313 22.6875 34.558594 21.996094 34.71875 C 20.953125 34.859375 19.949219 35.21875 19.050781 35.773438 C 19.121094 33.242188 20.03125 30.808594 21.636719 28.855469 C 22.917969 27.597656 24.667969 26.9375 26.457031 27.035156 C 29.207031 27.042969 31.835938 28.195313 33.710938 30.214844 C 34.898438 31.460938 35.804688 32.953125 36.359375 34.585938 C 34.367188 34.34375 33.03125 34.703125 32.375 35.648438 C 30.976563 37.65625 33.1875 41.640625 34.25 43.554688 C 34.433594 43.882813 34.621094 44.21875 34.679688 44.363281 C 34.960938 45.019531 35.339844 45.628906 35.800781 46.171875 C 35.941406 46.335938 36.066406 46.507813 36.175781 46.691406 L 36.085938 46.71875 C 35.523438 46.871094 34.46875 47.167969 34.5625 49.105469 Z M 15.421875 50.34375 C 14.152344 49.921875 12.742188 47.363281 11.453125 43.152344 C 10.605469 40.46875 10.003906 37.714844 9.660156 34.921875 C 9.5 31.6875 10.285156 29.433594 12 28.210938 C 13.207031 27.4375 14.621094 27.054688 16.054688 27.117188 C 17.855469 27.164063 19.640625 27.488281 21.34375 28.082031 C 21.261719 28.152344 21.175781 28.222656 21.097656 28.308594 C 18.152344 31.292969 18.253906 36.417969 18.261719 36.636719 L 18.261719 36.660156 C 18.386719 38.257813 18.359375 39.863281 18.175781 41.457031 C 17.933594 43.0625 18.445313 44.691406 19.558594 45.871094 C 19.707031 46.019531 19.863281 46.160156 20.027344 46.289063 C 19.546875 46.804688 18.398438 48.054688 17.15625 49.554688 C 16.558594 50.273438 15.988281 50.527344 15.421875 50.339844 Z M 18.933594 41.550781 C 19.121094 39.945313 19.15625 38.328125 19.03125 36.714844 C 20.144531 35.851563 21.53125 35.417969 22.9375 35.492188 C 23.691406 35.609375 24.273438 36.21875 24.359375 36.976563 C 25.222656 40.980469 24.472656 42.652344 23.867188 43.996094 C 23.753906 44.257813 23.632813 44.523438 23.535156 44.789063 L 23.457031 45 C 23.253906 45.503906 23.085938 46.023438 22.953125 46.550781 C 21.875 46.570313 20.839844 46.128906 20.105469 45.335938 C 19.15625 44.324219 18.722656 42.925781 18.933594 41.550781 Z M 23.632813 47.863281 C 23.644531 47.847656 23.65625 47.832031 23.667969 47.816406 C 23.855469 47.535156 24.226563 47.441406 24.519531 47.609375 L 24.582031 47.640625 C 25.132813 47.9375 25.355469 48.613281 25.089844 49.183594 C 24.003906 50.675781 22.082031 51.296875 20.328125 50.722656 C 20 50.652344 19.695313 50.5 19.4375 50.28125 C 19.71875 50.097656 20.042969 49.980469 20.378906 49.945313 C 22.210938 49.566406 22.46875 49.320313 23.09375 48.527344 C 23.230469 48.347656 23.40625 48.128906 23.636719 47.867188 Z M 35.390625 44.066406 C 35.316406 43.886719 35.15625 43.597656 34.933594 43.195313 L 34.921875 43.175781 C 34.011719 41.539063 31.878906 37.699219 33.003906 36.082031 C 33.566406 35.46875 34.390625 35.167969 35.214844 35.277344 C 35.621094 35.28125 36.023438 35.3125 36.421875 35.371094 C 36.417969 35.910156 36.367188 36.445313 36.273438 36.976563 C 36.175781 37.542969 36.113281 38.109375 36.089844 38.679688 C 36.089844 39.328125 36.132813 39.972656 36.230469 40.609375 C 36.539063 42.03125 36.390625 43.515625 35.796875 44.847656 C 35.640625 44.597656 35.503906 44.335938 35.390625 44.0625 Z M 40.628906 37.085938 C 39.675781 40.210938 38.335938 43.203125 36.632813 45.988281 C 36.570313 45.902344 36.492188 45.800781 36.394531 45.683594 L 36.304688 45.566406 L 36.28125 45.535156 C 37.121094 44 37.367188 42.210938 36.980469 40.503906 C 36.890625 39.90625 36.847656 39.304688 36.851563 38.703125 C 36.875 38.160156 36.933594 37.621094 37.023438 37.085938 C 37.144531 36.4375 37.195313 35.777344 37.183594 35.117188 C 37.207031 35.035156 37.214844 34.949219 37.203125 34.867188 C 36.238281 31.335938 33.71875 28.445313 30.363281 27.011719 C 36.609375 25.480469 39.847656 28.601563 40.960938 30.027344 C 41.800781 31.097656 41.675781 33.601563 40.628906 37.082031 Z M 36.304688 47.445313 C 36.398438 47.421875 36.492188 47.390625 36.582031 47.351563 C 36.644531 47.40625 36.710938 47.457031 36.777344 47.503906 C 38.171875 48.085938 39.722656 48.140625 41.152344 47.660156 C 41.285156 47.632813 41.417969 47.613281 41.554688 47.609375 C 41.066406 48.152344 40.460938 48.582031 39.789063 48.867188 C 38.410156 49.449219 36.882813 49.5625 35.433594 49.191406 C 35.359375 49.148438 35.339844 49.113281 35.339844 49.105469 C 35.261719 47.746094 35.792969 47.597656 36.316406 47.449219 Z M 36.304688 47.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 0.0195313 9.648438 L 0.0195313 60.871094 C 0.0195313 66.261719 11.921875 70.519531 26.519531 70.519531 L 26.519531 9.648438 Z M 0.0195313 9.648438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 26.234375 70.519531 L 26.660156 70.519531 C 41.398438 70.519531 53.160156 66.261719 53.160156 60.871094 L 53.160156 9.648438 L 26.234375 9.648438 Z M 26.234375 70.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 53.164063 9.648438 C 53.164063 14.902344 41.257813 19.296875 26.660156 19.296875 C 12.066406 19.296875 0.0195313 14.898438 0.0195313 9.648438 C 0.0195313 4.398438 11.921875 0 26.519531 0 C 41.117188 0 53.164063 4.398438 53.164063 9.648438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 47.773438 9.078125 C 47.773438 12.628906 38.277344 15.464844 26.65625 15.464844 C 15.035156 15.464844 5.402344 12.628906 5.402344 9.078125 C 5.402344 5.53125 14.898438 2.695313 26.519531 2.695313 C 38.140625 2.695313 47.773438 5.53125 47.773438 9.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 43.242188 12.910156 C 46.074219 11.78125 47.636719 10.5 47.636719 9.078125 C 47.636719 5.53125 38.140625 2.695313 26.519531 2.695313 C 14.898438 2.695313 5.402344 5.53125 5.402344 9.078125 C 5.402344 10.5 7.101563 11.917969 9.796875 12.910156 C 13.621094 11.347656 19.714844 10.5 26.519531 10.5 C 32.1875 10.378906 37.835938 11.191406 43.242188 12.910156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,104,182);fill-opacity:1;" d="M 41.523438 47.695313 C 37.308594 48.566406 37.015625 47.132813 37.015625 47.132813 C 41.46875 40.515625 43.332031 32.117188 41.722656 30.066406 C 37.34375 24.457031 29.75 27.109375 29.628906 27.179688 L 29.589844 27.1875 C 28.660156 27 27.71875 26.902344 26.769531 26.894531 C 25.175781 26.8125 23.605469 27.285156 22.316406 28.226563 C 22.316406 28.226563 8.78125 22.644531 9.414063 35.246094 C 9.554688 37.925781 13.25 55.53125 17.667969 50.214844 C 19.28125 48.269531 20.84375 46.625 20.84375 46.625 C 21.628906 47.15625 22.574219 47.398438 23.519531 47.308594 L 23.597656 47.246094 C 23.574219 47.5 23.585938 47.753906 23.628906 48.003906 C 22.488281 49.273438 22.824219 49.5 20.546875 49.972656 C 18.246094 50.445313 19.601563 51.292969 20.480469 51.511719 C 22.402344 52.136719 24.507813 51.453125 25.699219 49.820313 L 25.632813 50.089844 C 26.246094 51.367188 26.488281 52.792969 26.335938 54.203125 C 26.191406 55.53125 26.28125 56.871094 26.601563 58.167969 C 26.953125 59.125 27.304688 61.277344 30.292969 60.636719 C 32.492188 60.417969 34.191406 58.605469 34.265625 56.394531 C 34.394531 54.746094 34.6875 54.984375 34.703125 53.515625 L 34.933594 52.820313 C 35.203125 50.585938 34.976563 49.863281 36.515625 50.199219 L 36.890625 50.230469 C 38.082031 50.28125 39.269531 50.082031 40.378906 49.644531 C 42.253906 48.773438 43.363281 47.320313 41.515625 47.699219 Z M 41.523438 47.695313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 23.71875 36.640625 C 23.53125 36.542969 23.324219 36.476563 23.109375 36.453125 C 22.804688 36.386719 22.484375 36.429688 22.210938 36.578125 C 22.136719 36.628906 22.085938 36.707031 22.070313 36.796875 C 22.03125 37.078125 22.449219 37.609375 22.972656 37.683594 C 23.015625 37.6875 23.058594 37.691406 23.101563 37.691406 C 23.484375 37.691406 23.832031 37.464844 23.992188 37.117188 L 24.007813 37.066406 C 24.027344 36.976563 24.007813 36.796875 23.71875 36.640625 Z M 23.71875 36.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.375 36.203125 C 35.175781 36.160156 34.96875 36.15625 34.769531 36.1875 C 34.332031 36.253906 33.90625 36.449219 33.941406 36.707031 L 33.949219 36.734375 C 34.09375 37.054688 34.414063 37.257813 34.765625 37.257813 C 34.800781 37.257813 34.839844 37.253906 34.878906 37.25 C 35.109375 37.207031 35.320313 37.09375 35.480469 36.917969 C 35.613281 36.800781 35.691406 36.636719 35.707031 36.460938 C 35.683594 36.339844 35.566406 36.246094 35.375 36.203125 Z M 35.375 36.203125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 42.800781 47.640625 C 42.597656 47.015625 41.707031 47.203125 41.417969 47.261719 C 38.445313 47.878906 37.613281 47.273438 37.441406 47.101563 C 39.527344 43.929688 41.082031 40.433594 42.035156 36.753906 C 42.859375 33.464844 42.84375 30.855469 42 29.777344 C 40.203125 27.472656 37.457031 26.113281 34.535156 26.082031 C 32.84375 26.011719 31.15625 26.234375 29.542969 26.75 L 29.507813 26.757813 L 29.449219 26.777344 L 29.398438 26.796875 C 28.535156 26.582031 27.648438 26.464844 26.753906 26.453125 C 25.167969 26.390625 23.601563 26.835938 22.285156 27.722656 C 20.90625 27.203125 19.46875 26.84375 18.007813 26.644531 C 15.835938 26.21875 13.578125 26.625 11.6875 27.785156 C 9.730469 29.179688 8.820313 31.679688 8.996094 35.214844 C 9.082031 36.882813 11.519531 50.175781 15.347656 51.453125 C 16.34375 51.71875 17.398438 51.300781 17.941406 50.421875 C 19.304688 48.78125 20.578125 47.417969 20.898438 47.078125 C 21.578125 47.457031 22.339844 47.664063 23.121094 47.671875 C 23.121094 47.75 23.128906 47.828125 23.136719 47.90625 C 22.996094 48.066406 22.871094 48.226563 22.738281 48.398438 C 22.226563 49.050781 22.105469 49.203125 20.445313 49.546875 C 19.773438 49.6875 18.878906 49.945313 18.867188 50.613281 C 18.851563 51.28125 19.785156 51.699219 20.339844 51.835938 C 22.148438 52.425781 24.132813 51.945313 25.472656 50.59375 C 25.332031 53.234375 25.496094 55.886719 25.964844 58.488281 C 26.394531 60.089844 27.839844 61.203125 29.492188 61.210938 C 29.890625 61.207031 30.285156 61.164063 30.671875 61.078125 C 32.886719 60.902344 34.636719 59.121094 34.773438 56.902344 C 35.019531 55.492188 35.441406 52.0625 35.617188 50.335938 C 36.125 50.515625 36.664063 50.59375 37.199219 50.578125 C 38.335938 50.585938 39.464844 50.371094 40.519531 49.949219 C 41.574219 49.445313 43.058594 48.425781 42.800781 47.640625 Z M 34.925781 49.472656 C 34.855469 50.4375 34.300781 55.078125 34.007813 56.761719 C 33.921875 58.667969 32.410156 60.199219 30.503906 60.3125 C 29.71875 60.578125 28.855469 60.5 28.128906 60.097656 C 27.398438 59.695313 26.875 59.007813 26.679688 58.199219 C 26.203125 55.15625 26.066406 52.066406 26.269531 48.992188 C 26.269531 48.933594 26.257813 48.875 26.230469 48.820313 C 26.21875 48.703125 26.191406 48.585938 26.160156 48.46875 C 26.007813 47.972656 25.664063 47.558594 25.207031 47.316406 L 25.160156 47.292969 C 24.785156 47.082031 24.332031 47.054688 23.933594 47.21875 C 24.058594 46.667969 24.226563 46.128906 24.441406 45.609375 L 24.519531 45.394531 C 24.609375 45.152344 24.71875 44.914063 24.835938 44.644531 C 25.457031 43.261719 26.304688 41.375 25.378906 37.089844 C 25.261719 36.382813 24.859375 35.753906 24.261719 35.355469 C 23.667969 34.953125 22.933594 34.816406 22.234375 34.976563 C 21.179688 35.121094 20.167969 35.480469 19.257813 36.039063 C 19.328125 33.488281 20.246094 31.035156 21.871094 29.070313 C 23.164063 27.804688 24.929688 27.136719 26.738281 27.238281 C 29.519531 27.242188 32.171875 28.402344 34.0625 30.441406 C 35.265625 31.695313 36.179688 33.195313 36.742188 34.839844 C 34.730469 34.601563 33.378906 34.960938 32.714844 35.910156 C 31.304688 37.9375 33.535156 41.949219 34.609375 43.878906 C 34.792969 44.207031 34.984375 44.546875 35.042969 44.691406 C 35.328125 45.351563 35.710938 45.96875 36.175781 46.515625 C 36.316406 46.679688 36.445313 46.855469 36.554688 47.039063 L 36.464844 47.066406 C 35.894531 47.21875 34.832031 47.515625 34.925781 49.472656 Z M 15.59375 50.714844 C 14.3125 50.292969 12.890625 47.714844 11.585938 43.472656 C 10.730469 40.769531 10.125 37.992188 9.773438 35.179688 C 9.609375 31.925781 10.40625 29.652344 12.136719 28.421875 C 13.355469 27.640625 14.785156 27.257813 16.230469 27.320313 C 18.050781 27.367188 19.851563 27.695313 21.574219 28.289063 C 21.492188 28.363281 21.40625 28.433594 21.328125 28.519531 C 18.351563 31.523438 18.457031 36.691406 18.460938 36.90625 L 18.460938 36.933594 C 18.589844 38.542969 18.558594 40.160156 18.375 41.761719 C 18.128906 43.382813 18.644531 45.023438 19.773438 46.210938 C 19.917969 46.363281 20.078125 46.503906 20.246094 46.632813 C 19.757813 47.152344 18.597656 48.410156 17.34375 49.921875 C 16.742188 50.644531 16.167969 50.902344 15.59375 50.714844 Z M 19.140625 41.859375 C 19.332031 40.242188 19.363281 38.609375 19.242188 36.988281 C 20.367188 36.117188 21.765625 35.679688 23.183594 35.757813 C 23.945313 35.875 24.53125 36.484375 24.621094 37.25 C 25.492188 41.285156 24.734375 42.96875 24.125 44.324219 C 24.007813 44.585938 23.886719 44.855469 23.785156 45.121094 L 23.707031 45.332031 C 23.503906 45.84375 23.332031 46.363281 23.199219 46.898438 C 22.109375 46.917969 21.066406 46.472656 20.324219 45.671875 C 19.363281 44.652344 18.925781 43.242188 19.140625 41.859375 Z M 23.886719 48.21875 C 23.898438 48.203125 23.910156 48.1875 23.921875 48.171875 C 24.109375 47.886719 24.484375 47.796875 24.78125 47.964844 L 24.84375 47.996094 C 25.402344 48.292969 25.628906 48.976563 25.359375 49.546875 C 24.261719 51.050781 22.320313 51.679688 20.550781 51.097656 C 20.21875 51.027344 19.910156 50.875 19.648438 50.65625 C 19.933594 50.46875 20.261719 50.351563 20.597656 50.3125 C 22.449219 49.933594 22.710938 49.683594 23.339844 48.886719 C 23.480469 48.707031 23.65625 48.484375 23.890625 48.222656 Z M 35.761719 44.390625 C 35.6875 44.210938 35.523438 43.921875 35.300781 43.515625 L 35.289063 43.496094 C 34.371094 41.847656 32.214844 37.980469 33.351563 36.351563 C 33.921875 35.734375 34.753906 35.429688 35.585938 35.539063 C 35.992188 35.542969 36.402344 35.574219 36.804688 35.632813 C 36.796875 36.175781 36.746094 36.71875 36.652344 37.253906 C 36.554688 37.820313 36.492188 38.390625 36.46875 38.96875 C 36.464844 39.617188 36.511719 40.269531 36.609375 40.910156 C 36.921875 42.34375 36.769531 43.839844 36.175781 45.179688 C 36.015625 44.929688 35.875 44.664063 35.761719 44.390625 Z M 41.050781 37.359375 C 40.089844 40.507813 38.734375 43.523438 37.015625 46.332031 C 36.953125 46.242188 36.875 46.140625 36.777344 46.019531 L 36.6875 45.90625 L 36.660156 45.875 C 37.507813 44.328125 37.757813 42.523438 37.367188 40.804688 C 37.277344 40.203125 37.234375 39.597656 37.234375 38.988281 C 37.261719 38.441406 37.320313 37.898438 37.414063 37.359375 C 37.53125 36.707031 37.585938 36.042969 37.574219 35.375 C 37.597656 35.292969 37.605469 35.210938 37.59375 35.125 C 36.617188 31.570313 34.070313 28.65625 30.683594 27.214844 C 36.992188 25.671875 40.261719 28.816406 41.390625 30.25 C 42.234375 31.328125 42.109375 33.851563 41.050781 37.359375 Z M 36.683594 47.796875 C 36.78125 47.773438 36.875 47.742188 36.96875 47.703125 C 37.03125 47.757813 37.09375 47.808594 37.164063 47.855469 C 38.570313 48.441406 40.136719 48.496094 41.582031 48.015625 C 41.714844 47.984375 41.851563 47.96875 41.988281 47.960938 C 41.492188 48.511719 40.882813 48.945313 40.203125 49.230469 C 38.8125 49.816406 37.269531 49.933594 35.804688 49.558594 C 35.730469 49.511719 35.710938 49.480469 35.710938 49.472656 C 35.632813 48.101563 36.167969 47.949219 36.695313 47.800781 Z M 36.683594 47.796875 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureDatabaseForPostgreSQL.png b/dist/Databases/AzureDatabaseForPostgreSQL.png
index 0a213017..24463a9c 100644
Binary files a/dist/Databases/AzureDatabaseForPostgreSQL.png and b/dist/Databases/AzureDatabaseForPostgreSQL.png differ
diff --git a/dist/Databases/AzureDatabaseForPostgreSQL.puml b/dist/Databases/AzureDatabaseForPostgreSQL.puml
index 49891001..00bb6928 100644
--- a/dist/Databases/AzureDatabaseForPostgreSQL.puml
+++ b/dist/Databases/AzureDatabaseForPostgreSQL.puml
@@ -1,12 +1,12 @@
-sprite $AzureDatabaseForPostgreSQL [53x70/16z] {
-xTG9OgCm38LXItfF4hx_WSS3TY6DJJhx-cTF-8hALdvjeYtJbfJNgO4ahf60BQs0n2h29aHFi7JoIEGaj-mBJMSNX0zdNu_aQJoovJssdiOJb5EHxZ6fsVvx
-7oprU6Fa2HRmRT5C6viGTuecfHjlA7azZ2QIC2qZeU-eCIdNH5JLp5HLtlq2zuvQRkLrIlU1XeFU0B4k1ZhRvt-QrT3159quma7Ifp6NpS4I_KT10Bw_9TG0
-qpsiKPXvX5C5K6Q6cqHjRHGiaEjMU-BZ7UnuDPiZhIDhPfIwTJr3yDfBgvUs_iVqWcOhodejR7yXRv7Mnn2rvRX3mGiu1tJU8SQZoMDRu1R1JKs7J04rNcu8
-iwt1yL5Jahb4sq3jZGUpexfLj6_2PWZH4NOTVcvA-_pW33aVKFQFo0E9pr1QHtOWz0s1_Hj_SUmThydnSQl8gZv7o2low2XGcRb2ZdEy_jnNXLGkq9XltoAR
-rL52Kts5RCoNZyUIGRb4OxwjCBMURMA-HEEWC3gAdgioLJCLp15HMs2cUTLX4ksHePoZtFyRk2bhbO52FQYwlkwfmq8QJNr3RW1khx3qzb1L2nq8_FXb-GsP
-Vm7QEf8lGVaLoA8Z_G84Fqn-2N8UYFW2DBQv-1UWL6zaKtmHSbCLfKzGhD4ou2kGblXYX59afMvCYr-4h1p9bAt92F41n4xEnFmMGSiyCNWy8SBUWKy
+sprite $AzureDatabaseforPostgreSql [53x70/16z] {
+xTG7jgCm38LX9DqhoTx_WeS44PCyas5w_Lz9_GvkX-NN9gALNFcs0IIEaOJfgJ0GPv6ON5I7E8NsOd0fwj4GNwvmENuzali_uX2tl1udQu7be4Zt-9WxUJII
+DJKZFTxbOwkOfLQFjsei73qp-RJ54-am6Lznzxo5r-DgPW3CxFN8AhtG6lNISQPxeSfDBeY11eJf1ofgA313rROpjkspJyhJlBgA_gDmUjGp0nscQyOtY6ea
+J9IkIYTaOLzB2CwGUjzgggsUmRPdq3dIw5LgVvIQzqVN6NBhUzBwgDLLYGb2zihPgrBReqxG6D8-eJtd5THVqlPPbEoZSQds5eK7LECXLDNMnx1tYCAMOJMn
+W7kpizMpjgDO_pHgaCZ8n9ZICq8KylkJLjl6l0ruVJr5pXtvSGs3spl418r9CGfjwGR5twDyGeYUwAapD2Q5h3bjDRqzDywHutYbOAyG3KrzZbB6r8y7y0QC
+PyXoFserkeeIwdCqnjSqQWahLPwWiNwfq0NvC4q5X66EoEqxcI4v9cMP121pbFVPQ0GaQu3xZYNKJr1eQ-fgqNii3oGYEjkdeTJJZ5J3kA5TkYs7UoHt53P1
+ymPoV05Y8V0B40hP5o2tGkBNKUYNet7ezKkGRZSOyIz156P0-4N87MP5BYi_Jxy2OR4lHboMHRyGORd7Bq2KPGyN4NKvfemfcekH6ECCmOxY4m
 }
 
-AzureEntityColoring(AzureDatabaseForPostgreSQL)
-!define AzureDatabaseForPostgreSQL(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseForPostgreSQL, AzureDatabaseForPostgreSQL)
-!define AzureDatabaseForPostgreSQL(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseForPostgreSQL, AzureDatabaseForPostgreSQL)
+AzureEntityColoring(AzureDatabaseforPostgreSql)
+!define AzureDatabaseforPostgreSql(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseforPostgreSql, AzureDatabaseforPostgreSql)
+!define AzureDatabaseforPostgreSql(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseforPostgreSql, AzureDatabaseforPostgreSql)
diff --git a/dist/Databases/AzureDatabaseForPostgreSQL.svg b/dist/Databases/AzureDatabaseForPostgreSQL.svg
index 902b2b3d..8a6bb48e 100644
--- a/dist/Databases/AzureDatabaseForPostgreSQL.svg
+++ b/dist/Databases/AzureDatabaseForPostgreSQL.svg
@@ -1,26 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="53pt" height="70pt" viewBox="0 0 53 70" version="1.1">
-<defs>
-<clipPath id="clip1">
-  <path d="M 25 9 L 52.621094 9 L 52.621094 70 L 25 70 Z M 25 9 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 0 0 L 52.621094 0 L 52.621094 20 L 0 20 Z M 0 0 "/>
-</clipPath>
-</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,59.607843%,77.254902%);fill-opacity:1;" d="M 0 9.578125 L 0 60.421875 C 0 65.773438 11.785156 70 26.238281 70 L 26.238281 9.578125 Z M 0 9.578125 "/>
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 25.957031 70 L 26.378906 70 C 40.96875 70 52.617188 65.773438 52.617188 60.421875 L 52.617188 9.578125 L 25.957031 9.578125 Z M 25.957031 70 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 52.621094 9.578125 C 52.621094 14.789063 40.832031 19.15625 26.378906 19.15625 C 11.929688 19.15625 0 14.789063 0 9.578125 C 0 4.367188 11.785156 0 26.238281 0 C 40.691406 0 52.621094 4.367188 52.621094 9.578125 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.54902%,0%);fill-opacity:1;" d="M 47.28125 9.011719 C 47.28125 12.535156 37.882813 15.351563 26.375 15.351563 C 14.867188 15.351563 5.332031 12.535156 5.332031 9.011719 C 5.332031 5.492188 14.734375 2.675781 26.238281 2.675781 C 37.746094 2.675781 47.28125 5.492188 47.28125 9.011719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(71.764706%,82.745098%,19.607843%);fill-opacity:1;" d="M 42.796875 12.816406 C 45.601563 11.695313 47.144531 10.421875 47.144531 9.011719 C 47.144531 5.492188 37.746094 2.675781 26.238281 2.675781 C 14.734375 2.675781 5.332031 5.492188 5.332031 9.011719 C 5.332031 10.421875 7.015625 11.828125 9.683594 12.816406 C 13.46875 11.265625 19.503906 10.421875 26.238281 10.421875 C 31.851563 10.300781 37.445313 11.109375 42.796875 12.816406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(20%,40.392157%,56.470588%);fill-opacity:1;" d="M 41.097656 47.34375 C 36.921875 48.207031 36.632813 46.785156 36.632813 46.785156 C 41.042969 40.214844 42.886719 31.878906 41.292969 29.84375 C 36.953125 24.277344 29.4375 26.910156 29.320313 26.980469 L 29.277344 26.988281 C 28.359375 26.800781 27.425781 26.703125 26.488281 26.695313 C 24.910156 26.617188 23.355469 27.082031 22.078125 28.019531 C 22.078125 28.019531 8.679688 22.476563 9.300781 34.984375 C 9.441406 37.644531 13.101563 55.125 17.476563 49.84375 C 19.074219 47.914063 20.621094 46.28125 20.621094 46.28125 C 21.398438 46.808594 22.335938 47.050781 23.269531 46.960938 L 23.34375 46.898438 C 23.324219 47.148438 23.332031 47.402344 23.375 47.652344 C 22.25 48.910156 22.578125 49.136719 20.328125 49.601563 C 18.046875 50.074219 19.386719 50.914063 20.261719 51.132813 C 22.164063 51.753906 24.25 51.074219 25.429688 49.453125 L 25.363281 49.71875 C 25.96875 50.988281 26.210938 52.402344 26.058594 53.804688 C 25.914063 55.121094 26.003906 56.453125 26.320313 57.738281 C 26.667969 58.6875 27.015625 60.828125 29.976563 60.191406 C 32.152344 59.972656 33.835938 58.171875 33.910156 55.976563 C 34.035156 54.34375 34.328125 54.578125 34.339844 53.121094 L 34.570313 52.429688 C 34.835938 50.210938 34.613281 49.496094 36.136719 49.832031 L 36.507813 49.863281 C 37.6875 49.914063 38.863281 49.714844 39.960938 49.277344 C 41.816406 48.414063 42.917969 46.96875 41.085938 47.347656 Z M 41.097656 47.34375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 23.46875 36.371094 C 23.28125 36.273438 23.074219 36.210938 22.863281 36.183594 C 22.5625 36.117188 22.246094 36.160156 21.972656 36.308594 C 21.898438 36.359375 21.847656 36.4375 21.835938 36.527344 C 21.796875 36.804688 22.210938 37.332031 22.730469 37.40625 C 22.769531 37.410156 22.8125 37.414063 22.855469 37.414063 C 23.234375 37.414063 23.578125 37.191406 23.738281 36.84375 L 23.753906 36.792969 C 23.769531 36.707031 23.75 36.527344 23.46875 36.371094 Z M 23.46875 36.371094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.007813 35.933594 C 34.808594 35.894531 34.605469 35.890625 34.40625 35.921875 C 33.972656 35.984375 33.554688 36.179688 33.589844 36.4375 L 33.597656 36.464844 C 33.742188 36.78125 34.054688 36.984375 34.402344 36.980469 C 34.441406 36.984375 34.480469 36.980469 34.515625 36.976563 C 34.746094 36.933594 34.953125 36.820313 35.109375 36.648438 C 35.242188 36.53125 35.320313 36.367188 35.335938 36.191406 C 35.316406 36.074219 35.199219 35.980469 35.007813 35.933594 Z M 35.007813 35.933594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 42.359375 47.289063 C 42.15625 46.671875 41.277344 46.855469 40.988281 46.914063 C 38.046875 47.523438 37.222656 46.921875 37.050781 46.753906 C 39.121094 43.605469 40.65625 40.132813 41.605469 36.484375 C 42.417969 33.21875 42.402344 30.625 41.570313 29.558594 C 39.789063 27.269531 37.066406 25.921875 34.175781 25.890625 C 32.503906 25.820313 30.828125 26.042969 29.230469 26.550781 L 29.199219 26.5625 L 29.140625 26.582031 L 29.089844 26.601563 C 28.234375 26.386719 27.355469 26.269531 26.472656 26.257813 C 24.902344 26.199219 23.351563 26.636719 22.046875 27.519531 C 20.679688 27.003906 19.261719 26.644531 17.8125 26.449219 C 15.660156 26.027344 13.425781 26.429688 11.554688 27.582031 C 9.617188 28.964844 8.714844 31.445313 8.890625 34.957031 C 8.976563 36.613281 11.390625 49.804688 15.179688 51.074219 C 16.164063 51.339844 17.207031 50.921875 17.746094 50.050781 C 19.09375 48.421875 20.355469 47.066406 20.675781 46.730469 C 21.347656 47.109375 22.101563 47.3125 22.875 47.320313 C 22.875 47.398438 22.882813 47.476563 22.890625 47.554688 C 22.753906 47.710938 22.625 47.871094 22.496094 48.039063 C 21.988281 48.6875 21.867188 48.839844 20.226563 49.179688 C 19.5625 49.320313 18.675781 49.578125 18.660156 50.242188 C 18.648438 50.902344 19.574219 51.320313 20.121094 51.453125 C 21.910156 52.039063 23.875 51.5625 25.203125 50.21875 C 25.0625 52.84375 25.226563 55.472656 25.691406 58.058594 C 26.117188 59.644531 27.546875 60.75 29.183594 60.761719 C 29.574219 60.757813 29.964844 60.710938 30.347656 60.628906 C 32.542969 60.453125 34.277344 58.6875 34.414063 56.480469 C 34.652344 55.082031 35.070313 51.679688 35.25 49.964844 C 35.75 50.140625 36.28125 50.222656 36.8125 50.203125 C 37.9375 50.214844 39.054688 50.003906 40.101563 49.582031 C 41.144531 49.082031 42.613281 48.070313 42.359375 47.289063 Z M 34.5625 49.109375 C 34.492188 50.066406 33.941406 54.671875 33.65625 56.34375 C 33.566406 58.234375 32.070313 59.757813 30.1875 59.871094 C 29.40625 60.132813 28.550781 60.054688 27.832031 59.65625 C 27.109375 59.257813 26.589844 58.574219 26.398438 57.769531 C 25.925781 54.75 25.789063 51.683594 25.992188 48.632813 C 25.992188 48.574219 25.980469 48.515625 25.953125 48.460938 C 25.941406 48.34375 25.917969 48.226563 25.882813 48.113281 C 25.734375 47.621094 25.394531 47.207031 24.941406 46.96875 L 24.894531 46.945313 C 24.523438 46.734375 24.074219 46.707031 23.679688 46.871094 C 23.800781 46.324219 23.96875 45.789063 24.179688 45.273438 L 24.257813 45.0625 C 24.347656 44.820313 24.457031 44.582031 24.570313 44.316406 C 25.1875 42.945313 26.027344 41.070313 25.109375 36.820313 C 24.996094 36.113281 24.59375 35.492188 24.003906 35.09375 C 23.414063 34.695313 22.6875 34.558594 21.996094 34.71875 C 20.953125 34.859375 19.949219 35.21875 19.050781 35.773438 C 19.121094 33.242188 20.03125 30.808594 21.636719 28.855469 C 22.917969 27.597656 24.667969 26.9375 26.457031 27.035156 C 29.207031 27.042969 31.835938 28.195313 33.710938 30.214844 C 34.898438 31.460938 35.804688 32.953125 36.359375 34.585938 C 34.367188 34.34375 33.03125 34.703125 32.375 35.648438 C 30.976563 37.65625 33.1875 41.640625 34.25 43.554688 C 34.433594 43.882813 34.621094 44.21875 34.679688 44.363281 C 34.960938 45.019531 35.339844 45.628906 35.800781 46.171875 C 35.941406 46.335938 36.066406 46.507813 36.175781 46.691406 L 36.085938 46.71875 C 35.523438 46.871094 34.46875 47.167969 34.5625 49.105469 Z M 15.421875 50.34375 C 14.152344 49.921875 12.742188 47.363281 11.453125 43.152344 C 10.605469 40.46875 10.003906 37.714844 9.660156 34.921875 C 9.5 31.6875 10.285156 29.433594 12 28.210938 C 13.207031 27.4375 14.621094 27.054688 16.054688 27.117188 C 17.855469 27.164063 19.640625 27.488281 21.34375 28.082031 C 21.261719 28.152344 21.175781 28.222656 21.097656 28.308594 C 18.152344 31.292969 18.253906 36.417969 18.261719 36.636719 L 18.261719 36.660156 C 18.386719 38.257813 18.359375 39.863281 18.175781 41.457031 C 17.933594 43.0625 18.445313 44.691406 19.558594 45.871094 C 19.707031 46.019531 19.863281 46.160156 20.027344 46.289063 C 19.546875 46.804688 18.398438 48.054688 17.15625 49.554688 C 16.558594 50.273438 15.988281 50.527344 15.421875 50.339844 Z M 18.933594 41.550781 C 19.121094 39.945313 19.15625 38.328125 19.03125 36.714844 C 20.144531 35.851563 21.53125 35.417969 22.9375 35.492188 C 23.691406 35.609375 24.273438 36.21875 24.359375 36.976563 C 25.222656 40.980469 24.472656 42.652344 23.867188 43.996094 C 23.753906 44.257813 23.632813 44.523438 23.535156 44.789063 L 23.457031 45 C 23.253906 45.503906 23.085938 46.023438 22.953125 46.550781 C 21.875 46.570313 20.839844 46.128906 20.105469 45.335938 C 19.15625 44.324219 18.722656 42.925781 18.933594 41.550781 Z M 23.632813 47.863281 C 23.644531 47.847656 23.65625 47.832031 23.667969 47.816406 C 23.855469 47.535156 24.226563 47.441406 24.519531 47.609375 L 24.582031 47.640625 C 25.132813 47.9375 25.355469 48.613281 25.089844 49.183594 C 24.003906 50.675781 22.082031 51.296875 20.328125 50.722656 C 20 50.652344 19.695313 50.5 19.4375 50.28125 C 19.71875 50.097656 20.042969 49.980469 20.378906 49.945313 C 22.210938 49.566406 22.46875 49.320313 23.09375 48.527344 C 23.230469 48.347656 23.40625 48.128906 23.636719 47.867188 Z M 35.390625 44.066406 C 35.316406 43.886719 35.15625 43.597656 34.933594 43.195313 L 34.921875 43.175781 C 34.011719 41.539063 31.878906 37.699219 33.003906 36.082031 C 33.566406 35.46875 34.390625 35.167969 35.214844 35.277344 C 35.621094 35.28125 36.023438 35.3125 36.421875 35.371094 C 36.417969 35.910156 36.367188 36.445313 36.273438 36.976563 C 36.175781 37.542969 36.113281 38.109375 36.089844 38.679688 C 36.089844 39.328125 36.132813 39.972656 36.230469 40.609375 C 36.539063 42.03125 36.390625 43.515625 35.796875 44.847656 C 35.640625 44.597656 35.503906 44.335938 35.390625 44.0625 Z M 40.628906 37.085938 C 39.675781 40.210938 38.335938 43.203125 36.632813 45.988281 C 36.570313 45.902344 36.492188 45.800781 36.394531 45.683594 L 36.304688 45.566406 L 36.28125 45.535156 C 37.121094 44 37.367188 42.210938 36.980469 40.503906 C 36.890625 39.90625 36.847656 39.304688 36.851563 38.703125 C 36.875 38.160156 36.933594 37.621094 37.023438 37.085938 C 37.144531 36.4375 37.195313 35.777344 37.183594 35.117188 C 37.207031 35.035156 37.214844 34.949219 37.203125 34.867188 C 36.238281 31.335938 33.71875 28.445313 30.363281 27.011719 C 36.609375 25.480469 39.847656 28.601563 40.960938 30.027344 C 41.800781 31.097656 41.675781 33.601563 40.628906 37.082031 Z M 36.304688 47.445313 C 36.398438 47.421875 36.492188 47.390625 36.582031 47.351563 C 36.644531 47.40625 36.710938 47.457031 36.777344 47.503906 C 38.171875 48.085938 39.722656 48.140625 41.152344 47.660156 C 41.285156 47.632813 41.417969 47.613281 41.554688 47.609375 C 41.066406 48.152344 40.460938 48.582031 39.789063 48.867188 C 38.410156 49.449219 36.882813 49.5625 35.433594 49.191406 C 35.359375 49.148438 35.339844 49.113281 35.339844 49.105469 C 35.261719 47.746094 35.792969 47.597656 36.316406 47.449219 Z M 36.304688 47.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,59.607843%,77.254902%);fill-opacity:1;" d="M 0.0195313 9.648438 L 0.0195313 60.871094 C 0.0195313 66.261719 11.921875 70.519531 26.519531 70.519531 L 26.519531 9.648438 Z M 0.0195313 9.648438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 26.234375 70.519531 L 26.660156 70.519531 C 41.398438 70.519531 53.160156 66.261719 53.160156 60.871094 L 53.160156 9.648438 L 26.234375 9.648438 Z M 26.234375 70.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 53.164063 9.648438 C 53.164063 14.902344 41.257813 19.296875 26.660156 19.296875 C 12.066406 19.296875 0.0195313 14.898438 0.0195313 9.648438 C 0.0195313 4.398438 11.921875 0 26.519531 0 C 41.117188 0 53.164063 4.398438 53.164063 9.648438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.54902%,0%);fill-opacity:1;" d="M 47.773438 9.078125 C 47.773438 12.628906 38.277344 15.464844 26.65625 15.464844 C 15.035156 15.464844 5.402344 12.628906 5.402344 9.078125 C 5.402344 5.53125 14.898438 2.695313 26.519531 2.695313 C 38.140625 2.695313 47.773438 5.53125 47.773438 9.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(71.764706%,82.745098%,19.607843%);fill-opacity:1;" d="M 43.242188 12.910156 C 46.074219 11.78125 47.636719 10.5 47.636719 9.078125 C 47.636719 5.53125 38.140625 2.695313 26.519531 2.695313 C 14.898438 2.695313 5.402344 5.53125 5.402344 9.078125 C 5.402344 10.5 7.101563 11.917969 9.796875 12.910156 C 13.621094 11.347656 19.714844 10.5 26.519531 10.5 C 32.1875 10.378906 37.835938 11.191406 43.242188 12.910156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(20%,40.392157%,56.470588%);fill-opacity:1;" d="M 41.523438 47.695313 C 37.308594 48.566406 37.015625 47.132813 37.015625 47.132813 C 41.46875 40.515625 43.332031 32.117188 41.722656 30.066406 C 37.34375 24.457031 29.75 27.109375 29.628906 27.179688 L 29.589844 27.1875 C 28.660156 27 27.71875 26.902344 26.769531 26.894531 C 25.175781 26.8125 23.605469 27.285156 22.316406 28.226563 C 22.316406 28.226563 8.78125 22.644531 9.414063 35.246094 C 9.554688 37.925781 13.25 55.53125 17.667969 50.214844 C 19.28125 48.269531 20.84375 46.625 20.84375 46.625 C 21.628906 47.15625 22.574219 47.398438 23.519531 47.308594 L 23.597656 47.246094 C 23.574219 47.5 23.585938 47.753906 23.628906 48.003906 C 22.488281 49.273438 22.824219 49.5 20.546875 49.972656 C 18.246094 50.445313 19.601563 51.292969 20.480469 51.511719 C 22.402344 52.136719 24.507813 51.453125 25.699219 49.820313 L 25.632813 50.089844 C 26.246094 51.367188 26.488281 52.792969 26.335938 54.203125 C 26.191406 55.53125 26.28125 56.871094 26.601563 58.167969 C 26.953125 59.125 27.304688 61.277344 30.292969 60.636719 C 32.492188 60.417969 34.191406 58.605469 34.265625 56.394531 C 34.394531 54.746094 34.6875 54.984375 34.703125 53.515625 L 34.933594 52.820313 C 35.203125 50.585938 34.976563 49.863281 36.515625 50.199219 L 36.890625 50.230469 C 38.082031 50.28125 39.269531 50.082031 40.378906 49.644531 C 42.253906 48.773438 43.363281 47.320313 41.515625 47.699219 Z M 41.523438 47.695313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 23.71875 36.640625 C 23.53125 36.542969 23.324219 36.476563 23.109375 36.453125 C 22.804688 36.386719 22.484375 36.429688 22.210938 36.578125 C 22.136719 36.628906 22.085938 36.707031 22.070313 36.796875 C 22.03125 37.078125 22.449219 37.609375 22.972656 37.683594 C 23.015625 37.6875 23.058594 37.691406 23.101563 37.691406 C 23.484375 37.691406 23.832031 37.464844 23.992188 37.117188 L 24.007813 37.066406 C 24.027344 36.976563 24.007813 36.796875 23.71875 36.640625 Z M 23.71875 36.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.375 36.203125 C 35.175781 36.160156 34.96875 36.15625 34.769531 36.1875 C 34.332031 36.253906 33.90625 36.449219 33.941406 36.707031 L 33.949219 36.734375 C 34.09375 37.054688 34.414063 37.257813 34.765625 37.257813 C 34.800781 37.257813 34.839844 37.253906 34.878906 37.25 C 35.109375 37.207031 35.320313 37.09375 35.480469 36.917969 C 35.613281 36.800781 35.691406 36.636719 35.707031 36.460938 C 35.683594 36.339844 35.566406 36.246094 35.375 36.203125 Z M 35.375 36.203125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 42.800781 47.640625 C 42.597656 47.015625 41.707031 47.203125 41.417969 47.261719 C 38.445313 47.878906 37.613281 47.273438 37.441406 47.101563 C 39.527344 43.929688 41.082031 40.433594 42.035156 36.753906 C 42.859375 33.464844 42.84375 30.855469 42 29.777344 C 40.203125 27.472656 37.457031 26.113281 34.535156 26.082031 C 32.84375 26.011719 31.15625 26.234375 29.542969 26.75 L 29.507813 26.757813 L 29.449219 26.777344 L 29.398438 26.796875 C 28.535156 26.582031 27.648438 26.464844 26.753906 26.453125 C 25.167969 26.390625 23.601563 26.835938 22.285156 27.722656 C 20.90625 27.203125 19.46875 26.84375 18.007813 26.644531 C 15.835938 26.21875 13.578125 26.625 11.6875 27.785156 C 9.730469 29.179688 8.820313 31.679688 8.996094 35.214844 C 9.082031 36.882813 11.519531 50.175781 15.347656 51.453125 C 16.34375 51.71875 17.398438 51.300781 17.941406 50.421875 C 19.304688 48.78125 20.578125 47.417969 20.898438 47.078125 C 21.578125 47.457031 22.339844 47.664063 23.121094 47.671875 C 23.121094 47.75 23.128906 47.828125 23.136719 47.90625 C 22.996094 48.066406 22.871094 48.226563 22.738281 48.398438 C 22.226563 49.050781 22.105469 49.203125 20.445313 49.546875 C 19.773438 49.6875 18.878906 49.945313 18.867188 50.613281 C 18.851563 51.28125 19.785156 51.699219 20.339844 51.835938 C 22.148438 52.425781 24.132813 51.945313 25.472656 50.59375 C 25.332031 53.234375 25.496094 55.886719 25.964844 58.488281 C 26.394531 60.089844 27.839844 61.203125 29.492188 61.210938 C 29.890625 61.207031 30.285156 61.164063 30.671875 61.078125 C 32.886719 60.902344 34.636719 59.121094 34.773438 56.902344 C 35.019531 55.492188 35.441406 52.0625 35.617188 50.335938 C 36.125 50.515625 36.664063 50.59375 37.199219 50.578125 C 38.335938 50.585938 39.464844 50.371094 40.519531 49.949219 C 41.574219 49.445313 43.058594 48.425781 42.800781 47.640625 Z M 34.925781 49.472656 C 34.855469 50.4375 34.300781 55.078125 34.007813 56.761719 C 33.921875 58.667969 32.410156 60.199219 30.503906 60.3125 C 29.71875 60.578125 28.855469 60.5 28.128906 60.097656 C 27.398438 59.695313 26.875 59.007813 26.679688 58.199219 C 26.203125 55.15625 26.066406 52.066406 26.269531 48.992188 C 26.269531 48.933594 26.257813 48.875 26.230469 48.820313 C 26.21875 48.703125 26.191406 48.585938 26.160156 48.46875 C 26.007813 47.972656 25.664063 47.558594 25.207031 47.316406 L 25.160156 47.292969 C 24.785156 47.082031 24.332031 47.054688 23.933594 47.21875 C 24.058594 46.667969 24.226563 46.128906 24.441406 45.609375 L 24.519531 45.394531 C 24.609375 45.152344 24.71875 44.914063 24.835938 44.644531 C 25.457031 43.261719 26.304688 41.375 25.378906 37.089844 C 25.261719 36.382813 24.859375 35.753906 24.261719 35.355469 C 23.667969 34.953125 22.933594 34.816406 22.234375 34.976563 C 21.179688 35.121094 20.167969 35.480469 19.257813 36.039063 C 19.328125 33.488281 20.246094 31.035156 21.871094 29.070313 C 23.164063 27.804688 24.929688 27.136719 26.738281 27.238281 C 29.519531 27.242188 32.171875 28.402344 34.0625 30.441406 C 35.265625 31.695313 36.179688 33.195313 36.742188 34.839844 C 34.730469 34.601563 33.378906 34.960938 32.714844 35.910156 C 31.304688 37.9375 33.535156 41.949219 34.609375 43.878906 C 34.792969 44.207031 34.984375 44.546875 35.042969 44.691406 C 35.328125 45.351563 35.710938 45.96875 36.175781 46.515625 C 36.316406 46.679688 36.445313 46.855469 36.554688 47.039063 L 36.464844 47.066406 C 35.894531 47.21875 34.832031 47.515625 34.925781 49.472656 Z M 15.59375 50.714844 C 14.3125 50.292969 12.890625 47.714844 11.585938 43.472656 C 10.730469 40.769531 10.125 37.992188 9.773438 35.179688 C 9.609375 31.925781 10.40625 29.652344 12.136719 28.421875 C 13.355469 27.640625 14.785156 27.257813 16.230469 27.320313 C 18.050781 27.367188 19.851563 27.695313 21.574219 28.289063 C 21.492188 28.363281 21.40625 28.433594 21.328125 28.519531 C 18.351563 31.523438 18.457031 36.691406 18.460938 36.90625 L 18.460938 36.933594 C 18.589844 38.542969 18.558594 40.160156 18.375 41.761719 C 18.128906 43.382813 18.644531 45.023438 19.773438 46.210938 C 19.917969 46.363281 20.078125 46.503906 20.246094 46.632813 C 19.757813 47.152344 18.597656 48.410156 17.34375 49.921875 C 16.742188 50.644531 16.167969 50.902344 15.59375 50.714844 Z M 19.140625 41.859375 C 19.332031 40.242188 19.363281 38.609375 19.242188 36.988281 C 20.367188 36.117188 21.765625 35.679688 23.183594 35.757813 C 23.945313 35.875 24.53125 36.484375 24.621094 37.25 C 25.492188 41.285156 24.734375 42.96875 24.125 44.324219 C 24.007813 44.585938 23.886719 44.855469 23.785156 45.121094 L 23.707031 45.332031 C 23.503906 45.84375 23.332031 46.363281 23.199219 46.898438 C 22.109375 46.917969 21.066406 46.472656 20.324219 45.671875 C 19.363281 44.652344 18.925781 43.242188 19.140625 41.859375 Z M 23.886719 48.21875 C 23.898438 48.203125 23.910156 48.1875 23.921875 48.171875 C 24.109375 47.886719 24.484375 47.796875 24.78125 47.964844 L 24.84375 47.996094 C 25.402344 48.292969 25.628906 48.976563 25.359375 49.546875 C 24.261719 51.050781 22.320313 51.679688 20.550781 51.097656 C 20.21875 51.027344 19.910156 50.875 19.648438 50.65625 C 19.933594 50.46875 20.261719 50.351563 20.597656 50.3125 C 22.449219 49.933594 22.710938 49.683594 23.339844 48.886719 C 23.480469 48.707031 23.65625 48.484375 23.890625 48.222656 Z M 35.761719 44.390625 C 35.6875 44.210938 35.523438 43.921875 35.300781 43.515625 L 35.289063 43.496094 C 34.371094 41.847656 32.214844 37.980469 33.351563 36.351563 C 33.921875 35.734375 34.753906 35.429688 35.585938 35.539063 C 35.992188 35.542969 36.402344 35.574219 36.804688 35.632813 C 36.796875 36.175781 36.746094 36.71875 36.652344 37.253906 C 36.554688 37.820313 36.492188 38.390625 36.46875 38.96875 C 36.464844 39.617188 36.511719 40.269531 36.609375 40.910156 C 36.921875 42.34375 36.769531 43.839844 36.175781 45.179688 C 36.015625 44.929688 35.875 44.664063 35.761719 44.390625 Z M 41.050781 37.359375 C 40.089844 40.507813 38.734375 43.523438 37.015625 46.332031 C 36.953125 46.242188 36.875 46.140625 36.777344 46.019531 L 36.6875 45.90625 L 36.660156 45.875 C 37.507813 44.328125 37.757813 42.523438 37.367188 40.804688 C 37.277344 40.203125 37.234375 39.597656 37.234375 38.988281 C 37.261719 38.441406 37.320313 37.898438 37.414063 37.359375 C 37.53125 36.707031 37.585938 36.042969 37.574219 35.375 C 37.597656 35.292969 37.605469 35.210938 37.59375 35.125 C 36.617188 31.570313 34.070313 28.65625 30.683594 27.214844 C 36.992188 25.671875 40.261719 28.816406 41.390625 30.25 C 42.234375 31.328125 42.109375 33.851563 41.050781 37.359375 Z M 36.683594 47.796875 C 36.78125 47.773438 36.875 47.742188 36.96875 47.703125 C 37.03125 47.757813 37.09375 47.808594 37.164063 47.855469 C 38.570313 48.441406 40.136719 48.496094 41.582031 48.015625 C 41.714844 47.984375 41.851563 47.96875 41.988281 47.960938 C 41.492188 48.511719 40.882813 48.945313 40.203125 49.230469 C 38.8125 49.816406 37.269531 49.933594 35.804688 49.558594 C 35.730469 49.511719 35.710938 49.480469 35.710938 49.472656 C 35.632813 48.101563 36.167969 47.949219 36.695313 47.800781 Z M 36.683594 47.796875 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureElasticDatabasePool(m).png b/dist/Databases/AzureElasticDatabasePool(m).png
new file mode 100644
index 00000000..3a6535f0
Binary files /dev/null and b/dist/Databases/AzureElasticDatabasePool(m).png differ
diff --git a/dist/Databases/AzureElasticDatabasePool(m).svg b/dist/Databases/AzureElasticDatabasePool(m).svg
new file mode 100644
index 00000000..3a59ffc0
--- /dev/null
+++ b/dist/Databases/AzureElasticDatabasePool(m).svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.898438 9.238281 L 39.621094 1.960938 C 38.359375 0.699219 36.679688 0 35 0 C 33.320313 0 31.640625 0.699219 30.378906 1.960938 L 1.960938 30.378906 C 0.699219 31.640625 0 33.320313 0 35 C 0 36.679688 0.699219 38.359375 1.960938 39.621094 L 13.578125 51.238281 Z M 46.898438 9.238281 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 35 70 C 33.320313 70 31.640625 69.300781 30.378906 68.039063 L 1.960938 39.621094 C 0.699219 38.359375 0 36.679688 0 35 C 0 33.320313 0.699219 31.640625 1.960938 30.378906 L 30.378906 1.960938 C 31.640625 0.699219 33.320313 0 35 0 C 36.679688 0 38.359375 0.699219 39.621094 1.960938 L 68.179688 30.519531 C 69.441406 31.78125 70.140625 33.320313 70.140625 35.140625 C 70.140625 36.960938 69.441406 38.5 68.179688 39.761719 L 39.621094 68.039063 C 38.359375 69.300781 36.679688 70 35 70 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 16.800781 28.558594 L 9.800781 28.558594 L 9.800781 42.140625 C 9.800781 43.539063 12.878906 44.660156 16.660156 44.660156 L 16.800781 44.660156 C 20.71875 44.660156 23.800781 43.539063 23.800781 42.140625 L 23.800781 28.558594 Z M 16.800781 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 16.800781 28.558594 L 16.800781 44.660156 C 20.71875 44.660156 23.800781 43.539063 23.800781 42.140625 L 23.800781 28.558594 Z M 16.800781 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 23.800781 28.558594 C 23.800781 30.378906 20.71875 31.78125 16.800781 31.78125 C 12.878906 31.78125 9.800781 30.378906 9.800781 28.558594 C 9.800781 26.738281 12.878906 25.339844 16.800781 25.339844 C 20.71875 25.339844 23.800781 26.738281 23.800781 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 21.980469 28.558594 C 21.980469 29.539063 19.738281 30.378906 16.800781 30.378906 C 13.859375 30.378906 11.621094 29.539063 11.621094 28.558594 C 11.621094 27.578125 13.859375 26.738281 16.800781 26.738281 C 19.738281 26.738281 21.980469 27.578125 21.980469 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 53.199219 28.558594 L 46.199219 28.558594 L 46.199219 42.140625 C 46.199219 43.539063 49.28125 44.660156 53.058594 44.660156 L 53.199219 44.660156 C 57.121094 44.660156 60.199219 43.539063 60.199219 42.140625 L 60.199219 28.558594 Z M 53.199219 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 53.199219 28.558594 L 53.199219 44.660156 C 57.121094 44.660156 60.199219 43.539063 60.199219 42.140625 L 60.199219 28.558594 Z M 53.199219 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.199219 28.558594 C 60.199219 30.378906 57.121094 31.78125 53.199219 31.78125 C 49.28125 31.78125 46.199219 30.378906 46.199219 28.558594 C 46.199219 26.738281 49.28125 25.339844 53.199219 25.339844 C 57.121094 25.339844 60.199219 26.738281 60.199219 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 58.378906 28.558594 C 58.378906 29.539063 56.140625 30.378906 53.199219 30.378906 C 50.261719 30.378906 48.019531 29.539063 48.019531 28.558594 C 48.019531 27.578125 50.261719 26.738281 53.199219 26.738281 C 56.140625 26.738281 58.378906 27.578125 58.378906 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 35 10.359375 L 28 10.359375 L 28 23.941406 C 28 25.339844 31.078125 26.460938 34.859375 26.460938 L 35 26.460938 C 38.921875 26.460938 42 25.339844 42 23.941406 L 42 10.359375 Z M 35 10.359375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35 10.359375 L 35 26.460938 C 38.921875 26.460938 42 25.339844 42 23.941406 L 42 10.359375 Z M 35 10.359375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 42 10.359375 C 42 12.179688 38.921875 13.578125 35 13.578125 C 31.078125 13.578125 28 12.179688 28 10.359375 C 28 8.539063 31.078125 7.140625 35 7.140625 C 38.921875 7.140625 42 8.539063 42 10.359375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 40.179688 10.359375 C 40.179688 11.339844 37.941406 12.179688 35 12.179688 C 32.058594 12.179688 29.820313 11.339844 29.820313 10.359375 C 29.820313 9.378906 32.199219 8.539063 35 8.539063 C 37.800781 8.539063 40.179688 9.378906 40.179688 10.359375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 35 46.761719 L 28 46.761719 L 28 60.339844 C 28 61.738281 31.078125 62.859375 34.859375 62.859375 L 35 62.859375 C 38.921875 62.859375 42 61.738281 42 60.339844 L 42 46.761719 Z M 35 46.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35 46.761719 L 35 62.859375 C 38.921875 62.859375 42 61.738281 42 60.339844 L 42 46.761719 Z M 35 46.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 42 46.761719 C 42 48.578125 38.921875 49.980469 35 49.980469 C 31.078125 49.980469 28 48.578125 28 46.761719 C 28 44.941406 31.078125 43.539063 35 43.539063 C 38.921875 43.539063 42 44.941406 42 46.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 40.179688 46.761719 C 40.179688 47.738281 37.941406 48.578125 35 48.578125 C 32.058594 48.578125 29.820313 47.738281 29.820313 46.761719 C 29.820313 45.78125 32.058594 44.941406 35 44.941406 C 37.941406 44.941406 40.179688 45.78125 40.179688 46.761719 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureElasticDatabasePool.png b/dist/Databases/AzureElasticDatabasePool.png
new file mode 100644
index 00000000..fc0c6028
Binary files /dev/null and b/dist/Databases/AzureElasticDatabasePool.png differ
diff --git a/dist/Databases/AzureElasticDatabasePool.puml b/dist/Databases/AzureElasticDatabasePool.puml
new file mode 100644
index 00000000..d9733ca4
--- /dev/null
+++ b/dist/Databases/AzureElasticDatabasePool.puml
@@ -0,0 +1,13 @@
+sprite $AzureElasticDatabasePool [70x70/16z] {
+fTS73kGe48NXLr09kFzzrp9IoLhcQGRrhzJnws2RWB_KFJDCy4iIkUk_8Zlz2I7C7KAPUuGpzqWnzuZttgHrYsBk4GNGdWHezS0zqZns2icdeTT82bxahS4p
+SqwzHL8XjWrlxuDpBS9mP5y_yWIWQUHOYp4SoOXmxRsrrbKrnboKuKZ6plGjDd8m125AhaKOWZ25CnpXIZ4SuGfX248Lpd24AyLmX2k48GXLECCHhXH34AxO
+M8Gv43TLyuzJIY5pX9j7piqSY3LWrpvGZjZlsOOATgApc0_I8Uhnv0fO6NDz6e9k-mjso2Yca8H41JcGDuFMQnIsYgd_1AXNz58sKZd4O-S2hR-ua7G1Mdzg
+WEY1l0q5f7NjJO3cgvZFo6PT180qrVs_ZFL_9SAQ223ILNtjPkjPoaxVx4NcgRovldazx4mv4Qwiv4eXloWdmfLWobWNYX5bp1j5Y3BNXHBeVrRMXJ84wByg
+K_3KVr8sKioz4eKSp4O-a_8OOzQT_2W-ztzIVVuRCwkXRNh7MxDHw3kmciTOXNoPOqWP0kdsf0tmTLJ8oOnLTLZKc8H1aPCPSrKDfOGWA78o7sGvqDJSJJlG
+aY07iv4gGnjsJJK9SZ0R-IXFRhhB0o7feP1vkX3ES8KZdE5A8PoX2a48mnIES8Oh0qUCuKe25mnH248OeX24CASo2hbZnbUnMSWbCqTknJmBkMSUQCuQTmkv
+Oog2t3E5t3C4kMSuSiy4VgdbFsrQ_mC
+}
+
+AzureEntityColoring(AzureElasticDatabasePool)
+!define AzureElasticDatabasePool(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureElasticDatabasePool, AzureElasticDatabasePool)
+!define AzureElasticDatabasePool(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureElasticDatabasePool, AzureElasticDatabasePool)
diff --git a/dist/Databases/AzureElasticDatabasePool.svg b/dist/Databases/AzureElasticDatabasePool.svg
new file mode 100644
index 00000000..78d16004
--- /dev/null
+++ b/dist/Databases/AzureElasticDatabasePool.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.898438 9.238281 L 39.621094 1.960938 C 38.359375 0.699219 36.679688 0 35 0 C 33.320313 0 31.640625 0.699219 30.378906 1.960938 L 1.960938 30.378906 C 0.699219 31.640625 0 33.320313 0 35 C 0 36.679688 0.699219 38.359375 1.960938 39.621094 L 13.578125 51.238281 Z M 46.898438 9.238281 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 35 70 C 33.320313 70 31.640625 69.300781 30.378906 68.039063 L 1.960938 39.621094 C 0.699219 38.359375 0 36.679688 0 35 C 0 33.320313 0.699219 31.640625 1.960938 30.378906 L 30.378906 1.960938 C 31.640625 0.699219 33.320313 0 35 0 C 36.679688 0 38.359375 0.699219 39.621094 1.960938 L 68.179688 30.519531 C 69.441406 31.78125 70.140625 33.320313 70.140625 35.140625 C 70.140625 36.960938 69.441406 38.5 68.179688 39.761719 L 39.621094 68.039063 C 38.359375 69.300781 36.679688 70 35 70 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 16.800781 28.558594 L 9.800781 28.558594 L 9.800781 42.140625 C 9.800781 43.539063 12.878906 44.660156 16.660156 44.660156 L 16.800781 44.660156 C 20.71875 44.660156 23.800781 43.539063 23.800781 42.140625 L 23.800781 28.558594 Z M 16.800781 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 16.800781 28.558594 L 16.800781 44.660156 C 20.71875 44.660156 23.800781 43.539063 23.800781 42.140625 L 23.800781 28.558594 Z M 16.800781 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 23.800781 28.558594 C 23.800781 30.378906 20.71875 31.78125 16.800781 31.78125 C 12.878906 31.78125 9.800781 30.378906 9.800781 28.558594 C 9.800781 26.738281 12.878906 25.339844 16.800781 25.339844 C 20.71875 25.339844 23.800781 26.738281 23.800781 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 21.980469 28.558594 C 21.980469 29.539063 19.738281 30.378906 16.800781 30.378906 C 13.859375 30.378906 11.621094 29.539063 11.621094 28.558594 C 11.621094 27.578125 13.859375 26.738281 16.800781 26.738281 C 19.738281 26.738281 21.980469 27.578125 21.980469 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 53.199219 28.558594 L 46.199219 28.558594 L 46.199219 42.140625 C 46.199219 43.539063 49.28125 44.660156 53.058594 44.660156 L 53.199219 44.660156 C 57.121094 44.660156 60.199219 43.539063 60.199219 42.140625 L 60.199219 28.558594 Z M 53.199219 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 53.199219 28.558594 L 53.199219 44.660156 C 57.121094 44.660156 60.199219 43.539063 60.199219 42.140625 L 60.199219 28.558594 Z M 53.199219 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.199219 28.558594 C 60.199219 30.378906 57.121094 31.78125 53.199219 31.78125 C 49.28125 31.78125 46.199219 30.378906 46.199219 28.558594 C 46.199219 26.738281 49.28125 25.339844 53.199219 25.339844 C 57.121094 25.339844 60.199219 26.738281 60.199219 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 58.378906 28.558594 C 58.378906 29.539063 56.140625 30.378906 53.199219 30.378906 C 50.261719 30.378906 48.019531 29.539063 48.019531 28.558594 C 48.019531 27.578125 50.261719 26.738281 53.199219 26.738281 C 56.140625 26.738281 58.378906 27.578125 58.378906 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 35 10.359375 L 28 10.359375 L 28 23.941406 C 28 25.339844 31.078125 26.460938 34.859375 26.460938 L 35 26.460938 C 38.921875 26.460938 42 25.339844 42 23.941406 L 42 10.359375 Z M 35 10.359375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35 10.359375 L 35 26.460938 C 38.921875 26.460938 42 25.339844 42 23.941406 L 42 10.359375 Z M 35 10.359375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 42 10.359375 C 42 12.179688 38.921875 13.578125 35 13.578125 C 31.078125 13.578125 28 12.179688 28 10.359375 C 28 8.539063 31.078125 7.140625 35 7.140625 C 38.921875 7.140625 42 8.539063 42 10.359375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 40.179688 10.359375 C 40.179688 11.339844 37.941406 12.179688 35 12.179688 C 32.058594 12.179688 29.820313 11.339844 29.820313 10.359375 C 29.820313 9.378906 32.199219 8.539063 35 8.539063 C 37.800781 8.539063 40.179688 9.378906 40.179688 10.359375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 35 46.761719 L 28 46.761719 L 28 60.339844 C 28 61.738281 31.078125 62.859375 34.859375 62.859375 L 35 62.859375 C 38.921875 62.859375 42 61.738281 42 60.339844 L 42 46.761719 Z M 35 46.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35 46.761719 L 35 62.859375 C 38.921875 62.859375 42 61.738281 42 60.339844 L 42 46.761719 Z M 35 46.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 42 46.761719 C 42 48.578125 38.921875 49.980469 35 49.980469 C 31.078125 49.980469 28 48.578125 28 46.761719 C 28 44.941406 31.078125 43.539063 35 43.539063 C 38.921875 43.539063 42 44.941406 42 46.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 40.179688 46.761719 C 40.179688 47.738281 37.941406 48.578125 35 48.578125 C 32.058594 48.578125 29.820313 47.738281 29.820313 46.761719 C 29.820313 45.78125 32.058594 44.941406 35 44.941406 C 37.941406 44.941406 40.179688 45.78125 40.179688 46.761719 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureElasticJobAgent(m).png b/dist/Databases/AzureElasticJobAgent(m).png
new file mode 100644
index 00000000..3e557211
Binary files /dev/null and b/dist/Databases/AzureElasticJobAgent(m).png differ
diff --git a/dist/Databases/AzureElasticJobAgent(m).svg b/dist/Databases/AzureElasticJobAgent(m).svg
new file mode 100644
index 00000000..523b352d
--- /dev/null
+++ b/dist/Databases/AzureElasticJobAgent(m).svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="58pt" height="70pt" viewBox="0 0 58 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(59,171,255);fill-opacity:1;" d="M 45.847656 33.277344 C 39.707031 33.265625 34.1875 29.496094 31.914063 23.757813 C 29.636719 18.023438 31.0625 11.46875 35.507813 7.210938 L 28.683594 7.210938 L 28.683594 41.445313 L 33.175781 41.445313 L 33.175781 50.566406 C 36.976563 50.378906 40.730469 49.636719 44.320313 48.367188 L 40.980469 44.976563 L 38.933594 42.921875 L 40.980469 40.863281 L 43.253906 38.578125 L 45.300781 36.519531 L 47.34375 38.578125 L 49.304688 40.546875 L 49.304688 32.871094 C 48.171875 33.140625 47.011719 33.277344 45.847656 33.277344 Z M 45.847656 33.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 13.507813 48.308594 C 16.949219 49.542969 20.542969 50.285156 24.191406 50.511719 L 24.191406 41.445313 L 28.886719 41.445313 L 28.886719 7.179688 L 8.582031 7.179688 L 8.582031 40.488281 L 10.453125 38.605469 L 12.5 36.550781 L 14.542969 38.605469 L 16.816406 40.894531 L 18.863281 42.949219 L 16.816406 45.007813 Z M 13.507813 48.308594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.15625 2.980469 C 39.980469 0.964844 34.464844 -0.0195313 28.914063 0.0859375 C 17.710938 0.285156 8.582031 3.445313 8.582031 7.179688 C 8.582031 10.917969 17.828125 14.074219 29 14.074219 L 31.390625 14.074219 C 33.113281 7.773438 38.664063 3.296875 45.15625 2.980469 Z M 45.15625 2.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 27.070313 44.339844 L 27.070313 63.515625 L 21.972656 58.359375 L 19.699219 60.675781 L 26.40625 67.425781 L 28.683594 69.714844 L 30.988281 67.425781 L 37.695313 60.675781 L 35.421875 58.359375 L 30.296875 63.515625 L 30.296875 44.339844 Z M 14.773438 42.921875 L 12.5 40.632813 L 3.226563 49.960938 L 3.226563 42.691406 L 0 42.691406 L 0 55.492188 L 12.730469 55.492188 L 12.730469 52.246094 L 5.5 52.246094 Z M 14.773438 42.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 58 18.128906 C 58 11.378906 52.558594 5.90625 45.847656 5.90625 C 39.136719 5.90625 33.695313 11.378906 33.695313 18.128906 C 33.695313 24.878906 39.136719 30.351563 45.847656 30.351563 C 52.558594 30.351563 58 24.878906 58 18.128906 Z M 58 18.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.070313 7.703125 C 39.328125 8.324219 35.175781 13.511719 35.796875 19.285156 C 36.296875 24.015625 39.902344 27.8125 44.578125 28.535156 C 49.25 29.257813 53.824219 26.726563 55.714844 22.371094 C 57.609375 18.011719 56.347656 12.917969 52.644531 9.960938 C 50.8125 8.484375 48.539063 7.675781 46.191406 7.671875 C 45.820313 7.707031 45.441406 7.707031 45.070313 7.671875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 57.914063 16.882813 C 57.566406 13.605469 55.914063 10.605469 53.335938 8.570313 C 52.84375 8.222656 52.355469 7.847656 51.835938 7.585938 L 50.859375 9.4375 C 51.257813 9.660156 51.636719 9.921875 51.980469 10.222656 C 54.109375 11.910156 55.460938 14.398438 55.726563 17.113281 C 56.015625 19.796875 55.230469 22.484375 53.542969 24.582031 C 51.855469 26.683594 49.410156 28.019531 46.738281 28.292969 C 44.949219 28.492188 43.140625 28.203125 41.5 27.453125 L 40.519531 29.308594 C 42.523438 30.285156 44.761719 30.65625 46.96875 30.378906 C 50.210938 30.027344 53.179688 28.40625 55.234375 25.863281 C 57.292969 23.355469 58.257813 20.117188 57.914063 16.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(59,171,255);fill-opacity:1;" d="M 39.425781 26.152344 C 35.269531 22.808594 34.398438 16.796875 37.4375 12.40625 C 40.476563 8.011719 46.382813 6.738281 50.945313 9.496094 L 51.953125 7.644531 C 49.78125 6.292969 47.238281 5.671875 44.695313 5.875 C 41.398438 6.234375 38.378906 7.902344 36.316406 10.511719 C 34.273438 13.027344 33.328125 16.265625 33.695313 19.488281 C 34.050781 22.722656 35.652344 25.6875 38.15625 27.746094 C 38.941406 28.375 39.804688 28.898438 40.722656 29.308594 L 41.816406 27.453125 C 40.964844 27.128906 40.160156 26.691406 39.425781 26.152344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,141,246);fill-opacity:1;" d="M 51.03125 21.34375 L 46.367188 19.632813 C 46.019531 19.519531 45.761719 19.21875 45.703125 18.855469 C 45.640625 18.492188 45.78125 18.125 46.074219 17.902344 C 46.363281 17.675781 46.75 17.628906 47.085938 17.78125 L 51.75 19.488281 C 51.996094 19.582031 52.195313 19.765625 52.304688 20.007813 C 52.410156 20.246094 52.417969 20.519531 52.328125 20.765625 C 52.105469 21.261719 51.546875 21.507813 51.03125 21.34375 Z M 51.03125 21.34375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 45.789063 20.128906 C 44.898438 20.128906 44.175781 19.402344 44.175781 18.503906 L 44.175781 10.191406 C 44.175781 9.289063 44.90625 8.554688 45.804688 8.554688 C 46.703125 8.554688 47.429688 9.289063 47.429688 10.191406 L 47.429688 18.503906 C 47.429688 18.941406 47.257813 19.355469 46.949219 19.664063 C 46.640625 19.96875 46.222656 20.136719 45.789063 20.128906 Z M 45.789063 20.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.789063 9.179688 C 46.332031 9.179688 46.769531 9.621094 46.769531 10.164063 L 46.769531 18.503906 C 46.769531 19.058594 46.324219 19.503906 45.773438 19.503906 C 45.226563 19.503906 44.78125 19.058594 44.78125 18.503906 L 44.78125 10.191406 C 44.78125 9.648438 45.21875 9.207031 45.761719 9.207031 M 45.761719 7.933594 C 45.164063 7.925781 44.585938 8.160156 44.164063 8.585938 C 43.742188 9.011719 43.507813 9.589844 43.515625 10.191406 L 43.515625 18.503906 C 43.515625 19.753906 44.519531 20.765625 45.761719 20.765625 C 47 20.765625 48.007813 19.753906 48.007813 18.503906 L 48.007813 10.191406 C 48.015625 9.589844 47.78125 9.011719 47.359375 8.585938 C 46.933594 8.160156 46.359375 7.925781 45.761719 7.933594 Z M 45.761719 7.933594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 47.171875 18.503906 C 47.171875 19.289063 46.539063 19.925781 45.761719 19.925781 C 44.980469 19.925781 44.347656 19.289063 44.347656 18.503906 C 44.347656 17.722656 44.980469 17.085938 45.761719 17.085938 C 46.539063 17.085938 47.171875 17.722656 47.171875 18.503906 Z M 47.171875 18.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 57.796875 55.492188 L 57.796875 42.691406 L 54.574219 42.691406 L 54.574219 49.960938 L 45.300781 40.632813 L 43.023438 42.921875 L 52.296875 52.246094 L 45.070313 52.246094 L 45.070313 55.492188 Z M 57.796875 55.492188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55,170,255);fill-opacity:1;" d="M 41.152344 3.792969 C 37.160156 2.675781 33.027344 2.148438 28.886719 2.226563 C 19.984375 2.226563 12.699219 4.253906 12.699219 6.804688 C 12.699219 9.351563 20.074219 11.378906 29 11.378906 L 32.484375 11.378906 C 34.265625 7.800781 37.382813 5.070313 41.152344 3.792969 Z M 41.152344 3.792969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 41.125 3.792969 C 37.144531 2.667969 33.019531 2.140625 28.886719 2.226563 C 19.984375 2.226563 12.699219 4.253906 12.699219 6.804688 C 12.699219 7.816406 13.996094 8.832031 16.070313 9.554688 C 20.21875 8.269531 24.546875 7.683594 28.886719 7.816406 C 30.808594 7.8125 32.730469 7.910156 34.644531 8.105469 C 36.390625 6.125 38.625 4.636719 41.125 3.792969 Z M 41.125 3.792969 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureElasticJobAgent.png b/dist/Databases/AzureElasticJobAgent.png
new file mode 100644
index 00000000..ea00cfc1
Binary files /dev/null and b/dist/Databases/AzureElasticJobAgent.png differ
diff --git a/dist/Databases/AzureElasticJobAgent.puml b/dist/Databases/AzureElasticJobAgent.puml
new file mode 100644
index 00000000..748fcd90
--- /dev/null
+++ b/dist/Databases/AzureElasticJobAgent.puml
@@ -0,0 +1,12 @@
+sprite $AzureElasticJobAgent [58x70/16z] {
+pTQ7ig9048NXq-dG6z__SVSYNGvTGucp-JVhV2KPy9yaQZuoa_UKNwStJkFQXTt0cLIuIQzPwF4Zz-R95g3FOnmLL3wBRc77R1w4vnI0apIfVzxOf1DxLcha
+088q0E80O9biCZT5pUrPnmE6F0oFEUxKCvCwPbjKrJxI7H0uf1q_PdgNcLlejE24b2vXcT9bQJUL8PqET0ccTzdR6060n2GjiycP4X36B94fhsMCuLrkQQ-b
+z-5VYIhItv2AwjltB-go8CVCVMTy-aG5m3iPWD8nKkQdVCodlh5iYPOf8BVBbW845K3FaxYH1YXZafbs9maWQEWnDznA0uJK1YDJxYK166aT6jwGVj0m7DbM
+y4OMLJAtS0_kNmlUaxJs-sR0kvAEFVK8Dm4MP5ksYv9XiYn7xkOUgtBqlyW0NqkLQna0jbTI0BsI11gTf0A0p5A1HYUfRLnFGWQDFV_e1DrncP219mMg4oJF
+bAGKh05n9G4WI1fGRxNaW9ubeQeb6sroXdcO8MFG9ZliSgP3DZZ9cGxvW0P0yuMa0v23bjI2U-gybguOgy1A7d0avi6d31yN70SzqWPR9QVaBCCUwPsqHrxo
+bDz8OVMBCaxPdOnJYjOaR_elPFX9MYn0qf_Io5YHj9B6aYkKv28iwlKek42hHGXvIi4gRN2T5bod1TTfl8G_
+}
+
+AzureEntityColoring(AzureElasticJobAgent)
+!define AzureElasticJobAgent(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureElasticJobAgent, AzureElasticJobAgent)
+!define AzureElasticJobAgent(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureElasticJobAgent, AzureElasticJobAgent)
diff --git a/dist/Databases/AzureElasticJobAgent.svg b/dist/Databases/AzureElasticJobAgent.svg
new file mode 100644
index 00000000..b0240aed
--- /dev/null
+++ b/dist/Databases/AzureElasticJobAgent.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="58pt" height="70pt" viewBox="0 0 58 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(35.686275%,70.588235%,85.490196%);fill-opacity:1;" d="M 45.847656 33.277344 C 39.707031 33.265625 34.1875 29.496094 31.914063 23.757813 C 29.636719 18.023438 31.0625 11.46875 35.507813 7.210938 L 28.683594 7.210938 L 28.683594 41.445313 L 33.175781 41.445313 L 33.175781 50.566406 C 36.976563 50.378906 40.730469 49.636719 44.320313 48.367188 L 40.980469 44.976563 L 38.933594 42.921875 L 40.980469 40.863281 L 43.253906 38.578125 L 45.300781 36.519531 L 47.34375 38.578125 L 49.304688 40.546875 L 49.304688 32.871094 C 48.171875 33.140625 47.011719 33.277344 45.847656 33.277344 Z M 45.847656 33.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,78.039216%);fill-opacity:1;" d="M 13.507813 48.308594 C 16.949219 49.542969 20.542969 50.285156 24.191406 50.511719 L 24.191406 41.445313 L 28.886719 41.445313 L 28.886719 7.179688 L 8.582031 7.179688 L 8.582031 40.488281 L 10.453125 38.605469 L 12.5 36.550781 L 14.542969 38.605469 L 16.816406 40.894531 L 18.863281 42.949219 L 16.816406 45.007813 Z M 13.507813 48.308594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.15625 2.980469 C 39.980469 0.964844 34.464844 -0.0195313 28.914063 0.0859375 C 17.710938 0.285156 8.582031 3.445313 8.582031 7.179688 C 8.582031 10.917969 17.828125 14.074219 29 14.074219 L 31.390625 14.074219 C 33.113281 7.773438 38.664063 3.296875 45.15625 2.980469 Z M 45.15625 2.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.352941%,62.745098%,63.529412%);fill-opacity:1;" d="M 27.070313 44.339844 L 27.070313 63.515625 L 21.972656 58.359375 L 19.699219 60.675781 L 26.40625 67.425781 L 28.683594 69.714844 L 30.988281 67.425781 L 37.695313 60.675781 L 35.421875 58.359375 L 30.296875 63.515625 L 30.296875 44.339844 Z M 14.773438 42.921875 L 12.5 40.632813 L 3.226563 49.960938 L 3.226563 42.691406 L 0 42.691406 L 0 55.492188 L 12.730469 55.492188 L 12.730469 52.246094 L 5.5 52.246094 Z M 14.773438 42.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 58 18.128906 C 58 11.378906 52.558594 5.90625 45.847656 5.90625 C 39.136719 5.90625 33.695313 11.378906 33.695313 18.128906 C 33.695313 24.878906 39.136719 30.351563 45.847656 30.351563 C 52.558594 30.351563 58 24.878906 58 18.128906 Z M 58 18.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.070313 7.703125 C 39.328125 8.324219 35.175781 13.511719 35.796875 19.285156 C 36.296875 24.015625 39.902344 27.8125 44.578125 28.535156 C 49.25 29.257813 53.824219 26.726563 55.714844 22.371094 C 57.609375 18.011719 56.347656 12.917969 52.644531 9.960938 C 50.8125 8.484375 48.539063 7.675781 46.191406 7.671875 C 45.820313 7.707031 45.441406 7.707031 45.070313 7.671875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,78.039216%);fill-opacity:1;" d="M 57.914063 16.882813 C 57.566406 13.605469 55.914063 10.605469 53.335938 8.570313 C 52.84375 8.222656 52.355469 7.847656 51.835938 7.585938 L 50.859375 9.4375 C 51.257813 9.660156 51.636719 9.921875 51.980469 10.222656 C 54.109375 11.910156 55.460938 14.398438 55.726563 17.113281 C 56.015625 19.796875 55.230469 22.484375 53.542969 24.582031 C 51.855469 26.683594 49.410156 28.019531 46.738281 28.292969 C 44.949219 28.492188 43.140625 28.203125 41.5 27.453125 L 40.519531 29.308594 C 42.523438 30.285156 44.761719 30.65625 46.96875 30.378906 C 50.210938 30.027344 53.179688 28.40625 55.234375 25.863281 C 57.292969 23.355469 58.257813 20.117188 57.914063 16.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(35.686275%,70.588235%,85.490196%);fill-opacity:1;" d="M 39.425781 26.152344 C 35.269531 22.808594 34.398438 16.796875 37.4375 12.40625 C 40.476563 8.011719 46.382813 6.738281 50.945313 9.496094 L 51.953125 7.644531 C 49.78125 6.292969 47.238281 5.671875 44.695313 5.875 C 41.398438 6.234375 38.378906 7.902344 36.316406 10.511719 C 34.273438 13.027344 33.328125 16.265625 33.695313 19.488281 C 34.050781 22.722656 35.652344 25.6875 38.15625 27.746094 C 38.941406 28.375 39.804688 28.898438 40.722656 29.308594 L 41.816406 27.453125 C 40.964844 27.128906 40.160156 26.691406 39.425781 26.152344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(48.627451%,48.235294%,48.235294%);fill-opacity:1;" d="M 51.03125 21.34375 L 46.367188 19.632813 C 46.019531 19.519531 45.761719 19.21875 45.703125 18.855469 C 45.640625 18.492188 45.78125 18.125 46.074219 17.902344 C 46.363281 17.675781 46.75 17.628906 47.085938 17.78125 L 51.75 19.488281 C 51.996094 19.582031 52.195313 19.765625 52.304688 20.007813 C 52.410156 20.246094 52.417969 20.519531 52.328125 20.765625 C 52.105469 21.261719 51.546875 21.507813 51.03125 21.34375 Z M 51.03125 21.34375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.352941%,62.745098%,63.529412%);fill-opacity:1;" d="M 45.789063 20.128906 C 44.898438 20.128906 44.175781 19.402344 44.175781 18.503906 L 44.175781 10.191406 C 44.175781 9.289063 44.90625 8.554688 45.804688 8.554688 C 46.703125 8.554688 47.429688 9.289063 47.429688 10.191406 L 47.429688 18.503906 C 47.429688 18.941406 47.257813 19.355469 46.949219 19.664063 C 46.640625 19.96875 46.222656 20.136719 45.789063 20.128906 Z M 45.789063 20.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.789063 9.179688 C 46.332031 9.179688 46.769531 9.621094 46.769531 10.164063 L 46.769531 18.503906 C 46.769531 19.058594 46.324219 19.503906 45.773438 19.503906 C 45.226563 19.503906 44.78125 19.058594 44.78125 18.503906 L 44.78125 10.191406 C 44.78125 9.648438 45.21875 9.207031 45.761719 9.207031 M 45.761719 7.933594 C 45.164063 7.925781 44.585938 8.160156 44.164063 8.585938 C 43.742188 9.011719 43.507813 9.589844 43.515625 10.191406 L 43.515625 18.503906 C 43.515625 19.753906 44.519531 20.765625 45.761719 20.765625 C 47 20.765625 48.007813 19.753906 48.007813 18.503906 L 48.007813 10.191406 C 48.015625 9.589844 47.78125 9.011719 47.359375 8.585938 C 46.933594 8.160156 46.359375 7.925781 45.761719 7.933594 Z M 45.761719 7.933594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 47.171875 18.503906 C 47.171875 19.289063 46.539063 19.925781 45.761719 19.925781 C 44.980469 19.925781 44.347656 19.289063 44.347656 18.503906 C 44.347656 17.722656 44.980469 17.085938 45.761719 17.085938 C 46.539063 17.085938 47.171875 17.722656 47.171875 18.503906 Z M 47.171875 18.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.352941%,62.745098%,63.529412%);fill-opacity:1;" d="M 57.796875 55.492188 L 57.796875 42.691406 L 54.574219 42.691406 L 54.574219 49.960938 L 45.300781 40.632813 L 43.023438 42.921875 L 52.296875 52.246094 L 45.070313 52.246094 L 45.070313 55.492188 Z M 57.796875 55.492188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 41.152344 3.792969 C 37.160156 2.675781 33.027344 2.148438 28.886719 2.226563 C 19.984375 2.226563 12.699219 4.253906 12.699219 6.804688 C 12.699219 9.351563 20.074219 11.378906 29 11.378906 L 32.484375 11.378906 C 34.265625 7.800781 37.382813 5.070313 41.152344 3.792969 Z M 41.152344 3.792969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 41.125 3.792969 C 37.144531 2.667969 33.019531 2.140625 28.886719 2.226563 C 19.984375 2.226563 12.699219 4.253906 12.699219 6.804688 C 12.699219 7.816406 13.996094 8.832031 16.070313 9.554688 C 20.21875 8.269531 24.546875 7.683594 28.886719 7.816406 C 30.808594 7.8125 32.730469 7.910156 34.644531 8.105469 C 36.390625 6.125 38.625 4.636719 41.125 3.792969 Z M 41.125 3.792969 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureManagedDatabase(m).png b/dist/Databases/AzureManagedDatabase(m).png
new file mode 100644
index 00000000..028db7ff
Binary files /dev/null and b/dist/Databases/AzureManagedDatabase(m).png differ
diff --git a/dist/Databases/AzureManagedDatabase(m).svg b/dist/Databases/AzureManagedDatabase(m).svg
new file mode 100644
index 00000000..3d76dd2c
--- /dev/null
+++ b/dist/Databases/AzureManagedDatabase(m).svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65pt" height="70pt" viewBox="0 0 65 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 48.75 14.410156 L 48.75 10.289063 C 48.75 4.609375 37.839844 0 24.375 0 C 10.910156 0 0 4.609375 0 10.289063 L 0 14.410156 C 0 20.089844 10.910156 24.699219 24.375 24.699219 C 37.839844 24.699219 48.75 20.089844 48.75 14.410156 Z M 48.75 14.410156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,130,226);fill-opacity:1;" d="M 24.375 70 C 11.046875 70 0.164063 65.6875 0 59.707031 L 0 14.410156 C 0.167969 20.394531 11.050781 24.703125 24.375 24.703125 C 37.699219 24.703125 48.585938 20.394531 48.753906 14.410156 L 48.753906 59.707031 C 48.582031 65.6875 37.699219 70 24.375 70 Z M 24.375 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(169,218,255);fill-opacity:1;" d="M 42.65625 11.320313 C 42.65625 7.339844 34.472656 4.113281 24.375 4.113281 C 14.277344 4.113281 6.09375 7.339844 6.09375 11.320313 C 6.09375 15.300781 14.277344 18.527344 24.375 18.527344 C 34.472656 18.527344 42.65625 15.300781 42.65625 11.320313 Z M 42.65625 11.320313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 9.839844 15.6875 C 13.179688 13.96875 18.449219 12.855469 24.375 12.855469 C 30.300781 12.855469 35.570313 13.96875 38.910156 15.6875 C 35.570313 17.414063 30.300781 18.527344 24.375 18.527344 C 18.449219 18.527344 13.179688 17.414063 9.839844 15.6875 Z M 9.839844 15.6875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 24.375 24.703125 L 24.375 70 C 10.910156 70 0 65.765625 0 59.707031 L 0 14.410156 C 0 20.472656 10.910156 24.703125 24.375 24.703125 Z M 24.375 24.703125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(193,228,255);fill-opacity:1;" d="M 56.875 70 C 61.363281 70 65 66.316406 65 61.765625 C 65 56.855469 60.8125 53.066406 56.019531 53.574219 C 58.601563 40.871094 49.046875 28.820313 36.125 28.820313 C 27.660156 28.820313 20.40625 34.066406 17.355469 41.523438 C 8.519531 39.511719 0 46.300781 0 55.585938 C 0 63.546875 6.367188 70 14.21875 70 Z M 56.875 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 56.023438 45.25 C 54.125 35.875 45.933594 28.820313 36.125 28.820313 C 27.660156 28.820313 20.40625 34.066406 17.355469 41.523438 C 16.347656 41.292969 15.296875 41.175781 14.21875 41.175781 C 6.367188 41.175781 0 47.628906 0 55.585938 C 0 63.546875 6.367188 70 14.21875 70 L 23.777344 70 C 17.402344 70 12.234375 64.761719 12.234375 58.300781 C 12.234375 51.839844 17.402344 46.597656 23.777344 46.597656 C 24.65625 46.597656 25.503906 46.695313 26.324219 46.886719 C 28.804688 40.832031 34.691406 36.570313 41.558594 36.570313 C 47.792969 36.570313 53.21875 40.078125 56.023438 45.25 Z M 56.023438 45.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,78,136);fill-opacity:1;" d="M 24.375 65.882813 L 28.4375 65.882813 L 28.4375 53.527344 L 34.53125 59.707031 L 40.625 53.527344 L 40.625 65.882813 L 44.6875 65.882813 L 44.6875 45.292969 L 40.625 45.292969 L 40.625 47.351563 L 34.53125 53.527344 L 28.4375 47.351563 L 28.4375 45.292969 L 24.375 45.292969 Z M 24.375 65.882813 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureManagedDatabase.png b/dist/Databases/AzureManagedDatabase.png
new file mode 100644
index 00000000..6db031e7
Binary files /dev/null and b/dist/Databases/AzureManagedDatabase.png differ
diff --git a/dist/Databases/AzureManagedDatabase.puml b/dist/Databases/AzureManagedDatabase.puml
new file mode 100644
index 00000000..0a02dc0f
--- /dev/null
+++ b/dist/Databases/AzureManagedDatabase.puml
@@ -0,0 +1,11 @@
+sprite $AzureManagedDatabase [65x70/16z] {
+xTFNWjqW38HXCqXWCE__kYcdZ9jaOtAP_QzIThwLJvdE_HH2mBSGdew1U0peLZW-6yDpTai4xWS5nBimkcUX0nW_8OnTO9yWsnw-Yc9tkSVw5EAttX-EG9wO
+Bs1YSWJgbWmmVZbsFp4VWON2gXZV8-xFm58nzOQv6C1IS-TUIx404Xrp6tWHHQ-FJwMu08qizbXoOGv0f9QIaxxUF216INdcrWFiAYV_Ev2JVD8q0AZioyy0
+bNEv7yXYfhr04gykeAhuzG3STmWFxcTtm2o7OiId-FxxDL0FSwvN0fU0-dCILq1rzqm45b1pKjMqEm1ssnEu5gC8Jy01oDAtPv70rGSFVO2zJ_ESPRj8Vy8Q
+0U-3ExVMCjRapz-h3MJpsVEVmOmrFG21G3MV_0MqzMPPN43Flvq0XRWq3wZMda1JxZqW6_SJU0dSsu3QUm9DkRVV1U-ZHw2bfNK3s0EvK5aI0HRk0TJlNeJ0
+WJ2VW03gPmyJGBW5KDzx1q2u1L1VUm_0f7T0h88B8CoN07C15Daq0cZwHs3QdX07WFtNwJaGzj-dE0HCqH3Yvo-C1nxshu8Xz3LzYsF2j1OU4hp_Dm
+}
+
+AzureEntityColoring(AzureManagedDatabase)
+!define AzureManagedDatabase(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagedDatabase, AzureManagedDatabase)
+!define AzureManagedDatabase(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagedDatabase, AzureManagedDatabase)
diff --git a/dist/Databases/AzureManagedDatabase.svg b/dist/Databases/AzureManagedDatabase.svg
new file mode 100644
index 00000000..60985c33
--- /dev/null
+++ b/dist/Databases/AzureManagedDatabase.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65pt" height="70pt" viewBox="0 0 65 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 48.75 14.410156 L 48.75 10.289063 C 48.75 4.609375 37.839844 0 24.375 0 C 10.910156 0 0 4.609375 0 10.289063 L 0 14.410156 C 0 20.089844 10.910156 24.699219 24.375 24.699219 C 37.839844 24.699219 48.75 20.089844 48.75 14.410156 Z M 48.75 14.410156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.901961%,52.941176%,80.784314%);fill-opacity:1;" d="M 24.375 70 C 11.046875 70 0.164063 65.6875 0 59.707031 L 0 14.410156 C 0.167969 20.394531 11.050781 24.703125 24.375 24.703125 C 37.699219 24.703125 48.585938 20.394531 48.753906 14.410156 L 48.753906 59.707031 C 48.582031 65.6875 37.699219 70 24.375 70 Z M 24.375 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(83.921569%,90.980392%,42.352941%);fill-opacity:1;" d="M 42.65625 11.320313 C 42.65625 7.339844 34.472656 4.113281 24.375 4.113281 C 14.277344 4.113281 6.09375 7.339844 6.09375 11.320313 C 6.09375 15.300781 14.277344 18.527344 24.375 18.527344 C 34.472656 18.527344 42.65625 15.300781 42.65625 11.320313 Z M 42.65625 11.320313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,84.705882%,3.921569%);fill-opacity:1;" d="M 9.839844 15.6875 C 13.179688 13.96875 18.449219 12.855469 24.375 12.855469 C 30.300781 12.855469 35.570313 13.96875 38.910156 15.6875 C 35.570313 17.414063 30.300781 18.527344 24.375 18.527344 C 18.449219 18.527344 13.179688 17.414063 9.839844 15.6875 Z M 9.839844 15.6875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 24.375 24.703125 L 24.375 70 C 10.910156 70 0 65.765625 0 59.707031 L 0 14.410156 C 0 20.472656 10.910156 24.703125 24.375 24.703125 Z M 24.375 24.703125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(75.294118%,92.54902%,98.823529%);fill-opacity:1;" d="M 56.875 70 C 61.363281 70 65 66.316406 65 61.765625 C 65 56.855469 60.8125 53.066406 56.019531 53.574219 C 58.601563 40.871094 49.046875 28.820313 36.125 28.820313 C 27.660156 28.820313 20.40625 34.066406 17.355469 41.523438 C 8.519531 39.511719 0 46.300781 0 55.585938 C 0 63.546875 6.367188 70 14.21875 70 Z M 56.875 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40%,84.313725%,96.862745%);fill-opacity:1;" d="M 56.023438 45.25 C 54.125 35.875 45.933594 28.820313 36.125 28.820313 C 27.660156 28.820313 20.40625 34.066406 17.355469 41.523438 C 16.347656 41.292969 15.296875 41.175781 14.21875 41.175781 C 6.367188 41.175781 0 47.628906 0 55.585938 C 0 63.546875 6.367188 70 14.21875 70 L 23.777344 70 C 17.402344 70 12.234375 64.761719 12.234375 58.300781 C 12.234375 51.839844 17.402344 46.597656 23.777344 46.597656 C 24.65625 46.597656 25.503906 46.695313 26.324219 46.886719 C 28.804688 40.832031 34.691406 36.570313 41.558594 36.570313 C 47.792969 36.570313 53.21875 40.078125 56.023438 45.25 Z M 56.023438 45.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,36.862745%,47.45098%);fill-opacity:1;" d="M 24.375 65.882813 L 28.4375 65.882813 L 28.4375 53.527344 L 34.53125 59.707031 L 40.625 53.527344 L 40.625 65.882813 L 44.6875 65.882813 L 44.6875 45.292969 L 40.625 45.292969 L 40.625 47.351563 L 34.53125 53.527344 L 28.4375 47.351563 L 28.4375 45.292969 L 24.375 45.292969 Z M 24.375 65.882813 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureRedisCache(m).png b/dist/Databases/AzureRedisCache(m).png
deleted file mode 100644
index 857c8951..00000000
Binary files a/dist/Databases/AzureRedisCache(m).png and /dev/null differ
diff --git a/dist/Databases/AzureRedisCache(m).svg b/dist/Databases/AzureRedisCache(m).svg
deleted file mode 100644
index 978aad4d..00000000
--- a/dist/Databases/AzureRedisCache(m).svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="63pt" height="70pt" viewBox="0 0 63 70" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 8.34375 8.023438 C 8.34375 5.632813 16.003906 3.757813 25.539063 3.757813 C 35.074219 3.757813 42.738281 5.632813 42.738281 8.023438 C 42.738281 10.414063 35.074219 12.292969 25.539063 12.292969 C 16.003906 12.292969 8.34375 10.414063 8.34375 8.023438 Z M 23.667969 65.5625 L 23.667969 24.242188 C 23.667969 19.121094 31.671875 16.730469 43.417969 16.730469 C 46.144531 16.730469 48.699219 16.902344 51.082031 17.242188 L 51.082031 8.023438 C 51.082031 3.585938 39.671875 0 25.539063 0 C 11.40625 0 0 3.585938 0 8.023438 L 0 61.292969 C 0 65.730469 11.40625 69.316406 25.539063 69.316406 L 27.242188 69.316406 C 25.03125 68.121094 23.667969 66.925781 23.667969 65.5625 Z M 23.667969 65.5625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 44.175781 29.847656 C 37.363281 29.847656 31.746094 28.480469 31.746094 26.773438 C 31.746094 25.066406 37.363281 23.699219 44.175781 23.699219 C 50.984375 23.699219 56.605469 25.066406 56.605469 26.773438 C 56.605469 28.480469 51.15625 29.847656 44.175781 29.847656 Z M 55.074219 47.089844 L 32.425781 65.871094 L 41.109375 51.359375 L 33.449219 51.359375 L 56.09375 32.578125 L 47.410156 47.089844 Z M 44.175781 19.945313 C 34.128906 19.945313 26.46875 22.503906 26.46875 25.578125 L 26.46875 63.824219 C 26.46875 67.066406 33.960938 69.796875 44.175781 69.796875 C 54.222656 69.796875 62.5625 67.238281 62.5625 63.992188 L 62.5625 25.75 C 62.5625 22.503906 54.390625 19.945313 44.175781 19.945313 Z M 44.175781 19.945313 "/>
-</g>
-</svg>
diff --git a/dist/Databases/AzureRedisCache.png b/dist/Databases/AzureRedisCache.png
deleted file mode 100644
index b0e43262..00000000
Binary files a/dist/Databases/AzureRedisCache.png and /dev/null differ
diff --git a/dist/Databases/AzureRedisCache.puml b/dist/Databases/AzureRedisCache.puml
deleted file mode 100644
index 526c57d7..00000000
--- a/dist/Databases/AzureRedisCache.puml
+++ /dev/null
@@ -1,12 +0,0 @@
-sprite $AzureRedisCache [63x70/16z] {
-rTS7ikCm20PWqq7tlszwI28hqfhj_zHNFXTi6Bnz18b5pJqYMaIucmeJREi0gqSR9rmP9XOrsYgXECRYtJ-6tnFTGPttcEBbJ1ZXyvwGvUscd3gjQGL_vEPa
-Um-_VZrFdkRZ1gBJQ-_RMxfZJYBjdXZnM7cE8Syum-ITocUxvnbNHkWbiQQTydnfpFGQitpY4pxF_yyZujv2SOplcmXmoUTDjERPcsMkhswzpp_FuOUmuAbH
-V3ouQCOVvMMVZhxltAvdzdu0HlHN-FtQ8VBP4RwtaEJaiWcNIVtHsYtudMjEfb7kdghSr_oQO9WCdodF6II403S7cCDdoIVvkpn-Yhlz33UCd-2wMQjpsQXU
-kg1jyp8Fp9sWm0soamjSSq-eSBbgR3KUbArQu86vInMuG-vI1QwvNrMuF3Is0WzwRUotw14Us2zfxG1tsEsN1xZjH_m1xdHBNZ-KNXj-Q2mzTtzjjXLEkLLN
-k6NHAZmWYrRXaaMhSC-YbJXbqIhSicXx7aiUa4NRSrzooQ8DEAru38kMLQ6OBcQDP0YpgA2pjT1jeltRrxiztvEOwPmZf5qDR_sjKypTzvvOzDEHBSPMSHi5
-a5Zq4ii1mMeURukr2kLLdm4
-}
-
-AzureEntityColoring(AzureRedisCache)
-!define AzureRedisCache(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRedisCache, AzureRedisCache)
-!define AzureRedisCache(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRedisCache, AzureRedisCache)
diff --git a/dist/Databases/AzureRedisCache.svg b/dist/Databases/AzureRedisCache.svg
deleted file mode 100644
index 13cc07fc..00000000
--- a/dist/Databases/AzureRedisCache.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.363281 69.488281 L 51.644531 69.488281 C 61.464844 69.488281 69.429688 66.644531 69.429688 63.085938 L 69.429688 28.800781 L 51.363281 28.800781 Z M 51.363281 69.488281 "/>
-</g>
-</defs>
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 0 8.453125 L 0 59.816406 C 0 65.222656 11.953125 69.488281 26.605469 69.488281 L 26.605469 8.453125 Z M 0 8.453125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 26.320313 69.488281 L 26.746094 69.488281 C 41.542969 69.488281 53.355469 65.222656 53.355469 59.816406 L 53.355469 8.453125 L 26.320313 8.453125 Z M 26.320313 69.488281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 53.355469 8.453125 C 53.355469 13.71875 41.402344 18.128906 26.746094 18.128906 C 12.09375 18.128906 0 13.71875 0 8.453125 C 0 3.1875 11.953125 -1.222656 26.605469 -1.222656 C 41.261719 -1.222656 53.355469 3.1875 53.355469 8.453125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 47.945313 7.882813 C 47.945313 11.441406 38.414063 14.285156 26.746094 14.285156 C 15.082031 14.285156 5.40625 11.441406 5.40625 7.882813 C 5.40625 4.328125 14.9375 1.480469 26.605469 1.480469 C 38.273438 1.480469 47.945313 4.328125 47.945313 7.882813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 43.394531 11.726563 C 46.238281 10.585938 47.804688 9.308594 47.804688 7.882813 C 47.804688 4.328125 38.273438 1.480469 26.605469 1.480469 C 14.9375 1.480469 5.40625 4.328125 5.40625 7.882813 C 5.40625 9.308594 7.113281 10.730469 9.816406 11.726563 C 13.660156 10.160156 19.777344 9.308594 26.605469 9.308594 C 33.433594 9.308594 39.554688 10.304688 43.394531 11.726563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.863281 28.800781 L 33.863281 63.085938 C 33.863281 66.644531 41.828125 69.488281 51.644531 69.488281 L 51.644531 28.800781 Z M 33.863281 28.800781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 51.363281 69.488281 L 51.644531 69.488281 C 61.464844 69.488281 69.429688 66.644531 69.429688 63.085938 L 69.429688 28.800781 L 51.363281 28.800781 Z M 51.363281 69.488281 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 69.429688 28.800781 C 69.429688 32.355469 61.464844 35.203125 51.644531 35.203125 C 41.828125 35.203125 33.863281 32.355469 33.863281 28.800781 C 33.863281 25.242188 41.828125 22.398438 51.644531 22.398438 C 61.464844 22.398438 69.429688 25.242188 69.429688 28.800781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 65.730469 28.371094 C 65.730469 30.648438 59.328125 32.640625 51.644531 32.640625 C 43.964844 32.640625 37.5625 30.789063 37.5625 28.371094 C 37.5625 26.097656 43.964844 24.105469 51.644531 24.105469 C 59.328125 24.105469 65.730469 26.097656 65.730469 28.371094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 62.742188 30.933594 C 64.59375 30.222656 65.730469 29.367188 65.730469 28.371094 C 65.730469 26.097656 59.328125 24.105469 51.644531 24.105469 C 43.820313 24.105469 37.5625 25.953125 37.5625 28.371094 C 37.5625 29.367188 38.699219 30.222656 40.546875 30.933594 C 43.109375 29.9375 47.234375 29.226563 51.789063 29.226563 C 56.058594 29.226563 60.039063 29.9375 62.742188 30.933594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.226563 53.269531 L 42.539063 53.269531 L 62.316406 37.050781 L 54.632813 49.570313 L 61.320313 49.570313 L 41.542969 65.933594 Z M 49.226563 53.269531 "/>
-</g>
-</svg>
diff --git a/dist/Databases/AzureRedisCacheforRedis(m).png b/dist/Databases/AzureRedisCacheforRedis(m).png
new file mode 100644
index 00000000..21f8afa5
Binary files /dev/null and b/dist/Databases/AzureRedisCacheforRedis(m).png differ
diff --git a/dist/Databases/AzureRedisCacheforRedis(m).svg b/dist/Databases/AzureRedisCacheforRedis(m).svg
new file mode 100644
index 00000000..d0f07263
--- /dev/null
+++ b/dist/Databases/AzureRedisCacheforRedis(m).svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="66pt" viewBox="0 0 70 66" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="66" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="66"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 20.46875 42.953125 C 13.363281 42.953125 7.425781 40.855469 7.425781 38.34375 L 7.425781 11.210938 L 20.46875 11.523438 Z M 20.46875 42.953125 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="66" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="66"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 48.046875 42.953125 C 40.9375 42.953125 35 40.855469 35 38.34375 L 35 11.210938 L 48.046875 11.523438 Z M 48.046875 42.953125 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="66" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="66"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.726563 42.953125 L 47.726563 30.800781 C 47.726563 29.332031 46.453125 27.34375 45.605469 27.34375 L 22.273438 27.34375 C 21.425781 27.34375 20.152344 29.332031 20.152344 30.800781 L 20.152344 42.953125 Z M 47.726563 42.953125 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="66" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="66"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.257813 59.714844 C 27.152344 59.714844 21.210938 57.617188 21.210938 55.105469 L 21.210938 27.972656 L 34.257813 28.285156 Z M 34.257813 59.714844 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 20.152344 11.628906 L 32.878906 11.628906 L 32.878906 38.34375 C 32.878906 40.855469 27.257813 42.953125 20.363281 42.953125 L 20.152344 42.953125 C 13.152344 42.953125 7.425781 40.855469 7.425781 38.34375 L 7.425781 11.628906 Z M 20.152344 11.628906 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.878906 12.046875 C 32.878906 14.5625 27.152344 16.972656 20.152344 16.972656 C 13.152344 16.972656 7.425781 14.5625 7.425781 12.046875 C 7.425781 9.535156 13.152344 7.4375 20.152344 7.4375 C 27.152344 7.4375 32.878906 9.535156 32.878906 12.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 30.332031 11.941406 C 30.332031 13.515625 25.773438 14.769531 20.257813 14.769531 C 14.742188 14.769531 10.183594 13.515625 10.183594 11.941406 C 10.183594 10.371094 14.742188 9.113281 20.257813 9.113281 C 25.773438 9.113281 30.332031 10.371094 30.332031 11.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 12.089844 13.617188 C 13.894531 14.351563 16.863281 14.769531 20.152344 14.769531 C 23.4375 14.769531 26.410156 14.351563 28.210938 13.617188 C 26.410156 12.886719 23.4375 12.464844 20.152344 12.464844 C 16.863281 12.464844 14 12.992188 12.089844 13.617188 Z M 12.089844 13.617188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 47.726563 11.628906 L 60.453125 11.628906 L 60.453125 38.34375 C 60.453125 40.855469 54.832031 42.953125 47.9375 42.953125 L 47.726563 42.953125 C 40.726563 42.953125 35 40.855469 35 38.34375 L 35 11.628906 Z M 47.726563 11.628906 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.347656 12.046875 C 60.347656 14.5625 54.621094 16.972656 47.621094 16.972656 C 40.621094 16.972656 34.894531 14.5625 34.894531 12.046875 C 34.894531 9.535156 40.621094 7.4375 47.621094 7.4375 C 54.621094 7.4375 60.347656 9.535156 60.347656 12.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 57.804688 11.941406 C 57.804688 13.515625 53.242188 14.769531 47.726563 14.769531 C 42.210938 14.769531 37.652344 13.515625 37.652344 11.941406 C 37.652344 10.371094 42.210938 9.113281 47.726563 9.113281 C 53.242188 9.113281 57.804688 10.371094 57.804688 11.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 39.5625 13.617188 C 41.363281 14.351563 44.332031 14.769531 47.621094 14.769531 C 50.910156 14.769531 53.878906 14.351563 55.683594 13.617188 C 53.878906 12.886719 50.910156 12.464844 47.621094 12.464844 C 44.332031 12.464844 41.46875 12.992188 39.5625 13.617188 Z M 39.5625 13.617188 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 33.9375 28.390625 L 46.667969 28.390625 L 46.667969 55.105469 C 46.667969 57.617188 41.046875 59.714844 34.152344 59.714844 L 33.9375 59.714844 C 26.9375 59.714844 21.210938 57.617188 21.210938 55.105469 L 21.210938 28.390625 Z M 33.9375 28.390625 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.667969 28.703125 C 46.667969 31.21875 40.9375 33.628906 33.9375 33.628906 C 26.9375 33.628906 21.210938 31.21875 21.210938 28.703125 C 21.210938 26.191406 26.9375 24.09375 33.9375 24.09375 C 40.9375 24.09375 46.667969 26.191406 46.667969 28.703125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 44.121094 28.601563 C 44.121094 30.171875 39.5625 31.429688 33.9375 31.429688 C 28.316406 31.429688 23.757813 30.171875 23.757813 28.601563 C 23.757813 27.027344 28.316406 25.769531 33.9375 25.769531 C 39.5625 25.769531 44.121094 27.027344 44.121094 28.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 25.773438 30.277344 C 27.574219 31.007813 30.546875 31.429688 33.9375 31.429688 C 37.226563 31.429688 40.195313 31.007813 42.105469 30.277344 C 40.304688 29.542969 37.332031 29.125 33.9375 29.125 C 30.652344 29.125 27.683594 29.648438 25.773438 30.277344 Z M 25.773438 30.277344 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureRedisCacheforRedis.png b/dist/Databases/AzureRedisCacheforRedis.png
new file mode 100644
index 00000000..d45388c9
Binary files /dev/null and b/dist/Databases/AzureRedisCacheforRedis.png differ
diff --git a/dist/Databases/AzureRedisCacheforRedis.puml b/dist/Databases/AzureRedisCacheforRedis.puml
new file mode 100644
index 00000000..ed07004b
--- /dev/null
+++ b/dist/Databases/AzureRedisCacheforRedis.puml
@@ -0,0 +1,10 @@
+sprite $AzureRedisCacheforRedis [70x65/16z] {
+xTG7YkKm48JXwYpf_WTUkP714QnvcySVsML-4Hj_rkj5n2Aw464wR3aTjpFM8y9Az41mWJ9ocz4B0E500EgBcRadCrl_941oyo4d0HG7nalAOok_1U00I6D7
+btgSAYN39AgsK65qN1eGmMEpiH4wRULSASKOEwIbjQLIIhwznLRRLIMv2ZCnirhKbhBIXOrDndPNMTKsh9MDDlmzbRTI0V-aKamO0x7w5ohL21qHCHCH5kAJ
+5GV0ebjCW4nL_FBQ2C0p5G5qi8Lg8b0yhnG7ICtTO-Lkoe3QyqeK0y1gcufndfIfIWd1G4H0aj8cAvqBRo-MrzRcAodSBQ9a84rNLYrzqufyfU8uylbA9Pne
+J5OSbzZYQQM6ubuU5REuhVHHXGbF-5sbug6tybRUYjnL73FqkkAOGnQdIZ3ciNgibHec-01r-ADUFm
+}
+
+AzureEntityColoring(AzureRedisCacheforRedis)
+!define AzureRedisCacheforRedis(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRedisCacheforRedis, AzureRedisCacheforRedis)
+!define AzureRedisCacheforRedis(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRedisCacheforRedis, AzureRedisCacheforRedis)
diff --git a/dist/Databases/AzureRedisCacheforRedis.svg b/dist/Databases/AzureRedisCacheforRedis.svg
new file mode 100644
index 00000000..891dd928
--- /dev/null
+++ b/dist/Databases/AzureRedisCacheforRedis.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="66pt" viewBox="0 0 70 66" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="66" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="66"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.46875 42.953125 C 13.363281 42.953125 7.425781 40.855469 7.425781 38.34375 L 7.425781 11.210938 L 20.46875 11.523438 Z M 20.46875 42.953125 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="66" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="66"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 48.046875 42.953125 C 40.9375 42.953125 35 40.855469 35 38.34375 L 35 11.210938 L 48.046875 11.523438 Z M 48.046875 42.953125 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="66" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="66"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.726563 42.953125 L 47.726563 30.800781 C 47.726563 29.332031 46.453125 27.34375 45.605469 27.34375 L 22.273438 27.34375 C 21.425781 27.34375 20.152344 29.332031 20.152344 30.800781 L 20.152344 42.953125 Z M 47.726563 42.953125 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="66" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="66"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.257813 59.714844 C 27.152344 59.714844 21.210938 57.617188 21.210938 55.105469 L 21.210938 27.972656 L 34.257813 28.285156 Z M 34.257813 59.714844 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 20.152344 11.628906 L 32.878906 11.628906 L 32.878906 38.34375 C 32.878906 40.855469 27.257813 42.953125 20.363281 42.953125 L 20.152344 42.953125 C 13.152344 42.953125 7.425781 40.855469 7.425781 38.34375 L 7.425781 11.628906 Z M 20.152344 11.628906 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.878906 12.046875 C 32.878906 14.5625 27.152344 16.972656 20.152344 16.972656 C 13.152344 16.972656 7.425781 14.5625 7.425781 12.046875 C 7.425781 9.535156 13.152344 7.4375 20.152344 7.4375 C 27.152344 7.4375 32.878906 9.535156 32.878906 12.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 30.332031 11.941406 C 30.332031 13.515625 25.773438 14.769531 20.257813 14.769531 C 14.742188 14.769531 10.183594 13.515625 10.183594 11.941406 C 10.183594 10.371094 14.742188 9.113281 20.257813 9.113281 C 25.773438 9.113281 30.332031 10.371094 30.332031 11.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 12.089844 13.617188 C 13.894531 14.351563 16.863281 14.769531 20.152344 14.769531 C 23.4375 14.769531 26.410156 14.351563 28.210938 13.617188 C 26.410156 12.886719 23.4375 12.464844 20.152344 12.464844 C 16.863281 12.464844 14 12.992188 12.089844 13.617188 Z M 12.089844 13.617188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 47.726563 11.628906 L 60.453125 11.628906 L 60.453125 38.34375 C 60.453125 40.855469 54.832031 42.953125 47.9375 42.953125 L 47.726563 42.953125 C 40.726563 42.953125 35 40.855469 35 38.34375 L 35 11.628906 Z M 47.726563 11.628906 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.347656 12.046875 C 60.347656 14.5625 54.621094 16.972656 47.621094 16.972656 C 40.621094 16.972656 34.894531 14.5625 34.894531 12.046875 C 34.894531 9.535156 40.621094 7.4375 47.621094 7.4375 C 54.621094 7.4375 60.347656 9.535156 60.347656 12.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 57.804688 11.941406 C 57.804688 13.515625 53.242188 14.769531 47.726563 14.769531 C 42.210938 14.769531 37.652344 13.515625 37.652344 11.941406 C 37.652344 10.371094 42.210938 9.113281 47.726563 9.113281 C 53.242188 9.113281 57.804688 10.371094 57.804688 11.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 39.5625 13.617188 C 41.363281 14.351563 44.332031 14.769531 47.621094 14.769531 C 50.910156 14.769531 53.878906 14.351563 55.683594 13.617188 C 53.878906 12.886719 50.910156 12.464844 47.621094 12.464844 C 44.332031 12.464844 41.46875 12.992188 39.5625 13.617188 Z M 39.5625 13.617188 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 33.9375 28.390625 L 46.667969 28.390625 L 46.667969 55.105469 C 46.667969 57.617188 41.046875 59.714844 34.152344 59.714844 L 33.9375 59.714844 C 26.9375 59.714844 21.210938 57.617188 21.210938 55.105469 L 21.210938 28.390625 Z M 33.9375 28.390625 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.667969 28.703125 C 46.667969 31.21875 40.9375 33.628906 33.9375 33.628906 C 26.9375 33.628906 21.210938 31.21875 21.210938 28.703125 C 21.210938 26.191406 26.9375 24.09375 33.9375 24.09375 C 40.9375 24.09375 46.667969 26.191406 46.667969 28.703125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 44.121094 28.601563 C 44.121094 30.171875 39.5625 31.429688 33.9375 31.429688 C 28.316406 31.429688 23.757813 30.171875 23.757813 28.601563 C 23.757813 27.027344 28.316406 25.769531 33.9375 25.769531 C 39.5625 25.769531 44.121094 27.027344 44.121094 28.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 25.773438 30.277344 C 27.574219 31.007813 30.546875 31.429688 33.9375 31.429688 C 37.226563 31.429688 40.195313 31.007813 42.105469 30.277344 C 40.304688 29.542969 37.332031 29.125 33.9375 29.125 C 30.652344 29.125 27.683594 29.648438 25.773438 30.277344 Z M 25.773438 30.277344 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureSqlDataWarehouse(m).png b/dist/Databases/AzureSqlDataWarehouse(m).png
index 4f4bc1cf..14d0e39c 100644
Binary files a/dist/Databases/AzureSqlDataWarehouse(m).png and b/dist/Databases/AzureSqlDataWarehouse(m).png differ
diff --git a/dist/Databases/AzureSqlDataWarehouse(m).svg b/dist/Databases/AzureSqlDataWarehouse(m).svg
index c7535736..c27b9703 100644
--- a/dist/Databases/AzureSqlDataWarehouse(m).svg
+++ b/dist/Databases/AzureSqlDataWarehouse(m).svg
@@ -1,6 +1,241 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="68pt" viewBox="0 0 70 68" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 25.023438 28.753906 L 24.308594 28.753906 L 24.308594 23.308594 L 18.777344 23.308594 L 18.777344 22.503906 L 25.023438 22.503906 Z M 25.023438 28.753906 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 18.777344 22.503906 L 19.496094 22.503906 L 19.496094 27.964844 L 25.023438 27.964844 L 25.023438 28.753906 L 18.777344 28.753906 Z M 18.777344 22.503906 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 20.074219 37.222656 L 19.371094 37.222656 L 19.371094 31.78125 L 13.824219 31.78125 L 13.824219 30.976563 L 20.074219 30.976563 Z M 20.074219 37.222656 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 13.824219 30.976563 L 14.542969 30.976563 L 14.542969 36.417969 L 20.074219 36.417969 L 20.074219 37.222656 L 13.824219 37.222656 Z M 13.824219 30.976563 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 28.996094 37.222656 L 28.246094 37.222656 L 28.246094 31.78125 L 22.714844 31.78125 L 22.714844 30.976563 L 28.996094 30.976563 Z M 28.996094 37.222656 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 22.714844 30.976563 L 23.46875 30.976563 L 23.46875 36.417969 L 28.996094 36.417969 L 28.996094 37.222656 L 22.714844 37.222656 Z M 22.714844 30.976563 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 20.074219 45.691406 L 19.371094 45.691406 L 19.371094 40.234375 L 13.824219 40.234375 L 13.824219 39.445313 L 20.074219 39.445313 Z M 20.074219 45.691406 "/>
+</g>
+<mask id="mask7">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip8">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface26" clip-path="url(#clip8)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 13.824219 39.445313 L 14.542969 39.445313 L 14.542969 44.886719 L 20.074219 44.886719 L 20.074219 45.691406 L 13.824219 45.691406 Z M 13.824219 39.445313 "/>
+</g>
+<mask id="mask8">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip9">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface29" clip-path="url(#clip9)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 28.996094 45.691406 L 28.246094 45.691406 L 28.246094 40.234375 L 22.714844 40.234375 L 22.714844 39.445313 L 28.996094 39.445313 Z M 28.996094 45.691406 "/>
+</g>
+<mask id="mask9">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip10">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface32" clip-path="url(#clip10)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 22.714844 39.445313 L 23.46875 39.445313 L 23.46875 44.886719 L 28.996094 44.886719 L 28.996094 45.691406 L 22.714844 45.691406 Z M 22.714844 39.445313 "/>
+</g>
+<mask id="mask10">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip11">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface35" clip-path="url(#clip11)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 37.765625 45.691406 L 37.046875 45.691406 L 37.046875 40.234375 L 31.515625 40.234375 L 31.515625 39.445313 L 37.765625 39.445313 Z M 37.765625 45.691406 "/>
+</g>
+<mask id="mask11">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip12">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface38" clip-path="url(#clip12)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 31.515625 39.445313 L 32.234375 39.445313 L 32.234375 44.886719 L 37.765625 44.886719 L 37.765625 45.691406 L 31.515625 45.691406 Z M 31.515625 39.445313 "/>
+</g>
+<mask id="mask12">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip13">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface41" clip-path="url(#clip13)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 19.703125 28.753906 L 18.777344 28.753906 L 18.777344 28.035156 L 24.183594 22.503906 L 25.023438 22.503906 L 25.023438 23.136719 Z M 19.703125 28.753906 "/>
+</g>
+<mask id="mask13">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip14">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface44" clip-path="url(#clip14)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 23.640625 37.222656 L 22.714844 37.222656 L 22.714844 36.503906 L 28.175781 30.976563 L 28.996094 30.976563 L 28.996094 31.605469 Z M 23.640625 37.222656 "/>
+</g>
+<mask id="mask14">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip15">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface47" clip-path="url(#clip15)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 14.753906 37.222656 L 13.824219 37.222656 L 13.824219 36.503906 L 19.234375 30.976563 L 20.074219 30.976563 L 20.074219 31.605469 Z M 14.753906 37.222656 "/>
+</g>
+<mask id="mask15">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip16">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface50" clip-path="url(#clip16)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 14.753906 45.691406 L 13.824219 45.691406 L 13.824219 44.976563 L 19.234375 39.445313 L 20.074219 39.445313 L 20.074219 40.074219 Z M 14.753906 45.691406 "/>
+</g>
+<mask id="mask16">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip17">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface53" clip-path="url(#clip17)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 23.640625 45.691406 L 22.714844 45.691406 L 22.714844 44.976563 L 28.175781 39.445313 L 28.996094 39.445313 L 28.996094 40.074219 Z M 23.640625 45.691406 "/>
+</g>
+<mask id="mask17">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip18">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface56" clip-path="url(#clip18)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 32.445313 45.691406 L 31.515625 45.691406 L 31.515625 44.976563 L 36.925781 39.445313 L 37.765625 39.445313 L 37.765625 40.074219 Z M 32.445313 45.691406 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 55.210938 46.808594 C 54.492188 46.808594 53.910156 47.070313 53.460938 47.609375 C 53.015625 48.152344 52.820313 48.863281 52.820313 49.753906 C 52.820313 50.652344 53.042969 51.355469 53.460938 51.898438 C 53.910156 52.4375 54.453125 52.699219 55.132813 52.699219 C 55.84375 52.699219 56.390625 52.4375 56.84375 51.9375 C 57.253906 51.394531 57.476563 50.691406 57.476563 49.792969 C 57.476563 48.863281 57.253906 48.101563 56.84375 47.5625 C 56.464844 47.070313 55.921875 46.808594 55.210938 46.808594 Z M 66.851563 33.179688 L 66.792969 33.34375 C 66.773438 33.402344 66.734375 33.457031 66.714844 33.496094 L 66.714844 33.515625 C 66.675781 33.566406 66.636719 33.605469 66.605469 33.660156 C 66.605469 33.660156 66.605469 33.679688 66.585938 33.679688 C 66.546875 33.738281 66.507813 33.777344 66.453125 33.824219 L 66.433594 33.84375 C 66.394531 33.902344 66.335938 33.941406 66.285156 34 L 66.265625 34.019531 C 66.207031 34.058594 66.148438 34.105469 66.089844 34.144531 L 66.070313 34.164063 C 66.023438 34.203125 65.964844 34.261719 65.886719 34.300781 L 65.867188 34.320313 C 65.789063 34.355469 65.742188 34.40625 65.664063 34.445313 L 65.644531 34.464844 C 65.566406 34.503906 65.5 34.558594 65.421875 34.597656 C 65.421875 34.597656 65.402344 34.597656 65.402344 34.617188 C 65.304688 34.648438 65.234375 34.703125 65.140625 34.742188 C 64.574219 35.023438 63.882813 35.265625 63.085938 35.488281 C 63.078125 35.488281 63.058594 35.488281 63.058594 35.507813 C 62.960938 35.546875 62.84375 35.566406 62.738281 35.582031 C 62.699219 35.601563 62.660156 35.601563 62.621094 35.621094 C 62.53125 35.640625 62.4375 35.679688 62.339844 35.699219 C 62.28125 35.71875 62.25 35.71875 62.191406 35.730469 L 61.910156 35.785156 C 61.851563 35.804688 61.792969 35.804688 61.726563 35.824219 C 61.628906 35.84375 61.53125 35.863281 61.453125 35.882813 C 61.386719 35.902344 61.328125 35.902344 61.25 35.921875 C 61.164063 35.941406 61.085938 35.960938 60.988281 35.980469 C 60.910156 35.988281 60.839844 35.988281 60.765625 36.007813 C 60.667969 36.027344 60.597656 36.046875 60.5 36.046875 C 60.421875 36.066406 60.355469 36.066406 60.257813 36.085938 C 60.160156 36.105469 60.09375 36.105469 59.996094 36.125 C 59.917969 36.144531 59.820313 36.144531 59.734375 36.164063 C 59.636719 36.183594 59.558594 36.183594 59.46875 36.203125 C 59.375 36.222656 59.285156 36.222656 59.207031 36.242188 C 59.109375 36.25 59.03125 36.25 58.945313 36.269531 C 58.847656 36.289063 58.75 36.289063 58.664063 36.308594 C 58.566406 36.308594 58.488281 36.328125 58.402344 36.328125 C 58.304688 36.328125 58.195313 36.347656 58.101563 36.347656 C 58.003906 36.347656 57.925781 36.367188 57.835938 36.367188 C 57.738281 36.367188 57.632813 36.386719 57.515625 36.386719 C 57.417969 36.386719 57.351563 36.40625 57.253906 36.40625 C 57.136719 36.40625 57.03125 36.425781 56.933594 36.425781 C 56.855469 36.425781 56.769531 36.425781 56.691406 36.445313 C 56.574219 36.445313 56.464844 36.464844 56.332031 36.464844 L 56.085938 36.464844 C 55.960938 36.464844 55.824219 36.464844 55.699219 36.480469 L 53.480469 36.480469 C 53.363281 36.480469 53.238281 36.480469 53.121094 36.464844 C 53.035156 36.464844 52.957031 36.464844 52.878906 36.445313 C 52.773438 36.445313 52.65625 36.425781 52.558594 36.425781 C 52.46875 36.425781 52.394531 36.40625 52.296875 36.40625 C 52.207031 36.40625 52.089844 36.386719 51.996094 36.386719 C 51.90625 36.386719 51.828125 36.367188 51.730469 36.367188 C 51.644531 36.367188 51.546875 36.347656 51.429688 36.347656 C 51.34375 36.347656 51.265625 36.328125 51.167969 36.328125 C 51.082031 36.328125 50.984375 36.308594 50.886719 36.289063 C 50.796875 36.269531 50.703125 36.269531 50.625 36.25 C 50.535156 36.242188 50.457031 36.242188 50.359375 36.222656 C 50.273438 36.203125 50.175781 36.203125 50.097656 36.183594 C 50.03125 36.164063 49.933594 36.164063 49.855469 36.144531 C 49.769531 36.125 49.671875 36.125 49.59375 36.105469 C 49.515625 36.085938 49.445313 36.085938 49.371094 36.066406 C 49.273438 36.046875 49.183594 36.027344 49.085938 36.027344 C 49.007813 36.007813 48.941406 36.007813 48.882813 35.988281 L 48.601563 35.941406 C 48.523438 35.921875 48.464844 35.921875 48.417969 35.902344 L 48.132813 35.84375 C 48.078125 35.824219 48.019531 35.824219 47.960938 35.804688 L 47.675781 35.75 C 47.621094 35.730469 47.589844 35.730469 47.53125 35.71875 C 47.433594 35.699219 47.328125 35.660156 47.230469 35.640625 C 47.191406 35.640625 47.152344 35.621094 47.113281 35.621094 C 47.007813 35.601563 46.890625 35.566406 46.800781 35.527344 C 46.78125 35.527344 46.765625 35.527344 46.765625 35.507813 C 45.714844 35.207031 44.828125 34.859375 44.167969 34.464844 C 44.089844 34.40625 44.023438 34.367188 43.945313 34.320313 L 43.925781 34.320313 C 43.847656 34.261719 43.796875 34.222656 43.71875 34.164063 L 43.703125 34.144531 C 43.644531 34.097656 43.585938 34.058594 43.535156 34 L 43.515625 33.980469 C 43.457031 33.921875 43.398438 33.882813 43.359375 33.824219 L 43.339844 33.816406 C 43.28125 33.757813 43.253906 33.71875 43.214844 33.660156 L 43.214844 33.640625 C 43.175781 33.585938 43.136719 33.535156 43.097656 33.496094 L 43.097656 33.476563 C 43.058594 33.421875 43.039063 33.363281 43 33.304688 L 42.953125 33.140625 C 42.914063 33.023438 42.894531 32.9375 42.894531 32.820313 C 42.894531 30.859375 48.28125 29.210938 54.941406 29.210938 C 61.609375 29.210938 66.996094 30.832031 66.996094 32.820313 C 66.898438 32.976563 66.878906 33.0625 66.851563 33.179688 Z M 66.675781 54.3125 L 61.191406 54.3125 L 61.191406 45.144531 L 63.261719 45.144531 L 63.261719 52.613281 L 66.675781 52.613281 Z M 57.59375 55.617188 L 56.371094 54.359375 C 56.066406 54.4375 55.621094 54.496094 55.113281 54.496094 C 53.820313 54.496094 52.734375 54.042969 51.886719 53.210938 C 51.082031 52.351563 50.625 51.25 50.625 49.851563 C 50.625 48.410156 51.042969 47.261719 51.886719 46.363281 C 52.753906 45.464844 53.820313 45.019531 55.210938 45.019531 C 56.503906 45.019531 57.59375 45.464844 58.402344 46.304688 C 59.207031 47.144531 59.617188 48.265625 59.617188 49.707031 C 59.617188 51.136719 59.207031 52.292969 58.363281 53.191406 L 58.175781 53.375 L 60.519531 55.617188 Z M 49.464844 52.96875 C 49.273438 53.316406 49.007813 53.597656 48.660156 53.820313 C 48.339844 54.042969 47.941406 54.175781 47.492188 54.273438 C 47.046875 54.359375 46.589844 54.398438 46.101563 54.398438 C 45.617188 54.398438 45.109375 54.359375 44.652344 54.273438 C 44.1875 54.273438 43.796875 54.121094 43.476563 53.957031 L 43.476563 51.898438 C 43.828125 52.21875 44.246094 52.4375 44.691406 52.613281 C 45.148438 52.738281 45.597656 52.835938 45.984375 52.835938 C 46.257813 52.835938 46.480469 52.796875 46.667969 52.738281 C 46.851563 52.699219 47.027344 52.652344 47.152344 52.554688 C 47.289063 52.457031 47.375 52.371094 47.414063 52.234375 C 47.453125 52.109375 47.511719 52.015625 47.511719 51.886719 C 47.511719 51.695313 47.472656 51.53125 47.375 51.394531 C 47.289063 51.269531 47.152344 51.136719 46.96875 50.988281 C 46.78125 50.855469 46.550781 50.769531 46.328125 50.632813 C 46.101563 50.546875 45.839844 50.410156 45.519531 50.277344 C 44.808594 49.964844 44.265625 49.609375 43.90625 49.214844 C 43.546875 48.769531 43.359375 48.285156 43.359375 47.648438 C 43.359375 47.164063 43.457031 46.757813 43.625 46.441406 C 43.816406 46.082031 44.082031 45.804688 44.390625 45.582031 C 44.710938 45.359375 45.109375 45.164063 45.558594 45.097656 C 46.003906 45 46.460938 44.964844 46.949219 44.964844 C 47.433594 44.964844 47.851563 45 48.203125 45.058594 C 48.5625 45.097656 48.921875 45.183594 49.242188 45.320313 L 49.242188 47.242188 C 49.105469 47.144531 48.921875 47.050781 48.746094 46.980469 C 48.582031 46.90625 48.398438 46.847656 48.203125 46.789063 C 48.019531 46.757813 47.792969 46.703125 47.621094 46.664063 C 47.433594 46.625 47.269531 46.625 47.074219 46.625 C 46.851563 46.625 46.628906 46.625 46.441406 46.664063 C 46.257813 46.703125 46.082031 46.757813 45.957031 46.847656 C 45.820313 46.941406 45.722656 47.039063 45.636719 47.105469 C 45.539063 47.242188 45.539063 47.328125 45.539063 47.464844 C 45.539063 47.589844 45.578125 47.726563 45.675781 47.871094 C 45.761719 48.003906 45.859375 48.101563 46.023438 48.226563 C 46.160156 48.324219 46.34375 48.449219 46.570313 48.546875 C 46.800781 48.644531 47.027344 48.769531 47.289063 48.863281 C 47.640625 48.992188 48 49.183594 48.28125 49.347656 C 48.601563 49.53125 48.824219 49.707031 49.046875 49.925781 C 49.273438 50.148438 49.40625 50.371094 49.535156 50.691406 C 49.632813 50.953125 49.730469 51.269531 49.730469 51.675781 C 49.730469 52.160156 49.632813 52.613281 49.464844 52.96875 Z M 54.851563 27.730469 C 46.5 27.730469 39.707031 30.175781 39.707031 33.179688 L 39.707031 62.15625 C 39.707031 65.121094 46.382813 67.566406 54.628906 67.605469 L 54.628906 67.625 L 54.851563 67.625 C 63.222656 67.625 70 65.160156 70 62.175781 L 70 33.179688 C 70 30.136719 63.203125 27.730469 54.851563 27.730469 Z M 30.527344 45.917969 L 37.226563 45.917969 L 37.226563 39.253906 L 30.527344 39.253906 Z M 21.078125 36.886719 L 27.785156 36.886719 L 27.785156 30.234375 L 21.078125 30.234375 Z M 21.078125 45.917969 L 27.785156 45.917969 L 27.785156 39.253906 L 21.078125 39.253906 Z M 16.859375 27.867188 L 23.558594 27.867188 L 23.558594 21.203125 L 16.859375 21.203125 Z M 11.539063 36.886719 L 18.25 36.886719 L 18.25 30.234375 L 11.539063 30.234375 Z M 11.539063 45.917969 L 18.25 45.917969 L 18.25 39.253906 L 11.539063 39.253906 Z M 42.710938 28.292969 C 44.128906 27.671875 45.820313 27.210938 47.65625 26.871094 L 47.65625 17.996094 L 52.597656 17.996094 L 52.597656 13.929688 L 26.394531 0 L 0 13.929688 L 0 17.996094 L 5.386719 17.996094 L 5.386719 46.140625 L 9.898438 46.140625 L 9.898438 17.996094 L 42.710938 17.996094 Z M 42.710938 28.292969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55,170,255);fill-opacity:1;" d="M 18.777344 22.503906 L 25.023438 22.503906 L 25.023438 28.753906 L 18.777344 28.753906 Z M 18.777344 22.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55,170,255);fill-opacity:1;" d="M 13.824219 39.445313 L 20.074219 39.445313 L 20.074219 45.691406 L 13.824219 45.691406 Z M 13.824219 39.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55,170,255);fill-opacity:1;" d="M 22.714844 39.445313 L 28.960938 39.445313 L 28.960938 45.691406 L 22.714844 45.691406 Z M 22.714844 39.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55,170,255);fill-opacity:1;" d="M 31.515625 39.445313 L 37.765625 39.445313 L 37.765625 45.691406 L 31.515625 45.691406 Z M 31.515625 39.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55,170,255);fill-opacity:1;" d="M 13.824219 30.976563 L 20.074219 30.976563 L 20.074219 37.222656 L 13.824219 37.222656 Z M 13.824219 30.976563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55,170,255);fill-opacity:1;" d="M 22.714844 30.976563 L 28.960938 30.976563 L 28.960938 37.222656 L 22.714844 37.222656 Z M 22.714844 30.976563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 27.667969 2.609375 L 3.0625 15.679688 L 3.0625 19.496094 L 8.085938 19.496094 L 8.085938 45.902344 L 12.285156 45.902344 L 12.285156 19.496094 L 42.875 19.496094 L 42.875 44.222656 L 47.496094 44.222656 L 47.496094 19.496094 L 52.097656 19.496094 L 52.097656 15.679688 Z M 27.667969 2.609375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<use xlink:href="#surface26" mask="url(#mask7)"/>
+<use xlink:href="#surface29" mask="url(#mask8)"/>
+<use xlink:href="#surface32" mask="url(#mask9)"/>
+<use xlink:href="#surface35" mask="url(#mask10)"/>
+<use xlink:href="#surface38" mask="url(#mask11)"/>
+<use xlink:href="#surface41" mask="url(#mask12)"/>
+<use xlink:href="#surface44" mask="url(#mask13)"/>
+<use xlink:href="#surface47" mask="url(#mask14)"/>
+<use xlink:href="#surface50" mask="url(#mask15)"/>
+<use xlink:href="#surface53" mask="url(#mask16)"/>
+<use xlink:href="#surface56" mask="url(#mask17)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 40.074219 33.738281 L 40.074219 60.933594 C 40.074219 63.734375 46.410156 66.046875 54.199219 66.046875 L 54.199219 33.738281 Z M 40.074219 33.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(59,171,255);fill-opacity:1;" d="M 53.988281 66.0625 L 54.199219 66.0625 C 62.003906 66.0625 68.320313 63.753906 68.320313 60.953125 L 68.320313 33.738281 L 53.988281 33.738281 Z M 53.988281 66.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 68.320313 33.738281 C 68.320313 36.539063 61.984375 38.851563 54.199219 38.851563 C 46.410156 38.851563 40.074219 36.558594 40.074219 33.738281 C 40.074219 30.921875 46.410156 28.628906 54.199219 28.628906 C 61.984375 28.628906 68.320313 30.886719 68.320313 33.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55,170,255);fill-opacity:1;" d="M 65.433594 33.441406 C 65.433594 35.28125 60.410156 36.835938 54.199219 36.835938 C 47.984375 36.835938 42.960938 35.332031 42.960938 33.441406 C 42.960938 31.605469 47.984375 30.046875 54.199219 30.046875 C 60.410156 30.046875 65.433594 31.570313 65.433594 33.441406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 63.085938 35.507813 C 64.558594 34.914063 65.433594 34.210938 65.433594 33.460938 C 65.433594 31.621094 60.410156 30.066406 54.199219 30.066406 C 47.984375 30.066406 42.960938 31.570313 42.960938 33.460938 C 42.960938 34.265625 43.835938 34.964844 45.308594 35.507813 C 47.355469 34.703125 50.59375 34.210938 54.199219 34.210938 C 57.800781 34.160156 61.023438 34.703125 63.085938 35.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.59375 53.234375 L 43.59375 51.308594 C 43.925781 51.609375 44.308594 51.816406 44.730469 51.976563 C 45.148438 52.097656 45.570313 52.183594 45.9375 52.183594 C 46.183594 52.183594 46.390625 52.148438 46.566406 52.097656 C 46.742188 52.0625 46.898438 52.011719 47.023438 51.921875 C 47.144531 51.835938 47.234375 51.746094 47.265625 51.625 C 47.300781 51.503906 47.355469 51.414063 47.355469 51.292969 C 47.355469 51.117188 47.320313 50.960938 47.234375 50.835938 C 47.144531 50.714844 47.023438 50.59375 46.847656 50.453125 C 46.671875 50.328125 46.460938 50.242188 46.253906 50.121094 C 46.042969 50.03125 45.796875 49.910156 45.5 49.789063 C 44.835938 49.488281 44.328125 49.15625 43.996094 48.789063 C 43.664063 48.371094 43.488281 47.914063 43.488281 47.320313 C 43.488281 46.863281 43.574219 46.480469 43.734375 46.183594 C 43.90625 45.851563 44.152344 45.585938 44.449219 45.378906 C 44.746094 45.167969 45.113281 44.992188 45.535156 44.921875 C 45.953125 44.835938 46.375 44.800781 46.828125 44.800781 C 47.285156 44.800781 47.671875 44.835938 48.003906 44.886719 C 48.335938 44.921875 48.667969 45.011719 48.964844 45.132813 L 48.964844 46.933594 C 48.84375 46.847656 48.667969 46.761719 48.511719 46.691406 C 48.351563 46.621094 48.175781 46.566406 48.003906 46.515625 C 47.828125 46.480469 47.617188 46.425781 47.460938 46.390625 C 47.285156 46.359375 47.128906 46.359375 46.953125 46.359375 C 46.742188 46.359375 46.53125 46.359375 46.359375 46.390625 C 46.183594 46.425781 46.023438 46.480469 45.902344 46.566406 C 45.78125 46.65625 45.691406 46.742188 45.605469 46.8125 C 45.515625 46.933594 45.515625 47.023438 45.515625 47.144531 C 45.515625 47.265625 45.550781 47.390625 45.640625 47.53125 C 45.726563 47.652344 45.816406 47.738281 45.972656 47.863281 C 46.09375 47.949219 46.269531 48.074219 46.480469 48.160156 C 46.691406 48.246094 46.898438 48.371094 47.144531 48.457031 C 47.476563 48.578125 47.808594 48.753906 48.074219 48.914063 C 48.371094 49.085938 48.578125 49.246094 48.789063 49.453125 C 49 49.664063 49.121094 49.875 49.246094 50.171875 C 49.332031 50.417969 49.421875 50.714844 49.421875 51.101563 C 49.421875 51.554688 49.332031 51.976563 49.175781 52.308594 C 49 52.640625 48.753906 52.902344 48.421875 53.113281 C 48.125 53.324219 47.757813 53.445313 47.335938 53.53125 C 46.917969 53.621094 46.496094 53.65625 46.042969 53.65625 C 45.585938 53.65625 45.113281 53.621094 44.695313 53.53125 C 44.257813 53.53125 43.890625 53.390625 43.59375 53.234375 Z M 43.59375 53.234375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 54.441406 53.742188 C 53.234375 53.742188 52.21875 53.324219 51.433594 52.535156 C 50.679688 51.730469 50.261719 50.699219 50.261719 49.386719 C 50.261719 48.039063 50.644531 46.953125 51.433594 46.113281 C 52.238281 45.273438 53.234375 44.851563 54.53125 44.851563 C 55.738281 44.851563 56.753906 45.273438 57.503906 46.058594 C 58.257813 46.847656 58.640625 47.898438 58.640625 49.246094 C 58.640625 50.59375 58.257813 51.675781 57.46875 52.515625 C 57.433594 52.550781 57.433594 52.550781 57.382813 52.605469 C 57.347656 52.640625 57.347656 52.640625 57.296875 52.691406 L 59.484375 54.792969 L 56.753906 54.792969 L 55.613281 53.621094 C 55.335938 53.691406 54.914063 53.742188 54.441406 53.742188 Z M 54.53125 46.53125 C 53.863281 46.53125 53.324219 46.777344 52.902344 47.285156 C 52.484375 47.792969 52.308594 48.457031 52.308594 49.296875 C 52.308594 50.136719 52.515625 50.800781 52.902344 51.308594 C 53.324219 51.816406 53.828125 52.0625 54.460938 52.0625 C 55.125 52.0625 55.632813 51.816406 56.050781 51.34375 C 56.4375 50.835938 56.648438 50.171875 56.648438 49.332031 C 56.648438 48.457031 56.4375 47.738281 56.050781 47.234375 C 55.703125 46.777344 55.195313 46.53125 54.53125 46.53125 Z M 54.53125 46.53125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.222656 53.566406 L 60.113281 53.566406 L 60.113281 44.976563 L 62.039063 44.976563 L 62.039063 51.976563 L 65.222656 51.976563 Z M 65.222656 53.566406 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureSqlDataWarehouse.png b/dist/Databases/AzureSqlDataWarehouse.png
index 704f7e08..dc493aa1 100644
Binary files a/dist/Databases/AzureSqlDataWarehouse.png and b/dist/Databases/AzureSqlDataWarehouse.png differ
diff --git a/dist/Databases/AzureSqlDataWarehouse.puml b/dist/Databases/AzureSqlDataWarehouse.puml
index 5e927c32..d60d1afc 100644
--- a/dist/Databases/AzureSqlDataWarehouse.puml
+++ b/dist/Databases/AzureSqlDataWarehouse.puml
@@ -1,9 +1,9 @@
-sprite $AzureSqlDataWarehouse [70x68/16z] {
-xTS5ajj048NXDzFyxd_WhBgML8vSqYYS_SpqMmmueccuIv9awUr6o_NEJBQMijO8jZkTuNmKytQZnRZGA1xoanqhFbC-xZPQ6PxJuXcb5neh7KbUaNgxqN8-
-LBYW_eDAizr7Hmu2VtmbczsiiCLFgNnLiZaUCNG2m1XpCzQMbm68HHRvgi9aNAtCA3BTLEOBKRL-G_UL6Mq25ctVI3BaOVWiMVgvecm293UrYnHp7arKFrif
-SkBxWZnR8Qa7bRnKAJiuJhbK8Sjbx1EMvBuYsGI8R0-LBgMxRJoARLzvYWT-GkLWgPlHv4pbUEeAczwkV5MacW1HcmHcjTTA301EbWuCBTA7ig6D5tYAv5QL
-eQm1RDUYGTXm4ad785bKZ6GEw58bNu_V02Tf64iL6W2f0hPM06iLfcuP8BgoD2pD0GueIO4iLK8Y16ChgGkGD4nthsiLR88qR6QzFhbMOVhhzgtS391Atroh
-x8MgyzLofVrHbQzA_P2AyOd4MLOy4WEtJ_r3S8ruxaiLEh1YYfgvcwdCWLVV
+sprite $AzureSqlDataWarehouse [70x70/16z] {
+xTC7UhCw58JXEML6sl-AhqHGYe9v3FBz-vTcsaixmU-HOJrZhOd5M7jhJjPHYKLZE8uRHQbJkknugGV9reqUyMocUb8-FI3dvPBnz6lF-bp5LutprnxrMZ8S
+LAyMlxgIRDMMU5fj5ROSZohpEOvt4Ne_Jl5Uh2gKHDgYebSfbDOLQbqXzHAbP__Vl2YM5Je0ZsmnM-4Fb74pnYrCHSx5aJ96nOvcnfZVenygb0nsD3Dvt972
+eV2hullzi2U9lVsUV5P8RShuW14DyDGKimivAM-dCTZuW95ge6MHt05c65gkMOajuEF3Xr9B6BuLr3VbSQgzml11cNbIlLdnBM3-C9GHDJfIEEPbVF2t3xEY
+MJcVEkz_Bolpr7b7T5dPvsLyy8vSLKYzAUE3axggpF_JNUdjId63bMOuB2IbvQHO2oTr1V0mLM9B2WnbwamHhFO0IWw_frJ0snysJ29mKn40RqeqHJUL7e4a
+VELQUeaeW1QUIq44a4s2MQS2PXPN5GSi-tqPMbIWTL7vt2PGUtSLIQJMbO_MbNyANwBuYM9uEY-F5CULiXmfWQjPwel2CDpCt2FStV0dzny
 }
 
 AzureEntityColoring(AzureSqlDataWarehouse)
diff --git a/dist/Databases/AzureSqlDataWarehouse.svg b/dist/Databases/AzureSqlDataWarehouse.svg
index 16773ec8..acc90bdf 100644
--- a/dist/Databases/AzureSqlDataWarehouse.svg
+++ b/dist/Databases/AzureSqlDataWarehouse.svg
@@ -1,216 +1,216 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="68pt" viewBox="0 0 70 68" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 22.78125 22.160156 L 16.851563 22.160156 L 16.851563 21.300781 L 23.550781 21.300781 L 23.550781 27.988281 L 22.78125 27.988281 Z M 22.78125 22.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 25.023438 28.753906 L 24.308594 28.753906 L 24.308594 23.308594 L 18.777344 23.308594 L 18.777344 22.503906 L 25.023438 22.503906 Z M 25.023438 28.753906 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 17.621094 27.144531 L 23.550781 27.144531 L 23.550781 27.988281 L 16.851563 27.988281 L 16.851563 21.300781 L 17.621094 21.300781 Z M 17.621094 27.144531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 18.777344 22.503906 L 19.496094 22.503906 L 19.496094 27.964844 L 25.023438 27.964844 L 25.023438 28.753906 L 18.777344 28.753906 Z M 18.777344 22.503906 "/>
 </g>
 <mask id="mask2">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip3">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 17.492188 31.226563 L 11.542969 31.226563 L 11.542969 30.367188 L 18.242188 30.367188 L 18.242188 37.054688 L 17.492188 37.054688 Z M 17.492188 31.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 20.074219 37.222656 L 19.371094 37.222656 L 19.371094 31.78125 L 13.824219 31.78125 L 13.824219 30.976563 L 20.074219 30.976563 Z M 20.074219 37.222656 "/>
 </g>
 <mask id="mask3">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip4">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface14" clip-path="url(#clip4)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 12.3125 36.191406 L 18.242188 36.191406 L 18.242188 37.054688 L 11.542969 37.054688 L 11.542969 30.367188 L 12.3125 30.367188 Z M 12.3125 36.191406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 13.824219 30.976563 L 14.542969 30.976563 L 14.542969 36.417969 L 20.074219 36.417969 L 20.074219 37.222656 L 13.824219 37.222656 Z M 13.824219 30.976563 "/>
 </g>
 <mask id="mask4">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip5">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface17" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 27.003906 31.226563 L 21.074219 31.226563 L 21.074219 30.367188 L 27.8125 30.367188 L 27.8125 37.054688 L 27.003906 37.054688 Z M 27.003906 31.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 28.996094 37.222656 L 28.246094 37.222656 L 28.246094 31.78125 L 22.714844 31.78125 L 22.714844 30.976563 L 28.996094 30.976563 Z M 28.996094 37.222656 "/>
 </g>
 <mask id="mask5">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip6">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface20" clip-path="url(#clip6)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 21.882813 36.191406 L 27.8125 36.191406 L 27.8125 37.054688 L 21.074219 37.054688 L 21.074219 30.367188 L 21.882813 30.367188 Z M 21.882813 36.191406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 22.714844 30.976563 L 23.46875 30.976563 L 23.46875 36.417969 L 28.996094 36.417969 L 28.996094 37.222656 L 22.714844 37.222656 Z M 22.714844 30.976563 "/>
 </g>
 <mask id="mask6">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip7">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface23" clip-path="url(#clip7)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 17.492188 40.277344 L 11.542969 40.277344 L 11.542969 39.433594 L 18.242188 39.433594 L 18.242188 46.121094 L 17.492188 46.121094 Z M 17.492188 40.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 20.074219 45.691406 L 19.371094 45.691406 L 19.371094 40.234375 L 13.824219 40.234375 L 13.824219 39.445313 L 20.074219 39.445313 Z M 20.074219 45.691406 "/>
 </g>
 <mask id="mask7">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip8">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface26" clip-path="url(#clip8)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 12.3125 45.257813 L 18.242188 45.257813 L 18.242188 46.121094 L 11.542969 46.121094 L 11.542969 39.433594 L 12.3125 39.433594 Z M 12.3125 45.257813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 13.824219 39.445313 L 14.542969 39.445313 L 14.542969 44.886719 L 20.074219 44.886719 L 20.074219 45.691406 L 13.824219 45.691406 Z M 13.824219 39.445313 "/>
 </g>
 <mask id="mask8">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip9">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface29" clip-path="url(#clip9)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 27.003906 40.277344 L 21.074219 40.277344 L 21.074219 39.433594 L 27.8125 39.433594 L 27.8125 46.121094 L 27.003906 46.121094 Z M 27.003906 40.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 28.996094 45.691406 L 28.246094 45.691406 L 28.246094 40.234375 L 22.714844 40.234375 L 22.714844 39.445313 L 28.996094 39.445313 Z M 28.996094 45.691406 "/>
 </g>
 <mask id="mask9">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip10">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface32" clip-path="url(#clip10)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 21.882813 45.257813 L 27.8125 45.257813 L 27.8125 46.121094 L 21.074219 46.121094 L 21.074219 39.433594 L 21.882813 39.433594 Z M 21.882813 45.257813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 22.714844 39.445313 L 23.46875 39.445313 L 23.46875 44.886719 L 28.996094 44.886719 L 28.996094 45.691406 L 22.714844 45.691406 Z M 22.714844 39.445313 "/>
 </g>
 <mask id="mask10">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip11">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface35" clip-path="url(#clip11)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 36.445313 40.277344 L 30.515625 40.277344 L 30.515625 39.433594 L 37.214844 39.433594 L 37.214844 46.121094 L 36.445313 46.121094 Z M 36.445313 40.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 37.765625 45.691406 L 37.046875 45.691406 L 37.046875 40.234375 L 31.515625 40.234375 L 31.515625 39.445313 L 37.765625 39.445313 Z M 37.765625 45.691406 "/>
 </g>
 <mask id="mask11">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip12">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface38" clip-path="url(#clip12)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 31.285156 45.257813 L 37.214844 45.257813 L 37.214844 46.121094 L 30.515625 46.121094 L 30.515625 39.433594 L 31.285156 39.433594 Z M 31.285156 45.257813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 31.515625 39.445313 L 32.234375 39.445313 L 32.234375 44.886719 L 37.765625 44.886719 L 37.765625 45.691406 L 31.515625 45.691406 Z M 31.515625 39.445313 "/>
 </g>
 <mask id="mask12">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip13">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface41" clip-path="url(#clip13)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 16.851563 27.21875 L 22.652344 21.300781 L 23.550781 21.300781 L 23.550781 21.972656 L 17.847656 27.988281 L 16.851563 27.988281 Z M 16.851563 27.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 19.703125 28.753906 L 18.777344 28.753906 L 18.777344 28.035156 L 24.183594 22.503906 L 25.023438 22.503906 L 25.023438 23.136719 Z M 19.703125 28.753906 "/>
 </g>
 <mask id="mask13">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip14">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface44" clip-path="url(#clip14)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 21.074219 36.285156 L 26.929688 30.367188 L 27.8125 30.367188 L 27.8125 31.039063 L 22.070313 37.054688 L 21.074219 37.054688 Z M 21.074219 36.285156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 23.640625 37.222656 L 22.714844 37.222656 L 22.714844 36.503906 L 28.175781 30.976563 L 28.996094 30.976563 L 28.996094 31.605469 Z M 23.640625 37.222656 "/>
 </g>
 <mask id="mask14">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip15">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface47" clip-path="url(#clip15)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 11.542969 36.285156 L 17.339844 30.367188 L 18.242188 30.367188 L 18.242188 31.039063 L 12.535156 37.054688 L 11.542969 37.054688 Z M 11.542969 36.285156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 14.753906 37.222656 L 13.824219 37.222656 L 13.824219 36.503906 L 19.234375 30.976563 L 20.074219 30.976563 L 20.074219 31.605469 Z M 14.753906 37.222656 "/>
 </g>
 <mask id="mask15">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip16">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface50" clip-path="url(#clip16)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 11.542969 45.351563 L 17.339844 39.433594 L 18.242188 39.433594 L 18.242188 40.105469 L 12.535156 46.121094 L 11.542969 46.121094 Z M 11.542969 45.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 14.753906 45.691406 L 13.824219 45.691406 L 13.824219 44.976563 L 19.234375 39.445313 L 20.074219 39.445313 L 20.074219 40.074219 Z M 14.753906 45.691406 "/>
 </g>
 <mask id="mask16">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip17">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface53" clip-path="url(#clip17)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 21.074219 45.351563 L 26.929688 39.433594 L 27.8125 39.433594 L 27.8125 40.105469 L 22.070313 46.121094 L 21.074219 46.121094 Z M 21.074219 45.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 23.640625 45.691406 L 22.714844 45.691406 L 22.714844 44.976563 L 28.175781 39.445313 L 28.996094 39.445313 L 28.996094 40.074219 Z M 23.640625 45.691406 "/>
 </g>
 <mask id="mask17">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="68" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip18">
-  <rect x="0" y="0" width="70" height="68"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface56" clip-path="url(#clip18)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 30.515625 45.351563 L 36.3125 39.433594 L 37.214844 39.433594 L 37.214844 40.105469 L 31.507813 46.121094 L 30.515625 46.121094 Z M 30.515625 45.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 32.445313 45.691406 L 31.515625 45.691406 L 31.515625 44.976563 L 36.925781 39.445313 L 37.765625 39.445313 L 37.765625 40.074219 Z M 32.445313 45.691406 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 16.851563 21.300781 L 23.550781 21.300781 L 23.550781 27.988281 L 16.851563 27.988281 Z M 16.851563 21.300781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 11.542969 39.433594 L 18.242188 39.433594 L 18.242188 46.121094 L 11.542969 46.121094 Z M 11.542969 39.433594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 21.074219 39.433594 L 27.773438 39.433594 L 27.773438 46.121094 L 21.074219 46.121094 Z M 21.074219 39.433594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 30.515625 39.433594 L 37.214844 39.433594 L 37.214844 46.121094 L 30.515625 46.121094 Z M 30.515625 39.433594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 11.542969 30.367188 L 18.242188 30.367188 L 18.242188 37.054688 L 11.542969 37.054688 Z M 11.542969 30.367188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 21.074219 30.367188 L 27.773438 30.367188 L 27.773438 37.054688 L 21.074219 37.054688 Z M 21.074219 30.367188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 0 18.078125 L 5.386719 18.078125 L 5.386719 46.34375 L 9.890625 46.34375 L 9.890625 18.078125 L 42.695313 18.078125 L 42.695313 44.546875 L 47.648438 44.546875 L 47.648438 18.078125 L 52.585938 18.078125 L 52.585938 13.992188 L 26.386719 0 L 0 13.992188 Z M 0 18.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 18.777344 22.503906 L 25.023438 22.503906 L 25.023438 28.753906 L 18.777344 28.753906 Z M 18.777344 22.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 13.824219 39.445313 L 20.074219 39.445313 L 20.074219 45.691406 L 13.824219 45.691406 Z M 13.824219 39.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 22.714844 39.445313 L 28.960938 39.445313 L 28.960938 45.691406 L 22.714844 45.691406 Z M 22.714844 39.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 31.515625 39.445313 L 37.765625 39.445313 L 37.765625 45.691406 L 31.515625 45.691406 Z M 31.515625 39.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 13.824219 30.976563 L 20.074219 30.976563 L 20.074219 37.222656 L 13.824219 37.222656 Z M 13.824219 30.976563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 22.714844 30.976563 L 28.960938 30.976563 L 28.960938 37.222656 L 22.714844 37.222656 Z M 22.714844 30.976563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 27.667969 2.609375 L 3.0625 15.679688 L 3.0625 19.496094 L 8.085938 19.496094 L 8.085938 45.902344 L 12.285156 45.902344 L 12.285156 19.496094 L 42.875 19.496094 L 42.875 44.222656 L 47.496094 44.222656 L 47.496094 19.496094 L 52.097656 19.496094 L 52.097656 15.679688 Z M 27.667969 2.609375 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
 <use xlink:href="#surface11" mask="url(#mask2)"/>
@@ -229,13 +229,13 @@
 <use xlink:href="#surface50" mask="url(#mask15)"/>
 <use xlink:href="#surface53" mask="url(#mask16)"/>
 <use xlink:href="#surface56" mask="url(#mask17)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 39.691406 33.324219 L 39.691406 62.4375 C 39.691406 65.433594 46.484375 67.90625 54.835938 67.90625 L 54.835938 33.324219 Z M 39.691406 33.324219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(35.294118%,70.588235%,85.098039%);fill-opacity:1;" d="M 54.609375 67.925781 L 54.835938 67.925781 C 63.207031 67.925781 69.980469 65.453125 69.980469 62.457031 L 69.980469 33.324219 L 54.609375 33.324219 Z M 54.609375 67.925781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 69.980469 33.324219 C 69.980469 36.324219 63.1875 38.796875 54.835938 38.796875 C 46.484375 38.796875 39.691406 36.339844 39.691406 33.324219 C 39.691406 30.308594 46.484375 27.855469 54.835938 27.855469 C 63.1875 27.855469 69.980469 30.273438 69.980469 33.324219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 66.882813 33.007813 C 66.882813 34.972656 61.5 36.640625 54.835938 36.640625 C 48.175781 36.640625 42.789063 35.03125 42.789063 33.007813 C 42.789063 31.039063 48.175781 29.371094 54.835938 29.371094 C 61.5 29.371094 66.882813 31.003906 66.882813 33.007813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 64.371094 35.21875 C 65.945313 34.582031 66.882813 33.832031 66.882813 33.027344 C 66.882813 31.058594 61.5 29.390625 54.835938 29.390625 C 48.175781 29.390625 42.789063 31.003906 42.789063 33.027344 C 42.789063 33.886719 43.726563 34.636719 45.304688 35.21875 C 47.5 34.355469 50.96875 33.832031 54.835938 33.832031 C 58.703125 33.773438 62.15625 34.355469 64.371094 35.21875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.464844 54.195313 L 43.464844 52.132813 C 43.820313 52.453125 44.234375 52.675781 44.683594 52.84375 C 45.132813 52.976563 45.585938 53.070313 45.980469 53.070313 C 46.242188 53.070313 46.464844 53.03125 46.652344 52.976563 C 46.84375 52.9375 47.011719 52.882813 47.140625 52.789063 C 47.273438 52.695313 47.367188 52.601563 47.40625 52.46875 C 47.441406 52.339844 47.5 52.246094 47.5 52.113281 C 47.5 51.925781 47.460938 51.757813 47.367188 51.628906 C 47.273438 51.496094 47.140625 51.367188 46.953125 51.214844 C 46.765625 51.085938 46.542969 50.992188 46.316406 50.859375 C 46.089844 50.765625 45.828125 50.632813 45.507813 50.503906 C 44.796875 50.183594 44.253906 49.828125 43.894531 49.4375 C 43.539063 48.984375 43.351563 48.5 43.351563 47.863281 C 43.351563 47.375 43.445313 46.964844 43.613281 46.644531 C 43.800781 46.289063 44.0625 46.007813 44.382813 45.78125 C 44.703125 45.558594 45.097656 45.371094 45.546875 45.296875 C 45.996094 45.203125 46.449219 45.164063 46.9375 45.164063 C 47.421875 45.164063 47.835938 45.203125 48.191406 45.257813 C 48.550781 45.296875 48.90625 45.390625 49.226563 45.519531 L 49.226563 47.449219 C 49.09375 47.355469 48.90625 47.261719 48.738281 47.1875 C 48.570313 47.113281 48.378906 47.058594 48.191406 47 C 48.003906 46.964844 47.78125 46.90625 47.609375 46.871094 C 47.421875 46.832031 47.253906 46.832031 47.066406 46.832031 C 46.84375 46.832031 46.617188 46.832031 46.429688 46.871094 C 46.242188 46.90625 46.074219 46.964844 45.941406 47.058594 C 45.808594 47.152344 45.714844 47.242188 45.621094 47.320313 C 45.527344 47.449219 45.527344 47.542969 45.527344 47.675781 C 45.527344 47.804688 45.566406 47.9375 45.660156 48.085938 C 45.753906 48.21875 45.847656 48.3125 46.015625 48.441406 C 46.148438 48.535156 46.335938 48.667969 46.558594 48.761719 C 46.785156 48.855469 47.011719 48.984375 47.273438 49.078125 C 47.628906 49.210938 47.988281 49.398438 48.269531 49.566406 C 48.585938 49.753906 48.8125 49.921875 49.039063 50.148438 C 49.261719 50.371094 49.394531 50.597656 49.527344 50.914063 C 49.621094 51.179688 49.714844 51.496094 49.714844 51.910156 C 49.714844 52.394531 49.621094 52.84375 49.449219 53.199219 C 49.261719 53.558594 49 53.839844 48.644531 54.0625 C 48.324219 54.289063 47.929688 54.417969 47.480469 54.511719 C 47.03125 54.605469 46.578125 54.644531 46.089844 54.644531 C 45.601563 54.644531 45.097656 54.605469 44.644531 54.511719 C 44.175781 54.511719 43.78125 54.363281 43.464844 54.195313 Z M 43.464844 54.195313 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 55.097656 54.738281 C 53.804688 54.738281 52.714844 54.289063 51.871094 53.445313 C 51.0625 52.582031 50.613281 51.476563 50.613281 50.074219 C 50.613281 48.628906 51.027344 47.46875 51.871094 46.570313 C 52.734375 45.671875 53.804688 45.222656 55.191406 45.222656 C 56.488281 45.222656 57.578125 45.671875 58.382813 46.511719 C 59.191406 47.355469 59.601563 48.480469 59.601563 49.921875 C 59.601563 51.367188 59.191406 52.527344 58.347656 53.425781 C 58.308594 53.464844 58.308594 53.464844 58.253906 53.519531 C 58.214844 53.558594 58.214844 53.558594 58.15625 53.613281 L 60.503906 55.859375 L 57.578125 55.859375 L 56.355469 54.605469 C 56.054688 54.679688 55.605469 54.738281 55.097656 54.738281 Z M 55.191406 47.019531 C 54.480469 47.019531 53.898438 47.28125 53.449219 47.824219 C 52.996094 48.367188 52.808594 49.078125 52.808594 49.980469 C 52.808594 50.878906 53.035156 51.589844 53.449219 52.132813 C 53.898438 52.675781 54.441406 52.9375 55.117188 52.9375 C 55.832031 52.9375 56.375 52.675781 56.824219 52.171875 C 57.238281 51.628906 57.464844 50.914063 57.464844 50.015625 C 57.464844 49.078125 57.238281 48.3125 56.824219 47.769531 C 56.449219 47.28125 55.90625 47.019531 55.191406 47.019531 Z M 55.191406 47.019531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 66.660156 54.550781 L 61.179688 54.550781 L 61.179688 45.351563 L 63.242188 45.351563 L 63.242188 52.84375 L 66.660156 52.84375 Z M 66.660156 54.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 40.074219 33.738281 L 40.074219 60.933594 C 40.074219 63.734375 46.410156 66.046875 54.199219 66.046875 L 54.199219 33.738281 Z M 40.074219 33.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(35.294118%,70.588235%,85.098039%);fill-opacity:1;" d="M 53.988281 66.0625 L 54.199219 66.0625 C 62.003906 66.0625 68.320313 63.753906 68.320313 60.953125 L 68.320313 33.738281 L 53.988281 33.738281 Z M 53.988281 66.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 68.320313 33.738281 C 68.320313 36.539063 61.984375 38.851563 54.199219 38.851563 C 46.410156 38.851563 40.074219 36.558594 40.074219 33.738281 C 40.074219 30.921875 46.410156 28.628906 54.199219 28.628906 C 61.984375 28.628906 68.320313 30.886719 68.320313 33.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 65.433594 33.441406 C 65.433594 35.28125 60.410156 36.835938 54.199219 36.835938 C 47.984375 36.835938 42.960938 35.332031 42.960938 33.441406 C 42.960938 31.605469 47.984375 30.046875 54.199219 30.046875 C 60.410156 30.046875 65.433594 31.570313 65.433594 33.441406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 63.085938 35.507813 C 64.558594 34.914063 65.433594 34.210938 65.433594 33.460938 C 65.433594 31.621094 60.410156 30.066406 54.199219 30.066406 C 47.984375 30.066406 42.960938 31.570313 42.960938 33.460938 C 42.960938 34.265625 43.835938 34.964844 45.308594 35.507813 C 47.355469 34.703125 50.59375 34.210938 54.199219 34.210938 C 57.800781 34.160156 61.023438 34.703125 63.085938 35.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.59375 53.234375 L 43.59375 51.308594 C 43.925781 51.609375 44.308594 51.816406 44.730469 51.976563 C 45.148438 52.097656 45.570313 52.183594 45.9375 52.183594 C 46.183594 52.183594 46.390625 52.148438 46.566406 52.097656 C 46.742188 52.0625 46.898438 52.011719 47.023438 51.921875 C 47.144531 51.835938 47.234375 51.746094 47.265625 51.625 C 47.300781 51.503906 47.355469 51.414063 47.355469 51.292969 C 47.355469 51.117188 47.320313 50.960938 47.234375 50.835938 C 47.144531 50.714844 47.023438 50.59375 46.847656 50.453125 C 46.671875 50.328125 46.460938 50.242188 46.253906 50.121094 C 46.042969 50.03125 45.796875 49.910156 45.5 49.789063 C 44.835938 49.488281 44.328125 49.15625 43.996094 48.789063 C 43.664063 48.371094 43.488281 47.914063 43.488281 47.320313 C 43.488281 46.863281 43.574219 46.480469 43.734375 46.183594 C 43.90625 45.851563 44.152344 45.585938 44.449219 45.378906 C 44.746094 45.167969 45.113281 44.992188 45.535156 44.921875 C 45.953125 44.835938 46.375 44.800781 46.828125 44.800781 C 47.285156 44.800781 47.671875 44.835938 48.003906 44.886719 C 48.335938 44.921875 48.667969 45.011719 48.964844 45.132813 L 48.964844 46.933594 C 48.84375 46.847656 48.667969 46.761719 48.511719 46.691406 C 48.351563 46.621094 48.175781 46.566406 48.003906 46.515625 C 47.828125 46.480469 47.617188 46.425781 47.460938 46.390625 C 47.285156 46.359375 47.128906 46.359375 46.953125 46.359375 C 46.742188 46.359375 46.53125 46.359375 46.359375 46.390625 C 46.183594 46.425781 46.023438 46.480469 45.902344 46.566406 C 45.78125 46.65625 45.691406 46.742188 45.605469 46.8125 C 45.515625 46.933594 45.515625 47.023438 45.515625 47.144531 C 45.515625 47.265625 45.550781 47.390625 45.640625 47.53125 C 45.726563 47.652344 45.816406 47.738281 45.972656 47.863281 C 46.09375 47.949219 46.269531 48.074219 46.480469 48.160156 C 46.691406 48.246094 46.898438 48.371094 47.144531 48.457031 C 47.476563 48.578125 47.808594 48.753906 48.074219 48.914063 C 48.371094 49.085938 48.578125 49.246094 48.789063 49.453125 C 49 49.664063 49.121094 49.875 49.246094 50.171875 C 49.332031 50.417969 49.421875 50.714844 49.421875 51.101563 C 49.421875 51.554688 49.332031 51.976563 49.175781 52.308594 C 49 52.640625 48.753906 52.902344 48.421875 53.113281 C 48.125 53.324219 47.757813 53.445313 47.335938 53.53125 C 46.917969 53.621094 46.496094 53.65625 46.042969 53.65625 C 45.585938 53.65625 45.113281 53.621094 44.695313 53.53125 C 44.257813 53.53125 43.890625 53.390625 43.59375 53.234375 Z M 43.59375 53.234375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 54.441406 53.742188 C 53.234375 53.742188 52.21875 53.324219 51.433594 52.535156 C 50.679688 51.730469 50.261719 50.699219 50.261719 49.386719 C 50.261719 48.039063 50.644531 46.953125 51.433594 46.113281 C 52.238281 45.273438 53.234375 44.851563 54.53125 44.851563 C 55.738281 44.851563 56.753906 45.273438 57.503906 46.058594 C 58.257813 46.847656 58.640625 47.898438 58.640625 49.246094 C 58.640625 50.59375 58.257813 51.675781 57.46875 52.515625 C 57.433594 52.550781 57.433594 52.550781 57.382813 52.605469 C 57.347656 52.640625 57.347656 52.640625 57.296875 52.691406 L 59.484375 54.792969 L 56.753906 54.792969 L 55.613281 53.621094 C 55.335938 53.691406 54.914063 53.742188 54.441406 53.742188 Z M 54.53125 46.53125 C 53.863281 46.53125 53.324219 46.777344 52.902344 47.285156 C 52.484375 47.792969 52.308594 48.457031 52.308594 49.296875 C 52.308594 50.136719 52.515625 50.800781 52.902344 51.308594 C 53.324219 51.816406 53.828125 52.0625 54.460938 52.0625 C 55.125 52.0625 55.632813 51.816406 56.050781 51.34375 C 56.4375 50.835938 56.648438 50.171875 56.648438 49.332031 C 56.648438 48.457031 56.4375 47.738281 56.050781 47.234375 C 55.703125 46.777344 55.195313 46.53125 54.53125 46.53125 Z M 54.53125 46.53125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.222656 53.566406 L 60.113281 53.566406 L 60.113281 44.976563 L 62.039063 44.976563 L 62.039063 51.976563 L 65.222656 51.976563 Z M 65.222656 53.566406 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureSqlDatabase(m).png b/dist/Databases/AzureSqlDatabase(m).png
index d27e3c55..df5bacfc 100644
Binary files a/dist/Databases/AzureSqlDatabase(m).png and b/dist/Databases/AzureSqlDatabase(m).png differ
diff --git a/dist/Databases/AzureSqlDatabase(m).svg b/dist/Databases/AzureSqlDatabase(m).svg
index be66231e..88d48bab 100644
--- a/dist/Databases/AzureSqlDatabase(m).svg
+++ b/dist/Databases/AzureSqlDatabase(m).svg
@@ -1,8 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65pt" height="70pt" viewBox="0 0 65 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.640625 69.5625 L 35 69.5625 C 49.492188 69.5625 61.238281 65.308594 61.238281 60.058594 L 61.238281 9.503906 L 34.640625 9.503906 Z M 34.640625 69.5625 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 21.402344 35.316406 C 21.5625 35.636719 21.878906 35.796875 22.195313 35.796875 C 22.511719 35.953125 22.828125 35.953125 23.144531 35.953125 C 23.464844 35.953125 23.78125 35.953125 23.9375 35.796875 C 24.257813 35.636719 24.414063 35.476563 24.730469 35.160156 C 24.890625 34.839844 25.046875 34.523438 25.207031 34.203125 C 25.367188 33.886719 25.367188 33.410156 25.367188 32.773438 C 25.367188 32.296875 25.367188 31.976563 25.207031 31.5 C 25.046875 31.023438 25.046875 30.703125 24.730469 30.386719 C 24.574219 30.066406 24.257813 29.910156 24.097656 29.589844 C 23.78125 29.433594 23.464844 29.273438 23.144531 29.273438 C 22.671875 29.273438 22.355469 29.433594 22.035156 29.589844 C 21.71875 29.75 21.5625 30.066406 21.242188 30.226563 C 21.085938 30.546875 20.925781 30.863281 20.769531 31.183594 C 20.609375 31.5 20.609375 31.976563 20.609375 32.453125 C 20.609375 33.089844 20.609375 33.566406 20.769531 33.886719 C 21.085938 34.683594 21.242188 35 21.402344 35.316406 Z M 21.402344 35.316406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 30.597656 47.726563 C 31.074219 47.726563 31.707031 47.726563 32.183594 47.886719 C 34.71875 42.796875 39.792969 39.453125 45.660156 39.136719 L 45.660156 9.386719 C 45.660156 4.613281 35.355469 0 22.828125 0 C 10.144531 0 0 4.296875 0 9.066406 L 0 52.023438 C 0 56.316406 8.402344 60.453125 19.339844 61.089844 C 19.183594 60.453125 19.183594 59.816406 19.183594 59.183594 C 19.183594 52.976563 24.257813 47.726563 30.597656 47.726563 Z M 38.839844 38.976563 L 30.914063 38.976563 L 30.914063 26.726563 L 34.5625 26.726563 L 34.5625 36.113281 L 38.839844 36.113281 Z M 22.828125 3.339844 C 31.867188 3.339844 39.160156 5.566406 39.160156 8.273438 C 39.160156 10.976563 31.867188 13.203125 22.828125 13.203125 C 13.792969 13.203125 6.5 10.976563 6.5 8.273438 C 6.5 5.566406 13.792969 3.339844 22.828125 3.339844 Z M 16.011719 36.113281 C 16.011719 36.433594 15.855469 36.75 15.695313 37.066406 C 15.535156 37.386719 15.378906 37.703125 15.0625 37.863281 C 14.742188 38.183594 14.425781 38.339844 14.109375 38.5 C 13.792969 38.660156 13.316406 38.816406 12.683594 38.976563 C 12.207031 39.136719 11.574219 39.136719 10.78125 39.136719 C 10.464844 39.136719 9.988281 39.136719 9.671875 39.136719 C 9.355469 39.136719 9.035156 39.136719 8.71875 38.976563 C 8.402344 38.976563 8.085938 38.816406 7.925781 38.816406 C 7.609375 38.816406 7.453125 38.660156 7.292969 38.5 L 7.292969 35.160156 C 7.453125 35.316406 7.769531 35.476563 8.085938 35.636719 C 8.402344 35.796875 8.5625 35.953125 8.878906 36.113281 C 9.195313 36.273438 9.511719 36.273438 9.828125 36.433594 C 10.144531 36.589844 10.464844 36.589844 10.78125 36.589844 C 11.097656 36.589844 11.257813 36.589844 11.414063 36.433594 C 11.574219 36.433594 11.730469 36.273438 11.730469 36.273438 C 11.890625 36.273438 11.890625 36.113281 11.890625 35.953125 C 11.890625 35.796875 11.890625 35.796875 11.890625 35.636719 C 11.890625 35.476563 11.890625 35.316406 11.730469 35.160156 C 11.574219 35 11.574219 34.839844 11.414063 34.839844 C 11.257813 34.683594 11.097656 34.683594 10.78125 34.523438 C 10.464844 34.363281 10.304688 34.363281 9.988281 34.203125 C 9.511719 34.046875 9.035156 33.726563 8.5625 33.410156 C 8.242188 33.089844 7.925781 32.933594 7.609375 32.613281 C 7.292969 32.296875 7.132813 31.976563 7.132813 31.660156 C 6.976563 31.339844 6.976563 30.863281 6.976563 30.546875 C 6.976563 29.910156 7.132813 29.433594 7.292969 28.953125 C 7.609375 28.476563 7.925781 28 8.242188 27.683594 C 8.71875 27.363281 9.195313 27.046875 9.828125 26.886719 C 10.464844 26.726563 11.097656 26.566406 11.890625 26.566406 C 12.367188 26.566406 12.683594 26.566406 13 26.566406 C 13.316406 26.566406 13.632813 26.566406 13.953125 26.726563 C 14.269531 26.726563 14.425781 26.886719 14.742188 26.886719 C 14.902344 26.886719 15.21875 27.046875 15.378906 27.046875 L 15.378906 30.226563 C 15.21875 30.066406 15.0625 30.066406 14.742188 29.910156 C 14.585938 29.75 14.269531 29.75 13.953125 29.589844 C 13.632813 29.433594 13.476563 29.433594 13.160156 29.433594 C 12.839844 29.433594 12.523438 29.433594 12.207031 29.433594 C 11.730469 29.433594 11.414063 29.433594 11.257813 29.589844 C 10.9375 29.75 10.9375 29.910156 10.9375 30.226563 C 10.9375 30.386719 10.9375 30.546875 11.097656 30.546875 C 11.097656 30.703125 11.257813 30.703125 11.414063 30.863281 C 11.574219 31.023438 11.730469 31.023438 11.890625 31.183594 C 12.046875 31.339844 12.367188 31.339844 12.683594 31.5 C 13.160156 31.660156 13.632813 31.976563 14.109375 32.136719 C 14.585938 32.453125 14.902344 32.613281 15.21875 32.933594 C 15.535156 33.25 15.695313 33.566406 16.011719 33.886719 C 16.171875 34.203125 16.328125 34.683594 16.328125 35.316406 C 16.011719 35.476563 16.011719 35.796875 16.011719 36.113281 Z M 17.28125 35.476563 C 16.964844 34.683594 16.804688 33.886719 16.804688 32.933594 C 16.804688 31.976563 16.964844 31.023438 17.28125 30.226563 C 17.597656 29.433594 18.074219 28.796875 18.546875 28.160156 C 19.023438 27.523438 19.816406 27.203125 20.453125 26.886719 C 21.242188 26.566406 22.035156 26.410156 22.988281 26.410156 C 23.9375 26.410156 24.730469 26.566406 25.367188 26.886719 C 26.160156 27.203125 26.792969 27.683594 27.269531 28.160156 C 27.742188 28.636719 28.21875 29.433594 28.535156 30.066406 C 28.855469 30.863281 29.011719 31.660156 29.011719 32.773438 C 29.011719 33.410156 29.011719 34.203125 28.695313 34.683594 C 28.535156 35.316406 28.21875 35.796875 27.902344 36.273438 C 27.585938 36.75 27.269531 37.226563 26.792969 37.546875 C 26.316406 37.863281 26 38.183594 25.367188 38.5 L 29.488281 42 L 24.730469 42 L 22.035156 39.136719 C 21.242188 39.136719 20.453125 38.816406 19.816406 38.660156 C 19.183594 38.339844 18.546875 37.863281 18.074219 37.386719 C 18.074219 36.910156 17.597656 36.273438 17.28125 35.476563 Z M 17.28125 35.476563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 65.632813 63.476563 C 65.632813 60.453125 63.257813 57.910156 60.242188 57.589844 C 60.402344 56.636719 60.5625 55.839844 60.5625 54.886719 C 60.5625 47.089844 54.21875 40.726563 46.453125 40.726563 C 40.585938 40.726563 35.355469 44.226563 33.292969 49.636719 C 32.5 49.476563 31.707031 49.316406 30.757813 49.316406 C 25.207031 49.316406 20.769531 53.773438 20.769531 59.339844 C 20.769531 64.75 25.046875 69.203125 30.597656 69.363281 L 61.511719 69.363281 L 61.511719 69.203125 C 63.890625 68.566406 65.632813 66.183594 65.632813 63.476563 Z M 60.242188 67.773438 L 30.757813 67.773438 C 26.160156 67.773438 22.355469 63.953125 22.355469 59.339844 C 22.355469 54.726563 26.160156 50.910156 30.757813 50.910156 C 31.707031 50.910156 32.660156 51.066406 33.453125 51.386719 L 34.242188 51.703125 L 34.5625 50.910156 C 36.304688 45.816406 41.0625 42.316406 46.453125 42.316406 C 53.425781 42.316406 58.976563 48.046875 58.976563 54.886719 C 58.976563 56 58.816406 57.113281 58.5 58.226563 L 58.183594 59.5 L 59.292969 59.339844 C 59.453125 59.339844 59.609375 59.339844 59.769531 59.339844 C 62.144531 59.339844 64.046875 61.25 64.046875 63.636719 C 64.046875 65.703125 62.464844 67.613281 60.242188 67.773438 Z M 60.242188 67.773438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 8.761719 9.503906 L 8.761719 60.058594 C 8.761719 65.308594 20.507813 69.5625 35 69.5625 L 35 9.503906 Z M 8.761719 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 34.640625 69.5625 L 35 69.5625 C 49.492188 69.5625 61.238281 65.308594 61.238281 60.058594 L 61.238281 9.503906 L 34.640625 9.503906 Z M 34.640625 69.5625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 61.238281 9.503906 C 61.238281 14.75 49.492188 19.007813 35 19.007813 C 20.507813 19.007813 8.761719 14.75 8.761719 9.503906 C 8.761719 4.253906 20.507813 0 35 0 C 49.492188 0 61.238281 4.253906 61.238281 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 55.875 8.957031 C 55.875 12.421875 46.527344 15.226563 35 15.226563 C 23.472656 15.226563 14.125 12.421875 14.125 8.957031 C 14.125 5.492188 23.472656 2.683594 35 2.683594 C 46.527344 2.683594 55.875 5.492188 55.875 8.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 51.5 12.789063 C 54.234375 11.726563 55.875 10.402344 55.875 8.957031 C 55.875 5.492188 46.53125 2.6875 35 2.6875 C 23.472656 2.6875 14.125 5.492188 14.125 8.957031 C 14.125 10.402344 15.765625 11.726563 18.5 12.789063 C 22.316406 11.304688 28.28125 10.351563 35 10.351563 C 41.722656 10.351563 47.683594 11.304688 51.5 12.789063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.664063 44.59375 C 26.664063 46.167969 26.097656 47.382813 24.957031 48.246094 C 23.816406 49.109375 22.242188 49.539063 20.234375 49.539063 C 18.523438 49.539063 17.097656 49.230469 15.949219 48.613281 L 15.949219 44.917969 C 17.273438 46.042969 18.730469 46.605469 20.324219 46.605469 C 21.09375 46.605469 21.691406 46.453125 22.109375 46.144531 C 22.53125 45.835938 22.738281 45.429688 22.738281 44.917969 C 22.738281 44.417969 22.539063 43.984375 22.132813 43.613281 C 21.730469 43.246094 20.90625 42.765625 19.667969 42.183594 C 17.144531 40.996094 15.878906 39.378906 15.878906 37.332031 C 15.878906 35.847656 16.429688 34.65625 17.53125 33.757813 C 18.632813 32.863281 20.09375 32.414063 21.917969 32.414063 C 23.535156 32.414063 24.875 32.625 25.9375 33.046875 L 25.9375 36.5 C 24.824219 35.730469 23.550781 35.347656 22.128906 35.347656 C 21.414063 35.347656 20.847656 35.496094 20.429688 35.800781 C 20.03125 36.074219 19.796875 36.535156 19.808594 37.019531 C 19.808594 37.542969 19.976563 37.972656 20.3125 38.308594 C 20.644531 38.640625 21.332031 39.054688 22.371094 39.546875 C 23.921875 40.28125 25.023438 41.023438 25.679688 41.777344 C 26.335938 42.535156 26.664063 43.472656 26.664063 44.59375 Z M 44.484375 40.855469 C 44.484375 42.800781 44.039063 44.492188 43.15625 45.925781 C 42.269531 47.355469 41.023438 48.359375 39.414063 48.9375 L 44.21875 53.386719 L 39.367188 53.386719 L 35.9375 49.539063 C 34.46875 49.484375 33.140625 49.097656 31.960938 48.371094 C 30.777344 47.652344 29.863281 46.65625 29.222656 45.398438 C 28.578125 44.140625 28.257813 42.738281 28.257813 41.1875 C 28.257813 39.472656 28.605469 37.941406 29.300781 36.597656 C 30 35.253906 30.976563 34.222656 32.242188 33.496094 C 33.503906 32.777344 34.949219 32.414063 36.582031 32.414063 C 38.105469 32.414063 39.472656 32.761719 40.675781 33.464844 C 41.882813 34.164063 42.816406 35.160156 43.484375 36.453125 C 44.152344 37.75 44.484375 39.214844 44.484375 40.855469 Z M 40.558594 41.0625 C 40.558594 39.386719 40.191406 38.058594 39.460938 37.085938 C 38.726563 36.109375 37.730469 35.621094 36.457031 35.621094 C 35.164063 35.621094 34.128906 36.113281 33.351563 37.089844 C 32.574219 38.066406 32.183594 39.367188 32.183594 40.992188 C 32.183594 42.609375 32.566406 43.898438 33.328125 44.867188 C 34.089844 45.832031 35.101563 46.316406 36.363281 46.316406 C 37.648438 46.316406 38.667969 45.847656 39.425781 44.910156 C 40.179688 43.976563 40.558594 42.695313 40.558594 41.0625 Z M 57.082031 49.25 L 47.21875 49.25 L 47.21875 32.691406 L 50.949219 32.691406 L 50.949219 46.226563 L 57.082031 46.226563 Z M 57.082031 49.25 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureSqlDatabase.png b/dist/Databases/AzureSqlDatabase.png
index 044fb8b2..d7b34ad0 100644
Binary files a/dist/Databases/AzureSqlDatabase.png and b/dist/Databases/AzureSqlDatabase.png differ
diff --git a/dist/Databases/AzureSqlDatabase.puml b/dist/Databases/AzureSqlDatabase.puml
index ef7802ec..8b8d376c 100644
--- a/dist/Databases/AzureSqlDatabase.puml
+++ b/dist/Databases/AzureSqlDatabase.puml
@@ -1,11 +1,10 @@
-sprite $AzureSqlDatabase [65x70/16z] {
-xTQ7phEw5eJXMVPgC_T_mGTXlaw0wAZl_r59VqErZUziUbGtARAxCkR0OyEB-eiT4_SiMgyn1ovPwWChmzsdRoABElJ4QwcbOlnjp-WZCN3ErXVeXXSikBw1
-K-ltYUNoJquBiROUDoXjnijF0ZVgvNPgHyEbmPSRgeKJ5vpQzNbWQJUS6a7fBh1q-lXHiUb5BKy22xjhqqqjDu4R_xt0ly2_0AkAnxFCusbtyrcWx7E8ps-J
-1O3vA51OGWeSuft0031y8jQNtB6fDmBOK69h0iYrIVFDW2Kb0h2FRNeZuDY5-F6J2O3F0mhil06CbNmle5uRKTXmxOBfUQ0erHuO07njaRyHc1OLs73Fm00O
-zu3DpNq0YqlsVKB5uMaWA75-pQVF0-hCB6h76W1Icpv8OiOy2vpYEfHV68PpEaS3CAc50PXdK-noUn8GQ_ErGBEaMBbMVcNuedi519a3omWotWaKKEg1BvQg
-vm4QIecVNFquC90A_3PL3mE9gSHV8RyBT0p3XiIPvdMW9s1Zpk5od1cAgq02ixKZpbLV10BMOimnF0FdN0CRwaHYa8vh9iUcz1TXvC0T1JQ3-iDH7BZ513P-
-iW53WNjTs4tgfq8I3p2nMEe71mltxDjcZgI-J2XmRnvpoS6BEWoJuvvdKOLlXcVl0IZmJAp2TpQcWOd71PmfuYdYZ6lYeSQfvlyPc2eyOi8vLniUIE459sFW
-XgKIhrX9x6jINlOzwreEu7y
+sprite $AzureSqlDatabase [70x70/16z] {
+xTS5akCm441HDSFS_xuRjQKXnOcyJByWOFkL8DZ-c017qBuc91OHVbz_IFiQiF1fmhHZq4AiqBCHeV16Gj-EL8yKtWw-dx9GkCv8HFGr4LbdH8l2xvX-kTsf
+OmEfP54IvqwBsgFqTQTL5-Kbv_Y0v871s4OQTvINh2UdnABB6AY48_AugtJdqwe30Du2-BmRP15tbIgDeJqBnIFEbIfT2Cu5rYAUALMQ2k5x391OBQfTvRNC
+T8-bVMMK4LUL_yf_vR-IRcQHys6OgCN8R-qeoQs2Wp5i5HyNzuFsN4beewuajHdO1QL6GanGoe4SCFY-qg-8-Y2_ATPkoJoTjfMSSwdwccZjKNb-QImoxaSj
+SYdHGTbMf1vutUydyNYzIB-_hIJMGueXwb2idjnLNZVNLWKtbSgFuKGfCXJT7yieQqUuDfg6mbTMTrJZFxOzId6eotSLoPhKyGpLOlJ6lLsbWNeO7g-QQ3qQ
+FvviACGzUwYy5cDcCurIPhAZWDV3mFdOueAIoeZ8bg_xpWLvLCepk_g9QJMsR_xShRFj6vMn7FgjIZ3TylZplzN-A_0rYhJFvLSel2XoNV6sPbSLntOdlQOu
+jBkXxolExJIqN9LhHWNi-KHnmROHYUU9OihGjXj_XJqYCjnz_X4-wGi
 }
 
 AzureEntityColoring(AzureSqlDatabase)
diff --git a/dist/Databases/AzureSqlDatabase.svg b/dist/Databases/AzureSqlDatabase.svg
index 80ab4f2f..bcb66d9e 100644
--- a/dist/Databases/AzureSqlDatabase.svg
+++ b/dist/Databases/AzureSqlDatabase.svg
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="51pt" height="70pt" viewBox="0 0 51 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="51" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="51" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.480469 69.5625 L 25.835938 69.5625 C 40.101563 69.5625 51.667969 65.308594 51.667969 60.058594 L 51.667969 9.503906 L 25.480469 9.503906 Z M 25.480469 69.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.640625 69.5625 L 35 69.5625 C 49.492188 69.5625 61.238281 65.308594 61.238281 60.058594 L 61.238281 9.503906 L 34.640625 9.503906 Z M 34.640625 69.5625 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 9.503906 L 0 60.058594 C 0 65.308594 11.566406 69.5625 25.835938 69.5625 L 25.835938 9.503906 C 25.835938 9.503906 0 9.503906 0 9.503906 Z M 0 9.503906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 25.480469 69.5625 L 25.835938 69.5625 C 40.101563 69.5625 51.667969 65.308594 51.667969 60.058594 L 51.667969 9.503906 L 25.480469 9.503906 Z M 25.480469 69.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 8.761719 9.503906 L 8.761719 60.058594 C 8.761719 65.308594 20.507813 69.5625 35 69.5625 L 35 9.503906 Z M 8.761719 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 34.640625 69.5625 L 35 69.5625 C 49.492188 69.5625 61.238281 65.308594 61.238281 60.058594 L 61.238281 9.503906 L 34.640625 9.503906 Z M 34.640625 69.5625 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.667969 9.503906 C 51.667969 14.75 40.101563 19.007813 25.835938 19.007813 C 11.566406 19.007813 0 14.75 0 9.503906 C 0 4.253906 11.566406 0 25.835938 0 C 40.101563 0 51.667969 4.253906 51.667969 9.503906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 46.386719 8.957031 C 46.386719 12.421875 37.1875 15.226563 25.835938 15.226563 C 14.484375 15.226563 5.28125 12.421875 5.28125 8.957031 C 5.28125 5.492188 14.484375 2.683594 25.835938 2.683594 C 37.1875 2.683594 46.386719 5.492188 46.386719 8.957031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 42.082031 12.789063 C 44.773438 11.726563 46.390625 10.402344 46.390625 8.957031 C 46.390625 5.492188 37.1875 2.6875 25.835938 2.6875 C 14.484375 2.6875 5.28125 5.492188 5.28125 8.957031 C 5.28125 10.402344 6.898438 11.726563 9.589844 12.789063 C 13.347656 11.304688 19.21875 10.351563 25.835938 10.351563 C 32.453125 10.351563 38.320313 11.304688 42.082031 12.789063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.628906 44.59375 C 17.628906 46.167969 17.070313 47.382813 15.945313 48.246094 C 14.824219 49.109375 13.273438 49.539063 11.296875 49.539063 C 9.613281 49.539063 8.207031 49.230469 7.078125 48.613281 L 7.078125 44.917969 C 8.382813 46.042969 9.816406 46.605469 11.386719 46.605469 C 12.144531 46.605469 12.730469 46.453125 13.144531 46.144531 C 13.558594 45.835938 13.765625 45.429688 13.765625 44.917969 C 13.765625 44.417969 13.566406 43.984375 13.167969 43.613281 C 12.769531 43.246094 11.960938 42.765625 10.742188 42.183594 C 8.253906 40.996094 7.011719 39.378906 7.011719 37.332031 C 7.011719 35.847656 7.550781 34.65625 8.636719 33.757813 C 9.71875 32.863281 11.160156 32.414063 12.957031 32.414063 C 14.546875 32.414063 15.867188 32.625 16.914063 33.046875 L 16.914063 36.5 C 15.816406 35.730469 14.5625 35.347656 13.164063 35.347656 C 12.457031 35.347656 11.902344 35.496094 11.492188 35.800781 C 11.082031 36.105469 10.878906 36.511719 10.878906 37.019531 C 10.878906 37.542969 11.042969 37.972656 11.371094 38.308594 C 11.703125 38.640625 12.378906 39.054688 13.402344 39.546875 C 14.925781 40.28125 16.011719 41.023438 16.660156 41.777344 C 17.304688 42.535156 17.628906 43.472656 17.628906 44.59375 Z M 17.628906 44.59375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.171875 40.855469 C 35.171875 42.800781 34.734375 44.492188 33.863281 45.925781 C 32.992188 47.355469 31.765625 48.359375 30.179688 48.9375 L 34.910156 53.386719 L 30.136719 53.386719 L 26.757813 49.539063 C 25.3125 49.484375 24.003906 49.097656 22.839844 48.371094 C 21.679688 47.652344 20.777344 46.65625 20.144531 45.398438 C 19.515625 44.140625 19.195313 42.738281 19.195313 41.1875 C 19.195313 39.472656 19.539063 37.941406 20.226563 36.597656 C 20.910156 35.253906 21.875 34.222656 23.117188 33.496094 C 24.363281 32.777344 25.785156 32.414063 27.394531 32.414063 C 28.894531 32.414063 30.238281 32.761719 31.425781 33.464844 C 32.609375 34.164063 33.53125 35.160156 34.1875 36.453125 C 34.84375 37.75 35.171875 39.214844 35.171875 40.855469 Z M 31.308594 41.0625 C 31.308594 39.386719 30.949219 38.058594 30.226563 37.085938 C 29.503906 36.109375 28.519531 35.621094 27.269531 35.621094 C 25.996094 35.621094 24.976563 36.113281 24.210938 37.089844 C 23.445313 38.066406 23.0625 39.367188 23.0625 40.992188 C 23.0625 42.609375 23.4375 43.898438 24.1875 44.867188 C 24.9375 45.832031 25.933594 46.316406 27.175781 46.316406 C 28.445313 46.316406 29.449219 45.847656 30.191406 44.910156 C 30.933594 43.976563 31.308594 42.695313 31.308594 41.0625 Z M 31.308594 41.0625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.867188 32.691406 L 41.539063 32.691406 L 41.539063 46.226563 L 47.574219 46.226563 L 47.574219 49.25 L 37.867188 49.25 Z M 37.867188 32.691406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 61.238281 9.503906 C 61.238281 14.75 49.492188 19.007813 35 19.007813 C 20.507813 19.007813 8.761719 14.75 8.761719 9.503906 C 8.761719 4.253906 20.507813 0 35 0 C 49.492188 0 61.238281 4.253906 61.238281 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 55.875 8.957031 C 55.875 12.421875 46.527344 15.226563 35 15.226563 C 23.472656 15.226563 14.125 12.421875 14.125 8.957031 C 14.125 5.492188 23.472656 2.683594 35 2.683594 C 46.527344 2.683594 55.875 5.492188 55.875 8.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 51.5 12.789063 C 54.234375 11.726563 55.875 10.402344 55.875 8.957031 C 55.875 5.492188 46.53125 2.6875 35 2.6875 C 23.472656 2.6875 14.125 5.492188 14.125 8.957031 C 14.125 10.402344 15.765625 11.726563 18.5 12.789063 C 22.316406 11.304688 28.28125 10.351563 35 10.351563 C 41.722656 10.351563 47.683594 11.304688 51.5 12.789063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.664063 44.59375 C 26.664063 46.167969 26.097656 47.382813 24.957031 48.246094 C 23.816406 49.109375 22.242188 49.539063 20.234375 49.539063 C 18.523438 49.539063 17.097656 49.230469 15.949219 48.613281 L 15.949219 44.917969 C 17.273438 46.042969 18.730469 46.605469 20.324219 46.605469 C 21.09375 46.605469 21.691406 46.453125 22.109375 46.144531 C 22.53125 45.835938 22.738281 45.429688 22.738281 44.917969 C 22.738281 44.417969 22.539063 43.984375 22.132813 43.613281 C 21.730469 43.246094 20.90625 42.765625 19.667969 42.183594 C 17.144531 40.996094 15.878906 39.378906 15.878906 37.332031 C 15.878906 35.847656 16.429688 34.65625 17.53125 33.757813 C 18.632813 32.863281 20.09375 32.414063 21.917969 32.414063 C 23.535156 32.414063 24.875 32.625 25.9375 33.046875 L 25.9375 36.5 C 24.824219 35.730469 23.550781 35.347656 22.128906 35.347656 C 21.414063 35.347656 20.847656 35.496094 20.429688 35.800781 C 20.03125 36.074219 19.796875 36.535156 19.808594 37.019531 C 19.808594 37.542969 19.976563 37.972656 20.3125 38.308594 C 20.644531 38.640625 21.332031 39.054688 22.371094 39.546875 C 23.921875 40.28125 25.023438 41.023438 25.679688 41.777344 C 26.335938 42.535156 26.664063 43.472656 26.664063 44.59375 Z M 44.484375 40.855469 C 44.484375 42.800781 44.039063 44.492188 43.15625 45.925781 C 42.269531 47.355469 41.023438 48.359375 39.414063 48.9375 L 44.21875 53.386719 L 39.367188 53.386719 L 35.9375 49.539063 C 34.46875 49.484375 33.140625 49.097656 31.960938 48.371094 C 30.777344 47.652344 29.863281 46.65625 29.222656 45.398438 C 28.578125 44.140625 28.257813 42.738281 28.257813 41.1875 C 28.257813 39.472656 28.605469 37.941406 29.300781 36.597656 C 30 35.253906 30.976563 34.222656 32.242188 33.496094 C 33.503906 32.777344 34.949219 32.414063 36.582031 32.414063 C 38.105469 32.414063 39.472656 32.761719 40.675781 33.464844 C 41.882813 34.164063 42.816406 35.160156 43.484375 36.453125 C 44.152344 37.75 44.484375 39.214844 44.484375 40.855469 Z M 40.558594 41.0625 C 40.558594 39.386719 40.191406 38.058594 39.460938 37.085938 C 38.726563 36.109375 37.730469 35.621094 36.457031 35.621094 C 35.164063 35.621094 34.128906 36.113281 33.351563 37.089844 C 32.574219 38.066406 32.183594 39.367188 32.183594 40.992188 C 32.183594 42.609375 32.566406 43.898438 33.328125 44.867188 C 34.089844 45.832031 35.101563 46.316406 36.363281 46.316406 C 37.648438 46.316406 38.667969 45.847656 39.425781 44.910156 C 40.179688 43.976563 40.558594 42.695313 40.558594 41.0625 Z M 57.082031 49.25 L 47.21875 49.25 L 47.21875 32.691406 L 50.949219 32.691406 L 50.949219 46.226563 L 57.082031 46.226563 Z M 57.082031 49.25 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureSqlManagedInstance(m).png b/dist/Databases/AzureSqlManagedInstance(m).png
new file mode 100644
index 00000000..455e0501
Binary files /dev/null and b/dist/Databases/AzureSqlManagedInstance(m).png differ
diff --git a/dist/Databases/AzureSqlManagedInstance(m).svg b/dist/Databases/AzureSqlManagedInstance(m).svg
new file mode 100644
index 00000000..8383f4df
--- /dev/null
+++ b/dist/Databases/AzureSqlManagedInstance(m).svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="53pt" height="70pt" viewBox="0 0 53 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,137,238);fill-opacity:1;" d="M 16.226563 0 L 48.675781 0 C 51.0625 0 53 1.957031 53 4.375 L 53 65.625 C 53 68.042969 51.0625 70 48.675781 70 L 16.226563 70 C 13.835938 70 11.898438 68.042969 11.898438 65.625 L 11.898438 4.375 C 11.898438 1.957031 13.835938 0 16.226563 0 Z M 16.226563 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 20.550781 6.5625 C 18.164063 6.5625 16.226563 8.523438 16.226563 10.9375 C 16.226563 13.355469 18.164063 15.3125 20.550781 15.3125 L 44.347656 15.3125 C 46.738281 15.3125 48.675781 13.355469 48.675781 10.9375 C 48.675781 8.523438 46.738281 6.5625 44.347656 6.5625 Z M 20.550781 6.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 22.714844 10.9375 C 22.714844 12.144531 21.746094 13.125 20.550781 13.125 C 19.355469 13.125 18.390625 12.144531 18.390625 10.9375 C 18.390625 9.730469 19.355469 8.75 20.550781 8.75 C 21.746094 8.75 22.714844 9.730469 22.714844 10.9375 Z M 22.714844 10.9375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 20.550781 19.6875 C 18.164063 19.6875 16.226563 21.648438 16.226563 24.0625 C 16.226563 26.480469 18.164063 28.4375 20.550781 28.4375 L 44.347656 28.4375 C 46.738281 28.4375 48.675781 26.480469 48.675781 24.0625 C 48.675781 21.648438 46.738281 19.6875 44.347656 19.6875 Z M 20.550781 19.6875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 22.714844 24.0625 C 22.714844 25.269531 21.746094 26.25 20.550781 26.25 C 19.355469 26.25 18.390625 25.269531 18.390625 24.0625 C 18.390625 22.855469 19.355469 21.875 20.550781 21.875 C 21.746094 21.875 22.714844 22.855469 22.714844 24.0625 Z M 22.714844 24.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 20.550781 32.8125 C 18.164063 32.8125 16.226563 34.773438 16.226563 37.1875 C 16.226563 39.605469 18.164063 41.5625 20.550781 41.5625 L 44.347656 41.5625 C 46.738281 41.5625 48.675781 39.605469 48.675781 37.1875 C 48.675781 34.773438 46.738281 32.8125 44.347656 32.8125 Z M 20.550781 32.8125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 22.714844 37.1875 C 22.714844 38.398438 21.746094 39.375 20.550781 39.375 C 19.355469 39.375 18.390625 38.398438 18.390625 37.1875 C 18.390625 35.980469 19.355469 35 20.550781 35 C 21.746094 35 22.714844 35.980469 22.714844 37.1875 Z M 22.714844 37.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.429688 67.816406 C 49.011719 67.816406 51.917969 64.878906 51.917969 61.253906 C 51.917969 57.34375 48.574219 54.324219 44.746094 54.726563 C 46.804688 44.605469 39.175781 35.003906 28.851563 35.003906 C 22.09375 35.003906 16.296875 39.183594 13.859375 45.128906 C 6.804688 43.519531 0 48.929688 0 56.332031 C 0 62.671875 5.085938 67.816406 11.355469 67.816406 Z M 45.429688 67.816406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(193,228,255);fill-opacity:1;" d="M 44.746094 48.097656 C 43.230469 40.625 36.691406 35.003906 28.851563 35.003906 C 22.09375 35.003906 16.296875 39.183594 13.859375 45.128906 C 13.054688 44.945313 12.21875 44.847656 11.355469 44.847656 C 5.085938 44.847656 0 49.988281 0 56.332031 C 0 62.671875 5.085938 67.816406 11.355469 67.816406 L 18.992188 67.816406 C 13.902344 67.816406 9.773438 63.640625 9.773438 58.492188 C 9.773438 53.34375 13.902344 49.171875 18.992188 49.171875 C 19.691406 49.171875 20.371094 49.25 21.027344 49.398438 C 23.003906 44.574219 27.707031 41.179688 33.195313 41.179688 C 38.171875 41.179688 42.507813 43.976563 44.746094 48.097656 Z M 44.746094 48.097656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(21,155,255);fill-opacity:1;" d="M 31.367188 63.4375 C 32 63.4375 32.605469 63.300781 33.148438 63.050781 L 33.53125 63.4375 L 35.691406 63.4375 L 35.691406 61.25 L 35.3125 60.863281 C 35.558594 60.3125 35.691406 59.703125 35.691406 59.0625 L 35.691406 56.875 C 35.691406 54.460938 33.757813 52.5 31.367188 52.5 C 28.976563 52.5 27.039063 54.460938 27.039063 56.875 L 27.039063 59.0625 C 27.039063 61.480469 28.976563 63.4375 31.367188 63.4375 Z M 19.46875 52.5 C 17.679688 52.5 16.222656 53.96875 16.222656 55.78125 C 16.222656 57.59375 17.679688 59.0625 19.46875 59.0625 L 21.632813 59.0625 C 22.230469 59.0625 22.714844 59.550781 22.714844 60.15625 C 22.714844 60.761719 22.230469 61.25 21.632813 61.25 L 16.222656 61.25 L 16.222656 63.4375 L 21.632813 63.4375 C 23.425781 63.4375 24.878906 61.96875 24.878906 60.15625 C 24.878906 58.34375 23.425781 56.875 21.632813 56.875 L 19.46875 56.875 C 18.871094 56.875 18.386719 56.386719 18.386719 55.78125 C 18.386719 55.179688 18.871094 54.6875 19.46875 54.6875 L 24.878906 54.6875 L 24.878906 52.5 Z M 37.859375 52.5 L 40.019531 52.5 L 40.019531 61.25 L 44.347656 61.25 L 44.347656 63.4375 L 37.859375 63.4375 Z M 33.53125 59.0625 L 31.367188 59.0625 L 31.367188 61.25 C 30.171875 61.25 29.203125 60.269531 29.203125 59.0625 L 29.203125 56.875 C 29.203125 55.667969 30.171875 54.6875 31.367188 54.6875 C 32.5625 54.6875 33.53125 55.667969 33.53125 56.875 Z M 33.53125 59.0625 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureSqlManagedInstance.png b/dist/Databases/AzureSqlManagedInstance.png
new file mode 100644
index 00000000..93e27907
Binary files /dev/null and b/dist/Databases/AzureSqlManagedInstance.png differ
diff --git a/dist/Databases/AzureSqlManagedInstance.puml b/dist/Databases/AzureSqlManagedInstance.puml
new file mode 100644
index 00000000..1ed876fa
--- /dev/null
+++ b/dist/Databases/AzureSqlManagedInstance.puml
@@ -0,0 +1,12 @@
+sprite $AzureSqlManagedInstance [53x70/16z] {
+rT87jgKW383X9BHWtVzkXtYF72dXgjF_rtr-5WWKEOxVOe-bAOZE2kNYlRnoet5N5FyqccOr3KtRFcZge_IVRQnQjEnxi6vLqTf3wpvRQrb5solq_l7UByJx
+9N-_kUF-2JHfwMZTzLO5RVkmBfhJSHTqkVp2WPqI2ay7TdFMBOy7TbksfmCxxwDcRNENLMkPNetHVuf62xueQDr7RTh0pY7ADsE8ZFLBgUR-x2qsHPV2hO6b
+Eluwi0krcMqui5CsPUledG8fRNdDMqH5-EcZjcsTOm-Pgu2SCADDXByOI1KiAAYyJHbHWp15kf68IvJFLuraCsg81Dqeevv1w9THPL029SwekOLUE17ghwAZ
+rk3b4V4yL22idyq4bWAa73CxI37ZzPsmCiISaMV9GqPHGPPTtaiE11JOP0H8Nb3zHexjYJoRW_gC9DD1nEozTt9EO9835HA5zHPPbWAf27oB08qnNixq2P7r
+3Q88tPqb3l9wxhYlgn14m1AHCUUTYDcv4zbqz8GCK3wVuwD0-VN4yv7DTwfkPRta42HotZdl0FoHWIDCA2k4Uxa8ZnN524yLig0Zn7iCRJ9StDXBOH17oS0r
+m_5xRE47
+}
+
+AzureEntityColoring(AzureSqlManagedInstance)
+!define AzureSqlManagedInstance(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSqlManagedInstance, AzureSqlManagedInstance)
+!define AzureSqlManagedInstance(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSqlManagedInstance, AzureSqlManagedInstance)
diff --git a/dist/Databases/AzureSqlManagedInstance.svg b/dist/Databases/AzureSqlManagedInstance.svg
new file mode 100644
index 00000000..36a4bac1
--- /dev/null
+++ b/dist/Databases/AzureSqlManagedInstance.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="53pt" height="70pt" viewBox="0 0 53 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(46.666667%,46.666667%,46.666667%);fill-opacity:1;" d="M 16.226563 0 L 48.675781 0 C 51.0625 0 53 1.957031 53 4.375 L 53 65.625 C 53 68.042969 51.0625 70 48.675781 70 L 16.226563 70 C 13.835938 70 11.898438 68.042969 11.898438 65.625 L 11.898438 4.375 C 11.898438 1.957031 13.835938 0 16.226563 0 Z M 16.226563 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 20.550781 6.5625 C 18.164063 6.5625 16.226563 8.523438 16.226563 10.9375 C 16.226563 13.355469 18.164063 15.3125 20.550781 15.3125 L 44.347656 15.3125 C 46.738281 15.3125 48.675781 13.355469 48.675781 10.9375 C 48.675781 8.523438 46.738281 6.5625 44.347656 6.5625 Z M 20.550781 6.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 22.714844 10.9375 C 22.714844 12.144531 21.746094 13.125 20.550781 13.125 C 19.355469 13.125 18.390625 12.144531 18.390625 10.9375 C 18.390625 9.730469 19.355469 8.75 20.550781 8.75 C 21.746094 8.75 22.714844 9.730469 22.714844 10.9375 Z M 22.714844 10.9375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 20.550781 19.6875 C 18.164063 19.6875 16.226563 21.648438 16.226563 24.0625 C 16.226563 26.480469 18.164063 28.4375 20.550781 28.4375 L 44.347656 28.4375 C 46.738281 28.4375 48.675781 26.480469 48.675781 24.0625 C 48.675781 21.648438 46.738281 19.6875 44.347656 19.6875 Z M 20.550781 19.6875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 22.714844 24.0625 C 22.714844 25.269531 21.746094 26.25 20.550781 26.25 C 19.355469 26.25 18.390625 25.269531 18.390625 24.0625 C 18.390625 22.855469 19.355469 21.875 20.550781 21.875 C 21.746094 21.875 22.714844 22.855469 22.714844 24.0625 Z M 22.714844 24.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 20.550781 32.8125 C 18.164063 32.8125 16.226563 34.773438 16.226563 37.1875 C 16.226563 39.605469 18.164063 41.5625 20.550781 41.5625 L 44.347656 41.5625 C 46.738281 41.5625 48.675781 39.605469 48.675781 37.1875 C 48.675781 34.773438 46.738281 32.8125 44.347656 32.8125 Z M 20.550781 32.8125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 22.714844 37.1875 C 22.714844 38.398438 21.746094 39.375 20.550781 39.375 C 19.355469 39.375 18.390625 38.398438 18.390625 37.1875 C 18.390625 35.980469 19.355469 35 20.550781 35 C 21.746094 35 22.714844 35.980469 22.714844 37.1875 Z M 22.714844 37.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.429688 67.816406 C 49.011719 67.816406 51.917969 64.878906 51.917969 61.253906 C 51.917969 57.34375 48.574219 54.324219 44.746094 54.726563 C 46.804688 44.605469 39.175781 35.003906 28.851563 35.003906 C 22.09375 35.003906 16.296875 39.183594 13.859375 45.128906 C 6.804688 43.519531 0 48.929688 0 56.332031 C 0 62.671875 5.085938 67.816406 11.355469 67.816406 Z M 45.429688 67.816406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(75.294118%,92.54902%,98.823529%);fill-opacity:1;" d="M 44.746094 48.097656 C 43.230469 40.625 36.691406 35.003906 28.851563 35.003906 C 22.09375 35.003906 16.296875 39.183594 13.859375 45.128906 C 13.054688 44.945313 12.21875 44.847656 11.355469 44.847656 C 5.085938 44.847656 0 49.988281 0 56.332031 C 0 62.671875 5.085938 67.816406 11.355469 67.816406 L 18.992188 67.816406 C 13.902344 67.816406 9.773438 63.640625 9.773438 58.492188 C 9.773438 53.34375 13.902344 49.171875 18.992188 49.171875 C 19.691406 49.171875 20.371094 49.25 21.027344 49.398438 C 23.003906 44.574219 27.707031 41.179688 33.195313 41.179688 C 38.171875 41.179688 42.507813 43.976563 44.746094 48.097656 Z M 44.746094 48.097656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(54.509804%,63.529412%,3.137255%);fill-opacity:1;" d="M 31.367188 63.4375 C 32 63.4375 32.605469 63.300781 33.148438 63.050781 L 33.53125 63.4375 L 35.691406 63.4375 L 35.691406 61.25 L 35.3125 60.863281 C 35.558594 60.3125 35.691406 59.703125 35.691406 59.0625 L 35.691406 56.875 C 35.691406 54.460938 33.757813 52.5 31.367188 52.5 C 28.976563 52.5 27.039063 54.460938 27.039063 56.875 L 27.039063 59.0625 C 27.039063 61.480469 28.976563 63.4375 31.367188 63.4375 Z M 19.46875 52.5 C 17.679688 52.5 16.222656 53.96875 16.222656 55.78125 C 16.222656 57.59375 17.679688 59.0625 19.46875 59.0625 L 21.632813 59.0625 C 22.230469 59.0625 22.714844 59.550781 22.714844 60.15625 C 22.714844 60.761719 22.230469 61.25 21.632813 61.25 L 16.222656 61.25 L 16.222656 63.4375 L 21.632813 63.4375 C 23.425781 63.4375 24.878906 61.96875 24.878906 60.15625 C 24.878906 58.34375 23.425781 56.875 21.632813 56.875 L 19.46875 56.875 C 18.871094 56.875 18.386719 56.386719 18.386719 55.78125 C 18.386719 55.179688 18.871094 54.6875 19.46875 54.6875 L 24.878906 54.6875 L 24.878906 52.5 Z M 37.859375 52.5 L 40.019531 52.5 L 40.019531 61.25 L 44.347656 61.25 L 44.347656 63.4375 L 37.859375 63.4375 Z M 33.53125 59.0625 L 31.367188 59.0625 L 31.367188 61.25 C 30.171875 61.25 29.203125 60.269531 29.203125 59.0625 L 29.203125 56.875 C 29.203125 55.667969 30.171875 54.6875 31.367188 54.6875 C 32.5625 54.6875 33.53125 55.667969 33.53125 56.875 Z M 33.53125 59.0625 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureSqlServer(m).png b/dist/Databases/AzureSqlServer(m).png
new file mode 100644
index 00000000..6016d610
Binary files /dev/null and b/dist/Databases/AzureSqlServer(m).png differ
diff --git a/dist/Databases/AzureSqlServer(m).svg b/dist/Databases/AzureSqlServer(m).svg
new file mode 100644
index 00000000..f6d45f80
--- /dev/null
+++ b/dist/Databases/AzureSqlServer(m).svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 25.878906 69.5625 L 26.238281 69.5625 C 40.730469 69.5625 52.480469 65.308594 52.480469 60.058594 L 52.480469 9.503906 L 25.878906 9.503906 Z M 25.878906 69.5625 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 0 9.503906 L 0 60.058594 C 0 65.308594 11.75 69.5625 26.238281 69.5625 L 26.238281 9.503906 Z M 0 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 25.878906 69.5625 L 26.238281 69.5625 C 40.730469 69.5625 52.480469 65.308594 52.480469 60.058594 L 52.480469 9.503906 L 25.878906 9.503906 Z M 25.878906 69.5625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 52.480469 9.503906 C 52.480469 14.75 40.730469 19.007813 26.238281 19.007813 C 11.75 19.007813 0 14.75 0 9.503906 C 0 4.253906 11.75 0 26.238281 0 C 40.730469 0 52.480469 4.253906 52.480469 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 47.117188 8.957031 C 47.117188 12.421875 37.769531 15.226563 26.238281 15.226563 C 14.710938 15.226563 5.363281 12.421875 5.363281 8.957031 C 5.363281 5.492188 14.710938 2.683594 26.238281 2.683594 C 37.769531 2.683594 47.117188 5.492188 47.117188 8.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 42.742188 12.789063 C 45.476563 11.726563 47.117188 10.402344 47.117188 8.957031 C 47.117188 5.492188 37.769531 2.6875 26.238281 2.6875 C 14.710938 2.6875 5.363281 5.492188 5.363281 8.957031 C 5.363281 10.402344 7.007813 11.726563 9.738281 12.789063 C 13.554688 11.304688 19.519531 10.351563 26.238281 10.351563 C 32.960938 10.351563 38.921875 11.304688 42.742188 12.789063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 17.90625 43.195313 C 17.90625 44.765625 17.335938 45.984375 16.195313 46.84375 C 15.058594 47.707031 13.484375 48.140625 11.472656 48.140625 C 9.765625 48.140625 8.335938 47.832031 7.1875 47.214844 L 7.1875 43.519531 C 8.511719 44.644531 9.972656 45.207031 11.566406 45.207031 C 12.335938 45.207031 12.929688 45.050781 13.351563 44.742188 C 13.769531 44.4375 13.980469 44.027344 13.980469 43.519531 C 13.980469 43.019531 13.777344 42.582031 13.375 42.214844 C 12.96875 41.84375 12.148438 41.367188 10.910156 40.78125 C 8.382813 39.597656 7.121094 37.980469 7.121094 35.933594 C 7.121094 34.445313 7.671875 33.253906 8.773438 32.359375 C 9.871094 31.460938 11.335938 31.011719 13.160156 31.011719 C 14.777344 31.011719 16.117188 31.226563 17.179688 31.648438 L 17.179688 35.101563 C 16.0625 34.332031 14.792969 33.945313 13.367188 33.945313 C 12.652344 33.945313 12.085938 34.097656 11.671875 34.402344 C 11.273438 34.675781 11.039063 35.132813 11.046875 35.617188 C 11.046875 36.140625 11.214844 36.570313 11.550781 36.90625 C 11.886719 37.242188 12.574219 37.65625 13.613281 38.148438 C 15.160156 38.878906 16.261719 39.621094 16.921875 40.378906 C 17.578125 41.132813 17.90625 42.074219 17.90625 43.195313 Z M 35.722656 39.453125 C 35.722656 41.402344 35.28125 43.09375 34.394531 44.523438 C 33.507813 45.957031 32.261719 46.960938 30.65625 47.539063 L 35.457031 51.984375 L 30.609375 51.984375 L 27.179688 48.140625 C 25.707031 48.085938 24.382813 47.695313 23.199219 46.972656 C 22.019531 46.25 21.105469 45.257813 20.460938 44 C 19.820313 42.742188 19.496094 41.335938 19.496094 39.789063 C 19.496094 38.074219 19.847656 36.542969 20.542969 35.199219 C 21.238281 33.855469 22.21875 32.820313 23.480469 32.097656 C 24.742188 31.375 26.191406 31.011719 27.824219 31.011719 C 29.347656 31.011719 30.710938 31.363281 31.917969 32.0625 C 33.121094 32.765625 34.054688 33.761719 34.722656 35.054688 C 35.390625 36.347656 35.722656 37.816406 35.722656 39.453125 Z M 31.796875 39.664063 C 31.796875 37.984375 31.433594 36.660156 30.699219 35.683594 C 29.96875 34.710938 28.96875 34.222656 27.699219 34.222656 C 26.402344 34.222656 25.371094 34.710938 24.589844 35.6875 C 23.8125 36.667969 23.425781 37.96875 23.425781 39.59375 C 23.425781 41.210938 23.804688 42.5 24.566406 43.464844 C 25.332031 44.433594 26.339844 44.914063 27.605469 44.914063 C 28.890625 44.914063 29.910156 44.445313 30.664063 43.511719 C 31.421875 42.578125 31.796875 41.292969 31.796875 39.664063 Z M 48.324219 47.851563 L 38.460938 47.851563 L 38.460938 31.292969 L 42.191406 31.292969 L 42.191406 44.824219 L 48.324219 44.824219 Z M 48.324219 47.851563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 49.355469 68.71875 L 52.328125 70 L 52.644531 69.628906 L 55.023438 66.832031 L 57.429688 66.84375 L 60.191406 70 L 63.179688 68.757813 L 63.148438 68.273438 L 62.890625 64.570313 L 64.605469 62.84375 L 68.746094 63.078125 L 70 60.046875 L 69.640625 59.726563 L 66.894531 57.292969 L 66.910156 54.832031 L 70 52.011719 L 68.785156 48.960938 L 68.308594 48.996094 L 64.683594 49.257813 L 62.996094 47.507813 L 63.226563 43.28125 L 60.25 42 L 59.9375 42.371094 L 57.554688 45.171875 L 55.148438 45.15625 L 52.382813 42.003906 L 49.394531 43.242188 L 49.429688 43.730469 L 49.683594 47.429688 L 47.972656 49.15625 L 43.835938 48.921875 L 42.578125 51.953125 L 42.941406 52.273438 L 45.683594 54.703125 L 45.667969 57.164063 L 42.578125 59.984375 L 43.792969 63.035156 L 44.273438 63 L 47.894531 62.742188 L 49.585938 64.492188 Z M 50.207031 53.378906 C 51.625 49.945313 55.496094 48.339844 58.855469 49.789063 C 62.21875 51.238281 63.789063 55.1875 62.375 58.621094 C 60.957031 62.050781 57.082031 63.65625 53.722656 62.210938 C 50.363281 60.761719 48.789063 56.8125 50.207031 53.378906 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureSqlServer.png b/dist/Databases/AzureSqlServer.png
new file mode 100644
index 00000000..4a21ee19
Binary files /dev/null and b/dist/Databases/AzureSqlServer.png differ
diff --git a/dist/Databases/AzureSqlServer.puml b/dist/Databases/AzureSqlServer.puml
new file mode 100644
index 00000000..15565566
--- /dev/null
+++ b/dist/Databases/AzureSqlServer.puml
@@ -0,0 +1,13 @@
+sprite $AzureSqlServer [70x70/16z] {
+xPS7SiKg34MHK0FlVxy_t94hRvxjtzj9mumvH19eal9tXtY5og-0guYg7C1ZVIwZkgsVKQbF7Ano2zquIEKHhoNlDV8O_lqiD0SpHQG_sCfuc2AgayMEYL4p
+_u3PgbhNNEafPbNpRvYkbLQVB4kNabJzujZpgks3PLcS3XT8rAxXI3rS9_RssR9qlnQG25UHhjLWQ-sp1OHIkOCbMljY0SqgVRkgKDnPG0zJuQECk8fw0tUM
+cTuZeasyiO06_YEM_ot_MxeBSnNhwT3Al5ra5n5_O0dA2OTIIY9jOEYKjvPMG5eQbOtwmY9egIsKVYoTiLm5F_MvPRmVYAKl2zv2HWIZLnPVJWzjC8RwAYAA
+hDOOzsLBQtsPNOOdnieyBsDCZop02v1CYnmivPa5DCOpzyb2Jot0uL54n6dnCNvZoHDBo6x9x8uPkLXYjLI-M7fM1pCL8MrfyPCbt4mB96R69qkrdjMXyMDe
+eZKd17Iss0yuwcDGBwUEgc1AS7e6L430iYAmc8ZO9qj2FHEKaBUJfJRRc2BITQj-h1VYUcW1FTmy-kaF4TG7n8xR2Rhjc1Lxx_Z0W5HH3BHM4VfcQOmIhSGb
+3b9BvAibKEb8ongBUqd4ac-MtFvg2LY0tbkkfCRRRc43zCAIce0bGOAflBBWhBIZHP7htyD2BotnU_mkaCnvCNvZ2PjgL0rmVswnwRoG9V7SuhPobLXz6H4G
+6WxP9SLUP7TWPuI86OtfYMME2noRuWkBqjoa4hB-o19AvMpXSaAytrZ2wbuO8jB90gfwcorf43us0qeTn1Fvht14QtsKnDrKAbysMplcBla5
+}
+
+AzureEntityColoring(AzureSqlServer)
+!define AzureSqlServer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSqlServer, AzureSqlServer)
+!define AzureSqlServer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSqlServer, AzureSqlServer)
diff --git a/dist/Databases/AzureSqlServer.svg b/dist/Databases/AzureSqlServer.svg
new file mode 100644
index 00000000..6bc071aa
--- /dev/null
+++ b/dist/Databases/AzureSqlServer.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.878906 69.5625 L 26.238281 69.5625 C 40.730469 69.5625 52.480469 65.308594 52.480469 60.058594 L 52.480469 9.503906 L 25.878906 9.503906 Z M 25.878906 69.5625 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 9.503906 L 0 60.058594 C 0 65.308594 11.75 69.5625 26.238281 69.5625 L 26.238281 9.503906 Z M 0 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 25.878906 69.5625 L 26.238281 69.5625 C 40.730469 69.5625 52.480469 65.308594 52.480469 60.058594 L 52.480469 9.503906 L 25.878906 9.503906 Z M 25.878906 69.5625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 52.480469 9.503906 C 52.480469 14.75 40.730469 19.007813 26.238281 19.007813 C 11.75 19.007813 0 14.75 0 9.503906 C 0 4.253906 11.75 0 26.238281 0 C 40.730469 0 52.480469 4.253906 52.480469 9.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 47.117188 8.957031 C 47.117188 12.421875 37.769531 15.226563 26.238281 15.226563 C 14.710938 15.226563 5.363281 12.421875 5.363281 8.957031 C 5.363281 5.492188 14.710938 2.683594 26.238281 2.683594 C 37.769531 2.683594 47.117188 5.492188 47.117188 8.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 42.742188 12.789063 C 45.476563 11.726563 47.117188 10.402344 47.117188 8.957031 C 47.117188 5.492188 37.769531 2.6875 26.238281 2.6875 C 14.710938 2.6875 5.363281 5.492188 5.363281 8.957031 C 5.363281 10.402344 7.007813 11.726563 9.738281 12.789063 C 13.554688 11.304688 19.519531 10.351563 26.238281 10.351563 C 32.960938 10.351563 38.921875 11.304688 42.742188 12.789063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.90625 43.195313 C 17.90625 44.765625 17.335938 45.984375 16.195313 46.84375 C 15.058594 47.707031 13.484375 48.140625 11.472656 48.140625 C 9.765625 48.140625 8.335938 47.832031 7.1875 47.214844 L 7.1875 43.519531 C 8.511719 44.644531 9.972656 45.207031 11.566406 45.207031 C 12.335938 45.207031 12.929688 45.050781 13.351563 44.742188 C 13.769531 44.4375 13.980469 44.027344 13.980469 43.519531 C 13.980469 43.019531 13.777344 42.582031 13.375 42.214844 C 12.96875 41.84375 12.148438 41.367188 10.910156 40.78125 C 8.382813 39.597656 7.121094 37.980469 7.121094 35.933594 C 7.121094 34.445313 7.671875 33.253906 8.773438 32.359375 C 9.871094 31.460938 11.335938 31.011719 13.160156 31.011719 C 14.777344 31.011719 16.117188 31.226563 17.179688 31.648438 L 17.179688 35.101563 C 16.0625 34.332031 14.792969 33.945313 13.367188 33.945313 C 12.652344 33.945313 12.085938 34.097656 11.671875 34.402344 C 11.273438 34.675781 11.039063 35.132813 11.046875 35.617188 C 11.046875 36.140625 11.214844 36.570313 11.550781 36.90625 C 11.886719 37.242188 12.574219 37.65625 13.613281 38.148438 C 15.160156 38.878906 16.261719 39.621094 16.921875 40.378906 C 17.578125 41.132813 17.90625 42.074219 17.90625 43.195313 Z M 35.722656 39.453125 C 35.722656 41.402344 35.28125 43.09375 34.394531 44.523438 C 33.507813 45.957031 32.261719 46.960938 30.65625 47.539063 L 35.457031 51.984375 L 30.609375 51.984375 L 27.179688 48.140625 C 25.707031 48.085938 24.382813 47.695313 23.199219 46.972656 C 22.019531 46.25 21.105469 45.257813 20.460938 44 C 19.820313 42.742188 19.496094 41.335938 19.496094 39.789063 C 19.496094 38.074219 19.847656 36.542969 20.542969 35.199219 C 21.238281 33.855469 22.21875 32.820313 23.480469 32.097656 C 24.742188 31.375 26.191406 31.011719 27.824219 31.011719 C 29.347656 31.011719 30.710938 31.363281 31.917969 32.0625 C 33.121094 32.765625 34.054688 33.761719 34.722656 35.054688 C 35.390625 36.347656 35.722656 37.816406 35.722656 39.453125 Z M 31.796875 39.664063 C 31.796875 37.984375 31.433594 36.660156 30.699219 35.683594 C 29.96875 34.710938 28.96875 34.222656 27.699219 34.222656 C 26.402344 34.222656 25.371094 34.710938 24.589844 35.6875 C 23.8125 36.667969 23.425781 37.96875 23.425781 39.59375 C 23.425781 41.210938 23.804688 42.5 24.566406 43.464844 C 25.332031 44.433594 26.339844 44.914063 27.605469 44.914063 C 28.890625 44.914063 29.910156 44.445313 30.664063 43.511719 C 31.421875 42.578125 31.796875 41.292969 31.796875 39.664063 Z M 48.324219 47.851563 L 38.460938 47.851563 L 38.460938 31.292969 L 42.191406 31.292969 L 42.191406 44.824219 L 48.324219 44.824219 Z M 48.324219 47.851563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 49.355469 68.71875 L 52.328125 70 L 52.644531 69.628906 L 55.023438 66.832031 L 57.429688 66.84375 L 60.191406 70 L 63.179688 68.757813 L 63.148438 68.273438 L 62.890625 64.570313 L 64.605469 62.84375 L 68.746094 63.078125 L 70 60.046875 L 69.640625 59.726563 L 66.894531 57.292969 L 66.910156 54.832031 L 70 52.011719 L 68.785156 48.960938 L 68.308594 48.996094 L 64.683594 49.257813 L 62.996094 47.507813 L 63.226563 43.28125 L 60.25 42 L 59.9375 42.371094 L 57.554688 45.171875 L 55.148438 45.15625 L 52.382813 42.003906 L 49.394531 43.242188 L 49.429688 43.730469 L 49.683594 47.429688 L 47.972656 49.15625 L 43.835938 48.921875 L 42.578125 51.953125 L 42.941406 52.273438 L 45.683594 54.703125 L 45.667969 57.164063 L 42.578125 59.984375 L 43.792969 63.035156 L 44.273438 63 L 47.894531 62.742188 L 49.585938 64.492188 Z M 50.207031 53.378906 C 51.625 49.945313 55.496094 48.339844 58.855469 49.789063 C 62.21875 51.238281 63.789063 55.1875 62.375 58.621094 C 60.957031 62.050781 57.082031 63.65625 53.722656 62.210938 C 50.363281 60.761719 48.789063 56.8125 50.207031 53.378906 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureSqlStretchDatabase(m).png b/dist/Databases/AzureSqlStretchDatabase(m).png
index e9ec06eb..261e3866 100644
Binary files a/dist/Databases/AzureSqlStretchDatabase(m).png and b/dist/Databases/AzureSqlStretchDatabase(m).png differ
diff --git a/dist/Databases/AzureSqlStretchDatabase(m).svg b/dist/Databases/AzureSqlStretchDatabase(m).svg
index dfc37330..80b8e720 100644
--- a/dist/Databases/AzureSqlStretchDatabase(m).svg
+++ b/dist/Databases/AzureSqlStretchDatabase(m).svg
@@ -1,6 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="48pt" viewBox="0 0 70 48" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 63.421875 36.324219 C 63.421875 26.410156 65.910156 17.371094 70 10.523438 L 70 9.5625 L 34.519531 9.5625 L 34.519531 70 L 35 70 C 52.851563 70 67.5625 66.347656 69.714844 61.628906 C 65.796875 54.839844 63.421875 46 63.421875 36.324219 Z M 63.421875 36.324219 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 65.214844 33.234375 C 65.214844 33.234375 71.121094 26.152344 66.609375 18.789063 C 61.167969 9.898438 51.816406 14.796875 51.816406 14.796875 C 51.816406 14.796875 49.839844 -3.785156 28.308594 0.699219 C 22.785156 1.851563 19.269531 4.523438 17.054688 7.660156 C 20.324219 7.832031 23.359375 8.371094 25.777344 9.242188 C 28.910156 10.378906 30.480469 11.742188 30.953125 12.941406 L 30.953125 24.523438 L 40.332031 24.523438 L 40.332031 17.679688 L 42.246094 19.160156 L 53.621094 27.953125 L 54.816406 28.871094 L 53.640625 29.824219 L 42.265625 38.90625 L 40.332031 40.460938 L 40.332031 33.261719 L 30.953125 33.261719 L 30.953125 42.734375 C 30.953125 43.359375 30.78125 44.089844 30.214844 44.84375 L 61.214844 44.84375 C 61.214844 44.84375 68.816406 44.734375 69.597656 39.898438 C 70.601563 33.769531 65.214844 33.234375 65.214844 33.234375 Z M 24.863281 10.179688 C 24.636719 10.105469 24.398438 10.035156 24.152344 9.960938 C 24.042969 9.933594 23.945313 9.898438 23.84375 9.871094 L 24.007813 9.925781 C 21.492188 9.214844 18.339844 8.796875 14.910156 8.789063 C 6.753906 8.789063 0.0625 11.160156 0 14.117188 L 0 42.714844 C 0 45.660156 6.542969 48.0625 14.730469 48.089844 L 14.730469 48.125 L 14.765625 48.125 C 14.792969 48.125 14.882813 48.089844 14.882813 48.089844 L 14.882813 48.125 L 14.910156 48.125 C 23.113281 48.125 29.769531 45.6875 29.769531 42.734375 L 29.769531 32.078125 L 41.515625 32.078125 L 41.515625 37.988281 L 52.890625 28.871094 L 41.515625 20.078125 L 41.515625 25.699219 L 29.769531 25.699219 L 29.769531 14.117188 C 29.742188 12.941406 28.675781 11.859375 26.878906 10.980469 C 26.285156 10.6875 25.613281 10.425781 24.863281 10.179688 Z M 3.097656 13.851563 C 3.097656 11.886719 8.394531 10.296875 14.910156 10.296875 C 21.429688 10.316406 26.722656 11.90625 26.722656 13.851563 C 26.722656 13.933594 26.714844 14.023438 26.695313 14.117188 C 26.488281 14.980469 25.265625 15.734375 23.398438 16.324219 C 23.378906 16.324219 23.359375 16.34375 23.351563 16.34375 C 23.242188 16.371094 23.140625 16.398438 23.023438 16.433594 C 22.996094 16.441406 22.960938 16.441406 22.949219 16.460938 L 22.632813 16.550781 C 22.59375 16.5625 22.558594 16.5625 22.511719 16.578125 C 22.414063 16.605469 22.320313 16.625 22.222656 16.652344 C 22.175781 16.671875 22.128906 16.671875 22.085938 16.6875 C 21.992188 16.699219 21.894531 16.726563 21.785156 16.742188 C 21.730469 16.761719 21.683594 16.769531 21.621094 16.769531 C 21.539063 16.789063 21.429688 16.816406 21.335938 16.832031 C 21.28125 16.84375 21.21875 16.859375 21.164063 16.859375 C 21.074219 16.878906 20.972656 16.886719 20.882813 16.90625 C 20.808594 16.925781 20.746094 16.933594 20.671875 16.933594 C 20.582031 16.953125 20.488281 16.96875 20.390625 16.980469 C 20.316406 16.996094 20.242188 17.007813 20.160156 17.007813 L 19.898438 17.050781 C 19.824219 17.070313 19.734375 17.070313 19.660156 17.089844 C 19.570313 17.097656 19.476563 17.117188 19.394531 17.117188 C 19.304688 17.125 19.230469 17.125 19.140625 17.144531 C 19.050781 17.160156 18.957031 17.160156 18.867188 17.171875 C 18.785156 17.1875 18.695313 17.1875 18.601563 17.207031 C 18.511719 17.214844 18.421875 17.214844 18.339844 17.234375 C 18.246094 17.253906 18.136719 17.253906 18.054688 17.261719 C 17.964844 17.261719 17.875 17.28125 17.78125 17.28125 C 17.683594 17.28125 17.589844 17.289063 17.492188 17.289063 C 17.398438 17.289063 17.308594 17.304688 17.21875 17.304688 C 17.117188 17.304688 17.007813 17.324219 16.90625 17.324219 C 16.816406 17.324219 16.742188 17.332031 16.652344 17.332031 C 16.535156 17.332031 16.433594 17.351563 16.316406 17.351563 C 16.234375 17.351563 16.160156 17.351563 16.070313 17.371094 C 15.941406 17.371094 15.824219 17.371094 15.6875 17.378906 L 13.71875 17.378906 C 13.617188 17.378906 13.527344 17.378906 13.425781 17.371094 C 13.335938 17.371094 13.234375 17.371094 13.144531 17.351563 C 13.035156 17.351563 12.953125 17.332031 12.84375 17.332031 C 12.75 17.332031 12.660156 17.324219 12.578125 17.324219 C 12.46875 17.324219 12.378906 17.304688 12.277344 17.304688 C 12.1875 17.304688 12.09375 17.289063 12.011719 17.289063 C 11.902344 17.289063 11.8125 17.28125 11.710938 17.261719 C 11.621094 17.261719 11.546875 17.253906 11.457031 17.253906 C 11.355469 17.234375 11.265625 17.234375 11.175781 17.214844 C 11.082031 17.207031 11.011719 17.207031 10.917969 17.1875 C 10.835938 17.171875 10.746094 17.171875 10.65625 17.160156 L 10.636719 17.160156 C 10.5625 17.144531 10.492188 17.144531 10.398438 17.125 C 10.328125 17.117188 10.234375 17.117188 10.164063 17.097656 L 10.109375 17.097656 C 10.027344 17.089844 9.953125 17.089844 9.878906 17.070313 C 9.808594 17.050781 9.742188 17.050781 9.671875 17.042969 C 9.644531 17.042969 9.617188 17.023438 9.589844 17.023438 C 9.523438 17.007813 9.453125 17.007813 9.386719 16.996094 C 9.332031 16.980469 9.269531 16.980469 9.214844 16.96875 C 9.167969 16.96875 9.125 16.953125 9.097656 16.953125 C 9.03125 16.933594 8.976563 16.933594 8.914063 16.925781 C 8.867188 16.90625 8.8125 16.90625 8.769531 16.886719 C 8.722656 16.878906 8.660156 16.878906 8.613281 16.859375 C 8.558594 16.84375 8.511719 16.84375 8.449219 16.832031 C 8.414063 16.816406 8.367188 16.816406 8.320313 16.804688 C 8.257813 16.789063 8.203125 16.769531 8.140625 16.769531 C 8.09375 16.761719 8.046875 16.761719 8.003906 16.742188 C 7.964844 16.726563 7.929688 16.726563 7.882813 16.714844 C 7.828125 16.699219 7.757813 16.6875 7.691406 16.671875 C 7.664063 16.652344 7.621094 16.652344 7.59375 16.644531 C 7.546875 16.625 7.519531 16.625 7.472656 16.605469 C 7.390625 16.597656 7.320313 16.578125 7.265625 16.5625 C 7.246094 16.5625 7.21875 16.550781 7.199219 16.550781 C 7.15625 16.535156 7.109375 16.523438 7.074219 16.523438 C 6.992188 16.507813 6.917969 16.480469 6.84375 16.460938 C 6.789063 16.441406 6.746094 16.433594 6.679688 16.414063 C 6.609375 16.398438 6.535156 16.371094 6.460938 16.359375 C 6.417969 16.34375 6.351563 16.324219 6.308594 16.316406 C 6.234375 16.28125 6.160156 16.269531 6.089844 16.242188 L 5.953125 16.199219 C 5.878906 16.160156 5.804688 16.152344 5.742188 16.117188 L 5.613281 16.078125 C 5.53125 16.042969 5.476563 16.015625 5.40625 15.996094 C 5.359375 15.988281 5.332031 15.96875 5.285156 15.960938 C 5.222656 15.925781 5.148438 15.898438 5.085938 15.871094 C 5.058594 15.851563 5.011719 15.832031 4.984375 15.824219 L 4.804688 15.734375 C 4.777344 15.714844 4.75 15.707031 4.703125 15.6875 L 4.4375 15.550781 C 4.375 15.523438 4.328125 15.496094 4.273438 15.46875 C 4.238281 15.453125 4.210938 15.433594 4.191406 15.425781 C 4.15625 15.386719 4.09375 15.359375 4.046875 15.316406 C 4.019531 15.304688 4 15.289063 3.972656 15.261719 C 3.929688 15.234375 3.882813 15.199219 3.835938 15.152344 C 3.808594 15.144531 3.792969 15.125 3.78125 15.097656 C 3.738281 15.070313 3.710938 15.023438 3.664063 14.988281 L 3.5 14.824219 C 3.480469 14.816406 3.464844 14.796875 3.453125 14.769531 C 3.425781 14.742188 3.390625 14.699219 3.363281 14.660156 C 3.34375 14.652344 3.335938 14.625 3.316406 14.605469 C 3.289063 14.578125 3.273438 14.535156 3.246094 14.496094 C 3.226563 14.488281 3.226563 14.460938 3.21875 14.441406 C 3.199219 14.414063 3.171875 14.371094 3.152344 14.34375 C 3.144531 14.324219 3.144531 14.296875 3.144531 14.28125 L 3.097656 14.144531 C 3.109375 14.023438 3.097656 13.933594 3.097656 13.851563 Z M 3.097656 13.851563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 63.421875 36.324219 C 63.421875 26.410156 65.910156 17.371094 70 10.523438 L 70 9.5625 L 34.519531 9.5625 L 34.519531 70 L 35 70 C 35.597656 70 36.191406 69.996094 36.78125 69.984375 C 36.960938 69.984375 37.144531 69.976563 37.328125 69.976563 C 37.734375 69.96875 38.140625 69.960938 38.539063 69.949219 C 38.757813 69.945313 38.972656 69.933594 39.191406 69.925781 C 39.550781 69.914063 39.914063 69.90625 40.269531 69.890625 C 40.515625 69.878906 40.757813 69.867188 41.003906 69.855469 C 41.328125 69.839844 41.652344 69.824219 41.96875 69.808594 C 42.234375 69.792969 42.496094 69.773438 42.761719 69.757813 C 43.054688 69.738281 43.347656 69.722656 43.636719 69.703125 C 43.914063 69.683594 44.183594 69.664063 44.453125 69.640625 C 44.730469 69.621094 45.007813 69.597656 45.28125 69.578125 C 45.550781 69.554688 45.816406 69.53125 46.078125 69.503906 C 46.351563 69.480469 46.621094 69.457031 46.890625 69.429688 C 47.164063 69.402344 47.433594 69.375 47.703125 69.34375 C 47.953125 69.316406 48.203125 69.292969 48.453125 69.261719 C 48.730469 69.234375 49 69.199219 49.273438 69.164063 C 49.511719 69.136719 49.75 69.109375 49.988281 69.078125 C 50.261719 69.042969 50.53125 69.003906 50.804688 68.96875 C 51.027344 68.9375 51.253906 68.90625 51.476563 68.871094 C 51.75 68.832031 52.019531 68.789063 52.292969 68.75 C 52.503906 68.714844 52.714844 68.683594 52.921875 68.648438 C 53.203125 68.605469 53.472656 68.554688 53.746094 68.507813 C 53.9375 68.476563 54.132813 68.441406 54.320313 68.410156 C 54.597656 68.359375 54.871094 68.308594 55.144531 68.253906 C 55.320313 68.21875 55.5 68.1875 55.675781 68.152344 C 55.949219 68.097656 56.21875 68.039063 56.484375 67.984375 C 56.652344 67.949219 56.820313 67.914063 56.984375 67.875 C 57.25 67.816406 57.515625 67.753906 57.777344 67.695313 C 57.933594 67.65625 58.085938 67.621094 58.238281 67.585938 C 58.503906 67.519531 58.765625 67.453125 59.023438 67.386719 C 59.164063 67.351563 59.300781 67.316406 59.4375 67.28125 C 59.703125 67.210938 59.960938 67.136719 60.21875 67.0625 C 60.339844 67.027344 60.460938 66.996094 60.578125 66.960938 C 60.84375 66.882813 61.097656 66.804688 61.351563 66.726563 C 61.457031 66.695313 61.5625 66.660156 61.664063 66.628906 C 61.921875 66.546875 62.171875 66.460938 62.417969 66.378906 C 62.511719 66.347656 62.605469 66.3125 62.699219 66.28125 C 62.945313 66.195313 63.1875 66.105469 63.425781 66.015625 C 63.507813 65.984375 63.589844 65.953125 63.667969 65.921875 C 63.910156 65.828125 64.140625 65.734375 64.371094 65.640625 C 64.441406 65.609375 64.511719 65.582031 64.578125 65.550781 C 64.808594 65.453125 65.03125 65.351563 65.246094 65.25 C 65.308594 65.222656 65.367188 65.195313 65.425781 65.167969 C 65.640625 65.0625 65.851563 64.957031 66.054688 64.851563 C 66.105469 64.824219 66.15625 64.796875 66.203125 64.769531 C 66.410156 64.660156 66.605469 64.550781 66.796875 64.4375 C 66.835938 64.414063 66.875 64.390625 66.914063 64.367188 C 67.105469 64.25 67.289063 64.136719 67.464844 64.015625 C 67.496094 63.992188 67.527344 63.972656 67.558594 63.949219 C 67.734375 63.828125 67.902344 63.707031 68.058594 63.582031 C 68.082031 63.5625 68.105469 63.542969 68.132813 63.523438 C 68.289063 63.398438 68.4375 63.273438 68.578125 63.144531 C 68.59375 63.125 68.609375 63.109375 68.628906 63.089844 C 68.769531 62.960938 68.898438 62.828125 69.015625 62.691406 C 69.03125 62.679688 69.039063 62.664063 69.054688 62.648438 C 69.171875 62.511719 69.28125 62.375 69.378906 62.234375 C 69.386719 62.222656 69.394531 62.210938 69.402344 62.199219 C 69.5 62.054688 69.585938 61.914063 69.660156 61.769531 C 69.664063 61.761719 69.667969 61.75 69.671875 61.742188 C 69.691406 61.703125 69.703125 61.667969 69.71875 61.628906 C 65.796875 54.839844 63.421875 46 63.421875 36.324219 Z M 63.421875 36.324219 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 0 9.5625 L 0 10.25 C 0.132813 10.621094 0.253906 11.019531 0.382813 11.398438 C 4.167969 18.136719 6.453125 26.828125 6.453125 36.324219 C 6.453125 45.945313 4.105469 54.738281 0.230469 61.511719 C 2.191406 66.289063 17.003906 70 35 70 L 35 9.5625 Z M 0 9.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 70 9.5625 C 70 14.84375 54.328125 19.125 35 19.125 C 15.671875 19.125 0 14.84375 0 9.5625 C 0 4.28125 15.671875 0 35 0 C 54.328125 0 70 4.28125 70 9.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 62.84375 9.011719 C 62.84375 12.5 50.378906 15.320313 35 15.320313 C 19.621094 15.320313 7.152344 12.5 7.152344 9.011719 C 7.152344 5.527344 19.621094 2.703125 35 2.703125 C 50.378906 2.703125 62.84375 5.527344 62.84375 9.011719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 57.011719 12.867188 C 60.65625 11.800781 62.847656 10.464844 62.847656 9.015625 C 62.847656 5.527344 50.378906 2.703125 35 2.703125 C 19.621094 2.703125 7.15625 5.527344 7.15625 9.015625 C 7.15625 10.464844 9.347656 11.800781 12.992188 12.867188 C 18.082031 11.378906 26.039063 10.414063 35 10.414063 C 43.964844 10.414063 51.917969 11.378906 57.011719 12.867188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 25.964844 45.296875 C 25.964844 46.867188 25.394531 48.082031 24.257813 48.945313 C 23.117188 49.808594 21.542969 50.238281 19.535156 50.238281 C 17.824219 50.238281 16.398438 49.929688 15.25 49.316406 L 15.25 45.617188 C 16.574219 46.742188 18.03125 47.304688 19.625 47.304688 C 20.394531 47.304688 20.988281 47.152344 21.410156 46.84375 C 21.832031 46.535156 22.039063 46.128906 22.039063 45.617188 C 22.039063 45.121094 21.839844 44.683594 21.433594 44.3125 C 21.03125 43.945313 20.207031 43.46875 18.96875 42.882813 C 16.441406 41.699219 15.179688 40.078125 15.179688 38.03125 C 15.179688 36.546875 15.730469 35.355469 16.832031 34.457031 C 17.933594 33.5625 19.394531 33.113281 21.21875 33.113281 C 22.835938 33.113281 24.175781 33.324219 25.238281 33.75 L 25.238281 37.199219 C 24.125 36.429688 22.851563 36.046875 21.429688 36.046875 C 20.714844 36.046875 20.148438 36.195313 19.730469 36.5 C 19.316406 36.804688 19.109375 37.210938 19.109375 37.71875 C 19.109375 38.242188 19.273438 38.671875 19.609375 39.007813 C 19.945313 39.339844 20.632813 39.753906 21.671875 40.25 C 23.21875 40.980469 24.320313 41.722656 24.980469 42.476563 C 25.636719 43.234375 25.964844 44.171875 25.964844 45.296875 Z M 25.964844 45.296875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.785156 41.554688 C 43.785156 43.503906 43.339844 45.195313 42.453125 46.625 C 41.570313 48.054688 40.324219 49.058594 38.714844 49.636719 L 43.519531 54.085938 L 38.667969 54.085938 L 35.238281 50.238281 C 33.769531 50.1875 32.441406 49.796875 31.257813 49.074219 C 30.078125 48.351563 29.164063 47.359375 28.523438 46.097656 C 27.878906 44.839844 27.558594 43.4375 27.558594 41.890625 C 27.558594 40.171875 27.90625 38.644531 28.601563 37.296875 C 29.300781 35.953125 30.277344 34.921875 31.539063 34.199219 C 32.804688 33.476563 34.25 33.113281 35.882813 33.113281 C 37.40625 33.113281 38.773438 33.460938 39.976563 34.164063 C 41.179688 34.863281 42.117188 35.859375 42.78125 37.15625 C 43.449219 38.449219 43.785156 39.914063 43.785156 41.554688 Z M 39.859375 41.761719 C 39.859375 40.085938 39.492188 38.757813 38.761719 37.785156 C 38.027344 36.808594 37.027344 36.324219 35.757813 36.324219 C 34.464844 36.324219 33.429688 36.8125 32.652344 37.789063 C 31.875 38.765625 31.484375 40.066406 31.484375 41.691406 C 31.484375 43.308594 31.867188 44.601563 32.628906 45.566406 C 33.390625 46.53125 34.402344 47.015625 35.664063 47.015625 C 36.949219 47.015625 37.96875 46.546875 38.722656 45.613281 C 39.480469 44.679688 39.859375 43.394531 39.859375 41.761719 Z M 39.859375 41.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56.382813 49.949219 L 46.519531 49.949219 L 46.519531 33.390625 L 50.25 33.390625 L 50.25 46.925781 L 56.382813 46.925781 Z M 56.382813 49.949219 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureSqlStretchDatabase.png b/dist/Databases/AzureSqlStretchDatabase.png
index d8b23109..7371ee71 100644
Binary files a/dist/Databases/AzureSqlStretchDatabase.png and b/dist/Databases/AzureSqlStretchDatabase.png differ
diff --git a/dist/Databases/AzureSqlStretchDatabase.puml b/dist/Databases/AzureSqlStretchDatabase.puml
index de273af9..5d841897 100644
--- a/dist/Databases/AzureSqlStretchDatabase.puml
+++ b/dist/Databases/AzureSqlStretchDatabase.puml
@@ -1,9 +1,11 @@
-sprite $AzureSqlStretchDatabase [70x48/16z] {
-hTG7ikGm24LHGCIt__rEw51Tha5kupzd0LTPT6AfHrPLfQlG7Qo9WzHvmml_g6772gsOJ2ImatmvajXBkgY9p1UbMJYZz0Mp23CHyRB4Hj6Mg7-cyBnah3MQ
-Z7W16MQwrb8rYmBAXVfExeua5jC1Qm31_N59Cv522ZKaKSBTRBmzLw6M046vMPAegGgz0LZKKg3Q2ZGA3sMVIcd_bewLNigx0fGVjvUN5t2bWdfay5OP_bT4
-uk5OgMs67vL6Kp7TTM9I8Kdqrg0YYmAjd5HWj5cLJ2e8bZQZemfAsbNvjuhQovBN9jkyiZxiVQwhcifK2YUEZ31MIew3HRZ1Zwig8lnyCdwdKiB7uvORbMIf
-wMlyME_fQur_1eyNbVvyKCOqVG6StMxFNsD71fN7bhJYUaN9iL6NAyI9YRwo2Z-l94xanSgvLV-XOXGu4LJuAeI82rl5Ay-5AzDVxBk6qmHRi_eqfYbU5bbu
-g0nRmyHl
+sprite $AzureSqlStretchDatabase [70x70/16z] {
+rTTRUiCe38RXNqX22FQ_tnaJaSHJY5qxStflUlwU85jkY_y9elH4XDz9p2AgAdlnEKvq712LGwh2M8d2IIgOM2VM27kaSWLZHoxwJeNGqUf4skMW3wiJ2OA4
+_gEsr8lZMnCU4cKCl0Nib9uYXCJ8dl2KH4z5X0bFQW3LQWblAB6i3fNrnmP8SGPWhJNFQRcCpBnSHyxkNlefMkUP2R-H97kds7WRt2ITIH6h-HDXessdkgam
+JtAKc4Mj-8wXexPGwtRgOcRbJxuWUF3saNz6KSbtAeQGxbGKGxrHOGpbHWLF-Ngbu4ckLpAUqlMAueckLnWlzN8buSKlLmWlvN85R-ngfG3p6wPet_yOLJLb
+bZn-I5NjHANo-wTgHj3dwibnfIQ47Cc1fnN36sqX0w1SJ6ch202a-BMXvoiyHbszjV9uJUDvLeugULy9ykYFcqjFpqK1K8aPnLqzbYuTLQm5ZqdszsDFntVJ
+KQMqmT19VOo5ezBhaufZlaSbOPFgkGejThfQ_ueiJxJSwRPJfN-kJzTNqmqyUzRLzwiZZuVfUE5vLj7PSrUilYhz0cXrxxCYdrNoR1aP95afvghOf8IDHGMq
+6Qqokz2CmMD0GzxVyCd3x1BfyvjQPuIEpHSLtWqtLCkgzdx_P7uDezZJZ_5g-yYt3Fk2uUpVBocEC4Neg1vL2csPubDoSA0GJssrZqVoeye1YYjqfn97ihkL
+4hEzLt6EsTwh6AZUhpZdzeLAaMzKx1jpAGImtwnaTE8tAZbXOAkNAaK9EvpzbnKJMlqZLqzLB4l2Huar5wzrLYcMLPZmLty
 }
 
 AzureEntityColoring(AzureSqlStretchDatabase)
diff --git a/dist/Databases/AzureSqlStretchDatabase.svg b/dist/Databases/AzureSqlStretchDatabase.svg
index 1ca1d442..c9a93240 100644
--- a/dist/Databases/AzureSqlStretchDatabase.svg
+++ b/dist/Databases/AzureSqlStretchDatabase.svg
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="48pt" viewBox="0 0 70 48" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="48" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="48"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 0.0429688 14.132813 L 0.0429688 42.621094 C 0.0429688 45.585938 6.714844 47.984375 14.941406 47.984375 L 14.941406 14.132813 Z M 0.0429688 14.132813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 63.421875 36.324219 C 63.421875 26.410156 65.910156 17.371094 70 10.523438 L 70 9.5625 L 34.519531 9.5625 L 34.519531 70 L 35 70 C 52.851563 70 67.5625 66.347656 69.714844 61.628906 C 65.796875 54.839844 63.421875 46 63.421875 36.324219 Z M 63.421875 36.324219 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,86.666667%,86.666667%);fill-opacity:1;" d="M 18.222656 44.753906 L 61.386719 44.753906 C 61.386719 44.753906 69.015625 44.652344 69.804688 39.824219 C 70.804688 33.703125 65.402344 33.171875 65.402344 33.171875 C 65.402344 33.171875 71.328125 26.105469 66.804688 18.753906 C 61.34375 9.882813 51.96875 14.769531 51.96875 14.769531 C 51.96875 14.769531 49.984375 -3.777344 28.386719 0.695313 C 10.550781 4.398438 13.65625 23.792969 13.65625 23.792969 C 13.65625 23.792969 3.195313 21.171875 2.222656 32.414063 C 1.269531 43.644531 18.222656 44.753906 18.222656 44.753906 Z M 18.222656 44.753906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(92.941176%,70.980392%,11.372549%);fill-opacity:1;" d="M 14.925781 14.089844 L 0 14.089844 L 0 42.636719 C 0 45.570313 6.566406 47.96875 14.777344 48 L 14.777344 48.03125 L 14.804688 48.03125 C 14.835938 48.03125 14.925781 48 14.925781 48 L 14.925781 48.03125 L 14.957031 48.03125 C 23.179688 48.03125 29.851563 45.601563 29.851563 42.652344 L 29.851563 14.089844 Z M 14.925781 14.089844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(92.941176%,70.980392%,11.372549%);fill-opacity:1;" d="M 41.640625 20.042969 L 53.042969 28.816406 L 41.640625 37.910156 L 41.640625 32.015625 L 22.238281 32.015625 L 22.238281 25.644531 L 41.640625 25.644531 Z M 41.640625 20.042969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.421875 36.324219 C 63.421875 26.410156 65.910156 17.371094 70 10.523438 L 70 9.5625 L 34.519531 9.5625 L 34.519531 70 L 35 70 C 35.597656 70 36.191406 69.996094 36.78125 69.984375 C 36.960938 69.984375 37.144531 69.976563 37.328125 69.976563 C 37.734375 69.96875 38.140625 69.960938 38.539063 69.949219 C 38.757813 69.945313 38.972656 69.933594 39.191406 69.925781 C 39.550781 69.914063 39.914063 69.90625 40.269531 69.890625 C 40.515625 69.878906 40.757813 69.867188 41.003906 69.855469 C 41.328125 69.839844 41.652344 69.824219 41.96875 69.808594 C 42.234375 69.792969 42.496094 69.773438 42.761719 69.757813 C 43.054688 69.738281 43.347656 69.722656 43.636719 69.703125 C 43.914063 69.683594 44.183594 69.664063 44.453125 69.640625 C 44.730469 69.621094 45.007813 69.597656 45.28125 69.578125 C 45.550781 69.554688 45.816406 69.53125 46.078125 69.503906 C 46.351563 69.480469 46.621094 69.457031 46.890625 69.429688 C 47.164063 69.402344 47.433594 69.375 47.703125 69.34375 C 47.953125 69.316406 48.203125 69.292969 48.453125 69.261719 C 48.730469 69.234375 49 69.199219 49.273438 69.164063 C 49.511719 69.136719 49.75 69.109375 49.988281 69.078125 C 50.261719 69.042969 50.53125 69.003906 50.804688 68.96875 C 51.027344 68.9375 51.253906 68.90625 51.476563 68.871094 C 51.75 68.832031 52.019531 68.789063 52.292969 68.75 C 52.503906 68.714844 52.714844 68.683594 52.921875 68.648438 C 53.203125 68.605469 53.472656 68.554688 53.746094 68.507813 C 53.9375 68.476563 54.132813 68.441406 54.320313 68.410156 C 54.597656 68.359375 54.871094 68.308594 55.144531 68.253906 C 55.320313 68.21875 55.5 68.1875 55.675781 68.152344 C 55.949219 68.097656 56.21875 68.039063 56.484375 67.984375 C 56.652344 67.949219 56.820313 67.914063 56.984375 67.875 C 57.25 67.816406 57.515625 67.753906 57.777344 67.695313 C 57.933594 67.65625 58.085938 67.621094 58.238281 67.585938 C 58.503906 67.519531 58.765625 67.453125 59.023438 67.386719 C 59.164063 67.351563 59.300781 67.316406 59.4375 67.28125 C 59.703125 67.210938 59.960938 67.136719 60.21875 67.0625 C 60.339844 67.027344 60.460938 66.996094 60.578125 66.960938 C 60.84375 66.882813 61.097656 66.804688 61.351563 66.726563 C 61.457031 66.695313 61.5625 66.660156 61.664063 66.628906 C 61.921875 66.546875 62.171875 66.460938 62.417969 66.378906 C 62.511719 66.347656 62.605469 66.3125 62.699219 66.28125 C 62.945313 66.195313 63.1875 66.105469 63.425781 66.015625 C 63.507813 65.984375 63.589844 65.953125 63.667969 65.921875 C 63.910156 65.828125 64.140625 65.734375 64.371094 65.640625 C 64.441406 65.609375 64.511719 65.582031 64.578125 65.550781 C 64.808594 65.453125 65.03125 65.351563 65.246094 65.25 C 65.308594 65.222656 65.367188 65.195313 65.425781 65.167969 C 65.640625 65.0625 65.851563 64.957031 66.054688 64.851563 C 66.105469 64.824219 66.15625 64.796875 66.203125 64.769531 C 66.410156 64.660156 66.605469 64.550781 66.796875 64.4375 C 66.835938 64.414063 66.875 64.390625 66.914063 64.367188 C 67.105469 64.25 67.289063 64.136719 67.464844 64.015625 C 67.496094 63.992188 67.527344 63.972656 67.558594 63.949219 C 67.734375 63.828125 67.902344 63.707031 68.058594 63.582031 C 68.082031 63.5625 68.105469 63.542969 68.132813 63.523438 C 68.289063 63.398438 68.4375 63.273438 68.578125 63.144531 C 68.59375 63.125 68.609375 63.109375 68.628906 63.089844 C 68.769531 62.960938 68.898438 62.828125 69.015625 62.691406 C 69.03125 62.679688 69.039063 62.664063 69.054688 62.648438 C 69.171875 62.511719 69.28125 62.375 69.378906 62.234375 C 69.386719 62.222656 69.394531 62.210938 69.402344 62.199219 C 69.5 62.054688 69.585938 61.914063 69.660156 61.769531 C 69.664063 61.761719 69.667969 61.75 69.671875 61.742188 C 69.691406 61.703125 69.703125 61.667969 69.71875 61.628906 C 65.796875 54.839844 63.421875 46 63.421875 36.324219 Z M 63.421875 36.324219 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 29.851563 14.132813 C 29.851563 17.097656 23.179688 19.496094 14.957031 19.496094 C 6.730469 19.496094 0.0585938 17.097656 0.0585938 14.132813 C 0.0585938 11.171875 6.730469 8.769531 14.957031 8.769531 C 23.179688 8.785156 29.851563 11.183594 29.851563 14.132813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 26.804688 13.824219 C 26.804688 15.777344 21.492188 17.363281 14.957031 17.363281 C 8.402344 17.363281 3.105469 15.777344 3.105469 13.824219 C 3.105469 11.867188 8.417969 10.28125 14.957031 10.28125 C 21.492188 10.296875 26.804688 11.882813 26.804688 13.824219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 24.328125 15.984375 C 25.878906 15.394531 26.804688 14.636719 26.804688 13.824219 C 26.804688 11.867188 21.492188 10.28125 14.957031 10.28125 C 8.402344 10.28125 3.105469 11.867188 3.105469 13.824219 C 3.105469 14.636719 4.03125 15.378906 5.597656 15.984375 C 7.761719 15.15625 11.148438 14.609375 14.96875 14.609375 C 18.761719 14.609375 22.148438 15.15625 24.328125 15.984375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 9.5625 L 0 10.25 C 0.132813 10.621094 0.253906 11.019531 0.382813 11.398438 C 4.167969 18.136719 6.453125 26.828125 6.453125 36.324219 C 6.453125 45.945313 4.105469 54.738281 0.230469 61.511719 C 2.191406 66.289063 17.003906 70 35 70 L 35 9.5625 Z M 0 9.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 70 9.5625 C 70 14.84375 54.328125 19.125 35 19.125 C 15.671875 19.125 0 14.84375 0 9.5625 C 0 4.28125 15.671875 0 35 0 C 54.328125 0 70 4.28125 70 9.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 62.84375 9.011719 C 62.84375 12.5 50.378906 15.320313 35 15.320313 C 19.621094 15.320313 7.152344 12.5 7.152344 9.011719 C 7.152344 5.527344 19.621094 2.703125 35 2.703125 C 50.378906 2.703125 62.84375 5.527344 62.84375 9.011719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 57.011719 12.867188 C 60.65625 11.800781 62.847656 10.464844 62.847656 9.015625 C 62.847656 5.527344 50.378906 2.703125 35 2.703125 C 19.621094 2.703125 7.15625 5.527344 7.15625 9.015625 C 7.15625 10.464844 9.347656 11.800781 12.992188 12.867188 C 18.082031 11.378906 26.039063 10.414063 35 10.414063 C 43.964844 10.414063 51.917969 11.378906 57.011719 12.867188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.964844 45.296875 C 25.964844 46.867188 25.394531 48.082031 24.257813 48.945313 C 23.117188 49.808594 21.542969 50.238281 19.535156 50.238281 C 17.824219 50.238281 16.398438 49.929688 15.25 49.316406 L 15.25 45.617188 C 16.574219 46.742188 18.03125 47.304688 19.625 47.304688 C 20.394531 47.304688 20.988281 47.152344 21.410156 46.84375 C 21.832031 46.535156 22.039063 46.128906 22.039063 45.617188 C 22.039063 45.121094 21.839844 44.683594 21.433594 44.3125 C 21.03125 43.945313 20.207031 43.46875 18.96875 42.882813 C 16.441406 41.699219 15.179688 40.078125 15.179688 38.03125 C 15.179688 36.546875 15.730469 35.355469 16.832031 34.457031 C 17.933594 33.5625 19.394531 33.113281 21.21875 33.113281 C 22.835938 33.113281 24.175781 33.324219 25.238281 33.75 L 25.238281 37.199219 C 24.125 36.429688 22.851563 36.046875 21.429688 36.046875 C 20.714844 36.046875 20.148438 36.195313 19.730469 36.5 C 19.316406 36.804688 19.109375 37.210938 19.109375 37.71875 C 19.109375 38.242188 19.273438 38.671875 19.609375 39.007813 C 19.945313 39.339844 20.632813 39.753906 21.671875 40.25 C 23.21875 40.980469 24.320313 41.722656 24.980469 42.476563 C 25.636719 43.234375 25.964844 44.171875 25.964844 45.296875 Z M 25.964844 45.296875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.785156 41.554688 C 43.785156 43.503906 43.339844 45.195313 42.453125 46.625 C 41.570313 48.054688 40.324219 49.058594 38.714844 49.636719 L 43.519531 54.085938 L 38.667969 54.085938 L 35.238281 50.238281 C 33.769531 50.1875 32.441406 49.796875 31.257813 49.074219 C 30.078125 48.351563 29.164063 47.359375 28.523438 46.097656 C 27.878906 44.839844 27.558594 43.4375 27.558594 41.890625 C 27.558594 40.171875 27.90625 38.644531 28.601563 37.296875 C 29.300781 35.953125 30.277344 34.921875 31.539063 34.199219 C 32.804688 33.476563 34.25 33.113281 35.882813 33.113281 C 37.40625 33.113281 38.773438 33.460938 39.976563 34.164063 C 41.179688 34.863281 42.117188 35.859375 42.78125 37.15625 C 43.449219 38.449219 43.785156 39.914063 43.785156 41.554688 Z M 39.859375 41.761719 C 39.859375 40.085938 39.492188 38.757813 38.761719 37.785156 C 38.027344 36.808594 37.027344 36.324219 35.757813 36.324219 C 34.464844 36.324219 33.429688 36.8125 32.652344 37.789063 C 31.875 38.765625 31.484375 40.066406 31.484375 41.691406 C 31.484375 43.308594 31.867188 44.601563 32.628906 45.566406 C 33.390625 46.53125 34.402344 47.015625 35.664063 47.015625 C 36.949219 47.015625 37.96875 46.546875 38.722656 45.613281 C 39.480469 44.679688 39.859375 43.394531 39.859375 41.761719 Z M 39.859375 41.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56.382813 49.949219 L 46.519531 49.949219 L 46.519531 33.390625 L 50.25 33.390625 L 50.25 46.925781 L 56.382813 46.925781 Z M 56.382813 49.949219 "/>
 </g>
 </svg>
diff --git a/dist/Databases/AzureVirtualCluster(m).png b/dist/Databases/AzureVirtualCluster(m).png
new file mode 100644
index 00000000..699a551e
Binary files /dev/null and b/dist/Databases/AzureVirtualCluster(m).png differ
diff --git a/dist/Databases/AzureVirtualCluster(m).svg b/dist/Databases/AzureVirtualCluster(m).svg
new file mode 100644
index 00000000..74f5f7c9
--- /dev/null
+++ b/dist/Databases/AzureVirtualCluster(m).svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="67pt" height="70pt" viewBox="0 0 67 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,137,238);fill-opacity:1;" d="M 21.609375 69.996094 L 45.382813 69.996094 C 47.761719 69.996094 49.707031 68.03125 49.707031 65.625 L 49.707031 21.875 C 49.707031 19.46875 47.75 17.5 45.382813 17.5 L 21.609375 17.5 C 19.246094 17.5 17.289063 19.480469 17.289063 21.875 L 17.289063 65.621094 C 17.289063 68.015625 19.234375 69.996094 21.609375 69.996094 Z M 21.609375 69.996094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 25.933594 21.875 C 23.546875 21.875 21.609375 23.832031 21.609375 26.25 C 21.609375 28.664063 23.546875 30.621094 25.933594 30.621094 L 41.0625 30.621094 C 43.449219 30.621094 45.382813 28.664063 45.382813 26.25 C 45.382813 23.832031 43.449219 21.875 41.0625 21.875 Z M 25.933594 21.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 25.933594 28.4375 C 27.128906 28.4375 28.097656 27.457031 28.097656 26.25 C 28.097656 25.042969 27.128906 24.0625 25.933594 24.0625 C 24.742188 24.0625 23.773438 25.042969 23.773438 26.25 C 23.773438 27.457031 24.742188 28.4375 25.933594 28.4375 Z M 25.933594 28.4375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 25.933594 35 C 23.546875 35 21.609375 36.957031 21.609375 39.375 C 21.609375 41.789063 23.546875 43.75 25.933594 43.75 L 41.0625 43.75 C 43.449219 43.75 45.382813 41.789063 45.382813 39.375 C 45.382813 36.957031 43.449219 35 41.0625 35 Z M 25.933594 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 25.933594 41.5625 C 27.128906 41.5625 28.097656 40.582031 28.097656 39.375 C 28.097656 38.167969 27.128906 37.1875 25.933594 37.1875 C 24.742188 37.1875 23.773438 38.167969 23.773438 39.375 C 23.773438 40.582031 24.742188 41.5625 25.933594 41.5625 Z M 25.933594 41.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,137,238);fill-opacity:1;" d="M 51.871094 52.5 L 62.675781 52.5 C 65.054688 52.5 67 50.53125 67 48.125 L 67 4.375 C 67 1.96875 65.042969 0 62.675781 0 L 38.902344 0 C 36.535156 0 34.578125 1.980469 34.578125 4.375 L 34.578125 15.3125 L 45.386719 15.3125 C 48.953125 15.3125 51.871094 18.265625 51.871094 21.875 Z M 51.871094 52.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 43.226563 4.375 C 40.835938 4.375 38.902344 6.332031 38.902344 8.75 C 38.902344 11.164063 40.835938 13.125 43.226563 13.125 L 58.355469 13.125 C 60.742188 13.125 62.675781 11.164063 62.675781 8.75 C 62.675781 6.332031 60.742188 4.375 58.355469 4.375 Z M 43.226563 4.375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 43.226563 10.933594 C 44.417969 10.933594 45.386719 9.957031 45.386719 8.75 C 45.386719 7.542969 44.417969 6.5625 43.226563 6.5625 C 42.03125 6.5625 41.0625 7.542969 41.0625 8.75 C 41.0625 9.957031 42.03125 10.933594 43.226563 10.933594 Z M 43.226563 10.933594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 51.871094 26.25 L 58.355469 26.25 C 60.742188 26.25 62.675781 24.289063 62.675781 21.875 C 62.675781 19.460938 60.742188 17.5 58.355469 17.5 L 50.207031 17.5 C 51.242188 18.664063 51.871094 20.199219 51.871094 21.875 Z M 51.871094 26.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,137,238);fill-opacity:1;" d="M 4.324219 52.5 L 15.128906 52.5 L 15.128906 21.875 C 15.128906 18.265625 18.046875 15.3125 21.609375 15.3125 L 32.421875 15.3125 L 32.421875 4.375 C 32.421875 1.96875 30.464844 0 28.097656 0 L 4.324219 0 C 1.957031 0 0 1.980469 0 4.375 L 0 48.121094 C 0 50.519531 1.945313 52.5 4.324219 52.5 Z M 4.324219 52.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 8.644531 4.375 C 6.257813 4.375 4.324219 6.332031 4.324219 8.75 C 4.324219 11.164063 6.257813 13.125 8.644531 13.125 L 23.773438 13.125 C 26.164063 13.125 28.097656 11.164063 28.097656 8.75 C 28.097656 6.332031 26.164063 4.375 23.773438 4.375 Z M 8.644531 4.375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 8.644531 10.933594 C 9.839844 10.933594 10.808594 9.957031 10.808594 8.75 C 10.808594 7.542969 9.839844 6.5625 8.644531 6.5625 C 7.453125 6.5625 6.484375 7.542969 6.484375 8.75 C 6.484375 9.957031 7.453125 10.933594 8.644531 10.933594 Z M 8.644531 10.933594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 8.644531 17.5 C 6.257813 17.5 4.324219 19.460938 4.324219 21.875 C 4.324219 24.292969 6.257813 26.25 8.644531 26.25 L 15.128906 26.25 L 15.128906 21.875 C 15.128906 20.199219 15.757813 18.664063 16.789063 17.5 Z M 8.644531 17.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 8.644531 24.0625 C 9.839844 24.0625 10.808594 23.082031 10.808594 21.875 C 10.808594 20.667969 9.839844 19.6875 8.644531 19.6875 C 7.453125 19.6875 6.484375 20.667969 6.484375 21.875 C 6.484375 23.082031 7.453125 24.0625 8.644531 24.0625 Z M 8.644531 24.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(193,228,255);fill-opacity:1;" d="M 56.191406 70 C 59.773438 70 62.675781 67.0625 62.675781 63.4375 C 62.675781 59.527344 59.335938 56.507813 55.507813 56.910156 C 57.570313 46.789063 49.945313 37.1875 39.632813 37.1875 C 32.878906 37.1875 27.089844 41.367188 24.652344 47.3125 C 17.601563 45.703125 10.808594 51.113281 10.808594 58.515625 C 10.808594 64.855469 15.886719 69.996094 22.152344 69.996094 Z M 56.191406 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 55.511719 50.28125 C 53.996094 42.808594 47.464844 37.1875 39.632813 37.1875 C 32.878906 37.1875 27.089844 41.367188 24.652344 47.3125 C 23.847656 47.128906 23.011719 47.03125 22.152344 47.03125 C 15.886719 47.03125 10.808594 52.171875 10.808594 58.515625 C 10.808594 64.855469 15.886719 69.996094 22.152344 69.996094 L 29.78125 69.996094 C 24.695313 69.996094 20.570313 65.824219 20.570313 60.675781 C 20.570313 55.527344 24.695313 51.351563 29.78125 51.351563 C 30.480469 51.351563 31.160156 51.433594 31.8125 51.582031 C 33.789063 46.757813 38.488281 43.363281 43.96875 43.363281 C 48.945313 43.363281 53.273438 46.15625 55.511719 50.28125 Z M 55.511719 50.28125 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureVirtualCluster.png b/dist/Databases/AzureVirtualCluster.png
new file mode 100644
index 00000000..eeaa5190
Binary files /dev/null and b/dist/Databases/AzureVirtualCluster.png differ
diff --git a/dist/Databases/AzureVirtualCluster.puml b/dist/Databases/AzureVirtualCluster.puml
new file mode 100644
index 00000000..53bd4d27
--- /dev/null
+++ b/dist/Databases/AzureVirtualCluster.puml
@@ -0,0 +1,13 @@
+sprite $AzureVirtualCluster [67x70/16z] {
+vPJPsgCW3403942GvVsVTfOsdrG9bD-vd7EfSin602ZoXEWD_CK6dX4G008lY1O07A_mGBma01XUuoAlCHB47CzlShcH4x-mWFpY63uv9D3twwQGts6AehIH
+chgYjPfhktE8GWmbZuvJaLibfAn-88hM634eVn55QGaHOxlJ5QarGiIY9IkA0n5vhV28L5M5L9Cf3E_B9P7YQQnwEijPcqOInQHd4eGekEWT4yNCaMKkX7I3
+1L785zedWTU8GcUk2EWw1gphKDXH10ihN9mfqY4m05Wtmm2OyzFqgKYzgmvCM2uOy9V1wTUiYUG0a4ZdZdfro3Lh0Uar6_vh0ooaSJhbZiHt7fxN88Iko8h2
+WYoXSURBktm4Nb588gAONuaqA99IJb6qLa8S0gbtHL6QAegZLTAMLBegYZfQvgN8hI0YJHIeZLO798f6iqr8O5cOAcIbfx6avIUAr1Gg_qJ1ATSxcVSLC_vN
+HIh_MixKDFZnQDKKlFU1QnaKUmCU2Kzyt5RqQnRn2kqf-cKlX2Dx2bav1sgO7OKilemwxhj2rcyPZg8GTwVpUjmABy-cWZI1I6XFWHrx0_6B8dhIS-WWhHG6
+xrW5_5JS76xBO5ta4nAVW0FEgWG-iU3vKpXWTNen402S3m9j71PGZdWB5zG4T0oes5a8-metYs5VeGJnN66_AumcCViAqImLJnr3CVSTpnLstjJ72jCLppDv
+7iNpC630FktgSmS8UYxxGJmFf0j-0m
+}
+
+AzureEntityColoring(AzureVirtualCluster)
+!define AzureVirtualCluster(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualCluster, AzureVirtualCluster)
+!define AzureVirtualCluster(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualCluster, AzureVirtualCluster)
diff --git a/dist/Databases/AzureVirtualCluster.svg b/dist/Databases/AzureVirtualCluster.svg
new file mode 100644
index 00000000..84b21bd5
--- /dev/null
+++ b/dist/Databases/AzureVirtualCluster.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="67pt" height="70pt" viewBox="0 0 67 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(46.666667%,46.666667%,46.666667%);fill-opacity:1;" d="M 21.609375 69.996094 L 45.382813 69.996094 C 47.761719 69.996094 49.707031 68.03125 49.707031 65.625 L 49.707031 21.875 C 49.707031 19.46875 47.75 17.5 45.382813 17.5 L 21.609375 17.5 C 19.246094 17.5 17.289063 19.480469 17.289063 21.875 L 17.289063 65.621094 C 17.289063 68.015625 19.234375 69.996094 21.609375 69.996094 Z M 21.609375 69.996094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 25.933594 21.875 C 23.546875 21.875 21.609375 23.832031 21.609375 26.25 C 21.609375 28.664063 23.546875 30.621094 25.933594 30.621094 L 41.0625 30.621094 C 43.449219 30.621094 45.382813 28.664063 45.382813 26.25 C 45.382813 23.832031 43.449219 21.875 41.0625 21.875 Z M 25.933594 21.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 25.933594 28.4375 C 27.128906 28.4375 28.097656 27.457031 28.097656 26.25 C 28.097656 25.042969 27.128906 24.0625 25.933594 24.0625 C 24.742188 24.0625 23.773438 25.042969 23.773438 26.25 C 23.773438 27.457031 24.742188 28.4375 25.933594 28.4375 Z M 25.933594 28.4375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 25.933594 35 C 23.546875 35 21.609375 36.957031 21.609375 39.375 C 21.609375 41.789063 23.546875 43.75 25.933594 43.75 L 41.0625 43.75 C 43.449219 43.75 45.382813 41.789063 45.382813 39.375 C 45.382813 36.957031 43.449219 35 41.0625 35 Z M 25.933594 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 25.933594 41.5625 C 27.128906 41.5625 28.097656 40.582031 28.097656 39.375 C 28.097656 38.167969 27.128906 37.1875 25.933594 37.1875 C 24.742188 37.1875 23.773438 38.167969 23.773438 39.375 C 23.773438 40.582031 24.742188 41.5625 25.933594 41.5625 Z M 25.933594 41.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(46.666667%,46.666667%,46.666667%);fill-opacity:1;" d="M 51.871094 52.5 L 62.675781 52.5 C 65.054688 52.5 67 50.53125 67 48.125 L 67 4.375 C 67 1.96875 65.042969 0 62.675781 0 L 38.902344 0 C 36.535156 0 34.578125 1.980469 34.578125 4.375 L 34.578125 15.3125 L 45.386719 15.3125 C 48.953125 15.3125 51.871094 18.265625 51.871094 21.875 Z M 51.871094 52.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 43.226563 4.375 C 40.835938 4.375 38.902344 6.332031 38.902344 8.75 C 38.902344 11.164063 40.835938 13.125 43.226563 13.125 L 58.355469 13.125 C 60.742188 13.125 62.675781 11.164063 62.675781 8.75 C 62.675781 6.332031 60.742188 4.375 58.355469 4.375 Z M 43.226563 4.375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 43.226563 10.933594 C 44.417969 10.933594 45.386719 9.957031 45.386719 8.75 C 45.386719 7.542969 44.417969 6.5625 43.226563 6.5625 C 42.03125 6.5625 41.0625 7.542969 41.0625 8.75 C 41.0625 9.957031 42.03125 10.933594 43.226563 10.933594 Z M 43.226563 10.933594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 51.871094 26.25 L 58.355469 26.25 C 60.742188 26.25 62.675781 24.289063 62.675781 21.875 C 62.675781 19.460938 60.742188 17.5 58.355469 17.5 L 50.207031 17.5 C 51.242188 18.664063 51.871094 20.199219 51.871094 21.875 Z M 51.871094 26.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(46.666667%,46.666667%,46.666667%);fill-opacity:1;" d="M 4.324219 52.5 L 15.128906 52.5 L 15.128906 21.875 C 15.128906 18.265625 18.046875 15.3125 21.609375 15.3125 L 32.421875 15.3125 L 32.421875 4.375 C 32.421875 1.96875 30.464844 0 28.097656 0 L 4.324219 0 C 1.957031 0 0 1.980469 0 4.375 L 0 48.121094 C 0 50.519531 1.945313 52.5 4.324219 52.5 Z M 4.324219 52.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 8.644531 4.375 C 6.257813 4.375 4.324219 6.332031 4.324219 8.75 C 4.324219 11.164063 6.257813 13.125 8.644531 13.125 L 23.773438 13.125 C 26.164063 13.125 28.097656 11.164063 28.097656 8.75 C 28.097656 6.332031 26.164063 4.375 23.773438 4.375 Z M 8.644531 4.375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 8.644531 10.933594 C 9.839844 10.933594 10.808594 9.957031 10.808594 8.75 C 10.808594 7.542969 9.839844 6.5625 8.644531 6.5625 C 7.453125 6.5625 6.484375 7.542969 6.484375 8.75 C 6.484375 9.957031 7.453125 10.933594 8.644531 10.933594 Z M 8.644531 10.933594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 8.644531 17.5 C 6.257813 17.5 4.324219 19.460938 4.324219 21.875 C 4.324219 24.292969 6.257813 26.25 8.644531 26.25 L 15.128906 26.25 L 15.128906 21.875 C 15.128906 20.199219 15.757813 18.664063 16.789063 17.5 Z M 8.644531 17.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 8.644531 24.0625 C 9.839844 24.0625 10.808594 23.082031 10.808594 21.875 C 10.808594 20.667969 9.839844 19.6875 8.644531 19.6875 C 7.453125 19.6875 6.484375 20.667969 6.484375 21.875 C 6.484375 23.082031 7.453125 24.0625 8.644531 24.0625 Z M 8.644531 24.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(75.294118%,92.54902%,98.823529%);fill-opacity:1;" d="M 56.191406 70 C 59.773438 70 62.675781 67.0625 62.675781 63.4375 C 62.675781 59.527344 59.335938 56.507813 55.507813 56.910156 C 57.570313 46.789063 49.945313 37.1875 39.632813 37.1875 C 32.878906 37.1875 27.089844 41.367188 24.652344 47.3125 C 17.601563 45.703125 10.808594 51.113281 10.808594 58.515625 C 10.808594 64.855469 15.886719 69.996094 22.152344 69.996094 Z M 56.191406 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40%,84.313725%,96.862745%);fill-opacity:1;" d="M 55.511719 50.28125 C 53.996094 42.808594 47.464844 37.1875 39.632813 37.1875 C 32.878906 37.1875 27.089844 41.367188 24.652344 47.3125 C 23.847656 47.128906 23.011719 47.03125 22.152344 47.03125 C 15.886719 47.03125 10.808594 52.171875 10.808594 58.515625 C 10.808594 64.855469 15.886719 69.996094 22.152344 69.996094 L 29.78125 69.996094 C 24.695313 69.996094 20.570313 65.824219 20.570313 60.675781 C 20.570313 55.527344 24.695313 51.351563 29.78125 51.351563 C 30.480469 51.351563 31.160156 51.433594 31.8125 51.582031 C 33.789063 46.757813 38.488281 43.363281 43.96875 43.363281 C 48.945313 43.363281 53.273438 46.15625 55.511719 50.28125 Z M 55.511719 50.28125 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureVirtualDatacenter(m).png b/dist/Databases/AzureVirtualDatacenter(m).png
new file mode 100644
index 00000000..8b9a8b5b
Binary files /dev/null and b/dist/Databases/AzureVirtualDatacenter(m).png differ
diff --git a/dist/Databases/AzureVirtualDatacenter(m).svg b/dist/Databases/AzureVirtualDatacenter(m).svg
new file mode 100644
index 00000000..81f76aac
--- /dev/null
+++ b/dist/Databases/AzureVirtualDatacenter(m).svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56.304688 17.617188 C 56.285156 17.617188 56.273438 17.617188 56.253906 17.617188 C 55.75 7.882813 47.738281 0.140625 37.90625 0.140625 C 30.71875 0.140625 24.507813 4.28125 21.480469 10.308594 C 20.222656 10.015625 18.917969 9.847656 17.570313 9.847656 C 7.945313 9.847656 0.140625 17.671875 0.140625 27.324219 C 0.140625 36.976563 7.945313 44.800781 17.570313 44.800781 L 56.304688 44.800781 C 63.789063 44.800781 69.859375 38.714844 69.859375 31.207031 C 69.859375 23.699219 63.789063 17.617188 56.304688 17.617188 Z M 56.304688 17.617188 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 17.570313 44.800781 L 39.199219 44.800781 L 39.199219 24.53125 C 39.199219 22.585938 37.59375 21 35.621094 21 L 16.179688 21 C 14.203125 21 12.601563 22.585938 12.601563 24.53125 L 12.601563 44.070313 C 14.175781 44.539063 15.84375 44.800781 17.570313 44.800781 Z M 17.570313 44.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 56.304688 17.617188 C 56.285156 17.617188 56.273438 17.617188 56.253906 17.617188 C 55.75 7.882813 47.738281 0.140625 37.90625 0.140625 C 30.71875 0.140625 24.507813 4.28125 21.480469 10.308594 C 20.222656 10.015625 18.917969 9.847656 17.570313 9.847656 C 7.945313 9.847656 0.140625 17.671875 0.140625 27.324219 C 0.140625 36.976563 7.945313 44.800781 17.570313 44.800781 L 56.304688 44.800781 C 63.789063 44.800781 69.859375 38.714844 69.859375 31.207031 C 69.859375 23.699219 63.789063 17.617188 56.304688 17.617188 Z M 56.304688 17.617188 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 37.800781 63.667969 C 37.800781 64.84375 36.824219 65.800781 35.621094 65.800781 L 16.179688 65.800781 C 14.972656 65.800781 14 64.84375 14 63.667969 L 14 24.53125 C 14 23.355469 14.972656 22.398438 16.179688 22.398438 L 35.621094 22.398438 C 36.824219 22.398438 37.800781 23.355469 37.800781 24.53125 Z M 37.800781 63.667969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 17.082031 46.199219 C 17.082031 44.71875 18.28125 43.519531 19.761719 43.519531 L 32.039063 43.519531 C 33.515625 43.519531 34.71875 44.71875 34.71875 46.199219 C 34.71875 47.679688 33.519531 48.882813 32.039063 48.882813 L 19.761719 48.882813 C 18.28125 48.882813 17.082031 47.679688 17.082031 46.199219 Z M 17.082031 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 22.097656 46.199219 C 22.097656 47.195313 21.292969 48 20.300781 48 C 19.304688 48 18.5 47.195313 18.5 46.199219 C 18.5 45.207031 19.304688 44.402344 20.300781 44.402344 C 21.292969 44.402344 22.097656 45.207031 22.097656 46.199219 Z M 22.097656 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 17.082031 37.800781 C 17.082031 36.320313 18.28125 35.117188 19.761719 35.117188 L 32.039063 35.117188 C 33.515625 35.117188 34.71875 36.320313 34.71875 37.800781 C 34.71875 39.28125 33.519531 40.480469 32.039063 40.480469 L 19.761719 40.480469 C 18.28125 40.480469 17.082031 39.28125 17.082031 37.800781 Z M 17.082031 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 22.097656 37.800781 C 22.097656 38.792969 21.292969 39.597656 20.300781 39.597656 C 19.304688 39.597656 18.5 38.792969 18.5 37.800781 C 18.5 36.804688 19.304688 36 20.300781 36 C 21.292969 36 22.097656 36.804688 22.097656 37.800781 Z M 22.097656 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 17.082031 29.398438 C 17.082031 27.921875 18.28125 26.71875 19.761719 26.71875 L 32.039063 26.71875 C 33.515625 26.71875 34.71875 27.917969 34.71875 29.398438 C 34.71875 30.878906 33.519531 32.082031 32.039063 32.082031 L 19.761719 32.082031 C 18.28125 32.082031 17.082031 30.882813 17.082031 29.398438 Z M 17.082031 29.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 22.097656 29.398438 C 22.097656 30.394531 21.292969 31.199219 20.300781 31.199219 C 19.304688 31.199219 18.5 30.394531 18.5 29.398438 C 18.5 28.40625 19.304688 27.601563 20.300781 27.601563 C 21.292969 27.601563 22.097656 28.40625 22.097656 29.398438 Z M 22.097656 29.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 46.898438 38.929688 L 33.601563 38.929688 L 33.601563 64.671875 C 33.601563 67.320313 39.457031 69.472656 46.71875 69.507813 L 46.71875 69.511719 L 46.875 69.511719 C 46.882813 69.511719 46.890625 69.511719 46.898438 69.511719 C 54.246094 69.511719 60.199219 67.34375 60.199219 64.671875 L 60.199219 38.929688 Z M 46.898438 38.929688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 46.71875 69.511719 C 54.0625 69.511719 60.199219 67.34375 60.199219 64.671875 L 60.199219 38.929688 L 46.714844 39.28125 Z M 46.71875 69.511719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.199219 38.929688 C 60.199219 41.605469 54.246094 44.121094 46.898438 44.121094 C 39.554688 44.121094 33.601563 41.601563 33.601563 38.929688 C 33.601563 36.257813 39.554688 34.09375 46.898438 34.09375 C 54.246094 34.09375 60.199219 36.257813 60.199219 38.929688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.480469 38.871094 C 57.480469 40.511719 52.742188 41.84375 46.898438 41.84375 C 41.054688 41.84375 36.320313 40.511719 36.320313 38.871094 C 36.320313 37.226563 41.054688 35.894531 46.898438 35.894531 C 52.742188 35.894531 57.480469 37.226563 57.480469 38.871094 "/>
+</g>
+</svg>
diff --git a/dist/Databases/AzureVirtualDatacenter.png b/dist/Databases/AzureVirtualDatacenter.png
new file mode 100644
index 00000000..e903379d
Binary files /dev/null and b/dist/Databases/AzureVirtualDatacenter.png differ
diff --git a/dist/Databases/AzureVirtualDatacenter.puml b/dist/Databases/AzureVirtualDatacenter.puml
new file mode 100644
index 00000000..be42d696
--- /dev/null
+++ b/dist/Databases/AzureVirtualDatacenter.puml
@@ -0,0 +1,11 @@
+sprite $AzureVirtualDatacenter [70x70/16z] {
+xTK7akGW44JHCfc0xFrlk-DdX8es40gx_GxmSHB88se02BZ9A7KUm8OQu0bKUXaRNFg0JT2HIAGZaKYUvRm3yXpbNTwxdlwjCGS_07m08riHTJIwTmRi0ucK
+tIw9q4A5LrJ00L2f64UvXVKCWOMf345ZLm1l01vbb0TmCaNqHndZWQUfAJswRhogb7QbEEynGQYqtA_WaWgDeR9kwtwmFL7nC9Tb8z8nipwkC5Is1S1QJUPn
+9PpHEZ8N2_koRSlMkI-KU4PpPNggWWjEcc9FLk1c-ixC7V4VE5VcjVAnfApn0JozArPNvdtAytwmP1CHjPyP0FuPzVh1HNtI2y3Z8HKHHJgXYMXzKzsjR2AQ
+6bp4gxTVxwre4R7K017KhwtMkxiThBE965jJqNH-RF5J2Khwtbp-f0XJ4T6Smujjjok99e6ob8-AIyr_A_DHIHzWAdyCkRpBX3RwrlWRr_I31CYKouyiROsR
+OKr7vIX9MxYbEYgNpoNUtij89IZ_U-LLULLUbNn9nKfFXNAB1hXPaHxMhYJfP0WLgWnGSv0VbPpfvyGR
+}
+
+AzureEntityColoring(AzureVirtualDatacenter)
+!define AzureVirtualDatacenter(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualDatacenter, AzureVirtualDatacenter)
+!define AzureVirtualDatacenter(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualDatacenter, AzureVirtualDatacenter)
diff --git a/dist/Databases/AzureVirtualDatacenter.svg b/dist/Databases/AzureVirtualDatacenter.svg
new file mode 100644
index 00000000..1cfcb35d
--- /dev/null
+++ b/dist/Databases/AzureVirtualDatacenter.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56.304688 17.617188 C 56.285156 17.617188 56.273438 17.617188 56.253906 17.617188 C 55.75 7.882813 47.738281 0.140625 37.90625 0.140625 C 30.71875 0.140625 24.507813 4.28125 21.480469 10.308594 C 20.222656 10.015625 18.917969 9.847656 17.570313 9.847656 C 7.945313 9.847656 0.140625 17.671875 0.140625 27.324219 C 0.140625 36.976563 7.945313 44.800781 17.570313 44.800781 L 56.304688 44.800781 C 63.789063 44.800781 69.859375 38.714844 69.859375 31.207031 C 69.859375 23.699219 63.789063 17.617188 56.304688 17.617188 Z M 56.304688 17.617188 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.570313 44.800781 L 39.199219 44.800781 L 39.199219 24.53125 C 39.199219 22.585938 37.59375 21 35.621094 21 L 16.179688 21 C 14.203125 21 12.601563 22.585938 12.601563 24.53125 L 12.601563 44.070313 C 14.175781 44.539063 15.84375 44.800781 17.570313 44.800781 Z M 17.570313 44.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 56.304688 17.617188 C 56.285156 17.617188 56.273438 17.617188 56.253906 17.617188 C 55.75 7.882813 47.738281 0.140625 37.90625 0.140625 C 30.71875 0.140625 24.507813 4.28125 21.480469 10.308594 C 20.222656 10.015625 18.917969 9.847656 17.570313 9.847656 C 7.945313 9.847656 0.140625 17.671875 0.140625 27.324219 C 0.140625 36.976563 7.945313 44.800781 17.570313 44.800781 L 56.304688 44.800781 C 63.789063 44.800781 69.859375 38.714844 69.859375 31.207031 C 69.859375 23.699219 63.789063 17.617188 56.304688 17.617188 Z M 56.304688 17.617188 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 37.800781 63.667969 C 37.800781 64.84375 36.824219 65.800781 35.621094 65.800781 L 16.179688 65.800781 C 14.972656 65.800781 14 64.84375 14 63.667969 L 14 24.53125 C 14 23.355469 14.972656 22.398438 16.179688 22.398438 L 35.621094 22.398438 C 36.824219 22.398438 37.800781 23.355469 37.800781 24.53125 Z M 37.800781 63.667969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 17.082031 46.199219 C 17.082031 44.71875 18.28125 43.519531 19.761719 43.519531 L 32.039063 43.519531 C 33.515625 43.519531 34.71875 44.71875 34.71875 46.199219 C 34.71875 47.679688 33.519531 48.882813 32.039063 48.882813 L 19.761719 48.882813 C 18.28125 48.882813 17.082031 47.679688 17.082031 46.199219 Z M 17.082031 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 22.097656 46.199219 C 22.097656 47.195313 21.292969 48 20.300781 48 C 19.304688 48 18.5 47.195313 18.5 46.199219 C 18.5 45.207031 19.304688 44.402344 20.300781 44.402344 C 21.292969 44.402344 22.097656 45.207031 22.097656 46.199219 Z M 22.097656 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 17.082031 37.800781 C 17.082031 36.320313 18.28125 35.117188 19.761719 35.117188 L 32.039063 35.117188 C 33.515625 35.117188 34.71875 36.320313 34.71875 37.800781 C 34.71875 39.28125 33.519531 40.480469 32.039063 40.480469 L 19.761719 40.480469 C 18.28125 40.480469 17.082031 39.28125 17.082031 37.800781 Z M 17.082031 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 22.097656 37.800781 C 22.097656 38.792969 21.292969 39.597656 20.300781 39.597656 C 19.304688 39.597656 18.5 38.792969 18.5 37.800781 C 18.5 36.804688 19.304688 36 20.300781 36 C 21.292969 36 22.097656 36.804688 22.097656 37.800781 Z M 22.097656 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 17.082031 29.398438 C 17.082031 27.921875 18.28125 26.71875 19.761719 26.71875 L 32.039063 26.71875 C 33.515625 26.71875 34.71875 27.917969 34.71875 29.398438 C 34.71875 30.878906 33.519531 32.082031 32.039063 32.082031 L 19.761719 32.082031 C 18.28125 32.082031 17.082031 30.882813 17.082031 29.398438 Z M 17.082031 29.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 22.097656 29.398438 C 22.097656 30.394531 21.292969 31.199219 20.300781 31.199219 C 19.304688 31.199219 18.5 30.394531 18.5 29.398438 C 18.5 28.40625 19.304688 27.601563 20.300781 27.601563 C 21.292969 27.601563 22.097656 28.40625 22.097656 29.398438 Z M 22.097656 29.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 46.898438 38.929688 L 33.601563 38.929688 L 33.601563 64.671875 C 33.601563 67.320313 39.457031 69.472656 46.71875 69.507813 L 46.71875 69.511719 L 46.875 69.511719 C 46.882813 69.511719 46.890625 69.511719 46.898438 69.511719 C 54.246094 69.511719 60.199219 67.34375 60.199219 64.671875 L 60.199219 38.929688 Z M 46.898438 38.929688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 46.71875 69.511719 C 54.0625 69.511719 60.199219 67.34375 60.199219 64.671875 L 60.199219 38.929688 L 46.714844 39.28125 Z M 46.71875 69.511719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.199219 38.929688 C 60.199219 41.605469 54.246094 44.121094 46.898438 44.121094 C 39.554688 44.121094 33.601563 41.601563 33.601563 38.929688 C 33.601563 36.257813 39.554688 34.09375 46.898438 34.09375 C 54.246094 34.09375 60.199219 36.257813 60.199219 38.929688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.480469 38.871094 C 57.480469 40.511719 52.742188 41.84375 46.898438 41.84375 C 41.054688 41.84375 36.320313 40.511719 36.320313 38.871094 C 36.320313 37.226563 41.054688 35.894531 46.898438 35.894531 C 52.742188 35.894531 57.480469 37.226563 57.480469 38.871094 "/>
+</g>
+</svg>
diff --git a/dist/Databases/all.puml b/dist/Databases/all.puml
index 3b0c52a0..257b8307 100644
--- a/dist/Databases/all.puml
+++ b/dist/Databases/all.puml
@@ -1,113 +1,228 @@
-sprite $AzureCosmosDb [70x70/16z] {
-dPVRbjim24K10PBu__zjEmfs5DRH6gVxfPtRzk5YMw4tJ5yYwhrtOzfftobyHgAqOVGS7R4Xz6QsnuvNZEagqdf4to96_yOn_KeG4NJJzsHdP2o7qitOB1Bn
-80ptom4jl6BQRyKKns96x98wD1p4gH0nivoKvEzWsWeYuDjzENeacHSZ3als2ELcCmfTPQ-3ppT93ff_8lNOcNhzBalJYyRdEiVLDb2GQ06BHaIZn2x9zPjD
-2-R_Q5IHY5as8GRAaPA5rJpzi-EUIJ98nIzQZH9b1NFdM1L6IUhsMzdkMIJOulQvY7NmYYNsWszepR_JLrTEAP36Sa0xYXfhZf1NxP6xiYDWnEQOQygT4630
-4CqLOmA0UZ3jLO_YA4yiEUnngaUUMlBEOnpbeOLVgzy8mGyjxRLlJgU2AgVvzDmtWDhYbp2MJH72-8L1JP8teHA6lMYWXr-RukStHT4WVYGJR0gq-5b20tKM
-M-mewVbabV-r215vZaSF5YuMAB4SJxFZf3ToRtPQFWtMmhYtNomupqgGCzPytY7CAoL9o_DMo-s3D3zhsdPe4oyMq5vObAHat1B5GGILP5LoNujXZl1pIP8z
-cNnBZ10zOasf0YLuGlbM064irrxtSd2KxQq0B4Y2k-8H0uxf9R4gKGB8-wtGIfIyHlHTubIfPndT9IqR_qIYdoSykrZ3uP4te3Xiokai8vhmTRPN805H1dYx
-jVlil_O5IVWpIgEgKRaFdkl91gUZ9Kf5-6h9M8TyVDoTvGYEQFDwxxHrH7IJkY2whUqaX4Ma_zKc0GiojxKru92x6f9_yE4o_TrRFWHnki6IrC22igtx3k6i
-Yvcl1eTNwKn7M6UycIeUTK8wIn38ssESd-XBKX04qBUFPVsZkMqvHdeVQERzt_QPSYezOX-lvVwpzYoJ7jFkN-PLmbWfCiTp9bEYSJEKliFgL6PNfcyHIlu2
-}
-
-AzureEntityColoring(AzureCosmosDb)
-!define AzureCosmosDb(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCosmosDb, AzureCosmosDb)
-!define AzureCosmosDb(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCosmosDb, AzureCosmosDb)
-
-sprite $AzureDatabaseForMariaDB [52x70/16z] {
-xTK5WkGm34JH4fcKtF-u2nfmECuop6-6rsZ0RupuIoBCJ8JRMDNCj1StXN4IwVhPQwc4NM9wambMaUb0HXlo5EbeziqcterDUnQbb2nQ4GwIqT7NP-PzeJk1
-JOBeAyWNVN6AY7sU58XOqmLH1Y9nd-SvemyqjHrCfa9uAtcOUSgq7QCIRGSfMVCmKL7S9jcZCD5KZN4QQO1kkclPb0dBM3HLxtMpfkwjbL9hQzwxC1r6lyby
-c4prYSdA14OUDuL0W8grOLC0cnb5p4TD1I025l5Xmq2aFcoiJ-jHK_kx31i6eZPk4X2n3vkArtJODC9hQTIKTu8oPfgYvoEcAj2JM-D52QlojOddR_ChqnW7
-oPN9EAnU6CLXxCk62CgvoLX7G2Jdfc6J8cAbCrC9crASvGoKdV6imY4uL_TMIp9XpWo0t2j3jaRn6fNLUAllNx_LhNaRlZhDAwC0x6pjjNYJkXdNDMRDcQav
-bxQR2mAfJzVu-h_iSzCtcFBS59eU6uPC3uq2eFR4D4PaFcmCxqaTCKsnYhHCbwOcna6ikKq7fcKJeFSP
-}
-
-AzureEntityColoring(AzureDatabaseForMariaDB)
-!define AzureDatabaseForMariaDB(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseForMariaDB, AzureDatabaseForMariaDB)
-!define AzureDatabaseForMariaDB(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseForMariaDB, AzureDatabaseForMariaDB)
-
-sprite $AzureDatabaseForMySQL [52x70/16z] {
-xTP76giw38RXNzMD_Q_t1WldnccOoUdVA06zZoOq_CI8cUKMCnDEOrNJEJDLneTe6d-1z2h4z2IJML28CqMNoOnqELmtXhs-ZMq-yz1yWhjn13fctTDpxXvq
-46sCtWru-jBkqEEwDK74-WqPZx5IjsrpZ4ZKNg6f44PMwswsveI7Y5YEc0YFQQbXTfK4fx5r4IPOLiB7I3p0PCAvofCa5ainFvkvMal9oLFAUGoVcQZLw3Sr
-_qnrjVmmxsgfV3T-tBC7gOIz_DKGUkamZ9vyCmqHnQA2Y5SCl1j5H4k6slIlHBLNUYyc5ld_9ZQcUYjZprvCB28SKKsd9XPbh1iIxCKZKXTDndqQPT5iX97K
-LUCObSb8BgMazwOEmjk3cNenco1AmvHpSunG6wRAgTdiM7CtHKxDbeKuZIDSRvMSV2yJRld2lPry50lJWX7CbUj6wsN3vQeX-tEVlVzCksvAlcwSsbLJ2DAk
-cS80k5uncT2pkcgoufwM5PC5KwIvVJKVFZt5KWquc-pAUEW_
-}
-
-AzureEntityColoring(AzureDatabaseForMySQL)
-!define AzureDatabaseForMySQL(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseForMySQL, AzureDatabaseForMySQL)
-!define AzureDatabaseForMySQL(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseForMySQL, AzureDatabaseForMySQL)
-
-sprite $AzureDatabaseForPostgreSQL [53x70/16z] {
-xTG9OgCm38LXItfF4hx_WSS3TY6DJJhx-cTF-8hALdvjeYtJbfJNgO4ahf60BQs0n2h29aHFi7JoIEGaj-mBJMSNX0zdNu_aQJoovJssdiOJb5EHxZ6fsVvx
-7oprU6Fa2HRmRT5C6viGTuecfHjlA7azZ2QIC2qZeU-eCIdNH5JLp5HLtlq2zuvQRkLrIlU1XeFU0B4k1ZhRvt-QrT3159quma7Ifp6NpS4I_KT10Bw_9TG0
-qpsiKPXvX5C5K6Q6cqHjRHGiaEjMU-BZ7UnuDPiZhIDhPfIwTJr3yDfBgvUs_iVqWcOhodejR7yXRv7Mnn2rvRX3mGiu1tJU8SQZoMDRu1R1JKs7J04rNcu8
-iwt1yL5Jahb4sq3jZGUpexfLj6_2PWZH4NOTVcvA-_pW33aVKFQFo0E9pr1QHtOWz0s1_Hj_SUmThydnSQl8gZv7o2low2XGcRb2ZdEy_jnNXLGkq9XltoAR
-rL52Kts5RCoNZyUIGRb4OxwjCBMURMA-HEEWC3gAdgioLJCLp15HMs2cUTLX4ksHePoZtFyRk2bhbO52FQYwlkwfmq8QJNr3RW1khx3qzb1L2nq8_FXb-GsP
-Vm7QEf8lGVaLoA8Z_G84Fqn-2N8UYFW2DBQv-1UWL6zaKtmHSbCLfKzGhD4ou2kGblXYX59afMvCYr-4h1p9bAt92F41n4xEnFmMGSiyCNWy8SBUWKy
-}
-
-AzureEntityColoring(AzureDatabaseForPostgreSQL)
-!define AzureDatabaseForPostgreSQL(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseForPostgreSQL, AzureDatabaseForPostgreSQL)
-!define AzureDatabaseForPostgreSQL(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseForPostgreSQL, AzureDatabaseForPostgreSQL)
-
-sprite $AzureDataFactory [70x68/16z] {
-xTH5OYCn443HbbJuxt_V8RFBawHs0VrLuskKZdDJp2CJCiDqZQFTqE2vq1uq7O1qLP6rHDHEg3SS1N0PpxUNW7IGdCUB35WVL1AmrsyBy0yg0FdoaWv4Gu6G
--NWVovAkSf9CLKHKpHEWgzHQobQsifMjs56QsbH6P44MJMKaHH6QoagAOZGLWQ8uJKKfoWYQYbEKcVIK4HHbGKyPIL64fZAJeXXDHQ0eJbDHYZA2fk8KPIOz
-PGH5MT1JHb8KeQdCf2X6LTe53QNJLe2jvAcoKjRUKlGu5G3vCC7PUSs-Wx8LbrC9a7BA0GWv5Lzy76rbAxy1
-}
-
-AzureEntityColoring(AzureDataFactory)
-!define AzureDataFactory(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataFactory, AzureDataFactory)
-!define AzureDataFactory(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataFactory, AzureDataFactory)
-
-sprite $AzureRedisCache [63x70/16z] {
-rTS7ikCm20PWqq7tlszwI28hqfhj_zHNFXTi6Bnz18b5pJqYMaIucmeJREi0gqSR9rmP9XOrsYgXECRYtJ-6tnFTGPttcEBbJ1ZXyvwGvUscd3gjQGL_vEPa
-Um-_VZrFdkRZ1gBJQ-_RMxfZJYBjdXZnM7cE8Syum-ITocUxvnbNHkWbiQQTydnfpFGQitpY4pxF_yyZujv2SOplcmXmoUTDjERPcsMkhswzpp_FuOUmuAbH
-V3ouQCOVvMMVZhxltAvdzdu0HlHN-FtQ8VBP4RwtaEJaiWcNIVtHsYtudMjEfb7kdghSr_oQO9WCdodF6II403S7cCDdoIVvkpn-Yhlz33UCd-2wMQjpsQXU
-kg1jyp8Fp9sWm0soamjSSq-eSBbgR3KUbArQu86vInMuG-vI1QwvNrMuF3Is0WzwRUotw14Us2zfxG1tsEsN1xZjH_m1xdHBNZ-KNXj-Q2mzTtzjjXLEkLLN
-k6NHAZmWYrRXaaMhSC-YbJXbqIhSicXx7aiUa4NRSrzooQ8DEAru38kMLQ6OBcQDP0YpgA2pjT1jeltRrxiztvEOwPmZf5qDR_sjKypTzvvOzDEHBSPMSHi5
-a5Zq4ii1mMeURukr2kLLdm4
-}
-
-AzureEntityColoring(AzureRedisCache)
-!define AzureRedisCache(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRedisCache, AzureRedisCache)
-!define AzureRedisCache(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRedisCache, AzureRedisCache)
-
-sprite $AzureSqlDatabase [65x70/16z] {
-xTQ7phEw5eJXMVPgC_T_mGTXlaw0wAZl_r59VqErZUziUbGtARAxCkR0OyEB-eiT4_SiMgyn1ovPwWChmzsdRoABElJ4QwcbOlnjp-WZCN3ErXVeXXSikBw1
-K-ltYUNoJquBiROUDoXjnijF0ZVgvNPgHyEbmPSRgeKJ5vpQzNbWQJUS6a7fBh1q-lXHiUb5BKy22xjhqqqjDu4R_xt0ly2_0AkAnxFCusbtyrcWx7E8ps-J
-1O3vA51OGWeSuft0031y8jQNtB6fDmBOK69h0iYrIVFDW2Kb0h2FRNeZuDY5-F6J2O3F0mhil06CbNmle5uRKTXmxOBfUQ0erHuO07njaRyHc1OLs73Fm00O
-zu3DpNq0YqlsVKB5uMaWA75-pQVF0-hCB6h76W1Icpv8OiOy2vpYEfHV68PpEaS3CAc50PXdK-noUn8GQ_ErGBEaMBbMVcNuedi519a3omWotWaKKEg1BvQg
-vm4QIecVNFquC90A_3PL3mE9gSHV8RyBT0p3XiIPvdMW9s1Zpk5od1cAgq02ixKZpbLV10BMOimnF0FdN0CRwaHYa8vh9iUcz1TXvC0T1JQ3-iDH7BZ513P-
-iW53WNjTs4tgfq8I3p2nMEe71mltxDjcZgI-J2XmRnvpoS6BEWoJuvvdKOLlXcVl0IZmJAp2TpQcWOd71PmfuYdYZ6lYeSQfvlyPc2eyOi8vLniUIE459sFW
-XgKIhrX9x6jINlOzwreEu7y
+sprite $AzureCacheplusRedis [70x70/16z] {
+xTO5cjim48RXNuEIVF_xDhDH7ZEgt7wBIUJN3EZjV_yZPcanfIU0gCeY5I5SZsKtbOHBaSfn_KYaE4_Eu_iRHLURMHEEIcbS65Kpyp4pQvmoNj6-ueX8rNmx
+ixQJakuhsLDRBTr6XF0LsP6Iiw2LY4K_AsMgqyDNx529pewh96PdIkH2s8c2kAP4hjBMOBw6TaEPSQeszb395lssYhwI3aN7W-QnmZ66HVIT2AUxIXZfvDft
+gWGYc_4T1NkAt50SWBQhrhYhFagwgYW0LlDvfXpyPQKQthief2O88R9oMHc6gkFWoN-QomqbAYQ4CU8WoZsbLKlExfvBwvaIbLczYfP-9PFtAvwuT2i6v6v5
+0Ikz2WDKEfKSqtcdal5AIfzYxz5TIbL4LdgKIctqAyeFbUaKWJnI76FoU8rAH8YqRnyv8Yzz-oYr_Tob203EfKyfRPDqAPK07muKN54CAG-7Yfmh5LI6OmLo
+gWZNOQrW7lcEOcM8ijRttnbYMCQ-hVWNyxP2EK8YKbyfKGvYhHXXfyHYAyL4rCjCoIO99oLY5X5c9Xe74qjxDYJynFxt3G
+}
+
+AzureEntityColoring(AzureCacheplusRedis)
+!define AzureCacheplusRedis(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCacheplusRedis, AzureCacheplusRedis)
+!define AzureCacheplusRedis(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCacheplusRedis, AzureCacheplusRedis)
+
+sprite $AzureCosmosDB [70x64/16z] {
+hTQ7ikmW20PWa1BJzFtVziR9TGABdhRxJJ_b7q1Y0XqZl0y_af8umVk8-HCDyGTQukRzVjwFGUxmpn69hOJuzrwilwxA8y6F95ttirxAlk1h3iLkHLHLX1C-
+2Njriez9Fe94BI44e5ngSDWOSXciaMnrQ3Lh1yOWW-dIIobxLc6MVDRcEIkomulenaSjcvXjo3O5pLH88wPEmFCfQBg9w97cAP1iI4Ip678fytQ4BpIBMQ-G
+Csvb74Y4q66zBF0YXWovKYg2n-e9ZIKxbGmUZakPzzIMhi0B2KSpavv-U5YAHLDmqVuGEJnAcHV3TNJAe07DtPCj2A6XG6XAQaE3Up1YciYr4GYO_kCOCmvH
+YCIKQvfYYhOQDp-ca7vbEMmbNb9wy5SXnSx4IsKXGwUoUO74aFgpb7ia9SiufEQG4gyhsMjp21C4s5fToM1cYGiefJORNMB8sN_di1fqMMjpjvv2ob4l1mNi
+je-FsfpYRar_xHrcUGVRrzUrxdG3fp_XQ5FYaEKqtJIZoPRMPfgcBFkTSR2zCgszNtl3bioEs5rWyDWiuhYMVFf2HYTqskyOZYdvg6uYyr88Rc4oqkke6vCn
+cifkGidIdd4AEU2XBSN7SEuP9PF3erqfemznyoMvQGpnbZvRzoR8UwdTlgXF4HocdE2mYIZReXVs8O7wMvXqAzLbtAXZXe7q_y_pajj7kNMiyOKYP5g7nrQ7
+ohven628lnQ2aWcGOmRwKq0ms3UoBzIxPHkHm1CLS3WVvtaU-xg4lyMK4YM4G5HDp9yGzme9te1a9lK7TiKJl2qfmmSemWUOKlu1
+}
+
+AzureEntityColoring(AzureCosmosDB)
+!define AzureCosmosDB(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCosmosDB, AzureCosmosDB)
+!define AzureCosmosDB(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCosmosDB, AzureCosmosDB)
+
+sprite $AzureDatabase [70x70/16z] {
+xTS5aiGm34HHIQsMS_yJxu2SSjXUfbymw1Sc-J6fPVgwqUwajv5qM3zXJZ-CtZLRIPn4N1cWTqGxHJnx6-EzKNRJTr5ie_1Mr7ZBcwoPT9FB8oGGKNQA89lL
+ObibvYqTvQnWtT8QMsKAoSnF74Ab8dlAL21pXiqy1HtDCCI-SdDSbgcgtLBD_xV6eNAB9fUPHnmhMS1E132o4oKhT2mtf1hWaVKfRR7Jk5B-ZlAl_2kKEGMh
+ilosNycyAcqOLSHs546VejemLL7CPvmE9T-7vGzLiRY54QLTkcYL65QIuHkLwV4lR9R8nnGyHgUYxaXsJ7cEJYKpng0I6oMPDyrBXZ755-k5T7-EypTkex07
+EAB4Td_9XHjGokDFMjwav7zYgQ1xYOnqQFs-LMYvaJgK9anLQNlRkIxZa88oxIWMSQKKhx4qrm3C-RjTIVwLVmMlKMHJ6LUmLNHOeUoaPKnnsSy75AeSXjAd
+qEGqytAb42hNALYE5C9a8AtFmbD4a7I77S_22m
+}
+
+AzureEntityColoring(AzureDatabase)
+!define AzureDatabase(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabase, AzureDatabase)
+!define AzureDatabase(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabase, AzureDatabase)
+
+sprite $AzureDatabaseforMariaDB [52x70/16z] {
+xTM54ZCx28RX3m8HIE__TizfcKfMix_REzxXgMq4Fp5YvlH_p4GuZKLKvJDLbSJxy-FuA8MmAgcSf0b3f3AHqcKo8fdkYmsllflUou_qtkgxSGcfCPrpMNUt
+7mIvo_E_rbmEolhyhyLxLqGa-O08uKcytswDy8oJhc3MZxL3nH_crYlZCuf5ogirIjazpBscXBEaFaIOo7B2Rgm11XDvVNxxPyIYfNaqch7UtLipyw4Z4tdq
+Sym_OufsmPWc0j8LK-xpqAG-RJ9GEr7bCcqg06PGKfysX2Zxj154pQTD7JvbpX0YdpU2ACsR0aHvsbGyAxCcuvNDcSPlGZvXh30-aZFJMsQCrKFJOtwC_CXK
+RAK7fWisittJ4pOJ7ymCWUqRnHWZqh9hAXOf7YdJZl62JLDR1khIzAPCU2JjyOAteYADOW-O82sD017RiDxg-FF7xsQ4UsMnHdbSCwEHs8YtqLI0ck-PRcPz
+jHUOyxyxQo-xRYnVDnbsrHX0Tit4EilzWYc8gFH9KnYlADkviKmO8stzm3HbR4QIg_d2M2qoply7
+}
+
+AzureEntityColoring(AzureDatabaseforMariaDB)
+!define AzureDatabaseforMariaDB(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseforMariaDB, AzureDatabaseforMariaDB)
+!define AzureDatabaseforMariaDB(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseforMariaDB, AzureDatabaseforMariaDB)
+
+sprite $AzureDatabaseforMySql [52x70/16z] {
+xTQ7TYmX281XG470VV_NJP6eE_7SSURszYVR_Sxq0hym9ABq5X4YRAEScVDpp9mJVNdySVXHPbn5uho9qr5WY9t23TcXVBclDhJC6xydBNvlcJSg8Jb6YvIr
+T_j4G6hkwvgbd2JSrtMosX5WbXCojcbsgu-78lGeyGA54q4FnPjvL2Lu3cCdfMKVHNPlfgKPOLSgxiD4nkbiXmympCoBv8J7Oocng4VJhDNghgfcvj7MH1xz
+gUQ_qOH0POvF0CXsQWnQ7Jd6Vdng6A8Q9aDa9sOCuaOgVAHRCoOajqnC2E6Z8lnU76qotWup9wJGirWtkHaSgsMOEQ4qZUzCp9B7EBnc92RKNX9TCvhc5FIg
+AT2ZnrLJXoa70sbSUHRpu6xgDCTMusE5TqCxCxQJ3wDxKrCipJ1kcR15zCcK_9QrWq-ulRRBeVdCC5RX_jWMx45BhXWuPlSD-ssJ_OhHF6FzUy-z_utVDyht
+3OFTDGg0Tiyendti3ICGOQaNZH2Ca6rlZ16YoRIU6EMOn18cKVDFHelau_XN
+}
+
+AzureEntityColoring(AzureDatabaseforMySql)
+!define AzureDatabaseforMySql(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseforMySql, AzureDatabaseforMySql)
+!define AzureDatabaseforMySql(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseforMySql, AzureDatabaseforMySql)
+
+sprite $AzureDatabaseforPostgreSql [53x70/16z] {
+xTG7jgCm38LX9DqhoTx_WeS44PCyas5w_Lz9_GvkX-NN9gALNFcs0IIEaOJfgJ0GPv6ON5I7E8NsOd0fwj4GNwvmENuzali_uX2tl1udQu7be4Zt-9WxUJII
+DJKZFTxbOwkOfLQFjsei73qp-RJ54-am6Lznzxo5r-DgPW3CxFN8AhtG6lNISQPxeSfDBeY11eJf1ofgA313rROpjkspJyhJlBgA_gDmUjGp0nscQyOtY6ea
+J9IkIYTaOLzB2CwGUjzgggsUmRPdq3dIw5LgVvIQzqVN6NBhUzBwgDLLYGb2zihPgrBReqxG6D8-eJtd5THVqlPPbEoZSQds5eK7LECXLDNMnx1tYCAMOJMn
+W7kpizMpjgDO_pHgaCZ8n9ZICq8KylkJLjl6l0ruVJr5pXtvSGs3spl418r9CGfjwGR5twDyGeYUwAapD2Q5h3bjDRqzDywHutYbOAyG3KrzZbB6r8y7y0QC
+PyXoFserkeeIwdCqnjSqQWahLPwWiNwfq0NvC4q5X66EoEqxcI4v9cMP121pbFVPQ0GaQu3xZYNKJr1eQ-fgqNii3oGYEjkdeTJJZ5J3kA5TkYs7UoHt53P1
+ymPoV05Y8V0B40hP5o2tGkBNKUYNet7ezKkGRZSOyIz156P0-4N87MP5BYi_Jxy2OR4lHboMHRyGORd7Bq2KPGyN4NKvfemfcekH6ECCmOxY4m
+}
+
+AzureEntityColoring(AzureDatabaseforPostgreSql)
+!define AzureDatabaseforPostgreSql(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseforPostgreSql, AzureDatabaseforPostgreSql)
+!define AzureDatabaseforPostgreSql(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseforPostgreSql, AzureDatabaseforPostgreSql)
+
+sprite $AzureDataLake [70x70/16z] {
+xTDLWYiX48NXibEDPF_RZHE34BglpWp_EnzENoOM4LKvnhGXKGFiAS1Cnp4nsDjWIWCfx6DC_GGs5FLI6uqwmKOJQiM_HT5wHpZc9G3rZgfJXZoSBk2-D3fX
+3mXPfIIwT2AMNevoqufAsQMoFZRl6FSJKMyekupd7-3L8bIOIWnlASSIw3bcESTCpx6vjvLJUL7w62lSUygf0Eq8KeYEKagXdCB3vhG07QLTpX7mgd6bEEv_
+NfdALAOobQd4tw7443SedbwGK9YEufKIOhuVHGodObwjt4Ub64envTLAk_ZNbQbC9NmhPIhOee1Usw9efTXw1LI7jGgebQnJbDvauufH9rc65ALFYVSLA0qc
+M5eAJAZP0G
+}
+
+AzureEntityColoring(AzureDataLake)
+!define AzureDataLake(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataLake, AzureDataLake)
+!define AzureDataLake(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataLake, AzureDataLake)
+
+sprite $AzureElasticDatabasePool [70x70/16z] {
+fTS73kGe48NXLr09kFzzrp9IoLhcQGRrhzJnws2RWB_KFJDCy4iIkUk_8Zlz2I7C7KAPUuGpzqWnzuZttgHrYsBk4GNGdWHezS0zqZns2icdeTT82bxahS4p
+SqwzHL8XjWrlxuDpBS9mP5y_yWIWQUHOYp4SoOXmxRsrrbKrnboKuKZ6plGjDd8m125AhaKOWZ25CnpXIZ4SuGfX248Lpd24AyLmX2k48GXLECCHhXH34AxO
+M8Gv43TLyuzJIY5pX9j7piqSY3LWrpvGZjZlsOOATgApc0_I8Uhnv0fO6NDz6e9k-mjso2Yca8H41JcGDuFMQnIsYgd_1AXNz58sKZd4O-S2hR-ua7G1Mdzg
+WEY1l0q5f7NjJO3cgvZFo6PT180qrVs_ZFL_9SAQ223ILNtjPkjPoaxVx4NcgRovldazx4mv4Qwiv4eXloWdmfLWobWNYX5bp1j5Y3BNXHBeVrRMXJ84wByg
+K_3KVr8sKioz4eKSp4O-a_8OOzQT_2W-ztzIVVuRCwkXRNh7MxDHw3kmciTOXNoPOqWP0kdsf0tmTLJ8oOnLTLZKc8H1aPCPSrKDfOGWA78o7sGvqDJSJJlG
+aY07iv4gGnjsJJK9SZ0R-IXFRhhB0o7feP1vkX3ES8KZdE5A8PoX2a48mnIES8Oh0qUCuKe25mnH248OeX24CASo2hbZnbUnMSWbCqTknJmBkMSUQCuQTmkv
+Oog2t3E5t3C4kMSuSiy4VgdbFsrQ_mC
+}
+
+AzureEntityColoring(AzureElasticDatabasePool)
+!define AzureElasticDatabasePool(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureElasticDatabasePool, AzureElasticDatabasePool)
+!define AzureElasticDatabasePool(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureElasticDatabasePool, AzureElasticDatabasePool)
+
+sprite $AzureElasticJobAgent [58x70/16z] {
+pTQ7ig9048NXq-dG6z__SVSYNGvTGucp-JVhV2KPy9yaQZuoa_UKNwStJkFQXTt0cLIuIQzPwF4Zz-R95g3FOnmLL3wBRc77R1w4vnI0apIfVzxOf1DxLcha
+088q0E80O9biCZT5pUrPnmE6F0oFEUxKCvCwPbjKrJxI7H0uf1q_PdgNcLlejE24b2vXcT9bQJUL8PqET0ccTzdR6060n2GjiycP4X36B94fhsMCuLrkQQ-b
+z-5VYIhItv2AwjltB-go8CVCVMTy-aG5m3iPWD8nKkQdVCodlh5iYPOf8BVBbW845K3FaxYH1YXZafbs9maWQEWnDznA0uJK1YDJxYK166aT6jwGVj0m7DbM
+y4OMLJAtS0_kNmlUaxJs-sR0kvAEFVK8Dm4MP5ksYv9XiYn7xkOUgtBqlyW0NqkLQna0jbTI0BsI11gTf0A0p5A1HYUfRLnFGWQDFV_e1DrncP219mMg4oJF
+bAGKh05n9G4WI1fGRxNaW9ubeQeb6sroXdcO8MFG9ZliSgP3DZZ9cGxvW0P0yuMa0v23bjI2U-gybguOgy1A7d0avi6d31yN70SzqWPR9QVaBCCUwPsqHrxo
+bDz8OVMBCaxPdOnJYjOaR_elPFX9MYn0qf_Io5YHj9B6aYkKv28iwlKek42hHGXvIi4gRN2T5bod1TTfl8G_
+}
+
+AzureEntityColoring(AzureElasticJobAgent)
+!define AzureElasticJobAgent(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureElasticJobAgent, AzureElasticJobAgent)
+!define AzureElasticJobAgent(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureElasticJobAgent, AzureElasticJobAgent)
+
+sprite $AzureManagedDatabase [65x70/16z] {
+xTFNWjqW38HXCqXWCE__kYcdZ9jaOtAP_QzIThwLJvdE_HH2mBSGdew1U0peLZW-6yDpTai4xWS5nBimkcUX0nW_8OnTO9yWsnw-Yc9tkSVw5EAttX-EG9wO
+Bs1YSWJgbWmmVZbsFp4VWON2gXZV8-xFm58nzOQv6C1IS-TUIx404Xrp6tWHHQ-FJwMu08qizbXoOGv0f9QIaxxUF216INdcrWFiAYV_Ev2JVD8q0AZioyy0
+bNEv7yXYfhr04gykeAhuzG3STmWFxcTtm2o7OiId-FxxDL0FSwvN0fU0-dCILq1rzqm45b1pKjMqEm1ssnEu5gC8Jy01oDAtPv70rGSFVO2zJ_ESPRj8Vy8Q
+0U-3ExVMCjRapz-h3MJpsVEVmOmrFG21G3MV_0MqzMPPN43Flvq0XRWq3wZMda1JxZqW6_SJU0dSsu3QUm9DkRVV1U-ZHw2bfNK3s0EvK5aI0HRk0TJlNeJ0
+WJ2VW03gPmyJGBW5KDzx1q2u1L1VUm_0f7T0h88B8CoN07C15Daq0cZwHs3QdX07WFtNwJaGzj-dE0HCqH3Yvo-C1nxshu8Xz3LzYsF2j1OU4hp_Dm
+}
+
+AzureEntityColoring(AzureManagedDatabase)
+!define AzureManagedDatabase(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagedDatabase, AzureManagedDatabase)
+!define AzureManagedDatabase(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagedDatabase, AzureManagedDatabase)
+
+sprite $AzureRedisCacheforRedis [70x65/16z] {
+xTG7YkKm48JXwYpf_WTUkP714QnvcySVsML-4Hj_rkj5n2Aw464wR3aTjpFM8y9Az41mWJ9ocz4B0E500EgBcRadCrl_941oyo4d0HG7nalAOok_1U00I6D7
+btgSAYN39AgsK65qN1eGmMEpiH4wRULSASKOEwIbjQLIIhwznLRRLIMv2ZCnirhKbhBIXOrDndPNMTKsh9MDDlmzbRTI0V-aKamO0x7w5ohL21qHCHCH5kAJ
+5GV0ebjCW4nL_FBQ2C0p5G5qi8Lg8b0yhnG7ICtTO-Lkoe3QyqeK0y1gcufndfIfIWd1G4H0aj8cAvqBRo-MrzRcAodSBQ9a84rNLYrzqufyfU8uylbA9Pne
+J5OSbzZYQQM6ubuU5REuhVHHXGbF-5sbug6tybRUYjnL73FqkkAOGnQdIZ3ciNgibHec-01r-ADUFm
+}
+
+AzureEntityColoring(AzureRedisCacheforRedis)
+!define AzureRedisCacheforRedis(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRedisCacheforRedis, AzureRedisCacheforRedis)
+!define AzureRedisCacheforRedis(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRedisCacheforRedis, AzureRedisCacheforRedis)
+
+sprite $AzureSqlDatabase [70x70/16z] {
+xTS5akCm441HDSFS_xuRjQKXnOcyJByWOFkL8DZ-c017qBuc91OHVbz_IFiQiF1fmhHZq4AiqBCHeV16Gj-EL8yKtWw-dx9GkCv8HFGr4LbdH8l2xvX-kTsf
+OmEfP54IvqwBsgFqTQTL5-Kbv_Y0v871s4OQTvINh2UdnABB6AY48_AugtJdqwe30Du2-BmRP15tbIgDeJqBnIFEbIfT2Cu5rYAUALMQ2k5x391OBQfTvRNC
+T8-bVMMK4LUL_yf_vR-IRcQHys6OgCN8R-qeoQs2Wp5i5HyNzuFsN4beewuajHdO1QL6GanGoe4SCFY-qg-8-Y2_ATPkoJoTjfMSSwdwccZjKNb-QImoxaSj
+SYdHGTbMf1vutUydyNYzIB-_hIJMGueXwb2idjnLNZVNLWKtbSgFuKGfCXJT7yieQqUuDfg6mbTMTrJZFxOzId6eotSLoPhKyGpLOlJ6lLsbWNeO7g-QQ3qQ
+FvviACGzUwYy5cDcCurIPhAZWDV3mFdOueAIoeZ8bg_xpWLvLCepk_g9QJMsR_xShRFj6vMn7FgjIZ3TylZplzN-A_0rYhJFvLSel2XoNV6sPbSLntOdlQOu
+jBkXxolExJIqN9LhHWNi-KHnmROHYUU9OihGjXj_XJqYCjnz_X4-wGi
 }
 
 AzureEntityColoring(AzureSqlDatabase)
 !define AzureSqlDatabase(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSqlDatabase, AzureSqlDatabase)
 !define AzureSqlDatabase(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSqlDatabase, AzureSqlDatabase)
 
-sprite $AzureSqlDataWarehouse [70x68/16z] {
-xTS5ajj048NXDzFyxd_WhBgML8vSqYYS_SpqMmmueccuIv9awUr6o_NEJBQMijO8jZkTuNmKytQZnRZGA1xoanqhFbC-xZPQ6PxJuXcb5neh7KbUaNgxqN8-
-LBYW_eDAizr7Hmu2VtmbczsiiCLFgNnLiZaUCNG2m1XpCzQMbm68HHRvgi9aNAtCA3BTLEOBKRL-G_UL6Mq25ctVI3BaOVWiMVgvecm293UrYnHp7arKFrif
-SkBxWZnR8Qa7bRnKAJiuJhbK8Sjbx1EMvBuYsGI8R0-LBgMxRJoARLzvYWT-GkLWgPlHv4pbUEeAczwkV5MacW1HcmHcjTTA301EbWuCBTA7ig6D5tYAv5QL
-eQm1RDUYGTXm4ad785bKZ6GEw58bNu_V02Tf64iL6W2f0hPM06iLfcuP8BgoD2pD0GueIO4iLK8Y16ChgGkGD4nthsiLR88qR6QzFhbMOVhhzgtS391Atroh
-x8MgyzLofVrHbQzA_P2AyOd4MLOy4WEtJ_r3S8ruxaiLEh1YYfgvcwdCWLVV
+sprite $AzureSqlDataWarehouse [70x70/16z] {
+xTC7UhCw58JXEML6sl-AhqHGYe9v3FBz-vTcsaixmU-HOJrZhOd5M7jhJjPHYKLZE8uRHQbJkknugGV9reqUyMocUb8-FI3dvPBnz6lF-bp5LutprnxrMZ8S
+LAyMlxgIRDMMU5fj5ROSZohpEOvt4Ne_Jl5Uh2gKHDgYebSfbDOLQbqXzHAbP__Vl2YM5Je0ZsmnM-4Fb74pnYrCHSx5aJ96nOvcnfZVenygb0nsD3Dvt972
+eV2hullzi2U9lVsUV5P8RShuW14DyDGKimivAM-dCTZuW95ge6MHt05c65gkMOajuEF3Xr9B6BuLr3VbSQgzml11cNbIlLdnBM3-C9GHDJfIEEPbVF2t3xEY
+MJcVEkz_Bolpr7b7T5dPvsLyy8vSLKYzAUE3axggpF_JNUdjId63bMOuB2IbvQHO2oTr1V0mLM9B2WnbwamHhFO0IWw_frJ0snysJ29mKn40RqeqHJUL7e4a
+VELQUeaeW1QUIq44a4s2MQS2PXPN5GSi-tqPMbIWTL7vt2PGUtSLIQJMbO_MbNyANwBuYM9uEY-F5CULiXmfWQjPwel2CDpCt2FStV0dzny
 }
 
 AzureEntityColoring(AzureSqlDataWarehouse)
 !define AzureSqlDataWarehouse(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSqlDataWarehouse, AzureSqlDataWarehouse)
 !define AzureSqlDataWarehouse(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSqlDataWarehouse, AzureSqlDataWarehouse)
 
-sprite $AzureSqlStretchDatabase [70x48/16z] {
-hTG7ikGm24LHGCIt__rEw51Tha5kupzd0LTPT6AfHrPLfQlG7Qo9WzHvmml_g6772gsOJ2ImatmvajXBkgY9p1UbMJYZz0Mp23CHyRB4Hj6Mg7-cyBnah3MQ
-Z7W16MQwrb8rYmBAXVfExeua5jC1Qm31_N59Cv522ZKaKSBTRBmzLw6M046vMPAegGgz0LZKKg3Q2ZGA3sMVIcd_bewLNigx0fGVjvUN5t2bWdfay5OP_bT4
-uk5OgMs67vL6Kp7TTM9I8Kdqrg0YYmAjd5HWj5cLJ2e8bZQZemfAsbNvjuhQovBN9jkyiZxiVQwhcifK2YUEZ31MIew3HRZ1Zwig8lnyCdwdKiB7uvORbMIf
-wMlyME_fQur_1eyNbVvyKCOqVG6StMxFNsD71fN7bhJYUaN9iL6NAyI9YRwo2Z-l94xanSgvLV-XOXGu4LJuAeI82rl5Ay-5AzDVxBk6qmHRi_eqfYbU5bbu
-g0nRmyHl
+sprite $AzureSqlManagedInstance [53x70/16z] {
+rT87jgKW383X9BHWtVzkXtYF72dXgjF_rtr-5WWKEOxVOe-bAOZE2kNYlRnoet5N5FyqccOr3KtRFcZge_IVRQnQjEnxi6vLqTf3wpvRQrb5solq_l7UByJx
+9N-_kUF-2JHfwMZTzLO5RVkmBfhJSHTqkVp2WPqI2ay7TdFMBOy7TbksfmCxxwDcRNENLMkPNetHVuf62xueQDr7RTh0pY7ADsE8ZFLBgUR-x2qsHPV2hO6b
+Eluwi0krcMqui5CsPUledG8fRNdDMqH5-EcZjcsTOm-Pgu2SCADDXByOI1KiAAYyJHbHWp15kf68IvJFLuraCsg81Dqeevv1w9THPL029SwekOLUE17ghwAZ
+rk3b4V4yL22idyq4bWAa73CxI37ZzPsmCiISaMV9GqPHGPPTtaiE11JOP0H8Nb3zHexjYJoRW_gC9DD1nEozTt9EO9835HA5zHPPbWAf27oB08qnNixq2P7r
+3Q88tPqb3l9wxhYlgn14m1AHCUUTYDcv4zbqz8GCK3wVuwD0-VN4yv7DTwfkPRta42HotZdl0FoHWIDCA2k4Uxa8ZnN524yLig0Zn7iCRJ9StDXBOH17oS0r
+m_5xRE47
+}
+
+AzureEntityColoring(AzureSqlManagedInstance)
+!define AzureSqlManagedInstance(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSqlManagedInstance, AzureSqlManagedInstance)
+!define AzureSqlManagedInstance(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSqlManagedInstance, AzureSqlManagedInstance)
+
+sprite $AzureSqlServer [70x70/16z] {
+xPS7SiKg34MHK0FlVxy_t94hRvxjtzj9mumvH19eal9tXtY5og-0guYg7C1ZVIwZkgsVKQbF7Ano2zquIEKHhoNlDV8O_lqiD0SpHQG_sCfuc2AgayMEYL4p
+_u3PgbhNNEafPbNpRvYkbLQVB4kNabJzujZpgks3PLcS3XT8rAxXI3rS9_RssR9qlnQG25UHhjLWQ-sp1OHIkOCbMljY0SqgVRkgKDnPG0zJuQECk8fw0tUM
+cTuZeasyiO06_YEM_ot_MxeBSnNhwT3Al5ra5n5_O0dA2OTIIY9jOEYKjvPMG5eQbOtwmY9egIsKVYoTiLm5F_MvPRmVYAKl2zv2HWIZLnPVJWzjC8RwAYAA
+hDOOzsLBQtsPNOOdnieyBsDCZop02v1CYnmivPa5DCOpzyb2Jot0uL54n6dnCNvZoHDBo6x9x8uPkLXYjLI-M7fM1pCL8MrfyPCbt4mB96R69qkrdjMXyMDe
+eZKd17Iss0yuwcDGBwUEgc1AS7e6L430iYAmc8ZO9qj2FHEKaBUJfJRRc2BITQj-h1VYUcW1FTmy-kaF4TG7n8xR2Rhjc1Lxx_Z0W5HH3BHM4VfcQOmIhSGb
+3b9BvAibKEb8ongBUqd4ac-MtFvg2LY0tbkkfCRRRc43zCAIce0bGOAflBBWhBIZHP7htyD2BotnU_mkaCnvCNvZ2PjgL0rmVswnwRoG9V7SuhPobLXz6H4G
+6WxP9SLUP7TWPuI86OtfYMME2noRuWkBqjoa4hB-o19AvMpXSaAytrZ2wbuO8jB90gfwcorf43us0qeTn1Fvht14QtsKnDrKAbysMplcBla5
+}
+
+AzureEntityColoring(AzureSqlServer)
+!define AzureSqlServer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSqlServer, AzureSqlServer)
+!define AzureSqlServer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSqlServer, AzureSqlServer)
+
+sprite $AzureSqlStretchDatabase [70x70/16z] {
+rTTRUiCe38RXNqX22FQ_tnaJaSHJY5qxStflUlwU85jkY_y9elH4XDz9p2AgAdlnEKvq712LGwh2M8d2IIgOM2VM27kaSWLZHoxwJeNGqUf4skMW3wiJ2OA4
+_gEsr8lZMnCU4cKCl0Nib9uYXCJ8dl2KH4z5X0bFQW3LQWblAB6i3fNrnmP8SGPWhJNFQRcCpBnSHyxkNlefMkUP2R-H97kds7WRt2ITIH6h-HDXessdkgam
+JtAKc4Mj-8wXexPGwtRgOcRbJxuWUF3saNz6KSbtAeQGxbGKGxrHOGpbHWLF-Ngbu4ckLpAUqlMAueckLnWlzN8buSKlLmWlvN85R-ngfG3p6wPet_yOLJLb
+bZn-I5NjHANo-wTgHj3dwibnfIQ47Cc1fnN36sqX0w1SJ6ch202a-BMXvoiyHbszjV9uJUDvLeugULy9ykYFcqjFpqK1K8aPnLqzbYuTLQm5ZqdszsDFntVJ
+KQMqmT19VOo5ezBhaufZlaSbOPFgkGejThfQ_ueiJxJSwRPJfN-kJzTNqmqyUzRLzwiZZuVfUE5vLj7PSrUilYhz0cXrxxCYdrNoR1aP95afvghOf8IDHGMq
+6Qqokz2CmMD0GzxVyCd3x1BfyvjQPuIEpHSLtWqtLCkgzdx_P7uDezZJZ_5g-yYt3Fk2uUpVBocEC4Neg1vL2csPubDoSA0GJssrZqVoeye1YYjqfn97ihkL
+4hEzLt6EsTwh6AZUhpZdzeLAaMzKx1jpAGImtwnaTE8tAZbXOAkNAaK9EvpzbnKJMlqZLqzLB4l2Huar5wzrLYcMLPZmLty
 }
 
 AzureEntityColoring(AzureSqlStretchDatabase)
 !define AzureSqlStretchDatabase(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSqlStretchDatabase, AzureSqlStretchDatabase)
 !define AzureSqlStretchDatabase(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSqlStretchDatabase, AzureSqlStretchDatabase)
 
+sprite $AzureVirtualCluster [67x70/16z] {
+vPJPsgCW3403942GvVsVTfOsdrG9bD-vd7EfSin602ZoXEWD_CK6dX4G008lY1O07A_mGBma01XUuoAlCHB47CzlShcH4x-mWFpY63uv9D3twwQGts6AehIH
+chgYjPfhktE8GWmbZuvJaLibfAn-88hM634eVn55QGaHOxlJ5QarGiIY9IkA0n5vhV28L5M5L9Cf3E_B9P7YQQnwEijPcqOInQHd4eGekEWT4yNCaMKkX7I3
+1L785zedWTU8GcUk2EWw1gphKDXH10ihN9mfqY4m05Wtmm2OyzFqgKYzgmvCM2uOy9V1wTUiYUG0a4ZdZdfro3Lh0Uar6_vh0ooaSJhbZiHt7fxN88Iko8h2
+WYoXSURBktm4Nb588gAONuaqA99IJb6qLa8S0gbtHL6QAegZLTAMLBegYZfQvgN8hI0YJHIeZLO798f6iqr8O5cOAcIbfx6avIUAr1Gg_qJ1ATSxcVSLC_vN
+HIh_MixKDFZnQDKKlFU1QnaKUmCU2Kzyt5RqQnRn2kqf-cKlX2Dx2bav1sgO7OKilemwxhj2rcyPZg8GTwVpUjmABy-cWZI1I6XFWHrx0_6B8dhIS-WWhHG6
+xrW5_5JS76xBO5ta4nAVW0FEgWG-iU3vKpXWTNen402S3m9j71PGZdWB5zG4T0oes5a8-metYs5VeGJnN66_AumcCViAqImLJnr3CVSTpnLstjJ72jCLppDv
+7iNpC630FktgSmS8UYxxGJmFf0j-0m
+}
+
+AzureEntityColoring(AzureVirtualCluster)
+!define AzureVirtualCluster(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualCluster, AzureVirtualCluster)
+!define AzureVirtualCluster(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualCluster, AzureVirtualCluster)
+
+sprite $AzureVirtualDatacenter [70x70/16z] {
+xTK7akGW44JHCfc0xFrlk-DdX8es40gx_GxmSHB88se02BZ9A7KUm8OQu0bKUXaRNFg0JT2HIAGZaKYUvRm3yXpbNTwxdlwjCGS_07m08riHTJIwTmRi0ucK
+tIw9q4A5LrJ00L2f64UvXVKCWOMf345ZLm1l01vbb0TmCaNqHndZWQUfAJswRhogb7QbEEynGQYqtA_WaWgDeR9kwtwmFL7nC9Tb8z8nipwkC5Is1S1QJUPn
+9PpHEZ8N2_koRSlMkI-KU4PpPNggWWjEcc9FLk1c-ixC7V4VE5VcjVAnfApn0JozArPNvdtAytwmP1CHjPyP0FuPzVh1HNtI2y3Z8HKHHJgXYMXzKzsjR2AQ
+6bp4gxTVxwre4R7K017KhwtMkxiThBE965jJqNH-RF5J2Khwtbp-f0XJ4T6Smujjjok99e6ob8-AIyr_A_DHIHzWAdyCkRpBX3RwrlWRr_I31CYKouyiROsR
+OKr7vIX9MxYbEYgNpoNUtij89IZ_U-LLULLUbNn9nKfFXNAB1hXPaHxMhYJfP0WLgWnGSv0VbPpfvyGR
+}
+
+AzureEntityColoring(AzureVirtualDatacenter)
+!define AzureVirtualDatacenter(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualDatacenter, AzureVirtualDatacenter)
+!define AzureVirtualDatacenter(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualDatacenter, AzureVirtualDatacenter)
+
diff --git a/dist/DevOps/AzureApplicationInsights(m).png b/dist/DevOps/AzureApplicationInsights(m).png
index 4ea6ab95..368e5a92 100644
Binary files a/dist/DevOps/AzureApplicationInsights(m).png and b/dist/DevOps/AzureApplicationInsights(m).png differ
diff --git a/dist/DevOps/AzureApplicationInsights(m).svg b/dist/DevOps/AzureApplicationInsights(m).svg
index b09c612b..22dcac9e 100644
--- a/dist/DevOps/AzureApplicationInsights(m).svg
+++ b/dist/DevOps/AzureApplicationInsights(m).svg
@@ -1,10 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="45pt" height="70pt" viewBox="0 0 45 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 57.679688 22.960938 C 57.820313 21.558594 57.679688 20.578125 57.679688 20.441406 L 57.679688 20.019531 C 57.679688 9.238281 48.441406 0.28125 37.101563 0.140625 C 36.820313 -0.28125 30.378906 0.28125 30.378906 0.28125 C 20.160156 1.539063 12.179688 10.078125 12.179688 20.019531 C 12.179688 20.160156 12.039063 21.28125 12.179688 22.960938 Z M 57.679688 22.960938 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 15.269531 54.804688 L 29.828125 54.804688 L 29.828125 59.515625 L 15.269531 59.515625 Z M 15.269531 54.804688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 29.695313 64.632813 L 15.269531 64.632813 L 19.769531 69.613281 L 25.195313 69.613281 Z M 29.695313 64.632813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 15.929688 23.84375 C 14.738281 23.84375 13.546875 24.917969 13.546875 26.265625 C 13.546875 27.476563 14.605469 28.6875 15.929688 28.6875 L 18.3125 28.6875 L 18.3125 26.265625 C 18.046875 24.917969 17.121094 23.84375 15.929688 23.84375 Z M 15.929688 23.84375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 28.371094 23.84375 C 27.179688 23.84375 25.988281 24.917969 25.988281 26.265625 L 25.988281 28.6875 L 28.371094 28.6875 C 29.5625 28.6875 30.753906 27.613281 30.753906 26.265625 C 30.753906 25.054688 29.828125 23.84375 28.371094 23.84375 Z M 28.371094 23.84375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 44.652344 20.34375 L 44.652344 19.9375 C 44.652344 9.167969 35.652344 0.417969 24.535156 0.148438 C 24.269531 -0.253906 17.914063 0.285156 17.914063 0.285156 C 7.855469 1.496094 0.046875 9.976563 0.046875 19.804688 C 0.046875 20.074219 -1.011719 27.882813 6.796875 34.476563 C 10.371094 37.707031 14.078125 46.324219 14.605469 48.746094 L 15.003906 49.554688 L 29.5625 49.554688 L 29.960938 48.746094 C 30.488281 46.1875 34.328125 37.574219 37.769531 34.476563 C 45.578125 28.015625 44.652344 20.613281 44.652344 20.34375 Z M 28.503906 31.382813 L 26.121094 31.382813 L 26.121094 49.015625 L 23.476563 49.015625 L 23.476563 31.382813 L 20.960938 31.382813 L 20.960938 48.882813 L 18.3125 48.882813 L 18.3125 31.382813 L 15.929688 31.382813 C 13.285156 31.382813 10.902344 28.957031 10.902344 26.265625 C 10.902344 23.574219 13.152344 21.148438 15.929688 21.148438 C 18.710938 21.148438 20.960938 23.574219 20.960938 26.265625 L 20.960938 28.6875 L 23.34375 28.6875 L 23.34375 26.265625 C 23.34375 23.574219 25.726563 21.148438 28.371094 21.148438 C 31.019531 21.148438 33.402344 23.574219 33.402344 26.265625 C 33.535156 29.09375 31.152344 31.382813 28.503906 31.382813 Z M 28.503906 31.382813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 27.71875 55.160156 L 42.558594 55.160156 L 42.558594 59.921875 L 27.71875 59.921875 Z M 32.339844 70 L 37.800781 70 L 42.421875 65.101563 L 27.71875 65.101563 Z M 32.339844 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 57.679688 20.578125 L 57.679688 20.160156 C 57.679688 9.378906 48.441406 0.421875 37.101563 0.28125 C 36.820313 -0.140625 30.378906 0.421875 30.378906 0.421875 C 20.160156 1.679688 12.179688 10.21875 12.179688 20.160156 C 12.179688 20.441406 11.058594 28.28125 19.039063 34.859375 C 22.679688 38.078125 26.460938 46.761719 27.019531 49.28125 L 27.441406 50.121094 L 42.28125 50.121094 L 42.699219 49.28125 C 43.261719 46.761719 47.179688 38.078125 50.679688 35 C 58.660156 28.28125 57.679688 20.859375 57.679688 20.578125 Z M 57.679688 20.578125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 42.558594 25.339844 L 40.179688 40.179688 L 37.378906 40.179688 L 37.378906 25.480469 L 37.519531 25.199219 C 42.839844 25.199219 42.140625 20.300781 42.140625 20.300781 L 27.71875 20.300781 L 27.71875 20.71875 C 27.71875 21.839844 28.140625 25.339844 32.621094 25.339844 L 32.621094 40.179688 L 29.820313 40.179688 L 29.121094 36.679688 L 27.300781 25.339844 C 24.078125 25.339844 23.101563 23.238281 22.679688 21.699219 L 22.679688 19.738281 C 22.679688 15.820313 27.160156 15.398438 27.160156 15.398438 L 42.558594 15.398438 C 42.558594 15.398438 47.460938 15.960938 47.460938 20.300781 C 47.320313 20.300781 47.460938 25.339844 42.558594 25.339844 Z M 42.558594 25.339844 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureApplicationInsights.png b/dist/DevOps/AzureApplicationInsights.png
index 08dd92c3..30b3c3c2 100644
Binary files a/dist/DevOps/AzureApplicationInsights.png and b/dist/DevOps/AzureApplicationInsights.png differ
diff --git a/dist/DevOps/AzureApplicationInsights.puml b/dist/DevOps/AzureApplicationInsights.puml
index 1033ae9e..9bf0aee6 100644
--- a/dist/DevOps/AzureApplicationInsights.puml
+++ b/dist/DevOps/AzureApplicationInsights.puml
@@ -1,8 +1,9 @@
-sprite $AzureApplicationInsights [45x70/16z] {
-vTG7jXiX38NX2vBGbVQ_tnJZa-01pKkldyjfFvfn0RpgEfoC2D9D6sfzHBwYjI9bden3tZmBOTlOo1eRLXfv9_hQvgQi9JTbtIBVHapCBp4EDrph013vPLWC
-BaSplzH0ooyMqFnoVUINCyylDvXVpYE_7Byz3XEnoCbLrElOyV0eGlPTmMKjiVmDzR0lXkKd0aY4038NUdW3-3dGPPVCRH0Do3HWp3_nCgqZyYa0ULuWKkT8
-hlV1EM1gSuFfZ1zJR9riwmvKe3ifmEFDILitNG3BqcZOQIwprhNiUnlvvDlHvQRQ0DKEYAenjyjghXI8DC2B8qdBU6y1AUEz1RICznQmcrXmnJ8UsBGeui21
-5R7W98unSQJ7kECi3h6ZO8Uuen9RJ9J65WjAxHe7Rl0I3zomIznnev5qTzB78EdulnbVuDR8LVoUUB_d_rkFN0ZkoL8hAlj9RNYRbITjNJjsxm4
+sprite $AzureApplicationInsights [70x70/16z] {
+xT97ccCn24NXguZWiV_jTcuP76Iagg7_KSNpWH4MSkr4Op0JzPfneX2BHnMRwanOtB2XiBp05L5T5YWXPCWIvsWadeb7zZCa0OorAY64bSGIKmvlx8tLAE8S
+3jCaZ4wlxANOGjIgqxfODNBc_cxZlhhG-czAu4eaq_i_uVSVBWUMNbJSkDt9RgLuvSaxQpiLCT-x1p825Pq8lrGr1dufEbrueUbDcp-maSl-u8MYXb01KBl-
+mYK1YKIDZbSkjGY_PBEVa_0AgSM-qkz--L9Iw_ALeLO1WiCaLv7WAFT_Mbn5hOoLh4OpbVlVh3Mz8LkfxWKk-LEmhVHun4zpsSfmaPsChV1Mn0wVJUKoQyRm
+FCMifFzR9aIbI_-WMwNuDxlpqSYjqcRN2Ur4DFxKY6HURKDHnxtP_M4ymQOI76L_c0lRgZxes2U7etXTxmmSo7gdu8GSBkJbvXHyfu_g51n9xD2dya_sy9q-
+gfDn9Ws-wJYLHoGIpn2-8iSYFm4
 }
 
 AzureEntityColoring(AzureApplicationInsights)
diff --git a/dist/DevOps/AzureApplicationInsights.svg b/dist/DevOps/AzureApplicationInsights.svg
index 531a07cd..1ac80ef6 100644
--- a/dist/DevOps/AzureApplicationInsights.svg
+++ b/dist/DevOps/AzureApplicationInsights.svg
@@ -1,37 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46pt" height="70pt" viewBox="0 0 46 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="46" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.65098;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="46" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.539063 49.296875 L 23.75 49.296875 L 23.75 31.515625 L 21.378906 31.515625 L 21.378906 49.15625 L 18.59375 49.15625 L 18.59375 31.515625 L 16.222656 31.515625 C 13.433594 31.515625 11.066406 29.136719 11.066406 26.335938 C 11.066406 23.535156 13.296875 21.15625 16.222656 21.15625 C 19.152344 21.15625 21.378906 23.535156 21.378906 26.335938 L 21.378906 28.714844 L 23.75 28.714844 L 23.75 26.335938 C 23.75 23.535156 26.121094 21.15625 28.90625 21.15625 C 31.695313 21.15625 34.066406 23.535156 34.066406 26.335938 C 34.066406 29.136719 31.695313 31.515625 28.90625 31.515625 L 26.539063 31.515625 Z M 16.222656 23.957031 C 14.96875 23.957031 13.855469 24.9375 13.855469 26.335938 C 13.855469 27.597656 14.96875 28.714844 16.222656 28.714844 L 18.59375 28.714844 L 18.59375 26.335938 C 18.453125 25.078125 17.476563 23.957031 16.222656 23.957031 Z M 28.90625 23.957031 C 27.652344 23.957031 26.539063 25.078125 26.539063 26.335938 L 26.539063 28.714844 L 28.90625 28.714844 C 30.164063 28.714844 31.277344 27.597656 31.277344 26.335938 C 31.277344 25.078125 30.300781 23.957031 28.90625 23.957031 Z M 28.90625 23.957031 "/>
-</g>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="46" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="46" height="70"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 24.867188 0.15625 C 24.585938 -0.265625 18.175781 0.296875 18.175781 0.296875 C 8 1.554688 0.0546875 10.097656 0.0546875 20.035156 C 0.0546875 20.316406 -0.921875 27.175781 5.488281 33.476563 L 35.597656 3.234375 C 32.394531 1.277344 28.769531 0.15625 24.867188 0.15625 Z M 24.867188 0.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 57.679688 22.960938 C 57.820313 21.558594 57.679688 20.578125 57.679688 20.441406 L 57.679688 20.019531 C 57.679688 9.238281 48.441406 0.28125 37.101563 0.140625 C 36.820313 -0.28125 30.378906 0.28125 30.378906 0.28125 C 20.160156 1.539063 12.179688 10.078125 12.179688 20.019531 C 12.179688 20.160156 12.039063 21.28125 12.179688 22.960938 Z M 57.679688 22.960938 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 45.355469 20.457031 L 45.355469 20.035156 C 45.355469 9.257813 36.15625 0.296875 24.867188 0.15625 C 24.585938 -0.265625 18.175781 0.296875 18.175781 0.296875 C 8 1.554688 0.0546875 10.097656 0.0546875 20.035156 C 0.0546875 20.316406 -1.0625 28.15625 6.882813 34.734375 C 10.507813 37.957031 14.273438 46.636719 14.828125 49.15625 L 15.246094 49.996094 L 30.023438 49.996094 L 30.441406 49.15625 C 31 46.636719 34.902344 37.957031 38.386719 34.875 C 46.332031 28.15625 45.355469 20.734375 45.355469 20.457031 Z M 45.355469 20.457031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 15.527344 55.035156 L 30.300781 55.035156 L 30.300781 59.796875 L 15.527344 59.796875 Z M 15.527344 55.035156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 30.164063 64.976563 L 15.527344 64.976563 L 20.125 69.875 L 25.5625 69.875 Z M 30.164063 64.976563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 27.71875 55.160156 L 42.558594 55.160156 L 42.558594 59.921875 L 27.71875 59.921875 Z M 32.339844 70 L 37.800781 70 L 42.421875 65.101563 L 27.71875 65.101563 Z M 32.339844 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 57.679688 20.578125 L 57.679688 20.160156 C 57.679688 9.378906 48.441406 0.421875 37.101563 0.28125 C 36.820313 -0.140625 30.378906 0.421875 30.378906 0.421875 C 20.160156 1.679688 12.179688 10.21875 12.179688 20.160156 C 12.179688 20.441406 11.058594 28.28125 19.039063 34.859375 C 22.679688 38.078125 26.460938 46.761719 27.019531 49.28125 L 27.441406 50.121094 L 42.28125 50.121094 L 42.699219 49.28125 C 43.261719 46.761719 47.179688 38.078125 50.679688 35 C 58.660156 28.28125 57.679688 20.859375 57.679688 20.578125 Z M 57.679688 20.578125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 42.558594 25.339844 L 40.179688 40.179688 L 37.378906 40.179688 L 37.378906 25.480469 L 37.519531 25.199219 C 42.839844 25.199219 42.140625 20.300781 42.140625 20.300781 L 27.71875 20.300781 L 27.71875 20.71875 C 27.71875 21.839844 28.140625 25.339844 32.621094 25.339844 L 32.621094 40.179688 L 29.820313 40.179688 L 29.121094 36.679688 L 27.300781 25.339844 C 24.078125 25.339844 23.101563 23.238281 22.679688 21.699219 L 22.679688 19.738281 C 22.679688 15.820313 27.160156 15.398438 27.160156 15.398438 L 42.558594 15.398438 C 42.558594 15.398438 47.460938 15.960938 47.460938 20.300781 C 47.320313 20.300781 47.460938 25.339844 42.558594 25.339844 Z M 42.558594 25.339844 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureArtifacts(m).png b/dist/DevOps/AzureArtifacts(m).png
index fbf85a16..4dbf9556 100644
Binary files a/dist/DevOps/AzureArtifacts(m).png and b/dist/DevOps/AzureArtifacts(m).png differ
diff --git a/dist/DevOps/AzureArtifacts(m).svg b/dist/DevOps/AzureArtifacts(m).svg
index 4ad03b2b..c22e12c9 100644
--- a/dist/DevOps/AzureArtifacts(m).svg
+++ b/dist/DevOps/AzureArtifacts(m).svg
@@ -1,63 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65pt" height="70pt" viewBox="0 0 65 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<image id="image22" width="65" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAABGCAYAAACT8vn9AAAABmJLR0QA/wD/AP+gvaeTAAABZUlEQVR4nO3ZP04bQRiH4WeWDSi1hYtIQME5XEXKRaDJIVLlHFwEU3GKlIgSKWkt2xsNNWhJNivjP9HvlbaxdrzfPhptM6SUUnpRGXpjXcwutD9ulDLj5/F7DjW8yUpt73Vfr8rHb49j/2U4wvr0Tvn1eeyD3rV6Ni8fHr6MXT4coZsu92cHvG6yKu3TydjV/4BwVMc+ZBuV9vfgd3lds8lBDrUgCAKCgCAgCAgCgoAgIAgIAoKAICAICAKCgCAgCAgCgoAgIAgIAoKAICAIoKmL2UVdn97Vbrqs3VF969r1oH/rT7PXbrqs60/zuvh+3re27PVp86Z74/S67Pdp86brP70uh7DVN1nf6XU+jIKAICAICAKCgCAgCAgCgoAgIAgIAoKAICAICAKCgCAgCAgCgoAggIbJatdDbK/psu/XRm3vtz3Kzqonve/a6C6v1bP5/70jJiv18lZ3db3rSVJK6SB6BhRMdpsTsx78AAAAAElFTkSuQmCC"/>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<use xlink:href="#image22"/>
-  </g>
-</mask>
-<image id="image9" width="65" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAABGCAYAAACT8vn9AAAABmJLR0QA/wD/AP+gvaeTAAAGDElEQVR4nO2aTY4byRFG3xeZVUU21expDXoxgldaCj6EF76C7jP30RW88AW8G2hlaGvAgmfUPyTrJzPCi6I0sM0Z95jqhhf1AIJAAcyKfBmZlZVBcYLvweAPBh9tyzZNWHaUNyhXyE6fR1KCaolGlVB3qqGvyAAkFJUpIHml1g2rkqDsiGJEafByx12FG4c/+/fgj2k7n7r4hrd6z3uDVc54dsYWVu2O0rZ4O0EjPBspBcUasiZCX7PT/06DolIikdzxmqEcGCZho5HGRD9msrZsueMjb3gb8O5RbZ+U8Cc+2CtuDA55pLSVvBJlLWwV5BXUTtAEkUVKBZc9sYSCwkgReBUqgaaWNBSiF6WvZBspPJCBm3jPx0dlAfyChFf02jClxCZD243UC5E2wjcF2yRYVfRFhIECnlSCQQQRoBIwJWIoRA++q1gOqhra2IJXfqw76nkS4MYq9zkoLTQrkTYJto62wGVFG4NVEG1AAyY9sYRAEXgIJkNjRT2wA7UJUiVRUIWpOk2Fl/WxbZ+U8B339g9ShrZN+Fr4JtCV4BriCrgELgKtBDnwJOwrdfc0gSNUA4qgF+wh7oFGBCKqSFOlm1rq2HP/6IBOSvjEKjVEKtTWqStIm8C3wq7BX4KuHL0wYhVEK2RBfLUOn0IICDc0OupFPEB0YFbxCjY6pTfyoaJ8Q3+ehKA3Z5UNbwRrx18YbAO/FvpW6Dpg68Ra0DJP2SedDvOygzsxCu2F1jFnYQhGiL1gH/guSLny4lwJa4NDhtQa1hl2AX4JugK/Bn0rYgu6mEcDAz2xBAJwoQFiD2rnSzZB7A27AzoRzcCYWqbzJHRUDTQGked0986JC8EmYAuxDfhGcAEcJTztwshRAvO+qQmCgEnELoiLwFcQbYUmkVJH9+h4Tkq4o7MrdjaSUxAZrBXeAWtgPXdeFxAb0DNKkM8xCxFTwH6OR11gLXg2lJxin/DzMuEF0JPNMDM8OZ5F5EAN0AbRBXSa068LSF+nn7+OoAYiiHKchi3z0yHHFwFmhUbXlEe3e1LCSFXGJaTATZiY571pHvWkueNpFqCnfT4eOT6BjvdW0jEmwD7HakiZUE89bzr8580RhAIk4qn3Rb+B0OfYQP/zyvwsI/j/ziKBRQKwSAAWCcAiAVgkAIsEYJEALBKARQKwSAAWCcAiAfgvr9KGIlCU+W06NJ/sHD9yiM/fzxPtl/v/fG8hjzmASHOM8VvjOSmhJcWEhVA47iJViDJXf2IyNAYxzL8PnutQ5djxAWIQjE5MQkVzbLXibuQoKC5JjzbxCydLKUTxhNUgFYdJaITohQ7AAdQcBRSebVrpeNCqPcRhjiV60BgwGakkokLx8XwJ++hIHng16lSxQXAItBfxENAGIJgg2mfOhDHgANwBD8eYDkEMhk8BVWQfuD9PwhWdO7vqNBPYkODA3PnbIFqbq0FjzCe9DcSzZcLxmP0geHDiE3Ar4iGhQ2BDoKmh1vbcTLjl4A1eVthYqH3Fdhlu5ykAECPoQcQKaOLpCy8AiIg5+9QfCzC3oJ+A24J2Ce8zNgZTGdmcV5CFtYvbMlLGDHvBfeA5sON5v/bMNYg2UNaTl+BmAsW8CDLGvB4cs9M/ZdK9YD9SxgYvwf15pfktQxVXE9RhYjxUSIlEgsI8H9eOOqHG8BTzkfyTY3gEVudFMIZ5YdQO0n2FuwSHFc1wy6psGc6TkPnGE4dyyzCuSPsMMVKPdUB2c7UnWlAKZMKfLRMAh6iORuEj86J46Eg7sMOBYYSLks/9p8oP/N1fcVnWNOqZCDo3oojUG/FQiAYsJ9zA7ZHli7MRBTAvmEOURJocTUEdDuRBDGOiGYHyI7+r8NdHtXsy+j/y2n/iA3/jEmjiCmplPzm1dyw3xz9sBdkq0vPtGBMJRaa4yF6pVXhp8JJYlVsuClC+475e8/q8p8N73sUb3vpf+MDvuY3CTQ2mac86wWAdLxRgLcNzbRD+hXkzZz6wD+h8w1CDwV/y0X/gyt/w2t/z7rlGZmFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh4Vf4JwqBKKP8sSATAAAAAElFTkSuQmCC"/>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<image id="image15" width="65" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAABGCAYAAACT8vn9AAAABmJLR0QA/wD/AP+gvaeTAAAF20lEQVR4nO2awY7juBGGvyqSkt3t7p7ZSR8yxxwzL5GXmPfJ++zzbI57CpJDY5D02JYskazKQereYA/ZbDRubAB+AGFDhi3qIyna9RsajUaj0Wg0Go1Go9FoNBqNRqPRaDQajUaj0bgWsuXNfwb9gc/ynh+151kjjxo468Q+BCbdUUXY60wVgLtv0uX/zHF97Ah+4ewPJIPe4GSwM7gzeDJ4tB949E9875skfOZzeM+P+pG7AE8RUoQQz2gUppgIQag6kTSw7Vy/hoh4YXYIFkg1U6pRy4FaRna1ksuB7+qLjLjlZJ94ErgLA39PgYdOqJ1ReyH3kS5VcgKNERRcv9VF/hIzOKgpWgulgMw70jySsqHzgdv5C2OJ3OcHntgk4Qt/DR/oY+ChU6ZdJewduYW4L+R9JHQVOqEGUPU3mg0KJmgFKyCzwuTYGKiXRBozQ/hAnCDyzP02CZFH/SdjvKF2M3IT0INS74E7J9watgftHU2OBN14D/rvMABzvACzwOT44MipImejJIEwkKUCiZ1vkvCRs55J8ULtE7p36n3F3yv+zuFB0INge6ATiPYGEgQcMEGyI5PjI/ixInsIXcVDwHDUA2bK17pJgnGnZ+YYKV2Bm4DcKf5O4HeCvjfsAbgRZOeQ5M0kiDmWgRHkLHAjWCeIghCI1aEINQsxb5Iwcg6CRaHrlLJz9HadAe8NexT0neMH8L0gCbj6zdHXmQAygw/A0Zdzy3LcSkFnwSbBJyFMmyT0VMnEUMnJCb3A3uEA9rAK+A64X493vIEEXpcDkyGDIN1yiOL4BIyKDYb3Dikuu9f/zsRBhLMGQjBIQK+wB27ADwL3jt+D3AC9v4GEZTm4OUwCCRxHsi6z4saRnSBdoKaKRii6SUJHlTNJIwSo0dEEdI7sgP26DG7Ab0F6eSMJvmwR0QGFvCwL3/vSh84gKRKNGoTdNgkzVQIuCmKoKhIqREEieALpHHqQtV3/C5MvD1VelwA9y+6UgOQQBYuGBkF0om6T8ILh4suNZ22uLKP+b+312JvgSHAIAuHn/RBUBBfDNCDyTST8H7AO0jJYL89fXnyzkfkt0yTQJABNAtAkAE0C0CQATQLQJABNAtAkAE0C0CQA31iCIL7+PHNef9r/Jlj79FP/BHnt38bKUvBC9XkpFphjDmLgxlLdqbI2R+rWK/kVVMEr8NLW/oitlWh31EGtIttyhyOwfNhsglZHC1hxyCDzUuxkYpUtoH7lsvtLeW3JHJiW9InZ8bz0i+JoUaxWzHrStizyntGeCaaENfJidmwSdHRkBB/WshbLya8vgdeSO5PA2WFwZBQYBZ8MmcNSdyxKqE7eJmEieCC9hp6KXwwdlsDDv4Ikx1HIvtYY3yCAcRBbLphBkK+Cf3U4AwP4xfHZIC8D122TAL1l5vpT6MkAfpSltJ3AEXz2peT+kju8yUxwmGUNX0D+Af4syNHxs6HjGr5kx8pGCSczQonErPjoyNnQrwLdWsMrLFNxZ3gH6LX3ZAPATWF25AKcwJ8XEfbsyCnAIOg0U3LaLmFnB7oyMs9OuVTSGbwDC4KYI5PAyfCdQHQ8bL/MX0aQalAUuTgMgh/BnoHniB2NMEC99Mg8MG8LZOHORo7V0DmRxiX21mAoYJllduwEupdA9trJ9Lo7uEA2fF7uAZwVOQl2NORkMFR0Emp+4LB1JjxZJZQDt3NmCALBl/Cngs5g54D0hq2hB6LoVSUs3wHcBUpAc8Un0AswGGEwGBQbnTQFSj4xbp0Jj3aA+oWxfCBOA1kcdYUi2OSEHkgKETQoLo5dVYIusYIrVkEKhCzUSdAJ6qWik5OmwjDfQobHbRKWf3/9xSZ2BSIVCJgtub9PTkkVjYEQAqYVF7vyX3YUPIA7wSpWwYpAnim5R2ah5kDJq4Dye47bJHzie4c/2UeeyjP3nji50lUh5iX311jJwZg10glLbnl1BPHK7EKwQFcdK5DrQCkPHMqJscJj/RvH+kf+YP8CVcosrotFYXwAAAAASUVORK5CYII="/>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,30,-20,0,40,35)">
-<stop offset="0" style="stop-color:rgb(33,160,255);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(61,172,255);stop-opacity:1;"/>
-</linearGradient>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,60,-60,0,60,5)">
-<stop offset="0" style="stop-color:rgb(255,255,255);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(255,255,255);stop-opacity:0;"/>
-</linearGradient>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="65" height="70"/>
-</clipPath>
-<g id="surface18" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 10 7.5 C 10 6.121094 11.121094 5 12.5 5 L 47.5 5 C 48.878906 5 50 6.121094 50 7.5 L 50 35 L 57.5 35 C 58.878906 35 60 36.121094 60 37.5 L 60 62.5 C 60 63.878906 58.878906 65 57.5 65 L 2.5 65 C 1.121094 65 0 63.878906 0 62.5 L 0 37.5 C 0 36.121094 1.121094 35 2.5 35 L 10 35 Z M 10 7.5 "/>
-</g>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="65" height="70"/>
-</clipPath>
-<g id="surface21" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,87,152);fill-opacity:1;" d="M 0 37.5 C 0 36.121094 1.121094 35 2.5 35 L 27.5 35 C 28.878906 35 30 36.121094 30 37.5 L 30 62.5 C 30 63.878906 28.878906 65 27.5 65 L 2.5 65 C 1.121094 65 0 63.878906 0 62.5 Z M 0 37.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 22 35 L 27.5 35 C 28.878906 35 30 36.121094 30 37.5 L 30 61.25 C 30 62.628906 28.878906 63.75 27.5 63.75 L 22 63.75 Z M 22 35 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,63,110);fill-opacity:1;" d="M 11.875 40 L 18.125 40 C 19.160156 40 20 40.839844 20 41.875 C 20 42.910156 19.160156 43.75 18.125 43.75 L 11.875 43.75 C 10.839844 43.75 10 42.910156 10 41.875 C 10 40.839844 10.839844 40 11.875 40 Z M 11.875 40 "/>
-<use xlink:href="#image9"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 10 7.5 C 10 6.121094 11.121094 5 12.5 5 L 47.5 5 C 48.878906 5 50 6.121094 50 7.5 L 50 35 L 10 35 Z M 10 7.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,89,156);fill-opacity:1;" d="M 21.875 11.25 L 28.125 11.25 C 29.160156 11.25 30 12.089844 30 13.125 C 30 14.160156 29.160156 15 28.125 15 L 21.875 15 C 20.839844 15 20 14.160156 20 13.125 C 20 12.089844 20.839844 11.25 21.875 11.25 Z M 21.875 11.25 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,101,176);fill-opacity:1;" d="M 40 5 L 47.5 5 C 48.878906 5 50 6.121094 50 7.5 L 50 35 L 40 35 Z M 40 5 "/>
-<use xlink:href="#image15" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(61,172,255);fill-opacity:1;" d="M 20 35 L 57.5 35 C 58.878906 35 60 36.121094 60 37.5 L 60 62.5 C 60 63.878906 58.878906 65 57.5 65 L 22.5 65 C 21.121094 65 20 63.878906 20 62.5 Z M 20 35 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 22.855469 65 L 40 65 L 40 35 L 20 35 L 20 62.390625 C 20 63.832031 21.277344 65 22.855469 65 Z M 22.855469 65 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,114,198);fill-opacity:1;" d="M 31.875 40 L 38.125 40 C 39.160156 40 40 40.839844 40 41.875 C 40 42.910156 39.160156 43.75 38.125 43.75 L 31.875 43.75 C 30.839844 43.75 30 42.910156 30 41.875 C 30 40.839844 30.839844 40 31.875 40 Z M 31.875 40 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(33,160,255);fill-opacity:1;" d="M 50 35 L 57.5 35 C 58.878906 35 60 36.121094 60 37.5 L 60 62.5 C 60 63.878906 58.878906 65 57.5 65 L 50 65 Z M 50 35 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(109,193,255);fill-opacity:1;" d="M 40 52.5 L 25 52.5 L 25 55 L 40 55 Z M 40 52.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(109,193,255);fill-opacity:1;" d="M 33.75 57.5 L 25 57.5 L 25 60 L 33.75 60 Z M 33.75 57.5 "/>
-<use xlink:href="#surface18" mask="url(#mask2)"/>
-</g>
-</defs>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<use xlink:href="#surface21" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,82,144);fill-opacity:1;" d="M 26.378906 69.507813 L 3.429688 69.507813 C 1.789063 69.507813 0.441406 68.160156 0.441406 66.503906 L 0.441406 38.214844 C 0.441406 36.554688 1.789063 35.222656 3.429688 35.222656 L 26.378906 35.222656 Z M 26.378906 69.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(33,160,255);fill-opacity:1;" d="M 66.078125 69.507813 L 56.355469 69.507813 L 56.355469 35.222656 L 66.078125 35.222656 C 67.695313 35.222656 69.011719 36.542969 69.011719 38.160156 L 69.011719 66.574219 C 69.011719 68.191406 67.695313 69.507813 66.078125 69.507813 Z M 66.078125 69.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(61,172,255);fill-opacity:1;" d="M 26.589844 69.507813 L 57.6875 69.507813 L 57.6875 35.222656 L 23.414063 35.222656 L 23.414063 66.332031 C 23.414063 68.078125 24.832031 69.507813 26.589844 69.507813 Z M 26.589844 69.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,104,182);fill-opacity:1;" d="M 54.570313 0.9375 L 15.222656 0.9375 C 13.523438 0.9375 12.148438 2.3125 12.148438 4.015625 L 12.148438 35.222656 L 57.644531 35.222656 L 57.644531 4.015625 C 57.644531 2.3125 56.269531 0.9375 54.570313 0.9375 Z M 54.570313 0.9375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,117,204);fill-opacity:1;" d="M 46.234375 0.9375 L 15.222656 0.9375 C 13.523438 0.9375 12.148438 2.3125 12.148438 4.015625 L 12.148438 35.222656 L 46.234375 35.222656 Z M 46.234375 0.9375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,95,166);fill-opacity:1;" d="M 32.175781 12.28125 L 26.222656 12.28125 C 24.664063 12.28125 23.386719 11.003906 23.386719 9.445313 C 23.386719 7.886719 24.664063 6.609375 26.222656 6.609375 L 32.175781 6.609375 C 33.734375 6.609375 35.007813 7.886719 35.007813 9.445313 C 35.007813 11.003906 33.75 12.28125 32.175781 12.28125 Z M 32.175781 12.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(109,193,255);fill-opacity:1;" d="M 46.164063 55.199219 L 29.195313 55.199219 L 29.195313 58.109375 L 46.164063 58.109375 Z M 46.164063 55.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(109,193,255);fill-opacity:1;" d="M 38.847656 60.972656 L 29.195313 60.972656 L 29.195313 63.878906 L 38.847656 63.878906 Z M 38.847656 60.972656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 43.402344 46.734375 L 37.746094 46.734375 C 36.117188 46.734375 34.800781 45.417969 34.800781 43.785156 C 34.800781 42.15625 36.117188 40.835938 37.746094 40.835938 L 43.402344 40.835938 C 45.03125 40.835938 46.351563 42.15625 46.351563 43.785156 C 46.351563 45.417969 45.03125 46.734375 43.402344 46.734375 Z M 43.402344 46.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,62,108);fill-opacity:1;" d="M 20.394531 46.734375 L 14.738281 46.734375 C 13.109375 46.734375 11.792969 45.417969 11.792969 43.785156 C 11.792969 42.15625 13.109375 40.835938 14.738281 40.835938 L 20.394531 40.835938 C 22.023438 40.835938 23.34375 42.15625 23.34375 43.785156 C 23.34375 45.417969 22.023438 46.734375 20.394531 46.734375 Z M 20.394531 46.734375 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureArtifacts.png b/dist/DevOps/AzureArtifacts.png
index c569dfee..3d4300b4 100644
Binary files a/dist/DevOps/AzureArtifacts.png and b/dist/DevOps/AzureArtifacts.png differ
diff --git a/dist/DevOps/AzureArtifacts.puml b/dist/DevOps/AzureArtifacts.puml
index 9c99d876..f7b8c3a9 100644
--- a/dist/DevOps/AzureArtifacts.puml
+++ b/dist/DevOps/AzureArtifacts.puml
@@ -1,7 +1,6 @@
-sprite $AzureArtifacts [65x70/16z] {
-xT1LWiCm34NHeC3o_hSxquOvBoctEf-6QqZkofKi-oXTtoyGMWsmO5O30afF1hHrCg270jeu6z3EnmPwdnZmW0SKyDA01qBd_G8vNV15lvI9cMbDsSYJIX46
-h4RRk49KL04D4r2WGbKWt3qGu01F0zQY3ejMX860BGH4MtWWnaWTNGZmTY36qHEq8K2Wpz02D60l2DZ4qO0zCE21iXXvGU2BFh5yGU3JFb5iZh40LO5KRKQX
-06L9BPt85itdqwJX_W4
+sprite $AzureArtifacts [70x70/16z] {
+xT65WSH0241H8lZst-xvRTmzuHVmPW2ebWm48o8R7NOYQBO2erCKNKMnood-tnB5YswY5CmUDmebb5122IMKdFWlqNBI4jD_pFb_AG2ejwKq6Bz3o7svmWcj
+eMHdLLv55KNKVb9Ue8Yzus7bLSgeo8faTMNvHDELWb7U_jAXX8ArPYbu7gN9tEX6InGyaL9q8GNR5Pkaf8ctnnCK0aZ5sXIJiGfX0fy
 }
 
 AzureEntityColoring(AzureArtifacts)
diff --git a/dist/DevOps/AzureArtifacts.svg b/dist/DevOps/AzureArtifacts.svg
index f926c973..519c7143 100644
--- a/dist/DevOps/AzureArtifacts.svg
+++ b/dist/DevOps/AzureArtifacts.svg
@@ -1,63 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65pt" height="70pt" viewBox="0 0 65 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<image id="image22" width="65" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAABGCAYAAACT8vn9AAAABmJLR0QA/wD/AP+gvaeTAAABZUlEQVR4nO3ZP04bQRiH4WeWDSi1hYtIQME5XEXKRaDJIVLlHFwEU3GKlIgSKWkt2xsNNWhJNivjP9HvlbaxdrzfPhptM6SUUnpRGXpjXcwutD9ulDLj5/F7DjW8yUpt73Vfr8rHb49j/2U4wvr0Tvn1eeyD3rV6Ni8fHr6MXT4coZsu92cHvG6yKu3TydjV/4BwVMc+ZBuV9vfgd3lds8lBDrUgCAKCgCAgCAgCgoAgIAgIAoKAICAICAKCgCAgCAgCgoAgIAgIAoKAICAIoKmL2UVdn97Vbrqs3VF969r1oH/rT7PXbrqs60/zuvh+3re27PVp86Z74/S67Pdp86brP70uh7DVN1nf6XU+jIKAICAICAKCgCAgCAgCgoAgIAgIAoKAICAICAKCgCAgCAgCgoAggIbJatdDbK/psu/XRm3vtz3Kzqonve/a6C6v1bP5/70jJiv18lZ3db3rSVJK6SB6BhRMdpsTsx78AAAAAElFTkSuQmCC"/>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<use xlink:href="#image22"/>
-  </g>
-</mask>
-<image id="image9" width="65" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAABGCAYAAACT8vn9AAAABmJLR0QA/wD/AP+gvaeTAAAGDElEQVR4nO2aTY4byRFG3xeZVUU21expDXoxgldaCj6EF76C7jP30RW88AW8G2hlaGvAgmfUPyTrJzPCi6I0sM0Z95jqhhf1AIJAAcyKfBmZlZVBcYLvweAPBh9tyzZNWHaUNyhXyE6fR1KCaolGlVB3qqGvyAAkFJUpIHml1g2rkqDsiGJEafByx12FG4c/+/fgj2k7n7r4hrd6z3uDVc54dsYWVu2O0rZ4O0EjPBspBcUasiZCX7PT/06DolIikdzxmqEcGCZho5HGRD9msrZsueMjb3gb8O5RbZ+U8Cc+2CtuDA55pLSVvBJlLWwV5BXUTtAEkUVKBZc9sYSCwkgReBUqgaaWNBSiF6WvZBspPJCBm3jPx0dlAfyChFf02jClxCZD243UC5E2wjcF2yRYVfRFhIECnlSCQQQRoBIwJWIoRA++q1gOqhra2IJXfqw76nkS4MYq9zkoLTQrkTYJto62wGVFG4NVEG1AAyY9sYRAEXgIJkNjRT2wA7UJUiVRUIWpOk2Fl/WxbZ+U8B339g9ShrZN+Fr4JtCV4BriCrgELgKtBDnwJOwrdfc0gSNUA4qgF+wh7oFGBCKqSFOlm1rq2HP/6IBOSvjEKjVEKtTWqStIm8C3wq7BX4KuHL0wYhVEK2RBfLUOn0IICDc0OupFPEB0YFbxCjY6pTfyoaJ8Q3+ehKA3Z5UNbwRrx18YbAO/FvpW6Dpg68Ra0DJP2SedDvOygzsxCu2F1jFnYQhGiL1gH/guSLny4lwJa4NDhtQa1hl2AX4JugK/Bn0rYgu6mEcDAz2xBAJwoQFiD2rnSzZB7A27AzoRzcCYWqbzJHRUDTQGked0986JC8EmYAuxDfhGcAEcJTztwshRAvO+qQmCgEnELoiLwFcQbYUmkVJH9+h4Tkq4o7MrdjaSUxAZrBXeAWtgPXdeFxAb0DNKkM8xCxFTwH6OR11gLXg2lJxin/DzMuEF0JPNMDM8OZ5F5EAN0AbRBXSa068LSF+nn7+OoAYiiHKchi3z0yHHFwFmhUbXlEe3e1LCSFXGJaTATZiY571pHvWkueNpFqCnfT4eOT6BjvdW0jEmwD7HakiZUE89bzr8580RhAIk4qn3Rb+B0OfYQP/zyvwsI/j/ziKBRQKwSAAWCcAiAVgkAIsEYJEALBKARQKwSAAWCcAiAfgvr9KGIlCU+W06NJ/sHD9yiM/fzxPtl/v/fG8hjzmASHOM8VvjOSmhJcWEhVA47iJViDJXf2IyNAYxzL8PnutQ5djxAWIQjE5MQkVzbLXibuQoKC5JjzbxCydLKUTxhNUgFYdJaITohQ7AAdQcBRSebVrpeNCqPcRhjiV60BgwGakkokLx8XwJ++hIHng16lSxQXAItBfxENAGIJgg2mfOhDHgANwBD8eYDkEMhk8BVWQfuD9PwhWdO7vqNBPYkODA3PnbIFqbq0FjzCe9DcSzZcLxmP0geHDiE3Ar4iGhQ2BDoKmh1vbcTLjl4A1eVthYqH3Fdhlu5ykAECPoQcQKaOLpCy8AiIg5+9QfCzC3oJ+A24J2Ce8zNgZTGdmcV5CFtYvbMlLGDHvBfeA5sON5v/bMNYg2UNaTl+BmAsW8CDLGvB4cs9M/ZdK9YD9SxgYvwf15pfktQxVXE9RhYjxUSIlEgsI8H9eOOqHG8BTzkfyTY3gEVudFMIZ5YdQO0n2FuwSHFc1wy6psGc6TkPnGE4dyyzCuSPsMMVKPdUB2c7UnWlAKZMKfLRMAh6iORuEj86J46Eg7sMOBYYSLks/9p8oP/N1fcVnWNOqZCDo3oojUG/FQiAYsJ9zA7ZHli7MRBTAvmEOURJocTUEdDuRBDGOiGYHyI7+r8NdHtXsy+j/y2n/iA3/jEmjiCmplPzm1dyw3xz9sBdkq0vPtGBMJRaa4yF6pVXhp8JJYlVsuClC+475e8/q8p8N73sUb3vpf+MDvuY3CTQ2mac86wWAdLxRgLcNzbRD+hXkzZz6wD+h8w1CDwV/y0X/gyt/w2t/z7rlGZmFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh4Vf4JwqBKKP8sSATAAAAAElFTkSuQmCC"/>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<image id="image15" width="65" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAABGCAYAAACT8vn9AAAABmJLR0QA/wD/AP+gvaeTAAAF20lEQVR4nO2awY7juBGGvyqSkt3t7p7ZSR8yxxwzL5GXmPfJ++zzbI57CpJDY5D02JYskazKQereYA/ZbDRubAB+AGFDhi3qIyna9RsajUaj0Wg0Go1Go9FoNBqNRqPRaDQajUaj0bgWsuXNfwb9gc/ynh+151kjjxo468Q+BCbdUUXY60wVgLtv0uX/zHF97Ah+4ewPJIPe4GSwM7gzeDJ4tB949E9875skfOZzeM+P+pG7AE8RUoQQz2gUppgIQag6kTSw7Vy/hoh4YXYIFkg1U6pRy4FaRna1ksuB7+qLjLjlZJ94ErgLA39PgYdOqJ1ReyH3kS5VcgKNERRcv9VF/hIzOKgpWgulgMw70jySsqHzgdv5C2OJ3OcHntgk4Qt/DR/oY+ChU6ZdJewduYW4L+R9JHQVOqEGUPU3mg0KJmgFKyCzwuTYGKiXRBozQ/hAnCDyzP02CZFH/SdjvKF2M3IT0INS74E7J9watgftHU2OBN14D/rvMABzvACzwOT44MipImejJIEwkKUCiZ1vkvCRs55J8ULtE7p36n3F3yv+zuFB0INge6ATiPYGEgQcMEGyI5PjI/ixInsIXcVDwHDUA2bK17pJgnGnZ+YYKV2Bm4DcKf5O4HeCvjfsAbgRZOeQ5M0kiDmWgRHkLHAjWCeIghCI1aEINQsxb5Iwcg6CRaHrlLJz9HadAe8NexT0neMH8L0gCbj6zdHXmQAygw/A0Zdzy3LcSkFnwSbBJyFMmyT0VMnEUMnJCb3A3uEA9rAK+A64X493vIEEXpcDkyGDIN1yiOL4BIyKDYb3Dikuu9f/zsRBhLMGQjBIQK+wB27ADwL3jt+D3AC9v4GEZTm4OUwCCRxHsi6z4saRnSBdoKaKRii6SUJHlTNJIwSo0dEEdI7sgP26DG7Ab0F6eSMJvmwR0QGFvCwL3/vSh84gKRKNGoTdNgkzVQIuCmKoKhIqREEieALpHHqQtV3/C5MvD1VelwA9y+6UgOQQBYuGBkF0om6T8ILh4suNZ22uLKP+b+312JvgSHAIAuHn/RBUBBfDNCDyTST8H7AO0jJYL89fXnyzkfkt0yTQJABNAtAkAE0C0CQATQLQJABNAtAkAE0C0CQA31iCIL7+PHNef9r/Jlj79FP/BHnt38bKUvBC9XkpFphjDmLgxlLdqbI2R+rWK/kVVMEr8NLW/oitlWh31EGtIttyhyOwfNhsglZHC1hxyCDzUuxkYpUtoH7lsvtLeW3JHJiW9InZ8bz0i+JoUaxWzHrStizyntGeCaaENfJidmwSdHRkBB/WshbLya8vgdeSO5PA2WFwZBQYBZ8MmcNSdyxKqE7eJmEieCC9hp6KXwwdlsDDv4Ikx1HIvtYY3yCAcRBbLphBkK+Cf3U4AwP4xfHZIC8D122TAL1l5vpT6MkAfpSltJ3AEXz2peT+kju8yUxwmGUNX0D+Af4syNHxs6HjGr5kx8pGCSczQonErPjoyNnQrwLdWsMrLFNxZ3gH6LX3ZAPATWF25AKcwJ8XEfbsyCnAIOg0U3LaLmFnB7oyMs9OuVTSGbwDC4KYI5PAyfCdQHQ8bL/MX0aQalAUuTgMgh/BnoHniB2NMEC99Mg8MG8LZOHORo7V0DmRxiX21mAoYJllduwEupdA9trJ9Lo7uEA2fF7uAZwVOQl2NORkMFR0Emp+4LB1JjxZJZQDt3NmCALBl/Cngs5g54D0hq2hB6LoVSUs3wHcBUpAc8Un0AswGGEwGBQbnTQFSj4xbp0Jj3aA+oWxfCBOA1kcdYUi2OSEHkgKETQoLo5dVYIusYIrVkEKhCzUSdAJ6qWik5OmwjDfQobHbRKWf3/9xSZ2BSIVCJgtub9PTkkVjYEQAqYVF7vyX3YUPIA7wSpWwYpAnim5R2ah5kDJq4Dye47bJHzie4c/2UeeyjP3nji50lUh5iX311jJwZg10glLbnl1BPHK7EKwQFcdK5DrQCkPHMqJscJj/RvH+kf+YP8CVcosrotFYXwAAAAASUVORK5CYII="/>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,30,-20,0,40,35)">
-<stop offset="0" style="stop-color:rgb(90.196078%,38.823529%,59.607843%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(93.72549%,45.490196%,65.098039%);stop-opacity:1;"/>
-</linearGradient>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,60,-60,0,60,5)">
-<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/>
-</linearGradient>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="65" height="70"/>
-</clipPath>
-<g id="surface18" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 10 7.5 C 10 6.121094 11.121094 5 12.5 5 L 47.5 5 C 48.878906 5 50 6.121094 50 7.5 L 50 35 L 57.5 35 C 58.878906 35 60 36.121094 60 37.5 L 60 62.5 C 60 63.878906 58.878906 65 57.5 65 L 2.5 65 C 1.121094 65 0 63.878906 0 62.5 L 0 37.5 C 0 36.121094 1.121094 35 2.5 35 L 10 35 Z M 10 7.5 "/>
-</g>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="65" height="70"/>
-</clipPath>
-<g id="surface21" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(69.803922%,9.019608%,33.72549%);fill-opacity:1;" d="M 0 37.5 C 0 36.121094 1.121094 35 2.5 35 L 27.5 35 C 28.878906 35 30 36.121094 30 37.5 L 30 62.5 C 30 63.878906 28.878906 65 27.5 65 L 2.5 65 C 1.121094 65 0 63.878906 0 62.5 Z M 0 37.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65.098039%,8.235294%,31.372549%);fill-opacity:1;" d="M 22 35 L 27.5 35 C 28.878906 35 30 36.121094 30 37.5 L 30 61.25 C 30 62.628906 28.878906 63.75 27.5 63.75 L 22 63.75 Z M 22 35 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55.294118%,3.921569%,24.705882%);fill-opacity:1;" d="M 11.875 40 L 18.125 40 C 19.160156 40 20 40.839844 20 41.875 C 20 42.910156 19.160156 43.75 18.125 43.75 L 11.875 43.75 C 10.839844 43.75 10 42.910156 10 41.875 C 10 40.839844 10.839844 40 11.875 40 Z M 11.875 40 "/>
-<use xlink:href="#image9"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(79.607843%,18.039216%,42.745098%);fill-opacity:1;" d="M 10 7.5 C 10 6.121094 11.121094 5 12.5 5 L 47.5 5 C 48.878906 5 50 6.121094 50 7.5 L 50 35 L 10 35 Z M 10 7.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(69.019608%,10.980392%,34.117647%);fill-opacity:1;" d="M 21.875 11.25 L 28.125 11.25 C 29.160156 11.25 30 12.089844 30 13.125 C 30 14.160156 29.160156 15 28.125 15 L 21.875 15 C 20.839844 15 20 14.160156 20 13.125 C 20 12.089844 20.839844 11.25 21.875 11.25 Z M 21.875 11.25 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(74.117647%,14.117647%,38.039216%);fill-opacity:1;" d="M 40 5 L 47.5 5 C 48.878906 5 50 6.121094 50 7.5 L 50 35 L 40 35 Z M 40 5 "/>
-<use xlink:href="#image15" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(93.72549%,45.490196%,65.098039%);fill-opacity:1;" d="M 20 35 L 57.5 35 C 58.878906 35 60 36.121094 60 37.5 L 60 62.5 C 60 63.878906 58.878906 65 57.5 65 L 22.5 65 C 21.121094 65 20 63.878906 20 62.5 Z M 20 35 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 22.855469 65 L 40 65 L 40 35 L 20 35 L 20 62.390625 C 20 63.832031 21.277344 65 22.855469 65 Z M 22.855469 65 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(78.431373%,18.431373%,42.745098%);fill-opacity:1;" d="M 31.875 40 L 38.125 40 C 39.160156 40 40 40.839844 40 41.875 C 40 42.910156 39.160156 43.75 38.125 43.75 L 31.875 43.75 C 30.839844 43.75 30 42.910156 30 41.875 C 30 40.839844 30.839844 40 31.875 40 Z M 31.875 40 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(90.196078%,38.823529%,59.607843%);fill-opacity:1;" d="M 50 35 L 57.5 35 C 58.878906 35 60 36.121094 60 37.5 L 60 62.5 C 60 63.878906 58.878906 65 57.5 65 L 50 65 Z M 50 35 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,57.254902%,74.509804%);fill-opacity:1;" d="M 40 52.5 L 25 52.5 L 25 55 L 40 55 Z M 40 52.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,57.254902%,74.509804%);fill-opacity:1;" d="M 33.75 57.5 L 25 57.5 L 25 60 L 33.75 60 Z M 33.75 57.5 "/>
-<use xlink:href="#surface18" mask="url(#mask2)"/>
-</g>
-</defs>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<use xlink:href="#surface21" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.588235%,6.27451%,33.333333%);fill-opacity:1;" d="M 26.378906 69.507813 L 3.429688 69.507813 C 1.789063 69.507813 0.441406 68.160156 0.441406 66.503906 L 0.441406 38.214844 C 0.441406 36.554688 1.789063 35.222656 3.429688 35.222656 L 26.378906 35.222656 Z M 26.378906 69.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(90.980392%,38.431373%,60%);fill-opacity:1;" d="M 66.078125 69.507813 L 56.355469 69.507813 L 56.355469 35.222656 L 66.078125 35.222656 C 67.695313 35.222656 69.011719 36.542969 69.011719 38.160156 L 69.011719 66.574219 C 69.011719 68.191406 67.695313 69.507813 66.078125 69.507813 Z M 66.078125 69.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.509804%,45.098039%,65.490196%);fill-opacity:1;" d="M 26.589844 69.507813 L 57.6875 69.507813 L 57.6875 35.222656 L 23.414063 35.222656 L 23.414063 66.332031 C 23.414063 68.078125 24.832031 69.507813 26.589844 69.507813 Z M 26.589844 69.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(75.686275%,14.901961%,39.215686%);fill-opacity:1;" d="M 54.570313 0.9375 L 15.222656 0.9375 C 13.523438 0.9375 12.148438 2.3125 12.148438 4.015625 L 12.148438 35.222656 L 57.644531 35.222656 L 57.644531 4.015625 C 57.644531 2.3125 56.269531 0.9375 54.570313 0.9375 Z M 54.570313 0.9375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(81.176471%,18.823529%,44.313725%);fill-opacity:1;" d="M 46.234375 0.9375 L 15.222656 0.9375 C 13.523438 0.9375 12.148438 2.3125 12.148438 4.015625 L 12.148438 35.222656 L 46.234375 35.222656 Z M 46.234375 0.9375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(70.980392%,12.54902%,36.078431%);fill-opacity:1;" d="M 32.175781 12.28125 L 26.222656 12.28125 C 24.664063 12.28125 23.386719 11.003906 23.386719 9.445313 C 23.386719 7.886719 24.664063 6.609375 26.222656 6.609375 L 32.175781 6.609375 C 33.734375 6.609375 35.007813 7.886719 35.007813 9.445313 C 35.007813 11.003906 33.75 12.28125 32.175781 12.28125 Z M 32.175781 12.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(99.607843%,56.470588%,74.509804%);fill-opacity:1;" d="M 46.164063 55.199219 L 29.195313 55.199219 L 29.195313 58.109375 L 46.164063 58.109375 Z M 46.164063 55.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(99.607843%,56.470588%,74.509804%);fill-opacity:1;" d="M 38.847656 60.972656 L 29.195313 60.972656 L 29.195313 63.878906 L 38.847656 63.878906 Z M 38.847656 60.972656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(79.607843%,18.039216%,43.529412%);fill-opacity:1;" d="M 43.402344 46.734375 L 37.746094 46.734375 C 36.117188 46.734375 34.800781 45.417969 34.800781 43.785156 C 34.800781 42.15625 36.117188 40.835938 37.746094 40.835938 L 43.402344 40.835938 C 45.03125 40.835938 46.351563 42.15625 46.351563 43.785156 C 46.351563 45.417969 45.03125 46.734375 43.402344 46.734375 Z M 43.402344 46.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(56.470588%,2.745098%,25.098039%);fill-opacity:1;" d="M 20.394531 46.734375 L 14.738281 46.734375 C 13.109375 46.734375 11.792969 45.417969 11.792969 43.785156 C 11.792969 42.15625 13.109375 40.835938 14.738281 40.835938 L 20.394531 40.835938 C 22.023438 40.835938 23.34375 42.15625 23.34375 43.785156 C 23.34375 45.417969 22.023438 46.734375 20.394531 46.734375 Z M 20.394531 46.734375 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureBoards(m).png b/dist/DevOps/AzureBoards(m).png
index 46e23428..52e0905b 100644
Binary files a/dist/DevOps/AzureBoards(m).png and b/dist/DevOps/AzureBoards(m).png differ
diff --git a/dist/DevOps/AzureBoards(m).svg b/dist/DevOps/AzureBoards(m).svg
index f50ac3e8..fe9363b4 100644
--- a/dist/DevOps/AzureBoards(m).svg
+++ b/dist/DevOps/AzureBoards(m).svg
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<image id="image22" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAADP0lEQVR4nO2bTUhUURTH/3dm/IqpWSQmpplmE0YRZJQUUqQRkbTIjCKEoDZRuBioKIQ+TCqUokUtgsCFLZJAg0jcJGUhiYvQQrOFQ5rZJrJSx94bT4valO/MjObcGX3nB7O55wzn3B/3zpsL7yr61p6KRTvuAN49QL8bCw6PAerrxNSLEyppf0+k31JkOhsBlEexszjBN4DXN9aoTUEjkmxFZv73hblSLAjWblBJvu5IUh22kQIAjo7FEadGs4/5jIhhEDEMIoZBxDCIGAYRwyBiGEQMg4hhEDEMIoZBxDCIGAYRwyBiGEQMg4hhEDEMIoZBxDCIGAYRwyBiGEQMg4hhEDEMIobBXmLUSGqkqfYSA89dCqTnRZJpMzEtaXDWNtHgoZRwmTYTA0AdXYf0nTVh08h0ko5+4gu3ieCFglBvV9lvxQAAfrjgeHMpVIZNVwwAOAnBirUq6V6fVdSmKwYAggqOMxVc1MZiAKD5ABextxh13ksT1SusQvYWAwAJzRuthkUM5XqthkUMytKsRh2AXR/Xf1DNlm+LO0DX+nX3El9kWV66cEA1nQWW/tTdTtxAx0ethl3K1f6IAq3r4cgogToX8SWEWaHgA1os93TMoJIBq2EXAKjk3f0Aor6lyCjfCoV90a4zI1RhLzA4bVjzU+lLh9564cgehz+zyyqiV8zU3ida64WDctrU6puTViGtYlSSrxvU80pnzZBM1TVwIf1/8KZGbmmvaUnZJwynNnNR/WJ6dj0Ejk3/tdMNeetUTlaAC2sX8/sW64dTuuv+BV1+D//Y7VApSlcv/0JmdgMwdER/5ZQgyFmsEkafhcqK3SFyzFMJVPq116XUi+GkADFcMQBAgdJVcC15DjzI0FMx8z5cQxUKwfg/ONPktnwySz+T6aTofgrqqa3dFev5zgiaKMom4+PL6Ahxm2SsrCI4Y7o7Zg21tbvI8F8h023OmRTj+jsyPNtjPbc5gQKtXjIL6sn0GLOXcnCYjCofva1OjPV85hwKVOeS0XmVjJr+yGTkjpFR/Jgmnx6mgcHk/60/L/YdjZ9ejsTGLaDNeUDpMqgWN5BlgE5+BRX5oQp74c/s4g6EgiAIwjzhF6S67/vyUsSBAAAAAElFTkSuQmCC"/>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<use xlink:href="#image22"/>
-  </g>
-</mask>
-<image id="image9" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAOLElEQVR4nO2by24d2XWGv3/tupwLL6IoGWnBBuwMEsOMHyGADeQV0uOM8xJRv4RfIDP7FQJYGTrjSAg8SCYG3YBEUSTPpS5775XBrkNSfXO7raMOAi6iUBIPzzm7vlpr7XUreJAHeZAHeZAHeZAHeZAHeZAHeZAHeZAHeZAHeZAHeZAH+X8u+r4XcE+EO3z2mXj5Upy9Fp/8jfjjpWBpXK3F8cmX13t16RwvnYtD5/Rz5/zE+YfLzKszB+D5c5/+0r/03m9czPcv4vnzCcaZ4KXB0qAxqAyuDGqDYLAx+tndmtva6TvnaJlRyihmXo+Z1GXiKtP/KN9C+pfnPl3ttwL0fYL5MpArAsdPA7MYuOoqNFY088DogdoDmNENxmz6hBgccsabTN0lBiW8jngfmSmxssRBSHzSJP74e4df5G8LKOz76r9ChCP0XPDC+MEycPW6Ih821N5QjTO2aU5jc7xaYCxhPMDCkuRLgi9J1ZJsC2qfk5hjeYZXLbXV4DWNVVAZBxirjfEG0TwW5xvo/hrOPoUXL/7EIj+uFD/y6afGyYnxbAgsU2AdakgNtA1xbKmsZRhnNFVDSi2hrsmxJllFyEY2YXJydowEOZKrEU8DZj0h98TcU1U9Q+xxG2jTCMsIlxFe53va85Wa8zHBFNP52UtxeWL812XFcVPTh5q2aoEZKc0JYc6YFoQ8h2oGaYarRdTgFU5AEi7H3TFFskeMgew9pi1mW1LaEmxLjFsq2zI0PU3sWaaR9lHk7WkCvhbOxwJzB+UVAU4qttTMty1oRm8LWi1IvkT5gMwSY0nWAvkcVwveIFWIgFxkAMt4TsCI1AMdnrcorFFeg1YkrTHWuG+owhbUQTvAJnLeJJ49S18F52OAKebzm0/tFgpDQ121bPsFmSUKBwQOwY9wlbNYAkukOZkZeANUyAOu3bozKCJGch6QtrhvkNbIbnC/IacbjGtCdQNpBc0G1h2bec8ij18HZ//O1xGfvjKenRireQ1DA8yKVvghWccEToBTXKfIn+D+FOkJzinoMfgJ+CPQcTn8CDgEHQBL4ABpgbPAmCO1uLegGlRhMlI23MAyjLUz65xN4zyODo+cf//Few5532DK7hNj4PqywucNrhmBJYlDzB8hHuN2ingC/ADpCfAE/BR0An6C6xHSEeJwArIELXGWiAWwAOaIGTADtcgboAYqhIEZSiIHIDqpcY5SJi2dx52z/Q/4xT/dwqn2iuX5tCU/+3Fgflix3bZEFqADgo6JeoxxCn6Kc4p0gvujYkpaklkgtYhiRk4AN5AmtXfwO3OCgawOscS1BOaYt2A1TgXBcBeVnN6dITn0Tj84F3P4+5eO42i/GiOePi1xyjJUXHpLpQWRYj7iMWJnNk+B6fBT0CPgeNKQJTuNgBmuGVIDtEADasDbcqYpmqIdyGJKwgADwMgkOcoJrxIm52Z0jp5mXnfwqzN49WqPGvP8uQBx9TJAqGmtJTJH+YDgx7hOwE8nX/IUeAycgI4mGLNy4ZS7XS5OSALfOd9Ja5SBBETQBMybAtArXNN73XEyUoIqopTAErZIbC8z82Xm7MeZszPtS2MmbXkdSkQbZxAWmB8hHuF6jLz4lKIpp0gTGHZg5rdw5OXOQ4V7BQpAmGAFwCZ4ATyU11UBBiqmdwtSGfeEe0IWMUvkbaa1BEeZi/90/ufK9wPGXbz6lXG1rEqYz5ykA5xj5I/BnyB7ivwpsifA6QTlsDhUn92aA4TboA4MSex+mA6f/u8Ykk2gwq0JaQKje5oVGPEc8RShjSRlxk3mh1Xi+CzvB4xksA7MqKmaGTEsqMIhpBPcHuM8Qf4U15M7n6IJCsVZ7qDcXdjXx1zavea6A0g5v/++AkZE0Ig04CFSeWQcE7OQuJxnruOeNKY43YrZQc02zanDkjEfAyeYTsGfgJ6CToFHFPM5mDTlfZ/y7YNQ3QP4viaVVzOaAkJ8xDVgjFNwOGKKWE6kmPjhUbIPDgUoZYTGuOoqaqtLIpjnJcz3A6RD8APkux1ncrQqWnLfTP582b0vULSuBlqcBc4S/ADnsASXfoCzJIQ5VWgJVqO24roP+wFzfi6oDI0VfW4I1paEUKWM4CxBC/J9KNTsTOe7Q9lJ0ZbyWdX0+S0lCFxgWoCVs3xOznNGZvR1Q6uaWQz72a6fXRaNaeYBvCLFFlUz3Odgc5w5Yo582lo/KJQit1rnux2qnr6rrMNZYJrjeY40w9K0llzRaU8aw9LovFTe0lgT6hrPLVIpL8inXOY+FA+4f9FZ/qUikErEzD04aouTzyWFcLUoNATVUFU0eU9grtZiNlcpR4aKHGtETfYSeKGm1Fd2O4+HEuZ/8GRfuNu0lRc4Tj19dwM2RcuqyamGVEGsGHxPYI5PBJuSuCEDq8Argqqi1j4FYzvz0V/ibL9ZJMB32/f0ndM6PJfA0VONhcCYK2KpLe/JlIB+JrrBIBnkEnDtjl3Qhhs++RXfA5QimnjvzNTwPK3BAu4BZGRKsV1m0O8JzGpbLnLWQg4im3CVQz7Z/XQud1R7wwLcQfcpvpnyLbkwE8iwLCyXvxsb7QfMwXyqhPV3v5O8BJ5QCm96v5z4Z7XDvqvI79Zy/9fZMXOCld/XwfdnSm3txODUOYNn3L2Uz8glkZt+cAf5lxb74cSRT1k4DkxrIU//zmCZnJ0kJ0SnGvYE5uiydAjJmdEzRsIUSw1kSuJEKkUmclmww970RuUGiHKTtCtREEERz4lMIigR20Ss9gTmeukcxdIhNCWw0uJwDVOl7W5Rd3DyN3/od5a7mo2TyndOOZIYcUZkIxZGSJFqSAy2p1zp8aGjg9I2xSKZEWcABtx7ivOZICkCqZjV7fFh5NZcdxriEd+VQL2sRd5DHsiMDCFCFWn2Bebt545iZlAqdY80lAXQlRYHHdCRGWDSIE1wPiQWTT4F31X33l8H2gIdhA7lnkYDjJFutScw5yfO6zHjdST6iFnpEOIb3DflzLQoeu7DEfkD4LlztNqZz6QhBcYGtMG1LYBiRwg90UeoIzPtCcyz3zupyxz1kcpHQu4x24KVZphphVgh1sAW0YEGiu/Jdx2A7ySOO/dMaKTA7zBtgDVO6VSar8A3JNuSco8PA00eWe3LlF4+deJfZXolsIGYe1LalrZpXuGULiGsgBXuW/B+sv84XdB3Maw7R1tMMwI9eAe2xn0FlM5k5ga0ImuNaUtDh9uAzSIHIe2n7HB25pyfZ1aWqPNIW/XAluwrsGtgMTXK5sCu9TEVqMTt7i2sJIGCP5VH+T2fsoMiyveiNfIbXNfIr8h2hfk15BWyNSltSSpTEWEbodtTzfe3L8ocylUrxtbwvuQnOQQ8VbcVf/OAbJdd73o/JWzfYdgxcddXALo/RnbPpzAW82RD0cor4BJxgfMG0xtcF7i/o7JrnBVts6VbDXg7wnnaD5jPEGefwicbeLMt+UijkpPIDZNNbdNdZ9Gmusn9nGm6aBWDkvKkRjvnPAVs0yHuupHQgW9BExS/BF0gLpC9IeULyJeId4xaId/QzjrUDnwSIquf70ljAH77W/jvf4XwBMaNGJJQEFUQKZeShGchuys33GqJpmj49qLzXaNs0grdi03QDkhfgLABu0GTpjhvkb0BvUF+USDpEnRN7WvC2JHmAxd15G/fJP75V76/TqRUJibPzzM/HUaul5OGxGI+0tQoc5WInYzvetC3QeCcXZVPVEWz3EqWrC90Ib3EKU6PaYOzwrlGXOJ6C7yB/AZ4S6V34DdE3wAdWJmXOf1x4tWpo9/sNdmfRkD+0TgjsJzVrJsWtIB4QNIxPp5g4QT3adyDE+AR6Kh0Ee4Vy/1LdWFgyn1QiWjlfYlNWAM3SFd4vsTtLfhbzN/i4S3Jr2jsGvKGWbOlWQ4s15F/u8z8+jcZsUeNYVr+8zOHF5n255F1Elwa40woFmeaJxNxL/FGiWk2QJl9cc3Bp1EzVXgug0OaRs2KeY2IAdQhNjhrjGvgCvGOnN8hXWJ6x+DXmN9ALtrSMdL9IfFDMr/+dd5l+fsfHHrxosydbBfAa9g0ZWgnNU5SpsmJHEp06h4xG3AfCN6D9SWfYUvZdkvULK2BNeIGuAaucb0Dfwe6xPyCbBd4vgC7wPwt6B3m14RwgzGZUDPAZeRnJF6dOb/85Xv39GNImcE7Pw88GwIbqwmxoU1zYl0mILDSCPN8SNAB2Q+waUpK0wSDU+N518eG4pzvmdG0RYsyambcEPMKhZsSWOZpDo+OVRo56MbbCc4yQe53C/5Y4ojP7sFhUdGvWtqhJbZzqmpOyqUZZ14acuQFrqn/pAb3GvdQypFA8ozd8y/QkbUl+IasNWJN0JreN7R5A94xm/d0jO+NtX4ByscF80U4f9cabz+v6eqaw0XDZjNDsxlVnpNyGWvNeTcs1CLVeKqnmMdQLhVBJ5WdLA8QStZueUvSlpC2RNvi3lGPPdjA0Q9Grv+Qbs3nK6B8fDD34YBx8bvA6Y9CGW2lhtjQMaMaW6rQMlI6hLsBaKwiE26L1sV1JyyMZEaUe0LoS0JIR5V76qbHNgP9oxE2kU+axMn0fMHXQIHvA8zue9+b+10aLCq6dzWzUFOppvMG6gblqUOYKsZcgRlmIuxqtFOFcMiRRgPRRzwMeD9wYAPDNBF+0SZOTxMvX/q0+8A3ZPDf70MWDiXOORMXvwv85KfG51cV1lUctRWDaogVVKVDGD1QVSJNGhOtgKmUiEOiakeIkSaPXM0iT7aR9fSQxcl7T6H8yaz9/95jORe/C/zkwLgmMDsJdCnQ5MAwPX1CbyUgBsbB8VmGnGnWiU7pvadOWOcvPDcA37LO87/3co6Zh/jP8gAAAABJRU5ErkJggg=="/>
-<image id="image15" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAED0lEQVR4nO3WPY4cxw7A8T/Jqv6Y3dXKeNALFCpwois48NF0H1/Cl5Biw3iRFwaePDsz3fVBOhjBgJ0YkIP1APUDGHVXo0kQZMEwDMMwDMMwDMPwV8KHD8qPPyrfHoW374SfnpTpQbnsQl6UuyocZ2Wt8qeTlxxMz0E7OMtvQXtwytE5vXHePzkf3wTvfwg+4C+U2z9ifI9xeqNs3ySOnxOPUwYylieQmWILVmawheYLnRlsQmqmLxlvGVkUc+WSlFcOxSD/D37+Dj59ipdO8mskfl2Nbzbj1BKTJOqSoGa0ZvqU0J5JakQYOgnugrij4vTama0iVomoTBSKKZe98vq/jfdPwQ8vneLXSezJmFuCNNFkgpgoOqPTjMaM20TzjESCaijQzdFomDTCC7QN1Q31DfGN1wf49Qz/eXOT3QKQOLVEXjJaZ1JbQFdMV+CA9xWzBWHGdQLseswdj4qlHXxDOFP8TMrGvgvbGrw25+NtzheAxCs1qkxYzCAHRO9A76E/kNIdEXeErMCMkIgQVBqiBY8NiRPYEWkZAZIFTRrnpbN87i+d4NdKbJ7INbOlhbmvNL0Hf4R4pPdXKA+E3kEshGRCBIlKsCNxBo5EZMSERid6Zdp30lQoi750gl8rsYoRnpDIhC8oK507RB6ARyIeIe4JDggZQYBKsCHMhBiCo1FoumFyAsu4GGm+4cJsVcmz0SORLNGZkJghFkRXQu4QvwcOIBOBIFSIRGhANPALsGCR/yiKFmVJ8nc/8G+VOKywN8GT0LsipkQYQQLSdRtpgsjXQIBAvjy/hoEoIkrvgiBEF/a42cIo5wuoxjUkcA+gg3YkOiINoiM0RBpCAxpBI6ITtOv74bjHH99KFsz5htf1kp2IjpcOqSK94BQkNkIuCBOBAo5w7ZiQirARciL8gspGxP5lUzVydHYN/JYLY9E500m5EHVH04XwCSKhIngEUJG4EGSILzNGdoIzyBHniMqJ5hsmhV4bmjttv+F7zNk7dlcIT3hKmCsqgoTTo6K64f1AMCOSriOGjkdBuSCcgCMhv2H6jLcL01QQbaz3N1yYgzb2qmhsdBXCA3C6FmBDeCZ0Ac+IG4Fc5w8VZ0dkIzij/UTwTMoXihf02JjSDRdmTw0ugq+wEmzWUSrSd1zP9D4jmlFNiCgeAu6oNNBKj4L0DZedZBe2srFK4Vkbb7nhm+/cOvsKcwvO7sjc8Voh7aRIkDI9EtEUTBGgWxBct5ZLQ61AqyCF11Oh/L9hdHi65Y75xXn7LvhMMD85rXe6VbwZTYwFYzJlR8l2vZf0EqgFGh0pzqyNs3fy1jinxrx2pl+cj+9udisNwzAMwzAMwzAMwzAMwzAMwzAMwzAMwzAMwzAMwzAMw/Dv8zvOXSk8gbruNwAAAABJRU5ErkJggg=="/>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,64.615385,-64.615385,0,64.615385,0)">
-<stop offset="0" style="stop-color:rgb(255,255,255);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(255,255,255);stop-opacity:0;"/>
-</linearGradient>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface18" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 2.691406 0 C 1.207031 0 0 1.207031 0 2.691406 L 0 45.769531 C 0 47.257813 1.207031 48.460938 2.691406 48.460938 L 27.113281 48.460938 C 28.421875 57.59375 36.273438 64.617188 45.769531 64.617188 C 56.175781 64.617188 64.617188 56.175781 64.617188 45.769531 C 64.617188 40.632813 62.5625 35.980469 59.230469 32.578125 L 59.230469 2.691406 C 59.230469 1.207031 58.027344 0 56.539063 0 Z M 2.691406 0 "/>
-</g>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface21" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,110,192);fill-opacity:1;" d="M 0 2.691406 C 0 1.207031 1.207031 0 2.691406 0 L 56.539063 0 C 58.023438 0 59.230469 1.207031 59.230469 2.691406 L 59.230469 45.769531 C 59.230469 47.257813 58.023438 48.460938 56.539063 48.460938 L 2.691406 48.460938 C 1.207031 48.460938 0 47.257813 0 45.769531 Z M 0 2.691406 "/>
-<use xlink:href="#image9"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31,159,255);fill-opacity:1;" d="M 64.617188 45.769531 C 64.617188 56.175781 56.175781 64.617188 45.769531 64.617188 C 35.359375 64.617188 26.921875 56.175781 26.921875 45.769531 C 26.921875 35.359375 35.359375 26.921875 45.769531 26.921875 C 56.175781 26.921875 64.617188 35.359375 64.617188 45.769531 Z M 64.617188 45.769531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 59.230469 32.578125 L 59.230469 45.769531 C 59.230469 47.257813 58.023438 48.460938 56.539063 48.460938 L 27.113281 48.460938 C 26.988281 47.582031 26.921875 46.683594 26.921875 45.769531 C 26.921875 35.359375 35.359375 26.921875 45.769531 26.921875 C 51.042969 26.921875 55.808594 29.089844 59.230469 32.578125 Z M 59.230469 32.578125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 36.347656 5.382813 L 22.882813 5.382813 L 22.882813 13.460938 L 36.347656 13.460938 Z M 36.347656 5.382813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 53.847656 5.382813 L 40.382813 5.382813 L 40.382813 13.460938 L 53.847656 13.460938 Z M 53.847656 5.382813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 36.347656 17.5 L 22.882813 17.5 L 22.882813 25.578125 L 36.347656 25.578125 Z M 36.347656 17.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 18.847656 29.617188 L 5.382813 29.617188 L 5.382813 37.691406 L 18.847656 37.691406 Z M 18.847656 29.617188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 18.847656 5.382813 L 5.382813 5.382813 L 5.382813 13.460938 L 18.847656 13.460938 Z M 18.847656 5.382813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(69,176,255);fill-opacity:1;" d="M 36.347656 5.382813 L 22.882813 5.382813 L 22.882813 13.460938 L 36.347656 13.460938 Z M 36.347656 5.382813 "/>
-<use xlink:href="#image15"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(155,212,255);fill-opacity:1;" d="M 18.847656 17.5 L 5.382813 17.5 L 5.382813 25.578125 L 18.847656 25.578125 Z M 18.847656 17.5 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(215,238,255);fill-opacity:1;" d="M 59.113281 40.269531 L 43.75 55.632813 L 33.769531 45.652344 L 37.578125 41.847656 L 43.75 48.019531 L 55.308594 36.460938 Z M 59.113281 40.269531 "/>
-<use xlink:href="#surface18" mask="url(#mask1)"/>
-</g>
-</defs>
 <g id="surface1">
-<use xlink:href="#surface21" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,116,202);fill-opacity:1;" d="M 49.003906 29.78125 C 54.085938 29.78125 58.707031 31.691406 62.222656 34.828125 L 62.222656 4.003906 C 62.222656 2.445313 60.964844 1.1875 59.410156 1.1875 L 3.527344 1.1875 C 1.96875 1.1875 0.714844 2.445313 0.714844 4.003906 L 0.714844 49.824219 C 0.714844 51.382813 1.96875 52.640625 3.527344 52.640625 L 29.40625 52.640625 C 29.257813 51.667969 29.179688 50.664063 29.179688 49.640625 C 29.171875 38.675781 38.058594 29.78125 49.003906 29.78125 Z M 49.003906 29.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27,158,255);fill-opacity:1;" d="M 19.460938 6.351563 L 5.777344 6.351563 L 5.777344 15.023438 L 19.460938 15.023438 Z M 19.460938 6.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(107,192,255);fill-opacity:1;" d="M 38.269531 6.351563 L 24.585938 6.351563 L 24.585938 15.023438 L 38.269531 15.023438 Z M 38.269531 6.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(187,226,255);fill-opacity:1;" d="M 19.460938 20.09375 L 5.777344 20.09375 L 5.777344 28.765625 L 19.460938 28.765625 Z M 19.460938 20.09375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,145,252);fill-opacity:1;" d="M 19.460938 33.832031 L 5.777344 33.832031 L 5.777344 42.378906 L 19.460938 42.378906 Z M 19.460938 33.832031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 38.269531 20.09375 L 24.585938 20.09375 L 24.585938 28.765625 L 38.269531 28.765625 Z M 38.269531 20.09375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(25,157,255);fill-opacity:1;" d="M 57.121094 6.351563 L 43.4375 6.351563 L 43.4375 15.023438 L 57.121094 15.023438 Z M 57.121094 6.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,146,254);fill-opacity:1;" d="M 62.21875 49.824219 L 62.21875 34.835938 C 58.714844 31.699219 54.082031 29.789063 49.003906 29.789063 C 38.054688 29.789063 29.167969 38.675781 29.167969 49.648438 C 29.167969 50.671875 29.246094 51.664063 29.390625 52.648438 L 59.40625 52.648438 C 60.964844 52.640625 62.21875 51.382813 62.21875 49.824219 Z M 62.21875 49.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51,168,255);fill-opacity:1;" d="M 62.222656 34.835938 L 62.222656 49.832031 C 62.222656 51.382813 60.96875 52.648438 59.410156 52.648438 L 29.398438 52.648438 C 30.835938 62.1875 39.070313 69.507813 49.007813 69.507813 C 59.964844 69.496094 68.84375 60.609375 68.84375 49.636719 C 68.84375 43.753906 66.28125 38.46875 62.222656 34.835938 Z M 62.222656 34.835938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(215,238,255);fill-opacity:1;" d="M 59.195313 39.867188 L 46.765625 52.300781 L 40.382813 45.90625 L 36.566406 49.738281 L 42.953125 56.128906 L 47.011719 60.195313 L 50.824219 56.363281 L 63.253906 43.929688 Z M 59.195313 39.867188 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureBoards.png b/dist/DevOps/AzureBoards.png
index 49924c59..eb3cab5b 100644
Binary files a/dist/DevOps/AzureBoards.png and b/dist/DevOps/AzureBoards.png differ
diff --git a/dist/DevOps/AzureBoards.puml b/dist/DevOps/AzureBoards.puml
index 2b7f994f..d7602f6a 100644
--- a/dist/DevOps/AzureBoards.puml
+++ b/dist/DevOps/AzureBoards.puml
@@ -1,8 +1,8 @@
 sprite $AzureBoards [70x70/16z] {
-xT87aiCm28LX8GCFv_u7tiXfB96Bs5x-6K-rFjKomL8fbKTisU0KMBhwKEpRAN1PIts8ls13yR-8Jt-3yg_Cv-nLyznvBx6ez1fzktE-Zr6Wliv97L9ayYqA
-N5-jsBielZ-hABiaesJAAtO9ZvLDeqeRxCierYae-sTftSOKMsr0iVNui68RARs70g5ZYcq5vKFAXj0-QFNAFAeeILCWNedj8qJI5ArvHQabECTfHUcI0b1o
-IWOHjEfnXRM365hJOOM9z1cnXU5jvNHooC94P55aNJajEQGn0Rafr1JRLOHkZ4E2KjkOVXQP9-JnUedxYI0o7GHSTcBSOd8nVDEUKjKpVGHrJo65O_g8KjbB
-49c8WCjkLIF32DMody357KIe32u6p3Y-51zZCow78e4hjPzusp5r-yao7iblIZoo7p4wCPN1gYGN4XrMTo1SgUIYEh6SuyaHkMWC-Ey5
+xTM7hjWm28LXm8Q3x_i_S9KbqKjgChhRNolpouxfEwN-D6CwmiVpni7mnvlwhiWhnNw0uh6nNZ9YlYvAMmNbV1VN6F9M_whoNpblnBxF5_2FAgF7RB-viIkA
+IqppR-2lLFuhzaIvsNYfE01VWc4yKmRWCU210a_1RoeEFyj6CKuN9x87BPMCv9HBfKRSh5Hgn0rwIHa-Lz2lAAWKIA4KIDyKUwK8owf03cN4Wk8pX5bqKNHH
+Pc66B8mj31TAWJ3heZIILqZ7akvAVK7z3373abrL6ek7cHrnmrgXnFqa8uV2XHBtauGyK7Oc8gwxGbugaOb8E1TYZ6zc_fcHY9XYYwO9ZgnnJ14pceVCP0Iz
+K2mp6K4hb8R4P0HKn4XCHfIgD3490PSAunEJ4QMwZfWfKamNCinhT2MUCqhqbCb8dLY1l3oRJhTI86UDRYR9iKuFacxvF1v1hQkPQczCN_S5
 }
 
 AzureEntityColoring(AzureBoards)
diff --git a/dist/DevOps/AzureBoards.svg b/dist/DevOps/AzureBoards.svg
index a57dd3b7..8407e3b6 100644
--- a/dist/DevOps/AzureBoards.svg
+++ b/dist/DevOps/AzureBoards.svg
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<image id="image22" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAADP0lEQVR4nO2bTUhUURTH/3dm/IqpWSQmpplmE0YRZJQUUqQRkbTIjCKEoDZRuBioKIQ+TCqUokUtgsCFLZJAg0jcJGUhiYvQQrOFQ5rZJrJSx94bT4valO/MjObcGX3nB7O55wzn3B/3zpsL7yr61p6KRTvuAN49QL8bCw6PAerrxNSLEyppf0+k31JkOhsBlEexszjBN4DXN9aoTUEjkmxFZv73hblSLAjWblBJvu5IUh22kQIAjo7FEadGs4/5jIhhEDEMIoZBxDCIGAYRwyBiGEQMg4hhEDEMIoZBxDCIGAYRwyBiGEQMg4hhEDEMIoZBxDCIGAYRwyBiGEQMg4hhEDEMIobBXmLUSGqkqfYSA89dCqTnRZJpMzEtaXDWNtHgoZRwmTYTA0AdXYf0nTVh08h0ko5+4gu3ieCFglBvV9lvxQAAfrjgeHMpVIZNVwwAOAnBirUq6V6fVdSmKwYAggqOMxVc1MZiAKD5ABextxh13ksT1SusQvYWAwAJzRuthkUM5XqthkUMytKsRh2AXR/Xf1DNlm+LO0DX+nX3El9kWV66cEA1nQWW/tTdTtxAx0ethl3K1f6IAq3r4cgogToX8SWEWaHgA1os93TMoJIBq2EXAKjk3f0Aor6lyCjfCoV90a4zI1RhLzA4bVjzU+lLh9564cgehz+zyyqiV8zU3ida64WDctrU6puTViGtYlSSrxvU80pnzZBM1TVwIf1/8KZGbmmvaUnZJwynNnNR/WJ6dj0Ejk3/tdMNeetUTlaAC2sX8/sW64dTuuv+BV1+D//Y7VApSlcv/0JmdgMwdER/5ZQgyFmsEkafhcqK3SFyzFMJVPq116XUi+GkADFcMQBAgdJVcC15DjzI0FMx8z5cQxUKwfg/ONPktnwySz+T6aTofgrqqa3dFev5zgiaKMom4+PL6Ahxm2SsrCI4Y7o7Zg21tbvI8F8h023OmRTj+jsyPNtjPbc5gQKtXjIL6sn0GLOXcnCYjCofva1OjPV85hwKVOeS0XmVjJr+yGTkjpFR/Jgmnx6mgcHk/60/L/YdjZ9ejsTGLaDNeUDpMqgWN5BlgE5+BRX5oQp74c/s4g6EgiAIwjzhF6S67/vyUsSBAAAAAElFTkSuQmCC"/>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<use xlink:href="#image22"/>
-  </g>
-</mask>
-<image id="image9" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAOLElEQVR4nO2by24d2XWGv3/tupwLL6IoGWnBBuwMEsOMHyGADeQV0uOM8xJRv4RfIDP7FQJYGTrjSAg8SCYG3YBEUSTPpS5775XBrkNSfXO7raMOAi6iUBIPzzm7vlpr7XUreJAHeZAHeZAHeZAHeZAHeZAHeZAHeZAHeZAHeZAHeZAH+X8u+r4XcE+EO3z2mXj5Upy9Fp/8jfjjpWBpXK3F8cmX13t16RwvnYtD5/Rz5/zE+YfLzKszB+D5c5/+0r/03m9czPcv4vnzCcaZ4KXB0qAxqAyuDGqDYLAx+tndmtva6TvnaJlRyihmXo+Z1GXiKtP/KN9C+pfnPl3ttwL0fYL5MpArAsdPA7MYuOoqNFY088DogdoDmNENxmz6hBgccsabTN0lBiW8jngfmSmxssRBSHzSJP74e4df5G8LKOz76r9ChCP0XPDC+MEycPW6Ih821N5QjTO2aU5jc7xaYCxhPMDCkuRLgi9J1ZJsC2qfk5hjeYZXLbXV4DWNVVAZBxirjfEG0TwW5xvo/hrOPoUXL/7EIj+uFD/y6afGyYnxbAgsU2AdakgNtA1xbKmsZRhnNFVDSi2hrsmxJllFyEY2YXJydowEOZKrEU8DZj0h98TcU1U9Q+xxG2jTCMsIlxFe53va85Wa8zHBFNP52UtxeWL812XFcVPTh5q2aoEZKc0JYc6YFoQ8h2oGaYarRdTgFU5AEi7H3TFFskeMgew9pi1mW1LaEmxLjFsq2zI0PU3sWaaR9lHk7WkCvhbOxwJzB+UVAU4qttTMty1oRm8LWi1IvkT5gMwSY0nWAvkcVwveIFWIgFxkAMt4TsCI1AMdnrcorFFeg1YkrTHWuG+owhbUQTvAJnLeJJ49S18F52OAKebzm0/tFgpDQ121bPsFmSUKBwQOwY9wlbNYAkukOZkZeANUyAOu3bozKCJGch6QtrhvkNbIbnC/IacbjGtCdQNpBc0G1h2bec8ij18HZ//O1xGfvjKenRireQ1DA8yKVvghWccEToBTXKfIn+D+FOkJzinoMfgJ+CPQcTn8CDgEHQBL4ABpgbPAmCO1uLegGlRhMlI23MAyjLUz65xN4zyODo+cf//Few5532DK7hNj4PqywucNrhmBJYlDzB8hHuN2ingC/ADpCfAE/BR0An6C6xHSEeJwArIELXGWiAWwAOaIGTADtcgboAYqhIEZSiIHIDqpcY5SJi2dx52z/Q/4xT/dwqn2iuX5tCU/+3Fgflix3bZEFqADgo6JeoxxCn6Kc4p0gvujYkpaklkgtYhiRk4AN5AmtXfwO3OCgawOscS1BOaYt2A1TgXBcBeVnN6dITn0Tj84F3P4+5eO42i/GiOePi1xyjJUXHpLpQWRYj7iMWJnNk+B6fBT0CPgeNKQJTuNgBmuGVIDtEADasDbcqYpmqIdyGJKwgADwMgkOcoJrxIm52Z0jp5mXnfwqzN49WqPGvP8uQBx9TJAqGmtJTJH+YDgx7hOwE8nX/IUeAycgI4mGLNy4ZS7XS5OSALfOd9Ja5SBBETQBMybAtArXNN73XEyUoIqopTAErZIbC8z82Xm7MeZszPtS2MmbXkdSkQbZxAWmB8hHuF6jLz4lKIpp0gTGHZg5rdw5OXOQ4V7BQpAmGAFwCZ4ATyU11UBBiqmdwtSGfeEe0IWMUvkbaa1BEeZi/90/ufK9wPGXbz6lXG1rEqYz5ykA5xj5I/BnyB7ivwpsifA6QTlsDhUn92aA4TboA4MSex+mA6f/u8Ykk2gwq0JaQKje5oVGPEc8RShjSRlxk3mh1Xi+CzvB4xksA7MqKmaGTEsqMIhpBPcHuM8Qf4U15M7n6IJCsVZ7qDcXdjXx1zavea6A0g5v/++AkZE0Ig04CFSeWQcE7OQuJxnruOeNKY43YrZQc02zanDkjEfAyeYTsGfgJ6CToFHFPM5mDTlfZ/y7YNQ3QP4viaVVzOaAkJ8xDVgjFNwOGKKWE6kmPjhUbIPDgUoZYTGuOoqaqtLIpjnJcz3A6RD8APkux1ncrQqWnLfTP582b0vULSuBlqcBc4S/ADnsASXfoCzJIQ5VWgJVqO24roP+wFzfi6oDI0VfW4I1paEUKWM4CxBC/J9KNTsTOe7Q9lJ0ZbyWdX0+S0lCFxgWoCVs3xOznNGZvR1Q6uaWQz72a6fXRaNaeYBvCLFFlUz3Odgc5w5Yo582lo/KJQit1rnux2qnr6rrMNZYJrjeY40w9K0llzRaU8aw9LovFTe0lgT6hrPLVIpL8inXOY+FA+4f9FZ/qUikErEzD04aouTzyWFcLUoNATVUFU0eU9grtZiNlcpR4aKHGtETfYSeKGm1Fd2O4+HEuZ/8GRfuNu0lRc4Tj19dwM2RcuqyamGVEGsGHxPYI5PBJuSuCEDq8Argqqi1j4FYzvz0V/ibL9ZJMB32/f0ndM6PJfA0VONhcCYK2KpLe/JlIB+JrrBIBnkEnDtjl3Qhhs++RXfA5QimnjvzNTwPK3BAu4BZGRKsV1m0O8JzGpbLnLWQg4im3CVQz7Z/XQud1R7wwLcQfcpvpnyLbkwE8iwLCyXvxsb7QfMwXyqhPV3v5O8BJ5QCm96v5z4Z7XDvqvI79Zy/9fZMXOCld/XwfdnSm3txODUOYNn3L2Uz8glkZt+cAf5lxb74cSRT1k4DkxrIU//zmCZnJ0kJ0SnGvYE5uiydAjJmdEzRsIUSw1kSuJEKkUmclmww970RuUGiHKTtCtREEERz4lMIigR20Ss9gTmeukcxdIhNCWw0uJwDVOl7W5Rd3DyN3/od5a7mo2TyndOOZIYcUZkIxZGSJFqSAy2p1zp8aGjg9I2xSKZEWcABtx7ivOZICkCqZjV7fFh5NZcdxriEd+VQL2sRd5DHsiMDCFCFWn2Bebt545iZlAqdY80lAXQlRYHHdCRGWDSIE1wPiQWTT4F31X33l8H2gIdhA7lnkYDjJFutScw5yfO6zHjdST6iFnpEOIb3DflzLQoeu7DEfkD4LlztNqZz6QhBcYGtMG1LYBiRwg90UeoIzPtCcyz3zupyxz1kcpHQu4x24KVZphphVgh1sAW0YEGiu/Jdx2A7ySOO/dMaKTA7zBtgDVO6VSar8A3JNuSco8PA00eWe3LlF4+deJfZXolsIGYe1LalrZpXuGULiGsgBXuW/B+sv84XdB3Maw7R1tMMwI9eAe2xn0FlM5k5ga0ImuNaUtDh9uAzSIHIe2n7HB25pyfZ1aWqPNIW/XAluwrsGtgMTXK5sCu9TEVqMTt7i2sJIGCP5VH+T2fsoMiyveiNfIbXNfIr8h2hfk15BWyNSltSSpTEWEbodtTzfe3L8ocylUrxtbwvuQnOQQ8VbcVf/OAbJdd73o/JWzfYdgxcddXALo/RnbPpzAW82RD0cor4BJxgfMG0xtcF7i/o7JrnBVts6VbDXg7wnnaD5jPEGefwicbeLMt+UijkpPIDZNNbdNdZ9Gmusn9nGm6aBWDkvKkRjvnPAVs0yHuupHQgW9BExS/BF0gLpC9IeULyJeId4xaId/QzjrUDnwSIquf70ljAH77W/jvf4XwBMaNGJJQEFUQKZeShGchuys33GqJpmj49qLzXaNs0grdi03QDkhfgLABu0GTpjhvkb0BvUF+USDpEnRN7WvC2JHmAxd15G/fJP75V76/TqRUJibPzzM/HUaul5OGxGI+0tQoc5WInYzvetC3QeCcXZVPVEWz3EqWrC90Ib3EKU6PaYOzwrlGXOJ6C7yB/AZ4S6V34DdE3wAdWJmXOf1x4tWpo9/sNdmfRkD+0TgjsJzVrJsWtIB4QNIxPp5g4QT3adyDE+AR6Kh0Ee4Vy/1LdWFgyn1QiWjlfYlNWAM3SFd4vsTtLfhbzN/i4S3Jr2jsGvKGWbOlWQ4s15F/u8z8+jcZsUeNYVr+8zOHF5n255F1Elwa40woFmeaJxNxL/FGiWk2QJl9cc3Bp1EzVXgug0OaRs2KeY2IAdQhNjhrjGvgCvGOnN8hXWJ6x+DXmN9ALtrSMdL9IfFDMr/+dd5l+fsfHHrxosydbBfAa9g0ZWgnNU5SpsmJHEp06h4xG3AfCN6D9SWfYUvZdkvULK2BNeIGuAaucb0Dfwe6xPyCbBd4vgC7wPwt6B3m14RwgzGZUDPAZeRnJF6dOb/85Xv39GNImcE7Pw88GwIbqwmxoU1zYl0mILDSCPN8SNAB2Q+waUpK0wSDU+N518eG4pzvmdG0RYsyambcEPMKhZsSWOZpDo+OVRo56MbbCc4yQe53C/5Y4ojP7sFhUdGvWtqhJbZzqmpOyqUZZ14acuQFrqn/pAb3GvdQypFA8ozd8y/QkbUl+IasNWJN0JreN7R5A94xm/d0jO+NtX4ByscF80U4f9cabz+v6eqaw0XDZjNDsxlVnpNyGWvNeTcs1CLVeKqnmMdQLhVBJ5WdLA8QStZueUvSlpC2RNvi3lGPPdjA0Q9Grv+Qbs3nK6B8fDD34YBx8bvA6Y9CGW2lhtjQMaMaW6rQMlI6hLsBaKwiE26L1sV1JyyMZEaUe0LoS0JIR5V76qbHNgP9oxE2kU+axMn0fMHXQIHvA8zue9+b+10aLCq6dzWzUFOppvMG6gblqUOYKsZcgRlmIuxqtFOFcMiRRgPRRzwMeD9wYAPDNBF+0SZOTxMvX/q0+8A3ZPDf70MWDiXOORMXvwv85KfG51cV1lUctRWDaogVVKVDGD1QVSJNGhOtgKmUiEOiakeIkSaPXM0iT7aR9fSQxcl7T6H8yaz9/95jORe/C/zkwLgmMDsJdCnQ5MAwPX1CbyUgBsbB8VmGnGnWiU7pvadOWOcvPDcA37LO87/3co6Zh/jP8gAAAABJRU5ErkJggg=="/>
-<image id="image15" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAED0lEQVR4nO3WPY4cxw7A8T/Jqv6Y3dXKeNALFCpwois48NF0H1/Cl5Biw3iRFwaePDsz3fVBOhjBgJ0YkIP1APUDGHVXo0kQZMEwDMMwDMMwDMPwV8KHD8qPPyrfHoW374SfnpTpQbnsQl6UuyocZ2Wt8qeTlxxMz0E7OMtvQXtwytE5vXHePzkf3wTvfwg+4C+U2z9ifI9xeqNs3ySOnxOPUwYylieQmWILVmawheYLnRlsQmqmLxlvGVkUc+WSlFcOxSD/D37+Dj59ipdO8mskfl2Nbzbj1BKTJOqSoGa0ZvqU0J5JakQYOgnugrij4vTama0iVomoTBSKKZe98vq/jfdPwQ8vneLXSezJmFuCNNFkgpgoOqPTjMaM20TzjESCaijQzdFomDTCC7QN1Q31DfGN1wf49Qz/eXOT3QKQOLVEXjJaZ1JbQFdMV+CA9xWzBWHGdQLseswdj4qlHXxDOFP8TMrGvgvbGrw25+NtzheAxCs1qkxYzCAHRO9A76E/kNIdEXeErMCMkIgQVBqiBY8NiRPYEWkZAZIFTRrnpbN87i+d4NdKbJ7INbOlhbmvNL0Hf4R4pPdXKA+E3kEshGRCBIlKsCNxBo5EZMSERid6Zdp30lQoi750gl8rsYoRnpDIhC8oK507RB6ARyIeIe4JDggZQYBKsCHMhBiCo1FoumFyAsu4GGm+4cJsVcmz0SORLNGZkJghFkRXQu4QvwcOIBOBIFSIRGhANPALsGCR/yiKFmVJ8nc/8G+VOKywN8GT0LsipkQYQQLSdRtpgsjXQIBAvjy/hoEoIkrvgiBEF/a42cIo5wuoxjUkcA+gg3YkOiINoiM0RBpCAxpBI6ITtOv74bjHH99KFsz5htf1kp2IjpcOqSK94BQkNkIuCBOBAo5w7ZiQirARciL8gspGxP5lUzVydHYN/JYLY9E500m5EHVH04XwCSKhIngEUJG4EGSILzNGdoIzyBHniMqJ5hsmhV4bmjttv+F7zNk7dlcIT3hKmCsqgoTTo6K64f1AMCOSriOGjkdBuSCcgCMhv2H6jLcL01QQbaz3N1yYgzb2qmhsdBXCA3C6FmBDeCZ0Ac+IG4Fc5w8VZ0dkIzij/UTwTMoXihf02JjSDRdmTw0ugq+wEmzWUSrSd1zP9D4jmlFNiCgeAu6oNNBKj4L0DZedZBe2srFK4Vkbb7nhm+/cOvsKcwvO7sjc8Voh7aRIkDI9EtEUTBGgWxBct5ZLQ61AqyCF11Oh/L9hdHi65Y75xXn7LvhMMD85rXe6VbwZTYwFYzJlR8l2vZf0EqgFGh0pzqyNs3fy1jinxrx2pl+cj+9udisNwzAMwzAMwzAMwzAMwzAMwzAMwzAMwzAMwzAMwzAMw/Dv8zvOXSk8gbruNwAAAABJRU5ErkJggg=="/>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,64.615385,-64.615385,0,64.615385,0)">
-<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/>
-</linearGradient>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface18" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 2.691406 0 C 1.207031 0 0 1.207031 0 2.691406 L 0 45.769531 C 0 47.257813 1.207031 48.460938 2.691406 48.460938 L 27.113281 48.460938 C 28.421875 57.59375 36.273438 64.617188 45.769531 64.617188 C 56.175781 64.617188 64.617188 56.175781 64.617188 45.769531 C 64.617188 40.632813 62.5625 35.980469 59.230469 32.578125 L 59.230469 2.691406 C 59.230469 1.207031 58.027344 0 56.539063 0 Z M 2.691406 0 "/>
-</g>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface21" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,55.294118%,45.882353%);fill-opacity:1;" d="M 0 2.691406 C 0 1.207031 1.207031 0 2.691406 0 L 56.539063 0 C 58.023438 0 59.230469 1.207031 59.230469 2.691406 L 59.230469 45.769531 C 59.230469 47.257813 58.023438 48.460938 56.539063 48.460938 L 2.691406 48.460938 C 1.207031 48.460938 0 47.257813 0 45.769531 Z M 0 2.691406 "/>
-<use xlink:href="#image9"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(8.627451%,78.431373%,66.666667%);fill-opacity:1;" d="M 64.617188 45.769531 C 64.617188 56.175781 56.175781 64.617188 45.769531 64.617188 C 35.359375 64.617188 26.921875 56.175781 26.921875 45.769531 C 26.921875 35.359375 35.359375 26.921875 45.769531 26.921875 C 56.175781 26.921875 64.617188 35.359375 64.617188 45.769531 Z M 64.617188 45.769531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,69.803922%,58.039216%);fill-opacity:1;" d="M 59.230469 32.578125 L 59.230469 45.769531 C 59.230469 47.257813 58.023438 48.460938 56.539063 48.460938 L 27.113281 48.460938 C 26.988281 47.582031 26.921875 46.683594 26.921875 45.769531 C 26.921875 35.359375 35.359375 26.921875 45.769531 26.921875 C 51.042969 26.921875 55.808594 29.089844 59.230469 32.578125 Z M 59.230469 32.578125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,69.803922%,58.039216%);fill-opacity:1;" d="M 36.347656 5.382813 L 22.882813 5.382813 L 22.882813 13.460938 L 36.347656 13.460938 Z M 36.347656 5.382813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,69.803922%,58.039216%);fill-opacity:1;" d="M 53.847656 5.382813 L 40.382813 5.382813 L 40.382813 13.460938 L 53.847656 13.460938 Z M 53.847656 5.382813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,69.803922%,58.039216%);fill-opacity:1;" d="M 36.347656 17.5 L 22.882813 17.5 L 22.882813 25.578125 L 36.347656 25.578125 Z M 36.347656 17.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,69.803922%,58.039216%);fill-opacity:1;" d="M 18.847656 29.617188 L 5.382813 29.617188 L 5.382813 37.691406 L 18.847656 37.691406 Z M 18.847656 29.617188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,69.803922%,58.039216%);fill-opacity:1;" d="M 18.847656 5.382813 L 5.382813 5.382813 L 5.382813 13.460938 L 18.847656 13.460938 Z M 18.847656 5.382813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(20.784314%,83.921569%,73.333333%);fill-opacity:1;" d="M 36.347656 5.382813 L 22.882813 5.382813 L 22.882813 13.460938 L 36.347656 13.460938 Z M 36.347656 5.382813 "/>
-<use xlink:href="#image15"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(44.705882%,97.254902%,88.235294%);fill-opacity:1;" d="M 18.847656 17.5 L 5.382813 17.5 L 5.382813 25.578125 L 18.847656 25.578125 Z M 18.847656 17.5 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(77.647059%,99.215686%,95.686275%);fill-opacity:1;" d="M 59.113281 40.269531 L 43.75 55.632813 L 33.769531 45.652344 L 37.578125 41.847656 L 43.75 48.019531 L 55.308594 36.460938 Z M 59.113281 40.269531 "/>
-<use xlink:href="#surface18" mask="url(#mask1)"/>
-</g>
-</defs>
 <g id="surface1">
-<use xlink:href="#surface21" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,58.039216%,49.019608%);fill-opacity:1;" d="M 49.003906 29.78125 C 54.085938 29.78125 58.707031 31.691406 62.222656 34.828125 L 62.222656 4.003906 C 62.222656 2.445313 60.964844 1.1875 59.410156 1.1875 L 3.527344 1.1875 C 1.96875 1.1875 0.714844 2.445313 0.714844 4.003906 L 0.714844 49.824219 C 0.714844 51.382813 1.96875 52.640625 3.527344 52.640625 L 29.40625 52.640625 C 29.257813 51.667969 29.179688 50.664063 29.179688 49.640625 C 29.171875 38.675781 38.058594 29.78125 49.003906 29.78125 Z M 49.003906 29.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(12.156863%,75.686275%,65.490196%);fill-opacity:1;" d="M 19.460938 6.351563 L 5.777344 6.351563 L 5.777344 15.023438 L 19.460938 15.023438 Z M 19.460938 6.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.039216%,86.666667%,78.823529%);fill-opacity:1;" d="M 38.269531 6.351563 L 24.585938 6.351563 L 24.585938 15.023438 L 38.269531 15.023438 Z M 38.269531 6.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(60.784314%,99.215686%,92.54902%);fill-opacity:1;" d="M 19.460938 20.09375 L 5.777344 20.09375 L 5.777344 28.765625 L 19.460938 28.765625 Z M 19.460938 20.09375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,72.54902%,61.568627%);fill-opacity:1;" d="M 19.460938 33.832031 L 5.777344 33.832031 L 5.777344 42.378906 L 19.460938 42.378906 Z M 19.460938 33.832031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1.568627%,73.72549%,63.137255%);fill-opacity:1;" d="M 38.269531 20.09375 L 24.585938 20.09375 L 24.585938 28.765625 L 38.269531 28.765625 Z M 38.269531 20.09375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.372549%,75.294118%,65.490196%);fill-opacity:1;" d="M 57.121094 6.351563 L 43.4375 6.351563 L 43.4375 15.023438 L 57.121094 15.023438 Z M 57.121094 6.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,72.941176%,61.568627%);fill-opacity:1;" d="M 62.21875 49.824219 L 62.21875 34.835938 C 58.714844 31.699219 54.082031 29.789063 49.003906 29.789063 C 38.054688 29.789063 29.167969 38.675781 29.167969 49.648438 C 29.167969 50.671875 29.246094 51.664063 29.390625 52.648438 L 59.40625 52.648438 C 60.964844 52.640625 62.21875 51.382813 62.21875 49.824219 Z M 62.21875 49.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(15.294118%,81.176471%,69.803922%);fill-opacity:1;" d="M 62.222656 34.835938 L 62.222656 49.832031 C 62.222656 51.382813 60.96875 52.648438 59.410156 52.648438 L 29.398438 52.648438 C 30.835938 62.1875 39.070313 69.507813 49.007813 69.507813 C 59.964844 69.496094 68.84375 60.609375 68.84375 49.636719 C 68.84375 43.753906 66.28125 38.46875 62.222656 34.835938 Z M 62.222656 34.835938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(77.254902%,99.215686%,95.686275%);fill-opacity:1;" d="M 59.195313 39.867188 L 46.765625 52.300781 L 40.382813 45.90625 L 36.566406 49.738281 L 42.953125 56.128906 L 47.011719 60.195313 L 50.824219 56.363281 L 63.253906 43.929688 Z M 59.195313 39.867188 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureDevOps(m).png b/dist/DevOps/AzureDevOps(m).png
index 2dd6ee70..01dd2128 100644
Binary files a/dist/DevOps/AzureDevOps(m).png and b/dist/DevOps/AzureDevOps(m).png differ
diff --git a/dist/DevOps/AzureDevOps(m).svg b/dist/DevOps/AzureDevOps(m).svg
index 7df19fd8..77537c3b 100644
--- a/dist/DevOps/AzureDevOps(m).svg
+++ b/dist/DevOps/AzureDevOps(m).svg
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9" y1="16.97" x2="9" y2="1.03" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0,108,188);stop-opacity:1;"/>
+<stop offset="0.16" style="stop-color:rgb(0,120,210);stop-opacity:1;"/>
+<stop offset="0.53" style="stop-color:rgb(1,147,255);stop-opacity:1;"/>
+<stop offset="0.82" style="stop-color:rgb(31,159,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(41,164,255);stop-opacity:1;"/>
+</linearGradient>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 7.09375 16.667969 L 0 25.933594 L 0 45.746094 L 7.09375 47.066406 Z M 7.09375 16.667969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 52.886719 15.867188 L 52.886719 69.972656 L 70 55.863281 L 70 12.746094 Z M 52.886719 15.867188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 0 25.933594 L 52.886719 15.867188 L 31.148438 0 L 31.148438 7.265625 L 7.09375 16.667969 Z M 0 25.933594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 7.09375 47.066406 L 70 55.863281 L 52.886719 69.972656 L 26.507813 61.160156 L 26.507813 70 Z M 7.09375 47.066406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 66.109375 15.554688 L 66.109375 53.433594 L 50.554688 66.1875 L 26.445313 57.398438 L 26.445313 66.109375 L 12.792969 48.261719 L 52.578125 51.371094 L 52.578125 17.265625 Z M 52.851563 17.460938 L 30.527344 3.890625 L 30.527344 12.792969 L 10.035156 18.820313 L 3.890625 26.714844 L 3.890625 44.644531 L 12.679688 48.535156 L 12.679688 25.550781 Z M 52.851563 17.460938 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureDevOps.png b/dist/DevOps/AzureDevOps.png
index a3738952..bc461a58 100644
Binary files a/dist/DevOps/AzureDevOps.png and b/dist/DevOps/AzureDevOps.png differ
diff --git a/dist/DevOps/AzureDevOps.puml b/dist/DevOps/AzureDevOps.puml
index 4c48c5e2..8f314440 100644
--- a/dist/DevOps/AzureDevOps.puml
+++ b/dist/DevOps/AzureDevOps.puml
@@ -1,8 +1,8 @@
 sprite $AzureDevOps [70x70/16z] {
-xTT7Ukim34NXouAw__s-ai1TWk68NqOwCxUV9DoHHnqB4fzB59SbYbjVeRZJ4iMr7LIYSG0PvfSOFwjH60TEDTMVc_YiphwL7Dn6P1srkdWMLGUQ9mqFzSdg
-k6k85x9nMNAGnABRsyYZDYQht_Kwq3mJ6b2F7XNnGigpuwjjPPQ1H6avC1gYLB7T4GHGKJGxGLMP2L1Msjq9NaPGLlohpH7KbRWY8IgA_wfoAgToAgToAkYJ
-zRZoLHyq-c4bRb2XsTi1fPb7EPOhwFwS2GTMLp0yUiLezAe2yYZ1CYLYBwHCmp85wiLI1RP4QKiKT4-hlWkdVvpYDVOFa-HlQxcPlqjClL37JirYfss-WwnX
-jtuxRmufiiP5oI567eMIGXFlub0IgEDz6ieUP2XbeMn3YbgD4Mr0XCV-0W
+xTBNbgqm281XEibv__SzRTZDYOWxJlU_Tdq1bl14PoI7AEvyYEAAHoZkSeZYHfDAf3YfH7A8uaPpojHQoEgB6FP5OZx8Q6Q8Mxhy6CU4ULgiXSIYDjoIr0k9
+sWAj3X6f402kNvnQdfiGndljldi5FGKuW84YSCjgGAve1bGLJe2oGWbGLpm4eGJ8bTjb3V9ofNrHvLHEfKTbfT_t_HM7-qu5TLQ9f4qg4Vka4f4m4que4VV_
+jUQc8ao8poXW_LNDxKRM56XzlHXIHROKxBLo1VWG1VJNlWo6-HwZCup3lWCXM8lYYssj8QodiR1uyIJZFBu1bBQEA6pKRo-HzkIkQVGmBzi0GTXE5bilDtCe
+vSlRuVrc1iMwmJAoG0IgeS4WzlZLgY4CGq7u0Vq1
 }
 
 AzureEntityColoring(AzureDevOps)
diff --git a/dist/DevOps/AzureDevOps.svg b/dist/DevOps/AzureDevOps.svg
index 97448d5b..00a9eb8f 100644
--- a/dist/DevOps/AzureDevOps.svg
+++ b/dist/DevOps/AzureDevOps.svg
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9" y1="16.97" x2="9" y2="1.03" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0%,47.058824%,83.137255%);stop-opacity:1;"/>
+<stop offset="0.16" style="stop-color:rgb(7.45098%,50.196078%,85.490196%);stop-opacity:1;"/>
+<stop offset="0.53" style="stop-color:rgb(23.529412%,56.862745%,89.803922%);stop-opacity:1;"/>
+<stop offset="0.82" style="stop-color:rgb(33.333333%,61.176471%,92.54902%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(36.862745%,62.745098%,93.72549%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 7.09375 16.667969 L 0 25.933594 L 0 45.746094 L 7.09375 47.066406 Z M 7.09375 16.667969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 52.886719 15.867188 L 52.886719 69.972656 L 70 55.863281 L 70 12.746094 Z M 52.886719 15.867188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 0 25.933594 L 52.886719 15.867188 L 31.148438 0 L 31.148438 7.265625 L 7.09375 16.667969 Z M 0 25.933594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 7.09375 47.066406 L 70 55.863281 L 52.886719 69.972656 L 26.507813 61.160156 L 26.507813 70 Z M 7.09375 47.066406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 66.109375 15.554688 L 66.109375 53.433594 L 50.554688 66.1875 L 26.445313 57.398438 L 26.445313 66.109375 L 12.792969 48.261719 L 52.578125 51.371094 L 52.578125 17.265625 Z M 52.851563 17.460938 L 30.527344 3.890625 L 30.527344 12.792969 L 10.035156 18.820313 L 3.890625 26.714844 L 3.890625 44.644531 L 12.679688 48.535156 L 12.679688 25.550781 Z M 52.851563 17.460938 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureDevTestLabs(m).png b/dist/DevOps/AzureDevTestLabs(m).png
index 8768a37c..cbe2b0dd 100644
Binary files a/dist/DevOps/AzureDevTestLabs(m).png and b/dist/DevOps/AzureDevTestLabs(m).png differ
diff --git a/dist/DevOps/AzureDevTestLabs(m).svg b/dist/DevOps/AzureDevTestLabs(m).svg
index d9cae6fa..d330dcd9 100644
--- a/dist/DevOps/AzureDevTestLabs(m).svg
+++ b/dist/DevOps/AzureDevTestLabs(m).svg
@@ -1,8 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.679688 43.820313 C 20.71875 41.859375 19.320313 39.339844 18.621094 36.539063 C 16.800781 28.558594 21.699219 20.578125 29.679688 18.761719 C 31.359375 18.339844 33.039063 18.339844 34.578125 18.480469 C 35.28125 10.921875 39.898438 4.339844 46.621094 0.980469 C 44.519531 0.421875 42.421875 0 40.039063 0 C 30.519531 0 22.398438 6.160156 19.601563 14.839844 C 18.058594 14.28125 16.519531 14 14.839844 14 C 6.578125 14 0 20.71875 0 28.980469 C 0 37.238281 6.578125 43.820313 14.699219 43.820313 Z M 22.679688 43.820313 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 19.601563 64.820313 L 34.441406 39.199219 L 34.441406 28.839844 L 34.160156 28.839844 C 32.339844 28.839844 30.941406 27.441406 30.941406 25.621094 C 30.941406 23.800781 32.339844 22.398438 34.160156 22.398438 L 41.160156 22.398438 L 41.160156 39.199219 L 33.320313 70 L 22.539063 70 C 19.320313 70 18.058594 67.761719 19.601563 64.820313 Z M 19.601563 64.820313 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(12.54902%,44.705882%,72.156863%);fill-opacity:1;" d="M 14.742188 43.910156 L 26.835938 43.910156 L 30.863281 37.015625 L 30.863281 29.804688 C 28.742188 28.636719 27.257813 26.410156 27.257813 23.863281 C 27.257813 20.152344 30.335938 17.074219 34.046875 17.074219 L 50.910156 17.074219 C 54.621094 17.074219 57.699219 20.152344 57.699219 23.863281 C 57.699219 26.410156 56.214844 28.742188 54.09375 29.804688 L 54.09375 37.015625 L 58.121094 43.910156 L 62.789063 43.910156 C 66.925781 43.589844 70.320313 40.089844 70.320313 35.742188 C 70.320313 31.183594 66.714844 27.574219 62.152344 27.574219 C 61.835938 27.574219 61.515625 27.574219 61.199219 27.683594 C 61.730469 25.878906 61.941406 23.863281 61.941406 21.847656 C 61.941406 9.757813 52.183594 0 40.304688 0 C 30.757813 0 22.59375 6.257813 19.730469 14.953125 C 18.242188 14.425781 16.546875 14.105469 14.851563 14.105469 C 6.683594 14.105469 0 20.789063 0 29.0625 C -0.105469 37.226563 6.472656 43.910156 14.742188 43.910156 Z M 14.742188 43.910156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(12.54902%,44.705882%,72.156863%);fill-opacity:1;" d="M 48.578125 59.925781 C 48.578125 60.746094 47.914063 61.410156 47.09375 61.410156 C 46.273438 61.410156 45.605469 60.746094 45.605469 59.925781 C 45.605469 59.105469 46.273438 58.4375 47.09375 58.4375 C 47.914063 58.4375 48.578125 59.105469 48.578125 59.925781 Z M 48.578125 59.925781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(12.54902%,44.705882%,72.156863%);fill-opacity:1;" d="M 65.972656 64.589844 L 50.59375 37.863281 L 50.59375 27.046875 L 50.910156 27.046875 C 52.714844 27.046875 54.199219 25.5625 54.199219 23.757813 C 54.199219 21.953125 52.714844 20.46875 50.910156 20.46875 L 34.046875 20.46875 C 32.242188 20.46875 30.757813 21.953125 30.757813 23.757813 C 30.757813 25.5625 32.242188 27.046875 34.046875 27.046875 L 34.363281 27.046875 L 34.363281 37.863281 L 18.878906 64.589844 C 17.183594 67.5625 18.5625 69.894531 21.957031 69.894531 L 62.894531 69.894531 C 66.289063 69.894531 67.667969 67.453125 65.972656 64.589844 Z M 25.136719 64.0625 L 31.5 53.03125 L 40.410156 53.03125 C 40.199219 53.453125 40.09375 53.878906 40.09375 54.410156 C 40.09375 56.105469 41.472656 57.484375 43.167969 57.484375 C 44.863281 57.484375 46.242188 56.105469 46.242188 54.410156 C 46.242188 53.878906 46.136719 53.453125 45.925781 53.03125 L 53.136719 53.03125 L 59.5 64.0625 Z M 25.136719 64.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 70 35.699219 C 70 31.21875 66.359375 27.578125 61.878906 27.578125 C 61.601563 27.578125 61.179688 27.578125 60.898438 27.578125 C 61.460938 25.761719 61.601563 23.800781 61.601563 21.839844 C 61.738281 9.800781 51.941406 0 40.039063 0 C 30.519531 0 22.398438 6.160156 19.601563 14.839844 C 18.058594 14.28125 16.519531 14 14.839844 14 C 6.578125 14 0 20.71875 0 28.980469 C 0 37.238281 6.578125 43.820313 14.699219 43.820313 L 62.441406 43.820313 C 66.78125 43.398438 70 39.898438 70 35.699219 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 64.820313 64.820313 L 50.121094 39.199219 L 50.121094 28.839844 L 50.398438 28.839844 C 52.21875 28.839844 53.621094 27.441406 53.621094 25.621094 C 53.621094 23.800781 52.078125 22.398438 50.398438 22.398438 L 34.160156 22.398438 C 32.339844 22.398438 30.941406 23.800781 30.941406 25.621094 C 30.941406 27.441406 32.339844 28.839844 34.160156 28.839844 L 34.441406 28.839844 L 34.441406 39.199219 L 19.601563 64.820313 C 17.921875 67.621094 19.320313 70 22.539063 70 L 61.878906 70 C 65.238281 70 66.5 67.761719 64.820313 64.820313 Z M 64.820313 64.820313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 52.640625 53.898438 L 45.640625 53.898438 C 45.78125 54.320313 45.921875 54.738281 45.921875 55.160156 C 45.921875 56.839844 44.519531 58.101563 42.980469 58.101563 C 41.441406 58.101563 40.039063 56.699219 40.039063 55.160156 C 40.039063 54.738281 40.179688 54.179688 40.320313 53.898438 L 31.78125 53.898438 L 25.761719 64.398438 L 58.800781 64.398438 Z M 52.640625 53.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 42.980469 58.101563 C 44.660156 58.101563 45.921875 56.699219 45.921875 55.160156 C 45.921875 54.738281 45.78125 54.179688 45.640625 53.898438 L 40.320313 53.898438 C 40.179688 54.320313 40.039063 54.738281 40.039063 55.160156 C 40.039063 56.839844 41.441406 58.101563 42.980469 58.101563 Z M 42.980469 58.101563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 48.160156 60.480469 C 48.160156 61.253906 47.53125 61.878906 46.761719 61.878906 C 45.988281 61.878906 45.359375 61.253906 45.359375 60.480469 C 45.359375 59.707031 45.988281 59.078125 46.761719 59.078125 C 47.53125 59.078125 48.160156 59.707031 48.160156 60.480469 Z M 48.160156 60.480469 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureDevTestLabs.puml b/dist/DevOps/AzureDevTestLabs.puml
index 78f52e82..ab2344e4 100644
--- a/dist/DevOps/AzureDevTestLabs.puml
+++ b/dist/DevOps/AzureDevTestLabs.puml
@@ -1,9 +1,10 @@
 sprite $AzureDevTestLabs [70x70/16z] {
-hPPLekWm24IHOFjVyDDhKQYSh-f4Xg6571RpY71JHhW7M_p46rn7OaRW6kInXE426ZiKobZiCIZYSSBBCtakev5XaCAHqo0ZAk23zPJzngY1rRg_FXbMCrDX
-Y2emGXO9UQ3GuWvIB0zhDCEwAk1MdF8yzz9C2BROu3MTQvnuuj-xmp1-YYtwJhvrAdmiAjjMBNOgVbnGSeiEcSbL-ECMfYw7xYFrENobC-wQXDE7lbUQT5id
-7E7JQICiT3LQhTdxDIXbAj4sAcXz9kFCHaK66_m5bMZwXahmAohmZeg-eeAlg80aVmQjSEqS9Leb2UVW7BDaouQgtTKv59jHqndowSiic_xZGtUJuyTnc_dM
-3TpW6vHHYBjdTxif22FuaqDNbi-7d_rf8jJXPx_DULDcgDAIRDH8MdADh0sMe3YZHPSJgEooyWSQVn7-XvJTzdxnscsf5zsMmGZftkEQspW-XlsvbTpMQVzG
-JJhHF4wqynBx5MfXQt5nNVh2fZH0iig4zSzO6g2Ll150vdRlQYaXdhfSyb6E0JBDi9FR5DVGfAqKEIpegKgBQnYyi2H30FWD
+hTO5Skmm383X6CIz_tLBIufhUPKc__23RnHfQNjRwKWi8apGjlzLG5og_0-eeFZKlfD-4EbxG-qMroE3y1mnqtu2SM4IgH8WjoWtYUppI7uQdYA-n6umG5nQ
+yqk95UCJpvD_fYOfHTOABH1Vcoq3Y8K9Us8hqOkckrra5HqtuOoqCZvIbrKM1Xx1U8oVp3ABWPYmTU9s4XYEI2YSNsbyfBuUH8Ll-R_zg_1o4aMuXwz8noUg
+IyG89WhogC0ICPmgD5wQpYZmKDQ8yLIHXr9BGl6CcqJibQ1J0iGvRf1zsiuedk7pYcd12nJ3TeMYsnMARN29ibsZz57HuyhaO_UuekuZ9gbmz5r02qPXK4YZ
+Zr-85HeLvF2NJC60aSadWvgFo-Pgo1C6em-fMqfjUr-5YO9rErQVAd0CgJ1Li9qOnNK4QH0fFOyK21Ki-UTPA91VhKV6webHNDdLnah-sl0R_SIFzuJSelGm
+xOMGgDh7JtfBtBKJLyQRejzvHIbvxUv6OVtE7AAQktRreuZ-YTsrKwDunMp_J9dL8jrw8HyVjbjmIxo1oAtbbbkD6oRpFEDQCjVsL_PAjE2I78KaQ7tj2lim
+QdbjEAH0Ji4tXMk9bVmifHzGuFT8Nm
 }
 
 AzureEntityColoring(AzureDevTestLabs)
diff --git a/dist/DevOps/AzureLabServices(m).png b/dist/DevOps/AzureLabServices(m).png
deleted file mode 100644
index d45b589f..00000000
Binary files a/dist/DevOps/AzureLabServices(m).png and /dev/null differ
diff --git a/dist/DevOps/AzureLabServices(m).svg b/dist/DevOps/AzureLabServices(m).svg
deleted file mode 100644
index a9b83588..00000000
--- a/dist/DevOps/AzureLabServices(m).svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="56pt" viewBox="0 0 70 56" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 70.058594 31.851563 C 70.046875 38.175781 64.867188 43.3125 58.441406 43.371094 L 55.269531 43.371094 L 43.808594 26.074219 L 43.808594 15.457031 L 46.035156 15.417969 C 47.21875 15.414063 48.179688 14.46875 48.183594 13.300781 C 48.191406 12.734375 47.96875 12.1875 47.566406 11.785156 C 47.160156 11.378906 46.609375 11.152344 46.035156 11.148438 L 32.832031 11.148438 C 31.648438 11.152344 30.6875 12.097656 30.683594 13.261719 C 30.6875 14.429688 31.648438 15.375 32.832031 15.378906 L 35.058594 15.457031 L 35.058594 26.097656 L 23.410156 43.386719 L 13.859375 43.386719 C 5.699219 42.8125 -0.46875 35.878906 0.0273438 27.835938 C 0.523438 19.796875 7.503906 13.648438 15.675781 14.054688 C 17.9375 14.050781 20.167969 14.566406 22.191406 15.554688 C 22.964844 9.210938 27.160156 3.773438 33.15625 1.335938 C 39.15625 -1.101563 46.023438 -0.160156 51.117188 3.800781 C 56.210938 7.761719 58.734375 14.121094 57.714844 20.429688 L 58.539063 20.429688 C 64.921875 20.457031 70.074219 25.566406 70.058594 31.851563 Z M 70.058594 31.851563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 54.191406 54.226563 L 24.503906 54.226563 C 24.0625 54.226563 23.652344 53.988281 23.441406 53.605469 C 23.230469 53.222656 23.25 52.753906 23.496094 52.390625 L 33.691406 36.996094 L 44.902344 36.996094 L 55.183594 52.386719 C 55.425781 52.75 55.449219 53.210938 55.242188 53.597656 C 55.035156 53.980469 54.632813 54.222656 54.191406 54.226563 Z M 54.191406 54.226563 "/>
-</g>
-</svg>
diff --git a/dist/DevOps/AzureLabServices.png b/dist/DevOps/AzureLabServices.png
deleted file mode 100644
index 43e25884..00000000
Binary files a/dist/DevOps/AzureLabServices.png and /dev/null differ
diff --git a/dist/DevOps/AzureLabServices.puml b/dist/DevOps/AzureLabServices.puml
deleted file mode 100644
index 7362d94a..00000000
--- a/dist/DevOps/AzureLabServices.puml
+++ /dev/null
@@ -1,10 +0,0 @@
-sprite $AzureLabServices [70x56/16z] {
-lPK7SiCm30G1TXx-_zxqG4fWa8RRJdEHRhZ7HdjA6nF0x3NHZQGEEPZrfemX_q0yfq8iWob4buiWKm2rkIUcYmlIrPt8WadNaI0hMg2KUvsIREYHQaVYCwdf
-O9ZsGBw0RrfeInOlHGSpd2hgcFDhw_8npPd-mb0bka2PSZ3q2qPhsa1j7QAmDO3uwAJ2_6naxqxfye2K9k4KsqkHsr9QBOaKn5CKD5QVS8ezXn5FiVioIpp5
-nhJxKwJIb1tOhYimP4VUJsT3u51pIvoxb7dLNjdq0lLPJvC4RWpNgGHyV2SEt3g-4us0Z-S4IW4VpsaufiPdwLI8t4rGlmtQGLOdE-Q4XG-tCwnETim9lazj
-PwfrEkvQ7ZiVtmc5b09Jk_eidKQYCxcVWy3MnpgXPp9mBh-am-UYKogbPAOjwcET0gYFTOgWFjOf03SFZlhidU8-SQUsWYC-zpgbjYQ_C8Lu3Js3Tm
-}
-
-AzureEntityColoring(AzureLabServices)
-!define AzureLabServices(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureLabServices, AzureLabServices)
-!define AzureLabServices(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureLabServices, AzureLabServices)
diff --git a/dist/DevOps/AzureLabServices.svg b/dist/DevOps/AzureLabServices.svg
deleted file mode 100644
index 87e5ab9b..00000000
--- a/dist/DevOps/AzureLabServices.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="56pt" viewBox="0 0 70 56" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 70.058594 31.851563 C 70.046875 38.175781 64.867188 43.3125 58.441406 43.371094 L 55.269531 43.371094 L 43.808594 26.074219 L 43.808594 15.457031 L 46.035156 15.417969 C 47.21875 15.414063 48.179688 14.46875 48.183594 13.300781 C 48.191406 12.734375 47.96875 12.1875 47.566406 11.785156 C 47.160156 11.378906 46.609375 11.152344 46.035156 11.148438 L 32.832031 11.148438 C 31.648438 11.152344 30.6875 12.097656 30.683594 13.261719 C 30.6875 14.429688 31.648438 15.375 32.832031 15.378906 L 35.058594 15.457031 L 35.058594 26.097656 L 23.410156 43.386719 L 13.859375 43.386719 C 5.699219 42.8125 -0.46875 35.878906 0.0273438 27.835938 C 0.523438 19.796875 7.503906 13.648438 15.675781 14.054688 C 17.9375 14.050781 20.167969 14.566406 22.191406 15.554688 C 22.964844 9.210938 27.160156 3.773438 33.15625 1.335938 C 39.15625 -1.101563 46.023438 -0.160156 51.117188 3.800781 C 56.210938 7.761719 58.734375 14.121094 57.714844 20.429688 L 58.539063 20.429688 C 64.921875 20.457031 70.074219 25.566406 70.058594 31.851563 Z M 70.058594 31.851563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 54.191406 54.226563 L 24.503906 54.226563 C 24.0625 54.226563 23.652344 53.988281 23.441406 53.605469 C 23.230469 53.222656 23.25 52.753906 23.496094 52.390625 L 33.691406 36.996094 L 44.902344 36.996094 L 55.183594 52.386719 C 55.425781 52.75 55.449219 53.210938 55.242188 53.597656 C 55.035156 53.980469 54.632813 54.222656 54.191406 54.226563 Z M 54.191406 54.226563 "/>
-</g>
-</svg>
diff --git a/dist/DevOps/AzurePipelines(m).png b/dist/DevOps/AzurePipelines(m).png
index 2a9596d5..7107c0d0 100644
Binary files a/dist/DevOps/AzurePipelines(m).png and b/dist/DevOps/AzurePipelines(m).png differ
diff --git a/dist/DevOps/AzurePipelines(m).svg b/dist/DevOps/AzurePipelines(m).svg
index ee189faf..a59efe74 100644
--- a/dist/DevOps/AzurePipelines(m).svg
+++ b/dist/DevOps/AzurePipelines(m).svg
@@ -1,55 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<image id="image28" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAEeElEQVR4nO2ba2gcVRTH/2dmH4kPqCQa302VtkahWgSDUls1G7F+kBBtECmW7H6RNCIUW22bFHWNkkJ8tVZrGoJR7EMtSBAptha0KvpFK5aG2mAxQpJqEZq2m8yjxw+b1Ww7k0139947050f7Jd7Z+757z/nzH3sBAgICAgIkA6pFjAVPvlMBcrWLwP11IAOlokNtn0Y5uxtdMkffzp1e8YYNm5NQLPeBAYvlRd18QkYg3c4maPJE+EOT7y2HNrRbrmmAMDXFQiPJpx6lBvDqX1zoHe/A9hqspcW3ejUHJKtYyoMnRBKbAWGLlOpwwm1GWMcaAEN1SvV4IKyjOGUWQ1t4auq4udCiTHpEpr7HjB0uYr4M0FNKRl7Vnq1hDJIz5h0CS3wbAllkGoMv5DUECrvBdhzs9C5yC2ldXe3gPg+qTHzRFrGcGrfHGitni+hDFIyJl1CD/QCRzxfQhnklNK6BStBoSVSYhUJ4aU0WUKviI5TbEIAwONd86E9WAdaK2DBVdnopxLKEGLrzgagcyewJiImxBdihhWMBm7qBE4IMsW/aKD2uapFeBFN2QGRx1F+gudVAmNcCIxxITDGhcAYFwJjXAiM4dgpp+bAGG475NRc4sbUjOEMPnbqKWFjdMbZWCvNsv9x6i1RY+adgr1jOUXe6HO7gtjSWaYk5fDfB2DXNFPZyNHpLiuhjJl9Brz0eXRsXpLLFAAgNt/vAsVXyZCmDI7uh9WfoPK632d6i4Zw/Flg1dsidakjkyVrYxdiCjD5qhlDJ1jNW4Dep8QIVAAPfwvbbqaya37L53YNAAg2I9TbAjy8rbjqVHB9Kp0lWxfnawpwzsuJvEvX0VjVB4w+UbhABRSYJVPJmpWoybaxe/RJoHxnoQPLpThZkhM+lIywubSfLZ3P+5ibX2froeOOfSo+5sEfeDx5kzAznM259/NsESNJAOCJxC1sPTqs3BRLZzaXrRHx/V0XeHRbu4GR6x4DR/enW1q3UPjqdgCgaM8A7Fn3Aw0jIkR5gWl/u6YbdqT4eN0juAKt6KjcmNUX7RngiZ/qoZ/+CvjySrEyfQhbL75VUqU0E9hcsRp46eliifESeRvD5orVoA835r7Sn+T1fkz6DYmL1xQACPF41/zzWk9/OkwV3510vWv3z/1orPrIeYW8YRPw/eO+fyA7PtCM2njO+3bpOls1fdkPwqp2QPI6x2sP3/T24UgzMO8DAABXbqDwaBK4ONY5Bc1K/5tzT0PGlP/6oj0DsNvqgfq/CpOohoKPNqnJtin0zWeOfdGFv4K3v1toDBUIPfNlozYOuna9yBiiEGYMG7VxaL90A4YvD9yFiGZj711+NgUQZAxFYj+CD/vm/wacEPYXpXB1G3iwQ9T4ohGa6n42x3mvpEUWsVE7sxHG9E+m2z5QuLqNzWMA3eyv2angJbnTXsspjnns5ZLYElwofisrqdNp2pw9xT2u4M6xoo43ifR1BoVjzxXPnKsmcLZ8b3HGykbJAqxwc3QGbzoM3N4k6ge2fwGrPoXIRpUnXAAAAABJRU5ErkJggg=="/>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<use xlink:href="#image28"/>
-  </g>
-</mask>
-<image id="image9" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAANfElEQVR4nO2bzW4lx3mGn/erPv88PCRnJrKRODACwwsFCGDoAuyb8C1okUVuwdZt+Ba0zypAlHUiZGUtAsEWYBuyxJkhD3n+u6veLPqcGXJEcjhDzo8MfUCDG4Ld/fB566uurhZvvSz4NPjoJJj+JJjkxHRa0etWe2lVlXqU3CGRczjnwEl0a0H/DudcwaZjlK2UCmlTVDtHx3mW+w19Misy+2SO/1r48t/W1b3d763KAsRHJ8GTbmI0q8idimHpDlZ0mqbfdbhyLh0yyUmBc9AkQX2H8yZI2UhFpWRUZUXUZZObQaFOqapnNA1PezWTXgZ4m2AEn4hf/TL480+C0awi6s6oppfLqFeU++40PdPtusldFFWFEjhAuvvZo5BzaVJqVKI2bBSxkdYbMusRbFK15mz2I+CtgjHwqTg+DoarCqfOsCn9XOiXtB66iqFzGiQ3fVL0nN0pTgk7EdwRTJjSmBRNuDQS69x4beWVUmdJIlwnERm6yfD2wLS2fPTjoHuY+Dp3RqN+L+d6UIJRKdVeEnvGI6cY2u4T6oZcYRLFdwRjIxWKmoI2UFYRsVCkRYZU6hKqGqlURpsCbw2M4VeftBFKdUVadXPO/ZLSsCSNU8kTO/YdHkfRCDGE6Bp3UCS0HZte//zGysi1YC3HosCMUrqJSJKVS1VKiTyom7zkrYDZdqHjD4Ph44qNu4NBt5edhiUzTrkcWBwqfIA1sbxnaRgufZsOKIC460UAWdK6FK/A80DdEilRAEV2bhorGodrePNgdgOu+PI48XDcGXrVy3UaumIvpWZix6HRAxyHVj6UNRZlZNRDdLATRvgOcVIURGN7LbGU3LdJIVNSZHBNShsXr51SBW8cjOHXn4r/XSZGvYqSu7mjQclllIr2S3QOBEeoPBTlAegQsa/CyEGP4g7aGnOnxuSCaQQrw8LQsQUmIzYUrRNeBiyzSgfeKJhthL4gtRHa6w5y0885hoZxSZ645COkB8YPcTw0PhQaOxhieigqKOke2nUBGpulg44shGvhNYVFyPNiulbqkHOCNwfmygg14WHJ1V5K3i/FhyIOjY9EHBmOJA6APcxQ0AUnt2PMHcGoiNJAJDCC2miI6QM9Qxe5nVQW3iSYqyPkOo1aKOUgFAeFciR0BBxKTLD2wSPwwGg78Ho38N5hjHGxqSUbqzHug1sg0MGqCCeCRLTnewNgbohQlccu2kc6MBwKHSAOcJmgGIP3QANED7vCBLqrLQAqCGx1wO0hVcgVu9m1I+zns+y7tsHvXEEboUdiSiLGnaHXvRwxLLCXnPYtHUg6kHyIdCBrH2IPe0j7n+xi2gsWu1Z9t8MOzM6+9uat3dxILYxy6R9wz2AMv/5Q/HkboWbZayNUthFiEkUHLhzaMbG9b9hDHkr0QR2g2gK546TubnWPYF6IkHK3n913XUauNLZjH5UDyweSDxAToTF4hBls814B0Y6P74wJcH9groxQqXqDIu0le98qFyIUE5l9YA8YgHuYDpC216TtEsU7q3sCczlCo0sRivGlCBUdvM8R2tU9gPluhPKlCDGJNkKHEgeE9gX772uEdnVXMLeIEJO2E/kAaRshjYDh+xihXd0RzC0jxC5CZWI83kao9z5GaFd3AHN9hNKLETIXuhDD9zlCu3pdMFdEKD2LkJ9FiENJbYTQ+PsQoV29JpirIrQceFPvXY6QDlz8vYrQrl4DzA0R6lR73/cI7epVwfzNR2hXrwjmbz9Cu3oFMPcdofcXCtwezBuI0PtdtwRzTYT8vYqQ28PtIQqoPdT+FDay4VZgbogQuwjpfY6QUXsIClbBZOznP0spuBTKDtLLwdwyQvk9jJC2hmBMCwEyoiZUI9XbLRQ1QUNEg8jKcRswL4mQ3tsIXYgLGdHQQtiANypeY1YF1sBa2RtZteyGRIYbwdwiQuWqCF23nPA2oFywhG1kUA1ab1+2LY0WlhaWF8ILycsiraDZyN4ol+YmMHeIkK5ZkXvjddkS3NAassYsDXOkc+AM+wzpDDMraI5jkUu1rGEjR30DmO9ThK6zxBvhFTAHnyOmMqdCJwpOZJ8qmAqfK5W5wstQrJQ314Fxa8sf/qndH1etO8VVz00ME+zZsR/lqoncO4nQ9ZaghdEMOAOdCJ4aP2kPPRE8tdOJis4ynqmwlPJ6ORxurgFDa8v022A6rUbQLbn0HTE0uxhpIjNB7D+D8lYjdNESLlsiluwsgVPBU/AT28dC3wp/K3Ns/EQuJzmYBp5FlRehZo2X1xnziTh+JCZ/SvS6VVG3Y6KXlIcmRkEZA2OHxqCx8QjF4C1G6AVLuGyJmfPMEj2xOAa+kfWN7W8sfWtxLHiaUzmN0FmoN4umLBfRW1M6N+yPOT4OOIy9NakZ5I6de7b6tofASDByYSR5aBjg0rfV3b7yfEMRkltBdmOJC6iB0kha26zBS9BcMDOcWZ7KTA0noBOH2zGmMC0qZ1E8i8wiVXk5r2JNoWY+b64B82F7Q01P7hOul5WVOqZ0QT2gB+oj9w09oCupMqTnL+HvYZfl5dpZ0k7W8NYU16C1zQpYgGZC55bPMKeCU0untk9NOQ3iNCufyek8SppFxXLZq1aENpRVzXyTebDJfHWdMeu/Co7kcLgzCEoOMikSyVC5uEIkoH2/7IvR2cnie4TyoiVuhDdGq5ssMZyacip0qtA0K58Hnqkq81R7uci9NetFzWTeUB82/PRR4bPjm3Zt/gx4CgyvusHtg5banZAuRjLe3oDwnbaFvQjkSktYt1Cus8Sntk7BpzLTEjEVzSzQPHJZpFRW88FgTTmvWeX2UeH3FPgvw29uAvMlcIQiW3UpElkpmgJ1uxMpNsYbcI1U29SYLkHe2rOj+bqArrdEWuEXLLGn4qIlLSChaY5yHtQzMZjHpl4to7uiThtO1w2TfuanXxQ+o8DHbi/3t77mwh3886cV0N3rMmiaNM51PozkhwV/oKIfGX4s+MDS37V76Hwga2Q8ADrs5jGv3plesORZ16lpn2u2lnDZEnPqaMcStLMkTUUzE5pHzouUtJpXW0sWDxsmfyp8fljg12V7iZeikb57bRL/WInqKDbrJnVokk1VrE5IHdtdKToSHUQlXLUbCJ0k6QUgOyi3gfPcEthaQrtPTrEEz0Hngilwgngq8wR4DDy2/FjocUhPSvFJRJ4Gg7O08Xyl3qLOvRXTTU23aviXTeY//ljgX72dE32nro7S+Ofmq68K1QdN9GZ1CVZq8kJJ54i+5J6tLnbHqJIJQ9hIapeCLvz9l20Ve/lYYl8xlnhqxYnt52OJOJPKeVS7sWS5mg8vWPKz/cxnx+b3O0t+e22HuMKY/4Sv/lv8fVf0zlS7UjclOYpKExFIRShArSkS3rZphYBQuz3sNua8viXSY6PHgscRelLCJ6EyDeIsbdbzlUbfteTf/8c3WXKxrhl8vzCPfln487IhfR3LerDqJyeiiqwcCaLgUHm2R05EQCnt/M7menOetfLXsISppQuWeFqk1pKLHWe4/9ySD/7ajiW3sOQlYLYzzM8ofPQ78aRbUxWtRl31l7WQlCOUJBWEvD1fMS+FI7Y7vM32SbggNXjXcWKFWYJvmJdc7Dhxc8f5xSzz6dfedpxXmljdMCjuPrr6XeLJzxPVX7oMS7+/6QwLaVwSkwRHxXogl0eIR5hHhB5QyhGKCXgsMbDpI9ovSZ4rU7iy42gm2FriqaRTs7Vk13G2lrxux7lN3bCddWvO5x9nPvodPPn5hsVfWA1r+hsgJ3KCJFOIa8wBOyywi3vb2XILxmQFG8Ma64IlPnO7djLdGnLy3JI4y6GzN2XJpbt/+a+8pjnogeRDS/vgPUxfrTVtoEyNWLfRuTgveXeWXKxbbIB+TXO2L3DkUkw02MP2+yNpO3nbYJZCc+PzC2PJNZZoJmsRNcs3Zcmlu779r76iOaGH2A+QDm32JQ+B7nZJIgs2RSyEznE5e7klnUVK6zdqyWuCeRU45UGgB0YPhA/drva1YNpz5m2M5hJnNlPEqdGp7FNJZ1k7S8rWkmpFs6hZdWsmZD4k8+kX24e++7HkDmDgdnB8WOAo4MjWgeX9sIZuv/IQJsusHJ6Dz+2Yvg+WXKzXfPq9AY56eyXqSSo6sMqBzMShMWb3gClEpmil0LyQZ7LO3gdLLtYd1k1ugqO94hi3mxTL2MQI50FIFVjFaiDWUl5KaZZpZmo70zu15GLdcUHpCjjjbq+/qoclpaHxyDmGKRiAelZpu2BJWbCRyioXL+WYK7F815ZcrHtYabsCTky6g/6mX3Luu5S+HT3TdEmpfV7KKnLU6mw2amIVKVahZv2uLblY97Ro/QKc3h86VOPOCLpF3Y6VO67ryp0qAFQ3hYocjjpgM8/LGh9smK+bd2nJxbrH1fwLcKY/ab+xXjxM9GbVXlpVzv1wSQJQZM/XZHpk1puGYcnvgyUX6x6/V9q+Hfz848w/DDK5X9N8s6E/WM1yfzFfbxaLejBf1Mv5vOnN6bGkP1jR1Bs6H274xazh86/zFsruLeM7qzfwpnD77psP290S5/8nVodivXfhXF9C70emf2LGX5vPflNoF6zgHQP5oX6oH+qH+qHeYf0/0l0oPcbProQAAAAASUVORK5CYII="/>
-<image id="image15" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAGVElEQVR4nO2aS3IbyRGG/z+ruhtvEZqBVhNecKkJ38ARnkvwDD6GqHP4CLyELuClZsmNIzxhwSM+QBDorqr8vaBeY0+MQInEBCb6W+JRlfWhqtCZkUBPT09PT09PT09PT09PT09PT09PT09PT09PT0/PQ8P9T6lP5nxJnL745dunLwG80McXKPwO7FMMAQGnIF6fEcsFsZoS23Pi+btPnB/fSZiuhMVS+P5EOIXehblXQfsSQ+CUOHlOnF8Yjv9CLN8YplNDWxHd27s46qdCk4TVyrF45jjfCMfnjrMfBZwKe5QT9zDHRylAQP3nsFi+CTlOQ+m6oA6mujOEobh5K7LxEHOpr3L+93RVcH4MnMBxJu1zg9sjj/+JlO8DtsdxPl7XW2DQhttRUhqnej3NPprkxGkCJqltR5042PCnBqmqMF0FnF8YTsFf3k+PHvhjjv2plE08Wq3qFIaNMzcVY+OWa3mqpIakBOViMXQJoTWlNiK2123bYfGsA14XnJ34vi7jxzpK/yfliW+argkDL2kYLY9yyUMpNkFVBctGdy9UUvFtdA+5qlDS2udR5WL5xoCFP1Ksv0p4hDF/VUrKGhSUcYRPTdUMFmaAzxyaiByJVpMhmpxuUkwsxVVYDUs7GhX83Dj+9nfh1au97JiHvmN+Q0ochxRmFI6KaQ74N4C+IfmUwtyEI3mZOm0kYeCh1AKi2tawWhmOzwm8+HwED8RDHqXPSMkzoz0p9CMDZ4ImpA0Aj1AoDm+NBpenoGrjLBExmswMXfeAYe7GQ4nZUUqZU+EI8ieAxiJryAh6MhkEtaAF0Q2FfPT/zN/gIcTsKAVzWphTOpI4FTE0IDrkFAGWAAchipIQ3EETNtKj3ISf4Wt/k3tIwZxe5oKekJhQGEqojDBQglBASyRSphKJTO+KjWLBdOp36cLLB1n0jgv7mu/eUwo5ozC5O0IyAFnkhsJK0KWRP0N6K4W3AX5VolZNGd1e5FULIOPVD2VfzzFfumO+XArYAAqARCLRtRW0NseN4GuHrS1gk9S1oS3pIq8KFs8ci+Vek8gvEfN1UogA0Qm2AtakVpSuPfDKZNdG3qS83QSOtzHmhLYpON/cZdp75L5H6QGkoBBqBa4JXol+Kdnb4OXSwctSxeuAvK7W3F7Nhy0G5xnAXtMB4H475pGk4OKDlKBVcL+tIrdXo9sOg2EGTspd2WG/NbVdZ3tEKbr4IAVhXdXaXKXbDk++S8DzgrOXe6/FALvlSneVt5OlfZBysWlS/ONKAXYSI+LkzHB+bBj+szpaoc6T4aBQ45DzzKCjQs0pzQn9IaQAnxdDgMSz54ami09DqZKNm+LdKGZNLMQnLsyNdkTjkWgzAhNBA1AB4kFKAT6bEgg4BfCvfxA/wXLXxBKsjl0ZFoQxvUxpnDowozAlfCSqAWiHLAXYJVd6fUbcTAzVLLgYlVLtjI0xjxwcARqbY+TUgLQKEkEWSt2hSgF2EbNcEADnaWAtt7EqrHJVasBqExun1zBVAA3uoFmCe5bxlvJrkQcnBdg1u1409NuNaZ1NIQQIEUQEPMJhoInw4mYtBCdtS+BGskvBLw9NCnDfskNtRDLC3pVfRQdUqJJEkhAoJDfeQliJuAyuy0OTAtxXTOdCrB2enQiJUEfDxkVAaEE5jK0Ba0mrAF45eHVoUoBdxSxbERCbUJIzBwsdS2ndeCsnjOxAGWDF5S2AtRluXHZdrNwcmhRgFzGLpXAz0WU1K5Mti4dNsrbalroOIXdwKSmEePeA7MXI1os2kq2L2nWo0m1VDw9KCrCLmO9PhNdnwlXwUI2Sd1WXgyzC4SEUlbJ9V3QC5AUeukBuc/RN2IRtleP2ioclBfisGAI4BZZ/dQClGjC7Vy0sITO5ckwVm4BcDOaiV6Vjm1WP21hKF0PXXU6nHQZP8yFJAXbKrt/lSj8iYPZd+HbhsWtvKtc0utZRqTLURnQuVpUbmY3M0Sy/jcuMwfHBSQF2FYOXxMkLAmcBy4Wh7sK3g7Hl6xQ0jlRek+uxGLPirCr/2a4dXV2wmpbfq43ja9mxHvNezvO7hp/l0vCnCbEZEm3zcYymFYYb4c0z/9D8c4BSgHuVxd63YLxrD3vfFfW/fOiEet8ytv9uqIfgS+qF3G2dhymkp6enp6en52D4L16GcoyT1sq5AAAAAElFTkSuQmCC"/>
-<image id="image21" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAHE0lEQVR4nO3Zz27c1hXH8e/v3EvOUNLoXy0DKVIUENBNveoT1C/h54n6Gt135WW6r7MsiiybTQsDQVMUtRJb0kjDIXnvOV2MXKSLAnKAoHLBD0BgOODi8Df3DnnuhdlsNpvNZrPZ/xX9rwv4LwQB/Ea8+KW4PBPrlTjvxOUbA2BY3Nf+DSzOgq4P3jx1Vuvg7DJ49lVw8Vnc32L8gAIem9B/BHL21PjmOrFaG6mm476z2M+Kku5rv8GGhVvX+du+d4ZF5fjKefPUOX/tvPwq4LMAfVA4jyyY96F8JniZuDwzIB9DrpD9/iA3FnnajZzRQ4v9Kh+rGSWtVa5DBbfCp0eVyzfO8+fOBR8UziMK5j6U5782zp4a2z6f9O+aUnJTm6Z11UVUa5pU2ghy1GQASsmJUs18mjyPKmVMXRpyX6erdpxItdB39UPDeVzBvMDgq8S2z8frdTuluqihZbSLZa7q3KculBYpagMpAWDu1dOkVAcVbc2avti4TWPX5/1huJ4OR9Lfd+G8+sLhwh9STfpR7/XBQlwg/vhlovtbc7ymnVK3qCn2srUH1OlI4ghxTMSxpGOkw5AfKtjHvJPbQika95pSrVZMRGzYaz2GUoPTT4JnBF+9fNCIeSTByABjMWbSUZPNFtWm/eTNgVOPJJ2E61ToFOlUcBLBCehQSfvh1slYyMlkS54asqDW1hlb368e23fF+fZJ8I/ffkQj5uIP4u5PifKzvCp1Ual72WwXiutE0mmEngieIJ6ATjEdQxyB7RN0Qq1QIzC5y809R3htJqe1ejjim9O3zl9/Vx9SUv6x7/lB/vxSXJ4Z+U2uedHmomWZYl/ZD2WceNgTKX6C7JjgEGIPvAUJ9wnRI1s7vjSUJGFF1bOX7O1US4zTcS28PS4PLelxBHN5JlYrW22u8jRNrdQsk3y/el4Ffix0SsQTwQnEkdBeQIsQaBL0BEvJsodDqIZ8TKSt+7QN01A9RhbDg2fI4whmvdIZa+vbLoXGxieWMtsTcQBxCByHOIE4BY6C2CdiN2JgBPogskIorCC2kjZR/S6Iu8jWuEc+7Tp7+8CSHkcw553qbTH3MUW1BrM28CXEnqR94EDOCuMwnEOJPdACEGgEb4SAKKHYWtith/ZIsYwai8bV1NQm73t7aEmPI5jbrxXTU0XpU9uSqNFUo4W0UMQS6FzWKaLbhcKeoN01QpHBgJiATkEXxtI8FrhaTE0EOYa75IvpwcE8+MIf1y+IshatKXyhMLNwS4bnIJpAjYhG0BI0Qk0QLdD8+9D9YZYJb2L3oyfcLGo13ASHD67okQRzL3nAdH8S96/vit3n++9E7JplBcR9G35/SRC4Q1ig7736W/7g7vpxTCX+gnITDBZqGi91qoLqnotZTIRGDx+RRoIxRN71MkbsptCANCg0hhghJhEFWSFqVcJF48r1wQE9jmAOfh66/TrkBz7GVJPShDTI2UZED9FLugOWaFdzQAEXaAzoFbEJ2ARsEJsIbQkNYTY6Ksmt6m74yIJ53UdadW4dRYNPSs1ALVthG8Qt6MaJpdD7esvuP0YSjBI9oRuha8QNHreIOyx63AaVmMyHmg+bB731wmMJZrWOy9WtH45NtdyNhrYl607OWqhDtArlIBAqCnpkLYQEUxC90E0Q7wi9C/yasLVFbCTbRk6j1VK+3d49qE+CxxLM2WVw+6t6Y9+V/ZFxyv02Rb5TaIGV1sOSCBkqQWyRdRDtbg1HE6gPWENcB/adWXoX+I3LbvMUfVDHBIX19UcWzLMXwedfOj/NJfk4+cC2ZG9Ssmw1pZQi3FUhBuCOiA7R3C8nFWCLuI3QjcmvIngX0nWi3E3ybTPZeAWFT599ZFPpguD5Oiif1pvbf04Hh2lgMkvVVZOwajXkk1w90h6wVETGQkCJ0CC0Ab/F7SbCb8xYF9ldUt2uu26k7wuXbz6yEQPw/Lnz+ZeitdKSh9GuVX2f5DU8WQnSED5twtLSPBZBJDyh5JVggtimiE2NuEuR7orVTaqLTVN9IF8W1p9Uzl9/ZE8lFFwEvHjtvD4vb69GTo+PGNMYtXf3hU9NtIOn2EAsUG1krUVU4apQSngaQ7Z1aYuxzeRtrv14tVqNLJ8Wzn/pvPz9x7gYjuBit23y+txox/zEPI8H1tRijaeh9VLaNlsTU5Mi1d1iuHmIRRk1FE0+WdOMqYxj0x5Mb/NlYXm+m0KvvvAP2UZ5TMGwe8oAL14ar8+Np0dGvk6npeTiV9ltL7mTY5oM3xcdMHioKW6Rqmpfs6K8My+MbWW9qj90b+mRBQO834W8QLx6ZaxX4umRcXBpXA7ptOstpkZRdl2B8irUlHjb985q5azXztmlc3n2vf0k+NANt9lsNpvNZrPZbDabzWaz2Ww2m81ms9lsNpvNZrPZbDabvfcvhBom2odigxMAAAAASUVORK5CYII="/>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,64.615317,-64.615317,0,64.615317,5.384615)">
-<stop offset="0" style="stop-color:rgb(255,255,255);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(255,255,255);stop-opacity:0;"/>
-</linearGradient>
-<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,64.615317,-64.615317,0,64.615317,5.384615)">
-<stop offset="0" style="stop-color:rgb(255,255,255);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(255,255,255);stop-opacity:0;"/>
-</linearGradient>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface24" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 9.421875 48.742188 L 12.675781 45.265625 L 16.714844 49.304688 L 13.429688 52.589844 L 17.410156 56.570313 L 20.695313 53.285156 L 24.761719 57.351563 L 21.539063 60.578125 L 30.960938 70 L 45.769531 70 C 47.257813 70 48.460938 68.792969 48.460938 67.308594 L 48.460938 45.785156 L 62.21875 36.597656 C 63.71875 35.601563 64.617188 33.917969 64.617188 32.121094 L 64.617188 8.078125 C 64.617188 6.589844 63.410156 5.382813 61.921875 5.382813 L 37.878906 5.382813 C 36.082031 5.382813 34.398438 6.28125 33.402344 7.777344 L 24.214844 21.539063 L 2.691406 21.539063 C 1.207031 21.539063 0 22.742188 0 24.230469 L 0 39.039063 Z M 9.421875 48.742188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 5.382813 64.617188 L 5.382813 53.847656 L 0 53.847656 L 0 70 L 16.152344 70 L 16.152344 64.617188 Z M 5.382813 64.617188 "/>
-</g>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface27" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(91,185,255);fill-opacity:1;" d="M 0 53.847656 L 5.382813 53.847656 L 5.382813 64.617188 L 16.152344 64.617188 L 16.152344 70 L 0 70 Z M 0 53.847656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,76,132);fill-opacity:1;" d="M 0 24.230469 L 0 39.039063 L 9.421875 48.742188 L 13.460938 44.421875 L 25.578125 56.539063 L 21.539063 60.578125 L 30.960938 70 L 45.769531 70 C 47.257813 70 48.460938 68.792969 48.460938 67.308594 L 48.460938 45.769531 L 24.230469 21.539063 L 2.691406 21.539063 C 1.207031 21.539063 0 22.742188 0 24.230469 Z M 0 24.230469 "/>
-<use xlink:href="#image9"/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,105,184);fill-opacity:1;" d="M 11.65625 44.25 C 10.75 43.339844 10.609375 41.917969 11.324219 40.851563 L 33.402344 7.78125 C 34.398438 6.28125 36.082031 5.382813 37.878906 5.382813 L 61.921875 5.382813 C 63.410156 5.382813 64.617188 6.589844 64.617188 8.078125 L 64.617188 32.121094 C 64.617188 33.917969 63.714844 35.601563 62.21875 36.597656 L 29.148438 58.679688 C 28.082031 59.390625 26.660156 59.25 25.75 58.34375 Z M 11.65625 44.25 "/>
-<use xlink:href="#image15"/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(47,166,255);fill-opacity:1;" d="M 13.429688 52.589844 L 33.984375 32.035156 L 37.964844 36.015625 L 17.410156 56.570313 Z M 13.429688 52.589844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,142,248);fill-opacity:1;" d="M 20.695313 53.285156 L 16.714844 49.304688 L 33.984375 32.035156 L 37.964844 36.015625 Z M 20.695313 53.285156 "/>
-<use xlink:href="#image21"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(91,185,255);fill-opacity:1;" d="M 47.117188 30.960938 C 51.574219 30.960938 55.191406 27.34375 55.191406 22.882813 C 55.191406 18.425781 51.574219 14.808594 47.117188 14.808594 C 42.65625 14.808594 39.039063 18.425781 39.039063 22.882813 C 39.039063 27.34375 42.65625 30.960938 47.117188 30.960938 Z M 47.117188 30.960938 "/>
-<use xlink:href="#surface24" mask="url(#mask1)"/>
-</g>
-</defs>
 <g id="surface1">
-<use xlink:href="#surface27" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,99,172);fill-opacity:1;" d="M 24.523438 59.941406 L 33.796875 69.214844 L 48.851563 69.214844 C 50.683594 69.214844 52.160156 67.722656 52.160156 65.90625 L 52.160156 31.140625 L 24.523438 58.792969 C 24.199219 59.101563 24.199219 59.617188 24.523438 59.941406 Z M 24.523438 59.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,119,208);fill-opacity:1;" d="M 0.921875 21.289063 L 0.921875 36.339844 L 10.195313 45.613281 C 10.519531 45.941406 11.035156 45.941406 11.34375 45.613281 L 38.996094 17.964844 L 4.230469 17.964844 C 2.414063 17.964844 0.921875 19.453125 0.921875 21.289063 Z M 0.921875 21.289063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(17,154,255);fill-opacity:1;" d="M 35.71875 4.433594 L 13.398438 38.582031 C 12.644531 39.75 12.800781 41.273438 13.777344 42.25 L 28.074219 56.550781 C 29.050781 57.527344 30.59375 57.679688 31.742188 56.925781 L 65.890625 34.589844 C 68.070313 33.164063 69.371094 30.730469 69.371094 28.144531 L 69.371094 4.332031 C 69.371094 2.464844 67.847656 0.9375 65.976563 0.9375 L 42.183594 0.9375 C 39.578125 0.9375 37.160156 2.257813 35.71875 4.433594 Z M 35.71875 4.433594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(113,194,255);fill-opacity:1;" d="M 5.945313 64.519531 L 5.945313 52.453125 L 0.921875 52.453125 L 0.921875 69.285156 L 18.011719 69.285156 L 18.011719 64.519531 Z M 5.945313 64.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(133,203,255);fill-opacity:1;" d="M 52.242188 26.238281 C 56.9375 26.238281 60.746094 22.429688 60.746094 17.734375 C 60.746094 13.039063 56.9375 9.234375 52.242188 9.234375 C 47.546875 9.234375 43.738281 13.039063 43.738281 17.734375 C 43.738281 22.429688 47.546875 26.238281 52.242188 26.238281 Z M 52.242188 26.238281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(43,165,255);fill-opacity:1;" d="M 37.023438 29.128906 L 18.839844 47.308594 L 23.035156 51.503906 L 41.214844 33.320313 Z M 37.023438 29.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(81,181,255);fill-opacity:1;" d="M 19.414063 55.121094 L 23.023438 51.507813 L 18.832031 47.316406 L 15.21875 50.925781 Z M 19.414063 55.121094 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzurePipelines.png b/dist/DevOps/AzurePipelines.png
index 55ec5cf9..ac6ae961 100644
Binary files a/dist/DevOps/AzurePipelines.png and b/dist/DevOps/AzurePipelines.png differ
diff --git a/dist/DevOps/AzurePipelines.puml b/dist/DevOps/AzurePipelines.puml
index 7b80a4f3..5cb02254 100644
--- a/dist/DevOps/AzurePipelines.puml
+++ b/dist/DevOps/AzurePipelines.puml
@@ -1,9 +1,9 @@
 sprite $AzurePipelines [70x70/16z] {
-rT5PkXiX34HXm80akFjVRooFb4tAwimvx_r_fIRzv_t_bVhTSjJ8NKabY8YoMapfIkivWbJz1KgHumg_nwuTL-eYO0UK8e10SQKZyUfOIAa8Q6-rrYQszb4f
-0ehKMqsFA1sGNfz9NAcR9R0ceXIylzMr7bKw85gnDoM_LiwTceBIAwOlYjesDQg8tPABqiSsiqFA-355KQ48_xkeS8I_D5Vuc6OVbJbiboo8VbJcj7tI0A7A
-X2clZYTcH464nvMvkKS32XgRAQAKQMbLfXjxX3AdHPdt31gEKARdv24om7WWGX5NvXeOmvGZMbq01QUC1L5VjQcNTA_zAA8rFn1W5WEGSsm8CYE0m12emvJn
-ZdXa23B3soCU3WamY60m19FfYNr6OCYEwRaeHJnnX32IKdA68hCdMajUiGUoC-PiAL9ZI5GfJG018wharhiG9AQSaGkpC-9AxLwpD-EBAoSFcPfFXiYN8qnf
-7gofsHzyPyILT1rMT46EA5Yrcm78GINhl2FU3oeo_Skh4DsIDyYp-QDAMvNu5i9WL67CSOKpNAdF24CLZAw9AvI9AvmvnHJAp9wsVGC
+lT09ZiGm24HHx1WA9_S_x-nRLvg0fMZ-0PuAv3_R31vblMPq8hXMGZnf5926JB62Odw3ilaT2kvGrEjA_HwOgXhM592XupF5WgA4ZDzGLdg046DBz-XuY9JY
+FJOUivBI_NBAq982KWPNKOOlA1lcytn16NkGhoWpGEPPiVYxTSH12bB5dwKq9LEcvuoJKa6OKQIAXzcNO-wPClqYm02YfOXmkUBhIcKA4aMbWY1XjhFo14aO
+YAHJW8pPH58aLLHEIeJ4of2JCbSHT7blFYYhYCfdRQuYF8IPkOQCBu6O9SIQV4LC3U4XpDGG7iBCB24yX1bqL10qaPY1I4EEJ9MmFl6X8KFsGoMjuHAPnr5H
+f5yWSp-AYcgC74THKRDF9XX2IeXyCivz6HMbctqomP18QUynqnk28O4otlkxHj-GDnmqfAvyCM_85yD3weeqaR_C92DHE9o7h2iuzZbvIAum4bPNzBX3QViT
+YlHzNIaoTOMPTOMPki8bJ5L9cL5HKgPNb8nHERTnGenHNSwz0W
 }
 
 AzureEntityColoring(AzurePipelines)
diff --git a/dist/DevOps/AzurePipelines.svg b/dist/DevOps/AzurePipelines.svg
index d3e67793..d4b0ef2e 100644
--- a/dist/DevOps/AzurePipelines.svg
+++ b/dist/DevOps/AzurePipelines.svg
@@ -1,55 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<image id="image28" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAEeElEQVR4nO2ba2gcVRTH/2dmH4kPqCQa302VtkahWgSDUls1G7F+kBBtECmW7H6RNCIUW22bFHWNkkJ8tVZrGoJR7EMtSBAptha0KvpFK5aG2mAxQpJqEZq2m8yjxw+b1Ww7k0139947050f7Jd7Z+757z/nzH3sBAgICAgIkA6pFjAVPvlMBcrWLwP11IAOlokNtn0Y5uxtdMkffzp1e8YYNm5NQLPeBAYvlRd18QkYg3c4maPJE+EOT7y2HNrRbrmmAMDXFQiPJpx6lBvDqX1zoHe/A9hqspcW3ejUHJKtYyoMnRBKbAWGLlOpwwm1GWMcaAEN1SvV4IKyjOGUWQ1t4auq4udCiTHpEpr7HjB0uYr4M0FNKRl7Vnq1hDJIz5h0CS3wbAllkGoMv5DUECrvBdhzs9C5yC2ldXe3gPg+qTHzRFrGcGrfHGitni+hDFIyJl1CD/QCRzxfQhnklNK6BStBoSVSYhUJ4aU0WUKviI5TbEIAwONd86E9WAdaK2DBVdnopxLKEGLrzgagcyewJiImxBdihhWMBm7qBE4IMsW/aKD2uapFeBFN2QGRx1F+gudVAmNcCIxxITDGhcAYFwJjXAiM4dgpp+bAGG475NRc4sbUjOEMPnbqKWFjdMbZWCvNsv9x6i1RY+adgr1jOUXe6HO7gtjSWaYk5fDfB2DXNFPZyNHpLiuhjJl9Brz0eXRsXpLLFAAgNt/vAsVXyZCmDI7uh9WfoPK632d6i4Zw/Flg1dsidakjkyVrYxdiCjD5qhlDJ1jNW4Dep8QIVAAPfwvbbqaya37L53YNAAg2I9TbAjy8rbjqVHB9Kp0lWxfnawpwzsuJvEvX0VjVB4w+UbhABRSYJVPJmpWoybaxe/RJoHxnoQPLpThZkhM+lIywubSfLZ3P+5ibX2froeOOfSo+5sEfeDx5kzAznM259/NsESNJAOCJxC1sPTqs3BRLZzaXrRHx/V0XeHRbu4GR6x4DR/enW1q3UPjqdgCgaM8A7Fn3Aw0jIkR5gWl/u6YbdqT4eN0juAKt6KjcmNUX7RngiZ/qoZ/+CvjySrEyfQhbL75VUqU0E9hcsRp46eliifESeRvD5orVoA835r7Sn+T1fkz6DYmL1xQACPF41/zzWk9/OkwV3510vWv3z/1orPrIeYW8YRPw/eO+fyA7PtCM2njO+3bpOls1fdkPwqp2QPI6x2sP3/T24UgzMO8DAABXbqDwaBK4ONY5Bc1K/5tzT0PGlP/6oj0DsNvqgfq/CpOohoKPNqnJtin0zWeOfdGFv4K3v1toDBUIPfNlozYOuna9yBiiEGYMG7VxaL90A4YvD9yFiGZj711+NgUQZAxFYj+CD/vm/wacEPYXpXB1G3iwQ9T4ohGa6n42x3mvpEUWsVE7sxHG9E+m2z5QuLqNzWMA3eyv2angJbnTXsspjnns5ZLYElwofisrqdNp2pw9xT2u4M6xoo43ifR1BoVjzxXPnKsmcLZ8b3HGykbJAqxwc3QGbzoM3N4k6ge2fwGrPoXIRpUnXAAAAABJRU5ErkJggg=="/>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<use xlink:href="#image28"/>
-  </g>
-</mask>
-<image id="image9" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAANfElEQVR4nO2bzW4lx3mGn/erPv88PCRnJrKRODACwwsFCGDoAuyb8C1okUVuwdZt+Ba0zypAlHUiZGUtAsEWYBuyxJkhD3n+u6veLPqcGXJEcjhDzo8MfUCDG4Ld/fB566uurhZvvSz4NPjoJJj+JJjkxHRa0etWe2lVlXqU3CGRczjnwEl0a0H/DudcwaZjlK2UCmlTVDtHx3mW+w19Misy+2SO/1r48t/W1b3d763KAsRHJ8GTbmI0q8idimHpDlZ0mqbfdbhyLh0yyUmBc9AkQX2H8yZI2UhFpWRUZUXUZZObQaFOqapnNA1PezWTXgZ4m2AEn4hf/TL480+C0awi6s6oppfLqFeU++40PdPtusldFFWFEjhAuvvZo5BzaVJqVKI2bBSxkdYbMusRbFK15mz2I+CtgjHwqTg+DoarCqfOsCn9XOiXtB66iqFzGiQ3fVL0nN0pTgk7EdwRTJjSmBRNuDQS69x4beWVUmdJIlwnERm6yfD2wLS2fPTjoHuY+Dp3RqN+L+d6UIJRKdVeEnvGI6cY2u4T6oZcYRLFdwRjIxWKmoI2UFYRsVCkRYZU6hKqGqlURpsCbw2M4VeftBFKdUVadXPO/ZLSsCSNU8kTO/YdHkfRCDGE6Bp3UCS0HZte//zGysi1YC3HosCMUrqJSJKVS1VKiTyom7zkrYDZdqHjD4Ph44qNu4NBt5edhiUzTrkcWBwqfIA1sbxnaRgufZsOKIC460UAWdK6FK/A80DdEilRAEV2bhorGodrePNgdgOu+PI48XDcGXrVy3UaumIvpWZix6HRAxyHVj6UNRZlZNRDdLATRvgOcVIURGN7LbGU3LdJIVNSZHBNShsXr51SBW8cjOHXn4r/XSZGvYqSu7mjQclllIr2S3QOBEeoPBTlAegQsa/CyEGP4g7aGnOnxuSCaQQrw8LQsQUmIzYUrRNeBiyzSgfeKJhthL4gtRHa6w5y0885hoZxSZ645COkB8YPcTw0PhQaOxhieigqKOke2nUBGpulg44shGvhNYVFyPNiulbqkHOCNwfmygg14WHJ1V5K3i/FhyIOjY9EHBmOJA6APcxQ0AUnt2PMHcGoiNJAJDCC2miI6QM9Qxe5nVQW3iSYqyPkOo1aKOUgFAeFciR0BBxKTLD2wSPwwGg78Ho38N5hjHGxqSUbqzHug1sg0MGqCCeCRLTnewNgbohQlccu2kc6MBwKHSAOcJmgGIP3QANED7vCBLqrLQAqCGx1wO0hVcgVu9m1I+zns+y7tsHvXEEboUdiSiLGnaHXvRwxLLCXnPYtHUg6kHyIdCBrH2IPe0j7n+xi2gsWu1Z9t8MOzM6+9uat3dxILYxy6R9wz2AMv/5Q/HkboWbZayNUthFiEkUHLhzaMbG9b9hDHkr0QR2g2gK546TubnWPYF6IkHK3n913XUauNLZjH5UDyweSDxAToTF4hBls814B0Y6P74wJcH9groxQqXqDIu0le98qFyIUE5l9YA8YgHuYDpC216TtEsU7q3sCczlCo0sRivGlCBUdvM8R2tU9gPluhPKlCDGJNkKHEgeE9gX772uEdnVXMLeIEJO2E/kAaRshjYDh+xihXd0RzC0jxC5CZWI83kao9z5GaFd3AHN9hNKLETIXuhDD9zlCu3pdMFdEKD2LkJ9FiENJbYTQ+PsQoV29JpirIrQceFPvXY6QDlz8vYrQrl4DzA0R6lR73/cI7epVwfzNR2hXrwjmbz9Cu3oFMPcdofcXCtwezBuI0PtdtwRzTYT8vYqQ28PtIQqoPdT+FDay4VZgbogQuwjpfY6QUXsIClbBZOznP0spuBTKDtLLwdwyQvk9jJC2hmBMCwEyoiZUI9XbLRQ1QUNEg8jKcRswL4mQ3tsIXYgLGdHQQtiANypeY1YF1sBa2RtZteyGRIYbwdwiQuWqCF23nPA2oFywhG1kUA1ab1+2LY0WlhaWF8ILycsiraDZyN4ol+YmMHeIkK5ZkXvjddkS3NAassYsDXOkc+AM+wzpDDMraI5jkUu1rGEjR30DmO9ThK6zxBvhFTAHnyOmMqdCJwpOZJ8qmAqfK5W5wstQrJQ314Fxa8sf/qndH1etO8VVz00ME+zZsR/lqoncO4nQ9ZaghdEMOAOdCJ4aP2kPPRE8tdOJis4ynqmwlPJ6ORxurgFDa8v022A6rUbQLbn0HTE0uxhpIjNB7D+D8lYjdNESLlsiluwsgVPBU/AT28dC3wp/K3Ns/EQuJzmYBp5FlRehZo2X1xnziTh+JCZ/SvS6VVG3Y6KXlIcmRkEZA2OHxqCx8QjF4C1G6AVLuGyJmfPMEj2xOAa+kfWN7W8sfWtxLHiaUzmN0FmoN4umLBfRW1M6N+yPOT4OOIy9NakZ5I6de7b6tofASDByYSR5aBjg0rfV3b7yfEMRkltBdmOJC6iB0kha26zBS9BcMDOcWZ7KTA0noBOH2zGmMC0qZ1E8i8wiVXk5r2JNoWY+b64B82F7Q01P7hOul5WVOqZ0QT2gB+oj9w09oCupMqTnL+HvYZfl5dpZ0k7W8NYU16C1zQpYgGZC55bPMKeCU0untk9NOQ3iNCufyek8SppFxXLZq1aENpRVzXyTebDJfHWdMeu/Co7kcLgzCEoOMikSyVC5uEIkoH2/7IvR2cnie4TyoiVuhDdGq5ssMZyacip0qtA0K58Hnqkq81R7uci9NetFzWTeUB82/PRR4bPjm3Zt/gx4CgyvusHtg5banZAuRjLe3oDwnbaFvQjkSktYt1Cus8Sntk7BpzLTEjEVzSzQPHJZpFRW88FgTTmvWeX2UeH3FPgvw29uAvMlcIQiW3UpElkpmgJ1uxMpNsYbcI1U29SYLkHe2rOj+bqArrdEWuEXLLGn4qIlLSChaY5yHtQzMZjHpl4to7uiThtO1w2TfuanXxQ+o8DHbi/3t77mwh3886cV0N3rMmiaNM51PozkhwV/oKIfGX4s+MDS37V76Hwga2Q8ADrs5jGv3plesORZ16lpn2u2lnDZEnPqaMcStLMkTUUzE5pHzouUtJpXW0sWDxsmfyp8fljg12V7iZeikb57bRL/WInqKDbrJnVokk1VrE5IHdtdKToSHUQlXLUbCJ0k6QUgOyi3gfPcEthaQrtPTrEEz0Hngilwgngq8wR4DDy2/FjocUhPSvFJRJ4Gg7O08Xyl3qLOvRXTTU23aviXTeY//ljgX72dE32nro7S+Ofmq68K1QdN9GZ1CVZq8kJJ54i+5J6tLnbHqJIJQ9hIapeCLvz9l20Ve/lYYl8xlnhqxYnt52OJOJPKeVS7sWS5mg8vWPKz/cxnx+b3O0t+e22HuMKY/4Sv/lv8fVf0zlS7UjclOYpKExFIRShArSkS3rZphYBQuz3sNua8viXSY6PHgscRelLCJ6EyDeIsbdbzlUbfteTf/8c3WXKxrhl8vzCPfln487IhfR3LerDqJyeiiqwcCaLgUHm2R05EQCnt/M7menOetfLXsISppQuWeFqk1pKLHWe4/9ySD/7ajiW3sOQlYLYzzM8ofPQ78aRbUxWtRl31l7WQlCOUJBWEvD1fMS+FI7Y7vM32SbggNXjXcWKFWYJvmJdc7Dhxc8f5xSzz6dfedpxXmljdMCjuPrr6XeLJzxPVX7oMS7+/6QwLaVwSkwRHxXogl0eIR5hHhB5QyhGKCXgsMbDpI9ovSZ4rU7iy42gm2FriqaRTs7Vk13G2lrxux7lN3bCddWvO5x9nPvodPPn5hsVfWA1r+hsgJ3KCJFOIa8wBOyywi3vb2XILxmQFG8Ma64IlPnO7djLdGnLy3JI4y6GzN2XJpbt/+a+8pjnogeRDS/vgPUxfrTVtoEyNWLfRuTgveXeWXKxbbIB+TXO2L3DkUkw02MP2+yNpO3nbYJZCc+PzC2PJNZZoJmsRNcs3Zcmlu779r76iOaGH2A+QDm32JQ+B7nZJIgs2RSyEznE5e7klnUVK6zdqyWuCeRU45UGgB0YPhA/drva1YNpz5m2M5hJnNlPEqdGp7FNJZ1k7S8rWkmpFs6hZdWsmZD4k8+kX24e++7HkDmDgdnB8WOAo4MjWgeX9sIZuv/IQJsusHJ6Dz+2Yvg+WXKzXfPq9AY56eyXqSSo6sMqBzMShMWb3gClEpmil0LyQZ7LO3gdLLtYd1k1ugqO94hi3mxTL2MQI50FIFVjFaiDWUl5KaZZpZmo70zu15GLdcUHpCjjjbq+/qoclpaHxyDmGKRiAelZpu2BJWbCRyioXL+WYK7F815ZcrHtYabsCTky6g/6mX3Luu5S+HT3TdEmpfV7KKnLU6mw2amIVKVahZv2uLblY97Ro/QKc3h86VOPOCLpF3Y6VO67ryp0qAFQ3hYocjjpgM8/LGh9smK+bd2nJxbrH1fwLcKY/ab+xXjxM9GbVXlpVzv1wSQJQZM/XZHpk1puGYcnvgyUX6x6/V9q+Hfz848w/DDK5X9N8s6E/WM1yfzFfbxaLejBf1Mv5vOnN6bGkP1jR1Bs6H274xazh86/zFsruLeM7qzfwpnD77psP290S5/8nVodivXfhXF9C70emf2LGX5vPflNoF6zgHQP5oX6oH+qH+qHeYf0/0l0oPcbProQAAAAASUVORK5CYII="/>
-<image id="image15" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAGVElEQVR4nO2aS3IbyRGG/z+ruhtvEZqBVhNecKkJ38ARnkvwDD6GqHP4CLyELuClZsmNIzxhwSM+QBDorqr8vaBeY0+MQInEBCb6W+JRlfWhqtCZkUBPT09PT09PT09PT09PT09PT09PT09PT09PT0/PQ8P9T6lP5nxJnL745dunLwG80McXKPwO7FMMAQGnIF6fEcsFsZoS23Pi+btPnB/fSZiuhMVS+P5EOIXehblXQfsSQ+CUOHlOnF8Yjv9CLN8YplNDWxHd27s46qdCk4TVyrF45jjfCMfnjrMfBZwKe5QT9zDHRylAQP3nsFi+CTlOQ+m6oA6mujOEobh5K7LxEHOpr3L+93RVcH4MnMBxJu1zg9sjj/+JlO8DtsdxPl7XW2DQhttRUhqnej3NPprkxGkCJqltR5042PCnBqmqMF0FnF8YTsFf3k+PHvhjjv2plE08Wq3qFIaNMzcVY+OWa3mqpIakBOViMXQJoTWlNiK2123bYfGsA14XnJ34vi7jxzpK/yfliW+argkDL2kYLY9yyUMpNkFVBctGdy9UUvFtdA+5qlDS2udR5WL5xoCFP1Ksv0p4hDF/VUrKGhSUcYRPTdUMFmaAzxyaiByJVpMhmpxuUkwsxVVYDUs7GhX83Dj+9nfh1au97JiHvmN+Q0ochxRmFI6KaQ74N4C+IfmUwtyEI3mZOm0kYeCh1AKi2tawWhmOzwm8+HwED8RDHqXPSMkzoz0p9CMDZ4ImpA0Aj1AoDm+NBpenoGrjLBExmswMXfeAYe7GQ4nZUUqZU+EI8ieAxiJryAh6MhkEtaAF0Q2FfPT/zN/gIcTsKAVzWphTOpI4FTE0IDrkFAGWAAchipIQ3EETNtKj3ISf4Wt/k3tIwZxe5oKekJhQGEqojDBQglBASyRSphKJTO+KjWLBdOp36cLLB1n0jgv7mu/eUwo5ozC5O0IyAFnkhsJK0KWRP0N6K4W3AX5VolZNGd1e5FULIOPVD2VfzzFfumO+XArYAAqARCLRtRW0NseN4GuHrS1gk9S1oS3pIq8KFs8ci+Vek8gvEfN1UogA0Qm2AtakVpSuPfDKZNdG3qS83QSOtzHmhLYpON/cZdp75L5H6QGkoBBqBa4JXol+Kdnb4OXSwctSxeuAvK7W3F7Nhy0G5xnAXtMB4H475pGk4OKDlKBVcL+tIrdXo9sOg2EGTspd2WG/NbVdZ3tEKbr4IAVhXdXaXKXbDk++S8DzgrOXe6/FALvlSneVt5OlfZBysWlS/ONKAXYSI+LkzHB+bBj+szpaoc6T4aBQ45DzzKCjQs0pzQn9IaQAnxdDgMSz54ami09DqZKNm+LdKGZNLMQnLsyNdkTjkWgzAhNBA1AB4kFKAT6bEgg4BfCvfxA/wXLXxBKsjl0ZFoQxvUxpnDowozAlfCSqAWiHLAXYJVd6fUbcTAzVLLgYlVLtjI0xjxwcARqbY+TUgLQKEkEWSt2hSgF2EbNcEADnaWAtt7EqrHJVasBqExun1zBVAA3uoFmCe5bxlvJrkQcnBdg1u1409NuNaZ1NIQQIEUQEPMJhoInw4mYtBCdtS+BGskvBLw9NCnDfskNtRDLC3pVfRQdUqJJEkhAoJDfeQliJuAyuy0OTAtxXTOdCrB2enQiJUEfDxkVAaEE5jK0Ba0mrAF45eHVoUoBdxSxbERCbUJIzBwsdS2ndeCsnjOxAGWDF5S2AtRluXHZdrNwcmhRgFzGLpXAz0WU1K5Mti4dNsrbalroOIXdwKSmEePeA7MXI1os2kq2L2nWo0m1VDw9KCrCLmO9PhNdnwlXwUI2Sd1WXgyzC4SEUlbJ9V3QC5AUeukBuc/RN2IRtleP2ioclBfisGAI4BZZ/dQClGjC7Vy0sITO5ckwVm4BcDOaiV6Vjm1WP21hKF0PXXU6nHQZP8yFJAXbKrt/lSj8iYPZd+HbhsWtvKtc0utZRqTLURnQuVpUbmY3M0Sy/jcuMwfHBSQF2FYOXxMkLAmcBy4Wh7sK3g7Hl6xQ0jlRek+uxGLPirCr/2a4dXV2wmpbfq43ja9mxHvNezvO7hp/l0vCnCbEZEm3zcYymFYYb4c0z/9D8c4BSgHuVxd63YLxrD3vfFfW/fOiEet8ytv9uqIfgS+qF3G2dhymkp6enp6en52D4L16GcoyT1sq5AAAAAElFTkSuQmCC"/>
-<image id="image21" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAHE0lEQVR4nO3Zz27c1hXH8e/v3EvOUNLoXy0DKVIUENBNveoT1C/h54n6Gt135WW6r7MsiiybTQsDQVMUtRJb0kjDIXnvOV2MXKSLAnKAoHLBD0BgOODi8Df3DnnuhdlsNpvNZrPZ/xX9rwv4LwQB/Ea8+KW4PBPrlTjvxOUbA2BY3Nf+DSzOgq4P3jx1Vuvg7DJ49lVw8Vnc32L8gAIem9B/BHL21PjmOrFaG6mm476z2M+Kku5rv8GGhVvX+du+d4ZF5fjKefPUOX/tvPwq4LMAfVA4jyyY96F8JniZuDwzIB9DrpD9/iA3FnnajZzRQ4v9Kh+rGSWtVa5DBbfCp0eVyzfO8+fOBR8UziMK5j6U5782zp4a2z6f9O+aUnJTm6Z11UVUa5pU2ghy1GQASsmJUs18mjyPKmVMXRpyX6erdpxItdB39UPDeVzBvMDgq8S2z8frdTuluqihZbSLZa7q3KculBYpagMpAWDu1dOkVAcVbc2avti4TWPX5/1huJ4OR9Lfd+G8+sLhwh9STfpR7/XBQlwg/vhlovtbc7ymnVK3qCn2srUH1OlI4ghxTMSxpGOkw5AfKtjHvJPbQika95pSrVZMRGzYaz2GUoPTT4JnBF+9fNCIeSTByABjMWbSUZPNFtWm/eTNgVOPJJ2E61ToFOlUcBLBCehQSfvh1slYyMlkS54asqDW1hlb368e23fF+fZJ8I/ffkQj5uIP4u5PifKzvCp1Ual72WwXiutE0mmEngieIJ6ATjEdQxyB7RN0Qq1QIzC5y809R3htJqe1ejjim9O3zl9/Vx9SUv6x7/lB/vxSXJ4Z+U2uedHmomWZYl/ZD2WceNgTKX6C7JjgEGIPvAUJ9wnRI1s7vjSUJGFF1bOX7O1US4zTcS28PS4PLelxBHN5JlYrW22u8jRNrdQsk3y/el4Ffix0SsQTwQnEkdBeQIsQaBL0BEvJsodDqIZ8TKSt+7QN01A9RhbDg2fI4whmvdIZa+vbLoXGxieWMtsTcQBxCByHOIE4BY6C2CdiN2JgBPogskIorCC2kjZR/S6Iu8jWuEc+7Tp7+8CSHkcw553qbTH3MUW1BrM28CXEnqR94EDOCuMwnEOJPdACEGgEb4SAKKHYWtith/ZIsYwai8bV1NQm73t7aEmPI5jbrxXTU0XpU9uSqNFUo4W0UMQS6FzWKaLbhcKeoN01QpHBgJiATkEXxtI8FrhaTE0EOYa75IvpwcE8+MIf1y+IshatKXyhMLNwS4bnIJpAjYhG0BI0Qk0QLdD8+9D9YZYJb2L3oyfcLGo13ASHD67okQRzL3nAdH8S96/vit3n++9E7JplBcR9G35/SRC4Q1ig7736W/7g7vpxTCX+gnITDBZqGi91qoLqnotZTIRGDx+RRoIxRN71MkbsptCANCg0hhghJhEFWSFqVcJF48r1wQE9jmAOfh66/TrkBz7GVJPShDTI2UZED9FLugOWaFdzQAEXaAzoFbEJ2ARsEJsIbQkNYTY6Ksmt6m74yIJ53UdadW4dRYNPSs1ALVthG8Qt6MaJpdD7esvuP0YSjBI9oRuha8QNHreIOyx63AaVmMyHmg+bB731wmMJZrWOy9WtH45NtdyNhrYl607OWqhDtArlIBAqCnpkLYQEUxC90E0Q7wi9C/yasLVFbCTbRk6j1VK+3d49qE+CxxLM2WVw+6t6Y9+V/ZFxyv02Rb5TaIGV1sOSCBkqQWyRdRDtbg1HE6gPWENcB/adWXoX+I3LbvMUfVDHBIX19UcWzLMXwedfOj/NJfk4+cC2ZG9Ssmw1pZQi3FUhBuCOiA7R3C8nFWCLuI3QjcmvIngX0nWi3E3ybTPZeAWFT599ZFPpguD5Oiif1pvbf04Hh2lgMkvVVZOwajXkk1w90h6wVETGQkCJ0CC0Ab/F7SbCb8xYF9ldUt2uu26k7wuXbz6yEQPw/Lnz+ZeitdKSh9GuVX2f5DU8WQnSED5twtLSPBZBJDyh5JVggtimiE2NuEuR7orVTaqLTVN9IF8W1p9Uzl9/ZE8lFFwEvHjtvD4vb69GTo+PGNMYtXf3hU9NtIOn2EAsUG1krUVU4apQSngaQ7Z1aYuxzeRtrv14tVqNLJ8Wzn/pvPz9x7gYjuBit23y+txox/zEPI8H1tRijaeh9VLaNlsTU5Mi1d1iuHmIRRk1FE0+WdOMqYxj0x5Mb/NlYXm+m0KvvvAP2UZ5TMGwe8oAL14ar8+Np0dGvk6npeTiV9ltL7mTY5oM3xcdMHioKW6Rqmpfs6K8My+MbWW9qj90b+mRBQO834W8QLx6ZaxX4umRcXBpXA7ptOstpkZRdl2B8irUlHjb985q5azXztmlc3n2vf0k+NANt9lsNpvNZrPZbDabzWaz2Ww2m81ms9lsNpvNZrPZbDabvfcvhBom2odigxMAAAAASUVORK5CYII="/>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,64.615317,-64.615317,0,64.615317,5.384615)">
-<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/>
-</linearGradient>
-<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,64.615317,-64.615317,0,64.615317,5.384615)">
-<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/>
-</linearGradient>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface24" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 9.421875 48.742188 L 12.675781 45.265625 L 16.714844 49.304688 L 13.429688 52.589844 L 17.410156 56.570313 L 20.695313 53.285156 L 24.761719 57.351563 L 21.539063 60.578125 L 30.960938 70 L 45.769531 70 C 47.257813 70 48.460938 68.792969 48.460938 67.308594 L 48.460938 45.785156 L 62.21875 36.597656 C 63.71875 35.601563 64.617188 33.917969 64.617188 32.121094 L 64.617188 8.078125 C 64.617188 6.589844 63.410156 5.382813 61.921875 5.382813 L 37.878906 5.382813 C 36.082031 5.382813 34.398438 6.28125 33.402344 7.777344 L 24.214844 21.539063 L 2.691406 21.539063 C 1.207031 21.539063 0 22.742188 0 24.230469 L 0 39.039063 Z M 9.421875 48.742188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 5.382813 64.617188 L 5.382813 53.847656 L 0 53.847656 L 0 70 L 16.152344 70 L 16.152344 64.617188 Z M 5.382813 64.617188 "/>
-</g>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface27" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(56.862745%,69.019608%,94.901961%);fill-opacity:1;" d="M 0 53.847656 L 5.382813 53.847656 L 5.382813 64.617188 L 16.152344 64.617188 L 16.152344 70 L 0 70 Z M 0 53.847656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(5.882353%,27.45098%,74.117647%);fill-opacity:1;" d="M 0 24.230469 L 0 39.039063 L 9.421875 48.742188 L 13.460938 44.421875 L 25.578125 56.539063 L 21.539063 60.578125 L 30.960938 70 L 45.769531 70 C 47.257813 70 48.460938 68.792969 48.460938 67.308594 L 48.460938 45.769531 L 24.230469 21.539063 L 2.691406 21.539063 C 1.207031 21.539063 0 22.742188 0 24.230469 Z M 0 24.230469 "/>
-<use xlink:href="#image9"/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(14.509804%,37.647059%,87.843137%);fill-opacity:1;" d="M 11.65625 44.25 C 10.75 43.339844 10.609375 41.917969 11.324219 40.851563 L 33.402344 7.78125 C 34.398438 6.28125 36.082031 5.382813 37.878906 5.382813 L 61.921875 5.382813 C 63.410156 5.382813 64.617188 6.589844 64.617188 8.078125 L 64.617188 32.121094 C 64.617188 33.917969 63.714844 35.601563 62.21875 36.597656 L 29.148438 58.679688 C 28.082031 59.390625 26.660156 59.25 25.75 58.34375 Z M 11.65625 44.25 "/>
-<use xlink:href="#image15"/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(44.705882%,60.392157%,94.901961%);fill-opacity:1;" d="M 13.429688 52.589844 L 33.984375 32.035156 L 37.964844 36.015625 L 17.410156 56.570313 Z M 13.429688 52.589844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(29.803922%,50.196078%,94.117647%);fill-opacity:1;" d="M 20.695313 53.285156 L 16.714844 49.304688 L 33.984375 32.035156 L 37.964844 36.015625 Z M 20.695313 53.285156 "/>
-<use xlink:href="#image21"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(56.862745%,69.019608%,94.901961%);fill-opacity:1;" d="M 47.117188 30.960938 C 51.574219 30.960938 55.191406 27.34375 55.191406 22.882813 C 55.191406 18.425781 51.574219 14.808594 47.117188 14.808594 C 42.65625 14.808594 39.039063 18.425781 39.039063 22.882813 C 39.039063 27.34375 42.65625 30.960938 47.117188 30.960938 Z M 47.117188 30.960938 "/>
-<use xlink:href="#surface24" mask="url(#mask1)"/>
-</g>
-</defs>
 <g id="surface1">
-<use xlink:href="#surface27" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13.72549%,36.470588%,75.686275%);fill-opacity:1;" d="M 24.523438 59.941406 L 33.796875 69.214844 L 48.851563 69.214844 C 50.683594 69.214844 52.160156 67.722656 52.160156 65.90625 L 52.160156 31.140625 L 24.523438 58.792969 C 24.199219 59.101563 24.199219 59.617188 24.523438 59.941406 Z M 24.523438 59.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(23.137255%,43.137255%,77.647059%);fill-opacity:1;" d="M 0.921875 21.289063 L 0.921875 36.339844 L 10.195313 45.613281 C 10.519531 45.941406 11.035156 45.941406 11.34375 45.613281 L 38.996094 17.964844 L 4.230469 17.964844 C 2.414063 17.964844 0.921875 19.453125 0.921875 21.289063 Z M 0.921875 21.289063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(36.470588%,55.294118%,89.411765%);fill-opacity:1;" d="M 35.71875 4.433594 L 13.398438 38.582031 C 12.644531 39.75 12.800781 41.273438 13.777344 42.25 L 28.074219 56.550781 C 29.050781 57.527344 30.59375 57.679688 31.742188 56.925781 L 65.890625 34.589844 C 68.070313 33.164063 69.371094 30.730469 69.371094 28.144531 L 69.371094 4.332031 C 69.371094 2.464844 67.847656 0.9375 65.976563 0.9375 L 42.183594 0.9375 C 39.578125 0.9375 37.160156 2.257813 35.71875 4.433594 Z M 35.71875 4.433594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.352941%,73.333333%,94.117647%);fill-opacity:1;" d="M 5.945313 64.519531 L 5.945313 52.453125 L 0.921875 52.453125 L 0.921875 69.285156 L 18.011719 69.285156 L 18.011719 64.519531 Z M 5.945313 64.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.843137%,77.254902%,94.901961%);fill-opacity:1;" d="M 52.242188 26.238281 C 56.9375 26.238281 60.746094 22.429688 60.746094 17.734375 C 60.746094 13.039063 56.9375 9.234375 52.242188 9.234375 C 47.546875 9.234375 43.738281 13.039063 43.738281 17.734375 C 43.738281 22.429688 47.546875 26.238281 52.242188 26.238281 Z M 52.242188 26.238281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(42.352941%,60.392157%,93.333333%);fill-opacity:1;" d="M 37.023438 29.128906 L 18.839844 47.308594 L 23.035156 51.503906 L 41.214844 33.320313 Z M 37.023438 29.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(53.333333%,67.45098%,93.72549%);fill-opacity:1;" d="M 19.414063 55.121094 L 23.023438 51.507813 L 18.832031 47.316406 L 15.21875 50.925781 Z M 19.414063 55.121094 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureRepos(m).png b/dist/DevOps/AzureRepos(m).png
index 1e5c751f..6358216c 100644
Binary files a/dist/DevOps/AzureRepos(m).png and b/dist/DevOps/AzureRepos(m).png differ
diff --git a/dist/DevOps/AzureRepos(m).svg b/dist/DevOps/AzureRepos(m).svg
index aeb19d19..e9ebc55f 100644
--- a/dist/DevOps/AzureRepos(m).svg
+++ b/dist/DevOps/AzureRepos(m).svg
@@ -1,73 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<image id="image28" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAACMUlEQVR4nO3bMWgTURzH8d+7y0kbOigdtGpTECTgJKZSEIzgJi7aoUJBELs7OQqCHRwUBOeAdLCVDNq9Hasobd1FaEvaighRB0kwafscqou8X7nk3dmz/D5TeDwe//tC3k1n4Mmurvdg8Olj4PU48O6I73l+LnwFytNYbdw1p5/89DnJ+I5i258nYU7c8z0nUfbHAxP13vc5IvCf4uMV/zOStnTV94QEwiz2+Z+RNP+ZEghzMHV0x9hqGOJa8RaCSyXgW7i7ujIGLB9OY7julb4Dp6q7v49uYeftMmaXpszY9nbcEzoLs9X3Amje6GzIrOifMbkv43F3xw5jmxeHEL1Z62qmrGgtFkz+3HqcrfHvmNyxk10PlBXRw0Lcrbp8iT3D2OZkwbbCkm2FJdha8V8NlRpbK/55Htt4P7jXVucdY6thiNHe5//vRRtX/wxe1m+63lbuMK0zEwg+VNIfLAN2Lt82h+ae/b3s/isFw+dTHygrgoER57J792aU5izZ4n5WvZUIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhnCHsfOxPsE9EOxCzbXsDtMeqgDleqoDZUK5jvYd5yeOOdeiydc2bANnEeUmYK4fT3e4fWJffUJ7uGLyjzb3exQREfntF5AzcBmHCJ3vAAAAAElFTkSuQmCC"/>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<use xlink:href="#image28"/>
-  </g>
-</mask>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.74902;stroke:none;"/>
-  </g>
-</mask>
-<image id="image9" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAGzUlEQVR4nO2cS24kuRFAXwSZn6rSpzXwLAy0gd4LvoMv4fvMfeYSc4neGLPoxWAA24A1atUnk0lGeJGpnh6g2Lb86dIiH0CVkBCoiCeSxQIiJJxHvgMB9P09evdAzIkwTMSrHSFNRDMCRmh6JBnazD9/cSbwVrFpwFGKKqVtyPsDpW/Itz35p1vK/XsMsO/Azs1zNpnvQH8A/XaR8nCiiRuakGgs02pDE41YjCgNqo4aSPDLyimCK7gJ5hMWlJyVbBOTRlJpmfKJ6W7D9HBH/vt77AfI5+aK5x6+B/kW9O0j4W8D8aqjTQNdiHRB6YvTCTQSadSI4iig5f+Z9b+Dg4CpYBbJYkw4U6OMKIMPjFcdchjwt4/4l6Y6K+Ye5MM79HFPDBuadKJrApsMW41s1eiL0mO0pjQIQR3xC28nAS+CAwVjKkpSZ5CGU3ZiE9CUIGywxwHfvcP5cH6us2J+BmkTmjKhh/YY6IGdOlcKV67spLA1ocNoVQlAeA2HjEIxoyAkNUYPHDEOOucqEvB+pKRMaRPVRX5WTAd6SATpacpAGzs27uzUuXHnFuca4UqEDdA6NCKoX/iMEcEdTIQJIQEnjL1Dq4K64FEoZWSSnpxfKubpHdI+okeIGunIbNy5CsqNO3ei3AI3GFuEHqNxJVz6fckB5tUyYQwoR6BzIwq4FUoQ0hQZLZO2Ba3NdVZMm9BSCM2GqCfaHOnV2DncoLzB+cbhFuEK6EVozQjK8/n39RFwA1QoDglhcGcPNCjiTg5CcuXUZE62IZY9oTbfWTGngsQtIRRiCbRW2ARhB9zgvEH4BucOuHZng9CKEC55+DqzHIfiThLhBPQIAcdg3lpWOFigDYVYtgQ+np/vrJhrQx4E7Zy4HK6dw8ZhJ3DtcCvwBrgRYSvQwmXFwCwG5oMXOC4xmcDocEDYqNC50WYhjvLCrTQ4EhylJSjEXGhF6FE2wBbYAVfL2LnQ4fVl+bVwAKHgjIAy32pHhC2wwejdaUMgWkMI6YVidoYcFWkMdSe4EgUacVqBzqHH6YHNMjr4JOZSq8aXrwX/JCUBvczxtQiNC9GdIIbmL8R6VszoSOtIBCmgAsoiyKFhHi3zW3X7vJX+x4n+pxQXXGBikWFzvFGMIDLnE5hzrE1yVsw8O2KOLHeTWc4sSJHl+8+fU1+WXxn/PCb5LGYBdUedObfyBTGvJZlXxyqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmQrU4MQiugi8VkG4+vzK3vfhShe38drwGPsXzKcYlZgOXJR8VPEg95vPdJ4IPQJ5/gTF3dJT5EZm5VPTXIehSln7pzhxfCqB/G98S95KDOVj+F3/Is2L+AYhgqhiCWSEHmEyZZK60Hh1GYAACjvNa6nydwhLbEuOIMzpMakwFsgQMxUzO90NCbcUoboJbwjByECafq6wHh5M6R4cDc63+c7Hx6xADxWGUuZfgIM7R4AQMLqQAkxUyjsWXbqUpYFEo0edtk4VRjZMLB3H2NpehR57L0oX2s16Cy5bMz1vpucniyeCjwH6J/WTKGJ2JQHZ5YSPXJuDDE9ZfkwcnYQw4BzWeTOhFCIC7MYqwwV9RybxTBJI7J1H2Ar+486jGE84BZ8hK6gN5eHrhVkotpoGSEznC6M6xBPbitLr0/zgkVfZm9Co0vKK2HHMmVQZ3jgIfRfjF4dGVfTCOYow5kTW8cMX89QP++99RPDL5wIhwRGkAtfmgTQJHh41AZzK3GF9aDOAumDh5OXhPBnucJ4FH4MmNozuj9EzKC8X8AYyWko5MOTIGJRhoWLo6vHAS4cnmDrJGjOiKXvq2aIAY5jKfjQqDOycJHICDwV4ajsUY48DUbF8o5i/gf9xSHibyzcjoLRICXiayKaMoRzc6hHZp2w1uCK9gxcg8ikF2J6GMZgxqnNqGE4UhJsaPHfn6pWL+BPbzj8juHbkDxhFKh7mTXRhjoZ0iTTCiOUHnxin5UmPU10D5dMM1gVICuclMUyC5k8xIIZG6jrTbkccf64dvLRH5M+gdaHpHKCfCJhGHTGw3xFSIGMHbWUp0pCxz2YV6r3W5kwTwLPP/d5BEQSltIKcTuY/kU0sOG0r7gfIA9n3lnKl+VroHfw92/2F+Hd5i/US2gmohBEOnI9JdI5N9uSnqa/CcnQjeKT484Y3gxTETim+xhwbjJ8o92Hvwe/DvLxn0ysrKysrKyn/DPwEUtHqYNjeMYgAAAABJRU5ErkJggg=="/>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
-  </g>
-</mask>
-<image id="image15" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAGYklEQVR4nO2cS48bxxVGz3erusnmjDSStfLSgHbKLj8wyQ/0LgKyyN7OYmCMZsh+VNW9WTRlK0AasANEAoE+QKO5IAnew3oRuB9hZ2dnZ+erowD9DfQR9AH0/Z/R35+wdxWxYC8N3TsaAo2OxkC8/dYf+w/yCwwiBiNGES9G3CeCHn/MxJ8e8J9+JD5CfID4C4T+CgYYHzDOGAtGwcZXpGEh4dhSSX0gjlgJ9K3r/F/oRDDhi4g+0zB87GnDM40Op8e/f0f76UcC8AzY43tSfsK6iXy6J81Olxq5OFmNbD15dhIFy6B2Y3KSiBmCDk9Gq4UaUFOjzol66CmXF9o/Kqrv8Xf/hPz4nvTuQmIizwPdEvQmeq8caPRdom/QZcguUiQs35gYF2ENN2hAbYlCYwmxmJiXYEkHltMF4dTH95B/mLB/jXR2oG9wsMbxmDm2wuDGUOFozqEFPSKHYwHyG5FjIiIIhHtQk7MYzGFMqTGmjnFqTA5p7jEf0Q9G5J8n8mmgu4hDLwYP7ppzF8adgvsI7hoMEocIOokESLoNMUAIIoImUVowA6PgHMZLa/QmchZaErSB+HnCs53Ii+h65yDnpOA+jNdyXgOvJV4H3AmOwEGQALsVKwACB5pgRkwBZwWfgD6MLEeC6A13o3mm5WMllaBXcCRxknEfzoPgLfAm4E0Er4AT4oDIxDqdvm25vw+xTiOgRjAHXCSegd4h40iGEzQVqkQ9ipLpya3ShXMwGAjuLXjl8EbiO+A7GQ8R3Ck4AjnWLf4mxASEAieoISaJM8EhhLEWUiMoAYsbsxtzl8m5VJKcLNHTOEZikHFvzivgIeBtwBsL7hwGoIPbGjEBHlAsGF0ctC4FTVAwpoBRjaMSvZxcKikPjl0a2Y0uGb3EMYKB4A5xL3gVwevr40FXMdyQGMARBegVGFADJsEl1o3liNG708nJA1jmgLWF1IlEJV8L7xGHgGOsMgbgBJziNzE3Qaw3Bwrrl9mAmXUzOSroCbpwcsqkYiR6LE+OpfVckrKRwsgRdECH6An6EAeCQ8BBorvFxTfWkdJCLFrPZH2sNXYS2SDVICXQ5FjOgZbAbC3UCMwCiyABKSAryHC91sc3tV0TOOvgyQqyIBHrpXW9NMAskLOe7PPn1zpI11/bfHH/RqX8X/mitv+o1b+o92bWiq/NLmaDXcwGu5gNdjEb7GI22MVssIvZYBezwS5mg13MBruYDXYxG+xiNtjFbLCL2WAXs8EuZoNdzAa7mA12MRvsYjbYxWywi9lgF7PBLmaDXcwGu5gNdjEb7GI22MVssIvZYBezwS5mg13MBruYDXYxG+QkwtdWz0hrB7UT1/vaOOwBfk1wfL5ujf9ei764B/6rBxG5ieiEt7Vj2sNpCqqgIEqsHdXL9cqsL76tBujfOsM/11EEhaAANZwmrQm4BN5EZBYcw9VoAVVGuXZPLyFmnBExXJughajcWgM0uIIiGENMBGMYs1jjf4ISThU0Es6CZ4TXSjOjsj5pjmACLgRn6Zo4ERHrqOp0Y2tTXEMWgovgReIcwZm1xkliDmMhqLXSUsJzl2kzVK5ZwbbG4i4BL8AhoIv13YvWdNhNhSyuuKBEMIY4A0/Ap2uNFw/GBHMLFhK1y7RcJlqC4h2LOWP7nABzOoQFICgSF4ej3WDCTdegqOk6E+CT4BeCJ4znCC4NxkgsqVBKpWU66hKU3plLMMk4y9cosQQEHmuMZQAOHuRr5ucmCK5Tac0ozbHOiBfEU8CTOc8yzuFM5sxLpmRR89jT8gslG3ODjEguzAJCNNYV/II4mtO7yGgNZHzjmn8XcXVjQQ1jUfw6ap4teHbxLHFWMKZgdqeM97Q8PNM4UC4inRYMoWbggUdQgTnEkJw+RGes4m7CCr+eLTxEk1PaKmeM4CLjLHFOa05yvPQsp6DwTMtPB9rDhXo6spQOdQIKIVGvW9mY4NDW1Fu2WDNNt3TKE7ivYa6aYfF1Sk1yRoKJnrF0zKfGwkR9OtHywwMNR+OIhgEuIk7gVVQzFm9MoTXxFpDqOs1uZcAAULUe8gQt1t2pWGIOZ8nBfAmWk7OMI2UYqA8PtMxH/PE97R3ARJxO+OK0PlFrYVHHVCtdziSuo6XdyPrymXT9CwPSemZLmRKFmjNlccopKEzUYaA+nmjvPt7kz56vw78BAdB2OtMqjuAAAAAASUVORK5CYII="/>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,43.076923,-44.307712,0,57.153856,10.769231)">
-<stop offset="0" style="stop-color:rgb(0,93,162);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(0,114,198);stop-opacity:0;"/>
-</linearGradient>
-<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,21.201923,-5.062965,0,26.089175,27.932692)">
-<stop offset="0" style="stop-color:rgb(111,193,255);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(0,114,198);stop-opacity:1;"/>
-</linearGradient>
-<image id="image21" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAN90lEQVR4nO2bTY8cR3KGn4jMqurqnp4hJQ0ByTJ2LXhtQLoY4MkXL3/AXvV7LP2NvfukqwEfzbPXPPigBWwIghamVxBn9THs6a6uyswIH7KGHAu7BntILmfteYFGzxd6Ml5EREa8EQW3uMUtbnGLW9ziFrf4PwV50wf4Q/DnZxNAfnkfvbtHjkakz//z3EPEf9LhwwLfPMLPwH8N/vfgAn6d/x9f1oDXAJktEUAe3UdPztH3viYc3UV70AF0a5WcleKN4V9k7M++pvBTjBX281OMh5jzjOGDCLpxHjN7ijx8gN47Q8/PCbYippFASyyJ0BqqhoyOFMGbgIVIkYm8aSn3duQnS8p/nmB3H2Efgx1Kzo0i5iopw2NC2BB1RYyRZhxp+khMiaaJBJ3PbuAaKZLJu0RedKSSSW8dk757Slm/TfnyOTkvTEx4bVYeDhEQrpDS9jRZ6QJ0i4ZFyfSu9CGwEFhkWKjS5kxDJKgSBCSDlAHsCKZzWP0N/tOv4NMDiLkxOcaBz0DOztAPdgRWxFFoFTqMhRkLlE6ElkLMjhZH3DAC2QtTcMYMQUCzInEDuzt4eYxzYI65MR4joB8+QFdnhNDR/E7oIiyS0+MsfX4P0JvQi9Cp0gahUSd6IKColjnEBG8ilif8eMSe/Az/5dfYi57nxhDzzyC/WhGanthuaNuOrhi9O706Swss1VmosHChU6cVaBwaV4I7qiBZEXG8UTwppgEvS+x8i//Dd5QXPc+NCCUH+QzkdIv2kVA6YhppPdJFoXOvOSVAa9AqRBcUQMEx1BXBIQoYmEGJEzkrmYl4J784KXBDiAE4fYB0XyDJCOJEbWhItBbonJpbTGhFqoeoo3NcuIGogWv93qEUIYXARCCWgbDJlcgXxY0hBqA15IcjtEmESYkNRBEalIZCY0KDEN0IEUQBB0cQozIUoIjSIDRJacjEtkdLh/DNi5/lxhCz3iDNO0jYI9nQIKgbQYSIEhGiGIqgUr1FYA4lAEdFCKWSGd0J0dCpRduCaD6sZrsxxAB8V5BgCF5f5miU+g6oOAEjiKJODY0C7oao4jgmlSAphgpIBwyGTOUwYg6Ku9eNt36HF8VbqV4QePaOgIiiomhxojhBnKBOiIqqo/hz44PgCRjn74/DYXXMjfGYzRqfgKB4VqwIpoIZeBR87hfEnKBCcK+lhgjmDu6YgKjgBVwFA0wmLEQsxT9RYngI6/exssMmw7qWnJUiQjHBxGEOqejQqlRi3DBRcKcIkMHNKO6U4GSNlGnAyuZPlJgz8NNYvSUaZVKKJUoQSoi4OYLMpEDHfHaHIo6LkHDAKDGQVUhuZMnk0FCW8uJVL9wgYqAKTscB22ZskbCiWAAvNb8EgcaNhSs9/uzsycHUGR1wwbKRGyGZkUJDbgLlh3gYMW88+TrIpyCnVGXuaUGOgOSIzDdTMAJG49ApLIDenaXCAqFzoXFQBw9KDoFkkdRlkkzk7zeUeyeHEfPGeiWvMoOezc3jEAm+JR4JDYUuNCySsAywcmWNcyzC2p0jhyXQiqC1A2ASGFzYiXPhwraD3SDsmwVjiuS/+5xyk2UHceDTuTd69z56dI52X6DNqrYBWehYsEiJXqA3Z6lOb0ovsEBZiNOJoCaI1ISMg+HkbGQguZCYyIuR8vm7GAfKDn8UYn4sbP9i1nHPvyY8WRKBuJ9ovKUTWHSJXoQ1sBbhCOFInCU1hDqURuqHFQcXoSBkhYQyFSWhZIe8sSpvcpP0mKvhcvYA/dWKcLYiHn1H818NbV6wWEwsxsiyqWFz5M7aA8dinCCcOJy4c6LC2mAlQqe1XXAgKexcuHBnAzx1ZxNgG43BN0xnvyV/TL3KD8HrIEauEhLvE05XhKMnxDHS5kTHks4DfRhZmrBqqkesS+BYhWOMO6qVEIRjam5ZidLhBK9WZnUGhAuXSorAucDGnV3Tsz+fSHc35L/gcAXvlYXSi4TLaqIpDW2CtjE6GhbqVaUToZdCL0rvwrI4S1GWOEuBHqHBERGKQ1Fnb8JWhYvgXOBsi7IvhUk78nagHLXY2TVIeSXEXCXk4QP07Aw93aLTY8L3K+LxMfFooB0a2kZo3Vm4szBnUaCXUJOseJUscRZUpa5zp5NazDUz4Zla0E0oO3E2MoePCVsXBnHGXEhtTzkD+/hNDNwua5APQT64j77/GJ02xLwitic0YaTZ7elca1ItxiLGmQToFXpKvXFU6t+IVTHKqofE+Up2g4RTzJlUGAy2Ak8NzlE2UtiWwhALUzbyxYB98Fv802va9lJzpVmS1A/uo5tvZ2X/nLaLtHZpqNPLJRnO8pIU0dk7YHGp0InTWFUn9crZHKHgZHcmYC/CFmergafmPDV4qvCUwkWIbC9g/BmMj7+gPKiJ948XSpfDse9nUpqOZl9omyULCn10ejWWU2ClxtKFFUJvtThbiD+TLBuBBic4VUOhzpyLOUWVJM5kMIqwV2Fnxg7lwowLjAsNXGhma8K+ZFKZyOfvPssv18JLhdJD0D8/R1kR94VWjEXMLCkcuXJUAkfBah3ixhKlF3keLpdK26XoJGD+3DsSWglB2KsxOAwFdqLsxNiasgvOzgqDCXtgPw2ksKZs1nWwf92QuHYofQL6i/uE6RviGOmC05fISoX1lDkJwrEwl/HCyp2lCp1D616HYpef5WDiFBESNZeMXjWmPbB3YRBh54XBhUGFHTMRCPsA49KYvt2Sy5rcv0958LAWddfddrg2MQ7664+IT57QhhP6klkF4TjBHYE7otx1OBFjLcrS6m3TiKAILoYhFHOyKmnOH8/IUGHAGErNKbtLghD24owKYzKmrjBJT9Yt+eSE8uRz7AHPSJmPejiuW+DJRx+jfEWkpY0NCyusPLIOcGJwV+AucEeVY4cjgYVCpPY3xZUkwt5r87dFuFDnKfDUhXOFc1fORXmaM5vobGLDhTu7CXZtqg3iD3tSiuTjtyn/8W/Yv4I/eAlPucS1c8zpGTINhCkQj6ClYaHG0oS11k74GDh2ZyXQAuJKESe7Mrmx01qg7dzYuTC4sgvC4IUhw96dvcIYhXEsTA1MZHK7IoeRchIp6a+ws4f4vzxfFOKTlyQFrhdK8gnIxx8Rv890aWSlytqUtzHeETg14VSctxyOBXoXghjmMKqwpZbtG5SNOpuibLXM5FwJl+xM0ZhKIh31pPMNpe0pZyvs9ErIzIa8NBlXcbDHXG4lPNmiWyOuWmKBNghtodYuc33SSRWQggImFBVGg0GMDfCDGOembMS4KIFdTAzaMWZjamGKmSQ9+WKiTFDuvY99+Qi7skZ2eaRXjoOIuVq7nCSC7ohTolk0tCnTXd464jSiBHNUBZ8V/MmMPbBVZVOsVq1t4TwHtq2ymwpjY0xk0rQid685XP43HETMpyA/B22/JZxEwg+JGAKNFBoVmnBZl2gNUZEqHgFJYKDeLluzmmyDsklwIZntaAwhMp5sSN/1lPWCsvkc//Ax9uGVcPnklVPw+3GQ5vshyNlH6HsDwbpKimqdLQedSXEEw91rs2eXV7AwUG+gy9deYO/z9Ryc8WJi+vd3SGdfkf7x0fNyXl7BLXMoDvKYUxC26LAm7HY0Gmgk05RII06wOvAyqnI/ulSBSJzJYQD2AqM7KTgJIatRhkg5DpQQKXxOudyX++R1WPyCOIiY9X2Er9FohGlBlEQUpXEjavU+N5llARAxggEok8JgMOJkZJYkgVbwAUgR/0nEP3wD3vH7cFAo9XtkcxfdtMTFTEqZVzPMURdcnezULpi5lFd7RkpC6gKPOFIczYaeONJk5DfjzdkiPchjfjMib4GSCftIVCGSiS51/w3AhSLGRA0pccCVjJNNMAXcUXM0RNSUsMmEdxxNVqcHr8HOg3EQMX1GBtDgiBpahKABlYJKHfC4GRZqOLlV7ReoM2itBRkC4oFgVofzTYcOe/TMbgYpcM2WQA3xgJjPu7lUi0WwKBR3QK+sZVSiijku+rxBc+oejMyEvA/87Uub9GrwUiNaF9wL7nO3LIaZYA6WwUSqp/j8c6Gudjh4BiJ19aPTN59sf4yDiVkrbopnwYLMBs+rGg4mRkEp0Sshbphc/q7mn7rWUSimWFDMBM+KPwY+ew1GXgcHETNE/Inik2KaKRg5GOlZXVIT7DMPMcGYd1yC1wScdVbnAplCFqWkEcta10Bel6GH4iBiLjq877B1RyaSzUgWmdSZTJksMKmTVEgYOTgZIxevL3eSOlMTGM2Z3EidkYZIea+nDBG/7rjjVeOwyvcU676g7CIFSLFlyoVYLsccdeupSgBav9R5wykEks0qf4GxgX1umCSR1pk87LB772LXHXe8ahx0PTqEf/pLYt/RLAtdMRYp15FIdvoYWXihM6F1JcjlrVTFqSSZkcjeq3g9BGWHsm+EMY0kviI/uOa441Xj0Ova751g0zeUpy25UyYEdeqWpFlV+aWGUjBHQ/WejJFMmJrCXoT9HvatM+0y6WJPefddypdfvXlCLnEwMfcfYb/+iNJ+T2IB3wrSKt6CFSglk1AajBAi4hkXp2ghe8NUZiF7CeNUmGwghzVl8+jZuONGkHNoKP3BJ9DSQLuKNFNdb48eayi54CVhbajJuumYrNSn0KaB9KrGHa8aB5fgPybn3q5uM+ieuO6I24nYtYRsqDpigkfFwkSRliwjWRfkOD+3eBNJgWs2bD9+oPPzc8Jfp6rTpInQLtHxytMeRfFxh4WWEntKd045OaE8OcWukDJ/9C1ucYtb3OL/Lf4bwwP54vrV9MoAAAAASUVORK5CYII="/>
-<mask id="mask3">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0.000000000000003297,53.846154,-49.919894,0.000000000000003057,60.296472,10.769231)">
-<stop offset="0" style="stop-color:rgb(193,228,255);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(161,215,255);stop-opacity:0;"/>
-</linearGradient>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface24" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:evenodd;fill:url(#linear2);" d="M 8.078125 10.769531 C 6.589844 10.769531 5.382813 11.976563 5.382813 13.460938 L 5.382813 61.921875 C 5.382813 63.410156 6.589844 64.617188 8.078125 64.617188 L 61.921875 64.617188 C 63.410156 64.617188 64.617188 63.410156 64.617188 61.921875 L 64.617188 13.460938 C 64.617188 11.976563 63.410156 10.769531 61.921875 10.769531 Z M 8.078125 10.769531 "/>
-</g>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface27" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,103,180);fill-opacity:1;" d="M 51.152344 0 C 52.640625 0 53.847656 1.207031 53.847656 2.691406 L 53.847656 50.480469 C 53.847656 51.96875 52.640625 53.171875 51.152344 53.171875 L 18.847656 53.171875 C 17.359375 53.171875 16.152344 51.96875 16.152344 50.480469 L 16.152344 2.691406 C 16.152344 1.207031 17.359375 0 18.847656 0 Z M 51.152344 0 "/>
-<use xlink:href="#image9" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,114,198);fill-opacity:1;" d="M 56.539063 5.382813 C 58.023438 5.382813 59.230469 6.589844 59.230469 8.078125 L 59.230469 55.191406 C 59.230469 56.679688 58.023438 57.882813 56.539063 57.882813 L 13.460938 57.882813 C 11.976563 57.882813 10.769531 56.679688 10.769531 55.191406 L 10.769531 8.078125 C 10.769531 6.589844 11.976563 5.382813 13.460938 5.382813 Z M 56.539063 5.382813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,107,186);fill-opacity:1;" d="M 16.152344 5.382813 L 53.847656 5.382813 L 53.847656 10.769531 L 16.152344 10.769531 Z M 16.152344 5.382813 "/>
-<use xlink:href="#image15" mask="url(#mask2)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,114,198);fill-opacity:1;" d="M 61.921875 10.769531 C 63.410156 10.769531 64.617188 11.976563 64.617188 13.460938 L 64.617188 61.921875 C 64.617188 63.410156 63.410156 64.617188 61.921875 64.617188 L 8.078125 64.617188 C 6.589844 64.617188 5.382813 63.410156 5.382813 61.921875 L 5.382813 13.460938 C 5.382813 11.976563 6.589844 10.769531 8.078125 10.769531 Z M 61.921875 10.769531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 59.230469 10.769531 L 10.769531 10.769531 L 10.769531 55.191406 C 10.769531 56.679688 11.839844 57.882813 13.164063 57.882813 L 56.835938 57.882813 C 58.160156 57.882813 59.230469 56.679688 59.230469 55.191406 Z M 59.230469 10.769531 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:url(#linear1);" d="M 26.25 25.578125 L 26.25 49.808594 L 20.867188 49.808594 L 20.867188 25.578125 Z M 26.25 25.578125 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(111,193,255);fill-opacity:1;" d="M 30.289063 21.539063 C 30.289063 25.253906 27.273438 28.269531 23.558594 28.269531 C 19.839844 28.269531 16.828125 25.253906 16.828125 21.539063 C 16.828125 17.820313 19.839844 14.808594 23.558594 14.808594 C 27.273438 14.808594 30.289063 17.820313 30.289063 21.539063 Z M 23.558594 25.578125 C 25.789063 25.578125 27.597656 23.769531 27.597656 21.539063 C 27.597656 19.308594 25.789063 17.5 23.558594 17.5 C 21.328125 17.5 19.519531 19.308594 19.519531 21.539063 C 19.519531 23.769531 21.328125 25.578125 23.558594 25.578125 Z M 23.558594 25.578125 "/>
-<use xlink:href="#image21"/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(191,227,255);fill-opacity:1;" d="M 30.289063 53.847656 C 30.289063 57.5625 27.273438 60.578125 23.558594 60.578125 C 19.839844 60.578125 16.828125 57.5625 16.828125 53.847656 C 16.828125 50.128906 19.839844 47.117188 23.558594 47.117188 C 27.273438 47.117188 30.289063 50.128906 30.289063 53.847656 Z M 23.558594 57.882813 C 25.789063 57.882813 27.597656 56.078125 27.597656 53.847656 C 27.597656 51.617188 25.789063 49.808594 23.558594 49.808594 C 21.328125 49.808594 19.519531 51.617188 19.519531 53.847656 C 19.519531 56.078125 21.328125 57.882813 23.558594 57.882813 Z M 23.558594 57.882813 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(155,212,255);fill-opacity:1;" d="M 49.808594 25.578125 L 49.808594 34.671875 L 26.25 44.769531 L 26.25 49.808594 L 20.867188 49.808594 L 20.867188 41.21875 L 44.421875 31.121094 L 44.421875 25.578125 Z M 49.808594 25.578125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(191,227,255);fill-opacity:1;" d="M 20.871094 41.214844 L 20.867188 49.808594 L 26.25 49.808594 L 26.261719 38.902344 Z M 20.871094 41.214844 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(155,212,255);fill-opacity:1;" d="M 53.847656 21.539063 C 53.847656 25.253906 50.832031 28.269531 47.117188 28.269531 C 43.398438 28.269531 40.382813 25.253906 40.382813 21.539063 C 40.382813 17.820313 43.398438 14.808594 47.117188 14.808594 C 50.832031 14.808594 53.847656 17.820313 53.847656 21.539063 Z M 47.117188 25.578125 C 49.347656 25.578125 51.152344 23.769531 51.152344 21.539063 C 51.152344 19.308594 49.347656 17.5 47.117188 17.5 C 44.886719 17.5 43.078125 19.308594 43.078125 21.539063 C 43.078125 23.769531 44.886719 25.578125 47.117188 25.578125 Z M 47.117188 25.578125 "/>
-<use xlink:href="#surface24" mask="url(#mask3)"/>
-</g>
-</defs>
 <g id="surface1">
-<use xlink:href="#surface27" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,97,170);fill-opacity:1;" d="M 53.199219 0.488281 L 17.609375 0.488281 C 16.238281 0.488281 15.132813 1.59375 15.132813 2.964844 L 15.132813 11.074219 L 55.675781 11.074219 L 55.675781 2.964844 C 55.675781 1.59375 54.570313 0.488281 53.199219 0.488281 Z M 53.199219 0.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 57.390625 5.441406 L 13.425781 5.441406 C 11.441406 5.441406 9.84375 7.039063 9.84375 9.019531 L 9.84375 11.835938 L 60.96875 11.835938 L 60.96875 9.019531 C 60.96875 7.039063 59.371094 5.441406 57.390625 5.441406 Z M 57.390625 5.441406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 62.542969 10.523438 L 8.273438 10.523438 C 6.292969 10.523438 4.691406 12.121094 4.691406 14.101563 L 4.691406 65.074219 C 4.691406 67.054688 6.304688 68.667969 8.289063 68.667969 L 62.527344 68.667969 C 64.507813 68.667969 66.121094 67.054688 66.121094 65.074219 L 66.121094 14.101563 C 66.121094 12.121094 64.523438 10.523438 62.542969 10.523438 Z M 62.542969 10.523438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(139,205,255);fill-opacity:1;" d="M 22.820313 15.769531 C 19.054688 15.769531 16 18.828125 16 22.589844 C 16 26.355469 19.054688 29.410156 22.820313 29.410156 C 26.582031 29.410156 29.640625 26.355469 29.640625 22.589844 C 29.640625 18.828125 26.582031 15.769531 22.820313 15.769531 Z M 22.820313 27.003906 C 20.371094 27.003906 18.390625 25.023438 18.390625 22.578125 C 18.390625 20.128906 20.371094 18.148438 22.820313 18.148438 C 25.269531 18.148438 27.25 20.128906 27.25 22.578125 C 27.25 25.023438 25.269531 27.003906 22.820313 27.003906 Z M 22.820313 27.003906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(139,205,255);fill-opacity:1;" d="M 25.382813 28.675781 L 20.328125 28.675781 L 20.328125 42.503906 L 25.382813 42.503906 Z M 25.382813 28.675781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(199,231,255);fill-opacity:1;" d="M 55.214844 22.691406 C 55.214844 18.925781 52.15625 15.871094 48.390625 15.871094 C 44.628906 15.871094 41.570313 18.925781 41.570313 22.691406 C 41.570313 25.59375 43.382813 28.070313 45.945313 29.058594 L 45.945313 33.742188 L 20.332031 42.207031 L 20.289063 42.207031 L 20.289063 50.878906 C 17.785156 51.882813 16.015625 54.347656 16.015625 57.203125 C 16.015625 60.96875 19.070313 64.027344 22.835938 64.027344 C 26.601563 64.027344 29.65625 60.96875 29.65625 57.203125 C 29.65625 54.375 27.929688 51.941406 25.484375 50.90625 L 25.484375 45.53125 L 50.953125 37.109375 L 50.898438 37.011719 L 50.953125 37.011719 L 50.953125 29.003906 C 53.445313 27.996094 55.214844 25.550781 55.214844 22.691406 Z M 27.25 57.21875 C 27.25 59.667969 25.269531 61.648438 22.820313 61.648438 C 20.375 61.648438 18.394531 59.667969 18.394531 57.21875 C 18.394531 54.769531 20.375 52.789063 22.820313 52.789063 C 25.269531 52.789063 27.25 54.769531 27.25 57.21875 Z M 48.390625 27.105469 C 45.945313 27.105469 43.964844 25.125 43.964844 22.675781 C 43.964844 20.230469 45.945313 18.246094 48.390625 18.246094 C 50.839844 18.246094 52.820313 20.230469 52.820313 22.675781 C 52.820313 25.125 50.828125 27.105469 48.390625 27.105469 Z M 48.390625 27.105469 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureRepos.png b/dist/DevOps/AzureRepos.png
index c0183c3b..93760c46 100644
Binary files a/dist/DevOps/AzureRepos.png and b/dist/DevOps/AzureRepos.png differ
diff --git a/dist/DevOps/AzureRepos.puml b/dist/DevOps/AzureRepos.puml
index a89c8555..65f07c7a 100644
--- a/dist/DevOps/AzureRepos.puml
+++ b/dist/DevOps/AzureRepos.puml
@@ -1,10 +1,9 @@
 sprite $AzureRepos [70x70/16z] {
-xTG7Sfn048LXqQ_ptl--tc6AQi2BOK1RqRzo-kgrqiy-nEkab9-pA5_dwPcYhml5cM9Nb9o-hX0pHrv9cN60S0vbdvK-utMbRD4dPCf1XO-LroDbccXKaMdQ
-6l1tCPY_a_KGBsMGuGTJIj5I-1kAApEBnJvb06BN5EMURESveoU7IbJp49sVnxfvYF3CL0UAC_CyMfWrAWNcJtC0TgfeHpeJ5G2Fw0oVAdM8DM_90QtJBYXQ
-jvLYTOS0_b69uosbQ2bnfjHtGtcz4U1wxLInFgPUgGLQhnmhDKRKLBXDgHm0gmhwb6Ebc9x5EWDwx5UKqFe3METSVm0NbAWb7zR49lks8gtVKJnskJnNh1bZ
-YhxRACR0gAAbr2ct5EjAxWprougrV3cbOelMY1APhbWb7ZcckFl-bCXc32ZkRepjAOqOL1H4srDoNA7M-fHcZ2ZP7cbkEMLfQ4kM8fvb36p9o4M1nW8qOaYP
-evQiPkI8aaTA32dvMCabPvgp_7T_AravBKcUTw04Y63kKcjkA4h4ooRSLa0KEIT4VbTfKtf6P4DAhXMfRxFULK38dZxO8ilN1X75NSMf7-AeWyQLL7e7j6Tv
-IoccnV54oL3KVwXxIZMgu5UKAV9k-Ab8xLw5VAt__G4
+xTM5qgim48PXllNG-x_UOqYcMmaidD7_7Qdc6Ip9b8BQEANfQpG_3YLV5NySQ_wgnEDW_rjXrJOVJ5NU6eZvN8tUA3wVhRrHvlFHb4D1uMGGIq5Hfga7RzMY
+EzxgnNuexKgyAdH9aOzAn6KbL4J4ta0k168xefYiUKO4Inn3nKN4t6rX4a9goW35G0aHZVMDn1CFB5yOGGQAxMCZ7GplPwAW-AweQ7wx50HBRpyh8jOFwqb1
+doS4FQneNL6HRLW7qr3lu0V5zx6Mxf60VE5vS7MNWx5O7c1DQm38MclEWBM14hAbQGuO0SGCGCSp86n1hEMSy3UoGtFQEfBYlugt-vKV9OnnKN5TYAhIYRgI
+2P366UKzaGvah8o9iQ8ZOgmmqu0OA_f4S2AEAfAFegnqegnaegv86rHIVXIZlmhv9KMmfXSK1TWYZ00jAqwGw7jwKT5zR12qgZ2al-MgGlq0fAxKZ-N-w-84
+QPVlKHE0FS8Pq3kUNRbZ7bahAJqtyzOAIhMkJ9SKsXHjzNpQaoWQeTDz_GO
 }
 
 AzureEntityColoring(AzureRepos)
diff --git a/dist/DevOps/AzureRepos.svg b/dist/DevOps/AzureRepos.svg
index b9815621..c0875080 100644
--- a/dist/DevOps/AzureRepos.svg
+++ b/dist/DevOps/AzureRepos.svg
@@ -1,73 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<image id="image28" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAACMUlEQVR4nO3bMWgTURzH8d+7y0kbOigdtGpTECTgJKZSEIzgJi7aoUJBELs7OQqCHRwUBOeAdLCVDNq9Hasobd1FaEvaighRB0kwafscqou8X7nk3dmz/D5TeDwe//tC3k1n4Mmurvdg8Olj4PU48O6I73l+LnwFytNYbdw1p5/89DnJ+I5i258nYU7c8z0nUfbHAxP13vc5IvCf4uMV/zOStnTV94QEwiz2+Z+RNP+ZEghzMHV0x9hqGOJa8RaCSyXgW7i7ujIGLB9OY7julb4Dp6q7v49uYeftMmaXpszY9nbcEzoLs9X3Amje6GzIrOifMbkv43F3xw5jmxeHEL1Z62qmrGgtFkz+3HqcrfHvmNyxk10PlBXRw0Lcrbp8iT3D2OZkwbbCkm2FJdha8V8NlRpbK/55Htt4P7jXVucdY6thiNHe5//vRRtX/wxe1m+63lbuMK0zEwg+VNIfLAN2Lt82h+ae/b3s/isFw+dTHygrgoER57J792aU5izZ4n5WvZUIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhlAYQmEIhSEUhnCHsfOxPsE9EOxCzbXsDtMeqgDleqoDZUK5jvYd5yeOOdeiydc2bANnEeUmYK4fT3e4fWJffUJ7uGLyjzb3exQREfntF5AzcBmHCJ3vAAAAAElFTkSuQmCC"/>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<use xlink:href="#image28"/>
-  </g>
-</mask>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.74902;stroke:none;"/>
-  </g>
-</mask>
-<image id="image9" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAGzUlEQVR4nO2cS24kuRFAXwSZn6rSpzXwLAy0gd4LvoMv4fvMfeYSc4neGLPoxWAA24A1atUnk0lGeJGpnh6g2Lb86dIiH0CVkBCoiCeSxQIiJJxHvgMB9P09evdAzIkwTMSrHSFNRDMCRmh6JBnazD9/cSbwVrFpwFGKKqVtyPsDpW/Itz35p1vK/XsMsO/Azs1zNpnvQH8A/XaR8nCiiRuakGgs02pDE41YjCgNqo4aSPDLyimCK7gJ5hMWlJyVbBOTRlJpmfKJ6W7D9HBH/vt77AfI5+aK5x6+B/kW9O0j4W8D8aqjTQNdiHRB6YvTCTQSadSI4iig5f+Z9b+Dg4CpYBbJYkw4U6OMKIMPjFcdchjwt4/4l6Y6K+Ye5MM79HFPDBuadKJrApsMW41s1eiL0mO0pjQIQR3xC28nAS+CAwVjKkpSZ5CGU3ZiE9CUIGywxwHfvcP5cH6us2J+BmkTmjKhh/YY6IGdOlcKV67spLA1ocNoVQlAeA2HjEIxoyAkNUYPHDEOOucqEvB+pKRMaRPVRX5WTAd6SATpacpAGzs27uzUuXHnFuca4UqEDdA6NCKoX/iMEcEdTIQJIQEnjL1Dq4K64FEoZWSSnpxfKubpHdI+okeIGunIbNy5CsqNO3ei3AI3GFuEHqNxJVz6fckB5tUyYQwoR6BzIwq4FUoQ0hQZLZO2Ba3NdVZMm9BSCM2GqCfaHOnV2DncoLzB+cbhFuEK6EVozQjK8/n39RFwA1QoDglhcGcPNCjiTg5CcuXUZE62IZY9oTbfWTGngsQtIRRiCbRW2ARhB9zgvEH4BucOuHZng9CKEC55+DqzHIfiThLhBPQIAcdg3lpWOFigDYVYtgQ+np/vrJhrQx4E7Zy4HK6dw8ZhJ3DtcCvwBrgRYSvQwmXFwCwG5oMXOC4xmcDocEDYqNC50WYhjvLCrTQ4EhylJSjEXGhF6FE2wBbYAVfL2LnQ4fVl+bVwAKHgjIAy32pHhC2wwejdaUMgWkMI6YVidoYcFWkMdSe4EgUacVqBzqHH6YHNMjr4JOZSq8aXrwX/JCUBvczxtQiNC9GdIIbmL8R6VszoSOtIBCmgAsoiyKFhHi3zW3X7vJX+x4n+pxQXXGBikWFzvFGMIDLnE5hzrE1yVsw8O2KOLHeTWc4sSJHl+8+fU1+WXxn/PCb5LGYBdUedObfyBTGvJZlXxyqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmwiqmQrU4MQiugi8VkG4+vzK3vfhShe38drwGPsXzKcYlZgOXJR8VPEg95vPdJ4IPQJ5/gTF3dJT5EZm5VPTXIehSln7pzhxfCqB/G98S95KDOVj+F3/Is2L+AYhgqhiCWSEHmEyZZK60Hh1GYAACjvNa6nydwhLbEuOIMzpMakwFsgQMxUzO90NCbcUoboJbwjByECafq6wHh5M6R4cDc63+c7Hx6xADxWGUuZfgIM7R4AQMLqQAkxUyjsWXbqUpYFEo0edtk4VRjZMLB3H2NpehR57L0oX2s16Cy5bMz1vpucniyeCjwH6J/WTKGJ2JQHZ5YSPXJuDDE9ZfkwcnYQw4BzWeTOhFCIC7MYqwwV9RybxTBJI7J1H2Ar+486jGE84BZ8hK6gN5eHrhVkotpoGSEznC6M6xBPbitLr0/zgkVfZm9Co0vKK2HHMmVQZ3jgIfRfjF4dGVfTCOYow5kTW8cMX89QP++99RPDL5wIhwRGkAtfmgTQJHh41AZzK3GF9aDOAumDh5OXhPBnucJ4FH4MmNozuj9EzKC8X8AYyWko5MOTIGJRhoWLo6vHAS4cnmDrJGjOiKXvq2aIAY5jKfjQqDOycJHICDwV4ajsUY48DUbF8o5i/gf9xSHibyzcjoLRICXiayKaMoRzc6hHZp2w1uCK9gxcg8ikF2J6GMZgxqnNqGE4UhJsaPHfn6pWL+BPbzj8juHbkDxhFKh7mTXRhjoZ0iTTCiOUHnxin5UmPU10D5dMM1gVICuclMUyC5k8xIIZG6jrTbkccf64dvLRH5M+gdaHpHKCfCJhGHTGw3xFSIGMHbWUp0pCxz2YV6r3W5kwTwLPP/d5BEQSltIKcTuY/kU0sOG0r7gfIA9n3lnKl+VroHfw92/2F+Hd5i/US2gmohBEOnI9JdI5N9uSnqa/CcnQjeKT484Y3gxTETim+xhwbjJ8o92Hvwe/DvLxn0ysrKysrKyn/DPwEUtHqYNjeMYgAAAABJRU5ErkJggg=="/>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
-  </g>
-</mask>
-<image id="image15" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAGYklEQVR4nO2cS48bxxVGz3erusnmjDSStfLSgHbKLj8wyQ/0LgKyyN7OYmCMZsh+VNW9WTRlK0AasANEAoE+QKO5IAnew3oRuB9hZ2dnZ+erowD9DfQR9AH0/Z/R35+wdxWxYC8N3TsaAo2OxkC8/dYf+w/yCwwiBiNGES9G3CeCHn/MxJ8e8J9+JD5CfID4C4T+CgYYHzDOGAtGwcZXpGEh4dhSSX0gjlgJ9K3r/F/oRDDhi4g+0zB87GnDM40Op8e/f0f76UcC8AzY43tSfsK6iXy6J81Olxq5OFmNbD15dhIFy6B2Y3KSiBmCDk9Gq4UaUFOjzol66CmXF9o/Kqrv8Xf/hPz4nvTuQmIizwPdEvQmeq8caPRdom/QZcguUiQs35gYF2ENN2hAbYlCYwmxmJiXYEkHltMF4dTH95B/mLB/jXR2oG9wsMbxmDm2wuDGUOFozqEFPSKHYwHyG5FjIiIIhHtQk7MYzGFMqTGmjnFqTA5p7jEf0Q9G5J8n8mmgu4hDLwYP7ppzF8adgvsI7hoMEocIOokESLoNMUAIIoImUVowA6PgHMZLa/QmchZaErSB+HnCs53Ii+h65yDnpOA+jNdyXgOvJV4H3AmOwEGQALsVKwACB5pgRkwBZwWfgD6MLEeC6A13o3mm5WMllaBXcCRxknEfzoPgLfAm4E0Er4AT4oDIxDqdvm25vw+xTiOgRjAHXCSegd4h40iGEzQVqkQ9ipLpya3ShXMwGAjuLXjl8EbiO+A7GQ8R3Ck4AjnWLf4mxASEAieoISaJM8EhhLEWUiMoAYsbsxtzl8m5VJKcLNHTOEZikHFvzivgIeBtwBsL7hwGoIPbGjEBHlAsGF0ctC4FTVAwpoBRjaMSvZxcKikPjl0a2Y0uGb3EMYKB4A5xL3gVwevr40FXMdyQGMARBegVGFADJsEl1o3liNG708nJA1jmgLWF1IlEJV8L7xGHgGOsMgbgBJziNzE3Qaw3Bwrrl9mAmXUzOSroCbpwcsqkYiR6LE+OpfVckrKRwsgRdECH6An6EAeCQ8BBorvFxTfWkdJCLFrPZH2sNXYS2SDVICXQ5FjOgZbAbC3UCMwCiyABKSAryHC91sc3tV0TOOvgyQqyIBHrpXW9NMAskLOe7PPn1zpI11/bfHH/RqX8X/mitv+o1b+o92bWiq/NLmaDXcwGu5gNdjEb7GI22MVssIvZYBezwS5mg13MBruYDXYxG+xiNtjFbLCL2WAXs8EuZoNdzAa7mA12MRvsYjbYxWywi9lgF7PBLmaDXcwGu5gNdjEb7GI22MVssIvZYBezwS5mg13MBruYDXYxG+QkwtdWz0hrB7UT1/vaOOwBfk1wfL5ujf9ei764B/6rBxG5ieiEt7Vj2sNpCqqgIEqsHdXL9cqsL76tBujfOsM/11EEhaAANZwmrQm4BN5EZBYcw9VoAVVGuXZPLyFmnBExXJughajcWgM0uIIiGENMBGMYs1jjf4ISThU0Es6CZ4TXSjOjsj5pjmACLgRn6Zo4ERHrqOp0Y2tTXEMWgovgReIcwZm1xkliDmMhqLXSUsJzl2kzVK5ZwbbG4i4BL8AhoIv13YvWdNhNhSyuuKBEMIY4A0/Ap2uNFw/GBHMLFhK1y7RcJlqC4h2LOWP7nABzOoQFICgSF4ej3WDCTdegqOk6E+CT4BeCJ4znCC4NxkgsqVBKpWU66hKU3plLMMk4y9cosQQEHmuMZQAOHuRr5ucmCK5Tac0ozbHOiBfEU8CTOc8yzuFM5sxLpmRR89jT8gslG3ODjEguzAJCNNYV/II4mtO7yGgNZHzjmn8XcXVjQQ1jUfw6ap4teHbxLHFWMKZgdqeM97Q8PNM4UC4inRYMoWbggUdQgTnEkJw+RGes4m7CCr+eLTxEk1PaKmeM4CLjLHFOa05yvPQsp6DwTMtPB9rDhXo6spQOdQIKIVGvW9mY4NDW1Fu2WDNNt3TKE7ivYa6aYfF1Sk1yRoKJnrF0zKfGwkR9OtHywwMNR+OIhgEuIk7gVVQzFm9MoTXxFpDqOs1uZcAAULUe8gQt1t2pWGIOZ8nBfAmWk7OMI2UYqA8PtMxH/PE97R3ARJxO+OK0PlFrYVHHVCtdziSuo6XdyPrymXT9CwPSemZLmRKFmjNlccopKEzUYaA+nmjvPt7kz56vw78BAdB2OtMqjuAAAAAASUVORK5CYII="/>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,43.076923,-44.307712,0,57.153856,10.769231)">
-<stop offset="0" style="stop-color:rgb(78.431373%,14.117647%,0%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(84.705882%,23.137255%,0.392157%);stop-opacity:0;"/>
-</linearGradient>
-<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,21.201923,-5.062965,0,26.089175,27.932692)">
-<stop offset="0" style="stop-color:rgb(98.823529%,62.352941%,48.627451%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(84.705882%,23.137255%,0.392157%);stop-opacity:1;"/>
-</linearGradient>
-<image id="image21" width="70" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAYAAABxLuKEAAAABmJLR0QA/wD/AP+gvaeTAAAN90lEQVR4nO2bTY8cR3KGn4jMqurqnp4hJQ0ByTJ2LXhtQLoY4MkXL3/AXvV7LP2NvfukqwEfzbPXPPigBWwIghamVxBn9THs6a6uyswIH7KGHAu7BntILmfteYFGzxd6Ml5EREa8EQW3uMUtbnGLW9ziFrf4PwV50wf4Q/DnZxNAfnkfvbtHjkakz//z3EPEf9LhwwLfPMLPwH8N/vfgAn6d/x9f1oDXAJktEUAe3UdPztH3viYc3UV70AF0a5WcleKN4V9k7M++pvBTjBX281OMh5jzjOGDCLpxHjN7ijx8gN47Q8/PCbYippFASyyJ0BqqhoyOFMGbgIVIkYm8aSn3duQnS8p/nmB3H2Efgx1Kzo0i5iopw2NC2BB1RYyRZhxp+khMiaaJBJ3PbuAaKZLJu0RedKSSSW8dk757Slm/TfnyOTkvTEx4bVYeDhEQrpDS9jRZ6QJ0i4ZFyfSu9CGwEFhkWKjS5kxDJKgSBCSDlAHsCKZzWP0N/tOv4NMDiLkxOcaBz0DOztAPdgRWxFFoFTqMhRkLlE6ElkLMjhZH3DAC2QtTcMYMQUCzInEDuzt4eYxzYI65MR4joB8+QFdnhNDR/E7oIiyS0+MsfX4P0JvQi9Cp0gahUSd6IKColjnEBG8ilif8eMSe/Az/5dfYi57nxhDzzyC/WhGanthuaNuOrhi9O706Swss1VmosHChU6cVaBwaV4I7qiBZEXG8UTwppgEvS+x8i//Dd5QXPc+NCCUH+QzkdIv2kVA6YhppPdJFoXOvOSVAa9AqRBcUQMEx1BXBIQoYmEGJEzkrmYl4J784KXBDiAE4fYB0XyDJCOJEbWhItBbonJpbTGhFqoeoo3NcuIGogWv93qEUIYXARCCWgbDJlcgXxY0hBqA15IcjtEmESYkNRBEalIZCY0KDEN0IEUQBB0cQozIUoIjSIDRJacjEtkdLh/DNi5/lxhCz3iDNO0jYI9nQIKgbQYSIEhGiGIqgUr1FYA4lAEdFCKWSGd0J0dCpRduCaD6sZrsxxAB8V5BgCF5f5miU+g6oOAEjiKJODY0C7oao4jgmlSAphgpIBwyGTOUwYg6Ku9eNt36HF8VbqV4QePaOgIiiomhxojhBnKBOiIqqo/hz44PgCRjn74/DYXXMjfGYzRqfgKB4VqwIpoIZeBR87hfEnKBCcK+lhgjmDu6YgKjgBVwFA0wmLEQsxT9RYngI6/exssMmw7qWnJUiQjHBxGEOqejQqlRi3DBRcKcIkMHNKO6U4GSNlGnAyuZPlJgz8NNYvSUaZVKKJUoQSoi4OYLMpEDHfHaHIo6LkHDAKDGQVUhuZMnk0FCW8uJVL9wgYqAKTscB22ZskbCiWAAvNb8EgcaNhSs9/uzsycHUGR1wwbKRGyGZkUJDbgLlh3gYMW88+TrIpyCnVGXuaUGOgOSIzDdTMAJG49ApLIDenaXCAqFzoXFQBw9KDoFkkdRlkkzk7zeUeyeHEfPGeiWvMoOezc3jEAm+JR4JDYUuNCySsAywcmWNcyzC2p0jhyXQiqC1A2ASGFzYiXPhwraD3SDsmwVjiuS/+5xyk2UHceDTuTd69z56dI52X6DNqrYBWehYsEiJXqA3Z6lOb0ovsEBZiNOJoCaI1ISMg+HkbGQguZCYyIuR8vm7GAfKDn8UYn4sbP9i1nHPvyY8WRKBuJ9ovKUTWHSJXoQ1sBbhCOFInCU1hDqURuqHFQcXoSBkhYQyFSWhZIe8sSpvcpP0mKvhcvYA/dWKcLYiHn1H818NbV6wWEwsxsiyqWFz5M7aA8dinCCcOJy4c6LC2mAlQqe1XXAgKexcuHBnAzx1ZxNgG43BN0xnvyV/TL3KD8HrIEauEhLvE05XhKMnxDHS5kTHks4DfRhZmrBqqkesS+BYhWOMO6qVEIRjam5ZidLhBK9WZnUGhAuXSorAucDGnV3Tsz+fSHc35L/gcAXvlYXSi4TLaqIpDW2CtjE6GhbqVaUToZdCL0rvwrI4S1GWOEuBHqHBERGKQ1Fnb8JWhYvgXOBsi7IvhUk78nagHLXY2TVIeSXEXCXk4QP07Aw93aLTY8L3K+LxMfFooB0a2kZo3Vm4szBnUaCXUJOseJUscRZUpa5zp5NazDUz4Zla0E0oO3E2MoePCVsXBnHGXEhtTzkD+/hNDNwua5APQT64j77/GJ02xLwitic0YaTZ7elca1ItxiLGmQToFXpKvXFU6t+IVTHKqofE+Up2g4RTzJlUGAy2Ak8NzlE2UtiWwhALUzbyxYB98Fv802va9lJzpVmS1A/uo5tvZ2X/nLaLtHZpqNPLJRnO8pIU0dk7YHGp0InTWFUn9crZHKHgZHcmYC/CFmergafmPDV4qvCUwkWIbC9g/BmMj7+gPKiJ948XSpfDse9nUpqOZl9omyULCn10ejWWU2ClxtKFFUJvtThbiD+TLBuBBic4VUOhzpyLOUWVJM5kMIqwV2Fnxg7lwowLjAsNXGhma8K+ZFKZyOfvPssv18JLhdJD0D8/R1kR94VWjEXMLCkcuXJUAkfBah3ixhKlF3keLpdK26XoJGD+3DsSWglB2KsxOAwFdqLsxNiasgvOzgqDCXtgPw2ksKZs1nWwf92QuHYofQL6i/uE6RviGOmC05fISoX1lDkJwrEwl/HCyp2lCp1D616HYpef5WDiFBESNZeMXjWmPbB3YRBh54XBhUGFHTMRCPsA49KYvt2Sy5rcv0958LAWddfddrg2MQ7664+IT57QhhP6klkF4TjBHYE7otx1OBFjLcrS6m3TiKAILoYhFHOyKmnOH8/IUGHAGErNKbtLghD24owKYzKmrjBJT9Yt+eSE8uRz7AHPSJmPejiuW+DJRx+jfEWkpY0NCyusPLIOcGJwV+AucEeVY4cjgYVCpPY3xZUkwt5r87dFuFDnKfDUhXOFc1fORXmaM5vobGLDhTu7CXZtqg3iD3tSiuTjtyn/8W/Yv4I/eAlPucS1c8zpGTINhCkQj6ClYaHG0oS11k74GDh2ZyXQAuJKESe7Mrmx01qg7dzYuTC4sgvC4IUhw96dvcIYhXEsTA1MZHK7IoeRchIp6a+ws4f4vzxfFOKTlyQFrhdK8gnIxx8Rv890aWSlytqUtzHeETg14VSctxyOBXoXghjmMKqwpZbtG5SNOpuibLXM5FwJl+xM0ZhKIh31pPMNpe0pZyvs9ErIzIa8NBlXcbDHXG4lPNmiWyOuWmKBNghtodYuc33SSRWQggImFBVGg0GMDfCDGOembMS4KIFdTAzaMWZjamGKmSQ9+WKiTFDuvY99+Qi7skZ2eaRXjoOIuVq7nCSC7ohTolk0tCnTXd464jSiBHNUBZ8V/MmMPbBVZVOsVq1t4TwHtq2ymwpjY0xk0rQid685XP43HETMpyA/B22/JZxEwg+JGAKNFBoVmnBZl2gNUZEqHgFJYKDeLluzmmyDsklwIZntaAwhMp5sSN/1lPWCsvkc//Ax9uGVcPnklVPw+3GQ5vshyNlH6HsDwbpKimqdLQedSXEEw91rs2eXV7AwUG+gy9deYO/z9Ryc8WJi+vd3SGdfkf7x0fNyXl7BLXMoDvKYUxC26LAm7HY0Gmgk05RII06wOvAyqnI/ulSBSJzJYQD2AqM7KTgJIatRhkg5DpQQKXxOudyX++R1WPyCOIiY9X2Er9FohGlBlEQUpXEjavU+N5llARAxggEok8JgMOJkZJYkgVbwAUgR/0nEP3wD3vH7cFAo9XtkcxfdtMTFTEqZVzPMURdcnezULpi5lFd7RkpC6gKPOFIczYaeONJk5DfjzdkiPchjfjMib4GSCftIVCGSiS51/w3AhSLGRA0pccCVjJNNMAXcUXM0RNSUsMmEdxxNVqcHr8HOg3EQMX1GBtDgiBpahKABlYJKHfC4GRZqOLlV7ReoM2itBRkC4oFgVofzTYcOe/TMbgYpcM2WQA3xgJjPu7lUi0WwKBR3QK+sZVSiijku+rxBc+oejMyEvA/87Uub9GrwUiNaF9wL7nO3LIaZYA6WwUSqp/j8c6Gudjh4BiJ19aPTN59sf4yDiVkrbopnwYLMBs+rGg4mRkEp0Sshbphc/q7mn7rWUSimWFDMBM+KPwY+ew1GXgcHETNE/Inik2KaKRg5GOlZXVIT7DMPMcGYd1yC1wScdVbnAplCFqWkEcta10Bel6GH4iBiLjq877B1RyaSzUgWmdSZTJksMKmTVEgYOTgZIxevL3eSOlMTGM2Z3EidkYZIea+nDBG/7rjjVeOwyvcU676g7CIFSLFlyoVYLsccdeupSgBav9R5wykEks0qf4GxgX1umCSR1pk87LB772LXHXe8ahx0PTqEf/pLYt/RLAtdMRYp15FIdvoYWXihM6F1JcjlrVTFqSSZkcjeq3g9BGWHsm+EMY0kviI/uOa441Xj0Ova751g0zeUpy25UyYEdeqWpFlV+aWGUjBHQ/WejJFMmJrCXoT9HvatM+0y6WJPefddypdfvXlCLnEwMfcfYb/+iNJ+T2IB3wrSKt6CFSglk1AajBAi4hkXp2ghe8NUZiF7CeNUmGwghzVl8+jZuONGkHNoKP3BJ9DSQLuKNFNdb48eayi54CVhbajJuumYrNSn0KaB9KrGHa8aB5fgPybn3q5uM+ieuO6I24nYtYRsqDpigkfFwkSRliwjWRfkOD+3eBNJgWs2bD9+oPPzc8Jfp6rTpInQLtHxytMeRfFxh4WWEntKd045OaE8OcWukDJ/9C1ucYtb3OL/Lf4bwwP54vrV9MoAAAAASUVORK5CYII="/>
-<mask id="mask3">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0.000000000000003297,53.846154,-49.919894,0.000000000000003057,60.296472,10.769231)">
-<stop offset="0" style="stop-color:rgb(100%,84.313725%,75.686275%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(100%,76.078431%,62.352941%);stop-opacity:0;"/>
-</linearGradient>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface24" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:evenodd;fill:url(#linear2);" d="M 8.078125 10.769531 C 6.589844 10.769531 5.382813 11.976563 5.382813 13.460938 L 5.382813 61.921875 C 5.382813 63.410156 6.589844 64.617188 8.078125 64.617188 L 61.921875 64.617188 C 63.410156 64.617188 64.617188 63.410156 64.617188 61.921875 L 64.617188 13.460938 C 64.617188 11.976563 63.410156 10.769531 61.921875 10.769531 Z M 8.078125 10.769531 "/>
-</g>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface27" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(76.862745%,21.176471%,0.392157%);fill-opacity:1;" d="M 51.152344 0 C 52.640625 0 53.847656 1.207031 53.847656 2.691406 L 53.847656 50.480469 C 53.847656 51.96875 52.640625 53.171875 51.152344 53.171875 L 18.847656 53.171875 C 17.359375 53.171875 16.152344 51.96875 16.152344 50.480469 L 16.152344 2.691406 C 16.152344 1.207031 17.359375 0 18.847656 0 Z M 51.152344 0 "/>
-<use xlink:href="#image9" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(84.705882%,23.137255%,0.392157%);fill-opacity:1;" d="M 56.539063 5.382813 C 58.023438 5.382813 59.230469 6.589844 59.230469 8.078125 L 59.230469 55.191406 C 59.230469 56.679688 58.023438 57.882813 56.539063 57.882813 L 13.460938 57.882813 C 11.976563 57.882813 10.769531 56.679688 10.769531 55.191406 L 10.769531 8.078125 C 10.769531 6.589844 11.976563 5.382813 13.460938 5.382813 Z M 56.539063 5.382813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(79.215686%,21.568627%,0.392157%);fill-opacity:1;" d="M 16.152344 5.382813 L 53.847656 5.382813 L 53.847656 10.769531 L 16.152344 10.769531 Z M 16.152344 5.382813 "/>
-<use xlink:href="#image15" mask="url(#mask2)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(84.705882%,23.137255%,0.392157%);fill-opacity:1;" d="M 61.921875 10.769531 C 63.410156 10.769531 64.617188 11.976563 64.617188 13.460938 L 64.617188 61.921875 C 64.617188 63.410156 63.410156 64.617188 61.921875 64.617188 L 8.078125 64.617188 C 6.589844 64.617188 5.382813 63.410156 5.382813 61.921875 L 5.382813 13.460938 C 5.382813 11.976563 6.589844 10.769531 8.078125 10.769531 Z M 61.921875 10.769531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 59.230469 10.769531 L 10.769531 10.769531 L 10.769531 55.191406 C 10.769531 56.679688 11.839844 57.882813 13.164063 57.882813 L 56.835938 57.882813 C 58.160156 57.882813 59.230469 56.679688 59.230469 55.191406 Z M 59.230469 10.769531 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:url(#linear1);" d="M 26.25 25.578125 L 26.25 49.808594 L 20.867188 49.808594 L 20.867188 25.578125 Z M 26.25 25.578125 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(98.823529%,62.352941%,48.627451%);fill-opacity:1;" d="M 30.289063 21.539063 C 30.289063 25.253906 27.273438 28.269531 23.558594 28.269531 C 19.839844 28.269531 16.828125 25.253906 16.828125 21.539063 C 16.828125 17.820313 19.839844 14.808594 23.558594 14.808594 C 27.273438 14.808594 30.289063 17.820313 30.289063 21.539063 Z M 23.558594 25.578125 C 25.789063 25.578125 27.597656 23.769531 27.597656 21.539063 C 27.597656 19.308594 25.789063 17.5 23.558594 17.5 C 21.328125 17.5 19.519531 19.308594 19.519531 21.539063 C 19.519531 23.769531 21.328125 25.578125 23.558594 25.578125 Z M 23.558594 25.578125 "/>
-<use xlink:href="#image21"/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,83.529412%,77.647059%);fill-opacity:1;" d="M 30.289063 53.847656 C 30.289063 57.5625 27.273438 60.578125 23.558594 60.578125 C 19.839844 60.578125 16.828125 57.5625 16.828125 53.847656 C 16.828125 50.128906 19.839844 47.117188 23.558594 47.117188 C 27.273438 47.117188 30.289063 50.128906 30.289063 53.847656 Z M 23.558594 57.882813 C 25.789063 57.882813 27.597656 56.078125 27.597656 53.847656 C 27.597656 51.617188 25.789063 49.808594 23.558594 49.808594 C 21.328125 49.808594 19.519531 51.617188 19.519531 53.847656 C 19.519531 56.078125 21.328125 57.882813 23.558594 57.882813 Z M 23.558594 57.882813 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(99.607843%,73.72549%,63.921569%);fill-opacity:1;" d="M 49.808594 25.578125 L 49.808594 34.671875 L 26.25 44.769531 L 26.25 49.808594 L 20.867188 49.808594 L 20.867188 41.21875 L 44.421875 31.121094 L 44.421875 25.578125 Z M 49.808594 25.578125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,83.529412%,77.647059%);fill-opacity:1;" d="M 20.871094 41.214844 L 20.867188 49.808594 L 26.25 49.808594 L 26.261719 38.902344 Z M 20.871094 41.214844 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(99.607843%,73.72549%,63.921569%);fill-opacity:1;" d="M 53.847656 21.539063 C 53.847656 25.253906 50.832031 28.269531 47.117188 28.269531 C 43.398438 28.269531 40.382813 25.253906 40.382813 21.539063 C 40.382813 17.820313 43.398438 14.808594 47.117188 14.808594 C 50.832031 14.808594 53.847656 17.820313 53.847656 21.539063 Z M 47.117188 25.578125 C 49.347656 25.578125 51.152344 23.769531 51.152344 21.539063 C 51.152344 19.308594 49.347656 17.5 47.117188 17.5 C 44.886719 17.5 43.078125 19.308594 43.078125 21.539063 C 43.078125 23.769531 44.886719 25.578125 47.117188 25.578125 Z M 47.117188 25.578125 "/>
-<use xlink:href="#surface24" mask="url(#mask3)"/>
-</g>
-</defs>
 <g id="surface1">
-<use xlink:href="#surface27" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(73.72549%,19.607843%,0%);fill-opacity:1;" d="M 53.199219 0.488281 L 17.609375 0.488281 C 16.238281 0.488281 15.132813 1.59375 15.132813 2.964844 L 15.132813 11.074219 L 55.675781 11.074219 L 55.675781 2.964844 C 55.675781 1.59375 54.570313 0.488281 53.199219 0.488281 Z M 53.199219 0.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(81.960784%,21.176471%,0%);fill-opacity:1;" d="M 57.390625 5.441406 L 13.425781 5.441406 C 11.441406 5.441406 9.84375 7.039063 9.84375 9.019531 L 9.84375 11.835938 L 60.96875 11.835938 L 60.96875 9.019531 C 60.96875 7.039063 59.371094 5.441406 57.390625 5.441406 Z M 57.390625 5.441406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(88.235294%,34.509804%,8.235294%);fill-opacity:1;" d="M 62.542969 10.523438 L 8.273438 10.523438 C 6.292969 10.523438 4.691406 12.121094 4.691406 14.101563 L 4.691406 65.074219 C 4.691406 67.054688 6.304688 68.667969 8.289063 68.667969 L 62.527344 68.667969 C 64.507813 68.667969 66.121094 67.054688 66.121094 65.074219 L 66.121094 14.101563 C 66.121094 12.121094 64.523438 10.523438 62.542969 10.523438 Z M 62.542969 10.523438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,69.803922%,56.470588%);fill-opacity:1;" d="M 22.820313 15.769531 C 19.054688 15.769531 16 18.828125 16 22.589844 C 16 26.355469 19.054688 29.410156 22.820313 29.410156 C 26.582031 29.410156 29.640625 26.355469 29.640625 22.589844 C 29.640625 18.828125 26.582031 15.769531 22.820313 15.769531 Z M 22.820313 27.003906 C 20.371094 27.003906 18.390625 25.023438 18.390625 22.578125 C 18.390625 20.128906 20.371094 18.148438 22.820313 18.148438 C 25.269531 18.148438 27.25 20.128906 27.25 22.578125 C 27.25 25.023438 25.269531 27.003906 22.820313 27.003906 Z M 22.820313 27.003906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,69.803922%,56.470588%);fill-opacity:1;" d="M 25.382813 28.675781 L 20.328125 28.675781 L 20.328125 42.503906 L 25.382813 42.503906 Z M 25.382813 28.675781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,85.882353%,79.215686%);fill-opacity:1;" d="M 55.214844 22.691406 C 55.214844 18.925781 52.15625 15.871094 48.390625 15.871094 C 44.628906 15.871094 41.570313 18.925781 41.570313 22.691406 C 41.570313 25.59375 43.382813 28.070313 45.945313 29.058594 L 45.945313 33.742188 L 20.332031 42.207031 L 20.289063 42.207031 L 20.289063 50.878906 C 17.785156 51.882813 16.015625 54.347656 16.015625 57.203125 C 16.015625 60.96875 19.070313 64.027344 22.835938 64.027344 C 26.601563 64.027344 29.65625 60.96875 29.65625 57.203125 C 29.65625 54.375 27.929688 51.941406 25.484375 50.90625 L 25.484375 45.53125 L 50.953125 37.109375 L 50.898438 37.011719 L 50.953125 37.011719 L 50.953125 29.003906 C 53.445313 27.996094 55.214844 25.550781 55.214844 22.691406 Z M 27.25 57.21875 C 27.25 59.667969 25.269531 61.648438 22.820313 61.648438 C 20.375 61.648438 18.394531 59.667969 18.394531 57.21875 C 18.394531 54.769531 20.375 52.789063 22.820313 52.789063 C 25.269531 52.789063 27.25 54.769531 27.25 57.21875 Z M 48.390625 27.105469 C 45.945313 27.105469 43.964844 25.125 43.964844 22.675781 C 43.964844 20.230469 45.945313 18.246094 48.390625 18.246094 C 50.839844 18.246094 52.820313 20.230469 52.820313 22.675781 C 52.820313 25.125 50.828125 27.105469 48.390625 27.105469 Z M 48.390625 27.105469 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureTestPlans(m).png b/dist/DevOps/AzureTestPlans(m).png
index 83e5ebef..c9491354 100644
Binary files a/dist/DevOps/AzureTestPlans(m).png and b/dist/DevOps/AzureTestPlans(m).png differ
diff --git a/dist/DevOps/AzureTestPlans(m).svg b/dist/DevOps/AzureTestPlans(m).svg
index 834f8792..7b0b3778 100644
--- a/dist/DevOps/AzureTestPlans(m).svg
+++ b/dist/DevOps/AzureTestPlans(m).svg
@@ -1,58 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="63pt" height="70pt" viewBox="0 0 63 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<image id="image16" width="63" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD8AAABGCAYAAAB7ckzWAAAABmJLR0QA/wD/AP+gvaeTAAAERElEQVR4nO2aXWwUZRSG3zO77baUSt1NdGGVkpSk4MrPDUsLwRDFK4nBGGoVQ4kBA0GoGFGJS+QvaIiEckvwAgViNCVoQ3phDGDTXtQWC7Ep0RoV1pQUxCxNf3ZntseLtSYI+zdzvq9q50nmYme+88775nyZnT1ZQAE8fGUWW1t+ZcvD8sd0i81zhyR8GhIi9+DbugQ4NluJNkY9oK7nJJTUhMcIqdGdwBLRVxQ+bKnR/Qt+UERfTfh4/zfg1S3gC93ADFNOuCEGbu8C7zssp6kQttbHxB52ZvQNSW+Ktv1/Azf8VMUNP1Vxw09V3PBTFTe8KhgeAm4XySn2CGqp7nziq3qg9SExPVrwKv98vURMTxV8vb6UrW2/iE9yzGW7JjtbTtjkPWrGWPOHePjKLAmPSiYuPDL7ERSXXAV+KlOhDyw+Qd7uDWq0HcLW9E/VdH3iKB7n5OmlTn2KP/DY3LIMSNZJ695NikBLmtLfJvYRDc979htAw1EgpXiACYDm1SAZfdmRhJQXAOBkxSYYQ8ckNbOz5gbiA9UU6Lhjp1qs83zzRDmMp/ZJ6eXH2SAeOP2W3Wq5bV/hew84GxTTyxeqfZPHgnPtlIqE57HgXNCO1yS0CmfQB8/6D+xUynTeE24CBn0iWnagw8+zee7pQssch2ezbRXowjNOdZwzeITPt3kLqXAUPn2z/iYnGmLQxjCWhzYVUuKs88vbtoE2hh1pSGI0HOA7jYG8l9u9D8cX+mG0Ru3Wq6HDj9LK3fmutt/5ssUHgQ6/7XpV0N6tnPju8byW2tHn5OuLYBzvBkY9duqVw/6vqejmqlzL7IU3vedBvNJOrT7WPEve5pZsKwre9mx51v77gwPAY0f4xx1Z3z0KCp+en20X+TOQeg5WYc7t7dlWFLTt2Xx4N+iW5h8vTpg/hMS0airrHLjf1bw7zyM7Q6AZb8sZ00FfOXz+/Zmu5t15tipPArF1MqZ0UjyO8c4aKl7w7T+v5NV5NqO1wMBL8sZ0kDRA5UfvN/LKGT49mlrbpGU0pQqqqkXi8xfvOZ2rjpNLX4HR9ZEaVzpZ9xtufV9NwUvDE2eydj49mqo8oN6YDk6FEGi/a+SVfdtXhKJA80ylnnRC83byqDnn74+Z1vHY6ip4u3sndUKjhKLPyDv2ApCt8974u/+/4ABg1nEiHgYyhOf4Qj9wrV6vKY14Dm0GMnV+2oYIECvVakgnHFkBZArPx0NazeiGPnwUyBTeuBbXakY7K/8AMoVPLerV6kU3fLUXyBCefO194Eudeh1phC5+DGT7qqOTewEPazOkC/6yB23NXwA53u3Z7HwfVPuOHlc6eOJ3WH01VHKjH8jxektFkV0Y/6QRCCT1mFMIn7kM68nIRHAgz2EGD0dmovjiZiCwAtRQBVwuV+dSCg+DG2NAzw+g1lM409NCdanUZLtycXFxcXFxcXFxcZHnT1SjauF9yfS1AAAAAElFTkSuQmCC"/>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<use xlink:href="#image16"/>
-  </g>
-</mask>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0.000151899,-4.827586,9.6702,0.0000758317,25.314216,9.655028)">
-<stop offset="0" style="stop-color:rgb(0,109,190);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(0,81,142);stop-opacity:1;"/>
-</linearGradient>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="63" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<image id="image9" width="63" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD8AAABGCAYAAAB7ckzWAAAABmJLR0QA/wD/AP+gvaeTAAAT6UlEQVR4nO2by24kyZWmv3PMPSJIBsnJbHA01KaEWmhRuawX6EW/Qs/rdPXz1EPMvEAuKxe1ECQIqIRAiNm8xsXNzj8LM/eI4CUrU9BggEEZ4AyGu4e7/f+52jEz+K391n5rv7Xf2m/t/+tm/2+er/97j/6Kl/yzwT953kvv/0/74Z/wovqM/3gF4DNYL973zwK/95yn73kZ7E/81H7z71/xmh+n/97x7hmg+p6nhBxA1KtX/sFmz597CLgC3YG84sOr773jFwM45fefVdsLvtu7/uMzMur794mYXqlnZ76yvSDpHeDPgb3j0r5v/3/i4xe//w2XU6ffA6d8PAC7I+OQiNqnkYRDAr4W/K+A/s7gZbAj0HveTtdWXH/R+494O4FZ8j8EH4BKyHsA3k+a8hIJtX8HBHwV+Gegf+A/p3NPQe8DHsGOQC84m3635rb9f/nKaz8CsOBsAn/FrWBHyJJrwY6IUSNGEt7x4VUCfg38V0n6j1zavoRXXNsf+IYHPlkFesmmAT7nweCCDfev9mHOUnDFDSeq388EHycyrrjVyyRUTXidgM+D/yKbfgp6X8oXnNmaW9tw0sAe2wh04MgGHu1Ne97A/Ek/buhZqJJ4LICeVSNgpRtOtE/EUxL2teA5AZ8H/8R7vw76jkv7dk/Sv+PaHjizNSe24dZGwCPYJWuDcwbWlhvgY9YvCqBjoVugY6NKxA33LNRzrJ6V5ix1w6PmnGnBw4EmvExA9QEVy38ITP6PAL/jF/tjA37PW7sCX5L971z6DcUXZE88pE/cJWeVnIeUmCVjlgqlc/rkrJPTJehfPO7p2j19MlZpxZnPkc8pPkd+T/EF4Qs++g3F19zaBWe24trueWuf+DhFlSqs5/lE9xrw0aHtwtZ3DfilfQv2Vza2ArsgWwd2Q7FzsmUe/BPFlpybszZj5k5vztqgN2Njmd4C2QmFTDyTfMdMwR2JXsZGMJOzljOTsdIjFnOKeqR70DnHcQPALRecccU18Bb4yB+55OfmBH/iJ/thkv4h+FeBv2TbO7s+sQW3boR94s6XnFsgN1YW4BVwZ8HGC2HBkYnBFsgKgZ6YntOrEJzQaUsnkIxOhtShWIM6eluhGJCWLKJpgdacxEsE3HEJfOCCf5/CZH3XJPXXgY9qvgN+aqcwqfg9b91ZpXkFnZx1gj4ZXSpEF0S3QJ1QF0Q3J7pg3mW2faAumLdD7Vz9TRCdUAfb5HTJ2tEhnxE+Q/6IfM61DxzZgvANJzaawAjye562itFfOnkI/NK+5/spZi/JfspffMOJLQj/xF2aU3zFmXuz1xG09gCPADuGPpP6wtDPmHUJ7xPbdng/Y9Z+M+9mRAcpBdEZ21RJ2KZHtsnYpDX4DPnA3OaUZwTs2/8dlxO2fbXfk/pz4N/y0f7K28m+19zaHfgZYZV1ubFyBzeO3ZCLbVK7NoB3DJ6Rd4QV3DvcDLeMEfiTkcegRKfMICAKWYZFoAgURheOWccMMNY4C+7Zso45G99AnHNhN8AFya64Zgn6HviZD7av+pPN7zK2nap/Cy/adwafIyuoSVtuyIP7VDjyOZEGcGPuiSEV8IS84JbAC2aBW4cs4YhiRhJscZIyWR2zyBT1pAgII0oVlJlVZ0sP1jNnzbIRMI8lZhvu7ZwVa7A/8I3+xp29eWFYe+DwfuInu2pev6k6h8A/+j34HPyWmc8I75AbXRLbZHQeRDJIM2a+ZUiOPJFSRp6QO25C7sgyYT1gGBAUXMLlSEGOHiLaAbJKQlcScwpGRyGzoRIAC8QjsAHgKDa4PfDJoFPLPPUEvCZbryHtw4FX36n6KHF8xZnPCDc2yTh22CYjpWBIhhL0KTOkREqQU8E8Ye7IcwXuIEvYFOoclyGMUOCRIAoWwRA9qdSo0BUxYPQkCmsSonCEBCIzV8Ztya0FR0AdP6zAlqA7Lu1ij4Bu39avwO72gP+Oa/s72ALcOLI5slvWE/CuAa9e2RLMEuQU5A48GTkZnhxzo6QM7uCBmZEchE2hTjJMgcmxJvEcHV0Jwmo2KhMy2yMApC1S0GuOvGOtLXMLjuycZGvO9Ac+8reaequFbT1R+yr1Ohqr+fkDZ7ahmDXnVpDPWDZVP/YV2ySiW5DSgpQCdcI78FRDlJJhCZQKSgZuNcKYTZGmgjekgpSwCEo4RKIrIqwm471ZMxDDJAYSJpCE5EiFQWJuGbczHm2DWVX9swOVH6tIT5Kc3TC0qvuJnZPtnmJLihkrB/kj2+REMlICayqvKbSpSV5YV8GX5FiCSICDWWDmhFlLLKvEXUGEYyEIUdywJvVCBRCAqWAKcIGcIcTMAjMxs+M2noDtAbbq8Xctgfm/Ah+48jsu7Q33dsPKExvfIDM23nOXVsy9kFPBU0dJCU9QOug7PwBej0TqDXonOqskdAad2ifQqR4JzB13gRvmwhwwTVrhVKk7TlIhySlykCMSyNgyY6GOQbDUwCOFY51xy5oNwZGCKx5BJ/wrH/hR3U4N3vE98Ned1Dkn2yfufM7cjpkZFCuEG0fNqytBTjQnB0oid4muZWbqAuuqdkTTErxKzMxbZKm2HjJCwgK8OLLAEUG9p4ZAw+R0Yc1/DKQQZmAmtgbZ6vexXQBXrLi25RNv7z9M9n5YU9twaxvubcnajpnbmlvfIA96G6awJXd6H/AEOQl13c7eO4fOUedEb1gfRC+sd6x3oqf6h05E71gPqRPqHHXVUY6fyavpdF5Bywt4kKwnWdBZobOgt0xvma1l5jbw+NlizWTzd/xiF/yeFdfWgZ23BKfa5doW9E3qNaHJ4IWSejwZpeXdlkTsqbS6ERAoJVKqyRAu3NTCXE0xJUEkrIAhROBAES3WO3hBDniHNyEU6zFznBXD5EO+pO05vO+5Z2N/4JS/s2XDf9mSR7tlbsHarUrZog0oArnoHXJyeqc5NsOTKElYI0FdfY9StW+8HZZqxqYgqNZQ9VUEgcmQQ/JALUTKE25BsaCzjsGCzoLBoBg4hcGcUyA3DX69TOZQB/vjyOeBTzbW2QbmdjxJvbfEo89IVqWO11S1dygpUxJY+/RkeGqEdGBJzcnVw5ppkEDNJygZSgVLgSVr/kEtPBbkRnbhlnATxWBGUAzmABwBJ8ASOAPe8Pn2tJIztVp6WltmZoWtzdla0NnA2nuS7bI1mu3Tjs6pztBbGGzfp1C35/iUYor98jEPcNyMsAB3zIRZwg06nLAgLCYCIMgGCwrDJOVbar5Si6Avt0ntP/HRVjDZ+yeKzdu1TG9OZ0HYjLDMxoPeOtwy4YCPtlxBJTdKEsmtATbMwds94bvMrqZuAoSgevxGgpkIc2TVD0QLfy9p8ppEL8jc/4rEx+a7ObP9dsEbIDO3zNYACoPNGJq9pTY623oizHHbAR877TZ+r0nNjhyaNA0ztbBXQ5+ZT26hMfPr5XWcTgArYE0vXoB/xFvtZn1+bL971i6fOIkli0mdFgTJuqZu1fYOj6qWxW0P1CjFMT831ICb1Q6oSffp/zUH2O+d4aodD9VhMIzjuP1Wq77Hgqupzv++XRtncj5j82s7AxZsDI6Z0Vkht06NjgZEMRHWQVNLt+rU6/e090x/jW9qehu4aIObera0ay5rR+DyiYAiJ8lJ2tIr0atjpo7ZRNg44TG2/QnOV8ED5Bdq6jER0H/up68ArH8DEJIhCRNYA1cHKYZkEBWohSEFMWWBhVCCyCQZRQO9ElnOIHigY6uehcaJDhjn+N4f9Oez4L+2VQAhKFiN04omyUAjyDCIEeiY3BgxgXaIWtQggpC3+x2L0r5nkpxQpsjJ8ib11KTes5mmuOr83odn097PRnWHFxfKTfV2bHXtAQO1BpNkmApFhih1GKJATT0lsKijM6wmLCJ2eba8KkURVkABFkKFltlZ+xTESEAilAl1LMLZyHGtMYmsYKHCljcstW6TnS+1VyXft+miNXPBI1uyUgOem60VkqypYrXHrg1HrUnv8ACKowJWvB1UkKXeEwEqQqUSopLwUn/rJbXn1CpP/RzI2lK0ZZjsfXR2NzxqwZle8vSvSP4jcy4Ed+37fQsfAtY4SPQysrw5n6AoMKWp2DgCVvHm4Wuejqr3PvDmUdXfipEmMiCK8GITGRFBCkcRWHRYlPbpHEXCQwyCQeJIwUoF54Q3uueO98C3fKd3eyM7f2ltC1zxiRouRs+Z6LWllzcnk0lKENGk7HsVmArAS6pZcAFyPacSNenOQC7t0yAbliHad8v7v2F6TpRax0sl2EbX6nwFizWDMhZbLO7ZaM5Scx70Z/7Ckmvtr+T4oc3TT5J/w6Xu2WhB1hW3HHEseGjqMbRpI2lojqonRaZIeNDG4KJ47WwaCxFN6qbqAHEIizbe9snDW3OCNIDkwLI1ctSkL1KBKFXqXSlY9FiIQT0esG1Sv9ENSeecKdMJrtmp/LvPqT3MOFHPSs5Cxkow0yOdTti2yYNFBBEB0WFRJZE9QRGp4cDKWHFDDkWBm9XUtbWg1eQlvKg5OpuAW4YohmdDWUQRXYGhdE3KwiKwGBgULHTGRsGROs50xUwXnOgNc13xcW+Keg/8Bd/pPZ/sv7eTdeL/v+jZ6JaFnLUS0pa+xdr60r4VGIPsoiuGM2boVv82X2dJpHDMguI1CapRxElR63dRqCGtGClXEkoukB3LNNBVM/oCVnoiUusLEMLinrVqxabXXfP0P0Obo//A/gqtA8kvudYV6JRbm3Ohe4o6HtrU8EYgJboIshupaQEhUummqWaZ4Y2A0jI2RR2Whjvepse81ejHZCeVWqpORZQS1e6LTdLvsmFZRAmGqKZiJTOfpL9ho2OOtOa/xYKHls9XqR82OwTfHIJBXQB0w6MSD/Scy1hpzWkYa6vSq3FbbMNIpW/19PqAGsWtVVkrcEsVdPbDgUpNVGr8VlAJLZBK1YCuAa8EVJX3onYUcgiPJR4DGyWOYo3HOQ+64lYXoPf8wrf8m97x4UDlAbof2K1ZGJ0eLYXtOVLPRo9YdGzNmuNLdGGsDboSbSalgt4wEpBBTgqrY/sIZEHycQxguHKdtGiZHM2HpBbmYvLuhmXH8ozS8oRSqIXLgPt4xBS8jSVJ4konfKN7Or1hrtODouW0HqeZHDAG/jHzveJWcx40Z6V7jtWzUMdWAxYZi8JqCjHQF1HKKKGM5UzOTjdAyU4MQoOjIWHbQIPa53iuXo/B0VDIOZNzxrK1w7Fc31FKYR01Jj7GGNo2WPSspqTmb9xpybXe855xPc4Tqbfwzf/if/KBB77jE2v7Xa1t2zln3NDZnMFmZFsDiZnNgI6wLcl8Kit3QJ1wFkmGcJJSG6nVdDeFUCQiDEVBUWO3SiEVI5XAS6IUp8tG5IKVQi61qFmKmLUUOBcxL1s8lm2So6p7iitu9YaVqhabTrjgHab//UTqBza/b/dHvNUJp6z5i+age9Ccc61QQGBgR8xYsaWjICBh2oJSnXCQMXhuJa5a/FArP8mo82yqM7NJiVBBLWvrosOiZnz1c4uXBSqZHPvAj5p3X4FOQVfQlqRd83NbhTUuQXsq9WfgR7uHj/y5Tk3rhqJzjuOewhGFHuceM3jkiOOJgJoEHbWKq2ms9tRFCcWiVnMMZq0HHTCQkHIbohZsmp3tWgirHr0EzAo8xj7wDSmWEB2XseBBmU5LrvUnLnW65+H3197tY90b2PzY4n21/CPearT9Gx7Vs9I9Gz2y0QKi2v9jHJGbOs6KKEWUMmDZ8DxgORFDtd8hJ7ohob2jGwoxJGLo6IfRvg3LWzw7nkUuNcQdSrwCT7FuwO/pYlx/d/q61A+ag/EDu9LOKb/Xn7jUkmsd8VYLzjTnQWs8jptz2WKxZFHEvIhZCXKpnSvF8Wx4A7HNjuVEP5QGdGCbBywPbHMF3g+JbtiyPQA9Ag9mZd4c7VPg1cHVsDYC/3lv0eHnpL4n+cMF+qd81JtGwBW3jYAz3bLSSMDQOpOxEIvCnoRqx6P4BGYzee4KtoKukt60e+wJ6FxS+x+GEgzljG3ZcDMBHx3cuPT0/V6l5mkq+4rkd+0dH6a1quNjRvVf8KBTLmNHQIqjunKiLLiPqgWVhLHj1gBt9qT59BivVWI874POWASLIo7KppG+hGfAq53/onGx8U7dX5f6AfgfJulX2z/l44H67wgg1nj0rLThJo6xEEflkIRqBiMRI7ARlBrAkaBo947XcjOrYChH3MaGFMdY3LLSmst4DvxSu1XWo7r/eqsjkRb/fmC0/c8RsPMBS4hN04J9EoJFgaHsE/EU9NNzYt7Uu4IemqQ30BybxynEaOP7C4wPV1e/eyr1L1P70fbHBzwl4ALini7+BeKcFOumBUuuW0dvYoPFGduyI2JbgkXpSLmOynZHR8oj2GAo4qicsS3BSQm25Q2npXBS1nRxTop/4ZtnEv95r0hxuKx8aq96fDv8X00DxpWYu80ET3dPPN1IsOHEtjzYRdtAMLAyeMu4rn5oy80PW11X/wmoEwzX9BwdLCd/uqZ+3FTwp2cSfwp8gval4Md7v243Bey2jxxuMPj13RTw0o6KB722m+IrdlJ8FvhT8E8IeH319R2/TOtxRxLgc/to6h6azbSnZgRdJQvP99F82R6alzYRfRnwl8C/SsBLJFQiDndP7ZOxT8jY/sA3APyZvxy89HAH1SHgl3ZP7WdvX6PqLwB97fzuGS+RAM83CP6j++Zgt3fu6b65f2TP3Je0z3Vu79r+855vD/2aHZNf0j63W7K++8Wdkk87+qvtSzv5ChEwrtv94ZUfvjz//7y9PH/wRftjX+rUF7X/A/5fQic73H0nAAAAAElFTkSuQmCC"/>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="63" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,57.931034,-56.4,0,61.975734,0)">
-<stop offset="0" style="stop-color:rgb(255,255,255);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(255,255,255);stop-opacity:0;"/>
-</linearGradient>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="63" height="70"/>
-</clipPath>
-<g id="surface12" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 21.6875 1.207031 C 21.6875 0.539063 22.230469 0 22.898438 0 L 44.65625 0 C 45.320313 0 45.863281 0.539063 45.863281 1.207031 L 45.863281 3.621094 C 45.863281 4.289063 45.320313 4.828125 44.65625 4.828125 L 43.445313 4.828125 L 43.445313 16.722656 L 60.992188 47.070313 C 63.785156 51.898438 60.296875 57.929688 54.710938 57.929688 L 12.839844 57.929688 C 7.257813 57.929688 3.765625 51.898438 6.558594 47.070313 L 24.105469 16.722656 L 24.105469 4.828125 L 22.898438 4.828125 C 22.230469 4.828125 21.6875 4.289063 21.6875 3.621094 Z M 21.6875 1.207031 "/>
-</g>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="63" height="70"/>
-</clipPath>
-<g id="surface15" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,122,212);fill-opacity:1;" d="M 27.496094 10.863281 C 30.285156 6.035156 37.265625 6.035156 40.058594 10.863281 L 60.992188 47.070313 C 63.785156 51.898438 60.296875 57.929688 54.710938 57.929688 L 12.839844 57.929688 C 7.257813 57.929688 3.765625 51.898438 6.558594 47.070313 Z M 27.496094 10.863281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 43.445313 16.898438 L 43.445313 4.828125 L 24.105469 4.828125 L 24.105469 16.898438 Z M 43.445313 16.898438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31,159,255);fill-opacity:1;" d="M 21.6875 1.210938 C 21.6875 0.542969 22.226563 0 22.890625 0 L 44.660156 0 C 45.324219 0 45.863281 0.542969 45.863281 1.210938 L 45.863281 3.617188 C 45.863281 4.285156 45.324219 4.828125 44.660156 4.828125 L 22.890625 4.828125 C 22.226563 4.828125 21.6875 4.285156 21.6875 3.617188 Z M 21.6875 1.210938 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,122,212);fill-opacity:1;" d="M 43.445313 4.828125 L 24.105469 4.828125 L 24.105469 0 L 43.445313 0 Z M 43.445313 4.828125 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,74,130);fill-opacity:1;" d="M 57.503906 41.035156 L 60.992188 47.070313 C 63.785156 51.898438 60.296875 57.929688 54.710938 57.929688 L 12.839844 57.929688 C 7.257813 57.929688 3.765625 51.898438 6.558594 47.070313 L 10.046875 41.035156 Z M 57.503906 41.035156 "/>
-<use xlink:href="#image9" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(69,176,255);fill-opacity:1;" d="M 37.402344 38.621094 C 40.738281 38.621094 43.445313 35.917969 43.445313 32.585938 C 43.445313 29.253906 40.738281 26.550781 37.402344 26.550781 C 34.0625 26.550781 31.359375 29.253906 31.359375 32.585938 C 31.359375 35.917969 34.0625 38.621094 37.402344 38.621094 Z M 37.402344 38.621094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(111,193,255);fill-opacity:1;" d="M 28.941406 50.691406 C 34.28125 50.691406 38.609375 46.367188 38.609375 41.035156 C 38.609375 35.703125 34.28125 31.378906 28.941406 31.378906 C 23.597656 31.378906 19.269531 35.703125 19.269531 41.035156 C 19.269531 46.367188 23.597656 50.691406 28.941406 50.691406 Z M 28.941406 50.691406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,146,254);fill-opacity:1;" d="M 38.609375 41.035156 C 38.609375 46.367188 34.28125 50.691406 28.941406 50.691406 C 23.597656 50.691406 19.269531 46.367188 19.269531 41.035156 Z M 38.609375 41.035156 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(177,221,255);fill-opacity:1;" d="M 38.289063 38.554688 C 38 38.597656 37.703125 38.621094 37.402344 38.621094 C 34.0625 38.621094 31.359375 35.917969 31.359375 32.585938 C 31.359375 32.285156 31.378906 31.988281 31.421875 31.699219 C 34.769531 32.585938 37.402344 35.214844 38.289063 38.554688 Z M 38.289063 38.554688 "/>
-<use xlink:href="#surface12" mask="url(#mask2)"/>
-</g>
-</defs>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<use xlink:href="#surface15" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,137,238);fill-opacity:1;" d="M 46.230469 8.988281 L 24.320313 8.988281 L 24.320313 20.085938 L 46.230469 20.085938 Z M 46.230469 8.988281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,77,134);fill-opacity:1;" d="M 67.121094 56.433594 L 62.53125 48.539063 L 42.914063 48.539063 C 42.914063 48.585938 42.914063 48.628906 42.914063 48.675781 C 42.914063 55.175781 37.582031 60.449219 31.003906 60.449219 C 24.429688 60.449219 19.097656 55.175781 19.097656 48.675781 C 19.097656 48.628906 19.097656 48.585938 19.097656 48.539063 L 8.242188 48.539063 L 3.683594 56.480469 C 0.445313 62.136719 4.566406 69.140625 11.144531 69.140625 L 59.691406 69.140625 C 66.28125 69.140625 70.40625 62.089844 67.121094 56.433594 Z M 67.121094 56.433594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(5,148,255);fill-opacity:1;" d="M 19.113281 48.691406 C 19.113281 55.191406 24.445313 60.460938 31.019531 60.460938 C 37.597656 60.460938 42.929688 55.191406 42.929688 48.691406 C 42.929688 48.644531 42.929688 48.597656 42.929688 48.550781 L 19.113281 48.550781 C 19.113281 48.597656 19.113281 48.644531 19.113281 48.691406 Z M 19.113281 48.691406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 31.003906 36.917969 C 31.625 36.917969 32.230469 36.964844 32.820313 37.054688 C 33.5 34.082031 36.199219 31.859375 39.410156 31.859375 C 43.144531 31.859375 46.167969 34.847656 46.167969 38.542969 C 46.167969 41.257813 44.527344 43.585938 42.183594 44.644531 C 42.632813 45.871094 42.882813 47.171875 42.898438 48.554688 L 62.511719 48.554688 L 46.230469 20.546875 L 46.230469 20.085938 L 24.320313 20.085938 L 24.320313 20.546875 L 8.242188 48.539063 L 19.113281 48.539063 C 19.1875 42.113281 24.476563 36.917969 31.003906 36.917969 Z M 31.003906 36.917969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 39.410156 45.226563 C 35.671875 45.226563 32.648438 42.234375 32.648438 38.542969 C 32.648438 38.035156 32.710938 37.53125 32.820313 37.054688 C 32.230469 36.960938 31.625 36.917969 31.003906 36.917969 C 24.476563 36.917969 19.191406 42.113281 19.113281 48.535156 L 42.914063 48.535156 C 42.898438 47.171875 42.652344 45.855469 42.199219 44.628906 C 41.347656 45.011719 40.402344 45.226563 39.410156 45.226563 Z M 39.410156 45.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(85,182,255);fill-opacity:1;" d="M 42.183594 44.628906 C 44.539063 43.585938 46.167969 41.242188 46.167969 38.527344 C 46.167969 34.832031 43.144531 31.84375 39.40625 31.84375 C 36.183594 31.84375 33.5 34.066406 32.816406 37.039063 C 37.144531 37.699219 40.710938 40.675781 42.183594 44.628906 Z M 42.183594 44.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(181,223,255);fill-opacity:1;" d="M 39.40625 45.226563 C 40.398438 45.226563 41.328125 45.011719 42.179688 44.628906 C 40.707031 40.65625 37.140625 37.699219 32.816406 37.039063 C 32.707031 37.515625 32.644531 38.019531 32.644531 38.527344 C 32.644531 42.234375 35.667969 45.226563 39.40625 45.226563 Z M 39.40625 45.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(73,177,255);fill-opacity:1;" d="M 24.320313 1.996094 L 22.753906 1.996094 C 21.714844 1.996094 20.875 2.824219 20.875 3.851563 L 20.875 5.046875 C 20.875 6.074219 21.714844 6.902344 22.753906 6.902344 L 24.320313 6.902344 Z M 24.320313 1.996094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(73,177,255);fill-opacity:1;" d="M 49.484375 5.046875 L 49.484375 3.851563 C 49.484375 2.824219 48.648438 1.996094 47.609375 1.996094 L 46.226563 1.996094 L 46.226563 6.902344 L 47.609375 6.902344 C 48.648438 6.902344 49.484375 6.074219 49.484375 5.046875 Z M 49.484375 5.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11,151,255);fill-opacity:1;" d="M 46.230469 1.996094 L 24.320313 1.996094 L 24.320313 6.902344 L 46.230469 6.902344 Z M 46.230469 1.996094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,123,214);fill-opacity:1;" d="M 46.230469 6.902344 L 24.320313 6.902344 L 24.320313 8.988281 L 46.230469 8.988281 Z M 46.230469 6.902344 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/AzureTestPlans.png b/dist/DevOps/AzureTestPlans.png
index 43486ee6..4d2a3188 100644
Binary files a/dist/DevOps/AzureTestPlans.png and b/dist/DevOps/AzureTestPlans.png differ
diff --git a/dist/DevOps/AzureTestPlans.puml b/dist/DevOps/AzureTestPlans.puml
index 9e979581..b1544939 100644
--- a/dist/DevOps/AzureTestPlans.puml
+++ b/dist/DevOps/AzureTestPlans.puml
@@ -1,9 +1,9 @@
-sprite $AzureTestPlans [63x70/16z] {
-xTC74kCW341HWpfm__FkfY0NEMFCzlAcfdmhGVPoYbWYfhGCISmQCSCFpTqtve0I4Ix3r8uqBVz8BXhyGVdaV_-_zwGHZkUiaGoFptg6vcuQbyTgq2TRwPFC
-7BjJXP6Qx8EXyKdj4wLRJyl4lPDZeseTtpqteQ-ultkrFBGzfXVfLniRxdMdx_5mOsbAZWV6fsqgekArZpSQM9eGFW1Wo3LTBetm1N86po-NfrvxxZsRNImF
-lNRPUp4dvtd_55VmwB4Fx-2ixj_egVVWTHWVbwQu1v1PROy-BuqnqEid3-npBdOGbrVgcqHQZmhiQwwUQrG3szMfEerAZNYRQtNbR7XKqkAWRcZGMetaU6wj
-jWSBmrkt6vzxZRNr-a7tIjlcwpNKXp_UxF6njpLkNc_7fruwEvcz_msFdbvvRa6r40TLF9_WUPhCgH_TLEut3amDrwMJkU6ERzVsg1r8gUEAudAKnYr_gl_-
--m8
+sprite $AzureTestPlans [70x70/16z] {
+xTKBkfmW38PXWIG4pVwtU-O-Vnr0e_JUlWludaX4fzzTP65jOU7Whh1qAqBkYZWgFskMmDofC8Nf02ujFC7Fgr1feO5P_gJA_yh_2kMMenKjBNhuWSOlTIWz
+OVAJqYF-I2nzqLt9fKz7ldD00ri67TaoyCYM8Gvi6V9-99LAvXlKIpfnjFoYxWEcEWBgFE1GZIBCy1uc7DmoSsiOSLyWePkO60JRTbqWPRfByOhu1NlpR3dJ
+ows2UJpN2OzDg3pmNNPS9y8agmgcSLmdR9cepj3pS25iNo2cRoKya-CwOSj4hKoghcdQsh9GvHOXp_SgOPGEpyTJTojQ3nFw_sNgo3N-sF9YRrdRPgkj3rXj
+ls8Dy-feRR-IhOKdA6PGZbGM730PT8SfreGtUB4LpoWGdn6f-liRWe8jhysDZ7NHlP8R_Uny7cmRe_IdiIq9xyedHISljacmvbh9Tuf6HqRb55IYZMASxe3q
+tFIG6M_Tu2ZOzKaoFT4o5dcAQkTy_9C2oN7q-YfS
 }
 
 AzureEntityColoring(AzureTestPlans)
diff --git a/dist/DevOps/AzureTestPlans.svg b/dist/DevOps/AzureTestPlans.svg
index f183eacd..a6e39f54 100644
--- a/dist/DevOps/AzureTestPlans.svg
+++ b/dist/DevOps/AzureTestPlans.svg
@@ -1,58 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="63pt" height="70pt" viewBox="0 0 63 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<image id="image16" width="63" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD8AAABGCAYAAAB7ckzWAAAABmJLR0QA/wD/AP+gvaeTAAAERElEQVR4nO2aXWwUZRSG3zO77baUSt1NdGGVkpSk4MrPDUsLwRDFK4nBGGoVQ4kBA0GoGFGJS+QvaIiEckvwAgViNCVoQ3phDGDTXtQWC7Ep0RoV1pQUxCxNf3ZntseLtSYI+zdzvq9q50nmYme+88775nyZnT1ZQAE8fGUWW1t+ZcvD8sd0i81zhyR8GhIi9+DbugQ4NluJNkY9oK7nJJTUhMcIqdGdwBLRVxQ+bKnR/Qt+UERfTfh4/zfg1S3gC93ADFNOuCEGbu8C7zssp6kQttbHxB52ZvQNSW+Ktv1/Azf8VMUNP1Vxw09V3PBTFTe8KhgeAm4XySn2CGqp7nziq3qg9SExPVrwKv98vURMTxV8vb6UrW2/iE9yzGW7JjtbTtjkPWrGWPOHePjKLAmPSiYuPDL7ERSXXAV+KlOhDyw+Qd7uDWq0HcLW9E/VdH3iKB7n5OmlTn2KP/DY3LIMSNZJ695NikBLmtLfJvYRDc979htAw1EgpXiACYDm1SAZfdmRhJQXAOBkxSYYQ8ckNbOz5gbiA9UU6Lhjp1qs83zzRDmMp/ZJ6eXH2SAeOP2W3Wq5bV/hew84GxTTyxeqfZPHgnPtlIqE57HgXNCO1yS0CmfQB8/6D+xUynTeE24CBn0iWnagw8+zee7pQssch2ezbRXowjNOdZwzeITPt3kLqXAUPn2z/iYnGmLQxjCWhzYVUuKs88vbtoE2hh1pSGI0HOA7jYG8l9u9D8cX+mG0Ru3Wq6HDj9LK3fmutt/5ssUHgQ6/7XpV0N6tnPju8byW2tHn5OuLYBzvBkY9duqVw/6vqejmqlzL7IU3vedBvNJOrT7WPEve5pZsKwre9mx51v77gwPAY0f4xx1Z3z0KCp+en20X+TOQeg5WYc7t7dlWFLTt2Xx4N+iW5h8vTpg/hMS0airrHLjf1bw7zyM7Q6AZb8sZ00FfOXz+/Zmu5t15tipPArF1MqZ0UjyO8c4aKl7w7T+v5NV5NqO1wMBL8sZ0kDRA5UfvN/LKGT49mlrbpGU0pQqqqkXi8xfvOZ2rjpNLX4HR9ZEaVzpZ9xtufV9NwUvDE2eydj49mqo8oN6YDk6FEGi/a+SVfdtXhKJA80ylnnRC83byqDnn74+Z1vHY6ip4u3sndUKjhKLPyDv2ApCt8974u/+/4ABg1nEiHgYyhOf4Qj9wrV6vKY14Dm0GMnV+2oYIECvVakgnHFkBZArPx0NazeiGPnwUyBTeuBbXakY7K/8AMoVPLerV6kU3fLUXyBCefO194Eudeh1phC5+DGT7qqOTewEPazOkC/6yB23NXwA53u3Z7HwfVPuOHlc6eOJ3WH01VHKjH8jxektFkV0Y/6QRCCT1mFMIn7kM68nIRHAgz2EGD0dmovjiZiCwAtRQBVwuV+dSCg+DG2NAzw+g1lM409NCdanUZLtycXFxcXFxcXFxcZHnT1SjauF9yfS1AAAAAElFTkSuQmCC"/>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<use xlink:href="#image16"/>
-  </g>
-</mask>
-<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0.000151899,-4.827586,9.6702,0.0000758317,25.314216,9.655028)">
-<stop offset="0" style="stop-color:rgb(48.235294%,24.705882%,75.294118%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(40.392157%,14.117647%,70.588235%);stop-opacity:1;"/>
-</linearGradient>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="63" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<image id="image9" width="63" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD8AAABGCAYAAAB7ckzWAAAABmJLR0QA/wD/AP+gvaeTAAAT6UlEQVR4nO2by24kyZWmv3PMPSJIBsnJbHA01KaEWmhRuawX6EW/Qs/rdPXz1EPMvEAuKxe1ECQIqIRAiNm8xsXNzj8LM/eI4CUrU9BggEEZ4AyGu4e7/f+52jEz+K391n5rv7Xf2m/t/+tm/2+er/97j/6Kl/yzwT953kvv/0/74Z/wovqM/3gF4DNYL973zwK/95yn73kZ7E/81H7z71/xmh+n/97x7hmg+p6nhBxA1KtX/sFmz597CLgC3YG84sOr773jFwM45fefVdsLvtu7/uMzMur794mYXqlnZ76yvSDpHeDPgb3j0r5v/3/i4xe//w2XU6ffA6d8PAC7I+OQiNqnkYRDAr4W/K+A/s7gZbAj0HveTtdWXH/R+494O4FZ8j8EH4BKyHsA3k+a8hIJtX8HBHwV+Gegf+A/p3NPQe8DHsGOQC84m3635rb9f/nKaz8CsOBsAn/FrWBHyJJrwY6IUSNGEt7x4VUCfg38V0n6j1zavoRXXNsf+IYHPlkFesmmAT7nweCCDfev9mHOUnDFDSeq388EHycyrrjVyyRUTXidgM+D/yKbfgp6X8oXnNmaW9tw0sAe2wh04MgGHu1Ne97A/Ek/buhZqJJ4LICeVSNgpRtOtE/EUxL2teA5AZ8H/8R7vw76jkv7dk/Sv+PaHjizNSe24dZGwCPYJWuDcwbWlhvgY9YvCqBjoVugY6NKxA33LNRzrJ6V5ix1w6PmnGnBw4EmvExA9QEVy38ITP6PAL/jF/tjA37PW7sCX5L971z6DcUXZE88pE/cJWeVnIeUmCVjlgqlc/rkrJPTJehfPO7p2j19MlZpxZnPkc8pPkd+T/EF4Qs++g3F19zaBWe24trueWuf+DhFlSqs5/lE9xrw0aHtwtZ3DfilfQv2Vza2ArsgWwd2Q7FzsmUe/BPFlpybszZj5k5vztqgN2Njmd4C2QmFTDyTfMdMwR2JXsZGMJOzljOTsdIjFnOKeqR70DnHcQPALRecccU18Bb4yB+55OfmBH/iJ/thkv4h+FeBv2TbO7s+sQW3boR94s6XnFsgN1YW4BVwZ8HGC2HBkYnBFsgKgZ6YntOrEJzQaUsnkIxOhtShWIM6eluhGJCWLKJpgdacxEsE3HEJfOCCf5/CZH3XJPXXgY9qvgN+aqcwqfg9b91ZpXkFnZx1gj4ZXSpEF0S3QJ1QF0Q3J7pg3mW2faAumLdD7Vz9TRCdUAfb5HTJ2tEhnxE+Q/6IfM61DxzZgvANJzaawAjye562itFfOnkI/NK+5/spZi/JfspffMOJLQj/xF2aU3zFmXuz1xG09gCPADuGPpP6wtDPmHUJ7xPbdng/Y9Z+M+9mRAcpBdEZ21RJ2KZHtsnYpDX4DPnA3OaUZwTs2/8dlxO2fbXfk/pz4N/y0f7K28m+19zaHfgZYZV1ubFyBzeO3ZCLbVK7NoB3DJ6Rd4QV3DvcDLeMEfiTkcegRKfMICAKWYZFoAgURheOWccMMNY4C+7Zso45G99AnHNhN8AFya64Zgn6HviZD7av+pPN7zK2nap/Cy/adwafIyuoSVtuyIP7VDjyOZEGcGPuiSEV8IS84JbAC2aBW4cs4YhiRhJscZIyWR2zyBT1pAgII0oVlJlVZ0sP1jNnzbIRMI8lZhvu7ZwVa7A/8I3+xp29eWFYe+DwfuInu2pev6k6h8A/+j34HPyWmc8I75AbXRLbZHQeRDJIM2a+ZUiOPJFSRp6QO25C7sgyYT1gGBAUXMLlSEGOHiLaAbJKQlcScwpGRyGzoRIAC8QjsAHgKDa4PfDJoFPLPPUEvCZbryHtw4FX36n6KHF8xZnPCDc2yTh22CYjpWBIhhL0KTOkREqQU8E8Ye7IcwXuIEvYFOoclyGMUOCRIAoWwRA9qdSo0BUxYPQkCmsSonCEBCIzV8Ztya0FR0AdP6zAlqA7Lu1ij4Bu39avwO72gP+Oa/s72ALcOLI5slvWE/CuAa9e2RLMEuQU5A48GTkZnhxzo6QM7uCBmZEchE2hTjJMgcmxJvEcHV0Jwmo2KhMy2yMApC1S0GuOvGOtLXMLjuycZGvO9Ac+8reaequFbT1R+yr1Ohqr+fkDZ7ahmDXnVpDPWDZVP/YV2ySiW5DSgpQCdcI78FRDlJJhCZQKSgZuNcKYTZGmgjekgpSwCEo4RKIrIqwm471ZMxDDJAYSJpCE5EiFQWJuGbczHm2DWVX9swOVH6tIT5Kc3TC0qvuJnZPtnmJLihkrB/kj2+REMlICayqvKbSpSV5YV8GX5FiCSICDWWDmhFlLLKvEXUGEYyEIUdywJvVCBRCAqWAKcIGcIcTMAjMxs+M2noDtAbbq8Xctgfm/Ah+48jsu7Q33dsPKExvfIDM23nOXVsy9kFPBU0dJCU9QOug7PwBej0TqDXonOqskdAad2ifQqR4JzB13gRvmwhwwTVrhVKk7TlIhySlykCMSyNgyY6GOQbDUwCOFY51xy5oNwZGCKx5BJ/wrH/hR3U4N3vE98Ned1Dkn2yfufM7cjpkZFCuEG0fNqytBTjQnB0oid4muZWbqAuuqdkTTErxKzMxbZKm2HjJCwgK8OLLAEUG9p4ZAw+R0Yc1/DKQQZmAmtgbZ6vexXQBXrLi25RNv7z9M9n5YU9twaxvubcnajpnbmlvfIA96G6awJXd6H/AEOQl13c7eO4fOUedEb1gfRC+sd6x3oqf6h05E71gPqRPqHHXVUY6fyavpdF5Bywt4kKwnWdBZobOgt0xvma1l5jbw+NlizWTzd/xiF/yeFdfWgZ23BKfa5doW9E3qNaHJ4IWSejwZpeXdlkTsqbS6ERAoJVKqyRAu3NTCXE0xJUEkrIAhROBAES3WO3hBDniHNyEU6zFznBXD5EO+pO05vO+5Z2N/4JS/s2XDf9mSR7tlbsHarUrZog0oArnoHXJyeqc5NsOTKElYI0FdfY9StW+8HZZqxqYgqNZQ9VUEgcmQQ/JALUTKE25BsaCzjsGCzoLBoBg4hcGcUyA3DX69TOZQB/vjyOeBTzbW2QbmdjxJvbfEo89IVqWO11S1dygpUxJY+/RkeGqEdGBJzcnVw5ppkEDNJygZSgVLgSVr/kEtPBbkRnbhlnATxWBGUAzmABwBJ8ASOAPe8Pn2tJIztVp6WltmZoWtzdla0NnA2nuS7bI1mu3Tjs6pztBbGGzfp1C35/iUYor98jEPcNyMsAB3zIRZwg06nLAgLCYCIMgGCwrDJOVbar5Si6Avt0ntP/HRVjDZ+yeKzdu1TG9OZ0HYjLDMxoPeOtwy4YCPtlxBJTdKEsmtATbMwds94bvMrqZuAoSgevxGgpkIc2TVD0QLfy9p8ppEL8jc/4rEx+a7ObP9dsEbIDO3zNYACoPNGJq9pTY623oizHHbAR877TZ+r0nNjhyaNA0ztbBXQ5+ZT26hMfPr5XWcTgArYE0vXoB/xFvtZn1+bL971i6fOIkli0mdFgTJuqZu1fYOj6qWxW0P1CjFMT831ICb1Q6oSffp/zUH2O+d4aodD9VhMIzjuP1Wq77Hgqupzv++XRtncj5j82s7AxZsDI6Z0Vkht06NjgZEMRHWQVNLt+rU6/e090x/jW9qehu4aIObera0ay5rR+DyiYAiJ8lJ2tIr0atjpo7ZRNg44TG2/QnOV8ED5Bdq6jER0H/up68ArH8DEJIhCRNYA1cHKYZkEBWohSEFMWWBhVCCyCQZRQO9ElnOIHigY6uehcaJDhjn+N4f9Oez4L+2VQAhKFiN04omyUAjyDCIEeiY3BgxgXaIWtQggpC3+x2L0r5nkpxQpsjJ8ib11KTes5mmuOr83odn097PRnWHFxfKTfV2bHXtAQO1BpNkmApFhih1GKJATT0lsKijM6wmLCJ2eba8KkURVkABFkKFltlZ+xTESEAilAl1LMLZyHGtMYmsYKHCljcstW6TnS+1VyXft+miNXPBI1uyUgOem60VkqypYrXHrg1HrUnv8ACKowJWvB1UkKXeEwEqQqUSopLwUn/rJbXn1CpP/RzI2lK0ZZjsfXR2NzxqwZle8vSvSP4jcy4Ed+37fQsfAtY4SPQysrw5n6AoMKWp2DgCVvHm4Wuejqr3PvDmUdXfipEmMiCK8GITGRFBCkcRWHRYlPbpHEXCQwyCQeJIwUoF54Q3uueO98C3fKd3eyM7f2ltC1zxiRouRs+Z6LWllzcnk0lKENGk7HsVmArAS6pZcAFyPacSNenOQC7t0yAbliHad8v7v2F6TpRax0sl2EbX6nwFizWDMhZbLO7ZaM5Scx70Z/7Ckmvtr+T4oc3TT5J/w6Xu2WhB1hW3HHEseGjqMbRpI2lojqonRaZIeNDG4KJ47WwaCxFN6qbqAHEIizbe9snDW3OCNIDkwLI1ctSkL1KBKFXqXSlY9FiIQT0esG1Sv9ENSeecKdMJrtmp/LvPqT3MOFHPSs5Cxkow0yOdTti2yYNFBBEB0WFRJZE9QRGp4cDKWHFDDkWBm9XUtbWg1eQlvKg5OpuAW4YohmdDWUQRXYGhdE3KwiKwGBgULHTGRsGROs50xUwXnOgNc13xcW+Keg/8Bd/pPZ/sv7eTdeL/v+jZ6JaFnLUS0pa+xdr60r4VGIPsoiuGM2boVv82X2dJpHDMguI1CapRxElR63dRqCGtGClXEkoukB3LNNBVM/oCVnoiUusLEMLinrVqxabXXfP0P0Obo//A/gqtA8kvudYV6JRbm3Ohe4o6HtrU8EYgJboIshupaQEhUummqWaZ4Y2A0jI2RR2Whjvepse81ejHZCeVWqpORZQS1e6LTdLvsmFZRAmGqKZiJTOfpL9ho2OOtOa/xYKHls9XqR82OwTfHIJBXQB0w6MSD/Scy1hpzWkYa6vSq3FbbMNIpW/19PqAGsWtVVkrcEsVdPbDgUpNVGr8VlAJLZBK1YCuAa8EVJX3onYUcgiPJR4DGyWOYo3HOQ+64lYXoPf8wrf8m97x4UDlAbof2K1ZGJ0eLYXtOVLPRo9YdGzNmuNLdGGsDboSbSalgt4wEpBBTgqrY/sIZEHycQxguHKdtGiZHM2HpBbmYvLuhmXH8ozS8oRSqIXLgPt4xBS8jSVJ4konfKN7Or1hrtODouW0HqeZHDAG/jHzveJWcx40Z6V7jtWzUMdWAxYZi8JqCjHQF1HKKKGM5UzOTjdAyU4MQoOjIWHbQIPa53iuXo/B0VDIOZNzxrK1w7Fc31FKYR01Jj7GGNo2WPSspqTmb9xpybXe855xPc4Tqbfwzf/if/KBB77jE2v7Xa1t2zln3NDZnMFmZFsDiZnNgI6wLcl8Kit3QJ1wFkmGcJJSG6nVdDeFUCQiDEVBUWO3SiEVI5XAS6IUp8tG5IKVQi61qFmKmLUUOBcxL1s8lm2So6p7iitu9YaVqhabTrjgHab//UTqBza/b/dHvNUJp6z5i+age9Ccc61QQGBgR8xYsaWjICBh2oJSnXCQMXhuJa5a/FArP8mo82yqM7NJiVBBLWvrosOiZnz1c4uXBSqZHPvAj5p3X4FOQVfQlqRd83NbhTUuQXsq9WfgR7uHj/y5Tk3rhqJzjuOewhGFHuceM3jkiOOJgJoEHbWKq2ms9tRFCcWiVnMMZq0HHTCQkHIbohZsmp3tWgirHr0EzAo8xj7wDSmWEB2XseBBmU5LrvUnLnW65+H3197tY90b2PzY4n21/CPearT9Gx7Vs9I9Gz2y0QKi2v9jHJGbOs6KKEWUMmDZ8DxgORFDtd8hJ7ohob2jGwoxJGLo6IfRvg3LWzw7nkUuNcQdSrwCT7FuwO/pYlx/d/q61A+ag/EDu9LOKb/Xn7jUkmsd8VYLzjTnQWs8jptz2WKxZFHEvIhZCXKpnSvF8Wx4A7HNjuVEP5QGdGCbBywPbHMF3g+JbtiyPQA9Ag9mZd4c7VPg1cHVsDYC/3lv0eHnpL4n+cMF+qd81JtGwBW3jYAz3bLSSMDQOpOxEIvCnoRqx6P4BGYzee4KtoKukt60e+wJ6FxS+x+GEgzljG3ZcDMBHx3cuPT0/V6l5mkq+4rkd+0dH6a1quNjRvVf8KBTLmNHQIqjunKiLLiPqgWVhLHj1gBt9qT59BivVWI874POWASLIo7KppG+hGfAq53/onGx8U7dX5f6AfgfJulX2z/l44H67wgg1nj0rLThJo6xEEflkIRqBiMRI7ARlBrAkaBo947XcjOrYChH3MaGFMdY3LLSmst4DvxSu1XWo7r/eqsjkRb/fmC0/c8RsPMBS4hN04J9EoJFgaHsE/EU9NNzYt7Uu4IemqQ30BybxynEaOP7C4wPV1e/eyr1L1P70fbHBzwl4ALini7+BeKcFOumBUuuW0dvYoPFGduyI2JbgkXpSLmOynZHR8oj2GAo4qicsS3BSQm25Q2npXBS1nRxTop/4ZtnEv95r0hxuKx8aq96fDv8X00DxpWYu80ET3dPPN1IsOHEtjzYRdtAMLAyeMu4rn5oy80PW11X/wmoEwzX9BwdLCd/uqZ+3FTwp2cSfwp8gval4Md7v243Bey2jxxuMPj13RTw0o6KB722m+IrdlJ8FvhT8E8IeH319R2/TOtxRxLgc/to6h6azbSnZgRdJQvP99F82R6alzYRfRnwl8C/SsBLJFQiDndP7ZOxT8jY/sA3APyZvxy89HAH1SHgl3ZP7WdvX6PqLwB97fzuGS+RAM83CP6j++Zgt3fu6b65f2TP3Je0z3Vu79r+855vD/2aHZNf0j63W7K++8Wdkk87+qvtSzv5ChEwrtv94ZUfvjz//7y9PH/wRftjX+rUF7X/A/5fQic73H0nAAAAAElFTkSuQmCC"/>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="63" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="0" y1="0" x2="1" y2="0" gradientTransform="matrix(0,57.931034,-56.4,0,61.975734,0)">
-<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
-<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/>
-</linearGradient>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="63" height="70"/>
-</clipPath>
-<g id="surface12" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 21.6875 1.207031 C 21.6875 0.539063 22.230469 0 22.898438 0 L 44.65625 0 C 45.320313 0 45.863281 0.539063 45.863281 1.207031 L 45.863281 3.621094 C 45.863281 4.289063 45.320313 4.828125 44.65625 4.828125 L 43.445313 4.828125 L 43.445313 16.722656 L 60.992188 47.070313 C 63.785156 51.898438 60.296875 57.929688 54.710938 57.929688 L 12.839844 57.929688 C 7.257813 57.929688 3.765625 51.898438 6.558594 47.070313 L 24.105469 16.722656 L 24.105469 4.828125 L 22.898438 4.828125 C 22.230469 4.828125 21.6875 4.289063 21.6875 3.621094 Z M 21.6875 1.207031 "/>
-</g>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="63" height="70"/>
-</clipPath>
-<g id="surface15" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(52.156863%,29.803922%,78.039216%);fill-opacity:1;" d="M 27.496094 10.863281 C 30.285156 6.035156 37.265625 6.035156 40.058594 10.863281 L 60.992188 47.070313 C 63.785156 51.898438 60.296875 57.929688 54.710938 57.929688 L 12.839844 57.929688 C 7.257813 57.929688 3.765625 51.898438 6.558594 47.070313 Z M 27.496094 10.863281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 43.445313 16.898438 L 43.445313 4.828125 L 24.105469 4.828125 L 24.105469 16.898438 Z M 43.445313 16.898438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65.098039%,46.27451%,87.45098%);fill-opacity:1;" d="M 21.6875 1.210938 C 21.6875 0.542969 22.226563 0 22.890625 0 L 44.660156 0 C 45.324219 0 45.863281 0.542969 45.863281 1.210938 L 45.863281 3.617188 C 45.863281 4.285156 45.324219 4.828125 44.660156 4.828125 L 22.890625 4.828125 C 22.226563 4.828125 21.6875 4.285156 21.6875 3.617188 Z M 21.6875 1.210938 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(52.156863%,29.803922%,78.039216%);fill-opacity:1;" d="M 43.445313 4.828125 L 24.105469 4.828125 L 24.105469 0 L 43.445313 0 Z M 43.445313 4.828125 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(37.254902%,12.156863%,66.666667%);fill-opacity:1;" d="M 57.503906 41.035156 L 60.992188 47.070313 C 63.785156 51.898438 60.296875 57.929688 54.710938 57.929688 L 12.839844 57.929688 C 7.257813 57.929688 3.765625 51.898438 6.558594 47.070313 L 10.046875 41.035156 Z M 57.503906 41.035156 "/>
-<use xlink:href="#image9" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(71.372549%,54.901961%,90.196078%);fill-opacity:1;" d="M 37.402344 38.621094 C 40.738281 38.621094 43.445313 35.917969 43.445313 32.585938 C 43.445313 29.253906 40.738281 26.550781 37.402344 26.550781 C 34.0625 26.550781 31.359375 29.253906 31.359375 32.585938 C 31.359375 35.917969 34.0625 38.621094 37.402344 38.621094 Z M 37.402344 38.621094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(78.823529%,64.313725%,95.294118%);fill-opacity:1;" d="M 28.941406 50.691406 C 34.28125 50.691406 38.609375 46.367188 38.609375 41.035156 C 38.609375 35.703125 34.28125 31.378906 28.941406 31.378906 C 23.597656 31.378906 19.269531 35.703125 19.269531 41.035156 C 19.269531 46.367188 23.597656 50.691406 28.941406 50.691406 Z M 28.941406 50.691406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(60.784314%,37.647059%,85.882353%);fill-opacity:1;" d="M 38.609375 41.035156 C 38.609375 46.367188 34.28125 50.691406 28.941406 50.691406 C 23.597656 50.691406 19.269531 46.367188 19.269531 41.035156 Z M 38.609375 41.035156 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(89.019608%,80%,99.607843%);fill-opacity:1;" d="M 38.289063 38.554688 C 38 38.597656 37.703125 38.621094 37.402344 38.621094 C 34.0625 38.621094 31.359375 35.917969 31.359375 32.585938 C 31.359375 32.285156 31.378906 31.988281 31.421875 31.699219 C 34.769531 32.585938 37.402344 35.214844 38.289063 38.554688 Z M 38.289063 38.554688 "/>
-<use xlink:href="#surface12" mask="url(#mask2)"/>
-</g>
-</defs>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<use xlink:href="#surface15" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(56.862745%,35.294118%,80.392157%);fill-opacity:1;" d="M 46.230469 8.988281 L 24.320313 8.988281 L 24.320313 20.085938 L 46.230469 20.085938 Z M 46.230469 8.988281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40%,11.372549%,69.019608%);fill-opacity:1;" d="M 67.121094 56.433594 L 62.53125 48.539063 L 42.914063 48.539063 C 42.914063 48.585938 42.914063 48.628906 42.914063 48.675781 C 42.914063 55.175781 37.582031 60.449219 31.003906 60.449219 C 24.429688 60.449219 19.097656 55.175781 19.097656 48.675781 C 19.097656 48.628906 19.097656 48.585938 19.097656 48.539063 L 8.242188 48.539063 L 3.683594 56.480469 C 0.445313 62.136719 4.566406 69.140625 11.144531 69.140625 L 59.691406 69.140625 C 66.28125 69.140625 70.40625 62.089844 67.121094 56.433594 Z M 67.121094 56.433594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,38.431373%,87.45098%);fill-opacity:1;" d="M 19.113281 48.691406 C 19.113281 55.191406 24.445313 60.460938 31.019531 60.460938 C 37.597656 60.460938 42.929688 55.191406 42.929688 48.691406 C 42.929688 48.644531 42.929688 48.597656 42.929688 48.550781 L 19.113281 48.550781 C 19.113281 48.597656 19.113281 48.644531 19.113281 48.691406 Z M 19.113281 48.691406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(58.039216%,36.078431%,81.176471%);fill-opacity:1;" d="M 31.003906 36.917969 C 31.625 36.917969 32.230469 36.964844 32.820313 37.054688 C 33.5 34.082031 36.199219 31.859375 39.410156 31.859375 C 43.144531 31.859375 46.167969 34.847656 46.167969 38.542969 C 46.167969 41.257813 44.527344 43.585938 42.183594 44.644531 C 42.632813 45.871094 42.882813 47.171875 42.898438 48.554688 L 62.511719 48.554688 L 46.230469 20.546875 L 46.230469 20.085938 L 24.320313 20.085938 L 24.320313 20.546875 L 8.242188 48.539063 L 19.113281 48.539063 C 19.1875 42.113281 24.476563 36.917969 31.003906 36.917969 Z M 31.003906 36.917969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(80.784314%,65.882353%,96.470588%);fill-opacity:1;" d="M 39.410156 45.226563 C 35.671875 45.226563 32.648438 42.234375 32.648438 38.542969 C 32.648438 38.035156 32.710938 37.53125 32.820313 37.054688 C 32.230469 36.960938 31.625 36.917969 31.003906 36.917969 C 24.476563 36.917969 19.191406 42.113281 19.113281 48.535156 L 42.914063 48.535156 C 42.898438 47.171875 42.652344 45.855469 42.199219 44.628906 C 41.347656 45.011719 40.402344 45.226563 39.410156 45.226563 Z M 39.410156 45.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(74.509804%,58.431373%,91.764706%);fill-opacity:1;" d="M 42.183594 44.628906 C 44.539063 43.585938 46.167969 41.242188 46.167969 38.527344 C 46.167969 34.832031 43.144531 31.84375 39.40625 31.84375 C 36.183594 31.84375 33.5 34.066406 32.816406 37.039063 C 37.144531 37.699219 40.710938 40.675781 42.183594 44.628906 Z M 42.183594 44.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,81.176471%,100%);fill-opacity:1;" d="M 39.40625 45.226563 C 40.398438 45.226563 41.328125 45.011719 42.179688 44.628906 C 40.707031 40.65625 37.140625 37.699219 32.816406 37.039063 C 32.707031 37.515625 32.644531 38.019531 32.644531 38.527344 C 32.644531 42.234375 35.667969 45.226563 39.40625 45.226563 Z M 39.40625 45.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,55.686275%,90.588235%);fill-opacity:1;" d="M 24.320313 1.996094 L 22.753906 1.996094 C 21.714844 1.996094 20.875 2.824219 20.875 3.851563 L 20.875 5.046875 C 20.875 6.074219 21.714844 6.902344 22.753906 6.902344 L 24.320313 6.902344 Z M 24.320313 1.996094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,55.686275%,90.588235%);fill-opacity:1;" d="M 49.484375 5.046875 L 49.484375 3.851563 C 49.484375 2.824219 48.648438 1.996094 47.609375 1.996094 L 46.226563 1.996094 L 46.226563 6.902344 L 47.609375 6.902344 C 48.648438 6.902344 49.484375 6.074219 49.484375 5.046875 Z M 49.484375 5.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(61.568627%,41.960784%,83.529412%);fill-opacity:1;" d="M 46.230469 1.996094 L 24.320313 1.996094 L 24.320313 6.902344 L 46.230469 6.902344 Z M 46.230469 1.996094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(52.941176%,29.803922%,78.039216%);fill-opacity:1;" d="M 46.230469 6.902344 L 24.320313 6.902344 L 24.320313 8.988281 L 46.230469 8.988281 Z M 46.230469 6.902344 "/>
 </g>
 </svg>
diff --git a/dist/DevOps/all.puml b/dist/DevOps/all.puml
index f559041e..22cabebc 100644
--- a/dist/DevOps/all.puml
+++ b/dist/DevOps/all.puml
@@ -1,18 +1,18 @@
-sprite $AzureApplicationInsights [45x70/16z] {
-vTG7jXiX38NX2vBGbVQ_tnJZa-01pKkldyjfFvfn0RpgEfoC2D9D6sfzHBwYjI9bden3tZmBOTlOo1eRLXfv9_hQvgQi9JTbtIBVHapCBp4EDrph013vPLWC
-BaSplzH0ooyMqFnoVUINCyylDvXVpYE_7Byz3XEnoCbLrElOyV0eGlPTmMKjiVmDzR0lXkKd0aY4038NUdW3-3dGPPVCRH0Do3HWp3_nCgqZyYa0ULuWKkT8
-hlV1EM1gSuFfZ1zJR9riwmvKe3ifmEFDILitNG3BqcZOQIwprhNiUnlvvDlHvQRQ0DKEYAenjyjghXI8DC2B8qdBU6y1AUEz1RICznQmcrXmnJ8UsBGeui21
-5R7W98unSQJ7kECi3h6ZO8Uuen9RJ9J65WjAxHe7Rl0I3zomIznnev5qTzB78EdulnbVuDR8LVoUUB_d_rkFN0ZkoL8hAlj9RNYRbITjNJjsxm4
+sprite $AzureApplicationInsights [70x70/16z] {
+xT97ccCn24NXguZWiV_jTcuP76Iagg7_KSNpWH4MSkr4Op0JzPfneX2BHnMRwanOtB2XiBp05L5T5YWXPCWIvsWadeb7zZCa0OorAY64bSGIKmvlx8tLAE8S
+3jCaZ4wlxANOGjIgqxfODNBc_cxZlhhG-czAu4eaq_i_uVSVBWUMNbJSkDt9RgLuvSaxQpiLCT-x1p825Pq8lrGr1dufEbrueUbDcp-maSl-u8MYXb01KBl-
+mYK1YKIDZbSkjGY_PBEVa_0AgSM-qkz--L9Iw_ALeLO1WiCaLv7WAFT_Mbn5hOoLh4OpbVlVh3Mz8LkfxWKk-LEmhVHun4zpsSfmaPsChV1Mn0wVJUKoQyRm
+FCMifFzR9aIbI_-WMwNuDxlpqSYjqcRN2Ur4DFxKY6HURKDHnxtP_M4ymQOI76L_c0lRgZxes2U7etXTxmmSo7gdu8GSBkJbvXHyfu_g51n9xD2dya_sy9q-
+gfDn9Ws-wJYLHoGIpn2-8iSYFm4
 }
 
 AzureEntityColoring(AzureApplicationInsights)
 !define AzureApplicationInsights(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureApplicationInsights, AzureApplicationInsights)
 !define AzureApplicationInsights(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureApplicationInsights, AzureApplicationInsights)
 
-sprite $AzureArtifacts [65x70/16z] {
-xT1LWiCm34NHeC3o_hSxquOvBoctEf-6QqZkofKi-oXTtoyGMWsmO5O30afF1hHrCg270jeu6z3EnmPwdnZmW0SKyDA01qBd_G8vNV15lvI9cMbDsSYJIX46
-h4RRk49KL04D4r2WGbKWt3qGu01F0zQY3ejMX860BGH4MtWWnaWTNGZmTY36qHEq8K2Wpz02D60l2DZ4qO0zCE21iXXvGU2BFh5yGU3JFb5iZh40LO5KRKQX
-06L9BPt85itdqwJX_W4
+sprite $AzureArtifacts [70x70/16z] {
+xT65WSH0241H8lZst-xvRTmzuHVmPW2ebWm48o8R7NOYQBO2erCKNKMnood-tnB5YswY5CmUDmebb5122IMKdFWlqNBI4jD_pFb_AG2ejwKq6Bz3o7svmWcj
+eMHdLLv55KNKVb9Ue8Yzus7bLSgeo8faTMNvHDELWb7U_jAXX8ArPYbu7gN9tEX6InGyaL9q8GNR5Pkaf8ctnnCK0aZ5sXIJiGfX0fy
 }
 
 AzureEntityColoring(AzureArtifacts)
@@ -20,10 +20,10 @@ AzureEntityColoring(AzureArtifacts)
 !define AzureArtifacts(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureArtifacts, AzureArtifacts)
 
 sprite $AzureBoards [70x70/16z] {
-xT87aiCm28LX8GCFv_u7tiXfB96Bs5x-6K-rFjKomL8fbKTisU0KMBhwKEpRAN1PIts8ls13yR-8Jt-3yg_Cv-nLyznvBx6ez1fzktE-Zr6Wliv97L9ayYqA
-N5-jsBielZ-hABiaesJAAtO9ZvLDeqeRxCierYae-sTftSOKMsr0iVNui68RARs70g5ZYcq5vKFAXj0-QFNAFAeeILCWNedj8qJI5ArvHQabECTfHUcI0b1o
-IWOHjEfnXRM365hJOOM9z1cnXU5jvNHooC94P55aNJajEQGn0Rafr1JRLOHkZ4E2KjkOVXQP9-JnUedxYI0o7GHSTcBSOd8nVDEUKjKpVGHrJo65O_g8KjbB
-49c8WCjkLIF32DMody357KIe32u6p3Y-51zZCow78e4hjPzusp5r-yao7iblIZoo7p4wCPN1gYGN4XrMTo1SgUIYEh6SuyaHkMWC-Ey5
+xTM7hjWm28LXm8Q3x_i_S9KbqKjgChhRNolpouxfEwN-D6CwmiVpni7mnvlwhiWhnNw0uh6nNZ9YlYvAMmNbV1VN6F9M_whoNpblnBxF5_2FAgF7RB-viIkA
+IqppR-2lLFuhzaIvsNYfE01VWc4yKmRWCU210a_1RoeEFyj6CKuN9x87BPMCv9HBfKRSh5Hgn0rwIHa-Lz2lAAWKIA4KIDyKUwK8owf03cN4Wk8pX5bqKNHH
+Pc66B8mj31TAWJ3heZIILqZ7akvAVK7z3373abrL6ek7cHrnmrgXnFqa8uV2XHBtauGyK7Oc8gwxGbugaOb8E1TYZ6zc_fcHY9XYYwO9ZgnnJ14pceVCP0Iz
+K2mp6K4hb8R4P0HKn4XCHfIgD3490PSAunEJ4QMwZfWfKamNCinhT2MUCqhqbCb8dLY1l3oRJhTI86UDRYR9iKuFacxvF1v1hQkPQczCN_S5
 }
 
 AzureEntityColoring(AzureBoards)
@@ -31,10 +31,10 @@ AzureEntityColoring(AzureBoards)
 !define AzureBoards(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureBoards, AzureBoards)
 
 sprite $AzureDevOps [70x70/16z] {
-xTT7Ukim34NXouAw__s-ai1TWk68NqOwCxUV9DoHHnqB4fzB59SbYbjVeRZJ4iMr7LIYSG0PvfSOFwjH60TEDTMVc_YiphwL7Dn6P1srkdWMLGUQ9mqFzSdg
-k6k85x9nMNAGnABRsyYZDYQht_Kwq3mJ6b2F7XNnGigpuwjjPPQ1H6avC1gYLB7T4GHGKJGxGLMP2L1Msjq9NaPGLlohpH7KbRWY8IgA_wfoAgToAgToAkYJ
-zRZoLHyq-c4bRb2XsTi1fPb7EPOhwFwS2GTMLp0yUiLezAe2yYZ1CYLYBwHCmp85wiLI1RP4QKiKT4-hlWkdVvpYDVOFa-HlQxcPlqjClL37JirYfss-WwnX
-jtuxRmufiiP5oI567eMIGXFlub0IgEDz6ieUP2XbeMn3YbgD4Mr0XCV-0W
+xTBNbgqm281XEibv__SzRTZDYOWxJlU_Tdq1bl14PoI7AEvyYEAAHoZkSeZYHfDAf3YfH7A8uaPpojHQoEgB6FP5OZx8Q6Q8Mxhy6CU4ULgiXSIYDjoIr0k9
+sWAj3X6f402kNvnQdfiGndljldi5FGKuW84YSCjgGAve1bGLJe2oGWbGLpm4eGJ8bTjb3V9ofNrHvLHEfKTbfT_t_HM7-qu5TLQ9f4qg4Vka4f4m4que4VV_
+jUQc8ao8poXW_LNDxKRM56XzlHXIHROKxBLo1VWG1VJNlWo6-HwZCup3lWCXM8lYYssj8QodiR1uyIJZFBu1bBQEA6pKRo-HzkIkQVGmBzi0GTXE5bilDtCe
+vSlRuVrc1iMwmJAoG0IgeS4WzlZLgY4CGq7u0Vq1
 }
 
 AzureEntityColoring(AzureDevOps)
@@ -42,34 +42,24 @@ AzureEntityColoring(AzureDevOps)
 !define AzureDevOps(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDevOps, AzureDevOps)
 
 sprite $AzureDevTestLabs [70x70/16z] {
-hPPLekWm24IHOFjVyDDhKQYSh-f4Xg6571RpY71JHhW7M_p46rn7OaRW6kInXE426ZiKobZiCIZYSSBBCtakev5XaCAHqo0ZAk23zPJzngY1rRg_FXbMCrDX
-Y2emGXO9UQ3GuWvIB0zhDCEwAk1MdF8yzz9C2BROu3MTQvnuuj-xmp1-YYtwJhvrAdmiAjjMBNOgVbnGSeiEcSbL-ECMfYw7xYFrENobC-wQXDE7lbUQT5id
-7E7JQICiT3LQhTdxDIXbAj4sAcXz9kFCHaK66_m5bMZwXahmAohmZeg-eeAlg80aVmQjSEqS9Leb2UVW7BDaouQgtTKv59jHqndowSiic_xZGtUJuyTnc_dM
-3TpW6vHHYBjdTxif22FuaqDNbi-7d_rf8jJXPx_DULDcgDAIRDH8MdADh0sMe3YZHPSJgEooyWSQVn7-XvJTzdxnscsf5zsMmGZftkEQspW-XlsvbTpMQVzG
-JJhHF4wqynBx5MfXQt5nNVh2fZH0iig4zSzO6g2Ll150vdRlQYaXdhfSyb6E0JBDi9FR5DVGfAqKEIpegKgBQnYyi2H30FWD
+hTO5Skmm383X6CIz_tLBIufhUPKc__23RnHfQNjRwKWi8apGjlzLG5og_0-eeFZKlfD-4EbxG-qMroE3y1mnqtu2SM4IgH8WjoWtYUppI7uQdYA-n6umG5nQ
+yqk95UCJpvD_fYOfHTOABH1Vcoq3Y8K9Us8hqOkckrra5HqtuOoqCZvIbrKM1Xx1U8oVp3ABWPYmTU9s4XYEI2YSNsbyfBuUH8Ll-R_zg_1o4aMuXwz8noUg
+IyG89WhogC0ICPmgD5wQpYZmKDQ8yLIHXr9BGl6CcqJibQ1J0iGvRf1zsiuedk7pYcd12nJ3TeMYsnMARN29ibsZz57HuyhaO_UuekuZ9gbmz5r02qPXK4YZ
+Zr-85HeLvF2NJC60aSadWvgFo-Pgo1C6em-fMqfjUr-5YO9rErQVAd0CgJ1Li9qOnNK4QH0fFOyK21Ki-UTPA91VhKV6webHNDdLnah-sl0R_SIFzuJSelGm
+xOMGgDh7JtfBtBKJLyQRejzvHIbvxUv6OVtE7AAQktRreuZ-YTsrKwDunMp_J9dL8jrw8HyVjbjmIxo1oAtbbbkD6oRpFEDQCjVsL_PAjE2I78KaQ7tj2lim
+QdbjEAH0Ji4tXMk9bVmifHzGuFT8Nm
 }
 
 AzureEntityColoring(AzureDevTestLabs)
 !define AzureDevTestLabs(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDevTestLabs, AzureDevTestLabs)
 !define AzureDevTestLabs(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDevTestLabs, AzureDevTestLabs)
 
-sprite $AzureLabServices [70x56/16z] {
-lPK7SiCm30G1TXx-_zxqG4fWa8RRJdEHRhZ7HdjA6nF0x3NHZQGEEPZrfemX_q0yfq8iWob4buiWKm2rkIUcYmlIrPt8WadNaI0hMg2KUvsIREYHQaVYCwdf
-O9ZsGBw0RrfeInOlHGSpd2hgcFDhw_8npPd-mb0bka2PSZ3q2qPhsa1j7QAmDO3uwAJ2_6naxqxfye2K9k4KsqkHsr9QBOaKn5CKD5QVS8ezXn5FiVioIpp5
-nhJxKwJIb1tOhYimP4VUJsT3u51pIvoxb7dLNjdq0lLPJvC4RWpNgGHyV2SEt3g-4us0Z-S4IW4VpsaufiPdwLI8t4rGlmtQGLOdE-Q4XG-tCwnETim9lazj
-PwfrEkvQ7ZiVtmc5b09Jk_eidKQYCxcVWy3MnpgXPp9mBh-am-UYKogbPAOjwcET0gYFTOgWFjOf03SFZlhidU8-SQUsWYC-zpgbjYQ_C8Lu3Js3Tm
-}
-
-AzureEntityColoring(AzureLabServices)
-!define AzureLabServices(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureLabServices, AzureLabServices)
-!define AzureLabServices(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureLabServices, AzureLabServices)
-
 sprite $AzurePipelines [70x70/16z] {
-rT5PkXiX34HXm80akFjVRooFb4tAwimvx_r_fIRzv_t_bVhTSjJ8NKabY8YoMapfIkivWbJz1KgHumg_nwuTL-eYO0UK8e10SQKZyUfOIAa8Q6-rrYQszb4f
-0ehKMqsFA1sGNfz9NAcR9R0ceXIylzMr7bKw85gnDoM_LiwTceBIAwOlYjesDQg8tPABqiSsiqFA-355KQ48_xkeS8I_D5Vuc6OVbJbiboo8VbJcj7tI0A7A
-X2clZYTcH464nvMvkKS32XgRAQAKQMbLfXjxX3AdHPdt31gEKARdv24om7WWGX5NvXeOmvGZMbq01QUC1L5VjQcNTA_zAA8rFn1W5WEGSsm8CYE0m12emvJn
-ZdXa23B3soCU3WamY60m19FfYNr6OCYEwRaeHJnnX32IKdA68hCdMajUiGUoC-PiAL9ZI5GfJG018wharhiG9AQSaGkpC-9AxLwpD-EBAoSFcPfFXiYN8qnf
-7gofsHzyPyILT1rMT46EA5Yrcm78GINhl2FU3oeo_Skh4DsIDyYp-QDAMvNu5i9WL67CSOKpNAdF24CLZAw9AvI9AvmvnHJAp9wsVGC
+lT09ZiGm24HHx1WA9_S_x-nRLvg0fMZ-0PuAv3_R31vblMPq8hXMGZnf5926JB62Odw3ilaT2kvGrEjA_HwOgXhM592XupF5WgA4ZDzGLdg046DBz-XuY9JY
+FJOUivBI_NBAq982KWPNKOOlA1lcytn16NkGhoWpGEPPiVYxTSH12bB5dwKq9LEcvuoJKa6OKQIAXzcNO-wPClqYm02YfOXmkUBhIcKA4aMbWY1XjhFo14aO
+YAHJW8pPH58aLLHEIeJ4of2JCbSHT7blFYYhYCfdRQuYF8IPkOQCBu6O9SIQV4LC3U4XpDGG7iBCB24yX1bqL10qaPY1I4EEJ9MmFl6X8KFsGoMjuHAPnr5H
+f5yWSp-AYcgC74THKRDF9XX2IeXyCivz6HMbctqomP18QUynqnk28O4otlkxHj-GDnmqfAvyCM_85yD3weeqaR_C92DHE9o7h2iuzZbvIAum4bPNzBX3QViT
+YlHzNIaoTOMPTOMPki8bJ5L9cL5HKgPNb8nHERTnGenHNSwz0W
 }
 
 AzureEntityColoring(AzurePipelines)
@@ -77,24 +67,23 @@ AzureEntityColoring(AzurePipelines)
 !define AzurePipelines(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzurePipelines, AzurePipelines)
 
 sprite $AzureRepos [70x70/16z] {
-xTG7Sfn048LXqQ_ptl--tc6AQi2BOK1RqRzo-kgrqiy-nEkab9-pA5_dwPcYhml5cM9Nb9o-hX0pHrv9cN60S0vbdvK-utMbRD4dPCf1XO-LroDbccXKaMdQ
-6l1tCPY_a_KGBsMGuGTJIj5I-1kAApEBnJvb06BN5EMURESveoU7IbJp49sVnxfvYF3CL0UAC_CyMfWrAWNcJtC0TgfeHpeJ5G2Fw0oVAdM8DM_90QtJBYXQ
-jvLYTOS0_b69uosbQ2bnfjHtGtcz4U1wxLInFgPUgGLQhnmhDKRKLBXDgHm0gmhwb6Ebc9x5EWDwx5UKqFe3METSVm0NbAWb7zR49lks8gtVKJnskJnNh1bZ
-YhxRACR0gAAbr2ct5EjAxWprougrV3cbOelMY1APhbWb7ZcckFl-bCXc32ZkRepjAOqOL1H4srDoNA7M-fHcZ2ZP7cbkEMLfQ4kM8fvb36p9o4M1nW8qOaYP
-evQiPkI8aaTA32dvMCabPvgp_7T_AravBKcUTw04Y63kKcjkA4h4ooRSLa0KEIT4VbTfKtf6P4DAhXMfRxFULK38dZxO8ilN1X75NSMf7-AeWyQLL7e7j6Tv
-IoccnV54oL3KVwXxIZMgu5UKAV9k-Ab8xLw5VAt__G4
+xTM5qgim48PXllNG-x_UOqYcMmaidD7_7Qdc6Ip9b8BQEANfQpG_3YLV5NySQ_wgnEDW_rjXrJOVJ5NU6eZvN8tUA3wVhRrHvlFHb4D1uMGGIq5Hfga7RzMY
+EzxgnNuexKgyAdH9aOzAn6KbL4J4ta0k168xefYiUKO4Inn3nKN4t6rX4a9goW35G0aHZVMDn1CFB5yOGGQAxMCZ7GplPwAW-AweQ7wx50HBRpyh8jOFwqb1
+doS4FQneNL6HRLW7qr3lu0V5zx6Mxf60VE5vS7MNWx5O7c1DQm38MclEWBM14hAbQGuO0SGCGCSp86n1hEMSy3UoGtFQEfBYlugt-vKV9OnnKN5TYAhIYRgI
+2P366UKzaGvah8o9iQ8ZOgmmqu0OA_f4S2AEAfAFegnqegnaegv86rHIVXIZlmhv9KMmfXSK1TWYZ00jAqwGw7jwKT5zR12qgZ2al-MgGlq0fAxKZ-N-w-84
+QPVlKHE0FS8Pq3kUNRbZ7bahAJqtyzOAIhMkJ9SKsXHjzNpQaoWQeTDz_GO
 }
 
 AzureEntityColoring(AzureRepos)
 !define AzureRepos(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRepos, AzureRepos)
 !define AzureRepos(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRepos, AzureRepos)
 
-sprite $AzureTestPlans [63x70/16z] {
-xTC74kCW341HWpfm__FkfY0NEMFCzlAcfdmhGVPoYbWYfhGCISmQCSCFpTqtve0I4Ix3r8uqBVz8BXhyGVdaV_-_zwGHZkUiaGoFptg6vcuQbyTgq2TRwPFC
-7BjJXP6Qx8EXyKdj4wLRJyl4lPDZeseTtpqteQ-ultkrFBGzfXVfLniRxdMdx_5mOsbAZWV6fsqgekArZpSQM9eGFW1Wo3LTBetm1N86po-NfrvxxZsRNImF
-lNRPUp4dvtd_55VmwB4Fx-2ixj_egVVWTHWVbwQu1v1PROy-BuqnqEid3-npBdOGbrVgcqHQZmhiQwwUQrG3szMfEerAZNYRQtNbR7XKqkAWRcZGMetaU6wj
-jWSBmrkt6vzxZRNr-a7tIjlcwpNKXp_UxF6njpLkNc_7fruwEvcz_msFdbvvRa6r40TLF9_WUPhCgH_TLEut3amDrwMJkU6ERzVsg1r8gUEAudAKnYr_gl_-
--m8
+sprite $AzureTestPlans [70x70/16z] {
+xTKBkfmW38PXWIG4pVwtU-O-Vnr0e_JUlWludaX4fzzTP65jOU7Whh1qAqBkYZWgFskMmDofC8Nf02ujFC7Fgr1feO5P_gJA_yh_2kMMenKjBNhuWSOlTIWz
+OVAJqYF-I2nzqLt9fKz7ldD00ri67TaoyCYM8Gvi6V9-99LAvXlKIpfnjFoYxWEcEWBgFE1GZIBCy1uc7DmoSsiOSLyWePkO60JRTbqWPRfByOhu1NlpR3dJ
+ows2UJpN2OzDg3pmNNPS9y8agmgcSLmdR9cepj3pS25iNo2cRoKya-CwOSj4hKoghcdQsh9GvHOXp_SgOPGEpyTJTojQ3nFw_sNgo3N-sF9YRrdRPgkj3rXj
+ls8Dy-feRR-IhOKdA6PGZbGM730PT8SfreGtUB4LpoWGdn6f-liRWe8jhysDZ7NHlP8R_Uny7cmRe_IdiIq9xyedHISljacmvbh9Tuf6HqRb55IYZMASxe3q
+tFIG6M_Tu2ZOzKaoFT4o5dcAQkTy_9C2oN7q-YfS
 }
 
 AzureEntityColoring(AzureTestPlans)
diff --git a/dist/General/Azure(m).png b/dist/General/Azure(m).png
index 1a1ee817..69c48629 100644
Binary files a/dist/General/Azure(m).png and b/dist/General/Azure(m).png differ
diff --git a/dist/General/Azure(m).svg b/dist/General/Azure(m).svg
index f323dfbe..ca440764 100644
--- a/dist/General/Azure(m).svg
+++ b/dist/General/Azure(m).svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="54pt" viewBox="0 0 70 54" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 15.992188 53.523438 L 49.0625 47.769531 L 32.050781 27.800781 L 40.910156 3.78125 L 70 53.527344 Z M 38.59375 0 L 16.054688 47.683594 L 16.054688 47.636719 L 0 47.636719 L 17.804688 17.210938 Z M 38.59375 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 16.085938 53.128906 L 49.34375 47.417969 L 32.234375 27.597656 L 41.144531 3.753906 L 70.402344 53.132813 Z M 38.816406 0 L 16.148438 47.332031 L 16.148438 47.285156 L 0 47.285156 L 17.90625 17.085938 Z M 38.816406 0 "/>
 </g>
 </svg>
diff --git a/dist/General/Azure.png b/dist/General/Azure.png
index 6022ca7e..1a1ee817 100644
Binary files a/dist/General/Azure.png and b/dist/General/Azure.png differ
diff --git a/dist/General/Azure.puml b/dist/General/Azure.puml
index e164e23d..663a19b5 100644
--- a/dist/General/Azure.puml
+++ b/dist/General/Azure.puml
@@ -1,8 +1,8 @@
 sprite $Azure [70x54/16z] {
-fPK9hiCm24IDLvZx7_ZB_LsiJafmyhHqHOoV4KaXShgFgAJR5ElfDXMu7wK3CuhqMqe0JBSDrmrd0p3cEuDUzWeyesG09LsYOJAUTc3f2WFlACa0e5tpEj7d
-RKzaVzJmJrbYZVrHMw88dfJTKLlh6fxOhfArp80dRM_KdjJ75_WWcqecjfnlIt31GbqEj2NOA4h1YgO0ZQCCWBxq4ImOVHKGJ7qRfvlqBRL83nJVvEIZ72M3
-q0sr41gMa60nyF4DZ4bKBOHCXGJdepzs799ZQY5qof3WYfL1iaA2nNv4pZZ2_FN62w361MV7NWiBLazUZmZcrCNfuUmhEscZ4S7zh8iOcEQgLSU-iw-KeZ05
-p73KMcHjS3-BRO_k2cvUb9NX29Ru8bCGSjp10ikG1HVAw93jXs1peaJkMqajHM7guRxANoGNoTKs7WXCBcrOU5ynybLFvDFwhZX5VzTNfvu5iy1OlJyUSeK_
+hPK7ZiCm30HLJOdx__TU4S8h2m5Pbq5pzsH2o4cYfWSO3pobp9bkKnttLRfZgLYwWG5etqPewIfv0YyLUBwUvAMI7B3BIKAb0K2vcYHKHZplV9A5hvruu8Ka
+Y_wzTs1nDd1p_559iMTNaeHAHL1E91a8d1wg1owE_ogP3eX9IAKZa0DN_E5OXoO2EV04lxWWa0DtLebXKGD7I6uGX_J0HYeKIWjSDrSFC7OYBOn-enguameT
+KmBpQutqAB2MrakYOT42rrt2Xa0CFBaWpPmGc3CQ_KuXCAMbTmseWVcLWzPnAJ2dHILDCV0a5LhzjC2TLDZKXS3iF1FJbS06Lc6Ezu6hC0lsDl1abHtZJU2k
+ZUNS1zwdHPCM3WviYWgF3GUkq5JsOsFxj2ujgVnNT5bbFpPpbyob3nO7DlzFLx_Z75Ydj6Fi0glarcqwzbJX_ihtWvdNxcVwfViPtnMqSPRq29y
 }
 
 AzureEntityColoring(Azure)
diff --git a/dist/General/Azure.svg b/dist/General/Azure.svg
index f323dfbe..33ce5e3d 100644
--- a/dist/General/Azure.svg
+++ b/dist/General/Azure.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="54pt" viewBox="0 0 70 54" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 15.992188 53.523438 L 49.0625 47.769531 L 32.050781 27.800781 L 40.910156 3.78125 L 70 53.527344 Z M 38.59375 0 L 16.054688 47.683594 L 16.054688 47.636719 L 0 47.636719 L 17.804688 17.210938 Z M 38.59375 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 16.085938 53.128906 L 49.34375 47.417969 L 32.234375 27.597656 L 41.144531 3.753906 L 70.402344 53.132813 Z M 38.816406 0 L 16.148438 47.332031 L 16.148438 47.285156 L 0 47.285156 L 17.90625 17.085938 Z M 38.816406 0 "/>
 </g>
 </svg>
diff --git a/dist/General/AzureAllResources(m).png b/dist/General/AzureAllResources(m).png
new file mode 100644
index 00000000..49b4c93a
Binary files /dev/null and b/dist/General/AzureAllResources(m).png differ
diff --git a/dist/General/AzureAllResources(m).svg b/dist/General/AzureAllResources(m).svg
new file mode 100644
index 00000000..062b1f54
--- /dev/null
+++ b/dist/General/AzureAllResources(m).svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 7 7 L 23.800781 7 L 23.800781 23.800781 L 7 23.800781 Z M 26.601563 7 L 43.398438 7 L 43.398438 23.800781 L 26.601563 23.800781 Z M 46.199219 7 L 63 7 L 63 23.800781 L 46.199219 23.800781 Z M 7 26.601563 L 23.800781 26.601563 L 23.800781 43.398438 L 7 43.398438 Z M 26.601563 26.601563 L 43.398438 26.601563 L 43.398438 43.398438 L 26.601563 43.398438 Z M 46.199219 26.601563 L 63 26.601563 L 63 43.398438 L 46.199219 43.398438 Z M 7 46.199219 L 23.800781 46.199219 L 23.800781 63 L 7 63 Z M 26.601563 46.199219 L 43.398438 46.199219 L 43.398438 63 L 26.601563 63 Z M 46.199219 46.199219 L 63 46.199219 L 63 63 L 46.199219 63 Z M 46.199219 46.199219 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureAllResources.png b/dist/General/AzureAllResources.png
new file mode 100644
index 00000000..11524169
Binary files /dev/null and b/dist/General/AzureAllResources.png differ
diff --git a/dist/General/AzureAllResources.puml b/dist/General/AzureAllResources.puml
new file mode 100644
index 00000000..1e89e641
--- /dev/null
+++ b/dist/General/AzureAllResources.puml
@@ -0,0 +1,5 @@
+sprite $AzureAllResources [70x70/16z] xP4x5iGm3091tlkVUNiUNVx9J2d19BRrBU2NICxHaYPdti621GiMB5CjTyL9cQdDJhbTB5YmO5d1z9bpPjsLIShCadDspXjXmO85YvCsQwEd07y
+
+AzureEntityColoring(AzureAllResources)
+!define AzureAllResources(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAllResources, AzureAllResources)
+!define AzureAllResources(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAllResources, AzureAllResources)
diff --git a/dist/General/AzureAllResources.svg b/dist/General/AzureAllResources.svg
new file mode 100644
index 00000000..337e042e
--- /dev/null
+++ b/dist/General/AzureAllResources.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 7 7 L 23.800781 7 L 23.800781 23.800781 L 7 23.800781 Z M 26.601563 7 L 43.398438 7 L 43.398438 23.800781 L 26.601563 23.800781 Z M 46.199219 7 L 63 7 L 63 23.800781 L 46.199219 23.800781 Z M 7 26.601563 L 23.800781 26.601563 L 23.800781 43.398438 L 7 43.398438 Z M 26.601563 26.601563 L 43.398438 26.601563 L 43.398438 43.398438 L 26.601563 43.398438 Z M 46.199219 26.601563 L 63 26.601563 L 63 43.398438 L 46.199219 43.398438 Z M 7 46.199219 L 23.800781 46.199219 L 23.800781 63 L 7 63 Z M 26.601563 46.199219 L 43.398438 46.199219 L 43.398438 63 L 26.601563 63 Z M 46.199219 46.199219 L 63 46.199219 L 63 63 L 46.199219 63 Z M 46.199219 46.199219 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureDeveloperTool(m).png b/dist/General/AzureDeveloperTool(m).png
new file mode 100644
index 00000000..17ba1317
Binary files /dev/null and b/dist/General/AzureDeveloperTool(m).png differ
diff --git a/dist/General/AzureDeveloperTool(m).svg b/dist/General/AzureDeveloperTool(m).svg
new file mode 100644
index 00000000..659f11b8
--- /dev/null
+++ b/dist/General/AzureDeveloperTool(m).svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65pt" height="70pt" viewBox="0 0 65 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="65" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="65" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,93,162);fill-opacity:1;" d="M 53.335938 64.363281 C 54.574219 65.699219 56.308594 66.457031 58.125 66.457031 C 59.941406 66.457031 61.675781 65.699219 62.914063 64.363281 C 64.210938 63.019531 64.910156 61.207031 64.859375 59.339844 C 64.847656 57.480469 64.15625 55.691406 62.914063 54.3125 L 42.363281 33.09375 L 40.417969 35.1875 L 44.167969 39.097656 L 42.5 40.632813 L 38.328125 44.960938 L 37.769531 45.519531 L 36.9375 45.378906 C 36.332031 45.359375 35.726563 45.40625 35.132813 45.519531 Z M 53.335938 64.363281 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="65" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="65" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,93,162);fill-opacity:1;" d="M 26.164063 4.59375 C 22.636719 0.808594 17.351563 -0.773438 12.339844 0.464844 L 20.40625 8.96875 L 18.191406 17.171875 L 10.097656 19.277344 L 2.167969 10.773438 C 0.78125 15.875 2.113281 21.335938 5.691406 25.210938 C 9.253906 29.042969 14.628906 30.578125 19.660156 29.203125 L 19.933594 29.484375 L 23.621094 33.453125 C 23.742188 33.046875 23.792969 32.621094 23.777344 32.199219 L 23.804688 31.503906 L 23.535156 30.941406 L 29.886719 24.480469 L 30.980469 25.753906 L 33.4375 28.445313 L 35.40625 26.378906 L 29.535156 19.863281 C 31.242188 14.535156 29.953125 8.695313 26.164063 4.59375 Z M 26.164063 4.59375 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,145,252);fill-opacity:1;" d="M 55 15.78125 L 55.695313 16.480469 L 59.167969 13.550781 L 65 3.917969 L 63.472656 2.382813 L 54.304688 8.523438 L 51.523438 12.152344 L 52.21875 12.851563 L 34.027344 31.699219 L 30.277344 27.789063 L 26.105469 32.117188 C 26.367188 34.308594 25.65625 36.503906 24.160156 38.117188 C 22.714844 39.707031 20.589844 40.488281 18.464844 40.210938 L 0.0078125 59.199219 L 10.285156 69.949219 L 28.613281 50.824219 C 28.335938 48.605469 29.105469 46.382813 30.695313 44.820313 C 32.140625 43.234375 34.265625 42.453125 36.390625 42.726563 L 40.5625 38.398438 L 36.8125 34.488281 Z M 55 15.78125 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureDeveloperTool.png b/dist/General/AzureDeveloperTool.png
new file mode 100644
index 00000000..d3ae6420
Binary files /dev/null and b/dist/General/AzureDeveloperTool.png differ
diff --git a/dist/General/AzureDeveloperTool.puml b/dist/General/AzureDeveloperTool.puml
new file mode 100644
index 00000000..abc1a780
--- /dev/null
+++ b/dist/General/AzureDeveloperTool.puml
@@ -0,0 +1,12 @@
+sprite $AzureDeveloperTool [65x70/16z] {
+dPPfqWCX20KVg8ZtF_2tKh56CQzC_qxtB2ePO2Ab_b0K7zF6F_PnmqPW20ZbM701HxeR5lf5eRfxnxd0B_-38Y_mzr3ybvQMHw0u8kP_21B48z39vTqhKepT
+WeRVaUCZQCW9FzwWOK46MGWBF_g-5kfu8SZmu7N3RNy5WRvx0-KLM0h-FY3Jdx-lcEYObBElc85deOs97logWXV-k9PM7nF93q3Bzhx-oXPsuDoVj-oBd1wd
+p8UE8ow9RrZffC1yb76cOsBXxzWuOvkVuGVRFGh4XtZkYyQPpdnUS05AxAOMy-DCsttzFzkD-O7Qxei1PVgKqgpttgg7Bs7LpIUeX_-38Np11Jfw-EwM-9pI
+0NEV22uHe2z-mIMBtuRX2l690R4dBsZ-B9JBWlY3TbkGxayAK2yAnHVw_0VXScqzyUF3WnUg1vcV5xZ_7Btbwk5Dzz5TBloQZlvovujgpuOLk6-dWUbA_41m
+Kr3V04Y1-0O4cXI4-cuW1U9x0IbS-AGWdb3vLu0ByNc1-BnW9xyXO0L0ElKdTQmGdnTWRpSGBq28lz6sTq1yKa0K3ZulRFkuWsFhJjAJpmkAA2m-ewrJfOGl
+21XIcxMopKF1vnJYS-g7_ZS
+}
+
+AzureEntityColoring(AzureDeveloperTool)
+!define AzureDeveloperTool(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDeveloperTool, AzureDeveloperTool)
+!define AzureDeveloperTool(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDeveloperTool, AzureDeveloperTool)
diff --git a/dist/General/AzureDeveloperTool.svg b/dist/General/AzureDeveloperTool.svg
new file mode 100644
index 00000000..7d6272d0
--- /dev/null
+++ b/dist/General/AzureDeveloperTool.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65pt" height="70pt" viewBox="0 0 65 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="65" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="65" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(32.156863%,32.156863%,32.156863%);fill-opacity:1;" d="M 53.335938 64.363281 C 54.574219 65.699219 56.308594 66.457031 58.125 66.457031 C 59.941406 66.457031 61.675781 65.699219 62.914063 64.363281 C 64.210938 63.019531 64.910156 61.207031 64.859375 59.339844 C 64.847656 57.480469 64.15625 55.691406 62.914063 54.3125 L 42.363281 33.09375 L 40.417969 35.1875 L 44.167969 39.097656 L 42.5 40.632813 L 38.328125 44.960938 L 37.769531 45.519531 L 36.9375 45.378906 C 36.332031 45.359375 35.726563 45.40625 35.132813 45.519531 Z M 53.335938 64.363281 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="65" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="65" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(32.156863%,32.156863%,32.156863%);fill-opacity:1;" d="M 26.164063 4.59375 C 22.636719 0.808594 17.351563 -0.773438 12.339844 0.464844 L 20.40625 8.96875 L 18.191406 17.171875 L 10.097656 19.277344 L 2.167969 10.773438 C 0.78125 15.875 2.113281 21.335938 5.691406 25.210938 C 9.253906 29.042969 14.628906 30.578125 19.660156 29.203125 L 19.933594 29.484375 L 23.621094 33.453125 C 23.742188 33.046875 23.792969 32.621094 23.777344 32.199219 L 23.804688 31.503906 L 23.535156 30.941406 L 29.886719 24.480469 L 30.980469 25.753906 L 33.4375 28.445313 L 35.40625 26.378906 L 29.535156 19.863281 C 31.242188 14.535156 29.953125 8.695313 26.164063 4.59375 Z M 26.164063 4.59375 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,67.058824%,92.54902%);fill-opacity:1;" d="M 55 15.78125 L 55.695313 16.480469 L 59.167969 13.550781 L 65 3.917969 L 63.472656 2.382813 L 54.304688 8.523438 L 51.523438 12.152344 L 52.21875 12.851563 L 34.027344 31.699219 L 30.277344 27.789063 L 26.105469 32.117188 C 26.367188 34.308594 25.65625 36.503906 24.160156 38.117188 C 22.714844 39.707031 20.589844 40.488281 18.464844 40.210938 L 0.0078125 59.199219 L 10.285156 69.949219 L 28.613281 50.824219 C 28.335938 48.605469 29.105469 46.382813 30.695313 44.820313 C 32.140625 43.234375 34.265625 42.453125 36.390625 42.726563 L 40.5625 38.398438 L 36.8125 34.488281 Z M 55 15.78125 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureHelpAndSupport(m).png b/dist/General/AzureHelpAndSupport(m).png
new file mode 100644
index 00000000..f62a8221
Binary files /dev/null and b/dist/General/AzureHelpAndSupport(m).png differ
diff --git a/dist/General/AzureHelpAndSupport(m).svg b/dist/General/AzureHelpAndSupport(m).svg
new file mode 100644
index 00000000..c68a9e10
--- /dev/null
+++ b/dist/General/AzureHelpAndSupport(m).svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.578125 20.898438 C 22.578125 27.800781 28.089844 33.40625 34.957031 33.574219 L 38.144531 8.550781 C 37.21875 8.335938 36.261719 8.210938 35.265625 8.210938 C 28.257813 8.207031 22.578125 13.890625 22.578125 20.898438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 25.988281 37.941406 L 12.601563 37.941406 L 12.601563 70 L 30.375 70 L 33.175781 48.015625 Z M 25.988281 37.941406 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.976563 0 C 23.410156 0 14 9.410156 14 20.976563 L 14 23.308594 L 18.660156 23.308594 L 18.660156 20.976563 C 18.660156 11.980469 25.980469 4.660156 34.976563 4.660156 C 36.324219 4.660156 37.628906 4.84375 38.886719 5.152344 L 39.46875 0.496094 C 38.019531 0.179688 36.519531 0 34.976563 0 Z M 34.976563 0 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 47.957031 20.898438 C 47.957031 27.90625 42.277344 33.589844 35.265625 33.589844 C 28.257813 33.589844 22.574219 27.90625 22.574219 20.898438 C 22.574219 13.890625 28.257813 8.207031 35.265625 8.207031 C 42.277344 8.207031 47.957031 13.890625 47.957031 20.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 44.546875 37.941406 L 35.265625 50.941406 L 25.988281 37.941406 L 12.601563 37.941406 L 12.601563 70 L 57.933594 70 L 57.933594 37.941406 Z M 44.546875 37.941406 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 55.953125 33.796875 L 46.320313 33.796875 L 46.320313 29.132813 L 51.292969 29.132813 L 51.292969 20.976563 C 51.292969 11.980469 43.972656 4.660156 34.976563 4.660156 C 25.980469 4.660156 18.660156 11.980469 18.660156 20.976563 L 18.660156 23.308594 L 14 23.308594 L 14 20.976563 C 14 9.410156 23.410156 0 34.976563 0 C 46.539063 0 55.949219 9.410156 55.949219 20.976563 L 55.949219 33.796875 Z M 55.953125 33.796875 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureHelpAndSupport.png b/dist/General/AzureHelpAndSupport.png
new file mode 100644
index 00000000..885763cb
Binary files /dev/null and b/dist/General/AzureHelpAndSupport.png differ
diff --git a/dist/General/AzureHelpAndSupport.puml b/dist/General/AzureHelpAndSupport.puml
new file mode 100644
index 00000000..4df68cca
--- /dev/null
+++ b/dist/General/AzureHelpAndSupport.puml
@@ -0,0 +1,11 @@
+sprite $AzureHelpAndSupport [70x70/16z] {
+xTK7KiKm30HGsoekoVtFIx3YC1wboNJ8Jg4_fDKlxYo1Oigvv1mPt5Wyvx9bckSq0FaengOiALQ7ch4fDScR1YajESKOKvxNJ70VIQiGiVrlYDFgu5qaYy7z
+-BGwQ9aa1VMJACojfQIJw2G1405MaQGRVurWHLZ6Gf8mIqDGcNop59a4g8MNr3xmNZLSEv6fg5EOwi_hJdT6oRK6eavfJ7bbw5oXRH_K2bEhffmhgOqIDB8a
+j672wK9RAxIhS3itNvuPPHIjo31UZdrreR2reXLSLvekQr4B4NShfNc9FrMa5d-cy5Mz-LBnpj77AM1MkDleMg4bA9_O5HqyKD2aX0Cbc1HtT6YR4dQLO5GS
+xYZah8hJ2Zb8Iuf5yQWG6MDkYccfxSXAiOmZXdUZYhoh4SgxshZoHBsgXFEdAFaxJsJzQvwxt5JGzQ4XXVh71B9PqJjv7bN8lONjYgu6xOe-Dx1PqTLujYjw
+9x8h-jp8xrNOgtr65FRy4Gh_OiM2FCgZN22FyYWl
+}
+
+AzureEntityColoring(AzureHelpAndSupport)
+!define AzureHelpAndSupport(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureHelpAndSupport, AzureHelpAndSupport)
+!define AzureHelpAndSupport(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureHelpAndSupport, AzureHelpAndSupport)
diff --git a/dist/General/AzureHelpAndSupport.svg b/dist/General/AzureHelpAndSupport.svg
new file mode 100644
index 00000000..76f68263
--- /dev/null
+++ b/dist/General/AzureHelpAndSupport.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.578125 20.898438 C 22.578125 27.800781 28.089844 33.40625 34.957031 33.574219 L 38.144531 8.550781 C 37.21875 8.335938 36.261719 8.210938 35.265625 8.210938 C 28.257813 8.207031 22.578125 13.890625 22.578125 20.898438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.988281 37.941406 L 12.601563 37.941406 L 12.601563 70 L 30.375 70 L 33.175781 48.015625 Z M 25.988281 37.941406 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.976563 0 C 23.410156 0 14 9.410156 14 20.976563 L 14 23.308594 L 18.660156 23.308594 L 18.660156 20.976563 C 18.660156 11.980469 25.980469 4.660156 34.976563 4.660156 C 36.324219 4.660156 37.628906 4.84375 38.886719 5.152344 L 39.46875 0.496094 C 38.019531 0.179688 36.519531 0 34.976563 0 Z M 34.976563 0 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 47.957031 20.898438 C 47.957031 27.90625 42.277344 33.589844 35.265625 33.589844 C 28.257813 33.589844 22.574219 27.90625 22.574219 20.898438 C 22.574219 13.890625 28.257813 8.207031 35.265625 8.207031 C 42.277344 8.207031 47.957031 13.890625 47.957031 20.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 44.546875 37.941406 L 35.265625 50.941406 L 25.988281 37.941406 L 12.601563 37.941406 L 12.601563 70 L 57.933594 70 L 57.933594 37.941406 Z M 44.546875 37.941406 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 55.953125 33.796875 L 46.320313 33.796875 L 46.320313 29.132813 L 51.292969 29.132813 L 51.292969 20.976563 C 51.292969 11.980469 43.972656 4.660156 34.976563 4.660156 C 25.980469 4.660156 18.660156 11.980469 18.660156 20.976563 L 18.660156 23.308594 L 14 23.308594 L 14 20.976563 C 14 9.410156 23.410156 0 34.976563 0 C 46.539063 0 55.949219 9.410156 55.949219 20.976563 L 55.949219 33.796875 Z M 55.953125 33.796875 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureHome(m).png b/dist/General/AzureHome(m).png
new file mode 100644
index 00000000..388162c8
Binary files /dev/null and b/dist/General/AzureHome(m).png differ
diff --git a/dist/General/AzureHome(m).svg b/dist/General/AzureHome(m).svg
new file mode 100644
index 00000000..0e47ee41
--- /dev/null
+++ b/dist/General/AzureHome(m).svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 34.539063 6.476563 L 0 40.089844 L 12.644531 40.089844 L 12.644531 62.597656 L 28.0625 62.597656 L 28.0625 47.796875 L 41.320313 47.796875 L 41.320313 62.597656 L 54.582031 62.597656 L 54.582031 40.089844 L 70 40.089844 Z M 34.539063 6.476563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49,167,255);fill-opacity:1;" d="M 31.144531 47.796875 L 36.695313 8.632813 L 34.539063 6.476563 L 0 40.089844 L 12.644531 40.089844 L 12.644531 62.597656 L 28.0625 62.597656 L 28.0625 47.796875 Z M 31.144531 47.796875 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureHome.png b/dist/General/AzureHome.png
new file mode 100644
index 00000000..5101272c
Binary files /dev/null and b/dist/General/AzureHome.png differ
diff --git a/dist/General/AzureHome.puml b/dist/General/AzureHome.puml
new file mode 100644
index 00000000..abe73618
--- /dev/null
+++ b/dist/General/AzureHome.puml
@@ -0,0 +1,9 @@
+sprite $AzureHome [70x70/16z] {
+xTCtOWCn44DHfbtW_YTsPpWeWL0MVqdEl6xA6xJgLq6071a0a2CG4o94pH4mORPlHCmC8eMi0IA5BK90CVC8A6OUaS9k8Jj-As8YH8oFI573HwIeRGe1VKQ8
+59yHSbpXxYFW4SP4J0QuL26E6HM6GbW8U8of1W8QJ8MjY15YAAecY6gN8U2bJCEymYuaKDY510gxa43XA1svmj67sYv7skzAKJsuw8SfIs6kz5hrEQQLNv-F
+KvQobAKqKtd_Lby
+}
+
+AzureEntityColoring(AzureHome)
+!define AzureHome(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureHome, AzureHome)
+!define AzureHome(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureHome, AzureHome)
diff --git a/dist/General/AzureHome.svg b/dist/General/AzureHome.svg
new file mode 100644
index 00000000..a1697cdd
--- /dev/null
+++ b/dist/General/AzureHome.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 34.539063 6.476563 L 0 40.089844 L 12.644531 40.089844 L 12.644531 62.597656 L 28.0625 62.597656 L 28.0625 47.796875 L 41.320313 47.796875 L 41.320313 62.597656 L 54.582031 62.597656 L 54.582031 40.089844 L 70 40.089844 Z M 34.539063 6.476563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,68.235294%,82.745098%);fill-opacity:1;" d="M 31.144531 47.796875 L 36.695313 8.632813 L 34.539063 6.476563 L 0 40.089844 L 12.644531 40.089844 L 12.644531 62.597656 L 28.0625 62.597656 L 28.0625 47.796875 Z M 31.144531 47.796875 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureInformation(m).png b/dist/General/AzureInformation(m).png
new file mode 100644
index 00000000..9600eac6
Binary files /dev/null and b/dist/General/AzureInformation(m).png differ
diff --git a/dist/General/AzureInformation(m).svg b/dist/General/AzureInformation(m).svg
new file mode 100644
index 00000000..143fef77
--- /dev/null
+++ b/dist/General/AzureInformation(m).svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 66.144531 35 C 66.144531 52.203125 52.203125 66.144531 35 66.144531 C 17.796875 66.144531 3.855469 52.203125 3.855469 35 C 3.855469 17.796875 17.796875 3.855469 35 3.855469 C 52.199219 3.855469 66.144531 17.800781 66.144531 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 35 3.855469 C 17.796875 3.855469 3.855469 17.800781 3.855469 35 C 3.855469 42.371094 6.429688 49.132813 10.710938 54.46875 L 56.589844 12.582031 C 50.988281 7.1875 43.390625 3.855469 35 3.855469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 40.414063 27.324219 L 40.414063 49.863281 C 40.414063 51.871094 40.644531 53.152344 41.113281 53.710938 C 41.578125 54.269531 42.492188 54.585938 43.851563 54.667969 L 43.851563 55.761719 L 28.488281 55.761719 L 28.488281 54.667969 C 29.746094 54.628906 30.679688 54.261719 31.289063 53.574219 C 31.691406 53.109375 31.894531 51.871094 31.894531 49.863281 L 31.894531 33.253906 C 31.894531 31.25 31.664063 29.96875 31.199219 29.410156 C 30.730469 28.851563 29.828125 28.53125 28.488281 28.449219 L 28.488281 27.324219 Z M 40.414063 27.324219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.15625 13.546875 C 37.472656 13.546875 38.589844 14.011719 39.503906 14.933594 C 40.414063 15.855469 40.867188 16.964844 40.867188 18.261719 C 40.867188 19.558594 40.40625 20.664063 39.488281 21.578125 C 38.5625 22.488281 37.453125 22.945313 36.15625 22.945313 C 34.855469 22.945313 33.753906 22.488281 32.839844 21.578125 C 31.925781 20.664063 31.46875 19.558594 31.46875 18.261719 C 31.46875 16.964844 31.925781 15.855469 32.839844 14.933594 C 33.753906 14.011719 34.855469 13.546875 36.15625 13.546875 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureInformation.png b/dist/General/AzureInformation.png
new file mode 100644
index 00000000..833fdd9d
Binary files /dev/null and b/dist/General/AzureInformation.png differ
diff --git a/dist/General/AzureInformation.puml b/dist/General/AzureInformation.puml
new file mode 100644
index 00000000..e4bbdcb2
--- /dev/null
+++ b/dist/General/AzureInformation.puml
@@ -0,0 +1,10 @@
+sprite $AzureInformation [70x70/16z] {
+vTP9UiGW34HX41hg_YVEKcbYokMllSjRPlWjy3Z-ONFEh_xTyrUnnlCiB_9dHkGfUy7GdPKtXO2aaAcRoWjvDJo2UEezHTmZzmgfBgUlj1ax0eIyiNsvneu0
+hf_YFiQE0AOYFVPV153FSKzzWI38A7oM0ZeJRy2vxGi-ga-baWyp6_d8n6T1MEzQOQ-UtCYDa65CH_QYbUT8HnGTWTqjA5RdEEHtZvMOFUx2eHGMD6yL24hS
+ArFOt7l5Nb7McyhyJl5xfMHb40GlA0NekqiGw6UQ8FZsgYje2drU0ffIx5q4LGdob8AihADIq9NZXqj1Lt9qEw8hww0KdYY7Bw22hknVGXiYAzUVOtNwCoEZ
+TD68hjJb5naPURBRkRCiUdqN-sKN-5FzMlUCukjfXX-hFf4v2AFMo5Q2nNTMduOlftCPeLa9I110NLKP1wHnV8XPCaFF0XVb6aypJw2h80HlsbhklcoEVzOF
+}
+
+AzureEntityColoring(AzureInformation)
+!define AzureInformation(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureInformation, AzureInformation)
+!define AzureInformation(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureInformation, AzureInformation)
diff --git a/dist/General/AzureInformation.svg b/dist/General/AzureInformation.svg
new file mode 100644
index 00000000..a5772226
--- /dev/null
+++ b/dist/General/AzureInformation.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 66.144531 35 C 66.144531 52.203125 52.203125 66.144531 35 66.144531 C 17.796875 66.144531 3.855469 52.203125 3.855469 35 C 3.855469 17.796875 17.796875 3.855469 35 3.855469 C 52.199219 3.855469 66.144531 17.800781 66.144531 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 35 3.855469 C 17.796875 3.855469 3.855469 17.800781 3.855469 35 C 3.855469 42.371094 6.429688 49.132813 10.710938 54.46875 L 56.589844 12.582031 C 50.988281 7.1875 43.390625 3.855469 35 3.855469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 40.414063 27.324219 L 40.414063 49.863281 C 40.414063 51.871094 40.644531 53.152344 41.113281 53.710938 C 41.578125 54.269531 42.492188 54.585938 43.851563 54.667969 L 43.851563 55.761719 L 28.488281 55.761719 L 28.488281 54.667969 C 29.746094 54.628906 30.679688 54.261719 31.289063 53.574219 C 31.691406 53.109375 31.894531 51.871094 31.894531 49.863281 L 31.894531 33.253906 C 31.894531 31.25 31.664063 29.96875 31.199219 29.410156 C 30.730469 28.851563 29.828125 28.53125 28.488281 28.449219 L 28.488281 27.324219 Z M 40.414063 27.324219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.15625 13.546875 C 37.472656 13.546875 38.589844 14.011719 39.503906 14.933594 C 40.414063 15.855469 40.867188 16.964844 40.867188 18.261719 C 40.867188 19.558594 40.40625 20.664063 39.488281 21.578125 C 38.5625 22.488281 37.453125 22.945313 36.15625 22.945313 C 34.855469 22.945313 33.753906 22.488281 32.839844 21.578125 C 31.925781 20.664063 31.46875 19.558594 31.46875 18.261719 C 31.46875 16.964844 31.925781 15.855469 32.839844 14.933594 C 33.753906 14.011719 34.855469 13.546875 36.15625 13.546875 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureManagementGroup(m).png b/dist/General/AzureManagementGroup(m).png
new file mode 100644
index 00000000..cc5f0c9e
Binary files /dev/null and b/dist/General/AzureManagementGroup(m).png differ
diff --git a/dist/General/AzureManagementGroup(m).svg b/dist/General/AzureManagementGroup(m).svg
new file mode 100644
index 00000000..7ff9dc61
--- /dev/null
+++ b/dist/General/AzureManagementGroup(m).svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 49 29.960938 L 48.597656 30.929688 L 36.074219 15.902344 L 35 16.800781 L 33.925781 15.902344 L 21.402344 30.929688 L 21 29.960938 L 12.707031 49.859375 L 15.292969 50.9375 L 21 37.238281 L 26.707031 50.9375 L 29.292969 49.859375 L 22.617188 33.84375 L 35 18.988281 L 47.382813 33.84375 L 40.707031 49.859375 L 43.292969 50.9375 L 49 37.238281 L 54.707031 50.9375 L 57.292969 49.859375 Z M 49 29.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 60.199219 50.398438 C 60.199219 52.71875 58.320313 54.601563 56 54.601563 C 53.679688 54.601563 51.800781 52.71875 51.800781 50.398438 C 51.800781 48.082031 53.679688 46.199219 56 46.199219 C 58.320313 46.199219 60.199219 48.082031 60.199219 50.398438 Z M 60.199219 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 46.199219 50.398438 C 46.199219 52.71875 44.320313 54.601563 42 54.601563 C 39.679688 54.601563 37.800781 52.71875 37.800781 50.398438 C 37.800781 48.082031 39.679688 46.199219 42 46.199219 C 44.320313 46.199219 46.199219 48.082031 46.199219 50.398438 Z M 46.199219 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 42 16.800781 C 42 20.664063 38.867188 23.800781 35 23.800781 C 31.132813 23.800781 28 20.664063 28 16.800781 C 28 12.933594 31.132813 9.800781 35 9.800781 C 38.867188 9.800781 42 12.933594 42 16.800781 Z M 42 16.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 26.601563 33.601563 C 26.601563 36.691406 24.09375 39.199219 21 39.199219 C 17.90625 39.199219 15.398438 36.691406 15.398438 33.601563 C 15.398438 30.507813 17.90625 28 21 28 C 24.09375 28 26.601563 30.507813 26.601563 33.601563 Z M 26.601563 33.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 54.601563 33.601563 C 54.601563 36.691406 52.09375 39.199219 49 39.199219 C 45.90625 39.199219 43.398438 36.691406 43.398438 33.601563 C 43.398438 30.507813 45.90625 28 49 28 C 52.09375 28 54.601563 30.507813 54.601563 33.601563 Z M 54.601563 33.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 32.199219 50.398438 C 32.199219 52.71875 30.320313 54.601563 28 54.601563 C 25.679688 54.601563 23.800781 52.71875 23.800781 50.398438 C 23.800781 48.082031 25.679688 46.199219 28 46.199219 C 30.320313 46.199219 32.199219 48.082031 32.199219 50.398438 Z M 32.199219 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 18.199219 50.398438 C 18.199219 52.71875 16.320313 54.601563 14 54.601563 C 11.679688 54.601563 9.800781 52.71875 9.800781 50.398438 C 9.800781 48.082031 11.679688 46.199219 14 46.199219 C 16.320313 46.199219 18.199219 48.082031 18.199219 50.398438 Z M 18.199219 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 13.300781 63.558594 C 12.957031 63.53125 12.625 63.4375 12.320313 63.28125 L 2.800781 57.679688 C 1.121094 56.671875 0.0664063 54.878906 0 52.921875 L 0 17.640625 C 0.03125 15.671875 1.09375 13.863281 2.800781 12.878906 L 12.320313 7.28125 C 13.285156 6.726563 14.515625 7.046875 15.085938 8 C 15.660156 8.953125 15.363281 10.191406 14.421875 10.78125 L 4.898438 16.378906 C 4.507813 16.691406 4.257813 17.144531 4.199219 17.640625 L 4.199219 52.921875 C 4.257813 53.417969 4.507813 53.871094 4.898438 54.179688 L 14.421875 59.78125 C 14.882813 60.058594 15.21875 60.507813 15.351563 61.035156 C 15.480469 61.558594 15.398438 62.117188 15.121094 62.578125 C 14.691406 63.164063 14.023438 63.527344 13.300781 63.558594 Z M 56.699219 7 C 57.042969 7.027344 57.375 7.121094 57.679688 7.28125 L 67.199219 12.878906 C 68.878906 13.890625 69.933594 15.679688 70 17.640625 L 70 52.921875 C 69.96875 54.890625 68.90625 56.695313 67.199219 57.679688 L 57.679688 63.28125 C 56.714844 63.835938 55.484375 63.515625 54.914063 62.558594 C 54.339844 61.605469 54.636719 60.371094 55.578125 59.78125 L 65.101563 54.179688 C 65.492188 53.871094 65.742188 53.417969 65.800781 52.921875 L 65.800781 17.640625 C 65.742188 17.144531 65.492188 16.691406 65.101563 16.378906 L 55.578125 10.78125 C 55.117188 10.503906 54.78125 10.050781 54.648438 9.523438 C 54.519531 9 54.601563 8.445313 54.878906 7.980469 C 55.328125 7.421875 55.984375 7.066406 56.699219 7 Z M 56.699219 7 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureManagementGroup.png b/dist/General/AzureManagementGroup.png
new file mode 100644
index 00000000..9c3c6133
Binary files /dev/null and b/dist/General/AzureManagementGroup.png differ
diff --git a/dist/General/AzureManagementGroup.puml b/dist/General/AzureManagementGroup.puml
new file mode 100644
index 00000000..76fd9706
--- /dev/null
+++ b/dist/General/AzureManagementGroup.puml
@@ -0,0 +1,13 @@
+sprite $AzureManagementGroup [70x70/16z] {
+xPTdmkGe34G52YNi-zztr-uMOqOuV9FJ--KYF497qT_7FugvqaCgm3H3s_ymFSDRQwYfcRsTMShKig4qKD5sa4_PbcL1aalRSHaF4sqZlBonf8zrQtYzzVrb
+oQZ9Tz2i7AM54ctv15D2Nnvd8iHJHfO3JfbYRQVAxb2QWUK81Vbb0VfXCZvOAfs_pRQZLNfYAHTlm7PXiNIY6RYny562Bx3a8zKljaXweR_0Ke4kWNwXfG0G
+Hckk5O1ycSK0FMmBzKii2XXr643vk4K0Aoa_jkIryzxkBTNS8PDxCC1qwtjWqMNTQE3yclchpykTHTOtJWbPSj_Sign1JPQs1d9juRLZwKHhnwyjkdP0GLwX
+NLlacrZgsb4AyftPjOKy1YwKiDvNRonbUGzaohIypRc5UDabHXDgMxO-F7ZlmbKSe0a2g00eTvO2s3wSAODDpe3SMGJWS8tq-G1kB354WPei1fHOwD8Isws0
+qa2qfOqcIomN3mEnltYOMyOjSBvVmCPHSqiH0140IALEOKFt6Y1yOb7Vw9rRi4ZY6uKE8r6o9GPwdCXtR4YWdTfJjlXEB8WXsJlL8N6sbB2CJiwfho2tUncT
+c5fuOh7Xj3eayHTZAjtYtL8GY-_CKd-bZsap7FzZAg250layMSqfIfdqv_sM_3SUX2Wale1Y_M9jA2xkoQLCJSN5O_8qRS-FbUkZt4QNv5gDR-l6JAuR4-8V
+jA1CZwgGBwYdVm_-yHy
+}
+
+AzureEntityColoring(AzureManagementGroup)
+!define AzureManagementGroup(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagementGroup, AzureManagementGroup)
+!define AzureManagementGroup(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagementGroup, AzureManagementGroup)
diff --git a/dist/General/AzureManagementGroup.svg b/dist/General/AzureManagementGroup.svg
new file mode 100644
index 00000000..f38753e4
--- /dev/null
+++ b/dist/General/AzureManagementGroup.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 49 29.960938 L 48.597656 30.929688 L 36.074219 15.902344 L 35 16.800781 L 33.925781 15.902344 L 21.402344 30.929688 L 21 29.960938 L 12.707031 49.859375 L 15.292969 50.9375 L 21 37.238281 L 26.707031 50.9375 L 29.292969 49.859375 L 22.617188 33.84375 L 35 18.988281 L 47.382813 33.84375 L 40.707031 49.859375 L 43.292969 50.9375 L 49 37.238281 L 54.707031 50.9375 L 57.292969 49.859375 Z M 49 29.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 60.199219 50.398438 C 60.199219 52.71875 58.320313 54.601563 56 54.601563 C 53.679688 54.601563 51.800781 52.71875 51.800781 50.398438 C 51.800781 48.082031 53.679688 46.199219 56 46.199219 C 58.320313 46.199219 60.199219 48.082031 60.199219 50.398438 Z M 60.199219 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 46.199219 50.398438 C 46.199219 52.71875 44.320313 54.601563 42 54.601563 C 39.679688 54.601563 37.800781 52.71875 37.800781 50.398438 C 37.800781 48.082031 39.679688 46.199219 42 46.199219 C 44.320313 46.199219 46.199219 48.082031 46.199219 50.398438 Z M 46.199219 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 42 16.800781 C 42 20.664063 38.867188 23.800781 35 23.800781 C 31.132813 23.800781 28 20.664063 28 16.800781 C 28 12.933594 31.132813 9.800781 35 9.800781 C 38.867188 9.800781 42 12.933594 42 16.800781 Z M 42 16.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 26.601563 33.601563 C 26.601563 36.691406 24.09375 39.199219 21 39.199219 C 17.90625 39.199219 15.398438 36.691406 15.398438 33.601563 C 15.398438 30.507813 17.90625 28 21 28 C 24.09375 28 26.601563 30.507813 26.601563 33.601563 Z M 26.601563 33.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 54.601563 33.601563 C 54.601563 36.691406 52.09375 39.199219 49 39.199219 C 45.90625 39.199219 43.398438 36.691406 43.398438 33.601563 C 43.398438 30.507813 45.90625 28 49 28 C 52.09375 28 54.601563 30.507813 54.601563 33.601563 Z M 54.601563 33.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 32.199219 50.398438 C 32.199219 52.71875 30.320313 54.601563 28 54.601563 C 25.679688 54.601563 23.800781 52.71875 23.800781 50.398438 C 23.800781 48.082031 25.679688 46.199219 28 46.199219 C 30.320313 46.199219 32.199219 48.082031 32.199219 50.398438 Z M 32.199219 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 18.199219 50.398438 C 18.199219 52.71875 16.320313 54.601563 14 54.601563 C 11.679688 54.601563 9.800781 52.71875 9.800781 50.398438 C 9.800781 48.082031 11.679688 46.199219 14 46.199219 C 16.320313 46.199219 18.199219 48.082031 18.199219 50.398438 Z M 18.199219 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 13.300781 63.558594 C 12.957031 63.53125 12.625 63.4375 12.320313 63.28125 L 2.800781 57.679688 C 1.121094 56.671875 0.0664063 54.878906 0 52.921875 L 0 17.640625 C 0.03125 15.671875 1.09375 13.863281 2.800781 12.878906 L 12.320313 7.28125 C 13.285156 6.726563 14.515625 7.046875 15.085938 8 C 15.660156 8.953125 15.363281 10.191406 14.421875 10.78125 L 4.898438 16.378906 C 4.507813 16.691406 4.257813 17.144531 4.199219 17.640625 L 4.199219 52.921875 C 4.257813 53.417969 4.507813 53.871094 4.898438 54.179688 L 14.421875 59.78125 C 14.882813 60.058594 15.21875 60.507813 15.351563 61.035156 C 15.480469 61.558594 15.398438 62.117188 15.121094 62.578125 C 14.691406 63.164063 14.023438 63.527344 13.300781 63.558594 Z M 56.699219 7 C 57.042969 7.027344 57.375 7.121094 57.679688 7.28125 L 67.199219 12.878906 C 68.878906 13.890625 69.933594 15.679688 70 17.640625 L 70 52.921875 C 69.96875 54.890625 68.90625 56.695313 67.199219 57.679688 L 57.679688 63.28125 C 56.714844 63.835938 55.484375 63.515625 54.914063 62.558594 C 54.339844 61.605469 54.636719 60.371094 55.578125 59.78125 L 65.101563 54.179688 C 65.492188 53.871094 65.742188 53.417969 65.800781 52.921875 L 65.800781 17.640625 C 65.742188 17.144531 65.492188 16.691406 65.101563 16.378906 L 55.578125 10.78125 C 55.117188 10.503906 54.78125 10.050781 54.648438 9.523438 C 54.519531 9 54.601563 8.445313 54.878906 7.980469 C 55.328125 7.421875 55.984375 7.066406 56.699219 7 Z M 56.699219 7 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureMarketplace(m).png b/dist/General/AzureMarketplace(m).png
new file mode 100644
index 00000000..4112669b
Binary files /dev/null and b/dist/General/AzureMarketplace(m).png differ
diff --git a/dist/General/AzureMarketplace(m).svg b/dist/General/AzureMarketplace(m).svg
new file mode 100644
index 00000000..8db5c126
--- /dev/null
+++ b/dist/General/AzureMarketplace(m).svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 59.777344 17.308594 L 55.535156 17.308594 L 55.535156 70 L 59.777344 62.082031 Z M 59.777344 17.308594 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 59.8125 62.023438 L 59.777344 62.082031 L 55.535156 70 L 59.777344 66.730469 L 64.867188 62.808594 Z M 59.8125 62.023438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 64.867188 62.808594 L 64.863281 62.808594 L 63.3125 17.308594 L 5.753906 17.308594 L 4.199219 65.945313 L 55.535156 70 L 59.777344 66.730469 Z M 64.867188 62.808594 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.25 47.894531 C 46.25 45.71875 44.507813 43.957031 42.351563 43.957031 C 42.191406 43.957031 42.03125 43.972656 41.875 43.992188 C 42.113281 43.109375 42.246094 42.179688 42.246094 41.21875 C 42.246094 35.425781 37.589844 30.730469 31.847656 30.730469 C 27.257813 30.730469 23.367188 33.726563 21.988281 37.886719 C 21.257813 37.628906 20.480469 37.488281 19.664063 37.488281 C 15.738281 37.488281 12.558594 40.695313 12.558594 44.65625 C 12.558594 48.617188 15.738281 51.828125 19.664063 51.828125 C 19.664063 51.828125 19.671875 51.824219 19.675781 51.824219 L 19.675781 51.828125 L 42.667969 51.828125 L 42.664063 51.808594 C 44.671875 51.648438 46.25 49.960938 46.25 47.894531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 32.769531 9.464844 C 32.769531 6.03125 35.769531 3.238281 39.460938 3.238281 C 43.148438 3.238281 46.148438 6.03125 46.148438 9.464844 L 46.148438 17.308594 L 49.359375 17.308594 L 49.359375 9.464844 C 49.359375 4.246094 44.917969 0 39.460938 0 C 33.996094 0 29.558594 4.246094 29.558594 9.464844 L 29.558594 17.308594 L 32.769531 17.308594 Z M 32.769531 9.464844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 22.917969 9.464844 C 22.917969 6.03125 25.917969 3.238281 29.605469 3.238281 C 33.296875 3.238281 36.296875 6.03125 36.296875 9.464844 L 36.296875 17.308594 L 39.507813 17.308594 L 39.507813 9.464844 C 39.507813 4.246094 35.066406 0 29.605469 0 C 24.148438 0 19.703125 4.246094 19.703125 9.464844 L 19.703125 17.308594 L 22.917969 17.308594 Z M 22.917969 9.464844 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureMarketplace.png b/dist/General/AzureMarketplace.png
new file mode 100644
index 00000000..8d0dc4db
Binary files /dev/null and b/dist/General/AzureMarketplace.png differ
diff --git a/dist/General/AzureMarketplace.puml b/dist/General/AzureMarketplace.puml
new file mode 100644
index 00000000..c66f1a6b
--- /dev/null
+++ b/dist/General/AzureMarketplace.puml
@@ -0,0 +1,11 @@
+sprite $AzureMarketplace [70x70/16z] {
+xT5LOjWm48JXMHhjtl_2LTeO6fCSfl_9-8bmc3CpMoXW7cIOu7QUzLWsFXPtdLQh6gVqDf9XgfxLeufQt6LOLHJqdEt14VIKFGodLHMOVlJED3ma91sZHLLE
+vyI0JPE1tPbCLZd-Hb8tzuFDOml9VtEBUMw6iQGhM2jUnLdnbolsjPLVHUA_I3wzPpp9Un5XMDAy7NkPoK-gsBELzksKn9BdNhzAVBGYbuehUkfjJE6kWJb_
+jg9OfUskiaLwSgJecM9uabqhc_asRE8zfP5fsAJxYkqgBZZeKicf9ZYCmuhWkDXLVAiuJl9H1NY5kH1dSL09d2N67IKm9KDABqQKXglQW9A2YtoZSAl4InJD
+ASLv75BIS9RcHcbxBvEAmon7bLuxAFDKiRpNwolvoehdNhzAl4IHpw5KlOBIgjSmnUSfrGkyKCcE69RKF8AjtLEgKh2RY5edoKkHMSH8eXEvOx8Szvf8Nyso
+ALRz0G
+}
+
+AzureEntityColoring(AzureMarketplace)
+!define AzureMarketplace(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMarketplace, AzureMarketplace)
+!define AzureMarketplace(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMarketplace, AzureMarketplace)
diff --git a/dist/General/AzureMarketplace.svg b/dist/General/AzureMarketplace.svg
new file mode 100644
index 00000000..9c9f1abb
--- /dev/null
+++ b/dist/General/AzureMarketplace.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 59.777344 17.308594 L 55.535156 17.308594 L 55.535156 70 L 59.777344 62.082031 Z M 59.777344 17.308594 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 59.8125 62.023438 L 59.777344 62.082031 L 55.535156 70 L 59.777344 66.730469 L 64.867188 62.808594 Z M 59.8125 62.023438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 64.867188 62.808594 L 64.863281 62.808594 L 63.3125 17.308594 L 5.753906 17.308594 L 4.199219 65.945313 L 55.535156 70 L 59.777344 66.730469 Z M 64.867188 62.808594 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.25 47.894531 C 46.25 45.71875 44.507813 43.957031 42.351563 43.957031 C 42.191406 43.957031 42.03125 43.972656 41.875 43.992188 C 42.113281 43.109375 42.246094 42.179688 42.246094 41.21875 C 42.246094 35.425781 37.589844 30.730469 31.847656 30.730469 C 27.257813 30.730469 23.367188 33.726563 21.988281 37.886719 C 21.257813 37.628906 20.480469 37.488281 19.664063 37.488281 C 15.738281 37.488281 12.558594 40.695313 12.558594 44.65625 C 12.558594 48.617188 15.738281 51.828125 19.664063 51.828125 C 19.664063 51.828125 19.671875 51.824219 19.675781 51.824219 L 19.675781 51.828125 L 42.667969 51.828125 L 42.664063 51.808594 C 44.671875 51.648438 46.25 49.960938 46.25 47.894531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 32.769531 9.464844 C 32.769531 6.03125 35.769531 3.238281 39.460938 3.238281 C 43.148438 3.238281 46.148438 6.03125 46.148438 9.464844 L 46.148438 17.308594 L 49.359375 17.308594 L 49.359375 9.464844 C 49.359375 4.246094 44.917969 0 39.460938 0 C 33.996094 0 29.558594 4.246094 29.558594 9.464844 L 29.558594 17.308594 L 32.769531 17.308594 Z M 32.769531 9.464844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 22.917969 9.464844 C 22.917969 6.03125 25.917969 3.238281 29.605469 3.238281 C 33.296875 3.238281 36.296875 6.03125 36.296875 9.464844 L 36.296875 17.308594 L 39.507813 17.308594 L 39.507813 9.464844 C 39.507813 4.246094 35.066406 0 29.605469 0 C 24.148438 0 19.703125 4.246094 19.703125 9.464844 L 19.703125 17.308594 L 22.917969 17.308594 Z M 22.917969 9.464844 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureQuickStartCenter(m).png b/dist/General/AzureQuickStartCenter(m).png
new file mode 100644
index 00000000..f4501da0
Binary files /dev/null and b/dist/General/AzureQuickStartCenter(m).png differ
diff --git a/dist/General/AzureQuickStartCenter(m).svg b/dist/General/AzureQuickStartCenter(m).svg
new file mode 100644
index 00000000..5c55d81a
--- /dev/null
+++ b/dist/General/AzureQuickStartCenter(m).svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 10.523438 59.609375 C 10.566406 56.175781 15.925781 46.8125 19.226563 42.898438 L 27.234375 50.902344 C 22.835938 54.664063 13.039063 59.585938 10.523438 59.609375 Z M 10.523438 59.609375 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.960938 28.023438 C 37.429688 24.742188 38.851563 20.847656 42.132813 19.316406 C 45.414063 17.785156 49.304688 19.207031 50.835938 22.488281 Z M 38.960938 28.023438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 15.902344 39.703125 C 15.902344 39.703125 7.523438 33.578125 1.09375 35.789063 C 3.148438 29.398438 12.226563 21.875 20.167969 20.101563 C 29.378906 20.738281 30.910156 22.269531 30.910156 22.269531 Z M 15.902344 39.703125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 30.996094 54.773438 L 48.429688 39.769531 C 48.429688 39.769531 49.984375 41.320313 50.597656 50.507813 C 48.824219 58.449219 41.300781 67.527344 34.914063 69.5625 C 37.121094 63.152344 30.996094 54.773438 30.996094 54.773438 Z M 30.996094 54.773438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 69.648438 0.503906 C 69.648438 0.503906 35.832031 6.476563 15.507813 39.179688 L 30.976563 54.644531 C 63.679688 34.300781 69.648438 0.503906 69.648438 0.503906 Z M 69.648438 0.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 69.648438 0.503906 L 23.230469 46.898438 L 30.976563 54.644531 C 63.679688 34.300781 69.648438 0.503906 69.648438 0.503906 Z M 69.648438 0.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 17.609375 41.277344 C 33.492188 16.910156 56.414063 7.4375 65.121094 5.007813 C 62.695313 13.738281 53.242188 36.640625 28.851563 52.523438 Z M 17.609375 41.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 69.648438 0.503906 C 69.648438 0.503906 61.207031 1.992188 50.203125 7.570313 L 62.585938 19.949219 C 68.140625 8.945313 69.648438 0.503906 69.648438 0.503906 Z M 69.648438 0.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 3.390625 66.742188 C 3.390625 66.742188 4.679688 46.898438 15.507813 39.15625 L 30.976563 54.621094 C 23.230469 65.472656 3.390625 66.742188 3.390625 66.742188 Z M 3.390625 66.742188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 6.890625 63.261719 C 6.519531 59.675781 11.460938 46.988281 17.675781 41.320313 L 28.832031 52.476563 C 23.144531 58.710938 10.457031 63.632813 6.890625 63.261719 Z M 6.890625 63.261719 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 53.636719 25.242188 C 53.636719 30.078125 49.71875 33.992188 44.886719 33.992188 C 40.054688 33.992188 36.136719 30.078125 36.136719 25.242188 C 36.136719 20.410156 40.054688 16.492188 44.886719 16.492188 C 49.71875 16.492188 53.636719 20.410156 53.636719 25.242188 Z M 53.636719 25.242188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 51.449219 25.242188 C 51.449219 28.867188 48.511719 31.804688 44.886719 31.804688 C 41.261719 31.804688 38.324219 28.867188 38.324219 25.242188 C 38.324219 21.621094 41.261719 18.679688 44.886719 18.679688 C 48.511719 18.679688 51.449219 21.621094 51.449219 25.242188 Z M 51.449219 25.242188 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 27.875 39.164063 L 30.96875 42.253906 L 18.59375 54.628906 L 15.5 51.535156 Z M 27.875 39.164063 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureQuickStartCenter.png b/dist/General/AzureQuickStartCenter.png
new file mode 100644
index 00000000..c63bd3f3
Binary files /dev/null and b/dist/General/AzureQuickStartCenter.png differ
diff --git a/dist/General/AzureQuickStartCenter.puml b/dist/General/AzureQuickStartCenter.puml
new file mode 100644
index 00000000..c5c7a9df
--- /dev/null
+++ b/dist/General/AzureQuickStartCenter.puml
@@ -0,0 +1,14 @@
+sprite $AzureQuickStartCenter [70x70/16z] {
+fPK7akiW44Hx8aXx__j-CnzfR0e9XrTvmzlkNgOC_8uuVeIixdyxViAs_U_1zgiYS7m9rr04E_qQ8opVEKAHL7oETaSY-1GkssZPlt0y-B6GROrQjfSeZ4-G
+6fBYxjktXQYSZbTD-IH8EAftKhD_5MJKr0yMoI2f-N1R-n_4L7NGV73E7Wv6GFQYsHLlGT76S29fsT_TLc8HRJfk0E0kUUXtmmKagi9CQ6X8h3awTAPfty4S
+yHDJrf0u0HnqpH5bOynGVw76hcvDaY3-L6dVmWJsgSJbsI92eEieP1SIPr0wH1YKKHP1Kf8M2HY8QRVL8Ybf22WTaIM-gsj9IOah48uEWSlqlsoNaW1WIVeh
+eW-I10myHucZiAN43qc6GKfWipxY8tMGkCKTXUEY3oqaWH62Gw9lBLjzHCD3udNstcWbISnwq8eHKH6reOzVKdAK2IHFFrRk9O8RsBBFdSHm3qUVXSInn9xw
+b39zZ5YYRYdflk7CiQGDOoaPD5iWwoGFLBia62NhMIGa8fAIyZ9iK74BTmaJpoKTmXsdX4Xk91klHZ4H8IAkDv9DSGqTKIQIkZrZgoXJIKb9O8ie8d98gl2i
+pUBnQkzpI9fkRBEsz2WfUQ13c-MputFQSaXOH0V7wWJqMALfGY8Fp9jojE2I8qh3fGK9YNkj7nMAA45tg3UrRIDqLyWYIY1743TWpEAhGiz13Waa1OihehCG
+ImPnHQEy-t0v2Wcdeo40nZ3r_ePKEchZ1tDTzmciMzBXZ1DTzSbnKz7B9BIwe1nNxLJe6BkkHWdO4-D9r2wXjomcZ1csaWJYPietBtknoOgq67x5jihu6HEi
+-0S
+}
+
+AzureEntityColoring(AzureQuickStartCenter)
+!define AzureQuickStartCenter(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureQuickStartCenter, AzureQuickStartCenter)
+!define AzureQuickStartCenter(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureQuickStartCenter, AzureQuickStartCenter)
diff --git a/dist/General/AzureQuickStartCenter.svg b/dist/General/AzureQuickStartCenter.svg
new file mode 100644
index 00000000..f004a92b
--- /dev/null
+++ b/dist/General/AzureQuickStartCenter.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 10.523438 59.609375 C 10.566406 56.175781 15.925781 46.8125 19.226563 42.898438 L 27.234375 50.902344 C 22.835938 54.664063 13.039063 59.585938 10.523438 59.609375 Z M 10.523438 59.609375 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.960938 28.023438 C 37.429688 24.742188 38.851563 20.847656 42.132813 19.316406 C 45.414063 17.785156 49.304688 19.207031 50.835938 22.488281 Z M 38.960938 28.023438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 15.902344 39.703125 C 15.902344 39.703125 7.523438 33.578125 1.09375 35.789063 C 3.148438 29.398438 12.226563 21.875 20.167969 20.101563 C 29.378906 20.738281 30.910156 22.269531 30.910156 22.269531 Z M 15.902344 39.703125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 30.996094 54.773438 L 48.429688 39.769531 C 48.429688 39.769531 49.984375 41.320313 50.597656 50.507813 C 48.824219 58.449219 41.300781 67.527344 34.914063 69.5625 C 37.121094 63.152344 30.996094 54.773438 30.996094 54.773438 Z M 30.996094 54.773438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 69.648438 0.503906 C 69.648438 0.503906 35.832031 6.476563 15.507813 39.179688 L 30.976563 54.644531 C 63.679688 34.300781 69.648438 0.503906 69.648438 0.503906 Z M 69.648438 0.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 69.648438 0.503906 L 23.230469 46.898438 L 30.976563 54.644531 C 63.679688 34.300781 69.648438 0.503906 69.648438 0.503906 Z M 69.648438 0.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 17.609375 41.277344 C 33.492188 16.910156 56.414063 7.4375 65.121094 5.007813 C 62.695313 13.738281 53.242188 36.640625 28.851563 52.523438 Z M 17.609375 41.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 69.648438 0.503906 C 69.648438 0.503906 61.207031 1.992188 50.203125 7.570313 L 62.585938 19.949219 C 68.140625 8.945313 69.648438 0.503906 69.648438 0.503906 Z M 69.648438 0.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 3.390625 66.742188 C 3.390625 66.742188 4.679688 46.898438 15.507813 39.15625 L 30.976563 54.621094 C 23.230469 65.472656 3.390625 66.742188 3.390625 66.742188 Z M 3.390625 66.742188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 6.890625 63.261719 C 6.519531 59.675781 11.460938 46.988281 17.675781 41.320313 L 28.832031 52.476563 C 23.144531 58.710938 10.457031 63.632813 6.890625 63.261719 Z M 6.890625 63.261719 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 53.636719 25.242188 C 53.636719 30.078125 49.71875 33.992188 44.886719 33.992188 C 40.054688 33.992188 36.136719 30.078125 36.136719 25.242188 C 36.136719 20.410156 40.054688 16.492188 44.886719 16.492188 C 49.71875 16.492188 53.636719 20.410156 53.636719 25.242188 Z M 53.636719 25.242188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 51.449219 25.242188 C 51.449219 28.867188 48.511719 31.804688 44.886719 31.804688 C 41.261719 31.804688 38.324219 28.867188 38.324219 25.242188 C 38.324219 21.621094 41.261719 18.679688 44.886719 18.679688 C 48.511719 18.679688 51.449219 21.621094 51.449219 25.242188 Z M 51.449219 25.242188 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 27.875 39.164063 L 30.96875 42.253906 L 18.59375 54.628906 L 15.5 51.535156 Z M 27.875 39.164063 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureRecent(m).png b/dist/General/AzureRecent(m).png
new file mode 100644
index 00000000..2b11cf2c
Binary files /dev/null and b/dist/General/AzureRecent(m).png differ
diff --git a/dist/General/AzureRecent(m).svg b/dist/General/AzureRecent(m).svg
new file mode 100644
index 00000000..900b9502
--- /dev/null
+++ b/dist/General/AzureRecent(m).svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 31.960938 6.121094 C 24.296875 6.914063 17.265625 10.734375 12.429688 16.730469 C 7.570313 22.714844 5.296875 30.386719 6.117188 38.050781 C 6.914063 45.710938 10.734375 52.742188 16.730469 57.578125 C 22.519531 62.261719 30.058594 64.730469 38.039063 63.890625 C 46.027344 63.050781 52.890625 59.058594 57.578125 53.277344 C 62.253906 47.492188 64.726563 39.949219 63.886719 31.960938 C 63.035156 23.910156 58.945313 17.027344 53.070313 12.273438 C 48.128906 8.269531 41.828125 5.957031 35.074219 5.957031 C 34.046875 5.957031 33.007813 6.011719 31.960938 6.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 69.800781 31.339844 C 68.785156 21.628906 63.824219 13.304688 56.820313 7.640625 C 55.460938 6.539063 53.996094 5.578125 52.480469 4.699219 L 49.730469 9.988281 C 50.898438 10.667969 52.015625 11.429688 53.070313 12.273438 C 58.945313 17.027344 63.035156 23.910156 63.882813 31.960938 C 64.726563 39.949219 62.253906 47.492188 57.578125 53.277344 C 52.890625 59.058594 46.027344 63.050781 38.039063 63.890625 C 32.691406 64.449219 27.554688 63.503906 23 61.425781 L 20.253906 66.707031 C 25.820313 69.300781 32.125 70.5 38.664063 69.808594 C 47.902344 68.847656 56.371094 64.246094 62.203125 57.023438 C 68.054688 49.8125 70.789063 40.570313 69.800781 31.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 16.730469 57.578125 C 10.734375 52.742188 6.914063 45.710938 6.117188 38.050781 C 5.296875 30.386719 7.570313 22.710938 12.429688 16.730469 C 17.265625 10.734375 24.296875 6.914063 31.960938 6.121094 C 38.417969 5.441406 44.582031 6.925781 49.730469 9.984375 L 52.480469 4.699219 C 46.089844 0.988281 38.679688 -0.585938 31.332031 0.199219 C 22.101563 1.164063 13.632813 5.761719 7.796875 12.984375 L 7.785156 12.996094 C 1.945313 20.207031 -0.785156 29.441406 0.195313 38.667969 C 1.15625 47.90625 5.757813 56.375 12.984375 62.210938 C 15.199219 64.003906 17.652344 65.496094 20.253906 66.707031 L 23 61.421875 C 20.757813 60.410156 18.648438 59.121094 16.730469 57.578125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 16.730469 57.578125 C 10.734375 52.742188 6.914063 45.710938 6.117188 38.050781 C 5.296875 30.386719 7.570313 22.710938 12.429688 16.730469 C 17.265625 10.734375 24.296875 6.914063 31.960938 6.121094 C 38.417969 5.441406 44.582031 6.925781 49.730469 9.984375 L 52.480469 4.699219 C 46.089844 0.988281 38.679688 -0.585938 31.332031 0.199219 C 22.101563 1.164063 13.632813 5.761719 7.796875 12.984375 L 7.785156 12.996094 C 1.945313 20.207031 -0.785156 29.441406 0.195313 38.667969 C 1.15625 47.90625 5.757813 56.375 12.984375 62.210938 C 15.199219 64.003906 17.652344 65.496094 20.253906 66.707031 L 23 61.421875 C 20.757813 60.410156 18.648438 59.121094 16.730469 57.578125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 49.695313 44.179688 L 36.253906 39.402344 C 35.292969 39.082031 34.578125 38.265625 34.386719 37.269531 C 34.199219 36.273438 34.5625 35.253906 35.335938 34.601563 C 36.113281 33.949219 37.183594 33.765625 38.128906 34.125 L 51.570313 38.90625 C 52.535156 39.226563 53.246094 40.042969 53.4375 41.039063 C 53.628906 42.035156 53.265625 43.054688 52.488281 43.707031 C 51.710938 44.359375 50.644531 44.539063 49.695313 44.179688 Z M 49.695313 44.179688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 34.722656 38.882813 C 33.175781 38.882813 31.921875 37.628906 31.921875 36.082031 L 31.921875 12.257813 C 31.921875 10.710938 33.175781 9.457031 34.722656 9.457031 C 36.269531 9.457031 37.519531 10.710938 37.519531 12.257813 L 37.519531 36.082031 C 37.519531 37.628906 36.269531 38.882813 34.722656 38.882813 Z M 34.722656 38.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 38.8125 36.082031 C 38.8125 38.339844 36.980469 40.171875 34.722656 40.171875 C 32.460938 40.171875 30.632813 38.339844 30.632813 36.082031 C 30.632813 33.824219 32.460938 31.992188 34.722656 31.992188 C 36.980469 31.992188 38.8125 33.824219 38.8125 36.082031 Z M 38.8125 36.082031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 17.800781 16.664063 L 21.324219 20.183594 L 20.1875 21.320313 L 16.667969 17.800781 Z M 34.183594 9.921875 L 35.789063 9.921875 L 35.789063 14.898438 L 34.183594 14.898438 Z M 52.011719 16.824219 L 53.144531 17.957031 L 49.625 21.480469 L 48.492188 20.34375 Z M 54.675781 34.179688 L 59.65625 34.179688 L 59.65625 35.785156 L 54.675781 35.785156 Z M 49.398438 48.257813 L 52.917969 51.777344 L 51.78125 52.914063 L 48.261719 49.394531 Z M 49.398438 48.257813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 49.398438 48.257813 L 52.917969 51.777344 L 51.78125 52.914063 L 48.261719 49.394531 Z M 34.183594 54.59375 L 35.789063 54.59375 L 35.789063 59.574219 L 34.183594 59.574219 Z M 17.800781 16.664063 L 21.324219 20.183594 L 20.1875 21.320313 L 16.667969 17.800781 Z M 20.429688 48.402344 L 21.566406 49.539063 L 18.046875 53.058594 L 16.910156 51.925781 Z M 20.429688 48.402344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 20.429688 48.402344 L 21.566406 49.539063 L 18.046875 53.058594 L 16.910156 51.925781 Z M 10.011719 34.179688 L 14.992188 34.179688 L 14.992188 35.785156 L 10.011719 35.785156 Z M 10.011719 34.179688 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureRecent.png b/dist/General/AzureRecent.png
new file mode 100644
index 00000000..e033d268
Binary files /dev/null and b/dist/General/AzureRecent.png differ
diff --git a/dist/General/AzureRecent.puml b/dist/General/AzureRecent.puml
new file mode 100644
index 00000000..0c3eab79
--- /dev/null
+++ b/dist/General/AzureRecent.puml
@@ -0,0 +1,13 @@
+sprite $AzureRecent [70x70/16z] {
+fPTPcYen24R354Xtw_wNUorJ0r86AzxpvdG--54JoXWWaReXZ6KUadg6OKQ1KaVmvJ9gPDw3YU2oH-e556OA4QRd-m79syqiAuUzWeQPsuCwBETpwzGb2wEk
+1WwYqBEjO2gHuW1hpOg7DD4CygZjWOItRXeOJJYcPekbnYb4JPnEARcbWzRHua4NIMg9cfSF-4foIzJWEPIIM28KUq8VhEad2_PtIDTmwAUFM9lc5jn6eozp
+ejTajTdGuYK5NmBs_NGD9POkyJs1IuLTS6aju8rxCNAUJsRnSDSS3V6anHT3UxPbqkAJgLb3kSMFQMk8fYs-9GHNIcB9MsBwFmlrO7eiygq5R47Td5DB7aot
+uDSMTHOOM_vkjz_4KfsbZC3R_S4Vf4Fo5baeWP_xan-C7rw8bZs1E8BxIZE1ucWB9yi0t2qFb27fA4ltrYMtrb7AqiMHHTTSsawbeON6arualyrZVFhM9R-0
+3WX3eMhUmz72BjuKKjTL-8DHz9OSO3rPk3TKGhmv84jd1Y5SMYqoSIzdEApRYUI2cOUt4n_oMUVeVk3NxukXuuZbKxwGVl9KIYyW5iDD4acpM0hwco7jaePP
+58T6jsn3CK6IQsGxfJliDPPAUWd-TDLunUIGRGgSBfauM6Ooz7pXbKGZRNo2cBxT9IYrH4bS122iHha5r3eqsXZbimLjXPCj6eF5ejRSAZ7MI3Pir4JIctAU
+t94im-1Mvefl_tXjXovizi-AoLU4Nk7tu74unxkhF71FX4ZISYn5ySffaKkKBfywGwP-iVIs7cKeao2_c5HehFW7
+}
+
+AzureEntityColoring(AzureRecent)
+!define AzureRecent(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRecent, AzureRecent)
+!define AzureRecent(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRecent, AzureRecent)
diff --git a/dist/General/AzureRecent.svg b/dist/General/AzureRecent.svg
new file mode 100644
index 00000000..124eb5dc
--- /dev/null
+++ b/dist/General/AzureRecent.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 31.960938 6.121094 C 24.296875 6.914063 17.265625 10.734375 12.429688 16.730469 C 7.570313 22.714844 5.296875 30.386719 6.117188 38.050781 C 6.914063 45.710938 10.734375 52.742188 16.730469 57.578125 C 22.519531 62.261719 30.058594 64.730469 38.039063 63.890625 C 46.027344 63.050781 52.890625 59.058594 57.578125 53.277344 C 62.253906 47.492188 64.726563 39.949219 63.886719 31.960938 C 63.035156 23.910156 58.945313 17.027344 53.070313 12.273438 C 48.128906 8.269531 41.828125 5.957031 35.074219 5.957031 C 34.046875 5.957031 33.007813 6.011719 31.960938 6.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 69.800781 31.339844 C 68.785156 21.628906 63.824219 13.304688 56.820313 7.640625 C 55.460938 6.539063 53.996094 5.578125 52.480469 4.699219 L 49.730469 9.988281 C 50.898438 10.667969 52.015625 11.429688 53.070313 12.273438 C 58.945313 17.027344 63.035156 23.910156 63.882813 31.960938 C 64.726563 39.949219 62.253906 47.492188 57.578125 53.277344 C 52.890625 59.058594 46.027344 63.050781 38.039063 63.890625 C 32.691406 64.449219 27.554688 63.503906 23 61.425781 L 20.253906 66.707031 C 25.820313 69.300781 32.125 70.5 38.664063 69.808594 C 47.902344 68.847656 56.371094 64.246094 62.203125 57.023438 C 68.054688 49.8125 70.789063 40.570313 69.800781 31.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 16.730469 57.578125 C 10.734375 52.742188 6.914063 45.710938 6.117188 38.050781 C 5.296875 30.386719 7.570313 22.710938 12.429688 16.730469 C 17.265625 10.734375 24.296875 6.914063 31.960938 6.121094 C 38.417969 5.441406 44.582031 6.925781 49.730469 9.984375 L 52.480469 4.699219 C 46.089844 0.988281 38.679688 -0.585938 31.332031 0.199219 C 22.101563 1.164063 13.632813 5.761719 7.796875 12.984375 L 7.785156 12.996094 C 1.945313 20.207031 -0.785156 29.441406 0.195313 38.667969 C 1.15625 47.90625 5.757813 56.375 12.984375 62.210938 C 15.199219 64.003906 17.652344 65.496094 20.253906 66.707031 L 23 61.421875 C 20.757813 60.410156 18.648438 59.121094 16.730469 57.578125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 16.730469 57.578125 C 10.734375 52.742188 6.914063 45.710938 6.117188 38.050781 C 5.296875 30.386719 7.570313 22.710938 12.429688 16.730469 C 17.265625 10.734375 24.296875 6.914063 31.960938 6.121094 C 38.417969 5.441406 44.582031 6.925781 49.730469 9.984375 L 52.480469 4.699219 C 46.089844 0.988281 38.679688 -0.585938 31.332031 0.199219 C 22.101563 1.164063 13.632813 5.761719 7.796875 12.984375 L 7.785156 12.996094 C 1.945313 20.207031 -0.785156 29.441406 0.195313 38.667969 C 1.15625 47.90625 5.757813 56.375 12.984375 62.210938 C 15.199219 64.003906 17.652344 65.496094 20.253906 66.707031 L 23 61.421875 C 20.757813 60.410156 18.648438 59.121094 16.730469 57.578125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 49.695313 44.179688 L 36.253906 39.402344 C 35.292969 39.082031 34.578125 38.265625 34.386719 37.269531 C 34.199219 36.273438 34.5625 35.253906 35.335938 34.601563 C 36.113281 33.949219 37.183594 33.765625 38.128906 34.125 L 51.570313 38.90625 C 52.535156 39.226563 53.246094 40.042969 53.4375 41.039063 C 53.628906 42.035156 53.265625 43.054688 52.488281 43.707031 C 51.710938 44.359375 50.644531 44.539063 49.695313 44.179688 Z M 49.695313 44.179688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 34.722656 38.882813 C 33.175781 38.882813 31.921875 37.628906 31.921875 36.082031 L 31.921875 12.257813 C 31.921875 10.710938 33.175781 9.457031 34.722656 9.457031 C 36.269531 9.457031 37.519531 10.710938 37.519531 12.257813 L 37.519531 36.082031 C 37.519531 37.628906 36.269531 38.882813 34.722656 38.882813 Z M 34.722656 38.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 38.8125 36.082031 C 38.8125 38.339844 36.980469 40.171875 34.722656 40.171875 C 32.460938 40.171875 30.632813 38.339844 30.632813 36.082031 C 30.632813 33.824219 32.460938 31.992188 34.722656 31.992188 C 36.980469 31.992188 38.8125 33.824219 38.8125 36.082031 Z M 38.8125 36.082031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 17.800781 16.664063 L 21.324219 20.183594 L 20.1875 21.320313 L 16.667969 17.800781 Z M 34.183594 9.921875 L 35.789063 9.921875 L 35.789063 14.898438 L 34.183594 14.898438 Z M 52.011719 16.824219 L 53.144531 17.957031 L 49.625 21.480469 L 48.492188 20.34375 Z M 54.675781 34.179688 L 59.65625 34.179688 L 59.65625 35.785156 L 54.675781 35.785156 Z M 49.398438 48.257813 L 52.917969 51.777344 L 51.78125 52.914063 L 48.261719 49.394531 Z M 49.398438 48.257813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 49.398438 48.257813 L 52.917969 51.777344 L 51.78125 52.914063 L 48.261719 49.394531 Z M 34.183594 54.59375 L 35.789063 54.59375 L 35.789063 59.574219 L 34.183594 59.574219 Z M 17.800781 16.664063 L 21.324219 20.183594 L 20.1875 21.320313 L 16.667969 17.800781 Z M 20.429688 48.402344 L 21.566406 49.539063 L 18.046875 53.058594 L 16.910156 51.925781 Z M 20.429688 48.402344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 20.429688 48.402344 L 21.566406 49.539063 L 18.046875 53.058594 L 16.910156 51.925781 Z M 10.011719 34.179688 L 14.992188 34.179688 L 14.992188 35.785156 L 10.011719 35.785156 Z M 10.011719 34.179688 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureReservation(m).png b/dist/General/AzureReservation(m).png
new file mode 100644
index 00000000..d597b9e8
Binary files /dev/null and b/dist/General/AzureReservation(m).png differ
diff --git a/dist/General/AzureReservation(m).svg b/dist/General/AzureReservation(m).svg
new file mode 100644
index 00000000..1f84bf36
--- /dev/null
+++ b/dist/General/AzureReservation(m).svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 14.183594 23.730469 L 14.945313 22.414063 L 19.023438 24.773438 L 18.265625 26.085938 Z M 34.359375 11.253906 L 35.878906 11.253906 L 35.878906 15.96875 L 34.359375 15.96875 Z M 43.902344 18.261719 L 46.261719 14.179688 L 47.578125 14.941406 L 45.222656 19.023438 Z M 53.757813 34.222656 L 58.472656 34.222656 L 58.472656 35.742188 L 53.757813 35.742188 Z M 50.8125 44.882813 L 51.574219 43.566406 L 55.652344 45.921875 L 54.894531 47.238281 Z M 50.8125 44.882813 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 50.8125 44.882813 L 51.574219 43.566406 L 55.652344 45.921875 L 54.894531 47.238281 Z M 34.359375 53.546875 L 35.878906 53.546875 L 35.878906 58.257813 L 34.359375 58.257813 Z M 14.183594 23.730469 L 14.945313 22.414063 L 19.023438 24.773438 L 18.265625 26.085938 Z M 22.765625 54.875 L 25.121094 50.792969 L 26.4375 51.554688 L 24.085938 55.636719 Z M 22.765625 54.875 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 22.765625 54.875 L 25.121094 50.792969 L 26.4375 51.554688 L 24.085938 55.636719 Z M 22.765625 54.875 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 22.550781 14.859375 L 23.867188 14.097656 L 26.222656 18.179688 L 24.90625 18.941406 Z M 51.023438 24.984375 L 55.105469 22.625 L 55.867188 23.941406 L 51.785156 26.300781 Z M 43.699219 51.492188 L 45.015625 50.730469 L 47.371094 54.808594 L 46.054688 55.570313 Z M 43.699219 51.492188 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 43.699219 51.492188 L 45.015625 50.730469 L 47.371094 54.808594 L 46.054688 55.570313 Z M 22.550781 14.859375 L 23.867188 14.097656 L 26.222656 18.179688 L 24.90625 18.941406 Z M 14.414063 46.125 L 18.492188 43.769531 L 19.253906 45.085938 L 15.171875 47.441406 Z M 14.414063 46.125 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 14.414063 46.125 L 18.492188 43.769531 L 19.253906 45.085938 L 15.171875 47.441406 Z M 11.476563 34.222656 L 16.191406 34.222656 L 16.191406 35.742188 L 11.476563 35.742188 Z M 11.476563 34.222656 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35 67.101563 C 52.730469 67.101563 67.101563 52.730469 67.101563 35 C 67.101563 17.269531 52.730469 2.898438 35 2.898438 C 34.753906 2.898438 34.511719 2.910156 34.269531 2.917969 L 34.148438 8.546875 L 35.546875 8.578125 C 47.605469 8.832031 57.96875 17.183594 60.746094 28.894531 C 64.113281 43.089844 55.304688 57.378906 41.109375 60.746094 C 39.105469 61.21875 37.058594 61.460938 35 61.460938 C 22.726563 61.496094 12.054688 53.054688 9.253906 41.105469 C 7.226563 32.558594 9.640625 23.652344 15.429688 17.257813 L 21.082031 23.011719 L 24.460938 4.675781 C 11.910156 9.039063 2.898438 20.964844 2.898438 35 C 2.898438 52.730469 17.269531 67.101563 35 67.101563 Z M 35 67.101563 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.457031 35 C 65.457031 51.820313 51.820313 65.457031 35 65.457031 C 18.179688 65.457031 4.542969 51.820313 4.542969 35 C 4.542969 18.179688 18.179688 4.542969 35 4.542969 C 51.820313 4.542969 65.457031 18.179688 65.457031 35 Z M 65.457031 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 62.925781 47.15625 C 56.210938 62.578125 38.265625 69.640625 22.84375 62.925781 L 47.15625 7.074219 C 62.582031 13.785156 69.640625 31.730469 62.925781 47.15625 Z M 62.925781 47.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 35 5.699219 C 51.15625 5.699219 64.300781 18.84375 64.300781 35 C 64.300781 51.15625 51.15625 64.300781 35 64.300781 C 18.84375 64.300781 5.699219 51.15625 5.699219 35 C 5.699219 18.84375 18.84375 5.699219 35 5.699219 M 35 2.898438 C 17.269531 2.898438 2.898438 17.269531 2.898438 35 C 2.898438 52.730469 17.269531 67.101563 35 67.101563 C 52.730469 67.101563 67.101563 52.730469 67.101563 35 C 67.101563 17.269531 52.730469 2.898438 35 2.898438 Z M 35 2.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 14.183594 23.730469 L 14.945313 22.414063 L 19.023438 24.773438 L 18.265625 26.085938 Z M 34.359375 11.253906 L 35.878906 11.253906 L 35.878906 15.96875 L 34.359375 15.96875 Z M 43.902344 18.261719 L 46.261719 14.179688 L 47.578125 14.941406 L 45.222656 19.023438 Z M 53.757813 34.222656 L 58.472656 34.222656 L 58.472656 35.742188 L 53.757813 35.742188 Z M 50.8125 44.882813 L 51.574219 43.566406 L 55.652344 45.921875 L 54.894531 47.238281 Z M 50.8125 44.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 50.8125 44.882813 L 51.574219 43.566406 L 55.652344 45.921875 L 54.894531 47.238281 Z M 34.359375 53.546875 L 35.878906 53.546875 L 35.878906 58.257813 L 34.359375 58.257813 Z M 14.183594 23.730469 L 14.945313 22.414063 L 19.023438 24.773438 L 18.265625 26.085938 Z M 22.765625 54.875 L 25.121094 50.792969 L 26.4375 51.554688 L 24.085938 55.636719 Z M 22.765625 54.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 22.765625 54.875 L 25.121094 50.792969 L 26.4375 51.554688 L 24.085938 55.636719 Z M 11.476563 34.222656 L 16.191406 34.222656 L 16.191406 35.742188 L 11.476563 35.742188 Z M 11.476563 34.222656 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 22.550781 14.859375 L 23.867188 14.097656 L 26.222656 18.179688 L 24.90625 18.941406 Z M 51.023438 24.984375 L 55.105469 22.625 L 55.867188 23.941406 L 51.785156 26.300781 Z M 43.699219 51.492188 L 45.015625 50.730469 L 47.371094 54.808594 L 46.054688 55.570313 Z M 43.699219 51.492188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 43.699219 51.492188 L 45.015625 50.730469 L 47.371094 54.808594 L 46.054688 55.570313 Z M 22.550781 14.859375 L 23.867188 14.097656 L 26.222656 18.179688 L 24.90625 18.941406 Z M 14.414063 46.125 L 18.492188 43.769531 L 19.253906 45.085938 L 15.171875 47.441406 Z M 14.414063 46.125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 14.414063 46.125 L 18.492188 43.769531 L 19.253906 45.085938 L 15.171875 47.441406 Z M 14.414063 46.125 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 50.074219 42.117188 L 37.042969 38.574219 C 35.648438 38.175781 34.839844 36.730469 35.21875 35.332031 C 35.597656 33.9375 37.027344 33.101563 38.429688 33.460938 L 51.464844 37.003906 C 52.855469 37.402344 53.667969 38.847656 53.289063 40.242188 C 52.90625 41.640625 51.476563 42.476563 50.074219 42.117188 Z M 50.074219 42.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 35.132813 38.671875 C 33.820313 38.671875 32.75 37.484375 32.75 36.023438 L 32.75 13.464844 C 32.75 12.003906 33.820313 10.816406 35.132813 10.816406 C 36.449219 10.816406 37.519531 12.003906 37.519531 13.464844 L 37.519531 36.023438 C 37.519531 37.488281 36.453125 38.671875 35.132813 38.671875 Z M 35.132813 38.671875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 39.527344 35 C 39.527344 37.5 37.5 39.527344 35 39.527344 C 32.5 39.527344 30.472656 37.5 30.472656 35 C 30.472656 32.5 32.5 30.472656 35 30.472656 C 37.5 30.472656 39.527344 32.5 39.527344 35 Z M 39.527344 35 "/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 20.191406 20.109375 L 6.457031 6.128906 L 23.300781 3.253906 Z M 20.191406 20.109375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 35.695313 1.539063 L 35.578125 7.179688 C 47.960938 7.441406 59.121094 15.972656 62.105469 28.570313 C 65.652344 43.519531 56.375 58.5625 41.429688 62.109375 C 26.480469 65.652344 11.4375 56.375 7.890625 41.429688 C 5.277344 30.402344 9.652344 19.335938 18.121094 12.859375 L 14.113281 8.855469 C 4.324219 16.683594 -0.640625 29.714844 2.441406 42.722656 C 6.707031 60.703125 24.742188 71.820313 42.722656 67.558594 C 60.703125 63.292969 71.820313 45.257813 67.554688 27.277344 C 63.960938 12.121094 50.582031 1.839844 35.695313 1.539063 Z M 35.695313 1.539063 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureReservation.png b/dist/General/AzureReservation.png
new file mode 100644
index 00000000..3b57ee79
Binary files /dev/null and b/dist/General/AzureReservation.png differ
diff --git a/dist/General/AzureReservation.puml b/dist/General/AzureReservation.puml
new file mode 100644
index 00000000..6194b6e0
--- /dev/null
+++ b/dist/General/AzureReservation.puml
@@ -0,0 +1,15 @@
+sprite $AzureReservation [70x70/16z] {
+lPS7WkmW242bgA1cxt_SFoKi6aVp-zkQzW9ec1Z-6qm4Voo1yaGJ_veAEU7hBt5CYRaO4dzA11Ipb0S83y4JinWPV-9wWymH8r5njXxGCg1FIpnhYkL2NkHr
+FLE8iJj8dB8ED_afJGep66KwOQ-XnJd9euLxZPsoyUZYdEnv1mT4asz0GDbgKZS8lLjLsIGluaOJYnE3em_IO0caPsqc2Ot5DT5W0SWCJ_3KvCMqUqS4qDed
+2rU1DsTn-6Db-HrJ27h8P04e5U6DtHLx2VjSedU-hS5aIJM1WHzAersQ_9AbHXSBG2u8OF2KKnpc6lkHqG88JaYNgGMJTc4PqV6gQ2dkB331Op3w_GG2_wG5
+VRZF-f67eaV5pnRe8IremTZKovuVbgFfdGMbrenM6HkK8JskxPC5Ed8LWXV9xq-NvWLt5cGuGKyfpjrjRt62VgVnhdJOMg1ZddbWPP7ViW1R7h3kwJQPDCC2
+igQ6zizdqjU3Xh30GdZhQ2DvK1UQO8F4NRUPERxUvDqWIM-X_63KqTT9ayHTFF8WFoqoME0rRH_mOE5lYpx8aQmSZpDriEmoGhDKVUCXZHdHjYxbj6Y7yCMI
+pS8B2zINfEW0JoCD-_aIKYb2o4dKIIRnoMP3lW0CYjaiSNm2s9v6tKgCCoH1E4bML7ykznOt-IXr_O3tvPr11CFxWVrxajkD14hBLfPkPAHBARQZqOr5sb6v
+ImZVLtg7IPUFW5LNEThxRpSmK3mOnMrL38u04F8mrMnh0hRW-3vgcxzc2MAL68AHNxFmzTuultf0vJ1d00xgrFRJz9PMZZY5Ke_e6_BXdLSl-_Ye9a52ow5L
+CBA7xz1bZL0RcILNWfDovE53SMe5QTGK3J1Ri4QJUEm3SZamMvnJKd2vw5EwjSXw5MKQInOCpWWTWRLuPJSQPRDC1Cnb8J50oedmtc6Is-LQGWYZ0bZyC8OD
+N1nDZ716YHnbiQBUPMMeYeWMm-fs2slPao0OUy-VEGpAvICQ9ySUpbf696Bu3O1Yol8WfyGO_Za_
+}
+
+AzureEntityColoring(AzureReservation)
+!define AzureReservation(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureReservation, AzureReservation)
+!define AzureReservation(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureReservation, AzureReservation)
diff --git a/dist/General/AzureReservation.svg b/dist/General/AzureReservation.svg
new file mode 100644
index 00000000..3b612148
--- /dev/null
+++ b/dist/General/AzureReservation.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 14.183594 23.730469 L 14.945313 22.414063 L 19.023438 24.773438 L 18.265625 26.085938 Z M 34.359375 11.253906 L 35.878906 11.253906 L 35.878906 15.96875 L 34.359375 15.96875 Z M 43.902344 18.261719 L 46.261719 14.179688 L 47.578125 14.941406 L 45.222656 19.023438 Z M 53.757813 34.222656 L 58.472656 34.222656 L 58.472656 35.742188 L 53.757813 35.742188 Z M 50.8125 44.882813 L 51.574219 43.566406 L 55.652344 45.921875 L 54.894531 47.238281 Z M 50.8125 44.882813 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 50.8125 44.882813 L 51.574219 43.566406 L 55.652344 45.921875 L 54.894531 47.238281 Z M 34.359375 53.546875 L 35.878906 53.546875 L 35.878906 58.257813 L 34.359375 58.257813 Z M 14.183594 23.730469 L 14.945313 22.414063 L 19.023438 24.773438 L 18.265625 26.085938 Z M 22.765625 54.875 L 25.121094 50.792969 L 26.4375 51.554688 L 24.085938 55.636719 Z M 22.765625 54.875 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 22.765625 54.875 L 25.121094 50.792969 L 26.4375 51.554688 L 24.085938 55.636719 Z M 22.765625 54.875 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 22.550781 14.859375 L 23.867188 14.097656 L 26.222656 18.179688 L 24.90625 18.941406 Z M 51.023438 24.984375 L 55.105469 22.625 L 55.867188 23.941406 L 51.785156 26.300781 Z M 43.699219 51.492188 L 45.015625 50.730469 L 47.371094 54.808594 L 46.054688 55.570313 Z M 43.699219 51.492188 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 43.699219 51.492188 L 45.015625 50.730469 L 47.371094 54.808594 L 46.054688 55.570313 Z M 22.550781 14.859375 L 23.867188 14.097656 L 26.222656 18.179688 L 24.90625 18.941406 Z M 14.414063 46.125 L 18.492188 43.769531 L 19.253906 45.085938 L 15.171875 47.441406 Z M 14.414063 46.125 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 14.414063 46.125 L 18.492188 43.769531 L 19.253906 45.085938 L 15.171875 47.441406 Z M 11.476563 34.222656 L 16.191406 34.222656 L 16.191406 35.742188 L 11.476563 35.742188 Z M 11.476563 34.222656 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35 67.101563 C 52.730469 67.101563 67.101563 52.730469 67.101563 35 C 67.101563 17.269531 52.730469 2.898438 35 2.898438 C 34.753906 2.898438 34.511719 2.910156 34.269531 2.917969 L 34.148438 8.546875 L 35.546875 8.578125 C 47.605469 8.832031 57.96875 17.183594 60.746094 28.894531 C 64.113281 43.089844 55.304688 57.378906 41.109375 60.746094 C 39.105469 61.21875 37.058594 61.460938 35 61.460938 C 22.726563 61.496094 12.054688 53.054688 9.253906 41.105469 C 7.226563 32.558594 9.640625 23.652344 15.429688 17.257813 L 21.082031 23.011719 L 24.460938 4.675781 C 11.910156 9.039063 2.898438 20.964844 2.898438 35 C 2.898438 52.730469 17.269531 67.101563 35 67.101563 Z M 35 67.101563 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.457031 35 C 65.457031 51.820313 51.820313 65.457031 35 65.457031 C 18.179688 65.457031 4.542969 51.820313 4.542969 35 C 4.542969 18.179688 18.179688 4.542969 35 4.542969 C 51.820313 4.542969 65.457031 18.179688 65.457031 35 Z M 65.457031 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 62.925781 47.15625 C 56.210938 62.578125 38.265625 69.640625 22.84375 62.925781 L 47.15625 7.074219 C 62.582031 13.785156 69.640625 31.730469 62.925781 47.15625 Z M 62.925781 47.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 35 5.699219 C 51.15625 5.699219 64.300781 18.84375 64.300781 35 C 64.300781 51.15625 51.15625 64.300781 35 64.300781 C 18.84375 64.300781 5.699219 51.15625 5.699219 35 C 5.699219 18.84375 18.84375 5.699219 35 5.699219 M 35 2.898438 C 17.269531 2.898438 2.898438 17.269531 2.898438 35 C 2.898438 52.730469 17.269531 67.101563 35 67.101563 C 52.730469 67.101563 67.101563 52.730469 67.101563 35 C 67.101563 17.269531 52.730469 2.898438 35 2.898438 Z M 35 2.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 14.183594 23.730469 L 14.945313 22.414063 L 19.023438 24.773438 L 18.265625 26.085938 Z M 34.359375 11.253906 L 35.878906 11.253906 L 35.878906 15.96875 L 34.359375 15.96875 Z M 43.902344 18.261719 L 46.261719 14.179688 L 47.578125 14.941406 L 45.222656 19.023438 Z M 53.757813 34.222656 L 58.472656 34.222656 L 58.472656 35.742188 L 53.757813 35.742188 Z M 50.8125 44.882813 L 51.574219 43.566406 L 55.652344 45.921875 L 54.894531 47.238281 Z M 50.8125 44.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 50.8125 44.882813 L 51.574219 43.566406 L 55.652344 45.921875 L 54.894531 47.238281 Z M 34.359375 53.546875 L 35.878906 53.546875 L 35.878906 58.257813 L 34.359375 58.257813 Z M 14.183594 23.730469 L 14.945313 22.414063 L 19.023438 24.773438 L 18.265625 26.085938 Z M 22.765625 54.875 L 25.121094 50.792969 L 26.4375 51.554688 L 24.085938 55.636719 Z M 22.765625 54.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 22.765625 54.875 L 25.121094 50.792969 L 26.4375 51.554688 L 24.085938 55.636719 Z M 11.476563 34.222656 L 16.191406 34.222656 L 16.191406 35.742188 L 11.476563 35.742188 Z M 11.476563 34.222656 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 22.550781 14.859375 L 23.867188 14.097656 L 26.222656 18.179688 L 24.90625 18.941406 Z M 51.023438 24.984375 L 55.105469 22.625 L 55.867188 23.941406 L 51.785156 26.300781 Z M 43.699219 51.492188 L 45.015625 50.730469 L 47.371094 54.808594 L 46.054688 55.570313 Z M 43.699219 51.492188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 43.699219 51.492188 L 45.015625 50.730469 L 47.371094 54.808594 L 46.054688 55.570313 Z M 22.550781 14.859375 L 23.867188 14.097656 L 26.222656 18.179688 L 24.90625 18.941406 Z M 14.414063 46.125 L 18.492188 43.769531 L 19.253906 45.085938 L 15.171875 47.441406 Z M 14.414063 46.125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 14.414063 46.125 L 18.492188 43.769531 L 19.253906 45.085938 L 15.171875 47.441406 Z M 14.414063 46.125 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 50.074219 42.117188 L 37.042969 38.574219 C 35.648438 38.175781 34.839844 36.730469 35.21875 35.332031 C 35.597656 33.9375 37.027344 33.101563 38.429688 33.460938 L 51.464844 37.003906 C 52.855469 37.402344 53.667969 38.847656 53.289063 40.242188 C 52.90625 41.640625 51.476563 42.476563 50.074219 42.117188 Z M 50.074219 42.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 35.132813 38.671875 C 33.820313 38.671875 32.75 37.484375 32.75 36.023438 L 32.75 13.464844 C 32.75 12.003906 33.820313 10.816406 35.132813 10.816406 C 36.449219 10.816406 37.519531 12.003906 37.519531 13.464844 L 37.519531 36.023438 C 37.519531 37.488281 36.453125 38.671875 35.132813 38.671875 Z M 35.132813 38.671875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 39.527344 35 C 39.527344 37.5 37.5 39.527344 35 39.527344 C 32.5 39.527344 30.472656 37.5 30.472656 35 C 30.472656 32.5 32.5 30.472656 35 30.472656 C 37.5 30.472656 39.527344 32.5 39.527344 35 Z M 39.527344 35 "/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 20.191406 20.109375 L 6.457031 6.128906 L 23.300781 3.253906 Z M 20.191406 20.109375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 35.695313 1.539063 L 35.578125 7.179688 C 47.960938 7.441406 59.121094 15.972656 62.105469 28.570313 C 65.652344 43.519531 56.375 58.5625 41.429688 62.109375 C 26.480469 65.652344 11.4375 56.375 7.890625 41.429688 C 5.277344 30.402344 9.652344 19.335938 18.121094 12.859375 L 14.113281 8.855469 C 4.324219 16.683594 -0.640625 29.714844 2.441406 42.722656 C 6.707031 60.703125 24.742188 71.820313 42.722656 67.558594 C 60.703125 63.292969 71.820313 45.257813 67.554688 27.277344 C 63.960938 12.121094 50.582031 1.839844 35.695313 1.539063 Z M 35.695313 1.539063 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureResource(m).png b/dist/General/AzureResource(m).png
new file mode 100644
index 00000000..d2f4b0f6
Binary files /dev/null and b/dist/General/AzureResource(m).png differ
diff --git a/dist/General/AzureResource(m).svg b/dist/General/AzureResource(m).svg
new file mode 100644
index 00000000..457b77be
--- /dev/null
+++ b/dist/General/AzureResource(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.515625 70 C 39.378906 70 39.238281 69.964844 39.101563 69.890625 C 38.851563 69.746094 38.699219 69.488281 38.699219 69.1875 L 38.699219 38.46875 C 38.699219 38.179688 38.851563 37.914063 39.101563 37.761719 L 65.976563 22.359375 C 66.234375 22.21875 66.539063 22.21875 66.796875 22.359375 C 67.042969 22.503906 67.199219 22.773438 67.199219 23.0625 L 67.199219 53.78125 C 67.199219 54.078125 67.042969 54.339844 66.796875 54.484375 L 39.914063 69.890625 C 39.800781 69.964844 39.65625 70 39.515625 70 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 35.785156 32.433594 C 35.640625 32.433594 35.507813 32.390625 35.382813 32.316406 L 8.414063 16.863281 C 8.160156 16.71875 8.007813 16.445313 8.007813 16.15625 C 8.007813 15.871094 8.15625 15.601563 8.414063 15.460938 L 35.207031 0.105469 C 35.464844 -0.0351563 35.777344 -0.0351563 36.019531 0.105469 L 62.992188 15.566406 C 63.234375 15.710938 63.398438 15.976563 63.398438 16.261719 C 63.398438 16.558594 63.234375 16.824219 62.992188 16.96875 L 36.195313 32.316406 C 36.066406 32.390625 35.929688 32.433594 35.785156 32.433594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 31.910156 70 C 31.761719 70 31.617188 69.964844 31.496094 69.890625 L 4.613281 54.484375 C 4.355469 54.339844 4.199219 54.078125 4.199219 53.78125 L 4.199219 22.863281 C 4.199219 22.574219 4.355469 22.308594 4.613281 22.15625 C 4.859375 22.015625 5.175781 22.015625 5.433594 22.15625 L 32.3125 37.5625 C 32.5625 37.714844 32.710938 37.980469 32.710938 38.269531 L 32.710938 69.1875 C 32.710938 69.484375 32.5625 69.746094 32.3125 69.890625 C 32.179688 69.964844 32.042969 70 31.910156 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 39.515625 70 C 39.378906 70 39.238281 69.964844 39.101563 69.890625 C 38.851563 69.746094 38.699219 69.488281 38.699219 69.1875 L 38.699219 38.46875 C 38.699219 38.179688 38.851563 37.914063 39.101563 37.761719 L 65.976563 22.359375 C 66.234375 22.21875 66.539063 22.21875 66.796875 22.359375 C 67.042969 22.503906 67.199219 22.773438 67.199219 23.0625 L 67.199219 53.78125 C 67.199219 54.078125 67.042969 54.339844 66.796875 54.484375 L 39.914063 69.890625 C 39.800781 69.964844 39.65625 70 39.515625 70 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureResource.png b/dist/General/AzureResource.png
new file mode 100644
index 00000000..813a441f
Binary files /dev/null and b/dist/General/AzureResource.png differ
diff --git a/dist/General/AzureResource.puml b/dist/General/AzureResource.puml
new file mode 100644
index 00000000..89d91cb5
--- /dev/null
+++ b/dist/General/AzureResource.puml
@@ -0,0 +1,10 @@
+sprite $AzureResource [70x70/16z] {
+xT97ciGm24HXe0JI_IyyELK7ZD5oNAkElpy_MGw76IgRqrXlypt4rzT6tnZhTzDwXir52-q6uNax26zqW_2cTOFmGhj1UDu8qiY3LTkqHf0qJnwabMUiqqCt
+26ygAtErvjqRoazS_QmHMZZezYE3kWD9DjhF2eQcUV8W-7hZ4U0yzI06u4TX1zNJLO2LSAlaSJP8-HpbYSCWXeVAVPuyo3E57QH1CYLSAKyIv4wXqJKZ2P8e
+ztdkWzGKTW2-cRB2UKYiAPo7PoWfF2H6hl2CWdGKpWDiAE64T9NufygbNCgbO4yn-PpwXgBoC-ig9ZJK5JPuEauh352Uci91UAWh9icGARd1UGgA74_zG54f
+3PbYKXw2bOP1ULYHipE_KrGQ0oicpOtmBoKtNW4
+}
+
+AzureEntityColoring(AzureResource)
+!define AzureResource(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureResource, AzureResource)
+!define AzureResource(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureResource, AzureResource)
diff --git a/dist/General/AzureResource.svg b/dist/General/AzureResource.svg
new file mode 100644
index 00000000..ca80934f
--- /dev/null
+++ b/dist/General/AzureResource.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.515625 70 C 39.378906 70 39.238281 69.964844 39.101563 69.890625 C 38.851563 69.746094 38.699219 69.488281 38.699219 69.1875 L 38.699219 38.46875 C 38.699219 38.179688 38.851563 37.914063 39.101563 37.761719 L 65.976563 22.359375 C 66.234375 22.21875 66.539063 22.21875 66.796875 22.359375 C 67.042969 22.503906 67.199219 22.773438 67.199219 23.0625 L 67.199219 53.78125 C 67.199219 54.078125 67.042969 54.339844 66.796875 54.484375 L 39.914063 69.890625 C 39.800781 69.964844 39.65625 70 39.515625 70 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 35.785156 32.433594 C 35.640625 32.433594 35.507813 32.390625 35.382813 32.316406 L 8.414063 16.863281 C 8.160156 16.71875 8.007813 16.445313 8.007813 16.15625 C 8.007813 15.871094 8.15625 15.601563 8.414063 15.460938 L 35.207031 0.105469 C 35.464844 -0.0351563 35.777344 -0.0351563 36.019531 0.105469 L 62.992188 15.566406 C 63.234375 15.710938 63.398438 15.976563 63.398438 16.261719 C 63.398438 16.558594 63.234375 16.824219 62.992188 16.96875 L 36.195313 32.316406 C 36.066406 32.390625 35.929688 32.433594 35.785156 32.433594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 31.910156 70 C 31.761719 70 31.617188 69.964844 31.496094 69.890625 L 4.613281 54.484375 C 4.355469 54.339844 4.199219 54.078125 4.199219 53.78125 L 4.199219 22.863281 C 4.199219 22.574219 4.355469 22.308594 4.613281 22.15625 C 4.859375 22.015625 5.175781 22.015625 5.433594 22.15625 L 32.3125 37.5625 C 32.5625 37.714844 32.710938 37.980469 32.710938 38.269531 L 32.710938 69.1875 C 32.710938 69.484375 32.5625 69.746094 32.3125 69.890625 C 32.179688 69.964844 32.042969 70 31.910156 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 39.515625 70 C 39.378906 70 39.238281 69.964844 39.101563 69.890625 C 38.851563 69.746094 38.699219 69.488281 38.699219 69.1875 L 38.699219 38.46875 C 38.699219 38.179688 38.851563 37.914063 39.101563 37.761719 L 65.976563 22.359375 C 66.234375 22.21875 66.539063 22.21875 66.796875 22.359375 C 67.042969 22.503906 67.199219 22.773438 67.199219 23.0625 L 67.199219 53.78125 C 67.199219 54.078125 67.042969 54.339844 66.796875 54.484375 L 39.914063 69.890625 C 39.800781 69.964844 39.65625 70 39.515625 70 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureResourceGroup(m).png b/dist/General/AzureResourceGroup(m).png
new file mode 100644
index 00000000..d456b0c8
Binary files /dev/null and b/dist/General/AzureResourceGroup(m).png differ
diff --git a/dist/General/AzureResourceGroup(m).svg b/dist/General/AzureResourceGroup(m).svg
new file mode 100644
index 00000000..e9f5f0c0
--- /dev/null
+++ b/dist/General/AzureResourceGroup(m).svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.914063 60.597656 C 37.808594 60.597656 37.699219 60.570313 37.597656 60.515625 C 37.40625 60.402344 37.289063 60.203125 37.289063 59.972656 L 37.289063 36.347656 C 37.289063 36.125 37.40625 35.917969 37.597656 35.804688 L 58.121094 23.960938 C 58.320313 23.851563 58.550781 23.851563 58.75 23.960938 C 58.9375 24.070313 59.054688 24.277344 59.054688 24.5 L 59.054688 48.125 C 59.054688 48.351563 58.9375 48.554688 58.75 48.667969 L 38.21875 60.515625 C 38.132813 60.574219 38.019531 60.597656 37.914063 60.597656 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 35.066406 31.707031 C 34.957031 31.707031 34.855469 31.671875 34.757813 31.617188 L 14.164063 19.730469 C 13.964844 19.617188 13.851563 19.410156 13.851563 19.1875 C 13.851563 18.96875 13.964844 18.761719 14.164063 18.652344 L 34.625 6.84375 C 34.820313 6.734375 35.058594 6.734375 35.242188 6.84375 L 55.84375 18.734375 C 56.03125 18.84375 56.152344 19.046875 56.152344 19.269531 C 56.152344 19.496094 56.03125 19.699219 55.84375 19.8125 L 35.375 31.617188 C 35.28125 31.671875 35.175781 31.707031 35.066406 31.707031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 32.105469 60.597656 C 31.992188 60.597656 31.882813 60.570313 31.789063 60.515625 L 11.257813 48.664063 C 11.058594 48.554688 10.941406 48.351563 10.941406 48.125 L 10.941406 24.347656 C 10.941406 24.125 11.058594 23.917969 11.257813 23.800781 C 11.445313 23.695313 11.6875 23.695313 11.886719 23.800781 L 32.414063 35.652344 C 32.601563 35.765625 32.71875 35.96875 32.71875 36.191406 L 32.71875 59.972656 C 32.71875 60.203125 32.601563 60.402344 32.414063 60.515625 C 32.3125 60.574219 32.207031 60.597656 32.105469 60.597656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 37.914063 60.597656 C 37.808594 60.597656 37.699219 60.570313 37.597656 60.515625 C 37.40625 60.402344 37.289063 60.203125 37.289063 59.972656 L 37.289063 36.347656 C 37.289063 36.125 37.40625 35.917969 37.597656 35.804688 L 58.121094 23.960938 C 58.320313 23.851563 58.550781 23.851563 58.75 23.960938 C 58.9375 24.070313 59.054688 24.277344 59.054688 24.5 L 59.054688 48.125 C 59.054688 48.351563 58.9375 48.554688 58.75 48.667969 L 38.21875 60.515625 C 38.132813 60.574219 38.019531 60.597656 37.914063 60.597656 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 13.382813 63.238281 C 13.035156 63.238281 12.683594 63.152344 12.363281 62.964844 L 2.78125 57.433594 C 1.167969 56.5 0 54.476563 0 52.613281 L 0 17.386719 C 0 15.523438 1.167969 13.496094 2.78125 12.566406 L 12.363281 7.035156 C 13.339844 6.472656 14.585938 6.808594 15.148438 7.78125 C 15.710938 8.753906 15.375 10 14.402344 10.5625 L 4.820313 16.09375 C 4.480469 16.292969 4.074219 16.992188 4.074219 17.386719 L 4.074219 52.613281 C 4.074219 53.007813 4.480469 53.710938 4.820313 53.90625 L 14.402344 59.4375 C 15.375 60 15.710938 61.246094 15.148438 62.21875 C 14.769531 62.875 14.085938 63.238281 13.382813 63.238281 Z M 13.382813 63.238281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 56.617188 6.761719 C 56.964844 6.761719 57.316406 6.847656 57.636719 7.035156 L 67.21875 12.566406 C 68.832031 13.5 70 15.523438 70 17.386719 L 70 52.613281 C 70 54.476563 68.832031 56.503906 67.21875 57.433594 L 57.636719 62.964844 C 56.660156 63.527344 55.414063 63.191406 54.851563 62.21875 C 54.289063 61.246094 54.625 60 55.597656 59.4375 L 65.179688 53.90625 C 65.519531 53.707031 65.925781 53.007813 65.925781 52.613281 L 65.925781 17.386719 C 65.925781 16.992188 65.519531 16.289063 65.179688 16.09375 L 55.597656 10.5625 C 54.625 10 54.289063 8.753906 54.851563 7.78125 C 55.230469 7.125 55.914063 6.761719 56.617188 6.761719 Z M 56.617188 6.761719 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureResourceGroup.png b/dist/General/AzureResourceGroup.png
new file mode 100644
index 00000000..c57fa227
Binary files /dev/null and b/dist/General/AzureResourceGroup.png differ
diff --git a/dist/General/AzureResourceGroup.puml b/dist/General/AzureResourceGroup.puml
new file mode 100644
index 00000000..b3409a9b
--- /dev/null
+++ b/dist/General/AzureResourceGroup.puml
@@ -0,0 +1,11 @@
+sprite $AzureResourceGroup [70x70/16z] {
+xPS7hjmm34JPHTt_m2c20Nd7ZCtWewJueMvxyWotaVukNfY-ZkOST4566bsmEPqAPCmVA5vTv0-64Z1_SBLpp5bOF0y2mkRyoH0wOpaN3X5F-8T7ZXS4mrse
+bf6VsDt1FEOY5Gj1XbObfEuBkPnK4Wm3MJXnGZue1C7crglD6uNSrUChoC39iES3Gt1Q2xufvBcUE2odd2Dxs9rbP1SjB1YeLmrQDXpzF6Xf3HhVCcW1j3UV
+sXBEKC_THqbKQak4FTIp7rVzjIL2ePuwZEYz9LmW5avtEPuiSQh7SwEdC8-MXK8zK4Z30XuTK4ZJWh4ie92-vJnr2DEnOAoDQjU2246OjWNg0KVJWe3a2nPj
+MbxBQtajPBzbOQejnDwsoDtlj3GjJx_ssh0mWIMlV_xjmIBNbM2PGCEEbjgn_xaBR01O3rhe4ryl3t9OBWwqj31L6qNIMhkgdObjMo0Ch063SRd0UhO57Hnu
+kcuhrBCjMCWHngk4e27pPSD2A7QRHTj6FOh9xh9IgCVOXI1YGbtCwA_YvJi
+}
+
+AzureEntityColoring(AzureResourceGroup)
+!define AzureResourceGroup(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureResourceGroup, AzureResourceGroup)
+!define AzureResourceGroup(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureResourceGroup, AzureResourceGroup)
diff --git a/dist/General/AzureResourceGroup.svg b/dist/General/AzureResourceGroup.svg
new file mode 100644
index 00000000..fe508005
--- /dev/null
+++ b/dist/General/AzureResourceGroup.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.914063 60.597656 C 37.808594 60.597656 37.699219 60.570313 37.597656 60.515625 C 37.40625 60.402344 37.289063 60.203125 37.289063 59.972656 L 37.289063 36.347656 C 37.289063 36.125 37.40625 35.917969 37.597656 35.804688 L 58.121094 23.960938 C 58.320313 23.851563 58.550781 23.851563 58.75 23.960938 C 58.9375 24.070313 59.054688 24.277344 59.054688 24.5 L 59.054688 48.125 C 59.054688 48.351563 58.9375 48.554688 58.75 48.667969 L 38.21875 60.515625 C 38.132813 60.574219 38.019531 60.597656 37.914063 60.597656 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 35.066406 31.707031 C 34.957031 31.707031 34.855469 31.671875 34.757813 31.617188 L 14.164063 19.730469 C 13.964844 19.617188 13.851563 19.410156 13.851563 19.1875 C 13.851563 18.96875 13.964844 18.761719 14.164063 18.652344 L 34.625 6.84375 C 34.820313 6.734375 35.058594 6.734375 35.242188 6.84375 L 55.84375 18.734375 C 56.03125 18.84375 56.152344 19.046875 56.152344 19.269531 C 56.152344 19.496094 56.03125 19.699219 55.84375 19.8125 L 35.375 31.617188 C 35.28125 31.671875 35.175781 31.707031 35.066406 31.707031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 32.105469 60.597656 C 31.992188 60.597656 31.882813 60.570313 31.789063 60.515625 L 11.257813 48.664063 C 11.058594 48.554688 10.941406 48.351563 10.941406 48.125 L 10.941406 24.347656 C 10.941406 24.125 11.058594 23.917969 11.257813 23.800781 C 11.445313 23.695313 11.6875 23.695313 11.886719 23.800781 L 32.414063 35.652344 C 32.601563 35.765625 32.71875 35.96875 32.71875 36.191406 L 32.71875 59.972656 C 32.71875 60.203125 32.601563 60.402344 32.414063 60.515625 C 32.3125 60.574219 32.207031 60.597656 32.105469 60.597656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 37.914063 60.597656 C 37.808594 60.597656 37.699219 60.570313 37.597656 60.515625 C 37.40625 60.402344 37.289063 60.203125 37.289063 59.972656 L 37.289063 36.347656 C 37.289063 36.125 37.40625 35.917969 37.597656 35.804688 L 58.121094 23.960938 C 58.320313 23.851563 58.550781 23.851563 58.75 23.960938 C 58.9375 24.070313 59.054688 24.277344 59.054688 24.5 L 59.054688 48.125 C 59.054688 48.351563 58.9375 48.554688 58.75 48.667969 L 38.21875 60.515625 C 38.132813 60.574219 38.019531 60.597656 37.914063 60.597656 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 13.382813 63.238281 C 13.035156 63.238281 12.683594 63.152344 12.363281 62.964844 L 2.78125 57.433594 C 1.167969 56.5 0 54.476563 0 52.613281 L 0 17.386719 C 0 15.523438 1.167969 13.496094 2.78125 12.566406 L 12.363281 7.035156 C 13.339844 6.472656 14.585938 6.808594 15.148438 7.78125 C 15.710938 8.753906 15.375 10 14.402344 10.5625 L 4.820313 16.09375 C 4.480469 16.292969 4.074219 16.992188 4.074219 17.386719 L 4.074219 52.613281 C 4.074219 53.007813 4.480469 53.710938 4.820313 53.90625 L 14.402344 59.4375 C 15.375 60 15.710938 61.246094 15.148438 62.21875 C 14.769531 62.875 14.085938 63.238281 13.382813 63.238281 Z M 13.382813 63.238281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 56.617188 6.761719 C 56.964844 6.761719 57.316406 6.847656 57.636719 7.035156 L 67.21875 12.566406 C 68.832031 13.5 70 15.523438 70 17.386719 L 70 52.613281 C 70 54.476563 68.832031 56.503906 67.21875 57.433594 L 57.636719 62.964844 C 56.660156 63.527344 55.414063 63.191406 54.851563 62.21875 C 54.289063 61.246094 54.625 60 55.597656 59.4375 L 65.179688 53.90625 C 65.519531 53.707031 65.925781 53.007813 65.925781 52.613281 L 65.925781 17.386719 C 65.925781 16.992188 65.519531 16.289063 65.179688 16.09375 L 55.597656 10.5625 C 54.625 10 54.289063 8.753906 54.851563 7.78125 C 55.230469 7.125 55.914063 6.761719 56.617188 6.761719 Z M 56.617188 6.761719 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureServiceHealth(m).png b/dist/General/AzureServiceHealth(m).png
new file mode 100644
index 00000000..c0c43661
Binary files /dev/null and b/dist/General/AzureServiceHealth(m).png differ
diff --git a/dist/General/AzureServiceHealth(m).svg b/dist/General/AzureServiceHealth(m).svg
new file mode 100644
index 00000000..207bcc55
--- /dev/null
+++ b/dist/General/AzureServiceHealth(m).svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35 11.632813 C 33.746094 10.355469 32.542969 9.183594 31.394531 8.109375 C 30.242188 7.039063 29.035156 6.125 27.769531 5.359375 C 26.507813 4.597656 25.132813 4 23.652344 3.566406 C 22.171875 3.132813 20.484375 2.917969 18.59375 2.917969 C 16.019531 2.917969 13.601563 3.40625 11.347656 4.386719 C 9.089844 5.367188 7.121094 6.695313 5.433594 8.367188 C 3.746094 10.042969 2.421875 12.015625 1.453125 14.28125 C 0.484375 16.550781 0 18.957031 0 21.511719 C 0 23.996094 0.472656 26.375 1.417969 28.652344 C 2.363281 30.929688 3.703125 32.9375 5.433594 34.667969 L 35 64.203125 Z M 35 11.632813 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 51.40625 2.917969 C 49.515625 2.917969 47.828125 3.132813 46.347656 3.566406 C 44.867188 4 43.492188 4.597656 42.230469 5.359375 C 40.964844 6.125 39.757813 7.039063 38.609375 8.109375 C 37.457031 9.183594 36.253906 10.355469 35 11.632813 C 33.746094 10.355469 32.542969 9.183594 31.394531 8.109375 C 30.242188 7.039063 29.035156 6.125 27.769531 5.359375 C 26.507813 4.597656 25.132813 4 23.652344 3.566406 C 22.171875 3.132813 20.484375 2.917969 18.59375 2.917969 C 16.019531 2.917969 13.601563 3.40625 11.347656 4.386719 C 9.089844 5.367188 7.121094 6.695313 5.433594 8.367188 C 3.746094 10.042969 2.421875 12.015625 1.453125 14.28125 C 0.484375 16.550781 0 18.957031 0 21.511719 C 0 23.996094 0.472656 26.375 1.417969 28.652344 C 2.363281 30.929688 3.703125 32.9375 5.433594 34.667969 L 35 64.203125 L 64.566406 34.671875 C 66.296875 32.9375 67.636719 30.933594 68.582031 28.65625 C 69.527344 26.378906 70 23.996094 70 21.511719 C 70 18.957031 69.515625 16.550781 68.546875 14.28125 C 67.578125 12.015625 66.253906 10.042969 64.566406 8.367188 C 62.878906 6.695313 60.910156 5.367188 58.652344 4.386719 C 56.398438 3.40625 53.980469 2.917969 51.40625 2.917969 Z M 51.40625 2.917969 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.464844 48.640625 L 28.796875 28.800781 L 24.234375 37.917969 L 8.75 37.917969 L 5.832031 35 L 22.433594 35 L 29.535156 20.785156 L 35.535156 41.777344 L 40.050781 35 L 49.582031 35 L 49.582031 37.917969 L 41.613281 37.917969 Z M 34.464844 48.640625 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureServiceHealth.png b/dist/General/AzureServiceHealth.png
new file mode 100644
index 00000000..0271311d
Binary files /dev/null and b/dist/General/AzureServiceHealth.png differ
diff --git a/dist/General/AzureServiceHealth.puml b/dist/General/AzureServiceHealth.puml
new file mode 100644
index 00000000..2b339028
--- /dev/null
+++ b/dist/General/AzureServiceHealth.puml
@@ -0,0 +1,10 @@
+sprite $AzureServiceHealth [70x70/16z] {
+xTP9pfnG34NXuuxzxpWTAgj2u6BfaVu_uwTF5u_WtyuZwskPRfpbMTlNAiCupQBUI-UGvVPUEJ_MHfV6UsrqPSUfTLRGsNPMgY5Tl_Bjl1eWpSHscKQQQKIl
+iLAbHlesfSlSTDxVezhk0gXb9I3MbGtg0SNj2ILZHUdo3rBgvol-X9Ba0ueJwzTDiA4IQWeC5LTJ84PA8QVW8oL8DGL62jZr50Doe2IGbrFI8GQA0NOvfGBi
+NWa0ucfA5N2h57jvCQNA8EuKevdpAHNWDuhJsI70Njgks2k_HC0ujky3yl3uY2Z6-Zvn-3KG2EJtrLxiVow0rvv48EiiO7-j3ujc3BA0r0YQ2N301J9W4W04
+Cc80I86C60TS83Cc085C6KY1J1bpWOoPKCYSKSYSKSYSKSYSKSYSKSYSKSYSKSYSMKAQMKAQQMI9QMI9QMI9QMI9MKU0R6GfuxVsqMS
+}
+
+AzureEntityColoring(AzureServiceHealth)
+!define AzureServiceHealth(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceHealth, AzureServiceHealth)
+!define AzureServiceHealth(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceHealth, AzureServiceHealth)
diff --git a/dist/General/AzureServiceHealth.svg b/dist/General/AzureServiceHealth.svg
new file mode 100644
index 00000000..24d11e16
--- /dev/null
+++ b/dist/General/AzureServiceHealth.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35 11.632813 C 33.746094 10.355469 32.542969 9.183594 31.394531 8.109375 C 30.242188 7.039063 29.035156 6.125 27.769531 5.359375 C 26.507813 4.597656 25.132813 4 23.652344 3.566406 C 22.171875 3.132813 20.484375 2.917969 18.59375 2.917969 C 16.019531 2.917969 13.601563 3.40625 11.347656 4.386719 C 9.089844 5.367188 7.121094 6.695313 5.433594 8.367188 C 3.746094 10.042969 2.421875 12.015625 1.453125 14.28125 C 0.484375 16.550781 0 18.957031 0 21.511719 C 0 23.996094 0.472656 26.375 1.417969 28.652344 C 2.363281 30.929688 3.703125 32.9375 5.433594 34.667969 L 35 64.203125 Z M 35 11.632813 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 51.40625 2.917969 C 49.515625 2.917969 47.828125 3.132813 46.347656 3.566406 C 44.867188 4 43.492188 4.597656 42.230469 5.359375 C 40.964844 6.125 39.757813 7.039063 38.609375 8.109375 C 37.457031 9.183594 36.253906 10.355469 35 11.632813 C 33.746094 10.355469 32.542969 9.183594 31.394531 8.109375 C 30.242188 7.039063 29.035156 6.125 27.769531 5.359375 C 26.507813 4.597656 25.132813 4 23.652344 3.566406 C 22.171875 3.132813 20.484375 2.917969 18.59375 2.917969 C 16.019531 2.917969 13.601563 3.40625 11.347656 4.386719 C 9.089844 5.367188 7.121094 6.695313 5.433594 8.367188 C 3.746094 10.042969 2.421875 12.015625 1.453125 14.28125 C 0.484375 16.550781 0 18.957031 0 21.511719 C 0 23.996094 0.472656 26.375 1.417969 28.652344 C 2.363281 30.929688 3.703125 32.9375 5.433594 34.667969 L 35 64.203125 L 64.566406 34.671875 C 66.296875 32.9375 67.636719 30.933594 68.582031 28.65625 C 69.527344 26.378906 70 23.996094 70 21.511719 C 70 18.957031 69.515625 16.550781 68.546875 14.28125 C 67.578125 12.015625 66.253906 10.042969 64.566406 8.367188 C 62.878906 6.695313 60.910156 5.367188 58.652344 4.386719 C 56.398438 3.40625 53.980469 2.917969 51.40625 2.917969 Z M 51.40625 2.917969 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.464844 48.640625 L 28.796875 28.800781 L 24.234375 37.917969 L 8.75 37.917969 L 5.832031 35 L 22.433594 35 L 29.535156 20.785156 L 35.535156 41.777344 L 40.050781 35 L 49.582031 35 L 49.582031 37.917969 L 41.613281 37.917969 Z M 34.464844 48.640625 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureSharedDashboard(m).png b/dist/General/AzureSharedDashboard(m).png
new file mode 100644
index 00000000..a0190d10
Binary files /dev/null and b/dist/General/AzureSharedDashboard(m).png differ
diff --git a/dist/General/AzureSharedDashboard(m).svg b/dist/General/AzureSharedDashboard(m).svg
new file mode 100644
index 00000000..3d6656f7
--- /dev/null
+++ b/dist/General/AzureSharedDashboard(m).svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="57pt" viewBox="0 0 70 57" version="1.1">
+<g id="surface1">
+<rect x="0" y="0" width="70" height="57" style="fill:rgb(3,148,255);fill-opacity:1;stroke:none;"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.234375 8.144531 L 20.589844 8.144531 L 20.589844 40.714844 L 8.234375 40.714844 Z M 24.707031 8.144531 L 53.53125 8.144531 L 53.53125 24.429688 L 24.707031 24.429688 Z M 24.707031 28.5 L 37.058594 28.5 L 37.058594 40.714844 L 24.707031 40.714844 Z M 41.175781 28.5 L 53.53125 28.5 L 53.53125 40.714844 L 41.175781 40.714844 Z M 41.175781 28.5 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureSharedDashboard.png b/dist/General/AzureSharedDashboard.png
new file mode 100644
index 00000000..16f8d1a6
Binary files /dev/null and b/dist/General/AzureSharedDashboard.png differ
diff --git a/dist/General/AzureSharedDashboard.puml b/dist/General/AzureSharedDashboard.puml
new file mode 100644
index 00000000..5bc6bae5
--- /dev/null
+++ b/dist/General/AzureSharedDashboard.puml
@@ -0,0 +1,5 @@
+sprite $AzureSharedDashboard [70x57/16z] xTQ35KGn54NHEAV_XWSBtpRkBY1yOW4HRqiUo7Q0euSp9VTVnGomxrn5gsWLhK8OCdMLORTS9LPa8CMAHN-K06zAzc6hQ1MjCZo__5S9jkGuY8Z85m
+
+AzureEntityColoring(AzureSharedDashboard)
+!define AzureSharedDashboard(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSharedDashboard, AzureSharedDashboard)
+!define AzureSharedDashboard(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSharedDashboard, AzureSharedDashboard)
diff --git a/dist/General/AzureSharedDashboard.svg b/dist/General/AzureSharedDashboard.svg
new file mode 100644
index 00000000..98c83def
--- /dev/null
+++ b/dist/General/AzureSharedDashboard.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="57pt" viewBox="0 0 70 57" version="1.1">
+<g id="surface1">
+<rect x="0" y="0" width="70" height="57" style="fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;stroke:none;"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.234375 8.144531 L 20.589844 8.144531 L 20.589844 40.714844 L 8.234375 40.714844 Z M 24.707031 8.144531 L 53.53125 8.144531 L 53.53125 24.429688 L 24.707031 24.429688 Z M 24.707031 28.5 L 37.058594 28.5 L 37.058594 40.714844 L 24.707031 40.714844 Z M 41.175781 28.5 L 53.53125 28.5 L 53.53125 40.714844 L 41.175781 40.714844 Z M 41.175781 28.5 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureSupport(m).png b/dist/General/AzureSupport(m).png
new file mode 100644
index 00000000..f62a8221
Binary files /dev/null and b/dist/General/AzureSupport(m).png differ
diff --git a/dist/General/AzureSupport(m).svg b/dist/General/AzureSupport(m).svg
new file mode 100644
index 00000000..c68a9e10
--- /dev/null
+++ b/dist/General/AzureSupport(m).svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.578125 20.898438 C 22.578125 27.800781 28.089844 33.40625 34.957031 33.574219 L 38.144531 8.550781 C 37.21875 8.335938 36.261719 8.210938 35.265625 8.210938 C 28.257813 8.207031 22.578125 13.890625 22.578125 20.898438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 25.988281 37.941406 L 12.601563 37.941406 L 12.601563 70 L 30.375 70 L 33.175781 48.015625 Z M 25.988281 37.941406 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.976563 0 C 23.410156 0 14 9.410156 14 20.976563 L 14 23.308594 L 18.660156 23.308594 L 18.660156 20.976563 C 18.660156 11.980469 25.980469 4.660156 34.976563 4.660156 C 36.324219 4.660156 37.628906 4.84375 38.886719 5.152344 L 39.46875 0.496094 C 38.019531 0.179688 36.519531 0 34.976563 0 Z M 34.976563 0 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 47.957031 20.898438 C 47.957031 27.90625 42.277344 33.589844 35.265625 33.589844 C 28.257813 33.589844 22.574219 27.90625 22.574219 20.898438 C 22.574219 13.890625 28.257813 8.207031 35.265625 8.207031 C 42.277344 8.207031 47.957031 13.890625 47.957031 20.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 44.546875 37.941406 L 35.265625 50.941406 L 25.988281 37.941406 L 12.601563 37.941406 L 12.601563 70 L 57.933594 70 L 57.933594 37.941406 Z M 44.546875 37.941406 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 55.953125 33.796875 L 46.320313 33.796875 L 46.320313 29.132813 L 51.292969 29.132813 L 51.292969 20.976563 C 51.292969 11.980469 43.972656 4.660156 34.976563 4.660156 C 25.980469 4.660156 18.660156 11.980469 18.660156 20.976563 L 18.660156 23.308594 L 14 23.308594 L 14 20.976563 C 14 9.410156 23.410156 0 34.976563 0 C 46.539063 0 55.949219 9.410156 55.949219 20.976563 L 55.949219 33.796875 Z M 55.953125 33.796875 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureSupport.png b/dist/General/AzureSupport.png
new file mode 100644
index 00000000..885763cb
Binary files /dev/null and b/dist/General/AzureSupport.png differ
diff --git a/dist/General/AzureSupport.puml b/dist/General/AzureSupport.puml
new file mode 100644
index 00000000..cb725e8d
--- /dev/null
+++ b/dist/General/AzureSupport.puml
@@ -0,0 +1,11 @@
+sprite $AzureSupport [70x70/16z] {
+xTK7KiKm30HGsoekoVtFIx3YC1wboNJ8Jg4_fDKlxYo1Oigvv1mPt5Wyvx9bckSq0FaengOiALQ7ch4fDScR1YajESKOKvxNJ70VIQiGiVrlYDFgu5qaYy7z
+-BGwQ9aa1VMJACojfQIJw2G1405MaQGRVurWHLZ6Gf8mIqDGcNop59a4g8MNr3xmNZLSEv6fg5EOwi_hJdT6oRK6eavfJ7bbw5oXRH_K2bEhffmhgOqIDB8a
+j672wK9RAxIhS3itNvuPPHIjo31UZdrreR2reXLSLvekQr4B4NShfNc9FrMa5d-cy5Mz-LBnpj77AM1MkDleMg4bA9_O5HqyKD2aX0Cbc1HtT6YR4dQLO5GS
+xYZah8hJ2Zb8Iuf5yQWG6MDkYccfxSXAiOmZXdUZYhoh4SgxshZoHBsgXFEdAFaxJsJzQvwxt5JGzQ4XXVh71B9PqJjv7bN8lONjYgu6xOe-Dx1PqTLujYjw
+9x8h-jp8xrNOgtr65FRy4Gh_OiM2FCgZN22FyYWl
+}
+
+AzureEntityColoring(AzureSupport)
+!define AzureSupport(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSupport, AzureSupport)
+!define AzureSupport(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSupport, AzureSupport)
diff --git a/dist/General/AzureSupport.svg b/dist/General/AzureSupport.svg
new file mode 100644
index 00000000..76f68263
--- /dev/null
+++ b/dist/General/AzureSupport.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.578125 20.898438 C 22.578125 27.800781 28.089844 33.40625 34.957031 33.574219 L 38.144531 8.550781 C 37.21875 8.335938 36.261719 8.210938 35.265625 8.210938 C 28.257813 8.207031 22.578125 13.890625 22.578125 20.898438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.988281 37.941406 L 12.601563 37.941406 L 12.601563 70 L 30.375 70 L 33.175781 48.015625 Z M 25.988281 37.941406 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.976563 0 C 23.410156 0 14 9.410156 14 20.976563 L 14 23.308594 L 18.660156 23.308594 L 18.660156 20.976563 C 18.660156 11.980469 25.980469 4.660156 34.976563 4.660156 C 36.324219 4.660156 37.628906 4.84375 38.886719 5.152344 L 39.46875 0.496094 C 38.019531 0.179688 36.519531 0 34.976563 0 Z M 34.976563 0 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 47.957031 20.898438 C 47.957031 27.90625 42.277344 33.589844 35.265625 33.589844 C 28.257813 33.589844 22.574219 27.90625 22.574219 20.898438 C 22.574219 13.890625 28.257813 8.207031 35.265625 8.207031 C 42.277344 8.207031 47.957031 13.890625 47.957031 20.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 44.546875 37.941406 L 35.265625 50.941406 L 25.988281 37.941406 L 12.601563 37.941406 L 12.601563 70 L 57.933594 70 L 57.933594 37.941406 Z M 44.546875 37.941406 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 55.953125 33.796875 L 46.320313 33.796875 L 46.320313 29.132813 L 51.292969 29.132813 L 51.292969 20.976563 C 51.292969 11.980469 43.972656 4.660156 34.976563 4.660156 C 25.980469 4.660156 18.660156 11.980469 18.660156 20.976563 L 18.660156 23.308594 L 14 23.308594 L 14 20.976563 C 14 9.410156 23.410156 0 34.976563 0 C 46.539063 0 55.949219 9.410156 55.949219 20.976563 L 55.949219 33.796875 Z M 55.953125 33.796875 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureSupportRequest(m).png b/dist/General/AzureSupportRequest(m).png
new file mode 100644
index 00000000..b5403d38
Binary files /dev/null and b/dist/General/AzureSupportRequest(m).png differ
diff --git a/dist/General/AzureSupportRequest(m).svg b/dist/General/AzureSupportRequest(m).svg
new file mode 100644
index 00000000..d2f9803e
--- /dev/null
+++ b/dist/General/AzureSupportRequest(m).svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 12.90625 24.5 C 12.90625 29.53125 17.0625 33.6875 22.09375 33.90625 L 24.28125 15.3125 C 23.625 15.09375 22.96875 15.09375 22.09375 15.09375 C 17.0625 15.09375 12.90625 19.25 12.90625 24.5 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 15.3125 37.1875 L 4.375 37.1875 L 4.375 61.25 L 18.59375 61.25 L 20.5625 44.84375 Z M 15.3125 37.1875 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.09375 8.96875 C 13.5625 8.96875 6.5625 15.96875 6.5625 24.5 L 6.5625 28.4375 L 10.9375 28.4375 L 10.9375 24.5 C 10.9375 17.9375 15.75 12.46875 22.53125 12.46875 C 23.625 12.46875 24.28125 12.6875 25.15625 12.90625 L 25.375 9.40625 C 24.5 9.1875 23.1875 8.96875 22.09375 8.96875 Z M 22.09375 8.96875 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.78125 22.3125 C 34.78125 27.34375 38.9375 31.5 43.96875 31.71875 L 46.15625 13.125 C 45.5 12.90625 44.84375 12.90625 43.96875 12.90625 C 38.9375 12.90625 34.78125 17.0625 34.78125 22.3125 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.1875 37.1875 L 26.25 37.1875 L 26.25 63.4375 L 40.46875 63.4375 L 42.4375 45.5 Z M 37.1875 37.1875 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.96875 24.5 C 36.96875 29.53125 41.125 33.6875 46.15625 33.90625 L 48.34375 15.3125 C 47.6875 15.09375 47.03125 15.09375 46.15625 15.09375 C 41.125 15.09375 36.96875 19.25 36.96875 24.5 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.375 37.1875 L 28.4375 37.1875 L 28.4375 61.25 L 42.65625 61.25 L 44.625 44.84375 Z M 39.375 37.1875 "/>
+</g>
+<mask id="mask7">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip8">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface26" clip-path="url(#clip8)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.15625 8.96875 C 37.625 8.96875 30.625 15.96875 30.625 24.5 L 30.625 28.4375 L 35 28.4375 L 35 24.5 C 35 17.9375 39.8125 12.46875 46.59375 12.46875 C 47.6875 12.46875 48.34375 12.6875 49.21875 12.90625 L 49.4375 9.40625 C 48.5625 9.1875 47.25 8.96875 46.15625 8.96875 Z M 46.15625 8.96875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,110,192);fill-opacity:1;" d="M 31.71875 24.5 C 31.71875 29.75 27.5625 33.90625 22.3125 33.90625 C 17.0625 33.90625 12.90625 29.75 12.90625 24.5 C 12.90625 19.25 17.0625 15.09375 22.3125 15.09375 C 27.34375 15.09375 31.71875 19.25 31.71875 24.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,110,192);fill-opacity:1;" d="M 29.09375 37.1875 L 22.3125 46.8125 L 15.3125 37.1875 L 4.375 37.1875 L 4.375 61.25 L 39.375 61.25 L 39.375 37.1875 Z M 29.09375 37.1875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,117,204);fill-opacity:1;" d="M 37.1875 35 L 30.625 35 L 30.625 30.625 L 32.8125 30.625 L 32.8125 24.5 C 32.8125 17.9375 28.4375 12.46875 21.875 12.46875 C 15.3125 12.46875 10.9375 17.9375 10.9375 24.5 L 10.9375 28.4375 L 6.5625 28.4375 L 6.5625 24.5 C 6.5625 15.96875 13.34375 8.96875 21.875 8.96875 C 30.40625 8.96875 37.1875 15.96875 37.1875 24.5 Z M 37.1875 35 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 49.21875 31.9375 C 49.21875 41.125 45.0625 48.78125 39.8125 48.78125 C 34.5625 48.78125 30.40625 41.34375 30.40625 31.9375 C 30.40625 22.53125 34.5625 15.09375 39.8125 15.09375 C 44.84375 15.09375 49.21875 22.53125 49.21875 31.9375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 50.96875 37.1875 L 44.1875 46.8125 L 37.1875 37.1875 L 26.25 37.1875 L 26.25 61.25 L 61.25 61.25 L 61.25 37.1875 Z M 50.96875 37.1875 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 59.0625 39.375 L 52.5 39.375 L 52.5 35 L 54.6875 35 L 54.6875 26.46875 C 54.6875 18.15625 50.75 11.59375 43.75 11.59375 C 36.75 11.59375 32.8125 18.375 32.8125 26.46875 L 32.8125 30.625 L 28.4375 30.625 L 28.4375 26.46875 C 28.4375 15.96875 34.78125 7.21875 43.75 7.21875 C 52.71875 7.21875 59.5 15.96875 59.5 26.46875 Z M 59.0625 39.375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 28.4375 30.40625 L 32.15625 30.40625 L 32.15625 32.375 L 28.4375 32.375 Z M 28.4375 30.40625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 55.78125 24.5 C 55.78125 29.75 51.625 33.90625 46.375 33.90625 C 41.125 33.90625 36.96875 29.75 36.96875 24.5 C 36.96875 19.25 41.125 15.09375 46.375 15.09375 C 51.40625 15.09375 55.78125 19.25 55.78125 24.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 53.15625 37.1875 L 46.375 46.8125 L 39.375 37.1875 L 28.4375 37.1875 L 28.4375 61.25 L 63.4375 61.25 L 63.4375 37.1875 Z M 53.15625 37.1875 "/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 61.25 35 L 54.6875 35 L 54.6875 30.625 L 56.875 30.625 L 56.875 24.5 C 56.875 17.9375 52.5 12.46875 45.9375 12.46875 C 39.375 12.46875 35 17.9375 35 24.5 L 35 28.4375 L 30.625 28.4375 L 30.625 24.5 C 30.625 15.96875 37.40625 8.96875 45.9375 8.96875 C 54.46875 8.96875 61.25 15.96875 61.25 24.5 Z M 61.25 35 "/>
+<use xlink:href="#surface26" mask="url(#mask7)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureSupportRequest.png b/dist/General/AzureSupportRequest.png
new file mode 100644
index 00000000..8a6c90da
Binary files /dev/null and b/dist/General/AzureSupportRequest.png differ
diff --git a/dist/General/AzureSupportRequest.puml b/dist/General/AzureSupportRequest.puml
new file mode 100644
index 00000000..f4ae86f5
--- /dev/null
+++ b/dist/General/AzureSupportRequest.puml
@@ -0,0 +1,12 @@
+sprite $AzureSupportRequest [70x70/16z] {
+xT47bkCW44NHNndAtlzw1o5BjEBaxDVH2lT0WT_VktTY7YN2JR29BMghXEApQPHNDQjXpMg-UZoVGRXBcZ6Kp2heIJTMvVbmN6Ub5sxcCR_eQEdyVmttA4rf
+LLpbdL12Z-PDAE2TS5wkToVfPYLEMAF8B81bgp16qHcSfQLboocvCG1FcMTIkYhQwjSdfk0OzPMCKyei0ZYm8AmsvUxyOkHyFq60bxbi6URzL0R4vhobG8uz
+xPUY7HbAshmK7uZvb46UBJsRIan_Def3iyLWsoWkoBFZZZvQAbj54VDKTASuxDd2hj8IZANKhj1hGsHxHVXalbnQ1Dyfw8f23efXKWoRP5PYgnHGjWHwK1oF
+flY90fIzmlDmzO1u7szWa-wLd8exfLugiLLyKUIh5BjG-A3ecSBM0dYlaBS8E2Wqb6E-EMZ74XyE-av1R1J2acuLCEUDGl51CM3FBFjfn8q2ybLnV4nMn82X
+NCKMJQb6auaHYKwA4exAVOJJxfKlZtk47vxOcW0ZKfMbxGkw95YpCkBDd4URwxvcvqfSA4POyojbv1UAOaclbP4inbQnzRhVA2DwJR0hXz6GVvaIQ54zA8Of
+krT61Y3og2W0yIzLga1pA2C1-PShbVDKSVOlLx9tL7pqUvMtKlyRnRzAoRct8gSF2ukEH4HF4dnrxzvz0W
+}
+
+AzureEntityColoring(AzureSupportRequest)
+!define AzureSupportRequest(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSupportRequest, AzureSupportRequest)
+!define AzureSupportRequest(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSupportRequest, AzureSupportRequest)
diff --git a/dist/General/AzureSupportRequest.svg b/dist/General/AzureSupportRequest.svg
new file mode 100644
index 00000000..029baa6b
--- /dev/null
+++ b/dist/General/AzureSupportRequest.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 12.90625 24.5 C 12.90625 29.53125 17.0625 33.6875 22.09375 33.90625 L 24.28125 15.3125 C 23.625 15.09375 22.96875 15.09375 22.09375 15.09375 C 17.0625 15.09375 12.90625 19.25 12.90625 24.5 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 15.3125 37.1875 L 4.375 37.1875 L 4.375 61.25 L 18.59375 61.25 L 20.5625 44.84375 Z M 15.3125 37.1875 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.09375 8.96875 C 13.5625 8.96875 6.5625 15.96875 6.5625 24.5 L 6.5625 28.4375 L 10.9375 28.4375 L 10.9375 24.5 C 10.9375 17.9375 15.75 12.46875 22.53125 12.46875 C 23.625 12.46875 24.28125 12.6875 25.15625 12.90625 L 25.375 9.40625 C 24.5 9.1875 23.1875 8.96875 22.09375 8.96875 Z M 22.09375 8.96875 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.78125 22.3125 C 34.78125 27.34375 38.9375 31.5 43.96875 31.71875 L 46.15625 13.125 C 45.5 12.90625 44.84375 12.90625 43.96875 12.90625 C 38.9375 12.90625 34.78125 17.0625 34.78125 22.3125 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.1875 37.1875 L 26.25 37.1875 L 26.25 63.4375 L 40.46875 63.4375 L 42.4375 45.5 Z M 37.1875 37.1875 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.96875 24.5 C 36.96875 29.53125 41.125 33.6875 46.15625 33.90625 L 48.34375 15.3125 C 47.6875 15.09375 47.03125 15.09375 46.15625 15.09375 C 41.125 15.09375 36.96875 19.25 36.96875 24.5 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.375 37.1875 L 28.4375 37.1875 L 28.4375 61.25 L 42.65625 61.25 L 44.625 44.84375 Z M 39.375 37.1875 "/>
+</g>
+<mask id="mask7">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip8">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface26" clip-path="url(#clip8)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.15625 8.96875 C 37.625 8.96875 30.625 15.96875 30.625 24.5 L 30.625 28.4375 L 35 28.4375 L 35 24.5 C 35 17.9375 39.8125 12.46875 46.59375 12.46875 C 47.6875 12.46875 48.34375 12.6875 49.21875 12.90625 L 49.4375 9.40625 C 48.5625 9.1875 47.25 8.96875 46.15625 8.96875 Z M 46.15625 8.96875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,30.196078%,52.54902%);fill-opacity:1;" d="M 31.71875 24.5 C 31.71875 29.75 27.5625 33.90625 22.3125 33.90625 C 17.0625 33.90625 12.90625 29.75 12.90625 24.5 C 12.90625 19.25 17.0625 15.09375 22.3125 15.09375 C 27.34375 15.09375 31.71875 19.25 31.71875 24.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,30.196078%,52.54902%);fill-opacity:1;" d="M 29.09375 37.1875 L 22.3125 46.8125 L 15.3125 37.1875 L 4.375 37.1875 L 4.375 61.25 L 39.375 61.25 L 39.375 37.1875 Z M 29.09375 37.1875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40%,40%,40%);fill-opacity:1;" d="M 37.1875 35 L 30.625 35 L 30.625 30.625 L 32.8125 30.625 L 32.8125 24.5 C 32.8125 17.9375 28.4375 12.46875 21.875 12.46875 C 15.3125 12.46875 10.9375 17.9375 10.9375 24.5 L 10.9375 28.4375 L 6.5625 28.4375 L 6.5625 24.5 C 6.5625 15.96875 13.34375 8.96875 21.875 8.96875 C 30.40625 8.96875 37.1875 15.96875 37.1875 24.5 Z M 37.1875 35 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.21875 31.9375 C 49.21875 41.125 45.0625 48.78125 39.8125 48.78125 C 34.5625 48.78125 30.40625 41.34375 30.40625 31.9375 C 30.40625 22.53125 34.5625 15.09375 39.8125 15.09375 C 44.84375 15.09375 49.21875 22.53125 49.21875 31.9375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 50.96875 37.1875 L 44.1875 46.8125 L 37.1875 37.1875 L 26.25 37.1875 L 26.25 61.25 L 61.25 61.25 L 61.25 37.1875 Z M 50.96875 37.1875 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 59.0625 39.375 L 52.5 39.375 L 52.5 35 L 54.6875 35 L 54.6875 26.46875 C 54.6875 18.15625 50.75 11.59375 43.75 11.59375 C 36.75 11.59375 32.8125 18.375 32.8125 26.46875 L 32.8125 30.625 L 28.4375 30.625 L 28.4375 26.46875 C 28.4375 15.96875 34.78125 7.21875 43.75 7.21875 C 52.71875 7.21875 59.5 15.96875 59.5 26.46875 Z M 59.0625 39.375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 28.4375 30.40625 L 32.15625 30.40625 L 32.15625 32.375 L 28.4375 32.375 Z M 28.4375 30.40625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 55.78125 24.5 C 55.78125 29.75 51.625 33.90625 46.375 33.90625 C 41.125 33.90625 36.96875 29.75 36.96875 24.5 C 36.96875 19.25 41.125 15.09375 46.375 15.09375 C 51.40625 15.09375 55.78125 19.25 55.78125 24.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.196078%,84.705882%);fill-opacity:1;" d="M 53.15625 37.1875 L 46.375 46.8125 L 39.375 37.1875 L 28.4375 37.1875 L 28.4375 61.25 L 63.4375 61.25 L 63.4375 37.1875 Z M 53.15625 37.1875 "/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 61.25 35 L 54.6875 35 L 54.6875 30.625 L 56.875 30.625 L 56.875 24.5 C 56.875 17.9375 52.5 12.46875 45.9375 12.46875 C 39.375 12.46875 35 17.9375 35 24.5 L 35 28.4375 L 30.625 28.4375 L 30.625 24.5 C 30.625 15.96875 37.40625 8.96875 45.9375 8.96875 C 54.46875 8.96875 61.25 15.96875 61.25 24.5 Z M 61.25 35 "/>
+<use xlink:href="#surface26" mask="url(#mask7)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureTag(m).png b/dist/General/AzureTag(m).png
new file mode 100644
index 00000000..5932ff94
Binary files /dev/null and b/dist/General/AzureTag(m).png differ
diff --git a/dist/General/AzureTag(m).svg b/dist/General/AzureTag(m).svg
new file mode 100644
index 00000000..f7cae828
--- /dev/null
+++ b/dist/General/AzureTag(m).svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.460938 29.539063 L 26.039063 50.121094 L 30.660156 45.5 L 30.660156 4.339844 Z M 5.460938 29.539063 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 51.101563 5.039063 C 49 2.941406 45.78125 2.941406 43.679688 5.039063 C 41.578125 7.140625 41.578125 10.359375 43.679688 12.460938 C 45.78125 14.558594 49 14.558594 51.101563 12.460938 C 53.199219 10.359375 53.199219 7 51.101563 5.039063 Z M 49.421875 10.78125 C 48.300781 11.898438 46.480469 11.898438 45.359375 10.78125 C 44.238281 9.660156 44.238281 7.839844 45.359375 6.71875 C 46.480469 5.601563 48.300781 5.601563 49.421875 6.71875 C 50.539063 7.839844 50.539063 9.660156 49.421875 10.78125 Z M 49.421875 10.78125 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 9.660156 39.480469 L 30.238281 60.058594 L 34.859375 55.441406 L 34.859375 14.28125 Z M 9.660156 39.480469 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 55.300781 14.980469 C 53.199219 12.878906 49.980469 12.878906 47.878906 14.980469 C 45.78125 17.078125 45.78125 20.300781 47.878906 22.398438 C 49.980469 24.5 53.199219 24.5 55.300781 22.398438 C 57.398438 20.300781 57.398438 17.078125 55.300781 14.980469 Z M 53.621094 20.71875 C 52.5 21.839844 50.679688 21.839844 49.558594 20.71875 C 48.441406 19.601563 48.441406 17.78125 49.558594 16.660156 C 50.679688 15.539063 52.5 15.539063 53.621094 16.660156 C 54.738281 17.78125 54.738281 19.601563 53.621094 20.71875 Z M 53.621094 20.71875 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 13.859375 49.421875 L 34.441406 70 L 39.058594 65.378906 L 39.058594 24.21875 Z M 13.859375 49.421875 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 59.5 24.921875 C 57.398438 22.820313 54.179688 22.820313 52.078125 24.921875 C 49.980469 27.019531 49.980469 30.238281 52.078125 32.339844 C 54.179688 34.441406 57.398438 34.441406 59.5 32.339844 C 61.601563 30.238281 61.601563 27.019531 59.5 24.921875 Z M 57.820313 30.660156 C 56.699219 31.78125 54.878906 31.78125 53.761719 30.660156 C 52.640625 29.539063 52.640625 27.71875 53.761719 26.601563 C 54.878906 25.480469 56.699219 25.480469 57.820313 26.601563 C 58.941406 27.71875 58.941406 29.539063 57.820313 30.660156 Z M 57.820313 30.660156 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 48.300781 0 L 34.441406 0.558594 L 5.460938 29.539063 L 26.039063 50.121094 L 55.019531 21.140625 L 56.140625 7.839844 Z M 49.421875 10.78125 C 48.300781 11.898438 46.480469 11.898438 45.359375 10.78125 C 44.238281 9.660156 44.238281 7.839844 45.359375 6.71875 C 46.480469 5.601563 48.300781 5.601563 49.421875 6.71875 C 50.539063 7.839844 50.539063 9.660156 49.421875 10.78125 Z M 49.421875 10.78125 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 52.5 9.941406 L 38.640625 10.5 L 9.660156 39.480469 L 30.238281 60.058594 L 59.21875 31.078125 L 60.339844 17.78125 Z M 53.621094 20.71875 C 52.5 21.839844 50.679688 21.839844 49.558594 20.71875 C 48.441406 19.601563 48.441406 17.78125 49.558594 16.660156 C 50.679688 15.539063 52.5 15.539063 53.621094 16.660156 C 54.738281 17.78125 54.738281 19.601563 53.621094 20.71875 Z M 53.621094 20.71875 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 56.699219 19.878906 L 42.839844 20.441406 L 13.859375 49.421875 L 34.441406 70 L 63.421875 41.019531 L 64.539063 27.71875 Z M 57.820313 30.660156 C 56.699219 31.78125 54.878906 31.78125 53.761719 30.660156 C 52.640625 29.539063 52.640625 27.71875 53.761719 26.601563 C 54.878906 25.480469 56.699219 25.480469 57.820313 26.601563 C 58.941406 27.71875 58.941406 29.539063 57.820313 30.660156 Z M 57.820313 30.660156 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureTag.png b/dist/General/AzureTag.png
new file mode 100644
index 00000000..fb9d8036
Binary files /dev/null and b/dist/General/AzureTag.png differ
diff --git a/dist/General/AzureTag.puml b/dist/General/AzureTag.puml
new file mode 100644
index 00000000..6d54f199
--- /dev/null
+++ b/dist/General/AzureTag.puml
@@ -0,0 +1,11 @@
+sprite $AzureTag [70x70/16z] {
+bT47ikGW40HHPA6O-zztHQyXVYbobavvz-JAVzkFuppFwxhkftfl9LiWzKV6P15cyaXp9eyqZLgMsMz78cDII9NQNhORdeOHVvIujadrpJ3YIYkZQoZrM4L0
+kKFPrv6fj2UfthzNd_csZ4obMQOm4at4cGHoEn99p-nOH-uteXuP0uWfXWIpBo2WZEjhVInDXX1M0WccEUC8A-gzZbeeroBYIlkXdEl8LFJKUrVCkzuA8rFf
+bjgHGEf4ZDaJI9s8TIUG-aO-KU_NCXAA3046aL0aGtfhCWQGgSYKWGJJ9mF8J2z5RHIA9h9zHK1HAAtCpk-8Av-Xz51gSOOHLpv_v_qkpZ12V_hrhqz0fk9E
+7vt56KRKgQCummWhU_4kH5ZP7DaO4Ii9X9LYCI9MvCh122kjCEC8ArTXHgyOGKRl4456h33YZ5Xn13l5YYDSPIMFU4a4oY1b9mMG90D8aW4aoG2IP019Ce0a
+6K2I32191f0a0qYI0IJ9099a04aoW2GPG9AC8Kc6aJpZI9u19Cki8By
+}
+
+AzureEntityColoring(AzureTag)
+!define AzureTag(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTag, AzureTag)
+!define AzureTag(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTag, AzureTag)
diff --git a/dist/General/AzureTag.svg b/dist/General/AzureTag.svg
new file mode 100644
index 00000000..0abb3558
--- /dev/null
+++ b/dist/General/AzureTag.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.460938 29.539063 L 26.039063 50.121094 L 30.660156 45.5 L 30.660156 4.339844 Z M 5.460938 29.539063 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 51.101563 5.039063 C 49 2.941406 45.78125 2.941406 43.679688 5.039063 C 41.578125 7.140625 41.578125 10.359375 43.679688 12.460938 C 45.78125 14.558594 49 14.558594 51.101563 12.460938 C 53.199219 10.359375 53.199219 7 51.101563 5.039063 Z M 49.421875 10.78125 C 48.300781 11.898438 46.480469 11.898438 45.359375 10.78125 C 44.238281 9.660156 44.238281 7.839844 45.359375 6.71875 C 46.480469 5.601563 48.300781 5.601563 49.421875 6.71875 C 50.539063 7.839844 50.539063 9.660156 49.421875 10.78125 Z M 49.421875 10.78125 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 9.660156 39.480469 L 30.238281 60.058594 L 34.859375 55.441406 L 34.859375 14.28125 Z M 9.660156 39.480469 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 55.300781 14.980469 C 53.199219 12.878906 49.980469 12.878906 47.878906 14.980469 C 45.78125 17.078125 45.78125 20.300781 47.878906 22.398438 C 49.980469 24.5 53.199219 24.5 55.300781 22.398438 C 57.398438 20.300781 57.398438 17.078125 55.300781 14.980469 Z M 53.621094 20.71875 C 52.5 21.839844 50.679688 21.839844 49.558594 20.71875 C 48.441406 19.601563 48.441406 17.78125 49.558594 16.660156 C 50.679688 15.539063 52.5 15.539063 53.621094 16.660156 C 54.738281 17.78125 54.738281 19.601563 53.621094 20.71875 Z M 53.621094 20.71875 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 13.859375 49.421875 L 34.441406 70 L 39.058594 65.378906 L 39.058594 24.21875 Z M 13.859375 49.421875 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 59.5 24.921875 C 57.398438 22.820313 54.179688 22.820313 52.078125 24.921875 C 49.980469 27.019531 49.980469 30.238281 52.078125 32.339844 C 54.179688 34.441406 57.398438 34.441406 59.5 32.339844 C 61.601563 30.238281 61.601563 27.019531 59.5 24.921875 Z M 57.820313 30.660156 C 56.699219 31.78125 54.878906 31.78125 53.761719 30.660156 C 52.640625 29.539063 52.640625 27.71875 53.761719 26.601563 C 54.878906 25.480469 56.699219 25.480469 57.820313 26.601563 C 58.941406 27.71875 58.941406 29.539063 57.820313 30.660156 Z M 57.820313 30.660156 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 48.300781 0 L 34.441406 0.558594 L 5.460938 29.539063 L 26.039063 50.121094 L 55.019531 21.140625 L 56.140625 7.839844 Z M 49.421875 10.78125 C 48.300781 11.898438 46.480469 11.898438 45.359375 10.78125 C 44.238281 9.660156 44.238281 7.839844 45.359375 6.71875 C 46.480469 5.601563 48.300781 5.601563 49.421875 6.71875 C 50.539063 7.839844 50.539063 9.660156 49.421875 10.78125 Z M 49.421875 10.78125 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 52.5 9.941406 L 38.640625 10.5 L 9.660156 39.480469 L 30.238281 60.058594 L 59.21875 31.078125 L 60.339844 17.78125 Z M 53.621094 20.71875 C 52.5 21.839844 50.679688 21.839844 49.558594 20.71875 C 48.441406 19.601563 48.441406 17.78125 49.558594 16.660156 C 50.679688 15.539063 52.5 15.539063 53.621094 16.660156 C 54.738281 17.78125 54.738281 19.601563 53.621094 20.71875 Z M 53.621094 20.71875 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 56.699219 19.878906 L 42.839844 20.441406 L 13.859375 49.421875 L 34.441406 70 L 63.421875 41.019531 L 64.539063 27.71875 Z M 57.820313 30.660156 C 56.699219 31.78125 54.878906 31.78125 53.761719 30.660156 C 52.640625 29.539063 52.640625 27.71875 53.761719 26.601563 C 54.878906 25.480469 56.699219 25.480469 57.820313 26.601563 C 58.941406 27.71875 58.941406 29.539063 57.820313 30.660156 Z M 57.820313 30.660156 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureTemplate(m).png b/dist/General/AzureTemplate(m).png
new file mode 100644
index 00000000..49a17572
Binary files /dev/null and b/dist/General/AzureTemplate(m).png differ
diff --git a/dist/General/AzureTemplate(m).svg b/dist/General/AzureTemplate(m).svg
new file mode 100644
index 00000000..a8ef8df7
--- /dev/null
+++ b/dist/General/AzureTemplate(m).svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 53.199219 2.800781 L 7 2.800781 L 7 67.199219 L 63 67.199219 L 63 12.601563 L 53.199219 12.601563 Z M 53.199219 2.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 63 9.519531 L 53.480469 0 L 4.199219 0 L 4.199219 70 L 65.800781 70 L 65.800781 12.320313 Z M 63 9.519531 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 18.539063 37.34375 C 18.539063 38.855469 18.167969 40.035156 17.421875 40.871094 C 16.671875 41.714844 15.675781 42.132813 14.429688 42.132813 C 13.847656 42.132813 13.371094 42.0625 13 41.925781 L 13 39.933594 C 13.335938 40.164063 13.773438 40.28125 14.308594 40.28125 C 15.71875 40.28125 16.425781 39.1875 16.425781 37.007813 L 16.425781 29.160156 L 18.542969 29.160156 L 18.542969 37.34375 Z M 18.539063 37.34375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 20.988281 41.410156 L 20.988281 39.230469 C 21.183594 39.410156 21.414063 39.566406 21.6875 39.710938 C 21.957031 39.855469 22.242188 39.972656 22.542969 40.070313 C 22.847656 40.167969 23.148438 40.246094 23.453125 40.300781 C 23.753906 40.351563 24.03125 40.378906 24.289063 40.378906 C 25.175781 40.378906 25.839844 40.230469 26.273438 39.933594 C 26.710938 39.636719 26.929688 39.207031 26.929688 38.644531 C 26.929688 38.34375 26.855469 38.078125 26.710938 37.855469 C 26.566406 37.636719 26.363281 37.429688 26.101563 37.246094 C 25.839844 37.0625 25.53125 36.886719 25.179688 36.714844 C 24.828125 36.546875 24.449219 36.371094 24.046875 36.1875 C 23.613281 35.957031 23.210938 35.722656 22.835938 35.484375 C 22.464844 35.246094 22.136719 34.984375 21.863281 34.699219 C 21.585938 34.410156 21.371094 34.085938 21.210938 33.722656 C 21.054688 33.359375 20.976563 32.9375 20.976563 32.449219 C 20.976563 31.851563 21.113281 31.332031 21.382813 30.890625 C 21.652344 30.449219 22.007813 30.082031 22.449219 29.796875 C 22.890625 29.507813 23.394531 29.296875 23.957031 29.15625 C 24.519531 29.015625 25.097656 28.945313 25.683594 28.945313 C 27.019531 28.945313 27.988281 29.097656 28.601563 29.398438 L 28.601563 31.492188 C 27.875 30.96875 26.945313 30.710938 25.808594 30.710938 C 25.492188 30.710938 25.179688 30.738281 24.871094 30.796875 C 24.558594 30.855469 24.277344 30.953125 24.03125 31.089844 C 23.785156 31.226563 23.585938 31.402344 23.433594 31.613281 C 23.277344 31.828125 23.199219 32.085938 23.199219 32.390625 C 23.199219 32.675781 23.257813 32.917969 23.378906 33.128906 C 23.496094 33.335938 23.667969 33.527344 23.898438 33.695313 C 24.125 33.867188 24.40625 34.035156 24.734375 34.199219 C 25.0625 34.363281 25.445313 34.539063 25.878906 34.726563 C 26.320313 34.960938 26.742188 35.203125 27.136719 35.457031 C 27.53125 35.710938 27.878906 35.992188 28.179688 36.304688 C 28.476563 36.613281 28.714844 36.953125 28.890625 37.328125 C 29.0625 37.707031 29.152344 38.132813 29.152344 38.617188 C 29.152344 39.261719 29.023438 39.808594 28.761719 40.253906 C 28.5 40.695313 28.148438 41.058594 27.707031 41.335938 C 27.265625 41.617188 26.753906 41.816406 26.179688 41.945313 C 25.605469 42.070313 24.996094 42.128906 24.355469 42.128906 C 24.144531 42.128906 23.878906 42.113281 23.566406 42.082031 C 23.257813 42.050781 22.9375 42 22.613281 41.9375 C 22.285156 41.875 21.976563 41.800781 21.6875 41.710938 C 21.394531 41.625 21.164063 41.523438 20.988281 41.410156 Z M 20.988281 41.410156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 36.753906 42.132813 C 34.914063 42.132813 33.441406 41.535156 32.335938 40.34375 C 31.226563 39.152344 30.675781 37.601563 30.675781 35.691406 C 30.675781 33.640625 31.238281 32.003906 32.367188 30.78125 C 33.492188 29.558594 35.023438 28.949219 36.957031 28.949219 C 38.746094 28.949219 40.191406 29.539063 41.285156 30.726563 C 42.378906 31.914063 42.929688 33.464844 42.929688 35.378906 C 42.929688 37.460938 42.367188 39.109375 41.246094 40.316406 C 40.125 41.527344 38.625 42.132813 36.753906 42.132813 Z M 36.847656 30.804688 C 35.679688 30.804688 34.730469 31.242188 33.996094 32.113281 C 33.265625 32.984375 32.898438 34.132813 32.898438 35.558594 C 32.898438 36.972656 33.253906 38.113281 33.96875 38.980469 C 34.679688 39.847656 35.609375 40.28125 36.761719 40.28125 C 37.984375 40.28125 38.945313 39.867188 39.652344 39.042969 C 40.355469 38.21875 40.710938 37.066406 40.710938 35.582031 C 40.710938 34.058594 40.367188 32.878906 39.683594 32.050781 C 38.996094 31.222656 38.054688 30.804688 36.847656 30.804688 Z M 36.847656 30.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 56.085938 41.917969 L 53.773438 41.917969 L 47.675781 32.539063 C 47.523438 32.304688 47.394531 32.054688 47.292969 31.800781 L 47.242188 31.800781 C 47.289063 32.074219 47.3125 32.65625 47.3125 33.554688 L 47.3125 41.917969 L 45.269531 41.917969 L 45.269531 29.160156 L 47.730469 29.160156 L 53.621094 38.316406 C 53.871094 38.695313 54.03125 38.953125 54.101563 39.097656 L 54.136719 39.097656 C 54.078125 38.761719 54.050781 38.1875 54.050781 37.378906 L 54.050781 29.160156 L 56.085938 29.160156 Z M 56.085938 41.917969 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureTemplate.png b/dist/General/AzureTemplate.png
new file mode 100644
index 00000000..c96f8e30
Binary files /dev/null and b/dist/General/AzureTemplate.png differ
diff --git a/dist/General/AzureTemplate.puml b/dist/General/AzureTemplate.puml
new file mode 100644
index 00000000..ac16e21c
--- /dev/null
+++ b/dist/General/AzureTemplate.puml
@@ -0,0 +1,9 @@
+sprite $AzureTemplate [70x70/16z] {
+xTG5OeGm58JXpPF__aTkmcFgnUfjPeN1FfnRJt8sTdkPvBsCbFSp2UrKGiox5UpzYfZtAzZx5J7lLx3tAsBUhs3lLCHSLZmLO4Cv6g1DPIg7CfMfU7eDachF
+ggt5DfKWMZEMPEirgTYOMTD6yNqbIUk0jr7niah13olWEa2eVOSOCnFinBwqIXBYM6O6ULGnT3wrAsDIpGG_g3I7EZMbo0j2t0559_AHObB6to6bab3dMOfc
+WXrKT0n9Qde-EjmzfMwF-sCmIdKmAIrWIubWgMJuMWCo8WlJZcuhkjEJaRJQ2z1QKdnJCRUrzDQhfhgfQcW_zlqobQbCPIfJcKh6jJnHtf4FLEu
+}
+
+AzureEntityColoring(AzureTemplate)
+!define AzureTemplate(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTemplate, AzureTemplate)
+!define AzureTemplate(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTemplate, AzureTemplate)
diff --git a/dist/General/AzureTemplate.svg b/dist/General/AzureTemplate.svg
new file mode 100644
index 00000000..12647d7a
--- /dev/null
+++ b/dist/General/AzureTemplate.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 53.199219 2.800781 L 7 2.800781 L 7 67.199219 L 63 67.199219 L 63 12.601563 L 53.199219 12.601563 Z M 53.199219 2.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 63 9.519531 L 53.480469 0 L 4.199219 0 L 4.199219 70 L 65.800781 70 L 65.800781 12.320313 Z M 63 9.519531 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 18.539063 37.34375 C 18.539063 38.855469 18.167969 40.035156 17.421875 40.871094 C 16.671875 41.714844 15.675781 42.132813 14.429688 42.132813 C 13.847656 42.132813 13.371094 42.0625 13 41.925781 L 13 39.933594 C 13.335938 40.164063 13.773438 40.28125 14.308594 40.28125 C 15.71875 40.28125 16.425781 39.1875 16.425781 37.007813 L 16.425781 29.160156 L 18.542969 29.160156 L 18.542969 37.34375 Z M 18.539063 37.34375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 20.988281 41.410156 L 20.988281 39.230469 C 21.183594 39.410156 21.414063 39.566406 21.6875 39.710938 C 21.957031 39.855469 22.242188 39.972656 22.542969 40.070313 C 22.847656 40.167969 23.148438 40.246094 23.453125 40.300781 C 23.753906 40.351563 24.03125 40.378906 24.289063 40.378906 C 25.175781 40.378906 25.839844 40.230469 26.273438 39.933594 C 26.710938 39.636719 26.929688 39.207031 26.929688 38.644531 C 26.929688 38.34375 26.855469 38.078125 26.710938 37.855469 C 26.566406 37.636719 26.363281 37.429688 26.101563 37.246094 C 25.839844 37.0625 25.53125 36.886719 25.179688 36.714844 C 24.828125 36.546875 24.449219 36.371094 24.046875 36.1875 C 23.613281 35.957031 23.210938 35.722656 22.835938 35.484375 C 22.464844 35.246094 22.136719 34.984375 21.863281 34.699219 C 21.585938 34.410156 21.371094 34.085938 21.210938 33.722656 C 21.054688 33.359375 20.976563 32.9375 20.976563 32.449219 C 20.976563 31.851563 21.113281 31.332031 21.382813 30.890625 C 21.652344 30.449219 22.007813 30.082031 22.449219 29.796875 C 22.890625 29.507813 23.394531 29.296875 23.957031 29.15625 C 24.519531 29.015625 25.097656 28.945313 25.683594 28.945313 C 27.019531 28.945313 27.988281 29.097656 28.601563 29.398438 L 28.601563 31.492188 C 27.875 30.96875 26.945313 30.710938 25.808594 30.710938 C 25.492188 30.710938 25.179688 30.738281 24.871094 30.796875 C 24.558594 30.855469 24.277344 30.953125 24.03125 31.089844 C 23.785156 31.226563 23.585938 31.402344 23.433594 31.613281 C 23.277344 31.828125 23.199219 32.085938 23.199219 32.390625 C 23.199219 32.675781 23.257813 32.917969 23.378906 33.128906 C 23.496094 33.335938 23.667969 33.527344 23.898438 33.695313 C 24.125 33.867188 24.40625 34.035156 24.734375 34.199219 C 25.0625 34.363281 25.445313 34.539063 25.878906 34.726563 C 26.320313 34.960938 26.742188 35.203125 27.136719 35.457031 C 27.53125 35.710938 27.878906 35.992188 28.179688 36.304688 C 28.476563 36.613281 28.714844 36.953125 28.890625 37.328125 C 29.0625 37.707031 29.152344 38.132813 29.152344 38.617188 C 29.152344 39.261719 29.023438 39.808594 28.761719 40.253906 C 28.5 40.695313 28.148438 41.058594 27.707031 41.335938 C 27.265625 41.617188 26.753906 41.816406 26.179688 41.945313 C 25.605469 42.070313 24.996094 42.128906 24.355469 42.128906 C 24.144531 42.128906 23.878906 42.113281 23.566406 42.082031 C 23.257813 42.050781 22.9375 42 22.613281 41.9375 C 22.285156 41.875 21.976563 41.800781 21.6875 41.710938 C 21.394531 41.625 21.164063 41.523438 20.988281 41.410156 Z M 20.988281 41.410156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 36.753906 42.132813 C 34.914063 42.132813 33.441406 41.535156 32.335938 40.34375 C 31.226563 39.152344 30.675781 37.601563 30.675781 35.691406 C 30.675781 33.640625 31.238281 32.003906 32.367188 30.78125 C 33.492188 29.558594 35.023438 28.949219 36.957031 28.949219 C 38.746094 28.949219 40.191406 29.539063 41.285156 30.726563 C 42.378906 31.914063 42.929688 33.464844 42.929688 35.378906 C 42.929688 37.460938 42.367188 39.109375 41.246094 40.316406 C 40.125 41.527344 38.625 42.132813 36.753906 42.132813 Z M 36.847656 30.804688 C 35.679688 30.804688 34.730469 31.242188 33.996094 32.113281 C 33.265625 32.984375 32.898438 34.132813 32.898438 35.558594 C 32.898438 36.972656 33.253906 38.113281 33.96875 38.980469 C 34.679688 39.847656 35.609375 40.28125 36.761719 40.28125 C 37.984375 40.28125 38.945313 39.867188 39.652344 39.042969 C 40.355469 38.21875 40.710938 37.066406 40.710938 35.582031 C 40.710938 34.058594 40.367188 32.878906 39.683594 32.050781 C 38.996094 31.222656 38.054688 30.804688 36.847656 30.804688 Z M 36.847656 30.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 56.085938 41.917969 L 53.773438 41.917969 L 47.675781 32.539063 C 47.523438 32.304688 47.394531 32.054688 47.292969 31.800781 L 47.242188 31.800781 C 47.289063 32.074219 47.3125 32.65625 47.3125 33.554688 L 47.3125 41.917969 L 45.269531 41.917969 L 45.269531 29.160156 L 47.730469 29.160156 L 53.621094 38.316406 C 53.871094 38.695313 54.03125 38.953125 54.101563 39.097656 L 54.136719 39.097656 C 54.078125 38.761719 54.050781 38.1875 54.050781 37.378906 L 54.050781 29.160156 L 56.085938 29.160156 Z M 56.085938 41.917969 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureTwoUserIcon(m).png b/dist/General/AzureTwoUserIcon(m).png
new file mode 100644
index 00000000..ab75718c
Binary files /dev/null and b/dist/General/AzureTwoUserIcon(m).png differ
diff --git a/dist/General/AzureTwoUserIcon(m).svg b/dist/General/AzureTwoUserIcon(m).svg
new file mode 100644
index 00000000..0bdf83ef
--- /dev/null
+++ b/dist/General/AzureTwoUserIcon(m).svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.226563 15.5 C 34.226563 23.246094 40.425781 29.445313 47.914063 29.703125 L 51.53125 1.808594 C 50.5 1.550781 49.464844 1.550781 48.433594 1.550781 C 40.683594 1.292969 34.226563 7.492188 34.226563 15.5 M 38.101563 34.355469 L 27.507813 34.355469 L 27.507813 70 L 43.007813 70 L 46.105469 45.460938 Z M 4.261719 39.003906 C 4.261719 43.394531 7.878906 47.011719 12.269531 47.011719 L 13.042969 47.011719 L 15.109375 31.769531 C 14.335938 31.511719 13.300781 31.253906 12.269531 31.253906 C 7.878906 31.253906 4.261719 34.613281 4.261719 39.003906 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 62.636719 15.5 C 62.636719 23.246094 56.4375 29.703125 48.433594 29.703125 C 40.683594 29.703125 34.226563 23.503906 34.226563 15.5 C 34.226563 7.75 40.425781 1.292969 48.433594 1.292969 C 56.179688 1.292969 62.636719 7.492188 62.636719 15.5 M 58.765625 34.355469 L 48.433594 48.820313 L 38.101563 34.355469 L 27.507813 34.355469 L 27.507813 70 L 69.613281 70 L 69.613281 34.355469 Z M 20.277344 39.003906 C 20.277344 43.394531 16.660156 47.011719 12.269531 47.011719 C 7.878906 47.011719 4.261719 43.394531 4.261719 39.003906 C 4.261719 34.613281 7.878906 30.996094 12.269531 30.996094 C 16.660156 30.996094 20.277344 34.613281 20.277344 39.003906 M 17.953125 50.109375 L 12.269531 58.117188 L 6.328125 50.109375 L 0.386719 50.109375 L 0.386719 70 L 24.152344 70 L 24.152344 50.109375 Z M 17.953125 50.109375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureTwoUserIcon.png b/dist/General/AzureTwoUserIcon.png
new file mode 100644
index 00000000..3e317ae0
Binary files /dev/null and b/dist/General/AzureTwoUserIcon.png differ
diff --git a/dist/General/AzureTwoUserIcon.puml b/dist/General/AzureTwoUserIcon.puml
new file mode 100644
index 00000000..141b39f5
--- /dev/null
+++ b/dist/General/AzureTwoUserIcon.puml
@@ -0,0 +1,10 @@
+sprite $AzureTwoUserIcon [70x70/16z] {
+xTK7ikqm20DG0qBxt_7_hslYyWhCpRIh1Pmnmax6_V488Bn36F8zP4RNoEHhl8HaNXMYK4Wk2hDs4Ycrq-HMOVm9YOF2sZopWlfHagN3d15wOw3AI7vMc0sb
+KapShzHxwU-e_8fgzsMWKOjYdO4Kd1GhFsegKVzWhckktBm9APv6IED_f4vgSKZ1gCSYNYNuU70i08Hr29M73g8zPWEH8iRyAzj1GvcU6qdwvjxl42hBKSZS
+A5WGvwJ4LQ6jIlgiS5OmAIv5cQf1JS4yJsMYp1YASLLyKjJkQQRSAEEguA3aTibI_ABOIO5AMHNrgswbRDRDdQA2XKXPgy5MqQDM9mSbDSzLKSoqXOF2q98F
+Yd9MwCc-SeZZDJuKlCN-fE1owRK1hoYfQodbW9mLGi-igkYsPLrHDS6kafgdeH23TKN9ZgBSel3tobDvAdoqyXy
+}
+
+AzureEntityColoring(AzureTwoUserIcon)
+!define AzureTwoUserIcon(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTwoUserIcon, AzureTwoUserIcon)
+!define AzureTwoUserIcon(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTwoUserIcon, AzureTwoUserIcon)
diff --git a/dist/General/AzureTwoUserIcon.svg b/dist/General/AzureTwoUserIcon.svg
new file mode 100644
index 00000000..4a5dd9cb
--- /dev/null
+++ b/dist/General/AzureTwoUserIcon.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.226563 15.5 C 34.226563 23.246094 40.425781 29.445313 47.914063 29.703125 L 51.53125 1.808594 C 50.5 1.550781 49.464844 1.550781 48.433594 1.550781 C 40.683594 1.292969 34.226563 7.492188 34.226563 15.5 M 38.101563 34.355469 L 27.507813 34.355469 L 27.507813 70 L 43.007813 70 L 46.105469 45.460938 Z M 4.261719 39.003906 C 4.261719 43.394531 7.878906 47.011719 12.269531 47.011719 L 13.042969 47.011719 L 15.109375 31.769531 C 14.335938 31.511719 13.300781 31.253906 12.269531 31.253906 C 7.878906 31.253906 4.261719 34.613281 4.261719 39.003906 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 62.636719 15.5 C 62.636719 23.246094 56.4375 29.703125 48.433594 29.703125 C 40.683594 29.703125 34.226563 23.503906 34.226563 15.5 C 34.226563 7.75 40.425781 1.292969 48.433594 1.292969 C 56.179688 1.292969 62.636719 7.492188 62.636719 15.5 M 58.765625 34.355469 L 48.433594 48.820313 L 38.101563 34.355469 L 27.507813 34.355469 L 27.507813 70 L 69.613281 70 L 69.613281 34.355469 Z M 20.277344 39.003906 C 20.277344 43.394531 16.660156 47.011719 12.269531 47.011719 C 7.878906 47.011719 4.261719 43.394531 4.261719 39.003906 C 4.261719 34.613281 7.878906 30.996094 12.269531 30.996094 C 16.660156 30.996094 20.277344 34.613281 20.277344 39.003906 M 17.953125 50.109375 L 12.269531 58.117188 L 6.328125 50.109375 L 0.386719 50.109375 L 0.386719 70 L 24.152344 70 L 24.152344 50.109375 Z M 17.953125 50.109375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureUserHealthIcon(m).png b/dist/General/AzureUserHealthIcon(m).png
new file mode 100644
index 00000000..b5bfb8a7
Binary files /dev/null and b/dist/General/AzureUserHealthIcon(m).png differ
diff --git a/dist/General/AzureUserHealthIcon(m).svg b/dist/General/AzureUserHealthIcon(m).svg
new file mode 100644
index 00000000..6ddd3607
--- /dev/null
+++ b/dist/General/AzureUserHealthIcon(m).svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 34.859375 13.300781 C 34.859375 19.792969 29.59375 25.058594 23.101563 25.058594 C 16.605469 25.058594 11.339844 19.792969 11.339844 13.300781 C 11.339844 6.804688 16.605469 1.539063 23.101563 1.539063 C 29.59375 1.539063 34.859375 6.804688 34.859375 13.300781 M 31.410156 28 L 23.101563 39.921875 L 14.789063 28 L 2.800781 28 L 2.800781 57.398438 L 43.398438 57.398438 L 43.398438 28 Z M 31.410156 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 57.152344 51.785156 L 50.957031 45.605469 L 40.058594 41.40625 L 36.609375 46.734375 L 32.035156 50.398438 L 26.429688 50.398438 L 28.164063 53.96875 L 34.828125 53.96875 C 39.667969 61.515625 46.027344 67.5625 46.027344 67.5625 C 46.027344 67.5625 52.367188 63.367188 57.226563 56 L 59.457031 56 C 60.304688 54.839844 60.96875 53.554688 61.429688 52.195313 Z M 57.152344 51.785156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.363281 53.199219 L 58.492188 53.199219 L 56.753906 56.765625 L 63.570313 56.765625 Z M 65.363281 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 53.925781 36.398438 C 50.539063 36.398438 47.632813 38.53125 46.199219 41.605469 C 44.765625 38.53125 41.863281 36.398438 38.476563 36.398438 C 33.675781 36.398438 29.785156 40.628906 29.785156 45.851563 C 29.785156 47.015625 29.957031 48.191406 30.257813 49.363281 L 25.871094 49.363281 L 27.023438 51.664063 L 35.984375 51.664063 L 40.976563 43.953125 L 46.777344 55.9375 L 52.277344 48.238281 L 56.335938 53.199219 L 61.082031 53.199219 C 62.03125 50.894531 62.621094 48.429688 62.621094 45.851563 C 62.617188 40.628906 58.726563 36.398438 53.925781 36.398438 Z M 53.925781 36.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 64.226563 55.5 L 55.242188 55.5 L 52.398438 52.027344 L 46.394531 60.433594 L 40.683594 48.640625 L 37.238281 53.96875 L 32.074219 53.96875 C 36.582031 62.613281 46.199219 70 46.199219 70 C 46.199219 70 53.746094 65.167969 58.605469 57.804688 L 63.074219 57.804688 Z M 64.226563 55.5 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureUserHealthIcon.png b/dist/General/AzureUserHealthIcon.png
new file mode 100644
index 00000000..bc5466e9
Binary files /dev/null and b/dist/General/AzureUserHealthIcon.png differ
diff --git a/dist/General/AzureUserHealthIcon.puml b/dist/General/AzureUserHealthIcon.puml
new file mode 100644
index 00000000..0500d319
--- /dev/null
+++ b/dist/General/AzureUserHealthIcon.puml
@@ -0,0 +1,11 @@
+sprite $AzureUserHealthIcon [70x70/16z] {
+rTM7qkmW28RX3nJ4nFk_thELcAqQJlkVgTlUmP9P_3byGWX9ebVvU8Yrat5CqXsXKCI5bkC4q_I555gF2utY65D8NygHlNKIsXRtColnVN7g8jTEz1N270uj
+o4dawZeAtLp7eVKuYatYScXF72Mvpi688lnW91t2NfPD6ZvSEVfFIH-UO9siEC8c7wu8NDB3bUtBf86Atti9LTJN4whaXxVBMR_KbFXpnTSath1wKMwLV7sj
+zAsYj1sorJl32HL_dRzLXBk8Am3rh_ENYYkrfzY_vi5AtPEwKyOgfNx6GnMhdybGfJhJ-aAPh2IgBzXSHG5_qPkg605qU1RhxvStoyI-b1FpBmk3_QSoVaQb
+EWAjviCG_0gdxokokmnOQmpULcSU_5P9SBcrLguZA9006dy2S4VhgR8Ik5O3U3M0vOH7Ad9IbgNQqjfz60PgQmBdbK_AskvMGX90sqdc6nggg3LNS9BQZc-U
+VBRqmu2MrgiOHDkQ531_ONI2OQaRHjhTWadQxcpr86EMjISPysfxe9Zc9-CA4CyK89vH74Or7jaoQyPXVk0B8weqmqk_
+}
+
+AzureEntityColoring(AzureUserHealthIcon)
+!define AzureUserHealthIcon(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureUserHealthIcon, AzureUserHealthIcon)
+!define AzureUserHealthIcon(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureUserHealthIcon, AzureUserHealthIcon)
diff --git a/dist/General/AzureUserHealthIcon.svg b/dist/General/AzureUserHealthIcon.svg
new file mode 100644
index 00000000..ba5a471a
--- /dev/null
+++ b/dist/General/AzureUserHealthIcon.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 34.859375 13.300781 C 34.859375 19.792969 29.59375 25.058594 23.101563 25.058594 C 16.605469 25.058594 11.339844 19.792969 11.339844 13.300781 C 11.339844 6.804688 16.605469 1.539063 23.101563 1.539063 C 29.59375 1.539063 34.859375 6.804688 34.859375 13.300781 M 31.410156 28 L 23.101563 39.921875 L 14.789063 28 L 2.800781 28 L 2.800781 57.398438 L 43.398438 57.398438 L 43.398438 28 Z M 31.410156 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 57.152344 51.785156 L 50.957031 45.605469 L 40.058594 41.40625 L 36.609375 46.734375 L 32.035156 50.398438 L 26.429688 50.398438 L 28.164063 53.96875 L 34.828125 53.96875 C 39.667969 61.515625 46.027344 67.5625 46.027344 67.5625 C 46.027344 67.5625 52.367188 63.367188 57.226563 56 L 59.457031 56 C 60.304688 54.839844 60.96875 53.554688 61.429688 52.195313 Z M 57.152344 51.785156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.363281 53.199219 L 58.492188 53.199219 L 56.753906 56.765625 L 63.570313 56.765625 Z M 65.363281 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 53.925781 36.398438 C 50.539063 36.398438 47.632813 38.53125 46.199219 41.605469 C 44.765625 38.53125 41.863281 36.398438 38.476563 36.398438 C 33.675781 36.398438 29.785156 40.628906 29.785156 45.851563 C 29.785156 47.015625 29.957031 48.191406 30.257813 49.363281 L 25.871094 49.363281 L 27.023438 51.664063 L 35.984375 51.664063 L 40.976563 43.953125 L 46.777344 55.9375 L 52.277344 48.238281 L 56.335938 53.199219 L 61.082031 53.199219 C 62.03125 50.894531 62.621094 48.429688 62.621094 45.851563 C 62.617188 40.628906 58.726563 36.398438 53.925781 36.398438 Z M 53.925781 36.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 64.226563 55.5 L 55.242188 55.5 L 52.398438 52.027344 L 46.394531 60.433594 L 40.683594 48.640625 L 37.238281 53.96875 L 32.074219 53.96875 C 36.582031 62.613281 46.199219 70 46.199219 70 C 46.199219 70 53.746094 65.167969 58.605469 57.804688 L 63.074219 57.804688 Z M 64.226563 55.5 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureUserIcon(m).png b/dist/General/AzureUserIcon(m).png
new file mode 100644
index 00000000..288ca7fe
Binary files /dev/null and b/dist/General/AzureUserIcon(m).png differ
diff --git a/dist/General/AzureUserIcon(m).svg b/dist/General/AzureUserIcon(m).svg
new file mode 100644
index 00000000..dea9f6ff
--- /dev/null
+++ b/dist/General/AzureUserIcon(m).svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 50.203125 14.375 C 50.203125 22.316406 43.710938 28.753906 35.699219 28.753906 C 27.691406 28.753906 21.199219 22.316406 21.199219 14.375 C 21.199219 6.4375 27.691406 0 35.699219 0 C 43.710938 0 50.203125 6.4375 50.203125 14.375 M 46.304688 33.679688 L 35.699219 48.410156 L 25.097656 33.679688 L 9.800781 33.679688 L 9.800781 70 L 61.601563 70 L 61.601563 33.679688 Z M 46.304688 33.679688 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureUserIcon.png b/dist/General/AzureUserIcon.png
new file mode 100644
index 00000000..2ae78590
Binary files /dev/null and b/dist/General/AzureUserIcon.png differ
diff --git a/dist/General/AzureUserIcon.puml b/dist/General/AzureUserIcon.puml
new file mode 100644
index 00000000..9711e6de
--- /dev/null
+++ b/dist/General/AzureUserIcon.puml
@@ -0,0 +1,9 @@
+sprite $AzureUserIcon [70x70/16z] {
+xPK5TiKm30GZsBt_ZOigjtgEjlmzZmDZ41qz5W09X1rZWa_0PmxdIs3YHehpsqc-Gqnsekx6-06dBE07f10UFc63hKWNp8-1UA321c4MWfriYE-rnDTR_3jY
+j9ul-lN6TzPHNqZndVsbFvC9BLDetovA2eCuZmg7w2Wi4YJIZ-zYiruvkLAaZQNmfktqbhxod0CBcZxQMVgEX4LBUpN1eOND-yRIN0tc5iPJa0KBxId8WgNE
+HCbIbG39Kk4EoXRMAz42QfRYjrcsPLksPLksvHe
+}
+
+AzureEntityColoring(AzureUserIcon)
+!define AzureUserIcon(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureUserIcon, AzureUserIcon)
+!define AzureUserIcon(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureUserIcon, AzureUserIcon)
diff --git a/dist/General/AzureUserIcon.svg b/dist/General/AzureUserIcon.svg
new file mode 100644
index 00000000..fd70d9f9
--- /dev/null
+++ b/dist/General/AzureUserIcon.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 50.203125 14.375 C 50.203125 22.316406 43.710938 28.753906 35.699219 28.753906 C 27.691406 28.753906 21.199219 22.316406 21.199219 14.375 C 21.199219 6.4375 27.691406 0 35.699219 0 C 43.710938 0 50.203125 6.4375 50.203125 14.375 M 46.304688 33.679688 L 35.699219 48.410156 L 25.097656 33.679688 L 9.800781 33.679688 L 9.800781 70 L 61.601563 70 L 61.601563 33.679688 Z M 46.304688 33.679688 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureUserPrivacy(m).png b/dist/General/AzureUserPrivacy(m).png
new file mode 100644
index 00000000..621ead72
Binary files /dev/null and b/dist/General/AzureUserPrivacy(m).png differ
diff --git a/dist/General/AzureUserPrivacy(m).svg b/dist/General/AzureUserPrivacy(m).svg
new file mode 100644
index 00000000..f50c49cb
--- /dev/null
+++ b/dist/General/AzureUserPrivacy(m).svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 18.246094 11.199219 C 18.246094 17.21875 23.09375 22.101563 29.128906 22.246094 L 31.929688 0.4375 C 31.101563 0.242188 30.25 0.140625 29.398438 0.140625 C 23.238281 0.140625 18.246094 5.09375 18.246094 11.199219 M 21.09375 26.601563 L 9.101563 26.601563 L 9.101563 54.601563 L 25.019531 54.601563 L 27.53125 35.398438 Z M 21.09375 26.601563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 49.699219 54.601563 L 49.699219 35.953125 C 46.734375 34.289063 46.199219 32.199219 46.199219 32.199219 C 46.199219 32.199219 44.800781 37.96875 33.601563 37.96875 L 32.199219 37.96875 L 32.199219 54.601563 Z M 49.699219 54.601563 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 49.316406 46.578125 L 55.039063 39.171875 C 47.46875 38.320313 46.199219 35 46.199219 35 C 46.199219 35 44.496094 39.371094 33.601563 39.371094 L 33.601563 57.296875 C 33.601563 59.464844 34.78125 61.492188 36.421875 63.269531 L 40.652344 57.792969 Z M 49.316406 46.578125 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 40.554688 11.199219 C 40.554688 17.308594 35.5625 22.261719 29.398438 22.261719 C 23.238281 22.261719 18.246094 17.308594 18.246094 11.199219 C 18.246094 5.09375 23.238281 0.140625 29.398438 0.140625 C 35.5625 0.140625 40.554688 5.09375 40.554688 11.199219 M 37.710938 26.601563 L 29.398438 37.953125 L 21.089844 26.601563 L 9.101563 26.601563 L 9.101563 54.601563 L 49.699219 54.601563 L 49.699219 26.601563 Z M 37.710938 26.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 55.039063 39.171875 C 47.46875 38.320313 46.199219 35 46.199219 35 C 46.199219 35 44.496094 39.371094 33.601563 39.371094 L 33.601563 57.296875 C 33.601563 59.464844 34.78125 61.492188 36.421875 63.269531 C 40.136719 67.292969 46.199219 70 46.199219 70 C 46.199219 70 58.800781 64.378906 58.800781 57.296875 L 58.800781 39.371094 C 57.398438 39.371094 56.152344 39.296875 55.039063 39.171875 Z M 55.039063 39.171875 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureUserPrivacy.png b/dist/General/AzureUserPrivacy.png
new file mode 100644
index 00000000..cc6407a1
Binary files /dev/null and b/dist/General/AzureUserPrivacy.png differ
diff --git a/dist/General/AzureUserPrivacy.puml b/dist/General/AzureUserPrivacy.puml
new file mode 100644
index 00000000..69f68cf5
--- /dev/null
+++ b/dist/General/AzureUserPrivacy.puml
@@ -0,0 +1,10 @@
+sprite $AzureUserPrivacy [70x70/16z] {
+vTI7aUGm34JH9bmZ_uJNxr0dKLK3IET_08-UE4tTmrq7-WqBVfGPRKU2N-LRYbPARfMqxaocqfrDSA_aG3Kx8kaNf_8LYWbNYgAMBXL7BLigyGSfVik-68gj
+a1GKyuL2L9E5eYZd1uLe53k50us6JsKYzIocuXS_tWzZu593L0R-zuRCi4ysFVtREdxCSzFJ2XNR97jA26OZcme3iwWhnwsnx2lKmwPqb1ZuYBd9gmhZk2dk
+NbLe-qtnzrXKg1Wv2_U8SAygEVWbaE7kyLvLoVVeNyLthgEXn28tKxsiyBtnHoYyG-4T2YjA_bI5ToYyG-6Ve_0EXNSeB2jvLFY4ieiDvRonGleAxr1uIS6f
+WafdIA2IhH4gIgsHG2rPAWF5bCS4kCue6ibX9gr6S1O3tOpV6MRTwVZ0jIGOWbMl
+}
+
+AzureEntityColoring(AzureUserPrivacy)
+!define AzureUserPrivacy(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureUserPrivacy, AzureUserPrivacy)
+!define AzureUserPrivacy(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureUserPrivacy, AzureUserPrivacy)
diff --git a/dist/General/AzureUserPrivacy.svg b/dist/General/AzureUserPrivacy.svg
new file mode 100644
index 00000000..439f1472
--- /dev/null
+++ b/dist/General/AzureUserPrivacy.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18.246094 11.199219 C 18.246094 17.21875 23.09375 22.101563 29.128906 22.246094 L 31.929688 0.4375 C 31.101563 0.242188 30.25 0.140625 29.398438 0.140625 C 23.238281 0.140625 18.246094 5.09375 18.246094 11.199219 M 21.09375 26.601563 L 9.101563 26.601563 L 9.101563 54.601563 L 25.019531 54.601563 L 27.53125 35.398438 Z M 21.09375 26.601563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.699219 54.601563 L 49.699219 35.953125 C 46.734375 34.289063 46.199219 32.199219 46.199219 32.199219 C 46.199219 32.199219 44.800781 37.96875 33.601563 37.96875 L 32.199219 37.96875 L 32.199219 54.601563 Z M 49.699219 54.601563 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 49.316406 46.578125 L 55.039063 39.171875 C 47.46875 38.320313 46.199219 35 46.199219 35 C 46.199219 35 44.496094 39.371094 33.601563 39.371094 L 33.601563 57.296875 C 33.601563 59.464844 34.78125 61.492188 36.421875 63.269531 L 40.652344 57.792969 Z M 49.316406 46.578125 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 40.554688 11.199219 C 40.554688 17.308594 35.5625 22.261719 29.398438 22.261719 C 23.238281 22.261719 18.246094 17.308594 18.246094 11.199219 C 18.246094 5.09375 23.238281 0.140625 29.398438 0.140625 C 35.5625 0.140625 40.554688 5.09375 40.554688 11.199219 M 37.710938 26.601563 L 29.398438 37.953125 L 21.089844 26.601563 L 9.101563 26.601563 L 9.101563 54.601563 L 49.699219 54.601563 L 49.699219 26.601563 Z M 37.710938 26.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 55.039063 39.171875 C 47.46875 38.320313 46.199219 35 46.199219 35 C 46.199219 35 44.496094 39.371094 33.601563 39.371094 L 33.601563 57.296875 C 33.601563 59.464844 34.78125 61.492188 36.421875 63.269531 C 40.136719 67.292969 46.199219 70 46.199219 70 C 46.199219 70 58.800781 64.378906 58.800781 57.296875 L 58.800781 39.371094 C 57.398438 39.371094 56.152344 39.296875 55.039063 39.171875 Z M 55.039063 39.171875 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureUserResource(m).png b/dist/General/AzureUserResource(m).png
new file mode 100644
index 00000000..41d1c77a
Binary files /dev/null and b/dist/General/AzureUserResource(m).png differ
diff --git a/dist/General/AzureUserResource(m).svg b/dist/General/AzureUserResource(m).svg
new file mode 100644
index 00000000..6c31d2fb
--- /dev/null
+++ b/dist/General/AzureUserResource(m).svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 11.199219 14.558594 C 11.199219 22.398438 17.359375 28.699219 25.199219 28.839844 L 28.839844 0.699219 C 27.859375 0.421875 26.738281 0.28125 25.621094 0.28125 C 17.640625 0.28125 11.199219 6.71875 11.199219 14.558594 M 15.121094 33.738281 L 0 33.738281 L 0 69.859375 L 20.019531 69.859375 L 23.238281 45.21875 Z M 15.121094 33.738281 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 54.460938 69.859375 L 54.320313 69.859375 C 54.179688 69.859375 54.179688 69.71875 54.179688 69.578125 L 54.179688 55.019531 C 54.179688 54.878906 54.320313 54.738281 54.320313 54.738281 L 66.921875 47.460938 L 67.339844 47.460938 C 67.480469 47.460938 67.480469 47.601563 67.480469 47.738281 L 67.480469 62.300781 C 67.480469 62.441406 67.339844 62.578125 67.339844 62.578125 L 54.738281 69.859375 L 54.460938 69.859375 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 39.761719 14.558594 C 39.761719 22.398438 33.320313 28.839844 25.480469 28.839844 C 17.640625 28.839844 11.199219 22.539063 11.199219 14.558594 C 11.199219 6.71875 17.640625 0.28125 25.480469 0.28125 C 33.460938 0.28125 39.761719 6.71875 39.761719 14.558594 M 35.980469 33.738281 L 25.480469 48.441406 L 15.121094 33.738281 L 0 33.738281 L 0 69.859375 L 51.101563 69.859375 L 51.101563 33.738281 Z M 35.980469 33.738281 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 52.78125 52.21875 L 52.640625 52.21875 L 40.039063 44.941406 C 39.898438 44.941406 39.898438 44.800781 39.898438 44.660156 C 39.898438 44.519531 40.039063 44.378906 40.039063 44.378906 L 52.640625 37.101563 L 53.058594 37.101563 L 65.660156 44.378906 C 65.800781 44.378906 65.800781 44.519531 65.800781 44.660156 C 65.800781 44.800781 65.660156 44.941406 65.660156 44.941406 L 53.058594 52.21875 C 52.921875 52.078125 52.78125 52.21875 52.78125 52.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 50.960938 69.859375 L 50.820313 69.859375 L 38.21875 62.578125 C 38.078125 62.578125 38.078125 62.441406 38.078125 62.300781 L 38.078125 47.601563 C 38.078125 47.460938 38.21875 47.320313 38.21875 47.320313 L 38.640625 47.320313 L 51.238281 54.601563 C 51.378906 54.738281 51.378906 54.738281 51.378906 54.878906 L 51.378906 69.441406 C 51.378906 69.578125 51.238281 69.71875 51.238281 69.71875 C 51.101563 69.859375 50.960938 69.859375 50.960938 69.859375 M 54.460938 69.859375 L 54.320313 69.859375 C 54.179688 69.859375 54.179688 69.71875 54.179688 69.578125 L 54.179688 55.019531 C 54.179688 54.878906 54.320313 54.738281 54.320313 54.738281 L 66.921875 47.460938 L 67.339844 47.460938 C 67.480469 47.460938 67.480469 47.601563 67.480469 47.738281 L 67.480469 62.300781 C 67.480469 62.441406 67.339844 62.578125 67.339844 62.578125 L 54.738281 69.859375 L 54.460938 69.859375 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureUserResource.png b/dist/General/AzureUserResource.png
new file mode 100644
index 00000000..c6ffcdf8
Binary files /dev/null and b/dist/General/AzureUserResource.png differ
diff --git a/dist/General/AzureUserResource.puml b/dist/General/AzureUserResource.puml
new file mode 100644
index 00000000..efa385bc
--- /dev/null
+++ b/dist/General/AzureUserResource.puml
@@ -0,0 +1,10 @@
+sprite $AzureUserResource [70x70/16z] {
+xTG7akL020DGGBI_xt_X3UpEy2sdiIO77U0LKbUrRSOZ4E7sZ3Z-9pD3HG2qakdo8QrevmJ0IaAwf1MH0IjAAUmegVLX9PvpIkTb57zMeUlF5A-kf3IBhiG7
+KfmGRLqxKFn55FLpWLAeigj8dnGheN-Or4VhH7t4Q-WIaQ5DHASFKUDH2jm-G7w2PSBMyLp6JvMjnyth2em3HM76anF8KuKx9MVSvddECmNSXutABKWvOeAC
+QNxCvCTAx8rIHcSSAZqDb-6WbVrEE31wdbqbkW-NuGnMk5C-HSa39HTz-7deeVOLMDmJ8tiPNiNtbSIYppHoxQ0CO4Tv55hvxqmqY07Nb79gdXuaS5Lfvt4G
+G5AAyK0RYbAEMvUHb4ei35KPZHmgUQRWYoe_Ieu3nSnE4MPOSJjNs64bp4uLTbffuvBIJ2jkWb9EAsL8IZcbXDtdDm
+}
+
+AzureEntityColoring(AzureUserResource)
+!define AzureUserResource(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureUserResource, AzureUserResource)
+!define AzureUserResource(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureUserResource, AzureUserResource)
diff --git a/dist/General/AzureUserResource.svg b/dist/General/AzureUserResource.svg
new file mode 100644
index 00000000..ed4d1466
--- /dev/null
+++ b/dist/General/AzureUserResource.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 11.199219 14.558594 C 11.199219 22.398438 17.359375 28.699219 25.199219 28.839844 L 28.839844 0.699219 C 27.859375 0.421875 26.738281 0.28125 25.621094 0.28125 C 17.640625 0.28125 11.199219 6.71875 11.199219 14.558594 M 15.121094 33.738281 L 0 33.738281 L 0 69.859375 L 20.019531 69.859375 L 23.238281 45.21875 Z M 15.121094 33.738281 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 54.460938 69.859375 L 54.320313 69.859375 C 54.179688 69.859375 54.179688 69.71875 54.179688 69.578125 L 54.179688 55.019531 C 54.179688 54.878906 54.320313 54.738281 54.320313 54.738281 L 66.921875 47.460938 L 67.339844 47.460938 C 67.480469 47.460938 67.480469 47.601563 67.480469 47.738281 L 67.480469 62.300781 C 67.480469 62.441406 67.339844 62.578125 67.339844 62.578125 L 54.738281 69.859375 L 54.460938 69.859375 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 39.761719 14.558594 C 39.761719 22.398438 33.320313 28.839844 25.480469 28.839844 C 17.640625 28.839844 11.199219 22.539063 11.199219 14.558594 C 11.199219 6.71875 17.640625 0.28125 25.480469 0.28125 C 33.460938 0.28125 39.761719 6.71875 39.761719 14.558594 M 35.980469 33.738281 L 25.480469 48.441406 L 15.121094 33.738281 L 0 33.738281 L 0 69.859375 L 51.101563 69.859375 L 51.101563 33.738281 Z M 35.980469 33.738281 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 52.78125 52.21875 L 52.640625 52.21875 L 40.039063 44.941406 C 39.898438 44.941406 39.898438 44.800781 39.898438 44.660156 C 39.898438 44.519531 40.039063 44.378906 40.039063 44.378906 L 52.640625 37.101563 L 53.058594 37.101563 L 65.660156 44.378906 C 65.800781 44.378906 65.800781 44.519531 65.800781 44.660156 C 65.800781 44.800781 65.660156 44.941406 65.660156 44.941406 L 53.058594 52.21875 C 52.921875 52.078125 52.78125 52.21875 52.78125 52.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 50.960938 69.859375 L 50.820313 69.859375 L 38.21875 62.578125 C 38.078125 62.578125 38.078125 62.441406 38.078125 62.300781 L 38.078125 47.601563 C 38.078125 47.460938 38.21875 47.320313 38.21875 47.320313 L 38.640625 47.320313 L 51.238281 54.601563 C 51.378906 54.738281 51.378906 54.738281 51.378906 54.878906 L 51.378906 69.441406 C 51.378906 69.578125 51.238281 69.71875 51.238281 69.71875 C 51.101563 69.859375 50.960938 69.859375 50.960938 69.859375 M 54.460938 69.859375 L 54.320313 69.859375 C 54.179688 69.859375 54.179688 69.71875 54.179688 69.578125 L 54.179688 55.019531 C 54.179688 54.878906 54.320313 54.738281 54.320313 54.738281 L 66.921875 47.460938 L 67.339844 47.460938 C 67.480469 47.460938 67.480469 47.601563 67.480469 47.738281 L 67.480469 62.300781 C 67.480469 62.441406 67.339844 62.578125 67.339844 62.578125 L 54.738281 69.859375 L 54.460938 69.859375 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/General/AzureWhatsNew(m).png b/dist/General/AzureWhatsNew(m).png
new file mode 100644
index 00000000..03ab16ca
Binary files /dev/null and b/dist/General/AzureWhatsNew(m).png differ
diff --git a/dist/General/AzureWhatsNew(m).svg b/dist/General/AzureWhatsNew(m).svg
new file mode 100644
index 00000000..b1ea8b16
--- /dev/null
+++ b/dist/General/AzureWhatsNew(m).svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 35 3.855469 C 17.796875 3.855469 3.855469 17.796875 3.855469 35 C 3.855469 52.203125 17.796875 66.144531 35 66.144531 C 52.203125 66.144531 66.144531 52.203125 66.144531 35 C 66.144531 17.800781 52.199219 3.855469 35 3.855469 Z M 32.839844 14.933594 C 33.703125 14.03125 34.90625 13.527344 36.15625 13.546875 C 37.472656 13.546875 38.589844 14.011719 39.503906 14.933594 C 40.414063 15.855469 40.867188 16.964844 40.867188 18.261719 C 40.867188 19.558594 40.40625 20.664063 39.488281 21.578125 C 38.609375 22.46875 37.40625 22.964844 36.15625 22.945313 C 34.910156 22.96875 33.710938 22.472656 32.839844 21.578125 C 31.925781 20.664063 31.46875 19.558594 31.46875 18.261719 C 31.46875 16.964844 31.925781 15.855469 32.839844 14.933594 Z M 43.851563 55.761719 L 28.488281 55.761719 L 28.488281 54.667969 C 29.746094 54.628906 30.679688 54.261719 31.289063 53.574219 C 31.691406 53.109375 31.894531 51.871094 31.894531 49.863281 L 31.894531 33.253906 C 31.894531 31.25 31.664063 29.96875 31.199219 29.410156 C 30.730469 28.851563 29.828125 28.53125 28.488281 28.449219 L 28.488281 27.324219 L 40.414063 27.324219 L 40.414063 49.863281 C 40.414063 51.871094 40.644531 53.152344 41.113281 53.710938 C 41.578125 54.269531 42.492188 54.585938 43.851563 54.667969 Z M 43.851563 55.761719 "/>
+</g>
+</svg>
diff --git a/dist/General/AzureWhatsNew.png b/dist/General/AzureWhatsNew.png
new file mode 100644
index 00000000..37f4e28c
Binary files /dev/null and b/dist/General/AzureWhatsNew.png differ
diff --git a/dist/General/AzureWhatsNew.puml b/dist/General/AzureWhatsNew.puml
new file mode 100644
index 00000000..5e1eda4d
--- /dev/null
+++ b/dist/General/AzureWhatsNew.puml
@@ -0,0 +1,10 @@
+sprite $AzureWhatsNew [70x70/16z] {
+xPS7SiLG20CDIDp_nkd9xqWkK-Czm9hcDx2ivYJ1_e6es608z0F8bL6mdmC_eke1qnFicJ8aQ0d336HNEDacC2I-nfS0pzBaAWakvNAYYJ5ocYLcFsCADDqv
+kMJVJp3pQOmMY7oyM3hC7p0kTT7jxbTmJBZJ75hc52f5LKn2DCW3ObPCH6rDGbbO5o0Vh3HUnfHTmX2ljBJHP_gM7j2MECIIXrZgj3mb3xNma7d1BekpE_b_
+OpWM_TZjiQHuCJsBU88y2vSBsoqf5WRF8ZO6pr9YU_4iOdtnB6Nk_lDdn5hdMLAlP7g-oxjdMDTd5wsz6MhvKqMvQ7nYUG5NIdP74_9ar72PYJR00OSZyu0Z
+jloZN3XC0Y8NboZU630e197rGMOi_unt
+}
+
+AzureEntityColoring(AzureWhatsNew)
+!define AzureWhatsNew(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWhatsNew, AzureWhatsNew)
+!define AzureWhatsNew(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWhatsNew, AzureWhatsNew)
diff --git a/dist/General/AzureWhatsNew.svg b/dist/General/AzureWhatsNew.svg
new file mode 100644
index 00000000..5645e016
--- /dev/null
+++ b/dist/General/AzureWhatsNew.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 35 3.855469 C 17.796875 3.855469 3.855469 17.796875 3.855469 35 C 3.855469 52.203125 17.796875 66.144531 35 66.144531 C 52.203125 66.144531 66.144531 52.203125 66.144531 35 C 66.144531 17.800781 52.199219 3.855469 35 3.855469 Z M 32.839844 14.933594 C 33.703125 14.03125 34.90625 13.527344 36.15625 13.546875 C 37.472656 13.546875 38.589844 14.011719 39.503906 14.933594 C 40.414063 15.855469 40.867188 16.964844 40.867188 18.261719 C 40.867188 19.558594 40.40625 20.664063 39.488281 21.578125 C 38.609375 22.46875 37.40625 22.964844 36.15625 22.945313 C 34.910156 22.96875 33.710938 22.472656 32.839844 21.578125 C 31.925781 20.664063 31.46875 19.558594 31.46875 18.261719 C 31.46875 16.964844 31.925781 15.855469 32.839844 14.933594 Z M 43.851563 55.761719 L 28.488281 55.761719 L 28.488281 54.667969 C 29.746094 54.628906 30.679688 54.261719 31.289063 53.574219 C 31.691406 53.109375 31.894531 51.871094 31.894531 49.863281 L 31.894531 33.253906 C 31.894531 31.25 31.664063 29.96875 31.199219 29.410156 C 30.730469 28.851563 29.828125 28.53125 28.488281 28.449219 L 28.488281 27.324219 L 40.414063 27.324219 L 40.414063 49.863281 C 40.414063 51.871094 40.644531 53.152344 41.113281 53.710938 C 41.578125 54.269531 42.492188 54.585938 43.851563 54.667969 Z M 43.851563 55.761719 "/>
+</g>
+</svg>
diff --git a/dist/General/all.puml b/dist/General/all.puml
index 206faaf5..7e06edc6 100644
--- a/dist/General/all.puml
+++ b/dist/General/all.puml
@@ -1,11 +1,287 @@
 sprite $Azure [70x54/16z] {
-fPK9hiCm24IDLvZx7_ZB_LsiJafmyhHqHOoV4KaXShgFgAJR5ElfDXMu7wK3CuhqMqe0JBSDrmrd0p3cEuDUzWeyesG09LsYOJAUTc3f2WFlACa0e5tpEj7d
-RKzaVzJmJrbYZVrHMw88dfJTKLlh6fxOhfArp80dRM_KdjJ75_WWcqecjfnlIt31GbqEj2NOA4h1YgO0ZQCCWBxq4ImOVHKGJ7qRfvlqBRL83nJVvEIZ72M3
-q0sr41gMa60nyF4DZ4bKBOHCXGJdepzs799ZQY5qof3WYfL1iaA2nNv4pZZ2_FN62w361MV7NWiBLazUZmZcrCNfuUmhEscZ4S7zh8iOcEQgLSU-iw-KeZ05
-p73KMcHjS3-BRO_k2cvUb9NX29Ru8bCGSjp10ikG1HVAw93jXs1peaJkMqajHM7guRxANoGNoTKs7WXCBcrOU5ynybLFvDFwhZX5VzTNfvu5iy1OlJyUSeK_
+hPK7ZiCm30HLJOdx__TU4S8h2m5Pbq5pzsH2o4cYfWSO3pobp9bkKnttLRfZgLYwWG5etqPewIfv0YyLUBwUvAMI7B3BIKAb0K2vcYHKHZplV9A5hvruu8Ka
+Y_wzTs1nDd1p_559iMTNaeHAHL1E91a8d1wg1owE_ogP3eX9IAKZa0DN_E5OXoO2EV04lxWWa0DtLebXKGD7I6uGX_J0HYeKIWjSDrSFC7OYBOn-enguameT
+KmBpQutqAB2MrakYOT42rrt2Xa0CFBaWpPmGc3CQ_KuXCAMbTmseWVcLWzPnAJ2dHILDCV0a5LhzjC2TLDZKXS3iF1FJbS06Lc6Ezu6hC0lsDl1abHtZJU2k
+ZUNS1zwdHPCM3WviYWgF3GUkq5JsOsFxj2ujgVnNT5bbFpPpbyob3nO7DlzFLx_Z75Ydj6Fi0glarcqwzbJX_ihtWvdNxcVwfViPtnMqSPRq29y
 }
 
 AzureEntityColoring(Azure)
 !define Azure(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, Azure, Azure)
 !define Azure(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, Azure, Azure)
 
+sprite $AzureAllResources [70x70/16z] xP4x5iGm3091tlkVUNiUNVx9J2d19BRrBU2NICxHaYPdti621GiMB5CjTyL9cQdDJhbTB5YmO5d1z9bpPjsLIShCadDspXjXmO85YvCsQwEd07y
+
+AzureEntityColoring(AzureAllResources)
+!define AzureAllResources(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAllResources, AzureAllResources)
+!define AzureAllResources(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAllResources, AzureAllResources)
+
+sprite $AzureDeveloperTool [65x70/16z] {
+dPPfqWCX20KVg8ZtF_2tKh56CQzC_qxtB2ePO2Ab_b0K7zF6F_PnmqPW20ZbM701HxeR5lf5eRfxnxd0B_-38Y_mzr3ybvQMHw0u8kP_21B48z39vTqhKepT
+WeRVaUCZQCW9FzwWOK46MGWBF_g-5kfu8SZmu7N3RNy5WRvx0-KLM0h-FY3Jdx-lcEYObBElc85deOs97logWXV-k9PM7nF93q3Bzhx-oXPsuDoVj-oBd1wd
+p8UE8ow9RrZffC1yb76cOsBXxzWuOvkVuGVRFGh4XtZkYyQPpdnUS05AxAOMy-DCsttzFzkD-O7Qxei1PVgKqgpttgg7Bs7LpIUeX_-38Np11Jfw-EwM-9pI
+0NEV22uHe2z-mIMBtuRX2l690R4dBsZ-B9JBWlY3TbkGxayAK2yAnHVw_0VXScqzyUF3WnUg1vcV5xZ_7Btbwk5Dzz5TBloQZlvovujgpuOLk6-dWUbA_41m
+Kr3V04Y1-0O4cXI4-cuW1U9x0IbS-AGWdb3vLu0ByNc1-BnW9xyXO0L0ElKdTQmGdnTWRpSGBq28lz6sTq1yKa0K3ZulRFkuWsFhJjAJpmkAA2m-ewrJfOGl
+21XIcxMopKF1vnJYS-g7_ZS
+}
+
+AzureEntityColoring(AzureDeveloperTool)
+!define AzureDeveloperTool(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDeveloperTool, AzureDeveloperTool)
+!define AzureDeveloperTool(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDeveloperTool, AzureDeveloperTool)
+
+sprite $AzureHelpAndSupport [70x70/16z] {
+xTK7KiKm30HGsoekoVtFIx3YC1wboNJ8Jg4_fDKlxYo1Oigvv1mPt5Wyvx9bckSq0FaengOiALQ7ch4fDScR1YajESKOKvxNJ70VIQiGiVrlYDFgu5qaYy7z
+-BGwQ9aa1VMJACojfQIJw2G1405MaQGRVurWHLZ6Gf8mIqDGcNop59a4g8MNr3xmNZLSEv6fg5EOwi_hJdT6oRK6eavfJ7bbw5oXRH_K2bEhffmhgOqIDB8a
+j672wK9RAxIhS3itNvuPPHIjo31UZdrreR2reXLSLvekQr4B4NShfNc9FrMa5d-cy5Mz-LBnpj77AM1MkDleMg4bA9_O5HqyKD2aX0Cbc1HtT6YR4dQLO5GS
+xYZah8hJ2Zb8Iuf5yQWG6MDkYccfxSXAiOmZXdUZYhoh4SgxshZoHBsgXFEdAFaxJsJzQvwxt5JGzQ4XXVh71B9PqJjv7bN8lONjYgu6xOe-Dx1PqTLujYjw
+9x8h-jp8xrNOgtr65FRy4Gh_OiM2FCgZN22FyYWl
+}
+
+AzureEntityColoring(AzureHelpAndSupport)
+!define AzureHelpAndSupport(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureHelpAndSupport, AzureHelpAndSupport)
+!define AzureHelpAndSupport(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureHelpAndSupport, AzureHelpAndSupport)
+
+sprite $AzureHome [70x70/16z] {
+xTCtOWCn44DHfbtW_YTsPpWeWL0MVqdEl6xA6xJgLq6071a0a2CG4o94pH4mORPlHCmC8eMi0IA5BK90CVC8A6OUaS9k8Jj-As8YH8oFI573HwIeRGe1VKQ8
+59yHSbpXxYFW4SP4J0QuL26E6HM6GbW8U8of1W8QJ8MjY15YAAecY6gN8U2bJCEymYuaKDY510gxa43XA1svmj67sYv7skzAKJsuw8SfIs6kz5hrEQQLNv-F
+KvQobAKqKtd_Lby
+}
+
+AzureEntityColoring(AzureHome)
+!define AzureHome(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureHome, AzureHome)
+!define AzureHome(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureHome, AzureHome)
+
+sprite $AzureInformation [70x70/16z] {
+vTP9UiGW34HX41hg_YVEKcbYokMllSjRPlWjy3Z-ONFEh_xTyrUnnlCiB_9dHkGfUy7GdPKtXO2aaAcRoWjvDJo2UEezHTmZzmgfBgUlj1ax0eIyiNsvneu0
+hf_YFiQE0AOYFVPV153FSKzzWI38A7oM0ZeJRy2vxGi-ga-baWyp6_d8n6T1MEzQOQ-UtCYDa65CH_QYbUT8HnGTWTqjA5RdEEHtZvMOFUx2eHGMD6yL24hS
+ArFOt7l5Nb7McyhyJl5xfMHb40GlA0NekqiGw6UQ8FZsgYje2drU0ffIx5q4LGdob8AihADIq9NZXqj1Lt9qEw8hww0KdYY7Bw22hknVGXiYAzUVOtNwCoEZ
+TD68hjJb5naPURBRkRCiUdqN-sKN-5FzMlUCukjfXX-hFf4v2AFMo5Q2nNTMduOlftCPeLa9I110NLKP1wHnV8XPCaFF0XVb6aypJw2h80HlsbhklcoEVzOF
+}
+
+AzureEntityColoring(AzureInformation)
+!define AzureInformation(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureInformation, AzureInformation)
+!define AzureInformation(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureInformation, AzureInformation)
+
+sprite $AzureManagementGroup [70x70/16z] {
+xPTdmkGe34G52YNi-zztr-uMOqOuV9FJ--KYF497qT_7FugvqaCgm3H3s_ymFSDRQwYfcRsTMShKig4qKD5sa4_PbcL1aalRSHaF4sqZlBonf8zrQtYzzVrb
+oQZ9Tz2i7AM54ctv15D2Nnvd8iHJHfO3JfbYRQVAxb2QWUK81Vbb0VfXCZvOAfs_pRQZLNfYAHTlm7PXiNIY6RYny562Bx3a8zKljaXweR_0Ke4kWNwXfG0G
+Hckk5O1ycSK0FMmBzKii2XXr643vk4K0Aoa_jkIryzxkBTNS8PDxCC1qwtjWqMNTQE3yclchpykTHTOtJWbPSj_Sign1JPQs1d9juRLZwKHhnwyjkdP0GLwX
+NLlacrZgsb4AyftPjOKy1YwKiDvNRonbUGzaohIypRc5UDabHXDgMxO-F7ZlmbKSe0a2g00eTvO2s3wSAODDpe3SMGJWS8tq-G1kB354WPei1fHOwD8Isws0
+qa2qfOqcIomN3mEnltYOMyOjSBvVmCPHSqiH0140IALEOKFt6Y1yOb7Vw9rRi4ZY6uKE8r6o9GPwdCXtR4YWdTfJjlXEB8WXsJlL8N6sbB2CJiwfho2tUncT
+c5fuOh7Xj3eayHTZAjtYtL8GY-_CKd-bZsap7FzZAg250layMSqfIfdqv_sM_3SUX2Wale1Y_M9jA2xkoQLCJSN5O_8qRS-FbUkZt4QNv5gDR-l6JAuR4-8V
+jA1CZwgGBwYdVm_-yHy
+}
+
+AzureEntityColoring(AzureManagementGroup)
+!define AzureManagementGroup(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagementGroup, AzureManagementGroup)
+!define AzureManagementGroup(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagementGroup, AzureManagementGroup)
+
+sprite $AzureMarketplace [70x70/16z] {
+xT5LOjWm48JXMHhjtl_2LTeO6fCSfl_9-8bmc3CpMoXW7cIOu7QUzLWsFXPtdLQh6gVqDf9XgfxLeufQt6LOLHJqdEt14VIKFGodLHMOVlJED3ma91sZHLLE
+vyI0JPE1tPbCLZd-Hb8tzuFDOml9VtEBUMw6iQGhM2jUnLdnbolsjPLVHUA_I3wzPpp9Un5XMDAy7NkPoK-gsBELzksKn9BdNhzAVBGYbuehUkfjJE6kWJb_
+jg9OfUskiaLwSgJecM9uabqhc_asRE8zfP5fsAJxYkqgBZZeKicf9ZYCmuhWkDXLVAiuJl9H1NY5kH1dSL09d2N67IKm9KDABqQKXglQW9A2YtoZSAl4InJD
+ASLv75BIS9RcHcbxBvEAmon7bLuxAFDKiRpNwolvoehdNhzAl4IHpw5KlOBIgjSmnUSfrGkyKCcE69RKF8AjtLEgKh2RY5edoKkHMSH8eXEvOx8Szvf8Nyso
+ALRz0G
+}
+
+AzureEntityColoring(AzureMarketplace)
+!define AzureMarketplace(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMarketplace, AzureMarketplace)
+!define AzureMarketplace(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMarketplace, AzureMarketplace)
+
+sprite $AzureQuickStartCenter [70x70/16z] {
+fPK7akiW44Hx8aXx__j-CnzfR0e9XrTvmzlkNgOC_8uuVeIixdyxViAs_U_1zgiYS7m9rr04E_qQ8opVEKAHL7oETaSY-1GkssZPlt0y-B6GROrQjfSeZ4-G
+6fBYxjktXQYSZbTD-IH8EAftKhD_5MJKr0yMoI2f-N1R-n_4L7NGV73E7Wv6GFQYsHLlGT76S29fsT_TLc8HRJfk0E0kUUXtmmKagi9CQ6X8h3awTAPfty4S
+yHDJrf0u0HnqpH5bOynGVw76hcvDaY3-L6dVmWJsgSJbsI92eEieP1SIPr0wH1YKKHP1Kf8M2HY8QRVL8Ybf22WTaIM-gsj9IOah48uEWSlqlsoNaW1WIVeh
+eW-I10myHucZiAN43qc6GKfWipxY8tMGkCKTXUEY3oqaWH62Gw9lBLjzHCD3udNstcWbISnwq8eHKH6reOzVKdAK2IHFFrRk9O8RsBBFdSHm3qUVXSInn9xw
+b39zZ5YYRYdflk7CiQGDOoaPD5iWwoGFLBia62NhMIGa8fAIyZ9iK74BTmaJpoKTmXsdX4Xk91klHZ4H8IAkDv9DSGqTKIQIkZrZgoXJIKb9O8ie8d98gl2i
+pUBnQkzpI9fkRBEsz2WfUQ13c-MputFQSaXOH0V7wWJqMALfGY8Fp9jojE2I8qh3fGK9YNkj7nMAA45tg3UrRIDqLyWYIY1743TWpEAhGiz13Waa1OihehCG
+ImPnHQEy-t0v2Wcdeo40nZ3r_ePKEchZ1tDTzmciMzBXZ1DTzSbnKz7B9BIwe1nNxLJe6BkkHWdO4-D9r2wXjomcZ1csaWJYPietBtknoOgq67x5jihu6HEi
+-0S
+}
+
+AzureEntityColoring(AzureQuickStartCenter)
+!define AzureQuickStartCenter(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureQuickStartCenter, AzureQuickStartCenter)
+!define AzureQuickStartCenter(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureQuickStartCenter, AzureQuickStartCenter)
+
+sprite $AzureRecent [70x70/16z] {
+fPTPcYen24R354Xtw_wNUorJ0r86AzxpvdG--54JoXWWaReXZ6KUadg6OKQ1KaVmvJ9gPDw3YU2oH-e556OA4QRd-m79syqiAuUzWeQPsuCwBETpwzGb2wEk
+1WwYqBEjO2gHuW1hpOg7DD4CygZjWOItRXeOJJYcPekbnYb4JPnEARcbWzRHua4NIMg9cfSF-4foIzJWEPIIM28KUq8VhEad2_PtIDTmwAUFM9lc5jn6eozp
+ejTajTdGuYK5NmBs_NGD9POkyJs1IuLTS6aju8rxCNAUJsRnSDSS3V6anHT3UxPbqkAJgLb3kSMFQMk8fYs-9GHNIcB9MsBwFmlrO7eiygq5R47Td5DB7aot
+uDSMTHOOM_vkjz_4KfsbZC3R_S4Vf4Fo5baeWP_xan-C7rw8bZs1E8BxIZE1ucWB9yi0t2qFb27fA4ltrYMtrb7AqiMHHTTSsawbeON6arualyrZVFhM9R-0
+3WX3eMhUmz72BjuKKjTL-8DHz9OSO3rPk3TKGhmv84jd1Y5SMYqoSIzdEApRYUI2cOUt4n_oMUVeVk3NxukXuuZbKxwGVl9KIYyW5iDD4acpM0hwco7jaePP
+58T6jsn3CK6IQsGxfJliDPPAUWd-TDLunUIGRGgSBfauM6Ooz7pXbKGZRNo2cBxT9IYrH4bS122iHha5r3eqsXZbimLjXPCj6eF5ejRSAZ7MI3Pir4JIctAU
+t94im-1Mvefl_tXjXovizi-AoLU4Nk7tu74unxkhF71FX4ZISYn5ySffaKkKBfywGwP-iVIs7cKeao2_c5HehFW7
+}
+
+AzureEntityColoring(AzureRecent)
+!define AzureRecent(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRecent, AzureRecent)
+!define AzureRecent(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRecent, AzureRecent)
+
+sprite $AzureReservation [70x70/16z] {
+lPS7WkmW242bgA1cxt_SFoKi6aVp-zkQzW9ec1Z-6qm4Voo1yaGJ_veAEU7hBt5CYRaO4dzA11Ipb0S83y4JinWPV-9wWymH8r5njXxGCg1FIpnhYkL2NkHr
+FLE8iJj8dB8ED_afJGep66KwOQ-XnJd9euLxZPsoyUZYdEnv1mT4asz0GDbgKZS8lLjLsIGluaOJYnE3em_IO0caPsqc2Ot5DT5W0SWCJ_3KvCMqUqS4qDed
+2rU1DsTn-6Db-HrJ27h8P04e5U6DtHLx2VjSedU-hS5aIJM1WHzAersQ_9AbHXSBG2u8OF2KKnpc6lkHqG88JaYNgGMJTc4PqV6gQ2dkB331Op3w_GG2_wG5
+VRZF-f67eaV5pnRe8IremTZKovuVbgFfdGMbrenM6HkK8JskxPC5Ed8LWXV9xq-NvWLt5cGuGKyfpjrjRt62VgVnhdJOMg1ZddbWPP7ViW1R7h3kwJQPDCC2
+igQ6zizdqjU3Xh30GdZhQ2DvK1UQO8F4NRUPERxUvDqWIM-X_63KqTT9ayHTFF8WFoqoME0rRH_mOE5lYpx8aQmSZpDriEmoGhDKVUCXZHdHjYxbj6Y7yCMI
+pS8B2zINfEW0JoCD-_aIKYb2o4dKIIRnoMP3lW0CYjaiSNm2s9v6tKgCCoH1E4bML7ykznOt-IXr_O3tvPr11CFxWVrxajkD14hBLfPkPAHBARQZqOr5sb6v
+ImZVLtg7IPUFW5LNEThxRpSmK3mOnMrL38u04F8mrMnh0hRW-3vgcxzc2MAL68AHNxFmzTuultf0vJ1d00xgrFRJz9PMZZY5Ke_e6_BXdLSl-_Ye9a52ow5L
+CBA7xz1bZL0RcILNWfDovE53SMe5QTGK3J1Ri4QJUEm3SZamMvnJKd2vw5EwjSXw5MKQInOCpWWTWRLuPJSQPRDC1Cnb8J50oedmtc6Is-LQGWYZ0bZyC8OD
+N1nDZ716YHnbiQBUPMMeYeWMm-fs2slPao0OUy-VEGpAvICQ9ySUpbf696Bu3O1Yol8WfyGO_Za_
+}
+
+AzureEntityColoring(AzureReservation)
+!define AzureReservation(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureReservation, AzureReservation)
+!define AzureReservation(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureReservation, AzureReservation)
+
+sprite $AzureResource [70x70/16z] {
+xT97ciGm24HXe0JI_IyyELK7ZD5oNAkElpy_MGw76IgRqrXlypt4rzT6tnZhTzDwXir52-q6uNax26zqW_2cTOFmGhj1UDu8qiY3LTkqHf0qJnwabMUiqqCt
+26ygAtErvjqRoazS_QmHMZZezYE3kWD9DjhF2eQcUV8W-7hZ4U0yzI06u4TX1zNJLO2LSAlaSJP8-HpbYSCWXeVAVPuyo3E57QH1CYLSAKyIv4wXqJKZ2P8e
+ztdkWzGKTW2-cRB2UKYiAPo7PoWfF2H6hl2CWdGKpWDiAE64T9NufygbNCgbO4yn-PpwXgBoC-ig9ZJK5JPuEauh352Uci91UAWh9icGARd1UGgA74_zG54f
+3PbYKXw2bOP1ULYHipE_KrGQ0oicpOtmBoKtNW4
+}
+
+AzureEntityColoring(AzureResource)
+!define AzureResource(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureResource, AzureResource)
+!define AzureResource(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureResource, AzureResource)
+
+sprite $AzureResourceGroup [70x70/16z] {
+xPS7hjmm34JPHTt_m2c20Nd7ZCtWewJueMvxyWotaVukNfY-ZkOST4566bsmEPqAPCmVA5vTv0-64Z1_SBLpp5bOF0y2mkRyoH0wOpaN3X5F-8T7ZXS4mrse
+bf6VsDt1FEOY5Gj1XbObfEuBkPnK4Wm3MJXnGZue1C7crglD6uNSrUChoC39iES3Gt1Q2xufvBcUE2odd2Dxs9rbP1SjB1YeLmrQDXpzF6Xf3HhVCcW1j3UV
+sXBEKC_THqbKQak4FTIp7rVzjIL2ePuwZEYz9LmW5avtEPuiSQh7SwEdC8-MXK8zK4Z30XuTK4ZJWh4ie92-vJnr2DEnOAoDQjU2246OjWNg0KVJWe3a2nPj
+MbxBQtajPBzbOQejnDwsoDtlj3GjJx_ssh0mWIMlV_xjmIBNbM2PGCEEbjgn_xaBR01O3rhe4ryl3t9OBWwqj31L6qNIMhkgdObjMo0Ch063SRd0UhO57Hnu
+kcuhrBCjMCWHngk4e27pPSD2A7QRHTj6FOh9xh9IgCVOXI1YGbtCwA_YvJi
+}
+
+AzureEntityColoring(AzureResourceGroup)
+!define AzureResourceGroup(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureResourceGroup, AzureResourceGroup)
+!define AzureResourceGroup(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureResourceGroup, AzureResourceGroup)
+
+sprite $AzureServiceHealth [70x70/16z] {
+xTP9pfnG34NXuuxzxpWTAgj2u6BfaVu_uwTF5u_WtyuZwskPRfpbMTlNAiCupQBUI-UGvVPUEJ_MHfV6UsrqPSUfTLRGsNPMgY5Tl_Bjl1eWpSHscKQQQKIl
+iLAbHlesfSlSTDxVezhk0gXb9I3MbGtg0SNj2ILZHUdo3rBgvol-X9Ba0ueJwzTDiA4IQWeC5LTJ84PA8QVW8oL8DGL62jZr50Doe2IGbrFI8GQA0NOvfGBi
+NWa0ucfA5N2h57jvCQNA8EuKevdpAHNWDuhJsI70Njgks2k_HC0ujky3yl3uY2Z6-Zvn-3KG2EJtrLxiVow0rvv48EiiO7-j3ujc3BA0r0YQ2N301J9W4W04
+Cc80I86C60TS83Cc085C6KY1J1bpWOoPKCYSKSYSKSYSKSYSKSYSKSYSKSYSKSYSMKAQMKAQQMI9QMI9QMI9QMI9MKU0R6GfuxVsqMS
+}
+
+AzureEntityColoring(AzureServiceHealth)
+!define AzureServiceHealth(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceHealth, AzureServiceHealth)
+!define AzureServiceHealth(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceHealth, AzureServiceHealth)
+
+sprite $AzureSharedDashboard [70x57/16z] xTQ35KGn54NHEAV_XWSBtpRkBY1yOW4HRqiUo7Q0euSp9VTVnGomxrn5gsWLhK8OCdMLORTS9LPa8CMAHN-K06zAzc6hQ1MjCZo__5S9jkGuY8Z85m
+
+AzureEntityColoring(AzureSharedDashboard)
+!define AzureSharedDashboard(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSharedDashboard, AzureSharedDashboard)
+!define AzureSharedDashboard(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSharedDashboard, AzureSharedDashboard)
+
+sprite $AzureSupport [70x70/16z] {
+xTK7KiKm30HGsoekoVtFIx3YC1wboNJ8Jg4_fDKlxYo1Oigvv1mPt5Wyvx9bckSq0FaengOiALQ7ch4fDScR1YajESKOKvxNJ70VIQiGiVrlYDFgu5qaYy7z
+-BGwQ9aa1VMJACojfQIJw2G1405MaQGRVurWHLZ6Gf8mIqDGcNop59a4g8MNr3xmNZLSEv6fg5EOwi_hJdT6oRK6eavfJ7bbw5oXRH_K2bEhffmhgOqIDB8a
+j672wK9RAxIhS3itNvuPPHIjo31UZdrreR2reXLSLvekQr4B4NShfNc9FrMa5d-cy5Mz-LBnpj77AM1MkDleMg4bA9_O5HqyKD2aX0Cbc1HtT6YR4dQLO5GS
+xYZah8hJ2Zb8Iuf5yQWG6MDkYccfxSXAiOmZXdUZYhoh4SgxshZoHBsgXFEdAFaxJsJzQvwxt5JGzQ4XXVh71B9PqJjv7bN8lONjYgu6xOe-Dx1PqTLujYjw
+9x8h-jp8xrNOgtr65FRy4Gh_OiM2FCgZN22FyYWl
+}
+
+AzureEntityColoring(AzureSupport)
+!define AzureSupport(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSupport, AzureSupport)
+!define AzureSupport(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSupport, AzureSupport)
+
+sprite $AzureSupportRequest [70x70/16z] {
+xT47bkCW44NHNndAtlzw1o5BjEBaxDVH2lT0WT_VktTY7YN2JR29BMghXEApQPHNDQjXpMg-UZoVGRXBcZ6Kp2heIJTMvVbmN6Ub5sxcCR_eQEdyVmttA4rf
+LLpbdL12Z-PDAE2TS5wkToVfPYLEMAF8B81bgp16qHcSfQLboocvCG1FcMTIkYhQwjSdfk0OzPMCKyei0ZYm8AmsvUxyOkHyFq60bxbi6URzL0R4vhobG8uz
+xPUY7HbAshmK7uZvb46UBJsRIan_Def3iyLWsoWkoBFZZZvQAbj54VDKTASuxDd2hj8IZANKhj1hGsHxHVXalbnQ1Dyfw8f23efXKWoRP5PYgnHGjWHwK1oF
+flY90fIzmlDmzO1u7szWa-wLd8exfLugiLLyKUIh5BjG-A3ecSBM0dYlaBS8E2Wqb6E-EMZ74XyE-av1R1J2acuLCEUDGl51CM3FBFjfn8q2ybLnV4nMn82X
+NCKMJQb6auaHYKwA4exAVOJJxfKlZtk47vxOcW0ZKfMbxGkw95YpCkBDd4URwxvcvqfSA4POyojbv1UAOaclbP4inbQnzRhVA2DwJR0hXz6GVvaIQ54zA8Of
+krT61Y3og2W0yIzLga1pA2C1-PShbVDKSVOlLx9tL7pqUvMtKlyRnRzAoRct8gSF2ukEH4HF4dnrxzvz0W
+}
+
+AzureEntityColoring(AzureSupportRequest)
+!define AzureSupportRequest(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSupportRequest, AzureSupportRequest)
+!define AzureSupportRequest(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSupportRequest, AzureSupportRequest)
+
+sprite $AzureTag [70x70/16z] {
+bT47ikGW40HHPA6O-zztHQyXVYbobavvz-JAVzkFuppFwxhkftfl9LiWzKV6P15cyaXp9eyqZLgMsMz78cDII9NQNhORdeOHVvIujadrpJ3YIYkZQoZrM4L0
+kKFPrv6fj2UfthzNd_csZ4obMQOm4at4cGHoEn99p-nOH-uteXuP0uWfXWIpBo2WZEjhVInDXX1M0WccEUC8A-gzZbeeroBYIlkXdEl8LFJKUrVCkzuA8rFf
+bjgHGEf4ZDaJI9s8TIUG-aO-KU_NCXAA3046aL0aGtfhCWQGgSYKWGJJ9mF8J2z5RHIA9h9zHK1HAAtCpk-8Av-Xz51gSOOHLpv_v_qkpZ12V_hrhqz0fk9E
+7vt56KRKgQCummWhU_4kH5ZP7DaO4Ii9X9LYCI9MvCh122kjCEC8ArTXHgyOGKRl4456h33YZ5Xn13l5YYDSPIMFU4a4oY1b9mMG90D8aW4aoG2IP019Ce0a
+6K2I32191f0a0qYI0IJ9099a04aoW2GPG9AC8Kc6aJpZI9u19Cki8By
+}
+
+AzureEntityColoring(AzureTag)
+!define AzureTag(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTag, AzureTag)
+!define AzureTag(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTag, AzureTag)
+
+sprite $AzureTemplate [70x70/16z] {
+xTG5OeGm58JXpPF__aTkmcFgnUfjPeN1FfnRJt8sTdkPvBsCbFSp2UrKGiox5UpzYfZtAzZx5J7lLx3tAsBUhs3lLCHSLZmLO4Cv6g1DPIg7CfMfU7eDachF
+ggt5DfKWMZEMPEirgTYOMTD6yNqbIUk0jr7niah13olWEa2eVOSOCnFinBwqIXBYM6O6ULGnT3wrAsDIpGG_g3I7EZMbo0j2t0559_AHObB6to6bab3dMOfc
+WXrKT0n9Qde-EjmzfMwF-sCmIdKmAIrWIubWgMJuMWCo8WlJZcuhkjEJaRJQ2z1QKdnJCRUrzDQhfhgfQcW_zlqobQbCPIfJcKh6jJnHtf4FLEu
+}
+
+AzureEntityColoring(AzureTemplate)
+!define AzureTemplate(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTemplate, AzureTemplate)
+!define AzureTemplate(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTemplate, AzureTemplate)
+
+sprite $AzureTwoUserIcon [70x70/16z] {
+xTK7ikqm20DG0qBxt_7_hslYyWhCpRIh1Pmnmax6_V488Bn36F8zP4RNoEHhl8HaNXMYK4Wk2hDs4Ycrq-HMOVm9YOF2sZopWlfHagN3d15wOw3AI7vMc0sb
+KapShzHxwU-e_8fgzsMWKOjYdO4Kd1GhFsegKVzWhckktBm9APv6IED_f4vgSKZ1gCSYNYNuU70i08Hr29M73g8zPWEH8iRyAzj1GvcU6qdwvjxl42hBKSZS
+A5WGvwJ4LQ6jIlgiS5OmAIv5cQf1JS4yJsMYp1YASLLyKjJkQQRSAEEguA3aTibI_ABOIO5AMHNrgswbRDRDdQA2XKXPgy5MqQDM9mSbDSzLKSoqXOF2q98F
+Yd9MwCc-SeZZDJuKlCN-fE1owRK1hoYfQodbW9mLGi-igkYsPLrHDS6kafgdeH23TKN9ZgBSel3tobDvAdoqyXy
+}
+
+AzureEntityColoring(AzureTwoUserIcon)
+!define AzureTwoUserIcon(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTwoUserIcon, AzureTwoUserIcon)
+!define AzureTwoUserIcon(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTwoUserIcon, AzureTwoUserIcon)
+
+sprite $AzureUserHealthIcon [70x70/16z] {
+rTM7qkmW28RX3nJ4nFk_thELcAqQJlkVgTlUmP9P_3byGWX9ebVvU8Yrat5CqXsXKCI5bkC4q_I555gF2utY65D8NygHlNKIsXRtColnVN7g8jTEz1N270uj
+o4dawZeAtLp7eVKuYatYScXF72Mvpi688lnW91t2NfPD6ZvSEVfFIH-UO9siEC8c7wu8NDB3bUtBf86Atti9LTJN4whaXxVBMR_KbFXpnTSath1wKMwLV7sj
+zAsYj1sorJl32HL_dRzLXBk8Am3rh_ENYYkrfzY_vi5AtPEwKyOgfNx6GnMhdybGfJhJ-aAPh2IgBzXSHG5_qPkg605qU1RhxvStoyI-b1FpBmk3_QSoVaQb
+EWAjviCG_0gdxokokmnOQmpULcSU_5P9SBcrLguZA9006dy2S4VhgR8Ik5O3U3M0vOH7Ad9IbgNQqjfz60PgQmBdbK_AskvMGX90sqdc6nggg3LNS9BQZc-U
+VBRqmu2MrgiOHDkQ531_ONI2OQaRHjhTWadQxcpr86EMjISPysfxe9Zc9-CA4CyK89vH74Or7jaoQyPXVk0B8weqmqk_
+}
+
+AzureEntityColoring(AzureUserHealthIcon)
+!define AzureUserHealthIcon(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureUserHealthIcon, AzureUserHealthIcon)
+!define AzureUserHealthIcon(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureUserHealthIcon, AzureUserHealthIcon)
+
+sprite $AzureUserIcon [70x70/16z] {
+xPK5TiKm30GZsBt_ZOigjtgEjlmzZmDZ41qz5W09X1rZWa_0PmxdIs3YHehpsqc-Gqnsekx6-06dBE07f10UFc63hKWNp8-1UA321c4MWfriYE-rnDTR_3jY
+j9ul-lN6TzPHNqZndVsbFvC9BLDetovA2eCuZmg7w2Wi4YJIZ-zYiruvkLAaZQNmfktqbhxod0CBcZxQMVgEX4LBUpN1eOND-yRIN0tc5iPJa0KBxId8WgNE
+HCbIbG39Kk4EoXRMAz42QfRYjrcsPLksPLksvHe
+}
+
+AzureEntityColoring(AzureUserIcon)
+!define AzureUserIcon(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureUserIcon, AzureUserIcon)
+!define AzureUserIcon(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureUserIcon, AzureUserIcon)
+
+sprite $AzureUserPrivacy [70x70/16z] {
+vTI7aUGm34JH9bmZ_uJNxr0dKLK3IET_08-UE4tTmrq7-WqBVfGPRKU2N-LRYbPARfMqxaocqfrDSA_aG3Kx8kaNf_8LYWbNYgAMBXL7BLigyGSfVik-68gj
+a1GKyuL2L9E5eYZd1uLe53k50us6JsKYzIocuXS_tWzZu593L0R-zuRCi4ysFVtREdxCSzFJ2XNR97jA26OZcme3iwWhnwsnx2lKmwPqb1ZuYBd9gmhZk2dk
+NbLe-qtnzrXKg1Wv2_U8SAygEVWbaE7kyLvLoVVeNyLthgEXn28tKxsiyBtnHoYyG-4T2YjA_bI5ToYyG-6Ve_0EXNSeB2jvLFY4ieiDvRonGleAxr1uIS6f
+WafdIA2IhH4gIgsHG2rPAWF5bCS4kCue6ibX9gr6S1O3tOpV6MRTwVZ0jIGOWbMl
+}
+
+AzureEntityColoring(AzureUserPrivacy)
+!define AzureUserPrivacy(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureUserPrivacy, AzureUserPrivacy)
+!define AzureUserPrivacy(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureUserPrivacy, AzureUserPrivacy)
+
+sprite $AzureUserResource [70x70/16z] {
+xTG7akL020DGGBI_xt_X3UpEy2sdiIO77U0LKbUrRSOZ4E7sZ3Z-9pD3HG2qakdo8QrevmJ0IaAwf1MH0IjAAUmegVLX9PvpIkTb57zMeUlF5A-kf3IBhiG7
+KfmGRLqxKFn55FLpWLAeigj8dnGheN-Or4VhH7t4Q-WIaQ5DHASFKUDH2jm-G7w2PSBMyLp6JvMjnyth2em3HM76anF8KuKx9MVSvddECmNSXutABKWvOeAC
+QNxCvCTAx8rIHcSSAZqDb-6WbVrEE31wdbqbkW-NuGnMk5C-HSa39HTz-7deeVOLMDmJ8tiPNiNtbSIYppHoxQ0CO4Tv55hvxqmqY07Nb79gdXuaS5Lfvt4G
+G5AAyK0RYbAEMvUHb4ei35KPZHmgUQRWYoe_Ieu3nSnE4MPOSJjNs64bp4uLTbffuvBIJ2jkWb9EAsL8IZcbXDtdDm
+}
+
+AzureEntityColoring(AzureUserResource)
+!define AzureUserResource(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureUserResource, AzureUserResource)
+!define AzureUserResource(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureUserResource, AzureUserResource)
+
+sprite $AzureWhatsNew [70x70/16z] {
+xPS7SiLG20CDIDp_nkd9xqWkK-Czm9hcDx2ivYJ1_e6es608z0F8bL6mdmC_eke1qnFicJ8aQ0d336HNEDacC2I-nfS0pzBaAWakvNAYYJ5ocYLcFsCADDqv
+kMJVJp3pQOmMY7oyM3hC7p0kTT7jxbTmJBZJ75hc52f5LKn2DCW3ObPCH6rDGbbO5o0Vh3HUnfHTmX2ljBJHP_gM7j2MECIIXrZgj3mb3xNma7d1BekpE_b_
+OpWM_TZjiQHuCJsBU88y2vSBsoqf5WRF8ZO6pr9YU_4iOdtnB6Nk_lDdn5hdMLAlP7g-oxjdMDTd5wsz6MhvKqMvQ7nYUG5NIdP74_9ar72PYJR00OSZyu0Z
+jloZN3XC0Y8NboZU630e197rGMOi_unt
+}
+
+AzureEntityColoring(AzureWhatsNew)
+!define AzureWhatsNew(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWhatsNew, AzureWhatsNew)
+!define AzureWhatsNew(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWhatsNew, AzureWhatsNew)
+
diff --git a/dist/Identity/AzureAccessReview(m).png b/dist/Identity/AzureAccessReview(m).png
new file mode 100644
index 00000000..d9db2c0a
Binary files /dev/null and b/dist/Identity/AzureAccessReview(m).png differ
diff --git a/dist/Identity/AzureAccessReview(m).svg b/dist/Identity/AzureAccessReview(m).svg
new file mode 100644
index 00000000..b5748fad
--- /dev/null
+++ b/dist/Identity/AzureAccessReview(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,102,178);fill-opacity:1;stroke:none;"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.101563 27.476563 C 36.75 27.648438 36.574219 27.648438 36.050781 27.824219 L 36.050781 45.851563 C 36.574219 46.023438 37.273438 46.375 37.800781 46.898438 L 45.851563 40.425781 C 45.675781 40.074219 45.675781 39.375 45.675781 38.851563 C 45.675781 38.324219 45.851563 37.449219 46.023438 36.925781 Z M 23.800781 36.925781 C 24.148438 37.449219 24.324219 38.324219 24.324219 39.023438 C 24.324219 39.550781 24.148438 40.25 23.976563 40.773438 L 32.023438 47.25 C 32.375 46.898438 33.074219 46.550781 33.601563 46.199219 L 33.601563 27.824219 C 33.25 27.648438 33.074219 27.648438 32.898438 27.476563 Z M 23.800781 36.925781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35 7 L 7 40.25 L 35 63 L 63 40.25 Z M 50.226563 43.574219 C 49.175781 43.574219 48.300781 43.226563 47.425781 42.523438 L 39.375 49.175781 C 39.550781 49.523438 39.550781 49.875 39.550781 50.398438 C 39.550781 52.851563 37.625 54.949219 35 54.949219 C 32.375 54.949219 30.449219 53.023438 30.449219 50.398438 C 30.449219 50.050781 30.449219 49.699219 30.625 49.351563 L 22.050781 42.699219 C 21.351563 43.226563 20.476563 43.398438 19.601563 43.398438 C 17.148438 43.398438 15.050781 41.476563 15.050781 38.851563 C 15.050781 36.398438 16.976563 34.300781 19.601563 34.300781 C 20.300781 34.300781 21 34.476563 21.699219 34.824219 L 30.625 25.023438 C 30.449219 24.5 30.273438 23.800781 30.273438 23.101563 C 30.273438 20.648438 32.199219 18.550781 34.824219 18.550781 C 37.449219 18.550781 39.375 20.476563 39.375 23.101563 C 39.375 23.800781 39.199219 24.675781 38.851563 25.199219 L 47.601563 35 C 48.3125 34.660156 49.085938 34.480469 49.875 34.476563 C 52.324219 34.476563 54.425781 36.398438 54.425781 39.023438 C 54.511719 40.195313 54.109375 41.347656 53.3125 42.210938 C 52.515625 43.074219 51.398438 43.566406 50.226563 43.574219 Z M 50.226563 43.574219 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureAccessReview.png b/dist/Identity/AzureAccessReview.png
new file mode 100644
index 00000000..a90a9e81
Binary files /dev/null and b/dist/Identity/AzureAccessReview.png differ
diff --git a/dist/Identity/AzureAccessReview.puml b/dist/Identity/AzureAccessReview.puml
new file mode 100644
index 00000000..035102b9
--- /dev/null
+++ b/dist/Identity/AzureAccessReview.puml
@@ -0,0 +1,12 @@
+sprite $AzureAccessReview [70x70/16z] {
+xPPbmZCn28G9HEdzprkXCkknNv_CgxM7B9F9Sllel_uh-zkyYgCu3L4ceZGB4Ngfp54ycPpEG29zn1EOJ3_9CARGGc6qiuwMIkCUBvKdx85S6RV7YRXXenAH
+AJu_gGb63TaJrymmP0z_ds1Gk-r1xG2ZUY882dhT5KmK9h-qlI-OwM3RIs-YCc4fXnlPjvsGowfQda-LrTCKUzB3BuZmo-Qy3dXgimSGCWeLN6c3KIilZ6aK
+IsAYHgFYAi3gwKknnn4OrYPxia50iVAXnU-oWjXdG25MutuLhYCemRja451-624M1wFEFEQ26802pEAuoMVseFcHTXGq8_yCEBOdukhs59Jt9qPjL-aFARf-
+j-YnFUMQWYrnQ9HiWyPNQq7Noc5-7DQyfxYC6dXYAGtBIrKS1QlzOavZAvNJ8yw569dBTtcWU7trWrDEGjydpiydv2WiAH7jg4H020fgo_jGdAMpuTwFvg13
+sP5__cPh2JVV-HD1LZyP7Tr6XNDPTIWUuober_0JVl3UgMhPH06bUnYAUqeQ63PHMH5ERBLM5Vv-Q8EDlVC_Qck4ztt21cGcGle6vyEP8Hxfd1_XPMxoHdEm
+rIQ4mtvAsI5z4r96-cOmvVONwByU
+}
+
+AzureEntityColoring(AzureAccessReview)
+!define AzureAccessReview(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAccessReview, AzureAccessReview)
+!define AzureAccessReview(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAccessReview, AzureAccessReview)
diff --git a/dist/Identity/AzureAccessReview.svg b/dist/Identity/AzureAccessReview.svg
new file mode 100644
index 00000000..1ee8625d
--- /dev/null
+++ b/dist/Identity/AzureAccessReview.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;stroke:none;"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.101563 27.476563 C 36.75 27.648438 36.574219 27.648438 36.050781 27.824219 L 36.050781 45.851563 C 36.574219 46.023438 37.273438 46.375 37.800781 46.898438 L 45.851563 40.425781 C 45.675781 40.074219 45.675781 39.375 45.675781 38.851563 C 45.675781 38.324219 45.851563 37.449219 46.023438 36.925781 Z M 23.800781 36.925781 C 24.148438 37.449219 24.324219 38.324219 24.324219 39.023438 C 24.324219 39.550781 24.148438 40.25 23.976563 40.773438 L 32.023438 47.25 C 32.375 46.898438 33.074219 46.550781 33.601563 46.199219 L 33.601563 27.824219 C 33.25 27.648438 33.074219 27.648438 32.898438 27.476563 Z M 23.800781 36.925781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35 7 L 7 40.25 L 35 63 L 63 40.25 Z M 50.226563 43.574219 C 49.175781 43.574219 48.300781 43.226563 47.425781 42.523438 L 39.375 49.175781 C 39.550781 49.523438 39.550781 49.875 39.550781 50.398438 C 39.550781 52.851563 37.625 54.949219 35 54.949219 C 32.375 54.949219 30.449219 53.023438 30.449219 50.398438 C 30.449219 50.050781 30.449219 49.699219 30.625 49.351563 L 22.050781 42.699219 C 21.351563 43.226563 20.476563 43.398438 19.601563 43.398438 C 17.148438 43.398438 15.050781 41.476563 15.050781 38.851563 C 15.050781 36.398438 16.976563 34.300781 19.601563 34.300781 C 20.300781 34.300781 21 34.476563 21.699219 34.824219 L 30.625 25.023438 C 30.449219 24.5 30.273438 23.800781 30.273438 23.101563 C 30.273438 20.648438 32.199219 18.550781 34.824219 18.550781 C 37.449219 18.550781 39.375 20.476563 39.375 23.101563 C 39.375 23.800781 39.199219 24.675781 38.851563 25.199219 L 47.601563 35 C 48.3125 34.660156 49.085938 34.480469 49.875 34.476563 C 52.324219 34.476563 54.425781 36.398438 54.425781 39.023438 C 54.511719 40.195313 54.109375 41.347656 53.3125 42.210938 C 52.515625 43.074219 51.398438 43.566406 50.226563 43.574219 Z M 50.226563 43.574219 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureActiveDirectory(m).png b/dist/Identity/AzureActiveDirectory(m).png
index 5ef47d0c..2e53e300 100644
Binary files a/dist/Identity/AzureActiveDirectory(m).png and b/dist/Identity/AzureActiveDirectory(m).png differ
diff --git a/dist/Identity/AzureActiveDirectory(m).svg b/dist/Identity/AzureActiveDirectory(m).svg
index 38514fe9..bdef488d 100644
--- a/dist/Identity/AzureActiveDirectory(m).svg
+++ b/dist/Identity/AzureActiveDirectory(m).svg
@@ -1,8 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56.660156 34.976563 L 54.164063 37.476563 L 33.691406 17.007813 L 36.1875 14.511719 Z M 56.660156 34.976563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 33.832031 14.527344 L 36.332031 17.027344 L 15.863281 37.496094 L 13.363281 34.996094 Z M 33.832031 14.527344 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.566406 1.894531 C 38.347656 0.671875 36.726563 0 35 0 C 33.277344 0 31.65625 0.671875 30.4375 1.894531 L 1.894531 30.4375 C 0.6875 31.636719 0 33.300781 0 35 C 0 36.699219 0.6875 38.363281 1.894531 39.566406 L 18.054688 55.726563 L 48.453125 10.777344 Z M 39.566406 1.894531 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 32.792969 27 L 21.070313 37.847656 C 21.59375 38.722656 21.945313 39.773438 21.945313 40.648438 C 21.945313 41.175781 21.945313 41.699219 21.769531 42.222656 L 33.84375 49.574219 L 33.84375 28.398438 C 33.667969 28.398438 32.96875 27.175781 32.792969 27 Z M 32.792969 27 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 38.828125 26.832031 C 38.652344 27.003906 36.726563 28.40625 36.550781 28.582031 L 36.550781 49.582031 L 48.625 41.878906 C 48.453125 41.355469 48.277344 41.003906 48.277344 40.65625 C 48.277344 39.957031 48.453125 39.253906 48.625 38.554688 Z M 38.828125 26.832031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 35.351563 0 L 0 42 L 35.175781 70.699219 L 70.523438 42.175781 Z M 54.074219 46.375 C 52.5 46.375 51.101563 45.675781 50.050781 44.625 L 40.425781 51.449219 C 41.125 52.324219 41.300781 53.375 41.300781 54.601563 C 41.300781 57.75 38.675781 60.199219 35.699219 60.199219 C 32.550781 60.199219 30.101563 57.75 30.101563 54.601563 C 30.101563 53.199219 30.625 51.976563 31.5 50.925781 L 20.300781 44.976563 C 19.25 46.023438 17.851563 46.550781 16.449219 46.550781 C 13.300781 46.550781 10.851563 44.101563 10.851563 40.949219 C 10.851563 37.800781 13.476563 35.351563 16.449219 35.351563 C 17.324219 35.351563 18.199219 35.523438 19.074219 36.050781 L 30.800781 25.199219 C 29.925781 24.148438 29.574219 22.75 29.574219 21.523438 C 29.574219 18.023438 32.375 15.398438 35.875 15.398438 C 39.375 15.398438 42.175781 18.199219 42.175781 21.523438 C 42.175781 22.75 41.824219 23.800781 41.125 24.851563 L 51.101563 36.574219 C 51.976563 35.875 53.199219 35.523438 54.425781 35.523438 C 57.574219 35.523438 60.023438 37.976563 60.023438 41.125 C 59.675781 43.75 57.050781 46.375 54.074219 46.375 Z M 54.074219 46.375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 35 70 C 33.277344 70 31.652344 69.328125 30.4375 68.109375 L 1.890625 39.566406 C 0.6875 38.363281 0 36.699219 0 35 C 0 33.300781 0.6875 31.636719 1.890625 30.4375 L 30.4375 1.894531 C 31.65625 0.671875 33.277344 0 35 0 C 36.726563 0 38.347656 0.671875 39.566406 1.894531 L 68.105469 30.4375 C 69.328125 31.652344 70 33.273438 70 35 C 70 36.726563 69.328125 38.347656 68.105469 39.566406 L 39.566406 68.109375 C 38.347656 69.328125 36.726563 70 35 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 54.058594 29.53125 C 51.035156 29.53125 48.585938 31.980469 48.585938 35.003906 C 48.585938 36.113281 48.921875 37.140625 49.488281 38.003906 L 38.648438 48.84375 C 38.359375 48.644531 38.050781 48.476563 37.730469 48.324219 L 37.730469 20.664063 C 39.363281 19.714844 40.472656 17.96875 40.472656 15.945313 C 40.472656 12.921875 38.023438 10.472656 35 10.472656 C 31.980469 10.472656 29.527344 12.921875 29.527344 15.945313 C 29.527344 17.96875 30.640625 19.714844 32.273438 20.664063 L 32.273438 48.320313 C 31.964844 48.464844 31.664063 48.625 31.386719 48.816406 L 20.535156 37.960938 C 21.085938 37.105469 21.414063 36.09375 21.414063 35.003906 C 21.414063 31.980469 18.964844 29.53125 15.941406 29.53125 C 12.917969 29.53125 10.46875 31.980469 10.46875 35.003906 C 10.46875 38.027344 12.917969 40.476563 15.941406 40.476563 C 16.570313 40.476563 17.164063 40.347656 17.726563 40.152344 L 29.136719 51.5625 C 28.808594 52.332031 28.625 53.171875 28.625 54.058594 C 28.625 57.578125 31.480469 60.429688 34.996094 60.429688 C 38.515625 60.429688 41.367188 57.578125 41.367188 54.058594 C 41.367188 53.191406 41.191406 52.363281 40.878906 51.609375 L 52.320313 40.167969 C 52.867188 40.351563 53.445313 40.476563 54.058594 40.476563 C 57.078125 40.476563 59.527344 38.027344 59.527344 35.003906 C 59.527344 31.980469 57.078125 29.53125 54.058594 29.53125 Z M 54.058594 29.53125 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 38.730469 54.058594 C 38.730469 56.152344 37.03125 57.851563 34.9375 57.851563 C 32.839844 57.851563 31.144531 56.152344 31.144531 54.058594 C 31.144531 51.964844 32.839844 50.265625 34.9375 50.265625 C 37.03125 50.265625 38.730469 51.964844 38.730469 54.058594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 38.042969 15.945313 C 38.042969 17.625 36.679688 18.988281 35 18.988281 C 33.320313 18.988281 31.957031 17.625 31.957031 15.945313 C 31.957031 14.261719 33.320313 12.902344 35 12.902344 C 36.679688 12.902344 38.042969 14.261719 38.042969 15.945313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 18.988281 35 C 18.988281 36.683594 17.625 38.046875 15.945313 38.046875 C 14.261719 38.046875 12.902344 36.683594 12.902344 35 C 12.902344 33.320313 14.261719 31.957031 15.945313 31.957031 C 17.625 31.957031 18.988281 33.320313 18.988281 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 57.101563 35 C 57.101563 36.683594 55.738281 38.046875 54.058594 38.046875 C 52.378906 38.046875 51.015625 36.683594 51.015625 35 C 51.015625 33.320313 52.378906 31.957031 54.058594 31.957031 C 55.738281 31.957031 57.101563 33.320313 57.101563 35 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
 </g>
 </svg>
diff --git a/dist/Identity/AzureActiveDirectory.puml b/dist/Identity/AzureActiveDirectory.puml
index 51478ed6..a27564a2 100644
--- a/dist/Identity/AzureActiveDirectory.puml
+++ b/dist/Identity/AzureActiveDirectory.puml
@@ -1,11 +1,9 @@
 sprite $AzureActiveDirectory [70x70/16z] {
-fLU9bkCW31imFl__V_V8f7LQwz4Ij3iNl0X7aZt3psVe-NKB4hPFmX4XkoGK_p7sIBh70TeXQIT9UDzWiNZ0ssqIZOHjs9EuQzI8LumTUnAqOK_2-uOz2MyR
-zjmsIW93RjhZoYn-noXA4ZwZuyj6TQ_cagV2gnuB2BArLO-l3povTT4UmzxBMWigPe-nO4-f9K4hBUZNBPzqrBm51mWYCchUWeghd1kbW0GeDZUAGUkDVkoC
-kZs-cv1yhDdlYr9jTFfcGl9v_B-TXoiAHjzdUoIUBE6jgE_jWpr-la6oXDMZR6PFrd-ofDZTPqO98acML8ecHetolisYi0HLlma4oeN5BKcI9MkK25VpN7hp
-s4TnFLdI5Jwi6PvBBnxJXGIpXDLysQl7KhIkB25LJ7bvfESnW0KqgATtZ4QIJse16IEADHP58VEB1AKT08iJFEjdm1mEXopQO5JvTApCwYQLnGbCadCvSshj
-93ZSwfOi5s7P-jilxlucjZDrOe-GHpoJnVhpH1s33Rmannlyu6dwO76-5W2SnzldSsG7YxQQwUoyHBF0FFnlRwISiybxLZyzYiksjI__8XoWLYG9Y1eS13QL
-10K9nLbcaimr9Y0BbWIBCsVHfKiHvxgktN78aRhDuNJuJXokfLXRlv38UoJrrfN4XLaTA0Km3-2Y93Y0Yv9WZP4ag-BiNwXt94cGm-vR5oTdz0uq9Ta1bu44
-y1S
+fTG7agjG34HHHVQ_unymOkXw1NTigmBv817QeAAwE-sxwcslZk-GgVWUOOOHPXXXXX5blaMOOOGPHfXXf3EhWI6aVTzHm00ok_9jHlkFh5nsleMqcLTLfJGZ
+32DRcMNzBxFOX46456KOqOcKOKJUSrIblcjb6CdpNC--OHZ9OIBpbc5acCe7Xf4ZjZTW0DaE1HX0HW46a5600MGKO00P1HX0HW56aQxgGKHHfhk54QJtROz1
+L3aPtyygONgDnnX4b65sHFzFZykwcMUwZIoAxCWC7QAkhKHLLPZLW-9cQt3zWFaJRFcW7FSgDxzHQbLoLV96aP3zhpqglawKyefoHwmVb7YDv78lasR-5oZx
+3ZUx3fJIbpAgw3aoJ-bcPqGE8ufiHaHUscrHPMUB8aWkvmCp2Y30Z088CAC00imeW00p2Y3470eWm7Z7Im44c2b0cF4WX1a_ukyMOSOck2O71456arZpJn5c
+sYnF9MuGPivUKdeHX1c_F9TMX1a9iNmXVeim4vAX2uACngm3GandU1IC0umK8immmWmZp33232FCCCAC8DypzI4W7st2QNy1
 }
 
 AzureEntityColoring(AzureActiveDirectory)
diff --git a/dist/Identity/AzureActiveDirectoryB2C(m).png b/dist/Identity/AzureActiveDirectoryB2C(m).png
index b66b0ca1..2ca09c15 100644
Binary files a/dist/Identity/AzureActiveDirectoryB2C(m).png and b/dist/Identity/AzureActiveDirectoryB2C(m).png differ
diff --git a/dist/Identity/AzureActiveDirectoryB2C(m).svg b/dist/Identity/AzureActiveDirectoryB2C(m).svg
index f84f708c..7411ec7c 100644
--- a/dist/Identity/AzureActiveDirectoryB2C(m).svg
+++ b/dist/Identity/AzureActiveDirectoryB2C(m).svg
@@ -1,58 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 0 39.375 L 33.542969 67.082031 L 33.542969 0 Z M 0 39.375 "/>
-</g>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.375 16.914063 L 34.707031 15.164063 L 52.207031 38.496094 L 49.875 40.246094 Z M 32.375 16.914063 "/>
-</g>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip3">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 14.875 38.5 L 32.371094 15.164063 L 34.703125 16.914063 L 17.210938 40.25 Z M 14.875 38.5 "/>
-</g>
-</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13,152,255);fill-opacity:1;" d="M 40.832031 58.332031 C 40.832031 57.140625 41.066406 55.992188 41.523438 54.921875 C 41.972656 53.875 42.601563 52.941406 43.390625 52.152344 C 44.191406 51.355469 45.125 50.726563 46.160156 50.277344 C 48.28125 49.371094 50.761719 49.359375 52.875 50.222656 C 52.941406 50.152344 53.011719 50.082031 53.082031 50.015625 C 53.101563 49.996094 53.125 49.972656 53.144531 49.953125 C 53.140625 49.941406 53.136719 49.929688 53.128906 49.917969 C 52.710938 48.867188 52.5 47.777344 52.5 46.667969 C 52.5 45.472656 52.734375 44.324219 53.1875 43.253906 C 53.640625 42.207031 54.265625 41.277344 55.058594 40.484375 C 55.859375 39.6875 56.789063 39.058594 57.824219 38.609375 C 59.988281 37.6875 62.519531 37.695313 64.664063 38.605469 C 65.371094 38.910156 66 39.324219 66.589844 39.78125 L 67.082031 39.375 L 33.542969 0 L 0 39.375 L 33.542969 67.082031 L 41.214844 60.742188 C 40.988281 59.953125 40.832031 59.152344 40.832031 58.332031 Z M 40.832031 58.332031 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.917969 51.042969 C 37.917969 53.457031 35.957031 55.417969 33.542969 55.417969 C 31.125 55.417969 29.167969 53.457031 29.167969 51.042969 C 29.167969 48.625 31.125 46.667969 33.542969 46.667969 C 35.957031 46.667969 37.917969 48.625 37.917969 51.042969 Z M 37.917969 51.042969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 20.417969 39.375 C 20.417969 41.792969 18.457031 43.75 16.042969 43.75 C 13.625 43.75 11.667969 41.792969 11.667969 39.375 C 11.667969 36.957031 13.625 35 16.042969 35 C 18.457031 35 20.417969 36.957031 20.417969 39.375 Z M 20.417969 39.375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.917969 16.042969 C 37.917969 18.457031 35.957031 20.417969 33.542969 20.417969 C 31.125 20.417969 29.167969 18.457031 29.167969 16.042969 C 29.167969 13.625 31.125 11.667969 33.542969 11.667969 C 35.957031 11.667969 37.917969 13.625 37.917969 16.042969 Z M 37.917969 16.042969 "/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 15.238281 40.589844 L 16.855469 38.160156 L 34.355469 49.828125 L 32.738281 52.253906 Z M 15.238281 40.589844 "/>
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.738281 49.832031 L 50.238281 38.164063 L 51.859375 40.589844 L 34.355469 52.257813 Z M 32.738281 49.832031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.082031 16.042969 L 35 16.042969 L 35 51.042969 L 32.082031 51.042969 Z M 32.082031 16.042969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,24,42);fill-opacity:1;" d="M 67.082031 46.667969 C 67.082031 49.886719 64.472656 52.5 61.25 52.5 C 58.027344 52.5 55.417969 49.886719 55.417969 46.667969 C 55.417969 43.445313 58.027344 40.832031 61.25 40.832031 C 64.472656 40.832031 67.082031 43.445313 67.082031 46.667969 Z M 67.082031 46.667969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 40.832031 70 C 40.832031 65.167969 44.75 61.25 49.582031 61.25 C 54.417969 61.25 58.332031 65.167969 58.332031 70 Z M 40.832031 70 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 55.417969 58.332031 C 55.417969 61.554688 52.804688 64.167969 49.582031 64.167969 C 46.363281 64.167969 43.75 61.554688 43.75 58.332031 C 43.75 55.113281 46.363281 52.5 49.582031 52.5 C 52.804688 52.5 55.417969 55.113281 55.417969 58.332031 Z M 55.417969 58.332031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,24,42);fill-opacity:1;" d="M 61.25 49.582031 C 59 49.582031 56.964844 50.457031 55.414063 51.855469 C 57.191406 53.460938 58.332031 55.753906 58.332031 58.332031 L 70 58.332031 C 70 53.5 66.082031 49.582031 61.25 49.582031 Z M 61.25 49.582031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.042969 43.75 C 51.855469 43.75 52.605469 43.515625 53.257813 43.125 C 53.707031 42.132813 54.300781 41.242188 55.058594 40.484375 C 55.140625 40.402344 55.238281 40.339844 55.328125 40.261719 C 55.382813 39.980469 55.417969 39.679688 55.417969 39.375 C 55.417969 36.960938 53.457031 35 51.042969 35 C 48.625 35 46.667969 36.960938 46.667969 39.375 C 46.667969 41.789063 48.625 43.75 51.042969 43.75 Z M 51.042969 43.75 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 54.042969 31.363281 C 54.042969 44.59375 43.320313 55.316406 30.09375 55.316406 C 16.867188 55.316406 6.144531 44.59375 6.144531 31.363281 C 6.144531 18.136719 16.867188 7.414063 30.09375 7.414063 C 43.320313 7.414063 54.042969 18.136719 54.042969 31.363281 Z M 54.042969 31.363281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.949219 23.46875 C 39.792969 24.917969 41.664063 27.886719 41.664063 31.089844 C 41.148438 31.089844 40.339844 31.265625 39.871094 31.089844 C 39.363281 30.902344 39.585938 30.992188 39.484375 30.230469 C 39.394531 29.605469 39.214844 28.996094 38.941406 28.425781 C 37.839844 26.058594 35.34375 24.550781 32.730469 24.726563 C 30.210938 24.894531 27.976563 26.632813 27.140625 29.007813 C 26.683594 30.296875 26.90625 31.667969 26.5 32.96875 C 26.09375 34.265625 25.289063 35.40625 24.199219 36.21875 C 27.039063 37.667969 28.914063 40.636719 28.914063 43.839844 C 28.40625 43.839844 27.582031 44.011719 27.121094 43.839844 C 26.683594 43.675781 26.839844 43.808594 26.753906 43.195313 C 26.664063 42.558594 26.539063 41.960938 26.28125 41.367188 C 25.28125 39.042969 22.945313 37.464844 20.414063 37.464844 C 17.949219 37.464844 15.675781 38.953125 14.632813 41.175781 C 14.363281 41.746094 14.179688 42.355469 14.09375 42.980469 C 14.023438 43.496094 14.167969 43.664063 13.792969 43.839844 C 13.378906 44.03125 12.390625 43.839844 11.910156 43.839844 C 11.910156 40.640625 13.785156 37.664063 16.625 36.21875 C 13.53125 33.929688 13.195313 29.304688 15.914063 26.589844 C 18.628906 23.871094 23.253906 24.210938 25.542969 27.304688 C 26.382813 25.652344 27.726563 24.308594 29.375 23.46875 C 24.550781 19.898438 27.160156 11.960938 33.164063 11.960938 C 39.167969 11.964844 41.773438 19.894531 36.949219 23.46875 C 37.667969 23.835938 37.3125 23.277344 36.949219 23.46875 Z M 20.414063 35.339844 C 25.886719 35.339844 25.882813 26.84375 20.414063 26.839844 C 14.941406 26.832031 14.9375 35.339844 20.414063 35.339844 Z M 28.914063 18.339844 C 28.914063 23.8125 37.421875 23.808594 37.414063 18.339844 C 37.40625 12.867188 28.914063 12.863281 28.914063 18.339844 Z M 31.996094 46.449219 L 47.09375 31.351563 L 62.097656 46.351563 L 46.996094 61.453125 Z M 31.996094 46.449219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 48.296875 39.496094 C 48.078125 39.601563 47.972656 39.601563 47.648438 39.710938 L 47.648438 50.851563 C 47.972656 50.960938 48.402344 51.175781 48.730469 51.5 L 53.703125 47.5 C 53.597656 47.28125 53.597656 46.851563 53.597656 46.527344 C 53.597656 46.203125 53.703125 45.660156 53.8125 45.335938 Z M 40.074219 45.335938 C 40.289063 45.660156 40.398438 46.203125 40.398438 46.632813 C 40.398438 46.957031 40.289063 47.390625 40.183594 47.714844 L 45.160156 51.71875 C 45.375 51.5 45.808594 51.285156 46.132813 51.066406 L 46.132813 39.710938 C 45.917969 39.601563 45.808594 39.601563 45.699219 39.496094 Z M 40.074219 45.335938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 46.996094 26.839844 L 29.691406 47.390625 L 46.996094 61.453125 L 64.304688 47.390625 Z M 56.410156 49.445313 C 55.757813 49.445313 55.21875 49.230469 54.679688 48.796875 L 49.703125 52.90625 C 49.808594 53.125 49.808594 53.339844 49.808594 53.664063 C 49.808594 55.179688 48.621094 56.476563 46.996094 56.476563 C 45.375 56.476563 44.183594 55.289063 44.183594 53.664063 C 44.183594 53.449219 44.183594 53.230469 44.292969 53.015625 L 38.992188 48.90625 C 38.558594 49.230469 38.019531 49.339844 37.480469 49.339844 C 35.964844 49.339844 34.667969 48.148438 34.667969 46.527344 C 34.667969 45.011719 35.855469 43.714844 37.480469 43.714844 C 37.910156 43.714844 38.34375 43.824219 38.777344 44.039063 L 44.292969 37.980469 C 44.183594 37.65625 44.078125 37.222656 44.078125 36.789063 C 44.078125 35.277344 45.265625 33.980469 46.890625 33.980469 C 48.511719 33.980469 49.703125 35.167969 49.703125 36.789063 C 49.703125 37.222656 49.59375 37.765625 49.378906 38.089844 L 54.785156 44.144531 C 55.21875 43.929688 55.757813 43.820313 56.191406 43.820313 C 57.707031 43.820313 59.003906 45.011719 59.003906 46.632813 C 59.113281 48.257813 57.816406 49.445313 56.410156 49.445313 Z M 56.410156 49.445313 "/>
 </g>
 </svg>
diff --git a/dist/Identity/AzureActiveDirectoryB2C.png b/dist/Identity/AzureActiveDirectoryB2C.png
index e9fa6304..72bdd840 100644
Binary files a/dist/Identity/AzureActiveDirectoryB2C.png and b/dist/Identity/AzureActiveDirectoryB2C.png differ
diff --git a/dist/Identity/AzureActiveDirectoryB2C.puml b/dist/Identity/AzureActiveDirectoryB2C.puml
index 20512236..f57494b1 100644
--- a/dist/Identity/AzureActiveDirectoryB2C.puml
+++ b/dist/Identity/AzureActiveDirectoryB2C.puml
@@ -1,12 +1,11 @@
 sprite $AzureActiveDirectoryB2C [70x70/16z] {
-fPUBcgiW38GDWK1Rs_T_tAFPnk4uttuiEdk__JkPKO5bf2BBVULQxsFKQgjt8SasIhDx436dj7oBKhwKfhSWGMdfUZq6okMYr8BYcClrz9Hc5-i1nLLkGAnO
-OFALUbnf9mP7BqA-pGGcpNRiYXcajVc-rRfvN3KmanqpnMNpzPXYejc-hLFarA0yKuyhfvyHSssGJaAAgcwjQCwvTPA_T0ofQfPjn8rI01dthMU8xPIwOQp7
-33k6iggQKzhkfZR8XXttePGlfHL4C-pRQ9wWL4GpAgem92WDqGnkpCoXW4BHD1b040ee74sLGSUO1nIEfWuwjdn0GE5eZ3kcK8Z2qMIgXq8X2aVJb20SIa-X
-QBZlpA4G1T5GKLIFYgIaQaH1D2c9Tbokntx8gJ0bLEJqy3Eg9-mPKIXF0_S4APGJKuuKMZDD8bgyxs9CqJ4bkN5iPGjJ4b4upDzlGpbXY7ByXknlTNslBT40
-fKSpfUhIITyVbz6_BXjPikCJKSmDb0qbsrlwX3BVZAuCEqw14QtnX7eUb3VTII7OSKeOiIDZ-K1AGP0Tfy18K3GGI0OPantrEm961XJa2JiX6C6rHnE5f92T
-K6-aUhgF0x8k9_sA2IDPtBLit3TPeOo9Gezh-uGUmmKblerdW1lPj2ANrs19AS4E9wcjw_hoppxGap5IgASK5wo-LjTJzf6WFDoK9IqnZ-mGrwFlccVYZ2kU
-bNKzf7lNq6XFvPIu0q6fCH8eB67AtWkqVQaFY008XxoyEihakQHYCMsWb6kdJzkBNaElsRC9Blwkf3nxUApOgHYywDp9poaA9rDka76DxKLP_rEQmMWrXw1d
-T3qXPy0A9Ci5jJEbNA4ypvIwGFy
+xPK7bgim34MVgil-z_iBOolOnfoKqoTtUe2Ba9uo-FLyOL4pKw7t3PvhK9BY3RJKcSHu3Gl7-nxETOVZMNGgG0WK3vW9J-6Zf7SrrGRZ2T8Y4NEZqm5vMPBx
+AmggJrTZTKIZI_IuGI7S8dM2qETbi5E5jomnURpavrlOi-DPQz7XzIrK5-JK5tykVRvQKdzLG5EHE-e52f2QBXdmfv8Vy7K62ZOCErZQZqD2YsQVuEaTWFqd
+NvhRAr7htR1vkOrKULHeK_VpjYtHK2kr643ddbfBO6bUNEBp0gPOYI4noVD-rd5NZMUJiUCAEIJkPR_PEKPhZsSO4qYrPlUcaLiBXSMd8ARK99xArhAiJZnR
+KBoHTfRqgA14LQiaD7mxeqAGGoDDrsYTDIPnTy-qpKjCM4qZBAC400wDu0fPixjAd7_gZbyNwca1IGW0btFaVR8uxOTKgFsRFbQWZ99s9Vc1RHep1ZO3Cesd
+lL7mNaEnHPqKVvJahQF6SEuQnOelIPDUJ4ZK6UuCyVRA0iNY3giJ4WNK3ujJr_1bCUCQ5w1rjakQnGcw7LIffOoPBqr2H_yzB4uWiBdx9dapfKl4mzAllXwK
+NqXIluHNYyMWrirUWuzDBRRfSBwiHSxNJ25MuDbgb4LECp90b2KgMR55aoFmSbZQq5jD6wGiJnMNi1640Gln7bkRCoIUcbLn2zbSpw3nmNc7-5cKpHOBuob8
+rDpTb2Ck5l4pmZkqYvb2znvatb5yGDSmFaAMgBtR7CFdaE1Zldpv2m
 }
 
 AzureEntityColoring(AzureActiveDirectoryB2C)
diff --git a/dist/Identity/AzureActiveDirectoryB2C.svg b/dist/Identity/AzureActiveDirectoryB2C.svg
index 6819a5ee..437b0365 100644
--- a/dist/Identity/AzureActiveDirectoryB2C.svg
+++ b/dist/Identity/AzureActiveDirectoryB2C.svg
@@ -1,58 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 0 39.375 L 33.542969 67.082031 L 33.542969 0 Z M 0 39.375 "/>
-</g>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.375 16.914063 L 34.707031 15.164063 L 52.207031 38.496094 L 49.875 40.246094 Z M 32.375 16.914063 "/>
-</g>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip3">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 14.875 38.5 L 32.371094 15.164063 L 34.703125 16.914063 L 17.210938 40.25 Z M 14.875 38.5 "/>
-</g>
-</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(23.529412%,60.784314%,89.411765%);fill-opacity:1;" d="M 40.832031 58.332031 C 40.832031 57.140625 41.066406 55.992188 41.523438 54.921875 C 41.972656 53.875 42.601563 52.941406 43.390625 52.152344 C 44.191406 51.355469 45.125 50.726563 46.160156 50.277344 C 48.28125 49.371094 50.761719 49.359375 52.875 50.222656 C 52.941406 50.152344 53.011719 50.082031 53.082031 50.015625 C 53.101563 49.996094 53.125 49.972656 53.144531 49.953125 C 53.140625 49.941406 53.136719 49.929688 53.128906 49.917969 C 52.710938 48.867188 52.5 47.777344 52.5 46.667969 C 52.5 45.472656 52.734375 44.324219 53.1875 43.253906 C 53.640625 42.207031 54.265625 41.277344 55.058594 40.484375 C 55.859375 39.6875 56.789063 39.058594 57.824219 38.609375 C 59.988281 37.6875 62.519531 37.695313 64.664063 38.605469 C 65.371094 38.910156 66 39.324219 66.589844 39.78125 L 67.082031 39.375 L 33.542969 0 L 0 39.375 L 33.542969 67.082031 L 41.214844 60.742188 C 40.988281 59.953125 40.832031 59.152344 40.832031 58.332031 Z M 40.832031 58.332031 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.917969 51.042969 C 37.917969 53.457031 35.957031 55.417969 33.542969 55.417969 C 31.125 55.417969 29.167969 53.457031 29.167969 51.042969 C 29.167969 48.625 31.125 46.667969 33.542969 46.667969 C 35.957031 46.667969 37.917969 48.625 37.917969 51.042969 Z M 37.917969 51.042969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.417969 39.375 C 20.417969 41.792969 18.457031 43.75 16.042969 43.75 C 13.625 43.75 11.667969 41.792969 11.667969 39.375 C 11.667969 36.957031 13.625 35 16.042969 35 C 18.457031 35 20.417969 36.957031 20.417969 39.375 Z M 20.417969 39.375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.917969 16.042969 C 37.917969 18.457031 35.957031 20.417969 33.542969 20.417969 C 31.125 20.417969 29.167969 18.457031 29.167969 16.042969 C 29.167969 13.625 31.125 11.667969 33.542969 11.667969 C 35.957031 11.667969 37.917969 13.625 37.917969 16.042969 Z M 37.917969 16.042969 "/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 15.238281 40.589844 L 16.855469 38.160156 L 34.355469 49.828125 L 32.738281 52.253906 Z M 15.238281 40.589844 "/>
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.738281 49.832031 L 50.238281 38.164063 L 51.859375 40.589844 L 34.355469 52.257813 Z M 32.738281 49.832031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.082031 16.042969 L 35 16.042969 L 35 51.042969 L 32.082031 51.042969 Z M 32.082031 16.042969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,4.705882%,50.980392%);fill-opacity:1;" d="M 67.082031 46.667969 C 67.082031 49.886719 64.472656 52.5 61.25 52.5 C 58.027344 52.5 55.417969 49.886719 55.417969 46.667969 C 55.417969 43.445313 58.027344 40.832031 61.25 40.832031 C 64.472656 40.832031 67.082031 43.445313 67.082031 46.667969 Z M 67.082031 46.667969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 40.832031 70 C 40.832031 65.167969 44.75 61.25 49.582031 61.25 C 54.417969 61.25 58.332031 65.167969 58.332031 70 Z M 40.832031 70 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 55.417969 58.332031 C 55.417969 61.554688 52.804688 64.167969 49.582031 64.167969 C 46.363281 64.167969 43.75 61.554688 43.75 58.332031 C 43.75 55.113281 46.363281 52.5 49.582031 52.5 C 52.804688 52.5 55.417969 55.113281 55.417969 58.332031 Z M 55.417969 58.332031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,4.705882%,50.980392%);fill-opacity:1;" d="M 61.25 49.582031 C 59 49.582031 56.964844 50.457031 55.414063 51.855469 C 57.191406 53.460938 58.332031 55.753906 58.332031 58.332031 L 70 58.332031 C 70 53.5 66.082031 49.582031 61.25 49.582031 Z M 61.25 49.582031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.042969 43.75 C 51.855469 43.75 52.605469 43.515625 53.257813 43.125 C 53.707031 42.132813 54.300781 41.242188 55.058594 40.484375 C 55.140625 40.402344 55.238281 40.339844 55.328125 40.261719 C 55.382813 39.980469 55.417969 39.679688 55.417969 39.375 C 55.417969 36.960938 53.457031 35 51.042969 35 C 48.625 35 46.667969 36.960938 46.667969 39.375 C 46.667969 41.789063 48.625 43.75 51.042969 43.75 Z M 51.042969 43.75 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 54.042969 31.363281 C 54.042969 44.59375 43.320313 55.316406 30.09375 55.316406 C 16.867188 55.316406 6.144531 44.59375 6.144531 31.363281 C 6.144531 18.136719 16.867188 7.414063 30.09375 7.414063 C 43.320313 7.414063 54.042969 18.136719 54.042969 31.363281 Z M 54.042969 31.363281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.949219 23.46875 C 39.792969 24.917969 41.664063 27.886719 41.664063 31.089844 C 41.148438 31.089844 40.339844 31.265625 39.871094 31.089844 C 39.363281 30.902344 39.585938 30.992188 39.484375 30.230469 C 39.394531 29.605469 39.214844 28.996094 38.941406 28.425781 C 37.839844 26.058594 35.34375 24.550781 32.730469 24.726563 C 30.210938 24.894531 27.976563 26.632813 27.140625 29.007813 C 26.683594 30.296875 26.90625 31.667969 26.5 32.96875 C 26.09375 34.265625 25.289063 35.40625 24.199219 36.21875 C 27.039063 37.667969 28.914063 40.636719 28.914063 43.839844 C 28.40625 43.839844 27.582031 44.011719 27.121094 43.839844 C 26.683594 43.675781 26.839844 43.808594 26.753906 43.195313 C 26.664063 42.558594 26.539063 41.960938 26.28125 41.367188 C 25.28125 39.042969 22.945313 37.464844 20.414063 37.464844 C 17.949219 37.464844 15.675781 38.953125 14.632813 41.175781 C 14.363281 41.746094 14.179688 42.355469 14.09375 42.980469 C 14.023438 43.496094 14.167969 43.664063 13.792969 43.839844 C 13.378906 44.03125 12.390625 43.839844 11.910156 43.839844 C 11.910156 40.640625 13.785156 37.664063 16.625 36.21875 C 13.53125 33.929688 13.195313 29.304688 15.914063 26.589844 C 18.628906 23.871094 23.253906 24.210938 25.542969 27.304688 C 26.382813 25.652344 27.726563 24.308594 29.375 23.46875 C 24.550781 19.898438 27.160156 11.960938 33.164063 11.960938 C 39.167969 11.964844 41.773438 19.894531 36.949219 23.46875 C 37.667969 23.835938 37.3125 23.277344 36.949219 23.46875 Z M 20.414063 35.339844 C 25.886719 35.339844 25.882813 26.84375 20.414063 26.839844 C 14.941406 26.832031 14.9375 35.339844 20.414063 35.339844 Z M 28.914063 18.339844 C 28.914063 23.8125 37.421875 23.808594 37.414063 18.339844 C 37.40625 12.867188 28.914063 12.863281 28.914063 18.339844 Z M 31.996094 46.449219 L 47.09375 31.351563 L 62.097656 46.351563 L 46.996094 61.453125 Z M 31.996094 46.449219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 48.296875 39.496094 C 48.078125 39.601563 47.972656 39.601563 47.648438 39.710938 L 47.648438 50.851563 C 47.972656 50.960938 48.402344 51.175781 48.730469 51.5 L 53.703125 47.5 C 53.597656 47.28125 53.597656 46.851563 53.597656 46.527344 C 53.597656 46.203125 53.703125 45.660156 53.8125 45.335938 Z M 40.074219 45.335938 C 40.289063 45.660156 40.398438 46.203125 40.398438 46.632813 C 40.398438 46.957031 40.289063 47.390625 40.183594 47.714844 L 45.160156 51.71875 C 45.375 51.5 45.808594 51.285156 46.132813 51.066406 L 46.132813 39.710938 C 45.917969 39.601563 45.808594 39.601563 45.699219 39.496094 Z M 40.074219 45.335938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 46.996094 26.839844 L 29.691406 47.390625 L 46.996094 61.453125 L 64.304688 47.390625 Z M 56.410156 49.445313 C 55.757813 49.445313 55.21875 49.230469 54.679688 48.796875 L 49.703125 52.90625 C 49.808594 53.125 49.808594 53.339844 49.808594 53.664063 C 49.808594 55.179688 48.621094 56.476563 46.996094 56.476563 C 45.375 56.476563 44.183594 55.289063 44.183594 53.664063 C 44.183594 53.449219 44.183594 53.230469 44.292969 53.015625 L 38.992188 48.90625 C 38.558594 49.230469 38.019531 49.339844 37.480469 49.339844 C 35.964844 49.339844 34.667969 48.148438 34.667969 46.527344 C 34.667969 45.011719 35.855469 43.714844 37.480469 43.714844 C 37.910156 43.714844 38.34375 43.824219 38.777344 44.039063 L 44.292969 37.980469 C 44.183594 37.65625 44.078125 37.222656 44.078125 36.789063 C 44.078125 35.277344 45.265625 33.980469 46.890625 33.980469 C 48.511719 33.980469 49.703125 35.167969 49.703125 36.789063 C 49.703125 37.222656 49.59375 37.765625 49.378906 38.089844 L 54.785156 44.144531 C 55.21875 43.929688 55.757813 43.820313 56.191406 43.820313 C 57.707031 43.820313 59.003906 45.011719 59.003906 46.632813 C 59.113281 48.257813 57.816406 49.445313 56.410156 49.445313 Z M 56.410156 49.445313 "/>
 </g>
 </svg>
diff --git a/dist/Identity/AzureActiveDirectoryConnectHealth(m).png b/dist/Identity/AzureActiveDirectoryConnectHealth(m).png
new file mode 100644
index 00000000..3773e233
Binary files /dev/null and b/dist/Identity/AzureActiveDirectoryConnectHealth(m).png differ
diff --git a/dist/Identity/AzureActiveDirectoryConnectHealth(m).svg b/dist/Identity/AzureActiveDirectoryConnectHealth(m).svg
new file mode 100644
index 00000000..d51767f4
--- /dev/null
+++ b/dist/Identity/AzureActiveDirectoryConnectHealth(m).svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 29.621094 14.914063 L 31.796875 12.734375 L 49.816406 30.75 L 47.640625 32.929688 Z M 29.621094 14.914063 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 14.011719 32.957031 L 11.835938 30.777344 L 29.851563 12.761719 L 32.03125 14.9375 Z M 14.011719 32.957031 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.859375 1.679688 C 33.738281 0.558594 32.339844 0 30.800781 0 C 29.261719 0 27.859375 0.558594 26.738281 1.679688 L 1.679688 26.738281 C 0.558594 27.859375 0 29.261719 0 30.800781 C 0 32.339844 0.558594 33.738281 1.679688 34.859375 L 15.820313 49 L 42.699219 9.519531 Z M 34.859375 1.679688 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 52.640625 46.058594 C 47.320313 39.761719 41.160156 38.5 37.660156 42.28125 C 30.660156 49.839844 39.480469 59.921875 46.339844 65.519531 L 65.378906 40.738281 C 61.460938 39.339844 56 41.300781 52.640625 46.058594 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.679688 54.738281 L 40.601563 54.738281 L 44.101563 54.601563 L 46.761719 47.460938 C 46.898438 47.039063 47.179688 46.199219 48.300781 46.199219 C 49.421875 46.199219 49.558594 47.039063 49.558594 47.460938 L 49.699219 59.359375 L 51.660156 55.300781 C 51.800781 54.878906 52.21875 54.738281 52.5 54.738281 L 63.839844 54.738281 C 64.398438 54.738281 64.820313 55.300781 64.820313 55.71875 C 64.820313 56.140625 64.398438 56.980469 63.839844 56.980469 L 53.621094 56.980469 L 49.980469 64.261719 C 49.699219 64.960938 49.421875 65.238281 48.578125 65.101563 C 48.160156 64.960938 47.738281 64.398438 47.738281 63.980469 L 47.601563 53.058594 L 46.480469 56 C 46.339844 56.421875 46.058594 56.980469 45.640625 56.980469 L 37.941406 56.980469 L 37.238281 55.859375 Z M 36.679688 54.738281 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 30.800781 61.601563 C 29.261719 61.601563 27.859375 61.039063 26.738281 59.921875 L 1.679688 34.859375 C 0.558594 33.738281 0 32.339844 0 30.800781 C 0 29.261719 0.558594 27.859375 1.679688 26.738281 L 26.738281 1.679688 C 27.859375 0.558594 29.261719 0 30.800781 0 C 32.339844 0 33.738281 0.558594 34.859375 1.679688 L 59.921875 26.738281 C 61.039063 27.859375 61.601563 29.261719 61.601563 30.800781 C 61.601563 32.339844 61.039063 33.738281 59.921875 34.859375 L 34.859375 59.921875 C 33.738281 61.039063 32.339844 61.601563 30.800781 61.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.601563 26.039063 C 44.941406 26.039063 42.839844 28.140625 42.839844 30.800781 C 42.839844 31.78125 43.121094 32.621094 43.679688 33.460938 L 34.160156 42.980469 C 33.878906 42.839844 33.601563 42.699219 33.320313 42.558594 L 33.320313 18.199219 C 34.71875 17.359375 35.699219 15.820313 35.699219 14 C 35.699219 11.339844 33.601563 9.238281 30.941406 9.238281 C 28.28125 9.238281 26.179688 11.339844 26.179688 14 C 26.179688 15.820313 27.160156 17.359375 28.558594 18.199219 L 28.558594 42.558594 C 28.28125 42.699219 28 42.839844 27.71875 42.980469 L 18.199219 33.460938 C 18.621094 32.761719 19.039063 31.78125 19.039063 30.800781 C 19.039063 28.140625 16.941406 26.039063 14.28125 26.039063 C 11.621094 26.039063 9.519531 28.140625 9.519531 30.800781 C 9.519531 33.460938 11.621094 35.558594 14.28125 35.558594 C 14.839844 35.558594 15.398438 35.421875 15.820313 35.28125 L 25.898438 45.359375 C 25.621094 46.058594 25.480469 46.761719 25.480469 47.601563 C 25.480469 50.679688 28 53.199219 31.078125 53.199219 C 34.160156 53.199219 36.679688 50.679688 36.679688 47.601563 C 36.679688 46.898438 36.539063 46.058594 36.261719 45.5 L 46.339844 35.421875 C 46.761719 35.558594 47.320313 35.699219 47.878906 35.699219 C 50.539063 35.699219 52.640625 33.601563 52.640625 30.941406 C 52.359375 28.140625 50.261719 26.039063 47.601563 26.039063 Z M 47.601563 26.039063 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 34.019531 47.601563 C 34.019531 49.421875 32.480469 50.960938 30.660156 50.960938 C 28.839844 50.960938 27.300781 49.421875 27.300781 47.601563 C 27.300781 45.78125 28.839844 44.238281 30.660156 44.238281 C 32.621094 44.238281 34.019531 45.78125 34.019531 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 33.460938 14 C 33.460938 15.539063 32.199219 16.660156 30.800781 16.660156 C 29.398438 16.660156 28.140625 15.398438 28.140625 14 C 28.140625 12.601563 29.398438 11.339844 30.800781 11.339844 C 32.199219 11.339844 33.460938 12.601563 33.460938 14 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 16.660156 30.800781 C 16.660156 32.339844 15.398438 33.460938 14 33.460938 C 12.460938 33.460938 11.339844 32.199219 11.339844 30.800781 C 11.339844 29.261719 12.601563 28.140625 14 28.140625 C 15.539063 28.140625 16.660156 29.261719 16.660156 30.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 50.261719 30.800781 C 50.261719 32.339844 49 33.460938 47.601563 33.460938 C 46.199219 33.460938 44.941406 32.199219 44.941406 30.800781 C 44.941406 29.261719 46.199219 28.140625 47.601563 28.140625 C 49 28.140625 50.261719 29.261719 50.261719 30.800781 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 67.480469 42.421875 C 66.921875 41.71875 66.078125 41.300781 65.238281 40.878906 C 61.460938 39.339844 56 41.300781 52.640625 46.058594 C 47.320313 39.761719 41.160156 38.5 37.660156 42.28125 C 30.660156 49.839844 39.480469 59.921875 46.339844 65.519531 C 49 67.761719 51.519531 69.300781 52.5 69.859375 C 56.28125 68.179688 77.140625 52.921875 67.480469 42.421875 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureActiveDirectoryConnectHealth.png b/dist/Identity/AzureActiveDirectoryConnectHealth.png
new file mode 100644
index 00000000..24147e15
Binary files /dev/null and b/dist/Identity/AzureActiveDirectoryConnectHealth.png differ
diff --git a/dist/Identity/AzureActiveDirectoryConnectHealth.puml b/dist/Identity/AzureActiveDirectoryConnectHealth.puml
new file mode 100644
index 00000000..4c15d6a1
--- /dev/null
+++ b/dist/Identity/AzureActiveDirectoryConnectHealth.puml
@@ -0,0 +1,13 @@
+sprite $AzureActiveDirectoryConnectHealth [70x70/16z] {
+fTU9ieCW38NX92Giuli_xyNrq0jQgl-imlIhk8vqavYP2hrB_Pg-GiplsNi4p7C4p7i4p7C4p7C4p7FaEGF4d8Z3rglhHB7z415fsDyGxuYqL2WFvbV42ucM
+XDY36KTQPPW1WXKnLWHc4852BC94pZVCCA9EQ8sTDimuufniYEimuuXJAZdjCUE8tnJVOyQHG-anmmYK7ZE8GEapWmYKFZE4G1bXW9XZ5ZaHAD25sNKPFGUP
+zglCznHSpDOoSj854M6CGAbkh5MgRdjgOIqLvagH_IR7a3MAEnudP1SAaVl_m7cWyA5GesYp8lww8iPl-aSNFsiL8sAH-f-bUwOnqb_H6aQq_-uG5Z1GW32J
+sFt5YodzL82CtKXWe0mXVSQWZ29z1aeV6MIWh7TNIZ5y8knKvHjpAamSqbR0l6vZatvXTgKWCHt5iCtAFZJDSxXb491IMEOq7KZ9Vs64rudqaQj6yhmaTupi
+joU0BL4WQv6k62FMDT9QE1Q7zPGoNJ5AiYi-8LDha19TCL12jITQAndA9KEq8gvMF1GWK3gC4Az8lIA30WHAZpa7SAaebAb2CjqmJ4iEA_9GfbmfaUuOszxD
+yL2ASIW5GJhoKHAm8A_M8jFWfrf9r-AYc64-O5U-CQPxFXKbQ3qxpsdqwzF5hRGefduwotEMqIzXN3DgGMrg3ktWrrR4QR9G8u5eX55QudWgVcekbRkaE2R7
+ngc42adqGs2mAq1-Pyo7DyXsR2PVxKgaPyMSWNXwcZ-DhFGybpTa4deJ9rnhRz8yEVhi3m
+}
+
+AzureEntityColoring(AzureActiveDirectoryConnectHealth)
+!define AzureActiveDirectoryConnectHealth(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActiveDirectoryConnectHealth, AzureActiveDirectoryConnectHealth)
+!define AzureActiveDirectoryConnectHealth(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectoryConnectHealth, AzureActiveDirectoryConnectHealth)
diff --git a/dist/Identity/AzureActiveDirectoryConnectHealth.svg b/dist/Identity/AzureActiveDirectoryConnectHealth.svg
new file mode 100644
index 00000000..1740dd4a
--- /dev/null
+++ b/dist/Identity/AzureActiveDirectoryConnectHealth.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 29.621094 14.914063 L 31.796875 12.734375 L 49.816406 30.75 L 47.640625 32.929688 Z M 29.621094 14.914063 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 14.011719 32.957031 L 11.835938 30.777344 L 29.851563 12.761719 L 32.03125 14.9375 Z M 14.011719 32.957031 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.859375 1.679688 C 33.738281 0.558594 32.339844 0 30.800781 0 C 29.261719 0 27.859375 0.558594 26.738281 1.679688 L 1.679688 26.738281 C 0.558594 27.859375 0 29.261719 0 30.800781 C 0 32.339844 0.558594 33.738281 1.679688 34.859375 L 15.820313 49 L 42.699219 9.519531 Z M 34.859375 1.679688 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 52.640625 46.058594 C 47.320313 39.761719 41.160156 38.5 37.660156 42.28125 C 30.660156 49.839844 39.480469 59.921875 46.339844 65.519531 L 65.378906 40.738281 C 61.460938 39.339844 56 41.300781 52.640625 46.058594 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.679688 54.738281 L 40.601563 54.738281 L 44.101563 54.601563 L 46.761719 47.460938 C 46.898438 47.039063 47.179688 46.199219 48.300781 46.199219 C 49.421875 46.199219 49.558594 47.039063 49.558594 47.460938 L 49.699219 59.359375 L 51.660156 55.300781 C 51.800781 54.878906 52.21875 54.738281 52.5 54.738281 L 63.839844 54.738281 C 64.398438 54.738281 64.820313 55.300781 64.820313 55.71875 C 64.820313 56.140625 64.398438 56.980469 63.839844 56.980469 L 53.621094 56.980469 L 49.980469 64.261719 C 49.699219 64.960938 49.421875 65.238281 48.578125 65.101563 C 48.160156 64.960938 47.738281 64.398438 47.738281 63.980469 L 47.601563 53.058594 L 46.480469 56 C 46.339844 56.421875 46.058594 56.980469 45.640625 56.980469 L 37.941406 56.980469 L 37.238281 55.859375 Z M 36.679688 54.738281 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 30.800781 61.601563 C 29.261719 61.601563 27.859375 61.039063 26.738281 59.921875 L 1.679688 34.859375 C 0.558594 33.738281 0 32.339844 0 30.800781 C 0 29.261719 0.558594 27.859375 1.679688 26.738281 L 26.738281 1.679688 C 27.859375 0.558594 29.261719 0 30.800781 0 C 32.339844 0 33.738281 0.558594 34.859375 1.679688 L 59.921875 26.738281 C 61.039063 27.859375 61.601563 29.261719 61.601563 30.800781 C 61.601563 32.339844 61.039063 33.738281 59.921875 34.859375 L 34.859375 59.921875 C 33.738281 61.039063 32.339844 61.601563 30.800781 61.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.601563 26.039063 C 44.941406 26.039063 42.839844 28.140625 42.839844 30.800781 C 42.839844 31.78125 43.121094 32.621094 43.679688 33.460938 L 34.160156 42.980469 C 33.878906 42.839844 33.601563 42.699219 33.320313 42.558594 L 33.320313 18.199219 C 34.71875 17.359375 35.699219 15.820313 35.699219 14 C 35.699219 11.339844 33.601563 9.238281 30.941406 9.238281 C 28.28125 9.238281 26.179688 11.339844 26.179688 14 C 26.179688 15.820313 27.160156 17.359375 28.558594 18.199219 L 28.558594 42.558594 C 28.28125 42.699219 28 42.839844 27.71875 42.980469 L 18.199219 33.460938 C 18.621094 32.761719 19.039063 31.78125 19.039063 30.800781 C 19.039063 28.140625 16.941406 26.039063 14.28125 26.039063 C 11.621094 26.039063 9.519531 28.140625 9.519531 30.800781 C 9.519531 33.460938 11.621094 35.558594 14.28125 35.558594 C 14.839844 35.558594 15.398438 35.421875 15.820313 35.28125 L 25.898438 45.359375 C 25.621094 46.058594 25.480469 46.761719 25.480469 47.601563 C 25.480469 50.679688 28 53.199219 31.078125 53.199219 C 34.160156 53.199219 36.679688 50.679688 36.679688 47.601563 C 36.679688 46.898438 36.539063 46.058594 36.261719 45.5 L 46.339844 35.421875 C 46.761719 35.558594 47.320313 35.699219 47.878906 35.699219 C 50.539063 35.699219 52.640625 33.601563 52.640625 30.941406 C 52.359375 28.140625 50.261719 26.039063 47.601563 26.039063 Z M 47.601563 26.039063 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 34.019531 47.601563 C 34.019531 49.421875 32.480469 50.960938 30.660156 50.960938 C 28.839844 50.960938 27.300781 49.421875 27.300781 47.601563 C 27.300781 45.78125 28.839844 44.238281 30.660156 44.238281 C 32.621094 44.238281 34.019531 45.78125 34.019531 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 33.460938 14 C 33.460938 15.539063 32.199219 16.660156 30.800781 16.660156 C 29.398438 16.660156 28.140625 15.398438 28.140625 14 C 28.140625 12.601563 29.398438 11.339844 30.800781 11.339844 C 32.199219 11.339844 33.460938 12.601563 33.460938 14 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 16.660156 30.800781 C 16.660156 32.339844 15.398438 33.460938 14 33.460938 C 12.460938 33.460938 11.339844 32.199219 11.339844 30.800781 C 11.339844 29.261719 12.601563 28.140625 14 28.140625 C 15.539063 28.140625 16.660156 29.261719 16.660156 30.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 50.261719 30.800781 C 50.261719 32.339844 49 33.460938 47.601563 33.460938 C 46.199219 33.460938 44.941406 32.199219 44.941406 30.800781 C 44.941406 29.261719 46.199219 28.140625 47.601563 28.140625 C 49 28.140625 50.261719 29.261719 50.261719 30.800781 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 67.480469 42.421875 C 66.921875 41.71875 66.078125 41.300781 65.238281 40.878906 C 61.460938 39.339844 56 41.300781 52.640625 46.058594 C 47.320313 39.761719 41.160156 38.5 37.660156 42.28125 C 30.660156 49.839844 39.480469 59.921875 46.339844 65.519531 C 49 67.761719 51.519531 69.300781 52.5 69.859375 C 56.28125 68.179688 77.140625 52.921875 67.480469 42.421875 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureActiveDirectoryDomainServices(m).png b/dist/Identity/AzureActiveDirectoryDomainServices(m).png
index 7d79aff9..6d3b273d 100644
Binary files a/dist/Identity/AzureActiveDirectoryDomainServices(m).png and b/dist/Identity/AzureActiveDirectoryDomainServices(m).png differ
diff --git a/dist/Identity/AzureActiveDirectoryDomainServices(m).svg b/dist/Identity/AzureActiveDirectoryDomainServices(m).svg
index fd9ebff9..0697f520 100644
--- a/dist/Identity/AzureActiveDirectoryDomainServices(m).svg
+++ b/dist/Identity/AzureActiveDirectoryDomainServices(m).svg
@@ -1,55 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13.25" y1="13.06" x2="8.62" y2="4.29" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0,127,222);stop-opacity:1;"/>
+<stop offset="0.9" style="stop-color:rgb(53,169,255);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="11.26" y1="10.51" x2="14.46" y2="16.03" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0.1" style="stop-color:rgb(53,169,255);stop-opacity:1;"/>
+<stop offset="0.29" style="stop-color:rgb(45,165,255);stop-opacity:1;"/>
+<stop offset="0.51" style="stop-color:rgb(25,157,255);stop-opacity:1;"/>
+<stop offset="0.74" style="stop-color:rgb(0,141,246);stop-opacity:1;"/>
+<stop offset="0.88" style="stop-color:rgb(0,127,222);stop-opacity:1;"/>
+</linearGradient>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.25 51.929688 L 48.125 70 L 48.125 26.25 Z M 26.25 51.929688 "/>
-</g>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.015625 48.617188 L 46.828125 43.535156 C 45.863281 43.234375 45.035156 42.625 44.484375 41.800781 L 40.671875 46.886719 C 41.636719 47.1875 42.464844 47.792969 43.015625 48.617188 Z M 43.015625 48.617188 "/>
-</g>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip3">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.765625 41.796875 C 51.214844 42.621094 50.386719 43.230469 49.421875 43.53125 L 53.234375 48.613281 C 53.785156 47.792969 54.613281 47.183594 55.578125 46.882813 Z M 51.765625 41.796875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(241,249,255);fill-opacity:1;" d="M 52.617188 35.15625 L 35.234375 59.5 L 52.617188 66.578125 Z M 52.617188 35.15625 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13,152,255);fill-opacity:1;" d="M 48.125 70 L 70 51.929688 L 48.125 26.25 L 26.25 51.929688 Z M 48.125 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 3.929688 39.785156 L 34.726563 59.773438 L 66.070313 39.707031 L 70 44.253906 L 34.726563 67.003906 L 0 44.292969 Z M 3.929688 39.785156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 6.261719 37.214844 L 34.726563 3.304688 L 63.777344 37.253906 L 34.726563 55.609375 Z M 6.261719 37.214844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 34.726563 3.304688 L 34.726563 55.609375 L 6.261719 37.214844 Z M 34.726563 3.304688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 34.726563 3.304688 L 34.726563 55.609375 L 63.777344 37.253906 Z M 34.726563 3.304688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51,168,255);fill-opacity:1;" d="M 34.726563 30.332031 L 63.777344 37.253906 L 34.726563 55.609375 Z M 34.726563 30.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(171,219,255);fill-opacity:1;" d="M 34.726563 55.609375 L 6.261719 37.214844 L 34.726563 30.332031 Z M 34.726563 55.609375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 34.726563 67.003906 L 70 44.253906 L 66.070313 39.707031 L 34.726563 59.773438 Z M 34.726563 67.003906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 52.617188 35.15625 L 35.234375 59.5 L 52.617188 66.578125 L 70 59.5 Z M 52.617188 35.15625 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.515625 53.382813 L 43.605469 52.109375 C 43.355469 53.09375 42.777344 53.945313 41.984375 54.535156 L 43.894531 55.808594 C 44.144531 54.820313 44.722656 53.976563 45.515625 53.382813 Z M 45.515625 53.382813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 52.644531 52.109375 L 50.734375 53.382813 C 51.527344 53.976563 52.105469 54.820313 52.355469 55.808594 L 54.265625 54.535156 C 53.472656 53.941406 52.894531 53.09375 52.644531 52.109375 Z M 52.644531 52.109375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 48.125 35 C 45.710938 35 43.75 36.960938 43.75 39.375 C 43.75 41.789063 45.710938 43.75 48.125 43.75 C 50.539063 43.75 52.5 41.789063 52.5 39.375 C 52.5 36.960938 50.539063 35 48.125 35 Z M 48.125 35 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 48.125 52.5 C 45.710938 52.5 43.75 54.460938 43.75 56.875 C 43.75 59.289063 45.710938 61.25 48.125 61.25 C 50.539063 61.25 52.5 59.289063 52.5 56.875 C 52.5 54.460938 50.539063 52.5 48.125 52.5 Z M 48.125 52.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.375 46.667969 C 36.960938 46.667969 35 48.625 35 51.042969 C 35 53.457031 36.960938 55.417969 39.375 55.417969 C 41.789063 55.417969 43.75 53.457031 43.75 51.042969 C 43.75 48.625 41.789063 46.667969 39.375 46.667969 Z M 39.375 46.667969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56.875 46.667969 C 54.460938 46.667969 52.5 48.625 52.5 51.042969 C 52.5 53.457031 54.460938 55.417969 56.875 55.417969 C 59.289063 55.417969 61.25 53.457031 61.25 51.042969 C 61.25 48.625 59.289063 46.667969 56.875 46.667969 Z M 56.875 46.667969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.667969 42.292969 L 49.582031 42.292969 L 49.582031 53.957031 L 46.667969 53.957031 Z M 46.667969 42.292969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 64.765625 41.289063 L 67.082031 39.375 L 33.542969 0 L 0 39.375 L 33.542969 67.082031 L 36.777344 64.410156 L 22.109375 52.292969 L 48.125 21.753906 Z M 64.765625 41.289063 "/>
 </g>
 </svg>
diff --git a/dist/Identity/AzureActiveDirectoryDomainServices.png b/dist/Identity/AzureActiveDirectoryDomainServices.png
index 0153a694..98e89ef8 100644
Binary files a/dist/Identity/AzureActiveDirectoryDomainServices.png and b/dist/Identity/AzureActiveDirectoryDomainServices.png differ
diff --git a/dist/Identity/AzureActiveDirectoryDomainServices.puml b/dist/Identity/AzureActiveDirectoryDomainServices.puml
index 7b9d42bb..363b1197 100644
--- a/dist/Identity/AzureActiveDirectoryDomainServices.puml
+++ b/dist/Identity/AzureActiveDirectoryDomainServices.puml
@@ -1,11 +1,10 @@
 sprite $AzureActiveDirectoryDomainServices [70x70/16z] {
-fPTfUkGW34IDDcIu_tqdHAQQIUZ6mUzFzWBN4-JpiIBJyHohPteS8hNMysa8bVf5VXQIIlt67gMSzKAEVRns2c-7vFgYxFhMEh3hcwDPuFkEH_A-un7TTpmY
-suxhlYYhSqhQTRpb6uxd-9xZJTy9UkRejkEH8ZUF8DZrRSkC6xwbBZXRz-UsOumTbONlj0oXQodRTenxKp_wzbhNeqBXiV2kOslrEyTwXNOSHwLaxYb6yqnR
-ZbjpPkuvXOU9RrexRY4jnVFr-tdFiKQAsxLtspc2QbUAwzMZ_Dsn65ASuVksusY0RKXn-kLRxpbk22MEe5Rsw9lBol6bnonM5lVmZODvst6Zjm1H7BxlEsvW
-zpxwrZjw1266wV9lvF9DxJlt78yfv8Fl8l2yTZpseZxuxgwrB1q74iLGkBv40IuBnu4ojuLP92Fc6A3plHu3p2nVgIeYth7bIIeCFGrX5ciwH4GHewkhJdw6
-i7sdP14nnCWn8cLspRxa4BD6Yfi8jKU3x_STmp5cLYnIy1W2t-_-7vqlnz8T8AKBDlYUTrm6nrYhfy2l3Bu7TEOu_Ko1NfxwHiUAvndsadgxi2lZy8rGmMsT
-BD2USd3R5lFHTvTdMq77uHdJmbS8qgxF3OCt8NVJc1UbH6AKUWnd9PACUPcYuJfXOgRtI_3XTPiBHD6d5CpA73hHSJC3vH0CnHz9FdPy8QEQUQ_pZXqTlsIf
-uzvTe-LtnyeiUThhgcF603Pkz3hlMCTo5hskEfR_KkJFxtvd5C18GQ-taO8xYNeAUhqF7I152gPl5pMCsXDatki_
+vTS93kme30HGm1jm_mFFH1OjL4tYR7_t0PvA55X9-WSdvpSKrXSGOfCN43RZXqZXJJ5wX6HsnSf3n1NDznLsvHd3as9wkvvPCRbTpwmOtq9GCRfL3ohN-sPG
+RXN5eDnYQ4SnlOMWOdAndhLYVAaULAxspKlbOjySAPPZX68bPeXZfMfOJwZKMWCcSwHK7xcAC1W-5DM30qR4qA5IOV9vXAZG6gcsPCf2sCQLXMJHoP8Be22a
+QmG5L52ITJq0W89IQmm828UAjY4rcf42mg6YsgkDIVDaEg-8zWvhE8v3Y6nA_zfNXI3EeQAkjB78sVBeE1_48K1SwVu2YfhPvwAGnw9GaQ6qJP6njDXdFmvX
+55UwfJ9kZj1GHfnl1P2XzEh6DlCZB73Atufy56Ucrnt48KG-IdU4OIT075GKbJQ2u8AYhrCcG5mP3E5Ym3YeoBVIyzw-nDA7eYl53fOTpN5eHb3f3CfU71h8
+KkabXN4IkQ95zfIAo3eEcN6INQKh6kiucX8TA9tGm3iuQ3bIcgSEuyXAWRh3E1meNdSGXoLI-eB0E6PwhFWM3-BK_sV_rZKvzOqdrKT12MB07NJ5Iieyb3W6
+nd55ahEJOdJbzqJcVRO5sfGc-UAlNsM0PH4ZTj8VDVy1
 }
 
 AzureEntityColoring(AzureActiveDirectoryDomainServices)
diff --git a/dist/Identity/AzureActiveDirectoryDomainServices.svg b/dist/Identity/AzureActiveDirectoryDomainServices.svg
index 9e1331a2..954eef03 100644
--- a/dist/Identity/AzureActiveDirectoryDomainServices.svg
+++ b/dist/Identity/AzureActiveDirectoryDomainServices.svg
@@ -1,55 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13.25" y1="13.06" x2="8.62" y2="4.29" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(9.803922%,53.333333%,85.098039%);stop-opacity:1;"/>
+<stop offset="0.9" style="stop-color:rgb(32.941176%,68.235294%,94.117647%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="11.26" y1="10.51" x2="14.46" y2="16.03" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0.1" style="stop-color:rgb(32.941176%,68.235294%,94.117647%);stop-opacity:1;"/>
+<stop offset="0.29" style="stop-color:rgb(30.980392%,67.058824%,93.333333%);stop-opacity:1;"/>
+<stop offset="0.51" style="stop-color:rgb(25.490196%,63.529412%,91.372549%);stop-opacity:1;"/>
+<stop offset="0.74" style="stop-color:rgb(16.470588%,57.647059%,87.843137%);stop-opacity:1;"/>
+<stop offset="0.88" style="stop-color:rgb(9.803922%,53.333333%,85.098039%);stop-opacity:1;"/>
+</linearGradient>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.25 51.929688 L 48.125 70 L 48.125 26.25 Z M 26.25 51.929688 "/>
-</g>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.015625 48.617188 L 46.828125 43.535156 C 45.863281 43.234375 45.035156 42.625 44.484375 41.800781 L 40.671875 46.886719 C 41.636719 47.1875 42.464844 47.792969 43.015625 48.617188 Z M 43.015625 48.617188 "/>
-</g>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip3">
-  <rect x="0" y="0" width="70" height="70"/>
-</clipPath>
-<g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.765625 41.796875 C 51.214844 42.621094 50.386719 43.230469 49.421875 43.53125 L 53.234375 48.613281 C 53.785156 47.792969 54.613281 47.183594 55.578125 46.882813 Z M 51.765625 41.796875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(97.647059%,97.647059%,97.647059%);fill-opacity:1;" d="M 52.617188 35.15625 L 35.234375 59.5 L 52.617188 66.578125 Z M 52.617188 35.15625 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(23.529412%,60.784314%,89.411765%);fill-opacity:1;" d="M 48.125 70 L 70 51.929688 L 48.125 26.25 L 26.25 51.929688 Z M 48.125 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 3.929688 39.785156 L 34.726563 59.773438 L 66.070313 39.707031 L 70 44.253906 L 34.726563 67.003906 L 0 44.292969 Z M 3.929688 39.785156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 6.261719 37.214844 L 34.726563 3.304688 L 63.777344 37.253906 L 34.726563 55.609375 Z M 6.261719 37.214844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 34.726563 3.304688 L 34.726563 55.609375 L 6.261719 37.214844 Z M 34.726563 3.304688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 34.726563 3.304688 L 34.726563 55.609375 L 63.777344 37.253906 Z M 34.726563 3.304688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(32.54902%,69.411765%,87.843137%);fill-opacity:1;" d="M 34.726563 30.332031 L 63.777344 37.253906 L 34.726563 55.609375 Z M 34.726563 30.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(61.176471%,92.156863%,100%);fill-opacity:1;" d="M 34.726563 55.609375 L 6.261719 37.214844 L 34.726563 30.332031 Z M 34.726563 55.609375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 34.726563 67.003906 L 70 44.253906 L 66.070313 39.707031 L 34.726563 59.773438 Z M 34.726563 67.003906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(46.666667%,22.745098%,86.27451%);fill-opacity:1;" d="M 52.617188 35.15625 L 35.234375 59.5 L 52.617188 66.578125 L 70 59.5 Z M 52.617188 35.15625 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.515625 53.382813 L 43.605469 52.109375 C 43.355469 53.09375 42.777344 53.945313 41.984375 54.535156 L 43.894531 55.808594 C 44.144531 54.820313 44.722656 53.976563 45.515625 53.382813 Z M 45.515625 53.382813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 52.644531 52.109375 L 50.734375 53.382813 C 51.527344 53.976563 52.105469 54.820313 52.355469 55.808594 L 54.265625 54.535156 C 53.472656 53.941406 52.894531 53.09375 52.644531 52.109375 Z M 52.644531 52.109375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 48.125 35 C 45.710938 35 43.75 36.960938 43.75 39.375 C 43.75 41.789063 45.710938 43.75 48.125 43.75 C 50.539063 43.75 52.5 41.789063 52.5 39.375 C 52.5 36.960938 50.539063 35 48.125 35 Z M 48.125 35 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 48.125 52.5 C 45.710938 52.5 43.75 54.460938 43.75 56.875 C 43.75 59.289063 45.710938 61.25 48.125 61.25 C 50.539063 61.25 52.5 59.289063 52.5 56.875 C 52.5 54.460938 50.539063 52.5 48.125 52.5 Z M 48.125 52.5 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.375 46.667969 C 36.960938 46.667969 35 48.625 35 51.042969 C 35 53.457031 36.960938 55.417969 39.375 55.417969 C 41.789063 55.417969 43.75 53.457031 43.75 51.042969 C 43.75 48.625 41.789063 46.667969 39.375 46.667969 Z M 39.375 46.667969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56.875 46.667969 C 54.460938 46.667969 52.5 48.625 52.5 51.042969 C 52.5 53.457031 54.460938 55.417969 56.875 55.417969 C 59.289063 55.417969 61.25 53.457031 61.25 51.042969 C 61.25 48.625 59.289063 46.667969 56.875 46.667969 Z M 56.875 46.667969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.667969 42.292969 L 49.582031 42.292969 L 49.582031 53.957031 L 46.667969 53.957031 Z M 46.667969 42.292969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 64.765625 41.289063 L 67.082031 39.375 L 33.542969 0 L 0 39.375 L 33.542969 67.082031 L 36.777344 64.410156 L 22.109375 52.292969 L 48.125 21.753906 Z M 64.765625 41.289063 "/>
 </g>
 </svg>
diff --git a/dist/Identity/AzureActiveDirectoryIdentityProtection(m).png b/dist/Identity/AzureActiveDirectoryIdentityProtection(m).png
new file mode 100644
index 00000000..cca0b253
Binary files /dev/null and b/dist/Identity/AzureActiveDirectoryIdentityProtection(m).png differ
diff --git a/dist/Identity/AzureActiveDirectoryIdentityProtection(m).svg b/dist/Identity/AzureActiveDirectoryIdentityProtection(m).svg
new file mode 100644
index 00000000..d55bcde0
--- /dev/null
+++ b/dist/Identity/AzureActiveDirectoryIdentityProtection(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(115,195,255);fill-opacity:1;stroke:none;"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.101563 27.476563 C 36.75 27.648438 36.574219 27.648438 36.050781 27.824219 L 36.050781 45.851563 C 36.574219 46.023438 37.273438 46.375 37.800781 46.898438 L 45.851563 40.425781 C 45.675781 40.074219 45.675781 39.375 45.675781 38.851563 C 45.675781 38.324219 45.851563 37.449219 46.023438 36.925781 Z M 23.800781 36.925781 C 24.148438 37.449219 24.324219 38.324219 24.324219 39.023438 C 24.324219 39.550781 24.148438 40.25 23.976563 40.773438 L 32.023438 47.25 C 32.375 46.898438 33.074219 46.550781 33.601563 46.199219 L 33.601563 27.824219 C 33.25 27.648438 33.074219 27.648438 32.898438 27.476563 Z M 23.800781 36.925781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35 7 L 7 40.25 L 35 63 L 63 40.25 Z M 50.226563 43.574219 C 49.175781 43.574219 48.300781 43.226563 47.425781 42.523438 L 39.375 49.175781 C 39.550781 49.523438 39.550781 49.875 39.550781 50.398438 C 39.550781 52.851563 37.625 54.949219 35 54.949219 C 32.375 54.949219 30.449219 53.023438 30.449219 50.398438 C 30.449219 50.050781 30.449219 49.699219 30.625 49.351563 L 22.050781 42.699219 C 21.351563 43.226563 20.476563 43.398438 19.601563 43.398438 C 17.148438 43.398438 15.050781 41.476563 15.050781 38.851563 C 15.050781 36.398438 16.976563 34.300781 19.601563 34.300781 C 20.300781 34.300781 21 34.476563 21.699219 34.824219 L 30.625 25.023438 C 30.449219 24.5 30.273438 23.800781 30.273438 23.101563 C 30.273438 20.648438 32.199219 18.550781 34.824219 18.550781 C 37.449219 18.550781 39.375 20.476563 39.375 23.101563 C 39.375 23.800781 39.199219 24.675781 38.851563 25.199219 L 47.601563 35 C 48.300781 34.648438 49.175781 34.476563 49.875 34.476563 C 52.324219 34.476563 54.425781 36.398438 54.425781 39.023438 C 54.601563 41.648438 52.5 43.574219 50.226563 43.574219 Z M 50.226563 43.574219 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureActiveDirectoryIdentityProtection.png b/dist/Identity/AzureActiveDirectoryIdentityProtection.png
new file mode 100644
index 00000000..0badee83
Binary files /dev/null and b/dist/Identity/AzureActiveDirectoryIdentityProtection.png differ
diff --git a/dist/Identity/AzureActiveDirectoryIdentityProtection.puml b/dist/Identity/AzureActiveDirectoryIdentityProtection.puml
new file mode 100644
index 00000000..b0ba361f
--- /dev/null
+++ b/dist/Identity/AzureActiveDirectoryIdentityProtection.puml
@@ -0,0 +1,10 @@
+sprite $AzureActiveDirectoryIdentityProtection [70x70/16z] {
+xTRRaeCm30DGATh__-MzPggj1WyavX6zzNQIs0NyCVFaYSOT2Z3kG01r4U8dJMG0VKQOOHFfCu0p-aYZKSGDp42cWv3x5TR_ecgNSIt2N4akpfqACzSUM6U8
+Ki56ZsbtbL7yxKFX3ZA3HQRuEW9VGiYVu-YTqOcHPIH-5VYaLoey4fdA4gD4NWhUb-0rHFDNKrbX4h4o6KQZQeHZJ2GK_Z8ykJ3fdHgnuizKCZwzaLIIANiy
+iaHJYLCmArpiaeTAV9j5Us9h9qesYbZTYzz89h-NYef5dP57HIeil-luh1haMoFS4O6IGeq0vNNaDyul0SQNP2KHwDeJdgy1KpxXqWt6o-dmlDoSdrIyVwau
+rHwN61uf-qzOAzoOK8ld_yN4ZxGv8TBCFjAV3hCu3SJ5QO_mR0_mESvr8fUa5PUa5RvAykJ95m
+}
+
+AzureEntityColoring(AzureActiveDirectoryIdentityProtection)
+!define AzureActiveDirectoryIdentityProtection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActiveDirectoryIdentityProtection, AzureActiveDirectoryIdentityProtection)
+!define AzureActiveDirectoryIdentityProtection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectoryIdentityProtection, AzureActiveDirectoryIdentityProtection)
diff --git a/dist/Identity/AzureActiveDirectoryIdentityProtection.svg b/dist/Identity/AzureActiveDirectoryIdentityProtection.svg
new file mode 100644
index 00000000..1a8cee3c
--- /dev/null
+++ b/dist/Identity/AzureActiveDirectoryIdentityProtection.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(100%,72.54902%,0%);fill-opacity:1;stroke:none;"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.101563 27.476563 C 36.75 27.648438 36.574219 27.648438 36.050781 27.824219 L 36.050781 45.851563 C 36.574219 46.023438 37.273438 46.375 37.800781 46.898438 L 45.851563 40.425781 C 45.675781 40.074219 45.675781 39.375 45.675781 38.851563 C 45.675781 38.324219 45.851563 37.449219 46.023438 36.925781 Z M 23.800781 36.925781 C 24.148438 37.449219 24.324219 38.324219 24.324219 39.023438 C 24.324219 39.550781 24.148438 40.25 23.976563 40.773438 L 32.023438 47.25 C 32.375 46.898438 33.074219 46.550781 33.601563 46.199219 L 33.601563 27.824219 C 33.25 27.648438 33.074219 27.648438 32.898438 27.476563 Z M 23.800781 36.925781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35 7 L 7 40.25 L 35 63 L 63 40.25 Z M 50.226563 43.574219 C 49.175781 43.574219 48.300781 43.226563 47.425781 42.523438 L 39.375 49.175781 C 39.550781 49.523438 39.550781 49.875 39.550781 50.398438 C 39.550781 52.851563 37.625 54.949219 35 54.949219 C 32.375 54.949219 30.449219 53.023438 30.449219 50.398438 C 30.449219 50.050781 30.449219 49.699219 30.625 49.351563 L 22.050781 42.699219 C 21.351563 43.226563 20.476563 43.398438 19.601563 43.398438 C 17.148438 43.398438 15.050781 41.476563 15.050781 38.851563 C 15.050781 36.398438 16.976563 34.300781 19.601563 34.300781 C 20.300781 34.300781 21 34.476563 21.699219 34.824219 L 30.625 25.023438 C 30.449219 24.5 30.273438 23.800781 30.273438 23.101563 C 30.273438 20.648438 32.199219 18.550781 34.824219 18.550781 C 37.449219 18.550781 39.375 20.476563 39.375 23.101563 C 39.375 23.800781 39.199219 24.675781 38.851563 25.199219 L 47.601563 35 C 48.300781 34.648438 49.175781 34.476563 49.875 34.476563 C 52.324219 34.476563 54.425781 36.398438 54.425781 39.023438 C 54.601563 41.648438 52.5 43.574219 50.226563 43.574219 Z M 50.226563 43.574219 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement(m).png b/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement(m).png
new file mode 100644
index 00000000..2b5e3560
Binary files /dev/null and b/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement(m).png differ
diff --git a/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement(m).svg b/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement(m).svg
new file mode 100644
index 00000000..54131d8a
--- /dev/null
+++ b/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement(m).svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 18.898438 62.886719 C 3.496094 53.992188 -1.777344 34.300781 7.113281 18.898438 C 16.003906 3.5 35.695313 -1.78125 51.097656 7.113281 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.429688 37.941406 L 31.894531 28.472656 C 30.574219 27.910156 29.425781 27.015625 28.554688 25.875 L 19.460938 34.96875 C 20.886719 35.398438 22.003906 36.511719 22.429688 37.941406 Z M 47.625 37.941406 L 38.160156 28.472656 C 39.476563 27.910156 40.628906 27.015625 41.5 25.875 L 50.597656 34.96875 C 49.167969 35.398438 48.050781 36.511719 47.625 37.941406 Z M 47.625 37.941406 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 68.601563 35 C 68.601563 53.554688 53.554688 68.601563 35 68.601563 C 16.441406 68.601563 1.398438 53.554688 1.398438 35 C 1.398438 16.445313 16.441406 1.398438 35 1.398438 C 53.554688 1.398438 68.601563 16.445313 68.601563 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 53.285156 40.683594 L 50.316406 37.714844 L 37.359375 50.675781 C 37.273438 50.636719 37.1875 50.605469 37.101563 50.574219 L 37.101563 30.800781 L 32.898438 30.800781 L 32.898438 50.570313 C 32.8125 50.605469 32.726563 50.636719 32.640625 50.671875 L 23.527344 41.558594 C 23.851563 40.835938 24.035156 40.039063 24.035156 39.195313 C 24.03125 35.976563 21.417969 33.367188 18.199219 33.363281 C 14.980469 33.367188 12.363281 35.988281 12.367188 39.203125 C 12.367188 42.417969 14.984375 45.035156 18.199219 45.035156 L 18.203125 45.035156 C 19.015625 45.035156 19.816406 44.859375 20.558594 44.527344 L 29.671875 53.640625 C 29.339844 54.386719 29.167969 55.191406 29.164063 56.003906 C 29.171875 59.222656 31.777344 61.832031 35 61.835938 L 35.003906 61.835938 C 38.222656 61.832031 40.832031 59.21875 40.835938 56 C 40.835938 55.160156 40.648438 54.367188 40.328125 53.644531 Z M 18.199219 38.964844 C 18.265625 38.964844 18.324219 38.992188 18.367188 39.035156 L 18.035156 39.363281 C 17.992188 39.320313 17.964844 39.261719 17.964844 39.199219 C 17.964844 39.089844 18.089844 38.964844 18.199219 38.964844 Z M 35 56.234375 C 34.9375 56.234375 34.878906 56.210938 34.835938 56.167969 L 35 56 L 35.167969 56.167969 C 35.121094 56.210938 35.0625 56.234375 35 56.234375 Z M 35 56.234375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 38.035156 56 C 38.035156 57.675781 36.675781 59.035156 35 59.035156 C 33.324219 59.035156 31.964844 57.675781 31.964844 56 C 31.964844 54.324219 33.324219 52.964844 35 52.964844 C 36.675781 52.964844 38.035156 54.324219 38.035156 56 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.796875 45.035156 C 48.585938 45.035156 45.96875 42.421875 45.964844 39.203125 C 45.960938 35.984375 48.578125 33.367188 51.796875 33.363281 C 55.019531 33.367188 57.628906 35.976563 57.636719 39.195313 C 57.632813 42.417969 55.023438 45.03125 51.804688 45.035156 Z M 51.800781 38.964844 C 51.691406 38.964844 51.566406 39.089844 51.566406 39.199219 C 51.5625 39.292969 51.621094 39.378906 51.710938 39.417969 C 51.796875 39.453125 51.898438 39.433594 51.964844 39.367188 C 52.035156 39.300781 52.054688 39.199219 52.015625 39.109375 C 51.980469 39.023438 51.894531 38.964844 51.800781 38.964844 Z M 51.800781 38.964844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 54.835938 39.199219 C 54.835938 40.875 53.476563 42.234375 51.800781 42.234375 C 50.125 42.234375 48.765625 40.878906 48.765625 39.203125 C 48.765625 37.523438 50.121094 36.164063 51.796875 36.164063 L 51.800781 36.164063 C 53.476563 36.164063 54.832031 37.523438 54.835938 39.199219 M 21.234375 39.199219 C 21.234375 40.875 19.878906 42.234375 18.203125 42.234375 C 16.523438 42.234375 15.164063 40.878906 15.164063 39.203125 C 15.164063 37.523438 16.523438 36.164063 18.199219 36.164063 C 19.875 36.164063 21.234375 37.523438 21.234375 39.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 41.960938 20.859375 C 41.960938 24.648438 38.890625 27.71875 35.101563 27.71875 C 31.3125 27.71875 28.242188 24.648438 28.242188 20.859375 C 28.242188 17.070313 31.3125 14 35.101563 14 C 38.890625 14 41.960938 17.070313 41.960938 20.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.101563 9.800781 C 28.992188 9.800781 24.042969 14.75 24.042969 20.859375 C 24.042969 26.96875 28.992188 31.921875 35.101563 31.921875 C 41.210938 31.921875 46.164063 26.96875 46.164063 20.859375 C 46.164063 14.75 41.210938 9.800781 35.101563 9.800781 Z M 35.101563 27.71875 C 31.3125 27.722656 28.242188 24.648438 28.242188 20.859375 C 28.242188 17.070313 31.3125 14 35.101563 14 C 38.890625 14 41.960938 17.070313 41.960938 20.859375 C 41.960938 24.648438 38.890625 27.71875 35.101563 27.71875 Z M 35.101563 27.71875 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement.png b/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement.png
new file mode 100644
index 00000000..f5ee2b54
Binary files /dev/null and b/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement.png differ
diff --git a/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement.puml b/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement.puml
new file mode 100644
index 00000000..872f51a9
--- /dev/null
+++ b/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement.puml
@@ -0,0 +1,14 @@
+sprite $AzureActiveDirectoryPrivilegedIdentityManagement [70x70/16z] {
+lTU9UWCh20LWL43W_T-tYt4-SuAcqzxbTD_-2CuGI_z3AhE82dChVmCATu_dcDHV4nOHZec8tkuRjG_1NlCDETzSnp1idxkEH22H7Qi_5UF9I8a8UOjm_8pu
+sB1oHlhMw1c9y6DLbf5vZJG5PQJUHVXfvtGXC-qUKh5dixKhzKPFKWCPbnBXgSLoM4bLSvCoFbUpW1XXQa9qhl0H7hqn3uoYuc6xUjPZoxoSNjBUrzD72I-j
+B4bnMYa9CNxzey5wOkHvV-mrDHMmsWGfsDgiIFfrpOh2KlwgH86kPANTgIWaRT3jxkPjChUS_l1nfsliKbD1nwkEGSqbSLBo7U2De4A8mGwTxaRhJ8lSP7JC
+zqgQq0rxYpTJ-1vXBeY871Z12nSHvhgCmY8dHaTpJmXta_eWUgWS6GCb8r-vsWfCKWILBg8BMSfYJBMZuak1xPq8AeDvjBoWGwHFIb-z70WeWsaqewX8EDx8
+FDvtGsKDazB6UYnNj9QYlNScAhPLvBkOhrGOX0vxn4JSlrE8zaeZaluTeW9xr42HFX_ggiX1gKGw5LfAXy4WN-RrEpOJsxKeKS7H07qPlzHMNpnUkriqzOL7
+i-tAzpxMnm5P9WAAZn_LSL4vpc-9xJ51K5b8cZMUdeqO68-b058DRkayfhfsQvE9Irb8SRVkcsTypIDpCajPIAISds2dlvI4O46uIvaPIaRowOx3pynGtY1s
+E4d1Tetr2YAfj-V5U3110C6bd3iJ4PoGKrTEs-GncS9IpuYcusv2GkTGujDnmVBHEokyXXATwy6o0S7HLhOADYupQ_pm74exHIYdHi1IPja2GobrDgN5rHku
+f0eCfOGS__NqkE8r3QM4f1GB7yZAkFYRlMjiZaQu1yI1m3Ncd8zTzwh1o4-6LRgHec-DHZTJn4-rLFfDggIckZRwGvgekKUuMnSkz5_d4m
+}
+
+AzureEntityColoring(AzureActiveDirectoryPrivilegedIdentityManagement)
+!define AzureActiveDirectoryPrivilegedIdentityManagement(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActiveDirectoryPrivilegedIdentityManagement, AzureActiveDirectoryPrivilegedIdentityManagement)
+!define AzureActiveDirectoryPrivilegedIdentityManagement(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectoryPrivilegedIdentityManagement, AzureActiveDirectoryPrivilegedIdentityManagement)
diff --git a/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement.svg b/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement.svg
new file mode 100644
index 00000000..cd01eb02
--- /dev/null
+++ b/dist/Identity/AzureActiveDirectoryPrivilegedIdentityManagement.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18.898438 62.886719 C 3.496094 53.992188 -1.777344 34.300781 7.113281 18.898438 C 16.003906 3.5 35.695313 -1.78125 51.097656 7.113281 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.429688 37.941406 L 31.894531 28.472656 C 30.574219 27.910156 29.425781 27.015625 28.554688 25.875 L 19.460938 34.96875 C 20.886719 35.398438 22.003906 36.511719 22.429688 37.941406 Z M 47.625 37.941406 L 38.160156 28.472656 C 39.476563 27.910156 40.628906 27.015625 41.5 25.875 L 50.597656 34.96875 C 49.167969 35.398438 48.050781 36.511719 47.625 37.941406 Z M 47.625 37.941406 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 68.601563 35 C 68.601563 53.554688 53.554688 68.601563 35 68.601563 C 16.441406 68.601563 1.398438 53.554688 1.398438 35 C 1.398438 16.445313 16.441406 1.398438 35 1.398438 C 53.554688 1.398438 68.601563 16.445313 68.601563 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 53.285156 40.683594 L 50.316406 37.714844 L 37.359375 50.675781 C 37.273438 50.636719 37.1875 50.605469 37.101563 50.574219 L 37.101563 30.800781 L 32.898438 30.800781 L 32.898438 50.570313 C 32.8125 50.605469 32.726563 50.636719 32.640625 50.671875 L 23.527344 41.558594 C 23.851563 40.835938 24.035156 40.039063 24.035156 39.195313 C 24.03125 35.976563 21.417969 33.367188 18.199219 33.363281 C 14.980469 33.367188 12.363281 35.988281 12.367188 39.203125 C 12.367188 42.417969 14.984375 45.035156 18.199219 45.035156 L 18.203125 45.035156 C 19.015625 45.035156 19.816406 44.859375 20.558594 44.527344 L 29.671875 53.640625 C 29.339844 54.386719 29.167969 55.191406 29.164063 56.003906 C 29.171875 59.222656 31.777344 61.832031 35 61.835938 L 35.003906 61.835938 C 38.222656 61.832031 40.832031 59.21875 40.835938 56 C 40.835938 55.160156 40.648438 54.367188 40.328125 53.644531 Z M 18.199219 38.964844 C 18.265625 38.964844 18.324219 38.992188 18.367188 39.035156 L 18.035156 39.363281 C 17.992188 39.320313 17.964844 39.261719 17.964844 39.199219 C 17.964844 39.089844 18.089844 38.964844 18.199219 38.964844 Z M 35 56.234375 C 34.9375 56.234375 34.878906 56.210938 34.835938 56.167969 L 35 56 L 35.167969 56.167969 C 35.121094 56.210938 35.0625 56.234375 35 56.234375 Z M 35 56.234375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 38.035156 56 C 38.035156 57.675781 36.675781 59.035156 35 59.035156 C 33.324219 59.035156 31.964844 57.675781 31.964844 56 C 31.964844 54.324219 33.324219 52.964844 35 52.964844 C 36.675781 52.964844 38.035156 54.324219 38.035156 56 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.796875 45.035156 C 48.585938 45.035156 45.96875 42.421875 45.964844 39.203125 C 45.960938 35.984375 48.578125 33.367188 51.796875 33.363281 C 55.019531 33.367188 57.628906 35.976563 57.636719 39.195313 C 57.632813 42.417969 55.023438 45.03125 51.804688 45.035156 Z M 51.800781 38.964844 C 51.691406 38.964844 51.566406 39.089844 51.566406 39.199219 C 51.5625 39.292969 51.621094 39.378906 51.710938 39.417969 C 51.796875 39.453125 51.898438 39.433594 51.964844 39.367188 C 52.035156 39.300781 52.054688 39.199219 52.015625 39.109375 C 51.980469 39.023438 51.894531 38.964844 51.800781 38.964844 Z M 51.800781 38.964844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 54.835938 39.199219 C 54.835938 40.875 53.476563 42.234375 51.800781 42.234375 C 50.125 42.234375 48.765625 40.878906 48.765625 39.203125 C 48.765625 37.523438 50.121094 36.164063 51.796875 36.164063 L 51.800781 36.164063 C 53.476563 36.164063 54.832031 37.523438 54.835938 39.199219 M 21.234375 39.199219 C 21.234375 40.875 19.878906 42.234375 18.203125 42.234375 C 16.523438 42.234375 15.164063 40.878906 15.164063 39.203125 C 15.164063 37.523438 16.523438 36.164063 18.199219 36.164063 C 19.875 36.164063 21.234375 37.523438 21.234375 39.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 41.960938 20.859375 C 41.960938 24.648438 38.890625 27.71875 35.101563 27.71875 C 31.3125 27.71875 28.242188 24.648438 28.242188 20.859375 C 28.242188 17.070313 31.3125 14 35.101563 14 C 38.890625 14 41.960938 17.070313 41.960938 20.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.101563 9.800781 C 28.992188 9.800781 24.042969 14.75 24.042969 20.859375 C 24.042969 26.96875 28.992188 31.921875 35.101563 31.921875 C 41.210938 31.921875 46.164063 26.96875 46.164063 20.859375 C 46.164063 14.75 41.210938 9.800781 35.101563 9.800781 Z M 35.101563 27.71875 C 31.3125 27.722656 28.242188 24.648438 28.242188 20.859375 C 28.242188 17.070313 31.3125 14 35.101563 14 C 38.890625 14 41.960938 17.070313 41.960938 20.859375 C 41.960938 24.648438 38.890625 27.71875 35.101563 27.71875 Z M 35.101563 27.71875 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureAppRegistration(m).png b/dist/Identity/AzureAppRegistration(m).png
new file mode 100644
index 00000000..17f6d6e9
Binary files /dev/null and b/dist/Identity/AzureAppRegistration(m).png differ
diff --git a/dist/Identity/AzureAppRegistration(m).svg b/dist/Identity/AzureAppRegistration(m).svg
new file mode 100644
index 00000000..409b5c3d
--- /dev/null
+++ b/dist/Identity/AzureAppRegistration(m).svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.273438 67.84375 C 47.195313 67.84375 47.117188 67.824219 47.050781 67.785156 C 46.914063 67.707031 46.828125 67.5625 46.828125 67.40625 L 46.828125 50.667969 C 46.832031 50.507813 46.914063 50.363281 47.050781 50.28125 L 61.691406 41.890625 C 61.832031 41.8125 62 41.8125 62.140625 41.890625 C 62.273438 41.96875 62.355469 42.113281 62.355469 42.273438 L 62.355469 59.007813 C 62.359375 59.164063 62.273438 59.3125 62.140625 59.390625 L 47.492188 67.789063 C 47.425781 67.832031 47.351563 67.851563 47.273438 67.847656 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 0 2.800781 L 15.398438 2.800781 L 15.398438 18.199219 L 0 18.199219 Z M 18.199219 2.800781 L 35 2.800781 L 35 18.199219 L 18.199219 18.199219 Z M 37.800781 2.800781 L 53.199219 2.800781 L 53.199219 18.199219 L 37.800781 18.199219 Z M 0 21 L 15.398438 21 L 15.398438 36.398438 L 0 36.398438 Z M 18.199219 21 L 35 21 L 35 36.398438 L 18.199219 36.398438 Z M 37.800781 21 L 53.199219 21 L 53.199219 36.398438 L 37.800781 36.398438 Z M 0 39.199219 L 15.398438 39.199219 L 15.398438 56 L 0 56 Z M 18.199219 39.199219 L 35 39.199219 L 35 56 L 18.199219 56 Z M 37.800781 39.199219 L 53.199219 39.199219 L 53.199219 56 L 37.800781 56 Z M 37.800781 39.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.132813 64.039063 C 43.050781 64.039063 42.972656 64.019531 42.90625 63.980469 L 28.257813 55.578125 C 28.121094 55.503906 28.03125 55.355469 28.035156 55.199219 L 28.035156 38.359375 C 28.035156 38.199219 28.121094 38.054688 28.257813 37.972656 C 28.398438 37.898438 28.566406 37.898438 28.707031 37.972656 L 43.347656 46.375 C 43.484375 46.453125 43.566406 46.601563 43.566406 46.757813 L 43.566406 63.597656 C 43.570313 63.753906 43.484375 63.902344 43.347656 63.980469 C 43.28125 64.019531 43.207031 64.039063 43.128906 64.039063 M 47.265625 64.121094 C 47.34375 64.121094 47.421875 64.101563 47.492188 64.0625 L 62.136719 55.660156 C 62.277344 55.585938 62.363281 55.4375 62.363281 55.277344 L 62.363281 38.4375 C 62.363281 38.277344 62.277344 38.128906 62.136719 38.050781 C 62 37.972656 61.832031 37.972656 61.691406 38.050781 L 47.046875 46.449219 C 46.910156 46.53125 46.828125 46.675781 46.828125 46.835938 L 46.828125 63.675781 C 46.828125 63.832031 46.910156 63.976563 47.046875 64.058594 C 47.113281 64.09375 47.191406 64.117188 47.265625 64.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.242188 69.050781 C 45.164063 69.050781 45.089844 69.027344 45.023438 68.988281 L 30.332031 60.566406 C 30.191406 60.488281 30.105469 60.339844 30.109375 60.183594 C 30.109375 60.023438 30.195313 59.878906 30.332031 59.804688 L 44.929688 51.4375 C 45.066406 51.363281 45.234375 51.363281 45.371094 51.4375 L 60.070313 59.863281 C 60.203125 59.941406 60.289063 60.085938 60.289063 60.242188 C 60.289063 60.398438 60.207031 60.546875 60.070313 60.625 L 45.464844 68.988281 C 45.398438 69.027344 45.320313 69.050781 45.242188 69.050781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.242188 57.398438 C 45.164063 57.398438 45.089844 57.378906 45.023438 57.335938 L 30.332031 48.921875 C 30.191406 48.84375 30.105469 48.695313 30.109375 48.535156 C 30.109375 48.378906 30.195313 48.234375 30.332031 48.15625 L 44.929688 39.789063 C 45.066406 39.714844 45.234375 39.714844 45.371094 39.789063 L 60.058594 48.214844 C 60.195313 48.292969 60.277344 48.4375 60.28125 48.59375 C 60.28125 48.753906 60.195313 48.898438 60.058594 48.980469 L 45.464844 57.339844 C 45.398438 57.382813 45.320313 57.402344 45.242188 57.402344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 43.132813 67.84375 C 43.050781 67.847656 42.972656 67.828125 42.90625 67.785156 L 28.257813 59.386719 C 28.121094 59.308594 28.03125 59.164063 28.035156 59.003906 L 28.035156 42.164063 C 28.035156 42.003906 28.121094 41.859375 28.257813 41.777344 C 28.398438 41.703125 28.566406 41.703125 28.707031 41.777344 L 43.347656 50.179688 C 43.484375 50.257813 43.566406 50.40625 43.566406 50.5625 L 43.566406 67.40625 C 43.570313 67.5625 43.484375 67.707031 43.347656 67.785156 C 43.28125 67.824219 43.207031 67.84375 43.128906 67.84375 M 47.273438 67.84375 C 47.195313 67.84375 47.117188 67.824219 47.050781 67.785156 C 46.914063 67.707031 46.828125 67.5625 46.828125 67.40625 L 46.828125 50.667969 C 46.832031 50.507813 46.914063 50.363281 47.050781 50.28125 L 61.691406 41.890625 C 61.832031 41.8125 62 41.8125 62.140625 41.890625 C 62.273438 41.96875 62.355469 42.113281 62.355469 42.273438 L 62.355469 59.007813 C 62.359375 59.164063 62.273438 59.3125 62.140625 59.390625 L 47.492188 67.789063 C 47.425781 67.832031 47.351563 67.851563 47.273438 67.847656 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 45.242188 47.378906 C 45.164063 47.378906 45.089844 47.355469 45.023438 47.316406 L 30.332031 38.894531 C 30.191406 38.816406 30.105469 38.667969 30.109375 38.507813 C 30.109375 38.351563 30.195313 38.207031 30.332031 38.128906 L 44.929688 29.765625 C 45.066406 29.6875 45.234375 29.6875 45.371094 29.765625 L 60.070313 38.1875 C 60.203125 38.265625 60.289063 38.410156 60.289063 38.566406 C 60.289063 38.726563 60.207031 38.871094 60.070313 38.953125 L 45.464844 47.320313 C 45.398438 47.359375 45.320313 47.382813 45.242188 47.382813 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureAppRegistration.png b/dist/Identity/AzureAppRegistration.png
new file mode 100644
index 00000000..ea23ecc2
Binary files /dev/null and b/dist/Identity/AzureAppRegistration.png differ
diff --git a/dist/Identity/AzureAppRegistration.puml b/dist/Identity/AzureAppRegistration.puml
new file mode 100644
index 00000000..93e43057
--- /dev/null
+++ b/dist/Identity/AzureAppRegistration.puml
@@ -0,0 +1,10 @@
+sprite $AzureAppRegistration [70x70/16z] {
+xTPNikGm28NX0mWKUl_hxPoGGs7FtAp_6NybEUCRnJu2YBjcftm7dmBvqCL0wwP-jpAKeGn5V0ImTCrDVUEgBm5MksWwDUwNW3AKzX-KLajj_wPSZ4kr_OFI
+MhbNstxbif2NiqiXBRwyNMbQfWbSvXCWcIkNsJ8Z7bbPoWZ1KbbBGZiYK5v1Z49db_lLz2Sch02wifk8ecdfx2YkiKGKizjOVthuRaXGCRiVaViJGY8R55F2
+9RaxzrsAn9LRhzFpEY7RbUVfIUIChOefun69x5HUfmSYknItBPP_LVIsag5OK5d_numgw-atKj9_KS2whX1YoOh2Y9UM56oAT4uXR8qd2cDFuXJ6tj9BmJz4
+UbC8txmJ
+}
+
+AzureEntityColoring(AzureAppRegistration)
+!define AzureAppRegistration(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppRegistration, AzureAppRegistration)
+!define AzureAppRegistration(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppRegistration, AzureAppRegistration)
diff --git a/dist/Identity/AzureAppRegistration.svg b/dist/Identity/AzureAppRegistration.svg
new file mode 100644
index 00000000..db188708
--- /dev/null
+++ b/dist/Identity/AzureAppRegistration.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.273438 67.84375 C 47.195313 67.84375 47.117188 67.824219 47.050781 67.785156 C 46.914063 67.707031 46.828125 67.5625 46.828125 67.40625 L 46.828125 50.667969 C 46.832031 50.507813 46.914063 50.363281 47.050781 50.28125 L 61.691406 41.890625 C 61.832031 41.8125 62 41.8125 62.140625 41.890625 C 62.273438 41.96875 62.355469 42.113281 62.355469 42.273438 L 62.355469 59.007813 C 62.359375 59.164063 62.273438 59.3125 62.140625 59.390625 L 47.492188 67.789063 C 47.425781 67.832031 47.351563 67.851563 47.273438 67.847656 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 2.800781 L 15.398438 2.800781 L 15.398438 18.199219 L 0 18.199219 Z M 18.199219 2.800781 L 35 2.800781 L 35 18.199219 L 18.199219 18.199219 Z M 37.800781 2.800781 L 53.199219 2.800781 L 53.199219 18.199219 L 37.800781 18.199219 Z M 0 21 L 15.398438 21 L 15.398438 36.398438 L 0 36.398438 Z M 18.199219 21 L 35 21 L 35 36.398438 L 18.199219 36.398438 Z M 37.800781 21 L 53.199219 21 L 53.199219 36.398438 L 37.800781 36.398438 Z M 0 39.199219 L 15.398438 39.199219 L 15.398438 56 L 0 56 Z M 18.199219 39.199219 L 35 39.199219 L 35 56 L 18.199219 56 Z M 37.800781 39.199219 L 53.199219 39.199219 L 53.199219 56 L 37.800781 56 Z M 37.800781 39.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.132813 64.039063 C 43.050781 64.039063 42.972656 64.019531 42.90625 63.980469 L 28.257813 55.578125 C 28.121094 55.503906 28.03125 55.355469 28.035156 55.199219 L 28.035156 38.359375 C 28.035156 38.199219 28.121094 38.054688 28.257813 37.972656 C 28.398438 37.898438 28.566406 37.898438 28.707031 37.972656 L 43.347656 46.375 C 43.484375 46.453125 43.566406 46.601563 43.566406 46.757813 L 43.566406 63.597656 C 43.570313 63.753906 43.484375 63.902344 43.347656 63.980469 C 43.28125 64.019531 43.207031 64.039063 43.128906 64.039063 M 47.265625 64.121094 C 47.34375 64.121094 47.421875 64.101563 47.492188 64.0625 L 62.136719 55.660156 C 62.277344 55.585938 62.363281 55.4375 62.363281 55.277344 L 62.363281 38.4375 C 62.363281 38.277344 62.277344 38.128906 62.136719 38.050781 C 62 37.972656 61.832031 37.972656 61.691406 38.050781 L 47.046875 46.449219 C 46.910156 46.53125 46.828125 46.675781 46.828125 46.835938 L 46.828125 63.675781 C 46.828125 63.832031 46.910156 63.976563 47.046875 64.058594 C 47.113281 64.09375 47.191406 64.117188 47.265625 64.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.242188 69.050781 C 45.164063 69.050781 45.089844 69.027344 45.023438 68.988281 L 30.332031 60.566406 C 30.191406 60.488281 30.105469 60.339844 30.109375 60.183594 C 30.109375 60.023438 30.195313 59.878906 30.332031 59.804688 L 44.929688 51.4375 C 45.066406 51.363281 45.234375 51.363281 45.371094 51.4375 L 60.070313 59.863281 C 60.203125 59.941406 60.289063 60.085938 60.289063 60.242188 C 60.289063 60.398438 60.207031 60.546875 60.070313 60.625 L 45.464844 68.988281 C 45.398438 69.027344 45.320313 69.050781 45.242188 69.050781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.242188 57.398438 C 45.164063 57.398438 45.089844 57.378906 45.023438 57.335938 L 30.332031 48.921875 C 30.191406 48.84375 30.105469 48.695313 30.109375 48.535156 C 30.109375 48.378906 30.195313 48.234375 30.332031 48.15625 L 44.929688 39.789063 C 45.066406 39.714844 45.234375 39.714844 45.371094 39.789063 L 60.058594 48.214844 C 60.195313 48.292969 60.277344 48.4375 60.28125 48.59375 C 60.28125 48.753906 60.195313 48.898438 60.058594 48.980469 L 45.464844 57.339844 C 45.398438 57.382813 45.320313 57.402344 45.242188 57.402344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 43.132813 67.84375 C 43.050781 67.847656 42.972656 67.828125 42.90625 67.785156 L 28.257813 59.386719 C 28.121094 59.308594 28.03125 59.164063 28.035156 59.003906 L 28.035156 42.164063 C 28.035156 42.003906 28.121094 41.859375 28.257813 41.777344 C 28.398438 41.703125 28.566406 41.703125 28.707031 41.777344 L 43.347656 50.179688 C 43.484375 50.257813 43.566406 50.40625 43.566406 50.5625 L 43.566406 67.40625 C 43.570313 67.5625 43.484375 67.707031 43.347656 67.785156 C 43.28125 67.824219 43.207031 67.84375 43.128906 67.84375 M 47.273438 67.84375 C 47.195313 67.84375 47.117188 67.824219 47.050781 67.785156 C 46.914063 67.707031 46.828125 67.5625 46.828125 67.40625 L 46.828125 50.667969 C 46.832031 50.507813 46.914063 50.363281 47.050781 50.28125 L 61.691406 41.890625 C 61.832031 41.8125 62 41.8125 62.140625 41.890625 C 62.273438 41.96875 62.355469 42.113281 62.355469 42.273438 L 62.355469 59.007813 C 62.359375 59.164063 62.273438 59.3125 62.140625 59.390625 L 47.492188 67.789063 C 47.425781 67.832031 47.351563 67.851563 47.273438 67.847656 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 45.242188 47.378906 C 45.164063 47.378906 45.089844 47.355469 45.023438 47.316406 L 30.332031 38.894531 C 30.191406 38.816406 30.105469 38.667969 30.109375 38.507813 C 30.109375 38.351563 30.195313 38.207031 30.332031 38.128906 L 44.929688 29.765625 C 45.066406 29.6875 45.234375 29.6875 45.371094 29.765625 L 60.070313 38.1875 C 60.203125 38.265625 60.289063 38.410156 60.289063 38.566406 C 60.289063 38.726563 60.207031 38.871094 60.070313 38.953125 L 45.464844 47.320313 C 45.398438 47.359375 45.320313 47.382813 45.242188 47.382813 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureConditionalAccess(m).png b/dist/Identity/AzureConditionalAccess(m).png
new file mode 100644
index 00000000..1e45c993
Binary files /dev/null and b/dist/Identity/AzureConditionalAccess(m).png differ
diff --git a/dist/Identity/AzureConditionalAccess(m).svg b/dist/Identity/AzureConditionalAccess(m).svg
new file mode 100644
index 00000000..0b0bbe18
--- /dev/null
+++ b/dist/Identity/AzureConditionalAccess(m).svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 41.804688 23.160156 L 53.460938 8.34375 C 38.035156 6.644531 35.457031 0 35.457031 0 C 35.457031 0 31.984375 8.738281 9.800781 8.738281 L 9.800781 44.59375 C 9.800781 48.929688 12.210938 52.988281 15.546875 56.539063 L 24.160156 45.589844 Z M 41.804688 23.160156 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 53.460938 8.34375 C 38.035156 6.644531 35.457031 0 35.457031 0 C 35.457031 0 31.984375 8.738281 9.800781 8.738281 L 9.800781 44.59375 C 9.800781 48.929688 12.210938 52.988281 15.546875 56.539063 C 23.109375 64.585938 35.457031 70 35.457031 70 C 35.457031 70 61.117188 58.761719 61.117188 44.59375 L 61.117188 8.738281 C 58.261719 8.738281 55.722656 8.59375 53.460938 8.34375 Z M 53.460938 8.34375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.632813 34.242188 L 44.140625 34.242188 L 44.140625 29.269531 C 44.140625 26.878906 43.261719 24.683594 41.804688 23.042969 C 41.75 22.980469 41.699219 22.914063 41.648438 22.855469 C 40.097656 21.195313 37.890625 20.128906 35.457031 20.128906 C 33.027344 20.128906 30.820313 21.195313 29.269531 22.855469 C 27.714844 24.515625 26.773438 26.789063 26.773438 29.269531 L 26.773438 34.242188 L 25.28125 34.242188 C 24.664063 34.242188 24.160156 34.746094 24.160156 35.367188 L 24.160156 48.515625 C 24.160156 49.132813 24.664063 49.636719 25.28125 49.636719 L 45.632813 49.636719 C 46.25 49.636719 46.753906 49.132813 46.753906 48.515625 L 46.753906 35.367188 C 46.753906 34.746094 46.25 34.242188 45.632813 34.242188 Z M 40.019531 34.246094 L 32.988281 34.246094 L 32.992188 34.242188 L 30.898438 34.242188 L 30.898438 29.269531 C 30.898438 27.839844 31.4375 26.574219 32.28125 25.671875 C 33.128906 24.773438 34.234375 24.253906 35.457031 24.253906 C 36.679688 24.253906 37.789063 24.773438 38.632813 25.671875 C 38.835938 25.886719 39.015625 26.125 39.179688 26.378906 L 39.175781 26.378906 C 39.699219 27.191406 40.019531 28.183594 40.019531 29.269531 Z M 40.019531 34.246094 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureConditionalAccess.png b/dist/Identity/AzureConditionalAccess.png
new file mode 100644
index 00000000..60b5b827
Binary files /dev/null and b/dist/Identity/AzureConditionalAccess.png differ
diff --git a/dist/Identity/AzureConditionalAccess.puml b/dist/Identity/AzureConditionalAccess.puml
new file mode 100644
index 00000000..b879ecbb
--- /dev/null
+++ b/dist/Identity/AzureConditionalAccess.puml
@@ -0,0 +1,10 @@
+sprite $AzureConditionalAccess [70x70/16z] {
+xTK54eD038NX5x__YUkoKomRwkq_WdyuO3d57HAtUo3kYfMfxpF2YjZybAmtwWwftwQCdbZKnpDPa8YPHLJDbp9LuLqqWdY-E2LhbBY74k-Zn3sKk8SIzr3Y
+VPIuXn9LnOI9nOv8KJ76CRAwOhYc7ZN5q6P5XR6FHGZxlAJOvOAuO9UK5CQkThoaO9Uq4rvLx3WQSPXOfqG40T22OXSbtaU9UoXHKzfVASkfuuHrAepHEXLw
+lF9N_WeApou_IZ5lYfH26AGjab8SmxX5GZ4M3o_kz2b5Bi98t8aeHhCk931H5yAOY3iGmsIQLXmpQGKPPZc4C9yMa1BZI2ILkpECF6OIPBEOoXdvf78smyWJ
+1r8w74Cb7JmafSYkXg0U--3s5fs4iGK
+}
+
+AzureEntityColoring(AzureConditionalAccess)
+!define AzureConditionalAccess(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureConditionalAccess, AzureConditionalAccess)
+!define AzureConditionalAccess(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureConditionalAccess, AzureConditionalAccess)
diff --git a/dist/Identity/AzureConditionalAccess.svg b/dist/Identity/AzureConditionalAccess.svg
new file mode 100644
index 00000000..2ba410b1
--- /dev/null
+++ b/dist/Identity/AzureConditionalAccess.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 41.804688 23.160156 L 53.460938 8.34375 C 38.035156 6.644531 35.457031 0 35.457031 0 C 35.457031 0 31.984375 8.738281 9.800781 8.738281 L 9.800781 44.59375 C 9.800781 48.929688 12.210938 52.988281 15.546875 56.539063 L 24.160156 45.589844 Z M 41.804688 23.160156 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 53.460938 8.34375 C 38.035156 6.644531 35.457031 0 35.457031 0 C 35.457031 0 31.984375 8.738281 9.800781 8.738281 L 9.800781 44.59375 C 9.800781 48.929688 12.210938 52.988281 15.546875 56.539063 C 23.109375 64.585938 35.457031 70 35.457031 70 C 35.457031 70 61.117188 58.761719 61.117188 44.59375 L 61.117188 8.738281 C 58.261719 8.738281 55.722656 8.59375 53.460938 8.34375 Z M 53.460938 8.34375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.632813 34.242188 L 44.140625 34.242188 L 44.140625 29.269531 C 44.140625 26.878906 43.261719 24.683594 41.804688 23.042969 C 41.75 22.980469 41.699219 22.914063 41.648438 22.855469 C 40.097656 21.195313 37.890625 20.128906 35.457031 20.128906 C 33.027344 20.128906 30.820313 21.195313 29.269531 22.855469 C 27.714844 24.515625 26.773438 26.789063 26.773438 29.269531 L 26.773438 34.242188 L 25.28125 34.242188 C 24.664063 34.242188 24.160156 34.746094 24.160156 35.367188 L 24.160156 48.515625 C 24.160156 49.132813 24.664063 49.636719 25.28125 49.636719 L 45.632813 49.636719 C 46.25 49.636719 46.753906 49.132813 46.753906 48.515625 L 46.753906 35.367188 C 46.753906 34.746094 46.25 34.242188 45.632813 34.242188 Z M 40.019531 34.246094 L 32.988281 34.246094 L 32.992188 34.242188 L 30.898438 34.242188 L 30.898438 29.269531 C 30.898438 27.839844 31.4375 26.574219 32.28125 25.671875 C 33.128906 24.773438 34.234375 24.253906 35.457031 24.253906 C 36.679688 24.253906 37.789063 24.773438 38.632813 25.671875 C 38.835938 25.886719 39.015625 26.125 39.179688 26.378906 L 39.175781 26.378906 C 39.699219 27.191406 40.019531 28.183594 40.019531 29.269531 Z M 40.019531 34.246094 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureEnterpriseApplication(m).png b/dist/Identity/AzureEnterpriseApplication(m).png
new file mode 100644
index 00000000..104c4047
Binary files /dev/null and b/dist/Identity/AzureEnterpriseApplication(m).png differ
diff --git a/dist/Identity/AzureEnterpriseApplication(m).svg b/dist/Identity/AzureEnterpriseApplication(m).svg
new file mode 100644
index 00000000..7306d0dd
--- /dev/null
+++ b/dist/Identity/AzureEnterpriseApplication(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 0 2.800781 L 15.398438 2.800781 L 15.398438 18.199219 L 0 18.199219 Z M 18.199219 2.800781 L 35 2.800781 L 35 18.199219 L 18.199219 18.199219 Z M 37.800781 2.800781 L 53.199219 2.800781 L 53.199219 18.199219 L 37.800781 18.199219 Z M 0 21 L 15.398438 21 L 15.398438 36.398438 L 0 36.398438 Z M 18.199219 21 L 35 21 L 35 36.398438 L 18.199219 36.398438 Z M 37.800781 21 L 53.199219 21 L 53.199219 36.398438 L 37.800781 36.398438 Z M 0 39.199219 L 15.398438 39.199219 L 15.398438 56 L 0 56 Z M 18.199219 39.199219 L 35 39.199219 L 35 56 L 18.199219 56 Z M 37.800781 39.199219 L 53.199219 39.199219 L 53.199219 56 L 37.800781 56 Z M 37.800781 39.199219 "/>
+<path style="fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;stroke-width:0.194;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(57,171,255);stroke-opacity:1;stroke-miterlimit:10;" d="M 45.800781 35.100446 C 45.800781 42.555804 39.754464 48.59933 32.299107 48.59933 C 24.84375 48.59933 18.800223 42.555804 18.800223 35.100446 C 18.800223 27.645089 24.84375 21.598772 32.299107 21.598772 C 39.754464 21.598772 45.800781 27.645089 45.800781 35.100446 Z M 45.800781 35.100446 " transform="matrix(1.4,0,0,1.4,0,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 64.1875 48.492188 L 57.859375 42.160156 C 57.4375 41.695313 56.839844 41.429688 56.214844 41.429688 C 55.585938 41.429688 54.992188 41.695313 54.570313 42.160156 C 54.132813 42.59375 53.886719 43.1875 53.886719 43.804688 C 53.886719 44.421875 54.132813 45.011719 54.570313 45.445313 L 52.136719 43.011719 C 51.226563 42.105469 49.757813 42.105469 48.847656 43.011719 C 47.941406 43.921875 47.941406 45.390625 48.847656 46.300781 L 54.320313 51.777344 L 55.417969 52.875 L 57.234375 54.695313 C 58.144531 55.601563 58.144531 57.074219 57.234375 57.980469 C 56.328125 58.890625 54.855469 58.890625 53.949219 57.980469 L 50.417969 54.449219 C 49.511719 53.542969 48.039063 53.542969 47.132813 54.449219 C 46.222656 55.359375 46.222656 56.828125 47.132813 57.738281 L 50.910156 61.515625 C 50.003906 60.609375 48.53125 60.609375 47.625 61.515625 C 46.714844 62.425781 46.714844 63.898438 47.625 64.804688 L 50.308594 67.480469 C 58.882813 65.285156 64.699219 57.324219 64.1875 48.484375 Z M 33.171875 53.945313 C 33.753906 53.414063 34.085938 52.664063 34.085938 51.875 C 34.085938 51.089844 33.753906 50.335938 33.171875 49.804688 L 30.128906 46.761719 C 30.660156 47.34375 31.410156 47.675781 32.199219 47.675781 C 32.988281 47.675781 33.738281 47.34375 34.269531 46.761719 C 35.121094 45.890625 35.363281 44.589844 34.878906 43.472656 L 39.019531 47.613281 C 39.546875 48.195313 40.300781 48.527344 41.089844 48.527344 C 41.875 48.527344 42.628906 48.195313 43.15625 47.613281 C 43.714844 47.066406 44.027344 46.320313 44.027344 45.542969 C 44.027344 44.765625 43.714844 44.019531 43.15625 43.472656 L 39.503906 39.578125 C 38.921875 39.046875 38.589844 38.292969 38.589844 37.507813 C 38.589844 36.71875 38.921875 35.96875 39.503906 35.4375 C 40.050781 34.882813 40.796875 34.570313 41.574219 34.570313 C 42.355469 34.570313 43.097656 34.882813 43.644531 35.4375 L 45.59375 37.382813 C 46.738281 38.511719 48.578125 38.5 49.714844 37.367188 C 50.847656 36.230469 50.859375 34.390625 49.730469 33.246094 L 46.941406 30.175781 C 41.160156 29.449219 35.386719 31.5625 31.4375 35.847656 C 27.492188 39.984375 25.613281 45.667969 26.320313 51.339844 L 28.910156 54.066406 C 30.128906 55.191406 32.019531 55.136719 33.171875 53.945313 Z M 33.171875 53.945313 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureEnterpriseApplication.png b/dist/Identity/AzureEnterpriseApplication.png
new file mode 100644
index 00000000..508813bd
Binary files /dev/null and b/dist/Identity/AzureEnterpriseApplication.png differ
diff --git a/dist/Identity/AzureEnterpriseApplication.puml b/dist/Identity/AzureEnterpriseApplication.puml
new file mode 100644
index 00000000..c36ea5f5
--- /dev/null
+++ b/dist/Identity/AzureEnterpriseApplication.puml
@@ -0,0 +1,10 @@
+sprite $AzureEnterpriseApplication [70x70/16z] {
+xTO73i8m38LX9_5pQRZ_UPb6ZMl0OSzVYzMlpPAWDohR4b7Aiux-ohQqWMXOpjemrVtgcvM_ybV-Ih4bebnc7VlL6pVQc4Z6MSd_wWbhz5V-IXq7mQPXCTPh
+bIHWJMG3NQLmcsmhbofrO1Da6_95IfN3rJ2Cb0kKYkPIemZJbDWA4KkJ8lgPAfQ9OmqJ2dFBdefP6L_g6X7ColZGCxl273nCYPNA7368bO5FCz3tELJ0jcQP
+S7ZFaL9PCviMke-LGQGifcTe7wQ5HIG5oj0yGgF03h84Yco5JR8DoZacLCnkKyun72hAk72H4ZBz2ijv9bffUCKp9L16WHkHPrAWr47W4S0ouJbQYAzvEbMY
+_vXyGc5C3vCf3EB2x5nIN9Op37I5ukADsrCATboYhh8tC2c5EYl1UAvZ421zWxfyE5hYu-VdqZBcJA5hIeo6oNHrAPTjET73MWC
+}
+
+AzureEntityColoring(AzureEnterpriseApplication)
+!define AzureEnterpriseApplication(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureEnterpriseApplication, AzureEnterpriseApplication)
+!define AzureEnterpriseApplication(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureEnterpriseApplication, AzureEnterpriseApplication)
diff --git a/dist/Identity/AzureEnterpriseApplication.svg b/dist/Identity/AzureEnterpriseApplication.svg
new file mode 100644
index 00000000..0ff0982a
--- /dev/null
+++ b/dist/Identity/AzureEnterpriseApplication.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 2.800781 L 15.398438 2.800781 L 15.398438 18.199219 L 0 18.199219 Z M 18.199219 2.800781 L 35 2.800781 L 35 18.199219 L 18.199219 18.199219 Z M 37.800781 2.800781 L 53.199219 2.800781 L 53.199219 18.199219 L 37.800781 18.199219 Z M 0 21 L 15.398438 21 L 15.398438 36.398438 L 0 36.398438 Z M 18.199219 21 L 35 21 L 35 36.398438 L 18.199219 36.398438 Z M 37.800781 21 L 53.199219 21 L 53.199219 36.398438 L 37.800781 36.398438 Z M 0 39.199219 L 15.398438 39.199219 L 15.398438 56 L 0 56 Z M 18.199219 39.199219 L 35 39.199219 L 35 56 L 18.199219 56 Z M 37.800781 39.199219 L 53.199219 39.199219 L 53.199219 56 L 37.800781 56 Z M 37.800781 39.199219 "/>
+<path style="fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;stroke-width:0.194;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(34.901961%,70.588235%,85.098039%);stroke-opacity:1;stroke-miterlimit:10;" d="M 45.800781 35.100446 C 45.800781 42.555804 39.754464 48.59933 32.299107 48.59933 C 24.84375 48.59933 18.800223 42.555804 18.800223 35.100446 C 18.800223 27.645089 24.84375 21.598772 32.299107 21.598772 C 39.754464 21.598772 45.800781 27.645089 45.800781 35.100446 Z M 45.800781 35.100446 " transform="matrix(1.4,0,0,1.4,0,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 64.1875 48.492188 L 57.859375 42.160156 C 57.4375 41.695313 56.839844 41.429688 56.214844 41.429688 C 55.585938 41.429688 54.992188 41.695313 54.570313 42.160156 C 54.132813 42.59375 53.886719 43.1875 53.886719 43.804688 C 53.886719 44.421875 54.132813 45.011719 54.570313 45.445313 L 52.136719 43.011719 C 51.226563 42.105469 49.757813 42.105469 48.847656 43.011719 C 47.941406 43.921875 47.941406 45.390625 48.847656 46.300781 L 54.320313 51.777344 L 55.417969 52.875 L 57.234375 54.695313 C 58.144531 55.601563 58.144531 57.074219 57.234375 57.980469 C 56.328125 58.890625 54.855469 58.890625 53.949219 57.980469 L 50.417969 54.449219 C 49.511719 53.542969 48.039063 53.542969 47.132813 54.449219 C 46.222656 55.359375 46.222656 56.828125 47.132813 57.738281 L 50.910156 61.515625 C 50.003906 60.609375 48.53125 60.609375 47.625 61.515625 C 46.714844 62.425781 46.714844 63.898438 47.625 64.804688 L 50.308594 67.480469 C 58.882813 65.285156 64.699219 57.324219 64.1875 48.484375 Z M 33.171875 53.945313 C 33.753906 53.414063 34.085938 52.664063 34.085938 51.875 C 34.085938 51.089844 33.753906 50.335938 33.171875 49.804688 L 30.128906 46.761719 C 30.660156 47.34375 31.410156 47.675781 32.199219 47.675781 C 32.988281 47.675781 33.738281 47.34375 34.269531 46.761719 C 35.121094 45.890625 35.363281 44.589844 34.878906 43.472656 L 39.019531 47.613281 C 39.546875 48.195313 40.300781 48.527344 41.089844 48.527344 C 41.875 48.527344 42.628906 48.195313 43.15625 47.613281 C 43.714844 47.066406 44.027344 46.320313 44.027344 45.542969 C 44.027344 44.765625 43.714844 44.019531 43.15625 43.472656 L 39.503906 39.578125 C 38.921875 39.046875 38.589844 38.292969 38.589844 37.507813 C 38.589844 36.71875 38.921875 35.96875 39.503906 35.4375 C 40.050781 34.882813 40.796875 34.570313 41.574219 34.570313 C 42.355469 34.570313 43.097656 34.882813 43.644531 35.4375 L 45.59375 37.382813 C 46.738281 38.511719 48.578125 38.5 49.714844 37.367188 C 50.847656 36.230469 50.859375 34.390625 49.730469 33.246094 L 46.941406 30.175781 C 41.160156 29.449219 35.386719 31.5625 31.4375 35.847656 C 27.492188 39.984375 25.613281 45.667969 26.320313 51.339844 L 28.910156 54.066406 C 30.128906 55.191406 32.019531 55.136719 33.171875 53.945313 Z M 33.171875 53.945313 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureIdentitygovernance(m).png b/dist/Identity/AzureIdentitygovernance(m).png
new file mode 100644
index 00000000..5f6201aa
Binary files /dev/null and b/dist/Identity/AzureIdentitygovernance(m).png differ
diff --git a/dist/Identity/AzureIdentitygovernance(m).svg b/dist/Identity/AzureIdentitygovernance(m).svg
new file mode 100644
index 00000000..ad10327d
--- /dev/null
+++ b/dist/Identity/AzureIdentitygovernance(m).svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 12.824219 57.179688 C 6.902344 51.257813 3.640625 43.382813 3.640625 35.003906 C 3.640625 26.628906 6.902344 18.753906 12.824219 12.828125 C 18.746094 6.90625 26.621094 3.644531 35 3.644531 C 43.375 3.644531 51.25 6.90625 57.175781 12.832031 Z M 12.824219 57.179688 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 57.175781 57.179688 C 51.25 63.105469 43.375 66.367188 35 66.367188 C 26.621094 66.363281 18.75 63.101563 12.824219 57.179688 C 6.902344 51.257813 3.640625 43.382813 3.640625 35.003906 C 3.640625 26.628906 6.902344 18.753906 12.824219 12.828125 C 18.746094 6.90625 26.621094 3.644531 35 3.644531 C 43.375 3.644531 51.25 6.90625 57.175781 12.832031 C 63.097656 18.753906 66.359375 26.628906 66.359375 35.003906 C 66.359375 43.378906 63.097656 51.257813 57.175781 57.179688 Z M 57.175781 57.179688 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,142,248);fill-opacity:1;" d="M 7.855469 45.875 C 6.484375 42.460938 5.738281 38.792969 5.738281 35.003906 C 5.738281 28.554688 7.84375 22.4375 11.675781 17.386719 C 11.050781 16.953125 10.472656 16.433594 9.96875 15.816406 C 9.53125 15.277344 9.183594 14.699219 8.902344 14.097656 C 1.054688 23.878906 -0.46875 37.023438 4.285156 48.140625 C 5.351563 47.179688 6.554688 46.410156 7.855469 45.875 Z M 7.855469 45.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,142,248);fill-opacity:1;" d="M 22.875 3.859375 C 23.921875 4.925781 24.730469 6.136719 25.320313 7.425781 C 28.390625 6.347656 31.644531 5.746094 35 5.746094 C 41.25 5.746094 47.1875 7.722656 52.148438 11.332031 C 52.652344 10.300781 53.378906 9.359375 54.324219 8.585938 C 54.328125 8.585938 54.328125 8.582031 54.328125 8.582031 C 54.527344 8.421875 54.730469 8.277344 54.933594 8.140625 C 45.570313 1.175781 33.402344 -0.230469 22.875 3.859375 Z M 22.875 3.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,142,248);fill-opacity:1;" d="M 62.144531 24.136719 C 63.519531 27.550781 64.261719 31.214844 64.261719 35.003906 C 64.261719 41.457031 62.15625 47.570313 58.324219 52.625 C 58.953125 53.058594 59.53125 53.578125 60.03125 54.195313 C 60.46875 54.730469 60.816406 55.308594 61.097656 55.910156 C 68.945313 46.128906 70.46875 32.988281 65.71875 21.867188 C 64.648438 22.828125 63.445313 23.601563 62.144531 24.136719 Z M 62.144531 24.136719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,142,248);fill-opacity:1;" d="M 44.675781 62.585938 C 41.605469 63.664063 38.351563 64.265625 35 64.265625 C 28.746094 64.265625 22.8125 62.289063 17.851563 58.679688 C 17.34375 59.710938 16.621094 60.652344 15.675781 61.421875 C 15.671875 61.425781 15.671875 61.425781 15.667969 61.429688 C 15.480469 61.582031 15.289063 61.71875 15.089844 61.851563 C 24.453125 68.808594 36.609375 70.230469 47.125 66.152344 C 46.074219 65.089844 45.265625 63.875 44.675781 62.585938 Z M 44.675781 62.585938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,142,248);fill-opacity:1;" d="M 19.851563 6.765625 C 23.070313 9.992188 23.066406 15.234375 19.84375 18.453125 C 16.621094 21.671875 11.378906 21.667969 8.15625 18.445313 C 4.9375 15.222656 4.9375 9.976563 8.164063 6.757813 C 11.386719 3.539063 16.625 3.542969 19.84375 6.761719 C 19.847656 6.761719 19.847656 6.765625 19.851563 6.765625 Z M 19.851563 6.765625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 16.863281 15.46875 C 18.445313 13.886719 18.445313 11.324219 16.867188 9.742188 C 15.289063 8.160156 12.722656 8.160156 11.144531 9.742188 C 9.5625 11.320313 9.5625 13.882813 11.140625 15.464844 L 11.140625 15.46875 C 12.71875 17.046875 15.285156 17.046875 16.863281 15.46875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,142,248);fill-opacity:1;" d="M 51.558594 6.761719 C 54.785156 3.539063 60.027344 3.542969 63.246094 6.769531 C 66.460938 9.992188 66.460938 15.230469 63.238281 18.453125 C 60.011719 21.675781 54.769531 21.671875 51.550781 18.449219 C 48.332031 15.222656 48.332031 9.984375 51.550781 6.765625 C 51.554688 6.761719 51.554688 6.761719 51.558594 6.761719 Z M 51.558594 6.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.261719 9.746094 C 58.679688 8.164063 56.117188 8.164063 54.535156 9.742188 C 52.953125 11.324219 52.953125 13.886719 54.535156 15.46875 C 56.113281 17.050781 58.675781 17.050781 60.257813 15.472656 L 60.261719 15.46875 C 61.839844 13.890625 61.839844 11.328125 60.261719 9.746094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,142,248);fill-opacity:1;" d="M 50.152344 63.242188 C 46.929688 60.019531 46.933594 54.773438 50.15625 51.554688 C 53.378906 48.339844 58.621094 48.339844 61.84375 51.5625 C 65.066406 54.789063 65.0625 60.03125 61.839844 63.25 C 58.613281 66.46875 53.375 66.46875 50.15625 63.25 C 50.152344 63.246094 50.152344 63.246094 50.152344 63.242188 Z M 50.152344 63.242188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 53.136719 54.542969 C 51.554688 56.121094 51.554688 58.683594 53.132813 60.265625 C 54.714844 61.847656 57.277344 61.847656 58.855469 60.269531 C 60.4375 58.6875 60.4375 56.125 58.859375 54.542969 C 57.28125 52.960938 54.71875 52.960938 53.136719 54.542969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,142,248);fill-opacity:1;" d="M 18.441406 63.25 C 15.214844 66.46875 9.972656 66.464844 6.753906 63.242188 C 3.539063 60.019531 3.539063 54.777344 6.761719 51.554688 C 9.988281 48.335938 15.230469 48.335938 18.449219 51.5625 C 21.667969 54.785156 21.667969 60.023438 18.449219 63.242188 C 18.445313 63.246094 18.445313 63.246094 18.441406 63.25 Z M 18.441406 63.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 9.738281 60.261719 C 11.320313 61.84375 13.882813 61.84375 15.464844 60.265625 C 17.046875 58.683594 17.046875 56.125 15.464844 54.542969 C 13.886719 52.960938 11.324219 52.960938 9.742188 54.539063 L 9.738281 54.539063 C 8.160156 56.117188 8.160156 58.683594 9.738281 60.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.800781 30.804688 L 35 43.40625 L 39.199219 30.804688 Z M 30.800781 30.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 49.042969 45.894531 C 48.242188 38.78125 44.929688 32.816406 39.199219 30.804688 L 35 43.40625 L 30.800781 30.804688 C 25.207031 32.6875 21.652344 38.054688 20.957031 45.917969 C 20.8125 47.457031 21.816406 48.832031 23.199219 48.988281 C 23.28125 49 23.367188 49.003906 23.449219 49.003906 L 46.550781 49.003906 C 47.929688 49.011719 49.054688 47.769531 49.058594 46.230469 C 49.058594 46.117188 49.054688 46.007813 49.042969 45.894531 Z M 49.042969 45.894531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 43.261719 23.804688 C 43.261719 28.367188 39.5625 32.066406 35 32.066406 C 30.4375 32.066406 26.738281 28.367188 26.738281 23.804688 C 26.738281 19.242188 30.4375 15.546875 35 15.546875 C 39.5625 15.546875 43.261719 19.242188 43.261719 23.804688 Z M 43.261719 23.804688 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureIdentitygovernance.png b/dist/Identity/AzureIdentitygovernance.png
new file mode 100644
index 00000000..eda28a55
Binary files /dev/null and b/dist/Identity/AzureIdentitygovernance.png differ
diff --git a/dist/Identity/AzureIdentitygovernance.puml b/dist/Identity/AzureIdentitygovernance.puml
new file mode 100644
index 00000000..0c89f154
--- /dev/null
+++ b/dist/Identity/AzureIdentitygovernance.puml
@@ -0,0 +1,15 @@
+sprite $AzureIdentitygovernance [70x70/16z] {
+lPZfbgGi38R97hp_-vsPrcWWIbdV-lngJiDBzYFL_Wy0aOWGeFrDaDNwXQlGNvSGxpTSln025c5iEzoVSOKmL8JWuVOmtuxxz3ncV_3HC8N6VlqvGxbHTiEy
+cn2Usu1OhnsvrN4MwS4bGzWAG24qu31kyCZ3uHQs1N05tUIGj9P8c12UQLi24fwSiHlIDXpbOcU51cDjkX7w7s1Gf8L4t6A3eiygBR3FAZBSZqMbsF8tLE8a
+ntzAaYeqn4td9EaLT_2IFYIcMr5O25wNfm4kYEpJVq3wzeDXgGfd9ArbHtt4u1BVJdWo9k6M-4eaaJJSIxC4FFQOmdNfDd8w1O0MMvrRCSLGpDq4KtkRi13v
+WTNtlL1DmLQnL4XZe52xwCPMu1H96kF7EeEg8WyYP5rB1RwgG6KV0ANy2xrw13VmQZgCLdoDBZnWKJCvC2fKCWqFo7bOG-xD6887OavzcYVGLr59FFBxcEVQ
+0tqKgO7XQSvLW9rzrn1JX4SY7ZdrAkX7fI7ijIFmH0nGAYcQcz67l_LxbThHXw--hMJuemgEmmdEnREA7N6nTP9zcZIqi6KHNScwtnqAR1KNA8EyrfjCtKsB
+JDTwgSFIfvKzgV2Y0tnBO5eXp9odGsqveAIi9gwn4b4k3YK-hMmnxF0UNjr6-hIuXqKNdngshK4OoMaRUYMuAmW6A1DClHkLkRs6gqDsNitG_fP7w4D-eHLm
+ROnKKxnyMRF4LnC04Z-3Xmqi8eJeTV370y456ho06dkjreWE3mJu37aVa2BofGnE8bu_OBffF13W4xOVLhMRANv-g1vx6DRmzUM7dhRa1qmAAXHgSkkn-a28
+9ycQiSvicYaoE8XVg60vTtyWqAjA3e2SR_MPeoz9ik76KJ46k8RWItGbNtcQOo7NHeXHVKOlHIU8P77t-40e6EFIcAHCMlHUSPs5aDK90DeWuzWc81y8PBdB
+LFWFeXQzaUqVomAfTpSUVdAeP5xP_9iVG6A4LEhjxw3OBL3G_Wx88ggc6hFqF-Ot
+}
+
+AzureEntityColoring(AzureIdentitygovernance)
+!define AzureIdentitygovernance(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIdentitygovernance, AzureIdentitygovernance)
+!define AzureIdentitygovernance(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIdentitygovernance, AzureIdentitygovernance)
diff --git a/dist/Identity/AzureIdentitygovernance.svg b/dist/Identity/AzureIdentitygovernance.svg
new file mode 100644
index 00000000..a36e7ecd
--- /dev/null
+++ b/dist/Identity/AzureIdentitygovernance.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 12.824219 57.179688 C 6.902344 51.257813 3.640625 43.382813 3.640625 35.003906 C 3.640625 26.628906 6.902344 18.753906 12.824219 12.828125 C 18.746094 6.90625 26.621094 3.644531 35 3.644531 C 43.375 3.644531 51.25 6.90625 57.175781 12.832031 Z M 12.824219 57.179688 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 57.175781 57.179688 C 51.25 63.105469 43.375 66.367188 35 66.367188 C 26.621094 66.363281 18.75 63.101563 12.824219 57.179688 C 6.902344 51.257813 3.640625 43.382813 3.640625 35.003906 C 3.640625 26.628906 6.902344 18.753906 12.824219 12.828125 C 18.746094 6.90625 26.621094 3.644531 35 3.644531 C 43.375 3.644531 51.25 6.90625 57.175781 12.832031 C 63.097656 18.753906 66.359375 26.628906 66.359375 35.003906 C 66.359375 43.378906 63.097656 51.257813 57.175781 57.179688 Z M 57.175781 57.179688 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(16.078431%,60%,77.647059%);fill-opacity:1;" d="M 7.855469 45.875 C 6.484375 42.460938 5.738281 38.792969 5.738281 35.003906 C 5.738281 28.554688 7.84375 22.4375 11.675781 17.386719 C 11.050781 16.953125 10.472656 16.433594 9.96875 15.816406 C 9.53125 15.277344 9.183594 14.699219 8.902344 14.097656 C 1.054688 23.878906 -0.46875 37.023438 4.285156 48.140625 C 5.351563 47.179688 6.554688 46.410156 7.855469 45.875 Z M 7.855469 45.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(16.078431%,60%,77.647059%);fill-opacity:1;" d="M 22.875 3.859375 C 23.921875 4.925781 24.730469 6.136719 25.320313 7.425781 C 28.390625 6.347656 31.644531 5.746094 35 5.746094 C 41.25 5.746094 47.1875 7.722656 52.148438 11.332031 C 52.652344 10.300781 53.378906 9.359375 54.324219 8.585938 C 54.328125 8.585938 54.328125 8.582031 54.328125 8.582031 C 54.527344 8.421875 54.730469 8.277344 54.933594 8.140625 C 45.570313 1.175781 33.402344 -0.230469 22.875 3.859375 Z M 22.875 3.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(16.078431%,60%,77.647059%);fill-opacity:1;" d="M 62.144531 24.136719 C 63.519531 27.550781 64.261719 31.214844 64.261719 35.003906 C 64.261719 41.457031 62.15625 47.570313 58.324219 52.625 C 58.953125 53.058594 59.53125 53.578125 60.03125 54.195313 C 60.46875 54.730469 60.816406 55.308594 61.097656 55.910156 C 68.945313 46.128906 70.46875 32.988281 65.71875 21.867188 C 64.648438 22.828125 63.445313 23.601563 62.144531 24.136719 Z M 62.144531 24.136719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(16.078431%,60%,77.647059%);fill-opacity:1;" d="M 44.675781 62.585938 C 41.605469 63.664063 38.351563 64.265625 35 64.265625 C 28.746094 64.265625 22.8125 62.289063 17.851563 58.679688 C 17.34375 59.710938 16.621094 60.652344 15.675781 61.421875 C 15.671875 61.425781 15.671875 61.425781 15.667969 61.429688 C 15.480469 61.582031 15.289063 61.71875 15.089844 61.851563 C 24.453125 68.808594 36.609375 70.230469 47.125 66.152344 C 46.074219 65.089844 45.265625 63.875 44.675781 62.585938 Z M 44.675781 62.585938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(16.078431%,60%,77.647059%);fill-opacity:1;" d="M 19.851563 6.765625 C 23.070313 9.992188 23.066406 15.234375 19.84375 18.453125 C 16.621094 21.671875 11.378906 21.667969 8.15625 18.445313 C 4.9375 15.222656 4.9375 9.976563 8.164063 6.757813 C 11.386719 3.539063 16.625 3.542969 19.84375 6.761719 C 19.847656 6.761719 19.847656 6.765625 19.851563 6.765625 Z M 19.851563 6.765625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 16.863281 15.46875 C 18.445313 13.886719 18.445313 11.324219 16.867188 9.742188 C 15.289063 8.160156 12.722656 8.160156 11.144531 9.742188 C 9.5625 11.320313 9.5625 13.882813 11.140625 15.464844 L 11.140625 15.46875 C 12.71875 17.046875 15.285156 17.046875 16.863281 15.46875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(16.078431%,60%,77.647059%);fill-opacity:1;" d="M 51.558594 6.761719 C 54.785156 3.539063 60.027344 3.542969 63.246094 6.769531 C 66.460938 9.992188 66.460938 15.230469 63.238281 18.453125 C 60.011719 21.675781 54.769531 21.671875 51.550781 18.449219 C 48.332031 15.222656 48.332031 9.984375 51.550781 6.765625 C 51.554688 6.761719 51.554688 6.761719 51.558594 6.761719 Z M 51.558594 6.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.261719 9.746094 C 58.679688 8.164063 56.117188 8.164063 54.535156 9.742188 C 52.953125 11.324219 52.953125 13.886719 54.535156 15.46875 C 56.113281 17.050781 58.675781 17.050781 60.257813 15.472656 L 60.261719 15.46875 C 61.839844 13.890625 61.839844 11.328125 60.261719 9.746094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(16.078431%,60%,77.647059%);fill-opacity:1;" d="M 50.152344 63.242188 C 46.929688 60.019531 46.933594 54.773438 50.15625 51.554688 C 53.378906 48.339844 58.621094 48.339844 61.84375 51.5625 C 65.066406 54.789063 65.0625 60.03125 61.839844 63.25 C 58.613281 66.46875 53.375 66.46875 50.15625 63.25 C 50.152344 63.246094 50.152344 63.246094 50.152344 63.242188 Z M 50.152344 63.242188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 53.136719 54.542969 C 51.554688 56.121094 51.554688 58.683594 53.132813 60.265625 C 54.714844 61.847656 57.277344 61.847656 58.855469 60.269531 C 60.4375 58.6875 60.4375 56.125 58.859375 54.542969 C 57.28125 52.960938 54.71875 52.960938 53.136719 54.542969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(16.078431%,60%,77.647059%);fill-opacity:1;" d="M 18.441406 63.25 C 15.214844 66.46875 9.972656 66.464844 6.753906 63.242188 C 3.539063 60.019531 3.539063 54.777344 6.761719 51.554688 C 9.988281 48.335938 15.230469 48.335938 18.449219 51.5625 C 21.667969 54.785156 21.667969 60.023438 18.449219 63.242188 C 18.445313 63.246094 18.445313 63.246094 18.441406 63.25 Z M 18.441406 63.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 9.738281 60.261719 C 11.320313 61.84375 13.882813 61.84375 15.464844 60.265625 C 17.046875 58.683594 17.046875 56.125 15.464844 54.542969 C 13.886719 52.960938 11.324219 52.960938 9.742188 54.539063 L 9.738281 54.539063 C 8.160156 56.117188 8.160156 58.683594 9.738281 60.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.800781 30.804688 L 35 43.40625 L 39.199219 30.804688 Z M 30.800781 30.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 49.042969 45.894531 C 48.242188 38.78125 44.929688 32.816406 39.199219 30.804688 L 35 43.40625 L 30.800781 30.804688 C 25.207031 32.6875 21.652344 38.054688 20.957031 45.917969 C 20.8125 47.457031 21.816406 48.832031 23.199219 48.988281 C 23.28125 49 23.367188 49.003906 23.449219 49.003906 L 46.550781 49.003906 C 47.929688 49.011719 49.054688 47.769531 49.058594 46.230469 C 49.058594 46.117188 49.054688 46.007813 49.042969 45.894531 Z M 49.042969 45.894531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 43.261719 23.804688 C 43.261719 28.367188 39.5625 32.066406 35 32.066406 C 30.4375 32.066406 26.738281 28.367188 26.738281 23.804688 C 26.738281 19.242188 30.4375 15.546875 35 15.546875 C 39.5625 15.546875 43.261719 19.242188 43.261719 23.804688 Z M 43.261719 23.804688 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureInformationProtection(m).png b/dist/Identity/AzureInformationProtection(m).png
new file mode 100644
index 00000000..3f2c586f
Binary files /dev/null and b/dist/Identity/AzureInformationProtection(m).png differ
diff --git a/dist/Identity/AzureInformationProtection(m).svg b/dist/Identity/AzureInformationProtection(m).svg
new file mode 100644
index 00000000..04310ab1
--- /dev/null
+++ b/dist/Identity/AzureInformationProtection(m).svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="59pt" height="70pt" viewBox="0 0 59 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 36.171875 0.0117188 C 45.5625 0.34375 53.074219 8.109375 53.074219 17.640625 L 53.074219 27.941406 L 53.574219 27.941406 C 56.496094 27.941406 58.867188 30.324219 58.867188 33.261719 L 58.867188 64.679688 C 58.867188 67.617188 56.5 70 53.574219 70 L 5.425781 70 C 2.503906 70 0.132813 67.617188 0.132813 64.679688 L 0.132813 33.261719 C 0.132813 30.324219 2.5 27.941406 5.425781 27.941406 L 5.925781 27.941406 L 5.925781 17.640625 C 5.925781 8.109375 13.441406 0.34375 22.828125 0.0117188 Z M 17.019531 27.941406 L 42.328125 27.941406 L 42.328125 16.191406 C 42.328125 12.324219 39.210938 9.191406 35.371094 9.191406 L 23.976563 9.191406 C 20.136719 9.191406 17.019531 12.324219 17.019531 16.191406 Z M 23.148438 48.859375 L 34.230469 44.578125 C 35.257813 45.550781 36.625 46.140625 38.121094 46.140625 C 41.320313 46.140625 43.914063 43.441406 43.914063 40.113281 C 43.914063 36.78125 41.320313 34.085938 38.121094 34.085938 C 35.285156 34.085938 32.925781 36.203125 32.425781 39.003906 L 14.324219 45.996094 C 13.394531 46.355469 12.710938 47.167969 12.515625 48.152344 C 12.09375 49.597656 12.839844 51.152344 14.265625 51.699219 L 32.398438 58.703125 C 32.824219 61.59375 35.222656 63.804688 38.121094 63.804688 C 41.320313 63.804688 43.914063 61.105469 43.914063 57.777344 C 43.914063 54.449219 41.320313 51.75 38.121094 51.75 C 36.6875 51.75 35.375 52.292969 34.363281 53.191406 Z M 23.148438 48.859375 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureInformationProtection.png b/dist/Identity/AzureInformationProtection.png
new file mode 100644
index 00000000..c170a354
Binary files /dev/null and b/dist/Identity/AzureInformationProtection.png differ
diff --git a/dist/Identity/AzureInformationProtection.puml b/dist/Identity/AzureInformationProtection.puml
new file mode 100644
index 00000000..d03fb384
--- /dev/null
+++ b/dist/Identity/AzureInformationProtection.puml
@@ -0,0 +1,10 @@
+sprite $AzureInformationProtection [59x70/16z] {
+xPPLOYGW40MdzVuttettMEK5ubBV5Azn3XTuL9zH6NQGH1EXHSPPjEhdAJHROsJkkMpgcgjVHegvNPhdqvxTpGRFqv8vjEnmGN6iNBoa1ju3h3gr2BrL7Igk
+apLNiKdLQBLMrNeBjR-1-ltKF_NqZIdYf8tZ9QgfgNN3ZTx5QbkDVJMh9HNkeLL-pGDL_G_8PNMsqweQemQeQ0w-eARZkpyg1wwdfi4xATGA-E602e532RNy
+B2gwR7vohDPPeDV3ntIQWLgdWRbmSk8iS45rY2GL_t1HKkKDPAbKb1-6d3QzW0ehQxE3IHt2uCy5AaKFHQhUoa6gFa1EgeusK0bNgKpAQM9CtHBQjKQLYLaP
+K0LlgkQs6hQjpftEy5w9NVC_
+}
+
+AzureEntityColoring(AzureInformationProtection)
+!define AzureInformationProtection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureInformationProtection, AzureInformationProtection)
+!define AzureInformationProtection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureInformationProtection, AzureInformationProtection)
diff --git a/dist/Identity/AzureInformationProtection.svg b/dist/Identity/AzureInformationProtection.svg
new file mode 100644
index 00000000..91bbba12
--- /dev/null
+++ b/dist/Identity/AzureInformationProtection.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="59pt" height="70pt" viewBox="0 0 59 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.509804%,70.588235%,85.098039%);fill-opacity:1;" d="M 36.171875 0.0117188 C 45.5625 0.34375 53.074219 8.109375 53.074219 17.640625 L 53.074219 27.941406 L 53.574219 27.941406 C 56.496094 27.941406 58.867188 30.324219 58.867188 33.261719 L 58.867188 64.679688 C 58.867188 67.617188 56.5 70 53.574219 70 L 5.425781 70 C 2.503906 70 0.132813 67.617188 0.132813 64.679688 L 0.132813 33.261719 C 0.132813 30.324219 2.5 27.941406 5.425781 27.941406 L 5.925781 27.941406 L 5.925781 17.640625 C 5.925781 8.109375 13.441406 0.34375 22.828125 0.0117188 Z M 17.019531 27.941406 L 42.328125 27.941406 L 42.328125 16.191406 C 42.328125 12.324219 39.210938 9.191406 35.371094 9.191406 L 23.976563 9.191406 C 20.136719 9.191406 17.019531 12.324219 17.019531 16.191406 Z M 23.148438 48.859375 L 34.230469 44.578125 C 35.257813 45.550781 36.625 46.140625 38.121094 46.140625 C 41.320313 46.140625 43.914063 43.441406 43.914063 40.113281 C 43.914063 36.78125 41.320313 34.085938 38.121094 34.085938 C 35.285156 34.085938 32.925781 36.203125 32.425781 39.003906 L 14.324219 45.996094 C 13.394531 46.355469 12.710938 47.167969 12.515625 48.152344 C 12.09375 49.597656 12.839844 51.152344 14.265625 51.699219 L 32.398438 58.703125 C 32.824219 61.59375 35.222656 63.804688 38.121094 63.804688 C 41.320313 63.804688 43.914063 61.105469 43.914063 57.777344 C 43.914063 54.449219 41.320313 51.75 38.121094 51.75 C 36.6875 51.75 35.375 52.292969 34.363281 53.191406 Z M 23.148438 48.859375 "/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureManagedIdentities(m).png b/dist/Identity/AzureManagedIdentities(m).png
new file mode 100644
index 00000000..aaccbfd3
Binary files /dev/null and b/dist/Identity/AzureManagedIdentities(m).png differ
diff --git a/dist/Identity/AzureManagedIdentities(m).svg b/dist/Identity/AzureManagedIdentities(m).svg
new file mode 100644
index 00000000..d6116af3
--- /dev/null
+++ b/dist/Identity/AzureManagedIdentities(m).svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="53pt" height="70pt" viewBox="0 0 53 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="53" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="53" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.617188 18.152344 L 33.351563 18.152344 L 33.351563 21.71875 L 8.617188 21.71875 Z M 8.617188 23.957031 L 33.351563 23.957031 L 33.351563 27.523438 L 8.617188 27.523438 Z M 8.617188 23.957031 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="53" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="53" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.28125 46.960938 L 38.363281 45.875 L 47.226563 54.765625 L 46.144531 55.851563 Z M 37.28125 46.960938 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="53" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="53" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 28.480469 54.773438 L 37.34375 45.878906 L 38.425781 46.964844 L 29.5625 55.859375 Z M 28.480469 54.773438 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="53" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="53" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.824219 40.386719 C 39.300781 39.859375 38.589844 39.5625 37.847656 39.5625 C 37.109375 39.5625 36.398438 39.859375 35.875 40.386719 L 23.515625 52.792969 C 22.425781 53.886719 22.425781 55.664063 23.515625 56.761719 L 30.511719 63.78125 L 43.671875 44.25 Z M 39.824219 40.386719 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="53" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="53" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 24.25 47.691406 L 24.25 38.652344 L 21.554688 39.980469 L 21.554688 50.394531 Z M 24.25 47.691406 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 19.714844 57.285156 C 18.335938 55.898438 18.335938 53.652344 19.714844 52.265625 L 27.472656 44.480469 L 27.472656 37.519531 L 38.929688 26.019531 C 41.875 23.0625 41.875 18.261719 38.929688 15.304688 L 25.90625 2.234375 C 22.960938 -0.726563 18.179688 -0.726563 15.230469 2.234375 L 2.210938 15.304688 C -0.738281 18.261719 -0.738281 23.0625 2.210938 26.019531 L 14.574219 38.429688 L 14.574219 39.476563 L 11.054688 43.011719 L 14.542969 46.515625 L 11.054688 50.011719 L 14.542969 53.515625 L 11.054688 57.011719 L 14.574219 60.546875 L 14.574219 60.589844 L 20.570313 66.609375 L 24.789063 62.375 Z M 16.285156 9.695313 C 16.285156 7.320313 18.203125 5.394531 20.570313 5.394531 C 22.9375 5.394531 24.855469 7.320313 24.855469 9.695313 C 24.855469 12.070313 22.9375 13.996094 20.570313 13.996094 C 18.203125 13.996094 16.285156 12.070313 16.285156 9.695313 Z M 16.285156 9.695313 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 37.851563 69.984375 C 37.109375 69.988281 36.398438 69.691406 35.875 69.164063 L 23.515625 56.761719 C 22.425781 55.664063 22.425781 53.890625 23.515625 52.792969 L 35.871094 40.386719 C 36.394531 39.859375 37.105469 39.566406 37.847656 39.566406 C 38.589844 39.566406 39.300781 39.859375 39.824219 40.386719 L 52.179688 52.792969 C 52.707031 53.320313 53 54.03125 53 54.777344 C 53 55.523438 52.707031 56.234375 52.179688 56.761719 L 39.824219 69.164063 C 39.304688 69.691406 38.59375 69.988281 37.851563 69.984375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.097656 52.398438 C 45.226563 52.398438 44.425781 52.878906 44.011719 53.648438 C 43.597656 54.417969 43.640625 55.351563 44.121094 56.082031 L 39.425781 60.792969 C 39.300781 60.707031 39.167969 60.628906 39.03125 60.566406 L 39.03125 48.546875 C 39.960938 48.007813 40.414063 46.910156 40.140625 45.871094 C 39.863281 44.828125 38.921875 44.105469 37.847656 44.105469 C 36.773438 44.105469 35.835938 44.828125 35.558594 45.871094 C 35.28125 46.910156 35.738281 48.007813 36.667969 48.546875 L 36.667969 60.566406 C 36.535156 60.625 36.40625 60.699219 36.285156 60.78125 L 31.585938 56.0625 C 32.246094 55.066406 32.089844 53.734375 31.210938 52.917969 C 30.335938 52.105469 29 52.046875 28.058594 52.785156 C 27.117188 53.523438 26.847656 54.835938 27.421875 55.886719 C 27.996094 56.9375 29.246094 57.417969 30.371094 57.015625 L 35.308594 61.972656 C 34.816406 63.128906 35.164063 64.476563 36.15625 65.246094 C 37.144531 66.019531 38.527344 66.023438 39.523438 65.257813 C 40.515625 64.496094 40.875 63.152344 40.390625 61.992188 L 45.347656 57.023438 C 45.585938 57.109375 45.84375 57.152344 46.097656 57.15625 C 47.40625 57.15625 48.46875 56.089844 48.46875 54.777344 C 48.46875 53.460938 47.40625 52.398438 46.097656 52.398438 Z M 46.097656 52.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 39.464844 63.058594 C 39.464844 63.96875 38.730469 64.707031 37.820313 64.707031 C 36.914063 64.707031 36.179688 63.96875 36.179688 63.058594 C 36.179688 62.148438 36.914063 61.410156 37.820313 61.410156 C 38.726563 61.410156 39.464844 62.148438 39.464844 63.058594 M 39.164063 46.496094 C 39.164063 47.226563 38.574219 47.820313 37.847656 47.820313 C 37.121094 47.820313 36.53125 47.226563 36.53125 46.496094 C 36.53125 45.765625 37.121094 45.175781 37.847656 45.175781 C 38.199219 45.171875 38.53125 45.3125 38.78125 45.5625 C 39.027344 45.808594 39.164063 46.144531 39.164063 46.496094 M 30.917969 54.777344 C 30.917969 55.507813 30.328125 56.101563 29.597656 56.101563 C 28.871094 56.101563 28.28125 55.507813 28.28125 54.777344 C 28.28125 54.046875 28.871094 53.453125 29.597656 53.453125 C 30.328125 53.457031 30.917969 54.046875 30.917969 54.777344 M 47.417969 54.777344 C 47.417969 55.507813 46.828125 56.101563 46.097656 56.101563 C 45.371094 56.101563 44.78125 55.507813 44.78125 54.777344 C 44.78125 54.046875 45.371094 53.453125 46.097656 53.453125 C 46.828125 53.453125 47.417969 54.046875 47.417969 54.777344 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Identity/AzureManagedIdentities.png b/dist/Identity/AzureManagedIdentities.png
new file mode 100644
index 00000000..8fbe9c13
Binary files /dev/null and b/dist/Identity/AzureManagedIdentities.png differ
diff --git a/dist/Identity/AzureManagedIdentities.puml b/dist/Identity/AzureManagedIdentities.puml
new file mode 100644
index 00000000..ac271eec
--- /dev/null
+++ b/dist/Identity/AzureManagedIdentities.puml
@@ -0,0 +1,11 @@
+sprite $AzureManagedIdentities [53x70/16z] {
+fTC7ajj034JHRgJx7zaQ9HWhTHdq_aeAV2GduMSqTpVYIkRFiCyxNZHQQQELDaOJIXh3oPQgPqqeRGoFw0lbpoX-44OW9xGHhtTBcewVFqdJMJ-dbJOwOQuf
+y_zGlejV7sGYV_PzLKM_Gfpe-kkPhvg8IsFuk-NhSI2k9i8mumArcSf4mmob4qOeOPJIHYjjjD96AssqqaOhRRJIPg-moyI3Le-Ak83yAugg-BUPAEjMQZDH
+6wti0xNPg4PnBZVBXJge3KWiL4IR2aOmIYflz3OL24UKKjweJJe1UWdbxuOvtyBZkx96msG2cL9zchgPEgYqcYOzZdcWyorJg3O1W5alL4c0HyL4_a9ronYE
+HbM8UCpYD0FH8duYiqPjnkiH4-5pEraVy-V5xc2-4U7UHgYJWo_4roe06tMGC485U90mMfs4aSeOGMkZ5V1Mz0YpDb81hPoz4xHwc5O6s344T8QEzOvOHs4M
+IXcjiYg7-GC
+}
+
+AzureEntityColoring(AzureManagedIdentities)
+!define AzureManagedIdentities(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagedIdentities, AzureManagedIdentities)
+!define AzureManagedIdentities(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagedIdentities, AzureManagedIdentities)
diff --git a/dist/Identity/AzureManagedIdentities.svg b/dist/Identity/AzureManagedIdentities.svg
new file mode 100644
index 00000000..d0fd618e
--- /dev/null
+++ b/dist/Identity/AzureManagedIdentities.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="53pt" height="70pt" viewBox="0 0 53 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="53" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="53" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.617188 18.152344 L 33.351563 18.152344 L 33.351563 21.71875 L 8.617188 21.71875 Z M 8.617188 23.957031 L 33.351563 23.957031 L 33.351563 27.523438 L 8.617188 27.523438 Z M 8.617188 23.957031 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="53" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="53" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.28125 46.960938 L 38.363281 45.875 L 47.226563 54.765625 L 46.144531 55.851563 Z M 37.28125 46.960938 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="53" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="53" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 28.480469 54.773438 L 37.34375 45.878906 L 38.425781 46.964844 L 29.5625 55.859375 Z M 28.480469 54.773438 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="53" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="53" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.824219 40.386719 C 39.300781 39.859375 38.589844 39.5625 37.847656 39.5625 C 37.109375 39.5625 36.398438 39.859375 35.875 40.386719 L 23.515625 52.792969 C 22.425781 53.886719 22.425781 55.664063 23.515625 56.761719 L 30.511719 63.78125 L 43.671875 44.25 Z M 39.824219 40.386719 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="53" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="53" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 24.25 47.691406 L 24.25 38.652344 L 21.554688 39.980469 L 21.554688 50.394531 Z M 24.25 47.691406 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 19.714844 57.285156 C 18.335938 55.898438 18.335938 53.652344 19.714844 52.265625 L 27.472656 44.480469 L 27.472656 37.519531 L 38.929688 26.019531 C 41.875 23.0625 41.875 18.261719 38.929688 15.304688 L 25.90625 2.234375 C 22.960938 -0.726563 18.179688 -0.726563 15.230469 2.234375 L 2.210938 15.304688 C -0.738281 18.261719 -0.738281 23.0625 2.210938 26.019531 L 14.574219 38.429688 L 14.574219 39.476563 L 11.054688 43.011719 L 14.542969 46.515625 L 11.054688 50.011719 L 14.542969 53.515625 L 11.054688 57.011719 L 14.574219 60.546875 L 14.574219 60.589844 L 20.570313 66.609375 L 24.789063 62.375 Z M 16.285156 9.695313 C 16.285156 7.320313 18.203125 5.394531 20.570313 5.394531 C 22.9375 5.394531 24.855469 7.320313 24.855469 9.695313 C 24.855469 12.070313 22.9375 13.996094 20.570313 13.996094 C 18.203125 13.996094 16.285156 12.070313 16.285156 9.695313 Z M 16.285156 9.695313 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 37.851563 69.984375 C 37.109375 69.988281 36.398438 69.691406 35.875 69.164063 L 23.515625 56.761719 C 22.425781 55.664063 22.425781 53.890625 23.515625 52.792969 L 35.871094 40.386719 C 36.394531 39.859375 37.105469 39.566406 37.847656 39.566406 C 38.589844 39.566406 39.300781 39.859375 39.824219 40.386719 L 52.179688 52.792969 C 52.707031 53.320313 53 54.03125 53 54.777344 C 53 55.523438 52.707031 56.234375 52.179688 56.761719 L 39.824219 69.164063 C 39.304688 69.691406 38.59375 69.988281 37.851563 69.984375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.097656 52.398438 C 45.226563 52.398438 44.425781 52.878906 44.011719 53.648438 C 43.597656 54.417969 43.640625 55.351563 44.121094 56.082031 L 39.425781 60.792969 C 39.300781 60.707031 39.167969 60.628906 39.03125 60.566406 L 39.03125 48.546875 C 39.960938 48.007813 40.414063 46.910156 40.140625 45.871094 C 39.863281 44.828125 38.921875 44.105469 37.847656 44.105469 C 36.773438 44.105469 35.835938 44.828125 35.558594 45.871094 C 35.28125 46.910156 35.738281 48.007813 36.667969 48.546875 L 36.667969 60.566406 C 36.535156 60.625 36.40625 60.699219 36.285156 60.78125 L 31.585938 56.0625 C 32.246094 55.066406 32.089844 53.734375 31.210938 52.917969 C 30.335938 52.105469 29 52.046875 28.058594 52.785156 C 27.117188 53.523438 26.847656 54.835938 27.421875 55.886719 C 27.996094 56.9375 29.246094 57.417969 30.371094 57.015625 L 35.308594 61.972656 C 34.816406 63.128906 35.164063 64.476563 36.15625 65.246094 C 37.144531 66.019531 38.527344 66.023438 39.523438 65.257813 C 40.515625 64.496094 40.875 63.152344 40.390625 61.992188 L 45.347656 57.023438 C 45.585938 57.109375 45.84375 57.152344 46.097656 57.15625 C 47.40625 57.15625 48.46875 56.089844 48.46875 54.777344 C 48.46875 53.460938 47.40625 52.398438 46.097656 52.398438 Z M 46.097656 52.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 39.464844 63.058594 C 39.464844 63.96875 38.730469 64.707031 37.820313 64.707031 C 36.914063 64.707031 36.179688 63.96875 36.179688 63.058594 C 36.179688 62.148438 36.914063 61.410156 37.820313 61.410156 C 38.726563 61.410156 39.464844 62.148438 39.464844 63.058594 M 39.164063 46.496094 C 39.164063 47.226563 38.574219 47.820313 37.847656 47.820313 C 37.121094 47.820313 36.53125 47.226563 36.53125 46.496094 C 36.53125 45.765625 37.121094 45.175781 37.847656 45.175781 C 38.199219 45.171875 38.53125 45.3125 38.78125 45.5625 C 39.027344 45.808594 39.164063 46.144531 39.164063 46.496094 M 30.917969 54.777344 C 30.917969 55.507813 30.328125 56.101563 29.597656 56.101563 C 28.871094 56.101563 28.28125 55.507813 28.28125 54.777344 C 28.28125 54.046875 28.871094 53.453125 29.597656 53.453125 C 30.328125 53.457031 30.917969 54.046875 30.917969 54.777344 M 47.417969 54.777344 C 47.417969 55.507813 46.828125 56.101563 46.097656 56.101563 C 45.371094 56.101563 44.78125 55.507813 44.78125 54.777344 C 44.78125 54.046875 45.371094 53.453125 46.097656 53.453125 C 46.828125 53.453125 47.417969 54.046875 47.417969 54.777344 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Identity/all.puml b/dist/Identity/all.puml
index 012bd9fc..04cf0970 100644
--- a/dist/Identity/all.puml
+++ b/dist/Identity/all.puml
@@ -1,11 +1,22 @@
+sprite $AzureAccessReview [70x70/16z] {
+xPPbmZCn28G9HEdzprkXCkknNv_CgxM7B9F9Sllel_uh-zkyYgCu3L4ceZGB4Ngfp54ycPpEG29zn1EOJ3_9CARGGc6qiuwMIkCUBvKdx85S6RV7YRXXenAH
+AJu_gGb63TaJrymmP0z_ds1Gk-r1xG2ZUY882dhT5KmK9h-qlI-OwM3RIs-YCc4fXnlPjvsGowfQda-LrTCKUzB3BuZmo-Qy3dXgimSGCWeLN6c3KIilZ6aK
+IsAYHgFYAi3gwKknnn4OrYPxia50iVAXnU-oWjXdG25MutuLhYCemRja451-624M1wFEFEQ26802pEAuoMVseFcHTXGq8_yCEBOdukhs59Jt9qPjL-aFARf-
+j-YnFUMQWYrnQ9HiWyPNQq7Noc5-7DQyfxYC6dXYAGtBIrKS1QlzOavZAvNJ8yw569dBTtcWU7trWrDEGjydpiydv2WiAH7jg4H020fgo_jGdAMpuTwFvg13
+sP5__cPh2JVV-HD1LZyP7Tr6XNDPTIWUuober_0JVl3UgMhPH06bUnYAUqeQ63PHMH5ERBLM5Vv-Q8EDlVC_Qck4ztt21cGcGle6vyEP8Hxfd1_XPMxoHdEm
+rIQ4mtvAsI5z4r96-cOmvVONwByU
+}
+
+AzureEntityColoring(AzureAccessReview)
+!define AzureAccessReview(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAccessReview, AzureAccessReview)
+!define AzureAccessReview(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAccessReview, AzureAccessReview)
+
 sprite $AzureActiveDirectory [70x70/16z] {
-fLU9bkCW31imFl__V_V8f7LQwz4Ij3iNl0X7aZt3psVe-NKB4hPFmX4XkoGK_p7sIBh70TeXQIT9UDzWiNZ0ssqIZOHjs9EuQzI8LumTUnAqOK_2-uOz2MyR
-zjmsIW93RjhZoYn-noXA4ZwZuyj6TQ_cagV2gnuB2BArLO-l3povTT4UmzxBMWigPe-nO4-f9K4hBUZNBPzqrBm51mWYCchUWeghd1kbW0GeDZUAGUkDVkoC
-kZs-cv1yhDdlYr9jTFfcGl9v_B-TXoiAHjzdUoIUBE6jgE_jWpr-la6oXDMZR6PFrd-ofDZTPqO98acML8ecHetolisYi0HLlma4oeN5BKcI9MkK25VpN7hp
-s4TnFLdI5Jwi6PvBBnxJXGIpXDLysQl7KhIkB25LJ7bvfESnW0KqgATtZ4QIJse16IEADHP58VEB1AKT08iJFEjdm1mEXopQO5JvTApCwYQLnGbCadCvSshj
-93ZSwfOi5s7P-jilxlucjZDrOe-GHpoJnVhpH1s33Rmannlyu6dwO76-5W2SnzldSsG7YxQQwUoyHBF0FFnlRwISiybxLZyzYiksjI__8XoWLYG9Y1eS13QL
-10K9nLbcaimr9Y0BbWIBCsVHfKiHvxgktN78aRhDuNJuJXokfLXRlv38UoJrrfN4XLaTA0Km3-2Y93Y0Yv9WZP4ag-BiNwXt94cGm-vR5oTdz0uq9Ta1bu44
-y1S
+fTG7agjG34HHHVQ_unymOkXw1NTigmBv817QeAAwE-sxwcslZk-GgVWUOOOHPXXXXX5blaMOOOGPHfXXf3EhWI6aVTzHm00ok_9jHlkFh5nsleMqcLTLfJGZ
+32DRcMNzBxFOX46456KOqOcKOKJUSrIblcjb6CdpNC--OHZ9OIBpbc5acCe7Xf4ZjZTW0DaE1HX0HW46a5600MGKO00P1HX0HW56aQxgGKHHfhk54QJtROz1
+L3aPtyygONgDnnX4b65sHFzFZykwcMUwZIoAxCWC7QAkhKHLLPZLW-9cQt3zWFaJRFcW7FSgDxzHQbLoLV96aP3zhpqglawKyefoHwmVb7YDv78lasR-5oZx
+3ZUx3fJIbpAgw3aoJ-bcPqGE8ufiHaHUscrHPMUB8aWkvmCp2Y30Z088CAC00imeW00p2Y3470eWm7Z7Im44c2b0cF4WX1a_ukyMOSOck2O71456arZpJn5c
+sYnF9MuGPivUKdeHX1c_F9TMX1a9iNmXVeim4vAX2uACngm3GandU1IC0umK8immmWmZp33232FCCCAC8DypzI4W7st2QNy1
 }
 
 AzureEntityColoring(AzureActiveDirectory)
@@ -13,31 +24,141 @@ AzureEntityColoring(AzureActiveDirectory)
 !define AzureActiveDirectory(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectory, AzureActiveDirectory)
 
 sprite $AzureActiveDirectoryB2C [70x70/16z] {
-fPUBcgiW38GDWK1Rs_T_tAFPnk4uttuiEdk__JkPKO5bf2BBVULQxsFKQgjt8SasIhDx436dj7oBKhwKfhSWGMdfUZq6okMYr8BYcClrz9Hc5-i1nLLkGAnO
-OFALUbnf9mP7BqA-pGGcpNRiYXcajVc-rRfvN3KmanqpnMNpzPXYejc-hLFarA0yKuyhfvyHSssGJaAAgcwjQCwvTPA_T0ofQfPjn8rI01dthMU8xPIwOQp7
-33k6iggQKzhkfZR8XXttePGlfHL4C-pRQ9wWL4GpAgem92WDqGnkpCoXW4BHD1b040ee74sLGSUO1nIEfWuwjdn0GE5eZ3kcK8Z2qMIgXq8X2aVJb20SIa-X
-QBZlpA4G1T5GKLIFYgIaQaH1D2c9Tbokntx8gJ0bLEJqy3Eg9-mPKIXF0_S4APGJKuuKMZDD8bgyxs9CqJ4bkN5iPGjJ4b4upDzlGpbXY7ByXknlTNslBT40
-fKSpfUhIITyVbz6_BXjPikCJKSmDb0qbsrlwX3BVZAuCEqw14QtnX7eUb3VTII7OSKeOiIDZ-K1AGP0Tfy18K3GGI0OPantrEm961XJa2JiX6C6rHnE5f92T
-K6-aUhgF0x8k9_sA2IDPtBLit3TPeOo9Gezh-uGUmmKblerdW1lPj2ANrs19AS4E9wcjw_hoppxGap5IgASK5wo-LjTJzf6WFDoK9IqnZ-mGrwFlccVYZ2kU
-bNKzf7lNq6XFvPIu0q6fCH8eB67AtWkqVQaFY008XxoyEihakQHYCMsWb6kdJzkBNaElsRC9Blwkf3nxUApOgHYywDp9poaA9rDka76DxKLP_rEQmMWrXw1d
-T3qXPy0A9Ci5jJEbNA4ypvIwGFy
+xPK7bgim34MVgil-z_iBOolOnfoKqoTtUe2Ba9uo-FLyOL4pKw7t3PvhK9BY3RJKcSHu3Gl7-nxETOVZMNGgG0WK3vW9J-6Zf7SrrGRZ2T8Y4NEZqm5vMPBx
+AmggJrTZTKIZI_IuGI7S8dM2qETbi5E5jomnURpavrlOi-DPQz7XzIrK5-JK5tykVRvQKdzLG5EHE-e52f2QBXdmfv8Vy7K62ZOCErZQZqD2YsQVuEaTWFqd
+NvhRAr7htR1vkOrKULHeK_VpjYtHK2kr643ddbfBO6bUNEBp0gPOYI4noVD-rd5NZMUJiUCAEIJkPR_PEKPhZsSO4qYrPlUcaLiBXSMd8ARK99xArhAiJZnR
+KBoHTfRqgA14LQiaD7mxeqAGGoDDrsYTDIPnTy-qpKjCM4qZBAC400wDu0fPixjAd7_gZbyNwca1IGW0btFaVR8uxOTKgFsRFbQWZ99s9Vc1RHep1ZO3Cesd
+lL7mNaEnHPqKVvJahQF6SEuQnOelIPDUJ4ZK6UuCyVRA0iNY3giJ4WNK3ujJr_1bCUCQ5w1rjakQnGcw7LIffOoPBqr2H_yzB4uWiBdx9dapfKl4mzAllXwK
+NqXIluHNYyMWrirUWuzDBRRfSBwiHSxNJ25MuDbgb4LECp90b2KgMR55aoFmSbZQq5jD6wGiJnMNi1640Gln7bkRCoIUcbLn2zbSpw3nmNc7-5cKpHOBuob8
+rDpTb2Ck5l4pmZkqYvb2znvatb5yGDSmFaAMgBtR7CFdaE1Zldpv2m
 }
 
 AzureEntityColoring(AzureActiveDirectoryB2C)
 !define AzureActiveDirectoryB2C(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActiveDirectoryB2C, AzureActiveDirectoryB2C)
 !define AzureActiveDirectoryB2C(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectoryB2C, AzureActiveDirectoryB2C)
 
+sprite $AzureActiveDirectoryConnectHealth [70x70/16z] {
+fTU9ieCW38NX92Giuli_xyNrq0jQgl-imlIhk8vqavYP2hrB_Pg-GiplsNi4p7C4p7i4p7C4p7C4p7FaEGF4d8Z3rglhHB7z415fsDyGxuYqL2WFvbV42ucM
+XDY36KTQPPW1WXKnLWHc4852BC94pZVCCA9EQ8sTDimuufniYEimuuXJAZdjCUE8tnJVOyQHG-anmmYK7ZE8GEapWmYKFZE4G1bXW9XZ5ZaHAD25sNKPFGUP
+zglCznHSpDOoSj854M6CGAbkh5MgRdjgOIqLvagH_IR7a3MAEnudP1SAaVl_m7cWyA5GesYp8lww8iPl-aSNFsiL8sAH-f-bUwOnqb_H6aQq_-uG5Z1GW32J
+sFt5YodzL82CtKXWe0mXVSQWZ29z1aeV6MIWh7TNIZ5y8knKvHjpAamSqbR0l6vZatvXTgKWCHt5iCtAFZJDSxXb491IMEOq7KZ9Vs64rudqaQj6yhmaTupi
+joU0BL4WQv6k62FMDT9QE1Q7zPGoNJ5AiYi-8LDha19TCL12jITQAndA9KEq8gvMF1GWK3gC4Az8lIA30WHAZpa7SAaebAb2CjqmJ4iEA_9GfbmfaUuOszxD
+yL2ASIW5GJhoKHAm8A_M8jFWfrf9r-AYc64-O5U-CQPxFXKbQ3qxpsdqwzF5hRGefduwotEMqIzXN3DgGMrg3ktWrrR4QR9G8u5eX55QudWgVcekbRkaE2R7
+ngc42adqGs2mAq1-Pyo7DyXsR2PVxKgaPyMSWNXwcZ-DhFGybpTa4deJ9rnhRz8yEVhi3m
+}
+
+AzureEntityColoring(AzureActiveDirectoryConnectHealth)
+!define AzureActiveDirectoryConnectHealth(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActiveDirectoryConnectHealth, AzureActiveDirectoryConnectHealth)
+!define AzureActiveDirectoryConnectHealth(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectoryConnectHealth, AzureActiveDirectoryConnectHealth)
+
 sprite $AzureActiveDirectoryDomainServices [70x70/16z] {
-fPTfUkGW34IDDcIu_tqdHAQQIUZ6mUzFzWBN4-JpiIBJyHohPteS8hNMysa8bVf5VXQIIlt67gMSzKAEVRns2c-7vFgYxFhMEh3hcwDPuFkEH_A-un7TTpmY
-suxhlYYhSqhQTRpb6uxd-9xZJTy9UkRejkEH8ZUF8DZrRSkC6xwbBZXRz-UsOumTbONlj0oXQodRTenxKp_wzbhNeqBXiV2kOslrEyTwXNOSHwLaxYb6yqnR
-ZbjpPkuvXOU9RrexRY4jnVFr-tdFiKQAsxLtspc2QbUAwzMZ_Dsn65ASuVksusY0RKXn-kLRxpbk22MEe5Rsw9lBol6bnonM5lVmZODvst6Zjm1H7BxlEsvW
-zpxwrZjw1266wV9lvF9DxJlt78yfv8Fl8l2yTZpseZxuxgwrB1q74iLGkBv40IuBnu4ojuLP92Fc6A3plHu3p2nVgIeYth7bIIeCFGrX5ciwH4GHewkhJdw6
-i7sdP14nnCWn8cLspRxa4BD6Yfi8jKU3x_STmp5cLYnIy1W2t-_-7vqlnz8T8AKBDlYUTrm6nrYhfy2l3Bu7TEOu_Ko1NfxwHiUAvndsadgxi2lZy8rGmMsT
-BD2USd3R5lFHTvTdMq77uHdJmbS8qgxF3OCt8NVJc1UbH6AKUWnd9PACUPcYuJfXOgRtI_3XTPiBHD6d5CpA73hHSJC3vH0CnHz9FdPy8QEQUQ_pZXqTlsIf
-uzvTe-LtnyeiUThhgcF603Pkz3hlMCTo5hskEfR_KkJFxtvd5C18GQ-taO8xYNeAUhqF7I152gPl5pMCsXDatki_
+vTS93kme30HGm1jm_mFFH1OjL4tYR7_t0PvA55X9-WSdvpSKrXSGOfCN43RZXqZXJJ5wX6HsnSf3n1NDznLsvHd3as9wkvvPCRbTpwmOtq9GCRfL3ohN-sPG
+RXN5eDnYQ4SnlOMWOdAndhLYVAaULAxspKlbOjySAPPZX68bPeXZfMfOJwZKMWCcSwHK7xcAC1W-5DM30qR4qA5IOV9vXAZG6gcsPCf2sCQLXMJHoP8Be22a
+QmG5L52ITJq0W89IQmm828UAjY4rcf42mg6YsgkDIVDaEg-8zWvhE8v3Y6nA_zfNXI3EeQAkjB78sVBeE1_48K1SwVu2YfhPvwAGnw9GaQ6qJP6njDXdFmvX
+55UwfJ9kZj1GHfnl1P2XzEh6DlCZB73Atufy56Ucrnt48KG-IdU4OIT075GKbJQ2u8AYhrCcG5mP3E5Ym3YeoBVIyzw-nDA7eYl53fOTpN5eHb3f3CfU71h8
+KkabXN4IkQ95zfIAo3eEcN6INQKh6kiucX8TA9tGm3iuQ3bIcgSEuyXAWRh3E1meNdSGXoLI-eB0E6PwhFWM3-BK_sV_rZKvzOqdrKT12MB07NJ5Iieyb3W6
+nd55ahEJOdJbzqJcVRO5sfGc-UAlNsM0PH4ZTj8VDVy1
 }
 
 AzureEntityColoring(AzureActiveDirectoryDomainServices)
 !define AzureActiveDirectoryDomainServices(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActiveDirectoryDomainServices, AzureActiveDirectoryDomainServices)
 !define AzureActiveDirectoryDomainServices(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectoryDomainServices, AzureActiveDirectoryDomainServices)
 
+sprite $AzureActiveDirectoryIdentityProtection [70x70/16z] {
+xTRRaeCm30DGATh__-MzPggj1WyavX6zzNQIs0NyCVFaYSOT2Z3kG01r4U8dJMG0VKQOOHFfCu0p-aYZKSGDp42cWv3x5TR_ecgNSIt2N4akpfqACzSUM6U8
+Ki56ZsbtbL7yxKFX3ZA3HQRuEW9VGiYVu-YTqOcHPIH-5VYaLoey4fdA4gD4NWhUb-0rHFDNKrbX4h4o6KQZQeHZJ2GK_Z8ykJ3fdHgnuizKCZwzaLIIANiy
+iaHJYLCmArpiaeTAV9j5Us9h9qesYbZTYzz89h-NYef5dP57HIeil-luh1haMoFS4O6IGeq0vNNaDyul0SQNP2KHwDeJdgy1KpxXqWt6o-dmlDoSdrIyVwau
+rHwN61uf-qzOAzoOK8ld_yN4ZxGv8TBCFjAV3hCu3SJ5QO_mR0_mESvr8fUa5PUa5RvAykJ95m
+}
+
+AzureEntityColoring(AzureActiveDirectoryIdentityProtection)
+!define AzureActiveDirectoryIdentityProtection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActiveDirectoryIdentityProtection, AzureActiveDirectoryIdentityProtection)
+!define AzureActiveDirectoryIdentityProtection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectoryIdentityProtection, AzureActiveDirectoryIdentityProtection)
+
+sprite $AzureActiveDirectoryPrivilegedIdentityManagement [70x70/16z] {
+lTU9UWCh20LWL43W_T-tYt4-SuAcqzxbTD_-2CuGI_z3AhE82dChVmCATu_dcDHV4nOHZec8tkuRjG_1NlCDETzSnp1idxkEH22H7Qi_5UF9I8a8UOjm_8pu
+sB1oHlhMw1c9y6DLbf5vZJG5PQJUHVXfvtGXC-qUKh5dixKhzKPFKWCPbnBXgSLoM4bLSvCoFbUpW1XXQa9qhl0H7hqn3uoYuc6xUjPZoxoSNjBUrzD72I-j
+B4bnMYa9CNxzey5wOkHvV-mrDHMmsWGfsDgiIFfrpOh2KlwgH86kPANTgIWaRT3jxkPjChUS_l1nfsliKbD1nwkEGSqbSLBo7U2De4A8mGwTxaRhJ8lSP7JC
+zqgQq0rxYpTJ-1vXBeY871Z12nSHvhgCmY8dHaTpJmXta_eWUgWS6GCb8r-vsWfCKWILBg8BMSfYJBMZuak1xPq8AeDvjBoWGwHFIb-z70WeWsaqewX8EDx8
+FDvtGsKDazB6UYnNj9QYlNScAhPLvBkOhrGOX0vxn4JSlrE8zaeZaluTeW9xr42HFX_ggiX1gKGw5LfAXy4WN-RrEpOJsxKeKS7H07qPlzHMNpnUkriqzOL7
+i-tAzpxMnm5P9WAAZn_LSL4vpc-9xJ51K5b8cZMUdeqO68-b058DRkayfhfsQvE9Irb8SRVkcsTypIDpCajPIAISds2dlvI4O46uIvaPIaRowOx3pynGtY1s
+E4d1Tetr2YAfj-V5U3110C6bd3iJ4PoGKrTEs-GncS9IpuYcusv2GkTGujDnmVBHEokyXXATwy6o0S7HLhOADYupQ_pm74exHIYdHi1IPja2GobrDgN5rHku
+f0eCfOGS__NqkE8r3QM4f1GB7yZAkFYRlMjiZaQu1yI1m3Ncd8zTzwh1o4-6LRgHec-DHZTJn4-rLFfDggIckZRwGvgekKUuMnSkz5_d4m
+}
+
+AzureEntityColoring(AzureActiveDirectoryPrivilegedIdentityManagement)
+!define AzureActiveDirectoryPrivilegedIdentityManagement(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActiveDirectoryPrivilegedIdentityManagement, AzureActiveDirectoryPrivilegedIdentityManagement)
+!define AzureActiveDirectoryPrivilegedIdentityManagement(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectoryPrivilegedIdentityManagement, AzureActiveDirectoryPrivilegedIdentityManagement)
+
+sprite $AzureAppRegistration [70x70/16z] {
+xTPNikGm28NX0mWKUl_hxPoGGs7FtAp_6NybEUCRnJu2YBjcftm7dmBvqCL0wwP-jpAKeGn5V0ImTCrDVUEgBm5MksWwDUwNW3AKzX-KLajj_wPSZ4kr_OFI
+MhbNstxbif2NiqiXBRwyNMbQfWbSvXCWcIkNsJ8Z7bbPoWZ1KbbBGZiYK5v1Z49db_lLz2Sch02wifk8ecdfx2YkiKGKizjOVthuRaXGCRiVaViJGY8R55F2
+9RaxzrsAn9LRhzFpEY7RbUVfIUIChOefun69x5HUfmSYknItBPP_LVIsag5OK5d_numgw-atKj9_KS2whX1YoOh2Y9UM56oAT4uXR8qd2cDFuXJ6tj9BmJz4
+UbC8txmJ
+}
+
+AzureEntityColoring(AzureAppRegistration)
+!define AzureAppRegistration(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppRegistration, AzureAppRegistration)
+!define AzureAppRegistration(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppRegistration, AzureAppRegistration)
+
+sprite $AzureConditionalAccess [70x70/16z] {
+xTK54eD038NX5x__YUkoKomRwkq_WdyuO3d57HAtUo3kYfMfxpF2YjZybAmtwWwftwQCdbZKnpDPa8YPHLJDbp9LuLqqWdY-E2LhbBY74k-Zn3sKk8SIzr3Y
+VPIuXn9LnOI9nOv8KJ76CRAwOhYc7ZN5q6P5XR6FHGZxlAJOvOAuO9UK5CQkThoaO9Uq4rvLx3WQSPXOfqG40T22OXSbtaU9UoXHKzfVASkfuuHrAepHEXLw
+lF9N_WeApou_IZ5lYfH26AGjab8SmxX5GZ4M3o_kz2b5Bi98t8aeHhCk931H5yAOY3iGmsIQLXmpQGKPPZc4C9yMa1BZI2ILkpECF6OIPBEOoXdvf78smyWJ
+1r8w74Cb7JmafSYkXg0U--3s5fs4iGK
+}
+
+AzureEntityColoring(AzureConditionalAccess)
+!define AzureConditionalAccess(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureConditionalAccess, AzureConditionalAccess)
+!define AzureConditionalAccess(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureConditionalAccess, AzureConditionalAccess)
+
+sprite $AzureEnterpriseApplication [70x70/16z] {
+xTO73i8m38LX9_5pQRZ_UPb6ZMl0OSzVYzMlpPAWDohR4b7Aiux-ohQqWMXOpjemrVtgcvM_ybV-Ih4bebnc7VlL6pVQc4Z6MSd_wWbhz5V-IXq7mQPXCTPh
+bIHWJMG3NQLmcsmhbofrO1Da6_95IfN3rJ2Cb0kKYkPIemZJbDWA4KkJ8lgPAfQ9OmqJ2dFBdefP6L_g6X7ColZGCxl273nCYPNA7368bO5FCz3tELJ0jcQP
+S7ZFaL9PCviMke-LGQGifcTe7wQ5HIG5oj0yGgF03h84Yco5JR8DoZacLCnkKyun72hAk72H4ZBz2ijv9bffUCKp9L16WHkHPrAWr47W4S0ouJbQYAzvEbMY
+_vXyGc5C3vCf3EB2x5nIN9Op37I5ukADsrCATboYhh8tC2c5EYl1UAvZ421zWxfyE5hYu-VdqZBcJA5hIeo6oNHrAPTjET73MWC
+}
+
+AzureEntityColoring(AzureEnterpriseApplication)
+!define AzureEnterpriseApplication(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureEnterpriseApplication, AzureEnterpriseApplication)
+!define AzureEnterpriseApplication(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureEnterpriseApplication, AzureEnterpriseApplication)
+
+sprite $AzureIdentitygovernance [70x70/16z] {
+lPZfbgGi38R97hp_-vsPrcWWIbdV-lngJiDBzYFL_Wy0aOWGeFrDaDNwXQlGNvSGxpTSln025c5iEzoVSOKmL8JWuVOmtuxxz3ncV_3HC8N6VlqvGxbHTiEy
+cn2Usu1OhnsvrN4MwS4bGzWAG24qu31kyCZ3uHQs1N05tUIGj9P8c12UQLi24fwSiHlIDXpbOcU51cDjkX7w7s1Gf8L4t6A3eiygBR3FAZBSZqMbsF8tLE8a
+ntzAaYeqn4td9EaLT_2IFYIcMr5O25wNfm4kYEpJVq3wzeDXgGfd9ArbHtt4u1BVJdWo9k6M-4eaaJJSIxC4FFQOmdNfDd8w1O0MMvrRCSLGpDq4KtkRi13v
+WTNtlL1DmLQnL4XZe52xwCPMu1H96kF7EeEg8WyYP5rB1RwgG6KV0ANy2xrw13VmQZgCLdoDBZnWKJCvC2fKCWqFo7bOG-xD6887OavzcYVGLr59FFBxcEVQ
+0tqKgO7XQSvLW9rzrn1JX4SY7ZdrAkX7fI7ijIFmH0nGAYcQcz67l_LxbThHXw--hMJuemgEmmdEnREA7N6nTP9zcZIqi6KHNScwtnqAR1KNA8EyrfjCtKsB
+JDTwgSFIfvKzgV2Y0tnBO5eXp9odGsqveAIi9gwn4b4k3YK-hMmnxF0UNjr6-hIuXqKNdngshK4OoMaRUYMuAmW6A1DClHkLkRs6gqDsNitG_fP7w4D-eHLm
+ROnKKxnyMRF4LnC04Z-3Xmqi8eJeTV370y456ho06dkjreWE3mJu37aVa2BofGnE8bu_OBffF13W4xOVLhMRANv-g1vx6DRmzUM7dhRa1qmAAXHgSkkn-a28
+9ycQiSvicYaoE8XVg60vTtyWqAjA3e2SR_MPeoz9ik76KJ46k8RWItGbNtcQOo7NHeXHVKOlHIU8P77t-40e6EFIcAHCMlHUSPs5aDK90DeWuzWc81y8PBdB
+LFWFeXQzaUqVomAfTpSUVdAeP5xP_9iVG6A4LEhjxw3OBL3G_Wx88ggc6hFqF-Ot
+}
+
+AzureEntityColoring(AzureIdentitygovernance)
+!define AzureIdentitygovernance(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIdentitygovernance, AzureIdentitygovernance)
+!define AzureIdentitygovernance(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIdentitygovernance, AzureIdentitygovernance)
+
+sprite $AzureInformationProtection [59x70/16z] {
+xPPLOYGW40MdzVuttettMEK5ubBV5Azn3XTuL9zH6NQGH1EXHSPPjEhdAJHROsJkkMpgcgjVHegvNPhdqvxTpGRFqv8vjEnmGN6iNBoa1ju3h3gr2BrL7Igk
+apLNiKdLQBLMrNeBjR-1-ltKF_NqZIdYf8tZ9QgfgNN3ZTx5QbkDVJMh9HNkeLL-pGDL_G_8PNMsqweQemQeQ0w-eARZkpyg1wwdfi4xATGA-E602e532RNy
+B2gwR7vohDPPeDV3ntIQWLgdWRbmSk8iS45rY2GL_t1HKkKDPAbKb1-6d3QzW0ehQxE3IHt2uCy5AaKFHQhUoa6gFa1EgeusK0bNgKpAQM9CtHBQjKQLYLaP
+K0LlgkQs6hQjpftEy5w9NVC_
+}
+
+AzureEntityColoring(AzureInformationProtection)
+!define AzureInformationProtection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureInformationProtection, AzureInformationProtection)
+!define AzureInformationProtection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureInformationProtection, AzureInformationProtection)
+
+sprite $AzureManagedIdentities [53x70/16z] {
+fTC7ajj034JHRgJx7zaQ9HWhTHdq_aeAV2GduMSqTpVYIkRFiCyxNZHQQQELDaOJIXh3oPQgPqqeRGoFw0lbpoX-44OW9xGHhtTBcewVFqdJMJ-dbJOwOQuf
+y_zGlejV7sGYV_PzLKM_Gfpe-kkPhvg8IsFuk-NhSI2k9i8mumArcSf4mmob4qOeOPJIHYjjjD96AssqqaOhRRJIPg-moyI3Le-Ak83yAugg-BUPAEjMQZDH
+6wti0xNPg4PnBZVBXJge3KWiL4IR2aOmIYflz3OL24UKKjweJJe1UWdbxuOvtyBZkx96msG2cL9zchgPEgYqcYOzZdcWyorJg3O1W5alL4c0HyL4_a9ronYE
+HbM8UCpYD0FH8duYiqPjnkiH4-5pEraVy-V5xc2-4U7UHgYJWo_4roe06tMGC485U90mMfs4aSeOGMkZ5V1Mz0YpDb81hPoz4xHwc5O6s344T8QEzOvOHs4M
+IXcjiYg7-GC
+}
+
+AzureEntityColoring(AzureManagedIdentities)
+!define AzureManagedIdentities(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagedIdentities, AzureManagedIdentities)
+!define AzureManagedIdentities(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagedIdentities, AzureManagedIdentities)
+
diff --git a/dist/Integration/AzureAPIforFHIR(m).png b/dist/Integration/AzureAPIforFHIR(m).png
new file mode 100644
index 00000000..59470439
Binary files /dev/null and b/dist/Integration/AzureAPIforFHIR(m).png differ
diff --git a/dist/Integration/AzureAPIforFHIR(m).svg b/dist/Integration/AzureAPIforFHIR(m).svg
new file mode 100644
index 00000000..a234b672
--- /dev/null
+++ b/dist/Integration/AzureAPIforFHIR(m).svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 35 39.199219 C 20 39.199219 7.125 33.617188 1.550781 25.644531 C 3.882813 53.027344 35 68.601563 35 68.601563 C 35 68.601563 66.117188 53.027344 68.449219 25.644531 C 62.875 33.617188 50 39.199219 35 39.199219 Z M 35 39.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 51.101563 1.398438 C 43.871094 1.398438 37.667969 5.785156 35 12.039063 C 32.332031 5.785156 26.128906 1.398438 18.898438 1.398438 C 7 1.398438 1.398438 12.734375 1.398438 22.398438 C 1.398438 51.800781 35 68.601563 35 68.601563 C 35 68.601563 68.601563 51.800781 68.601563 22.398438 C 68.601563 12.734375 63 1.398438 51.101563 1.398438 Z M 51.101563 1.398438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 44.660156 51.800781 C 44.660156 54.816406 42.214844 57.261719 39.199219 57.261719 C 36.183594 57.261719 33.738281 54.816406 33.738281 51.800781 C 33.738281 48.785156 36.183594 46.339844 39.199219 46.339844 C 42.214844 46.339844 44.660156 48.785156 44.660156 51.800781 Z M 44.660156 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 6.503906 7.140625 C 6.503906 7.140625 4.535156 14.199219 12.710938 21.257813 L 15.296875 17.945313 C 15.25 17.910156 10.839844 14.355469 10.515625 9.175781 C 10.253906 4.953125 12.363281 2.675781 12.363281 2.675781 C 10.019531 3.734375 8.074219 5.195313 6.503906 7.140625 Z M 66.914063 13.1875 C 68.164063 18.640625 67.703125 24.015625 65.503906 28.960938 C 61.554688 37.851563 52.222656 45.0625 38.511719 49.816406 L 39.886719 53.785156 C 51.699219 49.691406 60.6875 43.785156 66.046875 36.511719 C 67.714844 32.199219 68.738281 27.492188 68.738281 22.398438 C 68.738281 19.359375 68.042969 16.15625 66.914063 13.1875 Z M 66.914063 13.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 12.847656 18.445313 C 4.976563 26.316406 14.726563 40.125 22.644531 48.046875 L 24.132813 49.53125 C 24.953125 50.351563 26.28125 50.351563 27.101563 49.53125 L 30.070313 46.5625 C 30.617188 46.035156 30.835938 45.253906 30.644531 44.519531 C 30.449219 43.785156 29.878906 43.210938 29.144531 43.019531 C 28.410156 42.828125 27.628906 43.046875 27.101563 43.59375 L 25.519531 45.175781 C 14.628906 34.289063 11.125 25.710938 15.617188 21.21875 C 20.109375 16.726563 28.6875 20.230469 39.574219 31.121094 L 37.992188 32.703125 C 37.445313 33.230469 37.226563 34.011719 37.417969 34.746094 C 37.609375 35.480469 38.183594 36.050781 38.917969 36.246094 C 39.652344 36.4375 40.433594 36.21875 40.960938 35.671875 L 43.929688 32.703125 C 44.75 31.882813 44.75 30.554688 43.929688 29.734375 L 42.445313 28.246094 C 34.527344 20.328125 20.714844 10.578125 12.847656 18.445313 Z M 12.847656 18.445313 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureAPIforFHIR.png b/dist/Integration/AzureAPIforFHIR.png
new file mode 100644
index 00000000..ccb695b8
Binary files /dev/null and b/dist/Integration/AzureAPIforFHIR.png differ
diff --git a/dist/Integration/AzureAPIforFHIR.puml b/dist/Integration/AzureAPIforFHIR.puml
new file mode 100644
index 00000000..a5d594c6
--- /dev/null
+++ b/dist/Integration/AzureAPIforFHIR.puml
@@ -0,0 +1,13 @@
+sprite $AzureAPIforFHIR [70x70/16z] {
+lPG7biGg30HRA77_2symYvuyHau_r0iRHYuQt0F-2wZn3urGqVWNEbE81T9mW5Xjebmuo7PeAzQOh3m4iGyK2RO3kf30ZX0cQYle825Rq8wIMlCxtApMg5La
+oRGKOs8bYi1EB5f-4c47ilrAvPYTWW7zlVegCzif74tGyztV2JD_8tj7mpnLVXycFukeXOg8sWDaF1f2CY4CslrWIW1Ib_UqkudormTuww5KJ4stMLlS1pMx
+kHRBfpkAz9b5uxM7vruSpKDyA9xIhJYIBGIWk5hrlWK0bbq8Uq7xi50nStx5K7nUMunBJNuhNkmea7CDWm1qZ-YeLwil3jeitZsIotEDOhDO7nezMK_B_ZaD
+Y_JU_TTprWmkmhXWqFelRiRr6SewYxjZH05yQBmEeyktvDvx2ulsWNEaNaLfHqTN1DodfYgx9aboT4D40Nngf6gUikmKtaCI5eqmj9NPtGf24TCX0KKOcplq
+bSgd8KaWc6YVy3vRfWTfEp04vFi5h5-YVn815c4iMMjcPSq9gp1TRsZcizO56Ua1JuqIUnbap3ZsU9zu0u2spRP-n0WRx6F5H9hFFQ1Za9QEql29Pit7HbrL
+H-LvBkffBkD73SUtT3DQso_9o8G-i92aFSJAxBaoGSGFB2HTiATPZ2pHf76rFg1FH-owmFeHHu8zlwi76gzALL0qdrQTOk2PPdM12F1GunHHakIvfiN9Piav
+PFqJ4nOBAUCMEqsHx0PwUa7THhoG69xGrXf5ujqPvtDzloiZl83yS6U_Gjy7oJJBGTx3deAyXzGQ_X--0G
+}
+
+AzureEntityColoring(AzureAPIforFHIR)
+!define AzureAPIforFHIR(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAPIforFHIR, AzureAPIforFHIR)
+!define AzureAPIforFHIR(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAPIforFHIR, AzureAPIforFHIR)
diff --git a/dist/Integration/AzureAPIforFHIR.svg b/dist/Integration/AzureAPIforFHIR.svg
new file mode 100644
index 00000000..370dc121
--- /dev/null
+++ b/dist/Integration/AzureAPIforFHIR.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 35 39.199219 C 20 39.199219 7.125 33.617188 1.550781 25.644531 C 3.882813 53.027344 35 68.601563 35 68.601563 C 35 68.601563 66.117188 53.027344 68.449219 25.644531 C 62.875 33.617188 50 39.199219 35 39.199219 Z M 35 39.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 51.101563 1.398438 C 43.871094 1.398438 37.667969 5.785156 35 12.039063 C 32.332031 5.785156 26.128906 1.398438 18.898438 1.398438 C 7 1.398438 1.398438 12.734375 1.398438 22.398438 C 1.398438 51.800781 35 68.601563 35 68.601563 C 35 68.601563 68.601563 51.800781 68.601563 22.398438 C 68.601563 12.734375 63 1.398438 51.101563 1.398438 Z M 51.101563 1.398438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44.660156 51.800781 C 44.660156 54.816406 42.214844 57.261719 39.199219 57.261719 C 36.183594 57.261719 33.738281 54.816406 33.738281 51.800781 C 33.738281 48.785156 36.183594 46.339844 39.199219 46.339844 C 42.214844 46.339844 44.660156 48.785156 44.660156 51.800781 Z M 44.660156 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 6.503906 7.140625 C 6.503906 7.140625 4.535156 14.199219 12.710938 21.257813 L 15.296875 17.945313 C 15.25 17.910156 10.839844 14.355469 10.515625 9.175781 C 10.253906 4.953125 12.363281 2.675781 12.363281 2.675781 C 10.019531 3.734375 8.074219 5.195313 6.503906 7.140625 Z M 66.914063 13.1875 C 68.164063 18.640625 67.703125 24.015625 65.503906 28.960938 C 61.554688 37.851563 52.222656 45.0625 38.511719 49.816406 L 39.886719 53.785156 C 51.699219 49.691406 60.6875 43.785156 66.046875 36.511719 C 67.714844 32.199219 68.738281 27.492188 68.738281 22.398438 C 68.738281 19.359375 68.042969 16.15625 66.914063 13.1875 Z M 66.914063 13.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 12.847656 18.445313 C 4.976563 26.316406 14.726563 40.125 22.644531 48.046875 L 24.132813 49.53125 C 24.953125 50.351563 26.28125 50.351563 27.101563 49.53125 L 30.070313 46.5625 C 30.617188 46.035156 30.835938 45.253906 30.644531 44.519531 C 30.449219 43.785156 29.878906 43.210938 29.144531 43.019531 C 28.410156 42.828125 27.628906 43.046875 27.101563 43.59375 L 25.519531 45.175781 C 14.628906 34.289063 11.125 25.710938 15.617188 21.21875 C 20.109375 16.726563 28.6875 20.230469 39.574219 31.121094 L 37.992188 32.703125 C 37.445313 33.230469 37.226563 34.011719 37.417969 34.746094 C 37.609375 35.480469 38.183594 36.050781 38.917969 36.246094 C 39.652344 36.4375 40.433594 36.21875 40.960938 35.671875 L 43.929688 32.703125 C 44.75 31.882813 44.75 30.554688 43.929688 29.734375 L 42.445313 28.246094 C 34.527344 20.328125 20.714844 10.578125 12.847656 18.445313 Z M 12.847656 18.445313 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureAppConfiguration(m).png b/dist/Integration/AzureAppConfiguration(m).png
new file mode 100644
index 00000000..d8c3a303
Binary files /dev/null and b/dist/Integration/AzureAppConfiguration(m).png differ
diff --git a/dist/Integration/AzureAppConfiguration(m).svg b/dist/Integration/AzureAppConfiguration(m).svg
new file mode 100644
index 00000000..f7553861
--- /dev/null
+++ b/dist/Integration/AzureAppConfiguration(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 11.125 37.558594 C 11.125 32.4375 13.746094 28.445313 18.617188 25.945313 L 18.617188 24.949219 C 18.703125 20.269531 21.277344 15.992188 25.371094 13.726563 C 29.46875 11.460938 34.457031 11.550781 38.46875 13.960938 C 41.722656 9.484375 46.921875 6.835938 52.453125 6.84375 C 49.351563 4.101563 45.355469 2.589844 41.214844 2.597656 C 36.039063 2.582031 31.167969 5.042969 28.105469 9.214844 C 26.175781 7.960938 23.914063 7.308594 21.613281 7.34375 C 14.902344 7.339844 9.441406 12.75 9.378906 19.460938 L 9.378906 20.457031 C 5.109375 22.445313 2.378906 26.730469 2.378906 31.441406 C 2.363281 37.707031 6.746094 43.128906 12.878906 44.425781 C 11.714844 42.324219 11.113281 39.960938 11.125 37.558594 Z M 11.125 37.558594 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.324219 20.328125 C 57.324219 19.828125 57.449219 19.207031 57.449219 18.707031 C 57.425781 14.429688 55.699219 10.339844 52.652344 7.339844 C 49.605469 4.339844 45.492188 2.679688 41.214844 2.722656 C 36.046875 2.605469 31.144531 5.03125 28.105469 9.214844 C 26.175781 7.960938 23.914063 7.308594 21.613281 7.34375 C 14.902344 7.339844 9.441406 12.75 9.378906 19.460938 L 9.378906 20.457031 C 5.109375 22.445313 2.378906 26.730469 2.378906 31.441406 C 2.421875 35.082031 3.929688 38.550781 6.5625 41.066406 C 9.195313 43.578125 12.730469 44.925781 16.371094 44.800781 L 50.828125 44.800781 C 54.46875 44.925781 58.003906 43.578125 60.636719 41.066406 C 63.269531 38.550781 64.777344 35.082031 64.820313 31.441406 C 64.859375 26.542969 61.878906 22.125 57.324219 20.328125 Z M 57.324219 20.328125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 32.109375 49.125 L 33.425781 52.25 L 30.464844 57.429688 L 33.714844 60.679688 L 39.058594 58.171875 L 42.183594 59.484375 L 43.820313 64.378906 L 43.984375 64.953125 L 48.59375 64.953125 L 50.527344 59.484375 L 53.652344 58.171875 L 58.253906 60.550781 L 58.832031 60.839844 L 62.078125 57.589844 L 59.613281 52.5 L 60.929688 49.375 L 65.820313 47.730469 L 66.394531 47.566406 L 66.394531 42.960938 L 60.933594 41.027344 L 59.617188 37.902344 L 62 33.300781 L 62.289063 32.722656 L 59.164063 29.476563 L 53.984375 31.984375 L 50.859375 30.667969 L 49.214844 25.777344 L 48.921875 25.199219 L 44.519531 25.199219 L 42.589844 30.667969 L 39.464844 31.984375 L 34.859375 29.601563 L 34.285156 29.316406 L 31.203125 33.015625 L 33.425781 37.742188 L 32.109375 40.867188 L 27.21875 42.511719 L 26.640625 42.800781 L 26.640625 47.195313 Z M 40.167969 45.140625 C 40.167969 41.617188 43.019531 38.765625 46.539063 38.765625 C 50.058594 38.765625 52.914063 41.617188 52.914063 45.136719 C 52.914063 48.65625 50.058594 51.511719 46.539063 51.511719 C 44.84375 51.53125 43.210938 50.863281 42.011719 49.664063 C 40.8125 48.464844 40.148438 46.835938 40.167969 45.140625 Z M 40.167969 45.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 12.277344 60.230469 L 13.492188 61.53125 L 12.972656 64.621094 L 15.160156 65.632813 L 17.339844 63.429688 L 19.117188 63.507813 L 20.816406 65.621094 L 21 65.875 L 23.269531 65.035156 L 23.230469 61.992188 L 24.53125 60.777344 L 27.230469 61.117188 L 27.566406 61.152344 L 28.578125 58.964844 L 26.4375 56.898438 L 26.519531 55.121094 L 28.632813 53.425781 L 28.886719 53.238281 L 28.042969 50.972656 L 25 51.011719 L 23.785156 49.710938 L 24.125 47.011719 L 24.164063 46.675781 L 22.035156 45.640625 L 19.933594 47.816406 L 18.15625 47.734375 L 16.460938 45.625 L 16.214844 45.390625 L 14.046875 46.1875 L 14.085938 49.234375 L 12.785156 50.449219 L 10.089844 50.121094 L 9.757813 50.082031 L 8.90625 52.460938 L 10.859375 54.386719 L 10.78125 56.164063 L 8.664063 57.859375 L 8.433594 58.105469 L 9.234375 60.273438 Z M 15.523438 56.804688 C 14.882813 55.070313 15.773438 53.148438 17.507813 52.511719 C 19.242188 51.871094 21.164063 52.761719 21.804688 54.496094 C 22.441406 56.230469 21.554688 58.152344 19.820313 58.789063 C 18.988281 59.105469 18.0625 59.074219 17.253906 58.703125 C 16.445313 58.328125 15.820313 57.644531 15.523438 56.804688 Z M 15.523438 56.804688 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureAppConfiguration.png b/dist/Integration/AzureAppConfiguration.png
new file mode 100644
index 00000000..42709b54
Binary files /dev/null and b/dist/Integration/AzureAppConfiguration.png differ
diff --git a/dist/Integration/AzureAppConfiguration.puml b/dist/Integration/AzureAppConfiguration.puml
new file mode 100644
index 00000000..61e93c4e
--- /dev/null
+++ b/dist/Integration/AzureAppConfiguration.puml
@@ -0,0 +1,12 @@
+sprite $AzureAppConfiguration [70x70/16z] {
+xPY5aYj124Mns_t_NxmosnMOyA1uRdjAucSk4Xlw--1tli-WXWzCwHiHGyI-AP7XcQ_Fmq36Q8Be6rn8rZiyRuCo9yK1rCA6ckMq6a4lSUJR9H6ggDhWrmCw
+N8qLI9AoCv8SBLn5cKlg_WubVMCaINhiMop3zceZcLliQotSlu7M42lBwIrz74LfcQyUurij80TJYxrHxPwC9Vh6a-Rhtq1wyUKmF9L0Bx0Y6Au-Ga5rIOfU
+eWOlo4k2AUOMLRqyq0Uu7ASuTaijCUtmBD9Pe2ruMBYTZtPOsDxMWZwABw_MbZwCnVSZjnQqKOmUQ6UnTa9CZeqgCZnbmrAAJBfhAPqPtU120mkI74-OxXYo
+nKoTek6IlWMw6LjwfF8eQWlAkGbbE4WZJ07jBRQl3T1hXDziMNil8jbxCv6avyuj1tg7WuWSIOxISf2iuNfVY4t59Ljp-YHHIjY-0u2F9HoQMHskYrd0FjWv
+T0Lbn5_9wmXFbWgkD0X6r57g-L1egWkrWuiimM8-w7aOzLQGU5TwSfBKtHMoY4P42WllmyBoIHyDtpVsSOiIQePzXw-GmhwpeHby99cW4HQXEqKLpRj0AIF9
+KcTPwuf26VOTQLdNhabXeLaKOk1ZTS0_ulJ99wy
+}
+
+AzureEntityColoring(AzureAppConfiguration)
+!define AzureAppConfiguration(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppConfiguration, AzureAppConfiguration)
+!define AzureAppConfiguration(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppConfiguration, AzureAppConfiguration)
diff --git a/dist/Integration/AzureAppConfiguration.svg b/dist/Integration/AzureAppConfiguration.svg
new file mode 100644
index 00000000..82fb3c8b
--- /dev/null
+++ b/dist/Integration/AzureAppConfiguration.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 11.125 37.558594 C 11.125 32.4375 13.746094 28.445313 18.617188 25.945313 L 18.617188 24.949219 C 18.703125 20.269531 21.277344 15.992188 25.371094 13.726563 C 29.46875 11.460938 34.457031 11.550781 38.46875 13.960938 C 41.722656 9.484375 46.921875 6.835938 52.453125 6.84375 C 49.351563 4.101563 45.355469 2.589844 41.214844 2.597656 C 36.039063 2.582031 31.167969 5.042969 28.105469 9.214844 C 26.175781 7.960938 23.914063 7.308594 21.613281 7.34375 C 14.902344 7.339844 9.441406 12.75 9.378906 19.460938 L 9.378906 20.457031 C 5.109375 22.445313 2.378906 26.730469 2.378906 31.441406 C 2.363281 37.707031 6.746094 43.128906 12.878906 44.425781 C 11.714844 42.324219 11.113281 39.960938 11.125 37.558594 Z M 11.125 37.558594 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.324219 20.328125 C 57.324219 19.828125 57.449219 19.207031 57.449219 18.707031 C 57.425781 14.429688 55.699219 10.339844 52.652344 7.339844 C 49.605469 4.339844 45.492188 2.679688 41.214844 2.722656 C 36.046875 2.605469 31.144531 5.03125 28.105469 9.214844 C 26.175781 7.960938 23.914063 7.308594 21.613281 7.34375 C 14.902344 7.339844 9.441406 12.75 9.378906 19.460938 L 9.378906 20.457031 C 5.109375 22.445313 2.378906 26.730469 2.378906 31.441406 C 2.421875 35.082031 3.929688 38.550781 6.5625 41.066406 C 9.195313 43.578125 12.730469 44.925781 16.371094 44.800781 L 50.828125 44.800781 C 54.46875 44.925781 58.003906 43.578125 60.636719 41.066406 C 63.269531 38.550781 64.777344 35.082031 64.820313 31.441406 C 64.859375 26.542969 61.878906 22.125 57.324219 20.328125 Z M 57.324219 20.328125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 32.109375 49.125 L 33.425781 52.25 L 30.464844 57.429688 L 33.714844 60.679688 L 39.058594 58.171875 L 42.183594 59.484375 L 43.820313 64.378906 L 43.984375 64.953125 L 48.59375 64.953125 L 50.527344 59.484375 L 53.652344 58.171875 L 58.253906 60.550781 L 58.832031 60.839844 L 62.078125 57.589844 L 59.613281 52.5 L 60.929688 49.375 L 65.820313 47.730469 L 66.394531 47.566406 L 66.394531 42.960938 L 60.933594 41.027344 L 59.617188 37.902344 L 62 33.300781 L 62.289063 32.722656 L 59.164063 29.476563 L 53.984375 31.984375 L 50.859375 30.667969 L 49.214844 25.777344 L 48.921875 25.199219 L 44.519531 25.199219 L 42.589844 30.667969 L 39.464844 31.984375 L 34.859375 29.601563 L 34.285156 29.316406 L 31.203125 33.015625 L 33.425781 37.742188 L 32.109375 40.867188 L 27.21875 42.511719 L 26.640625 42.800781 L 26.640625 47.195313 Z M 40.167969 45.140625 C 40.167969 41.617188 43.019531 38.765625 46.539063 38.765625 C 50.058594 38.765625 52.914063 41.617188 52.914063 45.136719 C 52.914063 48.65625 50.058594 51.511719 46.539063 51.511719 C 44.84375 51.53125 43.210938 50.863281 42.011719 49.664063 C 40.8125 48.464844 40.148438 46.835938 40.167969 45.140625 Z M 40.167969 45.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 12.277344 60.230469 L 13.492188 61.53125 L 12.972656 64.621094 L 15.160156 65.632813 L 17.339844 63.429688 L 19.117188 63.507813 L 20.816406 65.621094 L 21 65.875 L 23.269531 65.035156 L 23.230469 61.992188 L 24.53125 60.777344 L 27.230469 61.117188 L 27.566406 61.152344 L 28.578125 58.964844 L 26.4375 56.898438 L 26.519531 55.121094 L 28.632813 53.425781 L 28.886719 53.238281 L 28.042969 50.972656 L 25 51.011719 L 23.785156 49.710938 L 24.125 47.011719 L 24.164063 46.675781 L 22.035156 45.640625 L 19.933594 47.816406 L 18.15625 47.734375 L 16.460938 45.625 L 16.214844 45.390625 L 14.046875 46.1875 L 14.085938 49.234375 L 12.785156 50.449219 L 10.089844 50.121094 L 9.757813 50.082031 L 8.90625 52.460938 L 10.859375 54.386719 L 10.78125 56.164063 L 8.664063 57.859375 L 8.433594 58.105469 L 9.234375 60.273438 Z M 15.523438 56.804688 C 14.882813 55.070313 15.773438 53.148438 17.507813 52.511719 C 19.242188 51.871094 21.164063 52.761719 21.804688 54.496094 C 22.441406 56.230469 21.554688 58.152344 19.820313 58.789063 C 18.988281 59.105469 18.0625 59.074219 17.253906 58.703125 C 16.445313 58.328125 15.820313 57.644531 15.523438 56.804688 Z M 15.523438 56.804688 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureEventGrid(m).svg b/dist/Integration/AzureEventGrid(m).svg
index 63fd53cd..a09f4613 100644
--- a/dist/Integration/AzureEventGrid(m).svg
+++ b/dist/Integration/AzureEventGrid(m).svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 33.605469 28 L 33.59375 27.996094 L 23.789063 37.800781 L 16.546875 37.800781 L 33.347656 21 L 44.800781 21 L 44.800781 18.199219 L 32.199219 18.199219 L 32.199219 18.207031 L 32.1875 18.199219 L 12.585938 37.800781 L 9.800781 37.800781 L 9.800781 40.601563 L 18.199219 40.601563 L 28 50.398438 L 51.800781 50.398438 L 51.800781 47.601563 L 29.160156 47.601563 L 22.160156 40.601563 L 39.199219 40.601563 L 39.199219 37.800781 L 27.746094 37.800781 L 34.746094 30.800781 L 54.601563 30.800781 L 54.601563 28 Z M 33.605469 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 54.601563 30.800781 L 54.601563 28 L 33.605469 28 L 33.59375 27.996094 L 23.789063 37.800781 L 16.546875 37.800781 L 33.347656 21 L 44.800781 21 L 44.800781 18.199219 L 32.199219 18.199219 L 32.199219 18.207031 L 32.1875 18.199219 L 12.585938 37.800781 L 9.800781 37.800781 L 9.800781 40.601563 L 18.199219 40.601563 L 28 50.398438 L 51.800781 50.398438 L 51.800781 47.601563 L 29.160156 47.601563 L 22.160156 40.601563 L 39.199219 40.601563 L 39.199219 37.800781 L 27.746094 37.800781 L 34.746094 30.800781 Z M 54.601563 30.800781 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 46.058594 39.199219 C 46.058594 41.441406 44.242188 43.261719 42 43.261719 C 39.757813 43.261719 37.941406 41.441406 37.941406 39.199219 C 37.941406 36.957031 39.757813 35.140625 42 35.140625 C 44.242188 35.140625 46.058594 36.957031 46.058594 39.199219 Z M 46.058594 39.199219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 49.070313 16.730469 C 50.65625 18.316406 50.65625 20.886719 49.070313 22.472656 C 47.484375 24.054688 44.914063 24.054688 43.328125 22.472656 C 41.742188 20.886719 41.742188 18.316406 43.328125 16.730469 C 44.914063 15.144531 47.484375 15.144531 49.070313 16.730469 Z M 49.070313 16.730469 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 58.871094 26.527344 C 60.457031 28.113281 60.457031 30.683594 58.871094 32.269531 C 57.285156 33.855469 54.714844 33.855469 53.128906 32.269531 C 51.542969 30.683594 51.542969 28.113281 53.128906 26.527344 C 54.714844 24.945313 57.285156 24.945313 58.871094 26.527344 Z M 58.871094 26.527344 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 54.671875 46.128906 C 56.257813 47.714844 56.257813 50.285156 54.671875 51.871094 C 53.085938 53.457031 50.515625 53.457031 48.929688 51.871094 C 47.34375 50.285156 47.34375 47.714844 48.929688 46.128906 C 50.515625 44.542969 53.085938 44.542969 54.671875 46.128906 Z M 54.671875 46.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 49.070313 16.730469 C 47.484375 15.144531 44.914063 15.144531 43.328125 16.730469 C 41.742188 18.316406 41.742188 20.886719 43.328125 22.472656 C 44.914063 24.054688 47.484375 24.054688 49.070313 22.472656 C 50.65625 20.886719 50.65625 18.316406 49.070313 16.730469 Z M 49.070313 16.730469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 58.871094 26.527344 C 57.285156 24.945313 54.714844 24.945313 53.128906 26.527344 C 51.542969 28.113281 51.542969 30.683594 53.128906 32.269531 C 54.714844 33.855469 57.285156 33.855469 58.871094 32.269531 C 60.457031 30.683594 60.457031 28.113281 58.871094 26.527344 Z M 58.871094 26.527344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 54.671875 46.128906 C 53.085938 44.542969 50.515625 44.542969 48.929688 46.128906 C 47.34375 47.714844 47.34375 50.285156 48.929688 51.871094 C 50.515625 53.457031 53.085938 53.457031 54.671875 51.871094 C 56.257813 50.285156 56.257813 47.714844 54.671875 46.128906 Z M 54.671875 46.128906 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 1.121094 0 C 0.421875 0 0 0.421875 0 1.121094 L 0 15.121094 C 0 15.820313 0.421875 16.238281 1.121094 16.238281 L 8.132813 16.238281 C 8.835938 16.238281 9.253906 15.820313 9.253906 15.121094 L 9.253906 9.378906 L 60.71875 9.378906 L 60.71875 15.261719 C 60.71875 15.960938 61.136719 16.378906 62.121094 16.378906 L 68.851563 16.378906 C 69.554688 16.378906 69.972656 15.960938 69.972656 15.261719 L 69.972656 1.261719 C 70.113281 0.421875 69.695313 0 68.992188 0 Z M 1.121094 0 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 68.878906 70 C 69.578125 70 70 69.578125 70 68.878906 L 70 55.160156 C 70 54.460938 69.578125 54.039063 68.878906 54.039063 L 62.160156 54.039063 C 61.460938 54.039063 61.039063 54.460938 61.039063 55.160156 L 61.039063 60.761719 L 9.378906 60.761719 L 9.378906 54.878906 C 9.378906 54.179688 8.960938 53.761719 7.980469 53.761719 L 1.121094 53.761719 C 0.421875 53.761719 0 54.179688 0 55.160156 L 0 68.878906 C 0 69.578125 0.421875 70 1.121094 70 Z M 68.878906 70 "/>
 </g>
diff --git a/dist/Integration/AzureEventGrid.svg b/dist/Integration/AzureEventGrid.svg
index c0ad0b55..a815972c 100644
--- a/dist/Integration/AzureEventGrid.svg
+++ b/dist/Integration/AzureEventGrid.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.605469 28 L 33.59375 27.996094 L 23.789063 37.800781 L 16.546875 37.800781 L 33.347656 21 L 44.800781 21 L 44.800781 18.199219 L 32.199219 18.199219 L 32.199219 18.207031 L 32.1875 18.199219 L 12.585938 37.800781 L 9.800781 37.800781 L 9.800781 40.601563 L 18.199219 40.601563 L 28 50.398438 L 51.800781 50.398438 L 51.800781 47.601563 L 29.160156 47.601563 L 22.160156 40.601563 L 39.199219 40.601563 L 39.199219 37.800781 L 27.746094 37.800781 L 34.746094 30.800781 L 54.601563 30.800781 L 54.601563 28 Z M 33.605469 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 54.601563 30.800781 L 54.601563 28 L 33.605469 28 L 33.59375 27.996094 L 23.789063 37.800781 L 16.546875 37.800781 L 33.347656 21 L 44.800781 21 L 44.800781 18.199219 L 32.199219 18.199219 L 32.199219 18.207031 L 32.1875 18.199219 L 12.585938 37.800781 L 9.800781 37.800781 L 9.800781 40.601563 L 18.199219 40.601563 L 28 50.398438 L 51.800781 50.398438 L 51.800781 47.601563 L 29.160156 47.601563 L 22.160156 40.601563 L 39.199219 40.601563 L 39.199219 37.800781 L 27.746094 37.800781 L 34.746094 30.800781 Z M 54.601563 30.800781 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 46.058594 39.199219 C 46.058594 41.441406 44.242188 43.261719 42 43.261719 C 39.757813 43.261719 37.941406 41.441406 37.941406 39.199219 C 37.941406 36.957031 39.757813 35.140625 42 35.140625 C 44.242188 35.140625 46.058594 36.957031 46.058594 39.199219 Z M 46.058594 39.199219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 49.070313 16.730469 C 50.65625 18.316406 50.65625 20.886719 49.070313 22.472656 C 47.484375 24.054688 44.914063 24.054688 43.328125 22.472656 C 41.742188 20.886719 41.742188 18.316406 43.328125 16.730469 C 44.914063 15.144531 47.484375 15.144531 49.070313 16.730469 Z M 49.070313 16.730469 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 58.871094 26.527344 C 60.457031 28.113281 60.457031 30.683594 58.871094 32.269531 C 57.285156 33.855469 54.714844 33.855469 53.128906 32.269531 C 51.542969 30.683594 51.542969 28.113281 53.128906 26.527344 C 54.714844 24.945313 57.285156 24.945313 58.871094 26.527344 Z M 58.871094 26.527344 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 54.671875 46.128906 C 56.257813 47.714844 56.257813 50.285156 54.671875 51.871094 C 53.085938 53.457031 50.515625 53.457031 48.929688 51.871094 C 47.34375 50.285156 47.34375 47.714844 48.929688 46.128906 C 50.515625 44.542969 53.085938 44.542969 54.671875 46.128906 Z M 54.671875 46.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 49.070313 16.730469 C 47.484375 15.144531 44.914063 15.144531 43.328125 16.730469 C 41.742188 18.316406 41.742188 20.886719 43.328125 22.472656 C 44.914063 24.054688 47.484375 24.054688 49.070313 22.472656 C 50.65625 20.886719 50.65625 18.316406 49.070313 16.730469 Z M 49.070313 16.730469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 58.871094 26.527344 C 57.285156 24.945313 54.714844 24.945313 53.128906 26.527344 C 51.542969 28.113281 51.542969 30.683594 53.128906 32.269531 C 54.714844 33.855469 57.285156 33.855469 58.871094 32.269531 C 60.457031 30.683594 60.457031 28.113281 58.871094 26.527344 Z M 58.871094 26.527344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 54.671875 46.128906 C 53.085938 44.542969 50.515625 44.542969 48.929688 46.128906 C 47.34375 47.714844 47.34375 50.285156 48.929688 51.871094 C 50.515625 53.457031 53.085938 53.457031 54.671875 51.871094 C 56.257813 50.285156 56.257813 47.714844 54.671875 46.128906 Z M 54.671875 46.128906 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 1.121094 0 C 0.421875 0 0 0.421875 0 1.121094 L 0 15.121094 C 0 15.820313 0.421875 16.238281 1.121094 16.238281 L 8.132813 16.238281 C 8.835938 16.238281 9.253906 15.820313 9.253906 15.121094 L 9.253906 9.378906 L 60.71875 9.378906 L 60.71875 15.261719 C 60.71875 15.960938 61.136719 16.378906 62.121094 16.378906 L 68.851563 16.378906 C 69.554688 16.378906 69.972656 15.960938 69.972656 15.261719 L 69.972656 1.261719 C 70.113281 0.421875 69.695313 0 68.992188 0 Z M 1.121094 0 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 68.878906 70 C 69.578125 70 70 69.578125 70 68.878906 L 70 55.160156 C 70 54.460938 69.578125 54.039063 68.878906 54.039063 L 62.160156 54.039063 C 61.460938 54.039063 61.039063 54.460938 61.039063 55.160156 L 61.039063 60.761719 L 9.378906 60.761719 L 9.378906 54.878906 C 9.378906 54.179688 8.960938 53.761719 7.980469 53.761719 L 1.121094 53.761719 C 0.421875 53.761719 0 54.179688 0 55.160156 L 0 68.878906 C 0 69.578125 0.421875 70 1.121094 70 Z M 68.878906 70 "/>
 </g>
diff --git a/dist/Integration/AzureEventGridTopic(m).png b/dist/Integration/AzureEventGridTopic(m).png
new file mode 100644
index 00000000..23ff60ab
Binary files /dev/null and b/dist/Integration/AzureEventGridTopic(m).png differ
diff --git a/dist/Integration/AzureEventGridTopic(m).svg b/dist/Integration/AzureEventGridTopic(m).svg
new file mode 100644
index 00000000..f4c9313a
--- /dev/null
+++ b/dist/Integration/AzureEventGridTopic(m).svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 4.433594 18.199219 L 36.167969 18.199219 L 36.167969 23.800781 L 4.433594 23.800781 Z M 11.433594 32.199219 L 47.367188 32.199219 L 47.367188 37.800781 L 11.433594 37.800781 Z M 4.433594 46.199219 L 36.167969 46.199219 L 36.167969 51.800781 L 4.433594 51.800781 Z M 4.433594 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 11.058594 49 C 11.058594 52.015625 8.617188 54.460938 5.601563 54.460938 C 2.585938 54.460938 0.140625 52.015625 0.140625 49 C 0.140625 45.984375 2.585938 43.539063 5.601563 43.539063 C 8.617188 43.539063 11.058594 45.984375 11.058594 49 Z M 11.058594 49 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 9.460938 17.140625 C 7.328125 15.007813 3.871094 15.007813 1.738281 17.140625 C -0.394531 19.273438 -0.394531 22.730469 1.738281 24.859375 C 3.871094 26.992188 7.328125 26.992188 9.460938 24.859375 C 11.59375 22.726563 11.59375 19.269531 9.460938 17.140625 Z M 9.460938 17.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 16.460938 31.140625 C 14.328125 29.007813 10.871094 29.007813 8.738281 31.140625 C 6.605469 33.273438 6.605469 36.730469 8.738281 38.859375 C 10.871094 40.992188 14.328125 40.992188 16.460938 38.859375 C 18.59375 36.726563 18.59375 33.269531 16.460938 31.140625 Z M 16.460938 31.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 33.601563 28 L 33.601563 14 L 44.800781 21 Z M 33.601563 56 L 33.601563 42 L 44.800781 49 Z M 44.800781 42 L 44.800781 28 L 56 35 Z M 68.878906 54.039063 L 62.160156 54.039063 C 61.460938 54.039063 61.039063 54.460938 61.039063 55.160156 L 61.039063 60.761719 L 9.800781 60.761719 L 9.800781 70 L 68.878906 70 C 69.578125 70 70 69.578125 70 68.878906 L 70 55.160156 C 70 54.460938 69.578125 54.039063 68.878906 54.039063 Z M 68.992188 0 L 9.800781 0 L 9.800781 9.378906 L 60.734375 9.378906 L 60.734375 15.261719 C 60.734375 15.960938 61.152344 16.378906 62.132813 16.378906 L 68.851563 16.378906 C 69.554688 16.378906 69.972656 15.960938 69.972656 15.261719 L 69.972656 1.261719 C 70.113281 0.421875 69.695313 0 68.992188 0 Z M 68.992188 0 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureEventGridTopic.png b/dist/Integration/AzureEventGridTopic.png
new file mode 100644
index 00000000..6b2454c5
Binary files /dev/null and b/dist/Integration/AzureEventGridTopic.png differ
diff --git a/dist/Integration/AzureEventGridTopic.puml b/dist/Integration/AzureEventGridTopic.puml
new file mode 100644
index 00000000..ef2d00c3
--- /dev/null
+++ b/dist/Integration/AzureEventGridTopic.puml
@@ -0,0 +1,10 @@
+sprite $AzureEventGridTopic [70x70/16z] {
+xTS7aeOm28PX890ekVzvjpcuJJyicVhx7E2rfKc1-tK-fD9Vhl9KoCxpjNB7ArVO3bQOcNP9duLspDyLra-oN-bUQPlOGabqKNOh7rm9qr3Rfgb_cPW0qM0T
+SWELeYll47ZBfCShRWVknM05lndMq7nRxzzVARyP-AKR9GGE5v9uhnaHOJ03tEWscPZ6Ci9YQcC-QzQm-g5agrB3ywak55Qo-LIFy6G-bHfQJu1Lo-hAUsxM
+4PNUQ8lMq605JqsfOUfOJ4ryCmHuVA8aOumhwTJa4hiIg8oOcdWQuLka0IGcOFu-L1djqvP7T26xbICBhmRRrc828gAXPXDmp3xTUCW-NGViqtCvj4yVF33W
+c-5jPJqm7Cam62-kbE9IYj0U0MzLsg9IHi2uhGDEyCShJuNdy_pvAtygLxm3
+}
+
+AzureEntityColoring(AzureEventGridTopic)
+!define AzureEventGridTopic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureEventGridTopic, AzureEventGridTopic)
+!define AzureEventGridTopic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureEventGridTopic, AzureEventGridTopic)
diff --git a/dist/Integration/AzureEventGridTopic.svg b/dist/Integration/AzureEventGridTopic.svg
new file mode 100644
index 00000000..be59e063
--- /dev/null
+++ b/dist/Integration/AzureEventGridTopic.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 4.433594 18.199219 L 36.167969 18.199219 L 36.167969 23.800781 L 4.433594 23.800781 Z M 11.433594 32.199219 L 47.367188 32.199219 L 47.367188 37.800781 L 11.433594 37.800781 Z M 4.433594 46.199219 L 36.167969 46.199219 L 36.167969 51.800781 L 4.433594 51.800781 Z M 4.433594 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 11.058594 49 C 11.058594 52.015625 8.617188 54.460938 5.601563 54.460938 C 2.585938 54.460938 0.140625 52.015625 0.140625 49 C 0.140625 45.984375 2.585938 43.539063 5.601563 43.539063 C 8.617188 43.539063 11.058594 45.984375 11.058594 49 Z M 11.058594 49 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 9.460938 17.140625 C 7.328125 15.007813 3.871094 15.007813 1.738281 17.140625 C -0.394531 19.273438 -0.394531 22.730469 1.738281 24.859375 C 3.871094 26.992188 7.328125 26.992188 9.460938 24.859375 C 11.59375 22.726563 11.59375 19.269531 9.460938 17.140625 Z M 9.460938 17.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 16.460938 31.140625 C 14.328125 29.007813 10.871094 29.007813 8.738281 31.140625 C 6.605469 33.273438 6.605469 36.730469 8.738281 38.859375 C 10.871094 40.992188 14.328125 40.992188 16.460938 38.859375 C 18.59375 36.726563 18.59375 33.269531 16.460938 31.140625 Z M 16.460938 31.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.601563 28 L 33.601563 14 L 44.800781 21 Z M 33.601563 56 L 33.601563 42 L 44.800781 49 Z M 44.800781 42 L 44.800781 28 L 56 35 Z M 68.878906 54.039063 L 62.160156 54.039063 C 61.460938 54.039063 61.039063 54.460938 61.039063 55.160156 L 61.039063 60.761719 L 9.800781 60.761719 L 9.800781 70 L 68.878906 70 C 69.578125 70 70 69.578125 70 68.878906 L 70 55.160156 C 70 54.460938 69.578125 54.039063 68.878906 54.039063 Z M 68.992188 0 L 9.800781 0 L 9.800781 9.378906 L 60.734375 9.378906 L 60.734375 15.261719 C 60.734375 15.960938 61.152344 16.378906 62.132813 16.378906 L 68.851563 16.378906 C 69.554688 16.378906 69.972656 15.960938 69.972656 15.261719 L 69.972656 1.261719 C 70.113281 0.421875 69.695313 0 68.992188 0 Z M 68.992188 0 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureIntegrationAccount(m).png b/dist/Integration/AzureIntegrationAccount(m).png
new file mode 100644
index 00000000..d5993efb
Binary files /dev/null and b/dist/Integration/AzureIntegrationAccount(m).png differ
diff --git a/dist/Integration/AzureIntegrationAccount(m).svg b/dist/Integration/AzureIntegrationAccount(m).svg
new file mode 100644
index 00000000..fac3367f
--- /dev/null
+++ b/dist/Integration/AzureIntegrationAccount(m).svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(255,255,255);fill-opacity:1;stroke:none;"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 0 0 L 0 70 L 70 70 L 70 0 Z M 63.699219 63.699219 L 6.300781 63.699219 L 6.300781 6.300781 L 63.699219 6.300781 Z M 63.699219 63.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 11.199219 11.199219 L 23.800781 11.199219 L 23.800781 23.800781 L 11.199219 23.800781 Z M 11.199219 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 11.199219 28.699219 L 23.800781 28.699219 L 23.800781 41.300781 L 11.199219 41.300781 Z M 11.199219 28.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 28.699219 28.699219 L 41.300781 28.699219 L 41.300781 41.300781 L 28.699219 41.300781 Z M 28.699219 28.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 11.199219 46.199219 L 23.800781 46.199219 L 23.800781 58.800781 L 11.199219 58.800781 Z M 11.199219 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 28.699219 46.199219 L 41.300781 46.199219 L 41.300781 58.800781 L 28.699219 58.800781 Z M 28.699219 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 46.199219 46.199219 L 58.800781 46.199219 L 58.800781 58.800781 L 46.199219 58.800781 Z M 46.199219 46.199219 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureIntegrationAccount.png b/dist/Integration/AzureIntegrationAccount.png
new file mode 100644
index 00000000..5dfcc9b0
Binary files /dev/null and b/dist/Integration/AzureIntegrationAccount.png differ
diff --git a/dist/Integration/AzureIntegrationAccount.puml b/dist/Integration/AzureIntegrationAccount.puml
new file mode 100644
index 00000000..57c49a99
--- /dev/null
+++ b/dist/Integration/AzureIntegrationAccount.puml
@@ -0,0 +1,8 @@
+sprite $AzureIntegrationAccount [70x70/16z] {
+xTRL0OKm04FHkks_xrCak7lk7tPmQBX8pAYveQB4t1wWA6o-eY4gLAZm-xAc8g76ZB6AYsNXXmJ8Z52eKA6YRTb_6mCfVkiMASP2lrKirBW1jbtngIp-xdI4
+x8zDa6meLAXGaID67XBYjwvFkKZi3G
+}
+
+AzureEntityColoring(AzureIntegrationAccount)
+!define AzureIntegrationAccount(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIntegrationAccount, AzureIntegrationAccount)
+!define AzureIntegrationAccount(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIntegrationAccount, AzureIntegrationAccount)
diff --git a/dist/Integration/AzureIntegrationAccount.svg b/dist/Integration/AzureIntegrationAccount.svg
new file mode 100644
index 00000000..0a066709
--- /dev/null
+++ b/dist/Integration/AzureIntegrationAccount.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(100%,100%,100%);fill-opacity:1;stroke:none;"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 0 0 L 0 70 L 70 70 L 70 0 Z M 63.699219 63.699219 L 6.300781 63.699219 L 6.300781 6.300781 L 63.699219 6.300781 Z M 63.699219 63.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 11.199219 11.199219 L 23.800781 11.199219 L 23.800781 23.800781 L 11.199219 23.800781 Z M 11.199219 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 11.199219 28.699219 L 23.800781 28.699219 L 23.800781 41.300781 L 11.199219 41.300781 Z M 11.199219 28.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 28.699219 28.699219 L 41.300781 28.699219 L 41.300781 41.300781 L 28.699219 41.300781 Z M 28.699219 28.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 11.199219 46.199219 L 23.800781 46.199219 L 23.800781 58.800781 L 11.199219 58.800781 Z M 11.199219 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 28.699219 46.199219 L 41.300781 46.199219 L 41.300781 58.800781 L 28.699219 58.800781 Z M 28.699219 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 46.199219 46.199219 L 58.800781 46.199219 L 58.800781 58.800781 L 46.199219 58.800781 Z M 46.199219 46.199219 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureIntegrationServiceEnvironment(m).png b/dist/Integration/AzureIntegrationServiceEnvironment(m).png
new file mode 100644
index 00000000..9218db51
Binary files /dev/null and b/dist/Integration/AzureIntegrationServiceEnvironment(m).png differ
diff --git a/dist/Integration/AzureIntegrationServiceEnvironment(m).svg b/dist/Integration/AzureIntegrationServiceEnvironment(m).svg
new file mode 100644
index 00000000..5c13132d
--- /dev/null
+++ b/dist/Integration/AzureIntegrationServiceEnvironment(m).svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 64.398438 35 C 64.398438 51.238281 51.238281 64.398438 35 64.398438 C 18.761719 64.398438 5.601563 51.238281 5.601563 35 C 5.601563 18.761719 18.761719 5.601563 35 5.601563 C 51.238281 5.601563 64.398438 18.761719 64.398438 35 Z M 64.398438 35 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 68.460938 35 C 68.460938 53.480469 53.480469 68.460938 35 68.460938 C 16.519531 68.460938 1.539063 53.480469 1.539063 35 C 1.539063 16.519531 16.519531 1.539063 35 1.539063 C 53.480469 1.539063 68.460938 16.519531 68.460938 35 Z M 68.460938 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 36.261719 28.558594 L 36.261719 21.558594 L 32.761719 21.558594 L 32.761719 28.558594 C 32.761719 29.820313 31.640625 30.941406 29.820313 31.5 L 25.058594 32.480469 C 21.839844 33.460938 19.601563 35.980469 19.601563 38.78125 L 19.601563 46.761719 L 23.101563 46.761719 L 23.101563 38.78125 C 23.101563 37.519531 24.21875 36.398438 26.039063 35.839844 L 30.800781 34.71875 C 34.019531 33.878906 36.261719 31.359375 36.261719 28.558594 Z M 36.261719 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 33.738281 28.558594 L 33.738281 21.558594 L 37.238281 21.558594 L 37.238281 28.558594 C 37.238281 29.820313 38.359375 30.941406 40.179688 31.5 L 44.941406 32.480469 C 48.160156 33.460938 50.398438 35.980469 50.398438 38.78125 L 50.398438 46.761719 L 46.898438 46.761719 L 46.898438 38.78125 C 46.898438 37.519531 45.78125 36.398438 43.960938 35.839844 L 39.199219 34.71875 C 35.980469 33.878906 33.738281 31.359375 33.738281 28.558594 Z M 33.738281 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 27.441406 50.398438 L 27.441406 43.960938 C 27.441406 42.421875 26.179688 41.160156 24.640625 41.160156 L 18.199219 41.160156 C 16.660156 41.160156 15.398438 42.421875 15.398438 43.960938 L 15.398438 50.398438 C 15.398438 51.941406 16.660156 53.199219 18.199219 53.199219 L 24.640625 53.199219 C 26.179688 53.199219 27.441406 51.941406 27.441406 50.398438 Z M 42.558594 50.679688 L 42.558594 44.238281 C 42.558594 42.699219 43.820313 41.441406 45.359375 41.441406 L 51.800781 41.441406 C 53.339844 41.441406 54.601563 42.699219 54.601563 44.238281 L 54.601563 50.679688 C 54.601563 52.21875 53.339844 53.480469 51.800781 53.480469 L 45.359375 53.480469 C 43.820313 53.480469 42.558594 52.21875 42.558594 50.679688 Z M 42.558594 50.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 37.785156 15.414063 L 37.785156 20.984375 L 32.214844 20.984375 L 32.214844 15.414063 L 37.785156 15.414063 M 38.988281 11.199219 L 31.011719 11.199219 C 29.355469 11.199219 28 12.554688 28 14.210938 L 28 22.191406 C 28 23.84375 29.355469 25.199219 31.011719 25.199219 L 38.988281 25.199219 C 40.644531 25.199219 42 23.84375 42 22.1875 L 42 14.210938 C 42 12.554688 40.644531 11.199219 38.988281 11.199219 Z M 38.988281 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.199219 15.398438 L 37.800781 15.398438 L 37.800781 21 L 32.199219 21 Z M 32.199219 15.398438 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureIntegrationServiceEnvironment.png b/dist/Integration/AzureIntegrationServiceEnvironment.png
new file mode 100644
index 00000000..4a62c8c2
Binary files /dev/null and b/dist/Integration/AzureIntegrationServiceEnvironment.png differ
diff --git a/dist/Integration/AzureIntegrationServiceEnvironment.puml b/dist/Integration/AzureIntegrationServiceEnvironment.puml
new file mode 100644
index 00000000..e8981482
--- /dev/null
+++ b/dist/Integration/AzureIntegrationServiceEnvironment.puml
@@ -0,0 +1,14 @@
+sprite $AzureIntegrationServiceEnvironment [70x70/16z] {
+lPZfWfiw34Q3TeltVzyR48aT939ZRjlpgvtbp2Tvp-CVi03I4yJbhW7PV7tZJMbQXUfhfl64QE5G5BZ2BoKo5kBUcZ_fNxBVUCXV0cE4DyZQtdcMdugnrqyI
+950EaUDN2VhXGAYXmwDV9EpXW2ySdRVBgYI64-4xCGdQXKPJ45GxK8OEHUJbCedJAF7EfxrTfU4a0VKH6B5TKu-E8umq7w6aIIErU2H95iQDi6GDVLei9DaI
+qxsmmDORXr52crXWohBtm4RBzeK6SnRWKqqIdPspH6lyCuh2j0Lz3CER4sfBiutQ0ZfE6e_M9in74Eem61ACA1dnWGO5rgUUvgxaC8sWWFggt7i49SZSdYWJ
+r4H_Kq49Uy9mXKP9CK9sqn8blPOGtxH4ISlH5eGhSBC8ND9Yh9VroRL4ROFWYhsInmE-D1VP3eI-jnSlB2GQ0fMNYH4I4XOgBM8l583xVx2oM5XQqT8W3bhi
+KYuihROS1gP1J58schl5J_u8aOX8PKMOBT6D2aurNLfmp9rhbMgabsGXCqEeqR2aMHShuBQb7Lj3sso3WsMVOGGPfCr2U5gDaBOwqHUI7CMtC7Q6quGXxPpJ
+Q8TFGtGiQYmiN4K9vDpSQ8pCMNGyIk1zgBLxbbX5_Ux2jop-BYX6gTsno7X9X7LJJbiYYdpUfEOj6b5UX7HYliYkZIYdQn3zC7Vvz0TQHEai_PwAn3i42P8W
+lgVvaebh7wUQybPdrVtT9YHUFWKiD5CIU2HQ53KXeKTcyU9rLADhxspIx6cSuGVm-Bb2qJLh8_Y6-DhBAT7y-AoVZGr-yPfsA_DWv4XlpmJOUl6YHh5m5DNK
+SG9lfYB28cgjVrLIa19gwoMko_G79_S_EWaMEelS61utM92tZhIu43t-Ely1
+}
+
+AzureEntityColoring(AzureIntegrationServiceEnvironment)
+!define AzureIntegrationServiceEnvironment(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIntegrationServiceEnvironment, AzureIntegrationServiceEnvironment)
+!define AzureIntegrationServiceEnvironment(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIntegrationServiceEnvironment, AzureIntegrationServiceEnvironment)
diff --git a/dist/Integration/AzureIntegrationServiceEnvironment.svg b/dist/Integration/AzureIntegrationServiceEnvironment.svg
new file mode 100644
index 00000000..36166c38
--- /dev/null
+++ b/dist/Integration/AzureIntegrationServiceEnvironment.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 64.398438 35 C 64.398438 51.238281 51.238281 64.398438 35 64.398438 C 18.761719 64.398438 5.601563 51.238281 5.601563 35 C 5.601563 18.761719 18.761719 5.601563 35 5.601563 C 51.238281 5.601563 64.398438 18.761719 64.398438 35 Z M 64.398438 35 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 68.460938 35 C 68.460938 53.480469 53.480469 68.460938 35 68.460938 C 16.519531 68.460938 1.539063 53.480469 1.539063 35 C 1.539063 16.519531 16.519531 1.539063 35 1.539063 C 53.480469 1.539063 68.460938 16.519531 68.460938 35 Z M 68.460938 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 36.261719 28.558594 L 36.261719 21.558594 L 32.761719 21.558594 L 32.761719 28.558594 C 32.761719 29.820313 31.640625 30.941406 29.820313 31.5 L 25.058594 32.480469 C 21.839844 33.460938 19.601563 35.980469 19.601563 38.78125 L 19.601563 46.761719 L 23.101563 46.761719 L 23.101563 38.78125 C 23.101563 37.519531 24.21875 36.398438 26.039063 35.839844 L 30.800781 34.71875 C 34.019531 33.878906 36.261719 31.359375 36.261719 28.558594 Z M 36.261719 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 33.738281 28.558594 L 33.738281 21.558594 L 37.238281 21.558594 L 37.238281 28.558594 C 37.238281 29.820313 38.359375 30.941406 40.179688 31.5 L 44.941406 32.480469 C 48.160156 33.460938 50.398438 35.980469 50.398438 38.78125 L 50.398438 46.761719 L 46.898438 46.761719 L 46.898438 38.78125 C 46.898438 37.519531 45.78125 36.398438 43.960938 35.839844 L 39.199219 34.71875 C 35.980469 33.878906 33.738281 31.359375 33.738281 28.558594 Z M 33.738281 28.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 27.441406 50.398438 L 27.441406 43.960938 C 27.441406 42.421875 26.179688 41.160156 24.640625 41.160156 L 18.199219 41.160156 C 16.660156 41.160156 15.398438 42.421875 15.398438 43.960938 L 15.398438 50.398438 C 15.398438 51.941406 16.660156 53.199219 18.199219 53.199219 L 24.640625 53.199219 C 26.179688 53.199219 27.441406 51.941406 27.441406 50.398438 Z M 42.558594 50.679688 L 42.558594 44.238281 C 42.558594 42.699219 43.820313 41.441406 45.359375 41.441406 L 51.800781 41.441406 C 53.339844 41.441406 54.601563 42.699219 54.601563 44.238281 L 54.601563 50.679688 C 54.601563 52.21875 53.339844 53.480469 51.800781 53.480469 L 45.359375 53.480469 C 43.820313 53.480469 42.558594 52.21875 42.558594 50.679688 Z M 42.558594 50.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 37.785156 15.414063 L 37.785156 20.984375 L 32.214844 20.984375 L 32.214844 15.414063 L 37.785156 15.414063 M 38.988281 11.199219 L 31.011719 11.199219 C 29.355469 11.199219 28 12.554688 28 14.210938 L 28 22.191406 C 28 23.84375 29.355469 25.199219 31.011719 25.199219 L 38.988281 25.199219 C 40.644531 25.199219 42 23.84375 42 22.1875 L 42 14.210938 C 42 12.554688 40.644531 11.199219 38.988281 11.199219 Z M 38.988281 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.199219 15.398438 L 37.800781 15.398438 L 37.800781 21 L 32.199219 21 Z M 32.199219 15.398438 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureLogicApps(m).png b/dist/Integration/AzureLogicApps(m).png
index f9849803..14d38f91 100644
Binary files a/dist/Integration/AzureLogicApps(m).png and b/dist/Integration/AzureLogicApps(m).png differ
diff --git a/dist/Integration/AzureLogicApps(m).svg b/dist/Integration/AzureLogicApps(m).svg
index 01c78a6d..31cc5320 100644
--- a/dist/Integration/AzureLogicApps(m).svg
+++ b/dist/Integration/AzureLogicApps(m).svg
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="53pt" viewBox="0 0 70 53" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 58.15625 0 L 58.300781 3.5625 C 59.40625 3.5625 60.089844 3.839844 60.640625 4.386719 C 61.066406 4.933594 61.34375 5.902344 61.34375 7.128906 L 61.34375 20.707031 C 61.34375 23.851563 62.449219 25.769531 64.382813 26.589844 C 62.300781 27.414063 61.34375 29.332031 61.34375 32.496094 L 61.34375 46.203125 C 61.34375 48.523438 60.238281 49.617188 58.15625 49.617188 L 58.15625 53.183594 C 61.066406 53.183594 63.148438 52.632813 64.382813 51.539063 C 65.617188 50.441406 66.167969 48.523438 66.167969 45.925781 L 66.167969 32.074219 C 66.167969 29.605469 67.144531 28.382813 69.078125 28.382813 L 69.078125 24.820313 C 67.144531 24.820313 66.167969 23.574219 66.167969 21.253906 L 66.167969 7 C 66.167969 4.386719 65.617188 2.613281 64.382813 1.515625 C 63.148438 0.546875 61.066406 0 58.15625 0 Z M 42 43.1875 C 42 44.683594 43.253906 45.925781 44.761719 45.925781 L 51.117188 45.925781 C 52.648438 45.925781 53.882813 44.683594 53.882813 43.1875 L 53.882813 36.878906 C 53.882813 35.363281 52.648438 34.140625 51.117188 34.140625 L 49.609375 34.140625 L 49.609375 31.800781 C 49.609375 29.058594 47.398438 26.589844 44.210938 25.640625 L 38.40625 24.398438 C 37.15625 24.015625 36.253906 23.375 35.808594 22.605469 C 35.882813 22.242188 35.921875 21.894531 35.921875 21.527344 L 35.921875 17.269531 L 37.726563 17.269531 C 39.238281 17.269531 40.488281 16.046875 40.488281 14.53125 L 40.488281 7.273438 C 40.488281 5.757813 39.238281 4.53125 37.726563 4.53125 L 30.394531 4.53125 C 28.882813 4.53125 27.632813 5.757813 27.632813 7.273438 L 27.632813 14.53125 C 27.632813 16.046875 28.882813 17.269531 30.394531 17.269531 L 32.050781 17.269531 L 32.050781 21.527344 C 32.050781 21.894531 32.089844 22.242188 32.164063 22.605469 C 31.722656 23.375 30.820313 24.015625 29.566406 24.398438 L 24.867188 25.367188 C 21.699219 26.316406 19.488281 28.785156 19.488281 31.527344 L 19.488281 33.863281 L 17.960938 33.863281 C 16.449219 33.863281 15.199219 35.089844 15.199219 36.605469 L 15.199219 42.910156 C 15.199219 44.410156 16.449219 45.652344 17.960938 45.652344 L 24.316406 45.652344 C 25.84375 45.652344 27.078125 44.410156 27.078125 42.910156 L 27.078125 36.605469 C 27.078125 35.089844 25.84375 33.863281 24.316406 33.863281 L 22.933594 33.863281 L 22.933594 31.527344 C 22.933594 30.300781 24.039063 29.203125 25.84375 28.65625 L 30.542969 27.558594 C 31.886719 27.195313 33.066406 26.554688 33.96875 25.714844 C 34.890625 26.574219 36.070313 27.269531 37.429688 27.6875 L 43.253906 28.929688 C 45.039063 29.480469 46.144531 30.574219 46.144531 31.800781 L 46.144531 34.140625 L 44.761719 34.140625 C 43.253906 34.140625 42 35.363281 42 36.878906 Z M 36.621094 8.371094 L 36.621094 13.433594 L 31.5 13.433594 L 31.5 8.371094 Z M 10.90625 53.183594 L 10.777344 49.617188 C 9.671875 49.617188 8.972656 49.34375 8.417969 48.796875 C 8.011719 48.25 7.738281 47.296875 7.738281 46.054688 L 7.738281 32.496094 C 7.738281 29.332031 6.632813 27.414063 4.699219 26.589844 C 6.761719 25.769531 7.738281 23.851563 7.738281 20.707031 L 7.738281 7 C 7.738281 4.660156 8.84375 3.5625 10.90625 3.5625 L 10.90625 0 C 8.011719 0 5.929688 0.421875 4.699219 1.515625 C 3.464844 2.613281 2.910156 4.53125 2.910156 7.128906 L 2.910156 21.109375 C 2.910156 23.574219 1.933594 24.820313 0 24.820313 L 0 28.382813 C 1.933594 28.382813 2.910156 29.605469 2.910156 31.945313 L 2.910156 46.203125 C 2.910156 48.796875 3.464844 50.585938 4.699219 51.683594 C 5.929688 52.632813 8.011719 53.183594 10.90625 53.183594 Z M 10.90625 53.183594 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(57,171,255);fill-opacity:1;" d="M 36.75 31.675781 L 36.75 25.023438 L 32.898438 25.023438 L 32.898438 31.675781 C 32.898438 37.011719 20.5625 31.675781 20.5625 40.335938 L 20.5625 47.25 L 23.449219 47.25 L 23.449219 40.335938 C 23.449219 35.699219 34.824219 38.542969 34.824219 34.257813 C 34.824219 38.574219 46.199219 35.699219 46.199219 40.335938 L 46.199219 47.25 L 49.085938 47.25 L 49.085938 40.335938 C 49.085938 31.675781 36.75 37.011719 36.75 31.675781 Z M 36.75 31.675781 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,102,178);fill-opacity:1;" d="M 38.132813 15.75 L 31.429688 15.75 C 30.035156 15.75 29.050781 16.796875 29.050781 18.199219 L 29.050781 24.9375 C 29.050781 26.339844 30.035156 27.300781 31.429688 27.300781 L 38.132813 27.300781 C 39.527344 27.300781 40.601563 26.339844 40.601563 24.9375 L 40.601563 18.199219 C 40.601563 16.796875 39.417969 15.75 38.132813 15.75 Z M 32.488281 23.886719 L 37.074219 23.886719 L 37.074219 19.25 L 32.488281 19.25 Z M 32.488281 23.886719 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(57,171,255);fill-opacity:1;" d="M 14.085938 59.761719 C 9.449219 59.761719 6.914063 57.707031 6.914063 53.289063 L 6.914063 40.335938 C 6.914063 38.179688 6.078125 37.363281 4.375 37.363281 L 4.375 34.125 C 6.078125 34.125 6.914063 33.328125 6.914063 31.0625 L 6.914063 18.199219 C 6.914063 13.476563 9.570313 11.636719 14.085938 11.636719 L 14.085938 14.875 C 12.277344 14.875 11.289063 16.042969 11.289063 18.199219 L 11.289063 31.0625 C 11.289063 33.867188 10.386719 34.945313 8.574219 35.699219 C 10.277344 36.453125 11.289063 37.535156 11.289063 40.335938 L 11.289063 53.289063 C 11.289063 55.132813 12.117188 56.523438 14.085938 56.523438 Z M 14.085938 59.761719 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(57,171,255);fill-opacity:1;" d="M 55.5625 11.636719 C 59.9375 11.636719 62.738281 13.792969 62.738281 18.199219 L 62.738281 31.0625 C 62.738281 33.21875 63.570313 34.125 65.273438 34.125 L 65.273438 37.363281 C 63.570313 37.363281 62.730469 38.074219 62.730469 40.335938 L 62.730469 53.289063 C 62.730469 57.972656 60.078125 59.761719 55.5625 59.761719 L 55.5625 56.523438 C 57.375 56.523438 58.363281 55.445313 58.363281 53.289063 L 58.363281 40.335938 C 58.363281 37.535156 59.175781 36.453125 60.988281 35.699219 C 59.285156 34.835938 58.363281 33.867188 58.363281 31.0625 L 58.363281 18.199219 C 58.363281 16.351563 57.53125 14.875 55.5625 14.875 Z M 55.5625 11.636719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 19.25 42.261719 L 24.675781 42.261719 C 26.125 42.261719 27.300781 43.4375 27.300781 44.886719 L 27.300781 50.3125 C 27.300781 51.761719 26.125 52.9375 24.675781 52.9375 L 19.25 52.9375 C 17.800781 52.9375 16.625 51.761719 16.625 50.3125 L 16.625 44.886719 C 16.625 43.4375 17.800781 42.261719 19.25 42.261719 Z M 19.25 42.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 44.800781 42.261719 L 50.226563 42.261719 C 51.675781 42.261719 52.851563 43.4375 52.851563 44.886719 L 52.851563 50.3125 C 52.851563 51.761719 51.675781 52.9375 50.226563 52.9375 L 44.800781 52.9375 C 43.351563 52.9375 42.175781 51.761719 42.175781 50.3125 L 42.175781 44.886719 C 42.175781 43.4375 43.351563 42.261719 44.800781 42.261719 Z M 44.800781 42.261719 "/>
 </g>
 </svg>
diff --git a/dist/Integration/AzureLogicApps.png b/dist/Integration/AzureLogicApps.png
index 964fe91d..9ff1c838 100644
Binary files a/dist/Integration/AzureLogicApps.png and b/dist/Integration/AzureLogicApps.png differ
diff --git a/dist/Integration/AzureLogicApps.puml b/dist/Integration/AzureLogicApps.puml
index da988d5f..bf218add 100644
--- a/dist/Integration/AzureLogicApps.puml
+++ b/dist/Integration/AzureLogicApps.puml
@@ -1,9 +1,8 @@
-sprite $AzureLogicApps [70x53/16z] {
-xPO73fqm342z4e_xtxV3IcjzyrC4TBTFY_aI3omWaMdkS0rnru5rJXwVk6o9pqnOeCTzIunrElBC9bo3z2K4gvqrK1OCdGg28F4qRlUS63Gg2e5a-vH7CU0D
-d7VAed248WfzOZ7vn7XgoQJZVqktsFZ4V6B1fvL-tdK5bqRXjWMGsI92cE2s9T68G80_oeBtBLGMgb6tiS0Ep5Vxm3eYtzfeZKaSlft_91Q93yRzo3I2I1Ww
-F9SXF1AVGky3Zf1yW0uEYuKJQirmXixyQWd3mqOJLqwdUYnc3ydJCkoOFruHb1jGfdbfsfEqGgEMUHSu8jwVp2rmR-E4jfKdZvYzNworpeBtxJhpfQGtR4-C
-xDjrH7YtZASMtbd48t55QD1KYt1LERFm_ZU1qf_C4ykC0djcYnEBHa5Gj5luYop_BRtIjorKJ-hPV-lU0gIMw83Ey2yIt5ZIVWec-w_HuGuIDT2y2dA56fXL
-5vUh7cJD5_6bBWRN697CrtE_Qkbhi_ezYmr8FW8
+sprite $AzureLogicApps [70x70/16z] {
+xTQ7hkem381XRtUy__lUI2VoLMtAtkJJ1kU7xa8t30FYpRCePdP-nioaJfFPXPM6yZ-nQoe6Ms8DGu4T56oDm8QQcTR6l7PpxKZzCuV_Ygt18QF35O9iMiDy
+KsNYPhgruj3ug3pW6FaQfkihlApTmjTN04MdHWNXgag8sU-le3Nr4xoYWljtdFADxFOrRQ4nP4XYdH12afT9tIl86e58AMFDoFw_5ekLhKvHDDdVMj8qm7yh
+cF3_nl5VcLD4QNVlcfaY5AXvocJ_g67i-qnZAg-fPnt5RsIycMhWiHLYSLScA8ZLNHZFg8Xt2ebvnoShw27z6_Pmia8U63R40xwoCYgGPhjDt-1aXRqJ2EdF
+qCbAWzGWL4ZnpNw5uIArKjzKJzDQOMi4uMnuy15ptHiyvlOr5OA2zRAACdoyOVW7
 }
 
 AzureEntityColoring(AzureLogicApps)
diff --git a/dist/Integration/AzureLogicApps.svg b/dist/Integration/AzureLogicApps.svg
index 80e3cadd..ce9f153f 100644
--- a/dist/Integration/AzureLogicApps.svg
+++ b/dist/Integration/AzureLogicApps.svg
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="54pt" viewBox="0 0 70 54" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 36.398438 21.738281 L 36.398438 14.816406 L 32.898438 14.816406 L 32.898438 21.738281 C 32.898438 22.984375 31.78125 24.09375 29.960938 24.644531 L 25.199219 25.617188 C 21.980469 26.585938 19.738281 29.078125 19.738281 31.847656 L 19.738281 39.738281 L 23.238281 39.738281 L 23.238281 31.847656 C 23.238281 30.601563 24.359375 29.492188 26.179688 28.9375 L 30.941406 27.832031 C 34.160156 27 36.398438 24.507813 36.398438 21.738281 Z M 36.398438 21.738281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 27.441406 43.339844 L 27.441406 36.96875 C 27.441406 35.445313 26.179688 34.199219 24.640625 34.199219 L 18.199219 34.199219 C 16.660156 34.199219 15.398438 35.445313 15.398438 36.96875 L 15.398438 43.339844 C 15.398438 44.863281 16.660156 46.109375 18.199219 46.109375 L 24.640625 46.109375 C 26.179688 46.109375 27.441406 44.863281 27.441406 43.339844 Z M 27.441406 43.339844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 32.480469 21.738281 L 32.480469 14.816406 L 35.980469 14.816406 L 35.980469 21.738281 C 35.980469 22.984375 37.101563 24.09375 38.921875 24.644531 L 44.800781 25.890625 C 48.019531 26.863281 50.261719 29.355469 50.261719 32.125 L 50.261719 40.015625 L 46.761719 40.015625 L 46.761719 32.125 C 46.761719 30.875 45.640625 29.769531 43.820313 29.214844 L 37.941406 27.96875 C 34.71875 27 32.480469 24.507813 32.480469 21.738281 Z M 32.480469 21.738281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 42.558594 43.617188 L 42.558594 37.246094 C 42.558594 35.722656 43.820313 34.476563 45.359375 34.476563 L 51.800781 34.476563 C 53.339844 34.476563 54.601563 35.722656 54.601563 37.246094 L 54.601563 43.617188 C 54.601563 45.136719 53.339844 46.382813 51.800781 46.382813 L 45.359375 46.382813 C 43.820313 46.382813 42.558594 45.136719 42.558594 43.617188 Z M 42.558594 43.617188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 32.480469 14.816406 L 36.398438 14.816406 L 36.398438 21.460938 L 32.480469 21.460938 Z M 32.480469 14.816406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 37.101563 8.445313 L 37.101563 13.570313 L 31.921875 13.570313 L 31.921875 8.445313 L 37.101563 8.445313 M 38.21875 4.570313 L 30.800781 4.570313 C 29.261719 4.570313 28 5.816406 28 7.339844 L 28 14.675781 C 28 16.199219 29.261719 17.445313 30.800781 17.445313 L 38.21875 17.445313 C 39.761719 17.445313 41.019531 16.199219 41.019531 14.675781 L 41.019531 7.339844 C 41.019531 5.816406 39.761719 4.570313 38.21875 4.570313 Z M 38.21875 4.570313 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 11.058594 53.722656 C 8.121094 53.722656 6.019531 53.167969 4.761719 52.199219 C 3.5 51.09375 2.941406 49.292969 2.941406 46.660156 L 2.941406 32.261719 C 2.941406 29.90625 1.960938 28.660156 0 28.660156 L 0 25.0625 C 1.960938 25.0625 2.941406 23.816406 2.941406 21.324219 L 2.941406 7.199219 C 2.941406 4.570313 3.5 2.628906 4.761719 1.523438 C 6.019531 0.414063 8.121094 0 11.058594 0 L 11.058594 3.601563 C 8.960938 3.601563 7.839844 4.707031 7.839844 7.0625 L 7.839844 20.90625 C 7.839844 24.09375 6.859375 26.03125 4.761719 26.863281 C 6.71875 27.691406 7.839844 29.628906 7.839844 32.816406 L 7.839844 46.523438 C 7.839844 47.769531 8.121094 48.738281 8.539063 49.292969 C 9.101563 49.847656 9.800781 50.125 10.921875 50.125 L 11.058594 53.722656 C 10.921875 53.722656 11.058594 53.722656 11.058594 53.722656 Z M 11.058594 53.722656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 58.941406 0 C 61.878906 0 63.980469 0.554688 65.238281 1.523438 C 66.5 2.628906 67.058594 4.429688 67.058594 7.0625 L 67.058594 21.460938 C 67.058594 23.816406 68.039063 25.0625 70 25.0625 L 70 28.660156 C 68.039063 28.660156 67.058594 29.90625 67.058594 32.398438 L 67.058594 46.382813 C 67.058594 49.015625 66.5 50.953125 65.238281 52.0625 C 63.980469 53.167969 61.878906 53.722656 58.941406 53.722656 L 58.941406 50.125 C 61.039063 50.125 62.160156 49.015625 62.160156 46.660156 L 62.160156 32.816406 C 62.160156 29.628906 63.140625 27.691406 65.238281 26.863281 C 63.28125 26.03125 62.160156 24.09375 62.160156 20.90625 L 62.160156 7.199219 C 62.160156 5.953125 61.878906 4.984375 61.460938 4.429688 C 60.898438 3.875 60.199219 3.601563 59.078125 3.601563 Z M 58.941406 0 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 36.75 31.675781 L 36.75 25.023438 L 32.898438 25.023438 L 32.898438 31.675781 C 32.898438 37.011719 20.5625 31.675781 20.5625 40.335938 L 20.5625 47.25 L 23.449219 47.25 L 23.449219 40.335938 C 23.449219 35.699219 34.824219 38.542969 34.824219 34.257813 C 34.824219 38.574219 46.199219 35.699219 46.199219 40.335938 L 46.199219 47.25 L 49.085938 47.25 L 49.085938 40.335938 C 49.085938 31.675781 36.75 37.011719 36.75 31.675781 Z M 36.75 31.675781 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 38.132813 15.75 L 31.429688 15.75 C 30.035156 15.75 29.050781 16.796875 29.050781 18.199219 L 29.050781 24.9375 C 29.050781 26.339844 30.035156 27.300781 31.429688 27.300781 L 38.132813 27.300781 C 39.527344 27.300781 40.601563 26.339844 40.601563 24.9375 L 40.601563 18.199219 C 40.601563 16.796875 39.417969 15.75 38.132813 15.75 Z M 32.488281 23.886719 L 37.074219 23.886719 L 37.074219 19.25 L 32.488281 19.25 Z M 32.488281 23.886719 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 14.085938 59.761719 C 9.449219 59.761719 6.914063 57.707031 6.914063 53.289063 L 6.914063 40.335938 C 6.914063 38.179688 6.078125 37.363281 4.375 37.363281 L 4.375 34.125 C 6.078125 34.125 6.914063 33.328125 6.914063 31.0625 L 6.914063 18.199219 C 6.914063 13.476563 9.570313 11.636719 14.085938 11.636719 L 14.085938 14.875 C 12.277344 14.875 11.289063 16.042969 11.289063 18.199219 L 11.289063 31.0625 C 11.289063 33.867188 10.386719 34.945313 8.574219 35.699219 C 10.277344 36.453125 11.289063 37.535156 11.289063 40.335938 L 11.289063 53.289063 C 11.289063 55.132813 12.117188 56.523438 14.085938 56.523438 Z M 14.085938 59.761719 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 55.5625 11.636719 C 59.9375 11.636719 62.738281 13.792969 62.738281 18.199219 L 62.738281 31.0625 C 62.738281 33.21875 63.570313 34.125 65.273438 34.125 L 65.273438 37.363281 C 63.570313 37.363281 62.730469 38.074219 62.730469 40.335938 L 62.730469 53.289063 C 62.730469 57.972656 60.078125 59.761719 55.5625 59.761719 L 55.5625 56.523438 C 57.375 56.523438 58.363281 55.445313 58.363281 53.289063 L 58.363281 40.335938 C 58.363281 37.535156 59.175781 36.453125 60.988281 35.699219 C 59.285156 34.835938 58.363281 33.867188 58.363281 31.0625 L 58.363281 18.199219 C 58.363281 16.351563 57.53125 14.875 55.5625 14.875 Z M 55.5625 11.636719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 19.25 42.261719 L 24.675781 42.261719 C 26.125 42.261719 27.300781 43.4375 27.300781 44.886719 L 27.300781 50.3125 C 27.300781 51.761719 26.125 52.9375 24.675781 52.9375 L 19.25 52.9375 C 17.800781 52.9375 16.625 51.761719 16.625 50.3125 L 16.625 44.886719 C 16.625 43.4375 17.800781 42.261719 19.25 42.261719 Z M 19.25 42.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 44.800781 42.261719 L 50.226563 42.261719 C 51.675781 42.261719 52.851563 43.4375 52.851563 44.886719 L 52.851563 50.3125 C 52.851563 51.761719 51.675781 52.9375 50.226563 52.9375 L 44.800781 52.9375 C 43.351563 52.9375 42.175781 51.761719 42.175781 50.3125 L 42.175781 44.886719 C 42.175781 43.4375 43.351563 42.261719 44.800781 42.261719 Z M 44.800781 42.261719 "/>
 </g>
 </svg>
diff --git a/dist/Integration/AzureLogicAppsCustomConnector(m).png b/dist/Integration/AzureLogicAppsCustomConnector(m).png
new file mode 100644
index 00000000..804390b7
Binary files /dev/null and b/dist/Integration/AzureLogicAppsCustomConnector(m).png differ
diff --git a/dist/Integration/AzureLogicAppsCustomConnector(m).svg b/dist/Integration/AzureLogicAppsCustomConnector(m).svg
new file mode 100644
index 00000000..2063e1b8
--- /dev/null
+++ b/dist/Integration/AzureLogicAppsCustomConnector(m).svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 32.132813 55.082031 L 17.214844 70 L 0 52.785156 L 14.917969 37.867188 L 14.917969 22.949219 L 5.738281 22.949219 L 5.738281 0 L 28.6875 0 L 28.6875 22.949219 L 19.507813 22.949219 L 19.507813 37.867188 L 32.132813 50.492188 L 47.050781 50.492188 L 47.050781 41.3125 L 70 41.3125 L 70 64.261719 L 47.050781 64.261719 L 47.050781 55.082031 Z M 32.132813 55.082031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 28.6875 22.949219 L 28.6875 0 L 5.738281 0 L 5.738281 22.949219 Z M 28.6875 22.949219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 17.214844 42.460938 L 6.886719 52.785156 L 17.214844 63.113281 L 27.539063 52.785156 Z M 17.214844 42.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 47.050781 41.3125 L 47.050781 64.261719 L 70 64.261719 L 70 41.3125 Z M 47.050781 41.3125 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureLogicAppsCustomConnector.png b/dist/Integration/AzureLogicAppsCustomConnector.png
new file mode 100644
index 00000000..5eacd4f6
Binary files /dev/null and b/dist/Integration/AzureLogicAppsCustomConnector.png differ
diff --git a/dist/Integration/AzureLogicAppsCustomConnector.puml b/dist/Integration/AzureLogicAppsCustomConnector.puml
new file mode 100644
index 00000000..baa7e6d2
--- /dev/null
+++ b/dist/Integration/AzureLogicAppsCustomConnector.puml
@@ -0,0 +1,9 @@
+sprite $AzureLogicAppsCustomConnector [70x70/16z] {
+xTH54iCm40NHCTFzpnjEVbaPjq6RmFJQzIosQsNdPrlxSoMKK4899HGhdhMNwkAH7UsccFfg9PHGGYdRQqKs8YO34PE7C5CrRcz8XqpRkQL8FnB3Yf1fGeOL
+8SYm8WGPLeGWmueGP5WHWWmhGbnctf8Yn6FIEZyXpB1IjxS6H-ctArQ9GOGLgyKuI5NEQfSKZSP1Dk-q64HOIHX4M17322jY044bOG0X9MK0GKLC_klzF7w0
+w9iqCrKHihrAI1OZ98iHaiKSGiu
+}
+
+AzureEntityColoring(AzureLogicAppsCustomConnector)
+!define AzureLogicAppsCustomConnector(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureLogicAppsCustomConnector, AzureLogicAppsCustomConnector)
+!define AzureLogicAppsCustomConnector(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureLogicAppsCustomConnector, AzureLogicAppsCustomConnector)
diff --git a/dist/Integration/AzureLogicAppsCustomConnector.svg b/dist/Integration/AzureLogicAppsCustomConnector.svg
new file mode 100644
index 00000000..d13cb444
--- /dev/null
+++ b/dist/Integration/AzureLogicAppsCustomConnector.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 32.132813 55.082031 L 17.214844 70 L 0 52.785156 L 14.917969 37.867188 L 14.917969 22.949219 L 5.738281 22.949219 L 5.738281 0 L 28.6875 0 L 28.6875 22.949219 L 19.507813 22.949219 L 19.507813 37.867188 L 32.132813 50.492188 L 47.050781 50.492188 L 47.050781 41.3125 L 70 41.3125 L 70 64.261719 L 47.050781 64.261719 L 47.050781 55.082031 Z M 32.132813 55.082031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 28.6875 22.949219 L 28.6875 0 L 5.738281 0 L 5.738281 22.949219 Z M 28.6875 22.949219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 17.214844 42.460938 L 6.886719 52.785156 L 17.214844 63.113281 L 27.539063 52.785156 Z M 17.214844 42.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 47.050781 41.3125 L 47.050781 64.261719 L 70 64.261719 L 70 41.3125 Z M 47.050781 41.3125 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureSendGridAccount(m).png b/dist/Integration/AzureSendGridAccount(m).png
new file mode 100644
index 00000000..ed736d91
Binary files /dev/null and b/dist/Integration/AzureSendGridAccount(m).png differ
diff --git a/dist/Integration/AzureSendGridAccount(m).svg b/dist/Integration/AzureSendGridAccount(m).svg
new file mode 100644
index 00000000..b384d135
--- /dev/null
+++ b/dist/Integration/AzureSendGridAccount(m).svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="54pt" height="70pt" viewBox="0 0 54 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 35.207031 10.429688 C 40.589844 10.429688 45.96875 10.429688 51.351563 10.421875 C 51.652344 10.421875 51.714844 10.480469 51.714844 10.78125 C 51.707031 16.148438 51.707031 21.503906 51.707031 26.867188 C 46.507813 26.867188 41.3125 26.867188 36.105469 26.859375 C 35.832031 26.859375 35.558594 26.992188 35.292969 26.867188 C 35.269531 26.84375 35.242188 26.808594 35.207031 26.78125 Z M 35.207031 10.429688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 2.46875 26.867188 L 18.863281 26.867188 L 18.898438 26.859375 C 18.890625 27.054688 18.882813 27.238281 18.882813 27.433594 L 18.882813 43.308594 L 18.890625 43.300781 L 2.480469 43.300781 C 2.46875 37.828125 2.46875 32.347656 2.46875 26.867188 Z M 2.46875 26.867188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 2.46875 43.308594 L 18.882813 43.308594 L 18.882813 59.746094 C 13.527344 59.746094 8.179688 59.746094 2.824219 59.757813 C 2.523438 59.757813 2.460938 59.695313 2.460938 59.394531 C 2.46875 54.027344 2.46875 48.671875 2.46875 43.308594 Z M 2.46875 43.308594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 18.882813 59.746094 L 18.882813 43.308594 L 18.875 43.316406 L 34.71875 43.316406 C 34.914063 43.316406 35.101563 43.300781 35.292969 43.300781 L 35.285156 43.335938 L 35.285156 59.757813 C 29.824219 59.746094 24.351563 59.746094 18.882813 59.746094 Z M 18.882813 59.746094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 51.707031 43.308594 L 35.824219 43.308594 C 35.648438 43.308594 35.46875 43.316406 35.292969 43.324219 L 35.304688 43.289063 C 35.304688 37.820313 35.304688 32.347656 35.292969 26.867188 C 35.566406 27 35.839844 26.859375 36.105469 26.859375 C 41.3125 26.867188 46.507813 26.867188 51.707031 26.867188 Z M 18.863281 26.867188 C 18.875 26.417969 18.882813 25.957031 18.882813 25.507813 L 18.882813 10.429688 L 35.207031 10.429688 L 35.207031 26.78125 C 35.109375 26.902344 34.96875 26.867188 34.835938 26.867188 Z M 18.863281 26.867188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 18.910156 26.859375 L 34.84375 26.859375 C 34.96875 26.859375 35.109375 26.894531 35.214844 26.769531 C 35.242188 26.796875 35.269531 26.832031 35.304688 26.859375 C 35.304688 32.332031 35.304688 37.800781 35.3125 43.28125 C 35.117188 43.289063 34.933594 43.300781 34.738281 43.300781 L 18.890625 43.300781 L 18.890625 27.425781 C 18.882813 27.238281 18.898438 27.054688 18.910156 26.859375 Z M 18.910156 26.859375 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureSendGridAccount.png b/dist/Integration/AzureSendGridAccount.png
new file mode 100644
index 00000000..f0304849
Binary files /dev/null and b/dist/Integration/AzureSendGridAccount.png differ
diff --git a/dist/Integration/AzureSendGridAccount.puml b/dist/Integration/AzureSendGridAccount.puml
new file mode 100644
index 00000000..7e341ebd
--- /dev/null
+++ b/dist/Integration/AzureSendGridAccount.puml
@@ -0,0 +1,5 @@
+sprite $AzureSendGridAccount [54x70/16z] xSot0SD05CDG_ijX_ttjLbGS0Ay7z1aGnLGJkf26sIP_hQYeg78psmoJlbPKL5Ib7xLkYWdz-Rit8_UregAYKeJEW1y
+
+AzureEntityColoring(AzureSendGridAccount)
+!define AzureSendGridAccount(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSendGridAccount, AzureSendGridAccount)
+!define AzureSendGridAccount(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSendGridAccount, AzureSendGridAccount)
diff --git a/dist/Integration/AzureSendGridAccount.svg b/dist/Integration/AzureSendGridAccount.svg
new file mode 100644
index 00000000..044b89aa
--- /dev/null
+++ b/dist/Integration/AzureSendGridAccount.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="54pt" height="70pt" viewBox="0 0 54 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 35.207031 10.429688 C 40.589844 10.429688 45.96875 10.429688 51.351563 10.421875 C 51.652344 10.421875 51.714844 10.480469 51.714844 10.78125 C 51.707031 16.148438 51.707031 21.503906 51.707031 26.867188 C 46.507813 26.867188 41.3125 26.867188 36.105469 26.859375 C 35.832031 26.859375 35.558594 26.992188 35.292969 26.867188 C 35.269531 26.84375 35.242188 26.808594 35.207031 26.78125 Z M 35.207031 10.429688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 2.46875 26.867188 L 18.863281 26.867188 L 18.898438 26.859375 C 18.890625 27.054688 18.882813 27.238281 18.882813 27.433594 L 18.882813 43.308594 L 18.890625 43.300781 L 2.480469 43.300781 C 2.46875 37.828125 2.46875 32.347656 2.46875 26.867188 Z M 2.46875 26.867188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 2.46875 43.308594 L 18.882813 43.308594 L 18.882813 59.746094 C 13.527344 59.746094 8.179688 59.746094 2.824219 59.757813 C 2.523438 59.757813 2.460938 59.695313 2.460938 59.394531 C 2.46875 54.027344 2.46875 48.671875 2.46875 43.308594 Z M 2.46875 43.308594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 18.882813 59.746094 L 18.882813 43.308594 L 18.875 43.316406 L 34.71875 43.316406 C 34.914063 43.316406 35.101563 43.300781 35.292969 43.300781 L 35.285156 43.335938 L 35.285156 59.757813 C 29.824219 59.746094 24.351563 59.746094 18.882813 59.746094 Z M 18.882813 59.746094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 51.707031 43.308594 L 35.824219 43.308594 C 35.648438 43.308594 35.46875 43.316406 35.292969 43.324219 L 35.304688 43.289063 C 35.304688 37.820313 35.304688 32.347656 35.292969 26.867188 C 35.566406 27 35.839844 26.859375 36.105469 26.859375 C 41.3125 26.867188 46.507813 26.867188 51.707031 26.867188 Z M 18.863281 26.867188 C 18.875 26.417969 18.882813 25.957031 18.882813 25.507813 L 18.882813 10.429688 L 35.207031 10.429688 L 35.207031 26.78125 C 35.109375 26.902344 34.96875 26.867188 34.835938 26.867188 Z M 18.863281 26.867188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 18.910156 26.859375 L 34.84375 26.859375 C 34.96875 26.859375 35.109375 26.894531 35.214844 26.769531 C 35.242188 26.796875 35.269531 26.832031 35.304688 26.859375 C 35.304688 32.332031 35.304688 37.800781 35.3125 43.28125 C 35.117188 43.289063 34.933594 43.300781 34.738281 43.300781 L 18.890625 43.300781 L 18.890625 27.425781 C 18.882813 27.238281 18.898438 27.054688 18.910156 26.859375 Z M 18.910156 26.859375 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureServiceBus(m).png b/dist/Integration/AzureServiceBus(m).png
index 26fb0d46..361c44c7 100644
Binary files a/dist/Integration/AzureServiceBus(m).png and b/dist/Integration/AzureServiceBus(m).png differ
diff --git a/dist/Integration/AzureServiceBus(m).svg b/dist/Integration/AzureServiceBus(m).svg
index 8f9e39ba..e243f641 100644
--- a/dist/Integration/AzureServiceBus(m).svg
+++ b/dist/Integration/AzureServiceBus(m).svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 34.90625 37.328125 C 36.953125 37.328125 38.871094 36.527344 40.324219 35.074219 L 54.679688 20.722656 L 54.679688 19.957031 L 15.117188 19.957031 L 15.117188 20.722656 L 29.488281 35.074219 C 30.941406 36.527344 32.859375 37.328125 34.90625 37.328125 Z M 41.683594 36.433594 C 39.878906 38.257813 37.476563 39.246094 34.90625 39.246094 C 32.335938 39.246094 29.9375 38.257813 28.128906 36.433594 L 15.117188 23.4375 L 15.117188 49.855469 L 54.679688 49.855469 L 54.679688 23.4375 Z M 1.152344 0 C 0.464844 0 0 0.464844 0 1.152344 L 0 15.117188 C 0 15.824219 0.464844 16.289063 1.152344 16.289063 L 8.136719 16.289063 C 8.84375 16.289063 9.308594 15.824219 9.308594 15.117188 L 9.308594 9.308594 L 60.503906 9.308594 L 60.503906 15.136719 C 60.503906 15.824219 60.972656 16.289063 61.902344 16.289063 L 68.640625 16.289063 C 69.347656 16.289063 69.8125 15.824219 69.8125 15.136719 L 69.8125 1.171875 C 69.8125 0.464844 69.347656 0 68.660156 0 Z M 68.660156 69.8125 C 69.347656 69.8125 69.8125 69.347656 69.8125 68.660156 L 69.8125 54.921875 C 69.8125 54.230469 69.347656 53.765625 68.660156 53.765625 L 61.902344 53.765625 C 61.210938 53.765625 60.746094 54.230469 60.746094 54.921875 L 60.746094 60.503906 L 9.308594 60.503906 L 9.308594 54.695313 C 9.308594 53.988281 8.84375 53.523438 7.914063 53.523438 L 1.152344 53.523438 C 0.464844 53.523438 0 53.988281 0 54.921875 L 0 68.660156 C 0 69.347656 0.464844 69.8125 1.152344 69.8125 Z M 68.660156 69.8125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 1.167969 0 C 0.464844 0 0 0.464844 0 1.167969 L 0 15.167969 C 0 15.867188 0.464844 16.332031 1.167969 16.332031 L 8.167969 16.332031 C 8.867188 16.332031 9.332031 15.867188 9.332031 15.167969 L 9.332031 9.332031 L 60.667969 9.332031 L 60.667969 15.167969 C 60.667969 15.867188 61.132813 16.332031 62.066406 16.332031 L 68.832031 16.332031 C 69.53125 16.332031 70 15.867188 70 15.167969 L 70 1.167969 C 70 0.464844 69.535156 0 68.832031 0 Z M 1.167969 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 68.832031 70 C 69.535156 70 70 69.535156 70 68.832031 L 70 55.066406 C 70 54.367188 69.535156 53.902344 68.832031 53.902344 L 62.066406 53.902344 C 61.367188 53.902344 60.902344 54.367188 60.902344 55.066406 L 60.902344 60.667969 L 9.332031 60.667969 L 9.332031 54.832031 C 9.332031 54.132813 8.867188 53.667969 7.933594 53.667969 L 1.167969 53.667969 C 0.464844 53.667969 0 54.132813 0 55.066406 L 0 68.832031 C 0 69.535156 0.464844 70 1.167969 70 Z M 68.832031 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 41.800781 36.539063 C 39.984375 38.351563 37.570313 39.355469 35 39.355469 C 32.429688 39.355469 30.015625 38.355469 28.199219 36.539063 L 15.167969 23.503906 L 15.167969 49.996094 L 54.832031 49.996094 L 54.832031 23.503906 Z M 41.800781 36.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 35 37.417969 C 37.050781 37.417969 38.980469 36.621094 40.433594 35.167969 L 54.832031 20.769531 L 54.832031 20.007813 L 15.167969 20.007813 L 15.167969 20.769531 L 29.566406 35.167969 C 31.019531 36.621094 32.949219 37.417969 35 37.417969 Z M 35 37.417969 "/>
 </g>
 </svg>
diff --git a/dist/Integration/AzureServiceBus.puml b/dist/Integration/AzureServiceBus.puml
index c595eae6..bf86e7fc 100644
--- a/dist/Integration/AzureServiceBus.puml
+++ b/dist/Integration/AzureServiceBus.puml
@@ -1,7 +1,7 @@
 sprite $AzureServiceBus [70x70/16z] {
-xTZLWGCn34LHiotrt-_IMme9mg3x4vmpZ9FF4F4nHT6exjgkKfExh2YX43CgoT-laXkgwOXAGoKzUvDioKeXjbIJc_4Z6Oo6P5cP1Oo2B5bP14P1M54OZ8Ae
-2XW5qHKm8g8h4WF4eaXCnH-C2XW1KPM3312N0cONSIcx312d0YR_CeIrurN0f86tCmCvGi4HeFRUCeuOVWNDWg_pOEHM4CtH1p6Vfg2xLq899HjBTrn1fo7h
-b2lLJcYTSjMSo7Xz54hB_eYZw6OFfju1
+xTO53iCm38LX9tRSAhd_USVyfBtYqBzWAtrbwDe2rTec54LkuwkWc8oFAA5S_kWS9TknAOWaMFXNip8iShnyK2gS6OyWim1YYJDwcErPnOyCGPmfHuOWL446
+4QuWWmXNa464AyWWmXLa4E4ACeXm1Hb4k88C8bm11f1nYgVBaYLV_evMF8j8LjC4KyOeVhbtrNs2SgcOgi9Ogf0-L0abb3Gm-VMwTgmc6P_snxewvwkvRvVM
+K48PNnJLHPGj
 }
 
 AzureEntityColoring(AzureServiceBus)
diff --git a/dist/Integration/AzureServiceBusRelay(m).png b/dist/Integration/AzureServiceBusRelay(m).png
new file mode 100644
index 00000000..7c7f8d46
Binary files /dev/null and b/dist/Integration/AzureServiceBusRelay(m).png differ
diff --git a/dist/Integration/AzureServiceBusRelay(m).svg b/dist/Integration/AzureServiceBusRelay(m).svg
new file mode 100644
index 00000000..4df77187
--- /dev/null
+++ b/dist/Integration/AzureServiceBusRelay(m).svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 1.121094 0 C 0.421875 0 0 0.421875 0 1.121094 L 0 15.121094 C 0 15.820313 0.421875 16.238281 1.121094 16.238281 L 8.121094 16.238281 C 8.820313 16.238281 9.238281 15.820313 9.238281 15.121094 L 9.238281 9.378906 L 60.621094 9.378906 L 60.621094 15.261719 C 60.621094 15.960938 61.039063 16.378906 62.019531 16.378906 L 68.738281 16.378906 C 69.441406 16.378906 69.859375 15.960938 69.859375 15.261719 L 69.859375 1.261719 C 70 0.421875 69.578125 0 68.878906 0 Z M 1.121094 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 68.878906 70 C 69.578125 70 70 69.578125 70 68.878906 L 70 55.160156 C 70 54.460938 69.578125 54.039063 68.878906 54.039063 L 62.160156 54.039063 C 61.460938 54.039063 61.039063 54.460938 61.039063 55.160156 L 61.039063 60.761719 L 9.378906 60.761719 L 9.378906 54.878906 C 9.378906 54.179688 8.960938 53.761719 7.980469 53.761719 L 1.121094 53.761719 C 0.421875 53.761719 0 54.179688 0 55.160156 L 0 68.878906 C 0 69.578125 0.421875 70 1.121094 70 Z M 68.878906 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 33.585938 24.261719 L 36.554688 22.40625 L 51.171875 45.796875 L 48.203125 47.648438 Z M 33.585938 24.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 19.320313 45.777344 L 33.933594 22.390625 L 36.902344 24.242188 L 22.289063 47.632813 Z M 19.320313 45.777344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 42.558594 23.378906 C 42.558594 27.554688 39.175781 30.941406 35 30.941406 C 30.824219 30.941406 27.441406 27.554688 27.441406 23.378906 C 27.441406 19.203125 30.824219 15.820313 35 15.820313 C 39.175781 15.820313 42.558594 19.203125 42.558594 23.378906 Z M 42.558594 23.378906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 28 46.621094 C 28 50.796875 24.617188 54.179688 20.441406 54.179688 C 16.265625 54.179688 12.878906 50.796875 12.878906 46.621094 C 12.878906 42.445313 16.265625 39.058594 20.441406 39.058594 C 24.617188 39.058594 28 42.445313 28 46.621094 Z M 28 46.621094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.121094 46.621094 C 57.121094 50.796875 53.734375 54.179688 49.558594 54.179688 C 45.382813 54.179688 42 50.796875 42 46.621094 C 42 42.445313 45.382813 39.058594 49.558594 39.058594 C 53.734375 39.058594 57.121094 42.445313 57.121094 46.621094 Z M 57.121094 46.621094 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureServiceBusRelay.png b/dist/Integration/AzureServiceBusRelay.png
new file mode 100644
index 00000000..b2f4641e
Binary files /dev/null and b/dist/Integration/AzureServiceBusRelay.png differ
diff --git a/dist/Integration/AzureServiceBusRelay.puml b/dist/Integration/AzureServiceBusRelay.puml
new file mode 100644
index 00000000..95666a4c
--- /dev/null
+++ b/dist/Integration/AzureServiceBusRelay.puml
@@ -0,0 +1,10 @@
+sprite $AzureServiceBusRelay [70x70/16z] {
+xTM73fmm30PWnmlY__sVjojNXLEAfRYxvTEuYUE5EF4312eU3xTzM0ZjUw9ystfJC-qBl3GPxeAmVYBjvaSRb5AiBq9rh1DLDPtgsOXUKP6-uN91L_BNHgdt
+fJwZ-hxKTzUeZ4_JmQDHLKSS-baFd5Ha08ulxqu0IYKjW6ZpBPMC16PQJWKAN9hHWM3Q5s_N2O1Esno0qNICptiuWBxsUdjL05dxjBNsCbPbcLcepETAGdmu
+Oqc_HJ_y2skKCl_gM7VLfpIC-cHBgNv1zvfVyPhAf7agaoMfPCduk-m8vxyYYcLHnATqrfADeIL792MrB5D9zt-IR9kCCfAj5L-2v7ZaRKoqQdgJvX53Ptff
+BDpepjkFV0mUU57QvvX-VfGdIlHzWV_C8_0ZV0G
+}
+
+AzureEntityColoring(AzureServiceBusRelay)
+!define AzureServiceBusRelay(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceBusRelay, AzureServiceBusRelay)
+!define AzureServiceBusRelay(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceBusRelay, AzureServiceBusRelay)
diff --git a/dist/Integration/AzureServiceBusRelay.svg b/dist/Integration/AzureServiceBusRelay.svg
new file mode 100644
index 00000000..f5976eaf
--- /dev/null
+++ b/dist/Integration/AzureServiceBusRelay.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 1.121094 0 C 0.421875 0 0 0.421875 0 1.121094 L 0 15.121094 C 0 15.820313 0.421875 16.238281 1.121094 16.238281 L 8.121094 16.238281 C 8.820313 16.238281 9.238281 15.820313 9.238281 15.121094 L 9.238281 9.378906 L 60.621094 9.378906 L 60.621094 15.261719 C 60.621094 15.960938 61.039063 16.378906 62.019531 16.378906 L 68.738281 16.378906 C 69.441406 16.378906 69.859375 15.960938 69.859375 15.261719 L 69.859375 1.261719 C 70 0.421875 69.578125 0 68.878906 0 Z M 1.121094 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 68.878906 70 C 69.578125 70 70 69.578125 70 68.878906 L 70 55.160156 C 70 54.460938 69.578125 54.039063 68.878906 54.039063 L 62.160156 54.039063 C 61.460938 54.039063 61.039063 54.460938 61.039063 55.160156 L 61.039063 60.761719 L 9.378906 60.761719 L 9.378906 54.878906 C 9.378906 54.179688 8.960938 53.761719 7.980469 53.761719 L 1.121094 53.761719 C 0.421875 53.761719 0 54.179688 0 55.160156 L 0 68.878906 C 0 69.578125 0.421875 70 1.121094 70 Z M 68.878906 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.585938 24.261719 L 36.554688 22.40625 L 51.171875 45.796875 L 48.203125 47.648438 Z M 33.585938 24.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 19.320313 45.777344 L 33.933594 22.390625 L 36.902344 24.242188 L 22.289063 47.632813 Z M 19.320313 45.777344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 42.558594 23.378906 C 42.558594 27.554688 39.175781 30.941406 35 30.941406 C 30.824219 30.941406 27.441406 27.554688 27.441406 23.378906 C 27.441406 19.203125 30.824219 15.820313 35 15.820313 C 39.175781 15.820313 42.558594 19.203125 42.558594 23.378906 Z M 42.558594 23.378906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 28 46.621094 C 28 50.796875 24.617188 54.179688 20.441406 54.179688 C 16.265625 54.179688 12.878906 50.796875 12.878906 46.621094 C 12.878906 42.445313 16.265625 39.058594 20.441406 39.058594 C 24.617188 39.058594 28 42.445313 28 46.621094 Z M 28 46.621094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.121094 46.621094 C 57.121094 50.796875 53.734375 54.179688 49.558594 54.179688 C 45.382813 54.179688 42 50.796875 42 46.621094 C 42 42.445313 45.382813 39.058594 49.558594 39.058594 C 53.734375 39.058594 57.121094 42.445313 57.121094 46.621094 Z M 57.121094 46.621094 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureServiceCatalogManagedApplicationDefinition(m).png b/dist/Integration/AzureServiceCatalogManagedApplicationDefinition(m).png
new file mode 100644
index 00000000..3ef07268
Binary files /dev/null and b/dist/Integration/AzureServiceCatalogManagedApplicationDefinition(m).png differ
diff --git a/dist/Integration/AzureServiceCatalogManagedApplicationDefinition(m).svg b/dist/Integration/AzureServiceCatalogManagedApplicationDefinition(m).svg
new file mode 100644
index 00000000..a941eafa
--- /dev/null
+++ b/dist/Integration/AzureServiceCatalogManagedApplicationDefinition(m).svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 8.398438 8.398438 L 7 8.398438 C 4.679688 8.398438 2.800781 10.28125 2.800781 12.601563 L 4.199219 12.601563 C 4.199219 11.054688 5.453125 9.800781 7 9.800781 L 8.398438 9.800781 Z M 8.398438 8.398438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 8.398438 16.800781 L 7 16.800781 C 4.679688 16.800781 2.800781 18.679688 2.800781 21 L 4.199219 21 C 4.199219 19.453125 5.453125 18.199219 7 18.199219 L 8.398438 18.199219 Z M 8.398438 16.800781 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 8.398438 25.199219 L 7 25.199219 C 4.679688 25.199219 2.800781 27.082031 2.800781 29.398438 L 4.199219 29.398438 C 4.199219 27.855469 5.453125 26.601563 7 26.601563 L 8.398438 26.601563 Z M 8.398438 25.199219 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 8.398438 33.601563 L 7 33.601563 C 4.679688 33.601563 2.800781 35.480469 2.800781 37.800781 L 4.199219 37.800781 C 4.199219 36.253906 5.453125 35 7 35 L 8.398438 35 Z M 8.398438 33.601563 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 8.398438 42 L 7 42 C 4.679688 42 2.800781 43.878906 2.800781 46.199219 L 4.199219 46.199219 C 4.199219 44.652344 5.453125 43.398438 7 43.398438 L 8.398438 43.398438 Z M 8.398438 42 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 8.398438 50.398438 L 7 50.398438 C 4.679688 50.398438 2.800781 52.28125 2.800781 54.601563 L 4.199219 54.601563 C 4.199219 53.054688 5.453125 51.800781 7 51.800781 L 8.398438 51.800781 Z M 8.398438 50.398438 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 8.398438 58.800781 L 7 58.800781 C 4.679688 58.800781 2.800781 60.679688 2.800781 63 L 4.199219 63 C 4.199219 61.453125 5.453125 60.199219 7 60.199219 L 8.398438 60.199219 Z M 8.398438 58.800781 "/>
+</g>
+<mask id="mask7">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip8">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface26" clip-path="url(#clip8)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 16.800781 4.199219 L 11.898438 7 L 14 7 L 14 67.199219 L 61.601563 67.199219 L 64.398438 64.398438 L 64.398438 4.199219 Z M 16.800781 4.199219 "/>
+</g>
+<mask id="mask8">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip9">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface29" clip-path="url(#clip9)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 17.5 4.199219 L 12.601563 7 L 61.601563 7 L 64.398438 4.199219 Z M 17.5 4.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 2.800781 12.601563 L 10.5 12.601563 L 10.5 14 L 4.199219 14 C 4.199219 14 2.800781 14 2.800781 12.601563 Z M 2.800781 12.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 2.800781 21 L 10.5 21 L 10.5 22.398438 L 4.199219 22.398438 C 4.199219 22.398438 2.800781 22.398438 2.800781 21 Z M 2.800781 21 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 2.800781 29.398438 L 10.5 29.398438 L 10.5 30.800781 L 4.199219 30.800781 C 4.199219 30.800781 2.800781 30.800781 2.800781 29.398438 Z M 2.800781 29.398438 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 2.800781 37.800781 L 10.5 37.800781 L 10.5 39.199219 L 4.199219 39.199219 C 4.199219 39.199219 2.800781 39.199219 2.800781 37.800781 Z M 2.800781 37.800781 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 2.800781 46.199219 L 10.5 46.199219 L 10.5 47.601563 L 4.199219 47.601563 C 4.199219 47.601563 2.800781 47.601563 2.800781 46.199219 Z M 2.800781 46.199219 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 2.800781 54.601563 L 10.5 54.601563 L 10.5 56 L 4.199219 56 C 4.199219 56 2.800781 56 2.800781 54.601563 Z M 2.800781 54.601563 "/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,115,200);fill-opacity:1;" d="M 2.800781 63 L 10.5 63 L 10.5 64.398438 L 4.199219 64.398438 C 4.199219 64.398438 2.800781 64.398438 2.800781 63 Z M 2.800781 63 "/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 19.601563 2.800781 C 15.398438 2.800781 9.800781 7 9.800781 7 L 12.601563 7 L 12.601563 65.800781 L 61.601563 65.800781 L 61.601563 68.601563 L 65.800781 64.398438 L 65.800781 2.800781 Z M 19.601563 2.800781 "/>
+<use xlink:href="#surface26" mask="url(#mask7)"/>
+<use xlink:href="#surface29" mask="url(#mask8)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 8.398438 70 L 8.398438 65.800781 L 11.199219 65.800781 L 12.601563 64.398438 L 12.601563 63 L 11.199219 61.601563 L 8.398438 61.601563 L 8.398438 57.398438 L 11.199219 57.398438 L 12.601563 56 L 12.601563 54.601563 L 11.199219 53.199219 L 8.398438 53.199219 L 8.398438 49 L 11.199219 49 L 12.601563 47.601563 L 12.601563 46.199219 L 11.199219 44.800781 L 8.398438 44.800781 L 8.398438 40.601563 L 11.199219 40.601563 L 12.601563 39.199219 L 12.601563 37.800781 L 11.199219 36.398438 L 8.398438 36.398438 L 8.398438 32.199219 L 11.199219 32.199219 L 12.601563 30.800781 L 12.601563 29.398438 L 11.199219 28 L 8.398438 28 L 8.398438 23.800781 L 11.199219 23.800781 L 12.601563 22.398438 L 12.601563 21 L 11.199219 19.601563 L 8.398438 19.601563 L 8.398438 15.398438 L 11.199219 15.398438 L 12.601563 14 L 12.601563 12.601563 L 11.199219 11.199219 L 8.398438 11.199219 L 8.398438 7 L 61.601563 7 L 61.601563 70 Z M 8.398438 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 40.121094 43.472656 C 40.152344 43.472656 40.1875 43.464844 40.214844 43.449219 L 46.4375 40.003906 C 46.496094 39.972656 46.535156 39.914063 46.53125 39.847656 L 46.53125 32.929688 C 46.53125 32.863281 46.496094 32.804688 46.4375 32.773438 C 46.378906 32.742188 46.308594 32.742188 46.246094 32.773438 L 40.027344 36.21875 C 39.96875 36.25 39.933594 36.3125 39.933594 36.375 L 39.933594 43.292969 C 39.933594 43.359375 39.96875 43.417969 40.027344 43.449219 C 40.054688 43.464844 40.085938 43.472656 40.121094 43.472656 M 40.121094 52.582031 C 40.152344 52.582031 40.1875 52.574219 40.214844 52.558594 L 46.4375 49.113281 C 46.496094 49.082031 46.535156 49.019531 46.53125 48.957031 L 46.53125 42.039063 C 46.53125 41.972656 46.496094 41.914063 46.4375 41.882813 C 46.378906 41.851563 46.308594 41.851563 46.246094 41.882813 L 40.027344 45.328125 C 39.96875 45.359375 39.933594 45.421875 39.933594 45.484375 L 39.933594 52.402344 C 39.933594 52.453125 39.953125 52.5 39.988281 52.53125 C 40.023438 52.566406 40.070313 52.585938 40.121094 52.582031 M 48.183594 38.921875 C 48.21875 38.917969 48.253906 38.910156 48.28125 38.894531 L 54.503906 35.449219 C 54.5625 35.417969 54.601563 35.359375 54.601563 35.292969 L 54.601563 28.375 C 54.601563 28.308594 54.5625 28.25 54.503906 28.21875 C 54.445313 28.1875 54.371094 28.1875 54.3125 28.21875 L 48.089844 31.664063 C 48.035156 31.699219 48 31.757813 48 31.824219 L 48 38.742188 C 48 38.804688 48.035156 38.867188 48.089844 38.898438 C 48.121094 38.910156 48.152344 38.917969 48.183594 38.921875 M 48.183594 48.027344 C 48.21875 48.027344 48.253906 48.019531 48.28125 48.003906 L 54.503906 44.558594 C 54.5625 44.527344 54.601563 44.46875 54.601563 44.402344 L 54.601563 37.484375 C 54.601563 37.417969 54.5625 37.359375 54.503906 37.328125 C 54.445313 37.296875 54.371094 37.296875 54.3125 37.328125 L 48.089844 40.773438 C 48.035156 40.804688 48 40.867188 48 40.933594 L 48 47.847656 C 48 47.914063 48.035156 47.972656 48.089844 48.007813 C 48.121094 48.019531 48.152344 48.027344 48.183594 48.027344 M 38.28125 43.472656 C 38.246094 43.472656 38.214844 43.464844 38.183594 43.449219 L 31.960938 40.003906 C 31.902344 39.972656 31.867188 39.914063 31.867188 39.847656 L 31.867188 32.929688 C 31.867188 32.863281 31.902344 32.804688 31.960938 32.773438 C 32.023438 32.742188 32.09375 32.742188 32.152344 32.773438 L 38.375 36.21875 C 38.429688 36.25 38.464844 36.3125 38.464844 36.378906 L 38.464844 43.296875 C 38.46875 43.34375 38.445313 43.390625 38.410156 43.425781 C 38.375 43.457031 38.328125 43.476563 38.28125 43.472656 M 38.28125 52.582031 C 38.246094 52.582031 38.214844 52.574219 38.183594 52.558594 L 31.960938 49.113281 C 31.902344 49.082031 31.867188 49.019531 31.867188 48.957031 L 31.867188 42.039063 C 31.867188 41.972656 31.902344 41.914063 31.960938 41.882813 C 32.023438 41.851563 32.09375 41.851563 32.152344 41.882813 L 38.375 45.328125 C 38.429688 45.359375 38.464844 45.421875 38.464844 45.484375 L 38.464844 52.402344 C 38.46875 52.453125 38.445313 52.5 38.410156 52.53125 C 38.375 52.566406 38.328125 52.585938 38.28125 52.582031 M 30.214844 38.921875 C 30.179688 38.921875 30.148438 38.910156 30.121094 38.894531 L 23.898438 35.449219 C 23.835938 35.417969 23.800781 35.359375 23.800781 35.292969 L 23.800781 28.375 C 23.800781 28.308594 23.835938 28.25 23.894531 28.21875 C 23.953125 28.1875 24.027344 28.1875 24.085938 28.21875 L 30.308594 31.664063 C 30.363281 31.699219 30.398438 31.757813 30.398438 31.824219 L 30.398438 38.742188 C 30.398438 38.789063 30.378906 38.835938 30.34375 38.871094 C 30.3125 38.902344 30.261719 38.921875 30.214844 38.921875 M 30.214844 48.027344 C 30.179688 48.027344 30.148438 48.019531 30.121094 48.003906 L 23.898438 44.558594 C 23.835938 44.527344 23.800781 44.46875 23.800781 44.402344 L 23.800781 37.484375 C 23.800781 37.417969 23.835938 37.359375 23.894531 37.328125 C 23.953125 37.296875 24.027344 37.296875 24.085938 37.328125 L 30.308594 40.773438 C 30.363281 40.804688 30.398438 40.867188 30.398438 40.933594 L 30.398438 47.847656 C 30.398438 47.898438 30.378906 47.945313 30.34375 47.976563 C 30.3125 48.011719 30.261719 48.03125 30.214844 48.027344 M 32.917969 30.855469 C 32.933594 30.828125 32.957031 30.804688 32.988281 30.792969 L 39.171875 27.429688 C 39.230469 27.398438 39.300781 27.398438 39.359375 27.429688 L 45.480469 30.761719 C 45.535156 30.792969 45.570313 30.851563 45.570313 30.917969 C 45.570313 30.980469 45.53125 31.039063 45.476563 31.070313 L 39.292969 34.429688 C 39.234375 34.460938 39.164063 34.460938 39.105469 34.429688 L 32.984375 31.097656 C 32.941406 31.074219 32.910156 31.039063 32.898438 30.992188 C 32.886719 30.945313 32.890625 30.898438 32.917969 30.855469 M 24.855469 26.46875 C 24.871094 26.441406 24.894531 26.417969 24.921875 26.402344 L 31.039063 23.042969 C 31.09375 23.007813 31.164063 23.007813 31.222656 23.042969 L 37.277344 26.375 C 37.332031 26.402344 37.367188 26.460938 37.367188 26.527344 C 37.363281 26.589844 37.328125 26.648438 37.273438 26.679688 L 31.15625 30.042969 C 31.097656 30.070313 31.03125 30.070313 30.972656 30.039063 L 24.917969 26.707031 C 24.863281 26.679688 24.828125 26.621094 24.828125 26.558594 C 24.828125 26.527344 24.839844 26.496094 24.855469 26.46875 M 41.148438 26.542969 C 41.164063 26.515625 41.1875 26.492188 41.21875 26.476563 L 47.332031 23.117188 C 47.390625 23.082031 47.460938 23.082031 47.515625 23.117188 L 53.570313 26.449219 C 53.628906 26.476563 53.660156 26.535156 53.660156 26.601563 C 53.660156 26.664063 53.621094 26.722656 53.566406 26.753906 L 47.453125 30.117188 C 47.394531 30.144531 47.324219 30.144531 47.269531 30.113281 L 41.214844 26.78125 C 41.15625 26.753906 41.121094 26.695313 41.121094 26.632813 C 41.125 26.601563 41.132813 26.570313 41.148438 26.542969 M 32.949219 22.210938 C 32.964844 22.183594 32.988281 22.164063 33.019531 22.148438 L 39.203125 18.84375 C 39.257813 18.8125 39.332031 18.808594 39.390625 18.839844 L 45.511719 22.117188 C 45.566406 22.148438 45.601563 22.207031 45.601563 22.269531 C 45.597656 22.332031 45.5625 22.390625 45.507813 22.421875 L 39.324219 25.726563 C 39.265625 25.757813 39.195313 25.753906 39.136719 25.726563 L 33.015625 22.445313 C 32.957031 22.417969 32.921875 22.359375 32.921875 22.296875 C 32.921875 22.265625 32.933594 22.238281 32.949219 22.210938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 32.390625 60.433594 C 29.875 60.433594 27.628906 58.359375 25.988281 56.839844 C 25.519531 56.40625 25.074219 55.996094 24.78125 55.792969 C 23.703125 55.023438 21.589844 54.199219 19.511719 54.199219 L 17.589844 54.195313 C 16.433594 54.191406 15.496094 53.253906 15.496094 52.097656 L 15.496094 45.582031 C 15.496094 44.425781 16.4375 43.484375 17.59375 43.484375 L 20.730469 43.484375 L 20.886719 44.886719 L 20.886719 43.484375 C 21.789063 43.484375 23.191406 43.222656 24.433594 42.992188 C 25.429688 42.808594 26.367188 42.632813 27.148438 42.5625 C 27.488281 42.53125 27.835938 42.515625 28.183594 42.515625 C 29.175781 42.515625 32.519531 42.675781 33.96875 44.75 C 34.140625 44.988281 34.929688 45.933594 35.285156 46.226563 C 35.589844 46.46875 36.339844 46.726563 37.546875 46.726563 L 37.765625 46.726563 C 37.859375 46.722656 38.078125 46.703125 38.371094 46.675781 C 39.207031 46.601563 40.472656 46.492188 41.429688 46.492188 C 41.652344 46.492188 41.863281 46.5 42.042969 46.511719 C 43.875 46.648438 44.863281 47.894531 45.035156 49.070313 C 45.101563 49.519531 45.035156 50.132813 44.792969 50.699219 L 45.472656 50.367188 C 47.632813 49.304688 50.589844 47.855469 52.300781 47.277344 C 52.917969 47.066406 53.566406 46.953125 54.21875 46.949219 C 55.605469 46.949219 56.753906 47.523438 57.285156 48.484375 C 57.574219 49 57.925781 50.082031 57.058594 51.476563 C 56.605469 52.199219 55.890625 52.902344 55.089844 53.398438 C 53.566406 54.339844 52.039063 55.277344 50.507813 56.207031 C 49.859375 56.601563 49.191406 57.03125 48.539063 57.457031 C 46.285156 58.917969 44.847656 59.816406 43.765625 59.964844 C 43.273438 60.023438 42.78125 60.046875 42.289063 60.039063 C 41.8125 60.039063 41.277344 60.027344 40.742188 60.015625 C 40.226563 60 39.714844 59.992188 39.199219 59.988281 C 38.828125 59.988281 38.488281 59.996094 38.203125 60.019531 C 37.773438 60.050781 37.292969 60.097656 36.773438 60.152344 C 35.515625 60.277344 33.945313 60.433594 32.390625 60.433594 Z M 32.390625 60.433594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 52.609375 48.742188 C 50.230469 49.546875 45.019531 52.273438 43.824219 52.78125 C 42.421875 53.378906 39.628906 53.742188 36.515625 53.683594 C 34.792969 53.652344 33.5625 53.464844 32.871094 52.820313 C 32.871094 52.820313 30.40625 50.820313 29.90625 50.328125 C 29.0625 49.496094 30.152344 48.230469 31.003906 48.898438 C 31.628906 49.386719 32.679688 50.441406 33.699219 51.203125 C 34.71875 51.964844 38.3125 51.609375 39.800781 51.507813 C 41.515625 51.386719 42.484375 51.054688 42.867188 50.867188 C 43.421875 50.597656 43.5625 49.761719 43.511719 49.414063 C 43.4375 48.898438 42.964844 48.136719 41.800781 48.050781 C 40.636719 47.960938 38.046875 48.257813 37.664063 48.265625 C 35.871094 48.308594 34.808594 47.890625 34.273438 47.457031 C 33.734375 47.023438 32.8125 45.878906 32.683594 45.695313 C 31.78125 44.402344 29.277344 43.902344 27.136719 44.097656 C 25.355469 44.261719 22.328125 45.074219 20.59375 45.023438 L 17.457031 45.023438 C 17.070313 45.023438 16.757813 45.335938 16.757813 45.722656 L 16.757813 52.238281 C 16.757813 52.625 17.066406 52.9375 17.453125 52.9375 L 19.375 52.941406 C 21.648438 52.941406 24.042969 53.789063 25.453125 54.789063 C 26.863281 55.789063 29.59375 59.175781 32.25 59.175781 C 34.359375 59.175781 36.476563 58.871094 37.957031 58.761719 C 39.441406 58.648438 42.28125 58.878906 43.433594 58.71875 C 44.585938 58.5625 47.316406 56.566406 49.625 55.160156 C 51.035156 54.300781 52.613281 53.339844 54.214844 52.347656 C 54.851563 51.953125 55.40625 51.402344 55.730469 50.875 C 56.871094 49.039063 54.90625 47.964844 52.609375 48.742188 Z M 52.609375 48.742188 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureServiceCatalogManagedApplicationDefinition.png b/dist/Integration/AzureServiceCatalogManagedApplicationDefinition.png
new file mode 100644
index 00000000..84b75d70
Binary files /dev/null and b/dist/Integration/AzureServiceCatalogManagedApplicationDefinition.png differ
diff --git a/dist/Integration/AzureServiceCatalogManagedApplicationDefinition.puml b/dist/Integration/AzureServiceCatalogManagedApplicationDefinition.puml
new file mode 100644
index 00000000..a02b48b9
--- /dev/null
+++ b/dist/Integration/AzureServiceCatalogManagedApplicationDefinition.puml
@@ -0,0 +1,14 @@
+sprite $AzureServiceCatalogManagedApplicationDefinition [70x70/16z] {
+pTU7SlGg30LWr2X7x_--Tr1-OiUmP7QvxQHDynTM5YtzlqFyLbP2Rlvc9eOhil1RoK-52Wgdzq9FHL7v_HB-L0oVX7yeHDa_o0z5JFLOOQEKZXNZhrQpCqKY
+bCg9KX6nb0-KA_LO4RFgnyfvlv2Q7IjaolIBWbyLrVwhrlRQiAJj5yKeHQYzD7eCMwMsslEYNv3fclVRUHIHjQBfYcsK4S4y3gbU-NizzQO5x_PBeMutn5yg
+3es_hnHYdfHh30fape2DCRUbegOoAPAkb36myS124LsjKksReGoKCPGncFKgbOWKzxfYV2G3CdMgwIWoya8nxU5qhrkYBqU_DIfzV5GwIhDI5giK_lpJDepn
+gX5lR5QkjBio2f3lcwS7-bgHd9i_bQGEXrqJ02vVthRhPgMN9yggtUEXR5UfMVdw7CrQJCkDGYP4JuM64bKThJmKdXMLkIuE6qgFnTGU2cKiLwdv7HM7Neeu
+NOe1PLQmwfTe3bae2Y-qgekkUZUw1PC2RxBfkiSy6XsIXp8cWNxIBmxxLZ9yrtN4l52OILrwUKBf1T6DeYRoL2hYZsilJyrkCIzvKhQh56en4Stmqfj_h5eR
+nVYs1o1EpNIhLuxVbjAb66Obt_UZbXufdYc92zDGrgjthX5RArSNjQWBr_skHcrMnjwfAWeazXPUnLg9CyDJ8UHqHJpU979_hcsxhZtMq7BVXH1D62cJmcgs
+LgXwxMKbujYXcuv7C9yPXAQnJBNrOOocMAvIuunPQs-uUy4Q76Z5-BuNp0hFvrrOUXc3BvIsF7itMXlSrlr2wti0P8NapIbeUIU1JeRWWxDtULvnj-Sw5bag
+ZcAMIss8x4_mgiB79tZHFtVO8yL63-D4AJaYPtSrgn7zK7bq9-5zHM1tGclzeBhI0ZcyyS7IkHB8kJAU_Wi
+}
+
+AzureEntityColoring(AzureServiceCatalogManagedApplicationDefinition)
+!define AzureServiceCatalogManagedApplicationDefinition(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceCatalogManagedApplicationDefinition, AzureServiceCatalogManagedApplicationDefinition)
+!define AzureServiceCatalogManagedApplicationDefinition(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceCatalogManagedApplicationDefinition, AzureServiceCatalogManagedApplicationDefinition)
diff --git a/dist/Integration/AzureServiceCatalogManagedApplicationDefinition.svg b/dist/Integration/AzureServiceCatalogManagedApplicationDefinition.svg
new file mode 100644
index 00000000..b7ae7b0d
--- /dev/null
+++ b/dist/Integration/AzureServiceCatalogManagedApplicationDefinition.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 8.398438 8.398438 L 7 8.398438 C 4.679688 8.398438 2.800781 10.28125 2.800781 12.601563 L 4.199219 12.601563 C 4.199219 11.054688 5.453125 9.800781 7 9.800781 L 8.398438 9.800781 Z M 8.398438 8.398438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 8.398438 16.800781 L 7 16.800781 C 4.679688 16.800781 2.800781 18.679688 2.800781 21 L 4.199219 21 C 4.199219 19.453125 5.453125 18.199219 7 18.199219 L 8.398438 18.199219 Z M 8.398438 16.800781 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 8.398438 25.199219 L 7 25.199219 C 4.679688 25.199219 2.800781 27.082031 2.800781 29.398438 L 4.199219 29.398438 C 4.199219 27.855469 5.453125 26.601563 7 26.601563 L 8.398438 26.601563 Z M 8.398438 25.199219 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 8.398438 33.601563 L 7 33.601563 C 4.679688 33.601563 2.800781 35.480469 2.800781 37.800781 L 4.199219 37.800781 C 4.199219 36.253906 5.453125 35 7 35 L 8.398438 35 Z M 8.398438 33.601563 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 8.398438 42 L 7 42 C 4.679688 42 2.800781 43.878906 2.800781 46.199219 L 4.199219 46.199219 C 4.199219 44.652344 5.453125 43.398438 7 43.398438 L 8.398438 43.398438 Z M 8.398438 42 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 8.398438 50.398438 L 7 50.398438 C 4.679688 50.398438 2.800781 52.28125 2.800781 54.601563 L 4.199219 54.601563 C 4.199219 53.054688 5.453125 51.800781 7 51.800781 L 8.398438 51.800781 Z M 8.398438 50.398438 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 8.398438 58.800781 L 7 58.800781 C 4.679688 58.800781 2.800781 60.679688 2.800781 63 L 4.199219 63 C 4.199219 61.453125 5.453125 60.199219 7 60.199219 L 8.398438 60.199219 Z M 8.398438 58.800781 "/>
+</g>
+<mask id="mask7">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip8">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface26" clip-path="url(#clip8)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 16.800781 4.199219 L 11.898438 7 L 14 7 L 14 67.199219 L 61.601563 67.199219 L 64.398438 64.398438 L 64.398438 4.199219 Z M 16.800781 4.199219 "/>
+</g>
+<mask id="mask8">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip9">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface29" clip-path="url(#clip9)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.5 4.199219 L 12.601563 7 L 61.601563 7 L 64.398438 4.199219 Z M 17.5 4.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 2.800781 12.601563 L 10.5 12.601563 L 10.5 14 L 4.199219 14 C 4.199219 14 2.800781 14 2.800781 12.601563 Z M 2.800781 12.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 2.800781 21 L 10.5 21 L 10.5 22.398438 L 4.199219 22.398438 C 4.199219 22.398438 2.800781 22.398438 2.800781 21 Z M 2.800781 21 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 2.800781 29.398438 L 10.5 29.398438 L 10.5 30.800781 L 4.199219 30.800781 C 4.199219 30.800781 2.800781 30.800781 2.800781 29.398438 Z M 2.800781 29.398438 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 2.800781 37.800781 L 10.5 37.800781 L 10.5 39.199219 L 4.199219 39.199219 C 4.199219 39.199219 2.800781 39.199219 2.800781 37.800781 Z M 2.800781 37.800781 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 2.800781 46.199219 L 10.5 46.199219 L 10.5 47.601563 L 4.199219 47.601563 C 4.199219 47.601563 2.800781 47.601563 2.800781 46.199219 Z M 2.800781 46.199219 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 2.800781 54.601563 L 10.5 54.601563 L 10.5 56 L 4.199219 56 C 4.199219 56 2.800781 56 2.800781 54.601563 Z M 2.800781 54.601563 "/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39.215686%,39.607843%,39.607843%);fill-opacity:1;" d="M 2.800781 63 L 10.5 63 L 10.5 64.398438 L 4.199219 64.398438 C 4.199219 64.398438 2.800781 64.398438 2.800781 63 Z M 2.800781 63 "/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 19.601563 2.800781 C 15.398438 2.800781 9.800781 7 9.800781 7 L 12.601563 7 L 12.601563 65.800781 L 61.601563 65.800781 L 61.601563 68.601563 L 65.800781 64.398438 L 65.800781 2.800781 Z M 19.601563 2.800781 "/>
+<use xlink:href="#surface26" mask="url(#mask7)"/>
+<use xlink:href="#surface29" mask="url(#mask8)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 8.398438 70 L 8.398438 65.800781 L 11.199219 65.800781 L 12.601563 64.398438 L 12.601563 63 L 11.199219 61.601563 L 8.398438 61.601563 L 8.398438 57.398438 L 11.199219 57.398438 L 12.601563 56 L 12.601563 54.601563 L 11.199219 53.199219 L 8.398438 53.199219 L 8.398438 49 L 11.199219 49 L 12.601563 47.601563 L 12.601563 46.199219 L 11.199219 44.800781 L 8.398438 44.800781 L 8.398438 40.601563 L 11.199219 40.601563 L 12.601563 39.199219 L 12.601563 37.800781 L 11.199219 36.398438 L 8.398438 36.398438 L 8.398438 32.199219 L 11.199219 32.199219 L 12.601563 30.800781 L 12.601563 29.398438 L 11.199219 28 L 8.398438 28 L 8.398438 23.800781 L 11.199219 23.800781 L 12.601563 22.398438 L 12.601563 21 L 11.199219 19.601563 L 8.398438 19.601563 L 8.398438 15.398438 L 11.199219 15.398438 L 12.601563 14 L 12.601563 12.601563 L 11.199219 11.199219 L 8.398438 11.199219 L 8.398438 7 L 61.601563 7 L 61.601563 70 Z M 8.398438 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 40.121094 43.472656 C 40.152344 43.472656 40.1875 43.464844 40.214844 43.449219 L 46.4375 40.003906 C 46.496094 39.972656 46.535156 39.914063 46.53125 39.847656 L 46.53125 32.929688 C 46.53125 32.863281 46.496094 32.804688 46.4375 32.773438 C 46.378906 32.742188 46.308594 32.742188 46.246094 32.773438 L 40.027344 36.21875 C 39.96875 36.25 39.933594 36.3125 39.933594 36.375 L 39.933594 43.292969 C 39.933594 43.359375 39.96875 43.417969 40.027344 43.449219 C 40.054688 43.464844 40.085938 43.472656 40.121094 43.472656 M 40.121094 52.582031 C 40.152344 52.582031 40.1875 52.574219 40.214844 52.558594 L 46.4375 49.113281 C 46.496094 49.082031 46.535156 49.019531 46.53125 48.957031 L 46.53125 42.039063 C 46.53125 41.972656 46.496094 41.914063 46.4375 41.882813 C 46.378906 41.851563 46.308594 41.851563 46.246094 41.882813 L 40.027344 45.328125 C 39.96875 45.359375 39.933594 45.421875 39.933594 45.484375 L 39.933594 52.402344 C 39.933594 52.453125 39.953125 52.5 39.988281 52.53125 C 40.023438 52.566406 40.070313 52.585938 40.121094 52.582031 M 48.183594 38.921875 C 48.21875 38.917969 48.253906 38.910156 48.28125 38.894531 L 54.503906 35.449219 C 54.5625 35.417969 54.601563 35.359375 54.601563 35.292969 L 54.601563 28.375 C 54.601563 28.308594 54.5625 28.25 54.503906 28.21875 C 54.445313 28.1875 54.371094 28.1875 54.3125 28.21875 L 48.089844 31.664063 C 48.035156 31.699219 48 31.757813 48 31.824219 L 48 38.742188 C 48 38.804688 48.035156 38.867188 48.089844 38.898438 C 48.121094 38.910156 48.152344 38.917969 48.183594 38.921875 M 48.183594 48.027344 C 48.21875 48.027344 48.253906 48.019531 48.28125 48.003906 L 54.503906 44.558594 C 54.5625 44.527344 54.601563 44.46875 54.601563 44.402344 L 54.601563 37.484375 C 54.601563 37.417969 54.5625 37.359375 54.503906 37.328125 C 54.445313 37.296875 54.371094 37.296875 54.3125 37.328125 L 48.089844 40.773438 C 48.035156 40.804688 48 40.867188 48 40.933594 L 48 47.847656 C 48 47.914063 48.035156 47.972656 48.089844 48.007813 C 48.121094 48.019531 48.152344 48.027344 48.183594 48.027344 M 38.28125 43.472656 C 38.246094 43.472656 38.214844 43.464844 38.183594 43.449219 L 31.960938 40.003906 C 31.902344 39.972656 31.867188 39.914063 31.867188 39.847656 L 31.867188 32.929688 C 31.867188 32.863281 31.902344 32.804688 31.960938 32.773438 C 32.023438 32.742188 32.09375 32.742188 32.152344 32.773438 L 38.375 36.21875 C 38.429688 36.25 38.464844 36.3125 38.464844 36.378906 L 38.464844 43.296875 C 38.46875 43.34375 38.445313 43.390625 38.410156 43.425781 C 38.375 43.457031 38.328125 43.476563 38.28125 43.472656 M 38.28125 52.582031 C 38.246094 52.582031 38.214844 52.574219 38.183594 52.558594 L 31.960938 49.113281 C 31.902344 49.082031 31.867188 49.019531 31.867188 48.957031 L 31.867188 42.039063 C 31.867188 41.972656 31.902344 41.914063 31.960938 41.882813 C 32.023438 41.851563 32.09375 41.851563 32.152344 41.882813 L 38.375 45.328125 C 38.429688 45.359375 38.464844 45.421875 38.464844 45.484375 L 38.464844 52.402344 C 38.46875 52.453125 38.445313 52.5 38.410156 52.53125 C 38.375 52.566406 38.328125 52.585938 38.28125 52.582031 M 30.214844 38.921875 C 30.179688 38.921875 30.148438 38.910156 30.121094 38.894531 L 23.898438 35.449219 C 23.835938 35.417969 23.800781 35.359375 23.800781 35.292969 L 23.800781 28.375 C 23.800781 28.308594 23.835938 28.25 23.894531 28.21875 C 23.953125 28.1875 24.027344 28.1875 24.085938 28.21875 L 30.308594 31.664063 C 30.363281 31.699219 30.398438 31.757813 30.398438 31.824219 L 30.398438 38.742188 C 30.398438 38.789063 30.378906 38.835938 30.34375 38.871094 C 30.3125 38.902344 30.261719 38.921875 30.214844 38.921875 M 30.214844 48.027344 C 30.179688 48.027344 30.148438 48.019531 30.121094 48.003906 L 23.898438 44.558594 C 23.835938 44.527344 23.800781 44.46875 23.800781 44.402344 L 23.800781 37.484375 C 23.800781 37.417969 23.835938 37.359375 23.894531 37.328125 C 23.953125 37.296875 24.027344 37.296875 24.085938 37.328125 L 30.308594 40.773438 C 30.363281 40.804688 30.398438 40.867188 30.398438 40.933594 L 30.398438 47.847656 C 30.398438 47.898438 30.378906 47.945313 30.34375 47.976563 C 30.3125 48.011719 30.261719 48.03125 30.214844 48.027344 M 32.917969 30.855469 C 32.933594 30.828125 32.957031 30.804688 32.988281 30.792969 L 39.171875 27.429688 C 39.230469 27.398438 39.300781 27.398438 39.359375 27.429688 L 45.480469 30.761719 C 45.535156 30.792969 45.570313 30.851563 45.570313 30.917969 C 45.570313 30.980469 45.53125 31.039063 45.476563 31.070313 L 39.292969 34.429688 C 39.234375 34.460938 39.164063 34.460938 39.105469 34.429688 L 32.984375 31.097656 C 32.941406 31.074219 32.910156 31.039063 32.898438 30.992188 C 32.886719 30.945313 32.890625 30.898438 32.917969 30.855469 M 24.855469 26.46875 C 24.871094 26.441406 24.894531 26.417969 24.921875 26.402344 L 31.039063 23.042969 C 31.09375 23.007813 31.164063 23.007813 31.222656 23.042969 L 37.277344 26.375 C 37.332031 26.402344 37.367188 26.460938 37.367188 26.527344 C 37.363281 26.589844 37.328125 26.648438 37.273438 26.679688 L 31.15625 30.042969 C 31.097656 30.070313 31.03125 30.070313 30.972656 30.039063 L 24.917969 26.707031 C 24.863281 26.679688 24.828125 26.621094 24.828125 26.558594 C 24.828125 26.527344 24.839844 26.496094 24.855469 26.46875 M 41.148438 26.542969 C 41.164063 26.515625 41.1875 26.492188 41.21875 26.476563 L 47.332031 23.117188 C 47.390625 23.082031 47.460938 23.082031 47.515625 23.117188 L 53.570313 26.449219 C 53.628906 26.476563 53.660156 26.535156 53.660156 26.601563 C 53.660156 26.664063 53.621094 26.722656 53.566406 26.753906 L 47.453125 30.117188 C 47.394531 30.144531 47.324219 30.144531 47.269531 30.113281 L 41.214844 26.78125 C 41.15625 26.753906 41.121094 26.695313 41.121094 26.632813 C 41.125 26.601563 41.132813 26.570313 41.148438 26.542969 M 32.949219 22.210938 C 32.964844 22.183594 32.988281 22.164063 33.019531 22.148438 L 39.203125 18.84375 C 39.257813 18.8125 39.332031 18.808594 39.390625 18.839844 L 45.511719 22.117188 C 45.566406 22.148438 45.601563 22.207031 45.601563 22.269531 C 45.597656 22.332031 45.5625 22.390625 45.507813 22.421875 L 39.324219 25.726563 C 39.265625 25.757813 39.195313 25.753906 39.136719 25.726563 L 33.015625 22.445313 C 32.957031 22.417969 32.921875 22.359375 32.921875 22.296875 C 32.921875 22.265625 32.933594 22.238281 32.949219 22.210938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 32.390625 60.433594 C 29.875 60.433594 27.628906 58.359375 25.988281 56.839844 C 25.519531 56.40625 25.074219 55.996094 24.78125 55.792969 C 23.703125 55.023438 21.589844 54.199219 19.511719 54.199219 L 17.589844 54.195313 C 16.433594 54.191406 15.496094 53.253906 15.496094 52.097656 L 15.496094 45.582031 C 15.496094 44.425781 16.4375 43.484375 17.59375 43.484375 L 20.730469 43.484375 L 20.886719 44.886719 L 20.886719 43.484375 C 21.789063 43.484375 23.191406 43.222656 24.433594 42.992188 C 25.429688 42.808594 26.367188 42.632813 27.148438 42.5625 C 27.488281 42.53125 27.835938 42.515625 28.183594 42.515625 C 29.175781 42.515625 32.519531 42.675781 33.96875 44.75 C 34.140625 44.988281 34.929688 45.933594 35.285156 46.226563 C 35.589844 46.46875 36.339844 46.726563 37.546875 46.726563 L 37.765625 46.726563 C 37.859375 46.722656 38.078125 46.703125 38.371094 46.675781 C 39.207031 46.601563 40.472656 46.492188 41.429688 46.492188 C 41.652344 46.492188 41.863281 46.5 42.042969 46.511719 C 43.875 46.648438 44.863281 47.894531 45.035156 49.070313 C 45.101563 49.519531 45.035156 50.132813 44.792969 50.699219 L 45.472656 50.367188 C 47.632813 49.304688 50.589844 47.855469 52.300781 47.277344 C 52.917969 47.066406 53.566406 46.953125 54.21875 46.949219 C 55.605469 46.949219 56.753906 47.523438 57.285156 48.484375 C 57.574219 49 57.925781 50.082031 57.058594 51.476563 C 56.605469 52.199219 55.890625 52.902344 55.089844 53.398438 C 53.566406 54.339844 52.039063 55.277344 50.507813 56.207031 C 49.859375 56.601563 49.191406 57.03125 48.539063 57.457031 C 46.285156 58.917969 44.847656 59.816406 43.765625 59.964844 C 43.273438 60.023438 42.78125 60.046875 42.289063 60.039063 C 41.8125 60.039063 41.277344 60.027344 40.742188 60.015625 C 40.226563 60 39.714844 59.992188 39.199219 59.988281 C 38.828125 59.988281 38.488281 59.996094 38.203125 60.019531 C 37.773438 60.050781 37.292969 60.097656 36.773438 60.152344 C 35.515625 60.277344 33.945313 60.433594 32.390625 60.433594 Z M 32.390625 60.433594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 52.609375 48.742188 C 50.230469 49.546875 45.019531 52.273438 43.824219 52.78125 C 42.421875 53.378906 39.628906 53.742188 36.515625 53.683594 C 34.792969 53.652344 33.5625 53.464844 32.871094 52.820313 C 32.871094 52.820313 30.40625 50.820313 29.90625 50.328125 C 29.0625 49.496094 30.152344 48.230469 31.003906 48.898438 C 31.628906 49.386719 32.679688 50.441406 33.699219 51.203125 C 34.71875 51.964844 38.3125 51.609375 39.800781 51.507813 C 41.515625 51.386719 42.484375 51.054688 42.867188 50.867188 C 43.421875 50.597656 43.5625 49.761719 43.511719 49.414063 C 43.4375 48.898438 42.964844 48.136719 41.800781 48.050781 C 40.636719 47.960938 38.046875 48.257813 37.664063 48.265625 C 35.871094 48.308594 34.808594 47.890625 34.273438 47.457031 C 33.734375 47.023438 32.8125 45.878906 32.683594 45.695313 C 31.78125 44.402344 29.277344 43.902344 27.136719 44.097656 C 25.355469 44.261719 22.328125 45.074219 20.59375 45.023438 L 17.457031 45.023438 C 17.070313 45.023438 16.757813 45.335938 16.757813 45.722656 L 16.757813 52.238281 C 16.757813 52.625 17.066406 52.9375 17.453125 52.9375 L 19.375 52.941406 C 21.648438 52.941406 24.042969 53.789063 25.453125 54.789063 C 26.863281 55.789063 29.59375 59.175781 32.25 59.175781 C 34.359375 59.175781 36.476563 58.871094 37.957031 58.761719 C 39.441406 58.648438 42.28125 58.878906 43.433594 58.71875 C 44.585938 58.5625 47.316406 56.566406 49.625 55.160156 C 51.035156 54.300781 52.613281 53.339844 54.214844 52.347656 C 54.851563 51.953125 55.40625 51.402344 55.730469 50.875 C 56.871094 49.039063 54.90625 47.964844 52.609375 48.742188 Z M 52.609375 48.742188 "/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureSoftwareAsAService(m).png b/dist/Integration/AzureSoftwareAsAService(m).png
new file mode 100644
index 00000000..d66973ff
Binary files /dev/null and b/dist/Integration/AzureSoftwareAsAService(m).png differ
diff --git a/dist/Integration/AzureSoftwareAsAService(m).svg b/dist/Integration/AzureSoftwareAsAService(m).svg
new file mode 100644
index 00000000..58ebadf9
--- /dev/null
+++ b/dist/Integration/AzureSoftwareAsAService(m).svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 21 46.199219 L 21 23.910156 C 21 22.304688 22.304688 21 23.910156 21 L 48.890625 21 C 50.492188 21 51.800781 22.304688 51.800781 23.910156 L 51.800781 46.199219 Z M 21 46.199219 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 48.890625 22.398438 L 39.199219 22.398438 L 22.398438 60.199219 L 22.398438 67.089844 C 22.398438 67.921875 23.078125 68.601563 23.910156 68.601563 L 48.890625 68.601563 C 49.722656 68.601563 50.398438 67.921875 50.398438 67.089844 L 50.398438 23.910156 C 50.398438 23.078125 49.722656 22.398438 48.890625 22.398438 Z M 48.890625 22.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 25.199219 26.601563 L 30.800781 26.601563 L 30.800781 33.601563 L 25.199219 33.601563 Z M 33.601563 26.601563 L 39.199219 26.601563 L 39.199219 33.601563 L 33.601563 33.601563 Z M 42 26.601563 L 47.601563 26.601563 L 47.601563 33.601563 L 42 33.601563 Z M 25.199219 37.800781 L 30.800781 37.800781 L 30.800781 44.800781 L 25.199219 44.800781 Z M 33.601563 37.800781 L 39.199219 37.800781 L 39.199219 44.800781 L 33.601563 44.800781 Z M 42 37.800781 L 47.601563 37.800781 L 47.601563 44.800781 L 42 44.800781 Z M 25.199219 49 L 30.800781 49 L 30.800781 56 L 25.199219 56 Z M 33.601563 49 L 39.199219 49 L 39.199219 56 L 33.601563 56 Z M 33.601563 60.199219 L 39.199219 60.199219 L 39.199219 68.601563 L 33.601563 68.601563 Z M 42 49 L 47.601563 49 L 47.601563 56 L 42 56 Z M 42 49 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.910156 21.285156 C 57.949219 20.808594 57.984375 20.328125 57.984375 19.835938 C 57.984375 9.695313 49.621094 1.46875 39.304688 1.46875 C 30.976563 1.46875 23.929688 6.832031 21.519531 14.230469 C 20.496094 14.03125 19.453125 13.925781 18.410156 13.917969 C 9.167969 13.917969 1.679688 21.128906 1.679688 30.023438 C 1.679688 38.917969 9.167969 46.128906 18.410156 46.128906 L 55.585938 46.128906 C 62.773438 46.128906 68.597656 40.519531 68.597656 33.601563 C 68.601563 27.449219 63.988281 22.34375 57.910156 21.285156 Z M 57.910156 21.285156 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 48.890625 22.398438 L 23.910156 22.398438 C 23.078125 22.398438 22.398438 23.078125 22.398438 23.910156 L 22.398438 67.089844 C 22.398438 67.921875 23.078125 68.601563 23.910156 68.601563 L 48.890625 68.601563 C 49.722656 68.601563 50.398438 67.921875 50.398438 67.089844 L 50.398438 23.910156 C 50.398438 23.078125 49.722656 22.398438 48.890625 22.398438 Z M 48.890625 22.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 25.199219 26.601563 L 30.800781 26.601563 L 30.800781 33.601563 L 25.199219 33.601563 Z M 33.601563 26.601563 L 39.199219 26.601563 L 39.199219 33.601563 L 33.601563 33.601563 Z M 42 26.601563 L 47.601563 26.601563 L 47.601563 33.601563 L 42 33.601563 Z M 25.199219 37.800781 L 30.800781 37.800781 L 30.800781 44.800781 L 25.199219 44.800781 Z M 33.601563 37.800781 L 39.199219 37.800781 L 39.199219 44.800781 L 33.601563 44.800781 Z M 42 37.800781 L 47.601563 37.800781 L 47.601563 44.800781 L 42 44.800781 Z M 25.199219 49 L 30.800781 49 L 30.800781 56 L 25.199219 56 Z M 33.601563 49 L 39.199219 49 L 39.199219 56 L 33.601563 56 Z M 33.601563 60.199219 L 39.199219 60.199219 L 39.199219 68.601563 L 33.601563 68.601563 Z M 42 49 L 47.601563 49 L 47.601563 56 L 42 56 Z M 42 49 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/Integration/AzureSoftwareAsAService.png b/dist/Integration/AzureSoftwareAsAService.png
new file mode 100644
index 00000000..de1eb499
Binary files /dev/null and b/dist/Integration/AzureSoftwareAsAService.png differ
diff --git a/dist/Integration/AzureSoftwareAsAService.puml b/dist/Integration/AzureSoftwareAsAService.puml
new file mode 100644
index 00000000..34cd0d00
--- /dev/null
+++ b/dist/Integration/AzureSoftwareAsAService.puml
@@ -0,0 +1,11 @@
+sprite $AzureSoftwareAsAService [70x70/16z] {
+xTQ5TYiX483XZ2Bp_kzx0xVjL9YmXAttFrBDTrQmouS5I4G8EmA9FYO4znciBvCx73SyNhqG7OSh26eKBY7x3EYjuA2Yjpk6q4JXdVlnO66Wx5sCpfjE6X6T
+H-4JNKbsZVYMHFSLqFLW1uada-meyHWJuJ1HxJ5CrW3XDrUN7bEMuPYHmQMKLvcNU7HRC9Wa-WgfvcKUpIVUK9oHiPAqLKfMrPIhMScjhWmcb8uLWjPLwr_L
+hFy2cp8OVh2joARY5uFx2crUYz_IkogChQlIloQp_WiQANfWr5LxNgJWHB6f8Zxi8gNE5VPrEr9ihg3FfE0TrJn_HxusH8hD55-hA5Jg0SMtj4YnkGB1sZjJ
+ugq0P5tnA_5mIObFCSYkzFMnLZEhFV-QUNwW1sn9wTceZ3qNmdWy-7lf4XGejgymjSnA_vhCf7tb9ILyHwSeVmgVeTISMcQrVorc_HTvJR6W9QMUejWPYjXJ
+LLjbI_5tzCMKFuLFKQ24IgNBU_KF
+}
+
+AzureEntityColoring(AzureSoftwareAsAService)
+!define AzureSoftwareAsAService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSoftwareAsAService, AzureSoftwareAsAService)
+!define AzureSoftwareAsAService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSoftwareAsAService, AzureSoftwareAsAService)
diff --git a/dist/Integration/AzureSoftwareAsAService.svg b/dist/Integration/AzureSoftwareAsAService.svg
new file mode 100644
index 00000000..f3be3dd5
--- /dev/null
+++ b/dist/Integration/AzureSoftwareAsAService.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21 46.199219 L 21 23.910156 C 21 22.304688 22.304688 21 23.910156 21 L 48.890625 21 C 50.492188 21 51.800781 22.304688 51.800781 23.910156 L 51.800781 46.199219 Z M 21 46.199219 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 48.890625 22.398438 L 39.199219 22.398438 L 22.398438 60.199219 L 22.398438 67.089844 C 22.398438 67.921875 23.078125 68.601563 23.910156 68.601563 L 48.890625 68.601563 C 49.722656 68.601563 50.398438 67.921875 50.398438 67.089844 L 50.398438 23.910156 C 50.398438 23.078125 49.722656 22.398438 48.890625 22.398438 Z M 48.890625 22.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 25.199219 26.601563 L 30.800781 26.601563 L 30.800781 33.601563 L 25.199219 33.601563 Z M 33.601563 26.601563 L 39.199219 26.601563 L 39.199219 33.601563 L 33.601563 33.601563 Z M 42 26.601563 L 47.601563 26.601563 L 47.601563 33.601563 L 42 33.601563 Z M 25.199219 37.800781 L 30.800781 37.800781 L 30.800781 44.800781 L 25.199219 44.800781 Z M 33.601563 37.800781 L 39.199219 37.800781 L 39.199219 44.800781 L 33.601563 44.800781 Z M 42 37.800781 L 47.601563 37.800781 L 47.601563 44.800781 L 42 44.800781 Z M 25.199219 49 L 30.800781 49 L 30.800781 56 L 25.199219 56 Z M 33.601563 49 L 39.199219 49 L 39.199219 56 L 33.601563 56 Z M 33.601563 60.199219 L 39.199219 60.199219 L 39.199219 68.601563 L 33.601563 68.601563 Z M 42 49 L 47.601563 49 L 47.601563 56 L 42 56 Z M 42 49 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.910156 21.285156 C 57.949219 20.808594 57.984375 20.328125 57.984375 19.835938 C 57.984375 9.695313 49.621094 1.46875 39.304688 1.46875 C 30.976563 1.46875 23.929688 6.832031 21.519531 14.230469 C 20.496094 14.03125 19.453125 13.925781 18.410156 13.917969 C 9.167969 13.917969 1.679688 21.128906 1.679688 30.023438 C 1.679688 38.917969 9.167969 46.128906 18.410156 46.128906 L 55.585938 46.128906 C 62.773438 46.128906 68.597656 40.519531 68.597656 33.601563 C 68.601563 27.449219 63.988281 22.34375 57.910156 21.285156 Z M 57.910156 21.285156 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 48.890625 22.398438 L 23.910156 22.398438 C 23.078125 22.398438 22.398438 23.078125 22.398438 23.910156 L 22.398438 67.089844 C 22.398438 67.921875 23.078125 68.601563 23.910156 68.601563 L 48.890625 68.601563 C 49.722656 68.601563 50.398438 67.921875 50.398438 67.089844 L 50.398438 23.910156 C 50.398438 23.078125 49.722656 22.398438 48.890625 22.398438 Z M 48.890625 22.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.199219 26.601563 L 30.800781 26.601563 L 30.800781 33.601563 L 25.199219 33.601563 Z M 33.601563 26.601563 L 39.199219 26.601563 L 39.199219 33.601563 L 33.601563 33.601563 Z M 42 26.601563 L 47.601563 26.601563 L 47.601563 33.601563 L 42 33.601563 Z M 25.199219 37.800781 L 30.800781 37.800781 L 30.800781 44.800781 L 25.199219 44.800781 Z M 33.601563 37.800781 L 39.199219 37.800781 L 39.199219 44.800781 L 33.601563 44.800781 Z M 42 37.800781 L 47.601563 37.800781 L 47.601563 44.800781 L 42 44.800781 Z M 25.199219 49 L 30.800781 49 L 30.800781 56 L 25.199219 56 Z M 33.601563 49 L 39.199219 49 L 39.199219 56 L 33.601563 56 Z M 33.601563 60.199219 L 39.199219 60.199219 L 39.199219 68.601563 L 33.601563 68.601563 Z M 42 49 L 47.601563 49 L 47.601563 56 L 42 56 Z M 42 49 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/Integration/all.puml b/dist/Integration/all.puml
index f79e7eaf..f0dd7f48 100644
--- a/dist/Integration/all.puml
+++ b/dist/Integration/all.puml
@@ -1,3 +1,30 @@
+sprite $AzureAPIforFHIR [70x70/16z] {
+lPG7biGg30HRA77_2symYvuyHau_r0iRHYuQt0F-2wZn3urGqVWNEbE81T9mW5Xjebmuo7PeAzQOh3m4iGyK2RO3kf30ZX0cQYle825Rq8wIMlCxtApMg5La
+oRGKOs8bYi1EB5f-4c47ilrAvPYTWW7zlVegCzif74tGyztV2JD_8tj7mpnLVXycFukeXOg8sWDaF1f2CY4CslrWIW1Ib_UqkudormTuww5KJ4stMLlS1pMx
+kHRBfpkAz9b5uxM7vruSpKDyA9xIhJYIBGIWk5hrlWK0bbq8Uq7xi50nStx5K7nUMunBJNuhNkmea7CDWm1qZ-YeLwil3jeitZsIotEDOhDO7nezMK_B_ZaD
+Y_JU_TTprWmkmhXWqFelRiRr6SewYxjZH05yQBmEeyktvDvx2ulsWNEaNaLfHqTN1DodfYgx9aboT4D40Nngf6gUikmKtaCI5eqmj9NPtGf24TCX0KKOcplq
+bSgd8KaWc6YVy3vRfWTfEp04vFi5h5-YVn815c4iMMjcPSq9gp1TRsZcizO56Ua1JuqIUnbap3ZsU9zu0u2spRP-n0WRx6F5H9hFFQ1Za9QEql29Pit7HbrL
+H-LvBkffBkD73SUtT3DQso_9o8G-i92aFSJAxBaoGSGFB2HTiATPZ2pHf76rFg1FH-owmFeHHu8zlwi76gzALL0qdrQTOk2PPdM12F1GunHHakIvfiN9Piav
+PFqJ4nOBAUCMEqsHx0PwUa7THhoG69xGrXf5ujqPvtDzloiZl83yS6U_Gjy7oJJBGTx3deAyXzGQ_X--0G
+}
+
+AzureEntityColoring(AzureAPIforFHIR)
+!define AzureAPIforFHIR(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAPIforFHIR, AzureAPIforFHIR)
+!define AzureAPIforFHIR(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAPIforFHIR, AzureAPIforFHIR)
+
+sprite $AzureAppConfiguration [70x70/16z] {
+xPY5aYj124Mns_t_NxmosnMOyA1uRdjAucSk4Xlw--1tli-WXWzCwHiHGyI-AP7XcQ_Fmq36Q8Be6rn8rZiyRuCo9yK1rCA6ckMq6a4lSUJR9H6ggDhWrmCw
+N8qLI9AoCv8SBLn5cKlg_WubVMCaINhiMop3zceZcLliQotSlu7M42lBwIrz74LfcQyUurij80TJYxrHxPwC9Vh6a-Rhtq1wyUKmF9L0Bx0Y6Au-Ga5rIOfU
+eWOlo4k2AUOMLRqyq0Uu7ASuTaijCUtmBD9Pe2ruMBYTZtPOsDxMWZwABw_MbZwCnVSZjnQqKOmUQ6UnTa9CZeqgCZnbmrAAJBfhAPqPtU120mkI74-OxXYo
+nKoTek6IlWMw6LjwfF8eQWlAkGbbE4WZJ07jBRQl3T1hXDziMNil8jbxCv6avyuj1tg7WuWSIOxISf2iuNfVY4t59Ljp-YHHIjY-0u2F9HoQMHskYrd0FjWv
+T0Lbn5_9wmXFbWgkD0X6r57g-L1egWkrWuiimM8-w7aOzLQGU5TwSfBKtHMoY4P42WllmyBoIHyDtpVsSOiIQePzXw-GmhwpeHby99cW4HQXEqKLpRj0AIF9
+KcTPwuf26VOTQLdNhabXeLaKOk1ZTS0_ulJ99wy
+}
+
+AzureEntityColoring(AzureAppConfiguration)
+!define AzureAppConfiguration(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppConfiguration, AzureAppConfiguration)
+!define AzureAppConfiguration(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppConfiguration, AzureAppConfiguration)
+
 sprite $AzureEventGrid [70x70/16z] {
 xTG7ikuW28PXFa0IPV_xlUEGlpULkTDEdWMyTdVtlEOhJYShyzfBHMZUZyfPQNvW-WqC2g7w0H868YXcLkWEbw0qphh8pBBjoWBJjDslTWko4CbM8j841xQm
 4c6w4kjuFHAWHP6BlCf7c96EGBjyf9E9IAalJ0F68_xgLab4VDE0yKXJUWODov70sc4z4i32b8k4fGX49HqHwv2ByEYV2_zYju1KPVZdHZqqTs_rqMO1D0hL
@@ -8,25 +35,113 @@ AzureEntityColoring(AzureEventGrid)
 !define AzureEventGrid(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureEventGrid, AzureEventGrid)
 !define AzureEventGrid(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureEventGrid, AzureEventGrid)
 
-sprite $AzureLogicApps [70x53/16z] {
-xPO73fqm342z4e_xtxV3IcjzyrC4TBTFY_aI3omWaMdkS0rnru5rJXwVk6o9pqnOeCTzIunrElBC9bo3z2K4gvqrK1OCdGg28F4qRlUS63Gg2e5a-vH7CU0D
-d7VAed248WfzOZ7vn7XgoQJZVqktsFZ4V6B1fvL-tdK5bqRXjWMGsI92cE2s9T68G80_oeBtBLGMgb6tiS0Ep5Vxm3eYtzfeZKaSlft_91Q93yRzo3I2I1Ww
-F9SXF1AVGky3Zf1yW0uEYuKJQirmXixyQWd3mqOJLqwdUYnc3ydJCkoOFruHb1jGfdbfsfEqGgEMUHSu8jwVp2rmR-E4jfKdZvYzNworpeBtxJhpfQGtR4-C
-xDjrH7YtZASMtbd48t55QD1KYt1LERFm_ZU1qf_C4ykC0djcYnEBHa5Gj5luYop_BRtIjorKJ-hPV-lU0gIMw83Ey2yIt5ZIVWec-w_HuGuIDT2y2dA56fXL
-5vUh7cJD5_6bBWRN697CrtE_Qkbhi_ezYmr8FW8
+sprite $AzureEventGridTopic [70x70/16z] {
+xTS7aeOm28PX890ekVzvjpcuJJyicVhx7E2rfKc1-tK-fD9Vhl9KoCxpjNB7ArVO3bQOcNP9duLspDyLra-oN-bUQPlOGabqKNOh7rm9qr3Rfgb_cPW0qM0T
+SWELeYll47ZBfCShRWVknM05lndMq7nRxzzVARyP-AKR9GGE5v9uhnaHOJ03tEWscPZ6Ci9YQcC-QzQm-g5agrB3ywak55Qo-LIFy6G-bHfQJu1Lo-hAUsxM
+4PNUQ8lMq605JqsfOUfOJ4ryCmHuVA8aOumhwTJa4hiIg8oOcdWQuLka0IGcOFu-L1djqvP7T26xbICBhmRRrc828gAXPXDmp3xTUCW-NGViqtCvj4yVF33W
+c-5jPJqm7Cam62-kbE9IYj0U0MzLsg9IHi2uhGDEyCShJuNdy_pvAtygLxm3
+}
+
+AzureEntityColoring(AzureEventGridTopic)
+!define AzureEventGridTopic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureEventGridTopic, AzureEventGridTopic)
+!define AzureEventGridTopic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureEventGridTopic, AzureEventGridTopic)
+
+sprite $AzureIntegrationAccount [70x70/16z] {
+xTRL0OKm04FHkks_xrCak7lk7tPmQBX8pAYveQB4t1wWA6o-eY4gLAZm-xAc8g76ZB6AYsNXXmJ8Z52eKA6YRTb_6mCfVkiMASP2lrKirBW1jbtngIp-xdI4
+x8zDa6meLAXGaID67XBYjwvFkKZi3G
+}
+
+AzureEntityColoring(AzureIntegrationAccount)
+!define AzureIntegrationAccount(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIntegrationAccount, AzureIntegrationAccount)
+!define AzureIntegrationAccount(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIntegrationAccount, AzureIntegrationAccount)
+
+sprite $AzureIntegrationServiceEnvironment [70x70/16z] {
+lPZfWfiw34Q3TeltVzyR48aT939ZRjlpgvtbp2Tvp-CVi03I4yJbhW7PV7tZJMbQXUfhfl64QE5G5BZ2BoKo5kBUcZ_fNxBVUCXV0cE4DyZQtdcMdugnrqyI
+950EaUDN2VhXGAYXmwDV9EpXW2ySdRVBgYI64-4xCGdQXKPJ45GxK8OEHUJbCedJAF7EfxrTfU4a0VKH6B5TKu-E8umq7w6aIIErU2H95iQDi6GDVLei9DaI
+qxsmmDORXr52crXWohBtm4RBzeK6SnRWKqqIdPspH6lyCuh2j0Lz3CER4sfBiutQ0ZfE6e_M9in74Eem61ACA1dnWGO5rgUUvgxaC8sWWFggt7i49SZSdYWJ
+r4H_Kq49Uy9mXKP9CK9sqn8blPOGtxH4ISlH5eGhSBC8ND9Yh9VroRL4ROFWYhsInmE-D1VP3eI-jnSlB2GQ0fMNYH4I4XOgBM8l583xVx2oM5XQqT8W3bhi
+KYuihROS1gP1J58schl5J_u8aOX8PKMOBT6D2aurNLfmp9rhbMgabsGXCqEeqR2aMHShuBQb7Lj3sso3WsMVOGGPfCr2U5gDaBOwqHUI7CMtC7Q6quGXxPpJ
+Q8TFGtGiQYmiN4K9vDpSQ8pCMNGyIk1zgBLxbbX5_Ux2jop-BYX6gTsno7X9X7LJJbiYYdpUfEOj6b5UX7HYliYkZIYdQn3zC7Vvz0TQHEai_PwAn3i42P8W
+lgVvaebh7wUQybPdrVtT9YHUFWKiD5CIU2HQ53KXeKTcyU9rLADhxspIx6cSuGVm-Bb2qJLh8_Y6-DhBAT7y-AoVZGr-yPfsA_DWv4XlpmJOUl6YHh5m5DNK
+SG9lfYB28cgjVrLIa19gwoMko_G79_S_EWaMEelS61utM92tZhIu43t-Ely1
+}
+
+AzureEntityColoring(AzureIntegrationServiceEnvironment)
+!define AzureIntegrationServiceEnvironment(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIntegrationServiceEnvironment, AzureIntegrationServiceEnvironment)
+!define AzureIntegrationServiceEnvironment(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIntegrationServiceEnvironment, AzureIntegrationServiceEnvironment)
+
+sprite $AzureLogicApps [70x70/16z] {
+xTQ7hkem381XRtUy__lUI2VoLMtAtkJJ1kU7xa8t30FYpRCePdP-nioaJfFPXPM6yZ-nQoe6Ms8DGu4T56oDm8QQcTR6l7PpxKZzCuV_Ygt18QF35O9iMiDy
+KsNYPhgruj3ug3pW6FaQfkihlApTmjTN04MdHWNXgag8sU-le3Nr4xoYWljtdFADxFOrRQ4nP4XYdH12afT9tIl86e58AMFDoFw_5ekLhKvHDDdVMj8qm7yh
+cF3_nl5VcLD4QNVlcfaY5AXvocJ_g67i-qnZAg-fPnt5RsIycMhWiHLYSLScA8ZLNHZFg8Xt2ebvnoShw27z6_Pmia8U63R40xwoCYgGPhjDt-1aXRqJ2EdF
+qCbAWzGWL4ZnpNw5uIArKjzKJzDQOMi4uMnuy15ptHiyvlOr5OA2zRAACdoyOVW7
 }
 
 AzureEntityColoring(AzureLogicApps)
 !define AzureLogicApps(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureLogicApps, AzureLogicApps)
 !define AzureLogicApps(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureLogicApps, AzureLogicApps)
 
+sprite $AzureLogicAppsCustomConnector [70x70/16z] {
+xTH54iCm40NHCTFzpnjEVbaPjq6RmFJQzIosQsNdPrlxSoMKK4899HGhdhMNwkAH7UsccFfg9PHGGYdRQqKs8YO34PE7C5CrRcz8XqpRkQL8FnB3Yf1fGeOL
+8SYm8WGPLeGWmueGP5WHWWmhGbnctf8Yn6FIEZyXpB1IjxS6H-ctArQ9GOGLgyKuI5NEQfSKZSP1Dk-q64HOIHX4M17322jY044bOG0X9MK0GKLC_klzF7w0
+w9iqCrKHihrAI1OZ98iHaiKSGiu
+}
+
+AzureEntityColoring(AzureLogicAppsCustomConnector)
+!define AzureLogicAppsCustomConnector(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureLogicAppsCustomConnector, AzureLogicAppsCustomConnector)
+!define AzureLogicAppsCustomConnector(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureLogicAppsCustomConnector, AzureLogicAppsCustomConnector)
+
+sprite $AzureSendGridAccount [54x70/16z] xSot0SD05CDG_ijX_ttjLbGS0Ay7z1aGnLGJkf26sIP_hQYeg78psmoJlbPKL5Ib7xLkYWdz-Rit8_UregAYKeJEW1y
+
+AzureEntityColoring(AzureSendGridAccount)
+!define AzureSendGridAccount(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSendGridAccount, AzureSendGridAccount)
+!define AzureSendGridAccount(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSendGridAccount, AzureSendGridAccount)
+
 sprite $AzureServiceBus [70x70/16z] {
-xTZLWGCn34LHiotrt-_IMme9mg3x4vmpZ9FF4F4nHT6exjgkKfExh2YX43CgoT-laXkgwOXAGoKzUvDioKeXjbIJc_4Z6Oo6P5cP1Oo2B5bP14P1M54OZ8Ae
-2XW5qHKm8g8h4WF4eaXCnH-C2XW1KPM3312N0cONSIcx312d0YR_CeIrurN0f86tCmCvGi4HeFRUCeuOVWNDWg_pOEHM4CtH1p6Vfg2xLq899HjBTrn1fo7h
-b2lLJcYTSjMSo7Xz54hB_eYZw6OFfju1
+xTO53iCm38LX9tRSAhd_USVyfBtYqBzWAtrbwDe2rTec54LkuwkWc8oFAA5S_kWS9TknAOWaMFXNip8iShnyK2gS6OyWim1YYJDwcErPnOyCGPmfHuOWL446
+4QuWWmXNa464AyWWmXLa4E4ACeXm1Hb4k88C8bm11f1nYgVBaYLV_evMF8j8LjC4KyOeVhbtrNs2SgcOgi9Ogf0-L0abb3Gm-VMwTgmc6P_snxewvwkvRvVM
+K48PNnJLHPGj
 }
 
 AzureEntityColoring(AzureServiceBus)
 !define AzureServiceBus(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceBus, AzureServiceBus)
 !define AzureServiceBus(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceBus, AzureServiceBus)
 
+sprite $AzureServiceBusRelay [70x70/16z] {
+xTM73fmm30PWnmlY__sVjojNXLEAfRYxvTEuYUE5EF4312eU3xTzM0ZjUw9ystfJC-qBl3GPxeAmVYBjvaSRb5AiBq9rh1DLDPtgsOXUKP6-uN91L_BNHgdt
+fJwZ-hxKTzUeZ4_JmQDHLKSS-baFd5Ha08ulxqu0IYKjW6ZpBPMC16PQJWKAN9hHWM3Q5s_N2O1Esno0qNICptiuWBxsUdjL05dxjBNsCbPbcLcepETAGdmu
+Oqc_HJ_y2skKCl_gM7VLfpIC-cHBgNv1zvfVyPhAf7agaoMfPCduk-m8vxyYYcLHnATqrfADeIL792MrB5D9zt-IR9kCCfAj5L-2v7ZaRKoqQdgJvX53Ptff
+BDpepjkFV0mUU57QvvX-VfGdIlHzWV_C8_0ZV0G
+}
+
+AzureEntityColoring(AzureServiceBusRelay)
+!define AzureServiceBusRelay(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceBusRelay, AzureServiceBusRelay)
+!define AzureServiceBusRelay(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceBusRelay, AzureServiceBusRelay)
+
+sprite $AzureServiceCatalogManagedApplicationDefinition [70x70/16z] {
+pTU7SlGg30LWr2X7x_--Tr1-OiUmP7QvxQHDynTM5YtzlqFyLbP2Rlvc9eOhil1RoK-52Wgdzq9FHL7v_HB-L0oVX7yeHDa_o0z5JFLOOQEKZXNZhrQpCqKY
+bCg9KX6nb0-KA_LO4RFgnyfvlv2Q7IjaolIBWbyLrVwhrlRQiAJj5yKeHQYzD7eCMwMsslEYNv3fclVRUHIHjQBfYcsK4S4y3gbU-NizzQO5x_PBeMutn5yg
+3es_hnHYdfHh30fape2DCRUbegOoAPAkb36myS124LsjKksReGoKCPGncFKgbOWKzxfYV2G3CdMgwIWoya8nxU5qhrkYBqU_DIfzV5GwIhDI5giK_lpJDepn
+gX5lR5QkjBio2f3lcwS7-bgHd9i_bQGEXrqJ02vVthRhPgMN9yggtUEXR5UfMVdw7CrQJCkDGYP4JuM64bKThJmKdXMLkIuE6qgFnTGU2cKiLwdv7HM7Neeu
+NOe1PLQmwfTe3bae2Y-qgekkUZUw1PC2RxBfkiSy6XsIXp8cWNxIBmxxLZ9yrtN4l52OILrwUKBf1T6DeYRoL2hYZsilJyrkCIzvKhQh56en4Stmqfj_h5eR
+nVYs1o1EpNIhLuxVbjAb66Obt_UZbXufdYc92zDGrgjthX5RArSNjQWBr_skHcrMnjwfAWeazXPUnLg9CyDJ8UHqHJpU979_hcsxhZtMq7BVXH1D62cJmcgs
+LgXwxMKbujYXcuv7C9yPXAQnJBNrOOocMAvIuunPQs-uUy4Q76Z5-BuNp0hFvrrOUXc3BvIsF7itMXlSrlr2wti0P8NapIbeUIU1JeRWWxDtULvnj-Sw5bag
+ZcAMIss8x4_mgiB79tZHFtVO8yL63-D4AJaYPtSrgn7zK7bq9-5zHM1tGclzeBhI0ZcyyS7IkHB8kJAU_Wi
+}
+
+AzureEntityColoring(AzureServiceCatalogManagedApplicationDefinition)
+!define AzureServiceCatalogManagedApplicationDefinition(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceCatalogManagedApplicationDefinition, AzureServiceCatalogManagedApplicationDefinition)
+!define AzureServiceCatalogManagedApplicationDefinition(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceCatalogManagedApplicationDefinition, AzureServiceCatalogManagedApplicationDefinition)
+
+sprite $AzureSoftwareAsAService [70x70/16z] {
+xTQ5TYiX483XZ2Bp_kzx0xVjL9YmXAttFrBDTrQmouS5I4G8EmA9FYO4znciBvCx73SyNhqG7OSh26eKBY7x3EYjuA2Yjpk6q4JXdVlnO66Wx5sCpfjE6X6T
+H-4JNKbsZVYMHFSLqFLW1uada-meyHWJuJ1HxJ5CrW3XDrUN7bEMuPYHmQMKLvcNU7HRC9Wa-WgfvcKUpIVUK9oHiPAqLKfMrPIhMScjhWmcb8uLWjPLwr_L
+hFy2cp8OVh2joARY5uFx2crUYz_IkogChQlIloQp_WiQANfWr5LxNgJWHB6f8Zxi8gNE5VPrEr9ihg3FfE0TrJn_HxusH8hD55-hA5Jg0SMtj4YnkGB1sZjJ
+ugq0P5tnA_5mIObFCSYkzFMnLZEhFV-QUNwW1sn9wTceZ3qNmdWy-7lf4XGejgymjSnA_vhCf7tb9ILyHwSeVmgVeTISMcQrVorc_HTvJR6W9QMUejWPYjXJ
+LLjbI_5tzCMKFuLFKQ24IgNBU_KF
+}
+
+AzureEntityColoring(AzureSoftwareAsAService)
+!define AzureSoftwareAsAService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSoftwareAsAService, AzureSoftwareAsAService)
+!define AzureSoftwareAsAService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSoftwareAsAService, AzureSoftwareAsAService)
+
diff --git a/dist/InternetOfThings/AzureDeviceProvisioningServices(m).png b/dist/InternetOfThings/AzureDeviceProvisioningServices(m).png
new file mode 100644
index 00000000..7a4aa2b2
Binary files /dev/null and b/dist/InternetOfThings/AzureDeviceProvisioningServices(m).png differ
diff --git a/dist/InternetOfThings/AzureDeviceProvisioningServices(m).svg b/dist/InternetOfThings/AzureDeviceProvisioningServices(m).svg
new file mode 100644
index 00000000..2396672d
--- /dev/null
+++ b/dist/InternetOfThings/AzureDeviceProvisioningServices(m).svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="67pt" height="70pt" viewBox="0 0 67 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 31.679688 14.113281 C 31.679688 16.914063 29.414063 19.183594 26.617188 19.183594 C 23.824219 19.183594 21.558594 16.914063 21.558594 14.113281 C 21.558594 11.308594 23.824219 9.039063 26.617188 9.039063 C 29.414063 9.039063 31.679688 11.308594 31.679688 14.113281 Z M 31.679688 14.113281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 44.207031 30.445313 C 44.207031 33.785156 41.507813 36.492188 38.175781 36.492188 C 34.84375 36.492188 32.144531 33.785156 32.144531 30.445313 C 32.144531 27.105469 34.84375 24.398438 38.175781 24.398438 C 41.507813 24.398438 44.207031 27.105469 44.207031 30.445313 Z M 44.207031 30.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 52.992188 48.421875 C 52.992188 51.03125 50.882813 53.148438 48.277344 53.148438 C 45.671875 53.148438 43.558594 51.03125 43.558594 48.421875 C 43.558594 45.8125 45.671875 43.695313 48.277344 43.695313 C 50.882813 43.695313 52.992188 45.8125 52.992188 48.421875 Z M 52.992188 48.421875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 33.621094 45.15625 C 33.621094 47.40625 31.800781 49.234375 29.554688 49.234375 C 27.304688 49.234375 25.484375 47.40625 25.484375 45.15625 C 25.484375 42.902344 27.304688 41.078125 29.554688 41.078125 C 31.800781 41.078125 33.621094 42.902344 33.621094 45.15625 Z M 33.621094 45.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 17.144531 32.738281 C 17.144531 34.988281 15.324219 36.816406 13.074219 36.816406 C 10.828125 36.816406 9.007813 34.988281 9.007813 32.738281 C 9.007813 30.484375 10.828125 28.660156 13.074219 28.660156 C 15.324219 28.660156 17.144531 30.484375 17.144531 32.738281 Z M 17.144531 32.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 24.632813 14.511719 L 27.628906 12.398438 L 39.757813 29.695313 L 36.761719 31.804688 Z M 24.632813 14.511719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 36.21875 30.695313 L 39.398438 28.871094 L 50.121094 47.640625 L 46.941406 49.464844 Z M 36.21875 30.695313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 12.382813 30.636719 L 38.285156 28.480469 L 38.585938 32.140625 L 12.683594 34.296875 Z M 12.382813 30.636719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 27.421875 44.441406 L 36.710938 28.992188 L 39.847656 30.890625 L 30.558594 46.339844 Z M 27.421875 44.441406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 12.386719 17.90625 C 12.386719 20.59375 10.214844 22.773438 7.53125 22.773438 C 4.847656 22.773438 2.671875 20.59375 2.671875 17.90625 C 2.671875 15.214844 4.847656 13.035156 7.53125 13.035156 C 10.214844 13.035156 12.386719 15.214844 12.386719 17.90625 Z M 12.386719 17.90625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 64.207031 17.90625 C 64.207031 20.59375 62.03125 22.773438 59.347656 22.773438 C 56.664063 22.773438 54.492188 20.59375 54.492188 17.90625 C 54.492188 15.214844 56.664063 13.035156 59.347656 13.035156 C 62.03125 13.035156 64.207031 15.214844 64.207031 17.90625 Z M 64.207031 17.90625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 39.59375 64.167969 C 39.59375 66.855469 37.417969 69.035156 34.734375 69.035156 C 32.050781 69.035156 29.875 66.855469 29.875 64.167969 C 29.875 61.476563 32.050781 59.296875 34.734375 59.296875 C 37.417969 59.296875 39.59375 61.476563 39.59375 64.167969 Z M 39.59375 64.167969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 12.851563 13.625 C 18.054688 8.167969 25.382813 4.777344 33.5 4.777344 C 41.578125 4.777344 48.882813 8.144531 54.085938 13.5625 C 54.996094 12.449219 56.273438 11.617188 57.710938 11.25 C 57.386719 10.886719 57.042969 10.519531 56.675781 10.175781 C 53.660156 7.152344 50.160156 4.796875 46.253906 3.136719 C 42.203125 1.410156 37.914063 0.558594 33.480469 0.558594 C 29.046875 0.558594 24.753906 1.429688 20.707031 3.136719 C 16.800781 4.796875 13.296875 7.152344 10.28125 10.175781 C 9.917969 10.539063 9.574219 10.90625 9.230469 11.269531 C 10.707031 11.65625 11.941406 12.488281 12.851563 13.625 Z M 64.429688 22.492188 C 63.457031 23.566406 62.164063 24.316406 60.683594 24.621094 C 61.574219 27.402344 62.0625 30.34375 62.0625 33.425781 C 62.0625 46.695313 53.054688 57.855469 40.828125 61.101563 C 41.292969 62.035156 41.554688 63.070313 41.554688 64.1875 C 41.554688 64.574219 41.515625 64.957031 41.453125 65.324219 C 43.09375 64.917969 44.695313 64.371094 46.253906 63.71875 C 50.160156 62.054688 53.660156 59.703125 56.675781 56.679688 C 59.691406 53.65625 62.039063 50.144531 63.699219 46.230469 C 65.421875 42.171875 66.269531 37.871094 66.269531 33.425781 C 66.269531 29.652344 65.664063 25.980469 64.429688 22.492188 Z M 28.398438 61.589844 C 15.058594 59.175781 4.9375 47.488281 4.9375 33.40625 C 4.9375 30.34375 5.425781 27.402344 6.316406 24.621094 C 4.835938 24.359375 3.542969 23.605469 2.550781 22.574219 C 1.335938 26.042969 0.730469 29.675781 0.730469 33.40625 C 0.730469 37.851563 1.597656 42.152344 3.300781 46.210938 C 4.960938 50.125 7.308594 53.636719 10.324219 56.660156 C 13.339844 59.683594 16.839844 62.035156 20.746094 63.699219 C 23.117188 64.714844 25.585938 65.425781 28.117188 65.832031 C 27.972656 65.304688 27.914063 64.734375 27.914063 64.167969 C 27.894531 63.253906 28.074219 62.382813 28.398438 61.589844 Z M 28.398438 61.589844 "/>
+</g>
+</svg>
diff --git a/dist/InternetOfThings/AzureDeviceProvisioningServices.png b/dist/InternetOfThings/AzureDeviceProvisioningServices.png
new file mode 100644
index 00000000..783d52a5
Binary files /dev/null and b/dist/InternetOfThings/AzureDeviceProvisioningServices.png differ
diff --git a/dist/InternetOfThings/AzureDeviceProvisioningServices.puml b/dist/InternetOfThings/AzureDeviceProvisioningServices.puml
new file mode 100644
index 00000000..5bd6d376
--- /dev/null
+++ b/dist/InternetOfThings/AzureDeviceProvisioningServices.puml
@@ -0,0 +1,14 @@
+sprite $AzureDeviceProvisioningServices [67x70/16z] {
+fPY7bgum28GfYPIy__FUfdEy7c6pvJlrDph0W8cxz16YEiPGPVeEF2noWGmRNzFX6UjDp4-hgA-6DFwoG4PuP7v9XEs-UGZZgaw7Jaxwa97NVOUyqxDhCOHw
+ZajWK0aVYVKEtsOAaQDPFXjv-JKzlDAIwwvE0Jb2BhYjrgjcnb-5oodqnMlFs-REH5HPGAb0yzsKuU63IA4y5gYj5IO-8am8E986Su63QYGHuL6u4T051jNa
+er36psG2WKjKWagHkXRUQKAr6sF4Q2KmGSjt4bKXW4KIPcmAAUm42jsDdLLJWU7ohgaOhO9efmkZnVz2uPucM0fruE5S0P7Q-j0nfDizlFNiDMG1umgxPz_z
+Pyj7tHSzNJ_s4gKdVheTz_mmbsO0AnVjJ4Omqw44DHbZ7kPvIsGvf4xyTv49mv9sc4UkajfF4iZxwkYpaAT46JaJbwk-dILK4XbkDiTGuN_r0Tr9s1MAYyOX
+YOq49vhVpGKrNZ2i9hPCasfwt0olRD4Hp0MeEXzNCidDQi2e0gnY4Clfn9nNF1yiTWuyU_HlAjA_XxbwKs59_pqo7pMz6h8OKkrtLpxi3m8uUWC5MLd4Gw9m
+BR3LZ7hdcw-3-Ppr68ywX63ARFUQ-Pfrx75sLsRDTdAYxHS1GYEXsPnvKHoazexiRpTGUaYnZJeXy77xKZTbJ7qR38bunZLK-242YOcKvdC68Dc3NIdm6HGl
+-uDs_9juntQOyWxWj8FF0vgZQc90OmiKh7ubWccFP1DEiFtk60ZMQinjMw3GbhX2jodqfh5VqoTq8oe4D8hFXABnZqr10Xyu-1CQFriaS7RvbFj47SIUgpWo
+IsOkmEGG97hazrcH94weALabq3FiV8jaWKd7IjCl__k2U06beVHrcFxpujlS7Va-c8iV8LiJVWC
+}
+
+AzureEntityColoring(AzureDeviceProvisioningServices)
+!define AzureDeviceProvisioningServices(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDeviceProvisioningServices, AzureDeviceProvisioningServices)
+!define AzureDeviceProvisioningServices(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDeviceProvisioningServices, AzureDeviceProvisioningServices)
diff --git a/dist/InternetOfThings/AzureDeviceProvisioningServices.svg b/dist/InternetOfThings/AzureDeviceProvisioningServices.svg
new file mode 100644
index 00000000..c2d59008
--- /dev/null
+++ b/dist/InternetOfThings/AzureDeviceProvisioningServices.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="67pt" height="70pt" viewBox="0 0 67 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 31.679688 14.113281 C 31.679688 16.914063 29.414063 19.183594 26.617188 19.183594 C 23.824219 19.183594 21.558594 16.914063 21.558594 14.113281 C 21.558594 11.308594 23.824219 9.039063 26.617188 9.039063 C 29.414063 9.039063 31.679688 11.308594 31.679688 14.113281 Z M 31.679688 14.113281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 44.207031 30.445313 C 44.207031 33.785156 41.507813 36.492188 38.175781 36.492188 C 34.84375 36.492188 32.144531 33.785156 32.144531 30.445313 C 32.144531 27.105469 34.84375 24.398438 38.175781 24.398438 C 41.507813 24.398438 44.207031 27.105469 44.207031 30.445313 Z M 44.207031 30.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 52.992188 48.421875 C 52.992188 51.03125 50.882813 53.148438 48.277344 53.148438 C 45.671875 53.148438 43.558594 51.03125 43.558594 48.421875 C 43.558594 45.8125 45.671875 43.695313 48.277344 43.695313 C 50.882813 43.695313 52.992188 45.8125 52.992188 48.421875 Z M 52.992188 48.421875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.621094 45.15625 C 33.621094 47.40625 31.800781 49.234375 29.554688 49.234375 C 27.304688 49.234375 25.484375 47.40625 25.484375 45.15625 C 25.484375 42.902344 27.304688 41.078125 29.554688 41.078125 C 31.800781 41.078125 33.621094 42.902344 33.621094 45.15625 Z M 33.621094 45.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 17.144531 32.738281 C 17.144531 34.988281 15.324219 36.816406 13.074219 36.816406 C 10.828125 36.816406 9.007813 34.988281 9.007813 32.738281 C 9.007813 30.484375 10.828125 28.660156 13.074219 28.660156 C 15.324219 28.660156 17.144531 30.484375 17.144531 32.738281 Z M 17.144531 32.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 24.632813 14.511719 L 27.628906 12.398438 L 39.757813 29.695313 L 36.761719 31.804688 Z M 24.632813 14.511719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 36.21875 30.695313 L 39.398438 28.871094 L 50.121094 47.640625 L 46.941406 49.464844 Z M 36.21875 30.695313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 12.382813 30.636719 L 38.285156 28.480469 L 38.585938 32.140625 L 12.683594 34.296875 Z M 12.382813 30.636719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 27.421875 44.441406 L 36.710938 28.992188 L 39.847656 30.890625 L 30.558594 46.339844 Z M 27.421875 44.441406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 12.386719 17.90625 C 12.386719 20.59375 10.214844 22.773438 7.53125 22.773438 C 4.847656 22.773438 2.671875 20.59375 2.671875 17.90625 C 2.671875 15.214844 4.847656 13.035156 7.53125 13.035156 C 10.214844 13.035156 12.386719 15.214844 12.386719 17.90625 Z M 12.386719 17.90625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 64.207031 17.90625 C 64.207031 20.59375 62.03125 22.773438 59.347656 22.773438 C 56.664063 22.773438 54.492188 20.59375 54.492188 17.90625 C 54.492188 15.214844 56.664063 13.035156 59.347656 13.035156 C 62.03125 13.035156 64.207031 15.214844 64.207031 17.90625 Z M 64.207031 17.90625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 39.59375 64.167969 C 39.59375 66.855469 37.417969 69.035156 34.734375 69.035156 C 32.050781 69.035156 29.875 66.855469 29.875 64.167969 C 29.875 61.476563 32.050781 59.296875 34.734375 59.296875 C 37.417969 59.296875 39.59375 61.476563 39.59375 64.167969 Z M 39.59375 64.167969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 12.851563 13.625 C 18.054688 8.167969 25.382813 4.777344 33.5 4.777344 C 41.578125 4.777344 48.882813 8.144531 54.085938 13.5625 C 54.996094 12.449219 56.273438 11.617188 57.710938 11.25 C 57.386719 10.886719 57.042969 10.519531 56.675781 10.175781 C 53.660156 7.152344 50.160156 4.796875 46.253906 3.136719 C 42.203125 1.410156 37.914063 0.558594 33.480469 0.558594 C 29.046875 0.558594 24.753906 1.429688 20.707031 3.136719 C 16.800781 4.796875 13.296875 7.152344 10.28125 10.175781 C 9.917969 10.539063 9.574219 10.90625 9.230469 11.269531 C 10.707031 11.65625 11.941406 12.488281 12.851563 13.625 Z M 64.429688 22.492188 C 63.457031 23.566406 62.164063 24.316406 60.683594 24.621094 C 61.574219 27.402344 62.0625 30.34375 62.0625 33.425781 C 62.0625 46.695313 53.054688 57.855469 40.828125 61.101563 C 41.292969 62.035156 41.554688 63.070313 41.554688 64.1875 C 41.554688 64.574219 41.515625 64.957031 41.453125 65.324219 C 43.09375 64.917969 44.695313 64.371094 46.253906 63.71875 C 50.160156 62.054688 53.660156 59.703125 56.675781 56.679688 C 59.691406 53.65625 62.039063 50.144531 63.699219 46.230469 C 65.421875 42.171875 66.269531 37.871094 66.269531 33.425781 C 66.269531 29.652344 65.664063 25.980469 64.429688 22.492188 Z M 28.398438 61.589844 C 15.058594 59.175781 4.9375 47.488281 4.9375 33.40625 C 4.9375 30.34375 5.425781 27.402344 6.316406 24.621094 C 4.835938 24.359375 3.542969 23.605469 2.550781 22.574219 C 1.335938 26.042969 0.730469 29.675781 0.730469 33.40625 C 0.730469 37.851563 1.597656 42.152344 3.300781 46.210938 C 4.960938 50.125 7.308594 53.636719 10.324219 56.660156 C 13.339844 59.683594 16.839844 62.035156 20.746094 63.699219 C 23.117188 64.714844 25.585938 65.425781 28.117188 65.832031 C 27.972656 65.304688 27.914063 64.734375 27.914063 64.167969 C 27.894531 63.253906 28.074219 62.382813 28.398438 61.589844 Z M 28.398438 61.589844 "/>
+</g>
+</svg>
diff --git a/dist/InternetOfThings/AzureDigitalTwins(m).png b/dist/InternetOfThings/AzureDigitalTwins(m).png
index 911b030c..3eaa1fa3 100644
Binary files a/dist/InternetOfThings/AzureDigitalTwins(m).png and b/dist/InternetOfThings/AzureDigitalTwins(m).png differ
diff --git a/dist/InternetOfThings/AzureDigitalTwins(m).svg b/dist/InternetOfThings/AzureDigitalTwins(m).svg
index 6ae7e990..106bf0b4 100644
--- a/dist/InternetOfThings/AzureDigitalTwins(m).svg
+++ b/dist/InternetOfThings/AzureDigitalTwins(m).svg
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="63pt" height="70pt" viewBox="0 0 63 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="63" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="63" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 4.0625 4.058594 L 35.222656 4.058594 L 35.222656 46.058594 L 4.0625 46.058594 Z M 4.0625 4.058594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.261719 4.058594 L 39.421875 4.058594 L 39.421875 46.058594 L 8.261719 46.058594 Z M 8.261719 4.058594 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="63" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip2">
-  <rect x="0" y="0" width="63" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 27.796875 15.398438 L 39.199219 15.398438 L 39.199219 12.601563 L 27.796875 12.601563 C 27.171875 10.269531 25.0625 8.539063 22.539063 8.539063 C 19.527344 8.539063 17.078125 10.988281 17.078125 14 C 17.078125 16.472656 18.742188 18.542969 21 19.210938 L 21 32.585938 C 18.742188 33.257813 17.078125 35.328125 17.078125 37.800781 C 17.078125 40.273438 18.742188 42.34375 21 43.011719 L 21 50.398438 L 23.78125 50.398438 L 23.78125 43.105469 C 25.734375 42.640625 27.277344 41.140625 27.796875 39.199219 L 39.199219 39.199219 L 39.199219 36.398438 L 27.796875 36.398438 C 27.277344 34.457031 25.734375 32.957031 23.78125 32.496094 L 23.78125 19.304688 C 25.734375 18.839844 27.277344 17.339844 27.796875 15.398438 Z M 27.796875 15.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 31.996094 15.398438 L 43.398438 15.398438 L 43.398438 12.601563 L 31.996094 12.601563 C 31.371094 10.269531 29.265625 8.539063 26.738281 8.539063 C 23.730469 8.539063 21.28125 10.988281 21.28125 14 C 21.28125 16.472656 22.941406 18.542969 25.203125 19.210938 L 25.203125 32.585938 C 22.941406 33.257813 21.28125 35.328125 21.28125 37.800781 C 21.28125 40.273438 22.941406 42.34375 25.203125 43.011719 L 25.199219 50.398438 L 27.980469 50.398438 L 27.980469 43.105469 C 29.9375 42.644531 31.476563 41.136719 31.996094 39.199219 L 43.398438 39.199219 L 43.398438 36.398438 L 31.996094 36.398438 C 31.480469 34.464844 29.9375 32.953125 27.980469 32.496094 L 27.980469 19.304688 C 29.9375 18.84375 31.476563 17.335938 31.996094 15.398438 Z M 31.996094 15.398438 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 39.199219 0 L 0 0 L 0 50.398438 L 39.199219 50.398438 Z M 39.199219 0 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 21 12.601563 L 21 64.398438 L 57.261719 64.398438 L 57.398438 12.601563 Z M 54.480469 15.398438 L 54.480469 36.398438 L 23.78125 36.398438 L 23.78125 15.398438 Z M 23.78125 61.601563 L 23.78125 39.199219 L 54.480469 39.199219 L 54.480469 61.601563 Z M 23.78125 61.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 29.261719 63 C 29.261719 66.789063 26.1875 69.859375 22.398438 69.859375 C 18.609375 69.859375 15.539063 66.789063 15.539063 63 C 15.539063 59.210938 18.609375 56.140625 22.398438 56.140625 C 26.1875 56.140625 29.261719 59.210938 29.261719 63 Z M 29.261719 63 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.398438 65.660156 C 20.933594 65.660156 19.738281 64.464844 19.738281 63 C 19.738281 61.535156 20.933594 60.339844 22.398438 60.339844 C 23.867188 60.339844 25.058594 61.53125 25.058594 63 C 25.058594 64.46875 23.867188 65.660156 22.398438 65.660156 Z M 22.398438 65.660156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 62.859375 63 C 62.859375 66.789063 59.789063 69.859375 56 69.859375 C 52.210938 69.859375 49.140625 66.789063 49.140625 63 C 49.140625 59.210938 52.210938 56.140625 56 56.140625 C 59.789063 56.140625 62.859375 59.210938 62.859375 63 Z M 62.859375 63 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56 65.660156 C 54.53125 65.660156 53.339844 64.464844 53.339844 63 C 53.339844 61.535156 54.535156 60.339844 56 60.339844 C 57.464844 60.339844 58.660156 61.53125 58.660156 63 C 58.660156 64.46875 57.46875 65.660156 56 65.660156 Z M 56 65.660156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 62.859375 14 C 62.859375 17.789063 59.789063 20.859375 56 20.859375 C 52.210938 20.859375 49.140625 17.789063 49.140625 14 C 49.140625 10.210938 52.210938 7.140625 56 7.140625 C 59.789063 7.140625 62.859375 10.210938 62.859375 14 Z M 62.859375 14 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 58.660156 14 C 58.660156 15.46875 57.46875 16.660156 56 16.660156 C 54.53125 16.660156 53.339844 15.46875 53.339844 14 C 53.339844 12.53125 54.53125 11.339844 56 11.339844 C 57.46875 11.339844 58.660156 12.53125 58.660156 14 Z M 58.660156 14 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 62.859375 37.800781 C 62.859375 41.589844 59.789063 44.660156 56 44.660156 C 52.210938 44.660156 49.140625 41.589844 49.140625 37.800781 C 49.140625 34.011719 52.210938 30.941406 56 30.941406 C 59.789063 30.941406 62.859375 34.011719 62.859375 37.800781 Z M 62.859375 37.800781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 58.660156 37.800781 C 58.660156 39.269531 57.46875 40.460938 56 40.460938 C 54.53125 40.460938 53.339844 39.269531 53.339844 37.800781 C 53.339844 36.332031 54.53125 35.140625 56 35.140625 C 57.46875 35.140625 58.660156 36.332031 58.660156 37.800781 Z M 58.660156 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 43.398438 0 L 4.199219 0 L 4.199219 50.398438 L 43.398438 50.398438 Z M 43.398438 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 25.199219 12.601563 L 25.199219 64.398438 L 61.460938 64.398438 L 61.601563 12.601563 Z M 58.679688 15.398438 L 58.679688 36.398438 L 27.980469 36.398438 L 27.980469 15.398438 Z M 27.980469 61.601563 L 27.980469 39.199219 L 58.679688 39.199219 L 58.679688 61.601563 Z M 27.980469 61.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 33.460938 63 C 33.460938 66.789063 30.390625 69.859375 26.601563 69.859375 C 22.8125 69.859375 19.738281 66.789063 19.738281 63 C 19.738281 59.210938 22.8125 56.140625 26.601563 56.140625 C 30.390625 56.140625 33.460938 59.210938 33.460938 63 Z M 33.460938 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.601563 65.660156 C 25.132813 65.660156 23.941406 64.464844 23.941406 63 C 23.941406 61.535156 25.132813 60.339844 26.601563 60.339844 C 28.066406 60.339844 29.261719 61.53125 29.261719 63 C 29.261719 64.46875 28.066406 65.660156 26.601563 65.660156 Z M 26.601563 65.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 67.058594 63 C 67.058594 66.789063 63.988281 69.859375 60.199219 69.859375 C 56.410156 69.859375 53.339844 66.789063 53.339844 63 C 53.339844 59.210938 56.410156 56.140625 60.199219 56.140625 C 63.988281 56.140625 67.058594 59.210938 67.058594 63 Z M 67.058594 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.199219 65.660156 C 58.734375 65.660156 57.539063 64.464844 57.539063 63 C 57.539063 61.535156 58.734375 60.339844 60.199219 60.339844 C 61.664063 60.339844 62.859375 61.53125 62.859375 63 C 62.859375 64.46875 61.667969 65.660156 60.199219 65.660156 Z M 60.199219 65.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 67.058594 14 C 67.058594 17.789063 63.988281 20.859375 60.199219 20.859375 C 56.410156 20.859375 53.339844 17.789063 53.339844 14 C 53.339844 10.210938 56.410156 7.140625 60.199219 7.140625 C 63.988281 7.140625 67.058594 10.210938 67.058594 14 Z M 67.058594 14 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 62.859375 14 C 62.859375 15.46875 61.667969 16.660156 60.199219 16.660156 C 58.730469 16.660156 57.539063 15.46875 57.539063 14 C 57.539063 12.53125 58.730469 11.339844 60.199219 11.339844 C 61.667969 11.339844 62.859375 12.53125 62.859375 14 Z M 62.859375 14 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 67.058594 37.800781 C 67.058594 41.589844 63.988281 44.660156 60.199219 44.660156 C 56.410156 44.660156 53.339844 41.589844 53.339844 37.800781 C 53.339844 34.011719 56.410156 30.941406 60.199219 30.941406 C 63.988281 30.941406 67.058594 34.011719 67.058594 37.800781 Z M 67.058594 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 62.859375 37.800781 C 62.859375 39.269531 61.667969 40.460938 60.199219 40.460938 C 58.730469 40.460938 57.539063 39.269531 57.539063 37.800781 C 57.539063 36.332031 58.730469 35.140625 60.199219 35.140625 C 61.667969 35.140625 62.859375 36.332031 62.859375 37.800781 Z M 62.859375 37.800781 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
 </g>
diff --git a/dist/InternetOfThings/AzureDigitalTwins.png b/dist/InternetOfThings/AzureDigitalTwins.png
index 37549547..7c418f6b 100644
Binary files a/dist/InternetOfThings/AzureDigitalTwins.png and b/dist/InternetOfThings/AzureDigitalTwins.png differ
diff --git a/dist/InternetOfThings/AzureDigitalTwins.puml b/dist/InternetOfThings/AzureDigitalTwins.puml
index 01df1e13..ac7dd6b9 100644
--- a/dist/InternetOfThings/AzureDigitalTwins.puml
+++ b/dist/InternetOfThings/AzureDigitalTwins.puml
@@ -1,9 +1,9 @@
-sprite $AzureDigitalTwins [63x70/16z] {
-xPS7Zkmm241j2E2IV__h_bGYhS6xq-kRFkZXZfBwDuB3o-kfJ_bDboxFfWCH3T7LKqeTFR8iaAtdEfCz7JJ0czxqLNr3Pr66Lazr9vawoWJZ83EnqOlg9Q_K
-YG5tU1jrb0bizDhmRw8gCW5XOfXxVwfUbZxRkjzvKjOfcs2py_cNgHiM7u3jgTFcYxDmSa3MjYbdRnjT-fB4qzNdQEkYFMzr7JzZ26VgGMg5y1ZzgySFrL5I
-8l3qrDVXaNLU3kZCEa-8V5ATL_Ow7nvGv_lwvPrFVwdp17YhEf_lK-Vf_2CZYU1A1xRyP1p7Sb3xkhLHndhmlBeerjGfbkvIguGUNzq3SfROrtD6JsQP8J_1
-83Di9a3PyNm-BkSRG1JsR0Nj89D6dVp4rcOCSTV8RduBn2qD62DdpLDgYrfaZ1xtAXuCtRWTC4R6EiHae9F2XXwt9GVMRbYB3lhPpem2bXxbW7jHylUSdpzQ
-jks37sOCBi1wAFu3
+sprite $AzureDigitalTwins [70x70/16z] {
+xPS7cW8n28Kb3LAy_t6tFMLROEpzMQFuXmpjS_KXwJk9LwOUbrB5LTsHmgvkd19ppf4MA2BYKI93oQCWR4qiIbBBP5CqzZAdX1-sqQHeZhGvfV27Slpog5WK
+wQeAjS-tSQi47pO-aK6f_Q_6UhtM1OpLgN0IIjplH5d56nS8RuwvkZ4WQSmOrOL8HplIapEPMPVLChiLqF2PLG598KiKyQgHFZafh0wdGAqtlBahoeloeb0I
+baJ7KT9fvr6-YNcKma7pAAbkTXw5OquKz4IdkBfyoaWVdtN7Ly3nrSY9Jj0Pwj_EqFvgZF5pkHjbbcS_b_T5oGoPLnTA9iKMzqwkmU6K5uMurkXRr2haMo3u
+nUPGWKLm8CN8aKcRiZTIY6L4p2hhL15D3AoP0RAzm28xhXJGvixGzjV9SKR_hkJ9RDB9yCDqAjqWQHzNwLGhwdPqVO6Dp8HzV5yolYEyMliKscJ4KZB0yOcI
+qtPKUJ4RocGR6nFSxCQvR4NCSrgmA0cBTm
 }
 
 AzureEntityColoring(AzureDigitalTwins)
diff --git a/dist/InternetOfThings/AzureDigitalTwins.svg b/dist/InternetOfThings/AzureDigitalTwins.svg
index 8b77e48e..3fd371f0 100644
--- a/dist/InternetOfThings/AzureDigitalTwins.svg
+++ b/dist/InternetOfThings/AzureDigitalTwins.svg
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="63pt" height="70pt" viewBox="0 0 63 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="63" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="63" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 4.0625 4.058594 L 35.222656 4.058594 L 35.222656 46.058594 L 4.0625 46.058594 Z M 4.0625 4.058594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.261719 4.058594 L 39.421875 4.058594 L 39.421875 46.058594 L 8.261719 46.058594 Z M 8.261719 4.058594 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="63" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip2">
-  <rect x="0" y="0" width="63" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,9.411765%,56.078431%);fill-opacity:1;" d="M 27.796875 15.398438 L 39.199219 15.398438 L 39.199219 12.601563 L 27.796875 12.601563 C 27.171875 10.269531 25.0625 8.539063 22.539063 8.539063 C 19.527344 8.539063 17.078125 10.988281 17.078125 14 C 17.078125 16.472656 18.742188 18.542969 21 19.210938 L 21 32.585938 C 18.742188 33.257813 17.078125 35.328125 17.078125 37.800781 C 17.078125 40.273438 18.742188 42.34375 21 43.011719 L 21 50.398438 L 23.78125 50.398438 L 23.78125 43.105469 C 25.734375 42.640625 27.277344 41.140625 27.796875 39.199219 L 39.199219 39.199219 L 39.199219 36.398438 L 27.796875 36.398438 C 27.277344 34.457031 25.734375 32.957031 23.78125 32.496094 L 23.78125 19.304688 C 25.734375 18.839844 27.277344 17.339844 27.796875 15.398438 Z M 27.796875 15.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,9.411765%,56.078431%);fill-opacity:1;" d="M 31.996094 15.398438 L 43.398438 15.398438 L 43.398438 12.601563 L 31.996094 12.601563 C 31.371094 10.269531 29.265625 8.539063 26.738281 8.539063 C 23.730469 8.539063 21.28125 10.988281 21.28125 14 C 21.28125 16.472656 22.941406 18.542969 25.203125 19.210938 L 25.203125 32.585938 C 22.941406 33.257813 21.28125 35.328125 21.28125 37.800781 C 21.28125 40.273438 22.941406 42.34375 25.203125 43.011719 L 25.199219 50.398438 L 27.980469 50.398438 L 27.980469 43.105469 C 29.9375 42.644531 31.476563 41.136719 31.996094 39.199219 L 43.398438 39.199219 L 43.398438 36.398438 L 31.996094 36.398438 C 31.480469 34.464844 29.9375 32.953125 27.980469 32.496094 L 27.980469 19.304688 C 29.9375 18.84375 31.476563 17.335938 31.996094 15.398438 Z M 31.996094 15.398438 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 39.199219 0 L 0 0 L 0 50.398438 L 39.199219 50.398438 Z M 39.199219 0 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 21 12.601563 L 21 64.398438 L 57.261719 64.398438 L 57.398438 12.601563 Z M 54.480469 15.398438 L 54.480469 36.398438 L 23.78125 36.398438 L 23.78125 15.398438 Z M 23.78125 61.601563 L 23.78125 39.199219 L 54.480469 39.199219 L 54.480469 61.601563 Z M 23.78125 61.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 29.261719 63 C 29.261719 66.789063 26.1875 69.859375 22.398438 69.859375 C 18.609375 69.859375 15.539063 66.789063 15.539063 63 C 15.539063 59.210938 18.609375 56.140625 22.398438 56.140625 C 26.1875 56.140625 29.261719 59.210938 29.261719 63 Z M 29.261719 63 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.398438 65.660156 C 20.933594 65.660156 19.738281 64.464844 19.738281 63 C 19.738281 61.535156 20.933594 60.339844 22.398438 60.339844 C 23.867188 60.339844 25.058594 61.53125 25.058594 63 C 25.058594 64.46875 23.867188 65.660156 22.398438 65.660156 Z M 22.398438 65.660156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 62.859375 63 C 62.859375 66.789063 59.789063 69.859375 56 69.859375 C 52.210938 69.859375 49.140625 66.789063 49.140625 63 C 49.140625 59.210938 52.210938 56.140625 56 56.140625 C 59.789063 56.140625 62.859375 59.210938 62.859375 63 Z M 62.859375 63 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56 65.660156 C 54.53125 65.660156 53.339844 64.464844 53.339844 63 C 53.339844 61.535156 54.535156 60.339844 56 60.339844 C 57.464844 60.339844 58.660156 61.53125 58.660156 63 C 58.660156 64.46875 57.46875 65.660156 56 65.660156 Z M 56 65.660156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 62.859375 14 C 62.859375 17.789063 59.789063 20.859375 56 20.859375 C 52.210938 20.859375 49.140625 17.789063 49.140625 14 C 49.140625 10.210938 52.210938 7.140625 56 7.140625 C 59.789063 7.140625 62.859375 10.210938 62.859375 14 Z M 62.859375 14 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 58.660156 14 C 58.660156 15.46875 57.46875 16.660156 56 16.660156 C 54.53125 16.660156 53.339844 15.46875 53.339844 14 C 53.339844 12.53125 54.53125 11.339844 56 11.339844 C 57.46875 11.339844 58.660156 12.53125 58.660156 14 Z M 58.660156 14 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 62.859375 37.800781 C 62.859375 41.589844 59.789063 44.660156 56 44.660156 C 52.210938 44.660156 49.140625 41.589844 49.140625 37.800781 C 49.140625 34.011719 52.210938 30.941406 56 30.941406 C 59.789063 30.941406 62.859375 34.011719 62.859375 37.800781 Z M 62.859375 37.800781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 58.660156 37.800781 C 58.660156 39.269531 57.46875 40.460938 56 40.460938 C 54.53125 40.460938 53.339844 39.269531 53.339844 37.800781 C 53.339844 36.332031 54.53125 35.140625 56 35.140625 C 57.46875 35.140625 58.660156 36.332031 58.660156 37.800781 Z M 58.660156 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 43.398438 0 L 4.199219 0 L 4.199219 50.398438 L 43.398438 50.398438 Z M 43.398438 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 25.199219 12.601563 L 25.199219 64.398438 L 61.460938 64.398438 L 61.601563 12.601563 Z M 58.679688 15.398438 L 58.679688 36.398438 L 27.980469 36.398438 L 27.980469 15.398438 Z M 27.980469 61.601563 L 27.980469 39.199219 L 58.679688 39.199219 L 58.679688 61.601563 Z M 27.980469 61.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 33.460938 63 C 33.460938 66.789063 30.390625 69.859375 26.601563 69.859375 C 22.8125 69.859375 19.738281 66.789063 19.738281 63 C 19.738281 59.210938 22.8125 56.140625 26.601563 56.140625 C 30.390625 56.140625 33.460938 59.210938 33.460938 63 Z M 33.460938 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.601563 65.660156 C 25.132813 65.660156 23.941406 64.464844 23.941406 63 C 23.941406 61.535156 25.132813 60.339844 26.601563 60.339844 C 28.066406 60.339844 29.261719 61.53125 29.261719 63 C 29.261719 64.46875 28.066406 65.660156 26.601563 65.660156 Z M 26.601563 65.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 67.058594 63 C 67.058594 66.789063 63.988281 69.859375 60.199219 69.859375 C 56.410156 69.859375 53.339844 66.789063 53.339844 63 C 53.339844 59.210938 56.410156 56.140625 60.199219 56.140625 C 63.988281 56.140625 67.058594 59.210938 67.058594 63 Z M 67.058594 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.199219 65.660156 C 58.734375 65.660156 57.539063 64.464844 57.539063 63 C 57.539063 61.535156 58.734375 60.339844 60.199219 60.339844 C 61.664063 60.339844 62.859375 61.53125 62.859375 63 C 62.859375 64.46875 61.667969 65.660156 60.199219 65.660156 Z M 60.199219 65.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 67.058594 14 C 67.058594 17.789063 63.988281 20.859375 60.199219 20.859375 C 56.410156 20.859375 53.339844 17.789063 53.339844 14 C 53.339844 10.210938 56.410156 7.140625 60.199219 7.140625 C 63.988281 7.140625 67.058594 10.210938 67.058594 14 Z M 67.058594 14 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 62.859375 14 C 62.859375 15.46875 61.667969 16.660156 60.199219 16.660156 C 58.730469 16.660156 57.539063 15.46875 57.539063 14 C 57.539063 12.53125 58.730469 11.339844 60.199219 11.339844 C 61.667969 11.339844 62.859375 12.53125 62.859375 14 Z M 62.859375 14 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 67.058594 37.800781 C 67.058594 41.589844 63.988281 44.660156 60.199219 44.660156 C 56.410156 44.660156 53.339844 41.589844 53.339844 37.800781 C 53.339844 34.011719 56.410156 30.941406 60.199219 30.941406 C 63.988281 30.941406 67.058594 34.011719 67.058594 37.800781 Z M 67.058594 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 62.859375 37.800781 C 62.859375 39.269531 61.667969 40.460938 60.199219 40.460938 C 58.730469 40.460938 57.539063 39.269531 57.539063 37.800781 C 57.539063 36.332031 58.730469 35.140625 60.199219 35.140625 C 61.667969 35.140625 62.859375 36.332031 62.859375 37.800781 Z M 62.859375 37.800781 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
 </g>
diff --git a/dist/InternetOfThings/AzureIoTCentral(m).png b/dist/InternetOfThings/AzureIoTCentral(m).png
index e8d1cb3f..efec6944 100644
Binary files a/dist/InternetOfThings/AzureIoTCentral(m).png and b/dist/InternetOfThings/AzureIoTCentral(m).png differ
diff --git a/dist/InternetOfThings/AzureIoTCentral(m).svg b/dist/InternetOfThings/AzureIoTCentral(m).svg
index c2752e69..fbd1880a 100644
--- a/dist/InternetOfThings/AzureIoTCentral(m).svg
+++ b/dist/InternetOfThings/AzureIoTCentral(m).svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="61pt" height="70pt" viewBox="0 0 61 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 43.570313 26.644531 L 30.492188 18.957031 L 17.429688 26.605469 L 17.429688 43.308594 L 30.5 51.042969 L 43.570313 43.359375 Z M 43.570313 26.644531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 29.277344 L 14.523438 37.609375 L 14.523438 30.890625 L 5.808594 25.890625 L 5.808594 20.820313 L 30.496094 6.714844 L 55.191406 20.886719 L 55.191406 49.113281 L 30.5 63.28125 L 0 45.78125 L 0 52.5 L 30.5 70 L 61 52.5 L 61 17.5 L 30.5 0 L 0 17.429688 Z M 0 29.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 35 51.003906 L 47.972656 43.21875 L 47.972656 26.78125 L 35 18.996094 L 22.027344 26.78125 L 22.027344 43.21875 Z M 35 51.003906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 35 0.402344 L 4.726563 17.703125 L 4.726563 29.382813 L 18.996094 37.601563 L 18.996094 31.105469 L 10.347656 25.917969 L 10.347656 21.15625 L 35 6.890625 L 59.652344 21.160156 L 59.652344 48.84375 L 35 63.109375 L 4.726563 45.8125 L 4.726563 52.296875 L 35 69.597656 L 65.273438 52.296875 L 65.273438 17.699219 Z M 35 0.402344 "/>
 </g>
 </svg>
diff --git a/dist/InternetOfThings/AzureIoTCentral.png b/dist/InternetOfThings/AzureIoTCentral.png
index c593675a..eb297213 100644
Binary files a/dist/InternetOfThings/AzureIoTCentral.png and b/dist/InternetOfThings/AzureIoTCentral.png differ
diff --git a/dist/InternetOfThings/AzureIoTCentral.puml b/dist/InternetOfThings/AzureIoTCentral.puml
index 151bc14a..98087141 100644
--- a/dist/InternetOfThings/AzureIoTCentral.puml
+++ b/dist/InternetOfThings/AzureIoTCentral.puml
@@ -1,8 +1,9 @@
-sprite $AzureIoTCentral [61x70/16z] {
-xPP7hW0n24FJs_tl-tkpnF14rj_hUCGB6N3oL5TFbohhdBFhZJMFywbLmjwspuz63bdhFd-rUn1MjMe4zbD_2fWv1hkR534YiDtuc0jhbTa5dM6rkNbww5IV
-eWDixDC52rFq0h0Y2vrX7JQ0HNG7bllfz9zU4i3MrHnqWJKhN0NQTfPvm9iZVydTqdRtpN0fguBPH98sWbahLlKdynbIiQrTnMpskPydJJNhfSJDyhQZPc7i
-GRF-PZrc5iweMMPOr2mluzByYNvlJddScZ_HQz2i2fl_pVNHFDYSykH1ecOSOjqQW3F3Hh1F3NVLJ3_-3LXosmkUc2NQVbnLMUQpVMJWadJHFI1jP3WOP427
-Y5cMXSvXg2PUv1mnku5EUTfccPbX0waO8wQYDu25L5m3GV_vN7TW0HrWlRlfou4bT805TCpJq3Q01VIHBjGTM5QP0FiA
+sprite $AzureIoTCentral [70x70/16z] {
+rPS7ZaCX30L3R_S_x_P2qF0VybUBLNQJe04FfZra-FYu7IxtqS9DIEpZCwgxmGXj_4JFLeQlOugUh4AUmg8d_JF-_olEA6IqwCgmwF5riU4Rw55288NOZ_Mi
+xQjdKTMT2-bBvOCUBIHVTv6441oqqADRw9xqQ7NM_DEcG7M76MRtS7cql_P-AdT9M6Uzh1GMaZ15tvZIjwrxvZabIiAHNsLAb7YzfjmX1LE7uX0KdWQOG471
+P0QdnPGMblA4w4bHvisvZLruGPcwCb7Sl2SOAB2yYZDGO5CrKA36d8qobuYTCkzMTiginq31JTL0WKY6EO9u0SfhK_8EqfoYyAg27LnGnCPRtUNkdSHP34S0
+K9OMb5RF9wTQzPmM9iEKwR37j7Ye6S-0dZYjxPK1AFi-tKuPdoIeHqrVMhTAq2ElTO7fh8VBiTDj1VI8wwv-ZR0GyN0JUjGbN-lHhnwjHp-FplLaAKJhqKAq
+7g-5w0Tr5GLvfaSBqNgq4At7A8IhHrU8rgE5wCW7EzSx
 }
 
 AzureEntityColoring(AzureIoTCentral)
diff --git a/dist/InternetOfThings/AzureIoTCentral.svg b/dist/InternetOfThings/AzureIoTCentral.svg
index c2752e69..a179ef9b 100644
--- a/dist/InternetOfThings/AzureIoTCentral.svg
+++ b/dist/InternetOfThings/AzureIoTCentral.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="61pt" height="70pt" viewBox="0 0 61 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 43.570313 26.644531 L 30.492188 18.957031 L 17.429688 26.605469 L 17.429688 43.308594 L 30.5 51.042969 L 43.570313 43.359375 Z M 43.570313 26.644531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 29.277344 L 14.523438 37.609375 L 14.523438 30.890625 L 5.808594 25.890625 L 5.808594 20.820313 L 30.496094 6.714844 L 55.191406 20.886719 L 55.191406 49.113281 L 30.5 63.28125 L 0 45.78125 L 0 52.5 L 30.5 70 L 61 52.5 L 61 17.5 L 30.5 0 L 0 17.429688 Z M 0 29.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 35 51.003906 L 47.972656 43.21875 L 47.972656 26.78125 L 35 18.996094 L 22.027344 26.78125 L 22.027344 43.21875 Z M 35 51.003906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 35 0.402344 L 4.726563 17.703125 L 4.726563 29.382813 L 18.996094 37.601563 L 18.996094 31.105469 L 10.347656 25.917969 L 10.347656 21.15625 L 35 6.890625 L 59.652344 21.160156 L 59.652344 48.84375 L 35 63.109375 L 4.726563 45.8125 L 4.726563 52.296875 L 35 69.597656 L 65.273438 52.296875 L 65.273438 17.699219 Z M 35 0.402344 "/>
 </g>
 </svg>
diff --git a/dist/InternetOfThings/AzureIoTEdge(m).png b/dist/InternetOfThings/AzureIoTEdge(m).png
index 35372381..dc2e0843 100644
Binary files a/dist/InternetOfThings/AzureIoTEdge(m).png and b/dist/InternetOfThings/AzureIoTEdge(m).png differ
diff --git a/dist/InternetOfThings/AzureIoTEdge(m).svg b/dist/InternetOfThings/AzureIoTEdge(m).svg
index 4000fb54..6bebdcfd 100644
--- a/dist/InternetOfThings/AzureIoTEdge(m).svg
+++ b/dist/InternetOfThings/AzureIoTEdge(m).svg
@@ -4,36 +4,38 @@
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
+<image id="image9" width="67" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEMAAABGCAYAAACXBynAAAAABmJLR0QA/wD/AP+gvaeTAAAAnUlEQVR4nO3QMQ4BUQBF0T8i9EqFFShtwuZZhE3QGO0tNZMJOad+xcud5tf9PKbLfvyt4zztHrdvlpulr/wSMUKMECPECDFCjBAjxAgxQowQI8QIMUKMECPECDFCjBAjxAgxQowQI8QIMUKMECPECDFCjBAjxAgxQowQI8QIMUKMECO2Y74+xzi81z6ynNM8xmPtEwAAAAAAAAB/6wM/ngum25KWXgAAAABJRU5ErkJggg=="/>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="67" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+<use xlink:href="#image9"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="67" height="70"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 4.640625 40.308594 C 4.640625 34.617188 8.414063 29.800781 13.625 27.90625 C 13.304688 26.867188 13.132813 25.722656 13.132813 24.582031 C 13.132813 18.171875 18.503906 13.019531 25.191406 13.019531 C 28.683594 13.019531 31.832031 14.398438 34.042969 16.667969 C 36.53125 10.863281 42.472656 6.769531 49.425781 6.769531 C 52.210938 6.769531 54.835938 7.429688 57.144531 8.589844 C 54.570313 3.503906 49.136719 0 42.847656 0 C 36.21875 0 30.554688 3.90625 28.175781 9.4375 C 26.070313 7.273438 23.070313 5.960938 19.734375 5.960938 C 13.359375 5.960938 8.238281 10.871094 8.238281 16.984375 C 8.238281 18.074219 8.402344 19.164063 8.707031 20.15625 C 3.738281 21.960938 0.140625 26.554688 0.140625 31.984375 C 0.140625 35.820313 1.910156 39.261719 4.707031 41.589844 C 4.664063 41.167969 4.640625 40.742188 4.640625 40.308594 Z M 4.640625 40.308594 "/>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 4.625 40.539063 C 4.625 34.816406 8.390625 29.972656 13.585938 28.066406 C 13.265625 27.023438 13.09375 25.871094 13.09375 24.722656 C 13.09375 18.277344 18.449219 13.09375 25.117188 13.09375 C 28.597656 13.09375 31.738281 14.480469 33.941406 16.765625 C 36.421875 10.925781 42.347656 6.808594 49.277344 6.808594 C 52.054688 6.808594 54.671875 7.472656 56.972656 8.640625 C 54.40625 3.523438 48.992188 0 42.71875 0 C 36.109375 0 30.464844 3.929688 28.09375 9.492188 C 25.992188 7.316406 23 5.996094 19.675781 5.996094 C 13.320313 5.996094 8.214844 10.933594 8.214844 17.082031 C 8.214844 18.179688 8.378906 19.273438 8.679688 20.273438 C 3.726563 22.085938 0.140625 26.707031 0.140625 32.167969 C 0.140625 36.027344 1.90625 39.488281 4.691406 41.828125 C 4.648438 41.40625 4.625 40.976563 4.625 40.539063 Z M 4.625 40.539063 "/>
 </g>
+<image id="image17" width="67" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEMAAABGCAYAAACXBynAAAAABmJLR0QA/wD/AP+gvaeTAAAA10lEQVR4nO3bMUpDURBA0YlJbSsiFtZuxd7VCB/cjftwMYKVlZWxvWWKJ1E5p37MDLd/MwAAwJnsVgw5vuz383BzvWLWcm+v77u7289Tnh6WLLzf9nPYrpbMWu3y8WNmTopx8cOn/ClihBghRogRYoQYIUaIEWKEGCFGiBFihBghRogRYoQYIUaIEWKEGCFGiBFihBghRogRYoQYIUaIEWKEGCFGiBFihBghRogRYoQYIUaIEWKEGCFGiBFihBghRogRS75yzswct+dfGXa3PX2d+wb4R74BJtoOCSNjGVsAAAAASUVORK5CYII="/>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="67" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+<use xlink:href="#image17"/>
   </g>
 </mask>
 <clipPath id="clip2">
   <rect x="0" y="0" width="67" height="70"/>
 </clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 56.4375 34.996094 C 55.652344 32.980469 53.746094 31.675781 51.589844 31.675781 C 50.941406 31.675781 50.304688 31.796875 49.695313 32.035156 C 49.527344 32.101563 49.382813 32.195313 49.226563 32.277344 L 44.078125 27.3125 C 44.457031 26.402344 44.667969 25.40625 44.667969 24.359375 C 44.667969 20.113281 41.222656 16.660156 36.988281 16.660156 C 34.941406 16.660156 33.082031 17.472656 31.703125 18.789063 L 28.910156 17.042969 C 28.976563 16.253906 28.886719 15.453125 28.589844 14.695313 C 27.804688 12.679688 25.902344 11.378906 23.742188 11.378906 C 23.09375 11.378906 22.457031 11.5 21.847656 11.738281 C 19.175781 12.785156 17.855469 15.820313 18.898438 18.5 C 19.683594 20.511719 21.589844 21.816406 23.746094 21.816406 C 24.394531 21.816406 25.035156 21.695313 25.640625 21.457031 C 26.058594 21.292969 26.429688 21.066406 26.785156 20.8125 L 29.539063 22.53125 C 29.394531 23.121094 29.3125 23.730469 29.3125 24.359375 C 29.3125 25.195313 29.449219 26 29.699219 26.753906 L 24.316406 30.148438 C 23.652344 29.761719 22.890625 29.535156 22.082031 29.535156 C 21.527344 29.535156 20.984375 29.636719 20.464844 29.84375 C 18.183594 30.738281 17.054688 33.328125 17.945313 35.613281 C 18.617188 37.335938 20.242188 38.445313 22.082031 38.445313 C 22.636719 38.445313 23.183594 38.34375 23.703125 38.136719 C 25.488281 37.4375 26.546875 35.695313 26.503906 33.875 L 32.140625 30.320313 C 32.839844 30.890625 33.640625 31.335938 34.507813 31.636719 L 30.871094 53.394531 C 28.355469 54.21875 26.519531 56.566406 26.519531 59.359375 C 26.519531 62.832031 29.339844 65.660156 32.800781 65.660156 C 36.265625 65.660156 39.082031 62.832031 39.082031 59.359375 C 39.082031 56.683594 37.402344 54.402344 35.046875 53.492188 L 38.671875 31.867188 C 39.648438 31.648438 40.558594 31.242188 41.359375 30.683594 L 46.539063 35.683594 C 46.300781 36.6875 46.34375 37.769531 46.746094 38.796875 C 47.53125 40.8125 49.4375 42.113281 51.59375 42.117188 C 52.242188 42.117188 52.878906 41.996094 53.488281 41.757813 C 56.160156 40.707031 57.480469 37.675781 56.4375 34.996094 Z M 56.4375 34.996094 "/>
+<g id="surface16" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 56.269531 35.195313 C 55.488281 33.171875 53.585938 31.859375 51.4375 31.859375 C 50.789063 31.859375 50.15625 31.980469 49.546875 32.21875 C 49.378906 32.285156 49.234375 32.378906 49.078125 32.460938 L 43.945313 27.46875 C 44.324219 26.554688 44.535156 25.550781 44.535156 24.5 C 44.535156 20.230469 41.101563 16.757813 36.878906 16.757813 C 34.835938 16.757813 32.984375 17.574219 31.609375 18.898438 L 28.824219 17.140625 C 28.890625 16.347656 28.800781 15.542969 28.503906 14.78125 C 27.722656 12.753906 25.824219 11.445313 23.671875 11.445313 C 23.023438 11.445313 22.390625 11.566406 21.78125 11.804688 C 19.117188 12.859375 17.800781 15.910156 18.84375 18.605469 C 19.625 20.628906 21.527344 21.941406 23.675781 21.941406 C 24.320313 21.941406 24.960938 21.820313 25.5625 21.582031 C 25.980469 21.414063 26.351563 21.1875 26.707031 20.933594 L 29.449219 22.660156 C 29.308594 23.253906 29.226563 23.867188 29.226563 24.5 C 29.226563 25.339844 29.363281 26.148438 29.609375 26.90625 L 24.242188 30.320313 C 23.582031 29.933594 22.824219 29.703125 22.015625 29.703125 C 21.464844 29.703125 20.921875 29.808594 20.402344 30.015625 C 18.128906 30.914063 17.003906 33.519531 17.890625 35.816406 C 18.5625 37.550781 20.183594 38.667969 22.015625 38.667969 C 22.570313 38.667969 23.113281 38.5625 23.632813 38.355469 C 25.414063 37.652344 26.46875 35.902344 26.425781 34.070313 L 32.046875 30.496094 C 32.742188 31.066406 33.539063 31.515625 34.40625 31.820313 L 30.777344 53.703125 C 28.269531 54.53125 26.441406 56.890625 26.441406 59.699219 C 26.441406 63.191406 29.253906 66.039063 32.703125 66.039063 C 36.15625 66.039063 38.964844 63.191406 38.964844 59.699219 C 38.964844 57.007813 37.292969 54.714844 34.941406 53.800781 L 38.558594 32.050781 C 39.53125 31.832031 40.4375 31.421875 41.234375 30.859375 L 46.402344 35.890625 C 46.164063 36.898438 46.207031 37.988281 46.605469 39.019531 C 47.390625 41.046875 49.289063 42.355469 51.441406 42.359375 C 52.085938 42.359375 52.722656 42.238281 53.328125 41.996094 C 55.992188 40.941406 57.308594 37.890625 56.269531 35.195313 Z M 56.269531 35.195313 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 65.152344 48.859375 L 1.847656 48.859375 C 0.828125 48.859375 0 49.6875 0 50.710938 L 0 68.007813 C 0 69.03125 0.828125 69.859375 1.847656 69.859375 L 65.152344 69.859375 C 66.171875 69.859375 67 69.03125 67 68.007813 L 67 50.710938 C 67 49.691406 66.167969 48.859375 65.152344 48.859375 Z M 65.152344 48.859375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 57.230469 53.058594 L 61.417969 53.058594 L 61.417969 57.261719 L 57.230469 57.261719 Z M 57.230469 53.058594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 57.230469 61.460938 L 61.417969 61.460938 L 61.417969 65.660156 L 57.230469 65.660156 Z M 57.230469 61.460938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.914063 20.632813 C 58.433594 19.078125 58.726563 17.425781 58.726563 15.699219 C 58.726563 7.03125 51.617188 0 42.847656 0 C 36.21875 0 30.554688 4.027344 28.175781 9.734375 C 26.070313 7.503906 23.070313 6.148438 19.734375 6.148438 C 13.359375 6.148438 8.238281 11.214844 8.238281 17.519531 C 8.238281 18.640625 8.402344 19.765625 8.707031 20.789063 C 3.738281 22.652344 0.140625 27.386719 0.140625 32.988281 C 0.140625 40.195313 6.007813 46.058594 13.257813 46.058594 L 53.738281 46.058594 C 61.007813 46.058594 66.863281 40.207031 66.863281 32.988281 C 66.878906 27.230469 63.128906 22.359375 57.914063 20.632813 Z M 57.914063 20.632813 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 55.136719 35.503906 C 54.371094 33.539063 52.164063 32.570313 50.203125 33.339844 C 49.765625 33.511719 49.382813 33.765625 49.050781 34.066406 L 42.359375 27.585938 C 42.925781 26.640625 43.269531 25.542969 43.269531 24.359375 C 43.269531 20.882813 40.457031 18.058594 36.988281 18.058594 C 34.929688 18.058594 33.117188 19.070313 31.972656 20.605469 L 27.363281 17.730469 C 27.613281 16.929688 27.621094 16.046875 27.292969 15.207031 C 26.523438 13.242188 24.316406 12.273438 22.359375 13.042969 C 20.398438 13.8125 19.433594 16.027344 20.199219 17.988281 C 20.96875 19.953125 23.175781 20.921875 25.132813 20.15625 C 25.738281 19.917969 26.234375 19.53125 26.628906 19.066406 L 31.199219 21.921875 C 30.882813 22.671875 30.707031 23.496094 30.707031 24.359375 C 30.707031 25.425781 30.996094 26.414063 31.464844 27.292969 L 24.25 31.84375 C 23.417969 31.003906 22.140625 30.6875 20.972656 31.144531 C 19.40625 31.761719 18.632813 33.53125 19.246094 35.105469 C 19.859375 36.675781 21.625 37.449219 23.191406 36.835938 C 24.660156 36.257813 25.417969 34.664063 25 33.171875 L 32.332031 28.550781 C 33.292969 29.625 34.605469 30.355469 36.097656 30.570313 L 32.519531 54.488281 C 29.953125 54.640625 27.917969 56.75 27.917969 59.359375 C 27.917969 62.066406 30.105469 64.261719 32.800781 64.261719 C 35.5 64.261719 37.6875 62.066406 37.6875 59.359375 C 37.6875 57.03125 36.066406 55.09375 33.898438 54.59375 L 37.488281 30.609375 C 39.023438 30.488281 40.414063 29.839844 41.4375 28.804688 L 48.140625 35.296875 C 47.722656 36.207031 47.652344 37.277344 48.046875 38.289063 C 48.8125 40.25 51.023438 41.21875 52.980469 40.453125 C 54.9375 39.683594 55.902344 37.46875 55.136719 35.503906 Z M 55.136719 35.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 64.957031 49.140625 L 1.84375 49.140625 C 0.824219 49.140625 0 49.972656 0 51.003906 L 0 68.398438 C 0 69.429688 0.824219 70.261719 1.84375 70.261719 L 64.957031 70.261719 C 65.976563 70.261719 66.800781 69.429688 66.800781 68.398438 L 66.800781 51.003906 C 66.800781 49.976563 65.972656 49.140625 64.957031 49.140625 Z M 64.957031 49.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 57.058594 53.363281 L 61.234375 53.363281 L 61.234375 57.589844 L 57.058594 57.589844 Z M 57.058594 53.363281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 57.058594 61.8125 L 61.234375 61.8125 L 61.234375 66.039063 L 57.058594 66.039063 Z M 57.058594 61.8125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.742188 20.75 C 58.257813 19.1875 58.550781 17.527344 58.550781 15.789063 C 58.550781 7.070313 51.464844 0 42.71875 0 C 36.109375 0 30.464844 4.050781 28.09375 9.789063 C 25.992188 7.546875 23 6.183594 19.675781 6.183594 C 13.320313 6.183594 8.214844 11.28125 8.214844 17.621094 C 8.214844 18.746094 8.378906 19.878906 8.679688 20.910156 C 3.726563 22.78125 0.140625 27.542969 0.140625 33.179688 C 0.140625 40.425781 5.988281 46.324219 13.21875 46.324219 L 53.578125 46.324219 C 60.828125 46.324219 66.664063 40.4375 66.664063 33.179688 C 66.679688 27.386719 62.941406 22.488281 57.742188 20.75 Z M 57.742188 20.75 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
+<use xlink:href="#surface16" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 54.972656 35.707031 C 54.210938 33.730469 52.007813 32.757813 50.054688 33.53125 C 49.617188 33.703125 49.234375 33.960938 48.90625 34.261719 L 42.234375 27.746094 C 42.796875 26.792969 43.140625 25.691406 43.140625 24.5 C 43.140625 21.003906 40.335938 18.164063 36.878906 18.164063 C 34.824219 18.164063 33.019531 19.179688 31.878906 20.722656 L 27.28125 17.832031 C 27.53125 17.027344 27.539063 16.140625 27.210938 15.292969 C 26.445313 13.316406 24.242188 12.34375 22.292969 13.117188 C 20.335938 13.890625 19.375 16.121094 20.140625 18.089844 C 20.90625 20.066406 23.105469 21.042969 25.058594 20.273438 C 25.660156 20.03125 26.15625 19.644531 26.550781 19.175781 L 31.105469 22.046875 C 30.789063 22.800781 30.617188 23.632813 30.617188 24.5 C 30.617188 25.570313 30.902344 26.566406 31.371094 27.449219 L 24.179688 32.027344 C 23.347656 31.183594 22.074219 30.863281 20.910156 31.324219 C 19.347656 31.945313 18.578125 33.722656 19.1875 35.308594 C 19.800781 36.886719 21.5625 37.664063 23.121094 37.046875 C 24.585938 36.464844 25.34375 34.863281 24.925781 33.363281 L 32.234375 28.714844 C 33.195313 29.796875 34.503906 30.53125 35.988281 30.746094 L 32.421875 54.800781 C 29.863281 54.953125 27.835938 57.074219 27.835938 59.699219 C 27.835938 62.421875 30.015625 64.632813 32.703125 64.632813 C 35.394531 64.632813 37.574219 62.421875 37.574219 59.699219 C 37.574219 57.359375 35.960938 55.410156 33.796875 54.90625 L 37.375 30.785156 C 38.90625 30.664063 40.292969 30.011719 41.3125 28.96875 L 47.996094 35.5 C 47.582031 36.414063 47.511719 37.492188 47.902344 38.507813 C 48.667969 40.480469 50.871094 41.457031 52.824219 40.6875 C 54.773438 39.910156 55.734375 37.683594 54.972656 35.707031 Z M 54.972656 35.707031 "/>
 </g>
 </svg>
diff --git a/dist/InternetOfThings/AzureIoTEdge.png b/dist/InternetOfThings/AzureIoTEdge.png
index c1d085eb..86c52208 100644
Binary files a/dist/InternetOfThings/AzureIoTEdge.png and b/dist/InternetOfThings/AzureIoTEdge.png differ
diff --git a/dist/InternetOfThings/AzureIoTEdge.puml b/dist/InternetOfThings/AzureIoTEdge.puml
index 3a7eabeb..c4b4c324 100644
--- a/dist/InternetOfThings/AzureIoTEdge.puml
+++ b/dist/InternetOfThings/AzureIoTEdge.puml
@@ -1,11 +1,11 @@
 sprite $AzureIoTEdge [67x70/16z] {
-fTHfUeCm38JXqJg2-z-t2xIOO4me_NudxoE43Mwbvl6Lc-1Huh5B7mWMh_bV4Oa-mr_IECkVpN1_3ZLpDyLQZD8RgtC1uF5IRaN8dR4DqW4jlxKwznveoVtL
-zS9uZDYN7T1rUGYJJ3BV478nHDA_oORaQNgn2GQ-qsBcM4WRFmTBi9JChoBl4hvR1DQySety4v79mbeKCvFrtOcY0sBvZsrZ5Aj2HIoBRmbhkoTr6K8WMLGi
-MMSCJdSkLOKxgnne7qiz674nnC_paomQMb5N-vJpCyGYMj8zIaX_HVCG4xjg_5OqXaHW5va3GoAUJT4kcryGtIwwebsEmJe5Mr4SNDYXG5PWbt0mXfm9v3A2
-Gl9t3ikH0Ji1Qia1hw_289PL2PmQwYU2YtWAbBLEWooItqOMCm-CURU6ycrzNCXSJyIlSRpwVa9WYSMDB6xdFMdgB7P4ziJsgp8f7bvoLcxP2Q4lTvkbMjkQ
-4ako8rIFGf822BdzJRpQYU_lYw0Ziegizgz2iDsxdW2y8v9VxQzQDeBTbJD0Sa_qLO2DA3z-mV2Lvv1exxGPeP0eldumBWMMIUNXz3V1WRS6IwsEcphvZFiL
-0MSEShHqJ10n84BnaWucgKIU4gxe4z4-DxXs2VwG2XJ_IcuGoijg4YjUbLBJTJDYkYxV2HCuNSTt157_9HAZ-R-g6yGykSppT5QuUq_qW05Gpi-9IR2KyrDY
-DlpqV1VuBUU7RwJmcpybsXJnb9WLFzNKLz-z9OWrcv-VYro51qUh6Ty_vBFJsP3-UFV4uwggUoCFO_sVY7yJzWa
+hPLNml8u40GdT-Fx7tY9AyGuy9c_NeWkJvJbAymZhuIhd48Z1s4d394peV8tD3icVy5o3VyjXkCur3tSJHxa5YfR-8XrfPBrFvbVXMrYJJ3mhqhdqGM3WnWw
+rJ3fx0ewkLV9BA20QeQZJDuD8I81x2jqfn98kU54rRQXR3iFK1u0LJKCXueOQK0U9Ee1y2T53KKHLGNUMB7eXk9-pTElHO0iDmiGXns9KNj2vKgeE8YdBuWZ
+XGq5YF00uIAf8kkEQ8PuRn_ksODJleMQI5qxO6i6X0oSzK6q5MsAGif0UqLJXs53mIbXeXfjj9iYZnGvshck06HWH7LyfB5UJkfG9BTsFZOLOEbX5EMYsmAu
+QDPB45iEyIu0hu0fuY0HAc99RZaaLWpbNZ3H8WfWIP70biEUYfLE1eddPzpUF1qWPv5bLupJuWv37c_150CYQd9uj4hoOv3eHjJBeNB5W2cHfj2fXQ0ww_K-
+-igfjtQov0h6PH9e4_-c46qA49aWnf0dsjxXVKkQeW0Ixq41dzklV3_8hIP5Wob32Ehdljm_7YX2-VO9Df-Z9ZTg3z2Cq-Sfpv0xkgzGnrmfJBNSSVIUTa86
+iQs05BvwC6kJp3tjf4j3pQDJBXMVk9lArvYAoK-eoR4YSe-2UkKUBhZiiqXTzl4Z0mzlaaSAoELNHSfoMGLNlb4iIzYwWd65nugbJ2GlomyAanjwFeebv84l
+AugySXo5lE3PZb1UrFAp8iygHY8ucSWefvqjvsWglszg9rKqpepMOBboFE0dOLkpS_mp1NvM-7y
 }
 
 AzureEntityColoring(AzureIoTEdge)
diff --git a/dist/InternetOfThings/AzureIoTEdge.svg b/dist/InternetOfThings/AzureIoTEdge.svg
index 55b862ed..f4b81503 100644
--- a/dist/InternetOfThings/AzureIoTEdge.svg
+++ b/dist/InternetOfThings/AzureIoTEdge.svg
@@ -4,36 +4,38 @@
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
+<image id="image9" width="67" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEMAAABGCAYAAACXBynAAAAABmJLR0QA/wD/AP+gvaeTAAAAnUlEQVR4nO3QMQ4BUQBF0T8i9EqFFShtwuZZhE3QGO0tNZMJOad+xcud5tf9PKbLfvyt4zztHrdvlpulr/wSMUKMECPECDFCjBAjxAgxQowQI8QIMUKMECPECDFCjBAjxAgxQowQI8QIMUKMECPECDFCjBAjxAgxQowQI8QIMUKMECO2Y74+xzi81z6ynNM8xmPtEwAAAAAAAAB/6wM/ngum25KWXgAAAABJRU5ErkJggg=="/>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="67" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<use xlink:href="#image9"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="67" height="70"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 4.640625 40.308594 C 4.640625 34.617188 8.414063 29.800781 13.625 27.90625 C 13.304688 26.867188 13.132813 25.722656 13.132813 24.582031 C 13.132813 18.171875 18.503906 13.019531 25.191406 13.019531 C 28.683594 13.019531 31.832031 14.398438 34.042969 16.667969 C 36.53125 10.863281 42.472656 6.769531 49.425781 6.769531 C 52.210938 6.769531 54.835938 7.429688 57.144531 8.589844 C 54.570313 3.503906 49.136719 0 42.847656 0 C 36.21875 0 30.554688 3.90625 28.175781 9.4375 C 26.070313 7.273438 23.070313 5.960938 19.734375 5.960938 C 13.359375 5.960938 8.238281 10.871094 8.238281 16.984375 C 8.238281 18.074219 8.402344 19.164063 8.707031 20.15625 C 3.738281 21.960938 0.140625 26.554688 0.140625 31.984375 C 0.140625 35.820313 1.910156 39.261719 4.707031 41.589844 C 4.664063 41.167969 4.640625 40.742188 4.640625 40.308594 Z M 4.640625 40.308594 "/>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 4.625 40.539063 C 4.625 34.816406 8.390625 29.972656 13.585938 28.066406 C 13.265625 27.023438 13.09375 25.871094 13.09375 24.722656 C 13.09375 18.277344 18.449219 13.09375 25.117188 13.09375 C 28.597656 13.09375 31.738281 14.480469 33.941406 16.765625 C 36.421875 10.925781 42.347656 6.808594 49.277344 6.808594 C 52.054688 6.808594 54.671875 7.472656 56.972656 8.640625 C 54.40625 3.523438 48.992188 0 42.71875 0 C 36.109375 0 30.464844 3.929688 28.09375 9.492188 C 25.992188 7.316406 23 5.996094 19.675781 5.996094 C 13.320313 5.996094 8.214844 10.933594 8.214844 17.082031 C 8.214844 18.179688 8.378906 19.273438 8.679688 20.273438 C 3.726563 22.085938 0.140625 26.707031 0.140625 32.167969 C 0.140625 36.027344 1.90625 39.488281 4.691406 41.828125 C 4.648438 41.40625 4.625 40.976563 4.625 40.539063 Z M 4.625 40.539063 "/>
 </g>
+<image id="image17" width="67" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEMAAABGCAYAAACXBynAAAAABmJLR0QA/wD/AP+gvaeTAAAA10lEQVR4nO3bMUpDURBA0YlJbSsiFtZuxd7VCB/cjftwMYKVlZWxvWWKJ1E5p37MDLd/MwAAwJnsVgw5vuz383BzvWLWcm+v77u7289Tnh6WLLzf9nPYrpbMWu3y8WNmTopx8cOn/ClihBghRogRYoQYIUaIEWKEGCFGiBFihBghRogRYoQYIUaIEWKEGCFGiBFihBghRogRYoQYIUaIEWKEGCFGiBFihBghRogRYoQYIUaIEWKEGCFGiBFihBghRogRS75yzswct+dfGXa3PX2d+wb4R74BJtoOCSNjGVsAAAAASUVORK5CYII="/>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="67" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<use xlink:href="#image17"/>
   </g>
 </mask>
 <clipPath id="clip2">
   <rect x="0" y="0" width="67" height="70"/>
 </clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,9.411765%,56.078431%);fill-opacity:1;" d="M 56.4375 34.996094 C 55.652344 32.980469 53.746094 31.675781 51.589844 31.675781 C 50.941406 31.675781 50.304688 31.796875 49.695313 32.035156 C 49.527344 32.101563 49.382813 32.195313 49.226563 32.277344 L 44.078125 27.3125 C 44.457031 26.402344 44.667969 25.40625 44.667969 24.359375 C 44.667969 20.113281 41.222656 16.660156 36.988281 16.660156 C 34.941406 16.660156 33.082031 17.472656 31.703125 18.789063 L 28.910156 17.042969 C 28.976563 16.253906 28.886719 15.453125 28.589844 14.695313 C 27.804688 12.679688 25.902344 11.378906 23.742188 11.378906 C 23.09375 11.378906 22.457031 11.5 21.847656 11.738281 C 19.175781 12.785156 17.855469 15.820313 18.898438 18.5 C 19.683594 20.511719 21.589844 21.816406 23.746094 21.816406 C 24.394531 21.816406 25.035156 21.695313 25.640625 21.457031 C 26.058594 21.292969 26.429688 21.066406 26.785156 20.8125 L 29.539063 22.53125 C 29.394531 23.121094 29.3125 23.730469 29.3125 24.359375 C 29.3125 25.195313 29.449219 26 29.699219 26.753906 L 24.316406 30.148438 C 23.652344 29.761719 22.890625 29.535156 22.082031 29.535156 C 21.527344 29.535156 20.984375 29.636719 20.464844 29.84375 C 18.183594 30.738281 17.054688 33.328125 17.945313 35.613281 C 18.617188 37.335938 20.242188 38.445313 22.082031 38.445313 C 22.636719 38.445313 23.183594 38.34375 23.703125 38.136719 C 25.488281 37.4375 26.546875 35.695313 26.503906 33.875 L 32.140625 30.320313 C 32.839844 30.890625 33.640625 31.335938 34.507813 31.636719 L 30.871094 53.394531 C 28.355469 54.21875 26.519531 56.566406 26.519531 59.359375 C 26.519531 62.832031 29.339844 65.660156 32.800781 65.660156 C 36.265625 65.660156 39.082031 62.832031 39.082031 59.359375 C 39.082031 56.683594 37.402344 54.402344 35.046875 53.492188 L 38.671875 31.867188 C 39.648438 31.648438 40.558594 31.242188 41.359375 30.683594 L 46.539063 35.683594 C 46.300781 36.6875 46.34375 37.769531 46.746094 38.796875 C 47.53125 40.8125 49.4375 42.113281 51.59375 42.117188 C 52.242188 42.117188 52.878906 41.996094 53.488281 41.757813 C 56.160156 40.707031 57.480469 37.675781 56.4375 34.996094 Z M 56.4375 34.996094 "/>
+<g id="surface16" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,9.411765%,56.078431%);fill-opacity:1;" d="M 56.269531 35.195313 C 55.488281 33.171875 53.585938 31.859375 51.4375 31.859375 C 50.789063 31.859375 50.15625 31.980469 49.546875 32.21875 C 49.378906 32.285156 49.234375 32.378906 49.078125 32.460938 L 43.945313 27.46875 C 44.324219 26.554688 44.535156 25.550781 44.535156 24.5 C 44.535156 20.230469 41.101563 16.757813 36.878906 16.757813 C 34.835938 16.757813 32.984375 17.574219 31.609375 18.898438 L 28.824219 17.140625 C 28.890625 16.347656 28.800781 15.542969 28.503906 14.78125 C 27.722656 12.753906 25.824219 11.445313 23.671875 11.445313 C 23.023438 11.445313 22.390625 11.566406 21.78125 11.804688 C 19.117188 12.859375 17.800781 15.910156 18.84375 18.605469 C 19.625 20.628906 21.527344 21.941406 23.675781 21.941406 C 24.320313 21.941406 24.960938 21.820313 25.5625 21.582031 C 25.980469 21.414063 26.351563 21.1875 26.707031 20.933594 L 29.449219 22.660156 C 29.308594 23.253906 29.226563 23.867188 29.226563 24.5 C 29.226563 25.339844 29.363281 26.148438 29.609375 26.90625 L 24.242188 30.320313 C 23.582031 29.933594 22.824219 29.703125 22.015625 29.703125 C 21.464844 29.703125 20.921875 29.808594 20.402344 30.015625 C 18.128906 30.914063 17.003906 33.519531 17.890625 35.816406 C 18.5625 37.550781 20.183594 38.667969 22.015625 38.667969 C 22.570313 38.667969 23.113281 38.5625 23.632813 38.355469 C 25.414063 37.652344 26.46875 35.902344 26.425781 34.070313 L 32.046875 30.496094 C 32.742188 31.066406 33.539063 31.515625 34.40625 31.820313 L 30.777344 53.703125 C 28.269531 54.53125 26.441406 56.890625 26.441406 59.699219 C 26.441406 63.191406 29.253906 66.039063 32.703125 66.039063 C 36.15625 66.039063 38.964844 63.191406 38.964844 59.699219 C 38.964844 57.007813 37.292969 54.714844 34.941406 53.800781 L 38.558594 32.050781 C 39.53125 31.832031 40.4375 31.421875 41.234375 30.859375 L 46.402344 35.890625 C 46.164063 36.898438 46.207031 37.988281 46.605469 39.019531 C 47.390625 41.046875 49.289063 42.355469 51.441406 42.359375 C 52.085938 42.359375 52.722656 42.238281 53.328125 41.996094 C 55.992188 40.941406 57.308594 37.890625 56.269531 35.195313 Z M 56.269531 35.195313 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 65.152344 48.859375 L 1.847656 48.859375 C 0.828125 48.859375 0 49.6875 0 50.710938 L 0 68.007813 C 0 69.03125 0.828125 69.859375 1.847656 69.859375 L 65.152344 69.859375 C 66.171875 69.859375 67 69.03125 67 68.007813 L 67 50.710938 C 67 49.691406 66.167969 48.859375 65.152344 48.859375 Z M 65.152344 48.859375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 57.230469 53.058594 L 61.417969 53.058594 L 61.417969 57.261719 L 57.230469 57.261719 Z M 57.230469 53.058594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 57.230469 61.460938 L 61.417969 61.460938 L 61.417969 65.660156 L 57.230469 65.660156 Z M 57.230469 61.460938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.914063 20.632813 C 58.433594 19.078125 58.726563 17.425781 58.726563 15.699219 C 58.726563 7.03125 51.617188 0 42.847656 0 C 36.21875 0 30.554688 4.027344 28.175781 9.734375 C 26.070313 7.503906 23.070313 6.148438 19.734375 6.148438 C 13.359375 6.148438 8.238281 11.214844 8.238281 17.519531 C 8.238281 18.640625 8.402344 19.765625 8.707031 20.789063 C 3.738281 22.652344 0.140625 27.386719 0.140625 32.988281 C 0.140625 40.195313 6.007813 46.058594 13.257813 46.058594 L 53.738281 46.058594 C 61.007813 46.058594 66.863281 40.207031 66.863281 32.988281 C 66.878906 27.230469 63.128906 22.359375 57.914063 20.632813 Z M 57.914063 20.632813 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 55.136719 35.503906 C 54.371094 33.539063 52.164063 32.570313 50.203125 33.339844 C 49.765625 33.511719 49.382813 33.765625 49.050781 34.066406 L 42.359375 27.585938 C 42.925781 26.640625 43.269531 25.542969 43.269531 24.359375 C 43.269531 20.882813 40.457031 18.058594 36.988281 18.058594 C 34.929688 18.058594 33.117188 19.070313 31.972656 20.605469 L 27.363281 17.730469 C 27.613281 16.929688 27.621094 16.046875 27.292969 15.207031 C 26.523438 13.242188 24.316406 12.273438 22.359375 13.042969 C 20.398438 13.8125 19.433594 16.027344 20.199219 17.988281 C 20.96875 19.953125 23.175781 20.921875 25.132813 20.15625 C 25.738281 19.917969 26.234375 19.53125 26.628906 19.066406 L 31.199219 21.921875 C 30.882813 22.671875 30.707031 23.496094 30.707031 24.359375 C 30.707031 25.425781 30.996094 26.414063 31.464844 27.292969 L 24.25 31.84375 C 23.417969 31.003906 22.140625 30.6875 20.972656 31.144531 C 19.40625 31.761719 18.632813 33.53125 19.246094 35.105469 C 19.859375 36.675781 21.625 37.449219 23.191406 36.835938 C 24.660156 36.257813 25.417969 34.664063 25 33.171875 L 32.332031 28.550781 C 33.292969 29.625 34.605469 30.355469 36.097656 30.570313 L 32.519531 54.488281 C 29.953125 54.640625 27.917969 56.75 27.917969 59.359375 C 27.917969 62.066406 30.105469 64.261719 32.800781 64.261719 C 35.5 64.261719 37.6875 62.066406 37.6875 59.359375 C 37.6875 57.03125 36.066406 55.09375 33.898438 54.59375 L 37.488281 30.609375 C 39.023438 30.488281 40.414063 29.839844 41.4375 28.804688 L 48.140625 35.296875 C 47.722656 36.207031 47.652344 37.277344 48.046875 38.289063 C 48.8125 40.25 51.023438 41.21875 52.980469 40.453125 C 54.9375 39.683594 55.902344 37.46875 55.136719 35.503906 Z M 55.136719 35.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 64.957031 49.140625 L 1.84375 49.140625 C 0.824219 49.140625 0 49.972656 0 51.003906 L 0 68.398438 C 0 69.429688 0.824219 70.261719 1.84375 70.261719 L 64.957031 70.261719 C 65.976563 70.261719 66.800781 69.429688 66.800781 68.398438 L 66.800781 51.003906 C 66.800781 49.976563 65.972656 49.140625 64.957031 49.140625 Z M 64.957031 49.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 57.058594 53.363281 L 61.234375 53.363281 L 61.234375 57.589844 L 57.058594 57.589844 Z M 57.058594 53.363281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 57.058594 61.8125 L 61.234375 61.8125 L 61.234375 66.039063 L 57.058594 66.039063 Z M 57.058594 61.8125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.742188 20.75 C 58.257813 19.1875 58.550781 17.527344 58.550781 15.789063 C 58.550781 7.070313 51.464844 0 42.71875 0 C 36.109375 0 30.464844 4.050781 28.09375 9.789063 C 25.992188 7.546875 23 6.183594 19.675781 6.183594 C 13.320313 6.183594 8.214844 11.28125 8.214844 17.621094 C 8.214844 18.746094 8.378906 19.878906 8.679688 20.910156 C 3.726563 22.78125 0.140625 27.542969 0.140625 33.179688 C 0.140625 40.425781 5.988281 46.324219 13.21875 46.324219 L 53.578125 46.324219 C 60.828125 46.324219 66.664063 40.4375 66.664063 33.179688 C 66.679688 27.386719 62.941406 22.488281 57.742188 20.75 Z M 57.742188 20.75 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
+<use xlink:href="#surface16" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 54.972656 35.707031 C 54.210938 33.730469 52.007813 32.757813 50.054688 33.53125 C 49.617188 33.703125 49.234375 33.960938 48.90625 34.261719 L 42.234375 27.746094 C 42.796875 26.792969 43.140625 25.691406 43.140625 24.5 C 43.140625 21.003906 40.335938 18.164063 36.878906 18.164063 C 34.824219 18.164063 33.019531 19.179688 31.878906 20.722656 L 27.28125 17.832031 C 27.53125 17.027344 27.539063 16.140625 27.210938 15.292969 C 26.445313 13.316406 24.242188 12.34375 22.292969 13.117188 C 20.335938 13.890625 19.375 16.121094 20.140625 18.089844 C 20.90625 20.066406 23.105469 21.042969 25.058594 20.273438 C 25.660156 20.03125 26.15625 19.644531 26.550781 19.175781 L 31.105469 22.046875 C 30.789063 22.800781 30.617188 23.632813 30.617188 24.5 C 30.617188 25.570313 30.902344 26.566406 31.371094 27.449219 L 24.179688 32.027344 C 23.347656 31.183594 22.074219 30.863281 20.910156 31.324219 C 19.347656 31.945313 18.578125 33.722656 19.1875 35.308594 C 19.800781 36.886719 21.5625 37.664063 23.121094 37.046875 C 24.585938 36.464844 25.34375 34.863281 24.925781 33.363281 L 32.234375 28.714844 C 33.195313 29.796875 34.503906 30.53125 35.988281 30.746094 L 32.421875 54.800781 C 29.863281 54.953125 27.835938 57.074219 27.835938 59.699219 C 27.835938 62.421875 30.015625 64.632813 32.703125 64.632813 C 35.394531 64.632813 37.574219 62.421875 37.574219 59.699219 C 37.574219 57.359375 35.960938 55.410156 33.796875 54.90625 L 37.375 30.785156 C 38.90625 30.664063 40.292969 30.011719 41.3125 28.96875 L 47.996094 35.5 C 47.582031 36.414063 47.511719 37.492188 47.902344 38.507813 C 48.667969 40.480469 50.871094 41.457031 52.824219 40.6875 C 54.773438 39.910156 55.734375 37.683594 54.972656 35.707031 Z M 54.972656 35.707031 "/>
 </g>
 </svg>
diff --git a/dist/InternetOfThings/AzureIoTHub(m).png b/dist/InternetOfThings/AzureIoTHub(m).png
index 1cf9a411..9157126f 100644
Binary files a/dist/InternetOfThings/AzureIoTHub(m).png and b/dist/InternetOfThings/AzureIoTHub(m).png differ
diff --git a/dist/InternetOfThings/AzureIoTHub(m).svg b/dist/InternetOfThings/AzureIoTHub(m).svg
index 0dc8cdd3..5e243d2e 100644
--- a/dist/InternetOfThings/AzureIoTHub(m).svg
+++ b/dist/InternetOfThings/AzureIoTHub(m).svg
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 36.09375 10.71875 C 36.09375 14.464844 33.058594 17.5 29.3125 17.5 C 25.566406 17.5 22.53125 14.464844 22.53125 10.71875 C 22.53125 6.972656 25.566406 3.9375 29.3125 3.9375 C 33.058594 3.9375 36.09375 6.972656 36.09375 10.71875 Z M 36.09375 10.71875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 52.9375 32.59375 C 52.9375 37.0625 49.3125 40.6875 44.84375 40.6875 C 40.375 40.6875 36.75 37.0625 36.75 32.59375 C 36.75 28.125 40.375 24.5 44.84375 24.5 C 49.3125 24.5 52.9375 28.125 52.9375 32.59375 Z M 52.9375 32.59375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 64.75 56.65625 C 64.75 60.160156 61.910156 63 58.40625 63 C 54.902344 63 52.0625 60.160156 52.0625 56.65625 C 52.0625 53.152344 54.902344 50.3125 58.40625 50.3125 C 61.910156 50.3125 64.75 53.152344 64.75 56.65625 Z M 64.75 56.65625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 38.71875 52.28125 C 38.71875 55.300781 36.269531 57.75 33.25 57.75 C 30.230469 57.75 27.78125 55.300781 27.78125 52.28125 C 27.78125 49.261719 30.230469 46.8125 33.25 46.8125 C 36.269531 46.8125 38.71875 49.261719 38.71875 52.28125 Z M 38.71875 52.28125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 16.625 35.65625 C 16.625 38.675781 14.175781 41.125 11.15625 41.125 C 8.136719 41.125 5.6875 38.675781 5.6875 35.65625 C 5.6875 32.636719 8.136719 30.1875 11.15625 30.1875 C 14.175781 30.1875 16.625 32.636719 16.625 35.65625 Z M 16.625 35.65625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 30.496094 9.417969 L 45.972656 31.429688 L 43.109375 33.441406 L 27.632813 11.429688 Z M 30.496094 9.417969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 46.191406 31.441406 L 59.886719 55.363281 L 56.847656 57.101563 L 43.15625 33.179688 Z M 46.191406 31.441406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 44.339844 30.710938 L 44.628906 34.199219 L 11.273438 36.96875 L 10.984375 33.480469 Z M 44.339844 30.710938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 43.117188 31.585938 L 46.113281 33.394531 L 34.371094 52.878906 L 31.375 51.074219 Z M 43.117188 31.585938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 68.90625 0 L 51.1875 0 C 50.53125 0 50.09375 0.4375 50.09375 1.3125 L 50.09375 7.65625 C 50.09375 8.3125 50.53125 8.75 51.1875 8.75 L 61.25 8.75 L 61.25 18.59375 C 61.25 19.25 61.6875 19.6875 62.5625 19.6875 L 68.90625 19.6875 C 69.5625 19.6875 70 19.25 70 18.59375 L 70 1.09375 C 70 0.4375 69.5625 0 68.90625 0 Z M 68.90625 0 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 1.09375 69.78125 L 18.8125 69.78125 C 19.46875 69.78125 19.90625 69.34375 19.90625 68.46875 L 19.90625 62.125 C 19.90625 61.46875 19.46875 61.03125 18.8125 61.03125 L 8.75 61.03125 L 8.75 51.1875 C 8.75 50.53125 8.3125 50.09375 7.4375 50.09375 L 1.09375 50.09375 C 0.4375 50.09375 0 50.53125 0 51.1875 L 0 68.6875 C 0 69.34375 0.4375 69.78125 1.09375 69.78125 Z M 1.09375 69.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 43.121094 33.394531 L 27.644531 11.382813 L 30.507813 9.371094 L 45.984375 31.382813 Z M 43.121094 33.394531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 56.808594 57.0625 L 43.113281 33.140625 L 46.152344 31.402344 L 59.84375 55.320313 Z M 56.808594 57.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 11.296875 37.046875 L 11.007813 33.558594 L 44.363281 30.789063 L 44.652344 34.277344 Z M 11.296875 37.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 34.324219 52.929688 L 31.324219 51.125 L 43.066406 31.636719 L 46.066406 33.445313 Z M 34.324219 52.929688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 68.90625 0 L 51.1875 0 C 50.53125 0 50.09375 0.4375 50.09375 1.3125 L 50.09375 7.65625 C 50.09375 8.3125 50.53125 8.75 51.1875 8.75 L 61.25 8.75 L 61.25 18.59375 C 61.25 19.25 61.6875 19.6875 62.5625 19.6875 L 68.90625 19.6875 C 69.5625 19.6875 70 19.25 70 18.59375 L 70 1.09375 C 70 0.4375 69.5625 0 68.90625 0 Z M 68.90625 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 1.09375 69.78125 L 18.8125 69.78125 C 19.46875 69.78125 19.90625 69.34375 19.90625 68.46875 L 19.90625 62.125 C 19.90625 61.46875 19.46875 61.03125 18.8125 61.03125 L 8.75 61.03125 L 8.75 51.1875 C 8.75 50.53125 8.3125 50.09375 7.4375 50.09375 L 1.09375 50.09375 C 0.4375 50.09375 0 50.53125 0 51.1875 L 0 68.6875 C 0 69.34375 0.4375 69.78125 1.09375 69.78125 Z M 1.09375 69.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,100,174);fill-opacity:1;" d="M 36.09375 10.71875 C 36.09375 14.464844 33.058594 17.5 29.3125 17.5 C 25.566406 17.5 22.53125 14.464844 22.53125 10.71875 C 22.53125 6.972656 25.566406 3.9375 29.3125 3.9375 C 33.058594 3.9375 36.09375 6.972656 36.09375 10.71875 Z M 36.09375 10.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,100,174);fill-opacity:1;" d="M 52.9375 32.59375 C 52.9375 37.0625 49.3125 40.6875 44.84375 40.6875 C 40.375 40.6875 36.75 37.0625 36.75 32.59375 C 36.75 28.125 40.375 24.5 44.84375 24.5 C 49.3125 24.5 52.9375 28.125 52.9375 32.59375 Z M 52.9375 32.59375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,100,174);fill-opacity:1;" d="M 64.75 56.65625 C 64.75 60.160156 61.910156 63 58.40625 63 C 54.902344 63 52.0625 60.160156 52.0625 56.65625 C 52.0625 53.152344 54.902344 50.3125 58.40625 50.3125 C 61.910156 50.3125 64.75 53.152344 64.75 56.65625 Z M 64.75 56.65625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,100,174);fill-opacity:1;" d="M 38.71875 52.28125 C 38.71875 55.300781 36.269531 57.75 33.25 57.75 C 30.230469 57.75 27.78125 55.300781 27.78125 52.28125 C 27.78125 49.261719 30.230469 46.8125 33.25 46.8125 C 36.269531 46.8125 38.71875 49.261719 38.71875 52.28125 Z M 38.71875 52.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,100,174);fill-opacity:1;" d="M 16.625 35.65625 C 16.625 38.675781 14.175781 41.125 11.15625 41.125 C 8.136719 41.125 5.6875 38.675781 5.6875 35.65625 C 5.6875 32.636719 8.136719 30.1875 11.15625 30.1875 C 14.175781 30.1875 16.625 32.636719 16.625 35.65625 Z M 16.625 35.65625 "/>
 </g>
 </svg>
diff --git a/dist/InternetOfThings/AzureIoTHub.png b/dist/InternetOfThings/AzureIoTHub.png
index ec0cc0f1..5599f43e 100644
Binary files a/dist/InternetOfThings/AzureIoTHub.png and b/dist/InternetOfThings/AzureIoTHub.png differ
diff --git a/dist/InternetOfThings/AzureIoTHub.puml b/dist/InternetOfThings/AzureIoTHub.puml
index 3db10781..b5614b63 100644
--- a/dist/InternetOfThings/AzureIoTHub.puml
+++ b/dist/InternetOfThings/AzureIoTHub.puml
@@ -1,9 +1,9 @@
 sprite $AzureIoTHub [70x70/16z] {
-xPPLWjWm34Gj6KVtlszXOGAkeqOfTz-tymoYfDjacy1zIxEPlyEIEmmzFxDqUwK_iGokw75BjOqIjc2T3Je8hYrgUoGjA9l5pqyDMlI7MCHvEzV2R24zR57R
-4D_YBZ2ak2Lb9aEBM8ZMLbzS-Oc53mI9MaYxY9BqyK9FBeC5-GHbjAEmIun71YPoVMmHl9IavAn10ni5y9B8JUAQPWGvVYVR4TOCPof71dozMDbQ4QTdUOTH
-B7OHqLpiXAmpueNABslj73Xdr3lo0Cn5d40wkEDd1gEtMd9MgNQWknQyVpcTrKyx8yNzXR3krWdyVmZuAPxzXuDNjKClDcaT6CDhM3dBLSziszKat1UmAymU
-xhjbVpaDzeMnFNHm8e2xCmubD8xQz4fta3emVLHlZYV5gKL6eYsOqdKHxT9UqSifLETKBliiPO-xBC7nxRBgyXqM8rZvzOvbhAuASIrzyIvY6ysrw757Kcm3
-heNBytmXubkITZDhafvPIEH6Cu7NTQchIAEHubgO0s3MpIIV0bP0n4AKrHYqa0-B0smYCBC-0m
+xTW5aXin40NG9b7t_SyRchWDAiqlQyBPLxHh-2C6qzlKuvNJsshC_euKRHxUz5fAZqExajBZfk-db8XasoaUaGOzaPx6UOh48wO5Eq_HUAG_94KsKnZC4fYI
+7PtQTefuXhZW5FY1gBIVGZgEabJJdPIafHQrBnYd06nVu1H4p9PrujOF1AcP2LsMJNE9PDC0lx1EedefYyrAysCGCctJuZcjb7PnXbo9wNYzmJIU55hIMikg
+vLey6RGW8xxmGZHZzdZ6eFLAVbD4LEqGBmIqdflQR2eBMlAxuHI7M-6m1wegmimrddIOqc_Vd9ijATpS3HuXei5JbkF1EsXfdCyHjkRP_BHMFIA6h1UOKleO
+lHMmO9siGMBvtTtLCx-Q-vDkhxiy_VEcV7p-PnVt8rmOtBIR3SnrZD6AdSHYuZaMOM7moZyMpPsi7kJq3bEchYzgojDixZJprOh2ttVABdI8avJrwZPoXyCf
+dYbZLLLdcDBYfYxtsmfJn9-Uc2mYEKmXo_4oLIZX59BcuOrf8mL0DS9mwsAufxqc8wYzt7fYvWHaxsMxn-vl3wBAH3W5-qW1Ham6lUqp
 }
 
 AzureEntityColoring(AzureIoTHub)
diff --git a/dist/InternetOfThings/AzureIoTHub.svg b/dist/InternetOfThings/AzureIoTHub.svg
index bede7989..90c73ee6 100644
--- a/dist/InternetOfThings/AzureIoTHub.svg
+++ b/dist/InternetOfThings/AzureIoTHub.svg
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 27.648438 11.378906 L 30.519531 9.359375 L 46.042969 31.441406 L 43.167969 33.460938 Z M 27.648438 11.378906 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 43.183594 33.21875 L 46.230469 31.472656 L 59.964844 55.472656 L 56.917969 57.214844 Z M 43.183594 33.21875 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 10.882813 33.707031 L 44.339844 30.929688 L 44.632813 34.425781 L 11.171875 37.207031 Z M 10.882813 33.707031 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 31.324219 51.191406 L 43.105469 31.644531 L 46.113281 33.457031 L 34.332031 53.003906 Z M 31.324219 51.191406 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 69.121094 0 L 51.347656 0 C 50.691406 0 50.25 0.4375 50.25 1.316406 L 50.25 7.679688 C 50.25 8.335938 50.6875 8.777344 51.347656 8.777344 L 61.441406 8.777344 L 61.441406 18.652344 C 61.441406 19.308594 61.878906 19.75 62.757813 19.75 L 69.121094 19.75 C 69.777344 19.75 70.21875 19.308594 70.21875 18.652344 L 70.21875 1.097656 C 70.21875 0.441406 69.78125 0 69.121094 0 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 1.097656 70 L 18.871094 70 C 19.527344 70 19.96875 69.5625 19.96875 68.683594 L 19.96875 62.320313 C 19.96875 61.664063 19.53125 61.222656 18.871094 61.222656 L 8.777344 61.222656 L 8.777344 51.351563 C 8.777344 50.691406 8.339844 50.253906 7.460938 50.253906 L 1.097656 50.253906 C 0.441406 50.253906 0 50.6875 0 51.351563 L 0 68.90625 C 0 69.5625 0.4375 70 1.097656 70 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 29.40625 3.949219 C 33.160156 3.949219 36.207031 6.996094 36.207031 10.753906 C 36.207031 14.507813 33.160156 17.554688 29.40625 17.554688 C 25.648438 17.554688 22.601563 14.507813 22.601563 10.753906 C 22.601563 6.996094 25.648438 3.949219 29.40625 3.949219 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 44.984375 24.578125 C 49.46875 24.578125 53.101563 28.214844 53.101563 32.695313 C 53.101563 37.179688 49.46875 40.816406 44.984375 40.816406 C 40.5 40.816406 36.863281 37.179688 36.863281 32.695313 C 36.863281 28.214844 40.5 24.578125 44.984375 24.578125 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 58.589844 50.472656 C 62.101563 50.472656 64.953125 53.320313 64.953125 56.835938 C 64.953125 60.347656 62.101563 63.199219 58.589844 63.199219 C 55.074219 63.199219 52.226563 60.347656 52.226563 56.835938 C 52.226563 53.320313 55.074219 50.472656 58.589844 50.472656 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 33.355469 46.960938 C 36.382813 46.960938 38.839844 49.417969 38.839844 52.445313 C 38.839844 55.472656 36.382813 57.929688 33.355469 57.929688 C 30.324219 57.929688 27.867188 55.472656 27.867188 52.445313 C 27.867188 49.417969 30.324219 46.960938 33.355469 46.960938 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 11.191406 30.285156 C 14.21875 30.285156 16.675781 32.738281 16.675781 35.769531 C 16.675781 38.796875 14.21875 41.253906 11.191406 41.253906 C 8.160156 41.253906 5.703125 38.796875 5.703125 35.769531 C 5.703125 32.738281 8.160156 30.285156 11.191406 30.285156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 43.121094 33.394531 L 27.644531 11.382813 L 30.507813 9.371094 L 45.984375 31.382813 Z M 43.121094 33.394531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 56.808594 57.0625 L 43.113281 33.140625 L 46.152344 31.402344 L 59.84375 55.320313 Z M 56.808594 57.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 11.296875 37.046875 L 11.007813 33.558594 L 44.363281 30.789063 L 44.652344 34.277344 Z M 11.296875 37.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 34.324219 52.929688 L 31.324219 51.125 L 43.066406 31.636719 L 46.066406 33.445313 Z M 34.324219 52.929688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 68.90625 0 L 51.1875 0 C 50.53125 0 50.09375 0.4375 50.09375 1.3125 L 50.09375 7.65625 C 50.09375 8.3125 50.53125 8.75 51.1875 8.75 L 61.25 8.75 L 61.25 18.59375 C 61.25 19.25 61.6875 19.6875 62.5625 19.6875 L 68.90625 19.6875 C 69.5625 19.6875 70 19.25 70 18.59375 L 70 1.09375 C 70 0.4375 69.5625 0 68.90625 0 Z M 68.90625 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 1.09375 69.78125 L 18.8125 69.78125 C 19.46875 69.78125 19.90625 69.34375 19.90625 68.46875 L 19.90625 62.125 C 19.90625 61.46875 19.46875 61.03125 18.8125 61.03125 L 8.75 61.03125 L 8.75 51.1875 C 8.75 50.53125 8.3125 50.09375 7.4375 50.09375 L 1.09375 50.09375 C 0.4375 50.09375 0 50.53125 0 51.1875 L 0 68.6875 C 0 69.34375 0.4375 69.78125 1.09375 69.78125 Z M 1.09375 69.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 36.09375 10.71875 C 36.09375 14.464844 33.058594 17.5 29.3125 17.5 C 25.566406 17.5 22.53125 14.464844 22.53125 10.71875 C 22.53125 6.972656 25.566406 3.9375 29.3125 3.9375 C 33.058594 3.9375 36.09375 6.972656 36.09375 10.71875 Z M 36.09375 10.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 52.9375 32.59375 C 52.9375 37.0625 49.3125 40.6875 44.84375 40.6875 C 40.375 40.6875 36.75 37.0625 36.75 32.59375 C 36.75 28.125 40.375 24.5 44.84375 24.5 C 49.3125 24.5 52.9375 28.125 52.9375 32.59375 Z M 52.9375 32.59375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 64.75 56.65625 C 64.75 60.160156 61.910156 63 58.40625 63 C 54.902344 63 52.0625 60.160156 52.0625 56.65625 C 52.0625 53.152344 54.902344 50.3125 58.40625 50.3125 C 61.910156 50.3125 64.75 53.152344 64.75 56.65625 Z M 64.75 56.65625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 38.71875 52.28125 C 38.71875 55.300781 36.269531 57.75 33.25 57.75 C 30.230469 57.75 27.78125 55.300781 27.78125 52.28125 C 27.78125 49.261719 30.230469 46.8125 33.25 46.8125 C 36.269531 46.8125 38.71875 49.261719 38.71875 52.28125 Z M 38.71875 52.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,42.745098%,83.921569%);fill-opacity:1;" d="M 16.625 35.65625 C 16.625 38.675781 14.175781 41.125 11.15625 41.125 C 8.136719 41.125 5.6875 38.675781 5.6875 35.65625 C 5.6875 32.636719 8.136719 30.1875 11.15625 30.1875 C 14.175781 30.1875 16.625 32.636719 16.625 35.65625 Z M 16.625 35.65625 "/>
 </g>
 </svg>
diff --git a/dist/InternetOfThings/AzureIoTHubSecurity(m).png b/dist/InternetOfThings/AzureIoTHubSecurity(m).png
new file mode 100644
index 00000000..b1420bf9
Binary files /dev/null and b/dist/InternetOfThings/AzureIoTHubSecurity(m).png differ
diff --git a/dist/InternetOfThings/AzureIoTHubSecurity(m).svg b/dist/InternetOfThings/AzureIoTHubSecurity(m).svg
new file mode 100644
index 00000000..ec482845
--- /dev/null
+++ b/dist/InternetOfThings/AzureIoTHubSecurity(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="52pt" height="70pt" viewBox="0 0 52 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 43.4375 8.582031 C 28.222656 6.882813 25.675781 0.269531 25.675781 0.269531 C 25.675781 0.269531 22.25 8.972656 0.367188 8.972656 L 0.367188 44.683594 C 0.367188 49.003906 2.738281 53.054688 6.03125 56.585938 C 13.496094 64.597656 25.675781 69.996094 25.675781 69.996094 C 25.675781 69.996094 50.996094 58.800781 50.996094 44.683594 L 50.996094 8.972656 L 50.746094 8.972656 C 48.199219 8.972656 45.65625 8.832031 43.128906 8.550781 L 43.4375 8.578125 Z M 43.4375 8.582031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(69,176,255);fill-opacity:1;" d="M 25.3125 0 C 25.3125 0 21.882813 8.703125 0 8.703125 L 0 44.421875 C 0 48.742188 2.371094 52.785156 5.664063 56.316406 L 43.070313 8.3125 C 27.855469 6.621094 25.3125 0 25.3125 0 Z M 25.3125 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.210938 47.40625 C 34.851563 47.410156 33.625 46.574219 33.113281 45.300781 C 32.597656 44.027344 32.902344 42.566406 33.878906 41.609375 L 30.3125 35.308594 C 29.410156 35.617188 28.425781 35.589844 27.539063 35.234375 L 27.566406 35.242188 L 24.957031 39.621094 C 25.933594 40.597656 26.09375 42.136719 25.332031 43.296875 C 24.574219 44.453125 23.109375 44.910156 21.835938 44.378906 C 20.5625 43.851563 19.835938 42.488281 20.101563 41.125 C 20.371094 39.761719 21.554688 38.777344 22.933594 38.78125 L 22.9375 38.78125 C 23.0625 38.785156 23.179688 38.796875 23.296875 38.816406 L 23.28125 38.816406 L 26.027344 34.21875 C 25.535156 33.71875 25.175781 33.105469 24.980469 32.429688 L 24.972656 32.398438 L 14.121094 33.308594 C 13.898438 34.71875 12.695313 35.761719 11.28125 35.769531 C 9.867188 35.777344 8.652344 34.75 8.410156 33.34375 C 8.171875 31.933594 8.976563 30.558594 10.3125 30.085938 C 11.648438 29.617188 13.125 30.191406 13.804688 31.441406 L 13.808594 31.457031 L 24.84375 30.535156 C 24.984375 29.699219 25.34375 28.960938 25.863281 28.371094 L 25.855469 28.375 L 22.0625 22.941406 C 20.367188 23.558594 18.484375 22.8125 17.65625 21.195313 C 16.828125 19.578125 17.316406 17.59375 18.796875 16.558594 C 20.277344 15.519531 22.292969 15.753906 23.5 17.101563 C 24.710938 18.449219 24.746094 20.492188 23.578125 21.878906 L 23.582031 21.875 L 27.332031 27.261719 C 29.246094 26.402344 31.496094 27.074219 32.636719 28.847656 C 33.777344 30.621094 33.472656 32.964844 31.917969 34.382813 L 31.914063 34.386719 L 35.507813 40.726563 C 36.765625 40.445313 38.066406 40.917969 38.859375 41.9375 C 39.652344 42.957031 39.796875 44.347656 39.230469 45.511719 C 38.664063 46.675781 37.488281 47.410156 36.203125 47.402344 Z M 36.210938 47.40625 "/>
+</g>
+</svg>
diff --git a/dist/InternetOfThings/AzureIoTHubSecurity.png b/dist/InternetOfThings/AzureIoTHubSecurity.png
new file mode 100644
index 00000000..55bb571a
Binary files /dev/null and b/dist/InternetOfThings/AzureIoTHubSecurity.png differ
diff --git a/dist/InternetOfThings/AzureIoTHubSecurity.puml b/dist/InternetOfThings/AzureIoTHubSecurity.puml
new file mode 100644
index 00000000..98757e6a
--- /dev/null
+++ b/dist/InternetOfThings/AzureIoTHubSecurity.puml
@@ -0,0 +1,10 @@
+sprite $AzureIoTHubSecurity [52x70/16z] {
+lTHNibmX38JXLjx_YXquYHdS7kHm__UlA90Ai1pjFBrFCWsj8dyM3M5vfTXBSoesb7Y-vmAUMEIl2tjn8gfc7f6V2jLJvdPrXGRv4bDzKtrJ_y640aO8CR4k
+NNqoXb6iX1l5o2df6tuV227atNmWGkXy8XJA29yfu6tZG112JIg446vI82AQBUCOHU-SaVpEk8XEh-quIsu20CHCLGHpmOrYJaINSvWnltx7Ef4MD_6-cJaT
+mzy06WyfXQeAd9kvGGAegkJtMKcT9nXis_WrJ22vcOazbtVeOXYvBoy8OcPIBuC9018VZSp6hZ5nC-umxnb6pirrSP6B94R6JQt9CD4oyRwfYU3aB4szfW9A
+2C-0BYa0tYG104qZ0E0juXXrIE98zaafpdJR6EwiTPaptNrcYZZf8iUIvExrvsBZaPUSYXImDFbLUD4vX1_b8D5RXM0dYLkaWiHK6aZqMbHy1m
+}
+
+AzureEntityColoring(AzureIoTHubSecurity)
+!define AzureIoTHubSecurity(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIoTHubSecurity, AzureIoTHubSecurity)
+!define AzureIoTHubSecurity(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIoTHubSecurity, AzureIoTHubSecurity)
diff --git a/dist/InternetOfThings/AzureIoTHubSecurity.svg b/dist/InternetOfThings/AzureIoTHubSecurity.svg
new file mode 100644
index 00000000..9587cc54
--- /dev/null
+++ b/dist/InternetOfThings/AzureIoTHubSecurity.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="52pt" height="70pt" viewBox="0 0 52 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 43.4375 8.582031 C 28.222656 6.882813 25.675781 0.269531 25.675781 0.269531 C 25.675781 0.269531 22.25 8.972656 0.367188 8.972656 L 0.367188 44.683594 C 0.367188 49.003906 2.738281 53.054688 6.03125 56.585938 C 13.496094 64.597656 25.675781 69.996094 25.675781 69.996094 C 25.675781 69.996094 50.996094 58.800781 50.996094 44.683594 L 50.996094 8.972656 L 50.746094 8.972656 C 48.199219 8.972656 45.65625 8.832031 43.128906 8.550781 L 43.4375 8.578125 Z M 43.4375 8.582031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(58.823529%,76.862745%,7.843137%);fill-opacity:1;" d="M 25.3125 0 C 25.3125 0 21.882813 8.703125 0 8.703125 L 0 44.421875 C 0 48.742188 2.371094 52.785156 5.664063 56.316406 L 43.070313 8.3125 C 27.855469 6.621094 25.3125 0 25.3125 0 Z M 25.3125 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.210938 47.40625 C 34.851563 47.410156 33.625 46.574219 33.113281 45.300781 C 32.597656 44.027344 32.902344 42.566406 33.878906 41.609375 L 30.3125 35.308594 C 29.410156 35.617188 28.425781 35.589844 27.539063 35.234375 L 27.566406 35.242188 L 24.957031 39.621094 C 25.933594 40.597656 26.09375 42.136719 25.332031 43.296875 C 24.574219 44.453125 23.109375 44.910156 21.835938 44.378906 C 20.5625 43.851563 19.835938 42.488281 20.101563 41.125 C 20.371094 39.761719 21.554688 38.777344 22.933594 38.78125 L 22.9375 38.78125 C 23.0625 38.785156 23.179688 38.796875 23.296875 38.816406 L 23.28125 38.816406 L 26.027344 34.21875 C 25.535156 33.71875 25.175781 33.105469 24.980469 32.429688 L 24.972656 32.398438 L 14.121094 33.308594 C 13.898438 34.71875 12.695313 35.761719 11.28125 35.769531 C 9.867188 35.777344 8.652344 34.75 8.410156 33.34375 C 8.171875 31.933594 8.976563 30.558594 10.3125 30.085938 C 11.648438 29.617188 13.125 30.191406 13.804688 31.441406 L 13.808594 31.457031 L 24.84375 30.535156 C 24.984375 29.699219 25.34375 28.960938 25.863281 28.371094 L 25.855469 28.375 L 22.0625 22.941406 C 20.367188 23.558594 18.484375 22.8125 17.65625 21.195313 C 16.828125 19.578125 17.316406 17.59375 18.796875 16.558594 C 20.277344 15.519531 22.292969 15.753906 23.5 17.101563 C 24.710938 18.449219 24.746094 20.492188 23.578125 21.878906 L 23.582031 21.875 L 27.332031 27.261719 C 29.246094 26.402344 31.496094 27.074219 32.636719 28.847656 C 33.777344 30.621094 33.472656 32.964844 31.917969 34.382813 L 31.914063 34.386719 L 35.507813 40.726563 C 36.765625 40.445313 38.066406 40.917969 38.859375 41.9375 C 39.652344 42.957031 39.796875 44.347656 39.230469 45.511719 C 38.664063 46.675781 37.488281 47.410156 36.203125 47.402344 Z M 36.210938 47.40625 "/>
+</g>
+</svg>
diff --git a/dist/InternetOfThings/AzureMaps(m).png b/dist/InternetOfThings/AzureMaps(m).png
index 56e87a33..d629941d 100644
Binary files a/dist/InternetOfThings/AzureMaps(m).png and b/dist/InternetOfThings/AzureMaps(m).png differ
diff --git a/dist/InternetOfThings/AzureMaps(m).svg b/dist/InternetOfThings/AzureMaps(m).svg
index 47d49b5a..7898a3f1 100644
--- a/dist/InternetOfThings/AzureMaps(m).svg
+++ b/dist/InternetOfThings/AzureMaps(m).svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="54pt" height="70pt" viewBox="0 0 54 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,146,254);fill-opacity:1;" d="M 30.503906 6.792969 L 52.890625 61.917969 L 53.292969 62.847656 L 38.101563 -5.160156 Z M 30.503906 6.792969 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,79,138);fill-opacity:1;" d="M 43.011719 37.59375 L 1.261719 54.046875 L 30.601563 6.761719 Z M 43.011719 37.59375 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,112,196);fill-opacity:1;" d="M 53.296875 62.847656 L 43.011719 37.59375 L 29.246094 43.011719 Z M 53.296875 62.847656 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.101563 -6.21875 C 37.746094 -6.21875 37.410156 -6.035156 37.21875 -5.726563 L 0.277344 53.515625 C 0.0390625 53.902344 0.0703125 54.402344 0.355469 54.753906 C 0.558594 55.003906 0.855469 55.140625 1.160156 55.140625 C 1.285156 55.140625 1.414063 55.117188 1.539063 55.070313 L 29.066406 44.226563 L 52.636719 63.671875 C 52.828125 63.828125 53.0625 63.90625 53.296875 63.90625 C 53.488281 63.90625 53.675781 63.855469 53.847656 63.75 C 54.226563 63.511719 54.414063 63.054688 54.3125 62.617188 L 39.117188 -5.394531 C 39.023438 -5.8125 38.691406 -6.132813 38.277344 -6.203125 C 38.21875 -6.214844 38.160156 -6.21875 38.101563 -6.21875 M 38.101563 -5.160156 L 53.296875 62.847656 L 29.253906 43.019531 L 1.261719 54.042969 L 38.101563 -5.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 38.0625 0 L 0.0234375 60.867188 L 47.648438 42.25 Z M 38.0625 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 30.375 12.300781 L 53.976563 70 L 38.0625 0 Z M 30.375 12.300781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 29.007813 49.535156 L 43.316406 43.945313 L 53.976563 70 Z M 29.007813 49.535156 "/>
 </g>
 </svg>
diff --git a/dist/InternetOfThings/AzureMaps.png b/dist/InternetOfThings/AzureMaps.png
index c830c591..06e85e3a 100644
Binary files a/dist/InternetOfThings/AzureMaps.png and b/dist/InternetOfThings/AzureMaps.png differ
diff --git a/dist/InternetOfThings/AzureMaps.puml b/dist/InternetOfThings/AzureMaps.puml
index f81e721c..5ee42002 100644
--- a/dist/InternetOfThings/AzureMaps.puml
+++ b/dist/InternetOfThings/AzureMaps.puml
@@ -1,8 +1,9 @@
 sprite $AzureMaps [54x70/16z] {
-rPH95jim34CzcmFkVzxM4vzKYnRPNVusxmSIe6Jeij1VXYpqFzPE1rDEckXaoLbqiQUabMuoqaWFOxgAWpakBMhM5hS0CkBz0PAs9i32uZlhOJ5HQkSL1qgf
-dKTSv2x6k93CpZCUCZkhMHpVUODXVOIgCCAMe422Eo-e2Ewig8ZjlCEe-kY-sfh8plAofB_p2ZXXwuU51jsB4HfenvhHfBEpeebyxhp1uMld4HvV5sDugB_p
-0X-_3eKFUpllG2_CURLfI_014riTmIg4M4JsriuVCNBIsfdyc8SZh5U5nLJMs9kAvqKgs7RsVi2wZSS9QcslTnvVCSy7N5h_BCQl6AE-MMdDZHXZgwsngi9Y
-NfIT57zlMpl6cCgmhQf2rqRCgnCYAbwjxU105dPR2tGTkcncNT_ln7YTsCun9ZjY7Ek4KfPriezPRJkiQjLm9rj6i4xs8S_8b7Piu3nc_Ho_pny
+dP9PjiCW34CnWt78_jVxXl06LBUDpFtDqRcEH69eQOEiakAerdYegceu9BgJqfrKkL9bHwN1xfjEmbN4K_gBXAQQn7Rk-aT0jPCIiusKcarPPETYDcMXdUsR
+7ZonsKKibSrGbgcf84NkN6qIEb5c0cJKL4ucP1KeAsGLc6fi5NWYMmNAw2ecpCx57kd4pWQG9pRpw8IPoik4cChB2ZaLoXepbJ-HdGfFPAT2MIQhG5bbfq8P
+MmMcs2hmH26hG9dVsMvuccetAdlsElBxp76UrudyLDt6-SNmTTItcedxCNclcTZZwz2tciayyMOgBQcE4-YOwivIvIfsE5b-ETN_9y4Rrph4QHRwch9bv-uq
+A-r11bM01gW3-X2u3pH07ciVPQcYr_GQiUN4-lTg6seyVUbZLl5EupkvKXKqRoZZjmykW9qC9KxpdMXB5DZ9eIb86zyoIG3NIIyfIZxE0NNGdMZQe1-o4slb
+4m
 }
 
 AzureEntityColoring(AzureMaps)
diff --git a/dist/InternetOfThings/AzureMaps.svg b/dist/InternetOfThings/AzureMaps.svg
index bd4dbd1b..9456a2d5 100644
--- a/dist/InternetOfThings/AzureMaps.svg
+++ b/dist/InternetOfThings/AzureMaps.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="54pt" height="70pt" viewBox="0 0 54 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(4.313725%,67.058824%,81.960784%);fill-opacity:1;" d="M 30.503906 6.792969 L 52.890625 61.917969 L 53.292969 62.847656 L 38.101563 -5.160156 Z M 30.503906 6.792969 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,34.509804%,63.137255%);fill-opacity:1;" d="M 43.011719 37.59375 L 1.261719 54.046875 L 30.601563 6.761719 Z M 43.011719 37.59375 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(11.764706%,45.490196%,74.117647%);fill-opacity:1;" d="M 53.296875 62.847656 L 43.011719 37.59375 L 29.246094 43.011719 Z M 53.296875 62.847656 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.101563 -6.21875 C 37.746094 -6.21875 37.410156 -6.035156 37.21875 -5.726563 L 0.277344 53.515625 C 0.0390625 53.902344 0.0703125 54.402344 0.355469 54.753906 C 0.558594 55.003906 0.855469 55.140625 1.160156 55.140625 C 1.285156 55.140625 1.414063 55.117188 1.539063 55.070313 L 29.066406 44.226563 L 52.636719 63.671875 C 52.828125 63.828125 53.0625 63.90625 53.296875 63.90625 C 53.488281 63.90625 53.675781 63.855469 53.847656 63.75 C 54.226563 63.511719 54.414063 63.054688 54.3125 62.617188 L 39.117188 -5.394531 C 39.023438 -5.8125 38.691406 -6.132813 38.277344 -6.203125 C 38.21875 -6.214844 38.160156 -6.21875 38.101563 -6.21875 M 38.101563 -5.160156 L 53.296875 62.847656 L 29.253906 43.019531 L 1.261719 54.042969 L 38.101563 -5.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 38.0625 0 L 0.0234375 60.867188 L 47.648438 42.25 Z M 38.0625 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 30.375 12.300781 L 53.976563 70 L 38.0625 0 Z M 30.375 12.300781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 29.007813 49.535156 L 43.316406 43.945313 L 53.976563 70 Z M 29.007813 49.535156 "/>
 </g>
 </svg>
diff --git a/dist/InternetOfThings/AzureSphere(m).png b/dist/InternetOfThings/AzureSphere(m).png
new file mode 100644
index 00000000..c0abc033
Binary files /dev/null and b/dist/InternetOfThings/AzureSphere(m).png differ
diff --git a/dist/InternetOfThings/AzureSphere(m).svg b/dist/InternetOfThings/AzureSphere(m).svg
new file mode 100644
index 00000000..ed76dba2
--- /dev/null
+++ b/dist/InternetOfThings/AzureSphere(m).svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 64.398438 37.800781 C 64.398438 54.039063 51.238281 67.199219 35 67.199219 C 18.761719 67.199219 5.601563 54.039063 5.601563 37.800781 C 5.601563 21.5625 18.761719 8.398438 35 8.398438 C 51.238281 8.398438 64.398438 21.5625 64.398438 37.800781 Z M 64.398438 37.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style="fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0,102,178);stroke-opacity:1;stroke-miterlimit:10;" d="M 47.000558 27.000558 C 47.000558 39.148996 37.151228 49.001116 25 49.001116 C 12.848772 49.001116 2.999442 39.148996 2.999442 27.000558 C 2.999442 14.84933 12.848772 5 25 5 C 37.151228 5 47.000558 14.84933 47.000558 27.000558 Z M 47.000558 27.000558 " transform="matrix(1.4,0,0,1.4,0,0)"/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 34.265625 59.992188 C 30.496094 57.675781 18.199219 49.359375 18.199219 39.65625 L 18.199219 27.246094 L 19.511719 27.164063 C 24.773438 26.839844 26.8125 25.484375 28.613281 24.289063 C 30.148438 23.277344 31.472656 22.398438 35 22.398438 C 38.523438 22.398438 39.910156 23.3125 41.378906 24.285156 C 43.183594 25.484375 45.226563 26.839844 50.488281 27.164063 L 51.800781 27.246094 L 51.800781 39.65625 C 51.800781 49.363281 39.503906 57.675781 35.730469 59.992188 L 35 60.445313 Z M 34.265625 59.992188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.800781 56 C 65.800781 59.09375 63.292969 61.601563 60.199219 61.601563 C 57.105469 61.601563 54.601563 59.09375 54.601563 56 C 54.601563 52.90625 57.105469 50.398438 60.199219 50.398438 C 63.292969 50.398438 65.800781 52.90625 65.800781 56 Z M 65.800781 56 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 60.199219 50.398438 C 63.292969 50.398438 65.800781 52.90625 65.800781 56 C 65.800781 59.09375 63.292969 61.601563 60.199219 61.601563 C 57.105469 61.601563 54.601563 59.09375 54.601563 56 C 54.601563 52.90625 57.105469 50.398438 60.199219 50.398438 M 60.199219 47.601563 C 55.570313 47.601563 51.800781 51.367188 51.800781 56 C 51.800781 60.632813 55.570313 64.398438 60.199219 64.398438 C 64.832031 64.398438 68.601563 60.632813 68.601563 56 C 68.601563 51.367188 64.832031 47.601563 60.199219 47.601563 Z M 60.199219 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 15.398438 56 C 15.398438 59.09375 12.894531 61.601563 9.800781 61.601563 C 6.707031 61.601563 4.199219 59.09375 4.199219 56 C 4.199219 52.90625 6.707031 50.398438 9.800781 50.398438 C 12.894531 50.398438 15.398438 52.90625 15.398438 56 Z M 15.398438 56 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 9.800781 50.398438 C 12.894531 50.398438 15.398438 52.90625 15.398438 56 C 15.398438 59.09375 12.894531 61.601563 9.800781 61.601563 C 6.707031 61.601563 4.199219 59.09375 4.199219 56 C 4.199219 52.90625 6.707031 50.398438 9.800781 50.398438 M 9.800781 47.601563 C 5.167969 47.601563 1.398438 51.367188 1.398438 56 C 1.398438 60.632813 5.167969 64.398438 9.800781 64.398438 C 14.429688 64.398438 18.199219 60.632813 18.199219 56 C 18.199219 51.367188 14.429688 47.601563 9.800781 47.601563 Z M 9.800781 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 40.601563 8.398438 C 40.601563 11.492188 38.09375 14 35 14 C 31.90625 14 29.398438 11.492188 29.398438 8.398438 C 29.398438 5.308594 31.90625 2.800781 35 2.800781 C 38.09375 2.800781 40.601563 5.308594 40.601563 8.398438 Z M 40.601563 8.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 35 2.800781 C 38.09375 2.800781 40.601563 5.308594 40.601563 8.398438 C 40.601563 11.492188 38.09375 14 35 14 C 31.90625 14 29.398438 11.492188 29.398438 8.398438 C 29.398438 5.308594 31.90625 2.800781 35 2.800781 M 35 0 C 30.367188 0 26.601563 3.769531 26.601563 8.398438 C 26.601563 13.03125 30.367188 16.800781 35 16.800781 C 39.632813 16.800781 43.398438 13.03125 43.398438 8.398438 C 43.398438 3.769531 39.632813 0 35 0 Z M 35 0 "/>
+</g>
+</svg>
diff --git a/dist/InternetOfThings/AzureSphere.png b/dist/InternetOfThings/AzureSphere.png
new file mode 100644
index 00000000..56f574c1
Binary files /dev/null and b/dist/InternetOfThings/AzureSphere.png differ
diff --git a/dist/InternetOfThings/AzureSphere.puml b/dist/InternetOfThings/AzureSphere.puml
new file mode 100644
index 00000000..274c4b47
--- /dev/null
+++ b/dist/InternetOfThings/AzureSphere.puml
@@ -0,0 +1,15 @@
+sprite $AzureSphere [70x70/16z] {
+hLZXOl8m23GG0k3xl--NfalFz8jcxRnVavdpE2WI7v-Hn29S-V4Nb7Zki7IVnEhvSD-eWcuhgOTb4y5U_xgfXZO5K5NkiUZpcG-NuwOOgWVnwfQO95ujTGHa
+S_XQnNahpiZ2UoJarnpUtb-PR63n-3rFqgQYyEXBZGfbtOXydLTkxnEgs0r5ZRZ6kF7ekhfLCpLKmiW_95wFKaFppEbJDfiZolG3hOnAMy6g03_2swlWZoGX
+15YpSpSr8ypsmUJKFn7eptJO6DyIbtTAEWd0nTnTCvrGDdNpCG2IDSfyM9I1P0sT3GlUVAShG6yFpWfT0WSc1xfDwIBoEIUAT_baAKM4trbJJlMHcMWz-YNF
+SueqJ5YVLJEUW4tqb46CpgI8FmT4uSzY_dE5iu83F2Py5eCovIgCy1_pUBv5k2ceUEiPU9k7Rbe0B5GLfoCXfviiIAdAqhii-HYVWWfTPi68LyGliE3TEui_
+WswpL0dKk-Ks2-n5-zzWaPy1dBx5OdzYATzX-Kv6tt5tLcbTaSHqDlWObnMBqwphTDJ8AnOzvJzz6iaNB9bcJoEVwEL2GfWCmvHQYv6PkNrYClzEZC50vjU9
+cVSjD2olMWOh0UkcE5wcDyNfgujZbG--yFIL9CpsNRQlbtCeEZFSce7bM3eYzrtNi4TEO31EqtRM-lgXK9LYb7o68s71bXsfdOnXswUtQemFAOPDhZ7cdbb_
+flWTZJ5AoDZ26gKWLA5eyBF5Ygw4-dqaD4Nq6FIXhHmS8NHcWVoc9K-quERGu7byGWOjlZ-BZ-ac0tD2Xw3YWu_pyR94sp39SNFui5pwxcl6BgwuUm3IXG0E
+cdh4ku0eb18RN9m3hk-t_fGT4coiA2z8nWx0VKkYLqANSffYPvtz69ABQM7SFjzob7xxJAAcGeyvaZLLiwKTD-4BjtB9WmhHk7YxDootgaMrhy03nnfKPhlt
+ZT-dAAi764m-KFm3
+}
+
+AzureEntityColoring(AzureSphere)
+!define AzureSphere(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSphere, AzureSphere)
+!define AzureSphere(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSphere, AzureSphere)
diff --git a/dist/InternetOfThings/AzureSphere.svg b/dist/InternetOfThings/AzureSphere.svg
new file mode 100644
index 00000000..6def1674
--- /dev/null
+++ b/dist/InternetOfThings/AzureSphere.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 64.398438 37.800781 C 64.398438 54.039063 51.238281 67.199219 35 67.199219 C 18.761719 67.199219 5.601563 54.039063 5.601563 37.800781 C 5.601563 21.5625 18.761719 8.398438 35 8.398438 C 51.238281 8.398438 64.398438 21.5625 64.398438 37.800781 Z M 64.398438 37.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style="fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,44.705882%,77.647059%);stroke-opacity:1;stroke-miterlimit:10;" d="M 47.000558 27.000558 C 47.000558 39.148996 37.151228 49.001116 25 49.001116 C 12.848772 49.001116 2.999442 39.148996 2.999442 27.000558 C 2.999442 14.84933 12.848772 5 25 5 C 37.151228 5 47.000558 14.84933 47.000558 27.000558 Z M 47.000558 27.000558 " transform="matrix(1.4,0,0,1.4,0,0)"/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 34.265625 59.992188 C 30.496094 57.675781 18.199219 49.359375 18.199219 39.65625 L 18.199219 27.246094 L 19.511719 27.164063 C 24.773438 26.839844 26.8125 25.484375 28.613281 24.289063 C 30.148438 23.277344 31.472656 22.398438 35 22.398438 C 38.523438 22.398438 39.910156 23.3125 41.378906 24.285156 C 43.183594 25.484375 45.226563 26.839844 50.488281 27.164063 L 51.800781 27.246094 L 51.800781 39.65625 C 51.800781 49.363281 39.503906 57.675781 35.730469 59.992188 L 35 60.445313 Z M 34.265625 59.992188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.800781 56 C 65.800781 59.09375 63.292969 61.601563 60.199219 61.601563 C 57.105469 61.601563 54.601563 59.09375 54.601563 56 C 54.601563 52.90625 57.105469 50.398438 60.199219 50.398438 C 63.292969 50.398438 65.800781 52.90625 65.800781 56 Z M 65.800781 56 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 60.199219 50.398438 C 63.292969 50.398438 65.800781 52.90625 65.800781 56 C 65.800781 59.09375 63.292969 61.601563 60.199219 61.601563 C 57.105469 61.601563 54.601563 59.09375 54.601563 56 C 54.601563 52.90625 57.105469 50.398438 60.199219 50.398438 M 60.199219 47.601563 C 55.570313 47.601563 51.800781 51.367188 51.800781 56 C 51.800781 60.632813 55.570313 64.398438 60.199219 64.398438 C 64.832031 64.398438 68.601563 60.632813 68.601563 56 C 68.601563 51.367188 64.832031 47.601563 60.199219 47.601563 Z M 60.199219 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 15.398438 56 C 15.398438 59.09375 12.894531 61.601563 9.800781 61.601563 C 6.707031 61.601563 4.199219 59.09375 4.199219 56 C 4.199219 52.90625 6.707031 50.398438 9.800781 50.398438 C 12.894531 50.398438 15.398438 52.90625 15.398438 56 Z M 15.398438 56 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 9.800781 50.398438 C 12.894531 50.398438 15.398438 52.90625 15.398438 56 C 15.398438 59.09375 12.894531 61.601563 9.800781 61.601563 C 6.707031 61.601563 4.199219 59.09375 4.199219 56 C 4.199219 52.90625 6.707031 50.398438 9.800781 50.398438 M 9.800781 47.601563 C 5.167969 47.601563 1.398438 51.367188 1.398438 56 C 1.398438 60.632813 5.167969 64.398438 9.800781 64.398438 C 14.429688 64.398438 18.199219 60.632813 18.199219 56 C 18.199219 51.367188 14.429688 47.601563 9.800781 47.601563 Z M 9.800781 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 40.601563 8.398438 C 40.601563 11.492188 38.09375 14 35 14 C 31.90625 14 29.398438 11.492188 29.398438 8.398438 C 29.398438 5.308594 31.90625 2.800781 35 2.800781 C 38.09375 2.800781 40.601563 5.308594 40.601563 8.398438 Z M 40.601563 8.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 35 2.800781 C 38.09375 2.800781 40.601563 5.308594 40.601563 8.398438 C 40.601563 11.492188 38.09375 14 35 14 C 31.90625 14 29.398438 11.492188 29.398438 8.398438 C 29.398438 5.308594 31.90625 2.800781 35 2.800781 M 35 0 C 30.367188 0 26.601563 3.769531 26.601563 8.398438 C 26.601563 13.03125 30.367188 16.800781 35 16.800781 C 39.632813 16.800781 43.398438 13.03125 43.398438 8.398438 C 43.398438 3.769531 39.632813 0 35 0 Z M 35 0 "/>
+</g>
+</svg>
diff --git a/dist/InternetOfThings/AzureTimeSeriesInsights(m).png b/dist/InternetOfThings/AzureTimeSeriesInsights(m).png
index 3ee8e54d..ad564790 100644
Binary files a/dist/InternetOfThings/AzureTimeSeriesInsights(m).png and b/dist/InternetOfThings/AzureTimeSeriesInsights(m).png differ
diff --git a/dist/InternetOfThings/AzureTimeSeriesInsights(m).svg b/dist/InternetOfThings/AzureTimeSeriesInsights(m).svg
index 02775b1e..95a8d957 100644
--- a/dist/InternetOfThings/AzureTimeSeriesInsights(m).svg
+++ b/dist/InternetOfThings/AzureTimeSeriesInsights(m).svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="68pt" height="70pt" viewBox="0 0 68 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 67.460938 26.578125 C 63.683594 10.9375 49.867188 0 34 0 C 17.917969 0 3.777344 11.59375 0.324219 27.453125 L 0 28.875 L 6.90625 28.875 L 7.125 28 C 10.253906 15.53125 21.371094 6.78125 34 6.78125 C 46.195313 6.78125 57.207031 15.203125 60.660156 27.125 L 60.875 27.890625 L 67.785156 27.890625 Z M 60.335938 43.75 L 60.121094 44.515625 C 56.128906 55.671875 45.65625 63.21875 34 63.21875 C 22.558594 63.21875 12.414063 56.21875 8.203125 45.390625 L 7.878906 44.625 L 0.863281 44.625 L 1.402344 46.15625 C 6.042969 60.375 19.210938 70 34 70 C 49.21875 70 62.496094 60.046875 67.027344 45.171875 L 67.460938 43.75 Z M 60.335938 43.75 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 37.347656 53.59375 L 29.789063 31.5 L 25.472656 39.59375 L 3.023438 39.59375 C 1.511719 39.59375 0.214844 38.28125 0.214844 36.75 C 0.214844 35.21875 1.511719 33.90625 3.023438 33.90625 L 22.128906 33.90625 L 30.976563 17.5 L 38.855469 40.6875 L 43.714844 33.03125 L 65.195313 33.03125 C 66.703125 33.03125 68 34.34375 68 35.875 C 68 37.40625 66.703125 38.71875 65.195313 38.71875 L 46.738281 38.71875 Z M 37.347656 53.59375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 68.90625 26.578125 C 65.078125 10.9375 51.078125 0 35 0 C 18.703125 0 4.375 11.59375 0.875 27.453125 L 0.546875 28.875 L 7.546875 28.875 L 7.765625 28 C 10.9375 15.53125 22.203125 6.78125 35 6.78125 C 47.359375 6.78125 58.515625 15.203125 62.015625 27.125 L 62.234375 27.890625 L 69.234375 27.890625 Z M 61.6875 43.75 L 61.46875 44.515625 C 57.421875 55.671875 46.8125 63.21875 35 63.21875 C 23.40625 63.21875 13.125 56.21875 8.859375 45.390625 L 8.53125 44.625 L 1.421875 44.625 L 1.96875 46.15625 C 6.671875 60.375 20.015625 70 35 70 C 50.421875 70 63.875 60.046875 68.46875 45.171875 L 68.90625 43.75 Z M 61.6875 43.75 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,139,242);fill-opacity:1;" d="M 38.390625 53.59375 L 30.734375 31.5 L 26.359375 39.59375 L 3.609375 39.59375 C 2.078125 39.59375 0.765625 38.28125 0.765625 36.75 C 0.765625 35.21875 2.078125 33.90625 3.609375 33.90625 L 22.96875 33.90625 L 31.9375 17.5 L 39.921875 40.6875 L 44.84375 33.03125 L 66.609375 33.03125 C 68.140625 33.03125 69.453125 34.34375 69.453125 35.875 C 69.453125 37.40625 68.140625 38.71875 66.609375 38.71875 L 47.90625 38.71875 Z M 38.390625 53.59375 "/>
 </g>
 </svg>
diff --git a/dist/InternetOfThings/AzureTimeSeriesInsights.png b/dist/InternetOfThings/AzureTimeSeriesInsights.png
index 03e1dfa2..c3e2d5b1 100644
Binary files a/dist/InternetOfThings/AzureTimeSeriesInsights.png and b/dist/InternetOfThings/AzureTimeSeriesInsights.png differ
diff --git a/dist/InternetOfThings/AzureTimeSeriesInsights.puml b/dist/InternetOfThings/AzureTimeSeriesInsights.puml
index 9dca80d9..4d58bfea 100644
--- a/dist/InternetOfThings/AzureTimeSeriesInsights.puml
+++ b/dist/InternetOfThings/AzureTimeSeriesInsights.puml
@@ -1,10 +1,10 @@
-sprite $AzureTimeSeriesInsights [68x70/16z] {
-fPW7qkim28Gjwkh-1txLZJ_Pe8ntUepNVC2ePACQQf70d426wzY-bJZc3y5bMzSe1iLcB3h4_A1OISPde-XoKSnMi8yMBnX09bvyawSY9HYtVefwVQODH-a0
-Q_Tx7ki_OpSN9nR5WRbm4xrwrqmFnH6U14zOgpiEYpA6JVjGwfxrLwxwnIpfKGjkKkiwc4MFSw97gT6Iz0UDyAanMcAltyrYMGJVc71_IofQ_HYOHNqjw7WE
-5EUYyjxHbF4-YiF8zQAHD7Ptj0kMdHKL5YDT8dcWW8RurhLcA8tCwivdH9sXxEOBCB7dGz8WrIPYQN2ONfXakIAY2nvQc3uDnGCOtwV7xp2QxnJwzmbUTNHL
-RZ23RUScaoeF9koZJuJW7d92QMdsgiT1SC5WCZbd6LU3S2GqyIhRDebyAxztIEN1k1qm-MZQybQyyM3goM5XMQFC2udvhmKO8K_aN1HR62SPNett3WPiEOqh
-f8DHjap9HMMVOO8nuhPouYCC1ZiBsJqd_mHZRAT4BRnmcAJhljVYWCC88y7huOf8wU1PPUCbuVUSPEVDTOivQeMu2RUetVBr7Nha5Kky8QktnYILxdX6p691
-JM0BrwWStSffexd2vyhjDkjPNIph1iPaimWPRd_aaRFAchvrwbjdU7JTFohtu6-7Ml_kJvHU6dXZ4DzksM9t7uJpGlu6
+sprite $AzureTimeSeriesInsights [70x70/16z] {
+fPW5ilGm38CRS-v_u1yUUDnj5BVJR-11TcN9WSAnWSKy8cQ4cp8Tpo6D-K6OZ2SIeqYSSRvjm-Q6a5i-KkE5ZiJiSTeRyKlXS8-hyiuEnqcWpEvWzRCTE5rw
+ag2BKQb20MGCJ2YOlg2zIF018IyoEn4zjd1W6MsD9CDHRxZfFV3jP_ce_-xHPNe78hrCoI-_EGy0becI1ouaZ7zcidHtWGNA_BRofpJDRsprKTmfEfint1J9
+KWkicXcRpHwxCs14CQFOYkudltupe9KHQNZROCuc1GmkhHdBttHXfLlFwI1Np-Qiw2FHaNAWq9r8md35-MntLm_FX8w69ZBgV4yzB28ZlR4Y_YgI_fYG6cdu
+4ljVH3qkvD8UDP9D086XNBKb4a-4ZOcX_AfcgvOuKiaDb95qGdYJY4epA7VUbQzR0_4rMjUm_UJnLoidjDdV7JMoljkMxtTttDdSuuidDmZ9oDEG-zCLvf7y
+RfwTRIH60r8k1rqaWtqVnJ3XIE2sn6jzRpiJopoIvQintaLorAuSyUvMYkeOkdUYsMKAWNcyo3RRXF6LawwtktBSX69HMEOpcImRw-qlJvnSckuFZf1qFXbv
+d3vk7ri2elPsUFyvYXjFpEGpKTpur5dbOfz013vDkz1fa2tAQ71xE2PkAi8YwZ5F1BKheSVwEvSMf_SlFO9VlCJ1J_qOjbX9o3WUGbALmfMnn5y
 }
 
 AzureEntityColoring(AzureTimeSeriesInsights)
diff --git a/dist/InternetOfThings/AzureTimeSeriesInsights.svg b/dist/InternetOfThings/AzureTimeSeriesInsights.svg
index 6a53ce1f..a70cf5c5 100644
--- a/dist/InternetOfThings/AzureTimeSeriesInsights.svg
+++ b/dist/InternetOfThings/AzureTimeSeriesInsights.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="68pt" height="70pt" viewBox="0 0 68 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,69.803922%,58.039216%);fill-opacity:1;" d="M 67.460938 26.578125 C 63.683594 10.9375 49.867188 0 34 0 C 17.917969 0 3.777344 11.59375 0.324219 27.453125 L 0 28.875 L 6.90625 28.875 L 7.125 28 C 10.253906 15.53125 21.371094 6.78125 34 6.78125 C 46.195313 6.78125 57.207031 15.203125 60.660156 27.125 L 60.875 27.890625 L 67.785156 27.890625 Z M 60.335938 43.75 L 60.121094 44.515625 C 56.128906 55.671875 45.65625 63.21875 34 63.21875 C 22.558594 63.21875 12.414063 56.21875 8.203125 45.390625 L 7.878906 44.625 L 0.863281 44.625 L 1.402344 46.15625 C 6.042969 60.375 19.210938 70 34 70 C 49.21875 70 62.496094 60.046875 67.027344 45.171875 L 67.460938 43.75 Z M 60.335938 43.75 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,69.803922%,58.039216%);fill-opacity:1;" d="M 37.347656 53.59375 L 29.789063 31.5 L 25.472656 39.59375 L 3.023438 39.59375 C 1.511719 39.59375 0.214844 38.28125 0.214844 36.75 C 0.214844 35.21875 1.511719 33.90625 3.023438 33.90625 L 22.128906 33.90625 L 30.976563 17.5 L 38.855469 40.6875 L 43.714844 33.03125 L 65.195313 33.03125 C 66.703125 33.03125 68 34.34375 68 35.875 C 68 37.40625 66.703125 38.71875 65.195313 38.71875 L 46.738281 38.71875 Z M 37.347656 53.59375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,69.803922%,58.039216%);fill-opacity:1;" d="M 68.90625 26.578125 C 65.078125 10.9375 51.078125 0 35 0 C 18.703125 0 4.375 11.59375 0.875 27.453125 L 0.546875 28.875 L 7.546875 28.875 L 7.765625 28 C 10.9375 15.53125 22.203125 6.78125 35 6.78125 C 47.359375 6.78125 58.515625 15.203125 62.015625 27.125 L 62.234375 27.890625 L 69.234375 27.890625 Z M 61.6875 43.75 L 61.46875 44.515625 C 57.421875 55.671875 46.8125 63.21875 35 63.21875 C 23.40625 63.21875 13.125 56.21875 8.859375 45.390625 L 8.53125 44.625 L 1.421875 44.625 L 1.96875 46.15625 C 6.671875 60.375 20.015625 70 35 70 C 50.421875 70 63.875 60.046875 68.46875 45.171875 L 68.90625 43.75 Z M 61.6875 43.75 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,69.803922%,58.039216%);fill-opacity:1;" d="M 38.390625 53.59375 L 30.734375 31.5 L 26.359375 39.59375 L 3.609375 39.59375 C 2.078125 39.59375 0.765625 38.28125 0.765625 36.75 C 0.765625 35.21875 2.078125 33.90625 3.609375 33.90625 L 22.96875 33.90625 L 31.9375 17.5 L 39.921875 40.6875 L 44.84375 33.03125 L 66.609375 33.03125 C 68.140625 33.03125 69.453125 34.34375 69.453125 35.875 C 69.453125 37.40625 68.140625 38.71875 66.609375 38.71875 L 47.90625 38.71875 Z M 38.390625 53.59375 "/>
 </g>
 </svg>
diff --git a/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources(m).png b/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources(m).png
new file mode 100644
index 00000000..c4fdea65
Binary files /dev/null and b/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources(m).png differ
diff --git a/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources(m).svg b/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources(m).svg
new file mode 100644
index 00000000..7f1c3fca
--- /dev/null
+++ b/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources(m).svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 34.160156 33.601563 L 27.300781 26.320313 L 32.898438 26.320313 L 42 35.699219 L 32.898438 45.078125 L 27.300781 45.078125 L 34.160156 37.941406 L 9.378906 37.941406 L 9.378906 33.601563 Z M 34.160156 33.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 60.621094 57.960938 L 17.078125 57.960938 L 17.078125 43.539063 L 23.378906 43.539063 L 23.378906 51.800781 L 54.460938 51.800781 L 54.460938 43.539063 L 60.621094 43.539063 Z M 60.621094 28 L 54.460938 28 L 54.460938 18.199219 L 23.378906 18.199219 L 23.378906 28 L 17.078125 28 L 17.078125 12.039063 L 60.621094 12.039063 Z M 60.621094 28 "/>
+</g>
+</svg>
diff --git a/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources.png b/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources.png
new file mode 100644
index 00000000..8a4597f1
Binary files /dev/null and b/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources.png differ
diff --git a/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources.puml b/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources.puml
new file mode 100644
index 00000000..f2a7c9f7
--- /dev/null
+++ b/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources.puml
@@ -0,0 +1,8 @@
+sprite $AzureTimeSeriesInsightsEventsSources [70x70/16z] {
+xTR7WSCm34HHZ9ZPVxzAvmLtH6TxNW7_Xc3t9o8nySoLCc-keafSXW9N2JQ4RwgeWdJ0ZHLBVTSmKp4Sx9JzpCaunSlutZzJZqnbC_2MG3ipnabzgB8LFZDV
+AVUe5EFWRqlp8xnwjqXzXqYPZU3qNmGdOaivaSiRCno--vAeajFGIxz3LN217KHa0m
+}
+
+AzureEntityColoring(AzureTimeSeriesInsightsEventsSources)
+!define AzureTimeSeriesInsightsEventsSources(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTimeSeriesInsightsEventsSources, AzureTimeSeriesInsightsEventsSources)
+!define AzureTimeSeriesInsightsEventsSources(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTimeSeriesInsightsEventsSources, AzureTimeSeriesInsightsEventsSources)
diff --git a/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources.svg b/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources.svg
new file mode 100644
index 00000000..f0eac42a
--- /dev/null
+++ b/dist/InternetOfThings/AzureTimeSeriesInsightsEventsSources.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 34.160156 33.601563 L 27.300781 26.320313 L 32.898438 26.320313 L 42 35.699219 L 32.898438 45.078125 L 27.300781 45.078125 L 34.160156 37.941406 L 9.378906 37.941406 L 9.378906 33.601563 Z M 34.160156 33.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 60.621094 57.960938 L 17.078125 57.960938 L 17.078125 43.539063 L 23.378906 43.539063 L 23.378906 51.800781 L 54.460938 51.800781 L 54.460938 43.539063 L 60.621094 43.539063 Z M 60.621094 28 L 54.460938 28 L 54.460938 18.199219 L 23.378906 18.199219 L 23.378906 28 L 17.078125 28 L 17.078125 12.039063 L 60.621094 12.039063 Z M 60.621094 28 "/>
+</g>
+</svg>
diff --git a/dist/InternetOfThings/AzureWindows10IoTCoreServices(m).png b/dist/InternetOfThings/AzureWindows10IoTCoreServices(m).png
new file mode 100644
index 00000000..1a00ac14
Binary files /dev/null and b/dist/InternetOfThings/AzureWindows10IoTCoreServices(m).png differ
diff --git a/dist/InternetOfThings/AzureWindows10IoTCoreServices(m).svg b/dist/InternetOfThings/AzureWindows10IoTCoreServices(m).svg
new file mode 100644
index 00000000..964d1702
--- /dev/null
+++ b/dist/InternetOfThings/AzureWindows10IoTCoreServices(m).svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 56.074219 7.21875 L 59.171875 1.167969 C 59.273438 0.964844 59.261719 0.71875 59.136719 0.527344 C 59.011719 0.332031 58.792969 0.222656 58.5625 0.234375 L 35.859375 1.382813 C 35.628906 1.398438 35.425781 1.53125 35.320313 1.734375 C 35.21875 1.941406 35.230469 2.183594 35.355469 2.378906 L 47.699219 21.46875 C 47.824219 21.660156 48.042969 21.769531 48.273438 21.757813 C 48.5 21.746094 48.707031 21.613281 48.8125 21.410156 L 51.53125 16.105469 C 51.625 15.925781 51.796875 15.796875 51.996094 15.761719 C 52.195313 15.726563 52.398438 15.789063 52.546875 15.925781 C 56.824219 20.074219 61.335938 26.433594 61.335938 34.828125 C 61.335938 44.214844 56.382813 52.90625 48.308594 57.695313 C 40.238281 62.488281 30.234375 62.664063 21.996094 58.167969 C 21.695313 58.003906 21.316406 58.105469 21.136719 58.398438 L 17.609375 64.511719 C 17.519531 64.664063 17.492188 64.84375 17.539063 65.015625 C 17.585938 65.183594 17.699219 65.328125 17.855469 65.410156 C 28.675781 71.390625 41.855469 71.203125 52.503906 64.921875 C 63.152344 58.636719 69.6875 47.191406 69.6875 34.828125 C 69.6875 24.824219 64.929688 15.441406 56.238281 7.996094 C 56.011719 7.804688 55.945313 7.484375 56.074219 7.21875 Z M 56.074219 7.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 22.289063 66.472656 L 23.910156 63.660156 C 34.703125 67.707031 46.859375 65.277344 55.273438 57.390625 C 63.683594 49.507813 66.890625 37.535156 63.550781 26.5 C 60.207031 15.464844 50.894531 7.285156 39.523438 5.390625 L 39.523438 2.160156 C 39.523438 1.757813 39.109375 2.160156 38.789063 1.964844 L 36.582031 2.035156 C 36.085938 2.035156 36.382813 2.683594 36.65625 3.070313 L 43.652344 15.21875 C 45.949219 16.257813 48.046875 17.679688 49.863281 19.421875 L 51.566406 16.105469 C 51.675781 15.886719 51.902344 15.75 52.144531 15.75 C 52.308594 15.746094 52.464844 15.808594 52.578125 15.925781 C 56.859375 20.074219 61.367188 26.433594 61.367188 34.828125 C 61.375 44.226563 56.417969 52.929688 48.335938 57.71875 C 40.25 62.511719 30.238281 62.679688 21.996094 58.167969 C 21.902344 58.109375 21.796875 58.082031 21.6875 58.082031 C 21.460938 58.085938 21.253906 58.203125 21.136719 58.398438 L 17.609375 64.511719 C 17.527344 64.652344 17.503906 64.816406 17.539063 64.972656 L 20.730469 66.8125 L 20.949219 66.902344 C 21.441406 67.117188 22.015625 66.933594 22.289063 66.472656 Z M 22.289063 66.472656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 16.585938 63.925781 L 20.136719 57.8125 C 20.460938 57.25 21.058594 56.90625 21.707031 56.90625 C 22.011719 56.90625 22.3125 56.984375 22.578125 57.132813 C 30.453125 61.421875 40.003906 61.246094 47.714844 56.671875 C 55.425781 52.09375 60.15625 43.796875 60.160156 34.828125 C 60.160156 27.023438 55.980469 21.050781 52.25 17.28125 L 50.699219 20.3125 C 58.289063 28.519531 58.566406 41.101563 51.34375 49.636719 C 44.121094 58.167969 31.667969 59.976563 22.316406 53.84375 C 12.96875 47.710938 9.660156 35.570313 14.609375 25.542969 C 19.558594 15.519531 31.207031 10.757813 41.761719 14.449219 L 34.355469 3.019531 C 34 2.472656 33.964844 1.78125 34.257813 1.203125 C 34.285156 1.15625 34.3125 1.113281 34.347656 1.074219 L 30.597656 1.074219 C 30.3125 1.070313 30.039063 1.183594 29.835938 1.386719 C 29.632813 1.585938 29.519531 1.859375 29.519531 2.144531 L 29.519531 5.378906 C 27.605469 5.695313 25.726563 6.199219 23.910156 6.875 L 22.289063 4.085938 C 22.144531 3.835938 21.910156 3.65625 21.636719 3.582031 C 21.359375 3.507813 21.066406 3.546875 20.820313 3.691406 L 14.019531 7.613281 C 13.507813 7.910156 13.328125 8.570313 13.628906 9.085938 L 15.25 11.90625 C 13.753906 13.136719 12.382813 14.511719 11.144531 16.003906 L 8.332031 14.378906 C 7.816406 14.082031 7.160156 14.257813 6.859375 14.773438 L 2.9375 21.574219 C 2.792969 21.820313 2.757813 22.113281 2.832031 22.386719 C 2.902344 22.664063 3.085938 22.898438 3.332031 23.039063 L 6.136719 24.664063 C 5.453125 26.480469 4.945313 28.359375 4.625 30.273438 L 1.394531 30.273438 C 0.796875 30.273438 0.3125 30.753906 0.3125 31.351563 L 0.3125 39.203125 C 0.3125 39.488281 0.425781 39.761719 0.628906 39.964844 C 0.832031 40.167969 1.105469 40.277344 1.394531 40.277344 L 4.625 40.277344 C 4.945313 42.191406 5.453125 44.070313 6.136719 45.886719 L 3.332031 47.507813 C 2.816406 47.808594 2.640625 48.464844 2.9375 48.984375 L 6.859375 55.78125 C 7.160156 56.292969 7.816406 56.46875 8.332031 56.175781 L 11.144531 54.546875 C 12.382813 56.042969 13.753906 57.414063 15.25 58.652344 L 13.628906 61.46875 C 13.484375 61.714844 13.445313 62.007813 13.519531 62.285156 C 13.59375 62.558594 13.773438 62.792969 14.019531 62.9375 L 16.425781 64.324219 C 16.464844 64.1875 16.519531 64.050781 16.585938 63.925781 Z M 16.585938 63.925781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 47.460938 25.617188 C 47.433594 25.589844 47.390625 25.570313 47.351563 25.574219 L 46.949219 25.574219 C 41.78125 25.574219 37.003906 23.460938 35.128906 20.3125 C 35.101563 20.269531 35.050781 20.242188 35 20.242188 C 34.949219 20.242188 34.898438 20.269531 34.871094 20.3125 C 32.996094 23.460938 28.246094 25.574219 23.050781 25.574219 L 22.648438 25.574219 C 22.609375 25.574219 22.570313 25.589844 22.539063 25.617188 C 22.515625 25.648438 22.5 25.683594 22.5 25.722656 L 22.5 38.003906 C 22.460938 41.539063 24.011719 48.078125 34.941406 52.511719 L 35.058594 52.511719 C 45.972656 48.078125 47.539063 41.523438 47.5 38.035156 L 47.5 25.722656 C 47.5 25.683594 47.484375 25.648438 47.460938 25.617188 Z M 44.953125 28.035156 L 44.953125 38.058594 C 44.953125 40.753906 43.757813 45.816406 35.207031 49.695313 L 35 49.765625 L 34.800781 49.675781 C 26.25 45.839844 25.019531 40.75 25.054688 38.039063 L 25.054688 28.035156 L 25.488281 27.992188 C 28.84375 27.6875 32.039063 26.425781 34.695313 24.351563 L 35.007813 24.09375 L 35.316406 24.351563 C 37.972656 26.421875 41.171875 27.6875 44.527344 27.992188 Z M 44.953125 28.035156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 31.484375 34.726563 L 32.96875 34.726563 C 33.011719 34.726563 33.050781 34.707031 33.078125 34.679688 C 33.105469 34.648438 33.121094 34.609375 33.121094 34.570313 L 33.121094 32.222656 C 33.121094 31.183594 33.960938 30.34375 35 30.34375 C 36.039063 30.34375 36.878906 31.183594 36.878906 32.222656 L 36.878906 34.570313 C 36.878906 34.609375 36.894531 34.648438 36.921875 34.679688 C 36.949219 34.707031 36.988281 34.726563 37.03125 34.726563 L 38.515625 34.726563 C 38.601563 34.726563 38.671875 34.65625 38.671875 34.570313 L 38.671875 32.222656 C 38.671875 30.195313 37.027344 28.554688 35 28.554688 C 32.972656 28.554688 31.328125 30.195313 31.328125 32.222656 L 31.328125 34.570313 C 31.328125 34.65625 31.398438 34.726563 31.484375 34.726563 Z M 39.917969 35.253906 C 39.917969 35.167969 39.847656 35.101563 39.761719 35.101563 L 30.238281 35.101563 C 30.152344 35.101563 30.082031 35.167969 30.082031 35.253906 L 30.082031 41.867188 C 30.082031 42.867188 32.886719 44.214844 35 44.226563 C 37.113281 44.238281 39.917969 42.867188 39.917969 41.847656 Z M 35.929688 41.226563 C 35.945313 41.269531 35.945313 41.316406 35.929688 41.355469 C 35.898438 41.394531 35.855469 41.414063 35.808594 41.414063 L 34.222656 41.414063 C 34.175781 41.410156 34.132813 41.390625 34.101563 41.355469 C 34.082031 41.316406 34.082031 41.269531 34.101563 41.226563 L 34.484375 39.425781 C 34.015625 39.183594 33.769531 38.65625 33.894531 38.144531 C 34.015625 37.632813 34.472656 37.273438 35 37.273438 C 35.527344 37.273438 35.984375 37.632813 36.105469 38.144531 C 36.230469 38.65625 35.984375 39.183594 35.515625 39.425781 Z M 35.929688 41.226563 "/>
+</g>
+</svg>
diff --git a/dist/InternetOfThings/AzureWindows10IoTCoreServices.png b/dist/InternetOfThings/AzureWindows10IoTCoreServices.png
new file mode 100644
index 00000000..34d9f1e8
Binary files /dev/null and b/dist/InternetOfThings/AzureWindows10IoTCoreServices.png differ
diff --git a/dist/InternetOfThings/AzureWindows10IoTCoreServices.puml b/dist/InternetOfThings/AzureWindows10IoTCoreServices.puml
new file mode 100644
index 00000000..e7769d6e
--- /dev/null
+++ b/dist/InternetOfThings/AzureWindows10IoTCoreServices.puml
@@ -0,0 +1,16 @@
+sprite $AzureWindows10IoTCoreServices [70x70/16z] {
+bPTNeiCg34GHlMhslzfNNBXOGEBCJwgFrItKBo9jZ7K-X9XoAUxjLOsPdScvrCOCeRSK2m3UOQdspGIlJhdptmLTxqq9G1ueY8I5wcSl6W0OfHIvZ4FQOvPL
+U-dB-cfY6svRVp8bOQcW8UNt48-DT8GGwtroi55HF67C5XEnaJUOjCSmDgBy7cEnzmbu6Hid_vQZTzQva1kSmwH68iLXWhGmtegiQWiBPT4tPn-_srSP39z-
+R_Q3mppcmEnBDgcrpZmvgtWn7ypRwYO6m8H4Yp_Nrztg0TW818DRJ8ExUmYDuwWW7Rco0RUYgDUrEsMCeAvQwSE2YbkB16LfIG7OphdA9B9j6xfO9fUleJdb
+oYQP9hyUoUGhW1eEZX7rrPIC9CavIDQ5LEyuwNerbNCNApwCYS8M9urBT3fTdxUXuwrmgVIeZ9IMx92SK4TZ4m3TuwaVkOu3nVNhUqIeTOe54CB31Jsrbk_l
+THrgg7QAuj6bg6ECUQWVIMae2R0JfG3eb9BnfpfJ799I1dMYX34mhOY182ZXy9bveZW0hbyyKi8F50F0vnN5BoX73xKsKJI04DzHGhv5Wa8_KFv-rTAMhKTX
+IQbfHJ4YkgiSkO6YLLrG701JSOhNzM81UrE2xhOmobWllNFgkdOr46vAf9j2GwVbSSBaTHyfHkqKTr14ZpAGJG_ekgTLEf7nCKaRy0XkVWwxF3tez1Kbt_w6
+bHzkayQme0TSFeloVOdntjvWz24E86kH5PgpH2n7UGFyc25JHBK6pCQOvnDECv36MnJ2BPBFeoQVNSCWpcFiOV9Z5IAvT8pMiEiRUNniVqcBzkFLKQFFt6ef
+TLptXrLtW9SxWrajuvd-869dwADzZw4ebpogpoMQTxkKLGzE7h6wYHEJVx_NTLa-VkRL2OSWLCsIGHa0F36wjDXthS6WxeQC4LijnsDNzDCfe7fw-9AlP0Mn
+U-_MukQkLcufE6EizQdUdbBzSXZkrb2AobPCobPb36BwS3uA3a1MvCjuHV54-TtvA0uB6qTIsleGO_2Mb8xyykIe0S36qO8KGuYvyBUpaMYRGdYZAY328rtn
+GabzalO6tzMC-YA7R-AWlek-k1H9lPBE3HjLhtwGZW8aJhMlHIvscxYLO4bjzIy
+}
+
+AzureEntityColoring(AzureWindows10IoTCoreServices)
+!define AzureWindows10IoTCoreServices(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindows10IoTCoreServices, AzureWindows10IoTCoreServices)
+!define AzureWindows10IoTCoreServices(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindows10IoTCoreServices, AzureWindows10IoTCoreServices)
diff --git a/dist/InternetOfThings/AzureWindows10IoTCoreServices.svg b/dist/InternetOfThings/AzureWindows10IoTCoreServices.svg
new file mode 100644
index 00000000..a07bc783
--- /dev/null
+++ b/dist/InternetOfThings/AzureWindows10IoTCoreServices.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 56.074219 7.21875 L 59.171875 1.167969 C 59.273438 0.964844 59.261719 0.71875 59.136719 0.527344 C 59.011719 0.332031 58.792969 0.222656 58.5625 0.234375 L 35.859375 1.382813 C 35.628906 1.398438 35.425781 1.53125 35.320313 1.734375 C 35.21875 1.941406 35.230469 2.183594 35.355469 2.378906 L 47.699219 21.46875 C 47.824219 21.660156 48.042969 21.769531 48.273438 21.757813 C 48.5 21.746094 48.707031 21.613281 48.8125 21.410156 L 51.53125 16.105469 C 51.625 15.925781 51.796875 15.796875 51.996094 15.761719 C 52.195313 15.726563 52.398438 15.789063 52.546875 15.925781 C 56.824219 20.074219 61.335938 26.433594 61.335938 34.828125 C 61.335938 44.214844 56.382813 52.90625 48.308594 57.695313 C 40.238281 62.488281 30.234375 62.664063 21.996094 58.167969 C 21.695313 58.003906 21.316406 58.105469 21.136719 58.398438 L 17.609375 64.511719 C 17.519531 64.664063 17.492188 64.84375 17.539063 65.015625 C 17.585938 65.183594 17.699219 65.328125 17.855469 65.410156 C 28.675781 71.390625 41.855469 71.203125 52.503906 64.921875 C 63.152344 58.636719 69.6875 47.191406 69.6875 34.828125 C 69.6875 24.824219 64.929688 15.441406 56.238281 7.996094 C 56.011719 7.804688 55.945313 7.484375 56.074219 7.21875 Z M 56.074219 7.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 22.289063 66.472656 L 23.910156 63.660156 C 34.703125 67.707031 46.859375 65.277344 55.273438 57.390625 C 63.683594 49.507813 66.890625 37.535156 63.550781 26.5 C 60.207031 15.464844 50.894531 7.285156 39.523438 5.390625 L 39.523438 2.160156 C 39.523438 1.757813 39.109375 2.160156 38.789063 1.964844 L 36.582031 2.035156 C 36.085938 2.035156 36.382813 2.683594 36.65625 3.070313 L 43.652344 15.21875 C 45.949219 16.257813 48.046875 17.679688 49.863281 19.421875 L 51.566406 16.105469 C 51.675781 15.886719 51.902344 15.75 52.144531 15.75 C 52.308594 15.746094 52.464844 15.808594 52.578125 15.925781 C 56.859375 20.074219 61.367188 26.433594 61.367188 34.828125 C 61.375 44.226563 56.417969 52.929688 48.335938 57.71875 C 40.25 62.511719 30.238281 62.679688 21.996094 58.167969 C 21.902344 58.109375 21.796875 58.082031 21.6875 58.082031 C 21.460938 58.085938 21.253906 58.203125 21.136719 58.398438 L 17.609375 64.511719 C 17.527344 64.652344 17.503906 64.816406 17.539063 64.972656 L 20.730469 66.8125 L 20.949219 66.902344 C 21.441406 67.117188 22.015625 66.933594 22.289063 66.472656 Z M 22.289063 66.472656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 16.585938 63.925781 L 20.136719 57.8125 C 20.460938 57.25 21.058594 56.90625 21.707031 56.90625 C 22.011719 56.90625 22.3125 56.984375 22.578125 57.132813 C 30.453125 61.421875 40.003906 61.246094 47.714844 56.671875 C 55.425781 52.09375 60.15625 43.796875 60.160156 34.828125 C 60.160156 27.023438 55.980469 21.050781 52.25 17.28125 L 50.699219 20.3125 C 58.289063 28.519531 58.566406 41.101563 51.34375 49.636719 C 44.121094 58.167969 31.667969 59.976563 22.316406 53.84375 C 12.96875 47.710938 9.660156 35.570313 14.609375 25.542969 C 19.558594 15.519531 31.207031 10.757813 41.761719 14.449219 L 34.355469 3.019531 C 34 2.472656 33.964844 1.78125 34.257813 1.203125 C 34.285156 1.15625 34.3125 1.113281 34.347656 1.074219 L 30.597656 1.074219 C 30.3125 1.070313 30.039063 1.183594 29.835938 1.386719 C 29.632813 1.585938 29.519531 1.859375 29.519531 2.144531 L 29.519531 5.378906 C 27.605469 5.695313 25.726563 6.199219 23.910156 6.875 L 22.289063 4.085938 C 22.144531 3.835938 21.910156 3.65625 21.636719 3.582031 C 21.359375 3.507813 21.066406 3.546875 20.820313 3.691406 L 14.019531 7.613281 C 13.507813 7.910156 13.328125 8.570313 13.628906 9.085938 L 15.25 11.90625 C 13.753906 13.136719 12.382813 14.511719 11.144531 16.003906 L 8.332031 14.378906 C 7.816406 14.082031 7.160156 14.257813 6.859375 14.773438 L 2.9375 21.574219 C 2.792969 21.820313 2.757813 22.113281 2.832031 22.386719 C 2.902344 22.664063 3.085938 22.898438 3.332031 23.039063 L 6.136719 24.664063 C 5.453125 26.480469 4.945313 28.359375 4.625 30.273438 L 1.394531 30.273438 C 0.796875 30.273438 0.3125 30.753906 0.3125 31.351563 L 0.3125 39.203125 C 0.3125 39.488281 0.425781 39.761719 0.628906 39.964844 C 0.832031 40.167969 1.105469 40.277344 1.394531 40.277344 L 4.625 40.277344 C 4.945313 42.191406 5.453125 44.070313 6.136719 45.886719 L 3.332031 47.507813 C 2.816406 47.808594 2.640625 48.464844 2.9375 48.984375 L 6.859375 55.78125 C 7.160156 56.292969 7.816406 56.46875 8.332031 56.175781 L 11.144531 54.546875 C 12.382813 56.042969 13.753906 57.414063 15.25 58.652344 L 13.628906 61.46875 C 13.484375 61.714844 13.445313 62.007813 13.519531 62.285156 C 13.59375 62.558594 13.773438 62.792969 14.019531 62.9375 L 16.425781 64.324219 C 16.464844 64.1875 16.519531 64.050781 16.585938 63.925781 Z M 16.585938 63.925781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 47.460938 25.617188 C 47.433594 25.589844 47.390625 25.570313 47.351563 25.574219 L 46.949219 25.574219 C 41.78125 25.574219 37.003906 23.460938 35.128906 20.3125 C 35.101563 20.269531 35.050781 20.242188 35 20.242188 C 34.949219 20.242188 34.898438 20.269531 34.871094 20.3125 C 32.996094 23.460938 28.246094 25.574219 23.050781 25.574219 L 22.648438 25.574219 C 22.609375 25.574219 22.570313 25.589844 22.539063 25.617188 C 22.515625 25.648438 22.5 25.683594 22.5 25.722656 L 22.5 38.003906 C 22.460938 41.539063 24.011719 48.078125 34.941406 52.511719 L 35.058594 52.511719 C 45.972656 48.078125 47.539063 41.523438 47.5 38.035156 L 47.5 25.722656 C 47.5 25.683594 47.484375 25.648438 47.460938 25.617188 Z M 44.953125 28.035156 L 44.953125 38.058594 C 44.953125 40.753906 43.757813 45.816406 35.207031 49.695313 L 35 49.765625 L 34.800781 49.675781 C 26.25 45.839844 25.019531 40.75 25.054688 38.039063 L 25.054688 28.035156 L 25.488281 27.992188 C 28.84375 27.6875 32.039063 26.425781 34.695313 24.351563 L 35.007813 24.09375 L 35.316406 24.351563 C 37.972656 26.421875 41.171875 27.6875 44.527344 27.992188 Z M 44.953125 28.035156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 31.484375 34.726563 L 32.96875 34.726563 C 33.011719 34.726563 33.050781 34.707031 33.078125 34.679688 C 33.105469 34.648438 33.121094 34.609375 33.121094 34.570313 L 33.121094 32.222656 C 33.121094 31.183594 33.960938 30.34375 35 30.34375 C 36.039063 30.34375 36.878906 31.183594 36.878906 32.222656 L 36.878906 34.570313 C 36.878906 34.609375 36.894531 34.648438 36.921875 34.679688 C 36.949219 34.707031 36.988281 34.726563 37.03125 34.726563 L 38.515625 34.726563 C 38.601563 34.726563 38.671875 34.65625 38.671875 34.570313 L 38.671875 32.222656 C 38.671875 30.195313 37.027344 28.554688 35 28.554688 C 32.972656 28.554688 31.328125 30.195313 31.328125 32.222656 L 31.328125 34.570313 C 31.328125 34.65625 31.398438 34.726563 31.484375 34.726563 Z M 39.917969 35.253906 C 39.917969 35.167969 39.847656 35.101563 39.761719 35.101563 L 30.238281 35.101563 C 30.152344 35.101563 30.082031 35.167969 30.082031 35.253906 L 30.082031 41.867188 C 30.082031 42.867188 32.886719 44.214844 35 44.226563 C 37.113281 44.238281 39.917969 42.867188 39.917969 41.847656 Z M 35.929688 41.226563 C 35.945313 41.269531 35.945313 41.316406 35.929688 41.355469 C 35.898438 41.394531 35.855469 41.414063 35.808594 41.414063 L 34.222656 41.414063 C 34.175781 41.410156 34.132813 41.390625 34.101563 41.355469 C 34.082031 41.316406 34.082031 41.269531 34.101563 41.226563 L 34.484375 39.425781 C 34.015625 39.183594 33.769531 38.65625 33.894531 38.144531 C 34.015625 37.632813 34.472656 37.273438 35 37.273438 C 35.527344 37.273438 35.984375 37.632813 36.105469 38.144531 C 36.230469 38.65625 35.984375 39.183594 35.515625 39.425781 Z M 35.929688 41.226563 "/>
+</g>
+</svg>
diff --git a/dist/InternetOfThings/all.puml b/dist/InternetOfThings/all.puml
index cd92a14b..e1cfbf95 100644
--- a/dist/InternetOfThings/all.puml
+++ b/dist/InternetOfThings/all.puml
@@ -1,20 +1,36 @@
-sprite $AzureDigitalTwins [63x70/16z] {
-xPS7Zkmm241j2E2IV__h_bGYhS6xq-kRFkZXZfBwDuB3o-kfJ_bDboxFfWCH3T7LKqeTFR8iaAtdEfCz7JJ0czxqLNr3Pr66Lazr9vawoWJZ83EnqOlg9Q_K
-YG5tU1jrb0bizDhmRw8gCW5XOfXxVwfUbZxRkjzvKjOfcs2py_cNgHiM7u3jgTFcYxDmSa3MjYbdRnjT-fB4qzNdQEkYFMzr7JzZ26VgGMg5y1ZzgySFrL5I
-8l3qrDVXaNLU3kZCEa-8V5ATL_Ow7nvGv_lwvPrFVwdp17YhEf_lK-Vf_2CZYU1A1xRyP1p7Sb3xkhLHndhmlBeerjGfbkvIguGUNzq3SfROrtD6JsQP8J_1
-83Di9a3PyNm-BkSRG1JsR0Nj89D6dVp4rcOCSTV8RduBn2qD62DdpLDgYrfaZ1xtAXuCtRWTC4R6EiHae9F2XXwt9GVMRbYB3lhPpem2bXxbW7jHylUSdpzQ
-jks37sOCBi1wAFu3
+sprite $AzureDeviceProvisioningServices [67x70/16z] {
+fPY7bgum28GfYPIy__FUfdEy7c6pvJlrDph0W8cxz16YEiPGPVeEF2noWGmRNzFX6UjDp4-hgA-6DFwoG4PuP7v9XEs-UGZZgaw7Jaxwa97NVOUyqxDhCOHw
+ZajWK0aVYVKEtsOAaQDPFXjv-JKzlDAIwwvE0Jb2BhYjrgjcnb-5oodqnMlFs-REH5HPGAb0yzsKuU63IA4y5gYj5IO-8am8E986Su63QYGHuL6u4T051jNa
+er36psG2WKjKWagHkXRUQKAr6sF4Q2KmGSjt4bKXW4KIPcmAAUm42jsDdLLJWU7ohgaOhO9efmkZnVz2uPucM0fruE5S0P7Q-j0nfDizlFNiDMG1umgxPz_z
+Pyj7tHSzNJ_s4gKdVheTz_mmbsO0AnVjJ4Omqw44DHbZ7kPvIsGvf4xyTv49mv9sc4UkajfF4iZxwkYpaAT46JaJbwk-dILK4XbkDiTGuN_r0Tr9s1MAYyOX
+YOq49vhVpGKrNZ2i9hPCasfwt0olRD4Hp0MeEXzNCidDQi2e0gnY4Clfn9nNF1yiTWuyU_HlAjA_XxbwKs59_pqo7pMz6h8OKkrtLpxi3m8uUWC5MLd4Gw9m
+BR3LZ7hdcw-3-Ppr68ywX63ARFUQ-Pfrx75sLsRDTdAYxHS1GYEXsPnvKHoazexiRpTGUaYnZJeXy77xKZTbJ7qR38bunZLK-242YOcKvdC68Dc3NIdm6HGl
+-uDs_9juntQOyWxWj8FF0vgZQc90OmiKh7ubWccFP1DEiFtk60ZMQinjMw3GbhX2jodqfh5VqoTq8oe4D8hFXABnZqr10Xyu-1CQFriaS7RvbFj47SIUgpWo
+IsOkmEGG97hazrcH94weALabq3FiV8jaWKd7IjCl__k2U06beVHrcFxpujlS7Va-c8iV8LiJVWC
+}
+
+AzureEntityColoring(AzureDeviceProvisioningServices)
+!define AzureDeviceProvisioningServices(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDeviceProvisioningServices, AzureDeviceProvisioningServices)
+!define AzureDeviceProvisioningServices(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDeviceProvisioningServices, AzureDeviceProvisioningServices)
+
+sprite $AzureDigitalTwins [70x70/16z] {
+xPS7cW8n28Kb3LAy_t6tFMLROEpzMQFuXmpjS_KXwJk9LwOUbrB5LTsHmgvkd19ppf4MA2BYKI93oQCWR4qiIbBBP5CqzZAdX1-sqQHeZhGvfV27Slpog5WK
+wQeAjS-tSQi47pO-aK6f_Q_6UhtM1OpLgN0IIjplH5d56nS8RuwvkZ4WQSmOrOL8HplIapEPMPVLChiLqF2PLG598KiKyQgHFZafh0wdGAqtlBahoeloeb0I
+baJ7KT9fvr6-YNcKma7pAAbkTXw5OquKz4IdkBfyoaWVdtN7Ly3nrSY9Jj0Pwj_EqFvgZF5pkHjbbcS_b_T5oGoPLnTA9iKMzqwkmU6K5uMurkXRr2haMo3u
+nUPGWKLm8CN8aKcRiZTIY6L4p2hhL15D3AoP0RAzm28xhXJGvixGzjV9SKR_hkJ9RDB9yCDqAjqWQHzNwLGhwdPqVO6Dp8HzV5yolYEyMliKscJ4KZB0yOcI
+qtPKUJ4RocGR6nFSxCQvR4NCSrgmA0cBTm
 }
 
 AzureEntityColoring(AzureDigitalTwins)
 !define AzureDigitalTwins(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDigitalTwins, AzureDigitalTwins)
 !define AzureDigitalTwins(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDigitalTwins, AzureDigitalTwins)
 
-sprite $AzureIoTCentral [61x70/16z] {
-xPP7hW0n24FJs_tl-tkpnF14rj_hUCGB6N3oL5TFbohhdBFhZJMFywbLmjwspuz63bdhFd-rUn1MjMe4zbD_2fWv1hkR534YiDtuc0jhbTa5dM6rkNbww5IV
-eWDixDC52rFq0h0Y2vrX7JQ0HNG7bllfz9zU4i3MrHnqWJKhN0NQTfPvm9iZVydTqdRtpN0fguBPH98sWbahLlKdynbIiQrTnMpskPydJJNhfSJDyhQZPc7i
-GRF-PZrc5iweMMPOr2mluzByYNvlJddScZ_HQz2i2fl_pVNHFDYSykH1ecOSOjqQW3F3Hh1F3NVLJ3_-3LXosmkUc2NQVbnLMUQpVMJWadJHFI1jP3WOP427
-Y5cMXSvXg2PUv1mnku5EUTfccPbX0waO8wQYDu25L5m3GV_vN7TW0HrWlRlfou4bT805TCpJq3Q01VIHBjGTM5QP0FiA
+sprite $AzureIoTCentral [70x70/16z] {
+rPS7ZaCX30L3R_S_x_P2qF0VybUBLNQJe04FfZra-FYu7IxtqS9DIEpZCwgxmGXj_4JFLeQlOugUh4AUmg8d_JF-_olEA6IqwCgmwF5riU4Rw55288NOZ_Mi
+xQjdKTMT2-bBvOCUBIHVTv6441oqqADRw9xqQ7NM_DEcG7M76MRtS7cql_P-AdT9M6Uzh1GMaZ15tvZIjwrxvZabIiAHNsLAb7YzfjmX1LE7uX0KdWQOG471
+P0QdnPGMblA4w4bHvisvZLruGPcwCb7Sl2SOAB2yYZDGO5CrKA36d8qobuYTCkzMTiginq31JTL0WKY6EO9u0SfhK_8EqfoYyAg27LnGnCPRtUNkdSHP34S0
+K9OMb5RF9wTQzPmM9iEKwR37j7Ye6S-0dZYjxPK1AFi-tKuPdoIeHqrVMhTAq2ElTO7fh8VBiTDj1VI8wwv-ZR0GyN0JUjGbN-lHhnwjHp-FplLaAKJhqKAq
+7g-5w0Tr5GLvfaSBqNgq4At7A8IhHrU8rgE5wCW7EzSx
 }
 
 AzureEntityColoring(AzureIoTCentral)
@@ -22,13 +38,13 @@ AzureEntityColoring(AzureIoTCentral)
 !define AzureIoTCentral(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIoTCentral, AzureIoTCentral)
 
 sprite $AzureIoTEdge [67x70/16z] {
-fTHfUeCm38JXqJg2-z-t2xIOO4me_NudxoE43Mwbvl6Lc-1Huh5B7mWMh_bV4Oa-mr_IECkVpN1_3ZLpDyLQZD8RgtC1uF5IRaN8dR4DqW4jlxKwznveoVtL
-zS9uZDYN7T1rUGYJJ3BV478nHDA_oORaQNgn2GQ-qsBcM4WRFmTBi9JChoBl4hvR1DQySety4v79mbeKCvFrtOcY0sBvZsrZ5Aj2HIoBRmbhkoTr6K8WMLGi
-MMSCJdSkLOKxgnne7qiz674nnC_paomQMb5N-vJpCyGYMj8zIaX_HVCG4xjg_5OqXaHW5va3GoAUJT4kcryGtIwwebsEmJe5Mr4SNDYXG5PWbt0mXfm9v3A2
-Gl9t3ikH0Ji1Qia1hw_289PL2PmQwYU2YtWAbBLEWooItqOMCm-CURU6ycrzNCXSJyIlSRpwVa9WYSMDB6xdFMdgB7P4ziJsgp8f7bvoLcxP2Q4lTvkbMjkQ
-4ako8rIFGf822BdzJRpQYU_lYw0Ziegizgz2iDsxdW2y8v9VxQzQDeBTbJD0Sa_qLO2DA3z-mV2Lvv1exxGPeP0eldumBWMMIUNXz3V1WRS6IwsEcphvZFiL
-0MSEShHqJ10n84BnaWucgKIU4gxe4z4-DxXs2VwG2XJ_IcuGoijg4YjUbLBJTJDYkYxV2HCuNSTt157_9HAZ-R-g6yGykSppT5QuUq_qW05Gpi-9IR2KyrDY
-DlpqV1VuBUU7RwJmcpybsXJnb9WLFzNKLz-z9OWrcv-VYro51qUh6Ty_vBFJsP3-UFV4uwggUoCFO_sVY7yJzWa
+hPLNml8u40GdT-Fx7tY9AyGuy9c_NeWkJvJbAymZhuIhd48Z1s4d394peV8tD3icVy5o3VyjXkCur3tSJHxa5YfR-8XrfPBrFvbVXMrYJJ3mhqhdqGM3WnWw
+rJ3fx0ewkLV9BA20QeQZJDuD8I81x2jqfn98kU54rRQXR3iFK1u0LJKCXueOQK0U9Ee1y2T53KKHLGNUMB7eXk9-pTElHO0iDmiGXns9KNj2vKgeE8YdBuWZ
+XGq5YF00uIAf8kkEQ8PuRn_ksODJleMQI5qxO6i6X0oSzK6q5MsAGif0UqLJXs53mIbXeXfjj9iYZnGvshck06HWH7LyfB5UJkfG9BTsFZOLOEbX5EMYsmAu
+QDPB45iEyIu0hu0fuY0HAc99RZaaLWpbNZ3H8WfWIP70biEUYfLE1eddPzpUF1qWPv5bLupJuWv37c_150CYQd9uj4hoOv3eHjJBeNB5W2cHfj2fXQ0ww_K-
+-igfjtQov0h6PH9e4_-c46qA49aWnf0dsjxXVKkQeW0Ixq41dzklV3_8hIP5Wob32Ehdljm_7YX2-VO9Df-Z9ZTg3z2Cq-Sfpv0xkgzGnrmfJBNSSVIUTa86
+iQs05BvwC6kJp3tjf4j3pQDJBXMVk9lArvYAoK-eoR4YSe-2UkKUBhZiiqXTzl4Z0mzlaaSAoELNHSfoMGLNlb4iIzYwWd65nugbJ2GlomyAanjwFeebv84l
+AugySXo5lE3PZb1UrFAp8iygHY8ucSWefvqjvsWglszg9rKqpepMOBboFE0dOLkpS_mp1NvM-7y
 }
 
 AzureEntityColoring(AzureIoTEdge)
@@ -36,38 +52,92 @@ AzureEntityColoring(AzureIoTEdge)
 !define AzureIoTEdge(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIoTEdge, AzureIoTEdge)
 
 sprite $AzureIoTHub [70x70/16z] {
-xPPLWjWm34Gj6KVtlszXOGAkeqOfTz-tymoYfDjacy1zIxEPlyEIEmmzFxDqUwK_iGokw75BjOqIjc2T3Je8hYrgUoGjA9l5pqyDMlI7MCHvEzV2R24zR57R
-4D_YBZ2ak2Lb9aEBM8ZMLbzS-Oc53mI9MaYxY9BqyK9FBeC5-GHbjAEmIun71YPoVMmHl9IavAn10ni5y9B8JUAQPWGvVYVR4TOCPof71dozMDbQ4QTdUOTH
-B7OHqLpiXAmpueNABslj73Xdr3lo0Cn5d40wkEDd1gEtMd9MgNQWknQyVpcTrKyx8yNzXR3krWdyVmZuAPxzXuDNjKClDcaT6CDhM3dBLSziszKat1UmAymU
-xhjbVpaDzeMnFNHm8e2xCmubD8xQz4fta3emVLHlZYV5gKL6eYsOqdKHxT9UqSifLETKBliiPO-xBC7nxRBgyXqM8rZvzOvbhAuASIrzyIvY6ysrw757Kcm3
-heNBytmXubkITZDhafvPIEH6Cu7NTQchIAEHubgO0s3MpIIV0bP0n4AKrHYqa0-B0smYCBC-0m
+xTW5aXin40NG9b7t_SyRchWDAiqlQyBPLxHh-2C6qzlKuvNJsshC_euKRHxUz5fAZqExajBZfk-db8XasoaUaGOzaPx6UOh48wO5Eq_HUAG_94KsKnZC4fYI
+7PtQTefuXhZW5FY1gBIVGZgEabJJdPIafHQrBnYd06nVu1H4p9PrujOF1AcP2LsMJNE9PDC0lx1EedefYyrAysCGCctJuZcjb7PnXbo9wNYzmJIU55hIMikg
+vLey6RGW8xxmGZHZzdZ6eFLAVbD4LEqGBmIqdflQR2eBMlAxuHI7M-6m1wegmimrddIOqc_Vd9ijATpS3HuXei5JbkF1EsXfdCyHjkRP_BHMFIA6h1UOKleO
+lHMmO9siGMBvtTtLCx-Q-vDkhxiy_VEcV7p-PnVt8rmOtBIR3SnrZD6AdSHYuZaMOM7moZyMpPsi7kJq3bEchYzgojDixZJprOh2ttVABdI8avJrwZPoXyCf
+dYbZLLLdcDBYfYxtsmfJn9-Uc2mYEKmXo_4oLIZX59BcuOrf8mL0DS9mwsAufxqc8wYzt7fYvWHaxsMxn-vl3wBAH3W5-qW1Ham6lUqp
 }
 
 AzureEntityColoring(AzureIoTHub)
 !define AzureIoTHub(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIoTHub, AzureIoTHub)
 !define AzureIoTHub(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIoTHub, AzureIoTHub)
 
+sprite $AzureIoTHubSecurity [52x70/16z] {
+lTHNibmX38JXLjx_YXquYHdS7kHm__UlA90Ai1pjFBrFCWsj8dyM3M5vfTXBSoesb7Y-vmAUMEIl2tjn8gfc7f6V2jLJvdPrXGRv4bDzKtrJ_y640aO8CR4k
+NNqoXb6iX1l5o2df6tuV227atNmWGkXy8XJA29yfu6tZG112JIg446vI82AQBUCOHU-SaVpEk8XEh-quIsu20CHCLGHpmOrYJaINSvWnltx7Ef4MD_6-cJaT
+mzy06WyfXQeAd9kvGGAegkJtMKcT9nXis_WrJ22vcOazbtVeOXYvBoy8OcPIBuC9018VZSp6hZ5nC-umxnb6pirrSP6B94R6JQt9CD4oyRwfYU3aB4szfW9A
+2C-0BYa0tYG104qZ0E0juXXrIE98zaafpdJR6EwiTPaptNrcYZZf8iUIvExrvsBZaPUSYXImDFbLUD4vX1_b8D5RXM0dYLkaWiHK6aZqMbHy1m
+}
+
+AzureEntityColoring(AzureIoTHubSecurity)
+!define AzureIoTHubSecurity(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIoTHubSecurity, AzureIoTHubSecurity)
+!define AzureIoTHubSecurity(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIoTHubSecurity, AzureIoTHubSecurity)
+
 sprite $AzureMaps [54x70/16z] {
-rPH95jim34CzcmFkVzxM4vzKYnRPNVusxmSIe6Jeij1VXYpqFzPE1rDEckXaoLbqiQUabMuoqaWFOxgAWpakBMhM5hS0CkBz0PAs9i32uZlhOJ5HQkSL1qgf
-dKTSv2x6k93CpZCUCZkhMHpVUODXVOIgCCAMe422Eo-e2Ewig8ZjlCEe-kY-sfh8plAofB_p2ZXXwuU51jsB4HfenvhHfBEpeebyxhp1uMld4HvV5sDugB_p
-0X-_3eKFUpllG2_CURLfI_014riTmIg4M4JsriuVCNBIsfdyc8SZh5U5nLJMs9kAvqKgs7RsVi2wZSS9QcslTnvVCSy7N5h_BCQl6AE-MMdDZHXZgwsngi9Y
-NfIT57zlMpl6cCgmhQf2rqRCgnCYAbwjxU105dPR2tGTkcncNT_ln7YTsCun9ZjY7Ek4KfPriezPRJkiQjLm9rj6i4xs8S_8b7Piu3nc_Ho_pny
+dP9PjiCW34CnWt78_jVxXl06LBUDpFtDqRcEH69eQOEiakAerdYegceu9BgJqfrKkL9bHwN1xfjEmbN4K_gBXAQQn7Rk-aT0jPCIiusKcarPPETYDcMXdUsR
+7ZonsKKibSrGbgcf84NkN6qIEb5c0cJKL4ucP1KeAsGLc6fi5NWYMmNAw2ecpCx57kd4pWQG9pRpw8IPoik4cChB2ZaLoXepbJ-HdGfFPAT2MIQhG5bbfq8P
+MmMcs2hmH26hG9dVsMvuccetAdlsElBxp76UrudyLDt6-SNmTTItcedxCNclcTZZwz2tciayyMOgBQcE4-YOwivIvIfsE5b-ETN_9y4Rrph4QHRwch9bv-uq
+A-r11bM01gW3-X2u3pH07ciVPQcYr_GQiUN4-lTg6seyVUbZLl5EupkvKXKqRoZZjmykW9qC9KxpdMXB5DZ9eIb86zyoIG3NIIyfIZxE0NNGdMZQe1-o4slb
+4m
 }
 
 AzureEntityColoring(AzureMaps)
 !define AzureMaps(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMaps, AzureMaps)
 !define AzureMaps(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMaps, AzureMaps)
 
-sprite $AzureTimeSeriesInsights [68x70/16z] {
-fPW7qkim28Gjwkh-1txLZJ_Pe8ntUepNVC2ePACQQf70d426wzY-bJZc3y5bMzSe1iLcB3h4_A1OISPde-XoKSnMi8yMBnX09bvyawSY9HYtVefwVQODH-a0
-Q_Tx7ki_OpSN9nR5WRbm4xrwrqmFnH6U14zOgpiEYpA6JVjGwfxrLwxwnIpfKGjkKkiwc4MFSw97gT6Iz0UDyAanMcAltyrYMGJVc71_IofQ_HYOHNqjw7WE
-5EUYyjxHbF4-YiF8zQAHD7Ptj0kMdHKL5YDT8dcWW8RurhLcA8tCwivdH9sXxEOBCB7dGz8WrIPYQN2ONfXakIAY2nvQc3uDnGCOtwV7xp2QxnJwzmbUTNHL
-RZ23RUScaoeF9koZJuJW7d92QMdsgiT1SC5WCZbd6LU3S2GqyIhRDebyAxztIEN1k1qm-MZQybQyyM3goM5XMQFC2udvhmKO8K_aN1HR62SPNett3WPiEOqh
-f8DHjap9HMMVOO8nuhPouYCC1ZiBsJqd_mHZRAT4BRnmcAJhljVYWCC88y7huOf8wU1PPUCbuVUSPEVDTOivQeMu2RUetVBr7Nha5Kky8QktnYILxdX6p691
-JM0BrwWStSffexd2vyhjDkjPNIph1iPaimWPRd_aaRFAchvrwbjdU7JTFohtu6-7Ml_kJvHU6dXZ4DzksM9t7uJpGlu6
+sprite $AzureSphere [70x70/16z] {
+hLZXOl8m23GG0k3xl--NfalFz8jcxRnVavdpE2WI7v-Hn29S-V4Nb7Zki7IVnEhvSD-eWcuhgOTb4y5U_xgfXZO5K5NkiUZpcG-NuwOOgWVnwfQO95ujTGHa
+S_XQnNahpiZ2UoJarnpUtb-PR63n-3rFqgQYyEXBZGfbtOXydLTkxnEgs0r5ZRZ6kF7ekhfLCpLKmiW_95wFKaFppEbJDfiZolG3hOnAMy6g03_2swlWZoGX
+15YpSpSr8ypsmUJKFn7eptJO6DyIbtTAEWd0nTnTCvrGDdNpCG2IDSfyM9I1P0sT3GlUVAShG6yFpWfT0WSc1xfDwIBoEIUAT_baAKM4trbJJlMHcMWz-YNF
+SueqJ5YVLJEUW4tqb46CpgI8FmT4uSzY_dE5iu83F2Py5eCovIgCy1_pUBv5k2ceUEiPU9k7Rbe0B5GLfoCXfviiIAdAqhii-HYVWWfTPi68LyGliE3TEui_
+WswpL0dKk-Ks2-n5-zzWaPy1dBx5OdzYATzX-Kv6tt5tLcbTaSHqDlWObnMBqwphTDJ8AnOzvJzz6iaNB9bcJoEVwEL2GfWCmvHQYv6PkNrYClzEZC50vjU9
+cVSjD2olMWOh0UkcE5wcDyNfgujZbG--yFIL9CpsNRQlbtCeEZFSce7bM3eYzrtNi4TEO31EqtRM-lgXK9LYb7o68s71bXsfdOnXswUtQemFAOPDhZ7cdbb_
+flWTZJ5AoDZ26gKWLA5eyBF5Ygw4-dqaD4Nq6FIXhHmS8NHcWVoc9K-quERGu7byGWOjlZ-BZ-ac0tD2Xw3YWu_pyR94sp39SNFui5pwxcl6BgwuUm3IXG0E
+cdh4ku0eb18RN9m3hk-t_fGT4coiA2z8nWx0VKkYLqANSffYPvtz69ABQM7SFjzob7xxJAAcGeyvaZLLiwKTD-4BjtB9WmhHk7YxDootgaMrhy03nnfKPhlt
+ZT-dAAi764m-KFm3
+}
+
+AzureEntityColoring(AzureSphere)
+!define AzureSphere(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSphere, AzureSphere)
+!define AzureSphere(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSphere, AzureSphere)
+
+sprite $AzureTimeSeriesInsights [70x70/16z] {
+fPW5ilGm38CRS-v_u1yUUDnj5BVJR-11TcN9WSAnWSKy8cQ4cp8Tpo6D-K6OZ2SIeqYSSRvjm-Q6a5i-KkE5ZiJiSTeRyKlXS8-hyiuEnqcWpEvWzRCTE5rw
+ag2BKQb20MGCJ2YOlg2zIF018IyoEn4zjd1W6MsD9CDHRxZfFV3jP_ce_-xHPNe78hrCoI-_EGy0becI1ouaZ7zcidHtWGNA_BRofpJDRsprKTmfEfint1J9
+KWkicXcRpHwxCs14CQFOYkudltupe9KHQNZROCuc1GmkhHdBttHXfLlFwI1Np-Qiw2FHaNAWq9r8md35-MntLm_FX8w69ZBgV4yzB28ZlR4Y_YgI_fYG6cdu
+4ljVH3qkvD8UDP9D086XNBKb4a-4ZOcX_AfcgvOuKiaDb95qGdYJY4epA7VUbQzR0_4rMjUm_UJnLoidjDdV7JMoljkMxtTttDdSuuidDmZ9oDEG-zCLvf7y
+RfwTRIH60r8k1rqaWtqVnJ3XIE2sn6jzRpiJopoIvQintaLorAuSyUvMYkeOkdUYsMKAWNcyo3RRXF6LawwtktBSX69HMEOpcImRw-qlJvnSckuFZf1qFXbv
+d3vk7ri2elPsUFyvYXjFpEGpKTpur5dbOfz013vDkz1fa2tAQ71xE2PkAi8YwZ5F1BKheSVwEvSMf_SlFO9VlCJ1J_qOjbX9o3WUGbALmfMnn5y
 }
 
 AzureEntityColoring(AzureTimeSeriesInsights)
 !define AzureTimeSeriesInsights(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTimeSeriesInsights, AzureTimeSeriesInsights)
 !define AzureTimeSeriesInsights(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTimeSeriesInsights, AzureTimeSeriesInsights)
 
+sprite $AzureTimeSeriesInsightsEventsSources [70x70/16z] {
+xTR7WSCm34HHZ9ZPVxzAvmLtH6TxNW7_Xc3t9o8nySoLCc-keafSXW9N2JQ4RwgeWdJ0ZHLBVTSmKp4Sx9JzpCaunSlutZzJZqnbC_2MG3ipnabzgB8LFZDV
+AVUe5EFWRqlp8xnwjqXzXqYPZU3qNmGdOaivaSiRCno--vAeajFGIxz3LN217KHa0m
+}
+
+AzureEntityColoring(AzureTimeSeriesInsightsEventsSources)
+!define AzureTimeSeriesInsightsEventsSources(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTimeSeriesInsightsEventsSources, AzureTimeSeriesInsightsEventsSources)
+!define AzureTimeSeriesInsightsEventsSources(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTimeSeriesInsightsEventsSources, AzureTimeSeriesInsightsEventsSources)
+
+sprite $AzureWindows10IoTCoreServices [70x70/16z] {
+bPTNeiCg34GHlMhslzfNNBXOGEBCJwgFrItKBo9jZ7K-X9XoAUxjLOsPdScvrCOCeRSK2m3UOQdspGIlJhdptmLTxqq9G1ueY8I5wcSl6W0OfHIvZ4FQOvPL
+U-dB-cfY6svRVp8bOQcW8UNt48-DT8GGwtroi55HF67C5XEnaJUOjCSmDgBy7cEnzmbu6Hid_vQZTzQva1kSmwH68iLXWhGmtegiQWiBPT4tPn-_srSP39z-
+R_Q3mppcmEnBDgcrpZmvgtWn7ypRwYO6m8H4Yp_Nrztg0TW818DRJ8ExUmYDuwWW7Rco0RUYgDUrEsMCeAvQwSE2YbkB16LfIG7OphdA9B9j6xfO9fUleJdb
+oYQP9hyUoUGhW1eEZX7rrPIC9CavIDQ5LEyuwNerbNCNApwCYS8M9urBT3fTdxUXuwrmgVIeZ9IMx92SK4TZ4m3TuwaVkOu3nVNhUqIeTOe54CB31Jsrbk_l
+THrgg7QAuj6bg6ECUQWVIMae2R0JfG3eb9BnfpfJ799I1dMYX34mhOY182ZXy9bveZW0hbyyKi8F50F0vnN5BoX73xKsKJI04DzHGhv5Wa8_KFv-rTAMhKTX
+IQbfHJ4YkgiSkO6YLLrG701JSOhNzM81UrE2xhOmobWllNFgkdOr46vAf9j2GwVbSSBaTHyfHkqKTr14ZpAGJG_ekgTLEf7nCKaRy0XkVWwxF3tez1Kbt_w6
+bHzkayQme0TSFeloVOdntjvWz24E86kH5PgpH2n7UGFyc25JHBK6pCQOvnDECv36MnJ2BPBFeoQVNSCWpcFiOV9Z5IAvT8pMiEiRUNniVqcBzkFLKQFFt6ef
+TLptXrLtW9SxWrajuvd-869dwADzZw4ebpogpoMQTxkKLGzE7h6wYHEJVx_NTLa-VkRL2OSWLCsIGHa0F36wjDXthS6WxeQC4LijnsDNzDCfe7fw-9AlP0Mn
+U-_MukQkLcufE6EizQdUdbBzSXZkrb2AobPCobPb36BwS3uA3a1MvCjuHV54-TtvA0uB6qTIsleGO_2Mb8xyykIe0S36qO8KGuYvyBUpaMYRGdYZAY328rtn
+GabzalO6tzMC-YA7R-AWlek-k1H9lPBE3HjLhtwGZW8aJhMlHIvscxYLO4bjzIy
+}
+
+AzureEntityColoring(AzureWindows10IoTCoreServices)
+!define AzureWindows10IoTCoreServices(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWindows10IoTCoreServices, AzureWindows10IoTCoreServices)
+!define AzureWindows10IoTCoreServices(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWindows10IoTCoreServices, AzureWindows10IoTCoreServices)
+
diff --git a/dist/Intune/AzureClientApps(m).png b/dist/Intune/AzureClientApps(m).png
new file mode 100644
index 00000000..3d4aa4fe
Binary files /dev/null and b/dist/Intune/AzureClientApps(m).png differ
diff --git a/dist/Intune/AzureClientApps(m).svg b/dist/Intune/AzureClientApps(m).svg
new file mode 100644
index 00000000..df44a394
--- /dev/null
+++ b/dist/Intune/AzureClientApps(m).svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 0 0 L 20.257813 0 L 20.257813 20.257813 L 0 20.257813 Z M 23.964844 0 L 46.078125 0 L 46.078125 20.257813 L 23.964844 20.257813 Z M 49.742188 0 L 70 0 L 70 20.257813 L 49.742188 20.257813 Z M 0 23.964844 L 20.257813 23.964844 L 20.257813 44.222656 L 0 44.222656 Z M 23.964844 23.964844 L 46.078125 23.964844 L 46.078125 44.222656 L 23.964844 44.222656 Z M 49.742188 23.964844 L 70 23.964844 L 70 44.222656 L 49.742188 44.222656 Z M 0 47.886719 L 20.257813 47.886719 L 20.257813 70 L 0 70 Z M 23.964844 47.886719 L 46.078125 47.886719 L 46.078125 70 L 23.964844 70 Z M 49.742188 47.886719 L 70 47.886719 L 70 70 L 49.742188 70 Z M 49.742188 47.886719 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureClientApps.png b/dist/Intune/AzureClientApps.png
new file mode 100644
index 00000000..a126bf31
Binary files /dev/null and b/dist/Intune/AzureClientApps.png differ
diff --git a/dist/Intune/AzureClientApps.puml b/dist/Intune/AzureClientApps.puml
new file mode 100644
index 00000000..57016ce7
--- /dev/null
+++ b/dist/Intune/AzureClientApps.puml
@@ -0,0 +1,5 @@
+sprite $AzureClientApps [70x70/16z] xTL15e0G003HgG3kVzyk0DRUpBBu6z071Q3sKH_G-ZYLarHKL5J2e0VumknF6CHrrK4VKEhiJntahZjLL5HKLEAW1mXnzYSEuffyZrHKL5HKVW
+
+AzureEntityColoring(AzureClientApps)
+!define AzureClientApps(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureClientApps, AzureClientApps)
+!define AzureClientApps(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureClientApps, AzureClientApps)
diff --git a/dist/Intune/AzureClientApps.svg b/dist/Intune/AzureClientApps.svg
new file mode 100644
index 00000000..b31b7ecc
--- /dev/null
+++ b/dist/Intune/AzureClientApps.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 0 L 20.257813 0 L 20.257813 20.257813 L 0 20.257813 Z M 23.964844 0 L 46.078125 0 L 46.078125 20.257813 L 23.964844 20.257813 Z M 49.742188 0 L 70 0 L 70 20.257813 L 49.742188 20.257813 Z M 0 23.964844 L 20.257813 23.964844 L 20.257813 44.222656 L 0 44.222656 Z M 23.964844 23.964844 L 46.078125 23.964844 L 46.078125 44.222656 L 23.964844 44.222656 Z M 49.742188 23.964844 L 70 23.964844 L 70 44.222656 L 49.742188 44.222656 Z M 0 47.886719 L 20.257813 47.886719 L 20.257813 70 L 0 70 Z M 23.964844 47.886719 L 46.078125 47.886719 L 46.078125 70 L 23.964844 70 Z M 49.742188 47.886719 L 70 47.886719 L 70 70 L 49.742188 70 Z M 49.742188 47.886719 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureDedicatedEventHub(m).png b/dist/Intune/AzureDedicatedEventHub(m).png
new file mode 100644
index 00000000..144354c2
Binary files /dev/null and b/dist/Intune/AzureDedicatedEventHub(m).png differ
diff --git a/dist/Intune/AzureDedicatedEventHub(m).svg b/dist/Intune/AzureDedicatedEventHub(m).svg
new file mode 100644
index 00000000..5d2d9cb8
--- /dev/null
+++ b/dist/Intune/AzureDedicatedEventHub(m).svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 13.300781 25.199219 L 7.699219 25.199219 C 7.3125 25.199219 7 24.886719 7 24.5 L 7 20.300781 C 7 19.914063 7.3125 19.601563 7.699219 19.601563 L 13.300781 19.601563 C 13.6875 19.601563 14 19.914063 14 20.300781 L 14 24.5 C 14 24.886719 13.6875 25.199219 13.300781 25.199219 Z M 13.300781 25.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 13.300781 35 L 7.699219 35 C 7.3125 35 7 34.6875 7 34.300781 L 7 30.101563 C 7 29.714844 7.3125 29.398438 7.699219 29.398438 L 13.300781 29.398438 C 13.6875 29.398438 14 29.714844 14 30.101563 L 14 34.300781 C 14 34.6875 13.6875 35 13.300781 35 Z M 13.300781 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 13.300781 15.398438 L 7.699219 15.398438 C 7.3125 15.398438 7 15.085938 7 14.699219 L 7 10.5 C 7 10.113281 7.3125 9.800781 7.699219 9.800781 L 13.300781 9.800781 C 13.6875 9.800781 14 10.113281 14 10.5 L 14 14.699219 C 14 15.085938 13.6875 15.398438 13.300781 15.398438 Z M 13.300781 15.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 0 2.101563 L 0 10.5 C 0 10.886719 0.3125 11.199219 0.699219 11.199219 L 3.5 11.199219 C 3.886719 11.199219 4.199219 10.886719 4.199219 10.5 L 4.199219 6.300781 C 4.199219 5.914063 4.511719 5.601563 4.898438 5.601563 L 34.300781 5.601563 C 34.6875 5.601563 35 5.914063 35 6.300781 L 35 10.5 C 35 10.886719 35.3125 11.199219 35.699219 11.199219 L 38.5 11.199219 C 38.886719 11.199219 39.199219 10.886719 39.199219 10.5 L 39.199219 2.101563 C 39.199219 1.714844 38.886719 1.398438 38.5 1.398438 L 0.699219 1.398438 C 0.3125 1.398438 0 1.714844 0 2.101563 Z M 0 2.101563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 28.699219 37.800781 L 23.101563 37.800781 C 22.714844 37.800781 22.398438 37.488281 22.398438 37.101563 L 22.398438 32.898438 C 22.398438 32.511719 22.714844 32.199219 23.101563 32.199219 L 28.699219 32.199219 C 29.085938 32.199219 29.398438 32.511719 29.398438 32.898438 L 29.398438 37.101563 C 29.398438 37.488281 29.085938 37.800781 28.699219 37.800781 Z M 28.699219 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 28.699219 47.601563 L 23.101563 47.601563 C 22.714844 47.601563 22.398438 47.285156 22.398438 46.898438 L 22.398438 42.699219 C 22.398438 42.3125 22.714844 42 23.101563 42 L 28.699219 42 C 29.085938 42 29.398438 42.3125 29.398438 42.699219 L 29.398438 46.898438 C 29.398438 47.285156 29.085938 47.601563 28.699219 47.601563 Z M 28.699219 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 28.699219 28 L 23.101563 28 C 22.714844 28 22.398438 27.6875 22.398438 27.300781 L 22.398438 23.101563 C 22.398438 22.714844 22.714844 22.398438 23.101563 22.398438 L 28.699219 22.398438 C 29.085938 22.398438 29.398438 22.714844 29.398438 23.101563 L 29.398438 27.300781 C 29.398438 27.6875 29.085938 28 28.699219 28 Z M 28.699219 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 15.398438 14.699219 L 15.398438 23.101563 C 15.398438 23.488281 15.714844 23.800781 16.101563 23.800781 L 18.898438 23.800781 C 19.285156 23.800781 19.601563 23.488281 19.601563 23.101563 L 19.601563 18.898438 C 19.601563 18.511719 19.914063 18.199219 20.300781 18.199219 L 49.699219 18.199219 C 50.085938 18.199219 50.398438 18.511719 50.398438 18.898438 L 50.398438 23.101563 C 50.398438 23.488281 50.714844 23.800781 51.101563 23.800781 L 53.898438 23.800781 C 54.285156 23.800781 54.601563 23.488281 54.601563 23.101563 L 54.601563 14.699219 C 54.601563 14.3125 54.285156 14 53.898438 14 L 16.101563 14 C 15.714844 14 15.398438 14.3125 15.398438 14.699219 Z M 15.398438 14.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 44.101563 50.398438 L 38.5 50.398438 C 38.113281 50.398438 37.800781 50.085938 37.800781 49.699219 L 37.800781 45.5 C 37.800781 45.113281 38.113281 44.800781 38.5 44.800781 L 44.101563 44.800781 C 44.488281 44.800781 44.800781 45.113281 44.800781 45.5 L 44.800781 49.699219 C 44.800781 50.085938 44.488281 50.398438 44.101563 50.398438 Z M 44.101563 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 53.898438 44.800781 L 48.300781 44.800781 C 47.914063 44.800781 47.601563 44.488281 47.601563 44.101563 L 47.601563 39.898438 C 47.601563 39.511719 47.914063 39.199219 48.300781 39.199219 L 53.898438 39.199219 C 54.285156 39.199219 54.601563 39.511719 54.601563 39.898438 L 54.601563 44.101563 C 54.601563 44.488281 54.285156 44.800781 53.898438 44.800781 Z M 53.898438 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 53.898438 54.601563 L 48.300781 54.601563 C 47.914063 54.601563 47.601563 54.285156 47.601563 53.898438 L 47.601563 49.699219 C 47.601563 49.3125 47.914063 49 48.300781 49 L 53.898438 49 C 54.285156 49 54.601563 49.3125 54.601563 49.699219 L 54.601563 53.898438 C 54.601563 54.285156 54.285156 54.601563 53.898438 54.601563 Z M 53.898438 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 63.699219 50.398438 L 58.101563 50.398438 C 57.714844 50.398438 57.398438 50.085938 57.398438 49.699219 L 57.398438 45.5 C 57.398438 45.113281 57.714844 44.800781 58.101563 44.800781 L 63.699219 44.800781 C 64.085938 44.800781 64.398438 45.113281 64.398438 45.5 L 64.398438 49.699219 C 64.398438 50.085938 64.085938 50.398438 63.699219 50.398438 Z M 63.699219 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 44.101563 60.199219 L 38.5 60.199219 C 38.113281 60.199219 37.800781 59.886719 37.800781 59.5 L 37.800781 55.300781 C 37.800781 54.914063 38.113281 54.601563 38.5 54.601563 L 44.101563 54.601563 C 44.488281 54.601563 44.800781 54.914063 44.800781 55.300781 L 44.800781 59.5 C 44.800781 59.886719 44.488281 60.199219 44.101563 60.199219 Z M 44.101563 60.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 44.101563 40.601563 L 38.5 40.601563 C 38.113281 40.601563 37.800781 40.285156 37.800781 39.898438 L 37.800781 35.699219 C 37.800781 35.3125 38.113281 35 38.5 35 L 44.101563 35 C 44.488281 35 44.800781 35.3125 44.800781 35.699219 L 44.800781 39.898438 C 44.800781 40.285156 44.488281 40.601563 44.101563 40.601563 Z M 44.101563 40.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 30.800781 27.300781 L 30.800781 35.699219 C 30.800781 36.085938 31.113281 36.398438 31.5 36.398438 L 34.300781 36.398438 C 34.6875 36.398438 35 36.085938 35 35.699219 L 35 31.5 C 35 31.113281 35.3125 30.800781 35.699219 30.800781 L 65.101563 30.800781 C 65.488281 30.800781 65.800781 31.113281 65.800781 31.5 L 65.800781 35.699219 C 65.800781 36.085938 66.113281 36.398438 66.5 36.398438 L 69.300781 36.398438 C 69.6875 36.398438 70 36.085938 70 35.699219 L 70 27.300781 C 70 26.914063 69.6875 26.601563 69.300781 26.601563 L 31.5 26.601563 C 31.113281 26.601563 30.800781 26.914063 30.800781 27.300781 Z M 30.800781 27.300781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 70 67.898438 L 70 59.5 C 70 59.113281 69.6875 58.800781 69.300781 58.800781 L 66.5 58.800781 C 66.113281 58.800781 65.800781 59.113281 65.800781 59.5 L 65.800781 63.699219 C 65.800781 64.085938 65.488281 64.398438 65.101563 64.398438 L 35.699219 64.398438 C 35.3125 64.398438 35 64.085938 35 63.699219 L 35 59.5 C 35 59.113281 34.6875 58.800781 34.300781 58.800781 L 31.5 58.800781 C 31.113281 58.800781 30.800781 59.113281 30.800781 59.5 L 30.800781 67.898438 C 30.800781 68.285156 31.113281 68.601563 31.5 68.601563 L 69.300781 68.601563 C 69.6875 68.601563 70 68.285156 70 67.898438 Z M 70 67.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 15.398438 39.199219 L 4.898438 39.199219 C 4.511719 39.199219 4.199219 38.886719 4.199219 38.5 L 4.199219 34.300781 C 4.199219 33.914063 3.886719 33.601563 3.5 33.601563 L 0.699219 33.601563 C 0.3125 33.601563 0 33.914063 0 34.300781 L 0 42.699219 C 0 43.085938 0.3125 43.398438 0.699219 43.398438 L 15.398438 43.398438 Z M 15.398438 39.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 30.800781 51.800781 L 20.300781 51.800781 C 19.914063 51.800781 19.601563 51.488281 19.601563 51.101563 L 19.601563 46.898438 C 19.601563 46.511719 19.285156 46.199219 18.898438 46.199219 L 16.101563 46.199219 C 15.714844 46.199219 15.398438 46.511719 15.398438 46.898438 L 15.398438 55.300781 C 15.398438 55.6875 15.714844 56 16.101563 56 L 30.800781 56 Z M 30.800781 51.800781 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureDedicatedEventHub.png b/dist/Intune/AzureDedicatedEventHub.png
new file mode 100644
index 00000000..71c28b3b
Binary files /dev/null and b/dist/Intune/AzureDedicatedEventHub.png differ
diff --git a/dist/Intune/AzureDedicatedEventHub.puml b/dist/Intune/AzureDedicatedEventHub.puml
new file mode 100644
index 00000000..53e3609b
--- /dev/null
+++ b/dist/Intune/AzureDedicatedEventHub.puml
@@ -0,0 +1,10 @@
+sprite $AzureDedicatedEventHub [70x70/16z] {
+rTTdae8X383XzB3tl_1ATCJ25sBNvpU-jZX1U0hH4eJKNmt_LiKrOyKAGSf_iuBTtPMsEu80vW5cR5r18W80tqkEB2MLnCiht4eCfeWx0lahQP3vkahZb6rN
+a3gCYa6AjYlcuS6AlwJ20TDAFdK2m1u49Z2cBgs4l1BoxsXTgHiLf9Aqmj1gO0u3L2iNl-aBDrPyxuKLWfHlLb02HWNN5Tn9fgvO6VleaShbRfnNn3hDAzkp
+AwgoM3IiglCAUU3gkXgLHAdYUaIh2aj7-RrEO4gjqsFFLfKStb913LIjY9tXYsywgQJo2ZnIqUl7eYLhGaHeL99v8GyA4uUjHXReeShmeefentTLM3iPt_In
+HriLhyvkVYDhmmELuKKLCE_qhefvW2e-zyL_4-vaxhweo3f_s6ea7MVRVbr9_6H5C4EjK5dxiOhNAu_x1m
+}
+
+AzureEntityColoring(AzureDedicatedEventHub)
+!define AzureDedicatedEventHub(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDedicatedEventHub, AzureDedicatedEventHub)
+!define AzureDedicatedEventHub(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDedicatedEventHub, AzureDedicatedEventHub)
diff --git a/dist/Intune/AzureDedicatedEventHub.svg b/dist/Intune/AzureDedicatedEventHub.svg
new file mode 100644
index 00000000..00389c00
--- /dev/null
+++ b/dist/Intune/AzureDedicatedEventHub.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 13.300781 25.199219 L 7.699219 25.199219 C 7.3125 25.199219 7 24.886719 7 24.5 L 7 20.300781 C 7 19.914063 7.3125 19.601563 7.699219 19.601563 L 13.300781 19.601563 C 13.6875 19.601563 14 19.914063 14 20.300781 L 14 24.5 C 14 24.886719 13.6875 25.199219 13.300781 25.199219 Z M 13.300781 25.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 13.300781 35 L 7.699219 35 C 7.3125 35 7 34.6875 7 34.300781 L 7 30.101563 C 7 29.714844 7.3125 29.398438 7.699219 29.398438 L 13.300781 29.398438 C 13.6875 29.398438 14 29.714844 14 30.101563 L 14 34.300781 C 14 34.6875 13.6875 35 13.300781 35 Z M 13.300781 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 13.300781 15.398438 L 7.699219 15.398438 C 7.3125 15.398438 7 15.085938 7 14.699219 L 7 10.5 C 7 10.113281 7.3125 9.800781 7.699219 9.800781 L 13.300781 9.800781 C 13.6875 9.800781 14 10.113281 14 10.5 L 14 14.699219 C 14 15.085938 13.6875 15.398438 13.300781 15.398438 Z M 13.300781 15.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 0 2.101563 L 0 10.5 C 0 10.886719 0.3125 11.199219 0.699219 11.199219 L 3.5 11.199219 C 3.886719 11.199219 4.199219 10.886719 4.199219 10.5 L 4.199219 6.300781 C 4.199219 5.914063 4.511719 5.601563 4.898438 5.601563 L 34.300781 5.601563 C 34.6875 5.601563 35 5.914063 35 6.300781 L 35 10.5 C 35 10.886719 35.3125 11.199219 35.699219 11.199219 L 38.5 11.199219 C 38.886719 11.199219 39.199219 10.886719 39.199219 10.5 L 39.199219 2.101563 C 39.199219 1.714844 38.886719 1.398438 38.5 1.398438 L 0.699219 1.398438 C 0.3125 1.398438 0 1.714844 0 2.101563 Z M 0 2.101563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 28.699219 37.800781 L 23.101563 37.800781 C 22.714844 37.800781 22.398438 37.488281 22.398438 37.101563 L 22.398438 32.898438 C 22.398438 32.511719 22.714844 32.199219 23.101563 32.199219 L 28.699219 32.199219 C 29.085938 32.199219 29.398438 32.511719 29.398438 32.898438 L 29.398438 37.101563 C 29.398438 37.488281 29.085938 37.800781 28.699219 37.800781 Z M 28.699219 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 28.699219 47.601563 L 23.101563 47.601563 C 22.714844 47.601563 22.398438 47.285156 22.398438 46.898438 L 22.398438 42.699219 C 22.398438 42.3125 22.714844 42 23.101563 42 L 28.699219 42 C 29.085938 42 29.398438 42.3125 29.398438 42.699219 L 29.398438 46.898438 C 29.398438 47.285156 29.085938 47.601563 28.699219 47.601563 Z M 28.699219 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 28.699219 28 L 23.101563 28 C 22.714844 28 22.398438 27.6875 22.398438 27.300781 L 22.398438 23.101563 C 22.398438 22.714844 22.714844 22.398438 23.101563 22.398438 L 28.699219 22.398438 C 29.085938 22.398438 29.398438 22.714844 29.398438 23.101563 L 29.398438 27.300781 C 29.398438 27.6875 29.085938 28 28.699219 28 Z M 28.699219 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 15.398438 14.699219 L 15.398438 23.101563 C 15.398438 23.488281 15.714844 23.800781 16.101563 23.800781 L 18.898438 23.800781 C 19.285156 23.800781 19.601563 23.488281 19.601563 23.101563 L 19.601563 18.898438 C 19.601563 18.511719 19.914063 18.199219 20.300781 18.199219 L 49.699219 18.199219 C 50.085938 18.199219 50.398438 18.511719 50.398438 18.898438 L 50.398438 23.101563 C 50.398438 23.488281 50.714844 23.800781 51.101563 23.800781 L 53.898438 23.800781 C 54.285156 23.800781 54.601563 23.488281 54.601563 23.101563 L 54.601563 14.699219 C 54.601563 14.3125 54.285156 14 53.898438 14 L 16.101563 14 C 15.714844 14 15.398438 14.3125 15.398438 14.699219 Z M 15.398438 14.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 44.101563 50.398438 L 38.5 50.398438 C 38.113281 50.398438 37.800781 50.085938 37.800781 49.699219 L 37.800781 45.5 C 37.800781 45.113281 38.113281 44.800781 38.5 44.800781 L 44.101563 44.800781 C 44.488281 44.800781 44.800781 45.113281 44.800781 45.5 L 44.800781 49.699219 C 44.800781 50.085938 44.488281 50.398438 44.101563 50.398438 Z M 44.101563 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 53.898438 44.800781 L 48.300781 44.800781 C 47.914063 44.800781 47.601563 44.488281 47.601563 44.101563 L 47.601563 39.898438 C 47.601563 39.511719 47.914063 39.199219 48.300781 39.199219 L 53.898438 39.199219 C 54.285156 39.199219 54.601563 39.511719 54.601563 39.898438 L 54.601563 44.101563 C 54.601563 44.488281 54.285156 44.800781 53.898438 44.800781 Z M 53.898438 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 53.898438 54.601563 L 48.300781 54.601563 C 47.914063 54.601563 47.601563 54.285156 47.601563 53.898438 L 47.601563 49.699219 C 47.601563 49.3125 47.914063 49 48.300781 49 L 53.898438 49 C 54.285156 49 54.601563 49.3125 54.601563 49.699219 L 54.601563 53.898438 C 54.601563 54.285156 54.285156 54.601563 53.898438 54.601563 Z M 53.898438 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 63.699219 50.398438 L 58.101563 50.398438 C 57.714844 50.398438 57.398438 50.085938 57.398438 49.699219 L 57.398438 45.5 C 57.398438 45.113281 57.714844 44.800781 58.101563 44.800781 L 63.699219 44.800781 C 64.085938 44.800781 64.398438 45.113281 64.398438 45.5 L 64.398438 49.699219 C 64.398438 50.085938 64.085938 50.398438 63.699219 50.398438 Z M 63.699219 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 44.101563 60.199219 L 38.5 60.199219 C 38.113281 60.199219 37.800781 59.886719 37.800781 59.5 L 37.800781 55.300781 C 37.800781 54.914063 38.113281 54.601563 38.5 54.601563 L 44.101563 54.601563 C 44.488281 54.601563 44.800781 54.914063 44.800781 55.300781 L 44.800781 59.5 C 44.800781 59.886719 44.488281 60.199219 44.101563 60.199219 Z M 44.101563 60.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 44.101563 40.601563 L 38.5 40.601563 C 38.113281 40.601563 37.800781 40.285156 37.800781 39.898438 L 37.800781 35.699219 C 37.800781 35.3125 38.113281 35 38.5 35 L 44.101563 35 C 44.488281 35 44.800781 35.3125 44.800781 35.699219 L 44.800781 39.898438 C 44.800781 40.285156 44.488281 40.601563 44.101563 40.601563 Z M 44.101563 40.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 30.800781 27.300781 L 30.800781 35.699219 C 30.800781 36.085938 31.113281 36.398438 31.5 36.398438 L 34.300781 36.398438 C 34.6875 36.398438 35 36.085938 35 35.699219 L 35 31.5 C 35 31.113281 35.3125 30.800781 35.699219 30.800781 L 65.101563 30.800781 C 65.488281 30.800781 65.800781 31.113281 65.800781 31.5 L 65.800781 35.699219 C 65.800781 36.085938 66.113281 36.398438 66.5 36.398438 L 69.300781 36.398438 C 69.6875 36.398438 70 36.085938 70 35.699219 L 70 27.300781 C 70 26.914063 69.6875 26.601563 69.300781 26.601563 L 31.5 26.601563 C 31.113281 26.601563 30.800781 26.914063 30.800781 27.300781 Z M 30.800781 27.300781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 70 67.898438 L 70 59.5 C 70 59.113281 69.6875 58.800781 69.300781 58.800781 L 66.5 58.800781 C 66.113281 58.800781 65.800781 59.113281 65.800781 59.5 L 65.800781 63.699219 C 65.800781 64.085938 65.488281 64.398438 65.101563 64.398438 L 35.699219 64.398438 C 35.3125 64.398438 35 64.085938 35 63.699219 L 35 59.5 C 35 59.113281 34.6875 58.800781 34.300781 58.800781 L 31.5 58.800781 C 31.113281 58.800781 30.800781 59.113281 30.800781 59.5 L 30.800781 67.898438 C 30.800781 68.285156 31.113281 68.601563 31.5 68.601563 L 69.300781 68.601563 C 69.6875 68.601563 70 68.285156 70 67.898438 Z M 70 67.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 15.398438 39.199219 L 4.898438 39.199219 C 4.511719 39.199219 4.199219 38.886719 4.199219 38.5 L 4.199219 34.300781 C 4.199219 33.914063 3.886719 33.601563 3.5 33.601563 L 0.699219 33.601563 C 0.3125 33.601563 0 33.914063 0 34.300781 L 0 42.699219 C 0 43.085938 0.3125 43.398438 0.699219 43.398438 L 15.398438 43.398438 Z M 15.398438 39.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 30.800781 51.800781 L 20.300781 51.800781 C 19.914063 51.800781 19.601563 51.488281 19.601563 51.101563 L 19.601563 46.898438 C 19.601563 46.511719 19.285156 46.199219 18.898438 46.199219 L 16.101563 46.199219 C 15.714844 46.199219 15.398438 46.511719 15.398438 46.898438 L 15.398438 55.300781 C 15.398438 55.6875 15.714844 56 16.101563 56 L 30.800781 56 Z M 30.800781 51.800781 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureDeviceCompliance(m).png b/dist/Intune/AzureDeviceCompliance(m).png
new file mode 100644
index 00000000..5874c53f
Binary files /dev/null and b/dist/Intune/AzureDeviceCompliance(m).png differ
diff --git a/dist/Intune/AzureDeviceCompliance(m).svg b/dist/Intune/AzureDeviceCompliance(m).svg
new file mode 100644
index 00000000..9d8bf70b
--- /dev/null
+++ b/dist/Intune/AzureDeviceCompliance(m).svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.429688 0 L 9.800781 0 C 7.480469 0 5.601563 1.878906 5.601563 4.199219 L 5.601563 57.398438 C 5.601563 59.722656 7.480469 61.601563 9.800781 61.601563 L 13.441406 61.601563 Z M 36.429688 0 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 44.800781 57.398438 C 44.800781 59.71875 42.949219 61.601563 40.660156 61.601563 L 9.738281 61.601563 C 7.453125 61.601563 5.601563 59.71875 5.601563 57.398438 L 5.601563 4.199219 C 5.601563 1.878906 7.453125 0 9.738281 0 L 40.660156 0 C 42.949219 0 44.800781 1.878906 44.800781 4.199219 Z M 44.800781 57.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 8.398438 7 L 42 7 L 42 53.199219 L 8.398438 53.199219 Z M 8.398438 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.199219 3.945313 C 32.199219 4.515625 31.457031 4.976563 30.539063 4.976563 L 19.863281 4.976563 C 18.945313 4.976563 18.199219 4.515625 18.199219 3.945313 C 18.199219 3.371094 18.945313 2.910156 19.863281 2.910156 L 30.539063 2.910156 C 31.457031 2.910156 32.199219 3.371094 32.199219 3.945313 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style="fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(3,148,255);stroke-opacity:1;stroke-miterlimit:10;" d="M 21.040737 26.040737 L 43.959263 26.040737 L 43.959263 48.959263 L 21.040737 48.959263 Z M 21.040737 26.040737 " transform="matrix(1.4,0,0,1.4,0,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 33.964844 52.65625 C 33.8125 52.492188 33.730469 52.273438 33.738281 52.050781 C 33.753906 51.828125 33.851563 51.628906 34.015625 51.480469 L 36.210938 49.449219 C 36.371094 49.300781 36.5625 49.226563 36.773438 49.226563 C 37.007813 49.226563 37.214844 49.320313 37.378906 49.496094 L 43.199219 55.738281 L 53.398438 42.667969 C 53.550781 42.46875 53.789063 42.351563 54.050781 42.351563 C 54.238281 42.351563 54.414063 42.410156 54.558594 42.527344 L 56.9375 44.363281 C 57.113281 44.488281 57.226563 44.679688 57.253906 44.910156 C 57.273438 45.09375 57.25 45.339844 57.058594 45.539063 L 43.9375 62.34375 C 43.710938 62.632813 43.28125 62.652344 43.027344 62.382813 Z M 33.964844 52.65625 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureDeviceCompliance.png b/dist/Intune/AzureDeviceCompliance.png
new file mode 100644
index 00000000..f978336a
Binary files /dev/null and b/dist/Intune/AzureDeviceCompliance.png differ
diff --git a/dist/Intune/AzureDeviceCompliance.puml b/dist/Intune/AzureDeviceCompliance.puml
new file mode 100644
index 00000000..4bdfe376
--- /dev/null
+++ b/dist/Intune/AzureDeviceCompliance.puml
@@ -0,0 +1,10 @@
+sprite $AzureDeviceCompliance [70x70/16z] {
+xTA7pgmW48RXeVWn2FT_lUSO9-B63AFRb_nlobOVAgq5dlLA_LzXHqPnxbNNYiNCD-NMEXM9-qZO6w1TZdTADHQaAraMT4xHAqzHwWM5ePMaSaQPb3Rjymf6
+Kp2QWkzHC9g2qHHyZuBH58ocu7iKF4z9l2_dV93Z2ONjV4_1SnNg5T-Xu7iKc8f_XWB6uqfavkGC1ORYUIa-fZXUIlIOadZ96GhwoYGt_xBYT_yDiYc6WeCI
+vCzjKq2NbIWhQ9kIwBh2ifjBaFUQabdAhLNnZOcy54XJjafjPUQseSc9Dv6jrACYKqWh0hALSb0sHd8db7fKvAf9dbGbR5DHb8s9f2kKBOKWcw8hRJ9LKOH9
+r5N8SrwKSfCexTewNT63A18yFK5f_Icn5qugHgUKYSta1lq3
+}
+
+AzureEntityColoring(AzureDeviceCompliance)
+!define AzureDeviceCompliance(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDeviceCompliance, AzureDeviceCompliance)
+!define AzureDeviceCompliance(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDeviceCompliance, AzureDeviceCompliance)
diff --git a/dist/Intune/AzureDeviceCompliance.svg b/dist/Intune/AzureDeviceCompliance.svg
new file mode 100644
index 00000000..5aeb14a9
--- /dev/null
+++ b/dist/Intune/AzureDeviceCompliance.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.429688 0 L 9.800781 0 C 7.480469 0 5.601563 1.878906 5.601563 4.199219 L 5.601563 57.398438 C 5.601563 59.722656 7.480469 61.601563 9.800781 61.601563 L 13.441406 61.601563 Z M 36.429688 0 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 44.800781 57.398438 C 44.800781 59.71875 42.949219 61.601563 40.660156 61.601563 L 9.738281 61.601563 C 7.453125 61.601563 5.601563 59.71875 5.601563 57.398438 L 5.601563 4.199219 C 5.601563 1.878906 7.453125 0 9.738281 0 L 40.660156 0 C 42.949219 0 44.800781 1.878906 44.800781 4.199219 Z M 44.800781 57.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 8.398438 7 L 42 7 L 42 53.199219 L 8.398438 53.199219 Z M 8.398438 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.199219 3.945313 C 32.199219 4.515625 31.457031 4.976563 30.539063 4.976563 L 19.863281 4.976563 C 18.945313 4.976563 18.199219 4.515625 18.199219 3.945313 C 18.199219 3.371094 18.945313 2.910156 19.863281 2.910156 L 30.539063 2.910156 C 31.457031 2.910156 32.199219 3.371094 32.199219 3.945313 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(22.352941%,60%,77.647059%);stroke-opacity:1;stroke-miterlimit:10;" d="M 21.040737 26.040737 L 43.959263 26.040737 L 43.959263 48.959263 L 21.040737 48.959263 Z M 21.040737 26.040737 " transform="matrix(1.4,0,0,1.4,0,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 33.964844 52.65625 C 33.8125 52.492188 33.730469 52.273438 33.738281 52.050781 C 33.753906 51.828125 33.851563 51.628906 34.015625 51.480469 L 36.210938 49.449219 C 36.371094 49.300781 36.5625 49.226563 36.773438 49.226563 C 37.007813 49.226563 37.214844 49.320313 37.378906 49.496094 L 43.199219 55.738281 L 53.398438 42.667969 C 53.550781 42.46875 53.789063 42.351563 54.050781 42.351563 C 54.238281 42.351563 54.414063 42.410156 54.558594 42.527344 L 56.9375 44.363281 C 57.113281 44.488281 57.226563 44.679688 57.253906 44.910156 C 57.273438 45.09375 57.25 45.339844 57.058594 45.539063 L 43.9375 62.34375 C 43.710938 62.632813 43.28125 62.652344 43.027344 62.382813 Z M 33.964844 52.65625 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureDeviceConfig(m).png b/dist/Intune/AzureDeviceConfig(m).png
new file mode 100644
index 00000000..f591faae
Binary files /dev/null and b/dist/Intune/AzureDeviceConfig(m).png differ
diff --git a/dist/Intune/AzureDeviceConfig(m).svg b/dist/Intune/AzureDeviceConfig(m).svg
new file mode 100644
index 00000000..b72e4c32
--- /dev/null
+++ b/dist/Intune/AzureDeviceConfig(m).svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(203,232,255);fill-opacity:1;" d="M 28 61.601563 L 44.800781 61.601563 L 40.601563 51.800781 L 44.800781 42 L 44.800781 26.601563 L 28 26.601563 Z M 28 61.601563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.429688 0 L 9.800781 0 C 7.480469 0 5.601563 1.878906 5.601563 4.199219 L 5.601563 57.398438 C 5.601563 59.722656 7.480469 61.601563 9.800781 61.601563 L 13.441406 61.601563 Z M 36.429688 0 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(65,174,255);fill-opacity:1;" d="M 28 61.601563 L 44.800781 61.601563 L 40.601563 51.800781 L 44.800781 42 L 44.800781 26.601563 L 28 26.601563 Z M 28 61.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 35.460938 58.460938 L 34.773438 56.789063 L 30.945313 55.535156 L 29.398438 54.953125 L 29.398438 48.847656 L 34.835938 46.90625 L 35.519531 45.238281 L 33.40625 41.070313 L 32.953125 40.164063 L 37.28125 35.839844 L 42.34375 38.257813 L 44.011719 37.574219 L 44.800781 35.171875 L 44.800781 4.199219 C 44.800781 1.878906 42.949219 0 40.660156 0 L 9.738281 0 C 7.453125 0 5.601563 1.878906 5.601563 4.199219 L 5.601563 57.398438 C 5.601563 59.71875 7.453125 61.601563 9.738281 61.601563 L 33.984375 61.601563 Z M 35.460938 58.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 29.398438 48.847656 L 34.835938 46.90625 L 35.519531 45.238281 L 33.40625 41.070313 L 32.953125 40.164063 L 37.28125 35.839844 L 42 38.09375 L 42 7 L 8.398438 7 L 8.398438 53.199219 L 29.398438 53.199219 Z M 29.398438 48.847656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.199219 3.945313 C 32.199219 4.515625 31.457031 4.976563 30.539063 4.976563 L 19.863281 4.976563 C 18.945313 4.976563 18.199219 4.515625 18.199219 3.945313 C 18.199219 3.371094 18.945313 2.910156 19.863281 2.910156 L 30.539063 2.910156 C 31.457031 2.910156 32.199219 3.371094 32.199219 3.945313 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 67.199219 53.765625 L 67.199219 49.617188 L 66.617188 49.398438 L 62.175781 47.941406 L 61.011719 45.101563 L 63.269531 40.296875 L 60.355469 37.386719 L 59.773438 37.675781 L 55.625 39.789063 L 52.785156 38.625 L 50.964844 33.601563 L 46.816406 33.601563 L 46.597656 34.183594 L 45.140625 38.625 L 42.300781 39.789063 L 37.570313 37.53125 L 34.660156 40.441406 L 34.949219 41.027344 L 37.0625 45.175781 L 35.894531 48.015625 L 30.800781 49.835938 L 30.800781 53.984375 L 31.382813 54.203125 L 35.824219 55.660156 L 36.988281 58.496094 L 34.730469 63.300781 L 37.644531 66.214844 L 38.226563 65.921875 L 42.375 63.8125 L 45.214844 64.976563 L 47.035156 70 L 51.183594 70 L 51.402344 69.417969 L 52.859375 64.976563 L 55.699219 63.8125 L 60.503906 66.070313 L 63.414063 63.15625 L 63.125 62.574219 L 61.011719 58.425781 L 62.175781 55.585938 Z M 49 57.988281 C 45.578125 57.988281 42.8125 55.222656 42.8125 51.800781 C 42.8125 48.378906 45.578125 45.613281 49 45.613281 C 52.421875 45.613281 55.1875 48.378906 55.1875 51.800781 C 55.1875 55.222656 52.421875 57.988281 49 57.988281 Z M 49 57.988281 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureDeviceConfig.png b/dist/Intune/AzureDeviceConfig.png
new file mode 100644
index 00000000..7f289aa1
Binary files /dev/null and b/dist/Intune/AzureDeviceConfig.png differ
diff --git a/dist/Intune/AzureDeviceConfig.puml b/dist/Intune/AzureDeviceConfig.puml
new file mode 100644
index 00000000..ee44d421
--- /dev/null
+++ b/dist/Intune/AzureDeviceConfig.puml
@@ -0,0 +1,11 @@
+sprite $AzureDeviceConfig [70x70/16z] {
+tTJP4giW383XW5cBx_-wtN0QE4EKUdR_-tuJQ11gYzxYolgiQ8A3yBRNMYj7pAtBl3hAbi9kIsimD2Ljb1LsmrYnxK1pIbpv9ShwXQ8S9LjbGX4A-cX_N-6h
+ANmrXVyTXQ-cyDKK_dSK_brA-aiANqtXtwcaP_CAZvLap_0d5K1xfkSKOP6NOY3sAaygFKA8A59MJlQEe9Pd54TK6V65LKMh8KOJYYDcfeoijgMKilXKWS9j
+g1Q7augWM5oA5UuZ2sFOKsQ7oNlAx3020oL0fBrVLVDmMcbdKKfrKRwUHVnUD46DZk-b9mXzs_mtR3N1TAo84_sY9ZLpQA1mfqH_Avj7Noa9F3gjG1EE5TCj
+Qz8lJ_Ifh4sAtAW4tlXsFwrjHH0TKhyOwjRG5H-bx_Q4vCTLNQAjsre7aR-01Pub6h-0nKSPfCrhL669NYFOdY8uzP7oOKP8EVfAULdjFSiWGRKeWUdGuZBC
+fXP7C5j-CvpHELaMyUkTPYHlA-ldMCIHEMOxVkhlDCEvk5csyotjv-fyEbwI1m
+}
+
+AzureEntityColoring(AzureDeviceConfig)
+!define AzureDeviceConfig(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDeviceConfig, AzureDeviceConfig)
+!define AzureDeviceConfig(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDeviceConfig, AzureDeviceConfig)
diff --git a/dist/Intune/AzureDeviceConfig.svg b/dist/Intune/AzureDeviceConfig.svg
new file mode 100644
index 00000000..af2de9a1
--- /dev/null
+++ b/dist/Intune/AzureDeviceConfig.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 28 61.601563 L 44.800781 61.601563 L 40.601563 51.800781 L 44.800781 42 L 44.800781 26.601563 L 28 26.601563 Z M 28 61.601563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.429688 0 L 9.800781 0 C 7.480469 0 5.601563 1.878906 5.601563 4.199219 L 5.601563 57.398438 C 5.601563 59.722656 7.480469 61.601563 9.800781 61.601563 L 13.441406 61.601563 Z M 36.429688 0 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 28 61.601563 L 44.800781 61.601563 L 40.601563 51.800781 L 44.800781 42 L 44.800781 26.601563 L 28 26.601563 Z M 28 61.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 35.460938 58.460938 L 34.773438 56.789063 L 30.945313 55.535156 L 29.398438 54.953125 L 29.398438 48.847656 L 34.835938 46.90625 L 35.519531 45.238281 L 33.40625 41.070313 L 32.953125 40.164063 L 37.28125 35.839844 L 42.34375 38.257813 L 44.011719 37.574219 L 44.800781 35.171875 L 44.800781 4.199219 C 44.800781 1.878906 42.949219 0 40.660156 0 L 9.738281 0 C 7.453125 0 5.601563 1.878906 5.601563 4.199219 L 5.601563 57.398438 C 5.601563 59.71875 7.453125 61.601563 9.738281 61.601563 L 33.984375 61.601563 Z M 35.460938 58.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 29.398438 48.847656 L 34.835938 46.90625 L 35.519531 45.238281 L 33.40625 41.070313 L 32.953125 40.164063 L 37.28125 35.839844 L 42 38.09375 L 42 7 L 8.398438 7 L 8.398438 53.199219 L 29.398438 53.199219 Z M 29.398438 48.847656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.199219 3.945313 C 32.199219 4.515625 31.457031 4.976563 30.539063 4.976563 L 19.863281 4.976563 C 18.945313 4.976563 18.199219 4.515625 18.199219 3.945313 C 18.199219 3.371094 18.945313 2.910156 19.863281 2.910156 L 30.539063 2.910156 C 31.457031 2.910156 32.199219 3.371094 32.199219 3.945313 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 67.199219 53.765625 L 67.199219 49.617188 L 66.617188 49.398438 L 62.175781 47.941406 L 61.011719 45.101563 L 63.269531 40.296875 L 60.355469 37.386719 L 59.773438 37.675781 L 55.625 39.789063 L 52.785156 38.625 L 50.964844 33.601563 L 46.816406 33.601563 L 46.597656 34.183594 L 45.140625 38.625 L 42.300781 39.789063 L 37.570313 37.53125 L 34.660156 40.441406 L 34.949219 41.027344 L 37.0625 45.175781 L 35.894531 48.015625 L 30.800781 49.835938 L 30.800781 53.984375 L 31.382813 54.203125 L 35.824219 55.660156 L 36.988281 58.496094 L 34.730469 63.300781 L 37.644531 66.214844 L 38.226563 65.921875 L 42.375 63.8125 L 45.214844 64.976563 L 47.035156 70 L 51.183594 70 L 51.402344 69.417969 L 52.859375 64.976563 L 55.699219 63.8125 L 60.503906 66.070313 L 63.414063 63.15625 L 63.125 62.574219 L 61.011719 58.425781 L 62.175781 55.585938 Z M 49 57.988281 C 45.578125 57.988281 42.8125 55.222656 42.8125 51.800781 C 42.8125 48.378906 45.578125 45.613281 49 45.613281 C 52.421875 45.613281 55.1875 48.378906 55.1875 51.800781 C 55.1875 55.222656 52.421875 57.988281 49 57.988281 Z M 49 57.988281 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureDevicesGroup(m).png b/dist/Intune/AzureDevicesGroup(m).png
new file mode 100644
index 00000000..c6c70351
Binary files /dev/null and b/dist/Intune/AzureDevicesGroup(m).png differ
diff --git a/dist/Intune/AzureDevicesGroup(m).svg b/dist/Intune/AzureDevicesGroup(m).svg
new file mode 100644
index 00000000..7827ddc1
--- /dev/null
+++ b/dist/Intune/AzureDevicesGroup(m).svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.398438 0 L 4.199219 0 C 1.878906 0 0 1.878906 0 4.199219 L 0 46.199219 C 0 48.519531 1.878906 50.398438 4.199219 50.398438 L 21 50.398438 Z M 43.398438 0 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 63.125 19.601563 L 41.25 19.601563 C 39.34375 19.601563 37.800781 21.136719 37.800781 23.035156 L 37.800781 66.5625 C 37.800781 68.460938 39.34375 70 41.25 70 L 44.238281 70 Z M 63.125 19.601563 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 64.398438 46.199219 C 64.398438 48.519531 62.496094 50.398438 60.148438 50.398438 L 4.25 50.398438 C 1.902344 50.398438 0 48.519531 0 46.199219 L 0 4.199219 C 0 1.878906 1.902344 0 4.25 0 L 60.148438 0 C 62.496094 0 64.398438 1.878906 64.398438 4.199219 Z M 64.398438 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 4.148438 7 L 60.199219 7 L 60.199219 43.398438 L 4.148438 43.398438 Z M 4.148438 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.398438 3.765625 C 36.398438 4.296875 35.96875 4.726563 35.4375 4.726563 L 29.246094 4.726563 C 28.710938 4.726563 28.28125 4.296875 28.28125 3.765625 C 28.28125 3.234375 28.710938 2.800781 29.246094 2.800781 L 35.4375 2.800781 C 35.96875 2.800781 36.398438 3.234375 36.398438 3.765625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 70 66.5625 C 70 68.460938 68.476563 70 66.601563 70 L 41.199219 70 C 39.320313 70 37.800781 68.460938 37.800781 66.5625 L 37.800781 23.035156 C 37.800781 21.136719 39.320313 19.601563 41.199219 19.601563 L 66.597656 19.601563 C 68.476563 19.601563 70 21.136719 70 23.035156 Z M 70 66.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 40.601563 25.199219 L 67.199219 25.199219 L 67.199219 63 L 40.601563 63 Z M 40.601563 25.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 59.648438 22.640625 C 59.648438 23.109375 59.039063 23.488281 58.285156 23.488281 L 49.519531 23.488281 C 48.761719 23.488281 48.148438 23.109375 48.148438 22.640625 C 48.148438 22.171875 48.761719 21.789063 49.519531 21.789063 L 58.285156 21.789063 C 59.039063 21.789063 59.648438 22.171875 59.648438 22.640625 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureDevicesGroup.png b/dist/Intune/AzureDevicesGroup.png
new file mode 100644
index 00000000..8bf2860b
Binary files /dev/null and b/dist/Intune/AzureDevicesGroup.png differ
diff --git a/dist/Intune/AzureDevicesGroup.puml b/dist/Intune/AzureDevicesGroup.puml
new file mode 100644
index 00000000..3493b94e
--- /dev/null
+++ b/dist/Intune/AzureDevicesGroup.puml
@@ -0,0 +1,9 @@
+sprite $AzureDevicesGroup [70x70/16z] {
+tTS74i8m34HHfyahsVU_BZKzGXOTygTJtgpfX8fOVAMyJYXSgrYyPILS5H8ZN5EdzBKNnPhIzNkxVihjCUQK-bhifsXnhpZBhr1IKK4i1oLPAF5J2dv7mTuK
+_8w2tr7mEeMLpeeqJTqhPSJyl93Qfx1CST_iyq9yocHG6AjxfMVkEH1txL3i3-HNz99NmQ0OL_eLxfJe4XSLM0fzL86bq1ygi1Jwg8BtA-HKy7w5d0h-HI6d
+WkyeK69PnZhIAxuVfWygwILADXLQAsnCyIkTFiLKQAE4Q4pnAw6XyY-Mek9geT3U5FeTXVQcqDuKUauHN1Abv5NiV_ZVKV9J2XjJ_0hPKrBm1Kj9pH4
+}
+
+AzureEntityColoring(AzureDevicesGroup)
+!define AzureDevicesGroup(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDevicesGroup, AzureDevicesGroup)
+!define AzureDevicesGroup(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDevicesGroup, AzureDevicesGroup)
diff --git a/dist/Intune/AzureDevicesGroup.svg b/dist/Intune/AzureDevicesGroup.svg
new file mode 100644
index 00000000..d66ebf6e
--- /dev/null
+++ b/dist/Intune/AzureDevicesGroup.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.398438 0 L 4.199219 0 C 1.878906 0 0 1.878906 0 4.199219 L 0 46.199219 C 0 48.519531 1.878906 50.398438 4.199219 50.398438 L 21 50.398438 Z M 43.398438 0 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 63.125 19.601563 L 41.25 19.601563 C 39.34375 19.601563 37.800781 21.136719 37.800781 23.035156 L 37.800781 66.5625 C 37.800781 68.460938 39.34375 70 41.25 70 L 44.238281 70 Z M 63.125 19.601563 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 64.398438 46.199219 C 64.398438 48.519531 62.496094 50.398438 60.148438 50.398438 L 4.25 50.398438 C 1.902344 50.398438 0 48.519531 0 46.199219 L 0 4.199219 C 0 1.878906 1.902344 0 4.25 0 L 60.148438 0 C 62.496094 0 64.398438 1.878906 64.398438 4.199219 Z M 64.398438 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 4.148438 7 L 60.199219 7 L 60.199219 43.398438 L 4.148438 43.398438 Z M 4.148438 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.398438 3.765625 C 36.398438 4.296875 35.96875 4.726563 35.4375 4.726563 L 29.246094 4.726563 C 28.710938 4.726563 28.28125 4.296875 28.28125 3.765625 C 28.28125 3.234375 28.710938 2.800781 29.246094 2.800781 L 35.4375 2.800781 C 35.96875 2.800781 36.398438 3.234375 36.398438 3.765625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 70 66.5625 C 70 68.460938 68.476563 70 66.601563 70 L 41.199219 70 C 39.320313 70 37.800781 68.460938 37.800781 66.5625 L 37.800781 23.035156 C 37.800781 21.136719 39.320313 19.601563 41.199219 19.601563 L 66.597656 19.601563 C 68.476563 19.601563 70 21.136719 70 23.035156 Z M 70 66.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 40.601563 25.199219 L 67.199219 25.199219 L 67.199219 63 L 40.601563 63 Z M 40.601563 25.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 59.648438 22.640625 C 59.648438 23.109375 59.039063 23.488281 58.285156 23.488281 L 49.519531 23.488281 C 48.761719 23.488281 48.148438 23.109375 48.148438 22.640625 C 48.148438 22.171875 48.761719 21.789063 49.519531 21.789063 L 58.285156 21.789063 C 59.039063 21.789063 59.648438 22.171875 59.648438 22.640625 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureEnrollment(m).png b/dist/Intune/AzureEnrollment(m).png
new file mode 100644
index 00000000..d935bdc0
Binary files /dev/null and b/dist/Intune/AzureEnrollment(m).png differ
diff --git a/dist/Intune/AzureEnrollment(m).svg b/dist/Intune/AzureEnrollment(m).svg
new file mode 100644
index 00000000..99950a22
--- /dev/null
+++ b/dist/Intune/AzureEnrollment(m).svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.398438 0 L 4.199219 0 C 1.878906 0 0 1.878906 0 4.199219 L 0 46.199219 C 0 48.519531 1.878906 50.398438 4.199219 50.398438 L 21 50.398438 Z M 43.398438 0 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 63.125 19.601563 L 41.25 19.601563 C 39.34375 19.601563 37.800781 21.136719 37.800781 23.035156 L 37.800781 66.5625 C 37.800781 68.460938 39.34375 70 41.25 70 L 44.238281 70 Z M 63.125 19.601563 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 30.101563 29.398438 C 39.75 29.398438 47.601563 37.25 47.601563 46.898438 C 47.601563 56.550781 39.75 64.398438 30.101563 64.398438 C 20.449219 64.398438 12.601563 56.550781 12.601563 46.898438 C 12.601563 37.25 20.449219 29.398438 30.101563 29.398438 M 30.101563 28 C 19.660156 28 11.199219 36.460938 11.199219 46.898438 C 11.199219 57.339844 19.660156 65.800781 30.101563 65.800781 C 40.539063 65.800781 49 57.339844 49 46.898438 C 49 36.460938 40.539063 28 30.101563 28 Z M 30.101563 28 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 26.601563 58.800781 L 26.601563 50.398438 L 18.199219 50.398438 L 18.199219 43.398438 L 26.601563 43.398438 L 26.601563 35 L 33.601563 35 L 33.601563 43.398438 L 42 43.398438 L 42 50.398438 L 33.601563 50.398438 L 33.601563 58.800781 Z M 26.601563 58.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 64.398438 46.199219 C 64.398438 48.519531 62.496094 50.398438 60.148438 50.398438 L 4.25 50.398438 C 1.902344 50.398438 0 48.519531 0 46.199219 L 0 4.199219 C 0 1.878906 1.902344 0 4.25 0 L 60.148438 0 C 62.496094 0 64.398438 1.878906 64.398438 4.199219 Z M 64.398438 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 4.148438 7 L 60.199219 7 L 60.199219 43.398438 L 4.148438 43.398438 Z M 4.148438 7 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.398438 3.765625 C 36.398438 4.296875 35.96875 4.726563 35.4375 4.726563 L 29.246094 4.726563 C 28.710938 4.726563 28.28125 4.296875 28.28125 3.765625 C 28.28125 3.234375 28.710938 2.800781 29.246094 2.800781 L 35.4375 2.800781 C 35.96875 2.800781 36.398438 3.234375 36.398438 3.765625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 70 66.5625 C 70 68.460938 68.476563 70 66.601563 70 L 41.199219 70 C 39.320313 70 37.800781 68.460938 37.800781 66.5625 L 37.800781 23.035156 C 37.800781 21.136719 39.320313 19.601563 41.199219 19.601563 L 66.597656 19.601563 C 68.476563 19.601563 70 21.136719 70 23.035156 Z M 70 66.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 40.601563 25.199219 L 67.199219 25.199219 L 67.199219 63 L 40.601563 63 Z M 40.601563 25.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 59.648438 22.640625 C 59.648438 23.109375 59.039063 23.488281 58.285156 23.488281 L 49.519531 23.488281 C 48.761719 23.488281 48.148438 23.109375 48.148438 22.640625 C 48.148438 22.171875 48.761719 21.789063 49.519531 21.789063 L 58.285156 21.789063 C 59.039063 21.789063 59.648438 22.171875 59.648438 22.640625 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 49 46.898438 C 49 57.339844 40.539063 65.800781 30.101563 65.800781 C 19.660156 65.800781 11.199219 57.339844 11.199219 46.898438 C 11.199219 36.460938 19.660156 28 30.101563 28 C 40.539063 28 49 36.460938 49 46.898438 Z M 49 46.898438 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 40.601563 44.800781 L 32.199219 44.800781 L 32.199219 36.398438 L 28 36.398438 L 28 44.800781 L 19.601563 44.800781 L 19.601563 49 L 28 49 L 28 57.398438 L 32.199219 57.398438 L 32.199219 49 L 40.601563 49 Z M 40.601563 44.800781 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureEnrollment.png b/dist/Intune/AzureEnrollment.png
new file mode 100644
index 00000000..d1cb0b73
Binary files /dev/null and b/dist/Intune/AzureEnrollment.png differ
diff --git a/dist/Intune/AzureEnrollment.puml b/dist/Intune/AzureEnrollment.puml
new file mode 100644
index 00000000..fdea9706
--- /dev/null
+++ b/dist/Intune/AzureEnrollment.puml
@@ -0,0 +1,12 @@
+sprite $AzureEnrollment [70x70/16z] {
+tTVNWYeX48HXS1QwgiRtVzqJ1ji4GtDo-6zsJPzbrfGhjTP-VKyrjJArsdKGcb8r2IsVCkhZKAZpIceLdt8wHfEmNOxCfmoYAsjTVuQoXmei3eFqejZlKl3t
+AFZV5Fmz2luU1JzFuQ2lYhRjuag8JDylT5bJg4UyzVH-eJL5ycfAtgKfpdpB3MBvy4owVhlIjwygS6Louhh2CgWUCLGmKsgi0BprtGhepupspr2fWKA9U2PN
+bDv0VrJzDaMYTK6o3fae4cmKXK2946TM5JeoPAn3EgL3ZgisFE-iIufeZv1JIWNsIEoHNg5iga1rGH7dYecnGbcWKDMHKqMC51DY1R72KmKjoaA5SgHJl9i2
+hocUFqg1ubjg6fIN5JQbX4fzLwX72ugDbQAd5hVKJadMALPQXxQLLfqhQQlMWkmvd3pIG-NHPU5PHphIATxIAo1KJ942rL3PX42H73bNKlmkPGlA9amKdn8f
+2R97nu_FPuMo9ILBJqhBF0XbIKcRQ2T1T6IYEADJf2ufpi3ws91GyJB5VeXG70aKhqZ4go7XI8FsiP9obKJ2lxmZ-eMVJjegTKIKd49bLiuv7RbodIXnd4nP
+L-fyofxMmapPjyy
+}
+
+AzureEntityColoring(AzureEnrollment)
+!define AzureEnrollment(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureEnrollment, AzureEnrollment)
+!define AzureEnrollment(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureEnrollment, AzureEnrollment)
diff --git a/dist/Intune/AzureEnrollment.svg b/dist/Intune/AzureEnrollment.svg
new file mode 100644
index 00000000..0af5b85b
--- /dev/null
+++ b/dist/Intune/AzureEnrollment.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.398438 0 L 4.199219 0 C 1.878906 0 0 1.878906 0 4.199219 L 0 46.199219 C 0 48.519531 1.878906 50.398438 4.199219 50.398438 L 21 50.398438 Z M 43.398438 0 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 63.125 19.601563 L 41.25 19.601563 C 39.34375 19.601563 37.800781 21.136719 37.800781 23.035156 L 37.800781 66.5625 C 37.800781 68.460938 39.34375 70 41.25 70 L 44.238281 70 Z M 63.125 19.601563 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,9.411765%,56.078431%);fill-opacity:1;" d="M 30.101563 29.398438 C 39.75 29.398438 47.601563 37.25 47.601563 46.898438 C 47.601563 56.550781 39.75 64.398438 30.101563 64.398438 C 20.449219 64.398438 12.601563 56.550781 12.601563 46.898438 C 12.601563 37.25 20.449219 29.398438 30.101563 29.398438 M 30.101563 28 C 19.660156 28 11.199219 36.460938 11.199219 46.898438 C 11.199219 57.339844 19.660156 65.800781 30.101563 65.800781 C 40.539063 65.800781 49 57.339844 49 46.898438 C 49 36.460938 40.539063 28 30.101563 28 Z M 30.101563 28 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 26.601563 58.800781 L 26.601563 50.398438 L 18.199219 50.398438 L 18.199219 43.398438 L 26.601563 43.398438 L 26.601563 35 L 33.601563 35 L 33.601563 43.398438 L 42 43.398438 L 42 50.398438 L 33.601563 50.398438 L 33.601563 58.800781 Z M 26.601563 58.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 64.398438 46.199219 C 64.398438 48.519531 62.496094 50.398438 60.148438 50.398438 L 4.25 50.398438 C 1.902344 50.398438 0 48.519531 0 46.199219 L 0 4.199219 C 0 1.878906 1.902344 0 4.25 0 L 60.148438 0 C 62.496094 0 64.398438 1.878906 64.398438 4.199219 Z M 64.398438 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 4.148438 7 L 60.199219 7 L 60.199219 43.398438 L 4.148438 43.398438 Z M 4.148438 7 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.398438 3.765625 C 36.398438 4.296875 35.96875 4.726563 35.4375 4.726563 L 29.246094 4.726563 C 28.710938 4.726563 28.28125 4.296875 28.28125 3.765625 C 28.28125 3.234375 28.710938 2.800781 29.246094 2.800781 L 35.4375 2.800781 C 35.96875 2.800781 36.398438 3.234375 36.398438 3.765625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 70 66.5625 C 70 68.460938 68.476563 70 66.601563 70 L 41.199219 70 C 39.320313 70 37.800781 68.460938 37.800781 66.5625 L 37.800781 23.035156 C 37.800781 21.136719 39.320313 19.601563 41.199219 19.601563 L 66.597656 19.601563 C 68.476563 19.601563 70 21.136719 70 23.035156 Z M 70 66.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 40.601563 25.199219 L 67.199219 25.199219 L 67.199219 63 L 40.601563 63 Z M 40.601563 25.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 59.648438 22.640625 C 59.648438 23.109375 59.039063 23.488281 58.285156 23.488281 L 49.519531 23.488281 C 48.761719 23.488281 48.148438 23.109375 48.148438 22.640625 C 48.148438 22.171875 48.761719 21.789063 49.519531 21.789063 L 58.285156 21.789063 C 59.039063 21.789063 59.648438 22.171875 59.648438 22.640625 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 49 46.898438 C 49 57.339844 40.539063 65.800781 30.101563 65.800781 C 19.660156 65.800781 11.199219 57.339844 11.199219 46.898438 C 11.199219 36.460938 19.660156 28 30.101563 28 C 40.539063 28 49 36.460938 49 46.898438 Z M 49 46.898438 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 40.601563 44.800781 L 32.199219 44.800781 L 32.199219 36.398438 L 28 36.398438 L 28 44.800781 L 19.601563 44.800781 L 19.601563 49 L 28 49 L 28 57.398438 L 32.199219 57.398438 L 32.199219 49 L 40.601563 49 Z M 40.601563 44.800781 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureExchangeOn-PremisesAccess(m).png b/dist/Intune/AzureExchangeOn-PremisesAccess(m).png
new file mode 100644
index 00000000..2652d9d1
Binary files /dev/null and b/dist/Intune/AzureExchangeOn-PremisesAccess(m).png differ
diff --git a/dist/Intune/AzureExchangeOn-PremisesAccess(m).svg b/dist/Intune/AzureExchangeOn-PremisesAccess(m).svg
new file mode 100644
index 00000000..7eb6e611
--- /dev/null
+++ b/dist/Intune/AzureExchangeOn-PremisesAccess(m).svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.85098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 21 7 L 26.601563 7 L 26.601563 16.800781 L 21 16.800781 Z M 32.199219 7 L 37.800781 7 L 37.800781 16.800781 L 32.199219 16.800781 Z M 43.398438 7 L 49 7 L 49 16.800781 L 43.398438 16.800781 Z M 21 22.398438 L 26.601563 22.398438 L 26.601563 32.199219 L 21 32.199219 Z M 32.199219 22.398438 L 37.800781 22.398438 L 37.800781 32.199219 L 32.199219 32.199219 Z M 43.398438 22.398438 L 49 22.398438 L 49 32.199219 L 43.398438 32.199219 Z M 21 37.800781 L 26.601563 37.800781 L 26.601563 47.601563 L 21 47.601563 Z M 32.199219 37.800781 L 37.800781 37.800781 L 37.800781 47.601563 L 32.199219 47.601563 Z M 30.800781 56 L 39.199219 56 L 39.199219 68.671875 L 30.800781 68.671875 Z M 43.398438 37.800781 L 49 37.800781 L 49 47.601563 L 43.398438 47.601563 Z M 43.398438 37.800781 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 50.398438 1.398438 L 16.789063 1.398438 C 16.777344 1.398438 15.878906 1.421875 15.535156 2.171875 C 15.511719 2.226563 15.476563 2.273438 15.457031 2.339844 L 15.453125 2.382813 C 15.421875 2.507813 15.398438 2.640625 15.398438 2.800781 L 15.398438 50.8125 Z M 50.398438 1.398438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 54.546875 2.382813 C 54.542969 2.371094 54.542969 2.351563 54.539063 2.339844 C 54.523438 2.28125 54.492188 2.238281 54.46875 2.183594 C 54.132813 1.417969 53.207031 1.398438 53.207031 1.398438 L 16.792969 1.398438 C 16.792969 1.398438 15.878906 1.417969 15.539063 2.171875 C 15.511719 2.230469 15.476563 2.277344 15.460938 2.339844 L 15.453125 2.382813 C 15.417969 2.519531 15.398438 2.660156 15.398438 2.800781 L 15.398438 67.199219 C 15.398438 68.539063 16.800781 68.601563 16.800781 68.601563 L 53.199219 68.601563 C 53.199219 68.601563 54.601563 68.539063 54.601563 67.199219 L 54.601563 2.800781 C 54.601563 2.640625 54.578125 2.507813 54.546875 2.382813 Z M 54.546875 2.382813 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureExchangeOn-PremisesAccess.png b/dist/Intune/AzureExchangeOn-PremisesAccess.png
new file mode 100644
index 00000000..931757c9
Binary files /dev/null and b/dist/Intune/AzureExchangeOn-PremisesAccess.png differ
diff --git a/dist/Intune/AzureExchangeOn-PremisesAccess.puml b/dist/Intune/AzureExchangeOn-PremisesAccess.puml
new file mode 100644
index 00000000..cac46da4
--- /dev/null
+++ b/dist/Intune/AzureExchangeOn-PremisesAccess.puml
@@ -0,0 +1,9 @@
+sprite $AzureExchangeOn [70x70/16z] {
+xTP7WiCW58FXk06Ixd_V0T9xOZITV_LMNufDsNnAItYbyJ4ofsU1al1OMPugL8wD2cHGG8T2lQvCGswgupoKwXY6OHn7jYkv2wKhY0w53eKoAD3xofZRAMEf
+llcfZYshaJgsMe4C2kXGA8D2hLB2aWk7COJg89GQtXTAP-zBLnQ70eS2EXJAe50jokxTXQGKIrGETNnPkLx93QkHCYYGGG4ToWFadISzAzV-lbmeNO55eKEX
+30ei2gLvpEtUkh54wRsR1_MqvmhaK6XHz6LALpZlIatAi2l-3QKhNS5ZPS0h2fVDP_G1
+}
+
+AzureEntityColoring(AzureExchangeOn-PremisesAccess)
+!define AzureExchangeOn-PremisesAccess(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureExchangeOn-PremisesAccess, AzureExchangeOn-PremisesAccess)
+!define AzureExchangeOn-PremisesAccess(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureExchangeOn-PremisesAccess, AzureExchangeOn-PremisesAccess)
diff --git a/dist/Intune/AzureExchangeOn-PremisesAccess.svg b/dist/Intune/AzureExchangeOn-PremisesAccess.svg
new file mode 100644
index 00000000..97c8d634
--- /dev/null
+++ b/dist/Intune/AzureExchangeOn-PremisesAccess.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.85098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21 7 L 26.601563 7 L 26.601563 16.800781 L 21 16.800781 Z M 32.199219 7 L 37.800781 7 L 37.800781 16.800781 L 32.199219 16.800781 Z M 43.398438 7 L 49 7 L 49 16.800781 L 43.398438 16.800781 Z M 21 22.398438 L 26.601563 22.398438 L 26.601563 32.199219 L 21 32.199219 Z M 32.199219 22.398438 L 37.800781 22.398438 L 37.800781 32.199219 L 32.199219 32.199219 Z M 43.398438 22.398438 L 49 22.398438 L 49 32.199219 L 43.398438 32.199219 Z M 21 37.800781 L 26.601563 37.800781 L 26.601563 47.601563 L 21 47.601563 Z M 32.199219 37.800781 L 37.800781 37.800781 L 37.800781 47.601563 L 32.199219 47.601563 Z M 30.800781 56 L 39.199219 56 L 39.199219 68.671875 L 30.800781 68.671875 Z M 43.398438 37.800781 L 49 37.800781 L 49 47.601563 L 43.398438 47.601563 Z M 43.398438 37.800781 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 50.398438 1.398438 L 16.789063 1.398438 C 16.777344 1.398438 15.878906 1.421875 15.535156 2.171875 C 15.511719 2.226563 15.476563 2.273438 15.457031 2.339844 L 15.453125 2.382813 C 15.421875 2.507813 15.398438 2.640625 15.398438 2.800781 L 15.398438 50.8125 Z M 50.398438 1.398438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 54.546875 2.382813 C 54.542969 2.371094 54.542969 2.351563 54.539063 2.339844 C 54.523438 2.28125 54.492188 2.238281 54.46875 2.183594 C 54.132813 1.417969 53.207031 1.398438 53.207031 1.398438 L 16.792969 1.398438 C 16.792969 1.398438 15.878906 1.417969 15.539063 2.171875 C 15.511719 2.230469 15.476563 2.277344 15.460938 2.339844 L 15.453125 2.382813 C 15.417969 2.519531 15.398438 2.660156 15.398438 2.800781 L 15.398438 67.199219 C 15.398438 68.539063 16.800781 68.601563 16.800781 68.601563 L 53.199219 68.601563 C 53.199219 68.601563 54.601563 68.539063 54.601563 67.199219 L 54.601563 2.800781 C 54.601563 2.640625 54.578125 2.507813 54.546875 2.382813 Z M 54.546875 2.382813 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureIntuneAppProtection(m).png b/dist/Intune/AzureIntuneAppProtection(m).png
new file mode 100644
index 00000000..c58e34dc
Binary files /dev/null and b/dist/Intune/AzureIntuneAppProtection(m).png differ
diff --git a/dist/Intune/AzureIntuneAppProtection(m).svg b/dist/Intune/AzureIntuneAppProtection(m).svg
new file mode 100644
index 00000000..87379624
--- /dev/null
+++ b/dist/Intune/AzureIntuneAppProtection(m).svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 53.199219 50.398438 L 63 44.101563 L 53.199219 36.398438 Z M 27.300781 34.859375 C 23.941406 34.859375 21.140625 32.058594 21.140625 28.699219 C 21.140625 25.339844 23.941406 22.539063 27.300781 22.539063 C 30.660156 22.539063 33.460938 25.339844 33.460938 28.699219 C 33.460938 32.058594 30.660156 34.859375 27.300781 34.859375 Z M 27.300781 34.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 5.601563 40.601563 L 5.601563 15.398438 L 49 15.398438 L 49 23.800781 L 54.601563 23.800781 L 54.601563 12.601563 C 54.601563 11.199219 53.199219 9.800781 51.800781 9.800781 L 2.800781 9.800781 C 1.398438 9.800781 0 11.199219 0 12.601563 L 0 43.398438 C 0 44.800781 1.398438 46.199219 2.800781 46.199219 L 56 46.199219 L 56 40.601563 Z M 5.601563 40.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 67.761719 26.601563 L 28 26.601563 L 28 30.800781 L 65.800781 30.800781 L 65.800781 60.199219 L 50.398438 60.199219 L 50.398438 49 L 46.199219 49 L 46.199219 63.558594 C 46.199219 64.820313 47.179688 65.800781 48.441406 65.800781 L 67.761719 65.800781 C 69.019531 65.800781 70 64.820313 70 63.558594 L 70 28.839844 C 70 27.578125 69.019531 26.601563 67.761719 26.601563 Z M 60.199219 63 L 56 63 L 56 61.601563 L 60.199219 61.601563 Z M 60.199219 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 32.199219 44.800781 L 22.398438 44.800781 C 22.398438 51.800781 22.398438 56 11.199219 56 L 11.199219 58.800781 L 43.398438 58.800781 L 43.398438 56 C 32.199219 56 32.199219 51.800781 32.199219 44.800781 Z M 32.199219 44.800781 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureIntuneAppProtection.png b/dist/Intune/AzureIntuneAppProtection.png
new file mode 100644
index 00000000..09fd5a37
Binary files /dev/null and b/dist/Intune/AzureIntuneAppProtection.png differ
diff --git a/dist/Intune/AzureIntuneAppProtection.puml b/dist/Intune/AzureIntuneAppProtection.puml
new file mode 100644
index 00000000..e63b02ec
--- /dev/null
+++ b/dist/Intune/AzureIntuneAppProtection.puml
@@ -0,0 +1,10 @@
+sprite $AzureIntuneAppProtection [70x70/16z] {
+xTHLWeKm38NXj3H4plxNEuvJ931-_oVqGrlwZXuzIcUZPU8ucyi2GIIUAOv8DbCGoZzFKJwULPMMZYS_HtaekScN5NO0pYkAlsJ75CLxIjNs5K5N6rSo-hpa
+_TQL5kVILKKGw9CKlaL9ZYwdlMnGgZTJmihmbPpfYa9P72wP0agak99kKLXkKQ3f3WNUB1H9vsh7Fu7XKdAB0akTuhYGDn-ANhwRLoKxmddRFH6bmiiKNSBL
+tPQfLxhEp0my_j9rfKKNLnHDjAj8HIcgoaJiXMXVKNJ9ub64A2SwejJcNUxS8mfZg4ILv1Yoe98DuooVLt9Hp78fwRZ2gkPOpqsL3ocAxUGBbRJNZdAuLyLu
+cWUKBdyDNL6bwTOkAIeY5bGArgDpQUKVE5dAonBzlPu1
+}
+
+AzureEntityColoring(AzureIntuneAppProtection)
+!define AzureIntuneAppProtection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIntuneAppProtection, AzureIntuneAppProtection)
+!define AzureIntuneAppProtection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIntuneAppProtection, AzureIntuneAppProtection)
diff --git a/dist/Intune/AzureIntuneAppProtection.svg b/dist/Intune/AzureIntuneAppProtection.svg
new file mode 100644
index 00000000..f5c0dccd
--- /dev/null
+++ b/dist/Intune/AzureIntuneAppProtection.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 53.199219 50.398438 L 63 44.101563 L 53.199219 36.398438 Z M 27.300781 34.859375 C 23.941406 34.859375 21.140625 32.058594 21.140625 28.699219 C 21.140625 25.339844 23.941406 22.539063 27.300781 22.539063 C 30.660156 22.539063 33.460938 25.339844 33.460938 28.699219 C 33.460938 32.058594 30.660156 34.859375 27.300781 34.859375 Z M 27.300781 34.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 5.601563 40.601563 L 5.601563 15.398438 L 49 15.398438 L 49 23.800781 L 54.601563 23.800781 L 54.601563 12.601563 C 54.601563 11.199219 53.199219 9.800781 51.800781 9.800781 L 2.800781 9.800781 C 1.398438 9.800781 0 11.199219 0 12.601563 L 0 43.398438 C 0 44.800781 1.398438 46.199219 2.800781 46.199219 L 56 46.199219 L 56 40.601563 Z M 5.601563 40.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 67.761719 26.601563 L 28 26.601563 L 28 30.800781 L 65.800781 30.800781 L 65.800781 60.199219 L 50.398438 60.199219 L 50.398438 49 L 46.199219 49 L 46.199219 63.558594 C 46.199219 64.820313 47.179688 65.800781 48.441406 65.800781 L 67.761719 65.800781 C 69.019531 65.800781 70 64.820313 70 63.558594 L 70 28.839844 C 70 27.578125 69.019531 26.601563 67.761719 26.601563 Z M 60.199219 63 L 56 63 L 56 61.601563 L 60.199219 61.601563 Z M 60.199219 63 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 32.199219 44.800781 L 22.398438 44.800781 C 22.398438 51.800781 22.398438 56 11.199219 56 L 11.199219 58.800781 L 43.398438 58.800781 L 43.398438 56 C 32.199219 56 32.199219 51.800781 32.199219 44.800781 Z M 32.199219 44.800781 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureManagedDesktop(m).png b/dist/Intune/AzureManagedDesktop(m).png
new file mode 100644
index 00000000..7f920bd2
Binary files /dev/null and b/dist/Intune/AzureManagedDesktop(m).png differ
diff --git a/dist/Intune/AzureManagedDesktop(m).svg b/dist/Intune/AzureManagedDesktop(m).svg
new file mode 100644
index 00000000..516944f8
--- /dev/null
+++ b/dist/Intune/AzureManagedDesktop(m).svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 41.433594 56 L 28.566406 56 C 28.148438 56 27.875 55.632813 28.0625 55.324219 L 29.191406 53.460938 C 29.285156 53.300781 29.484375 53.199219 29.695313 53.199219 L 40.304688 53.199219 C 40.515625 53.199219 40.714844 53.300781 40.808594 53.457031 L 41.941406 55.324219 C 42.128906 55.632813 41.855469 56 41.433594 56 Z M 41.433594 56 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 9.800781 14 L 60.199219 14 L 60.199219 47.601563 L 9.800781 47.601563 Z M 9.800781 14 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 21.472656 30.699219 L 20.589844 29.679688 C 20.359375 29.410156 20.359375 28.980469 20.625 28.722656 L 23.179688 26.207031 C 23.300781 26.089844 23.445313 26.027344 23.605469 26.027344 C 23.78125 26.027344 23.945313 26.105469 24.0625 26.246094 L 31.085938 34.273438 L 43.171875 17.777344 C 43.292969 17.609375 43.472656 17.519531 43.667969 17.519531 C 43.8125 17.519531 43.945313 17.570313 44.054688 17.664063 L 46.816406 19.933594 C 46.953125 20.039063 47.035156 20.191406 47.058594 20.375 C 47.070313 20.554688 47.03125 20.738281 46.921875 20.863281 L 31.402344 42.042969 Z M 21.472656 30.699219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 69.300781 57.988281 L 64.398438 47.601563 L 64.398438 13.3125 C 64.398438 11.449219 62.890625 9.941406 61.027344 9.941406 L 8.972656 9.976563 C 7.109375 9.976563 5.601563 11.488281 5.601563 13.351563 L 5.601563 47.601563 L 0.699219 57.988281 C 0.0390625 58.914063 0.703125 60.199219 1.839844 60.199219 L 68.160156 60.199219 C 69.300781 60.199219 69.960938 58.914063 69.300781 57.988281 Z M 69.300781 57.988281 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 9.800781 14 L 60.199219 14 L 60.199219 47.601563 L 9.800781 47.601563 Z M 9.800781 14 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 21.472656 30.699219 L 20.589844 29.679688 C 20.359375 29.410156 20.359375 28.980469 20.625 28.722656 L 23.179688 26.207031 C 23.300781 26.089844 23.445313 26.027344 23.605469 26.027344 C 23.78125 26.027344 23.945313 26.105469 24.0625 26.246094 L 31.085938 34.273438 L 43.171875 17.777344 C 43.292969 17.609375 43.472656 17.519531 43.667969 17.519531 C 43.8125 17.519531 43.945313 17.570313 44.054688 17.664063 L 46.816406 19.933594 C 46.953125 20.039063 47.035156 20.191406 47.058594 20.375 C 47.070313 20.554688 47.03125 20.738281 46.921875 20.863281 L 31.402344 42.042969 Z M 21.472656 30.699219 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureManagedDesktop.png b/dist/Intune/AzureManagedDesktop.png
new file mode 100644
index 00000000..4c842778
Binary files /dev/null and b/dist/Intune/AzureManagedDesktop.png differ
diff --git a/dist/Intune/AzureManagedDesktop.puml b/dist/Intune/AzureManagedDesktop.puml
new file mode 100644
index 00000000..317134bf
--- /dev/null
+++ b/dist/Intune/AzureManagedDesktop.puml
@@ -0,0 +1,9 @@
+sprite $AzureManagedDesktop [70x70/16z] {
+xTLPSiCm281XWuJ05lU_RXTt69Dfio3SNVzxlX32sCllRZPhM-zTmwte4T7H78Cw71zArU7MIwLZEFv0WN3Vg22UeA18oIii8fHLI5x3d59sX9Epo1xcbBOZ
+DRVTkYCDKWhQKe9AA-1YMqfCOP7oVYb1XTrNkwM45BiDz4iH22hs4zWlfOGL-sGxBfzWGC4tXlpbnnLRHaNPmo75PX1Roe1Y_wz5YISc6S8mgdW64ugx_9m2
+R4UJKf258Qq02lwWT-DKC9nSAgBZWI6WYPefh8cw6oK_J5ChCqpNQ_NjIAz6jqVfv9BRmrmVHSYdLwlBGdgzxjEhRJPAhbBrX5RI4zeMQlbm-V9cisS
+}
+
+AzureEntityColoring(AzureManagedDesktop)
+!define AzureManagedDesktop(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagedDesktop, AzureManagedDesktop)
+!define AzureManagedDesktop(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagedDesktop, AzureManagedDesktop)
diff --git a/dist/Intune/AzureManagedDesktop.svg b/dist/Intune/AzureManagedDesktop.svg
new file mode 100644
index 00000000..b0759474
--- /dev/null
+++ b/dist/Intune/AzureManagedDesktop.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 41.433594 56 L 28.566406 56 C 28.148438 56 27.875 55.632813 28.0625 55.324219 L 29.191406 53.460938 C 29.285156 53.300781 29.484375 53.199219 29.695313 53.199219 L 40.304688 53.199219 C 40.515625 53.199219 40.714844 53.300781 40.808594 53.457031 L 41.941406 55.324219 C 42.128906 55.632813 41.855469 56 41.433594 56 Z M 41.433594 56 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 9.800781 14 L 60.199219 14 L 60.199219 47.601563 L 9.800781 47.601563 Z M 9.800781 14 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 21.472656 30.699219 L 20.589844 29.679688 C 20.359375 29.410156 20.359375 28.980469 20.625 28.722656 L 23.179688 26.207031 C 23.300781 26.089844 23.445313 26.027344 23.605469 26.027344 C 23.78125 26.027344 23.945313 26.105469 24.0625 26.246094 L 31.085938 34.273438 L 43.171875 17.777344 C 43.292969 17.609375 43.472656 17.519531 43.667969 17.519531 C 43.8125 17.519531 43.945313 17.570313 44.054688 17.664063 L 46.816406 19.933594 C 46.953125 20.039063 47.035156 20.191406 47.058594 20.375 C 47.070313 20.554688 47.03125 20.738281 46.921875 20.863281 L 31.402344 42.042969 Z M 21.472656 30.699219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 69.300781 57.988281 L 64.398438 47.601563 L 64.398438 13.3125 C 64.398438 11.449219 62.890625 9.941406 61.027344 9.941406 L 8.972656 9.976563 C 7.109375 9.976563 5.601563 11.488281 5.601563 13.351563 L 5.601563 47.601563 L 0.699219 57.988281 C 0.0390625 58.914063 0.703125 60.199219 1.839844 60.199219 L 68.160156 60.199219 C 69.300781 60.199219 69.960938 58.914063 69.300781 57.988281 Z M 69.300781 57.988281 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 9.800781 14 L 60.199219 14 L 60.199219 47.601563 L 9.800781 47.601563 Z M 9.800781 14 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 21.472656 30.699219 L 20.589844 29.679688 C 20.359375 29.410156 20.359375 28.980469 20.625 28.722656 L 23.179688 26.207031 C 23.300781 26.089844 23.445313 26.027344 23.605469 26.027344 C 23.78125 26.027344 23.945313 26.105469 24.0625 26.246094 L 31.085938 34.273438 L 43.171875 17.777344 C 43.292969 17.609375 43.472656 17.519531 43.667969 17.519531 C 43.8125 17.519531 43.945313 17.570313 44.054688 17.664063 L 46.816406 19.933594 C 46.953125 20.039063 47.035156 20.191406 47.058594 20.375 C 47.070313 20.554688 47.03125 20.738281 46.921875 20.863281 L 31.402344 42.042969 Z M 21.472656 30.699219 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureSecurityBaseline(m).png b/dist/Intune/AzureSecurityBaseline(m).png
new file mode 100644
index 00000000..41d4ac8b
Binary files /dev/null and b/dist/Intune/AzureSecurityBaseline(m).png differ
diff --git a/dist/Intune/AzureSecurityBaseline(m).svg b/dist/Intune/AzureSecurityBaseline(m).svg
new file mode 100644
index 00000000..96e06b9d
--- /dev/null
+++ b/dist/Intune/AzureSecurityBaseline(m).svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 31.660156 18.820313 L 41.597656 6.78125 C 28.449219 5.402344 26.25 0.00390625 26.25 0.00390625 C 26.25 0.00390625 23.289063 7.105469 4.375 7.105469 L 4.375 36.238281 C 4.375 39.761719 6.429688 43.058594 9.273438 45.941406 L 16.621094 37.042969 Z M 31.660156 18.820313 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 41.597656 6.785156 C 28.449219 5.402344 26.25 0.00390625 26.25 0.00390625 C 26.25 0.00390625 23.289063 7.105469 4.375 7.105469 L 4.375 36.238281 C 4.375 39.761719 6.429688 43.058594 9.273438 45.941406 C 15.722656 52.476563 26.25 56.878906 26.25 56.878906 C 26.25 56.878906 48.125 47.75 48.125 36.234375 L 48.125 7.105469 C 45.691406 7.105469 43.527344 6.988281 41.597656 6.785156 Z M 41.597656 6.785156 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.625 34.996094 L 61.25 34.996094 L 61.25 65.621094 L 30.71875 65.832031 Z M 30.625 34.996094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 43.75 39.375 L 56.875 39.375 L 56.875 43.75 L 43.75 43.75 Z M 43.75 48.125 L 56.875 48.125 L 56.875 52.5 L 43.75 52.5 Z M 43.75 56.875 L 56.875 56.875 L 56.875 61.25 L 43.75 61.25 Z M 35 39.375 L 39.375 39.375 L 39.375 43.75 L 35 43.75 Z M 35 48.125 L 39.375 48.125 L 39.375 52.5 L 35 52.5 Z M 35 56.875 L 39.375 56.875 L 39.375 61.25 L 35 61.25 Z M 35 56.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 64.105469 26.25 L 27.769531 26.25 C 27.367188 26.246094 26.980469 26.40625 26.695313 26.6875 C 26.410156 26.972656 26.25 27.359375 26.25 27.757813 L 26.25 68.496094 C 26.25 69.328125 26.929688 70 27.769531 70 L 64.101563 70 C 64.503906 70.003906 64.890625 69.84375 65.175781 69.5625 C 65.460938 69.277344 65.625 68.894531 65.625 68.492188 L 65.625 27.757813 C 65.625 27.359375 65.464844 26.972656 65.179688 26.6875 C 64.894531 26.40625 64.507813 26.246094 64.105469 26.25 Z M 30.625 65.625 L 30.625 34.996094 L 61.25 34.996094 L 61.25 65.625 Z M 30.625 65.625 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureSecurityBaseline.png b/dist/Intune/AzureSecurityBaseline.png
new file mode 100644
index 00000000..aa9e8e60
Binary files /dev/null and b/dist/Intune/AzureSecurityBaseline.png differ
diff --git a/dist/Intune/AzureSecurityBaseline.puml b/dist/Intune/AzureSecurityBaseline.puml
new file mode 100644
index 00000000..59a1d607
--- /dev/null
+++ b/dist/Intune/AzureSecurityBaseline.puml
@@ -0,0 +1,9 @@
+sprite $AzureSecurityBaseline [70x70/16z] {
+vTP7UWGn24HX2GGrzp-nF-mDOzHHvJXlrV7l7Dfcen4oNsUwkIypwk-Ph1kHwIsXg_bpG_kLzKM7-JIpeT8E6kR78NANRUKa4kdFAs0eO2XWA60e-3qA60eO
+2XWAVey2XWA60eO2XWAEyfZbzgbUb8eSXpq5ITblHm530KF1xr70KC1Ga1KfzTJOLF2ajDsKhqX6RYij8rKHLPKOq5nLB25LYI6BWKUk5qKASb79vnUBIkCe
+lI2Nhr4a3eBIXA8qeIYj-rmPPgOnOBa-LI9Rk4OffIYj-xeIQL4Cm8W1vFQLrctX6gN424eu_g5WIGbdNOaibBjdjohpA_sNbVdJU4dPwMMLu_wMeXV-lTy
+}
+
+AzureEntityColoring(AzureSecurityBaseline)
+!define AzureSecurityBaseline(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSecurityBaseline, AzureSecurityBaseline)
+!define AzureSecurityBaseline(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSecurityBaseline, AzureSecurityBaseline)
diff --git a/dist/Intune/AzureSecurityBaseline.svg b/dist/Intune/AzureSecurityBaseline.svg
new file mode 100644
index 00000000..5a0e8967
--- /dev/null
+++ b/dist/Intune/AzureSecurityBaseline.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 31.660156 18.820313 L 41.597656 6.78125 C 28.449219 5.402344 26.25 0.00390625 26.25 0.00390625 C 26.25 0.00390625 23.289063 7.105469 4.375 7.105469 L 4.375 36.238281 C 4.375 39.761719 6.429688 43.058594 9.273438 45.941406 L 16.621094 37.042969 Z M 31.660156 18.820313 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 41.597656 6.785156 C 28.449219 5.402344 26.25 0.00390625 26.25 0.00390625 C 26.25 0.00390625 23.289063 7.105469 4.375 7.105469 L 4.375 36.238281 C 4.375 39.761719 6.429688 43.058594 9.273438 45.941406 C 15.722656 52.476563 26.25 56.878906 26.25 56.878906 C 26.25 56.878906 48.125 47.75 48.125 36.234375 L 48.125 7.105469 C 45.691406 7.105469 43.527344 6.988281 41.597656 6.785156 Z M 41.597656 6.785156 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.625 34.996094 L 61.25 34.996094 L 61.25 65.621094 L 30.71875 65.832031 Z M 30.625 34.996094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(21.960784%,59.607843%,77.647059%);fill-opacity:1;" d="M 43.75 39.375 L 56.875 39.375 L 56.875 43.75 L 43.75 43.75 Z M 43.75 48.125 L 56.875 48.125 L 56.875 52.5 L 43.75 52.5 Z M 43.75 56.875 L 56.875 56.875 L 56.875 61.25 L 43.75 61.25 Z M 35 39.375 L 39.375 39.375 L 39.375 43.75 L 35 43.75 Z M 35 48.125 L 39.375 48.125 L 39.375 52.5 L 35 52.5 Z M 35 56.875 L 39.375 56.875 L 39.375 61.25 L 35 61.25 Z M 35 56.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 64.105469 26.25 L 27.769531 26.25 C 27.367188 26.246094 26.980469 26.40625 26.695313 26.6875 C 26.410156 26.972656 26.25 27.359375 26.25 27.757813 L 26.25 68.496094 C 26.25 69.328125 26.929688 70 27.769531 70 L 64.101563 70 C 64.503906 70.003906 64.890625 69.84375 65.175781 69.5625 C 65.460938 69.277344 65.625 68.894531 65.625 68.492188 L 65.625 27.757813 C 65.625 27.359375 65.464844 26.972656 65.179688 26.6875 C 64.894531 26.40625 64.507813 26.246094 64.105469 26.25 Z M 30.625 65.625 L 30.625 34.996094 L 61.25 34.996094 L 61.25 65.625 Z M 30.625 65.625 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureSoftwareUpdate(m).png b/dist/Intune/AzureSoftwareUpdate(m).png
new file mode 100644
index 00000000..0bd3d19e
Binary files /dev/null and b/dist/Intune/AzureSoftwareUpdate(m).png differ
diff --git a/dist/Intune/AzureSoftwareUpdate(m).svg b/dist/Intune/AzureSoftwareUpdate(m).svg
new file mode 100644
index 00000000..8b622c8f
--- /dev/null
+++ b/dist/Intune/AzureSoftwareUpdate(m).svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.398438 8.398438 L 4.199219 8.398438 C 1.878906 8.398438 0 10.28125 0 12.601563 L 0 54.601563 C 0 56.921875 1.878906 58.800781 4.199219 58.800781 L 21 58.800781 Z M 43.398438 8.398438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 64.398438 54.601563 C 64.398438 56.917969 62.496094 58.800781 60.148438 58.800781 L 4.25 58.800781 C 1.902344 58.800781 0 56.917969 0 54.601563 L 0 12.601563 C 0 10.28125 1.902344 8.398438 4.25 8.398438 L 60.148438 8.398438 C 62.496094 8.398438 64.398438 10.28125 64.398438 12.601563 Z M 64.398438 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 4.148438 15.398438 L 60.199219 15.398438 L 60.199219 51.800781 L 4.148438 51.800781 Z M 4.148438 15.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.398438 12.164063 C 36.398438 12.695313 35.96875 13.128906 35.4375 13.128906 L 29.246094 13.128906 C 28.710938 13.128906 28.28125 12.695313 28.28125 12.164063 C 28.28125 11.632813 28.710938 11.199219 29.246094 11.199219 L 35.4375 11.199219 C 35.96875 11.199219 36.398438 11.632813 36.398438 12.164063 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(115,195,255);fill-opacity:1;" d="M 46.199219 70 C 46.199219 70 61.601563 68.511719 61.601563 50.398438 L 68.601563 50.398438 L 58.101563 37.800781 L 47.601563 50.398438 L 54.601563 50.398438 C 54.601563 66.527344 46.199219 70 46.199219 70 Z M 46.199219 70 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(39,163,255);fill-opacity:1;" d="M 46.199219 70 C 46.199219 70 61.601563 68.511719 61.601563 50.398438 L 68.601563 50.398438 L 58.101563 37.800781 C 60.378906 51.800781 57.527344 66.3125 46.199219 70 Z M 46.199219 70 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(39,163,255);fill-opacity:1;" d="M 47.601563 35 C 47.601563 35 32.199219 36.488281 32.199219 54.601563 L 25.199219 54.601563 L 35.699219 67.199219 L 46.199219 54.601563 L 39.199219 54.601563 C 39.199219 38.472656 47.601563 35 47.601563 35 Z M 47.601563 35 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(115,195,255);fill-opacity:1;" d="M 47.601563 35 C 47.601563 35 32.199219 36.488281 32.199219 54.601563 L 25.199219 54.601563 L 35.699219 67.199219 C 33.421875 53.199219 36.273438 38.6875 47.601563 35 Z M 47.601563 35 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureSoftwareUpdate.png b/dist/Intune/AzureSoftwareUpdate.png
new file mode 100644
index 00000000..bd294eb2
Binary files /dev/null and b/dist/Intune/AzureSoftwareUpdate.png differ
diff --git a/dist/Intune/AzureSoftwareUpdate.puml b/dist/Intune/AzureSoftwareUpdate.puml
new file mode 100644
index 00000000..2889e97c
--- /dev/null
+++ b/dist/Intune/AzureSoftwareUpdate.puml
@@ -0,0 +1,11 @@
+sprite $AzureSoftwareUpdate [70x70/16z] {
+xTQ5iWCn28NX20HMtlzrApdj9QlbUkqVNRhpJQY7J_NkNUBorJXU4UwzZSk638JSo32kbQhIzTjfJZNTKQGg_KuyMNfShOEobo8SnQ_udzkbqddQUBvD4KUw
+Kly_YjwFelUZwFqe-coAte-YzwFe_IXwhuh8rvIMA2pwNQLG4Tz6suZm0YcVLWhn764Mfs88bNOxk29-1GZF48mwZw98Y5XCmGYptg_mSX-cKt9gS2hBem21
+8gPuZY8B18hu5C7zasUsLSYKco-GB14Ib4tnBoHa2aexYbwYcS8BHU9D1K-BAGMPShxOL7JhQK64yQt_cCE81BTtuwJ1eG11WgUb_v9olhDMLfKUp_cUWgFq
+J9UAFLbNfSFuTArLaSs5TAaCCF0OdYskIjp-kovp1MDxpazg7r3KpUUsJ1GWY34T9LXneyIjmiq3M8Y2gyYcS3l7Gi5P-b1AEyvrIC5RlYgndTfHd46HD3iX
+HlwgaXSZxEEFMNYs9HlYBJ9FhudjSFxYR4MMai8texApZN-zjMME
+}
+
+AzureEntityColoring(AzureSoftwareUpdate)
+!define AzureSoftwareUpdate(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSoftwareUpdate, AzureSoftwareUpdate)
+!define AzureSoftwareUpdate(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSoftwareUpdate, AzureSoftwareUpdate)
diff --git a/dist/Intune/AzureSoftwareUpdate.svg b/dist/Intune/AzureSoftwareUpdate.svg
new file mode 100644
index 00000000..64e9885d
--- /dev/null
+++ b/dist/Intune/AzureSoftwareUpdate.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.398438 8.398438 L 4.199219 8.398438 C 1.878906 8.398438 0 10.28125 0 12.601563 L 0 54.601563 C 0 56.921875 1.878906 58.800781 4.199219 58.800781 L 21 58.800781 Z M 43.398438 8.398438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 64.398438 54.601563 C 64.398438 56.917969 62.496094 58.800781 60.148438 58.800781 L 4.25 58.800781 C 1.902344 58.800781 0 56.917969 0 54.601563 L 0 12.601563 C 0 10.28125 1.902344 8.398438 4.25 8.398438 L 60.148438 8.398438 C 62.496094 8.398438 64.398438 10.28125 64.398438 12.601563 Z M 64.398438 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 4.148438 15.398438 L 60.199219 15.398438 L 60.199219 51.800781 L 4.148438 51.800781 Z M 4.148438 15.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.398438 12.164063 C 36.398438 12.695313 35.96875 13.128906 35.4375 13.128906 L 29.246094 13.128906 C 28.710938 13.128906 28.28125 12.695313 28.28125 12.164063 C 28.28125 11.632813 28.710938 11.199219 29.246094 11.199219 L 35.4375 11.199219 C 35.96875 11.199219 36.398438 11.632813 36.398438 12.164063 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 46.199219 70 C 46.199219 70 61.601563 68.511719 61.601563 50.398438 L 68.601563 50.398438 L 58.101563 37.800781 L 47.601563 50.398438 L 54.601563 50.398438 C 54.601563 66.527344 46.199219 70 46.199219 70 Z M 46.199219 70 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 46.199219 70 C 46.199219 70 61.601563 68.511719 61.601563 50.398438 L 68.601563 50.398438 L 58.101563 37.800781 C 60.378906 51.800781 57.527344 66.3125 46.199219 70 Z M 46.199219 70 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 47.601563 35 C 47.601563 35 32.199219 36.488281 32.199219 54.601563 L 25.199219 54.601563 L 35.699219 67.199219 L 46.199219 54.601563 L 39.199219 54.601563 C 39.199219 38.472656 47.601563 35 47.601563 35 Z M 47.601563 35 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 47.601563 35 C 47.601563 35 32.199219 36.488281 32.199219 54.601563 L 25.199219 54.601563 L 35.699219 67.199219 C 33.421875 53.199219 36.273438 38.6875 47.601563 35 Z M 47.601563 35 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureTool(m).png b/dist/Intune/AzureTool(m).png
new file mode 100644
index 00000000..fdfa34d2
Binary files /dev/null and b/dist/Intune/AzureTool(m).png differ
diff --git a/dist/Intune/AzureTool(m).svg b/dist/Intune/AzureTool(m).svg
new file mode 100644
index 00000000..594f0f9d
--- /dev/null
+++ b/dist/Intune/AzureTool(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.679688 15.679688 L 58.378906 16.378906 L 61.878906 13.441406 L 67.761719 3.78125 L 66.21875 2.238281 L 56.980469 8.398438 L 54.179688 12.039063 L 54.878906 12.738281 L 36.539063 31.640625 L 32.761719 27.71875 L 28.558594 32.058594 C 28.839844 34.160156 28.140625 36.398438 26.601563 38.078125 C 25.058594 39.761719 22.820313 40.460938 20.859375 40.179688 L 2.238281 59.21875 L 12.601563 70 L 31.078125 50.820313 C 30.800781 48.71875 31.5 46.480469 33.179688 44.800781 C 34.71875 43.121094 36.960938 42.421875 38.921875 42.699219 L 43.121094 38.359375 L 39.339844 34.441406 Z M 57.679688 15.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 56 64.398438 C 58.660156 67.199219 63 67.199219 65.660156 64.398438 C 67.058594 63 67.621094 61.179688 67.621094 59.359375 C 67.621094 57.539063 66.921875 55.71875 65.660156 54.320313 L 44.941406 33.039063 L 42.980469 35.140625 L 46.761719 39.058594 L 45.078125 40.601563 L 40.878906 44.941406 L 40.320313 45.5 L 39.480469 45.359375 C 38.921875 45.359375 38.21875 45.359375 37.660156 45.5 Z M 56 64.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 28.421875 4.339844 C 24.640625 0.421875 19.179688 -0.839844 14.421875 0.421875 L 22.679688 8.820313 L 20.578125 17.078125 L 12.460938 19.320313 L 4.339844 10.921875 C 3.078125 15.960938 4.339844 21.421875 8.121094 25.339844 C 11.898438 29.261719 17.359375 30.519531 22.261719 29.121094 L 22.539063 29.398438 L 26.320313 33.320313 C 26.460938 32.898438 26.460938 32.480469 26.460938 32.058594 C 26.460938 31.78125 26.460938 31.640625 26.460938 31.359375 L 26.179688 30.800781 L 32.480469 24.21875 L 33.601563 25.480469 L 36.121094 28.140625 L 38.078125 26.039063 L 32.058594 19.601563 C 33.601563 14.421875 32.480469 8.539063 28.421875 4.339844 Z M 28.421875 4.339844 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureTool.png b/dist/Intune/AzureTool.png
new file mode 100644
index 00000000..9b669d71
Binary files /dev/null and b/dist/Intune/AzureTool.png differ
diff --git a/dist/Intune/AzureTool.puml b/dist/Intune/AzureTool.puml
new file mode 100644
index 00000000..9fa034dd
--- /dev/null
+++ b/dist/Intune/AzureTool.puml
@@ -0,0 +1,11 @@
+sprite $AzureTool [70x70/16z] {
+fTK7iiGW30FGkEd-D_xLMp8e23QQclPY30F7ALO0KEd7hGGwSPVfhDOJSoPN30VgDfDePSA4BWI0tUjDabynfcGXmAJlkfZKvJefXlydrOXdhJDqPkkcr3IH
+nsFT46l6o821ucqHI-eytk7b98f2Zg5ou9Nh6IpIXUHANI5kP4PUZ4NXbRn2wEhe3pnnJWXad98g3765l08ItXThX2K4ev0ErXYRRoYk68tqDF4aWDH8fpWI
+VsMcG4GrsQCbo7fliXyOHtY28DaVSeJ78gig8vv8VrgJFLOUdDaLS4Gd4CyX1a5McJniwFH-h9KNOhudy4syn2JfXUZ_NV9z1JWp-GcJkCVmhSls6KkGVTon
+pbXc0HnPPWmTWWX68US7je-43GyaKpYdZEYA6Ihv9zo1TQRuosqiCaNEecs6hP9EB3F5NjnbYhutPJJIRP6CHkJnMTk8PWggNCrmn8ub9iapWYZ61BB6f41e
+YlOl1A8PiV0NcGlSjtQoudWZgqoGkmGH3BdRY6PO3uqWccbaP6BZ3AvA9-UGHhJTo5tcS-GR
+}
+
+AzureEntityColoring(AzureTool)
+!define AzureTool(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTool, AzureTool)
+!define AzureTool(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTool, AzureTool)
diff --git a/dist/Intune/AzureTool.svg b/dist/Intune/AzureTool.svg
new file mode 100644
index 00000000..ff54e335
--- /dev/null
+++ b/dist/Intune/AzureTool.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.679688 15.679688 L 58.378906 16.378906 L 61.878906 13.441406 L 67.761719 3.78125 L 66.21875 2.238281 L 56.980469 8.398438 L 54.179688 12.039063 L 54.878906 12.738281 L 36.539063 31.640625 L 32.761719 27.71875 L 28.558594 32.058594 C 28.839844 34.160156 28.140625 36.398438 26.601563 38.078125 C 25.058594 39.761719 22.820313 40.460938 20.859375 40.179688 L 2.238281 59.21875 L 12.601563 70 L 31.078125 50.820313 C 30.800781 48.71875 31.5 46.480469 33.179688 44.800781 C 34.71875 43.121094 36.960938 42.421875 38.921875 42.699219 L 43.121094 38.359375 L 39.339844 34.441406 Z M 57.679688 15.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 56 64.398438 C 58.660156 67.199219 63 67.199219 65.660156 64.398438 C 67.058594 63 67.621094 61.179688 67.621094 59.359375 C 67.621094 57.539063 66.921875 55.71875 65.660156 54.320313 L 44.941406 33.039063 L 42.980469 35.140625 L 46.761719 39.058594 L 45.078125 40.601563 L 40.878906 44.941406 L 40.320313 45.5 L 39.480469 45.359375 C 38.921875 45.359375 38.21875 45.359375 37.660156 45.5 Z M 56 64.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 28.421875 4.339844 C 24.640625 0.421875 19.179688 -0.839844 14.421875 0.421875 L 22.679688 8.820313 L 20.578125 17.078125 L 12.460938 19.320313 L 4.339844 10.921875 C 3.078125 15.960938 4.339844 21.421875 8.121094 25.339844 C 11.898438 29.261719 17.359375 30.519531 22.261719 29.121094 L 22.539063 29.398438 L 26.320313 33.320313 C 26.460938 32.898438 26.460938 32.480469 26.460938 32.058594 C 26.460938 31.78125 26.460938 31.640625 26.460938 31.359375 L 26.179688 30.800781 L 32.480469 24.21875 L 33.601563 25.480469 L 36.121094 28.140625 L 38.078125 26.039063 L 32.058594 19.601563 C 33.601563 14.421875 32.480469 8.539063 28.421875 4.339844 Z M 28.421875 4.339844 "/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureeBook(m).png b/dist/Intune/AzureeBook(m).png
new file mode 100644
index 00000000..2a0a2cd1
Binary files /dev/null and b/dist/Intune/AzureeBook(m).png differ
diff --git a/dist/Intune/AzureeBook(m).svg b/dist/Intune/AzureeBook(m).svg
new file mode 100644
index 00000000..686c3a7c
--- /dev/null
+++ b/dist/Intune/AzureeBook(m).svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 18.199219 10.179688 C 12.484375 10.976563 8.371094 13.617188 7 14.605469 L 7 51.511719 C 9.308594 51.105469 13.679688 50.425781 18.199219 50.167969 Z M 47.601563 9.953125 C 47.433594 9.949219 47.269531 9.941406 47.097656 9.941406 C 39.519531 9.941406 36.902344 14.488281 36.398438 15.535156 L 36.398438 52.425781 C 38.761719 51.445313 42.847656 50.058594 47 50.058594 C 47.199219 50.058594 47.398438 50.066406 47.601563 50.070313 Z M 47.601563 9.953125 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,36,64);fill-opacity:1;" d="M 8.398438 17.117188 C 12.445313 15.046875 16.957031 14.046875 21.5 14.210938 C 25.863281 14.378906 28.832031 15.820313 30.800781 17.410156 L 30.800781 19.289063 C 29.089844 17.597656 26.191406 15.792969 21.5 15.613281 C 15.664063 15.390625 11.019531 17.308594 8.398438 18.742188 Z M 8.398438 22.71875 C 12.445313 20.644531 16.957031 19.644531 21.5 19.8125 C 25.863281 19.980469 28.832031 21.421875 30.800781 23.011719 L 30.800781 24.890625 C 29.089844 23.199219 26.191406 21.390625 21.5 21.210938 C 15.664063 20.988281 11.019531 22.910156 8.398438 24.34375 Z M 8.398438 28.316406 C 12.445313 26.246094 16.957031 25.246094 21.5 25.414063 C 25.863281 25.578125 28.832031 27.019531 30.800781 28.609375 L 30.800781 30.492188 C 29.089844 28.800781 26.191406 26.992188 21.5 26.8125 C 15.664063 26.589844 11.019531 28.507813 8.398438 29.941406 Z M 8.398438 33.917969 C 12.445313 31.847656 16.957031 30.847656 21.5 31.011719 C 25.863281 31.179688 28.832031 32.621094 30.800781 34.210938 L 30.800781 36.089844 C 29.089844 34.398438 26.191406 32.59375 21.5 32.414063 C 15.664063 32.191406 11.019531 34.109375 8.398438 35.542969 Z M 8.398438 39.519531 C 12.445313 37.445313 16.957031 36.445313 21.5 36.613281 C 25.863281 36.78125 28.832031 38.222656 30.800781 39.808594 L 30.800781 41.691406 C 29.089844 40 26.191406 38.191406 21.5 38.011719 C 15.664063 37.789063 11.019531 39.710938 8.398438 41.144531 Z M 8.398438 45.117188 C 12.445313 43.046875 16.957031 42.046875 21.5 42.210938 C 25.863281 42.378906 28.832031 43.820313 30.800781 45.410156 L 30.800781 47.289063 C 29.089844 45.597656 26.191406 43.792969 21.5 43.613281 C 15.664063 43.390625 11.019531 45.308594 8.398438 46.742188 Z M 60.199219 17.117188 C 56.152344 15.046875 51.640625 14.046875 47.097656 14.210938 C 42.738281 14.378906 39.769531 15.820313 37.800781 17.410156 L 37.800781 19.289063 C 39.511719 17.597656 42.410156 15.792969 47.097656 15.613281 C 52.9375 15.390625 57.582031 17.308594 60.199219 18.742188 Z M 60.199219 22.71875 C 56.152344 20.644531 51.640625 19.644531 47.097656 19.8125 C 42.738281 19.980469 39.769531 21.421875 37.800781 23.011719 L 37.800781 24.890625 C 39.511719 23.199219 42.410156 21.390625 47.097656 21.210938 C 52.9375 20.988281 57.582031 22.910156 60.199219 24.34375 Z M 60.199219 28.316406 C 56.152344 26.246094 51.640625 25.246094 47.097656 25.414063 C 42.738281 25.578125 39.769531 27.019531 37.800781 28.609375 L 37.800781 30.492188 C 39.511719 28.800781 42.410156 26.992188 47.097656 26.8125 C 52.9375 26.589844 57.582031 28.507813 60.199219 29.941406 Z M 60.199219 33.917969 C 56.152344 31.847656 51.640625 30.847656 47.097656 31.011719 C 42.738281 31.179688 39.769531 32.621094 37.800781 34.210938 L 37.800781 36.089844 C 39.511719 34.398438 42.410156 32.59375 47.097656 32.414063 C 52.9375 32.191406 57.582031 34.109375 60.199219 35.542969 Z M 56 37.800781 C 53.820313 37.246094 49.898438 36.503906 47.097656 36.613281 C 42.738281 36.78125 39.769531 38.222656 37.800781 39.808594 L 37.800781 41.691406 C 39.511719 40 42.410156 38.191406 47.097656 38.011719 C 49.628906 37.921875 52.160156 38.21875 54.601563 38.894531 Z M 56 37.800781 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 18.199219 10.179688 C 12.484375 10.976563 8.371094 13.617188 7 14.605469 L 7 51.511719 C 9.308594 51.105469 13.679688 50.425781 18.199219 50.167969 Z M 47.601563 9.953125 C 47.433594 9.949219 47.269531 9.941406 47.097656 9.941406 C 39.519531 9.941406 36.902344 14.488281 36.398438 15.535156 L 36.398438 52.425781 C 38.761719 51.445313 42.847656 50.058594 47 50.058594 C 47.199219 50.058594 47.398438 50.066406 47.601563 50.070313 Z M 47.601563 9.953125 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 1.398438 11.199219 L 1.398438 57.398438 C 1.398438 58.171875 2.027344 58.800781 2.800781 58.800781 L 21 58.800781 C 26.539063 58.800781 28.464844 60.28125 29.101563 61.085938 C 29.363281 61.417969 29.761719 61.601563 30.179688 61.601563 L 38.421875 61.601563 C 38.839844 61.601563 39.238281 61.417969 39.5 61.085938 C 40.136719 60.28125 42.0625 58.800781 47.601563 58.800781 L 65.800781 58.800781 C 66.574219 58.800781 67.199219 58.171875 67.199219 57.398438 L 67.199219 11.199219 C 67.199219 10.425781 66.574219 9.800781 65.800781 9.800781 L 2.800781 9.800781 C 2.027344 9.800781 1.398438 10.425781 1.398438 11.199219 Z M 1.398438 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 7 14 L 61.601563 14 L 61.601563 54.601563 L 7 54.601563 Z M 7 14 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 63.90625 12.847656 C 63.628906 12.613281 57.03125 7.140625 47.097656 7.140625 C 39.140625 7.140625 35.585938 11.414063 34.300781 13.554688 C 33.015625 11.414063 29.460938 7.140625 21.5 7.140625 C 11.570313 7.140625 4.972656 12.613281 4.695313 12.847656 L 4.199219 13.265625 L 4.199219 54.914063 L 64.398438 54.914063 L 64.398438 13.265625 Z M 63.90625 12.847656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 21.660156 8.539063 C 12.03125 8.539063 5.601563 13.914063 5.601563 13.914063 L 5.601563 53.199219 C 5.601563 53.199219 14.242188 51.457031 21.761719 51.457031 C 27.820313 51.457031 33.878906 54.601563 33.878906 54.601563 L 33.878906 15.242188 C 33.878906 15.242188 31.300781 8.539063 21.660156 8.539063 Z M 46.9375 8.539063 C 56.570313 8.539063 63 13.914063 63 13.914063 L 63 53.199219 C 63 53.199219 54.359375 51.457031 46.839844 51.457031 C 40.78125 51.457031 34.71875 54.601563 34.71875 54.601563 L 34.71875 15.242188 C 34.71875 15.242188 37.300781 8.539063 46.9375 8.539063 Z M 46.9375 8.539063 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/Intune/AzureeBook.png b/dist/Intune/AzureeBook.png
new file mode 100644
index 00000000..6d803789
Binary files /dev/null and b/dist/Intune/AzureeBook.png differ
diff --git a/dist/Intune/AzureeBook.puml b/dist/Intune/AzureeBook.puml
new file mode 100644
index 00000000..01d3bc6d
--- /dev/null
+++ b/dist/Intune/AzureeBook.puml
@@ -0,0 +1,13 @@
+sprite $AzureeBook [70x70/16z] {
+xPLRakCu30IjAXH8Qkv_tnLfM4sRKBz_TdVoPnuPpWuJ4TMt_ob_WSczk8lRYzaOnl1-GQMrMeeVbDgAJSxAOOOuJ2jQIji0LbjrunQ0gjNY7rQhYDEOrtQw
+qU3-vs3VMtDYUmAgRU-oLRqgUclx_QCyAjx_rXlOLdXaUeI9mz4P6U-LqIZOKb3RdsjPHYSgvtVCCnMNrcfxg_Xs0j0EUBwHDNjpuDsTNLyhC4ccZXyOjawz
+IvfaPk54f1LGCc8wzEX4XTBiJ3sqLY1xFGJC5HLJ8frh1Uan7vNC4ajbOYeYAc-yvD8AQEO3dJ--JawwE-Aomd4Y3apkJaGbxaS2xArHGbQXGan74g824r-b
+6vOAZElpoQEYzNbXwuroO55XQd5T0GVO7jJ9uSKbbNXV3unF5GofwO9f1QRpX03DNJmhi2UdBh5MeEYVWEuM5QvIxbWhp1xtl55gkLHo61Na-ge2KXqpBZS2
+QNPtkAp45QmZhIlL7HbEXhG2apZj0-rvfUO50wzN2iaGNQyKvLmgwGD2ZyhsrPL2vsgbmhr_enYMZX7BIkcJAsK41tOUgORi3eW54_BAE56oylbANNmZ93EF
+QQKMcLPoifNAA_dlQM1TgSzLuWg1-FLAN86884pk_6e54h4yhhvQuRP2_s8b1p-i1F-52W2IG5894-foCRtKzg0MSQfGJyubmqkbZ8-lLEUeq7DTl4oLToXM
+hRpZtohxJpWhF-8tAzn_6DbvwsmheFKRFj7SY6tbzZweKwFYzbryV-2tN-ClV_a7
+}
+
+AzureEntityColoring(AzureeBook)
+!define AzureeBook(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureeBook, AzureeBook)
+!define AzureeBook(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureeBook, AzureeBook)
diff --git a/dist/Intune/AzureeBook.svg b/dist/Intune/AzureeBook.svg
new file mode 100644
index 00000000..d6cac137
--- /dev/null
+++ b/dist/Intune/AzureeBook.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18.199219 10.179688 C 12.484375 10.976563 8.371094 13.617188 7 14.605469 L 7 51.511719 C 9.308594 51.105469 13.679688 50.425781 18.199219 50.167969 Z M 47.601563 9.953125 C 47.433594 9.949219 47.269531 9.941406 47.097656 9.941406 C 39.519531 9.941406 36.902344 14.488281 36.398438 15.535156 L 36.398438 52.425781 C 38.761719 51.445313 42.847656 50.058594 47 50.058594 C 47.199219 50.058594 47.398438 50.066406 47.601563 50.070313 Z M 47.601563 9.953125 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13.72549%,12.156863%,12.54902%);fill-opacity:1;" d="M 8.398438 17.117188 C 12.445313 15.046875 16.957031 14.046875 21.5 14.210938 C 25.863281 14.378906 28.832031 15.820313 30.800781 17.410156 L 30.800781 19.289063 C 29.089844 17.597656 26.191406 15.792969 21.5 15.613281 C 15.664063 15.390625 11.019531 17.308594 8.398438 18.742188 Z M 8.398438 22.71875 C 12.445313 20.644531 16.957031 19.644531 21.5 19.8125 C 25.863281 19.980469 28.832031 21.421875 30.800781 23.011719 L 30.800781 24.890625 C 29.089844 23.199219 26.191406 21.390625 21.5 21.210938 C 15.664063 20.988281 11.019531 22.910156 8.398438 24.34375 Z M 8.398438 28.316406 C 12.445313 26.246094 16.957031 25.246094 21.5 25.414063 C 25.863281 25.578125 28.832031 27.019531 30.800781 28.609375 L 30.800781 30.492188 C 29.089844 28.800781 26.191406 26.992188 21.5 26.8125 C 15.664063 26.589844 11.019531 28.507813 8.398438 29.941406 Z M 8.398438 33.917969 C 12.445313 31.847656 16.957031 30.847656 21.5 31.011719 C 25.863281 31.179688 28.832031 32.621094 30.800781 34.210938 L 30.800781 36.089844 C 29.089844 34.398438 26.191406 32.59375 21.5 32.414063 C 15.664063 32.191406 11.019531 34.109375 8.398438 35.542969 Z M 8.398438 39.519531 C 12.445313 37.445313 16.957031 36.445313 21.5 36.613281 C 25.863281 36.78125 28.832031 38.222656 30.800781 39.808594 L 30.800781 41.691406 C 29.089844 40 26.191406 38.191406 21.5 38.011719 C 15.664063 37.789063 11.019531 39.710938 8.398438 41.144531 Z M 8.398438 45.117188 C 12.445313 43.046875 16.957031 42.046875 21.5 42.210938 C 25.863281 42.378906 28.832031 43.820313 30.800781 45.410156 L 30.800781 47.289063 C 29.089844 45.597656 26.191406 43.792969 21.5 43.613281 C 15.664063 43.390625 11.019531 45.308594 8.398438 46.742188 Z M 60.199219 17.117188 C 56.152344 15.046875 51.640625 14.046875 47.097656 14.210938 C 42.738281 14.378906 39.769531 15.820313 37.800781 17.410156 L 37.800781 19.289063 C 39.511719 17.597656 42.410156 15.792969 47.097656 15.613281 C 52.9375 15.390625 57.582031 17.308594 60.199219 18.742188 Z M 60.199219 22.71875 C 56.152344 20.644531 51.640625 19.644531 47.097656 19.8125 C 42.738281 19.980469 39.769531 21.421875 37.800781 23.011719 L 37.800781 24.890625 C 39.511719 23.199219 42.410156 21.390625 47.097656 21.210938 C 52.9375 20.988281 57.582031 22.910156 60.199219 24.34375 Z M 60.199219 28.316406 C 56.152344 26.246094 51.640625 25.246094 47.097656 25.414063 C 42.738281 25.578125 39.769531 27.019531 37.800781 28.609375 L 37.800781 30.492188 C 39.511719 28.800781 42.410156 26.992188 47.097656 26.8125 C 52.9375 26.589844 57.582031 28.507813 60.199219 29.941406 Z M 60.199219 33.917969 C 56.152344 31.847656 51.640625 30.847656 47.097656 31.011719 C 42.738281 31.179688 39.769531 32.621094 37.800781 34.210938 L 37.800781 36.089844 C 39.511719 34.398438 42.410156 32.59375 47.097656 32.414063 C 52.9375 32.191406 57.582031 34.109375 60.199219 35.542969 Z M 56 37.800781 C 53.820313 37.246094 49.898438 36.503906 47.097656 36.613281 C 42.738281 36.78125 39.769531 38.222656 37.800781 39.808594 L 37.800781 41.691406 C 39.511719 40 42.410156 38.191406 47.097656 38.011719 C 49.628906 37.921875 52.160156 38.21875 54.601563 38.894531 Z M 56 37.800781 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18.199219 10.179688 C 12.484375 10.976563 8.371094 13.617188 7 14.605469 L 7 51.511719 C 9.308594 51.105469 13.679688 50.425781 18.199219 50.167969 Z M 47.601563 9.953125 C 47.433594 9.949219 47.269531 9.941406 47.097656 9.941406 C 39.519531 9.941406 36.902344 14.488281 36.398438 15.535156 L 36.398438 52.425781 C 38.761719 51.445313 42.847656 50.058594 47 50.058594 C 47.199219 50.058594 47.398438 50.066406 47.601563 50.070313 Z M 47.601563 9.953125 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 1.398438 11.199219 L 1.398438 57.398438 C 1.398438 58.171875 2.027344 58.800781 2.800781 58.800781 L 21 58.800781 C 26.539063 58.800781 28.464844 60.28125 29.101563 61.085938 C 29.363281 61.417969 29.761719 61.601563 30.179688 61.601563 L 38.421875 61.601563 C 38.839844 61.601563 39.238281 61.417969 39.5 61.085938 C 40.136719 60.28125 42.0625 58.800781 47.601563 58.800781 L 65.800781 58.800781 C 66.574219 58.800781 67.199219 58.171875 67.199219 57.398438 L 67.199219 11.199219 C 67.199219 10.425781 66.574219 9.800781 65.800781 9.800781 L 2.800781 9.800781 C 2.027344 9.800781 1.398438 10.425781 1.398438 11.199219 Z M 1.398438 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 7 14 L 61.601563 14 L 61.601563 54.601563 L 7 54.601563 Z M 7 14 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 63.90625 12.847656 C 63.628906 12.613281 57.03125 7.140625 47.097656 7.140625 C 39.140625 7.140625 35.585938 11.414063 34.300781 13.554688 C 33.015625 11.414063 29.460938 7.140625 21.5 7.140625 C 11.570313 7.140625 4.972656 12.613281 4.695313 12.847656 L 4.199219 13.265625 L 4.199219 54.914063 L 64.398438 54.914063 L 64.398438 13.265625 Z M 63.90625 12.847656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 21.660156 8.539063 C 12.03125 8.539063 5.601563 13.914063 5.601563 13.914063 L 5.601563 53.199219 C 5.601563 53.199219 14.242188 51.457031 21.761719 51.457031 C 27.820313 51.457031 33.878906 54.601563 33.878906 54.601563 L 33.878906 15.242188 C 33.878906 15.242188 31.300781 8.539063 21.660156 8.539063 Z M 46.9375 8.539063 C 56.570313 8.539063 63 13.914063 63 13.914063 L 63 53.199219 C 63 53.199219 54.359375 51.457031 46.839844 51.457031 C 40.78125 51.457031 34.71875 54.601563 34.71875 54.601563 L 34.71875 15.242188 C 34.71875 15.242188 37.300781 8.539063 46.9375 8.539063 Z M 46.9375 8.539063 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+</g>
+</svg>
diff --git a/dist/Intune/all.puml b/dist/Intune/all.puml
new file mode 100644
index 00000000..0b7378d4
--- /dev/null
+++ b/dist/Intune/all.puml
@@ -0,0 +1,142 @@
+sprite $AzureClientApps [70x70/16z] xTL15e0G003HgG3kVzyk0DRUpBBu6z071Q3sKH_G-ZYLarHKL5J2e0VumknF6CHrrK4VKEhiJntahZjLL5HKLEAW1mXnzYSEuffyZrHKL5HKVW
+
+AzureEntityColoring(AzureClientApps)
+!define AzureClientApps(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureClientApps, AzureClientApps)
+!define AzureClientApps(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureClientApps, AzureClientApps)
+
+sprite $AzureDedicatedEventHub [70x70/16z] {
+rTTdae8X383XzB3tl_1ATCJ25sBNvpU-jZX1U0hH4eJKNmt_LiKrOyKAGSf_iuBTtPMsEu80vW5cR5r18W80tqkEB2MLnCiht4eCfeWx0lahQP3vkahZb6rN
+a3gCYa6AjYlcuS6AlwJ20TDAFdK2m1u49Z2cBgs4l1BoxsXTgHiLf9Aqmj1gO0u3L2iNl-aBDrPyxuKLWfHlLb02HWNN5Tn9fgvO6VleaShbRfnNn3hDAzkp
+AwgoM3IiglCAUU3gkXgLHAdYUaIh2aj7-RrEO4gjqsFFLfKStb913LIjY9tXYsywgQJo2ZnIqUl7eYLhGaHeL99v8GyA4uUjHXReeShmeefentTLM3iPt_In
+HriLhyvkVYDhmmELuKKLCE_qhefvW2e-zyL_4-vaxhweo3f_s6ea7MVRVbr9_6H5C4EjK5dxiOhNAu_x1m
+}
+
+AzureEntityColoring(AzureDedicatedEventHub)
+!define AzureDedicatedEventHub(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDedicatedEventHub, AzureDedicatedEventHub)
+!define AzureDedicatedEventHub(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDedicatedEventHub, AzureDedicatedEventHub)
+
+sprite $AzureDeviceCompliance [70x70/16z] {
+xTA7pgmW48RXeVWn2FT_lUSO9-B63AFRb_nlobOVAgq5dlLA_LzXHqPnxbNNYiNCD-NMEXM9-qZO6w1TZdTADHQaAraMT4xHAqzHwWM5ePMaSaQPb3Rjymf6
+Kp2QWkzHC9g2qHHyZuBH58ocu7iKF4z9l2_dV93Z2ONjV4_1SnNg5T-Xu7iKc8f_XWB6uqfavkGC1ORYUIa-fZXUIlIOadZ96GhwoYGt_xBYT_yDiYc6WeCI
+vCzjKq2NbIWhQ9kIwBh2ifjBaFUQabdAhLNnZOcy54XJjafjPUQseSc9Dv6jrACYKqWh0hALSb0sHd8db7fKvAf9dbGbR5DHb8s9f2kKBOKWcw8hRJ9LKOH9
+r5N8SrwKSfCexTewNT63A18yFK5f_Icn5qugHgUKYSta1lq3
+}
+
+AzureEntityColoring(AzureDeviceCompliance)
+!define AzureDeviceCompliance(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDeviceCompliance, AzureDeviceCompliance)
+!define AzureDeviceCompliance(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDeviceCompliance, AzureDeviceCompliance)
+
+sprite $AzureDeviceConfig [70x70/16z] {
+tTJP4giW383XW5cBx_-wtN0QE4EKUdR_-tuJQ11gYzxYolgiQ8A3yBRNMYj7pAtBl3hAbi9kIsimD2Ljb1LsmrYnxK1pIbpv9ShwXQ8S9LjbGX4A-cX_N-6h
+ANmrXVyTXQ-cyDKK_dSK_brA-aiANqtXtwcaP_CAZvLap_0d5K1xfkSKOP6NOY3sAaygFKA8A59MJlQEe9Pd54TK6V65LKMh8KOJYYDcfeoijgMKilXKWS9j
+g1Q7augWM5oA5UuZ2sFOKsQ7oNlAx3020oL0fBrVLVDmMcbdKKfrKRwUHVnUD46DZk-b9mXzs_mtR3N1TAo84_sY9ZLpQA1mfqH_Avj7Noa9F3gjG1EE5TCj
+Qz8lJ_Ifh4sAtAW4tlXsFwrjHH0TKhyOwjRG5H-bx_Q4vCTLNQAjsre7aR-01Pub6h-0nKSPfCrhL669NYFOdY8uzP7oOKP8EVfAULdjFSiWGRKeWUdGuZBC
+fXP7C5j-CvpHELaMyUkTPYHlA-ldMCIHEMOxVkhlDCEvk5csyotjv-fyEbwI1m
+}
+
+AzureEntityColoring(AzureDeviceConfig)
+!define AzureDeviceConfig(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDeviceConfig, AzureDeviceConfig)
+!define AzureDeviceConfig(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDeviceConfig, AzureDeviceConfig)
+
+sprite $AzureDevicesGroup [70x70/16z] {
+tTS74i8m34HHfyahsVU_BZKzGXOTygTJtgpfX8fOVAMyJYXSgrYyPILS5H8ZN5EdzBKNnPhIzNkxVihjCUQK-bhifsXnhpZBhr1IKK4i1oLPAF5J2dv7mTuK
+_8w2tr7mEeMLpeeqJTqhPSJyl93Qfx1CST_iyq9yocHG6AjxfMVkEH1txL3i3-HNz99NmQ0OL_eLxfJe4XSLM0fzL86bq1ygi1Jwg8BtA-HKy7w5d0h-HI6d
+WkyeK69PnZhIAxuVfWygwILADXLQAsnCyIkTFiLKQAE4Q4pnAw6XyY-Mek9geT3U5FeTXVQcqDuKUauHN1Abv5NiV_ZVKV9J2XjJ_0hPKrBm1Kj9pH4
+}
+
+AzureEntityColoring(AzureDevicesGroup)
+!define AzureDevicesGroup(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDevicesGroup, AzureDevicesGroup)
+!define AzureDevicesGroup(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDevicesGroup, AzureDevicesGroup)
+
+sprite $AzureeBook [70x70/16z] {
+xPLRakCu30IjAXH8Qkv_tnLfM4sRKBz_TdVoPnuPpWuJ4TMt_ob_WSczk8lRYzaOnl1-GQMrMeeVbDgAJSxAOOOuJ2jQIji0LbjrunQ0gjNY7rQhYDEOrtQw
+qU3-vs3VMtDYUmAgRU-oLRqgUclx_QCyAjx_rXlOLdXaUeI9mz4P6U-LqIZOKb3RdsjPHYSgvtVCCnMNrcfxg_Xs0j0EUBwHDNjpuDsTNLyhC4ccZXyOjawz
+IvfaPk54f1LGCc8wzEX4XTBiJ3sqLY1xFGJC5HLJ8frh1Uan7vNC4ajbOYeYAc-yvD8AQEO3dJ--JawwE-Aomd4Y3apkJaGbxaS2xArHGbQXGan74g824r-b
+6vOAZElpoQEYzNbXwuroO55XQd5T0GVO7jJ9uSKbbNXV3unF5GofwO9f1QRpX03DNJmhi2UdBh5MeEYVWEuM5QvIxbWhp1xtl55gkLHo61Na-ge2KXqpBZS2
+QNPtkAp45QmZhIlL7HbEXhG2apZj0-rvfUO50wzN2iaGNQyKvLmgwGD2ZyhsrPL2vsgbmhr_enYMZX7BIkcJAsK41tOUgORi3eW54_BAE56oylbANNmZ93EF
+QQKMcLPoifNAA_dlQM1TgSzLuWg1-FLAN86884pk_6e54h4yhhvQuRP2_s8b1p-i1F-52W2IG5894-foCRtKzg0MSQfGJyubmqkbZ8-lLEUeq7DTl4oLToXM
+hRpZtohxJpWhF-8tAzn_6DbvwsmheFKRFj7SY6tbzZweKwFYzbryV-2tN-ClV_a7
+}
+
+AzureEntityColoring(AzureeBook)
+!define AzureeBook(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureeBook, AzureeBook)
+!define AzureeBook(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureeBook, AzureeBook)
+
+sprite $AzureEnrollment [70x70/16z] {
+tTVNWYeX48HXS1QwgiRtVzqJ1ji4GtDo-6zsJPzbrfGhjTP-VKyrjJArsdKGcb8r2IsVCkhZKAZpIceLdt8wHfEmNOxCfmoYAsjTVuQoXmei3eFqejZlKl3t
+AFZV5Fmz2luU1JzFuQ2lYhRjuag8JDylT5bJg4UyzVH-eJL5ycfAtgKfpdpB3MBvy4owVhlIjwygS6Louhh2CgWUCLGmKsgi0BprtGhepupspr2fWKA9U2PN
+bDv0VrJzDaMYTK6o3fae4cmKXK2946TM5JeoPAn3EgL3ZgisFE-iIufeZv1JIWNsIEoHNg5iga1rGH7dYecnGbcWKDMHKqMC51DY1R72KmKjoaA5SgHJl9i2
+hocUFqg1ubjg6fIN5JQbX4fzLwX72ugDbQAd5hVKJadMALPQXxQLLfqhQQlMWkmvd3pIG-NHPU5PHphIATxIAo1KJ942rL3PX42H73bNKlmkPGlA9amKdn8f
+2R97nu_FPuMo9ILBJqhBF0XbIKcRQ2T1T6IYEADJf2ufpi3ws91GyJB5VeXG70aKhqZ4go7XI8FsiP9obKJ2lxmZ-eMVJjegTKIKd49bLiuv7RbodIXnd4nP
+L-fyofxMmapPjyy
+}
+
+AzureEntityColoring(AzureEnrollment)
+!define AzureEnrollment(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureEnrollment, AzureEnrollment)
+!define AzureEnrollment(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureEnrollment, AzureEnrollment)
+
+sprite $AzureExchangeOn [70x70/16z] {
+xTP7WiCW58FXk06Ixd_V0T9xOZITV_LMNufDsNnAItYbyJ4ofsU1al1OMPugL8wD2cHGG8T2lQvCGswgupoKwXY6OHn7jYkv2wKhY0w53eKoAD3xofZRAMEf
+llcfZYshaJgsMe4C2kXGA8D2hLB2aWk7COJg89GQtXTAP-zBLnQ70eS2EXJAe50jokxTXQGKIrGETNnPkLx93QkHCYYGGG4ToWFadISzAzV-lbmeNO55eKEX
+30ei2gLvpEtUkh54wRsR1_MqvmhaK6XHz6LALpZlIatAi2l-3QKhNS5ZPS0h2fVDP_G1
+}
+
+AzureEntityColoring(AzureExchangeOn-PremisesAccess)
+!define AzureExchangeOn-PremisesAccess(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureExchangeOn-PremisesAccess, AzureExchangeOn-PremisesAccess)
+!define AzureExchangeOn-PremisesAccess(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureExchangeOn-PremisesAccess, AzureExchangeOn-PremisesAccess)
+
+sprite $AzureIntuneAppProtection [70x70/16z] {
+xTHLWeKm38NXj3H4plxNEuvJ931-_oVqGrlwZXuzIcUZPU8ucyi2GIIUAOv8DbCGoZzFKJwULPMMZYS_HtaekScN5NO0pYkAlsJ75CLxIjNs5K5N6rSo-hpa
+_TQL5kVILKKGw9CKlaL9ZYwdlMnGgZTJmihmbPpfYa9P72wP0agak99kKLXkKQ3f3WNUB1H9vsh7Fu7XKdAB0akTuhYGDn-ANhwRLoKxmddRFH6bmiiKNSBL
+tPQfLxhEp0my_j9rfKKNLnHDjAj8HIcgoaJiXMXVKNJ9ub64A2SwejJcNUxS8mfZg4ILv1Yoe98DuooVLt9Hp78fwRZ2gkPOpqsL3ocAxUGBbRJNZdAuLyLu
+cWUKBdyDNL6bwTOkAIeY5bGArgDpQUKVE5dAonBzlPu1
+}
+
+AzureEntityColoring(AzureIntuneAppProtection)
+!define AzureIntuneAppProtection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureIntuneAppProtection, AzureIntuneAppProtection)
+!define AzureIntuneAppProtection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureIntuneAppProtection, AzureIntuneAppProtection)
+
+sprite $AzureManagedDesktop [70x70/16z] {
+xTLPSiCm281XWuJ05lU_RXTt69Dfio3SNVzxlX32sCllRZPhM-zTmwte4T7H78Cw71zArU7MIwLZEFv0WN3Vg22UeA18oIii8fHLI5x3d59sX9Epo1xcbBOZ
+DRVTkYCDKWhQKe9AA-1YMqfCOP7oVYb1XTrNkwM45BiDz4iH22hs4zWlfOGL-sGxBfzWGC4tXlpbnnLRHaNPmo75PX1Roe1Y_wz5YISc6S8mgdW64ugx_9m2
+R4UJKf258Qq02lwWT-DKC9nSAgBZWI6WYPefh8cw6oK_J5ChCqpNQ_NjIAz6jqVfv9BRmrmVHSYdLwlBGdgzxjEhRJPAhbBrX5RI4zeMQlbm-V9cisS
+}
+
+AzureEntityColoring(AzureManagedDesktop)
+!define AzureManagedDesktop(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagedDesktop, AzureManagedDesktop)
+!define AzureManagedDesktop(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagedDesktop, AzureManagedDesktop)
+
+sprite $AzureSecurityBaseline [70x70/16z] {
+vTP7UWGn24HX2GGrzp-nF-mDOzHHvJXlrV7l7Dfcen4oNsUwkIypwk-Ph1kHwIsXg_bpG_kLzKM7-JIpeT8E6kR78NANRUKa4kdFAs0eO2XWA60e-3qA60eO
+2XWAVey2XWA60eO2XWAEyfZbzgbUb8eSXpq5ITblHm530KF1xr70KC1Ga1KfzTJOLF2ajDsKhqX6RYij8rKHLPKOq5nLB25LYI6BWKUk5qKASb79vnUBIkCe
+lI2Nhr4a3eBIXA8qeIYj-rmPPgOnOBa-LI9Rk4OffIYj-xeIQL4Cm8W1vFQLrctX6gN424eu_g5WIGbdNOaibBjdjohpA_sNbVdJU4dPwMMLu_wMeXV-lTy
+}
+
+AzureEntityColoring(AzureSecurityBaseline)
+!define AzureSecurityBaseline(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSecurityBaseline, AzureSecurityBaseline)
+!define AzureSecurityBaseline(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSecurityBaseline, AzureSecurityBaseline)
+
+sprite $AzureSoftwareUpdate [70x70/16z] {
+xTQ5iWCn28NX20HMtlzrApdj9QlbUkqVNRhpJQY7J_NkNUBorJXU4UwzZSk638JSo32kbQhIzTjfJZNTKQGg_KuyMNfShOEobo8SnQ_udzkbqddQUBvD4KUw
+Kly_YjwFelUZwFqe-coAte-YzwFe_IXwhuh8rvIMA2pwNQLG4Tz6suZm0YcVLWhn764Mfs88bNOxk29-1GZF48mwZw98Y5XCmGYptg_mSX-cKt9gS2hBem21
+8gPuZY8B18hu5C7zasUsLSYKco-GB14Ib4tnBoHa2aexYbwYcS8BHU9D1K-BAGMPShxOL7JhQK64yQt_cCE81BTtuwJ1eG11WgUb_v9olhDMLfKUp_cUWgFq
+J9UAFLbNfSFuTArLaSs5TAaCCF0OdYskIjp-kovp1MDxpazg7r3KpUUsJ1GWY34T9LXneyIjmiq3M8Y2gyYcS3l7Gi5P-b1AEyvrIC5RlYgndTfHd46HD3iX
+HlwgaXSZxEEFMNYs9HlYBJ9FhudjSFxYR4MMai8texApZN-zjMME
+}
+
+AzureEntityColoring(AzureSoftwareUpdate)
+!define AzureSoftwareUpdate(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSoftwareUpdate, AzureSoftwareUpdate)
+!define AzureSoftwareUpdate(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSoftwareUpdate, AzureSoftwareUpdate)
+
+sprite $AzureTool [70x70/16z] {
+fTK7iiGW30FGkEd-D_xLMp8e23QQclPY30F7ALO0KEd7hGGwSPVfhDOJSoPN30VgDfDePSA4BWI0tUjDabynfcGXmAJlkfZKvJefXlydrOXdhJDqPkkcr3IH
+nsFT46l6o821ucqHI-eytk7b98f2Zg5ou9Nh6IpIXUHANI5kP4PUZ4NXbRn2wEhe3pnnJWXad98g3765l08ItXThX2K4ev0ErXYRRoYk68tqDF4aWDH8fpWI
+VsMcG4GrsQCbo7fliXyOHtY28DaVSeJ78gig8vv8VrgJFLOUdDaLS4Gd4CyX1a5McJniwFH-h9KNOhudy4syn2JfXUZ_NV9z1JWp-GcJkCVmhSls6KkGVTon
+pbXc0HnPPWmTWWX68US7je-43GyaKpYdZEYA6Ihv9zo1TQRuosqiCaNEecs6hP9EB3F5NjnbYhutPJJIRP6CHkJnMTk8PWggNCrmn8ub9iapWYZ61BB6f41e
+YlOl1A8PiV0NcGlSjtQoudWZgqoGkmGH3BdRY6PO3uqWccbaP6BZ3AvA9-UGHhJTo5tcS-GR
+}
+
+AzureEntityColoring(AzureTool)
+!define AzureTool(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTool, AzureTool)
+!define AzureTool(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTool, AzureTool)
+
diff --git a/dist/Management/AzureActiveDirectoryvisor(m).png b/dist/Management/AzureActiveDirectoryvisor(m).png
new file mode 100644
index 00000000..cb980cf8
Binary files /dev/null and b/dist/Management/AzureActiveDirectoryvisor(m).png differ
diff --git a/dist/Management/AzureActiveDirectoryvisor(m).svg b/dist/Management/AzureActiveDirectoryvisor(m).svg
new file mode 100644
index 00000000..3a58f48d
--- /dev/null
+++ b/dist/Management/AzureActiveDirectoryvisor(m).svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.382813 43.886719 C 20.40625 41.910156 19.089844 39.5 18.433594 36.644531 C 16.675781 28.527344 21.503906 20.628906 29.625 18.871094 C 31.378906 18.433594 32.914063 18.433594 34.453125 18.652344 C 35.109375 11.191406 39.71875 4.390625 46.519531 1.097656 C 44.398438 0.378906 42.175781 0.0078125 39.9375 0 C 30.5 0 22.382813 6.144531 19.53125 14.921875 C 17.996094 14.484375 16.457031 14.042969 14.703125 14.042969 C 6.582031 14.042969 0 20.628906 0 28.964844 C 0 37.304688 6.582031 43.886719 14.703125 43.886719 Z M 22.382813 43.886719 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 31.226563 47.578125 C 24.890625 41.242188 24.890625 30.882813 31.226563 24.550781 C 37.5625 18.214844 47.917969 18.214844 54.253906 24.550781 Z M 31.226563 47.578125 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 70 35.546875 C 70 30.941406 66.269531 27.429688 61.882813 27.429688 L 60.785156 27.429688 C 61.222656 25.675781 61.660156 23.699219 61.660156 21.726563 C 61.6875 15.957031 59.40625 10.417969 55.324219 6.335938 C 51.246094 2.257813 45.707031 -0.0234375 39.9375 0 C 30.5 0 22.382813 6.144531 19.53125 14.921875 C 17.996094 14.484375 16.457031 14.042969 14.703125 14.042969 C 6.582031 14.042969 0 20.628906 0 28.964844 C 0 37.304688 6.582031 43.886719 14.703125 43.886719 L 62.539063 43.886719 C 66.796875 43.433594 70.019531 39.832031 70 35.546875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 51.136719 44.761719 C 48.925781 46.769531 46.007813 47.976563 42.789063 47.976563 C 39.574219 47.976563 36.65625 46.769531 34.445313 44.761719 L 33.238281 70 L 42.789063 60.347656 L 52.34375 70 Z M 51.136719 44.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 59.078125 36.011719 C 59.078125 45.007813 51.785156 52.300781 42.789063 52.300781 C 33.792969 52.300781 26.5 45.007813 26.5 36.011719 C 26.5 27.015625 33.792969 19.722656 42.789063 19.722656 C 51.785156 19.722656 59.078125 27.015625 59.078125 36.011719 Z M 59.078125 36.011719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 55.058594 36.011719 C 55.058594 42.789063 49.566406 48.28125 42.789063 48.28125 C 36.015625 48.28125 30.519531 42.789063 30.519531 36.011719 C 30.519531 29.238281 36.015625 23.742188 42.789063 23.742188 C 49.566406 23.742188 55.058594 29.238281 55.058594 36.011719 Z M 55.058594 36.011719 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Management/AzureActiveDirectoryvisor.png b/dist/Management/AzureActiveDirectoryvisor.png
new file mode 100644
index 00000000..f0f5081b
Binary files /dev/null and b/dist/Management/AzureActiveDirectoryvisor.png differ
diff --git a/dist/Management/AzureActiveDirectoryvisor.puml b/dist/Management/AzureActiveDirectoryvisor.puml
new file mode 100644
index 00000000..947195d6
--- /dev/null
+++ b/dist/Management/AzureActiveDirectoryvisor.puml
@@ -0,0 +1,12 @@
+sprite $AzureActiveDirectoryvisor [70x70/16z] {
+nTM7agqW381X84KKt_zvBwvpCcpY6iXj_xIjtuGSItBB1H6fXr1ICA0nfW2KyRlnLOdF8KYFyWg26f5W_ZHa4Gd3I8InY6RYErdR3P2hS0ujHKUUWhxYNtxb
+7P6Ye_Z3PC0hoFa5SJPJa5I-mWytRq0f-l88AH12T3I3yDZMUrbCyOqErA-qbAG9emvzSvnHjA4ThKmZ0xVfxMO7aN-Z7iltIe49P6EIxX_jDuFZdQTJnn53
+d7s_cV9H_57O_7w_uXwKuYk2w64kfV8TvWbbU_frlPZnRl8GVlZrFSmsCEWepx-jmv5w6TuLjh-KOLZ2JBgtKVZJVIGfhIWiLQN0lC8_AsbQuJV53lEiyAkI
+q5KqOhTh6Vr9MyHUTi-CLjWgrRmAm3cIGjIrczNBqJAi47iWoZ-zgSVRyH6HKQWaftmpfdef9Sq6yemr2ARvgDwNbpxEpcabtg_g9aPNBpUbTQPtRQXsGYPP
+2tSJfVMsGo4r1Qfd6voZdK6brzhHQ-tixH5bFrN7_rCEhRJ_fxHJ5r7ElwJaTIJBEkHe9QuqA2skb0-IqeU1TGK44IQY228ChYieY30HHH1XQ5sXis4QWdPo
+G154c832WWXZbLy
+}
+
+AzureEntityColoring(AzureActiveDirectoryvisor)
+!define AzureActiveDirectoryvisor(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActiveDirectoryvisor, AzureActiveDirectoryvisor)
+!define AzureActiveDirectoryvisor(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectoryvisor, AzureActiveDirectoryvisor)
diff --git a/dist/Management/AzureActiveDirectoryvisor.svg b/dist/Management/AzureActiveDirectoryvisor.svg
new file mode 100644
index 00000000..9f1324d9
--- /dev/null
+++ b/dist/Management/AzureActiveDirectoryvisor.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.382813 43.886719 C 20.40625 41.910156 19.089844 39.5 18.433594 36.644531 C 16.675781 28.527344 21.503906 20.628906 29.625 18.871094 C 31.378906 18.433594 32.914063 18.433594 34.453125 18.652344 C 35.109375 11.191406 39.71875 4.390625 46.519531 1.097656 C 44.398438 0.378906 42.175781 0.0078125 39.9375 0 C 30.5 0 22.382813 6.144531 19.53125 14.921875 C 17.996094 14.484375 16.457031 14.042969 14.703125 14.042969 C 6.582031 14.042969 0 20.628906 0 28.964844 C 0 37.304688 6.582031 43.886719 14.703125 43.886719 Z M 22.382813 43.886719 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 31.226563 47.578125 C 24.890625 41.242188 24.890625 30.882813 31.226563 24.550781 C 37.5625 18.214844 47.917969 18.214844 54.253906 24.550781 Z M 31.226563 47.578125 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 70 35.546875 C 70 30.941406 66.269531 27.429688 61.882813 27.429688 L 60.785156 27.429688 C 61.222656 25.675781 61.660156 23.699219 61.660156 21.726563 C 61.6875 15.957031 59.40625 10.417969 55.324219 6.335938 C 51.246094 2.257813 45.707031 -0.0234375 39.9375 0 C 30.5 0 22.382813 6.144531 19.53125 14.921875 C 17.996094 14.484375 16.457031 14.042969 14.703125 14.042969 C 6.582031 14.042969 0 20.628906 0 28.964844 C 0 37.304688 6.582031 43.886719 14.703125 43.886719 L 62.539063 43.886719 C 66.796875 43.433594 70.019531 39.832031 70 35.546875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 51.136719 44.761719 C 48.925781 46.769531 46.007813 47.976563 42.789063 47.976563 C 39.574219 47.976563 36.65625 46.769531 34.445313 44.761719 L 33.238281 70 L 42.789063 60.347656 L 52.34375 70 Z M 51.136719 44.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 59.078125 36.011719 C 59.078125 45.007813 51.785156 52.300781 42.789063 52.300781 C 33.792969 52.300781 26.5 45.007813 26.5 36.011719 C 26.5 27.015625 33.792969 19.722656 42.789063 19.722656 C 51.785156 19.722656 59.078125 27.015625 59.078125 36.011719 Z M 59.078125 36.011719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 55.058594 36.011719 C 55.058594 42.789063 49.566406 48.28125 42.789063 48.28125 C 36.015625 48.28125 30.519531 42.789063 30.519531 36.011719 C 30.519531 29.238281 36.015625 23.742188 42.789063 23.742188 C 49.566406 23.742188 55.058594 29.238281 55.058594 36.011719 Z M 55.058594 36.011719 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Management/AzureActivityLog(m).png b/dist/Management/AzureActivityLog(m).png
new file mode 100644
index 00000000..124d6bcc
Binary files /dev/null and b/dist/Management/AzureActivityLog(m).png differ
diff --git a/dist/Management/AzureActivityLog(m).svg b/dist/Management/AzureActivityLog(m).svg
new file mode 100644
index 00000000..164a4641
--- /dev/null
+++ b/dist/Management/AzureActivityLog(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 58.789063 68.980469 L 62.988281 63.511719 L 62.988281 2.800781 L 58.789063 7 Z M 58.789063 68.980469 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 62.988281 63.511719 L 65.789063 63.511719 L 65.789063 0 L 8.390625 0 C 6.578125 0.234375 2.800781 4.621094 2.800781 5.25 L 2.882813 66.6875 C 2.882813 68.515625 4.367188 70 6.199219 70 L 58.789063 70 L 58.789063 68.980469 Z M 62.988281 63.511719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 10.882813 2.800781 C 9.335938 2.800781 8.671875 3.058594 7.375 4.199219 C 4.1875 7 7.917969 7 9.46875 7 L 58.789063 7 L 58.789063 68.980469 L 62.988281 63.511719 L 62.988281 2.800781 Z M 10.882813 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.1875 28 C 46.1875 29.546875 44.933594 30.800781 43.390625 30.800781 L 19.589844 30.800781 C 18.042969 30.800781 16.789063 29.546875 16.789063 28 L 16.789063 21 C 16.789063 19.453125 18.042969 18.199219 19.589844 18.199219 L 43.390625 18.199219 C 44.933594 18.199219 46.1875 19.453125 46.1875 21 Z M 46.1875 28 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureActivityLog.png b/dist/Management/AzureActivityLog.png
new file mode 100644
index 00000000..f407b3d1
Binary files /dev/null and b/dist/Management/AzureActivityLog.png differ
diff --git a/dist/Management/AzureActivityLog.puml b/dist/Management/AzureActivityLog.puml
new file mode 100644
index 00000000..6ca4fa4d
--- /dev/null
+++ b/dist/Management/AzureActivityLog.puml
@@ -0,0 +1,8 @@
+sprite $AzureActivityLog [70x70/16z] {
+xTI5OSGm341HWL7PVz-66TKSwm_mp8Qc88KsX3RCXJuS8v8roQ2KY7X2HHHx9PO8emfnlOBbShmI6HGgbS0gPAQKoUNSJD7rjWh-fcAA1CSRUJcjUDWEvQGY
+i5SygUHT9NoDOehSeXIyf-IpYcmpbEoNQZB555DCCSKKKqp9-GO5olwjq1qAmv2e5HWLjGgCmwnJQ23-
+}
+
+AzureEntityColoring(AzureActivityLog)
+!define AzureActivityLog(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActivityLog, AzureActivityLog)
+!define AzureActivityLog(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActivityLog, AzureActivityLog)
diff --git a/dist/Management/AzureActivityLog.svg b/dist/Management/AzureActivityLog.svg
new file mode 100644
index 00000000..83dbdb7e
--- /dev/null
+++ b/dist/Management/AzureActivityLog.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 58.789063 68.980469 L 62.988281 63.511719 L 62.988281 2.800781 L 58.789063 7 Z M 58.789063 68.980469 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 62.988281 63.511719 L 65.789063 63.511719 L 65.789063 0 L 8.390625 0 C 6.578125 0.234375 2.800781 4.621094 2.800781 5.25 L 2.882813 66.6875 C 2.882813 68.515625 4.367188 70 6.199219 70 L 58.789063 70 L 58.789063 68.980469 Z M 62.988281 63.511719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 10.882813 2.800781 C 9.335938 2.800781 8.671875 3.058594 7.375 4.199219 C 4.1875 7 7.917969 7 9.46875 7 L 58.789063 7 L 58.789063 68.980469 L 62.988281 63.511719 L 62.988281 2.800781 Z M 10.882813 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.1875 28 C 46.1875 29.546875 44.933594 30.800781 43.390625 30.800781 L 19.589844 30.800781 C 18.042969 30.800781 16.789063 29.546875 16.789063 28 L 16.789063 21 C 16.789063 19.453125 18.042969 18.199219 19.589844 18.199219 L 43.390625 18.199219 C 44.933594 18.199219 46.1875 19.453125 46.1875 21 Z M 46.1875 28 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureAlert(m).png b/dist/Management/AzureAlert(m).png
new file mode 100644
index 00000000..c41817dc
Binary files /dev/null and b/dist/Management/AzureAlert(m).png differ
diff --git a/dist/Management/AzureAlert(m).svg b/dist/Management/AzureAlert(m).svg
new file mode 100644
index 00000000..2ca696cc
--- /dev/null
+++ b/dist/Management/AzureAlert(m).svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 60.65625 0 L 8.785156 0 C 3.65625 -0.0273438 0 3.0625 0 8.175781 L 0 44.878906 C 0 50.066406 3.726563 54.660156 8.859375 54.71875 L 27.597656 54.753906 L 42.984375 69.859375 L 43.097656 54.796875 L 60.515625 54.796875 C 65.640625 54.839844 69.84375 50.691406 69.84375 45.566406 L 69.921875 8.722656 C 69.957031 3.625 65.789063 0 60.65625 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 40.054688 39.089844 C 40.054688 41.921875 37.757813 44.21875 34.921875 44.21875 C 32.089844 44.21875 29.789063 41.921875 29.789063 39.089844 C 29.789063 36.253906 32.089844 33.957031 34.921875 33.957031 C 37.757813 33.957031 40.054688 36.253906 40.054688 39.089844 M 35.890625 8.828125 L 30.855469 8.828125 L 32.140625 31.132813 L 38.195313 31.132813 L 39.484375 8.828125 Z M 35.890625 8.828125 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureAlert.png b/dist/Management/AzureAlert.png
new file mode 100644
index 00000000..5626e56f
Binary files /dev/null and b/dist/Management/AzureAlert.png differ
diff --git a/dist/Management/AzureAlert.puml b/dist/Management/AzureAlert.puml
new file mode 100644
index 00000000..3cd81b11
--- /dev/null
+++ b/dist/Management/AzureAlert.puml
@@ -0,0 +1,8 @@
+sprite $AzureAlert [70x70/16z] {
+xTV5WGG040B17Y3_bC_TRuV7MWNGR-2Ud0DvUAAiF7QS9JKYYPWKZ5BWN1gUp15Lb8qvmegpeREjPCLdLydnLIPVkLQKdJcYYX_ad6WOPySyq3gopmpFii0B
+7r4b2-ekZnp5iexad1AdGIamAH3A7f2r0QX4m8q8Z1OVzZVEE-80dpB38hElu4e5LoguKi6L2gvKSAM2AnLKgQ1A1LKgg591FrHk0G
+}
+
+AzureEntityColoring(AzureAlert)
+!define AzureAlert(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAlert, AzureAlert)
+!define AzureAlert(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAlert, AzureAlert)
diff --git a/dist/Management/AzureAlert.svg b/dist/Management/AzureAlert.svg
new file mode 100644
index 00000000..f60827c0
--- /dev/null
+++ b/dist/Management/AzureAlert.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 60.65625 0 L 8.785156 0 C 3.65625 -0.0273438 0 3.0625 0 8.175781 L 0 44.878906 C 0 50.066406 3.726563 54.660156 8.859375 54.71875 L 27.597656 54.753906 L 42.984375 69.859375 L 43.097656 54.796875 L 60.515625 54.796875 C 65.640625 54.839844 69.84375 50.691406 69.84375 45.566406 L 69.921875 8.722656 C 69.957031 3.625 65.789063 0 60.65625 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 40.054688 39.089844 C 40.054688 41.921875 37.757813 44.21875 34.921875 44.21875 C 32.089844 44.21875 29.789063 41.921875 29.789063 39.089844 C 29.789063 36.253906 32.089844 33.957031 34.921875 33.957031 C 37.757813 33.957031 40.054688 36.253906 40.054688 39.089844 M 35.890625 8.828125 L 30.855469 8.828125 L 32.140625 31.132813 L 38.195313 31.132813 L 39.484375 8.828125 Z M 35.890625 8.828125 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureAutomation(m).png b/dist/Management/AzureAutomation(m).png
index 52221216..a4646b02 100644
Binary files a/dist/Management/AzureAutomation(m).png and b/dist/Management/AzureAutomation(m).png differ
diff --git a/dist/Management/AzureAutomation(m).svg b/dist/Management/AzureAutomation(m).svg
index db38668c..88d3e1e0 100644
--- a/dist/Management/AzureAutomation(m).svg
+++ b/dist/Management/AzureAutomation(m).svg
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="61pt" viewBox="0 0 70 61" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 55.308594 4.714844 L 44.324219 27.210938 L 47.058594 27.210938 C 46.816406 27.160156 46.710938 26.957031 46.863281 26.710938 L 51.589844 18.285156 L 52.703125 16.273438 L 53.996094 13.957031 L 56.75 9.078125 L 58.328125 6.234375 C 57.347656 5.671875 56.339844 5.164063 55.308594 4.714844 Z M 53.089844 27.191406 L 50.023438 27.203125 L 38.691406 44.199219 L 53.285156 27.648438 C 53.503906 27.386719 53.417969 27.191406 53.089844 27.191406 Z M 53.089844 27.191406 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 64.132813 29.59375 C 64.132813 29.113281 64.132813 28.628906 64.132813 28.148438 L 69.34375 25.257813 C 69.019531 23.492188 68.691406 21.886719 68.042969 20.285156 L 62.019531 20.445313 C 61.53125 19.480469 61.042969 18.679688 60.554688 17.875 L 63.644531 12.738281 C 62.507813 11.453125 61.367188 10.171875 60.066406 9.207031 L 56.972656 10.972656 L 55.667969 12.898438 L 52.902344 16.914063 C 56.808594 19.960938 59.25 24.617188 59.25 29.753906 C 59.25 38.742188 51.925781 45.96875 42.808594 45.96875 C 33.691406 45.96875 26.367188 38.742188 26.367188 29.753906 C 26.367188 21.726563 32.226563 14.984375 40.042969 13.703125 L 41.34375 8.726563 L 38.414063 3.589844 C 36.621094 3.910156 34.996094 4.390625 33.367188 4.871094 L 33.53125 10.8125 C 32.554688 11.292969 31.738281 11.777344 30.925781 12.257813 L 25.714844 9.207031 C 24.414063 10.332031 23.109375 11.453125 22.132813 12.738281 L 25.226563 17.714844 C 24.574219 18.515625 24.25 19.480469 23.761719 20.445313 L 17.738281 20.285156 C 17.085938 21.886719 16.761719 23.492188 16.4375 25.257813 L 21.644531 28.148438 C 21.644531 28.628906 21.644531 29.113281 21.644531 29.59375 C 21.644531 30.074219 21.644531 30.558594 21.644531 31.039063 L 16.4375 33.929688 C 16.761719 35.695313 17.25 37.300781 17.738281 38.90625 L 23.761719 38.742188 C 24.25 39.707031 24.738281 40.507813 25.226563 41.472656 L 22.132813 46.609375 C 23.273438 47.894531 24.414063 49.179688 25.714844 50.300781 L 30.925781 47.25 C 31.738281 47.894531 32.714844 48.375 33.53125 48.695313 L 33.367188 54.636719 C 34.996094 55.277344 36.621094 55.597656 38.414063 55.921875 L 41.34375 50.785156 C 41.832031 50.785156 42.320313 50.945313 42.808594 50.945313 C 43.296875 50.945313 43.785156 50.945313 44.273438 50.785156 L 47.203125 55.921875 C 48.996094 55.597656 50.621094 55.117188 52.25 54.636719 L 52.085938 48.695313 C 53.066406 48.214844 53.878906 47.734375 54.691406 47.25 L 59.902344 50.300781 C 61.203125 49.179688 62.507813 48.054688 63.484375 46.609375 L 60.390625 41.472656 C 60.878906 40.671875 61.53125 39.707031 61.855469 38.742188 L 67.878906 38.90625 C 68.53125 37.300781 68.855469 35.695313 69.179688 33.929688 L 63.972656 31.039063 C 64.132813 30.558594 64.132813 30.074219 64.132813 29.59375 Z M 64.132813 29.59375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 11.394531 54.285156 C 9.441406 54.285156 7.8125 52.679688 7.8125 50.753906 C 7.8125 48.824219 9.441406 47.21875 11.394531 47.21875 C 13.347656 47.21875 14.976563 48.824219 14.976563 50.753906 C 14.976563 52.679688 13.347656 54.285156 11.394531 54.285156 Z M 18.394531 41.761719 L 15.464844 43.207031 L 13.675781 42.40625 L 12.535156 39.355469 L 9.929688 39.355469 L 8.953125 42.40625 L 7.164063 43.207031 L 4.234375 41.761719 L 2.441406 43.527344 L 3.90625 46.417969 L 3.09375 48.183594 L 0 49.308594 L 0 51.875 L 3.09375 52.839844 L 3.90625 54.605469 L 2.441406 57.492188 L 4.234375 59.261719 L 7.164063 57.816406 L 8.953125 58.617188 L 10.09375 61.667969 L 12.699219 61.667969 L 13.675781 58.617188 L 15.464844 57.816406 L 18.394531 59.261719 L 20.1875 57.492188 L 18.722656 54.605469 L 19.535156 52.839844 L 22.628906 51.714844 L 22.628906 49.148438 L 19.535156 48.183594 L 18.722656 46.417969 L 20.1875 43.527344 Z M 18.394531 41.761719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 46.132813 0 L 45.15625 3.050781 L 41.898438 13.324219 L 36.855469 28.894531 C 36.691406 29.214844 36.855469 29.375 37.179688 29.375 L 41.738281 29.375 C 41.898438 29.375 42.0625 29.375 42.0625 29.535156 C 42.226563 29.699219 42.226563 29.859375 42.226563 30.019531 L 37.503906 41.414063 C 37.34375 41.738281 37.503906 41.738281 37.667969 41.578125 L 52.644531 24.882813 C 52.808594 24.558594 52.808594 24.398438 52.480469 24.398438 L 46.621094 24.398438 C 46.296875 24.398438 46.132813 24.238281 46.296875 23.917969 L 51.015625 15.730469 L 56.0625 6.742188 L 57.691406 4.011719 C 54.273438 1.765625 50.367188 0.480469 46.132813 0 Z M 46.132813 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 64.792969 32.679688 C 64.792969 32.15625 64.75 31.652344 64.707031 31.128906 L 70 28.199219 C 69.71875 26.464844 69.265625 24.765625 68.644531 23.121094 L 62.605469 23.230469 C 62.15625 22.292969 61.644531 21.386719 61.074219 20.519531 L 64.179688 15.335938 C 63.070313 13.984375 61.832031 12.746094 60.484375 11.636719 L 57.417969 13.453125 L 56.128906 15.378906 L 53.351563 19.46875 C 57.289063 22.53125 59.828125 27.300781 59.828125 32.679688 C 59.828125 41.914063 52.367188 49.394531 43.136719 49.394531 C 33.925781 49.394531 26.445313 41.914063 26.445313 32.679688 C 26.445313 24.414063 32.4375 17.589844 40.3125 16.230469 L 41.582031 11.089844 L 38.648438 5.796875 C 36.925781 6.078125 35.234375 6.53125 33.601563 7.152344 L 33.6875 13.210938 C 32.75 13.648438 31.851563 14.160156 30.996094 14.742188 L 25.8125 11.636719 C 24.457031 12.738281 23.21875 13.980469 22.117188 15.335938 L 25.222656 20.519531 C 24.632813 21.371094 24.148438 22.289063 23.691406 23.230469 L 17.632813 23.121094 C 17.027344 24.769531 16.582031 26.46875 16.296875 28.199219 L 21.570313 31.128906 C 21.484375 32.164063 21.484375 33.199219 21.570313 34.234375 L 16.296875 37.164063 C 16.582031 38.914063 17.039063 40.621094 17.652344 42.242188 L 23.691406 42.132813 C 24.152344 43.074219 24.632813 43.992188 25.222656 44.84375 L 22.117188 50.027344 C 23.226563 51.386719 24.464844 52.632813 25.816406 53.746094 L 31 50.621094 C 31.851563 51.210938 32.769531 51.714844 33.691406 52.171875 L 33.601563 58.210938 C 35.21875 58.824219 36.902344 59.28125 38.652344 59.566406 L 41.605469 54.273438 C 42.109375 54.316406 42.613281 54.359375 43.136719 54.359375 C 43.660156 54.359375 44.1875 54.316406 44.6875 54.273438 L 47.621094 59.566406 C 49.355469 59.285156 51.054688 58.832031 52.695313 58.210938 L 52.585938 52.171875 C 53.527344 51.71875 54.433594 51.199219 55.300781 50.617188 L 60.484375 53.746094 C 61.828125 52.625 63.066406 51.378906 64.179688 50.027344 L 61.074219 44.84375 C 61.644531 43.992188 62.148438 43.070313 62.605469 42.128906 L 68.644531 42.238281 C 69.257813 40.621094 69.71875 38.914063 70 37.164063 L 64.707031 34.234375 C 64.75 33.710938 64.792969 33.207031 64.792969 32.679688 Z M 64.792969 32.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 22.398438 55.605469 L 22.398438 53.003906 L 22.257813 52.871094 L 19.59375 51.976563 L 18.910156 50.179688 L 20.226563 47.449219 L 20.371094 47.140625 L 19.546875 46.308594 L 18.546875 45.300781 L 18.195313 45.476563 L 15.59375 46.8125 L 13.800781 46.308594 L 12.664063 43.398438 L 10.085938 43.398438 L 9.953125 43.53125 L 9.054688 46.1875 L 7.242188 46.871094 L 4.222656 45.421875 L 2.382813 47.242188 L 2.558594 47.585938 L 3.894531 50.1875 L 3.148438 51.976563 L 0 53.113281 L 0 55.714844 L 0.371094 55.824219 L 3.148438 56.742188 L 3.894531 58.535156 L 2.472656 61.554688 L 4.308594 63.414063 L 4.660156 63.238281 L 7.261719 61.90625 L 9.054688 62.648438 L 10.195313 65.800781 L 12.796875 65.800781 L 12.90625 65.425781 L 13.824219 62.648438 L 15.597656 61.90625 L 18.636719 63.328125 L 20.476563 61.492188 L 20.300781 61.140625 L 18.964844 58.539063 L 19.480469 56.722656 Z M 11.441406 58.011719 C 9.425781 58.011719 7.789063 56.371094 7.789063 54.359375 C 7.789063 52.347656 9.429688 50.707031 11.441406 50.707031 C 13.453125 50.707031 15.074219 52.347656 15.074219 54.359375 C 15.074219 56.371094 13.453125 58.011719 11.441406 58.011719 Z M 11.441406 58.011719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 46.617188 2.363281 L 45.609375 5.535156 L 43.882813 11.046875 L 43.050781 13.695313 L 42.328125 16.011719 L 37.296875 32.003906 C 37.1875 32.308594 37.339844 32.550781 37.6875 32.550781 L 42.328125 32.550781 C 42.480469 32.550781 42.589844 32.59375 42.65625 32.679688 C 42.765625 32.789063 42.785156 32.945313 42.722656 33.121094 L 37.929688 44.734375 C 37.796875 45.042969 37.886719 45.109375 38.105469 44.84375 L 53.265625 27.648438 C 53.484375 27.386719 53.398438 27.191406 53.070313 27.191406 L 48.101563 27.214844 L 47.183594 27.234375 C 46.855469 27.234375 46.703125 26.996094 46.878906 26.710938 L 51.601563 18.289063 L 52.71875 16.273438 L 54.007813 13.957031 L 56.765625 9.078125 L 58.339844 6.234375 C 54.742188 4.148438 50.75 2.832031 46.617188 2.363281 Z M 46.617188 2.363281 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Management/AzureAutomation.png b/dist/Management/AzureAutomation.png
index 2a8678b7..cdacd8b6 100644
Binary files a/dist/Management/AzureAutomation.png and b/dist/Management/AzureAutomation.png differ
diff --git a/dist/Management/AzureAutomation.puml b/dist/Management/AzureAutomation.puml
index e6e34089..23343449 100644
--- a/dist/Management/AzureAutomation.puml
+++ b/dist/Management/AzureAutomation.puml
@@ -1,11 +1,11 @@
-sprite $AzureAutomation [70x61/16z] {
-fLS9hgmm36lQRER-z_qBwWICogpMzaIH4yTncTS-GgHhRpz2jl-0_qQasqJgDptCuh4LyiD-XcE3x7zYEn1Vg8YTxqG2-MOMexNc9nRxKD2S0mj2-ufbKnAa
-xofHPXbJK7NM-cjLDiqi5ZaBwgs9iqzhalzmQOf7zKuk2wgdbqkAgk_DoELulJLLju1-4kHLveNXVgP8xMTYI1EyPRZWu1WrgN8vohWtu-lpGPvSrhUpb7CU
-DAbPl-FDB0cAX0N5IN1_nUANrvApt5-iYxYxcO5zbCeopUt_c-vZjRM5fATaBTzxwwcIZ_HKbuifxOfb2LbK3Ih767I7NBSdRGUzkSf1J-gJ1J4zAXAwsDhA
-20ig64l2JI9jvmaML71UAPUd5uCl1adaHYDPiV2v_aTUNT8FMBYXb0kBteSW3aKSJyXro-CkaORLvM57nFa-35bpB6z340d5dBHVDx9Vdm-Mo6juTsOys-kx
-olKOg3CmkTs67q-_8Nf-walfv0EV0iYDVKKiUqu0BDNiFBsW8fhBbdFP0wqlnLSQGqaoatCp1usiIPAwWCvFGqeJXzJ2KmuMDtpdOMFQXi0SQjp_i9NZZ6B6
-IFPnS-8Hnyqk4FRfW7bj4dLBEe2m7GTGmWa0YBh6HhE2wOnpFrI6RqjuJEeIgwXBJ7B_iomRhVNO67FWFS-Viy3Pj56DTi2EHmoTrJ4k7rHmegCsxOPbHsyt
-B9HIOkbD1CLIOE_6iTc8mVagNYCMXjUqE_Yb8kP_i-p-9pB2WiHHBtORPQvsUukAUXPpfgkq5R0neds8jPNo3OrlEMGVFrGKBFjzzCVTPhHBtmhxck0l
+sprite $AzureAutomation [70x70/16z] {
+xPQ7Rkim54DvbnB__my_sn9AXBZP66-TxbOu8kLhD_XpSSFtMEnyRVAOV2UAM6I-w_6iOQiGBUbu0ni7jGfHadZVCbmAfNzYAHPYbBSj8suBsMUM18AIm6lK
+MCr_ifX4YP7F9MFKN3in-4qKgndmYUGWlCRYfj1QyKGJGqc04kSAnmF4KN5JY6TUU3bC6Y1HwfKeNCRgj039lpt4X-nclCei3F8mZ46Z1FS8F4CaO1H6BJmX
+HMACSkAFmrYUw29VahpT9a_kXM1WAUIiJ1nA_qTZb6Qa2eB9twIGzVjrSxA8hf0VFcVtfnQJGlgqzBwHz9L2j9YKTtIaRW2HBAHuMokra4eWlPzQ_4071lMw
+XIo9M72Nw2o-xYB2estmukbAb6Z6lBfELlqesH6b7_F4awaZhXB46tS02wL4h_iM6qIYs6ihTGS7YVJx3wA44kqM5luWj4En2D-HFSBRp3Ld6YJ2DH8tSGZP
+X_1jssIakCpwteK9rzHkIN3RaiegqLEjRJZykbikZhXinNKwDNfvZDvjvt3yVFLPQ57U3gPKicaWL-xMU69LrQGb5hx88HM-4rb3O1Yn64_bEOv5RWV3O6Cx
+23x07JawGbzxM9xdKYntJPkQu5dUOW1N75os2IOycaoJVwHwPQm22ruNIa-BtdMLcJnIGIpNknO73nsAvTm-E87RSAXbjQ05oZZ3n26vCeXOZ6FRMtmxkOnr
+ADtZDPiV26kGWE1PM7Y5e-NIt4TluviIU0Tc6J67VqJj1uIFA5jNQW2mn1U4L7aNZYs-nuo3yfzV
 }
 
 AzureEntityColoring(AzureAutomation)
diff --git a/dist/Management/AzureAutomation.svg b/dist/Management/AzureAutomation.svg
index 0a0706dc..ad29d295 100644
--- a/dist/Management/AzureAutomation.svg
+++ b/dist/Management/AzureAutomation.svg
@@ -1,37 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="63pt" viewBox="0 0 70 63" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="63" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="63"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 55.308594 2.351563 L 44.324219 24.847656 L 47.058594 24.847656 C 46.816406 24.796875 46.710938 24.59375 46.863281 24.347656 L 51.589844 15.921875 L 52.703125 13.910156 L 53.996094 11.59375 L 56.75 6.714844 L 58.328125 3.871094 C 57.351563 3.308594 56.34375 2.804688 55.308594 2.351563 Z M 55.308594 2.351563 "/>
-</g>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="63" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="63"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 53.089844 24.828125 L 50.023438 24.839844 L 38.691406 41.835938 L 53.285156 25.285156 C 53.503906 25.023438 53.417969 24.828125 53.089844 24.828125 Z M 53.089844 24.828125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 55.308594 4.714844 L 44.324219 27.210938 L 47.058594 27.210938 C 46.816406 27.160156 46.710938 26.957031 46.863281 26.710938 L 51.589844 18.285156 L 52.703125 16.273438 L 53.996094 13.957031 L 56.75 9.078125 L 58.328125 6.234375 C 57.347656 5.671875 56.339844 5.164063 55.308594 4.714844 Z M 53.089844 27.191406 L 50.023438 27.203125 L 38.691406 44.199219 L 53.285156 27.648438 C 53.503906 27.386719 53.417969 27.191406 53.089844 27.191406 Z M 53.089844 27.191406 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 64.792969 30.320313 C 64.792969 29.792969 64.75 29.289063 64.707031 28.765625 L 70 25.835938 C 69.714844 24.085938 69.257813 22.378906 68.644531 20.757813 L 62.605469 20.867188 C 62.144531 19.925781 61.640625 19.007813 61.074219 18.15625 L 64.179688 12.972656 C 63.0625 11.613281 61.816406 10.367188 60.484375 9.273438 L 57.417969 11.089844 L 56.128906 13.015625 L 53.351563 17.105469 C 57.289063 20.167969 59.828125 24.9375 59.828125 30.320313 C 59.828125 39.550781 52.367188 47.03125 43.136719 47.03125 C 33.925781 47.03125 26.445313 39.550781 26.445313 30.320313 C 26.445313 22.050781 32.4375 15.226563 40.3125 13.867188 L 41.582031 8.726563 L 38.648438 3.433594 C 36.902344 3.71875 35.21875 4.175781 33.601563 4.789063 L 33.6875 10.847656 C 32.769531 11.285156 31.851563 11.789063 30.996094 12.378906 L 25.8125 9.273438 C 24.457031 10.367188 23.230469 11.613281 22.117188 12.972656 L 25.222656 18.15625 C 24.632813 19.007813 24.148438 19.925781 23.691406 20.867188 L 17.632813 20.757813 C 17.039063 22.378906 16.582031 24.085938 16.296875 25.835938 L 21.570313 28.765625 C 21.527344 29.289063 21.503906 29.792969 21.503906 30.320313 C 21.503906 30.84375 21.527344 31.347656 21.570313 31.871094 L 16.296875 34.800781 C 16.582031 36.550781 17.039063 38.257813 17.652344 39.878906 L 23.691406 39.769531 C 24.152344 40.710938 24.632813 41.628906 25.222656 42.480469 L 22.117188 47.664063 C 23.234375 49.023438 24.457031 50.269531 25.816406 51.382813 L 31 48.257813 C 31.851563 48.847656 32.769531 49.351563 33.691406 49.808594 L 33.601563 55.847656 C 35.21875 56.460938 36.902344 56.917969 38.652344 57.203125 L 41.605469 51.910156 C 42.109375 51.953125 42.613281 51.996094 43.136719 51.996094 C 43.660156 51.996094 44.1875 51.953125 44.6875 51.910156 L 47.621094 57.203125 C 49.371094 56.917969 51.078125 56.460938 52.695313 55.847656 L 52.585938 49.808594 C 53.527344 49.347656 54.425781 48.84375 55.300781 48.253906 L 60.484375 51.382813 C 61.820313 50.265625 63.066406 49.019531 64.179688 47.664063 L 61.074219 42.480469 C 61.644531 41.628906 62.148438 40.707031 62.605469 39.765625 L 68.644531 39.875 C 69.257813 38.257813 69.71875 36.550781 70 34.800781 L 64.707031 31.871094 C 64.75 31.347656 64.792969 30.84375 64.792969 30.320313 Z M 64.792969 30.320313 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 22.398438 53.242188 L 22.398438 50.640625 L 22.257813 50.507813 L 19.59375 49.613281 L 18.910156 47.820313 L 20.226563 45.085938 L 20.371094 44.777344 L 19.546875 43.945313 L 18.546875 42.9375 L 18.195313 43.113281 L 15.59375 44.449219 L 13.800781 43.945313 L 12.664063 41.035156 L 10.085938 41.035156 L 9.953125 41.167969 L 9.054688 43.824219 L 7.242188 44.507813 L 4.222656 43.058594 L 2.382813 44.878906 L 2.558594 45.222656 L 3.894531 47.824219 L 3.148438 49.613281 L 0 50.75 L 0 53.351563 L 0.371094 53.460938 L 3.148438 54.378906 L 3.894531 56.171875 L 2.472656 59.191406 L 4.308594 61.050781 L 4.660156 60.875 L 7.261719 59.542969 L 9.054688 60.285156 L 10.195313 63.4375 L 12.796875 63.4375 L 12.90625 63.0625 L 13.824219 60.285156 L 15.597656 59.542969 L 18.636719 60.964844 L 20.476563 59.128906 L 20.300781 58.777344 L 18.964844 56.175781 L 19.480469 54.359375 Z M 11.441406 55.648438 C 9.425781 55.648438 7.789063 54.007813 7.789063 51.996094 C 7.789063 49.984375 9.429688 48.34375 11.441406 48.34375 C 13.453125 48.34375 15.074219 49.984375 15.074219 51.996094 C 15.074219 54.007813 13.453125 55.648438 11.441406 55.648438 Z M 11.441406 55.648438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 46.617188 0 L 45.609375 3.171875 L 43.882813 8.6875 L 43.050781 11.332031 L 42.328125 13.648438 L 37.296875 29.640625 C 37.1875 29.945313 37.339844 30.1875 37.6875 30.1875 L 42.328125 30.1875 C 42.480469 30.1875 42.589844 30.230469 42.65625 30.320313 C 42.765625 30.425781 42.785156 30.582031 42.722656 30.757813 L 37.929688 42.371094 C 37.796875 42.679688 37.886719 42.746094 38.105469 42.480469 L 53.265625 25.285156 C 53.484375 25.023438 53.398438 24.828125 53.070313 24.828125 L 48.101563 24.851563 L 47.183594 24.871094 C 46.855469 24.871094 46.703125 24.632813 46.878906 24.347656 L 51.601563 15.925781 L 52.71875 13.910156 L 54.007813 11.59375 L 56.765625 6.714844 L 58.339844 3.871094 C 54.820313 1.835938 50.859375 0.480469 46.617188 0 Z M 46.617188 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 64.792969 32.679688 C 64.792969 32.15625 64.75 31.652344 64.707031 31.128906 L 70 28.199219 C 69.71875 26.464844 69.265625 24.765625 68.644531 23.121094 L 62.605469 23.230469 C 62.15625 22.292969 61.644531 21.386719 61.074219 20.519531 L 64.179688 15.335938 C 63.070313 13.984375 61.832031 12.746094 60.484375 11.636719 L 57.417969 13.453125 L 56.128906 15.378906 L 53.351563 19.46875 C 57.289063 22.53125 59.828125 27.300781 59.828125 32.679688 C 59.828125 41.914063 52.367188 49.394531 43.136719 49.394531 C 33.925781 49.394531 26.445313 41.914063 26.445313 32.679688 C 26.445313 24.414063 32.4375 17.589844 40.3125 16.230469 L 41.582031 11.089844 L 38.648438 5.796875 C 36.925781 6.078125 35.234375 6.53125 33.601563 7.152344 L 33.6875 13.210938 C 32.75 13.648438 31.851563 14.160156 30.996094 14.742188 L 25.8125 11.636719 C 24.457031 12.738281 23.21875 13.980469 22.117188 15.335938 L 25.222656 20.519531 C 24.632813 21.371094 24.148438 22.289063 23.691406 23.230469 L 17.632813 23.121094 C 17.027344 24.769531 16.582031 26.46875 16.296875 28.199219 L 21.570313 31.128906 C 21.484375 32.164063 21.484375 33.199219 21.570313 34.234375 L 16.296875 37.164063 C 16.582031 38.914063 17.039063 40.621094 17.652344 42.242188 L 23.691406 42.132813 C 24.152344 43.074219 24.632813 43.992188 25.222656 44.84375 L 22.117188 50.027344 C 23.226563 51.386719 24.464844 52.632813 25.816406 53.746094 L 31 50.621094 C 31.851563 51.210938 32.769531 51.714844 33.691406 52.171875 L 33.601563 58.210938 C 35.21875 58.824219 36.902344 59.28125 38.652344 59.566406 L 41.605469 54.273438 C 42.109375 54.316406 42.613281 54.359375 43.136719 54.359375 C 43.660156 54.359375 44.1875 54.316406 44.6875 54.273438 L 47.621094 59.566406 C 49.355469 59.285156 51.054688 58.832031 52.695313 58.210938 L 52.585938 52.171875 C 53.527344 51.71875 54.433594 51.199219 55.300781 50.617188 L 60.484375 53.746094 C 61.828125 52.625 63.066406 51.378906 64.179688 50.027344 L 61.074219 44.84375 C 61.644531 43.992188 62.148438 43.070313 62.605469 42.128906 L 68.644531 42.238281 C 69.257813 40.621094 69.71875 38.914063 70 37.164063 L 64.707031 34.234375 C 64.75 33.710938 64.792969 33.207031 64.792969 32.679688 Z M 64.792969 32.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 22.398438 55.605469 L 22.398438 53.003906 L 22.257813 52.871094 L 19.59375 51.976563 L 18.910156 50.179688 L 20.226563 47.449219 L 20.371094 47.140625 L 19.546875 46.308594 L 18.546875 45.300781 L 18.195313 45.476563 L 15.59375 46.8125 L 13.800781 46.308594 L 12.664063 43.398438 L 10.085938 43.398438 L 9.953125 43.53125 L 9.054688 46.1875 L 7.242188 46.871094 L 4.222656 45.421875 L 2.382813 47.242188 L 2.558594 47.585938 L 3.894531 50.1875 L 3.148438 51.976563 L 0 53.113281 L 0 55.714844 L 0.371094 55.824219 L 3.148438 56.742188 L 3.894531 58.535156 L 2.472656 61.554688 L 4.308594 63.414063 L 4.660156 63.238281 L 7.261719 61.90625 L 9.054688 62.648438 L 10.195313 65.800781 L 12.796875 65.800781 L 12.90625 65.425781 L 13.824219 62.648438 L 15.597656 61.90625 L 18.636719 63.328125 L 20.476563 61.492188 L 20.300781 61.140625 L 18.964844 58.539063 L 19.480469 56.722656 Z M 11.441406 58.011719 C 9.425781 58.011719 7.789063 56.371094 7.789063 54.359375 C 7.789063 52.347656 9.429688 50.707031 11.441406 50.707031 C 13.453125 50.707031 15.074219 52.347656 15.074219 54.359375 C 15.074219 56.371094 13.453125 58.011719 11.441406 58.011719 Z M 11.441406 58.011719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 46.617188 2.363281 L 45.609375 5.535156 L 43.882813 11.046875 L 43.050781 13.695313 L 42.328125 16.011719 L 37.296875 32.003906 C 37.1875 32.308594 37.339844 32.550781 37.6875 32.550781 L 42.328125 32.550781 C 42.480469 32.550781 42.589844 32.59375 42.65625 32.679688 C 42.765625 32.789063 42.785156 32.945313 42.722656 33.121094 L 37.929688 44.734375 C 37.796875 45.042969 37.886719 45.109375 38.105469 44.84375 L 53.265625 27.648438 C 53.484375 27.386719 53.398438 27.191406 53.070313 27.191406 L 48.101563 27.214844 L 47.183594 27.234375 C 46.855469 27.234375 46.703125 26.996094 46.878906 26.710938 L 51.601563 18.289063 L 52.71875 16.273438 L 54.007813 13.957031 L 56.765625 9.078125 L 58.339844 6.234375 C 54.742188 4.148438 50.75 2.832031 46.617188 2.363281 Z M 46.617188 2.363281 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
 </g>
 </svg>
diff --git a/dist/Management/AzureBackup(m).png b/dist/Management/AzureBackup(m).png
index 350a8ba3..b61cbef2 100644
Binary files a/dist/Management/AzureBackup(m).png and b/dist/Management/AzureBackup(m).png differ
diff --git a/dist/Management/AzureBackup(m).svg b/dist/Management/AzureBackup(m).svg
index 9513c13d..7b714a31 100644
--- a/dist/Management/AzureBackup(m).svg
+++ b/dist/Management/AzureBackup(m).svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="58pt" viewBox="0 0 70 58" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 62.949219 16.230469 C 62.984375 15.726563 63.023438 15.226563 63.023438 14.703125 C 63.023438 6.597656 56.339844 0 48.148438 0 C 43.289063 0 38.820313 2.324219 36.066406 6.132813 C 34.296875 5.039063 32.25 4.441406 30.109375 4.441406 C 24.28125 4.441406 19.460938 8.886719 18.917969 14.519531 C 19.832031 14.40625 20.742188 14.3125 21.675781 14.3125 C 25.976563 14.3125 30.109375 15.707031 33.496094 18.179688 C 36.027344 12.34375 42.46875 8.605469 49.617188 8.382813 L 49.617188 3.402344 L 58.332031 10.855469 L 49.617188 18.273438 L 49.617188 13.382813 C 45.523438 13.550781 41.539063 15.078125 39.230469 18.792969 L 39.695313 18.757813 C 48.035156 18.757813 54.925781 24.984375 55.894531 32.960938 C 57.867188 34.445313 59.429688 36.230469 60.546875 38.277344 C 65.945313 36.828125 69.820313 32.179688 69.820313 26.492188 C 69.820313 21.917969 67.34375 18.273438 62.949219 16.230469 Z M 62.949219 16.230469 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 6.871094 35.546875 C 6.8125 35.046875 6.796875 34.523438 6.796875 34.023438 C 6.796875 25.917969 13.480469 19.335938 21.671875 19.335938 C 26.527344 19.335938 30.996094 21.660156 33.753906 25.453125 C 35.519531 24.355469 37.550781 23.78125 39.710938 23.78125 C 45.890625 23.78125 50.9375 28.761719 50.9375 34.898438 L 50.917969 35.789063 C 55.105469 37.90625 57.359375 41.402344 57.359375 45.808594 C 57.359375 52.707031 51.738281 58.097656 44.550781 58.097656 L 12.828125 58.097656 C 5.621094 58.097656 0 52.707031 0 45.808594 C 0 41.253906 2.476563 37.59375 6.871094 35.546875 Z M 6.871094 35.546875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 63.480469 15.957031 C 63.527344 15.476563 63.550781 14.972656 63.550781 14.46875 C 63.550781 6.492188 56.8125 0 48.554688 0 C 43.648438 0 39.144531 2.285156 36.375 6.03125 C 34.59375 4.957031 32.527344 4.363281 30.367188 4.363281 C 24.476563 4.363281 19.621094 8.734375 19.078125 14.285156 C 19.992188 14.171875 20.910156 14.078125 21.847656 14.078125 C 26.1875 14.078125 30.367188 15.453125 33.769531 17.871094 C 36.328125 12.136719 42.828125 8.457031 50.03125 8.25 L 50.03125 3.335938 L 58.832031 10.671875 L 50.03125 17.964844 L 50.03125 13.167969 C 45.902344 13.324219 41.886719 14.835938 39.566406 18.492188 L 40.035156 18.445313 C 48.4375 18.445313 55.382813 24.574219 56.367188 32.414063 C 58.363281 33.875 59.9375 35.636719 61.058594 37.648438 C 66.503906 36.230469 70.402344 31.65625 70.402344 26.058594 C 70.402344 21.554688 67.914063 17.964844 63.480469 15.957031 Z M 63.480469 15.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 6.921875 34.972656 C 6.875 34.46875 6.851563 33.964844 6.851563 33.464844 C 6.851563 25.484375 13.589844 19.015625 21.847656 19.015625 C 26.753906 19.015625 31.257813 21.300781 34.027344 25.027344 C 35.8125 23.957031 37.875 23.382813 40.039063 23.382813 C 46.28125 23.382813 51.371094 28.296875 51.371094 34.328125 L 51.347656 35.203125 C 55.570313 37.28125 57.851563 40.730469 57.851563 45.050781 C 57.851563 51.839844 52.167969 57.144531 44.917969 57.144531 L 12.929688 57.144531 C 5.675781 57.144531 0 51.839844 0 45.050781 C 0 40.570313 2.488281 36.984375 6.921875 34.972656 Z M 6.921875 34.972656 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureBackup.png b/dist/Management/AzureBackup.png
index 6fd4f8e7..b472ca61 100644
Binary files a/dist/Management/AzureBackup.png and b/dist/Management/AzureBackup.png differ
diff --git a/dist/Management/AzureBackup.puml b/dist/Management/AzureBackup.puml
index 80224ed0..6d873255 100644
--- a/dist/Management/AzureBackup.puml
+++ b/dist/Management/AzureBackup.puml
@@ -1,9 +1,9 @@
 sprite $AzureBackup [70x58/16z] {
-hTS5aYjH20LGz27xt-_N6AqCbLCocbj8A_IXMaI6Bu4nzdmpWWdqhDQaaCYdUEGvGWk9BcNy6v9l0VRufjELHlxdJ5bIO3s-mqOBHKa1UUJ3DSsyIW6A_4lW
-Yfmbc0h3NnYFn7Dq7A5bd7vNZEUUCsnOPbgxb8C9l4S3fzQ-6JmR7VKRSlmy4CiI6Sum4x4itrQ26i-zM9QKI-AlgjyzH3ar6Hh8ClMraaSAHRuuDIyhDII3
-vvS8ClSyvd00PPcRASCEh-Z5Y5zV5lKeHtVNri9mNwhb7bvV3u9XHwwBiJmxWP2PwIB6o-bpX44VVRgSnjnUtYBs3TfP2cQBlgvqHUcdGGvx-b4fxtCp3bCa
-k_oWT2jRRk5oLItNq-optGUYZALfTrcLIGfkOWmcALH7wUN0RPDohx1wW-epV1t18UKSRIeFGE82mv3ZcoNbX4FbEQB3KghOFI2Cq5b3yvOYXnPyoAdr_Ley
-X-JxEveVBqLC5rtmj9JASe1XowVzL3ODgJH_8XYEuOfiShbxrxobWd3aDm
+nTLfSkGW38RXJsW1nFtFEojEgun9QvZj-Prw8x2eHXv9RUxUcnQSAjN71rSSiTcuTCOlepu-N3CPKefQDMK09Gx2x3E7zzJ7JswbZu11FJaD-zXX06ty89b1
+zXNOpp7n6Tb4UbKkyKyCU-IF2IK4nTyCKvyQylY_E3NAVbUfVNuaNIC5TtE5Mlv0dJ2nrSxn_ZjsY00YrkPpaXaXy-jBsvWwtfF-FSAl7PgLDfALYVkejtCo
+zV7I2ZBcbjYuc8_83NaiMdqygbWLiH-aO57KCnaI2uIIxvGHYTq8ddPsqH6eBHGh6mkys2C2Y4LLcFQP_IIJ5hKBxzv8k9ECEK_VLCXo2hxZJKLjoatJ7Yja
+QK_3f6_bTiN-L57BMpzJMtObUS4w0ZweyFqXL1nKvBPw3SULcOaHjhJu47hyfIArABzwnRrIMBZJJ7pBXvb8x8W2aHqg2DWE2GArKmZiFrVeZrJ-_Bs87L84
+nGunelFBZShvA97Q2GJ76S92poCHdp_4YCJIXB17BA9lY731t_CL
 }
 
 AzureEntityColoring(AzureBackup)
diff --git a/dist/Management/AzureBackup.svg b/dist/Management/AzureBackup.svg
index 6d14562f..3be75c58 100644
--- a/dist/Management/AzureBackup.svg
+++ b/dist/Management/AzureBackup.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="58pt" viewBox="0 0 70 58" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.117188 16.066406 C 63.164063 15.582031 63.1875 15.074219 63.1875 14.570313 C 63.1875 6.535156 56.488281 0 48.277344 0 C 43.398438 0 38.921875 2.300781 36.167969 6.074219 C 34.394531 4.992188 32.339844 4.394531 30.195313 4.394531 C 24.335938 4.394531 19.507813 8.792969 18.96875 14.382813 C 19.878906 14.269531 20.789063 14.175781 21.722656 14.175781 C 26.039063 14.175781 30.195313 15.558594 33.578125 17.996094 C 36.121094 12.21875 42.582031 8.515625 49.746094 8.308594 L 49.746094 3.359375 L 58.496094 10.746094 L 49.746094 18.089844 L 49.746094 13.257813 C 45.640625 13.417969 41.648438 14.9375 39.339844 18.621094 L 39.804688 18.574219 C 48.160156 18.574219 55.066406 24.742188 56.046875 32.636719 C 58.03125 34.109375 59.59375 35.882813 60.710938 37.90625 C 66.125 36.480469 70 31.875 70 26.238281 C 70 21.703125 67.527344 18.089844 63.117188 16.066406 Z M 63.117188 16.066406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 6.882813 35.214844 C 6.835938 34.707031 6.8125 34.199219 6.8125 33.695313 C 6.8125 25.660156 13.511719 19.148438 21.722656 19.148438 C 26.601563 19.148438 31.078125 21.449219 33.832031 25.199219 C 35.609375 24.121094 37.660156 23.542969 39.808594 23.542969 C 46.015625 23.542969 51.078125 28.492188 51.078125 34.566406 L 51.054688 35.445313 C 55.253906 37.539063 57.519531 41.011719 57.519531 45.363281 C 57.519531 52.199219 51.871094 57.539063 44.660156 57.539063 L 12.855469 57.539063 C 5.644531 57.539063 0 52.199219 0 45.363281 C 0 40.851563 2.472656 37.238281 6.882813 35.214844 Z M 6.882813 35.214844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.480469 15.957031 C 63.527344 15.476563 63.550781 14.972656 63.550781 14.46875 C 63.550781 6.492188 56.8125 0 48.554688 0 C 43.648438 0 39.144531 2.285156 36.375 6.03125 C 34.59375 4.957031 32.527344 4.363281 30.367188 4.363281 C 24.476563 4.363281 19.621094 8.734375 19.078125 14.285156 C 19.992188 14.171875 20.910156 14.078125 21.847656 14.078125 C 26.1875 14.078125 30.367188 15.453125 33.769531 17.871094 C 36.328125 12.136719 42.828125 8.457031 50.03125 8.25 L 50.03125 3.335938 L 58.832031 10.671875 L 50.03125 17.964844 L 50.03125 13.167969 C 45.902344 13.324219 41.886719 14.835938 39.566406 18.492188 L 40.035156 18.445313 C 48.4375 18.445313 55.382813 24.574219 56.367188 32.414063 C 58.363281 33.875 59.9375 35.636719 61.058594 37.648438 C 66.503906 36.230469 70.402344 31.65625 70.402344 26.058594 C 70.402344 21.554688 67.914063 17.964844 63.480469 15.957031 Z M 63.480469 15.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 6.921875 34.972656 C 6.875 34.46875 6.851563 33.964844 6.851563 33.464844 C 6.851563 25.484375 13.589844 19.015625 21.847656 19.015625 C 26.753906 19.015625 31.257813 21.300781 34.027344 25.027344 C 35.8125 23.957031 37.875 23.382813 40.039063 23.382813 C 46.28125 23.382813 51.371094 28.296875 51.371094 34.328125 L 51.347656 35.203125 C 55.570313 37.28125 57.851563 40.730469 57.851563 45.050781 C 57.851563 51.839844 52.167969 57.144531 44.917969 57.144531 L 12.929688 57.144531 C 5.675781 57.144531 0 51.839844 0 45.050781 C 0 40.570313 2.488281 36.984375 6.921875 34.972656 Z M 6.921875 34.972656 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureBlueprints(m).png b/dist/Management/AzureBlueprints(m).png
index 9e5d6e59..dabf4ad9 100644
Binary files a/dist/Management/AzureBlueprints(m).png and b/dist/Management/AzureBlueprints(m).png differ
diff --git a/dist/Management/AzureBlueprints(m).svg b/dist/Management/AzureBlueprints(m).svg
index c424e086..401f06dc 100644
--- a/dist/Management/AzureBlueprints(m).svg
+++ b/dist/Management/AzureBlueprints(m).svg
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="67pt" viewBox="0 0 70 67" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="67" style="fill:rgb(0,0,0);fill-opacity:0.701961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.701961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="67"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 61.832031 65.476563 C 61.132813 65.476563 61.847656 65.621094 61.25 65.476563 L 61.25 58.242188 L 8.75 58.242188 C 8.453125 58.242188 1.457031 58.171875 1.457031 52.402344 L 1.457031 7.152344 C 1.457031 3.238281 4.859375 1.457031 8.019531 1.457031 C 11.179688 1.457031 14.582031 3.242188 14.582031 7.152344 L 14.582031 8.609375 L 55.5625 8.609375 C 63.449219 8.609375 68.542969 10.992188 68.542969 18.976563 L 68.542969 61.160156 C 68.542969 64.433594 65.59375 65.476563 61.832031 65.476563 Z M 61.832031 65.476563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.761719 65.804688 C 60.089844 65.804688 60.773438 65.941406 60.199219 65.804688 L 60.199219 58.867188 L 9.800781 58.867188 C 9.515625 58.867188 2.800781 58.800781 2.800781 53.265625 L 2.800781 9.867188 C 2.800781 6.113281 6.066406 4.40625 9.101563 4.40625 C 12.132813 4.40625 15.398438 6.113281 15.398438 9.867188 L 15.398438 11.265625 L 54.738281 11.265625 C 62.308594 11.265625 67.199219 13.550781 67.199219 21.207031 L 67.199219 61.664063 C 67.199219 64.808594 64.371094 65.804688 60.761719 65.804688 Z M 60.761719 65.804688 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 61.832031 65.476563 C 61.132813 65.476563 61.847656 65.621094 61.25 65.476563 L 61.25 58.242188 L 8.75 58.242188 C 8.453125 58.242188 1.457031 58.171875 1.457031 52.402344 L 1.457031 7.152344 C 1.457031 3.238281 4.859375 1.457031 8.019531 1.457031 C 11.179688 1.457031 14.582031 3.242188 14.582031 7.152344 L 14.582031 8.609375 L 55.5625 8.609375 C 63.449219 8.609375 68.542969 10.992188 68.542969 18.976563 L 68.542969 61.160156 C 68.542969 64.433594 65.59375 65.476563 61.832031 65.476563 Z M 61.832031 65.476563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 60.761719 65.804688 C 60.089844 65.804688 60.773438 65.941406 60.199219 65.804688 L 60.199219 58.867188 L 9.800781 58.867188 C 9.515625 58.867188 2.800781 58.800781 2.800781 53.265625 L 2.800781 9.867188 C 2.800781 6.113281 6.066406 4.40625 9.101563 4.40625 C 12.132813 4.40625 15.398438 6.113281 15.398438 9.867188 L 15.398438 11.265625 L 54.738281 11.265625 C 62.308594 11.265625 67.199219 13.550781 67.199219 21.207031 L 67.199219 61.664063 C 67.199219 64.808594 64.371094 65.804688 60.761719 65.804688 Z M 60.761719 65.804688 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 55.5625 7.152344 L 16.042969 7.152344 C 16.042969 2.773438 12.394531 0 8.019531 0 C 3.644531 0 0 2.773438 0 7.152344 C 0 7.152344 0 45.105469 0 50.945313 C 0 58.242188 4.375 59.703125 8.75 59.703125 L 59.792969 59.703125 L 59.792969 67 C 59.792969 67 70 67 70 59.703125 L 70 18.976563 C 70 10.21875 65.625 7.152344 55.5625 7.152344 Z M 67.082031 59.992188 C 67.082031 59.992188 64.167969 56.78125 58.480469 56.78125 L 8.75 56.78125 C 5.832031 56.78125 2.917969 56.050781 2.917969 51.671875 C 2.917969 49.191406 4.8125 46.5625 8.75 46.5625 C 13.125 46.5625 15.894531 50.945313 15.894531 50.945313 L 16.042969 50.945313 L 16.042969 10.070313 L 57.019531 10.070313 C 62.855469 10.070313 67.082031 11.675781 67.082031 17.515625 Z M 67.082031 59.992188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 51.042969 43.574219 L 53.230469 49.410156 L 55.417969 43.574219 Z M 51.042969 43.574219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 55.417969 23.140625 L 51.042969 23.140625 L 51.042969 40.65625 L 55.417969 40.65625 Z M 55.417969 23.140625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 53.230469 15.988281 C 54.4375 15.988281 55.417969 16.929688 55.417969 18.097656 L 55.378906 20.21875 L 51.042969 20.183594 L 51.042969 18.097656 C 51.042969 16.929688 52.023438 15.988281 53.230469 15.988281 Z M 53.230469 15.988281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 33.542969 14.527344 C 34.347656 14.527344 35 15.472656 35 16.636719 L 34.972656 18.761719 L 32.082031 18.722656 L 32.082031 16.636719 C 32.082031 15.472656 32.738281 14.527344 33.542969 14.527344 Z M 33.542969 14.527344 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 33.542969 17.445313 C 30.398438 17.445313 27.855469 19.996094 27.855469 23.140625 C 27.855469 26.28125 30.398438 28.832031 33.542969 28.832031 C 36.683594 28.832031 39.230469 26.28125 39.230469 23.140625 C 39.230469 19.996094 36.683594 17.445313 33.542969 17.445313 Z M 33.542969 27.371094 C 31.210938 27.371094 29.3125 25.472656 29.3125 23.140625 C 29.3125 20.804688 31.210938 18.90625 33.542969 18.90625 C 35.875 18.90625 37.769531 20.804688 37.769531 23.140625 C 37.769531 25.472656 35.875 27.371094 33.542969 27.371094 Z M 33.542969 27.371094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 33.542969 27.394531 L 33.542969 24.597656 L 30.820313 26.507813 L 24.960938 44.554688 L 24.546875 50.554688 L 27.734375 45.457031 L 33.59375 27.410156 Z M 33.542969 27.394531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 42.121094 44.554688 L 36.265625 26.507813 L 33.542969 24.597656 L 33.542969 27.394531 L 33.492188 27.410156 L 39.347656 45.457031 L 39.351563 45.457031 L 42.539063 50.554688 Z M 42.121094 44.554688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 45.207031 37.734375 L 21.875 37.734375 C 21.472656 37.734375 21.144531 37.410156 21.144531 37.007813 C 21.144531 36.601563 21.472656 36.277344 21.875 36.277344 L 45.207031 36.277344 C 45.609375 36.277344 45.9375 36.601563 45.9375 37.007813 C 45.9375 37.410156 45.609375 37.734375 45.207031 37.734375 Z M 45.207031 37.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 54.738281 9.867188 L 16.800781 9.867188 C 16.800781 5.667969 13.300781 3.007813 9.101563 3.007813 C 4.898438 3.007813 1.398438 5.667969 1.398438 9.867188 L 1.398438 51.867188 C 1.398438 58.867188 5.601563 60.265625 9.800781 60.265625 L 58.800781 60.265625 L 58.800781 67.265625 C 58.800781 67.265625 68.601563 67.265625 68.601563 60.265625 L 68.601563 21.207031 C 68.601563 12.808594 64.398438 9.867188 54.738281 9.867188 Z M 65.800781 60.546875 C 65.800781 60.546875 63 57.46875 57.539063 57.46875 L 9.800781 57.46875 C 7 57.46875 4.199219 56.765625 4.199219 52.566406 C 4.199219 50.1875 6.019531 47.667969 9.800781 47.667969 C 14 47.667969 16.660156 51.867188 16.660156 51.867188 L 16.800781 51.867188 L 16.800781 12.667969 L 56.140625 12.667969 C 61.738281 12.667969 65.800781 14.207031 65.800781 19.808594 Z M 65.800781 60.546875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 50.398438 44.796875 L 52.5 50.398438 L 54.601563 44.796875 Z M 50.398438 25.199219 L 54.601563 25.199219 L 54.601563 42 L 50.398438 42 Z M 52.5 18.339844 C 53.660156 18.339844 54.601563 19.246094 54.601563 20.363281 L 54.5625 22.398438 L 50.398438 22.363281 L 50.398438 20.363281 C 50.398438 19.246094 51.339844 18.339844 52.5 18.339844 Z M 33.601563 16.941406 C 34.371094 16.941406 35 17.847656 35 18.964844 L 34.976563 21 L 32.199219 20.964844 L 32.199219 18.964844 C 32.199219 17.847656 32.828125 16.941406 33.601563 16.941406 Z M 33.601563 16.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 33.601563 19.738281 C 30.585938 19.738281 28.140625 22.183594 28.140625 25.199219 C 28.140625 28.214844 30.585938 30.660156 33.601563 30.660156 C 36.617188 30.660156 39.058594 28.214844 39.058594 25.199219 C 39.058594 22.183594 36.617188 19.738281 33.601563 19.738281 Z M 33.601563 29.261719 C 31.363281 29.261719 29.539063 27.4375 29.539063 25.199219 C 29.539063 22.960938 31.363281 21.140625 33.601563 21.140625 C 35.839844 21.140625 37.660156 22.960938 37.660156 25.199219 C 37.660156 27.4375 35.839844 29.261719 33.601563 29.261719 Z M 33.601563 29.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 33.601563 29.28125 L 33.601563 26.601563 L 30.984375 28.429688 L 25.363281 45.738281 L 24.964844 51.496094 L 28.023438 46.605469 L 33.648438 29.296875 Z M 33.601563 29.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 41.835938 45.738281 L 36.214844 28.429688 L 33.601563 26.601563 L 33.601563 29.28125 L 33.550781 29.296875 L 39.175781 46.605469 L 42.238281 51.496094 Z M 41.835938 45.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 44.800781 39.199219 L 22.398438 39.199219 C 22.011719 39.199219 21.699219 38.886719 21.699219 38.5 C 21.699219 38.113281 22.011719 37.800781 22.398438 37.800781 L 44.800781 37.800781 C 45.1875 37.800781 45.5 38.113281 45.5 38.5 C 45.5 38.886719 45.1875 39.199219 44.800781 39.199219 Z M 44.800781 39.199219 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureBlueprints.png b/dist/Management/AzureBlueprints.png
index 5ac3306c..48e32152 100644
Binary files a/dist/Management/AzureBlueprints.png and b/dist/Management/AzureBlueprints.png differ
diff --git a/dist/Management/AzureBlueprints.puml b/dist/Management/AzureBlueprints.puml
index 9f35c68c..bec3473f 100644
--- a/dist/Management/AzureBlueprints.puml
+++ b/dist/Management/AzureBlueprints.puml
@@ -1,9 +1,9 @@
-sprite $AzureBlueprints [70x67/16z] {
-hT87WiCW34HHMn8gC_S_xrPIs1B7a9_UNX3szf560HMsBIJ5Niay0bw3pYh5kx3F8Or3FgSaXp2dW6Dp2ZbMpvOPRd9JLYhVkx8MsX-AojEfjGJ9M51w3jAN
-5J4G-x8YJlgXqWvTi8uK9-IW98wK_6DvYLAv5UI1eaMstnl165uVA040h1zlaimJIi95n0gwe3JsOQh6CLNbUINhogcCdL3WqcDxkH80ydcbKaJiyqQJMtbs
-TqsYogHAvXL9W4KKR4MH8a5sP5f9ia3gcW92WlGbfP4fHjQIacGJ0Qah2WYHFjAqOcH-FzI24cJhIz9v1OHspISKhwz8Z4_ob6BnMP4LNu6ChoOc0gdZ1ib9
-PJmqZSmfPTnJ47AjkNixLcu33IVnsB4o3jH7cb36WSQHxCH4TVTy7Cb8FgjWcC7kLrR4dnELkoS6XL2vA-yKP_oXbFMNk2bAbo7SVgdGtmhkFhuf9MFjfaZ8
-RwN97_zY9Z_onqTQxZALqpa9GXPpibwY96dhIYDZNTb1-hAoDP88RnEPNfNDEHz2kx9fBJbVocUxjfdmxMHN9YlsNgFW9KgyGgbjNM7kwqhgjbQ4s_SwtW4
+sprite $AzureBlueprints [70x70/16z] {
+tTU5qZCn28NXBKJWdFk_tiygR6PIsT1Vtxez0ndjzdycpG7lca8wBxci8yvRaCGaaIyY9t1VMLCAXsnDQHpoXB8GOAsSGaa4awa2Up5ta2JQL97Nqsea-weI
+5P0bhOY2dbUaa_fKKUzFXY7RKwKHAcFQgkm2xQdIIPKna5qYfpzHj8FqAliAIGmA7YiAj5eDFQMu_pnKj3tTlZgWLAZyr26JNbIwtvRGTSLCpYdBRYCpwqTc
+GSooVhg5LQgRYhciAs8mEc4e6KMC18agAQMH024vnKdjP6uM1LqAQIcbaaq4H4enKaKwMJCAwEUVMKAfP3zZI2X65lcgasL50QVrOqhzhfDMVmBnywZ7b5Xe
+VBQWWDWTyu8IFmqmcAzULMADU1wzh60orn4bVZWZ5O2zghHX2IDrzxpUKu1HwNI95A5KGgQAV-FQi5CCAhlwRZBqgT9Zs52Q326KNYRAVdGBHSPgZVLafZI9
+-lohunjJfSXYeTItA8MiUUL4UbxPd6nvHKbwAqMFDYXRvMAm6igcpjLGVvHpKcex77uS2oNrF_nDId-BekzGsfPNKBQqWdRQSjLMPFlx-WG
 }
 
 AzureEntityColoring(AzureBlueprints)
diff --git a/dist/Management/AzureBlueprints.svg b/dist/Management/AzureBlueprints.svg
index 28929779..80a7f498 100644
--- a/dist/Management/AzureBlueprints.svg
+++ b/dist/Management/AzureBlueprints.svg
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="67pt" viewBox="0 0 70 67" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="67" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="67"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 61.832031 65.476563 C 61.132813 65.476563 61.847656 65.621094 61.25 65.476563 L 61.25 58.242188 L 8.75 58.242188 C 8.453125 58.242188 1.457031 58.171875 1.457031 52.402344 L 1.457031 7.152344 C 1.457031 3.238281 4.859375 1.457031 8.019531 1.457031 C 11.179688 1.457031 14.582031 3.242188 14.582031 7.152344 L 14.582031 8.609375 L 55.5625 8.609375 C 63.449219 8.609375 68.542969 10.992188 68.542969 18.976563 L 68.542969 61.160156 C 68.542969 64.433594 65.59375 65.476563 61.832031 65.476563 Z M 61.832031 65.476563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.761719 65.804688 C 60.089844 65.804688 60.773438 65.941406 60.199219 65.804688 L 60.199219 58.867188 L 9.800781 58.867188 C 9.515625 58.867188 2.800781 58.800781 2.800781 53.265625 L 2.800781 9.867188 C 2.800781 6.113281 6.066406 4.40625 9.101563 4.40625 C 12.132813 4.40625 15.398438 6.113281 15.398438 9.867188 L 15.398438 11.265625 L 54.738281 11.265625 C 62.308594 11.265625 67.199219 13.550781 67.199219 21.207031 L 67.199219 61.664063 C 67.199219 64.808594 64.371094 65.804688 60.761719 65.804688 Z M 60.761719 65.804688 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 61.832031 65.476563 C 61.132813 65.476563 61.847656 65.621094 61.25 65.476563 L 61.25 58.242188 L 8.75 58.242188 C 8.453125 58.242188 1.457031 58.171875 1.457031 52.402344 L 1.457031 7.152344 C 1.457031 3.238281 4.859375 1.457031 8.019531 1.457031 C 11.179688 1.457031 14.582031 3.242188 14.582031 7.152344 L 14.582031 8.609375 L 55.5625 8.609375 C 63.449219 8.609375 68.542969 10.992188 68.542969 18.976563 L 68.542969 61.160156 C 68.542969 64.433594 65.59375 65.476563 61.832031 65.476563 Z M 61.832031 65.476563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 60.761719 65.804688 C 60.089844 65.804688 60.773438 65.941406 60.199219 65.804688 L 60.199219 58.867188 L 9.800781 58.867188 C 9.515625 58.867188 2.800781 58.800781 2.800781 53.265625 L 2.800781 9.867188 C 2.800781 6.113281 6.066406 4.40625 9.101563 4.40625 C 12.132813 4.40625 15.398438 6.113281 15.398438 9.867188 L 15.398438 11.265625 L 54.738281 11.265625 C 62.308594 11.265625 67.199219 13.550781 67.199219 21.207031 L 67.199219 61.664063 C 67.199219 64.808594 64.371094 65.804688 60.761719 65.804688 Z M 60.761719 65.804688 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 55.5625 7.152344 L 16.042969 7.152344 C 16.042969 2.773438 12.394531 0 8.019531 0 C 3.644531 0 0 2.773438 0 7.152344 C 0 7.152344 0 45.105469 0 50.945313 C 0 58.242188 4.375 59.703125 8.75 59.703125 L 59.792969 59.703125 L 59.792969 67 C 59.792969 67 70 67 70 59.703125 L 70 18.976563 C 70 10.21875 65.625 7.152344 55.5625 7.152344 Z M 67.082031 59.992188 C 67.082031 59.992188 64.167969 56.78125 58.480469 56.78125 L 8.75 56.78125 C 5.832031 56.78125 2.917969 56.050781 2.917969 51.671875 C 2.917969 49.191406 4.8125 46.5625 8.75 46.5625 C 13.125 46.5625 15.894531 50.945313 15.894531 50.945313 L 16.042969 50.945313 L 16.042969 10.070313 L 57.019531 10.070313 C 62.855469 10.070313 67.082031 11.675781 67.082031 17.515625 Z M 67.082031 59.992188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 51.042969 43.574219 L 53.230469 49.410156 L 55.417969 43.574219 Z M 51.042969 43.574219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 55.417969 23.140625 L 51.042969 23.140625 L 51.042969 40.65625 L 55.417969 40.65625 Z M 55.417969 23.140625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 53.230469 15.988281 C 54.4375 15.988281 55.417969 16.929688 55.417969 18.097656 L 55.378906 20.21875 L 51.042969 20.183594 L 51.042969 18.097656 C 51.042969 16.929688 52.023438 15.988281 53.230469 15.988281 Z M 53.230469 15.988281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.542969 14.527344 C 34.347656 14.527344 35 15.472656 35 16.636719 L 34.972656 18.761719 L 32.082031 18.722656 L 32.082031 16.636719 C 32.082031 15.472656 32.738281 14.527344 33.542969 14.527344 Z M 33.542969 14.527344 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.542969 17.445313 C 30.398438 17.445313 27.855469 19.996094 27.855469 23.140625 C 27.855469 26.28125 30.398438 28.832031 33.542969 28.832031 C 36.683594 28.832031 39.230469 26.28125 39.230469 23.140625 C 39.230469 19.996094 36.683594 17.445313 33.542969 17.445313 Z M 33.542969 27.371094 C 31.210938 27.371094 29.3125 25.472656 29.3125 23.140625 C 29.3125 20.804688 31.210938 18.90625 33.542969 18.90625 C 35.875 18.90625 37.769531 20.804688 37.769531 23.140625 C 37.769531 25.472656 35.875 27.371094 33.542969 27.371094 Z M 33.542969 27.371094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.542969 27.394531 L 33.542969 24.597656 L 30.820313 26.507813 L 24.960938 44.554688 L 24.546875 50.554688 L 27.734375 45.457031 L 33.59375 27.410156 Z M 33.542969 27.394531 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 42.121094 44.554688 L 36.265625 26.507813 L 33.542969 24.597656 L 33.542969 27.394531 L 33.492188 27.410156 L 39.347656 45.457031 L 39.351563 45.457031 L 42.539063 50.554688 Z M 42.121094 44.554688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 45.207031 37.734375 L 21.875 37.734375 C 21.472656 37.734375 21.144531 37.410156 21.144531 37.007813 C 21.144531 36.601563 21.472656 36.277344 21.875 36.277344 L 45.207031 36.277344 C 45.609375 36.277344 45.9375 36.601563 45.9375 37.007813 C 45.9375 37.410156 45.609375 37.734375 45.207031 37.734375 Z M 45.207031 37.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 54.738281 9.867188 L 16.800781 9.867188 C 16.800781 5.667969 13.300781 3.007813 9.101563 3.007813 C 4.898438 3.007813 1.398438 5.667969 1.398438 9.867188 L 1.398438 51.867188 C 1.398438 58.867188 5.601563 60.265625 9.800781 60.265625 L 58.800781 60.265625 L 58.800781 67.265625 C 58.800781 67.265625 68.601563 67.265625 68.601563 60.265625 L 68.601563 21.207031 C 68.601563 12.808594 64.398438 9.867188 54.738281 9.867188 Z M 65.800781 60.546875 C 65.800781 60.546875 63 57.46875 57.539063 57.46875 L 9.800781 57.46875 C 7 57.46875 4.199219 56.765625 4.199219 52.566406 C 4.199219 50.1875 6.019531 47.667969 9.800781 47.667969 C 14 47.667969 16.660156 51.867188 16.660156 51.867188 L 16.800781 51.867188 L 16.800781 12.667969 L 56.140625 12.667969 C 61.738281 12.667969 65.800781 14.207031 65.800781 19.808594 Z M 65.800781 60.546875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 50.398438 44.796875 L 52.5 50.398438 L 54.601563 44.796875 Z M 50.398438 25.199219 L 54.601563 25.199219 L 54.601563 42 L 50.398438 42 Z M 52.5 18.339844 C 53.660156 18.339844 54.601563 19.246094 54.601563 20.363281 L 54.5625 22.398438 L 50.398438 22.363281 L 50.398438 20.363281 C 50.398438 19.246094 51.339844 18.339844 52.5 18.339844 Z M 33.601563 16.941406 C 34.371094 16.941406 35 17.847656 35 18.964844 L 34.976563 21 L 32.199219 20.964844 L 32.199219 18.964844 C 32.199219 17.847656 32.828125 16.941406 33.601563 16.941406 Z M 33.601563 16.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.601563 19.738281 C 30.585938 19.738281 28.140625 22.183594 28.140625 25.199219 C 28.140625 28.214844 30.585938 30.660156 33.601563 30.660156 C 36.617188 30.660156 39.058594 28.214844 39.058594 25.199219 C 39.058594 22.183594 36.617188 19.738281 33.601563 19.738281 Z M 33.601563 29.261719 C 31.363281 29.261719 29.539063 27.4375 29.539063 25.199219 C 29.539063 22.960938 31.363281 21.140625 33.601563 21.140625 C 35.839844 21.140625 37.660156 22.960938 37.660156 25.199219 C 37.660156 27.4375 35.839844 29.261719 33.601563 29.261719 Z M 33.601563 29.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 33.601563 29.28125 L 33.601563 26.601563 L 30.984375 28.429688 L 25.363281 45.738281 L 24.964844 51.496094 L 28.023438 46.605469 L 33.648438 29.296875 Z M 33.601563 29.28125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 41.835938 45.738281 L 36.214844 28.429688 L 33.601563 26.601563 L 33.601563 29.28125 L 33.550781 29.296875 L 39.175781 46.605469 L 42.238281 51.496094 Z M 41.835938 45.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 44.800781 39.199219 L 22.398438 39.199219 C 22.011719 39.199219 21.699219 38.886719 21.699219 38.5 C 21.699219 38.113281 22.011719 37.800781 22.398438 37.800781 L 44.800781 37.800781 C 45.1875 37.800781 45.5 38.113281 45.5 38.5 C 45.5 38.886719 45.1875 39.199219 44.800781 39.199219 Z M 44.800781 39.199219 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureCostManagementAndBilling(m).png b/dist/Management/AzureCostManagementAndBilling(m).png
new file mode 100644
index 00000000..a17e1dec
Binary files /dev/null and b/dist/Management/AzureCostManagementAndBilling(m).png differ
diff --git a/dist/Management/AzureCostManagementAndBilling(m).svg b/dist/Management/AzureCostManagementAndBilling(m).svg
new file mode 100644
index 00000000..1f494b2d
--- /dev/null
+++ b/dist/Management/AzureCostManagementAndBilling(m).svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35 54.335938 C 24.320313 54.335938 15.664063 45.679688 15.664063 35 C 15.664063 24.324219 24.320313 15.667969 35 15.667969 C 45.675781 15.667969 54.332031 24.320313 54.332031 35 L 70 35 C 70 15.671875 54.328125 0 35 0 C 15.667969 0.00390625 0 15.671875 0 35 C 0 54.332031 15.667969 70 35 70 C 43.949219 70 52.109375 66.636719 58.296875 61.113281 L 47.859375 49.410156 C 44.4375 52.464844 39.941406 54.335938 35 54.335938 Z M 35 54.335938 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 54.332031 35 L 70 35 C 70 15.671875 54.328125 0 35 0 L 35 15.667969 C 45.675781 15.667969 54.332031 24.320313 54.332031 35 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,16,28);fill-opacity:1;" d="M 39.804688 38.585938 C 39.804688 39.722656 39.449219 40.632813 38.734375 41.324219 C 38.015625 42.015625 36.976563 42.4375 35.613281 42.59375 L 35.613281 44.820313 L 34.113281 44.820313 L 34.113281 42.65625 C 32.707031 42.644531 31.414063 42.328125 30.238281 41.714844 L 30.238281 38.875 C 30.609375 39.175781 31.195313 39.464844 32.007813 39.75 C 32.816406 40.03125 33.519531 40.195313 34.113281 40.238281 L 34.113281 36.503906 C 32.605469 35.945313 31.53125 35.332031 30.902344 34.664063 C 30.273438 33.996094 29.960938 33.121094 29.960938 32.035156 C 29.960938 30.949219 30.347656 30.03125 31.121094 29.28125 C 31.894531 28.535156 32.890625 28.097656 34.113281 27.972656 L 34.113281 26.066406 L 35.613281 26.066406 L 35.613281 27.933594 C 37.050781 28 38.128906 28.234375 38.839844 28.628906 L 38.839844 31.398438 C 37.890625 30.824219 36.816406 30.46875 35.613281 30.332031 L 35.613281 34.21875 C 37.121094 34.765625 38.199219 35.378906 38.839844 36.0625 C 39.484375 36.75 39.804688 37.589844 39.804688 38.585938 Z M 34.113281 33.625 L 34.113281 30.371094 C 33.164063 30.542969 32.6875 31.039063 32.6875 31.859375 C 32.6875 32.578125 33.164063 33.164063 34.113281 33.625 Z M 37.078125 38.730469 C 37.078125 38.066406 36.585938 37.519531 35.613281 37.089844 L 35.613281 40.195313 C 36.585938 40.039063 37.078125 39.550781 37.078125 38.730469 Z M 37.078125 38.730469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 35 54.335938 C 24.320313 54.335938 15.664063 45.679688 15.664063 35 C 15.664063 24.324219 24.320313 15.667969 35 15.667969 C 45.675781 15.667969 54.332031 24.320313 54.332031 35 L 70 35 C 70 15.671875 54.328125 0 35 0 C 15.667969 0.00390625 0 15.671875 0 35 C 0 54.332031 15.667969 70 35 70 C 43.949219 70 52.109375 66.636719 58.296875 61.113281 L 47.859375 49.410156 C 44.4375 52.464844 39.941406 54.335938 35 54.335938 Z M 35 54.335938 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 70 35 L 54.332031 35 C 54.332031 40.734375 51.824219 45.871094 47.859375 49.410156 L 58.296875 61.113281 C 65.476563 54.699219 70 45.382813 70 35 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Management/AzureCostManagementAndBilling.png b/dist/Management/AzureCostManagementAndBilling.png
new file mode 100644
index 00000000..3d6ce2a2
Binary files /dev/null and b/dist/Management/AzureCostManagementAndBilling.png differ
diff --git a/dist/Management/AzureCostManagementAndBilling.puml b/dist/Management/AzureCostManagementAndBilling.puml
new file mode 100644
index 00000000..c938174f
--- /dev/null
+++ b/dist/Management/AzureCostManagementAndBilling.puml
@@ -0,0 +1,12 @@
+sprite $AzureCostManagementAndBilling [70x70/16z] {
+fPS7hkH024J9sk_Kzp_jZnwrZ30bxxm3F1N519hkOL5pZ_1lp5JeEMBnmb-OCJs0VnNJCZ5zvCYMYH5Xs2FX6Pp78g35NVeW4SY2nz90bWc3QO05JEK1BLZZ
+0IrOum4jM6C1BRXY3MIfoPyJR86V6-1eK5oA2Ps8-GrWdhm1haNMBdawW8VFjDKiLA9LcDieIZV8NHXk9Hc-2MD0WZNq3Ue43wLLjmImOYJ3AyuK8qN2AV5l
+WViMXb6M3OOn0QtuSXpR4dqpfls2bl47zskoTg0OOzltZtqmwBSTQ1t7Ro_MB1jRjjD2mDBl-MECTIqi-iWYnnXZjpSjfFluPXEwmde5M8ZyntCeiC2luhAl
+OwoznR5b-rtL1KaMInQ-VkhijEofBc3Hw_Tv7Cj-R6CilKLolSdonyvjBSBHZkJBTXnB48X2aR2YNG8M9ey4GujeehXSd02icUgVH815CrB-mJ9rI1M59806
+IUJka68icN2w374txggPvgepofp3coQuFLErUZaL6dHt6zD4FKwo19-xRYeYQh-AIYFDwGr8KS1CM4DNuhyq35wC09-blAkHyYFr29kITz88VjPZ1BxiCSwK
+ULwE4S3U2J9X0mwX2V9W1qQyL2ZJGrZzOZ2vLtm1
+}
+
+AzureEntityColoring(AzureCostManagementAndBilling)
+!define AzureCostManagementAndBilling(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCostManagementAndBilling, AzureCostManagementAndBilling)
+!define AzureCostManagementAndBilling(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCostManagementAndBilling, AzureCostManagementAndBilling)
diff --git a/dist/Management/AzureCostManagementAndBilling.svg b/dist/Management/AzureCostManagementAndBilling.svg
new file mode 100644
index 00000000..13895b2c
--- /dev/null
+++ b/dist/Management/AzureCostManagementAndBilling.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35 54.335938 C 24.320313 54.335938 15.664063 45.679688 15.664063 35 C 15.664063 24.324219 24.320313 15.667969 35 15.667969 C 45.675781 15.667969 54.332031 24.320313 54.332031 35 L 70 35 C 70 15.671875 54.328125 0 35 0 C 15.667969 0.00390625 0 15.671875 0 35 C 0 54.332031 15.667969 70 35 70 C 43.949219 70 52.109375 66.636719 58.296875 61.113281 L 47.859375 49.410156 C 44.4375 52.464844 39.941406 54.335938 35 54.335938 Z M 35 54.335938 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 54.332031 35 L 70 35 C 70 15.671875 54.328125 0 35 0 L 35 15.667969 C 45.675781 15.667969 54.332031 24.320313 54.332031 35 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(5.882353%,5.882353%,5.882353%);fill-opacity:1;" d="M 39.804688 38.585938 C 39.804688 39.722656 39.449219 40.632813 38.734375 41.324219 C 38.015625 42.015625 36.976563 42.4375 35.613281 42.59375 L 35.613281 44.820313 L 34.113281 44.820313 L 34.113281 42.65625 C 32.707031 42.644531 31.414063 42.328125 30.238281 41.714844 L 30.238281 38.875 C 30.609375 39.175781 31.195313 39.464844 32.007813 39.75 C 32.816406 40.03125 33.519531 40.195313 34.113281 40.238281 L 34.113281 36.503906 C 32.605469 35.945313 31.53125 35.332031 30.902344 34.664063 C 30.273438 33.996094 29.960938 33.121094 29.960938 32.035156 C 29.960938 30.949219 30.347656 30.03125 31.121094 29.28125 C 31.894531 28.535156 32.890625 28.097656 34.113281 27.972656 L 34.113281 26.066406 L 35.613281 26.066406 L 35.613281 27.933594 C 37.050781 28 38.128906 28.234375 38.839844 28.628906 L 38.839844 31.398438 C 37.890625 30.824219 36.816406 30.46875 35.613281 30.332031 L 35.613281 34.21875 C 37.121094 34.765625 38.199219 35.378906 38.839844 36.0625 C 39.484375 36.75 39.804688 37.589844 39.804688 38.585938 Z M 34.113281 33.625 L 34.113281 30.371094 C 33.164063 30.542969 32.6875 31.039063 32.6875 31.859375 C 32.6875 32.578125 33.164063 33.164063 34.113281 33.625 Z M 37.078125 38.730469 C 37.078125 38.066406 36.585938 37.519531 35.613281 37.089844 L 35.613281 40.195313 C 36.585938 40.039063 37.078125 39.550781 37.078125 38.730469 Z M 37.078125 38.730469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 35 54.335938 C 24.320313 54.335938 15.664063 45.679688 15.664063 35 C 15.664063 24.324219 24.320313 15.667969 35 15.667969 C 45.675781 15.667969 54.332031 24.320313 54.332031 35 L 70 35 C 70 15.671875 54.328125 0 35 0 C 15.667969 0.00390625 0 15.671875 0 35 C 0 54.332031 15.667969 70 35 70 C 43.949219 70 52.109375 66.636719 58.296875 61.113281 L 47.859375 49.410156 C 44.4375 52.464844 39.941406 54.335938 35 54.335938 Z M 35 54.335938 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 70 35 L 54.332031 35 C 54.332031 40.734375 51.824219 45.871094 47.859375 49.410156 L 58.296875 61.113281 C 65.476563 54.699219 70 45.382813 70 35 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Management/AzureDiagnosticSetting(m).png b/dist/Management/AzureDiagnosticSetting(m).png
new file mode 100644
index 00000000..e92b46b1
Binary files /dev/null and b/dist/Management/AzureDiagnosticSetting(m).png differ
diff --git a/dist/Management/AzureDiagnosticSetting(m).svg b/dist/Management/AzureDiagnosticSetting(m).svg
new file mode 100644
index 00000000..4406522b
--- /dev/null
+++ b/dist/Management/AzureDiagnosticSetting(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 58.789063 68.980469 L 62.988281 63.511719 L 62.988281 2.800781 L 58.789063 7 Z M 58.789063 68.980469 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 62.988281 63.511719 L 65.789063 63.511719 L 65.789063 0 L 8.390625 0 C 6.578125 0.234375 2.800781 4.621094 2.800781 5.25 L 2.882813 66.6875 C 2.882813 68.515625 4.367188 70 6.199219 70 L 58.789063 70 L 58.789063 68.980469 Z M 62.988281 63.511719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 10.882813 2.800781 C 9.335938 2.800781 8.671875 3.058594 7.375 4.199219 C 4.1875 7 7.917969 7 9.46875 7 L 58.789063 7 L 58.789063 68.980469 L 62.988281 63.511719 L 62.988281 2.800781 Z M 10.882813 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.285156 54.183594 L 30.261719 29.570313 L 27.125 38.078125 L 15.390625 38.078125 C 14.230469 38.078125 13.289063 37.136719 13.289063 35.976563 C 13.289063 34.816406 14.230469 33.878906 15.390625 33.878906 L 24.195313 33.878906 L 31.074219 15.230469 L 37.386719 41.015625 L 40.460938 33.878906 L 50.390625 33.878906 C 51.546875 33.878906 52.488281 34.816406 52.488281 35.976563 C 52.488281 37.136719 51.546875 38.078125 50.390625 38.078125 L 43.226563 38.078125 Z M 36.285156 54.183594 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureDiagnosticSetting.png b/dist/Management/AzureDiagnosticSetting.png
new file mode 100644
index 00000000..1d00a403
Binary files /dev/null and b/dist/Management/AzureDiagnosticSetting.png differ
diff --git a/dist/Management/AzureDiagnosticSetting.puml b/dist/Management/AzureDiagnosticSetting.puml
new file mode 100644
index 00000000..33342228
--- /dev/null
+++ b/dist/Management/AzureDiagnosticSetting.puml
@@ -0,0 +1,10 @@
+sprite $AzureDiagnosticSetting [70x70/16z] {
+xTX5egH04431ACky_ud7XxQlbInvksuWS0NCtAu1YAmhxGyIEzqfaPcpxTJNeQpC77l8F9HMG1wLsRUG1sMpUIbFNKgSeSGuGndj38KJbCMgAvrHLz3AoeIo
+qc0LbG2Zg0pGYae3Qie2h9BI0QEa0FIACc50HUbe0MjV2PW9Sr-P4DdHlwjqz_L_sA42FJvMfeTMPa1aveF-iJ8ybB-2-U1_geJxnlzrx9dDNUkphRlkYcCb
+Sy4u_lz4UIqWEbJkZJ1WL9GE41Lb0dfMb02iaf90ovhImImg4sHHMJ2gIaAKbKxFiZ9OTMLf-QaYFyiyG-bvXX9rvQYkNCgbH9oWG5bfr9M1kkAkjQjuAAgV
+jVm4
+}
+
+AzureEntityColoring(AzureDiagnosticSetting)
+!define AzureDiagnosticSetting(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDiagnosticSetting, AzureDiagnosticSetting)
+!define AzureDiagnosticSetting(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDiagnosticSetting, AzureDiagnosticSetting)
diff --git a/dist/Management/AzureDiagnosticSetting.svg b/dist/Management/AzureDiagnosticSetting.svg
new file mode 100644
index 00000000..d36b0c93
--- /dev/null
+++ b/dist/Management/AzureDiagnosticSetting.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 58.789063 68.980469 L 62.988281 63.511719 L 62.988281 2.800781 L 58.789063 7 Z M 58.789063 68.980469 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 62.988281 63.511719 L 65.789063 63.511719 L 65.789063 0 L 8.390625 0 C 6.578125 0.234375 2.800781 4.621094 2.800781 5.25 L 2.882813 66.6875 C 2.882813 68.515625 4.367188 70 6.199219 70 L 58.789063 70 L 58.789063 68.980469 Z M 62.988281 63.511719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 10.882813 2.800781 C 9.335938 2.800781 8.671875 3.058594 7.375 4.199219 C 4.1875 7 7.917969 7 9.46875 7 L 58.789063 7 L 58.789063 68.980469 L 62.988281 63.511719 L 62.988281 2.800781 Z M 10.882813 2.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.285156 54.183594 L 30.261719 29.570313 L 27.125 38.078125 L 15.390625 38.078125 C 14.230469 38.078125 13.289063 37.136719 13.289063 35.976563 C 13.289063 34.816406 14.230469 33.878906 15.390625 33.878906 L 24.195313 33.878906 L 31.074219 15.230469 L 37.386719 41.015625 L 40.460938 33.878906 L 50.390625 33.878906 C 51.546875 33.878906 52.488281 34.816406 52.488281 35.976563 C 52.488281 37.136719 51.546875 38.078125 50.390625 38.078125 L 43.226563 38.078125 Z M 36.285156 54.183594 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureFreeService(m).png b/dist/Management/AzureFreeService(m).png
new file mode 100644
index 00000000..593bf689
Binary files /dev/null and b/dist/Management/AzureFreeService(m).png differ
diff --git a/dist/Management/AzureFreeService(m).svg b/dist/Management/AzureFreeService(m).svg
new file mode 100644
index 00000000..b06778bd
--- /dev/null
+++ b/dist/Management/AzureFreeService(m).svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 63.667969 5.476563 L 6.085938 5.476563 C 4.140625 5.476563 2.554688 7.242188 2.554688 9.191406 L 2.554688 49.304688 C 2.554688 51.253906 4.140625 52.957031 6.085938 52.957031 L 7.425781 52.957031 Z M 63.667969 5.476563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 33.90625 46.566406 C 33.84375 46.566406 33.84375 46.566406 33.78125 46.503906 L 25.6875 41.816406 C 25.625 41.757813 25.566406 41.695313 25.566406 41.574219 L 25.566406 32.261719 C 25.566406 32.199219 25.625 32.078125 25.6875 32.015625 C 25.746094 31.957031 25.871094 31.957031 25.929688 32.015625 L 34.027344 36.703125 C 34.085938 36.765625 34.148438 36.824219 34.148438 36.949219 L 34.148438 46.320313 C 34.148438 46.382813 34.085938 46.503906 34.027344 46.566406 L 33.90625 46.566406 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.21875 46.566406 C 36.15625 46.566406 36.15625 46.566406 36.09375 46.503906 C 36.035156 46.445313 35.972656 46.382813 35.972656 46.261719 L 35.972656 37.007813 C 35.972656 36.949219 36.035156 36.824219 36.09375 36.765625 L 44.191406 32.078125 C 44.253906 32.015625 44.375 32.015625 44.433594 32.078125 C 44.496094 32.140625 44.554688 32.199219 44.554688 32.261719 L 44.554688 41.574219 C 44.554688 41.636719 44.496094 41.757813 44.433594 41.816406 L 36.339844 46.503906 C 36.339844 46.566406 36.277344 46.566406 36.21875 46.566406 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 44.738281 52.957031 L 25.746094 52.957031 C 27.878906 60.445313 26.355469 61.539063 13.878906 61.539063 L 13.878906 65.433594 L 56.363281 65.433594 L 56.363281 61.539063 C 43.824219 61.539063 42.609375 60.445313 44.738281 52.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 63.609375 5.476563 L 6.085938 5.476563 C 4.140625 5.476563 2.554688 7.242188 2.554688 9.191406 L 2.554688 49.304688 C 2.554688 51.253906 4.140625 52.957031 6.085938 52.957031 L 63.609375 52.957031 C 65.554688 52.957031 67.503906 51.253906 67.503906 49.304688 L 67.503906 9.191406 C 67.566406 7.242188 65.554688 5.476563 63.609375 5.476563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 62.511719 10.46875 L 62.511719 47.964844 L 7.488281 47.964844 L 7.488281 10.46875 Z M 62.511719 10.46875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 7.488281 47.964844 L 7.609375 47.964844 L 7.609375 10.46875 L 57.824219 10.410156 L 7.488281 10.46875 Z M 7.488281 47.964844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 13.816406 61.539063 L 56.304688 61.539063 L 56.304688 65.433594 L 13.816406 65.433594 Z M 13.816406 61.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 35.730469 8.21875 C 35.730469 8.703125 35.304688 9.128906 34.816406 9.128906 C 34.332031 9.128906 33.90625 8.703125 33.90625 8.21875 C 33.90625 7.730469 34.332031 7.304688 34.816406 7.304688 C 35.304688 7.304688 35.730469 7.730469 35.730469 8.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.121094 35.183594 C 35.0625 35.183594 35.0625 35.183594 35 35.121094 L 26.84375 30.433594 C 26.78125 30.375 26.722656 30.3125 26.722656 30.191406 C 26.722656 30.128906 26.78125 30.007813 26.84375 30.007813 L 34.9375 25.320313 C 35 25.261719 35.121094 25.261719 35.183594 25.320313 L 43.339844 30.007813 C 43.398438 30.070313 43.460938 30.128906 43.460938 30.191406 C 43.460938 30.253906 43.398438 30.375 43.339844 30.375 L 35.242188 35.0625 L 35.121094 35.183594 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 24.410156 10.957031 C 35.488281 18.746094 35.183594 28.972656 35.183594 28.972656 C 35.183594 28.972656 32.140625 19.234375 19.175781 15.21875 L 26.113281 15.398438 Z M 43.824219 15.886719 C 35.0625 21.0625 34.511719 29.21875 34.511719 29.21875 C 34.511719 29.21875 37.496094 21.609375 47.476563 19.417969 L 42.242188 19.175781 Z M 35.121094 27.9375 C 35 27.757813 32.503906 23.984375 28.183594 22.21875 C 25.382813 21.121094 23.253906 20.757813 21.792969 21.304688 C 21 21.609375 20.453125 22.09375 20.148438 22.824219 C 19.660156 24.042969 19.722656 26.417969 25.503906 28.730469 C 29.824219 30.496094 34.269531 29.460938 34.453125 29.398438 L 35.730469 28.914063 Z M 27.453125 24.042969 C 29.765625 24.957031 31.53125 26.601563 32.503906 27.757813 C 30.984375 27.878906 28.609375 27.878906 26.296875 26.90625 C 22.949219 25.566406 21.730469 24.164063 21.972656 23.496094 C 22.035156 23.375 22.09375 23.191406 22.460938 23.128906 C 22.886719 22.949219 24.285156 22.765625 27.453125 24.042969 Z M 35.609375 29.21875 C 35.792969 29.277344 40.113281 30.617188 44.617188 29.277344 C 47.476563 28.363281 49.363281 27.269531 50.15625 25.992188 C 50.582031 25.261719 50.703125 24.53125 50.460938 23.800781 C 50.09375 22.523438 48.511719 20.757813 42.546875 22.582031 C 38.105469 23.984375 35.242188 27.574219 35.121094 27.695313 L 34.332031 28.730469 Z M 44.070313 27.390625 C 41.695313 28.121094 39.320313 27.9375 37.800781 27.695313 C 38.894531 26.660156 40.78125 25.140625 43.15625 24.410156 C 46.625 23.3125 48.390625 23.617188 48.636719 24.347656 C 48.695313 24.46875 48.695313 24.652344 48.511719 24.957031 C 48.269531 25.320313 47.355469 26.355469 44.070313 27.390625 Z M 44.070313 27.390625 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureFreeService.png b/dist/Management/AzureFreeService.png
new file mode 100644
index 00000000..b59e3dc4
Binary files /dev/null and b/dist/Management/AzureFreeService.png differ
diff --git a/dist/Management/AzureFreeService.puml b/dist/Management/AzureFreeService.puml
new file mode 100644
index 00000000..435fdb2b
--- /dev/null
+++ b/dist/Management/AzureFreeService.puml
@@ -0,0 +1,11 @@
+sprite $AzureFreeService [70x70/16z] {
+xTC7ajim38LXiU2XyVxdpL0oqkHnQ4Zf-q_PTViC5cy_kuzgkbR3A9tI0MY7SWq1wZuA_Q3-6W5DfUO7EId85ifJXEKE1QvtA3hi1eL7C3c5nSnKVGozD0jF
+OYRVFBccd1rdHEAIsHURZ7r170a5a3cE8lvtCnL-Mm5xh4dsvIc_DOkOcyh1Q73JO5vNTEovCljm03Q6CQi5jgJu41OzFk93vdf4R8VdSCkAnYcP38Mxs2I5
+0Hw-g4XyuLoGEORwYDjYmnQKs1YNnpZ78CQ80-Sb9QwAcp1t7MPZC06FhM8iAk54iQynuRe2i8YQcNA7s3wRIk8NKBPlwq12GVlQA8ICqW7KRmQXX59h1-XO
+LWD0FQVKIa2VxvX6JokrFHRIUrwPzJ0kAHMWsvKFfPyK99HmGY7a550B9OoC0j2kX95LW0uGiAha2oMwHS45fLn4qBTPluQWRC7a3Ph8NdaMpfKdRQzZ_Jvi
+xqSdfIUKTbBgBKhvRRFmIQ6tZGBLpFR6nQcrTM9v7gYrMb_VauBr_Wvbmt8hv_NH9m
+}
+
+AzureEntityColoring(AzureFreeService)
+!define AzureFreeService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureFreeService, AzureFreeService)
+!define AzureFreeService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureFreeService, AzureFreeService)
diff --git a/dist/Management/AzureFreeService.svg b/dist/Management/AzureFreeService.svg
new file mode 100644
index 00000000..c62ef2d3
--- /dev/null
+++ b/dist/Management/AzureFreeService.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 63.667969 5.476563 L 6.085938 5.476563 C 4.140625 5.476563 2.554688 7.242188 2.554688 9.191406 L 2.554688 49.304688 C 2.554688 51.253906 4.140625 52.957031 6.085938 52.957031 L 7.425781 52.957031 Z M 63.667969 5.476563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 33.90625 46.566406 C 33.84375 46.566406 33.84375 46.566406 33.78125 46.503906 L 25.6875 41.816406 C 25.625 41.757813 25.566406 41.695313 25.566406 41.574219 L 25.566406 32.261719 C 25.566406 32.199219 25.625 32.078125 25.6875 32.015625 C 25.746094 31.957031 25.871094 31.957031 25.929688 32.015625 L 34.027344 36.703125 C 34.085938 36.765625 34.148438 36.824219 34.148438 36.949219 L 34.148438 46.320313 C 34.148438 46.382813 34.085938 46.503906 34.027344 46.566406 L 33.90625 46.566406 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.21875 46.566406 C 36.15625 46.566406 36.15625 46.566406 36.09375 46.503906 C 36.035156 46.445313 35.972656 46.382813 35.972656 46.261719 L 35.972656 37.007813 C 35.972656 36.949219 36.035156 36.824219 36.09375 36.765625 L 44.191406 32.078125 C 44.253906 32.015625 44.375 32.015625 44.433594 32.078125 C 44.496094 32.140625 44.554688 32.199219 44.554688 32.261719 L 44.554688 41.574219 C 44.554688 41.636719 44.496094 41.757813 44.433594 41.816406 L 36.339844 46.503906 C 36.339844 46.566406 36.277344 46.566406 36.21875 46.566406 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 44.738281 52.957031 L 25.746094 52.957031 C 27.878906 60.445313 26.355469 61.539063 13.878906 61.539063 L 13.878906 65.433594 L 56.363281 65.433594 L 56.363281 61.539063 C 43.824219 61.539063 42.609375 60.445313 44.738281 52.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 63.609375 5.476563 L 6.085938 5.476563 C 4.140625 5.476563 2.554688 7.242188 2.554688 9.191406 L 2.554688 49.304688 C 2.554688 51.253906 4.140625 52.957031 6.085938 52.957031 L 63.609375 52.957031 C 65.554688 52.957031 67.503906 51.253906 67.503906 49.304688 L 67.503906 9.191406 C 67.566406 7.242188 65.554688 5.476563 63.609375 5.476563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 62.511719 10.46875 L 62.511719 47.964844 L 7.488281 47.964844 L 7.488281 10.46875 Z M 62.511719 10.46875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 7.488281 47.964844 L 7.609375 47.964844 L 7.609375 10.46875 L 57.824219 10.410156 L 7.488281 10.46875 Z M 7.488281 47.964844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 13.816406 61.539063 L 56.304688 61.539063 L 56.304688 65.433594 L 13.816406 65.433594 Z M 13.816406 61.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 35.730469 8.21875 C 35.730469 8.703125 35.304688 9.128906 34.816406 9.128906 C 34.332031 9.128906 33.90625 8.703125 33.90625 8.21875 C 33.90625 7.730469 34.332031 7.304688 34.816406 7.304688 C 35.304688 7.304688 35.730469 7.730469 35.730469 8.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.121094 35.183594 C 35.0625 35.183594 35.0625 35.183594 35 35.121094 L 26.84375 30.433594 C 26.78125 30.375 26.722656 30.3125 26.722656 30.191406 C 26.722656 30.128906 26.78125 30.007813 26.84375 30.007813 L 34.9375 25.320313 C 35 25.261719 35.121094 25.261719 35.183594 25.320313 L 43.339844 30.007813 C 43.398438 30.070313 43.460938 30.128906 43.460938 30.191406 C 43.460938 30.253906 43.398438 30.375 43.339844 30.375 L 35.242188 35.0625 L 35.121094 35.183594 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 24.410156 10.957031 C 35.488281 18.746094 35.183594 28.972656 35.183594 28.972656 C 35.183594 28.972656 32.140625 19.234375 19.175781 15.21875 L 26.113281 15.398438 Z M 43.824219 15.886719 C 35.0625 21.0625 34.511719 29.21875 34.511719 29.21875 C 34.511719 29.21875 37.496094 21.609375 47.476563 19.417969 L 42.242188 19.175781 Z M 35.121094 27.9375 C 35 27.757813 32.503906 23.984375 28.183594 22.21875 C 25.382813 21.121094 23.253906 20.757813 21.792969 21.304688 C 21 21.609375 20.453125 22.09375 20.148438 22.824219 C 19.660156 24.042969 19.722656 26.417969 25.503906 28.730469 C 29.824219 30.496094 34.269531 29.460938 34.453125 29.398438 L 35.730469 28.914063 Z M 27.453125 24.042969 C 29.765625 24.957031 31.53125 26.601563 32.503906 27.757813 C 30.984375 27.878906 28.609375 27.878906 26.296875 26.90625 C 22.949219 25.566406 21.730469 24.164063 21.972656 23.496094 C 22.035156 23.375 22.09375 23.191406 22.460938 23.128906 C 22.886719 22.949219 24.285156 22.765625 27.453125 24.042969 Z M 35.609375 29.21875 C 35.792969 29.277344 40.113281 30.617188 44.617188 29.277344 C 47.476563 28.363281 49.363281 27.269531 50.15625 25.992188 C 50.582031 25.261719 50.703125 24.53125 50.460938 23.800781 C 50.09375 22.523438 48.511719 20.757813 42.546875 22.582031 C 38.105469 23.984375 35.242188 27.574219 35.121094 27.695313 L 34.332031 28.730469 Z M 44.070313 27.390625 C 41.695313 28.121094 39.320313 27.9375 37.800781 27.695313 C 38.894531 26.660156 40.78125 25.140625 43.15625 24.410156 C 46.625 23.3125 48.390625 23.617188 48.636719 24.347656 C 48.695313 24.46875 48.695313 24.652344 48.511719 24.957031 C 48.269531 25.320313 47.355469 26.355469 44.070313 27.390625 Z M 44.070313 27.390625 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureGuestAssignment(m).png b/dist/Management/AzureGuestAssignment(m).png
new file mode 100644
index 00000000..0636d142
Binary files /dev/null and b/dist/Management/AzureGuestAssignment(m).png differ
diff --git a/dist/Management/AzureGuestAssignment(m).svg b/dist/Management/AzureGuestAssignment(m).svg
new file mode 100644
index 00000000..8d733309
--- /dev/null
+++ b/dist/Management/AzureGuestAssignment(m).svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.800781 4.199219 L 8.398438 4.199219 L 8.398438 65.800781 L 61.601563 65.800781 L 61.601563 14 L 51.800781 14 Z M 51.800781 4.199219 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 27.148438 40.113281 C 22.871094 35.824219 22.871094 28.769531 27.148438 24.476563 C 31.425781 20.1875 38.457031 20.1875 42.734375 24.476563 Z M 27.148438 40.113281 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 61.601563 10.921875 L 52.078125 1.398438 L 5.601563 1.398438 L 5.601563 68.601563 L 64.398438 68.601563 L 64.398438 13.71875 Z M 61.601563 10.921875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 41.085938 40.054688 C 39.4375 41.496094 37.277344 42.421875 34.910156 42.421875 C 32.542969 42.421875 30.378906 41.496094 28.730469 40.054688 L 27.804688 58.585938 L 34.804688 51.480469 L 41.804688 58.585938 Z M 41.085938 40.054688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 46.058594 32.199219 C 46.058594 26.089844 41.125 21.140625 35.035156 21.140625 C 28.945313 21.140625 24.011719 26.089844 24.011719 32.199219 C 24.011719 38.308594 28.945313 43.261719 35.035156 43.261719 C 41.125 43.261719 46.058594 38.308594 46.058594 32.199219 Z M 46.058594 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 43.398438 32.199219 C 43.398438 27.566406 39.652344 23.808594 35.035156 23.808594 C 30.414063 23.808594 26.671875 27.566406 26.671875 32.199219 C 26.671875 36.832031 30.414063 40.589844 35.035156 40.589844 C 39.652344 40.589844 43.398438 36.832031 43.398438 32.199219 Z M 43.398438 32.199219 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Management/AzureGuestAssignment.png b/dist/Management/AzureGuestAssignment.png
new file mode 100644
index 00000000..afc95289
Binary files /dev/null and b/dist/Management/AzureGuestAssignment.png differ
diff --git a/dist/Management/AzureGuestAssignment.puml b/dist/Management/AzureGuestAssignment.puml
new file mode 100644
index 00000000..a26b39a3
--- /dev/null
+++ b/dist/Management/AzureGuestAssignment.puml
@@ -0,0 +1,10 @@
+sprite $AzureGuestAssignment [70x70/16z] {
+xTO7OeH028NXE3CymF7-vysgRA-0wVct5pzxUTkkeRagjvK2NzMXU1XJgBwUCRUKuVLWJ5v1JIl6v1LZyWfgMZ4chnYJLr2pYZ5HvLW1AAyCtq7vLne1e9fH
+2h6iSGihRJNMPvIOGhC0416OHRX4b3ORP8559Q0KDiGILVWLY9mYWAeMhr94-0m1gyAhD16S8O2gU1M8N20GrU9M-081grQdmaS5SGK71Gc5H2uGMowXTOHZ
+gkpUwbZu765LSYiamXU8QzkrM8JF4HhyIcLLuHC4eUDBKvsTNJA_u-YnJYr3OagTHhN6Jb6bJTFK-pZsldk3X69b5DfUuQY2xHM9Aho98gUAvfJUSuekI6iz
+hSnR_iACKMLSaOL9A0jYJ8ygVPg_DIQkqF4zXHMw_U7_glbV2VPTbNpl
+}
+
+AzureEntityColoring(AzureGuestAssignment)
+!define AzureGuestAssignment(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureGuestAssignment, AzureGuestAssignment)
+!define AzureGuestAssignment(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureGuestAssignment, AzureGuestAssignment)
diff --git a/dist/Management/AzureGuestAssignment.svg b/dist/Management/AzureGuestAssignment.svg
new file mode 100644
index 00000000..1ea2f839
--- /dev/null
+++ b/dist/Management/AzureGuestAssignment.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.800781 4.199219 L 8.398438 4.199219 L 8.398438 65.800781 L 61.601563 65.800781 L 61.601563 14 L 51.800781 14 Z M 51.800781 4.199219 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 27.148438 40.113281 C 22.871094 35.824219 22.871094 28.769531 27.148438 24.476563 C 31.425781 20.1875 38.457031 20.1875 42.734375 24.476563 Z M 27.148438 40.113281 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 61.601563 10.921875 L 52.078125 1.398438 L 5.601563 1.398438 L 5.601563 68.601563 L 64.398438 68.601563 L 64.398438 13.71875 Z M 61.601563 10.921875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 41.085938 40.054688 C 39.4375 41.496094 37.277344 42.421875 34.910156 42.421875 C 32.542969 42.421875 30.378906 41.496094 28.730469 40.054688 L 27.804688 58.585938 L 34.804688 51.480469 L 41.804688 58.585938 Z M 41.085938 40.054688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 46.058594 32.199219 C 46.058594 26.089844 41.125 21.140625 35.035156 21.140625 C 28.945313 21.140625 24.011719 26.089844 24.011719 32.199219 C 24.011719 38.308594 28.945313 43.261719 35.035156 43.261719 C 41.125 43.261719 46.058594 38.308594 46.058594 32.199219 Z M 46.058594 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 43.398438 32.199219 C 43.398438 27.566406 39.652344 23.808594 35.035156 23.808594 C 30.414063 23.808594 26.671875 27.566406 26.671875 32.199219 C 26.671875 36.832031 30.414063 40.589844 35.035156 40.589844 C 39.652344 40.589844 43.398438 36.832031 43.398438 32.199219 Z M 43.398438 32.199219 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Management/AzureLogAnalytics(m).png b/dist/Management/AzureLogAnalytics(m).png
index 49e43438..c4e77914 100644
Binary files a/dist/Management/AzureLogAnalytics(m).png and b/dist/Management/AzureLogAnalytics(m).png differ
diff --git a/dist/Management/AzureLogAnalytics(m).svg b/dist/Management/AzureLogAnalytics(m).svg
index 6fe65cc2..b2d41fab 100644
--- a/dist/Management/AzureLogAnalytics(m).svg
+++ b/dist/Management/AzureLogAnalytics(m).svg
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(65,174,255);fill-opacity:1;" d="M 0 36.457031 L 14.582031 36.457031 L 14.582031 51.042969 L 0 51.042969 Z M 0 17.5 L 14.582031 17.5 L 14.582031 32.082031 L 0 32.082031 Z M 0 55.417969 L 14.582031 55.417969 L 14.582031 70 L 0 70 Z M 18.957031 55.417969 L 33.542969 55.417969 L 33.542969 70 L 18.957031 70 Z M 37.917969 55.417969 L 52.5 55.417969 L 52.5 70 L 37.917969 70 Z M 37.917969 55.417969 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,102,178);fill-opacity:1;" d="M 44.480469 0 C 30.195313 0 18.957031 11.238281 18.957031 25.519531 L 18.957031 51.042969 L 44.480469 51.042969 C 58.761719 51.042969 70 39.804688 70 25.519531 C 70 11.238281 58.761719 0 44.480469 0 Z M 44.480469 0 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 29.167969 21.875 L 33.542969 21.875 L 33.542969 37.917969 L 29.167969 37.917969 Z M 39.375 26.25 L 43.75 26.25 L 43.75 37.917969 L 39.375 37.917969 Z M 49.582031 16.042969 L 53.957031 16.042969 L 53.957031 37.917969 L 49.582031 37.917969 Z M 49.582031 16.042969 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(65,174,255);fill-opacity:1;" d="M 1.398438 36.398438 L 15.398438 36.398438 L 15.398438 50.398438 L 1.398438 50.398438 Z M 1.398438 36.398438 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(65,174,255);fill-opacity:1;" d="M 1.398438 18.199219 L 15.398438 18.199219 L 15.398438 32.199219 L 1.398438 32.199219 Z M 1.398438 18.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(65,174,255);fill-opacity:1;" d="M 1.398438 54.601563 L 15.398438 54.601563 L 15.398438 68.601563 L 1.398438 68.601563 Z M 1.398438 54.601563 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(65,174,255);fill-opacity:1;" d="M 19.601563 54.601563 L 33.601563 54.601563 L 33.601563 68.601563 L 19.601563 68.601563 Z M 19.601563 54.601563 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(65,174,255);fill-opacity:1;" d="M 37.800781 54.601563 L 51.800781 54.601563 L 51.800781 68.601563 L 37.800781 68.601563 Z M 37.800781 54.601563 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,102,178);fill-opacity:1;" d="M 44.101563 1.398438 C 30.386719 1.398438 19.601563 12.1875 19.601563 25.898438 L 19.601563 50.398438 C 19.601563 50.398438 37.792969 50.398438 44.101563 50.398438 C 57.8125 50.398438 68.601563 39.613281 68.601563 25.898438 C 68.601563 12.1875 57.8125 1.398438 44.101563 1.398438 Z M 44.101563 1.398438 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 29.398438 22.398438 L 33.601563 22.398438 L 33.601563 37.800781 L 29.398438 37.800781 Z M 29.398438 22.398438 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.199219 26.601563 L 43.398438 26.601563 L 43.398438 37.800781 L 39.199219 37.800781 Z M 39.199219 26.601563 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 49 16.800781 L 53.199219 16.800781 L 53.199219 37.800781 L 49 37.800781 Z M 49 16.800781 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureLogAnalytics.png b/dist/Management/AzureLogAnalytics.png
index 9a1f6baf..f2d33234 100644
Binary files a/dist/Management/AzureLogAnalytics.png and b/dist/Management/AzureLogAnalytics.png differ
diff --git a/dist/Management/AzureLogAnalytics.puml b/dist/Management/AzureLogAnalytics.puml
index fcb7bf49..afd2c02d 100644
--- a/dist/Management/AzureLogAnalytics.puml
+++ b/dist/Management/AzureLogAnalytics.puml
@@ -1,8 +1,8 @@
 sprite $AzureLogAnalytics [70x70/16z] {
-xTG5SiKm38JXbItJwlxtRTwmfWxAvVu3uIziN2gLrWUtHgjPyAJSQAvHRaCwx7riwPP1swa9BYRTzgFYKfbsM7jwDxuXEAlOLfHHipYJQPVgE4Xe5olOhzlL
-c1u-5D_0NhGRwS6bn2zcsAqoPcKxQCXMzsyRoILurKwltokKwbAyuat5TA8akwkqYQAtbJ5Hwcs54wMxLvWkA3PHnZTI-65ArwsmKh7rXnGkKRhudYa5lcTA
-Mg4Ch50AaakUA1GiU4SLnmh7rcoE_bBcogqK2vIE1GfbWSA4kCACWEAGeCA4kD85OOKAH1KM8Afq1K8AHrC1VBEH8U-N17yayLrUTVoEvgkAMrM-hVAl_2l_
-oXi
+xTPLeeGm38NXKqiZ-r_lTHa90w6Tg_nFF7rO3LzPAhKHjLOpzbQws4Sgj4DAf7QPjA3HrRmqubIrfIHZOzsSWe-Jn6xNeuWV1v2Hfn7R4k5cPDigk56nZMdm
+VUBlr6npch6KcbFqFrLRJaL4xIHDyEELdzBij0OWrzCo02GBAGAWq6a506fCiUGgFQXKLv6WGgwYzXQtrcXTwPwIJc-2lAw8f-IeelTJYgC8CykmKW6K-oeo
+HU4f2arHAf3oQMcFak0KLGGpb3P3qOG9twK34_vHNbFqEVVg_55y9P2c6Kh51ALZWiAOe30cA8nnHGdZYXGCAzg0KKKfOL2HNd2UUtx9VIcYLXAsTkIUN-Yq
+1W1qrizI3kLG3cL-Zm
 }
 
 AzureEntityColoring(AzureLogAnalytics)
diff --git a/dist/Management/AzureLogAnalytics.svg b/dist/Management/AzureLogAnalytics.svg
index cae7b5ff..cb87c083 100644
--- a/dist/Management/AzureLogAnalytics.svg
+++ b/dist/Management/AzureLogAnalytics.svg
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 0 36.457031 L 14.582031 36.457031 L 14.582031 51.042969 L 0 51.042969 Z M 0 17.5 L 14.582031 17.5 L 14.582031 32.082031 L 0 32.082031 Z M 0 55.417969 L 14.582031 55.417969 L 14.582031 70 L 0 70 Z M 18.957031 55.417969 L 33.542969 55.417969 L 33.542969 70 L 18.957031 70 Z M 37.917969 55.417969 L 52.5 55.417969 L 52.5 70 L 37.917969 70 Z M 37.917969 55.417969 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 44.480469 0 C 30.195313 0 18.957031 11.238281 18.957031 25.519531 L 18.957031 51.042969 L 44.480469 51.042969 C 58.761719 51.042969 70 39.804688 70 25.519531 C 70 11.238281 58.761719 0 44.480469 0 Z M 44.480469 0 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 29.167969 21.875 L 33.542969 21.875 L 33.542969 37.917969 L 29.167969 37.917969 Z M 39.375 26.25 L 43.75 26.25 L 43.75 37.917969 L 39.375 37.917969 Z M 49.582031 16.042969 L 53.957031 16.042969 L 53.957031 37.917969 L 49.582031 37.917969 Z M 49.582031 16.042969 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 1.398438 36.398438 L 15.398438 36.398438 L 15.398438 50.398438 L 1.398438 50.398438 Z M 1.398438 36.398438 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 1.398438 18.199219 L 15.398438 18.199219 L 15.398438 32.199219 L 1.398438 32.199219 Z M 1.398438 18.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 1.398438 54.601563 L 15.398438 54.601563 L 15.398438 68.601563 L 1.398438 68.601563 Z M 1.398438 54.601563 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 19.601563 54.601563 L 33.601563 54.601563 L 33.601563 68.601563 L 19.601563 68.601563 Z M 19.601563 54.601563 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 37.800781 54.601563 L 51.800781 54.601563 L 51.800781 68.601563 L 37.800781 68.601563 Z M 37.800781 54.601563 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 44.101563 1.398438 C 30.386719 1.398438 19.601563 12.1875 19.601563 25.898438 L 19.601563 50.398438 C 19.601563 50.398438 37.792969 50.398438 44.101563 50.398438 C 57.8125 50.398438 68.601563 39.613281 68.601563 25.898438 C 68.601563 12.1875 57.8125 1.398438 44.101563 1.398438 Z M 44.101563 1.398438 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 29.398438 22.398438 L 33.601563 22.398438 L 33.601563 37.800781 L 29.398438 37.800781 Z M 29.398438 22.398438 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.199219 26.601563 L 43.398438 26.601563 L 43.398438 37.800781 L 39.199219 37.800781 Z M 39.199219 26.601563 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49 16.800781 L 53.199219 16.800781 L 53.199219 37.800781 L 49 37.800781 Z M 49 16.800781 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureManagedApplications(m).png b/dist/Management/AzureManagedApplications(m).png
index b6c04bf6..71531b64 100644
Binary files a/dist/Management/AzureManagedApplications(m).png and b/dist/Management/AzureManagedApplications(m).png differ
diff --git a/dist/Management/AzureManagedApplications(m).svg b/dist/Management/AzureManagedApplications(m).svg
index 2698409d..9453c2d6 100644
--- a/dist/Management/AzureManagedApplications(m).svg
+++ b/dist/Management/AzureManagedApplications(m).svg
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65pt" height="70pt" viewBox="0 0 65 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="65" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,59,104);fill-opacity:1;" d="M 38.992188 61.390625 C 39.050781 61.390625 39.113281 61.378906 39.164063 61.347656 L 50.339844 55.082031 C 50.445313 55.027344 50.511719 54.917969 50.511719 54.796875 L 50.511719 42.222656 C 50.511719 42.101563 50.445313 41.988281 50.339844 41.933594 C 50.234375 41.875 50.105469 41.875 50 41.933594 L 38.824219 48.199219 C 38.722656 48.257813 38.660156 48.367188 38.660156 48.488281 L 38.660156 61.0625 C 38.660156 61.183594 38.722656 61.289063 38.824219 61.347656 C 38.878906 61.378906 38.933594 61.390625 38.992188 61.390625 M 53.480469 53.109375 C 53.539063 53.109375 53.601563 53.097656 53.652344 53.066406 L 64.828125 46.800781 C 64.933594 46.746094 65 46.636719 65 46.515625 L 65 33.941406 C 65 33.820313 64.933594 33.710938 64.828125 33.652344 C 64.71875 33.59375 64.59375 33.59375 64.484375 33.652344 L 53.3125 39.917969 C 53.207031 39.976563 53.144531 40.085938 53.144531 40.207031 L 53.144531 52.78125 C 53.144531 52.902344 53.207031 53.007813 53.3125 53.066406 C 53.363281 53.097656 53.421875 53.109375 53.480469 53.109375 M 38.992188 44.832031 C 39.050781 44.832031 39.113281 44.816406 39.164063 44.789063 L 50.339844 38.519531 C 50.445313 38.464844 50.511719 38.355469 50.511719 38.234375 L 50.511719 25.660156 C 50.511719 25.539063 50.445313 25.429688 50.339844 25.371094 C 50.234375 25.316406 50.105469 25.316406 50 25.371094 L 38.824219 31.640625 C 38.722656 31.695313 38.660156 31.808594 38.660156 31.925781 L 38.660156 44.5 C 38.660156 44.621094 38.722656 44.726563 38.824219 44.789063 C 38.878906 44.816406 38.933594 44.832031 38.992188 44.832031 M 53.480469 36.550781 C 53.539063 36.550781 53.601563 36.535156 53.652344 36.507813 L 64.828125 30.238281 C 64.933594 30.183594 65 30.074219 65 29.953125 L 65 17.378906 C 65 17.257813 64.933594 17.148438 64.828125 17.089844 C 64.71875 17.035156 64.59375 17.035156 64.484375 17.089844 L 53.3125 23.359375 C 53.207031 23.417969 53.144531 23.527344 53.144531 23.644531 L 53.144531 36.222656 C 53.144531 36.339844 53.207031 36.445313 53.3125 36.507813 C 53.363281 36.535156 53.421875 36.550781 53.480469 36.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,59,104);fill-opacity:1;" d="M 40.871094 61.601563 C 40.933594 61.601563 40.992188 61.585938 41.046875 61.554688 L 52.359375 55.289063 C 52.46875 55.234375 52.535156 55.125 52.535156 55.003906 L 52.535156 42.429688 C 52.535156 42.308594 52.464844 42.199219 52.359375 42.140625 C 52.25 42.082031 52.121094 42.082031 52.015625 42.140625 L 40.703125 48.40625 C 40.597656 48.464844 40.535156 48.574219 40.535156 48.695313 L 40.535156 61.269531 C 40.535156 61.390625 40.597656 61.496094 40.703125 61.554688 C 40.757813 61.585938 40.8125 61.601563 40.871094 61.601563 M 55.539063 53.320313 C 55.597656 53.320313 55.660156 53.304688 55.714844 53.277344 L 67.027344 47.007813 C 67.132813 46.953125 67.199219 46.84375 67.199219 46.722656 L 67.199219 34.148438 C 67.199219 34.027344 67.132813 33.917969 67.023438 33.859375 C 66.917969 33.804688 66.789063 33.804688 66.679688 33.859375 L 55.367188 40.125 C 55.261719 40.183594 55.199219 40.292969 55.199219 40.414063 L 55.199219 52.988281 C 55.199219 53.109375 55.261719 53.214844 55.367188 53.277344 C 55.417969 53.304688 55.476563 53.320313 55.539063 53.320313 M 40.871094 45.039063 C 40.933594 45.039063 40.992188 45.027344 41.046875 44.996094 L 52.359375 38.730469 C 52.46875 38.675781 52.535156 38.5625 52.535156 38.445313 L 52.535156 25.871094 C 52.535156 25.75 52.464844 25.636719 52.359375 25.582031 C 52.25 25.523438 52.121094 25.523438 52.015625 25.582031 L 40.703125 31.847656 C 40.597656 31.90625 40.535156 32.015625 40.535156 32.132813 L 40.535156 44.710938 C 40.535156 44.832031 40.597656 44.9375 40.703125 44.996094 C 40.757813 45.027344 40.8125 45.039063 40.871094 45.039063 M 55.539063 36.757813 C 55.597656 36.757813 55.660156 36.746094 55.714844 36.714844 L 67.027344 30.449219 C 67.132813 30.394531 67.199219 30.285156 67.199219 30.164063 L 67.199219 17.589844 C 67.199219 17.46875 67.132813 17.355469 67.023438 17.300781 C 66.917969 17.242188 66.789063 17.242188 66.679688 17.300781 L 55.367188 23.566406 C 55.261719 23.625 55.199219 23.734375 55.199219 23.851563 L 55.199219 36.429688 C 55.199219 36.550781 55.261719 36.65625 55.367188 36.714844 C 55.417969 36.742188 55.476563 36.757813 55.539063 36.757813 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip2">
-  <rect x="0" y="0" width="65" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.054688 21.890625 C 26.085938 21.839844 26.128906 21.800781 26.179688 21.773438 L 37.285156 15.660156 C 37.390625 15.601563 37.519531 15.601563 37.621094 15.660156 L 48.617188 21.71875 C 48.71875 21.773438 48.78125 21.878906 48.78125 21.996094 C 48.777344 22.113281 48.710938 22.21875 48.609375 22.277344 L 37.503906 28.382813 C 37.398438 28.441406 37.273438 28.4375 37.171875 28.382813 L 26.175781 22.320313 C 26.074219 22.269531 26.007813 22.164063 26.007813 22.046875 C 26.011719 21.992188 26.027344 21.9375 26.054688 21.890625 M 11.574219 13.910156 C 11.605469 13.863281 11.648438 13.820313 11.699219 13.792969 L 22.683594 7.683594 C 22.785156 7.625 22.910156 7.621094 23.015625 7.679688 L 33.886719 13.738281 C 33.988281 13.792969 34.054688 13.902344 34.050781 14.019531 C 34.046875 14.136719 33.984375 14.242188 33.882813 14.296875 L 22.898438 20.40625 C 22.792969 20.460938 22.671875 20.460938 22.566406 20.402344 L 11.691406 14.34375 C 11.59375 14.289063 11.53125 14.183594 11.527344 14.070313 C 11.53125 14.015625 11.546875 13.960938 11.574219 13.910156 M 40.839844 14.046875 C 40.871094 13.996094 40.914063 13.957031 40.964844 13.925781 L 51.949219 7.816406 C 52.050781 7.757813 52.175781 7.757813 52.28125 7.816406 L 63.152344 13.871094 C 63.253906 13.929688 63.316406 14.035156 63.316406 14.152344 C 63.3125 14.269531 63.246094 14.375 63.148438 14.429688 L 52.164063 20.539063 C 52.058594 20.59375 51.933594 20.59375 51.832031 20.535156 L 40.957031 14.476563 C 40.859375 14.421875 40.796875 14.320313 40.792969 14.203125 C 40.796875 14.148438 40.8125 14.09375 40.839844 14.046875 M 26.109375 6.171875 C 26.140625 6.125 26.183594 6.082031 26.234375 6.054688 L 37.34375 0.046875 C 37.445313 -0.015625 37.574219 -0.015625 37.679688 0.0429688 L 48.671875 6 C 48.773438 6.054688 48.835938 6.160156 48.835938 6.277344 C 48.832031 6.390625 48.765625 6.496094 48.664063 6.550781 L 37.558594 12.558594 C 37.453125 12.613281 37.328125 12.613281 37.226563 12.558594 L 26.230469 6.597656 C 26.128906 6.546875 26.066406 6.441406 26.0625 6.328125 C 26.066406 6.273438 26.082031 6.21875 26.109375 6.171875 M 9.855469 46.800781 L 21.03125 53.066406 C 21.136719 53.125 21.265625 53.125 21.371094 53.066406 C 21.472656 53.007813 21.535156 52.898438 21.535156 52.78125 L 21.535156 43.308594 C 21.046875 43.234375 20.550781 43.195313 20.054688 43.191406 C 17.015625 43.191406 14.753906 43.6875 12.929688 44.089844 C 11.648438 44.371094 10.640625 44.589844 9.679688 44.589844 L 9.679688 46.515625 C 9.679688 46.636719 9.746094 46.742188 9.855469 46.800781 Z M 35.6875 61.390625 C 35.746094 61.390625 35.800781 61.378906 35.855469 61.347656 C 35.957031 61.289063 36.023438 61.179688 36.023438 61.0625 L 36.023438 50.949219 C 34.96875 50.972656 33.867188 50.992188 32.90625 50.992188 C 31.617188 50.992188 31.070313 50.957031 30.847656 50.933594 C 30.523438 50.695313 29.898438 49.808594 29.472656 49.203125 C 28.375 47.652344 26.765625 45.375 24.167969 44.117188 L 24.167969 54.796875 C 24.167969 54.917969 24.234375 55.023438 24.34375 55.082031 L 35.519531 61.347656 C 35.570313 61.378906 35.628906 61.390625 35.6875 61.390625 Z M 50.511719 54.796875 L 50.511719 53.449219 C 49.175781 54.03125 47.710938 54.667969 46.289063 55.277344 C 45.78125 51.128906 41.597656 50.953125 40.203125 50.894531 C 40 50.886719 39.800781 50.882813 39.597656 50.882813 C 39.335938 50.882813 39.015625 50.886719 38.660156 50.894531 L 38.660156 61.0625 C 38.660156 61.179688 38.722656 61.285156 38.824219 61.347656 C 38.929688 61.40625 39.058594 61.40625 39.164063 61.347656 L 50.339844 55.082031 C 50.445313 55.027344 50.511719 54.917969 50.511719 54.796875 Z M 54.703125 51.5625 C 54.339844 51.738281 53.796875 51.988281 53.148438 52.28125 L 53.148438 52.78125 C 53.148438 52.902344 53.210938 53.007813 53.3125 53.070313 C 53.417969 53.128906 53.546875 53.128906 53.652344 53.070313 L 58.21875 50.507813 C 56.996094 50.660156 55.808594 51.015625 54.703125 51.5625 Z M 54.703125 51.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 27.777344 22.097656 C 27.808594 22.050781 27.851563 22.007813 27.902344 21.980469 L 39.144531 15.871094 C 39.25 15.8125 39.378906 15.808594 39.484375 15.867188 L 50.617188 21.925781 C 50.71875 21.980469 50.78125 22.089844 50.78125 22.207031 C 50.777344 22.320313 50.710938 22.425781 50.609375 22.484375 L 39.367188 28.59375 C 39.261719 28.648438 39.132813 28.648438 39.027344 28.589844 L 27.894531 22.53125 C 27.792969 22.476563 27.730469 22.371094 27.726563 22.257813 C 27.730469 22.203125 27.746094 22.148438 27.777344 22.097656 M 13.117188 14.121094 C 13.148438 14.070313 13.191406 14.027344 13.242188 14 L 24.363281 7.890625 C 24.464844 7.832031 24.59375 7.832031 24.699219 7.890625 L 35.707031 13.945313 C 35.808594 14.003906 35.871094 14.109375 35.871094 14.226563 C 35.867188 14.34375 35.800781 14.449219 35.699219 14.503906 L 24.578125 20.613281 C 24.476563 20.667969 24.347656 20.667969 24.246094 20.609375 L 13.238281 14.550781 C 13.136719 14.496094 13.070313 14.394531 13.070313 14.277344 C 13.070313 14.222656 13.089844 14.167969 13.117188 14.121094 M 42.742188 14.253906 C 42.773438 14.203125 42.816406 14.164063 42.867188 14.136719 L 53.988281 8.027344 C 54.089844 7.964844 54.21875 7.964844 54.324219 8.023438 L 65.332031 14.082031 C 65.433594 14.136719 65.496094 14.246094 65.496094 14.359375 C 65.492188 14.476563 65.425781 14.582031 65.324219 14.640625 L 54.207031 20.746094 C 54.101563 20.804688 53.972656 20.804688 53.871094 20.746094 L 42.863281 14.6875 C 42.761719 14.632813 42.699219 14.527344 42.695313 14.414063 C 42.699219 14.355469 42.714844 14.300781 42.742188 14.253906 M 27.832031 6.382813 C 27.863281 6.332031 27.90625 6.292969 27.957031 6.261719 L 39.203125 0.253906 C 39.308594 0.195313 39.433594 0.195313 39.542969 0.25 L 50.671875 6.210938 C 50.773438 6.261719 50.839844 6.371094 50.839844 6.484375 C 50.832031 6.601563 50.765625 6.703125 50.664063 6.757813 L 39.421875 12.769531 C 39.316406 12.824219 39.191406 12.820313 39.082031 12.765625 L 27.953125 6.804688 C 27.851563 6.753906 27.785156 6.652344 27.785156 6.535156 C 27.785156 6.480469 27.804688 6.429688 27.832031 6.382813 M 11.375 47.007813 L 22.6875 53.277344 C 22.796875 53.335938 22.925781 53.335938 23.03125 53.277344 C 23.136719 53.21875 23.199219 53.109375 23.199219 52.988281 L 23.199219 43.519531 C 22.703125 43.441406 22.203125 43.402344 21.699219 43.398438 C 18.625 43.398438 16.332031 43.898438 14.488281 44.296875 C 13.195313 44.578125 12.171875 44.800781 11.199219 44.800781 L 11.199219 46.722656 C 11.199219 46.84375 11.265625 46.953125 11.375 47.007813 Z M 37.527344 61.601563 C 37.585938 61.601563 37.640625 61.585938 37.699219 61.554688 C 37.800781 61.5 37.867188 61.390625 37.867188 61.269531 L 37.867188 51.160156 C 36.800781 51.179688 35.683594 51.203125 34.710938 51.203125 C 33.40625 51.203125 32.851563 51.164063 32.625 51.140625 C 32.300781 50.90625 31.664063 50.019531 31.234375 49.414063 C 30.125 47.859375 28.496094 45.582031 25.867188 44.324219 L 25.867188 55.007813 C 25.867188 55.125 25.929688 55.234375 26.042969 55.292969 L 37.355469 61.558594 C 37.40625 61.585938 37.46875 61.601563 37.527344 61.601563 Z M 52.535156 55.003906 L 52.535156 53.65625 C 51.183594 54.238281 49.695313 54.875 48.257813 55.484375 C 47.746094 51.335938 43.507813 51.160156 42.097656 51.101563 C 41.894531 51.09375 41.691406 51.089844 41.484375 51.089844 C 41.222656 51.089844 40.894531 51.097656 40.535156 51.101563 L 40.535156 61.269531 C 40.535156 61.390625 40.597656 61.496094 40.703125 61.554688 C 40.808594 61.613281 40.9375 61.613281 41.046875 61.554688 L 52.359375 55.289063 C 52.46875 55.234375 52.535156 55.125 52.535156 55.003906 Z M 56.777344 51.769531 C 56.410156 51.945313 55.859375 52.195313 55.199219 52.488281 L 55.199219 52.992188 C 55.199219 53.113281 55.265625 53.21875 55.367188 53.277344 C 55.476563 53.335938 55.605469 53.335938 55.714844 53.277344 L 60.335938 50.714844 C 59.097656 50.867188 57.898438 51.222656 56.777344 51.769531 Z M 56.777344 51.769531 "/>
 </g>
 <mask id="mask2">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip3">
-  <rect x="0" y="0" width="65" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.292969 58.742188 C 49.191406 57.078125 54.195313 54.917969 55.90625 54.082031 C 57.507813 53.296875 59.191406 52.867188 60.652344 52.867188 C 62.019531 52.867188 63.039063 53.257813 63.382813 53.90625 C 63.414063 53.976563 64.292969 55.953125 60.75 58.054688 C 58.328125 59.484375 55.90625 60.902344 53.476563 62.3125 C 49.820313 64.4375 46.933594 66.113281 45.597656 67.011719 C 44.523438 67.730469 42.964844 67.824219 41.722656 67.824219 C 41.03125 67.824219 40.328125 67.792969 39.625 67.757813 C 38.867188 67.714844 38.105469 67.6875 37.34375 67.683594 C 35.550781 67.683594 32.890625 67.882813 30.078125 68.101563 C 28.75 68.199219 27.464844 68.300781 26.230469 68.382813 L 26.015625 68.390625 C 22.464844 68.390625 17.734375 64.164063 16.367188 62.867188 C 15.84375 62.371094 15.46875 62.019531 15.164063 61.75 C 12.195313 59.117188 9.132813 57.890625 5.53125 57.890625 C 3.554688 57.890625 2.152344 57.886719 1.382813 57.882813 L 1.382813 47.390625 L 9.679688 47.390625 C 10.9375 47.390625 12.132813 47.128906 13.511719 46.824219 C 15.222656 46.449219 17.320313 45.992188 20.054688 45.992188 C 23.8125 45.992188 25.621094 48.566406 27.222656 50.835938 C 28.226563 52.257813 29.09375 53.484375 30.316406 53.683594 C 30.789063 53.757813 31.578125 53.792969 32.882813 53.792969 C 34.070313 53.792969 35.480469 53.761719 36.703125 53.734375 L 37.132813 53.726563 C 37.960938 53.703125 38.789063 53.6875 39.613281 53.683594 C 39.804688 53.683594 39.960938 53.6875 40.078125 53.691406 C 43.183594 53.824219 43.496094 54.742188 43.566406 55.835938 C 43.59375 56.257813 43.546875 56.664063 43.433594 57.039063 L 42.515625 59.570313 C 42.515625 59.570313 44.335938 59.152344 45.292969 58.742188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.25 58.953125 C 51.195313 57.285156 56.261719 55.125 57.992188 54.289063 C 59.613281 53.507813 61.320313 53.078125 62.800781 53.078125 C 64.183594 53.078125 65.214844 53.464844 65.5625 54.117188 C 65.59375 54.183594 66.484375 56.160156 62.894531 58.261719 C 60.449219 59.691406 57.992188 61.109375 55.535156 62.519531 C 51.832031 64.644531 48.914063 66.324219 47.558594 67.21875 C 46.472656 67.941406 44.890625 68.03125 43.636719 68.03125 C 42.9375 68.03125 42.222656 68 41.515625 67.96875 C 40.742188 67.921875 39.972656 67.898438 39.203125 67.890625 C 37.386719 67.890625 34.695313 68.09375 31.847656 68.308594 C 30.503906 68.410156 29.203125 68.507813 27.957031 68.589844 L 27.734375 68.601563 C 24.140625 68.601563 19.351563 64.371094 17.96875 63.078125 C 17.4375 62.578125 17.058594 62.230469 16.753906 61.957031 C 13.746094 59.324219 10.648438 58.101563 7 58.101563 C 5 58.101563 3.578125 58.09375 2.800781 58.089844 L 2.800781 47.601563 L 11.199219 47.601563 C 12.472656 47.601563 13.679688 47.335938 15.078125 47.035156 C 16.808594 46.660156 18.933594 46.199219 21.699219 46.199219 C 25.503906 46.199219 27.335938 48.773438 28.960938 51.042969 C 29.972656 52.464844 30.851563 53.695313 32.089844 53.890625 C 32.566406 53.96875 33.367188 54 34.6875 54 C 35.890625 54 37.320313 53.972656 38.554688 53.945313 L 38.992188 53.933594 C 39.828125 53.910156 40.664063 53.898438 41.5 53.890625 C 41.695313 53.890625 41.851563 53.894531 41.972656 53.898438 C 45.113281 54.03125 45.429688 54.949219 45.503906 56.046875 C 45.53125 56.464844 45.484375 56.871094 45.367188 57.25 L 44.4375 59.78125 C 44.4375 59.78125 46.28125 59.363281 47.25 58.953125 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 38.992188 44.832031 C 39.050781 44.832031 39.113281 44.816406 39.164063 44.789063 L 50.339844 38.519531 C 50.445313 38.464844 50.511719 38.355469 50.511719 38.234375 L 50.511719 25.660156 C 50.511719 25.539063 50.445313 25.429688 50.339844 25.371094 C 50.234375 25.316406 50.105469 25.316406 50 25.371094 L 38.824219 31.640625 C 38.722656 31.695313 38.660156 31.808594 38.660156 31.925781 L 38.660156 44.5 C 38.660156 44.621094 38.722656 44.726563 38.824219 44.789063 C 38.878906 44.816406 38.933594 44.832031 38.992188 44.832031 M 38.992188 61.390625 C 39.050781 61.390625 39.113281 61.378906 39.164063 61.347656 L 50.339844 55.082031 C 50.445313 55.027344 50.511719 54.917969 50.511719 54.796875 L 50.511719 42.222656 C 50.511719 42.101563 50.445313 41.988281 50.339844 41.933594 C 50.234375 41.875 50.105469 41.875 50 41.933594 L 38.824219 48.199219 C 38.722656 48.257813 38.660156 48.367188 38.660156 48.488281 L 38.660156 61.0625 C 38.660156 61.183594 38.722656 61.289063 38.824219 61.347656 C 38.878906 61.378906 38.933594 61.390625 38.992188 61.390625 M 53.480469 36.550781 C 53.539063 36.550781 53.601563 36.535156 53.652344 36.507813 L 64.828125 30.238281 C 64.933594 30.183594 65 30.074219 65 29.953125 L 65 17.378906 C 65 17.257813 64.933594 17.148438 64.828125 17.089844 C 64.71875 17.035156 64.59375 17.035156 64.484375 17.089844 L 53.3125 23.359375 C 53.207031 23.417969 53.144531 23.527344 53.144531 23.644531 L 53.144531 36.222656 C 53.144531 36.339844 53.207031 36.445313 53.3125 36.507813 C 53.363281 36.535156 53.421875 36.550781 53.480469 36.550781 M 53.480469 53.109375 C 53.539063 53.109375 53.601563 53.097656 53.652344 53.066406 L 64.828125 46.800781 C 64.933594 46.746094 65 46.636719 65 46.515625 L 65 33.941406 C 65 33.820313 64.933594 33.710938 64.828125 33.652344 C 64.71875 33.59375 64.59375 33.59375 64.484375 33.652344 L 53.3125 39.917969 C 53.207031 39.976563 53.144531 40.085938 53.144531 40.207031 L 53.144531 52.78125 C 53.144531 52.902344 53.207031 53.007813 53.3125 53.066406 C 53.363281 53.097656 53.421875 53.109375 53.480469 53.109375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 40.871094 45.039063 C 40.933594 45.039063 40.992188 45.027344 41.046875 44.996094 L 52.359375 38.730469 C 52.46875 38.675781 52.535156 38.5625 52.535156 38.445313 L 52.535156 25.871094 C 52.535156 25.75 52.464844 25.636719 52.359375 25.582031 C 52.25 25.523438 52.121094 25.523438 52.015625 25.582031 L 40.703125 31.847656 C 40.597656 31.90625 40.535156 32.015625 40.535156 32.132813 L 40.535156 44.710938 C 40.535156 44.832031 40.597656 44.9375 40.703125 44.996094 C 40.757813 45.027344 40.8125 45.039063 40.871094 45.039063 M 40.871094 61.601563 C 40.933594 61.601563 40.992188 61.585938 41.046875 61.554688 L 52.359375 55.289063 C 52.46875 55.234375 52.535156 55.125 52.535156 55.003906 L 52.535156 42.429688 C 52.535156 42.308594 52.464844 42.199219 52.359375 42.140625 C 52.25 42.082031 52.121094 42.082031 52.015625 42.140625 L 40.703125 48.40625 C 40.597656 48.464844 40.535156 48.574219 40.535156 48.695313 L 40.535156 61.269531 C 40.535156 61.390625 40.597656 61.496094 40.703125 61.554688 C 40.757813 61.585938 40.8125 61.601563 40.871094 61.601563 M 55.539063 36.757813 C 55.597656 36.757813 55.660156 36.746094 55.714844 36.714844 L 67.027344 30.449219 C 67.132813 30.394531 67.199219 30.285156 67.199219 30.164063 L 67.199219 17.589844 C 67.199219 17.46875 67.132813 17.355469 67.023438 17.300781 C 66.917969 17.242188 66.789063 17.242188 66.679688 17.300781 L 55.367188 23.566406 C 55.261719 23.625 55.199219 23.734375 55.199219 23.851563 L 55.199219 36.429688 C 55.199219 36.550781 55.261719 36.65625 55.367188 36.714844 C 55.417969 36.742188 55.476563 36.757813 55.539063 36.757813 M 55.539063 53.320313 C 55.597656 53.320313 55.660156 53.304688 55.714844 53.277344 L 67.027344 47.007813 C 67.132813 46.953125 67.199219 46.84375 67.199219 46.722656 L 67.199219 34.148438 C 67.199219 34.027344 67.132813 33.917969 67.023438 33.859375 C 66.917969 33.804688 66.789063 33.804688 66.679688 33.859375 L 55.367188 40.125 C 55.261719 40.183594 55.199219 40.292969 55.199219 40.414063 L 55.199219 52.988281 C 55.199219 53.109375 55.261719 53.214844 55.367188 53.277344 C 55.417969 53.304688 55.476563 53.320313 55.539063 53.320313 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 35.6875 44.832031 C 35.628906 44.832031 35.570313 44.816406 35.515625 44.789063 L 24.339844 38.519531 C 24.234375 38.464844 24.167969 38.355469 24.167969 38.234375 L 24.167969 25.660156 C 24.167969 25.542969 24.230469 25.433594 24.339844 25.371094 C 24.445313 25.316406 24.574219 25.316406 24.683594 25.371094 L 35.855469 31.640625 C 35.960938 31.699219 36.023438 31.808594 36.023438 31.925781 L 36.023438 44.5 C 36.023438 44.621094 35.957031 44.730469 35.855469 44.789063 C 35.804688 44.816406 35.746094 44.832031 35.6875 44.832031 M 35.6875 61.390625 C 35.628906 61.390625 35.570313 61.378906 35.515625 61.347656 L 24.339844 55.082031 C 24.234375 55.027344 24.167969 54.917969 24.167969 54.796875 L 24.167969 42.222656 C 24.167969 42.105469 24.230469 41.996094 24.339844 41.933594 C 24.445313 41.875 24.574219 41.875 24.683594 41.933594 L 35.855469 48.199219 C 35.960938 48.257813 36.023438 48.367188 36.023438 48.488281 L 36.023438 61.0625 C 36.023438 61.179688 35.957031 61.289063 35.855469 61.347656 C 35.804688 61.375 35.746094 61.390625 35.6875 61.390625 M 21.199219 36.550781 C 21.140625 36.550781 21.082031 36.535156 21.027344 36.507813 L 9.851563 30.238281 C 9.746094 30.183594 9.679688 30.074219 9.679688 29.953125 L 9.679688 17.378906 C 9.679688 17.261719 9.746094 17.15625 9.855469 17.089844 C 9.960938 17.035156 10.089844 17.035156 10.195313 17.089844 L 21.371094 23.359375 C 21.472656 23.417969 21.535156 23.527344 21.535156 23.644531 L 21.535156 36.222656 C 21.535156 36.339844 21.472656 36.449219 21.371094 36.507813 C 21.316406 36.535156 21.261719 36.550781 21.199219 36.550781 M 21.199219 53.109375 C 21.140625 53.109375 21.082031 53.097656 21.027344 53.066406 L 9.851563 46.800781 C 9.746094 46.746094 9.679688 46.636719 9.679688 46.515625 L 9.679688 33.941406 C 9.679688 33.824219 9.746094 33.714844 9.855469 33.652344 C 9.960938 33.59375 10.089844 33.59375 10.195313 33.652344 L 21.371094 39.917969 C 21.472656 39.980469 21.535156 40.085938 21.535156 40.207031 L 21.535156 52.78125 C 21.535156 52.898438 21.472656 53.007813 21.371094 53.066406 C 21.316406 53.097656 21.261719 53.109375 21.199219 53.109375 M 26.054688 21.890625 C 26.085938 21.839844 26.128906 21.800781 26.179688 21.773438 L 37.285156 15.660156 C 37.390625 15.601563 37.519531 15.601563 37.621094 15.660156 L 48.617188 21.71875 C 48.71875 21.773438 48.78125 21.878906 48.78125 21.996094 C 48.777344 22.113281 48.710938 22.21875 48.609375 22.277344 L 37.503906 28.382813 C 37.398438 28.441406 37.273438 28.4375 37.171875 28.382813 L 26.175781 22.320313 C 26.074219 22.269531 26.007813 22.164063 26.007813 22.046875 C 26.011719 21.992188 26.027344 21.9375 26.054688 21.890625 M 11.574219 13.910156 C 11.605469 13.863281 11.648438 13.820313 11.699219 13.792969 L 22.683594 7.683594 C 22.785156 7.625 22.910156 7.621094 23.015625 7.679688 L 33.886719 13.738281 C 33.988281 13.792969 34.054688 13.902344 34.050781 14.019531 C 34.046875 14.136719 33.984375 14.242188 33.882813 14.296875 L 22.898438 20.40625 C 22.792969 20.460938 22.671875 20.460938 22.566406 20.402344 L 11.691406 14.34375 C 11.59375 14.289063 11.53125 14.183594 11.527344 14.070313 C 11.53125 14.015625 11.546875 13.960938 11.574219 13.910156 M 40.839844 14.046875 C 40.871094 13.996094 40.914063 13.957031 40.964844 13.925781 L 51.949219 7.816406 C 52.050781 7.757813 52.175781 7.757813 52.28125 7.816406 L 63.152344 13.871094 C 63.253906 13.929688 63.316406 14.035156 63.316406 14.152344 C 63.3125 14.269531 63.246094 14.375 63.148438 14.429688 L 52.164063 20.539063 C 52.058594 20.59375 51.933594 20.59375 51.832031 20.535156 L 40.957031 14.476563 C 40.859375 14.421875 40.796875 14.320313 40.792969 14.203125 C 40.796875 14.148438 40.8125 14.09375 40.839844 14.046875 M 26.109375 6.171875 C 26.140625 6.125 26.183594 6.082031 26.234375 6.054688 L 37.34375 0.046875 C 37.445313 -0.015625 37.574219 -0.015625 37.679688 0.0429688 L 48.671875 6 C 48.773438 6.054688 48.835938 6.160156 48.835938 6.277344 C 48.832031 6.390625 48.765625 6.496094 48.664063 6.550781 L 37.558594 12.558594 C 37.453125 12.613281 37.328125 12.613281 37.226563 12.558594 L 26.230469 6.597656 C 26.128906 6.546875 26.066406 6.441406 26.0625 6.328125 C 26.066406 6.273438 26.082031 6.21875 26.109375 6.171875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 37.527344 45.039063 C 37.46875 45.039063 37.40625 45.023438 37.351563 44.996094 L 26.039063 38.730469 C 25.933594 38.675781 25.867188 38.5625 25.863281 38.445313 L 25.863281 25.871094 C 25.863281 25.75 25.929688 25.644531 26.039063 25.582031 C 26.148438 25.523438 26.277344 25.523438 26.386719 25.582031 L 37.699219 31.847656 C 37.804688 31.90625 37.867188 32.015625 37.867188 32.132813 L 37.867188 44.710938 C 37.867188 44.828125 37.800781 44.9375 37.699219 44.996094 C 37.644531 45.023438 37.585938 45.039063 37.527344 45.039063 M 37.527344 61.601563 C 37.46875 61.601563 37.40625 61.585938 37.351563 61.554688 L 26.039063 55.289063 C 25.933594 55.234375 25.867188 55.125 25.863281 55.003906 L 25.863281 42.429688 C 25.863281 42.3125 25.929688 42.203125 26.039063 42.140625 C 26.148438 42.082031 26.277344 42.082031 26.386719 42.140625 L 37.699219 48.40625 C 37.804688 48.46875 37.867188 48.578125 37.867188 48.695313 L 37.867188 61.269531 C 37.867188 61.390625 37.800781 61.5 37.699219 61.554688 C 37.644531 61.585938 37.585938 61.601563 37.527344 61.601563 M 22.863281 36.757813 C 22.800781 36.757813 22.742188 36.742188 22.6875 36.714844 L 11.375 30.449219 C 11.265625 30.394531 11.199219 30.285156 11.199219 30.164063 L 11.199219 17.589844 C 11.199219 17.46875 11.265625 17.363281 11.375 17.300781 C 11.484375 17.242188 11.613281 17.242188 11.722656 17.300781 L 23.03125 23.566406 C 23.136719 23.625 23.199219 23.734375 23.199219 23.851563 L 23.199219 36.429688 C 23.199219 36.546875 23.136719 36.65625 23.03125 36.714844 C 22.980469 36.742188 22.921875 36.757813 22.863281 36.757813 M 22.863281 53.320313 C 22.800781 53.320313 22.742188 53.304688 22.6875 53.277344 L 11.375 47.007813 C 11.265625 46.953125 11.199219 46.84375 11.199219 46.722656 L 11.199219 34.148438 C 11.199219 34.03125 11.265625 33.921875 11.375 33.859375 C 11.484375 33.804688 11.613281 33.804688 11.722656 33.859375 L 23.03125 40.125 C 23.136719 40.1875 23.199219 40.296875 23.199219 40.414063 L 23.199219 52.988281 C 23.199219 53.109375 23.136719 53.21875 23.03125 53.277344 C 22.980469 53.304688 22.921875 53.320313 22.863281 53.320313 M 27.777344 22.097656 C 27.808594 22.050781 27.851563 22.007813 27.902344 21.980469 L 39.144531 15.871094 C 39.25 15.8125 39.378906 15.808594 39.484375 15.867188 L 50.617188 21.925781 C 50.71875 21.980469 50.78125 22.089844 50.78125 22.207031 C 50.777344 22.320313 50.710938 22.425781 50.609375 22.484375 L 39.367188 28.59375 C 39.261719 28.648438 39.132813 28.648438 39.027344 28.589844 L 27.894531 22.53125 C 27.792969 22.476563 27.730469 22.371094 27.726563 22.257813 C 27.730469 22.203125 27.746094 22.148438 27.777344 22.097656 M 13.117188 14.121094 C 13.148438 14.070313 13.191406 14.027344 13.242188 14 L 24.363281 7.890625 C 24.464844 7.832031 24.59375 7.832031 24.699219 7.890625 L 35.707031 13.945313 C 35.808594 14.003906 35.871094 14.109375 35.871094 14.226563 C 35.867188 14.34375 35.800781 14.449219 35.699219 14.503906 L 24.578125 20.613281 C 24.476563 20.667969 24.347656 20.667969 24.246094 20.609375 L 13.238281 14.550781 C 13.136719 14.496094 13.070313 14.394531 13.070313 14.277344 C 13.070313 14.222656 13.089844 14.167969 13.117188 14.121094 M 42.742188 14.253906 C 42.773438 14.203125 42.816406 14.164063 42.867188 14.136719 L 53.988281 8.027344 C 54.089844 7.964844 54.21875 7.964844 54.324219 8.023438 L 65.332031 14.082031 C 65.433594 14.136719 65.496094 14.246094 65.496094 14.359375 C 65.492188 14.476563 65.425781 14.582031 65.324219 14.640625 L 54.207031 20.746094 C 54.101563 20.804688 53.972656 20.804688 53.871094 20.746094 L 42.863281 14.6875 C 42.761719 14.632813 42.699219 14.527344 42.695313 14.414063 C 42.699219 14.355469 42.714844 14.300781 42.742188 14.253906 M 27.832031 6.382813 C 27.863281 6.332031 27.90625 6.292969 27.957031 6.261719 L 39.203125 0.253906 C 39.308594 0.195313 39.433594 0.195313 39.542969 0.25 L 50.671875 6.210938 C 50.773438 6.261719 50.839844 6.371094 50.839844 6.484375 C 50.832031 6.601563 50.765625 6.703125 50.664063 6.757813 L 39.421875 12.769531 C 39.316406 12.824219 39.191406 12.820313 39.082031 12.765625 L 27.953125 6.804688 C 27.851563 6.753906 27.785156 6.652344 27.785156 6.535156 C 27.785156 6.480469 27.804688 6.429688 27.832031 6.382813 "/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 26.015625 69.089844 C 22.3125 69.089844 17.703125 65.097656 15.894531 63.378906 C 15.507813 63.003906 15.109375 62.636719 14.710938 62.273438 C 11.875 59.761719 8.957031 58.589844 5.53125 58.589844 C 2.390625 58.589844 0.691406 58.578125 0.691406 58.578125 L 0.691406 46.691406 L 9.679688 46.691406 C 10.867188 46.691406 12.027344 46.433594 13.375 46.140625 C 15.09375 45.761719 17.238281 45.292969 20.054688 45.292969 C 24.167969 45.292969 26.175781 48.140625 27.785156 50.429688 C 28.699219 51.722656 29.488281 52.839844 30.425781 52.992188 C 30.851563 53.058594 31.628906 53.09375 32.878906 53.09375 C 34.136719 53.09375 35.636719 53.058594 36.902344 53.03125 C 37.804688 53.007813 38.707031 52.988281 39.609375 52.984375 C 39.8125 52.984375 39.980469 52.984375 40.105469 52.992188 C 42.964844 53.113281 44.128906 53.898438 44.253906 55.792969 C 44.285156 56.296875 44.230469 56.785156 44.09375 57.246094 L 43.660156 58.679688 L 45.023438 58.097656 C 48.199219 56.738281 53.796875 54.332031 55.601563 53.449219 C 57.296875 52.625 59.085938 52.167969 60.648438 52.167969 C 62.300781 52.167969 63.515625 52.683594 63.988281 53.578125 C 64 53.605469 65.289063 56.171875 61.09375 58.660156 C 58.671875 60.089844 56.246094 61.507813 53.816406 62.917969 C 50.167969 65.039063 47.289063 66.714844 45.972656 67.597656 C 44.746094 68.421875 43.054688 68.527344 41.71875 68.527344 C 40.996094 68.527344 40.253906 68.492188 39.519531 68.457031 C 38.792969 68.414063 38.066406 68.390625 37.335938 68.382813 C 35.554688 68.382813 32.882813 68.585938 30.054688 68.804688 C 28.792969 68.902344 27.507813 69 26.273438 69.082031 C 26.1875 69.089844 26.101563 69.089844 26.015625 69.089844 Z M 26.015625 69.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 27.734375 69.300781 C 23.988281 69.300781 19.324219 65.304688 17.492188 63.589844 C 17.097656 63.214844 16.695313 62.847656 16.292969 62.484375 C 13.421875 59.96875 10.46875 58.800781 7 58.800781 C 3.820313 58.800781 2.101563 58.789063 2.101563 58.789063 L 2.101563 46.898438 L 11.199219 46.898438 C 12.402344 46.898438 13.578125 46.644531 14.9375 46.347656 C 16.679688 45.96875 18.851563 45.5 21.699219 45.5 C 25.863281 45.5 27.894531 48.347656 29.527344 50.636719 C 30.453125 51.929688 31.25 53.046875 32.203125 53.199219 C 32.628906 53.269531 33.417969 53.300781 34.683594 53.300781 C 35.957031 53.300781 37.476563 53.265625 38.757813 53.238281 C 39.671875 53.214844 40.585938 53.199219 41.5 53.191406 C 41.703125 53.191406 41.871094 53.195313 42 53.199219 C 44.894531 53.320313 46.074219 54.105469 46.199219 56 C 46.230469 56.503906 46.175781 56.992188 46.035156 57.457031 L 45.597656 58.886719 L 46.976563 58.304688 C 50.191406 56.949219 55.859375 54.542969 57.6875 53.660156 C 59.402344 52.832031 61.214844 52.375 62.796875 52.375 C 64.464844 52.375 65.699219 52.890625 66.175781 53.789063 C 66.1875 53.816406 67.492188 56.378906 63.246094 58.867188 C 60.792969 60.296875 58.339844 61.71875 55.875 63.128906 C 52.183594 65.25 49.269531 66.921875 47.9375 67.804688 C 46.695313 68.628906 44.984375 68.734375 43.632813 68.734375 C 42.898438 68.734375 42.148438 68.699219 41.40625 68.664063 C 40.671875 68.621094 39.933594 68.597656 39.195313 68.589844 C 37.394531 68.589844 34.6875 68.796875 31.824219 69.011719 C 30.546875 69.109375 29.246094 69.210938 27.996094 69.292969 C 27.910156 69.296875 27.824219 69.300781 27.734375 69.300781 Z M 27.734375 69.300781 "/>
 <use xlink:href="#surface11" mask="url(#mask2)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 26.015625 69.792969 C 22.390625 69.792969 18.046875 66.382813 15.421875 63.890625 C 14.96875 63.460938 14.574219 63.085938 14.253906 62.800781 C 11.554688 60.40625 8.78125 59.292969 5.53125 59.292969 C 2.386719 59.292969 0.6875 59.277344 0.6875 59.277344 C 0.304688 59.277344 0 58.964844 0 58.578125 L 0 46.691406 C 0 46.304688 0.308594 45.992188 0.691406 45.992188 L 9.679688 45.992188 C 10.792969 45.992188 11.917969 45.742188 13.226563 45.457031 C 14.980469 45.070313 17.164063 44.589844 20.054688 44.589844 C 24.523438 44.589844 26.734375 47.730469 28.351563 50.023438 C 29.136719 51.140625 29.878906 52.195313 30.535156 52.300781 C 31.484375 52.453125 34.664063 52.382813 36.988281 52.328125 C 38.390625 52.296875 39.601563 52.269531 40.132813 52.292969 C 42.40625 52.390625 44.757813 52.875 44.945313 55.746094 C 44.988281 56.394531 44.902344 56.96875 44.753906 57.453125 C 47.792969 56.15625 53.5 53.703125 55.304688 52.820313 C 59.242188 50.898438 63.425781 51.015625 64.601563 53.25 C 64.980469 53.972656 65.617188 56.792969 61.445313 59.265625 C 59.023438 60.695313 56.59375 62.117188 54.160156 63.527344 C 50.523438 65.644531 47.652344 67.3125 46.355469 68.179688 C 44.539063 69.402344 41.953125 69.273438 39.453125 69.15625 C 38.730469 69.121094 38.019531 69.085938 37.339844 69.085938 C 35.589844 69.085938 32.925781 69.289063 30.109375 69.503906 C 28.847656 69.601563 27.558594 69.699219 26.320313 69.78125 C 26.21875 69.789063 26.117188 69.792969 26.015625 69.792969 Z M 1.382813 57.882813 C 2.152344 57.886719 3.554688 57.890625 5.53125 57.890625 C 9.085938 57.890625 12.238281 59.152344 15.164063 61.75 C 15.492188 62.039063 15.898438 62.425781 16.367188 62.871094 C 18.738281 65.117188 23.175781 68.636719 26.230469 68.382813 C 27.464844 68.300781 28.746094 68.203125 30.007813 68.105469 C 32.851563 67.890625 35.535156 67.683594 37.339844 67.683594 C 38.042969 67.683594 38.777344 67.71875 39.519531 67.753906 C 41.796875 67.863281 44.15625 67.976563 45.59375 67.011719 C 46.925781 66.121094 49.816406 64.4375 53.472656 62.3125 C 55.710938 61.011719 58.210938 59.558594 60.746094 58.054688 C 62.84375 56.8125 64 55.085938 63.382813 53.910156 C 62.640625 52.5 59.375 52.390625 55.90625 54.082031 C 53.382813 55.3125 43.75 59.402344 43.339844 59.574219 C 43.132813 59.753906 42.839844 59.789063 42.59375 59.671875 C 42.351563 59.550781 42.195313 59.296875 42.203125 59.019531 C 42.210938 58.746094 42.375 58.5 42.628906 58.394531 C 42.667969 58.359375 43.671875 57.457031 43.566406 55.839844 C 43.480469 54.570313 42.886719 53.808594 40.078125 53.691406 C 39.589844 53.667969 38.398438 53.699219 37.019531 53.730469 C 34.378906 53.789063 31.390625 53.855469 30.316406 53.683594 C 29.089844 53.484375 28.226563 52.257813 27.226563 50.835938 C 25.703125 48.679688 23.8125 45.992188 20.054688 45.992188 C 17.3125 45.992188 15.296875 46.433594 13.519531 46.824219 C 12.132813 47.128906 10.9375 47.390625 9.679688 47.390625 L 1.382813 47.390625 Z M 1.382813 57.882813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 32.699219 60.714844 C 29.96875 60.714844 28.019531 60.386719 26.921875 59.410156 L 22.667969 55.636719 L 23.578125 54.582031 L 27.832031 58.359375 C 29.289063 59.644531 35.546875 59.164063 37.90625 59.007813 C 41.660156 58.753906 42.050781 58.566406 44.324219 57.636719 C 44.679688 57.492188 45.078125 57.667969 45.222656 58.023438 C 45.363281 58.378906 45.195313 58.785156 44.84375 58.933594 C 42.441406 59.914063 41.878906 60.144531 38 60.402344 C 36.542969 60.5 33.871094 60.714844 32.699219 60.714844 Z M 32.699219 60.714844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 27.734375 70 C 24.066406 70 19.667969 66.589844 17.011719 64.097656 C 16.550781 63.667969 16.152344 63.292969 15.828125 63.011719 C 13.09375 60.617188 10.289063 59.5 7 59.5 C 3.816406 59.5 2.09375 59.488281 2.09375 59.488281 C 1.710938 59.484375 1.398438 59.171875 1.398438 58.789063 L 1.398438 46.898438 C 1.398438 46.511719 1.714844 46.199219 2.101563 46.199219 L 11.199219 46.199219 C 12.324219 46.199219 13.464844 45.953125 14.789063 45.664063 C 16.566406 45.28125 18.777344 44.800781 21.699219 44.800781 C 26.222656 44.800781 28.464844 47.9375 30.097656 50.230469 C 30.894531 51.347656 31.648438 52.402344 32.3125 52.507813 C 33.269531 52.664063 36.492188 52.589844 38.84375 52.539063 C 40.261719 52.507813 41.488281 52.480469 42.027344 52.5 C 44.328125 52.597656 46.707031 53.082031 46.898438 55.957031 C 46.941406 56.605469 46.855469 57.175781 46.707031 57.664063 C 49.78125 56.363281 55.558594 53.910156 57.386719 53.03125 C 61.371094 51.105469 65.605469 51.222656 66.796875 53.460938 C 67.179688 54.179688 67.824219 57 63.601563 59.472656 C 61.148438 60.902344 58.691406 62.324219 56.226563 63.738281 C 52.546875 65.851563 49.636719 67.523438 48.324219 68.390625 C 46.488281 69.609375 43.867188 69.480469 41.335938 69.363281 C 40.609375 69.328125 39.886719 69.292969 39.199219 69.292969 C 37.425781 69.292969 34.734375 69.496094 31.878906 69.714844 C 30.601563 69.808594 29.296875 69.910156 28.042969 69.992188 C 27.941406 69.996094 27.839844 70 27.734375 70 Z M 2.800781 58.089844 C 3.578125 58.09375 5 58.101563 7 58.101563 C 10.597656 58.101563 13.789063 59.363281 16.75 61.957031 C 17.082031 62.25 17.496094 62.632813 17.96875 63.078125 C 20.367188 65.324219 24.863281 68.84375 27.953125 68.59375 C 29.203125 68.511719 30.5 68.414063 31.777344 68.316406 C 34.65625 68.097656 37.375 67.890625 39.199219 67.890625 C 39.910156 67.890625 40.65625 67.925781 41.40625 67.964844 C 43.710938 68.074219 46.097656 68.1875 47.554688 67.222656 C 48.90625 66.328125 51.828125 64.648438 55.53125 62.519531 C 57.796875 61.21875 60.328125 59.765625 62.894531 58.265625 C 65.015625 57.019531 66.1875 55.296875 65.5625 54.117188 C 64.808594 52.707031 61.503906 52.597656 57.992188 54.289063 C 55.441406 55.523438 45.6875 59.609375 45.273438 59.785156 C 45.0625 59.960938 44.765625 60 44.519531 59.878906 C 44.269531 59.757813 44.117188 59.503906 44.125 59.230469 C 44.128906 58.953125 44.296875 58.710938 44.550781 58.601563 C 44.589844 58.570313 45.609375 57.664063 45.5 56.046875 C 45.417969 54.777344 44.8125 54.019531 41.972656 53.902344 C 41.476563 53.878906 40.269531 53.90625 38.875 53.9375 C 36.203125 54 33.175781 54.066406 32.089844 53.894531 C 30.847656 53.695313 29.972656 52.464844 28.960938 51.046875 C 27.417969 48.886719 25.503906 46.199219 21.699219 46.199219 C 18.925781 46.199219 16.886719 46.640625 15.085938 47.035156 C 13.683594 47.339844 12.472656 47.601563 11.199219 47.601563 L 2.800781 47.601563 Z M 2.800781 58.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 34.5 60.921875 C 31.738281 60.921875 29.765625 60.59375 28.652344 59.617188 L 24.347656 55.84375 L 25.265625 54.792969 L 29.578125 58.566406 C 31.046875 59.855469 37.386719 59.371094 39.773438 59.214844 C 43.574219 58.964844 43.96875 58.773438 46.269531 57.84375 C 46.628906 57.703125 47.035156 57.875 47.179688 58.230469 C 47.324219 58.589844 47.152344 58.996094 46.796875 59.140625 C 44.363281 60.125 43.792969 60.351563 39.867188 60.609375 C 38.394531 60.707031 35.6875 60.921875 34.5 60.921875 Z M 34.5 60.921875 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureManagedApplications.png b/dist/Management/AzureManagedApplications.png
index 9e9eade3..1947978e 100644
Binary files a/dist/Management/AzureManagedApplications.png and b/dist/Management/AzureManagedApplications.png differ
diff --git a/dist/Management/AzureManagedApplications.puml b/dist/Management/AzureManagedApplications.puml
index 43b6fbec..c0cf7bc5 100644
--- a/dist/Management/AzureManagedApplications.puml
+++ b/dist/Management/AzureManagedApplications.puml
@@ -1,12 +1,12 @@
-sprite $AzureManagedApplications [65x70/16z] {
-fPGBcYCX28HLG46v_tat9iHrM6AwPslUazJ_bLHBkg12aFv31OdezuYCP2g_jvlmFWBefp3Vj_y70YWItXh0hmE0rLOSeXWNlXI_lRjiTjXYbGl1BI_izWH1
-fw7T8t1bEy_3x3usv6WY19UAAq6s616_XI0EPyf-_d7nTe88xWLnyLW2Flhv6y8V7u9E_sQZ1IYrWf72uWdjnHrEmZjWHs2sqD6ZQ7PayO1gOotXsCnOB1kB
-UC0KvbEhwzNIH2B0b9jcr5mcaH1WAYw2Bnv5pW1qf_3vwmL0iV-YNyePhW78AbrD6f6aNWNKQXxO3izo1r0f6sAhxWx04APiDWzO8WSmmMOF0FN7DWW0Xa2H
-2D3SQeKGK1ziYG2CmKAv0I2tKAhTrek0cb-zxYtO1gFl03iyiAlHMYlb2m1XFHOEiExH4R1w3G2hU8m1QtPqUX9jXuS01hiJ9u2500zOpTUh2mKSW6ui5B1A
-Du0rJnS0C5iWGnXWDLyF09fw0N1j-58V65xDVmHaejga3vqIGjg6iJVl0KtUUbh7w5D3HwMj46i-0aoFgNVXjsIe4Mf9rdm4OD3EiSPu4sPvBLuec9810kcW
-mtMsNay0KQ4Je4tx2S1T6pqr-slCl06uGSgbd04ybBazX5HdNuqNe27oipNs04_OrHiRe53NMPfqvG0GI_g3C8DGRaE7l8_v0J0adCdp76hs8w1hZm1DXexz
-bH4V8IPqzNOP8xyVvUupTnt-kR3i-rjAeZR5NIVR6qOtZQ7_s6Kev_HNmEedrwt6rqKJNt67z5D5hdLgwIdzgshdFidIjvmYeOvBTYdfWq37XVIOFgiCbM_f
-qr5PjDzFxqSfiVsGtlMvjlDB-lnIrPek2cmLZ2xSQgLQMsiLKw0_
+sprite $AzureManagedApplications [70x70/16z] {
+fPUDZkmW28KBWehu_izxRvSuP5rAsypP_vLy8uTJaZaU2GYFRmN4pDzo2fi8lcHyoK7-BVgQOIfl8SIXNdlovLsAEGabP1J2ntwKbPLjHlZpBtmIie13iF-P
+CrpuUN72y6evOsy2GxlBuw4Gv2FB8Ov9uqD9Gox2z4Km7Z95LONfgIy8gt8FMJ1sFyNVAAwqBPJjTXZ5fmflb6eSgoH8usEdB19GQYt68KZYivuZ4Wae9lI9
+fV6XBWcbCZm823QHIuffLLu618oHKhoh4Z3CaOSKSCuMCdX1MVO0xORqDvHbZyV7KYQlA9wU0zTyMUGjnJcUa5jA2IcLqHaIKSgsNJYWM0ejPH6bmR4BUQUO
+ZWD48agxs58N58meFLYNP0sMfnHZGALzHiQXHnGR3KUJPZIRRoaLrjW2Yg-5b6B2bgIEu8RId95brsoZ2qg5jN5ZYWlCde1YHqLUR2daZTBBootrIOzHd07q
+wfbsZb7OshpV36ool7WAJmh3QYMb43FNBaDrwgZ0rLDeNvQoa89rgG-T_wK_cbEOFOMUa9ZIfhg6zAKnXs4-szSOEyKMJDCUoJ3LjsODDeEFtYWnfdEwNsmv
+P1J3D4ufR8YSqbKhBqh_hr-KNk78AAwfpKA8r7jhhNyelI9rdLCRt59acamgRUK5gUbK7KEdtb6iYI6ceNEq4rAFqa-c5KnAA1hRVJRMnzJXNVCrHQP6_-oj
+YzerFcJCEj8fV-yYOxNYrply2HX3xZ6dmsEhiLLEuvHQmOxH8QQpvAmPszqcxsya-bvqMl2HNNSxxHuy1xM_bbhCJ3jZb2DK2IoDDQRoSIKOESODgKScsSo9
+cn4ySlMfESGDoLGzLtapkL23hiBfvcfpdk5OSNDbpKJH-GJkJ9lq7vwq2yO_
 }
 
 AzureEntityColoring(AzureManagedApplications)
diff --git a/dist/Management/AzureManagedApplications.svg b/dist/Management/AzureManagedApplications.svg
index 57108131..c5cce4e7 100644
--- a/dist/Management/AzureManagedApplications.svg
+++ b/dist/Management/AzureManagedApplications.svg
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="65pt" height="70pt" viewBox="0 0 65 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="65" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.431373%,6.666667%,47.843137%);fill-opacity:1;" d="M 38.992188 61.390625 C 39.050781 61.390625 39.113281 61.378906 39.164063 61.347656 L 50.339844 55.082031 C 50.445313 55.027344 50.511719 54.917969 50.511719 54.796875 L 50.511719 42.222656 C 50.511719 42.101563 50.445313 41.988281 50.339844 41.933594 C 50.234375 41.875 50.105469 41.875 50 41.933594 L 38.824219 48.199219 C 38.722656 48.257813 38.660156 48.367188 38.660156 48.488281 L 38.660156 61.0625 C 38.660156 61.183594 38.722656 61.289063 38.824219 61.347656 C 38.878906 61.378906 38.933594 61.390625 38.992188 61.390625 M 53.480469 53.109375 C 53.539063 53.109375 53.601563 53.097656 53.652344 53.066406 L 64.828125 46.800781 C 64.933594 46.746094 65 46.636719 65 46.515625 L 65 33.941406 C 65 33.820313 64.933594 33.710938 64.828125 33.652344 C 64.71875 33.59375 64.59375 33.59375 64.484375 33.652344 L 53.3125 39.917969 C 53.207031 39.976563 53.144531 40.085938 53.144531 40.207031 L 53.144531 52.78125 C 53.144531 52.902344 53.207031 53.007813 53.3125 53.066406 C 53.363281 53.097656 53.421875 53.109375 53.480469 53.109375 M 38.992188 44.832031 C 39.050781 44.832031 39.113281 44.816406 39.164063 44.789063 L 50.339844 38.519531 C 50.445313 38.464844 50.511719 38.355469 50.511719 38.234375 L 50.511719 25.660156 C 50.511719 25.539063 50.445313 25.429688 50.339844 25.371094 C 50.234375 25.316406 50.105469 25.316406 50 25.371094 L 38.824219 31.640625 C 38.722656 31.695313 38.660156 31.808594 38.660156 31.925781 L 38.660156 44.5 C 38.660156 44.621094 38.722656 44.726563 38.824219 44.789063 C 38.878906 44.816406 38.933594 44.832031 38.992188 44.832031 M 53.480469 36.550781 C 53.539063 36.550781 53.601563 36.535156 53.652344 36.507813 L 64.828125 30.238281 C 64.933594 30.183594 65 30.074219 65 29.953125 L 65 17.378906 C 65 17.257813 64.933594 17.148438 64.828125 17.089844 C 64.71875 17.035156 64.59375 17.035156 64.484375 17.089844 L 53.3125 23.359375 C 53.207031 23.417969 53.144531 23.527344 53.144531 23.644531 L 53.144531 36.222656 C 53.144531 36.339844 53.207031 36.445313 53.3125 36.507813 C 53.363281 36.535156 53.421875 36.550781 53.480469 36.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.431373%,6.666667%,47.843137%);fill-opacity:1;" d="M 40.871094 61.601563 C 40.933594 61.601563 40.992188 61.585938 41.046875 61.554688 L 52.359375 55.289063 C 52.46875 55.234375 52.535156 55.125 52.535156 55.003906 L 52.535156 42.429688 C 52.535156 42.308594 52.464844 42.199219 52.359375 42.140625 C 52.25 42.082031 52.121094 42.082031 52.015625 42.140625 L 40.703125 48.40625 C 40.597656 48.464844 40.535156 48.574219 40.535156 48.695313 L 40.535156 61.269531 C 40.535156 61.390625 40.597656 61.496094 40.703125 61.554688 C 40.757813 61.585938 40.8125 61.601563 40.871094 61.601563 M 55.539063 53.320313 C 55.597656 53.320313 55.660156 53.304688 55.714844 53.277344 L 67.027344 47.007813 C 67.132813 46.953125 67.199219 46.84375 67.199219 46.722656 L 67.199219 34.148438 C 67.199219 34.027344 67.132813 33.917969 67.023438 33.859375 C 66.917969 33.804688 66.789063 33.804688 66.679688 33.859375 L 55.367188 40.125 C 55.261719 40.183594 55.199219 40.292969 55.199219 40.414063 L 55.199219 52.988281 C 55.199219 53.109375 55.261719 53.214844 55.367188 53.277344 C 55.417969 53.304688 55.476563 53.320313 55.539063 53.320313 M 40.871094 45.039063 C 40.933594 45.039063 40.992188 45.027344 41.046875 44.996094 L 52.359375 38.730469 C 52.46875 38.675781 52.535156 38.5625 52.535156 38.445313 L 52.535156 25.871094 C 52.535156 25.75 52.464844 25.636719 52.359375 25.582031 C 52.25 25.523438 52.121094 25.523438 52.015625 25.582031 L 40.703125 31.847656 C 40.597656 31.90625 40.535156 32.015625 40.535156 32.132813 L 40.535156 44.710938 C 40.535156 44.832031 40.597656 44.9375 40.703125 44.996094 C 40.757813 45.027344 40.8125 45.039063 40.871094 45.039063 M 55.539063 36.757813 C 55.597656 36.757813 55.660156 36.746094 55.714844 36.714844 L 67.027344 30.449219 C 67.132813 30.394531 67.199219 30.285156 67.199219 30.164063 L 67.199219 17.589844 C 67.199219 17.46875 67.132813 17.355469 67.023438 17.300781 C 66.917969 17.242188 66.789063 17.242188 66.679688 17.300781 L 55.367188 23.566406 C 55.261719 23.625 55.199219 23.734375 55.199219 23.851563 L 55.199219 36.429688 C 55.199219 36.550781 55.261719 36.65625 55.367188 36.714844 C 55.417969 36.742188 55.476563 36.757813 55.539063 36.757813 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip2">
-  <rect x="0" y="0" width="65" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.054688 21.890625 C 26.085938 21.839844 26.128906 21.800781 26.179688 21.773438 L 37.285156 15.660156 C 37.390625 15.601563 37.519531 15.601563 37.621094 15.660156 L 48.617188 21.71875 C 48.71875 21.773438 48.78125 21.878906 48.78125 21.996094 C 48.777344 22.113281 48.710938 22.21875 48.609375 22.277344 L 37.503906 28.382813 C 37.398438 28.441406 37.273438 28.4375 37.171875 28.382813 L 26.175781 22.320313 C 26.074219 22.269531 26.007813 22.164063 26.007813 22.046875 C 26.011719 21.992188 26.027344 21.9375 26.054688 21.890625 M 11.574219 13.910156 C 11.605469 13.863281 11.648438 13.820313 11.699219 13.792969 L 22.683594 7.683594 C 22.785156 7.625 22.910156 7.621094 23.015625 7.679688 L 33.886719 13.738281 C 33.988281 13.792969 34.054688 13.902344 34.050781 14.019531 C 34.046875 14.136719 33.984375 14.242188 33.882813 14.296875 L 22.898438 20.40625 C 22.792969 20.460938 22.671875 20.460938 22.566406 20.402344 L 11.691406 14.34375 C 11.59375 14.289063 11.53125 14.183594 11.527344 14.070313 C 11.53125 14.015625 11.546875 13.960938 11.574219 13.910156 M 40.839844 14.046875 C 40.871094 13.996094 40.914063 13.957031 40.964844 13.925781 L 51.949219 7.816406 C 52.050781 7.757813 52.175781 7.757813 52.28125 7.816406 L 63.152344 13.871094 C 63.253906 13.929688 63.316406 14.035156 63.316406 14.152344 C 63.3125 14.269531 63.246094 14.375 63.148438 14.429688 L 52.164063 20.539063 C 52.058594 20.59375 51.933594 20.59375 51.832031 20.535156 L 40.957031 14.476563 C 40.859375 14.421875 40.796875 14.320313 40.792969 14.203125 C 40.796875 14.148438 40.8125 14.09375 40.839844 14.046875 M 26.109375 6.171875 C 26.140625 6.125 26.183594 6.082031 26.234375 6.054688 L 37.34375 0.046875 C 37.445313 -0.015625 37.574219 -0.015625 37.679688 0.0429688 L 48.671875 6 C 48.773438 6.054688 48.835938 6.160156 48.835938 6.277344 C 48.832031 6.390625 48.765625 6.496094 48.664063 6.550781 L 37.558594 12.558594 C 37.453125 12.613281 37.328125 12.613281 37.226563 12.558594 L 26.230469 6.597656 C 26.128906 6.546875 26.066406 6.441406 26.0625 6.328125 C 26.066406 6.273438 26.082031 6.21875 26.109375 6.171875 M 9.855469 46.800781 L 21.03125 53.066406 C 21.136719 53.125 21.265625 53.125 21.371094 53.066406 C 21.472656 53.007813 21.535156 52.898438 21.535156 52.78125 L 21.535156 43.308594 C 21.046875 43.234375 20.550781 43.195313 20.054688 43.191406 C 17.015625 43.191406 14.753906 43.6875 12.929688 44.089844 C 11.648438 44.371094 10.640625 44.589844 9.679688 44.589844 L 9.679688 46.515625 C 9.679688 46.636719 9.746094 46.742188 9.855469 46.800781 Z M 35.6875 61.390625 C 35.746094 61.390625 35.800781 61.378906 35.855469 61.347656 C 35.957031 61.289063 36.023438 61.179688 36.023438 61.0625 L 36.023438 50.949219 C 34.96875 50.972656 33.867188 50.992188 32.90625 50.992188 C 31.617188 50.992188 31.070313 50.957031 30.847656 50.933594 C 30.523438 50.695313 29.898438 49.808594 29.472656 49.203125 C 28.375 47.652344 26.765625 45.375 24.167969 44.117188 L 24.167969 54.796875 C 24.167969 54.917969 24.234375 55.023438 24.34375 55.082031 L 35.519531 61.347656 C 35.570313 61.378906 35.628906 61.390625 35.6875 61.390625 Z M 50.511719 54.796875 L 50.511719 53.449219 C 49.175781 54.03125 47.710938 54.667969 46.289063 55.277344 C 45.78125 51.128906 41.597656 50.953125 40.203125 50.894531 C 40 50.886719 39.800781 50.882813 39.597656 50.882813 C 39.335938 50.882813 39.015625 50.886719 38.660156 50.894531 L 38.660156 61.0625 C 38.660156 61.179688 38.722656 61.285156 38.824219 61.347656 C 38.929688 61.40625 39.058594 61.40625 39.164063 61.347656 L 50.339844 55.082031 C 50.445313 55.027344 50.511719 54.917969 50.511719 54.796875 Z M 54.703125 51.5625 C 54.339844 51.738281 53.796875 51.988281 53.148438 52.28125 L 53.148438 52.78125 C 53.148438 52.902344 53.210938 53.007813 53.3125 53.070313 C 53.417969 53.128906 53.546875 53.128906 53.652344 53.070313 L 58.21875 50.507813 C 56.996094 50.660156 55.808594 51.015625 54.703125 51.5625 Z M 54.703125 51.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 27.777344 22.097656 C 27.808594 22.050781 27.851563 22.007813 27.902344 21.980469 L 39.144531 15.871094 C 39.25 15.8125 39.378906 15.808594 39.484375 15.867188 L 50.617188 21.925781 C 50.71875 21.980469 50.78125 22.089844 50.78125 22.207031 C 50.777344 22.320313 50.710938 22.425781 50.609375 22.484375 L 39.367188 28.59375 C 39.261719 28.648438 39.132813 28.648438 39.027344 28.589844 L 27.894531 22.53125 C 27.792969 22.476563 27.730469 22.371094 27.726563 22.257813 C 27.730469 22.203125 27.746094 22.148438 27.777344 22.097656 M 13.117188 14.121094 C 13.148438 14.070313 13.191406 14.027344 13.242188 14 L 24.363281 7.890625 C 24.464844 7.832031 24.59375 7.832031 24.699219 7.890625 L 35.707031 13.945313 C 35.808594 14.003906 35.871094 14.109375 35.871094 14.226563 C 35.867188 14.34375 35.800781 14.449219 35.699219 14.503906 L 24.578125 20.613281 C 24.476563 20.667969 24.347656 20.667969 24.246094 20.609375 L 13.238281 14.550781 C 13.136719 14.496094 13.070313 14.394531 13.070313 14.277344 C 13.070313 14.222656 13.089844 14.167969 13.117188 14.121094 M 42.742188 14.253906 C 42.773438 14.203125 42.816406 14.164063 42.867188 14.136719 L 53.988281 8.027344 C 54.089844 7.964844 54.21875 7.964844 54.324219 8.023438 L 65.332031 14.082031 C 65.433594 14.136719 65.496094 14.246094 65.496094 14.359375 C 65.492188 14.476563 65.425781 14.582031 65.324219 14.640625 L 54.207031 20.746094 C 54.101563 20.804688 53.972656 20.804688 53.871094 20.746094 L 42.863281 14.6875 C 42.761719 14.632813 42.699219 14.527344 42.695313 14.414063 C 42.699219 14.355469 42.714844 14.300781 42.742188 14.253906 M 27.832031 6.382813 C 27.863281 6.332031 27.90625 6.292969 27.957031 6.261719 L 39.203125 0.253906 C 39.308594 0.195313 39.433594 0.195313 39.542969 0.25 L 50.671875 6.210938 C 50.773438 6.261719 50.839844 6.371094 50.839844 6.484375 C 50.832031 6.601563 50.765625 6.703125 50.664063 6.757813 L 39.421875 12.769531 C 39.316406 12.824219 39.191406 12.820313 39.082031 12.765625 L 27.953125 6.804688 C 27.851563 6.753906 27.785156 6.652344 27.785156 6.535156 C 27.785156 6.480469 27.804688 6.429688 27.832031 6.382813 M 11.375 47.007813 L 22.6875 53.277344 C 22.796875 53.335938 22.925781 53.335938 23.03125 53.277344 C 23.136719 53.21875 23.199219 53.109375 23.199219 52.988281 L 23.199219 43.519531 C 22.703125 43.441406 22.203125 43.402344 21.699219 43.398438 C 18.625 43.398438 16.332031 43.898438 14.488281 44.296875 C 13.195313 44.578125 12.171875 44.800781 11.199219 44.800781 L 11.199219 46.722656 C 11.199219 46.84375 11.265625 46.953125 11.375 47.007813 Z M 37.527344 61.601563 C 37.585938 61.601563 37.640625 61.585938 37.699219 61.554688 C 37.800781 61.5 37.867188 61.390625 37.867188 61.269531 L 37.867188 51.160156 C 36.800781 51.179688 35.683594 51.203125 34.710938 51.203125 C 33.40625 51.203125 32.851563 51.164063 32.625 51.140625 C 32.300781 50.90625 31.664063 50.019531 31.234375 49.414063 C 30.125 47.859375 28.496094 45.582031 25.867188 44.324219 L 25.867188 55.007813 C 25.867188 55.125 25.929688 55.234375 26.042969 55.292969 L 37.355469 61.558594 C 37.40625 61.585938 37.46875 61.601563 37.527344 61.601563 Z M 52.535156 55.003906 L 52.535156 53.65625 C 51.183594 54.238281 49.695313 54.875 48.257813 55.484375 C 47.746094 51.335938 43.507813 51.160156 42.097656 51.101563 C 41.894531 51.09375 41.691406 51.089844 41.484375 51.089844 C 41.222656 51.089844 40.894531 51.097656 40.535156 51.101563 L 40.535156 61.269531 C 40.535156 61.390625 40.597656 61.496094 40.703125 61.554688 C 40.808594 61.613281 40.9375 61.613281 41.046875 61.554688 L 52.359375 55.289063 C 52.46875 55.234375 52.535156 55.125 52.535156 55.003906 Z M 56.777344 51.769531 C 56.410156 51.945313 55.859375 52.195313 55.199219 52.488281 L 55.199219 52.992188 C 55.199219 53.113281 55.265625 53.21875 55.367188 53.277344 C 55.476563 53.335938 55.605469 53.335938 55.714844 53.277344 L 60.335938 50.714844 C 59.097656 50.867188 57.898438 51.222656 56.777344 51.769531 Z M 56.777344 51.769531 "/>
 </g>
 <mask id="mask2">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="65" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip3">
-  <rect x="0" y="0" width="65" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.292969 58.742188 C 49.191406 57.078125 54.195313 54.917969 55.90625 54.082031 C 57.507813 53.296875 59.191406 52.867188 60.652344 52.867188 C 62.019531 52.867188 63.039063 53.257813 63.382813 53.90625 C 63.414063 53.976563 64.292969 55.953125 60.75 58.054688 C 58.328125 59.484375 55.90625 60.902344 53.476563 62.3125 C 49.820313 64.4375 46.933594 66.113281 45.597656 67.011719 C 44.523438 67.730469 42.964844 67.824219 41.722656 67.824219 C 41.03125 67.824219 40.328125 67.792969 39.625 67.757813 C 38.867188 67.714844 38.105469 67.6875 37.34375 67.683594 C 35.550781 67.683594 32.890625 67.882813 30.078125 68.101563 C 28.75 68.199219 27.464844 68.300781 26.230469 68.382813 L 26.015625 68.390625 C 22.464844 68.390625 17.734375 64.164063 16.367188 62.867188 C 15.84375 62.371094 15.46875 62.019531 15.164063 61.75 C 12.195313 59.117188 9.132813 57.890625 5.53125 57.890625 C 3.554688 57.890625 2.152344 57.886719 1.382813 57.882813 L 1.382813 47.390625 L 9.679688 47.390625 C 10.9375 47.390625 12.132813 47.128906 13.511719 46.824219 C 15.222656 46.449219 17.320313 45.992188 20.054688 45.992188 C 23.8125 45.992188 25.621094 48.566406 27.222656 50.835938 C 28.226563 52.257813 29.09375 53.484375 30.316406 53.683594 C 30.789063 53.757813 31.578125 53.792969 32.882813 53.792969 C 34.070313 53.792969 35.480469 53.761719 36.703125 53.734375 L 37.132813 53.726563 C 37.960938 53.703125 38.789063 53.6875 39.613281 53.683594 C 39.804688 53.683594 39.960938 53.6875 40.078125 53.691406 C 43.183594 53.824219 43.496094 54.742188 43.566406 55.835938 C 43.59375 56.257813 43.546875 56.664063 43.433594 57.039063 L 42.515625 59.570313 C 42.515625 59.570313 44.335938 59.152344 45.292969 58.742188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.25 58.953125 C 51.195313 57.285156 56.261719 55.125 57.992188 54.289063 C 59.613281 53.507813 61.320313 53.078125 62.800781 53.078125 C 64.183594 53.078125 65.214844 53.464844 65.5625 54.117188 C 65.59375 54.183594 66.484375 56.160156 62.894531 58.261719 C 60.449219 59.691406 57.992188 61.109375 55.535156 62.519531 C 51.832031 64.644531 48.914063 66.324219 47.558594 67.21875 C 46.472656 67.941406 44.890625 68.03125 43.636719 68.03125 C 42.9375 68.03125 42.222656 68 41.515625 67.96875 C 40.742188 67.921875 39.972656 67.898438 39.203125 67.890625 C 37.386719 67.890625 34.695313 68.09375 31.847656 68.308594 C 30.503906 68.410156 29.203125 68.507813 27.957031 68.589844 L 27.734375 68.601563 C 24.140625 68.601563 19.351563 64.371094 17.96875 63.078125 C 17.4375 62.578125 17.058594 62.230469 16.753906 61.957031 C 13.746094 59.324219 10.648438 58.101563 7 58.101563 C 5 58.101563 3.578125 58.09375 2.800781 58.089844 L 2.800781 47.601563 L 11.199219 47.601563 C 12.472656 47.601563 13.679688 47.335938 15.078125 47.035156 C 16.808594 46.660156 18.933594 46.199219 21.699219 46.199219 C 25.503906 46.199219 27.335938 48.773438 28.960938 51.042969 C 29.972656 52.464844 30.851563 53.695313 32.089844 53.890625 C 32.566406 53.96875 33.367188 54 34.6875 54 C 35.890625 54 37.320313 53.972656 38.554688 53.945313 L 38.992188 53.933594 C 39.828125 53.910156 40.664063 53.898438 41.5 53.890625 C 41.695313 53.890625 41.851563 53.894531 41.972656 53.898438 C 45.113281 54.03125 45.429688 54.949219 45.503906 56.046875 C 45.53125 56.464844 45.484375 56.871094 45.367188 57.25 L 44.4375 59.78125 C 44.4375 59.78125 46.28125 59.363281 47.25 58.953125 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 38.992188 44.832031 C 39.050781 44.832031 39.113281 44.816406 39.164063 44.789063 L 50.339844 38.519531 C 50.445313 38.464844 50.511719 38.355469 50.511719 38.234375 L 50.511719 25.660156 C 50.511719 25.539063 50.445313 25.429688 50.339844 25.371094 C 50.234375 25.316406 50.105469 25.316406 50 25.371094 L 38.824219 31.640625 C 38.722656 31.695313 38.660156 31.808594 38.660156 31.925781 L 38.660156 44.5 C 38.660156 44.621094 38.722656 44.726563 38.824219 44.789063 C 38.878906 44.816406 38.933594 44.832031 38.992188 44.832031 M 38.992188 61.390625 C 39.050781 61.390625 39.113281 61.378906 39.164063 61.347656 L 50.339844 55.082031 C 50.445313 55.027344 50.511719 54.917969 50.511719 54.796875 L 50.511719 42.222656 C 50.511719 42.101563 50.445313 41.988281 50.339844 41.933594 C 50.234375 41.875 50.105469 41.875 50 41.933594 L 38.824219 48.199219 C 38.722656 48.257813 38.660156 48.367188 38.660156 48.488281 L 38.660156 61.0625 C 38.660156 61.183594 38.722656 61.289063 38.824219 61.347656 C 38.878906 61.378906 38.933594 61.390625 38.992188 61.390625 M 53.480469 36.550781 C 53.539063 36.550781 53.601563 36.535156 53.652344 36.507813 L 64.828125 30.238281 C 64.933594 30.183594 65 30.074219 65 29.953125 L 65 17.378906 C 65 17.257813 64.933594 17.148438 64.828125 17.089844 C 64.71875 17.035156 64.59375 17.035156 64.484375 17.089844 L 53.3125 23.359375 C 53.207031 23.417969 53.144531 23.527344 53.144531 23.644531 L 53.144531 36.222656 C 53.144531 36.339844 53.207031 36.445313 53.3125 36.507813 C 53.363281 36.535156 53.421875 36.550781 53.480469 36.550781 M 53.480469 53.109375 C 53.539063 53.109375 53.601563 53.097656 53.652344 53.066406 L 64.828125 46.800781 C 64.933594 46.746094 65 46.636719 65 46.515625 L 65 33.941406 C 65 33.820313 64.933594 33.710938 64.828125 33.652344 C 64.71875 33.59375 64.59375 33.59375 64.484375 33.652344 L 53.3125 39.917969 C 53.207031 39.976563 53.144531 40.085938 53.144531 40.207031 L 53.144531 52.78125 C 53.144531 52.902344 53.207031 53.007813 53.3125 53.066406 C 53.363281 53.097656 53.421875 53.109375 53.480469 53.109375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 40.871094 45.039063 C 40.933594 45.039063 40.992188 45.027344 41.046875 44.996094 L 52.359375 38.730469 C 52.46875 38.675781 52.535156 38.5625 52.535156 38.445313 L 52.535156 25.871094 C 52.535156 25.75 52.464844 25.636719 52.359375 25.582031 C 52.25 25.523438 52.121094 25.523438 52.015625 25.582031 L 40.703125 31.847656 C 40.597656 31.90625 40.535156 32.015625 40.535156 32.132813 L 40.535156 44.710938 C 40.535156 44.832031 40.597656 44.9375 40.703125 44.996094 C 40.757813 45.027344 40.8125 45.039063 40.871094 45.039063 M 40.871094 61.601563 C 40.933594 61.601563 40.992188 61.585938 41.046875 61.554688 L 52.359375 55.289063 C 52.46875 55.234375 52.535156 55.125 52.535156 55.003906 L 52.535156 42.429688 C 52.535156 42.308594 52.464844 42.199219 52.359375 42.140625 C 52.25 42.082031 52.121094 42.082031 52.015625 42.140625 L 40.703125 48.40625 C 40.597656 48.464844 40.535156 48.574219 40.535156 48.695313 L 40.535156 61.269531 C 40.535156 61.390625 40.597656 61.496094 40.703125 61.554688 C 40.757813 61.585938 40.8125 61.601563 40.871094 61.601563 M 55.539063 36.757813 C 55.597656 36.757813 55.660156 36.746094 55.714844 36.714844 L 67.027344 30.449219 C 67.132813 30.394531 67.199219 30.285156 67.199219 30.164063 L 67.199219 17.589844 C 67.199219 17.46875 67.132813 17.355469 67.023438 17.300781 C 66.917969 17.242188 66.789063 17.242188 66.679688 17.300781 L 55.367188 23.566406 C 55.261719 23.625 55.199219 23.734375 55.199219 23.851563 L 55.199219 36.429688 C 55.199219 36.550781 55.261719 36.65625 55.367188 36.714844 C 55.417969 36.742188 55.476563 36.757813 55.539063 36.757813 M 55.539063 53.320313 C 55.597656 53.320313 55.660156 53.304688 55.714844 53.277344 L 67.027344 47.007813 C 67.132813 46.953125 67.199219 46.84375 67.199219 46.722656 L 67.199219 34.148438 C 67.199219 34.027344 67.132813 33.917969 67.023438 33.859375 C 66.917969 33.804688 66.789063 33.804688 66.679688 33.859375 L 55.367188 40.125 C 55.261719 40.183594 55.199219 40.292969 55.199219 40.414063 L 55.199219 52.988281 C 55.199219 53.109375 55.261719 53.214844 55.367188 53.277344 C 55.417969 53.304688 55.476563 53.320313 55.539063 53.320313 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 35.6875 44.832031 C 35.628906 44.832031 35.570313 44.816406 35.515625 44.789063 L 24.339844 38.519531 C 24.234375 38.464844 24.167969 38.355469 24.167969 38.234375 L 24.167969 25.660156 C 24.167969 25.542969 24.230469 25.433594 24.339844 25.371094 C 24.445313 25.316406 24.574219 25.316406 24.683594 25.371094 L 35.855469 31.640625 C 35.960938 31.699219 36.023438 31.808594 36.023438 31.925781 L 36.023438 44.5 C 36.023438 44.621094 35.957031 44.730469 35.855469 44.789063 C 35.804688 44.816406 35.746094 44.832031 35.6875 44.832031 M 35.6875 61.390625 C 35.628906 61.390625 35.570313 61.378906 35.515625 61.347656 L 24.339844 55.082031 C 24.234375 55.027344 24.167969 54.917969 24.167969 54.796875 L 24.167969 42.222656 C 24.167969 42.105469 24.230469 41.996094 24.339844 41.933594 C 24.445313 41.875 24.574219 41.875 24.683594 41.933594 L 35.855469 48.199219 C 35.960938 48.257813 36.023438 48.367188 36.023438 48.488281 L 36.023438 61.0625 C 36.023438 61.179688 35.957031 61.289063 35.855469 61.347656 C 35.804688 61.375 35.746094 61.390625 35.6875 61.390625 M 21.199219 36.550781 C 21.140625 36.550781 21.082031 36.535156 21.027344 36.507813 L 9.851563 30.238281 C 9.746094 30.183594 9.679688 30.074219 9.679688 29.953125 L 9.679688 17.378906 C 9.679688 17.261719 9.746094 17.15625 9.855469 17.089844 C 9.960938 17.035156 10.089844 17.035156 10.195313 17.089844 L 21.371094 23.359375 C 21.472656 23.417969 21.535156 23.527344 21.535156 23.644531 L 21.535156 36.222656 C 21.535156 36.339844 21.472656 36.449219 21.371094 36.507813 C 21.316406 36.535156 21.261719 36.550781 21.199219 36.550781 M 21.199219 53.109375 C 21.140625 53.109375 21.082031 53.097656 21.027344 53.066406 L 9.851563 46.800781 C 9.746094 46.746094 9.679688 46.636719 9.679688 46.515625 L 9.679688 33.941406 C 9.679688 33.824219 9.746094 33.714844 9.855469 33.652344 C 9.960938 33.59375 10.089844 33.59375 10.195313 33.652344 L 21.371094 39.917969 C 21.472656 39.980469 21.535156 40.085938 21.535156 40.207031 L 21.535156 52.78125 C 21.535156 52.898438 21.472656 53.007813 21.371094 53.066406 C 21.316406 53.097656 21.261719 53.109375 21.199219 53.109375 M 26.054688 21.890625 C 26.085938 21.839844 26.128906 21.800781 26.179688 21.773438 L 37.285156 15.660156 C 37.390625 15.601563 37.519531 15.601563 37.621094 15.660156 L 48.617188 21.71875 C 48.71875 21.773438 48.78125 21.878906 48.78125 21.996094 C 48.777344 22.113281 48.710938 22.21875 48.609375 22.277344 L 37.503906 28.382813 C 37.398438 28.441406 37.273438 28.4375 37.171875 28.382813 L 26.175781 22.320313 C 26.074219 22.269531 26.007813 22.164063 26.007813 22.046875 C 26.011719 21.992188 26.027344 21.9375 26.054688 21.890625 M 11.574219 13.910156 C 11.605469 13.863281 11.648438 13.820313 11.699219 13.792969 L 22.683594 7.683594 C 22.785156 7.625 22.910156 7.621094 23.015625 7.679688 L 33.886719 13.738281 C 33.988281 13.792969 34.054688 13.902344 34.050781 14.019531 C 34.046875 14.136719 33.984375 14.242188 33.882813 14.296875 L 22.898438 20.40625 C 22.792969 20.460938 22.671875 20.460938 22.566406 20.402344 L 11.691406 14.34375 C 11.59375 14.289063 11.53125 14.183594 11.527344 14.070313 C 11.53125 14.015625 11.546875 13.960938 11.574219 13.910156 M 40.839844 14.046875 C 40.871094 13.996094 40.914063 13.957031 40.964844 13.925781 L 51.949219 7.816406 C 52.050781 7.757813 52.175781 7.757813 52.28125 7.816406 L 63.152344 13.871094 C 63.253906 13.929688 63.316406 14.035156 63.316406 14.152344 C 63.3125 14.269531 63.246094 14.375 63.148438 14.429688 L 52.164063 20.539063 C 52.058594 20.59375 51.933594 20.59375 51.832031 20.535156 L 40.957031 14.476563 C 40.859375 14.421875 40.796875 14.320313 40.792969 14.203125 C 40.796875 14.148438 40.8125 14.09375 40.839844 14.046875 M 26.109375 6.171875 C 26.140625 6.125 26.183594 6.082031 26.234375 6.054688 L 37.34375 0.046875 C 37.445313 -0.015625 37.574219 -0.015625 37.679688 0.0429688 L 48.671875 6 C 48.773438 6.054688 48.835938 6.160156 48.835938 6.277344 C 48.832031 6.390625 48.765625 6.496094 48.664063 6.550781 L 37.558594 12.558594 C 37.453125 12.613281 37.328125 12.613281 37.226563 12.558594 L 26.230469 6.597656 C 26.128906 6.546875 26.066406 6.441406 26.0625 6.328125 C 26.066406 6.273438 26.082031 6.21875 26.109375 6.171875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 37.527344 45.039063 C 37.46875 45.039063 37.40625 45.023438 37.351563 44.996094 L 26.039063 38.730469 C 25.933594 38.675781 25.867188 38.5625 25.863281 38.445313 L 25.863281 25.871094 C 25.863281 25.75 25.929688 25.644531 26.039063 25.582031 C 26.148438 25.523438 26.277344 25.523438 26.386719 25.582031 L 37.699219 31.847656 C 37.804688 31.90625 37.867188 32.015625 37.867188 32.132813 L 37.867188 44.710938 C 37.867188 44.828125 37.800781 44.9375 37.699219 44.996094 C 37.644531 45.023438 37.585938 45.039063 37.527344 45.039063 M 37.527344 61.601563 C 37.46875 61.601563 37.40625 61.585938 37.351563 61.554688 L 26.039063 55.289063 C 25.933594 55.234375 25.867188 55.125 25.863281 55.003906 L 25.863281 42.429688 C 25.863281 42.3125 25.929688 42.203125 26.039063 42.140625 C 26.148438 42.082031 26.277344 42.082031 26.386719 42.140625 L 37.699219 48.40625 C 37.804688 48.46875 37.867188 48.578125 37.867188 48.695313 L 37.867188 61.269531 C 37.867188 61.390625 37.800781 61.5 37.699219 61.554688 C 37.644531 61.585938 37.585938 61.601563 37.527344 61.601563 M 22.863281 36.757813 C 22.800781 36.757813 22.742188 36.742188 22.6875 36.714844 L 11.375 30.449219 C 11.265625 30.394531 11.199219 30.285156 11.199219 30.164063 L 11.199219 17.589844 C 11.199219 17.46875 11.265625 17.363281 11.375 17.300781 C 11.484375 17.242188 11.613281 17.242188 11.722656 17.300781 L 23.03125 23.566406 C 23.136719 23.625 23.199219 23.734375 23.199219 23.851563 L 23.199219 36.429688 C 23.199219 36.546875 23.136719 36.65625 23.03125 36.714844 C 22.980469 36.742188 22.921875 36.757813 22.863281 36.757813 M 22.863281 53.320313 C 22.800781 53.320313 22.742188 53.304688 22.6875 53.277344 L 11.375 47.007813 C 11.265625 46.953125 11.199219 46.84375 11.199219 46.722656 L 11.199219 34.148438 C 11.199219 34.03125 11.265625 33.921875 11.375 33.859375 C 11.484375 33.804688 11.613281 33.804688 11.722656 33.859375 L 23.03125 40.125 C 23.136719 40.1875 23.199219 40.296875 23.199219 40.414063 L 23.199219 52.988281 C 23.199219 53.109375 23.136719 53.21875 23.03125 53.277344 C 22.980469 53.304688 22.921875 53.320313 22.863281 53.320313 M 27.777344 22.097656 C 27.808594 22.050781 27.851563 22.007813 27.902344 21.980469 L 39.144531 15.871094 C 39.25 15.8125 39.378906 15.808594 39.484375 15.867188 L 50.617188 21.925781 C 50.71875 21.980469 50.78125 22.089844 50.78125 22.207031 C 50.777344 22.320313 50.710938 22.425781 50.609375 22.484375 L 39.367188 28.59375 C 39.261719 28.648438 39.132813 28.648438 39.027344 28.589844 L 27.894531 22.53125 C 27.792969 22.476563 27.730469 22.371094 27.726563 22.257813 C 27.730469 22.203125 27.746094 22.148438 27.777344 22.097656 M 13.117188 14.121094 C 13.148438 14.070313 13.191406 14.027344 13.242188 14 L 24.363281 7.890625 C 24.464844 7.832031 24.59375 7.832031 24.699219 7.890625 L 35.707031 13.945313 C 35.808594 14.003906 35.871094 14.109375 35.871094 14.226563 C 35.867188 14.34375 35.800781 14.449219 35.699219 14.503906 L 24.578125 20.613281 C 24.476563 20.667969 24.347656 20.667969 24.246094 20.609375 L 13.238281 14.550781 C 13.136719 14.496094 13.070313 14.394531 13.070313 14.277344 C 13.070313 14.222656 13.089844 14.167969 13.117188 14.121094 M 42.742188 14.253906 C 42.773438 14.203125 42.816406 14.164063 42.867188 14.136719 L 53.988281 8.027344 C 54.089844 7.964844 54.21875 7.964844 54.324219 8.023438 L 65.332031 14.082031 C 65.433594 14.136719 65.496094 14.246094 65.496094 14.359375 C 65.492188 14.476563 65.425781 14.582031 65.324219 14.640625 L 54.207031 20.746094 C 54.101563 20.804688 53.972656 20.804688 53.871094 20.746094 L 42.863281 14.6875 C 42.761719 14.632813 42.699219 14.527344 42.695313 14.414063 C 42.699219 14.355469 42.714844 14.300781 42.742188 14.253906 M 27.832031 6.382813 C 27.863281 6.332031 27.90625 6.292969 27.957031 6.261719 L 39.203125 0.253906 C 39.308594 0.195313 39.433594 0.195313 39.542969 0.25 L 50.671875 6.210938 C 50.773438 6.261719 50.839844 6.371094 50.839844 6.484375 C 50.832031 6.601563 50.765625 6.703125 50.664063 6.757813 L 39.421875 12.769531 C 39.316406 12.824219 39.191406 12.820313 39.082031 12.765625 L 27.953125 6.804688 C 27.851563 6.753906 27.785156 6.652344 27.785156 6.535156 C 27.785156 6.480469 27.804688 6.429688 27.832031 6.382813 "/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 26.015625 69.089844 C 22.3125 69.089844 17.703125 65.097656 15.894531 63.378906 C 15.507813 63.003906 15.109375 62.636719 14.710938 62.273438 C 11.875 59.761719 8.957031 58.589844 5.53125 58.589844 C 2.390625 58.589844 0.691406 58.578125 0.691406 58.578125 L 0.691406 46.691406 L 9.679688 46.691406 C 10.867188 46.691406 12.027344 46.433594 13.375 46.140625 C 15.09375 45.761719 17.238281 45.292969 20.054688 45.292969 C 24.167969 45.292969 26.175781 48.140625 27.785156 50.429688 C 28.699219 51.722656 29.488281 52.839844 30.425781 52.992188 C 30.851563 53.058594 31.628906 53.09375 32.878906 53.09375 C 34.136719 53.09375 35.636719 53.058594 36.902344 53.03125 C 37.804688 53.007813 38.707031 52.988281 39.609375 52.984375 C 39.8125 52.984375 39.980469 52.984375 40.105469 52.992188 C 42.964844 53.113281 44.128906 53.898438 44.253906 55.792969 C 44.285156 56.296875 44.230469 56.785156 44.09375 57.246094 L 43.660156 58.679688 L 45.023438 58.097656 C 48.199219 56.738281 53.796875 54.332031 55.601563 53.449219 C 57.296875 52.625 59.085938 52.167969 60.648438 52.167969 C 62.300781 52.167969 63.515625 52.683594 63.988281 53.578125 C 64 53.605469 65.289063 56.171875 61.09375 58.660156 C 58.671875 60.089844 56.246094 61.507813 53.816406 62.917969 C 50.167969 65.039063 47.289063 66.714844 45.972656 67.597656 C 44.746094 68.421875 43.054688 68.527344 41.71875 68.527344 C 40.996094 68.527344 40.253906 68.492188 39.519531 68.457031 C 38.792969 68.414063 38.066406 68.390625 37.335938 68.382813 C 35.554688 68.382813 32.882813 68.585938 30.054688 68.804688 C 28.792969 68.902344 27.507813 69 26.273438 69.082031 C 26.1875 69.089844 26.101563 69.089844 26.015625 69.089844 Z M 26.015625 69.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 27.734375 69.300781 C 23.988281 69.300781 19.324219 65.304688 17.492188 63.589844 C 17.097656 63.214844 16.695313 62.847656 16.292969 62.484375 C 13.421875 59.96875 10.46875 58.800781 7 58.800781 C 3.820313 58.800781 2.101563 58.789063 2.101563 58.789063 L 2.101563 46.898438 L 11.199219 46.898438 C 12.402344 46.898438 13.578125 46.644531 14.9375 46.347656 C 16.679688 45.96875 18.851563 45.5 21.699219 45.5 C 25.863281 45.5 27.894531 48.347656 29.527344 50.636719 C 30.453125 51.929688 31.25 53.046875 32.203125 53.199219 C 32.628906 53.269531 33.417969 53.300781 34.683594 53.300781 C 35.957031 53.300781 37.476563 53.265625 38.757813 53.238281 C 39.671875 53.214844 40.585938 53.199219 41.5 53.191406 C 41.703125 53.191406 41.871094 53.195313 42 53.199219 C 44.894531 53.320313 46.074219 54.105469 46.199219 56 C 46.230469 56.503906 46.175781 56.992188 46.035156 57.457031 L 45.597656 58.886719 L 46.976563 58.304688 C 50.191406 56.949219 55.859375 54.542969 57.6875 53.660156 C 59.402344 52.832031 61.214844 52.375 62.796875 52.375 C 64.464844 52.375 65.699219 52.890625 66.175781 53.789063 C 66.1875 53.816406 67.492188 56.378906 63.246094 58.867188 C 60.792969 60.296875 58.339844 61.71875 55.875 63.128906 C 52.183594 65.25 49.269531 66.921875 47.9375 67.804688 C 46.695313 68.628906 44.984375 68.734375 43.632813 68.734375 C 42.898438 68.734375 42.148438 68.699219 41.40625 68.664063 C 40.671875 68.621094 39.933594 68.597656 39.195313 68.589844 C 37.394531 68.589844 34.6875 68.796875 31.824219 69.011719 C 30.546875 69.109375 29.246094 69.210938 27.996094 69.292969 C 27.910156 69.296875 27.824219 69.300781 27.734375 69.300781 Z M 27.734375 69.300781 "/>
 <use xlink:href="#surface11" mask="url(#mask2)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 26.015625 69.792969 C 22.390625 69.792969 18.046875 66.382813 15.421875 63.890625 C 14.96875 63.460938 14.574219 63.085938 14.253906 62.800781 C 11.554688 60.40625 8.78125 59.292969 5.53125 59.292969 C 2.386719 59.292969 0.6875 59.277344 0.6875 59.277344 C 0.304688 59.277344 0 58.964844 0 58.578125 L 0 46.691406 C 0 46.304688 0.308594 45.992188 0.691406 45.992188 L 9.679688 45.992188 C 10.792969 45.992188 11.917969 45.742188 13.226563 45.457031 C 14.980469 45.070313 17.164063 44.589844 20.054688 44.589844 C 24.523438 44.589844 26.734375 47.730469 28.351563 50.023438 C 29.136719 51.140625 29.878906 52.195313 30.535156 52.300781 C 31.484375 52.453125 34.664063 52.382813 36.988281 52.328125 C 38.390625 52.296875 39.601563 52.269531 40.132813 52.292969 C 42.40625 52.390625 44.757813 52.875 44.945313 55.746094 C 44.988281 56.394531 44.902344 56.96875 44.753906 57.453125 C 47.792969 56.15625 53.5 53.703125 55.304688 52.820313 C 59.242188 50.898438 63.425781 51.015625 64.601563 53.25 C 64.980469 53.972656 65.617188 56.792969 61.445313 59.265625 C 59.023438 60.695313 56.59375 62.117188 54.160156 63.527344 C 50.523438 65.644531 47.652344 67.3125 46.355469 68.179688 C 44.539063 69.402344 41.953125 69.273438 39.453125 69.15625 C 38.730469 69.121094 38.019531 69.085938 37.339844 69.085938 C 35.589844 69.085938 32.925781 69.289063 30.109375 69.503906 C 28.847656 69.601563 27.558594 69.699219 26.320313 69.78125 C 26.21875 69.789063 26.117188 69.792969 26.015625 69.792969 Z M 1.382813 57.882813 C 2.152344 57.886719 3.554688 57.890625 5.53125 57.890625 C 9.085938 57.890625 12.238281 59.152344 15.164063 61.75 C 15.492188 62.039063 15.898438 62.425781 16.367188 62.871094 C 18.738281 65.117188 23.175781 68.636719 26.230469 68.382813 C 27.464844 68.300781 28.746094 68.203125 30.007813 68.105469 C 32.851563 67.890625 35.535156 67.683594 37.339844 67.683594 C 38.042969 67.683594 38.777344 67.71875 39.519531 67.753906 C 41.796875 67.863281 44.15625 67.976563 45.59375 67.011719 C 46.925781 66.121094 49.816406 64.4375 53.472656 62.3125 C 55.710938 61.011719 58.210938 59.558594 60.746094 58.054688 C 62.84375 56.8125 64 55.085938 63.382813 53.910156 C 62.640625 52.5 59.375 52.390625 55.90625 54.082031 C 53.382813 55.3125 43.75 59.402344 43.339844 59.574219 C 43.132813 59.753906 42.839844 59.789063 42.59375 59.671875 C 42.351563 59.550781 42.195313 59.296875 42.203125 59.019531 C 42.210938 58.746094 42.375 58.5 42.628906 58.394531 C 42.667969 58.359375 43.671875 57.457031 43.566406 55.839844 C 43.480469 54.570313 42.886719 53.808594 40.078125 53.691406 C 39.589844 53.667969 38.398438 53.699219 37.019531 53.730469 C 34.378906 53.789063 31.390625 53.855469 30.316406 53.683594 C 29.089844 53.484375 28.226563 52.257813 27.226563 50.835938 C 25.703125 48.679688 23.8125 45.992188 20.054688 45.992188 C 17.3125 45.992188 15.296875 46.433594 13.519531 46.824219 C 12.132813 47.128906 10.9375 47.390625 9.679688 47.390625 L 1.382813 47.390625 Z M 1.382813 57.882813 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 32.699219 60.714844 C 29.96875 60.714844 28.019531 60.386719 26.921875 59.410156 L 22.667969 55.636719 L 23.578125 54.582031 L 27.832031 58.359375 C 29.289063 59.644531 35.546875 59.164063 37.90625 59.007813 C 41.660156 58.753906 42.050781 58.566406 44.324219 57.636719 C 44.679688 57.492188 45.078125 57.667969 45.222656 58.023438 C 45.363281 58.378906 45.195313 58.785156 44.84375 58.933594 C 42.441406 59.914063 41.878906 60.144531 38 60.402344 C 36.542969 60.5 33.871094 60.714844 32.699219 60.714844 Z M 32.699219 60.714844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 27.734375 70 C 24.066406 70 19.667969 66.589844 17.011719 64.097656 C 16.550781 63.667969 16.152344 63.292969 15.828125 63.011719 C 13.09375 60.617188 10.289063 59.5 7 59.5 C 3.816406 59.5 2.09375 59.488281 2.09375 59.488281 C 1.710938 59.484375 1.398438 59.171875 1.398438 58.789063 L 1.398438 46.898438 C 1.398438 46.511719 1.714844 46.199219 2.101563 46.199219 L 11.199219 46.199219 C 12.324219 46.199219 13.464844 45.953125 14.789063 45.664063 C 16.566406 45.28125 18.777344 44.800781 21.699219 44.800781 C 26.222656 44.800781 28.464844 47.9375 30.097656 50.230469 C 30.894531 51.347656 31.648438 52.402344 32.3125 52.507813 C 33.269531 52.664063 36.492188 52.589844 38.84375 52.539063 C 40.261719 52.507813 41.488281 52.480469 42.027344 52.5 C 44.328125 52.597656 46.707031 53.082031 46.898438 55.957031 C 46.941406 56.605469 46.855469 57.175781 46.707031 57.664063 C 49.78125 56.363281 55.558594 53.910156 57.386719 53.03125 C 61.371094 51.105469 65.605469 51.222656 66.796875 53.460938 C 67.179688 54.179688 67.824219 57 63.601563 59.472656 C 61.148438 60.902344 58.691406 62.324219 56.226563 63.738281 C 52.546875 65.851563 49.636719 67.523438 48.324219 68.390625 C 46.488281 69.609375 43.867188 69.480469 41.335938 69.363281 C 40.609375 69.328125 39.886719 69.292969 39.199219 69.292969 C 37.425781 69.292969 34.734375 69.496094 31.878906 69.714844 C 30.601563 69.808594 29.296875 69.910156 28.042969 69.992188 C 27.941406 69.996094 27.839844 70 27.734375 70 Z M 2.800781 58.089844 C 3.578125 58.09375 5 58.101563 7 58.101563 C 10.597656 58.101563 13.789063 59.363281 16.75 61.957031 C 17.082031 62.25 17.496094 62.632813 17.96875 63.078125 C 20.367188 65.324219 24.863281 68.84375 27.953125 68.59375 C 29.203125 68.511719 30.5 68.414063 31.777344 68.316406 C 34.65625 68.097656 37.375 67.890625 39.199219 67.890625 C 39.910156 67.890625 40.65625 67.925781 41.40625 67.964844 C 43.710938 68.074219 46.097656 68.1875 47.554688 67.222656 C 48.90625 66.328125 51.828125 64.648438 55.53125 62.519531 C 57.796875 61.21875 60.328125 59.765625 62.894531 58.265625 C 65.015625 57.019531 66.1875 55.296875 65.5625 54.117188 C 64.808594 52.707031 61.503906 52.597656 57.992188 54.289063 C 55.441406 55.523438 45.6875 59.609375 45.273438 59.785156 C 45.0625 59.960938 44.765625 60 44.519531 59.878906 C 44.269531 59.757813 44.117188 59.503906 44.125 59.230469 C 44.128906 58.953125 44.296875 58.710938 44.550781 58.601563 C 44.589844 58.570313 45.609375 57.664063 45.5 56.046875 C 45.417969 54.777344 44.8125 54.019531 41.972656 53.902344 C 41.476563 53.878906 40.269531 53.90625 38.875 53.9375 C 36.203125 54 33.175781 54.066406 32.089844 53.894531 C 30.847656 53.695313 29.972656 52.464844 28.960938 51.046875 C 27.417969 48.886719 25.503906 46.199219 21.699219 46.199219 C 18.925781 46.199219 16.886719 46.640625 15.085938 47.035156 C 13.683594 47.339844 12.472656 47.601563 11.199219 47.601563 L 2.800781 47.601563 Z M 2.800781 58.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 34.5 60.921875 C 31.738281 60.921875 29.765625 60.59375 28.652344 59.617188 L 24.347656 55.84375 L 25.265625 54.792969 L 29.578125 58.566406 C 31.046875 59.855469 37.386719 59.371094 39.773438 59.214844 C 43.574219 58.964844 43.96875 58.773438 46.269531 57.84375 C 46.628906 57.703125 47.035156 57.875 47.179688 58.230469 C 47.324219 58.589844 47.152344 58.996094 46.796875 59.140625 C 44.363281 60.125 43.792969 60.351563 39.867188 60.609375 C 38.394531 60.707031 35.6875 60.921875 34.5 60.921875 Z M 34.5 60.921875 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureManagementGroups(m).png b/dist/Management/AzureManagementGroups(m).png
index 356da503..5b235ac6 100644
Binary files a/dist/Management/AzureManagementGroups(m).png and b/dist/Management/AzureManagementGroups(m).png differ
diff --git a/dist/Management/AzureManagementGroups(m).svg b/dist/Management/AzureManagementGroups(m).svg
index 1865e6d0..fadcd474 100644
--- a/dist/Management/AzureManagementGroups(m).svg
+++ b/dist/Management/AzureManagementGroups(m).svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="56pt" viewBox="0 0 70 56" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 49 22.960938 L 48.597656 23.929688 L 36.074219 8.902344 L 35 9.800781 L 33.925781 8.902344 L 21.402344 23.929688 L 21 22.960938 L 12.707031 42.859375 L 15.292969 43.9375 L 21 30.238281 L 26.707031 43.9375 L 29.292969 42.859375 L 22.617188 26.84375 L 35 11.988281 L 47.382813 26.84375 L 40.707031 42.859375 L 43.292969 43.9375 L 49 30.238281 L 54.707031 43.9375 L 57.292969 42.859375 Z M 49 22.960938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 60.199219 43.398438 C 60.199219 45.71875 58.320313 47.601563 56 47.601563 C 53.679688 47.601563 51.800781 45.71875 51.800781 43.398438 C 51.800781 41.082031 53.679688 39.199219 56 39.199219 C 58.320313 39.199219 60.199219 41.082031 60.199219 43.398438 Z M 60.199219 43.398438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 46.199219 43.398438 C 46.199219 45.71875 44.320313 47.601563 42 47.601563 C 39.679688 47.601563 37.800781 45.71875 37.800781 43.398438 C 37.800781 41.082031 39.679688 39.199219 42 39.199219 C 44.320313 39.199219 46.199219 41.082031 46.199219 43.398438 Z M 46.199219 43.398438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 42 9.800781 C 42 13.664063 38.867188 16.800781 35 16.800781 C 31.132813 16.800781 28 13.664063 28 9.800781 C 28 5.933594 31.132813 2.800781 35 2.800781 C 38.867188 2.800781 42 5.933594 42 9.800781 Z M 42 9.800781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 26.601563 26.601563 C 26.601563 29.691406 24.09375 32.199219 21 32.199219 C 17.90625 32.199219 15.398438 29.691406 15.398438 26.601563 C 15.398438 23.507813 17.90625 21 21 21 C 24.09375 21 26.601563 23.507813 26.601563 26.601563 Z M 26.601563 26.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 54.601563 26.601563 C 54.601563 29.691406 52.09375 32.199219 49 32.199219 C 45.90625 32.199219 43.398438 29.691406 43.398438 26.601563 C 43.398438 23.507813 45.90625 21 49 21 C 52.09375 21 54.601563 23.507813 54.601563 26.601563 Z M 54.601563 26.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 32.199219 43.398438 C 32.199219 45.71875 30.320313 47.601563 28 47.601563 C 25.679688 47.601563 23.800781 45.71875 23.800781 43.398438 C 23.800781 41.082031 25.679688 39.199219 28 39.199219 C 30.320313 39.199219 32.199219 41.082031 32.199219 43.398438 Z M 32.199219 43.398438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 18.199219 43.398438 C 18.199219 45.71875 16.320313 47.601563 14 47.601563 C 11.679688 47.601563 9.800781 45.71875 9.800781 43.398438 C 9.800781 41.082031 11.679688 39.199219 14 39.199219 C 16.320313 39.199219 18.199219 41.082031 18.199219 43.398438 Z M 18.199219 43.398438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 13.300781 56.558594 C 12.957031 56.53125 12.625 56.4375 12.320313 56.28125 L 2.800781 50.679688 C 1.121094 49.671875 0.0664063 47.878906 0 45.921875 L 0 10.640625 C 0.03125 8.671875 1.09375 6.863281 2.800781 5.878906 L 12.320313 0.28125 C 13.285156 -0.273438 14.515625 0.046875 15.085938 1 C 15.660156 1.953125 15.363281 3.191406 14.421875 3.78125 L 4.898438 9.378906 C 4.507813 9.691406 4.257813 10.144531 4.199219 10.640625 L 4.199219 45.921875 C 4.257813 46.417969 4.507813 46.871094 4.898438 47.179688 L 14.421875 52.78125 C 14.882813 53.058594 15.21875 53.507813 15.351563 54.035156 C 15.480469 54.558594 15.398438 55.117188 15.121094 55.578125 C 14.691406 56.164063 14.023438 56.527344 13.300781 56.558594 Z M 56.699219 0 C 57.042969 0.0273438 57.375 0.121094 57.679688 0.28125 L 67.199219 5.878906 C 68.878906 6.890625 69.933594 8.679688 70 10.640625 L 70 45.921875 C 69.96875 47.890625 68.90625 49.695313 67.199219 50.679688 L 57.679688 56.28125 C 56.714844 56.835938 55.484375 56.515625 54.914063 55.558594 C 54.339844 54.605469 54.636719 53.371094 55.578125 52.78125 L 65.101563 47.179688 C 65.492188 46.871094 65.742188 46.417969 65.800781 45.921875 L 65.800781 10.640625 C 65.742188 10.144531 65.492188 9.691406 65.101563 9.378906 L 55.578125 3.78125 C 55.117188 3.503906 54.78125 3.050781 54.648438 2.523438 C 54.519531 2 54.601563 1.445313 54.878906 0.980469 C 55.328125 0.421875 55.984375 0.0664063 56.699219 0 Z M 56.699219 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 49.28125 22.960938 L 48.875 23.929688 L 36.28125 8.902344 L 35.199219 9.800781 L 34.121094 8.902344 L 21.523438 23.929688 L 21.121094 22.960938 L 12.78125 42.859375 L 15.382813 43.9375 L 21.121094 30.238281 L 26.859375 43.9375 L 29.460938 42.859375 L 22.746094 26.84375 L 35.199219 11.988281 L 47.65625 26.84375 L 40.941406 42.859375 L 43.542969 43.9375 L 49.28125 30.238281 L 55.019531 43.9375 L 57.621094 42.859375 Z M 49.28125 22.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 60.546875 43.398438 C 60.546875 45.71875 58.65625 47.601563 56.320313 47.601563 C 53.988281 47.601563 52.097656 45.71875 52.097656 43.398438 C 52.097656 41.082031 53.988281 39.199219 56.320313 39.199219 C 58.65625 39.199219 60.546875 41.082031 60.546875 43.398438 Z M 60.546875 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 46.464844 43.398438 C 46.464844 45.71875 44.574219 47.601563 42.242188 47.601563 C 39.90625 47.601563 38.019531 45.71875 38.019531 43.398438 C 38.019531 41.082031 39.90625 39.199219 42.242188 39.199219 C 44.574219 39.199219 46.464844 41.082031 46.464844 43.398438 Z M 46.464844 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 42.242188 9.800781 C 42.242188 13.664063 39.089844 16.800781 35.199219 16.800781 C 31.3125 16.800781 28.160156 13.664063 28.160156 9.800781 C 28.160156 5.933594 31.3125 2.800781 35.199219 2.800781 C 39.089844 2.800781 42.242188 5.933594 42.242188 9.800781 Z M 42.242188 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 26.753906 26.601563 C 26.753906 29.691406 24.230469 32.199219 21.121094 32.199219 C 18.007813 32.199219 15.488281 29.691406 15.488281 26.601563 C 15.488281 23.507813 18.007813 21 21.121094 21 C 24.230469 21 26.753906 23.507813 26.753906 26.601563 Z M 26.753906 26.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 54.914063 26.601563 C 54.914063 29.691406 52.394531 32.199219 49.28125 32.199219 C 46.171875 32.199219 43.648438 29.691406 43.648438 26.601563 C 43.648438 23.507813 46.171875 21 49.28125 21 C 52.394531 21 54.914063 23.507813 54.914063 26.601563 Z M 54.914063 26.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 32.382813 43.398438 C 32.382813 45.71875 30.496094 47.601563 28.160156 47.601563 C 25.828125 47.601563 23.9375 45.71875 23.9375 43.398438 C 23.9375 41.082031 25.828125 39.199219 28.160156 39.199219 C 30.496094 39.199219 32.382813 41.082031 32.382813 43.398438 Z M 32.382813 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 18.304688 43.398438 C 18.304688 45.71875 16.414063 47.601563 14.082031 47.601563 C 11.746094 47.601563 9.855469 45.71875 9.855469 43.398438 C 9.855469 41.082031 11.746094 39.199219 14.082031 39.199219 C 16.414063 39.199219 18.304688 41.082031 18.304688 43.398438 Z M 18.304688 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 13.378906 56.558594 C 13.03125 56.53125 12.699219 56.4375 12.390625 56.28125 L 2.816406 50.679688 C 1.128906 49.671875 0.0664063 47.878906 0 45.921875 L 0 10.640625 C 0.03125 8.671875 1.101563 6.863281 2.816406 5.878906 L 12.390625 0.28125 C 13.363281 -0.273438 14.597656 0.046875 15.171875 1 C 15.75 1.953125 15.453125 3.191406 14.503906 3.78125 L 4.925781 9.378906 C 4.535156 9.691406 4.28125 10.144531 4.222656 10.640625 L 4.222656 45.921875 C 4.28125 46.417969 4.535156 46.871094 4.925781 47.179688 L 14.503906 52.78125 C 14.96875 53.058594 15.304688 53.507813 15.441406 54.035156 C 15.570313 54.558594 15.488281 55.117188 15.207031 55.578125 C 14.777344 56.164063 14.105469 56.527344 13.378906 56.558594 Z M 57.023438 0 C 57.371094 0.0273438 57.703125 0.121094 58.011719 0.28125 L 67.585938 5.878906 C 69.273438 6.890625 70.335938 8.679688 70.402344 10.640625 L 70.402344 45.921875 C 70.371094 47.890625 69.300781 49.695313 67.585938 50.679688 L 58.011719 56.28125 C 57.039063 56.835938 55.804688 56.515625 55.230469 55.558594 C 54.652344 54.605469 54.949219 53.371094 55.898438 52.78125 L 65.476563 47.179688 C 65.867188 46.871094 66.121094 46.417969 66.179688 45.921875 L 66.179688 10.640625 C 66.121094 10.144531 65.867188 9.691406 65.476563 9.378906 L 55.898438 3.78125 C 55.433594 3.503906 55.097656 3.050781 54.960938 2.523438 C 54.832031 2 54.914063 1.445313 55.195313 0.980469 C 55.644531 0.421875 56.304688 0.0664063 57.023438 0 Z M 57.023438 0 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureManagementGroups.png b/dist/Management/AzureManagementGroups.png
index a061b40b..c663e7e8 100644
Binary files a/dist/Management/AzureManagementGroups.png and b/dist/Management/AzureManagementGroups.png differ
diff --git a/dist/Management/AzureManagementGroups.puml b/dist/Management/AzureManagementGroups.puml
index 862641f2..6fd7029b 100644
--- a/dist/Management/AzureManagementGroups.puml
+++ b/dist/Management/AzureManagementGroups.puml
@@ -1,10 +1,11 @@
 sprite $AzureManagementGroups [70x56/16z] {
-dPU7cWCX28GjoA1v__UzsnOodoQwErS9-ZDYYWPNL2jXKGcGOQBKV-L5YjLQaRg7nUeNIen3oYRbL4BTfHr2QslDEdW-C2OVGyl1w0TBEuK1dkS8SQbYQuGP
--uyRr8DEjRd89vNVx6mGwZUjnsNZVTsLX1R3GliKUULb0TklC9OH9OMX3XkReJc5lVHFdHyK9Khu8amewHE2XnHkRtnC4Thefoi2wWL1UKY9078gC9MeGBb1
-OOWGyGc5ooS0wJwb04glRm3nBaMwIKBO6ILRQwONXDq1hTMoGC5hLnjqGUkHgt56AQzJbGcScr1YUrtgDzPpvJT5NczrhKoUiz-KGYDPsNDrsGiUUk6-o8--
-w6IFiB97BKueePu3wK4kqNAOKNBzD-vFK5BQSmrXIb4WHGNY-1MQjroQKH9GzXUm3Dznz1WnevIZ4g33rta-t8wxo-KSnW8G0Xab2fTpcejcKuueLAwppG-n
-KQQmMRPDziXeJn4rUpk0cKfqliAGtwuC9Oufi4rEsPIkUOCeZoZ5TY4C8h53fo-Ac6Ad8aNfRSpBAqL4YJplYZ97n9If5moZDFDohLt38ChKfKGHpdETUEUt
-QTvUttVv7cq4_JYe9f73rXLbZwAKBlAZQg93yxBuDg11w02_AZx2VrnIoYs0JwpA5njP9_3LXYyfM5yMLsPtjefHx-O0lhgehpiRzOuNlX_-0G
+fPS9ckmW28H5a4Bx_lTz4yV1vejPNyrAfFy2igSfKjDqASyjouLIVyGtALfhDTbjPgkRP65BIyecvB0netPXXoYrjRPt9QjTIj-fNVlaNDklR5UG34vPnH7I
+N7KnuE7DMu1GMv2rAGqhOGwQ4dnEwr9SOIcseH864bK2XO-FZuhjXz9I6YZHAUwjxIUd5nHNx-Q48e6INrBe6rBJEqfiILvJkCvIw2s503y3eFIEGW242gp_
+XhwZA512y8RYzhEmvnG1GE7K0_WfXGSaOl9j2gErgkuSgqDj5NHDqKzNMvpdnThlcbnHv3FKLjURlxLyGUc9NML7WQ_PEOK_kyoLGwDJYanAtL4-K_b_Qd7H
+-xbOgFECeg7rgEmMSaY9XijBVXaOJLUKNDiFeoAjP6rRDBga5819WOEJgv00SaMXVZt8wwk9zZCKm1L50FRyeC7sb6EA6ytCs6psSiye_DUqPyPcdRQanCvZ
+PcpMErjJudhU5mCWUgqfh6R8dcaeDFa51l6g3Cfh2cnJ3ppor1wL6AqenRemwh9VKO-osPS5ZOWN50kPy4ntS7iPaPvGE52aHpeY3KmiA0YrQAmbCFca5lbU
+IZbCYSAKKl2JyLmdQHhwWI0XOl_Oj93vIl3zSf55EBb8oc6Kk0XzFQfcVmf_BdzijYJ-0FzO_WZF_cPKorE6lqwCetP4ygAPQcNtafNl8hm3fSN6knW-i2ts
+P3XwD0BI9xL4nty
 }
 
 AzureEntityColoring(AzureManagementGroups)
diff --git a/dist/Management/AzureManagementGroups.svg b/dist/Management/AzureManagementGroups.svg
index b7da0968..9a5ead18 100644
--- a/dist/Management/AzureManagementGroups.svg
+++ b/dist/Management/AzureManagementGroups.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="56pt" viewBox="0 0 70 56" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 49 22.960938 L 48.597656 23.929688 L 36.074219 8.902344 L 35 9.800781 L 33.925781 8.902344 L 21.402344 23.929688 L 21 22.960938 L 12.707031 42.859375 L 15.292969 43.9375 L 21 30.238281 L 26.707031 43.9375 L 29.292969 42.859375 L 22.617188 26.84375 L 35 11.988281 L 47.382813 26.84375 L 40.707031 42.859375 L 43.292969 43.9375 L 49 30.238281 L 54.707031 43.9375 L 57.292969 42.859375 Z M 49 22.960938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 60.199219 43.398438 C 60.199219 45.71875 58.320313 47.601563 56 47.601563 C 53.679688 47.601563 51.800781 45.71875 51.800781 43.398438 C 51.800781 41.082031 53.679688 39.199219 56 39.199219 C 58.320313 39.199219 60.199219 41.082031 60.199219 43.398438 Z M 60.199219 43.398438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 46.199219 43.398438 C 46.199219 45.71875 44.320313 47.601563 42 47.601563 C 39.679688 47.601563 37.800781 45.71875 37.800781 43.398438 C 37.800781 41.082031 39.679688 39.199219 42 39.199219 C 44.320313 39.199219 46.199219 41.082031 46.199219 43.398438 Z M 46.199219 43.398438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 42 9.800781 C 42 13.664063 38.867188 16.800781 35 16.800781 C 31.132813 16.800781 28 13.664063 28 9.800781 C 28 5.933594 31.132813 2.800781 35 2.800781 C 38.867188 2.800781 42 5.933594 42 9.800781 Z M 42 9.800781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 26.601563 26.601563 C 26.601563 29.691406 24.09375 32.199219 21 32.199219 C 17.90625 32.199219 15.398438 29.691406 15.398438 26.601563 C 15.398438 23.507813 17.90625 21 21 21 C 24.09375 21 26.601563 23.507813 26.601563 26.601563 Z M 26.601563 26.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 54.601563 26.601563 C 54.601563 29.691406 52.09375 32.199219 49 32.199219 C 45.90625 32.199219 43.398438 29.691406 43.398438 26.601563 C 43.398438 23.507813 45.90625 21 49 21 C 52.09375 21 54.601563 23.507813 54.601563 26.601563 Z M 54.601563 26.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 32.199219 43.398438 C 32.199219 45.71875 30.320313 47.601563 28 47.601563 C 25.679688 47.601563 23.800781 45.71875 23.800781 43.398438 C 23.800781 41.082031 25.679688 39.199219 28 39.199219 C 30.320313 39.199219 32.199219 41.082031 32.199219 43.398438 Z M 32.199219 43.398438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 18.199219 43.398438 C 18.199219 45.71875 16.320313 47.601563 14 47.601563 C 11.679688 47.601563 9.800781 45.71875 9.800781 43.398438 C 9.800781 41.082031 11.679688 39.199219 14 39.199219 C 16.320313 39.199219 18.199219 41.082031 18.199219 43.398438 Z M 18.199219 43.398438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 13.300781 56.558594 C 12.957031 56.53125 12.625 56.4375 12.320313 56.28125 L 2.800781 50.679688 C 1.121094 49.671875 0.0664063 47.878906 0 45.921875 L 0 10.640625 C 0.03125 8.671875 1.09375 6.863281 2.800781 5.878906 L 12.320313 0.28125 C 13.285156 -0.273438 14.515625 0.046875 15.085938 1 C 15.660156 1.953125 15.363281 3.191406 14.421875 3.78125 L 4.898438 9.378906 C 4.507813 9.691406 4.257813 10.144531 4.199219 10.640625 L 4.199219 45.921875 C 4.257813 46.417969 4.507813 46.871094 4.898438 47.179688 L 14.421875 52.78125 C 14.882813 53.058594 15.21875 53.507813 15.351563 54.035156 C 15.480469 54.558594 15.398438 55.117188 15.121094 55.578125 C 14.691406 56.164063 14.023438 56.527344 13.300781 56.558594 Z M 56.699219 0 C 57.042969 0.0273438 57.375 0.121094 57.679688 0.28125 L 67.199219 5.878906 C 68.878906 6.890625 69.933594 8.679688 70 10.640625 L 70 45.921875 C 69.96875 47.890625 68.90625 49.695313 67.199219 50.679688 L 57.679688 56.28125 C 56.714844 56.835938 55.484375 56.515625 54.914063 55.558594 C 54.339844 54.605469 54.636719 53.371094 55.578125 52.78125 L 65.101563 47.179688 C 65.492188 46.871094 65.742188 46.417969 65.800781 45.921875 L 65.800781 10.640625 C 65.742188 10.144531 65.492188 9.691406 65.101563 9.378906 L 55.578125 3.78125 C 55.117188 3.503906 54.78125 3.050781 54.648438 2.523438 C 54.519531 2 54.601563 1.445313 54.878906 0.980469 C 55.328125 0.421875 55.984375 0.0664063 56.699219 0 Z M 56.699219 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 49.28125 22.960938 L 48.875 23.929688 L 36.28125 8.902344 L 35.199219 9.800781 L 34.121094 8.902344 L 21.523438 23.929688 L 21.121094 22.960938 L 12.78125 42.859375 L 15.382813 43.9375 L 21.121094 30.238281 L 26.859375 43.9375 L 29.460938 42.859375 L 22.746094 26.84375 L 35.199219 11.988281 L 47.65625 26.84375 L 40.941406 42.859375 L 43.542969 43.9375 L 49.28125 30.238281 L 55.019531 43.9375 L 57.621094 42.859375 Z M 49.28125 22.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 60.546875 43.398438 C 60.546875 45.71875 58.65625 47.601563 56.320313 47.601563 C 53.988281 47.601563 52.097656 45.71875 52.097656 43.398438 C 52.097656 41.082031 53.988281 39.199219 56.320313 39.199219 C 58.65625 39.199219 60.546875 41.082031 60.546875 43.398438 Z M 60.546875 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 46.464844 43.398438 C 46.464844 45.71875 44.574219 47.601563 42.242188 47.601563 C 39.90625 47.601563 38.019531 45.71875 38.019531 43.398438 C 38.019531 41.082031 39.90625 39.199219 42.242188 39.199219 C 44.574219 39.199219 46.464844 41.082031 46.464844 43.398438 Z M 46.464844 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 42.242188 9.800781 C 42.242188 13.664063 39.089844 16.800781 35.199219 16.800781 C 31.3125 16.800781 28.160156 13.664063 28.160156 9.800781 C 28.160156 5.933594 31.3125 2.800781 35.199219 2.800781 C 39.089844 2.800781 42.242188 5.933594 42.242188 9.800781 Z M 42.242188 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 26.753906 26.601563 C 26.753906 29.691406 24.230469 32.199219 21.121094 32.199219 C 18.007813 32.199219 15.488281 29.691406 15.488281 26.601563 C 15.488281 23.507813 18.007813 21 21.121094 21 C 24.230469 21 26.753906 23.507813 26.753906 26.601563 Z M 26.753906 26.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 54.914063 26.601563 C 54.914063 29.691406 52.394531 32.199219 49.28125 32.199219 C 46.171875 32.199219 43.648438 29.691406 43.648438 26.601563 C 43.648438 23.507813 46.171875 21 49.28125 21 C 52.394531 21 54.914063 23.507813 54.914063 26.601563 Z M 54.914063 26.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 32.382813 43.398438 C 32.382813 45.71875 30.496094 47.601563 28.160156 47.601563 C 25.828125 47.601563 23.9375 45.71875 23.9375 43.398438 C 23.9375 41.082031 25.828125 39.199219 28.160156 39.199219 C 30.496094 39.199219 32.382813 41.082031 32.382813 43.398438 Z M 32.382813 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 18.304688 43.398438 C 18.304688 45.71875 16.414063 47.601563 14.082031 47.601563 C 11.746094 47.601563 9.855469 45.71875 9.855469 43.398438 C 9.855469 41.082031 11.746094 39.199219 14.082031 39.199219 C 16.414063 39.199219 18.304688 41.082031 18.304688 43.398438 Z M 18.304688 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 13.378906 56.558594 C 13.03125 56.53125 12.699219 56.4375 12.390625 56.28125 L 2.816406 50.679688 C 1.128906 49.671875 0.0664063 47.878906 0 45.921875 L 0 10.640625 C 0.03125 8.671875 1.101563 6.863281 2.816406 5.878906 L 12.390625 0.28125 C 13.363281 -0.273438 14.597656 0.046875 15.171875 1 C 15.75 1.953125 15.453125 3.191406 14.503906 3.78125 L 4.925781 9.378906 C 4.535156 9.691406 4.28125 10.144531 4.222656 10.640625 L 4.222656 45.921875 C 4.28125 46.417969 4.535156 46.871094 4.925781 47.179688 L 14.503906 52.78125 C 14.96875 53.058594 15.304688 53.507813 15.441406 54.035156 C 15.570313 54.558594 15.488281 55.117188 15.207031 55.578125 C 14.777344 56.164063 14.105469 56.527344 13.378906 56.558594 Z M 57.023438 0 C 57.371094 0.0273438 57.703125 0.121094 58.011719 0.28125 L 67.585938 5.878906 C 69.273438 6.890625 70.335938 8.679688 70.402344 10.640625 L 70.402344 45.921875 C 70.371094 47.890625 69.300781 49.695313 67.585938 50.679688 L 58.011719 56.28125 C 57.039063 56.835938 55.804688 56.515625 55.230469 55.558594 C 54.652344 54.605469 54.949219 53.371094 55.898438 52.78125 L 65.476563 47.179688 C 65.867188 46.871094 66.121094 46.417969 66.179688 45.921875 L 66.179688 10.640625 C 66.121094 10.144531 65.867188 9.691406 65.476563 9.378906 L 55.898438 3.78125 C 55.433594 3.503906 55.097656 3.050781 54.960938 2.523438 C 54.832031 2 54.914063 1.445313 55.195313 0.980469 C 55.644531 0.421875 56.304688 0.0664063 57.023438 0 Z M 57.023438 0 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureMetric(m).png b/dist/Management/AzureMetric(m).png
new file mode 100644
index 00000000..e50f7303
Binary files /dev/null and b/dist/Management/AzureMetric(m).png differ
diff --git a/dist/Management/AzureMetric(m).svg b/dist/Management/AzureMetric(m).svg
new file mode 100644
index 00000000..083b242d
--- /dev/null
+++ b/dist/Management/AzureMetric(m).svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 0 34.625 L 12.296875 34.625 L 12.296875 70 L 0 70 Z M 0 34.625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 19.234375 24.902344 L 31.53125 24.902344 L 31.53125 70 L 19.234375 70 Z M 19.234375 24.902344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 38.445313 40.304688 L 50.785156 40.304688 L 50.785156 70 L 38.445313 70 Z M 38.445313 40.304688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 57.703125 29.6875 L 70 29.6875 L 70 70 L 57.703125 70 Z M 57.703125 29.6875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 43.488281 28.460938 L 29.820313 8.558594 L 6.183594 25.921875 L 4.332031 23.40625 L 30.570313 4.128906 L 44.078125 23.796875 L 65.15625 5.386719 L 66.488281 6.910156 L 65.3125 7.9375 L 66.035156 8.769531 Z M 43.488281 28.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 9.378906 24.855469 C 9.378906 27.445313 7.277344 29.542969 4.6875 29.542969 C 2.097656 29.542969 0 27.445313 0 24.855469 C 0 22.265625 2.097656 20.167969 4.6875 20.167969 C 7.277344 20.167969 9.378906 22.265625 9.378906 24.855469 Z M 9.378906 24.855469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 34.792969 6.824219 C 34.792969 9.414063 32.691406 11.511719 30.101563 11.511719 C 27.511719 11.511719 25.414063 9.414063 25.414063 6.824219 C 25.414063 4.234375 27.511719 2.136719 30.101563 2.136719 C 32.691406 2.136719 34.792969 4.234375 34.792969 6.824219 Z M 34.792969 6.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 48.148438 26.128906 C 48.148438 28.71875 46.050781 30.816406 43.460938 30.816406 C 40.871094 30.816406 38.773438 28.71875 38.773438 26.128906 C 38.773438 23.539063 40.871094 21.441406 43.460938 21.441406 C 46.050781 21.441406 48.148438 23.539063 48.148438 26.128906 Z M 48.148438 26.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 70 7.480469 C 70 10.066406 67.902344 12.167969 65.3125 12.167969 C 62.722656 12.167969 60.621094 10.066406 60.621094 7.480469 C 60.621094 4.890625 62.722656 2.789063 65.3125 2.789063 C 67.902344 2.789063 70 4.890625 70 7.480469 Z M 70 7.480469 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureMetric.png b/dist/Management/AzureMetric.png
new file mode 100644
index 00000000..59f1e532
Binary files /dev/null and b/dist/Management/AzureMetric.png differ
diff --git a/dist/Management/AzureMetric.puml b/dist/Management/AzureMetric.puml
new file mode 100644
index 00000000..1bcbc6ad
--- /dev/null
+++ b/dist/Management/AzureMetric.puml
@@ -0,0 +1,10 @@
+sprite $AzureMetric [70x70/16z] {
+xPG5iWGX44CNb-xxNtSzDKRWkvBo8VMQ48RJBr78ETcHoPZ-SgatXQufNXsvDodNXzpOmossFfKxaP-MGXs-GfnIO1bJ2gSC1pc18xrzBr4Lc3W-ka9ArgiU
+1OWOkbr5ZMHPjTgJ3S6BQY45OLBxlgJxCeYg6abc5NUDPTfXzQhbncPLtGt3Px6qu6UQHQ9QZ-tSNDX5SuIYMvh9LCLniJJY6-VaDZR1A7hgvRZFkita5Rjh
+o23DGHRVbrcUtw5xTQnLhAIspOGKtIcsqooPfDSm_bsU5PcoTsYO_b62Iy8E7iEQ3QV-amOP36itN24_UAN9Eq4fFYxo-_S8xP14XbF6MxRBkzYZP5181HwG
+BiNtEy2jwrEGV7qjpI9yvHJ8vrhYsbvbqP12z7CfPgKtK1hotqAP5EDNUZF5vfL-5MLI9cLI9cLI9cLIBW
+}
+
+AzureEntityColoring(AzureMetric)
+!define AzureMetric(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMetric, AzureMetric)
+!define AzureMetric(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMetric, AzureMetric)
diff --git a/dist/Management/AzureMetric.svg b/dist/Management/AzureMetric.svg
new file mode 100644
index 00000000..3d328705
--- /dev/null
+++ b/dist/Management/AzureMetric.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 34.625 L 12.296875 34.625 L 12.296875 70 L 0 70 Z M 0 34.625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 19.234375 24.902344 L 31.53125 24.902344 L 31.53125 70 L 19.234375 70 Z M 19.234375 24.902344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 38.445313 40.304688 L 50.785156 40.304688 L 50.785156 70 L 38.445313 70 Z M 38.445313 40.304688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 57.703125 29.6875 L 70 29.6875 L 70 70 L 57.703125 70 Z M 57.703125 29.6875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 43.488281 28.460938 L 29.820313 8.558594 L 6.183594 25.921875 L 4.332031 23.40625 L 30.570313 4.128906 L 44.078125 23.796875 L 65.15625 5.386719 L 66.488281 6.910156 L 65.3125 7.9375 L 66.035156 8.769531 Z M 43.488281 28.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 9.378906 24.855469 C 9.378906 27.445313 7.277344 29.542969 4.6875 29.542969 C 2.097656 29.542969 0 27.445313 0 24.855469 C 0 22.265625 2.097656 20.167969 4.6875 20.167969 C 7.277344 20.167969 9.378906 22.265625 9.378906 24.855469 Z M 9.378906 24.855469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 34.792969 6.824219 C 34.792969 9.414063 32.691406 11.511719 30.101563 11.511719 C 27.511719 11.511719 25.414063 9.414063 25.414063 6.824219 C 25.414063 4.234375 27.511719 2.136719 30.101563 2.136719 C 32.691406 2.136719 34.792969 4.234375 34.792969 6.824219 Z M 34.792969 6.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 48.148438 26.128906 C 48.148438 28.71875 46.050781 30.816406 43.460938 30.816406 C 40.871094 30.816406 38.773438 28.71875 38.773438 26.128906 C 38.773438 23.539063 40.871094 21.441406 43.460938 21.441406 C 46.050781 21.441406 48.148438 23.539063 48.148438 26.128906 Z M 48.148438 26.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 70 7.480469 C 70 10.066406 67.902344 12.167969 65.3125 12.167969 C 62.722656 12.167969 60.621094 10.066406 60.621094 7.480469 C 60.621094 4.890625 62.722656 2.789063 65.3125 2.789063 C 67.902344 2.789063 70 4.890625 70 7.480469 Z M 70 7.480469 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureMonitor(m).png b/dist/Management/AzureMonitor(m).png
index 5baf795e..5aabeb19 100644
Binary files a/dist/Management/AzureMonitor(m).png and b/dist/Management/AzureMonitor(m).png differ
diff --git a/dist/Management/AzureMonitor(m).svg b/dist/Management/AzureMonitor(m).svg
index 13f33762..e47ce9fa 100644
--- a/dist/Management/AzureMonitor(m).svg
+++ b/dist/Management/AzureMonitor(m).svg
@@ -1,12 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 22.960938 27.300781 L 15.960938 21.558594 C 13.019531 25.761719 11.621094 30.800781 11.761719 35.839844 L 20.71875 34.859375 C 20.859375 32.199219 21.558594 29.539063 22.960938 27.300781 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 42.839844 22.820313 L 48.578125 15.820313 C 44.378906 12.878906 39.339844 11.480469 34.300781 11.621094 L 35.28125 20.71875 C 37.800781 20.578125 40.460938 21.28125 42.839844 22.820313 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 31.921875 21 L 30.941406 11.898438 C 25.898438 12.738281 21.28125 15.261719 17.921875 19.039063 L 24.921875 24.78125 C 26.878906 22.820313 29.398438 21.558594 31.921875 21 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 21.140625 38.078125 L 12.039063 39.058594 C 12.878906 44.101563 15.398438 48.71875 19.179688 52.21875 L 24.921875 45.21875 C 23.101563 43.121094 21.699219 40.738281 21.140625 38.078125 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 16.660156 57.539063 C 4.199219 47.460938 2.378906 29.261719 12.460938 16.800781 C 21.558594 5.601563 37.378906 2.800781 49.699219 10.078125 L 52.5 4.761719 C 37.519531 -3.921875 18.621094 -0.421875 7.839844 13.019531 C -4.339844 28 -2.101563 49.980469 12.878906 62.160156 C 15.121094 63.980469 17.640625 65.519531 20.300781 66.78125 L 23.101563 61.460938 C 20.71875 60.480469 18.621094 59.078125 16.660156 57.539063 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 23.039063 27.261719 L 15.972656 21.542969 C 12.949219 25.863281 11.578125 30.90625 11.785156 35.867188 L 20.820313 34.914063 C 20.820313 32.269531 21.546875 29.613281 23.039063 27.261719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 42.804688 22.789063 L 48.527344 15.722656 C 44.199219 12.703125 39.15625 11.339844 34.195313 11.546875 L 35.144531 20.582031 C 37.792969 20.578125 40.453125 21.304688 42.804688 22.789063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 31.996094 20.9375 L 31.042969 11.894531 C 26.15625 12.765625 21.527344 15.183594 17.953125 19.066406 L 25.015625 24.785156 C 26.984375 22.8125 29.417969 21.519531 31.996094 20.9375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 21.167969 38.066406 L 12.125 39.019531 C 12.992188 43.90625 15.410156 48.539063 19.292969 52.121094 L 25.011719 45.058594 C 23.035156 43.085938 21.746094 40.648438 21.167969 38.066406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 51.003906 17.707031 L 45.285156 24.769531 C 46.695313 26.171875 47.746094 27.816406 48.453125 29.582031 L 57.9375 29.582031 C 56.898438 25.140625 54.566406 20.980469 51.003906 17.707031 Z M 51.003906 17.707031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 61.964844 34.96875 C 61.964844 34.964844 61.96875 34.960938 61.96875 34.957031 C 61.957031 33.320313 60.625 32 58.980469 32 L 58.976563 31.992188 L 58.105469 32 L 38.105469 32 C 38.09375 31.988281 38.089844 32.007813 38.078125 32 C 37.28125 31.207031 36.242188 30.863281 35.199219 30.863281 C 34.148438 30.863281 33.09375 31.265625 32.289063 32.074219 C 30.699219 33.675781 30.710938 36.265625 32.316406 37.855469 C 33.113281 38.648438 34.152344 39.039063 35.1875 39.039063 C 36.152344 39.039063 37.109375 38.625 37.878906 37.949219 L 59 37.949219 C 60.640625 37.945313 61.957031 36.617188 61.964844 34.976563 L 61.96875 34.976563 C 61.96875 34.972656 61.964844 34.972656 61.964844 34.96875 Z M 61.964844 34.96875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 35 5.878906 C 51.054688 5.878906 64.121094 18.945313 64.121094 35 C 64.121094 51.054688 51.054688 64.121094 35 64.121094 C 18.945313 64.121094 5.878906 51.054688 5.878906 35 C 5.878906 18.945313 18.945313 5.878906 35 5.878906 M 35 0 C 15.671875 0 0 15.671875 0 35 C 0 54.328125 15.671875 70 35 70 C 54.328125 70 70 54.328125 70 35 C 70 15.671875 54.328125 0 35 0 Z M 35 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 31.921875 6.160156 C 15.960938 7.839844 4.480469 22.121094 6.160156 38.078125 C 7.839844 54.039063 22.121094 65.660156 38.078125 63.980469 C 54.039063 62.300781 65.660156 48.019531 63.980469 32.058594 C 63.140625 24.359375 59.21875 17.21875 53.199219 12.320313 C 47.878906 8.121094 41.578125 5.878906 35 6.019531 C 34.019531 6.019531 33.039063 6.019531 31.921875 6.160156 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 69.71875 31.359375 C 68.738281 21.980469 64.121094 13.578125 56.699219 7.699219 C 55.300781 6.578125 53.898438 5.601563 52.359375 4.761719 L 49.558594 10.078125 C 50.679688 10.78125 51.800781 11.480469 52.921875 12.320313 C 65.519531 22.261719 67.621094 40.601563 57.539063 53.199219 C 52.640625 59.359375 45.640625 63.140625 37.800781 63.980469 C 32.621094 64.539063 27.441406 63.699219 22.820313 61.460938 L 20.019531 66.78125 C 37.519531 74.898438 58.238281 67.339844 66.5 49.839844 C 69.300781 44.101563 70.421875 37.660156 69.71875 31.359375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 16.660156 57.539063 C 4.199219 47.460938 2.378906 29.261719 12.460938 16.800781 C 21.558594 5.601563 37.378906 2.800781 49.699219 10.078125 L 52.5 4.761719 C 37.519531 -3.921875 18.621094 -0.421875 7.839844 13.019531 C -4.339844 28 -2.101563 49.980469 12.878906 62.160156 C 15.121094 63.980469 17.640625 65.519531 20.300781 66.78125 L 23.101563 61.460938 C 20.71875 60.480469 18.621094 59.078125 16.660156 57.539063 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 50.960938 17.640625 L 45.21875 24.640625 C 46.621094 26.039063 47.738281 27.71875 48.441406 29.398438 L 57.960938 29.398438 C 56.839844 25.058594 54.460938 20.859375 50.960938 17.640625 Z M 50.960938 17.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 32.339844 37.800781 C 30.800781 36.261719 30.660156 33.601563 32.339844 32.058594 C 33.179688 31.21875 34.160156 30.800781 35.28125 30.800781 C 36.398438 30.800781 37.378906 31.21875 38.21875 31.921875 L 59.078125 31.921875 C 60.761719 31.921875 62.019531 33.179688 62.019531 34.859375 C 62.019531 36.539063 60.761719 37.800781 59.078125 37.800781 L 37.800781 37.800781 C 37.101563 38.5 36.121094 38.921875 35.140625 38.921875 C 34.019531 39.058594 33.039063 38.640625 32.339844 37.800781 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureMonitor.png b/dist/Management/AzureMonitor.png
index 4e82d247..e13b3dc8 100644
Binary files a/dist/Management/AzureMonitor.png and b/dist/Management/AzureMonitor.png differ
diff --git a/dist/Management/AzureMonitor.puml b/dist/Management/AzureMonitor.puml
index 4261b387..0052db99 100644
--- a/dist/Management/AzureMonitor.puml
+++ b/dist/Management/AzureMonitor.puml
@@ -1,12 +1,11 @@
 sprite $AzureMonitor [70x70/16z] {
-bLTPek0W21CK1Ez_trdfCzfgRRvcCoGXsdbf3SgYvjwQkrKfdBuZgxS9NWkb3s2W657BCKTj6xWSSLXxWR_hqVkXkplZlH0VqfGSSHANCQgTBG4AlSsZ0cPj
-kQwUgkNLyleOVY7nlAcYxcaCF9yjyO6chaPmoPcVu-CLIHrkWV5rnXHivciYFMz7fo1BIgMtbkP6sAWQ8y5R834ue3JHQ0B0duqDrZu1rWTpmQUEcP2rrcEY
-Xk0f6v_z-A2s6s-0Wb6E-Wt6p0x2BeJFHfjZqcS0ubztPUJNPcZ8eKu6SmDGIc8EzR0usESHICaFxuCBNymrj5VKxJqPnVuKvv0tlsca9SRtC4ftuI7bifg3
-kbAw8MD2U3PZAlgZi6YwW_gwCYHJBqCwfhu2hWiolKGnKCDTtOXXe6L2GmvbUqOPt-zm8XayC7HqWNbG71SW5kZQ2ha6OeNnmO34Azpa0u0sWzcED_T2CRUI
-NhRciQfGX_c3Fdk4HBp0WiyHbdK1h5l0bopQjg0aTnQtgfAPqD0Md0GTRLgsWK-vBE4x4hvOR6mPSIwYd0BnFH1-0dNB5LQh_dG1YDzR9r0p0R-dYF_fmN26
-pyuxu8ZnjvTXXeG8XtWLdeOprBZC5Inm--efAXozCg0-zzGF4rvZXcwVm7xUk8f1wAaX74hzgX2kIRzaQ_U3VFvYZb_uWhz9vRmjXej9FlnE6dzfNCkmBmY3
-Flana0Qif_2v4dnUadcotYtwEKrzgdZzI5CVrPEtBzaOLFoHHWwsi_wt_F8J8OOOqDs4lHms8DdIk6n_xj_F8ckTvsbRnOuUGsqTfdbG8I7Ze1BP6y9DLKIr
-UXkWHpTr3mCXcm2ti9oEGEexZdFa-aWXb3w2fVgGSrvJ_0O
+fPS9TgD034IrOz__mWCM9jKq8z3ppnvuFwK51wX0rCm_cAamzM4rFwFILFX_C7xiC2ymQJX-ywW_m3f1J4MOjr-pGBCj8geuKkOMzIHMx4arIfU8PPGLfski
+SA0d4kTIebIYyOKBYT0DVAIP_yB5ShBQzZbMt0GEsA2PfsEeME6F9N6Pgh9Jo4JHiLie3lwEIoGwDGMIgEq8Md0mEdTOHmcReSK342ngR8qdF4bCJnQTMgod
+UcIMcEwdGpSbA8a4MWkT5KEW1HcVboM63kiG1Ivi8BS0UX3BilXG4qOH7DaNuSFiEHzVDZH_2M4Kex30f8KGbSs_90nX_FCjTaLKU6-EqemkEuvXUFrkYA8h
+3A56U3d8m_wTdEB2YMwWO2GEI-2OlWN94GKqPHY6dM72WaJlD7fO34eImOBq2z_N570rcSA4k8WohoGqnjCYXQKcFXXSpN9LaBtUBxkpN3ONptfll2u99lB9
+ehD5tnMlme9jyNU9aCqLYV0AqK-McNv5roo5PE6quAIluLNpqiw-yC7WuVkjWzr5orCusoBuIjUtI1R4U4ttmrWMH8wDQMlY0-DhNJyCfuL8halYHa5612MX
+fbEGdFyVzIIQbkrR6SAqB0wtPOQTeNwKF5kdCAqn6oL-2jFPk8m2dL5g8HXblYLhBLpCjxlSiFYnAmSAcfR42B6c1kxqaEA9f7WguUd0ZZwQJYAp__63ju9a
+GlnH7F520cd0KpX2Rf-cBPHfHlySpW-UxBVpHX630aPSLNMSRAQgPWO6hAQE4oN6T8zQL3pTRx4VS-0qPbofYvYFXgAb_m
 }
 
 AzureEntityColoring(AzureMonitor)
diff --git a/dist/Management/AzureMonitor.svg b/dist/Management/AzureMonitor.svg
index 740f8881..111aa6f1 100644
--- a/dist/Management/AzureMonitor.svg
+++ b/dist/Management/AzureMonitor.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
-<clipPath id="clip1">
-  <path d="M 0 0 L 70 0 L 70 69.996094 L 0 69.996094 Z M 0 0 "/>
-</clipPath>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
@@ -12,80 +9,67 @@
 <rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip2">
+<clipPath id="clip1">
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 23.039063 27.261719 L 15.972656 21.539063 C 12.949219 25.863281 11.578125 30.902344 11.785156 35.863281 L 20.820313 34.914063 C 20.820313 32.269531 21.546875 29.613281 23.039063 27.261719 "/>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 22.960938 27.300781 L 15.960938 21.558594 C 13.019531 25.761719 11.621094 30.800781 11.761719 35.839844 L 20.71875 34.859375 C 20.859375 32.199219 21.558594 29.539063 22.960938 27.300781 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
 <rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip3">
+<clipPath id="clip2">
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface8" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 42.804688 22.789063 L 48.527344 15.722656 C 44.199219 12.703125 39.15625 11.339844 34.195313 11.546875 L 35.144531 20.582031 C 37.792969 20.578125 40.453125 21.304688 42.804688 22.789063 "/>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 42.839844 22.820313 L 48.578125 15.820313 C 44.378906 12.878906 39.339844 11.480469 34.300781 11.621094 L 35.28125 20.71875 C 37.800781 20.578125 40.460938 21.28125 42.839844 22.820313 "/>
 </g>
 <mask id="mask2">
   <g filter="url(#alpha)">
 <rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip4">
+<clipPath id="clip3">
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface11" clip-path="url(#clip4)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 31.996094 20.9375 L 31.042969 11.894531 C 26.15625 12.765625 21.527344 15.183594 17.953125 19.066406 L 25.015625 24.785156 C 26.984375 22.8125 29.417969 21.519531 31.996094 20.9375 "/>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 31.921875 21 L 30.941406 11.898438 C 25.898438 12.738281 21.28125 15.261719 17.921875 19.039063 L 24.921875 24.78125 C 26.878906 22.820313 29.398438 21.558594 31.921875 21 "/>
 </g>
 <mask id="mask3">
   <g filter="url(#alpha)">
 <rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip5">
+<clipPath id="clip4">
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface14" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 21.167969 38.066406 L 12.125 39.019531 C 12.992188 43.90625 15.410156 48.539063 19.292969 52.121094 L 25.011719 45.058594 C 23.035156 43.085938 21.746094 40.648438 21.167969 38.066406 "/>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 21.140625 38.078125 L 12.039063 39.058594 C 12.878906 44.101563 15.398438 48.71875 19.179688 52.21875 L 24.921875 45.21875 C 23.101563 43.121094 21.699219 40.738281 21.140625 38.078125 "/>
 </g>
-<clipPath id="clip6">
-  <path d="M 20 4 L 70 4 L 70 69.996094 L 20 69.996094 Z M 20 4 "/>
-</clipPath>
-<clipPath id="clip7">
-  <path d="M 0 0 L 70 0 L 70 69.996094 L 0 69.996094 Z M 0 0 "/>
-</clipPath>
 <mask id="mask4">
   <g filter="url(#alpha)">
 <rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip8">
+<clipPath id="clip5">
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface17" clip-path="url(#clip8)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 16.730469 57.574219 C 10.945313 52.890625 6.960938 46.03125 6.117188 38.046875 C 5.28125 30.054688 7.746094 22.515625 12.429688 16.730469 C 17.109375 10.945313 23.972656 6.960938 31.960938 6.121094 C 38.417969 5.441406 44.582031 6.921875 49.730469 9.984375 L 52.480469 4.695313 C 46.296875 1.105469 38.953125 -0.605469 31.332031 0.199219 C 21.730469 1.207031 13.421875 6.03125 7.796875 12.980469 L 7.785156 12.992188 C 2.160156 19.945313 -0.816406 29.070313 0.195313 38.667969 C 1.207031 48.269531 6.023438 56.582031 12.984375 62.207031 C 15.199219 64.003906 17.652344 65.492188 20.253906 66.703125 L 23 61.421875 C 20.757813 60.398438 18.640625 59.121094 16.730469 57.574219 "/>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 16.660156 57.539063 C 4.199219 47.460938 2.378906 29.261719 12.460938 16.800781 C 21.558594 5.601563 37.378906 2.800781 49.699219 10.078125 L 52.5 4.761719 C 37.519531 -3.921875 18.621094 -0.421875 7.839844 13.019531 C -4.339844 28 -2.101563 49.980469 12.878906 62.160156 C 15.121094 63.980469 17.640625 65.519531 20.300781 66.78125 L 23.101563 61.460938 C 20.71875 60.480469 18.621094 59.078125 16.660156 57.539063 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 31.960938 6.117188 C 23.972656 6.960938 17.109375 10.945313 12.429688 16.730469 C 7.746094 22.515625 5.28125 30.054688 6.117188 38.046875 C 6.960938 46.03125 10.945313 52.890625 16.730469 57.574219 C 22.519531 62.257813 30.058594 64.726563 38.039063 63.886719 C 46.027344 63.046875 52.890625 59.054688 57.578125 53.273438 C 62.253906 47.488281 64.726563 39.949219 63.886719 31.960938 C 63.035156 23.90625 58.945313 17.023438 53.070313 12.269531 C 48.128906 8.265625 41.828125 5.957031 35.074219 5.957031 C 34.046875 5.957031 33.007813 6.007813 31.960938 6.117188 "/>
-<g clip-path="url(#clip1)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 31.921875 6.160156 C 15.960938 7.839844 4.480469 22.121094 6.160156 38.078125 C 7.839844 54.039063 22.121094 65.660156 38.078125 63.980469 C 54.039063 62.300781 65.660156 48.019531 63.980469 32.058594 C 63.140625 24.359375 59.21875 17.21875 53.199219 12.320313 C 47.878906 8.121094 41.578125 5.878906 35 6.019531 C 34.019531 6.019531 33.039063 6.019531 31.921875 6.160156 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
 <use xlink:href="#surface11" mask="url(#mask2)"/>
 <use xlink:href="#surface14" mask="url(#mask3)"/>
-</g>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 69.800781 31.335938 C 68.785156 21.625 63.824219 13.300781 56.820313 7.636719 C 55.460938 6.535156 53.996094 5.578125 52.480469 4.695313 L 49.730469 9.984375 C 50.894531 10.675781 52.023438 11.417969 53.070313 12.269531 C 58.945313 17.023438 63.035156 23.90625 63.882813 31.957031 C 64.726563 39.945313 62.253906 47.488281 57.578125 53.273438 C 52.890625 59.058594 46.027344 63.046875 38.039063 63.886719 C 32.691406 64.449219 27.554688 63.5 23 61.421875 L 20.253906 66.707031 C 25.820313 69.296875 32.125 70.496094 38.664063 69.804688 C 48.273438 68.796875 56.578125 63.976563 62.203125 57.019531 C 67.835938 50.070313 70.820313 40.9375 69.800781 31.335938 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 16.730469 57.574219 C 10.945313 52.890625 6.960938 46.03125 6.117188 38.046875 C 5.28125 30.054688 7.746094 22.515625 12.429688 16.730469 C 17.109375 10.945313 23.972656 6.960938 31.960938 6.121094 C 38.417969 5.441406 44.582031 6.921875 49.730469 9.984375 L 52.480469 4.695313 C 46.296875 1.105469 38.953125 -0.605469 31.332031 0.199219 C 21.730469 1.207031 13.421875 6.03125 7.796875 12.980469 L 7.785156 12.992188 C 2.160156 19.945313 -0.816406 29.070313 0.195313 38.667969 C 1.207031 48.269531 6.023438 56.582031 12.984375 62.207031 C 15.199219 64.003906 17.652344 65.492188 20.253906 66.703125 L 23 61.421875 C 20.757813 60.398438 18.640625 59.121094 16.730469 57.574219 "/>
-<g clip-path="url(#clip7)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 69.71875 31.359375 C 68.738281 21.980469 64.121094 13.578125 56.699219 7.699219 C 55.300781 6.578125 53.898438 5.601563 52.359375 4.761719 L 49.558594 10.078125 C 50.679688 10.78125 51.800781 11.480469 52.921875 12.320313 C 65.519531 22.261719 67.621094 40.601563 57.539063 53.199219 C 52.640625 59.359375 45.640625 63.140625 37.800781 63.980469 C 32.621094 64.539063 27.441406 63.699219 22.820313 61.460938 L 20.019531 66.78125 C 37.519531 74.898438 58.238281 67.339844 66.5 49.839844 C 69.300781 44.101563 70.421875 37.660156 69.71875 31.359375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 16.660156 57.539063 C 4.199219 47.460938 2.378906 29.261719 12.460938 16.800781 C 21.558594 5.601563 37.378906 2.800781 49.699219 10.078125 L 52.5 4.761719 C 37.519531 -3.921875 18.621094 -0.421875 7.839844 13.019531 C -4.339844 28 -2.101563 49.980469 12.878906 62.160156 C 15.121094 63.980469 17.640625 65.519531 20.300781 66.78125 L 23.101563 61.460938 C 20.71875 60.480469 18.621094 59.078125 16.660156 57.539063 "/>
 <use xlink:href="#surface17" mask="url(#mask4)"/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 51.003906 17.707031 L 45.285156 24.769531 C 46.695313 26.171875 47.746094 27.816406 48.453125 29.582031 L 57.9375 29.582031 C 56.898438 25.140625 54.566406 20.980469 51.003906 17.707031 Z M 51.003906 17.707031 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 32.316406 37.855469 C 30.710938 36.265625 30.699219 33.675781 32.289063 32.074219 C 33.09375 31.265625 34.148438 30.863281 35.199219 30.863281 C 36.242188 30.863281 37.28125 31.207031 38.078125 32 C 38.089844 32.007813 38.09375 31.988281 38.105469 32 L 58.105469 32 L 58.976563 31.992188 L 58.980469 32 C 60.625 32 61.957031 33.320313 61.96875 34.957031 C 61.972656 36.605469 60.648438 37.945313 59 37.949219 L 37.878906 37.949219 C 37.109375 38.625 36.152344 39.039063 35.1875 39.039063 C 34.152344 39.039063 33.113281 38.648438 32.316406 37.855469 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 58.980469 32.023438 L 58.976563 32.019531 L 58.105469 32.023438 L 38.105469 32.023438 C 38.09375 32.015625 38.089844 32.035156 38.078125 32.023438 C 37.28125 31.234375 36.242188 30.886719 35.199219 30.886719 C 34.148438 30.886719 33.09375 31.289063 32.289063 32.097656 C 31.5 32.894531 31.105469 33.9375 31.105469 34.976563 L 61.96875 34.976563 C 61.953125 33.339844 60.621094 32.023438 58.980469 32.023438 Z M 58.980469 32.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 50.960938 17.640625 L 45.21875 24.640625 C 46.621094 26.039063 47.738281 27.71875 48.441406 29.398438 L 57.960938 29.398438 C 56.839844 25.058594 54.460938 20.859375 50.960938 17.640625 Z M 50.960938 17.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 32.339844 37.800781 C 30.800781 36.261719 30.660156 33.601563 32.339844 32.058594 C 33.179688 31.21875 34.160156 30.800781 35.28125 30.800781 C 36.398438 30.800781 37.378906 31.21875 38.21875 31.921875 L 59.078125 31.921875 C 60.761719 31.921875 62.019531 33.179688 62.019531 34.859375 C 62.019531 36.539063 60.761719 37.800781 59.078125 37.800781 L 37.800781 37.800781 C 37.101563 38.5 36.121094 38.921875 35.140625 38.921875 C 34.019531 39.058594 33.039063 38.640625 32.339844 37.800781 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzurePolicy(m).png b/dist/Management/AzurePolicy(m).png
index 126a0b71..b7d9bc41 100644
Binary files a/dist/Management/AzurePolicy(m).png and b/dist/Management/AzurePolicy(m).png differ
diff --git a/dist/Management/AzurePolicy(m).svg b/dist/Management/AzurePolicy(m).svg
index 1401c913..3e02f6c0 100644
--- a/dist/Management/AzurePolicy(m).svg
+++ b/dist/Management/AzurePolicy(m).svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="62pt" height="70pt" viewBox="0 0 62 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 40.6875 35.015625 C 40.6875 40.386719 36.351563 44.738281 31 44.738281 C 25.648438 44.738281 21.3125 40.386719 21.3125 35.015625 C 21.3125 29.644531 25.648438 25.292969 31 25.292969 C 36.351563 25.292969 40.6875 29.644531 40.6875 35.015625 Z M 40.6875 35.015625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 51.863281 25.914063 C 51.863281 28.542969 49.738281 30.675781 47.121094 30.675781 C 44.5 30.675781 42.378906 28.542969 42.378906 25.914063 C 42.378906 23.285156 44.5 21.15625 47.121094 21.15625 C 49.738281 21.15625 51.863281 23.285156 51.863281 25.914063 Z M 51.863281 25.914063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 51.863281 44.117188 C 51.863281 46.746094 49.738281 48.875 47.121094 48.875 C 44.5 48.875 42.378906 46.746094 42.378906 44.117188 C 42.378906 41.488281 44.5 39.355469 47.121094 39.355469 C 49.738281 39.355469 51.863281 41.488281 51.863281 44.117188 Z M 51.863281 44.117188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 62.171875 50.597656 C 62.171875 52.839844 60.359375 54.660156 58.125 54.660156 C 55.890625 54.660156 54.078125 52.839844 54.078125 50.597656 C 54.078125 48.355469 55.890625 46.539063 58.125 46.539063 C 60.359375 46.539063 62.171875 48.355469 62.171875 50.597656 Z M 62.171875 50.597656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 62 19.488281 C 62 21.636719 60.265625 23.375 58.125 23.375 C 55.984375 23.375 54.25 21.636719 54.25 19.488281 C 54.25 17.339844 55.984375 15.597656 58.125 15.597656 C 60.265625 15.597656 62 17.339844 62 19.488281 Z M 62 19.488281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 62 35.015625 C 62 37.164063 60.265625 38.90625 58.125 38.90625 C 55.984375 38.90625 54.25 37.164063 54.25 35.015625 C 54.25 32.867188 55.984375 31.125 58.125 31.125 C 60.265625 31.125 62 32.867188 62 35.015625 Z M 62 35.015625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 48.082031 11.214844 C 48.082031 12.761719 46.832031 14.015625 45.289063 14.015625 C 43.75 14.015625 42.5 12.761719 42.5 11.214844 C 42.5 9.667969 43.75 8.414063 45.289063 8.414063 C 46.832031 8.414063 48.082031 9.667969 48.082031 11.214844 Z M 48.082031 11.214844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 31.078125 63.558594 L 5.578125 49.242188 L 5.578125 20.757813 L 31.078125 6.441406 L 43.804688 13.585938 L 46.617188 8.75 L 31.078125 0 L 0 17.5 L 0 52.5 L 31.078125 70 L 46.617188 61.25 L 43.804688 56.414063 Z M 31.078125 63.558594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 48.082031 58.785156 C 48.082031 60.332031 46.832031 61.585938 45.289063 61.585938 C 43.75 61.585938 42.5 60.332031 42.5 58.785156 C 42.5 57.238281 43.75 55.984375 45.289063 55.984375 C 46.832031 55.984375 48.082031 57.238281 48.082031 58.785156 Z M 48.082031 58.785156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 44.550781 35.015625 C 44.550781 40.386719 40.199219 44.738281 34.828125 44.738281 C 29.460938 44.738281 25.105469 40.386719 25.105469 35.015625 C 25.105469 29.644531 29.460938 25.292969 34.828125 25.292969 C 40.199219 25.292969 44.550781 29.644531 44.550781 35.015625 Z M 44.550781 35.015625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 55.765625 25.914063 C 55.765625 28.542969 53.636719 30.675781 51.007813 30.675781 C 48.378906 30.675781 46.246094 28.542969 46.246094 25.914063 C 46.246094 23.285156 48.378906 21.15625 51.007813 21.15625 C 53.636719 21.15625 55.765625 23.285156 55.765625 25.914063 Z M 55.765625 25.914063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 55.765625 44.117188 C 55.765625 46.746094 53.636719 48.875 51.007813 48.875 C 48.378906 48.875 46.246094 46.746094 46.246094 44.117188 C 46.246094 41.488281 48.378906 39.355469 51.007813 39.355469 C 53.636719 39.355469 55.765625 41.488281 55.765625 44.117188 Z M 55.765625 44.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 66.109375 50.597656 C 66.109375 52.839844 64.292969 54.660156 62.050781 54.660156 C 59.808594 54.660156 57.992188 52.839844 57.992188 50.597656 C 57.992188 48.355469 59.808594 46.539063 62.050781 46.539063 C 64.292969 46.539063 66.109375 48.355469 66.109375 50.597656 Z M 66.109375 50.597656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 65.941406 19.488281 C 65.941406 21.636719 64.199219 23.375 62.050781 23.375 C 59.902344 23.375 58.164063 21.636719 58.164063 19.488281 C 58.164063 17.339844 59.902344 15.597656 62.050781 15.597656 C 64.199219 15.597656 65.941406 17.339844 65.941406 19.488281 Z M 65.941406 19.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 65.941406 35.015625 C 65.941406 37.164063 64.199219 38.90625 62.050781 38.90625 C 59.902344 38.90625 58.164063 37.164063 58.164063 35.015625 C 58.164063 32.867188 59.902344 31.125 62.050781 31.125 C 64.199219 31.125 65.941406 32.867188 65.941406 35.015625 Z M 65.941406 35.015625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 51.972656 11.214844 C 51.972656 12.761719 50.71875 14.015625 49.171875 14.015625 C 47.625 14.015625 46.371094 12.761719 46.371094 11.214844 C 46.371094 9.667969 47.625 8.414063 49.171875 8.414063 C 50.71875 8.414063 51.972656 9.667969 51.972656 11.214844 Z M 51.972656 11.214844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 34.90625 63.558594 L 9.316406 49.242188 L 9.316406 20.757813 L 34.90625 6.441406 L 47.679688 13.585938 L 50.5 8.75 L 34.90625 0 L 3.71875 17.5 L 3.71875 52.5 L 34.90625 70 L 50.5 61.25 L 47.679688 56.414063 Z M 34.90625 63.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 51.972656 58.785156 C 51.972656 60.332031 50.71875 61.585938 49.171875 61.585938 C 47.625 61.585938 46.371094 60.332031 46.371094 58.785156 C 46.371094 57.238281 47.625 55.984375 49.171875 55.984375 C 50.71875 55.984375 51.972656 57.238281 51.972656 58.785156 Z M 51.972656 58.785156 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzurePolicy.png b/dist/Management/AzurePolicy.png
index d427fdfa..a50fd813 100644
Binary files a/dist/Management/AzurePolicy.png and b/dist/Management/AzurePolicy.png differ
diff --git a/dist/Management/AzurePolicy.puml b/dist/Management/AzurePolicy.puml
index d93839ca..d26cbb2c 100644
--- a/dist/Management/AzurePolicy.puml
+++ b/dist/Management/AzurePolicy.puml
@@ -1,9 +1,9 @@
-sprite $AzurePolicy [62x70/16z] {
-jPTNWkmW30HHjEz_uHTNJgqPw0tzDw5i2X1Xl8jaoFXiOlyJ_nph-_zinhEwxKSsvLZ9_POKWeqTueHm9RUp-KO8bwzjXBuclCmltIUhmjv-Asl2qWz1z2GO
-zhsHFIiWt3RCreNn-K48GoR2gSkKIFK7NqsMcI43X9UY-JSn3ZOOuVmV1M66DgRyaQQCpLshq_vc54rqrT_uFss2bimBBgPZ4BJdHsfm9hIecOvA56qhj5LB
-XQSbp_YzvJgb9Qy9wBNtTDvZvuYbJ6dFQmeHZx0nfdG-uysqanUq9cHKBWDWFUr8I_S7QUb0MjiQ-m7QMneVhorjIFV5sj82S0p4_TLuHzzmqPi0qltBupB8
-CnhDvT8WGnfnW8rPM_GvnsEnlelto0mJQcN2yE_6w7tY24VN_DLp1oReGc0dol79NH1E3TIc14SqXlRzI0X_Te2J6haPIvxyihv4XdL7SZvB-XelVvlebs2B
-p_LzSZu7_UuecslwAUrZZRsOI2xF2FmlEHljgc_WGen-XQl2OA-XgCy8u-Y3C1K3OIu-4_uD
+sprite $AzurePolicy [70x70/16z] {
+fPS7jhKm28JfSVyR_ikpy3Wc2ZYdtFuP9y3Dm9jGZU2hPFidmqyC7jikwJDeR2xkCT2se45TGw8C-unX_boRXWoE_aYQORSVSPM3wZzGDq9A65cQwVGt1Zzi
+h6yzfgkCrryOsIeJM4Z6Dl01CZMrNsM5GO28uE9GPMcfcSb53ARM88wXPflOBdHAesNve91JlChQQoavGYAy_t27A1GfRYdlPUgG6aM26SG43GeU45z2ZeB4
+JEYEdgfGI6tNyIbtA6gN5BjtP47ucqjfYaQAXftEKjo3u0sh2aAQ4WXJHv65NoXqfz3i6_X8uJj5m9Ni8xbJTDNJVOhFbo95fZrLzOLdr-572jufEBaGlTIB
+BcmXYhHd2awNmjwQAGhGn1LsOf8I3URG5fAd06eOBzrP1oHgfaBGd7LpQ9SI5Lq2x578IsSlNgbIt71PdZm4FlxRzpA7H8kebpbaCbzsQUEEfYVTwc9u5MMo
+OZMbV0AOgt_uHb4k9AE7pAA5w2lhZ-ShpPtbVIUndIjG7TyBZf4zi9xgfPzPOlQZPcRnAepI3_6jr_BHvkzzGMDYQfyZy56IISP_0G
 }
 
 AzureEntityColoring(AzurePolicy)
diff --git a/dist/Management/AzurePolicy.svg b/dist/Management/AzurePolicy.svg
index 0c163a2b..6c1a60f4 100644
--- a/dist/Management/AzurePolicy.svg
+++ b/dist/Management/AzurePolicy.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="62pt" height="70pt" viewBox="0 0 62 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 40.6875 35.015625 C 40.6875 40.386719 36.351563 44.738281 31 44.738281 C 25.648438 44.738281 21.3125 40.386719 21.3125 35.015625 C 21.3125 29.644531 25.648438 25.292969 31 25.292969 C 36.351563 25.292969 40.6875 29.644531 40.6875 35.015625 Z M 40.6875 35.015625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 51.863281 25.914063 C 51.863281 28.542969 49.738281 30.675781 47.121094 30.675781 C 44.5 30.675781 42.378906 28.542969 42.378906 25.914063 C 42.378906 23.285156 44.5 21.15625 47.121094 21.15625 C 49.738281 21.15625 51.863281 23.285156 51.863281 25.914063 Z M 51.863281 25.914063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 51.863281 44.117188 C 51.863281 46.746094 49.738281 48.875 47.121094 48.875 C 44.5 48.875 42.378906 46.746094 42.378906 44.117188 C 42.378906 41.488281 44.5 39.355469 47.121094 39.355469 C 49.738281 39.355469 51.863281 41.488281 51.863281 44.117188 Z M 51.863281 44.117188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 62.171875 50.597656 C 62.171875 52.839844 60.359375 54.660156 58.125 54.660156 C 55.890625 54.660156 54.078125 52.839844 54.078125 50.597656 C 54.078125 48.355469 55.890625 46.539063 58.125 46.539063 C 60.359375 46.539063 62.171875 48.355469 62.171875 50.597656 Z M 62.171875 50.597656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 62 19.488281 C 62 21.636719 60.265625 23.375 58.125 23.375 C 55.984375 23.375 54.25 21.636719 54.25 19.488281 C 54.25 17.339844 55.984375 15.597656 58.125 15.597656 C 60.265625 15.597656 62 17.339844 62 19.488281 Z M 62 19.488281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 62 35.015625 C 62 37.164063 60.265625 38.90625 58.125 38.90625 C 55.984375 38.90625 54.25 37.164063 54.25 35.015625 C 54.25 32.867188 55.984375 31.125 58.125 31.125 C 60.265625 31.125 62 32.867188 62 35.015625 Z M 62 35.015625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 48.082031 11.214844 C 48.082031 12.761719 46.832031 14.015625 45.289063 14.015625 C 43.75 14.015625 42.5 12.761719 42.5 11.214844 C 42.5 9.667969 43.75 8.414063 45.289063 8.414063 C 46.832031 8.414063 48.082031 9.667969 48.082031 11.214844 Z M 48.082031 11.214844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 31.078125 63.558594 L 5.578125 49.242188 L 5.578125 20.757813 L 31.078125 6.441406 L 43.804688 13.585938 L 46.617188 8.75 L 31.078125 0 L 0 17.5 L 0 52.5 L 31.078125 70 L 46.617188 61.25 L 43.804688 56.414063 Z M 31.078125 63.558594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 48.082031 58.785156 C 48.082031 60.332031 46.832031 61.585938 45.289063 61.585938 C 43.75 61.585938 42.5 60.332031 42.5 58.785156 C 42.5 57.238281 43.75 55.984375 45.289063 55.984375 C 46.832031 55.984375 48.082031 57.238281 48.082031 58.785156 Z M 48.082031 58.785156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 44.550781 35.015625 C 44.550781 40.386719 40.199219 44.738281 34.828125 44.738281 C 29.460938 44.738281 25.105469 40.386719 25.105469 35.015625 C 25.105469 29.644531 29.460938 25.292969 34.828125 25.292969 C 40.199219 25.292969 44.550781 29.644531 44.550781 35.015625 Z M 44.550781 35.015625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 55.765625 25.914063 C 55.765625 28.542969 53.636719 30.675781 51.007813 30.675781 C 48.378906 30.675781 46.246094 28.542969 46.246094 25.914063 C 46.246094 23.285156 48.378906 21.15625 51.007813 21.15625 C 53.636719 21.15625 55.765625 23.285156 55.765625 25.914063 Z M 55.765625 25.914063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 55.765625 44.117188 C 55.765625 46.746094 53.636719 48.875 51.007813 48.875 C 48.378906 48.875 46.246094 46.746094 46.246094 44.117188 C 46.246094 41.488281 48.378906 39.355469 51.007813 39.355469 C 53.636719 39.355469 55.765625 41.488281 55.765625 44.117188 Z M 55.765625 44.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 66.109375 50.597656 C 66.109375 52.839844 64.292969 54.660156 62.050781 54.660156 C 59.808594 54.660156 57.992188 52.839844 57.992188 50.597656 C 57.992188 48.355469 59.808594 46.539063 62.050781 46.539063 C 64.292969 46.539063 66.109375 48.355469 66.109375 50.597656 Z M 66.109375 50.597656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 65.941406 19.488281 C 65.941406 21.636719 64.199219 23.375 62.050781 23.375 C 59.902344 23.375 58.164063 21.636719 58.164063 19.488281 C 58.164063 17.339844 59.902344 15.597656 62.050781 15.597656 C 64.199219 15.597656 65.941406 17.339844 65.941406 19.488281 Z M 65.941406 19.488281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 65.941406 35.015625 C 65.941406 37.164063 64.199219 38.90625 62.050781 38.90625 C 59.902344 38.90625 58.164063 37.164063 58.164063 35.015625 C 58.164063 32.867188 59.902344 31.125 62.050781 31.125 C 64.199219 31.125 65.941406 32.867188 65.941406 35.015625 Z M 65.941406 35.015625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 51.972656 11.214844 C 51.972656 12.761719 50.71875 14.015625 49.171875 14.015625 C 47.625 14.015625 46.371094 12.761719 46.371094 11.214844 C 46.371094 9.667969 47.625 8.414063 49.171875 8.414063 C 50.71875 8.414063 51.972656 9.667969 51.972656 11.214844 Z M 51.972656 11.214844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 34.90625 63.558594 L 9.316406 49.242188 L 9.316406 20.757813 L 34.90625 6.441406 L 47.679688 13.585938 L 50.5 8.75 L 34.90625 0 L 3.71875 17.5 L 3.71875 52.5 L 34.90625 70 L 50.5 61.25 L 47.679688 56.414063 Z M 34.90625 63.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 51.972656 58.785156 C 51.972656 60.332031 50.71875 61.585938 49.171875 61.585938 C 47.625 61.585938 46.371094 60.332031 46.371094 58.785156 C 46.371094 57.238281 47.625 55.984375 49.171875 55.984375 C 50.71875 55.984375 51.972656 57.238281 51.972656 58.785156 Z M 51.972656 58.785156 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureResourceGraphExplorer(m).png b/dist/Management/AzureResourceGraphExplorer(m).png
new file mode 100644
index 00000000..2fa9f893
Binary files /dev/null and b/dist/Management/AzureResourceGraphExplorer(m).png differ
diff --git a/dist/Management/AzureResourceGraphExplorer(m).svg b/dist/Management/AzureResourceGraphExplorer(m).svg
new file mode 100644
index 00000000..06d1e82f
--- /dev/null
+++ b/dist/Management/AzureResourceGraphExplorer(m).svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 19.460938 14 C 19.460938 19.335938 15.136719 23.660156 9.800781 23.660156 C 4.464844 23.660156 0.140625 19.335938 0.140625 14 C 0.140625 8.664063 4.464844 4.339844 9.800781 4.339844 C 15.136719 4.339844 19.460938 8.664063 19.460938 14 Z M 19.460938 14 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 68.460938 14 C 68.460938 20.882813 62.882813 26.460938 56 26.460938 C 49.117188 26.460938 43.539063 20.882813 43.539063 14 C 43.539063 7.117188 49.117188 1.539063 56 1.539063 C 62.882813 1.539063 68.460938 7.117188 68.460938 14 Z M 68.460938 14 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 7.628906 15.769531 L 11.96875 12.230469 L 42.769531 50.027344 L 38.429688 53.566406 Z M 7.628906 15.769531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 9.800781 11.199219 L 56 11.199219 L 56 16.800781 L 9.800781 16.800781 Z M 9.800781 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 19.460938 14 C 19.460938 19.335938 15.136719 23.660156 9.800781 23.660156 C 4.464844 23.660156 0.140625 19.335938 0.140625 14 C 0.140625 8.664063 4.464844 4.339844 9.800781 4.339844 C 15.136719 4.339844 19.460938 8.664063 19.460938 14 Z M 19.460938 14 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 68.460938 14 C 68.460938 20.882813 62.882813 26.460938 56 26.460938 C 49.117188 26.460938 43.539063 20.882813 43.539063 14 C 43.539063 7.117188 49.117188 1.539063 56 1.539063 C 62.882813 1.539063 68.460938 7.117188 68.460938 14 Z M 68.460938 14 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 57.261719 51.800781 C 57.261719 61 49.800781 68.460938 40.601563 68.460938 C 31.398438 68.460938 23.941406 61 23.941406 51.800781 C 23.941406 42.597656 31.398438 35.140625 40.601563 35.140625 C 49.800781 35.140625 57.261719 42.597656 57.261719 51.800781 Z M 57.261719 51.800781 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureResourceGraphExplorer.png b/dist/Management/AzureResourceGraphExplorer.png
new file mode 100644
index 00000000..97b254ce
Binary files /dev/null and b/dist/Management/AzureResourceGraphExplorer.png differ
diff --git a/dist/Management/AzureResourceGraphExplorer.puml b/dist/Management/AzureResourceGraphExplorer.puml
new file mode 100644
index 00000000..83925333
--- /dev/null
+++ b/dist/Management/AzureResourceGraphExplorer.puml
@@ -0,0 +1,11 @@
+sprite $AzureResourceGraphExplorer [70x70/16z] {
+nTI7iSGm20JGHIAg_tv_qimb7RRvbru1Ex38nkTGwzmR7i8MatRy5tkS6U5IPn5ksATnhUD4VBAE7HQt65CpFr725ebLco5-oR2XnnsE7sH-HP7pcDQTr6_q
+qYXp6F9RjdEVLGFxGZWH2O7wmZGH2ONvIk-pIDXpKfwoaK5yePB8ssrFk7J7kX9NNrq0wp3bBq3me_iLPQGuxY4iCQRQaR9OTKoarqTkbPq49yHgAfrqekFJ
+25QaV-JexoxvZVJz65AFoHa9rZ-CBOr5X0avqQJX6aaQhY6Ty9YMD5pKauQBMF_qvpJSdjCmFRFXBlg36whwAOPzd9HtP9rYNF5MRzXYB1GbgZRkSLIGZKKz
+XiQg7kCZ9JXAnePMs2TdXL4U7oR69iKHRMoBoa8vmW4sTlJ2OtdmoSHxKlHf6ptUBZ_bqWq7zB43XunjXaEq_EZgVmR7GLeO9KTHQgL-fa01Po642iv2QbgC
+XH7AT5mBnd-GnZXnnhyrCV-XJ7YfRm
+}
+
+AzureEntityColoring(AzureResourceGraphExplorer)
+!define AzureResourceGraphExplorer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureResourceGraphExplorer, AzureResourceGraphExplorer)
+!define AzureResourceGraphExplorer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureResourceGraphExplorer, AzureResourceGraphExplorer)
diff --git a/dist/Management/AzureResourceGraphExplorer.svg b/dist/Management/AzureResourceGraphExplorer.svg
new file mode 100644
index 00000000..d993329c
--- /dev/null
+++ b/dist/Management/AzureResourceGraphExplorer.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 19.460938 14 C 19.460938 19.335938 15.136719 23.660156 9.800781 23.660156 C 4.464844 23.660156 0.140625 19.335938 0.140625 14 C 0.140625 8.664063 4.464844 4.339844 9.800781 4.339844 C 15.136719 4.339844 19.460938 8.664063 19.460938 14 Z M 19.460938 14 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 68.460938 14 C 68.460938 20.882813 62.882813 26.460938 56 26.460938 C 49.117188 26.460938 43.539063 20.882813 43.539063 14 C 43.539063 7.117188 49.117188 1.539063 56 1.539063 C 62.882813 1.539063 68.460938 7.117188 68.460938 14 Z M 68.460938 14 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 7.628906 15.769531 L 11.96875 12.230469 L 42.769531 50.027344 L 38.429688 53.566406 Z M 7.628906 15.769531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 9.800781 11.199219 L 56 11.199219 L 56 16.800781 L 9.800781 16.800781 Z M 9.800781 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 19.460938 14 C 19.460938 19.335938 15.136719 23.660156 9.800781 23.660156 C 4.464844 23.660156 0.140625 19.335938 0.140625 14 C 0.140625 8.664063 4.464844 4.339844 9.800781 4.339844 C 15.136719 4.339844 19.460938 8.664063 19.460938 14 Z M 19.460938 14 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 68.460938 14 C 68.460938 20.882813 62.882813 26.460938 56 26.460938 C 49.117188 26.460938 43.539063 20.882813 43.539063 14 C 43.539063 7.117188 49.117188 1.539063 56 1.539063 C 62.882813 1.539063 68.460938 7.117188 68.460938 14 Z M 68.460938 14 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 57.261719 51.800781 C 57.261719 61 49.800781 68.460938 40.601563 68.460938 C 31.398438 68.460938 23.941406 61 23.941406 51.800781 C 23.941406 42.597656 31.398438 35.140625 40.601563 35.140625 C 49.800781 35.140625 57.261719 42.597656 57.261719 51.800781 Z M 57.261719 51.800781 "/>
+</g>
+</svg>
diff --git a/dist/Management/AzureResourceGroups(m).png b/dist/Management/AzureResourceGroups(m).png
index d9c11874..c45023c2 100644
Binary files a/dist/Management/AzureResourceGroups(m).png and b/dist/Management/AzureResourceGroups(m).png differ
diff --git a/dist/Management/AzureResourceGroups(m).svg b/dist/Management/AzureResourceGroups(m).svg
index fe57d330..5f464152 100644
--- a/dist/Management/AzureResourceGroups(m).svg
+++ b/dist/Management/AzureResourceGroups(m).svg
@@ -4,22 +4,23 @@
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
+<image id="image9" width="70" height="56" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAA4CAYAAABABo41AAAABmJLR0QA/wD/AP+gvaeTAAAAtklEQVRoge3asQkCQRBG4X9VMBATM+vQsmxJsJXrweB6uPREEOFswAcXDHjI++JhZnnxJpIkSZIkSdICtF8/4JvptT4l47l+8aVr22s/Z3RTfrxCe++THOsX33ZzJ1f1x/+DYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGHAMr+aTfdHMg71ew/PpH6tlHwA4iwQtlA41uMAAAAASUVORK5CYII="/>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="56" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image9"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="70" height="56"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.914063 53.835938 C 37.746094 53.835938 37.589844 53.773438 37.472656 53.65625 C 37.355469 53.539063 37.289063 53.378906 37.289063 53.214844 L 37.289063 29.585938 C 37.289063 29.363281 37.40625 29.160156 37.597656 29.042969 L 58.121094 17.199219 C 58.316406 17.089844 58.554688 17.089844 58.75 17.199219 C 58.9375 17.3125 59.054688 17.515625 59.054688 17.738281 L 59.054688 41.367188 C 59.058594 41.589844 58.941406 41.792969 58.75 41.90625 L 38.21875 53.753906 C 38.125 53.8125 38.019531 53.839844 37.914063 53.835938 "/>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.132813 53.835938 C 37.964844 53.835938 37.804688 53.773438 37.6875 53.65625 C 37.570313 53.539063 37.503906 53.378906 37.503906 53.214844 L 37.503906 29.585938 C 37.503906 29.363281 37.621094 29.160156 37.8125 29.042969 L 58.457031 17.199219 C 58.652344 17.089844 58.890625 17.089844 59.085938 17.199219 C 59.277344 17.3125 59.394531 17.515625 59.394531 17.738281 L 59.394531 41.367188 C 59.398438 41.589844 59.28125 41.792969 59.085938 41.90625 L 38.4375 53.753906 C 38.34375 53.8125 38.238281 53.839844 38.132813 53.835938 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 35.066406 24.945313 C 34.957031 24.945313 34.851563 24.914063 34.757813 24.855469 L 14.164063 12.96875 C 13.96875 12.859375 13.851563 12.652344 13.851563 12.429688 C 13.851563 12.207031 13.96875 12 14.164063 11.890625 L 34.625 0.0820313 C 34.816406 -0.0273438 35.050781 -0.0273438 35.242188 0.0820313 L 55.84375 11.972656 C 56.035156 12.085938 56.152344 12.289063 56.152344 12.507813 C 56.152344 12.730469 56.035156 12.9375 55.84375 13.050781 L 35.375 24.855469 C 35.28125 24.914063 35.175781 24.945313 35.066406 24.945313 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 32.105469 53.835938 C 31.992188 53.839844 31.882813 53.808594 31.789063 53.753906 L 11.257813 41.90625 C 11.0625 41.796875 10.941406 41.589844 10.941406 41.363281 L 10.941406 17.585938 C 10.941406 17.359375 11.0625 17.152344 11.257813 17.039063 C 11.453125 16.933594 11.691406 16.933594 11.886719 17.039063 L 32.414063 28.890625 C 32.601563 29.003906 32.71875 29.210938 32.71875 29.433594 L 32.71875 53.214844 C 32.71875 53.4375 32.601563 53.640625 32.414063 53.753906 C 32.320313 53.808594 32.214844 53.835938 32.105469 53.835938 M 37.914063 53.835938 C 37.746094 53.835938 37.589844 53.773438 37.472656 53.65625 C 37.355469 53.539063 37.289063 53.378906 37.289063 53.214844 L 37.289063 29.585938 C 37.289063 29.363281 37.40625 29.160156 37.597656 29.042969 L 58.121094 17.199219 C 58.316406 17.089844 58.554688 17.089844 58.75 17.199219 C 58.9375 17.3125 59.054688 17.515625 59.054688 17.738281 L 59.054688 41.367188 C 59.058594 41.589844 58.941406 41.792969 58.75 41.90625 L 38.21875 53.753906 C 38.125 53.8125 38.019531 53.839844 37.914063 53.835938 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 13.382813 56.480469 C 13.023438 56.480469 12.671875 56.382813 12.363281 56.207031 L 2.78125 50.671875 C 1.167969 49.742188 0 47.714844 0 45.855469 L 0 10.625 C 0 8.765625 1.167969 6.738281 2.78125 5.808594 L 12.363281 0.273438 C 13.335938 -0.253906 14.550781 0.0898438 15.101563 1.046875 C 15.652344 2 15.34375 3.222656 14.402344 3.800781 L 4.820313 9.332031 C 4.480469 9.53125 4.074219 10.230469 4.074219 10.625 L 4.074219 45.855469 C 4.074219 46.246094 4.480469 46.949219 4.820313 47.144531 L 14.402344 52.679688 C 15.203125 53.136719 15.59375 54.078125 15.355469 54.972656 C 15.113281 55.863281 14.304688 56.480469 13.382813 56.480469 Z M 56.617188 0 C 56.964844 0 57.316406 0.0898438 57.636719 0.273438 L 67.21875 5.804688 C 68.832031 6.738281 70 8.765625 70 10.625 L 70 45.855469 C 70 47.714844 68.832031 49.742188 67.21875 50.671875 L 57.636719 56.203125 C 56.664063 56.730469 55.449219 56.390625 54.898438 55.433594 C 54.347656 54.476563 54.65625 53.253906 55.597656 52.679688 L 65.179688 47.144531 C 65.519531 46.949219 65.925781 46.246094 65.925781 45.855469 L 65.925781 10.625 C 65.925781 10.230469 65.519531 9.53125 65.179688 9.332031 L 55.597656 3.800781 C 54.796875 3.339844 54.40625 2.398438 54.644531 1.507813 C 54.886719 0.617188 55.695313 -0.00390625 56.617188 0 Z M 56.617188 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 35.269531 24.945313 C 35.15625 24.945313 35.050781 24.914063 34.957031 24.855469 L 14.246094 12.96875 C 14.050781 12.859375 13.929688 12.652344 13.929688 12.429688 C 13.929688 12.207031 14.050781 12 14.246094 11.890625 L 34.824219 0.0820313 C 35.015625 -0.0273438 35.253906 -0.0273438 35.445313 0.0820313 L 56.164063 11.972656 C 56.355469 12.085938 56.476563 12.289063 56.476563 12.507813 C 56.476563 12.730469 56.355469 12.9375 56.164063 13.050781 L 35.578125 24.855469 C 35.484375 24.914063 35.378906 24.945313 35.269531 24.945313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 32.289063 53.835938 C 32.175781 53.839844 32.066406 53.808594 31.972656 53.753906 L 11.324219 41.90625 C 11.125 41.796875 11.003906 41.589844 11.003906 41.363281 L 11.003906 17.585938 C 11.003906 17.359375 11.125 17.152344 11.324219 17.039063 C 11.519531 16.933594 11.757813 16.933594 11.953125 17.039063 L 32.601563 28.890625 C 32.789063 29.003906 32.90625 29.210938 32.90625 29.433594 L 32.90625 53.214844 C 32.90625 53.4375 32.789063 53.640625 32.601563 53.753906 C 32.507813 53.808594 32.398438 53.835938 32.289063 53.835938 M 38.132813 53.835938 C 37.964844 53.835938 37.804688 53.773438 37.6875 53.65625 C 37.570313 53.539063 37.503906 53.378906 37.503906 53.214844 L 37.503906 29.585938 C 37.503906 29.363281 37.621094 29.160156 37.8125 29.042969 L 58.457031 17.199219 C 58.652344 17.089844 58.890625 17.089844 59.085938 17.199219 C 59.277344 17.3125 59.394531 17.515625 59.394531 17.738281 L 59.394531 41.367188 C 59.398438 41.589844 59.28125 41.792969 59.085938 41.90625 L 38.4375 53.753906 C 38.34375 53.8125 38.238281 53.839844 38.132813 53.835938 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 13.460938 56.480469 C 13.097656 56.480469 12.746094 56.382813 12.433594 56.207031 L 2.796875 50.671875 C 1.175781 49.742188 0 47.714844 0 45.855469 L 0 10.625 C 0 8.765625 1.175781 6.738281 2.796875 5.808594 L 12.433594 0.273438 C 13.414063 -0.253906 14.632813 0.0898438 15.1875 1.046875 C 15.742188 2 15.433594 3.222656 14.484375 3.800781 L 4.847656 9.332031 C 4.507813 9.53125 4.097656 10.230469 4.097656 10.625 L 4.097656 45.855469 C 4.097656 46.246094 4.507813 46.949219 4.847656 47.144531 L 14.484375 52.679688 C 15.289063 53.136719 15.683594 54.078125 15.445313 54.972656 C 15.199219 55.863281 14.386719 56.480469 13.460938 56.480469 Z M 56.941406 0 C 57.292969 0 57.644531 0.0898438 57.96875 0.273438 L 67.605469 5.804688 C 69.226563 6.738281 70.402344 8.765625 70.402344 10.625 L 70.402344 45.855469 C 70.402344 47.714844 69.226563 49.742188 67.605469 50.671875 L 57.96875 56.203125 C 56.988281 56.730469 55.769531 56.390625 55.214844 55.433594 C 54.660156 54.476563 54.96875 53.253906 55.917969 52.679688 L 65.554688 47.144531 C 65.894531 46.949219 66.304688 46.246094 66.304688 45.855469 L 66.304688 10.625 C 66.304688 10.230469 65.894531 9.53125 65.554688 9.332031 L 55.917969 3.800781 C 55.113281 3.339844 54.71875 2.398438 54.957031 1.507813 C 55.203125 0.617188 56.015625 -0.00390625 56.941406 0 Z M 56.941406 0 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureResourceGroups.png b/dist/Management/AzureResourceGroups.png
index afd2d87d..f007a53b 100644
Binary files a/dist/Management/AzureResourceGroups.png and b/dist/Management/AzureResourceGroups.png differ
diff --git a/dist/Management/AzureResourceGroups.puml b/dist/Management/AzureResourceGroups.puml
index 10e0999f..e99e9d85 100644
--- a/dist/Management/AzureResourceGroups.puml
+++ b/dist/Management/AzureResourceGroups.puml
@@ -1,9 +1,9 @@
 sprite $AzureResourceGroups [70x56/16z] {
-xPSBSiCW30Kb14A-_uNhCcJaFB-nTO1i_mtPWSrNagZ7a1lgiyaDYsd26CU92T3Zn5M0EDSIUu-3M2msusuv0NkRnyBXlv5qqA_rLxlwiGYJxqnVx0FWTJxs
-aNz34C2LxN_PDGvoHfl16ApbqKLc2Y48Wddo6DP9a170MvuvyPR186zvR6tZ_DA78EzvTkG3WXIu9l2R9SeOiHJ25lQIj6eNRgdtTHLg0Nhj_i8jtWjvSeqf
-jxWRoSE3c5dZbd-QREmfIBDdYm_DF1Wa7MyMl-Hn7iGg5io3GKeMo8D1YXRCCsQ3mvGic0SSDGlaWI1L2-I185KBv057qO8Qa1Gj24rYFylFyhCejOWLB20X
-5j5UjhIdrsaTtC8TQ4ciO141Iv0t_oyMlOy4Zk-wCGzQcjmdY6Wu0IpQ00iuO1eOqk4D_CQeHUauDFFNKmWUjA33uZeEAHzAH4TQo64-8ucH8GNpR0iw9CSZ
-iZjSR7tPy30oim8frQK6kKNoLWkL6hw3RFu
+xPVNhWCn20MDSVt_3qv3YhMpBbpTrvoNxMEOLCA8b5R2FRbgk4Lgos6Mt5_HW6XxfSQ0bDvxIu59hR-32x4sIn5ItgcAkxkTlfPTsZTeG9ezK0PTZCmISxi4
+LnCukHiZGmWoz71jraOXJ9651zlZCcqL5cmLfBCGXvxwHk4yizVp9hnHiX5orgFT8aiX7ZtnHgdDcxAXIFvNBUZ9xOKKlrzy1a5nljO9TuEIqnUN7K9KfvHI
+YaBFMaXKJGlAu40FtxIYkgMK_BrLAUJ2s52C0pqK4lL4iIJeWH0FXNeen4UXdbGL33V5z22gVWhqGAgN0ZrenabXMs0uAGmWMygFygFyAFb4OKYnw9yeSVaB
+cquKCaYnIFPHvF1h7_SKCepIxYE47YZnFeLCXuj42XY4TEkgeHp9AuhCHfaMKXz_lgc753AqzjvDYJRRpRm5bD4CnuauMble6HGmxgECrBxGCoWKSXzbHbjS
+C6QZW06RXEVWIncbitpKiejUDJu1
 }
 
 AzureEntityColoring(AzureResourceGroups)
diff --git a/dist/Management/AzureResourceGroups.svg b/dist/Management/AzureResourceGroups.svg
index 8583b694..1612fb80 100644
--- a/dist/Management/AzureResourceGroups.svg
+++ b/dist/Management/AzureResourceGroups.svg
@@ -4,22 +4,23 @@
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
+<image id="image9" width="70" height="56" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAA4CAYAAABABo41AAAABmJLR0QA/wD/AP+gvaeTAAAAtklEQVRoge3asQkCQRBG4X9VMBATM+vQsmxJsJXrweB6uPREEOFswAcXDHjI++JhZnnxJpIkSZIkSdICtF8/4JvptT4l47l+8aVr22s/Z3RTfrxCe++THOsX33ZzJ1f1x/+DYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGGAYYBhgGHAMr+aTfdHMg71ew/PpH6tlHwA4iwQtlA41uMAAAAASUVORK5CYII="/>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="56" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<use xlink:href="#image9"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="70" height="56"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.914063 53.835938 C 37.746094 53.835938 37.589844 53.773438 37.472656 53.65625 C 37.355469 53.539063 37.289063 53.378906 37.289063 53.214844 L 37.289063 29.585938 C 37.289063 29.363281 37.40625 29.160156 37.597656 29.042969 L 58.121094 17.199219 C 58.316406 17.089844 58.554688 17.089844 58.75 17.199219 C 58.9375 17.3125 59.054688 17.515625 59.054688 17.738281 L 59.054688 41.367188 C 59.058594 41.589844 58.941406 41.792969 58.75 41.90625 L 38.21875 53.753906 C 38.125 53.8125 38.019531 53.839844 37.914063 53.835938 "/>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.132813 53.835938 C 37.964844 53.835938 37.804688 53.773438 37.6875 53.65625 C 37.570313 53.539063 37.503906 53.378906 37.503906 53.214844 L 37.503906 29.585938 C 37.503906 29.363281 37.621094 29.160156 37.8125 29.042969 L 58.457031 17.199219 C 58.652344 17.089844 58.890625 17.089844 59.085938 17.199219 C 59.277344 17.3125 59.394531 17.515625 59.394531 17.738281 L 59.394531 41.367188 C 59.398438 41.589844 59.28125 41.792969 59.085938 41.90625 L 38.4375 53.753906 C 38.34375 53.8125 38.238281 53.839844 38.132813 53.835938 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 35.066406 24.945313 C 34.957031 24.945313 34.851563 24.914063 34.757813 24.855469 L 14.164063 12.96875 C 13.96875 12.859375 13.851563 12.652344 13.851563 12.429688 C 13.851563 12.207031 13.96875 12 14.164063 11.890625 L 34.625 0.0820313 C 34.816406 -0.0273438 35.050781 -0.0273438 35.242188 0.0820313 L 55.84375 11.972656 C 56.035156 12.085938 56.152344 12.289063 56.152344 12.507813 C 56.152344 12.730469 56.035156 12.9375 55.84375 13.050781 L 35.375 24.855469 C 35.28125 24.914063 35.175781 24.945313 35.066406 24.945313 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 32.105469 53.835938 C 31.992188 53.839844 31.882813 53.808594 31.789063 53.753906 L 11.257813 41.90625 C 11.0625 41.796875 10.941406 41.589844 10.941406 41.363281 L 10.941406 17.585938 C 10.941406 17.359375 11.0625 17.152344 11.257813 17.039063 C 11.453125 16.933594 11.691406 16.933594 11.886719 17.039063 L 32.414063 28.890625 C 32.601563 29.003906 32.71875 29.210938 32.71875 29.433594 L 32.71875 53.214844 C 32.71875 53.4375 32.601563 53.640625 32.414063 53.753906 C 32.320313 53.808594 32.214844 53.835938 32.105469 53.835938 M 37.914063 53.835938 C 37.746094 53.835938 37.589844 53.773438 37.472656 53.65625 C 37.355469 53.539063 37.289063 53.378906 37.289063 53.214844 L 37.289063 29.585938 C 37.289063 29.363281 37.40625 29.160156 37.597656 29.042969 L 58.121094 17.199219 C 58.316406 17.089844 58.554688 17.089844 58.75 17.199219 C 58.9375 17.3125 59.054688 17.515625 59.054688 17.738281 L 59.054688 41.367188 C 59.058594 41.589844 58.941406 41.792969 58.75 41.90625 L 38.21875 53.753906 C 38.125 53.8125 38.019531 53.839844 37.914063 53.835938 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 13.382813 56.480469 C 13.023438 56.480469 12.671875 56.382813 12.363281 56.207031 L 2.78125 50.671875 C 1.167969 49.742188 0 47.714844 0 45.855469 L 0 10.625 C 0 8.765625 1.167969 6.738281 2.78125 5.808594 L 12.363281 0.273438 C 13.335938 -0.253906 14.550781 0.0898438 15.101563 1.046875 C 15.652344 2 15.34375 3.222656 14.402344 3.800781 L 4.820313 9.332031 C 4.480469 9.53125 4.074219 10.230469 4.074219 10.625 L 4.074219 45.855469 C 4.074219 46.246094 4.480469 46.949219 4.820313 47.144531 L 14.402344 52.679688 C 15.203125 53.136719 15.59375 54.078125 15.355469 54.972656 C 15.113281 55.863281 14.304688 56.480469 13.382813 56.480469 Z M 56.617188 0 C 56.964844 0 57.316406 0.0898438 57.636719 0.273438 L 67.21875 5.804688 C 68.832031 6.738281 70 8.765625 70 10.625 L 70 45.855469 C 70 47.714844 68.832031 49.742188 67.21875 50.671875 L 57.636719 56.203125 C 56.664063 56.730469 55.449219 56.390625 54.898438 55.433594 C 54.347656 54.476563 54.65625 53.253906 55.597656 52.679688 L 65.179688 47.144531 C 65.519531 46.949219 65.925781 46.246094 65.925781 45.855469 L 65.925781 10.625 C 65.925781 10.230469 65.519531 9.53125 65.179688 9.332031 L 55.597656 3.800781 C 54.796875 3.339844 54.40625 2.398438 54.644531 1.507813 C 54.886719 0.617188 55.695313 -0.00390625 56.617188 0 Z M 56.617188 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 35.269531 24.945313 C 35.15625 24.945313 35.050781 24.914063 34.957031 24.855469 L 14.246094 12.96875 C 14.050781 12.859375 13.929688 12.652344 13.929688 12.429688 C 13.929688 12.207031 14.050781 12 14.246094 11.890625 L 34.824219 0.0820313 C 35.015625 -0.0273438 35.253906 -0.0273438 35.445313 0.0820313 L 56.164063 11.972656 C 56.355469 12.085938 56.476563 12.289063 56.476563 12.507813 C 56.476563 12.730469 56.355469 12.9375 56.164063 13.050781 L 35.578125 24.855469 C 35.484375 24.914063 35.378906 24.945313 35.269531 24.945313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 32.289063 53.835938 C 32.175781 53.839844 32.066406 53.808594 31.972656 53.753906 L 11.324219 41.90625 C 11.125 41.796875 11.003906 41.589844 11.003906 41.363281 L 11.003906 17.585938 C 11.003906 17.359375 11.125 17.152344 11.324219 17.039063 C 11.519531 16.933594 11.757813 16.933594 11.953125 17.039063 L 32.601563 28.890625 C 32.789063 29.003906 32.90625 29.210938 32.90625 29.433594 L 32.90625 53.214844 C 32.90625 53.4375 32.789063 53.640625 32.601563 53.753906 C 32.507813 53.808594 32.398438 53.835938 32.289063 53.835938 M 38.132813 53.835938 C 37.964844 53.835938 37.804688 53.773438 37.6875 53.65625 C 37.570313 53.539063 37.503906 53.378906 37.503906 53.214844 L 37.503906 29.585938 C 37.503906 29.363281 37.621094 29.160156 37.8125 29.042969 L 58.457031 17.199219 C 58.652344 17.089844 58.890625 17.089844 59.085938 17.199219 C 59.277344 17.3125 59.394531 17.515625 59.394531 17.738281 L 59.394531 41.367188 C 59.398438 41.589844 59.28125 41.792969 59.085938 41.90625 L 38.4375 53.753906 C 38.34375 53.8125 38.238281 53.839844 38.132813 53.835938 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 13.460938 56.480469 C 13.097656 56.480469 12.746094 56.382813 12.433594 56.207031 L 2.796875 50.671875 C 1.175781 49.742188 0 47.714844 0 45.855469 L 0 10.625 C 0 8.765625 1.175781 6.738281 2.796875 5.808594 L 12.433594 0.273438 C 13.414063 -0.253906 14.632813 0.0898438 15.1875 1.046875 C 15.742188 2 15.433594 3.222656 14.484375 3.800781 L 4.847656 9.332031 C 4.507813 9.53125 4.097656 10.230469 4.097656 10.625 L 4.097656 45.855469 C 4.097656 46.246094 4.507813 46.949219 4.847656 47.144531 L 14.484375 52.679688 C 15.289063 53.136719 15.683594 54.078125 15.445313 54.972656 C 15.199219 55.863281 14.386719 56.480469 13.460938 56.480469 Z M 56.941406 0 C 57.292969 0 57.644531 0.0898438 57.96875 0.273438 L 67.605469 5.804688 C 69.226563 6.738281 70.402344 8.765625 70.402344 10.625 L 70.402344 45.855469 C 70.402344 47.714844 69.226563 49.742188 67.605469 50.671875 L 57.96875 56.203125 C 56.988281 56.730469 55.769531 56.390625 55.214844 55.433594 C 54.660156 54.476563 54.96875 53.253906 55.917969 52.679688 L 65.554688 47.144531 C 65.894531 46.949219 66.304688 46.246094 66.304688 45.855469 L 66.304688 10.625 C 66.304688 10.230469 65.894531 9.53125 65.554688 9.332031 L 55.917969 3.800781 C 55.113281 3.339844 54.71875 2.398438 54.957031 1.507813 C 55.203125 0.617188 56.015625 -0.00390625 56.941406 0 Z M 56.941406 0 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureScheduler(m).png b/dist/Management/AzureScheduler(m).png
index 12564baf..47da4375 100644
Binary files a/dist/Management/AzureScheduler(m).png and b/dist/Management/AzureScheduler(m).png differ
diff --git a/dist/Management/AzureScheduler(m).svg b/dist/Management/AzureScheduler(m).svg
index 2a42ecd5..62bc6e64 100644
--- a/dist/Management/AzureScheduler(m).svg
+++ b/dist/Management/AzureScheduler(m).svg
@@ -1,7 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="55pt" height="70pt" viewBox="0 0 55 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 39.199219 57.261719 C 24.5 56.699219 13.160156 44.378906 13.71875 29.820313 C 14.140625 20.71875 19.039063 12.878906 26.179688 8.398438 C 16.660156 12.460938 9.941406 21.980469 9.941406 33.039063 C 9.941406 47.738281 21.839844 59.78125 36.679688 59.78125 C 37.238281 59.78125 38.078125 59.78125 38.640625 59.78125 L 38.5 65.238281 L 45.78125 56.839844 C 43.679688 57.261719 41.441406 57.398438 39.199219 57.261719 Z M 39.199219 57.261719 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 29.847656 49.558594 L 29.847656 56.058594 C 29.347656 56.058594 27.347656 55.726563 27.015625 55.558594 C 25.683594 55.226563 24.347656 54.890625 23.015625 54.390625 C 22.515625 54.226563 22.183594 54.058594 21.847656 53.890625 L 21.183594 53.726563 L 20.515625 53.390625 L 20.015625 53.058594 L 19.347656 52.726563 C 19.015625 52.558594 18.515625 52.226563 18.183594 52.058594 C 16.683594 51.058594 15.183594 49.890625 13.847656 48.558594 C 12.515625 47.226563 11.347656 45.726563 10.347656 44.058594 C 9.347656 42.390625 8.515625 40.726563 7.683594 38.890625 C 6.347656 35.226563 5.683594 31.390625 6.015625 27.558594 C 6.347656 23.726563 7.347656 19.890625 9.183594 16.726563 C 11.015625 13.390625 13.347656 10.558594 16.183594 8.390625 C 17.515625 7.226563 19.015625 6.390625 20.515625 5.558594 C 22.015625 4.726563 23.515625 4.226563 24.847656 3.726563 C 27.847656 2.726563 30.683594 2.226563 33.183594 2.226563 C 35.683594 2.058594 38.015625 2.390625 39.847656 2.726563 C 41.683594 3.058594 43.015625 3.558594 44.015625 3.890625 C 44.515625 4.058594 44.847656 4.226563 45.183594 4.226563 L 45.515625 4.390625 C 45.683594 4.390625 45.847656 4.390625 46.015625 4.226563 C 46.183594 4.058594 46.015625 3.890625 45.847656 3.726563 L 45.515625 3.558594 C 45.347656 3.390625 44.847656 3.226563 44.515625 3.058594 C 43.515625 2.558594 42.183594 1.890625 40.347656 1.390625 C 38.515625 0.726563 36.183594 0.226563 33.347656 0.0585938 C 30.683594 -0.109375 27.515625 0.0585938 24.015625 0.890625 C 20.683594 1.726563 17.183594 3.226563 13.847656 5.390625 C 10.515625 7.558594 7.515625 10.726563 5.183594 14.390625 C 2.847656 18.058594 1.183594 22.390625 0.347656 27.058594 C 0.015625 29.390625 -0.152344 31.726563 0.183594 34.226563 C 0.347656 36.558594 0.847656 39.058594 1.515625 41.226563 C 2.183594 43.558594 3.183594 45.726563 4.515625 47.890625 C 5.683594 49.890625 7.183594 51.890625 8.847656 53.726563 C 10.515625 55.390625 12.347656 57.058594 14.347656 58.226563 C 14.847656 58.558594 15.347656 58.890625 15.847656 59.226563 L 16.683594 59.726563 L 17.515625 60.226563 L 18.183594 60.558594 L 19.015625 60.890625 C 19.515625 61.058594 20.015625 61.390625 20.515625 61.558594 C 22.683594 62.390625 25.015625 63.058594 27.183594 63.390625 C 28.015625 63.558594 29.183594 63.558594 30.015625 63.726563 L 30.015625 70.726563 L 39.847656 60.390625 Z M 29.847656 49.558594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 32.847656 6.726563 C 20.683594 6.726563 11.347656 16.558594 11.347656 28.726563 C 11.347656 38.890625 18.015625 47.390625 27.347656 49.890625 L 27.347656 48.058594 C 27.347656 47.226563 28.015625 46.390625 28.847656 46.058594 C 29.183594 45.890625 28.515625 46.058594 28.847656 46.058594 C 29.347656 46.058594 30.015625 46.058594 30.347656 46.558594 L 34.515625 50.726563 C 46.015625 49.890625 55.015625 40.390625 55.015625 28.726563 C 55.015625 16.558594 45.015625 6.726563 32.847656 6.726563 Z M 16.515625 30.558594 C 15.515625 30.558594 14.515625 29.726563 14.515625 28.558594 C 14.515625 27.558594 15.347656 26.558594 16.515625 26.558594 C 17.515625 26.558594 18.515625 27.390625 18.515625 28.558594 C 18.347656 29.726563 17.515625 30.558594 16.515625 30.558594 Z M 32.847656 9.226563 C 33.847656 9.226563 34.847656 10.058594 34.847656 11.226563 C 34.847656 12.226563 34.015625 13.226563 32.847656 13.226563 C 31.847656 13.226563 30.847656 12.390625 30.847656 11.226563 C 31.015625 10.226563 31.847656 9.226563 32.847656 9.226563 Z M 44.347656 39.890625 L 44.183594 40.058594 C 42.847656 41.390625 40.515625 41.390625 39.183594 40.058594 L 30.183594 31.058594 C 29.347656 30.226563 29.847656 29.226563 29.847656 28.226563 L 29.847656 19.890625 C 29.847656 17.890625 31.515625 16.390625 33.347656 16.390625 L 34.015625 16.390625 C 36.015625 16.390625 37.515625 18.058594 37.515625 19.890625 L 37.515625 27.058594 L 45.347656 34.890625 C 46.847656 36.226563 45.847656 38.558594 44.347656 39.890625 Z M 50.347656 30.558594 C 49.347656 30.558594 48.347656 29.726563 48.347656 28.558594 C 48.347656 27.558594 49.183594 26.558594 50.347656 26.558594 C 51.347656 26.558594 52.347656 27.390625 52.347656 28.558594 C 52.347656 29.726563 51.515625 30.558594 50.347656 30.558594 Z M 50.347656 30.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.359375 13.71875 C 33.601563 14.28125 29.539063 16.519531 26.738281 20.019531 C 23.941406 23.519531 22.539063 28 22.960938 32.621094 C 23.519531 37.378906 25.761719 41.441406 29.261719 44.238281 C 32.761719 47.039063 37.238281 48.441406 41.859375 48.019531 C 46.621094 47.460938 50.679688 45.078125 53.480469 41.71875 C 56.28125 38.21875 57.679688 33.738281 57.261719 29.121094 C 56.699219 24.359375 54.320313 20.300781 50.820313 17.359375 C 47.878906 14.980469 44.101563 13.578125 40.179688 13.578125 C 39.621094 13.578125 39.058594 13.578125 38.359375 13.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 59.921875 28.699219 C 59.359375 23.101563 56.421875 18.199219 52.359375 14.980469 C 51.519531 14.28125 50.679688 13.71875 49.839844 13.300781 L 48.300781 16.378906 C 49 16.800781 49.558594 17.21875 50.261719 17.640625 C 53.621094 20.441406 56 24.359375 56.558594 28.980469 C 56.980469 33.601563 55.578125 37.941406 52.921875 41.300781 C 50.261719 44.660156 46.199219 46.898438 41.578125 47.460938 C 38.5 47.738281 35.558594 47.179688 32.898438 46.058594 L 31.359375 49.140625 C 34.578125 50.679688 38.21875 51.378906 42 50.960938 C 47.601563 50.398438 52.359375 47.601563 55.578125 43.539063 C 58.800781 39.621094 60.480469 34.300781 59.921875 28.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 29.261719 43.960938 C 25.898438 41.300781 23.660156 37.238281 23.101563 32.621094 C 22.679688 28 24.078125 23.660156 26.738281 20.300781 C 29.398438 16.941406 33.460938 14.699219 38.078125 14.140625 C 41.859375 13.71875 45.359375 14.558594 48.300781 16.378906 L 49.839844 13.300781 C 46.199219 11.199219 42 10.21875 37.660156 10.640625 C 32.058594 11.199219 27.300781 14 24.078125 18.058594 C 20.859375 22.121094 19.039063 27.300781 19.738281 32.898438 C 20.300781 38.5 23.101563 43.261719 27.160156 46.480469 C 28.421875 47.460938 29.820313 48.441406 31.359375 49.140625 L 32.898438 46.058594 C 31.5 45.5 30.378906 44.800781 29.261719 43.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 29.261719 43.960938 C 25.898438 41.300781 23.660156 37.238281 23.101563 32.621094 C 22.679688 28 24.078125 23.660156 26.738281 20.300781 C 29.398438 16.941406 33.460938 14.699219 38.078125 14.140625 C 41.859375 13.71875 45.359375 14.558594 48.300781 16.378906 L 49.839844 13.300781 C 46.199219 11.199219 42 10.21875 37.660156 10.640625 C 32.058594 11.199219 27.300781 14 24.078125 18.058594 C 20.859375 22.121094 19.039063 27.300781 19.738281 32.898438 C 20.300781 38.5 23.101563 43.261719 27.160156 46.480469 C 28.421875 47.460938 29.820313 48.441406 31.359375 49.140625 L 32.898438 46.058594 C 31.5 45.5 30.378906 44.800781 29.261719 43.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 48.300781 36.121094 L 40.460938 33.320313 C 39.621094 33.039063 39.199219 32.058594 39.480469 31.21875 C 39.761719 30.378906 40.738281 29.960938 41.578125 30.238281 L 49.421875 33.039063 C 50.261719 33.320313 50.679688 34.300781 50.398438 35.140625 C 50.121094 35.980469 49.140625 36.539063 48.300781 36.121094 Z M 48.300781 36.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 39.621094 33.039063 C 38.78125 33.039063 37.941406 32.339844 37.941406 31.359375 L 37.941406 17.640625 C 37.941406 16.800781 38.640625 15.960938 39.621094 15.960938 C 40.460938 15.960938 41.300781 16.660156 41.300781 17.640625 L 41.300781 31.359375 C 41.300781 32.339844 40.601563 33.039063 39.621094 33.039063 Z M 39.621094 33.039063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 42 31.5 C 42 32.8125 40.933594 33.878906 39.621094 33.878906 C 38.304688 33.878906 37.238281 32.8125 37.238281 31.5 C 37.238281 30.1875 38.304688 29.121094 39.621094 29.121094 C 40.933594 29.121094 42 30.1875 42 31.5 Z M 42 31.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 37.660156 49 L 45.921875 56.699219 L 38.640625 65.101563 L 38.78125 59.640625 C 38.21875 59.640625 37.378906 59.640625 36.820313 59.640625 C 22.121094 59.640625 10.078125 47.738281 10.078125 32.898438 C 10.078125 18.058594 21.839844 6.300781 36.679688 6.300781 C 44.101563 6.300781 50.820313 9.378906 55.71875 14.28125 C 51.519531 10.21875 45.78125 7.699219 39.480469 7.558594 C 26.738281 7.558594 16.378906 17.921875 16.378906 30.660156 C 16.378906 42.980469 26.320313 52.921875 38.359375 53.761719 Z M 37.660156 49 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 13.441406 61.460938 C 13.160156 61.460938 12.738281 61.320313 12.460938 61.179688 L 2.941406 55.578125 C 1.261719 54.601563 0.140625 52.640625 0.140625 50.820313 L 0.140625 15.539063 C 0.140625 13.71875 1.261719 11.621094 2.941406 10.78125 L 12.460938 5.179688 C 13.441406 4.621094 14.699219 4.898438 15.261719 5.878906 C 15.820313 6.859375 15.539063 8.121094 14.558594 8.679688 L 5.039063 14.28125 C 4.761719 14.421875 4.339844 15.121094 4.339844 15.539063 L 4.339844 50.820313 C 4.339844 51.238281 4.761719 51.941406 5.039063 52.078125 L 14.558594 57.679688 C 15.539063 58.238281 15.820313 59.5 15.261719 60.480469 C 14.839844 61.039063 14.140625 61.460938 13.441406 61.460938 Z M 13.441406 61.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 56.558594 4.898438 C 56.839844 4.898438 57.261719 5.039063 57.539063 5.179688 L 67.058594 10.78125 C 68.738281 11.761719 69.859375 13.71875 69.859375 15.539063 L 69.859375 50.820313 C 69.859375 52.640625 68.738281 54.738281 67.058594 55.578125 L 57.539063 61.179688 C 56.558594 61.738281 55.300781 61.460938 54.738281 60.480469 C 54.179688 59.5 54.460938 58.238281 55.441406 57.679688 L 64.960938 52.078125 C 65.238281 51.941406 65.660156 51.238281 65.660156 50.820313 L 65.660156 15.539063 C 65.660156 15.121094 65.238281 14.421875 64.960938 14.28125 L 55.441406 8.679688 C 54.460938 8.121094 54.179688 6.859375 54.738281 5.878906 C 55.300781 5.320313 55.859375 4.898438 56.558594 4.898438 Z M 56.558594 4.898438 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureScheduler.png b/dist/Management/AzureScheduler.png
index 11e9151f..b3f5f8fe 100644
Binary files a/dist/Management/AzureScheduler.png and b/dist/Management/AzureScheduler.png differ
diff --git a/dist/Management/AzureScheduler.puml b/dist/Management/AzureScheduler.puml
index 894e4712..8739ea2c 100644
--- a/dist/Management/AzureScheduler.puml
+++ b/dist/Management/AzureScheduler.puml
@@ -1,11 +1,12 @@
-sprite $AzureScheduler [55x70/16z] {
-dPK73kmW34G16nVkVzzV26Y4bG3QKLkSFDmtwKE5HSszkQjKIbSYyRRAQZumUJAkbQdy4t5LRqfRQ5vVmWCs-mGVo6KmWVp0o3jqoEFTbG9AEPUIzr2sxehJ
-45NpaQTotbEMnwc65YXVK38XeyuZZg1EAIhpo5DA5HvpfBHVZSfqFHR2qMcbk1lpk07oqizGNHBhKH4eSEeD2fp18EqW3Y7YvrvbOWWnUrlbmjM2QL0LLTH0
-MNwnIdHM0kKPRyGmQUFieQ9TrpBc5gHOZKLvlfj7adTONQflHmp16uhZHmnHelMbNMDKK5A-nsfTA-Bg1ypqVrAFPJwqCLy18zYaDreLXPIdVR9WaIkzT6OB
-9ciRP69OSUgO-eArIX9o2vmpQHjOmoQieeM3vC7onuhw1rSTVSjjpp7CP9WI3DVHtoYteAlV7BAtySjmspU7D7W6d17bXYl3aESlHX0RJZ05ZYWnZv4hOyJm
-nwHeB6eSvGogrVacviZQXx1HjbI7Tc76W16bZMATE0gzPnolFZWskn5MydBK55__KJxsrxo6B2wp-2Xq1eVdc9duXStQjsdXhAGW0JTLn4i2vm88ylSu2ltd
-J2j587RByc8kQIjUnWz9dpXfBxaNT7F30UGyiMON7AIrZCvOsYlkjgjYUbwrcyOpb_MTa_IRmvfEggyWfwCuWEZ2GIMuT507PHRpG5spOQTliKZTOqxf5onG
-bnYd7x1FwYy
+sprite $AzureScheduler [70x70/16z] {
+xTU7rjim20LWXa1AHzx_SMlf9kOecExTtdzcVGUG9_sS_0_xhTDdfesXT1Mx7Mc95X5L4URjsTkHBidGSKiAQqDKHRMfS2WhpfiX7KztYWW0uQqkGjfjPJIA
+M7gEcqqZryny3d6bwpafF65qHZU3HO-SZs86qHRtr2FRH1GFr2EsrzRW3242CfJEY4z4uFbBekbeQx2kFqQloAhC_2AQbyMdrfaYwlv0-6n4HLYquT5mJflP
+j9GY0YG6OaoH0-fZZ6qy5mhxx4TEf3qBztDbnWipic8JKTHqX0dfiLMp1rCeRPLopeHeLn2R3DTAz0CaAS5uhTWQBMeA92aqcz9AcRE8KhXMQ1of5CDKK4gZ
+Ki5AjK9PfUYZ52eKf8_HhnLT2kCVgvGeHfAoDMGnbQp4PEnISIXRGwLYQ2afiXHzSBKIBLqf-bndZXMg5S7scvG61KK9RRczUsUq1-DDYZqLJOhSx_VtcXJz
+CgNVZxmP9fzMlEx8fe93AnF2wAXG5DDzBV_-_lP8vuzErygLHhZrnJZMebXfgxQwYDXudloysEeQ5CP_JDSH_VWUeDjuMw5yQcyKA5jBPJh6aXNshQMwcFee
+5UF5AbMJ-VGHipcOvungnAEKfB3lnLY5sC0o5qVlc4p9VFgi9b3Yv9Xdy-apR1IZ8AzMgeqPfKg9Ju9XnoFUTgM1IcebYW63HsDqKs4HVH2ZmwqLzerHNFJi
+YIOhXUHaq8b2wOLHAAJ1o6CMFeRrPPaGbShcjs3Yidc_agTqOs5niHjCShIr2kaJa4cbQrKmo2n20ep4vRUHfPk0EU9m8kNjq3XlKhQss2uTISr48_58zd8G
+is2KYjkXV9CIqudO2lQgyYC1CqMa-HwZCvxBds6F8KTOcuN2yNmQvLPZe-i44XkiqMMQDwgLhNXnOofJAqhV74QLtnWs-cNvdmy
 }
 
 AzureEntityColoring(AzureScheduler)
diff --git a/dist/Management/AzureScheduler.svg b/dist/Management/AzureScheduler.svg
index 6c0a210e..b63d60dd 100644
--- a/dist/Management/AzureScheduler.svg
+++ b/dist/Management/AzureScheduler.svg
@@ -1,50 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60pt" height="70pt" viewBox="0 0 60 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
-<clipPath id="clip1">
-  <path d="M 20 8 L 59.433594 8 L 59.433594 50 L 20 50 Z M 20 8 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 30 8 L 59.433594 8 L 59.433594 54 L 30 54 Z M 30 8 "/>
-</clipPath>
-<clipPath id="clip3">
-  <path d="M 5 0 L 59.433594 0 L 59.433594 70 L 5 70 Z M 5 0 "/>
-</clipPath>
-<clipPath id="clip4">
-  <path d="M 0 0 L 59.433594 0 L 59.433594 70 L 0 70 Z M 0 0 "/>
-</clipPath>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="60" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip5">
-  <rect x="0" y="0" width="60" height="70"/>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 39.765625 60.761719 C 22.464844 60.058594 8.929688 45.359375 9.628906 28 C 10.046875 17.21875 15.90625 7.839844 24.417969 2.519531 C 13.117188 7.421875 5.164063 18.621094 5.164063 31.78125 C 5.164063 49.28125 19.394531 63.558594 36.835938 63.558594 C 37.535156 63.558594 38.511719 63.558594 39.210938 63.558594 L 39.070313 70 L 47.722656 60.058594 C 45.210938 60.621094 42.558594 60.761719 39.765625 60.761719 Z M 39.765625 60.761719 "/>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 39.199219 57.261719 C 24.5 56.699219 13.160156 44.378906 13.71875 29.820313 C 14.140625 20.71875 19.039063 12.878906 26.179688 8.398438 C 16.660156 12.460938 9.941406 21.980469 9.941406 33.039063 C 9.941406 47.738281 21.839844 59.78125 36.679688 59.78125 C 37.238281 59.78125 38.078125 59.78125 38.640625 59.78125 L 38.5 65.238281 L 45.78125 56.839844 C 43.679688 57.261719 41.441406 57.398438 39.199219 57.261719 Z M 39.199219 57.261719 "/>
 </g>
 </defs>
 <g id="surface1">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.929688 8.679688 C 33.347656 9.238281 28.464844 12.039063 25.117188 16.238281 C 21.765625 20.300781 20.09375 25.621094 20.652344 31.359375 C 21.210938 36.960938 24 41.859375 28.1875 45.21875 C 32.234375 48.578125 37.535156 50.261719 43.253906 49.699219 C 48.835938 49.140625 53.722656 46.339844 57.070313 42.140625 C 60.417969 38.078125 62.09375 32.761719 61.535156 27.019531 C 60.976563 21.28125 58.046875 16.378906 53.859375 13.019531 C 50.371094 10.21875 45.90625 8.539063 41.164063 8.539063 C 40.324219 8.679688 39.628906 8.679688 38.929688 8.679688 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 64.464844 26.738281 C 63.765625 20.019531 60.417969 14.28125 55.535156 10.359375 C 54.558594 9.660156 53.582031 8.960938 52.605469 8.398438 L 50.652344 12.039063 C 51.488281 12.460938 52.1875 13.019531 52.882813 13.578125 C 56.929688 16.800781 59.722656 21.558594 60.277344 27.160156 C 60.835938 32.621094 59.164063 37.800781 55.953125 41.859375 C 52.746094 45.78125 48 48.578125 42.558594 49.140625 C 38.929688 49.558594 35.300781 48.859375 32.234375 47.460938 L 30.277344 51.101563 C 34.046875 52.921875 38.371094 53.761719 42.976563 53.199219 C 49.535156 52.5 55.253906 49.140625 59.164063 44.378906 C 63.070313 39.621094 65.164063 33.320313 64.464844 26.738281 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 28.046875 44.800781 C 24.140625 41.578125 21.347656 36.820313 20.789063 31.359375 C 20.234375 25.898438 21.90625 20.71875 25.117188 16.660156 C 28.324219 12.738281 33.070313 9.941406 38.511719 9.378906 C 42.976563 8.960938 47.164063 9.941406 50.652344 12.039063 L 52.605469 8.398438 C 48.417969 5.878906 43.253906 4.761719 38.09375 5.320313 C 31.535156 6.019531 25.8125 9.378906 21.90625 14.140625 C 18 18.898438 16.046875 25.199219 16.746094 31.78125 C 17.441406 38.359375 20.789063 44.101563 25.535156 48.019531 C 27.070313 49.28125 28.746094 50.261719 30.558594 51.101563 L 32.511719 47.460938 C 30.835938 46.761719 29.300781 45.78125 28.046875 44.800781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 28.046875 44.800781 C 24.140625 41.578125 21.347656 36.820313 20.789063 31.359375 C 20.234375 25.898438 21.90625 20.71875 25.117188 16.660156 C 28.324219 12.738281 33.070313 9.941406 38.511719 9.378906 C 42.976563 8.960938 47.164063 9.941406 50.652344 12.039063 L 52.605469 8.398438 C 48.417969 5.878906 43.253906 4.761719 38.09375 5.320313 C 31.535156 6.019531 25.8125 9.378906 21.90625 14.140625 C 18 18.898438 16.046875 25.199219 16.746094 31.78125 C 17.441406 38.359375 20.789063 44.101563 25.535156 48.019531 C 27.070313 49.28125 28.746094 50.261719 30.558594 51.101563 L 32.511719 47.460938 C 30.835938 46.761719 29.300781 45.78125 28.046875 44.800781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 50.652344 35.558594 L 41.441406 32.199219 C 40.464844 31.78125 39.90625 30.800781 40.324219 29.679688 C 40.746094 28.699219 41.722656 28.140625 42.835938 28.558594 L 52.046875 31.921875 C 53.023438 32.339844 53.582031 33.320313 53.164063 34.441406 C 52.746094 35.421875 51.628906 35.839844 50.652344 35.558594 Z M 50.652344 35.558594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 40.324219 31.921875 C 39.210938 31.921875 38.371094 31.078125 38.371094 29.960938 L 38.371094 13.578125 C 38.371094 12.460938 39.210938 11.621094 40.324219 11.621094 C 41.441406 11.621094 42.277344 12.460938 42.277344 13.578125 L 42.277344 29.960938 C 42.277344 31.078125 41.441406 31.921875 40.324219 31.921875 Z M 40.324219 31.921875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 43.117188 29.960938 C 43.117188 31.507813 41.867188 32.761719 40.324219 32.761719 C 38.785156 32.761719 37.535156 31.507813 37.535156 29.960938 C 37.535156 28.414063 38.785156 27.160156 40.324219 27.160156 C 41.867188 27.160156 43.117188 28.414063 43.117188 29.960938 Z M 43.117188 29.960938 "/>
-<g clip-path="url(#clip3)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 38.09375 50.820313 L 47.859375 59.921875 L 39.070313 70 L 39.210938 63.421875 C 38.511719 63.421875 37.535156 63.421875 36.835938 63.421875 C 19.394531 63.421875 5.164063 49.140625 5.164063 31.640625 C 5.164063 14.140625 19.394531 0 36.835938 0 C 45.628906 0 53.722656 3.640625 59.441406 9.519531 C 54.417969 4.621094 47.722656 1.679688 40.1875 1.679688 C 24.976563 1.539063 12.835938 13.859375 12.699219 29.121094 C 12.699219 43.679688 24.558594 55.578125 38.789063 56.558594 Z M 38.09375 50.820313 "/>
-</g>
-<g clip-path="url(#clip4)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.359375 13.71875 C 33.601563 14.28125 29.539063 16.519531 26.738281 20.019531 C 23.941406 23.519531 22.539063 28 22.960938 32.621094 C 23.519531 37.378906 25.761719 41.441406 29.261719 44.238281 C 32.761719 47.039063 37.238281 48.441406 41.859375 48.019531 C 46.621094 47.460938 50.679688 45.078125 53.480469 41.71875 C 56.28125 38.21875 57.679688 33.738281 57.261719 29.121094 C 56.699219 24.359375 54.320313 20.300781 50.820313 17.359375 C 47.878906 14.980469 44.101563 13.578125 40.179688 13.578125 C 39.621094 13.578125 39.058594 13.578125 38.359375 13.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 59.921875 28.699219 C 59.359375 23.101563 56.421875 18.199219 52.359375 14.980469 C 51.519531 14.28125 50.679688 13.71875 49.839844 13.300781 L 48.300781 16.378906 C 49 16.800781 49.558594 17.21875 50.261719 17.640625 C 53.621094 20.441406 56 24.359375 56.558594 28.980469 C 56.980469 33.601563 55.578125 37.941406 52.921875 41.300781 C 50.261719 44.660156 46.199219 46.898438 41.578125 47.460938 C 38.5 47.738281 35.558594 47.179688 32.898438 46.058594 L 31.359375 49.140625 C 34.578125 50.679688 38.21875 51.378906 42 50.960938 C 47.601563 50.398438 52.359375 47.601563 55.578125 43.539063 C 58.800781 39.621094 60.480469 34.300781 59.921875 28.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 29.261719 43.960938 C 25.898438 41.300781 23.660156 37.238281 23.101563 32.621094 C 22.679688 28 24.078125 23.660156 26.738281 20.300781 C 29.398438 16.941406 33.460938 14.699219 38.078125 14.140625 C 41.859375 13.71875 45.359375 14.558594 48.300781 16.378906 L 49.839844 13.300781 C 46.199219 11.199219 42 10.21875 37.660156 10.640625 C 32.058594 11.199219 27.300781 14 24.078125 18.058594 C 20.859375 22.121094 19.039063 27.300781 19.738281 32.898438 C 20.300781 38.5 23.101563 43.261719 27.160156 46.480469 C 28.421875 47.460938 29.820313 48.441406 31.359375 49.140625 L 32.898438 46.058594 C 31.5 45.5 30.378906 44.800781 29.261719 43.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 29.261719 43.960938 C 25.898438 41.300781 23.660156 37.238281 23.101563 32.621094 C 22.679688 28 24.078125 23.660156 26.738281 20.300781 C 29.398438 16.941406 33.460938 14.699219 38.078125 14.140625 C 41.859375 13.71875 45.359375 14.558594 48.300781 16.378906 L 49.839844 13.300781 C 46.199219 11.199219 42 10.21875 37.660156 10.640625 C 32.058594 11.199219 27.300781 14 24.078125 18.058594 C 20.859375 22.121094 19.039063 27.300781 19.738281 32.898438 C 20.300781 38.5 23.101563 43.261719 27.160156 46.480469 C 28.421875 47.460938 29.820313 48.441406 31.359375 49.140625 L 32.898438 46.058594 C 31.5 45.5 30.378906 44.800781 29.261719 43.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 48.300781 36.121094 L 40.460938 33.320313 C 39.621094 33.039063 39.199219 32.058594 39.480469 31.21875 C 39.761719 30.378906 40.738281 29.960938 41.578125 30.238281 L 49.421875 33.039063 C 50.261719 33.320313 50.679688 34.300781 50.398438 35.140625 C 50.121094 35.980469 49.140625 36.539063 48.300781 36.121094 Z M 48.300781 36.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 39.621094 33.039063 C 38.78125 33.039063 37.941406 32.339844 37.941406 31.359375 L 37.941406 17.640625 C 37.941406 16.800781 38.640625 15.960938 39.621094 15.960938 C 40.460938 15.960938 41.300781 16.660156 41.300781 17.640625 L 41.300781 31.359375 C 41.300781 32.339844 40.601563 33.039063 39.621094 33.039063 Z M 39.621094 33.039063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 42 31.5 C 42 32.8125 40.933594 33.878906 39.621094 33.878906 C 38.304688 33.878906 37.238281 32.8125 37.238281 31.5 C 37.238281 30.1875 38.304688 29.121094 39.621094 29.121094 C 40.933594 29.121094 42 30.1875 42 31.5 Z M 42 31.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 37.660156 49 L 45.921875 56.699219 L 38.640625 65.101563 L 38.78125 59.640625 C 38.21875 59.640625 37.378906 59.640625 36.820313 59.640625 C 22.121094 59.640625 10.078125 47.738281 10.078125 32.898438 C 10.078125 18.058594 21.839844 6.300781 36.679688 6.300781 C 44.101563 6.300781 50.820313 9.378906 55.71875 14.28125 C 51.519531 10.21875 45.78125 7.699219 39.480469 7.558594 C 26.738281 7.558594 16.378906 17.921875 16.378906 30.660156 C 16.378906 42.980469 26.320313 52.921875 38.359375 53.761719 Z M 37.660156 49 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-</g>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 13.441406 61.460938 C 13.160156 61.460938 12.738281 61.320313 12.460938 61.179688 L 2.941406 55.578125 C 1.261719 54.601563 0.140625 52.640625 0.140625 50.820313 L 0.140625 15.539063 C 0.140625 13.71875 1.261719 11.621094 2.941406 10.78125 L 12.460938 5.179688 C 13.441406 4.621094 14.699219 4.898438 15.261719 5.878906 C 15.820313 6.859375 15.539063 8.121094 14.558594 8.679688 L 5.039063 14.28125 C 4.761719 14.421875 4.339844 15.121094 4.339844 15.539063 L 4.339844 50.820313 C 4.339844 51.238281 4.761719 51.941406 5.039063 52.078125 L 14.558594 57.679688 C 15.539063 58.238281 15.820313 59.5 15.261719 60.480469 C 14.839844 61.039063 14.140625 61.460938 13.441406 61.460938 Z M 13.441406 61.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 56.558594 4.898438 C 56.839844 4.898438 57.261719 5.039063 57.539063 5.179688 L 67.058594 10.78125 C 68.738281 11.761719 69.859375 13.71875 69.859375 15.539063 L 69.859375 50.820313 C 69.859375 52.640625 68.738281 54.738281 67.058594 55.578125 L 57.539063 61.179688 C 56.558594 61.738281 55.300781 61.460938 54.738281 60.480469 C 54.179688 59.5 54.460938 58.238281 55.441406 57.679688 L 64.960938 52.078125 C 65.238281 51.941406 65.660156 51.238281 65.660156 50.820313 L 65.660156 15.539063 C 65.660156 15.121094 65.238281 14.421875 64.960938 14.28125 L 55.441406 8.679688 C 54.460938 8.121094 54.179688 6.859375 54.738281 5.878906 C 55.300781 5.320313 55.859375 4.898438 56.558594 4.898438 Z M 56.558594 4.898438 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureSiteRecovery(m).png b/dist/Management/AzureSiteRecovery(m).png
index 38089c35..e0eaae9c 100644
Binary files a/dist/Management/AzureSiteRecovery(m).png and b/dist/Management/AzureSiteRecovery(m).png differ
diff --git a/dist/Management/AzureSiteRecovery(m).svg b/dist/Management/AzureSiteRecovery(m).svg
index 70b64254..2ef10c94 100644
--- a/dist/Management/AzureSiteRecovery(m).svg
+++ b/dist/Management/AzureSiteRecovery(m).svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="58pt" viewBox="0 0 70 58" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 39.652344 18.960938 C 48.03125 18.960938 54.863281 25.226563 55.851563 33.183594 C 57.804688 34.707031 59.351563 36.527344 60.449219 38.480469 C 65.902344 37.085938 69.664063 32.347656 69.664063 26.621094 C 69.664063 22.027344 67.171875 18.402344 62.832031 16.304688 L 62.832031 14.777344 C 62.832031 6.691406 56.128906 0 48.03125 0 C 43.136719 0 38.667969 2.359375 35.894531 6.132813 C 34.070313 5.019531 32.113281 4.460938 29.878906 4.460938 C 24.015625 4.460938 19.269531 8.921875 18.710938 14.5 C 19.546875 14.351563 20.535156 14.351563 21.503906 14.351563 C 25.839844 14.351563 30.71875 15.058594 34.757813 19.371094 Z M 34.347656 25.375 L 34.347656 25.503906 Z M 34.347656 25.375 C 30.4375 27.882813 29.042969 31.507813 28.894531 35.414063 L 33.789063 35.414063 L 26.398438 44.1875 L 18.859375 35.414063 L 23.867188 35.414063 C 24.015625 30.117188 26.101563 25.097656 29.730469 21.878906 C 27.367188 20.355469 24.574219 19.519531 21.632813 19.519531 C 13.402344 19.519531 6.703125 26.0625 6.703125 34.148438 L 6.703125 35.691406 C 2.511719 37.773438 0 41.398438 0 46.007813 C 0 52.980469 5.585938 58.277344 12.847656 58.277344 L 44.53125 58.277344 C 51.792969 58.277344 57.378906 52.851563 57.378906 46.007813 C 57.378906 41.546875 55.144531 38.054688 50.953125 35.972656 L 50.953125 35.132813 C 50.953125 29 45.929688 23.980469 39.785156 23.980469 C 37.828125 23.980469 36.023438 24.539063 34.347656 25.375 Z M 34.347656 25.375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 39.992188 18.652344 C 48.4375 18.652344 55.335938 24.824219 56.320313 32.640625 C 58.292969 34.152344 59.84375 35.933594 60.96875 37.851563 C 66.457031 36.484375 70.261719 31.820313 70.261719 26.195313 C 70.261719 21.671875 67.726563 18.105469 63.363281 16.046875 C 63.363281 15.5 63.363281 15.085938 63.363281 14.535156 C 63.363281 6.582031 56.605469 0 48.4375 0 C 43.511719 0 39.003906 2.332031 36.1875 6.035156 C 34.355469 4.9375 32.382813 4.386719 30.132813 4.386719 C 24.214844 4.386719 19.429688 8.78125 18.871094 14.265625 C 19.714844 14.125 20.695313 14.125 21.683594 14.125 C 26.046875 14.125 30.976563 14.8125 35.058594 19.0625 Z M 39.992188 18.652344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 51.394531 35.386719 L 51.394531 34.5625 C 51.394531 28.527344 46.324219 23.589844 40.128906 23.589844 C 38.160156 23.589844 36.328125 24.136719 34.640625 24.960938 L 34.640625 25.097656 L 34.640625 24.960938 C 34.496094 25.097656 34.214844 25.097656 34.074219 25.234375 C 34.074219 25.234375 34.074219 25.234375 33.933594 25.097656 C 30.695313 27.429688 29.289063 30.996094 29.148438 34.835938 L 34.074219 34.835938 L 26.613281 43.476563 L 19.007813 34.835938 L 24.078125 34.835938 C 24.214844 29.625 26.332031 24.683594 29.992188 21.53125 C 27.597656 20.023438 24.78125 19.199219 21.824219 19.199219 C 13.519531 19.199219 6.757813 25.648438 6.757813 33.601563 C 6.757813 34.152344 6.757813 34.5625 6.757813 35.109375 C 2.535156 37.164063 0 40.734375 0 45.257813 C 0 52.117188 5.632813 57.328125 12.953125 57.328125 L 44.917969 57.328125 C 52.238281 57.328125 57.871094 51.980469 57.871094 45.257813 C 57.871094 40.871094 55.617188 37.441406 51.394531 35.386719 Z M 51.394531 35.386719 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureSiteRecovery.png b/dist/Management/AzureSiteRecovery.png
index c6029874..1131dd25 100644
Binary files a/dist/Management/AzureSiteRecovery.png and b/dist/Management/AzureSiteRecovery.png differ
diff --git a/dist/Management/AzureSiteRecovery.puml b/dist/Management/AzureSiteRecovery.puml
index 8c654de1..c8171642 100644
--- a/dist/Management/AzureSiteRecovery.puml
+++ b/dist/Management/AzureSiteRecovery.puml
@@ -1,9 +1,9 @@
 sprite $AzureSiteRecovery [70x58/16z] {
-hPU7ZaGX24KLfLp-_t-txvkO1KBCdlGPWXUblT67M067oHhNRFCNCiSDP7x2DqBy3zezVpFlhpjW3x26YoduFPIsXsWtX1ePDUejQ5I8zz0wd2vLsi2xy9sK
-_ckRznafNj2_c4MqrcP5rqiDCRePKyDU8xFR4chsQ67k3Y2NapK4OLulgJH_hycQgKVo76g1Lb8FMAKH8Zz1Q2XJ7pG2j1OZHJBCMTYv57_kywuWbAb15ivJ
-hrFzGMTIhu_a9BdFsyJw_Z7p8d4tdF2J5LgdKbRSzZ03SsHLX-VdKAE6RsInCR9CtM6-nAMwikexGqBzGkAUvJkYn8fReUPTad0aLkAbc0Pqve3Di35k8lgn
-92BEQezmEY4BKk87GjgMrb68AywiA7VF80GoKoVk5ip9L6v-cYOz81tGMZHsxWwGMLXjpq5l-Ar1_TbgkMRq5w3AjBzW-Ytw_rhCB-6RrROUpiilAPRRFb9i
-j_VBfTtURLxKzvyHX0id0NeHJi0oB-Ylk7EB6b1ZcdoHlmC
+lPQ74jim34F5QOlw_-_jz34f2m-cuztCme6W46iqO3LtDnKQdqBgBup7HnmQYT47Hlnt-E5FHLH-PC2EaDO8aawwRjYVG8qipx6k28QRu_JD-7EwLZ3SJQLv
+Pho1Zak8MAshWY5jBmcZNJCOxgu9GswcAchMs1FRjiyvDsFqsJCt5YkPzZHlg97ioEjTnDlwbKa3OLTcQ1QHuDSSPYPKPA3AlWfwIDWX7xkSoPoDaw5ulBz7
+-96GeQqA_nI1Kyg9oiHMT1M2KE_J2ao5ObNcOGQf-2f4lbqnOEPweCCAq3Vq_x0gddFYs0KytGZ7eWjXTTbw6gvaBD3ckup1qxAbIVLln2fiX_ygeb5t-S9M
+9VHTHiyQj8y4HPD5O7TZrENqV23f4XQ1IfT1WFZiPX7At0W3De7TvCIoWXCDAf_fOKBmhDZCjau8zdL5ZEJATAnh2CG2-EygStqAIBVF19lku-3KzM7GW0Qe
+0PrySHkpjsr2HeLRCjdL2ktD9VE0I4DdLYFrKXWtvANnt_0L
 }
 
 AzureEntityColoring(AzureSiteRecovery)
diff --git a/dist/Management/AzureSiteRecovery.svg b/dist/Management/AzureSiteRecovery.svg
index 1b70b2fc..bc8893b2 100644
--- a/dist/Management/AzureSiteRecovery.svg
+++ b/dist/Management/AzureSiteRecovery.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="58pt" viewBox="0 0 70 58" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 39.761719 18.78125 C 48.160156 18.78125 55.019531 24.996094 56 32.867188 C 57.960938 34.386719 59.5 36.179688 60.621094 38.113281 C 66.078125 36.734375 69.859375 32.039063 69.859375 26.375 C 69.859375 21.820313 67.339844 18.230469 63 16.15625 C 63 15.605469 63 15.191406 63 14.636719 C 63 6.628906 56.28125 0 48.160156 0 C 43.261719 0 38.78125 2.347656 35.980469 6.078125 C 34.160156 4.972656 32.199219 4.417969 29.960938 4.417969 C 24.078125 4.417969 19.320313 8.839844 18.761719 14.363281 C 19.601563 14.222656 20.578125 14.222656 21.558594 14.222656 C 25.898438 14.222656 30.800781 14.914063 34.859375 19.195313 Z M 39.761719 18.78125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 51.101563 35.628906 L 51.101563 34.800781 C 51.101563 28.722656 46.058594 23.753906 39.898438 23.753906 C 37.941406 23.753906 36.121094 24.304688 34.441406 25.132813 L 34.441406 25.269531 L 34.441406 25.132813 C 34.300781 25.269531 34.019531 25.269531 33.878906 25.410156 C 33.878906 25.410156 33.878906 25.410156 33.738281 25.269531 C 30.519531 27.617188 29.121094 31.210938 28.980469 35.078125 L 33.878906 35.078125 L 26.460938 43.777344 L 18.898438 35.078125 L 23.941406 35.078125 C 24.078125 29.828125 26.179688 24.855469 29.820313 21.679688 C 27.441406 20.160156 24.640625 19.332031 21.699219 19.332031 C 13.441406 19.332031 6.71875 25.824219 6.71875 33.832031 C 6.71875 34.386719 6.71875 34.800781 6.71875 35.351563 C 2.519531 37.421875 0 41.015625 0 45.570313 C 0 52.476563 5.601563 57.722656 12.878906 57.722656 L 44.660156 57.722656 C 51.941406 57.722656 57.539063 52.339844 57.539063 45.570313 C 57.539063 41.152344 55.300781 37.699219 51.101563 35.628906 Z M 51.101563 35.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 39.992188 18.652344 C 48.4375 18.652344 55.335938 24.824219 56.320313 32.640625 C 58.292969 34.152344 59.84375 35.933594 60.96875 37.851563 C 66.457031 36.484375 70.261719 31.820313 70.261719 26.195313 C 70.261719 21.671875 67.726563 18.105469 63.363281 16.046875 C 63.363281 15.5 63.363281 15.085938 63.363281 14.535156 C 63.363281 6.582031 56.605469 0 48.4375 0 C 43.511719 0 39.003906 2.332031 36.1875 6.035156 C 34.355469 4.9375 32.382813 4.386719 30.132813 4.386719 C 24.214844 4.386719 19.429688 8.78125 18.871094 14.265625 C 19.714844 14.125 20.695313 14.125 21.683594 14.125 C 26.046875 14.125 30.976563 14.8125 35.058594 19.0625 Z M 39.992188 18.652344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 51.394531 35.386719 L 51.394531 34.5625 C 51.394531 28.527344 46.324219 23.589844 40.128906 23.589844 C 38.160156 23.589844 36.328125 24.136719 34.640625 24.960938 L 34.640625 25.097656 L 34.640625 24.960938 C 34.496094 25.097656 34.214844 25.097656 34.074219 25.234375 C 34.074219 25.234375 34.074219 25.234375 33.933594 25.097656 C 30.695313 27.429688 29.289063 30.996094 29.148438 34.835938 L 34.074219 34.835938 L 26.613281 43.476563 L 19.007813 34.835938 L 24.078125 34.835938 C 24.214844 29.625 26.332031 24.683594 29.992188 21.53125 C 27.597656 20.023438 24.78125 19.199219 21.824219 19.199219 C 13.519531 19.199219 6.757813 25.648438 6.757813 33.601563 C 6.757813 34.152344 6.757813 34.5625 6.757813 35.109375 C 2.535156 37.164063 0 40.734375 0 45.257813 C 0 52.117188 5.632813 57.328125 12.953125 57.328125 L 44.917969 57.328125 C 52.238281 57.328125 57.871094 51.980469 57.871094 45.257813 C 57.871094 40.871094 55.617188 37.441406 51.394531 35.386719 Z M 51.394531 35.386719 "/>
 </g>
 </svg>
diff --git a/dist/Management/AzureSolution(m).png b/dist/Management/AzureSolution(m).png
new file mode 100644
index 00000000..41d960d1
Binary files /dev/null and b/dist/Management/AzureSolution(m).png differ
diff --git a/dist/Management/AzureSolution(m).svg b/dist/Management/AzureSolution(m).svg
new file mode 100644
index 00000000..90942dad
--- /dev/null
+++ b/dist/Management/AzureSolution(m).svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,135,236);fill-opacity:1;" d="M 0 25.199219 L 21 25.199219 L 21 46.199219 L 0 46.199219 Z M 0 49 L 21 49 L 21 70 L 0 70 Z M 23.800781 49 L 44.800781 49 L 44.800781 70 L 23.800781 70 Z M 23.800781 49 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(3,148,255);fill-opacity:1;" d="M 46.898438 0 C 33.972656 0 23.800781 10.171875 23.800781 23.101563 L 23.800781 46.199219 L 46.898438 46.199219 C 59.828125 46.199219 70 36.027344 70 23.101563 C 70 10.171875 59.828125 0 46.898438 0 Z M 46.898438 0 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.398438 35 C 36.398438 37.320313 34.519531 39.199219 32.199219 39.199219 C 29.878906 39.199219 28 37.320313 28 35 C 28 32.679688 29.878906 30.800781 32.199219 30.800781 C 34.519531 30.800781 36.398438 32.679688 36.398438 35 Z M 36.398438 35 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 56 30.800781 C 56 33.121094 54.121094 35 51.800781 35 C 49.480469 35 47.601563 33.121094 47.601563 30.800781 C 47.601563 28.480469 49.480469 26.601563 51.800781 26.601563 C 54.121094 26.601563 56 28.480469 56 30.800781 Z M 56 30.800781 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 46.199219 19.601563 C 46.199219 21.917969 44.320313 23.800781 42 23.800781 C 39.679688 23.800781 37.800781 21.917969 37.800781 19.601563 C 37.800781 17.28125 39.679688 15.398438 42 15.398438 C 44.320313 15.398438 46.199219 17.28125 46.199219 19.601563 Z M 46.199219 19.601563 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,255,255);stroke-opacity:1;stroke-miterlimit:10;" d="M 24.001116 24.001116 L 30 14.001116 " transform="matrix(1.4,0,0,1.4,0,0)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 64.398438 15.398438 C 64.398438 17.71875 62.519531 19.601563 60.199219 19.601563 C 57.878906 19.601563 56 17.71875 56 15.398438 C 56 13.082031 57.878906 11.199219 60.199219 11.199219 C 62.519531 11.199219 64.398438 13.082031 64.398438 15.398438 Z M 64.398438 15.398438 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,255,255);stroke-opacity:1;stroke-miterlimit:10;" d="M 42.000558 12.000558 L 37.000558 22.000558 M 37.000558 22.000558 L 30 14.001116 " transform="matrix(1.4,0,0,1.4,0,0)"/>
+</g>
+</svg>
diff --git a/dist/Management/AzureSolution.png b/dist/Management/AzureSolution.png
new file mode 100644
index 00000000..ca2daaa8
Binary files /dev/null and b/dist/Management/AzureSolution.png differ
diff --git a/dist/Management/AzureSolution.puml b/dist/Management/AzureSolution.puml
new file mode 100644
index 00000000..1275f712
--- /dev/null
+++ b/dist/Management/AzureSolution.puml
@@ -0,0 +1,10 @@
+sprite $AzureSolution [70x70/16z] {
+xPPLOiC0241nsFqFFBTG2ipr_KtwyAImXSGyhd5JHdWLR770vUKYyJX5N-OXZng1FHfdyMqwwD51MqaFBoLlrtZCqDpO1Jv8E5Rec-fn9hQn9jca85DDktPO
+aSo-A_BitmpEagzOnQezeRW6bmN9qnAcNDhLusgQMFSbTBTnU5Ac7GQvQylfz0c0Y2tksAqSvWpjK5xicilPJK_6lSLJHIcLpfBF7-yqAPMznUv-8G2WLIfX
+5Tc20FhG7YjIYOiA14YBYq-LkMjAPMNnP-j3QUHx2ps_X_BXOxFbs2MikY-p1G_vbnT2lONJATSMXzQ2-HDrHT9Qf8XhHNUXjL0r4CCyQEajM3_8tTEbzXPU
+lMbfi7XwsfOe39Qm-Uk7GMkvmzI6L-HecJ5u1ul2sorEy7QB0CoMsV56Yol14Qbu-ds6cH2-DrRH_3unTBVy_Pij_vP_ox_bt_9lkG8
+}
+
+AzureEntityColoring(AzureSolution)
+!define AzureSolution(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSolution, AzureSolution)
+!define AzureSolution(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSolution, AzureSolution)
diff --git a/dist/Management/AzureSolution.svg b/dist/Management/AzureSolution.svg
new file mode 100644
index 00000000..fd1b218a
--- /dev/null
+++ b/dist/Management/AzureSolution.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 0 25.199219 L 21 25.199219 L 21 46.199219 L 0 46.199219 Z M 0 49 L 21 49 L 21 70 L 0 70 Z M 23.800781 49 L 44.800781 49 L 44.800781 70 L 23.800781 70 Z M 23.800781 49 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 46.898438 0 C 33.972656 0 23.800781 10.171875 23.800781 23.101563 L 23.800781 46.199219 L 46.898438 46.199219 C 59.828125 46.199219 70 36.027344 70 23.101563 C 70 10.171875 59.828125 0 46.898438 0 Z M 46.898438 0 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.398438 35 C 36.398438 37.320313 34.519531 39.199219 32.199219 39.199219 C 29.878906 39.199219 28 37.320313 28 35 C 28 32.679688 29.878906 30.800781 32.199219 30.800781 C 34.519531 30.800781 36.398438 32.679688 36.398438 35 Z M 36.398438 35 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56 30.800781 C 56 33.121094 54.121094 35 51.800781 35 C 49.480469 35 47.601563 33.121094 47.601563 30.800781 C 47.601563 28.480469 49.480469 26.601563 51.800781 26.601563 C 54.121094 26.601563 56 28.480469 56 30.800781 Z M 56 30.800781 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.199219 19.601563 C 46.199219 21.917969 44.320313 23.800781 42 23.800781 C 39.679688 23.800781 37.800781 21.917969 37.800781 19.601563 C 37.800781 17.28125 39.679688 15.398438 42 15.398438 C 44.320313 15.398438 46.199219 17.28125 46.199219 19.601563 Z M 46.199219 19.601563 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24.001116 24.001116 L 30 14.001116 " transform="matrix(1.4,0,0,1.4,0,0)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 64.398438 15.398438 C 64.398438 17.71875 62.519531 19.601563 60.199219 19.601563 C 57.878906 19.601563 56 17.71875 56 15.398438 C 56 13.082031 57.878906 11.199219 60.199219 11.199219 C 62.519531 11.199219 64.398438 13.082031 64.398438 15.398438 Z M 64.398438 15.398438 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 42.000558 12.000558 L 37.000558 22.000558 M 37.000558 22.000558 L 30 14.001116 " transform="matrix(1.4,0,0,1.4,0,0)"/>
+</g>
+</svg>
diff --git a/dist/Management/AzureSubscription(m).png b/dist/Management/AzureSubscription(m).png
index b63c85a6..fb2aee30 100644
Binary files a/dist/Management/AzureSubscription(m).png and b/dist/Management/AzureSubscription(m).png differ
diff --git a/dist/Management/AzureSubscription(m).svg b/dist/Management/AzureSubscription(m).svg
index aa969b02..c79dfd70 100644
--- a/dist/Management/AzureSubscription(m).svg
+++ b/dist/Management/AzureSubscription(m).svg
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="43pt" height="70pt" viewBox="0 0 43 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="43" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="43" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 17.65625 61.542969 L 20.46875 64.34375 L 20.46875 42.011719 L 17.65625 40.609375 Z M 17.65625 61.542969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 31.820313 61.546875 L 34.660156 64.34375 L 34.660156 42.011719 L 31.820313 40.609375 Z M 31.820313 61.546875 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="43" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip2">
-  <rect x="0" y="0" width="43" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.140625 19.0625 L 33.996094 19.0625 L 33.996094 22.8125 L 8.140625 22.8125 Z M 8.140625 25.164063 L 33.996094 25.164063 L 33.996094 28.914063 L 8.140625 28.914063 Z M 8.140625 25.164063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.214844 19.0625 L 48.3125 19.0625 L 48.3125 22.8125 L 22.214844 22.8125 Z M 22.214844 25.167969 L 48.3125 25.167969 L 48.3125 28.917969 L 22.214844 28.917969 Z M 22.214844 25.167969 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 40.691406 27.332031 C 43.773438 24.222656 43.773438 19.179688 40.691406 16.070313 L 27.082031 2.332031 C 24 -0.777344 19.003906 -0.777344 15.921875 2.332031 L 2.308594 16.070313 C -0.769531 19.179688 -0.769531 24.222656 2.308594 27.332031 L 14.285156 39.421875 L 14.285156 62.71875 L 21.5 70 L 27.769531 63.671875 L 27.769531 63.628906 L 31.449219 59.914063 L 27.800781 56.234375 L 31.449219 52.550781 L 27.800781 48.871094 L 31.449219 45.191406 L 27.769531 41.476563 L 27.769531 40.378906 Z M 21.503906 5.652344 C 23.121094 5.625 24.628906 6.480469 25.449219 7.890625 C 26.265625 9.300781 26.265625 11.046875 25.449219 12.457031 C 24.628906 13.871094 23.121094 14.726563 21.503906 14.695313 C 19.058594 14.652344 17.101563 12.640625 17.101563 10.175781 C 17.101563 7.707031 19.058594 5.695313 21.503906 5.652344 Z M 21.503906 5.652344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 55.070313 27.335938 C 58.183594 24.226563 58.183594 19.183594 55.070313 16.070313 L 41.335938 2.332031 C 38.222656 -0.777344 33.179688 -0.777344 30.070313 2.332031 L 16.332031 16.070313 C 13.222656 19.183594 13.222656 24.222656 16.332031 27.335938 L 28.417969 39.421875 L 28.417969 62.71875 L 35.703125 70 L 42.027344 63.675781 L 42.027344 63.628906 L 45.742188 59.914063 L 42.058594 56.234375 L 45.742188 52.554688 L 42.058594 48.871094 L 45.742188 45.191406 L 42.027344 41.476563 L 42.027344 40.378906 Z M 35.703125 5.65625 C 37.335938 5.625 38.859375 6.480469 39.683594 7.890625 C 40.511719 9.300781 40.511719 11.050781 39.683594 12.460938 C 38.859375 13.871094 37.335938 14.726563 35.703125 14.695313 C 33.238281 14.652344 31.261719 12.640625 31.261719 10.175781 C 31.261719 7.710938 33.238281 5.699219 35.703125 5.65625 Z M 35.703125 5.65625 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
 </g>
diff --git a/dist/Management/AzureSubscription.png b/dist/Management/AzureSubscription.png
index 83667283..f7955758 100644
Binary files a/dist/Management/AzureSubscription.png and b/dist/Management/AzureSubscription.png differ
diff --git a/dist/Management/AzureSubscription.puml b/dist/Management/AzureSubscription.puml
index c05643ff..56cf3126 100644
--- a/dist/Management/AzureSubscription.puml
+++ b/dist/Management/AzureSubscription.puml
@@ -1,7 +1,7 @@
-sprite $AzureSubscription [43x70/16z] {
-jTO7SWD130D10j3_l-niE2thncagIwr0hiBDb-GarboNbtm5bJGW6v0DIDTUo4wtszvxiYUfmskSPTORMbQQJUQmk4NsG9sqiqoqdbjbioGd9niIant1eLQX
-zKczrisaOo-vuYTqBQKu2rCDVWCpWcDfPdn5AsSCg6TgrofhWQm5iXR8MY1hWQo5SWR81cG3iW5v7cqkwErswvDY6d4QSHfnclzuLlt71eRJ45hxByiofXvA
-_I_BCgSnf_5VxJNaj4hvbHvOLcqbjHfWAvdLa5G9x5dU0m
+sprite $AzureSubscription [70x70/16z] {
+pTX7WiCm30H1Og3_VtdpUfG5intO9yTI04vgLoc_KaCf_mg0f1D1d0ZYX109CFFR6cPw4S3aNtxVmMpMH1rCRfJ8kvcTwIghZ17NlSMvg7EBSrLybQx6P2KL
+4CmeYmKv5LSv5HtbaxbM54TLxam-HgbVaSY8AagG6Rd25HMKgDxTTffgIhGBfg0O8NEATfq8uaGG9u8u4SI984u4SIA84q6S2E8441SGiJ9D3r7CSEKdh9ZX
+YiOvbt5c9AgOuKfgf4a7Kenm9GQQT335p3WpIWsmk_mH0Pgq6IFT8SGPGHb16K4La4y
 }
 
 AzureEntityColoring(AzureSubscription)
diff --git a/dist/Management/AzureSubscription.svg b/dist/Management/AzureSubscription.svg
index 84a8dfe1..d1ae04ac 100644
--- a/dist/Management/AzureSubscription.svg
+++ b/dist/Management/AzureSubscription.svg
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="43pt" height="70pt" viewBox="0 0 43 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="43" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="43" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 17.65625 61.542969 L 20.46875 64.34375 L 20.46875 42.011719 L 17.65625 40.609375 Z M 17.65625 61.542969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 31.820313 61.546875 L 34.660156 64.34375 L 34.660156 42.011719 L 31.820313 40.609375 Z M 31.820313 61.546875 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="43" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip2">
-  <rect x="0" y="0" width="43" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.140625 19.0625 L 33.996094 19.0625 L 33.996094 22.8125 L 8.140625 22.8125 Z M 8.140625 25.164063 L 33.996094 25.164063 L 33.996094 28.914063 L 8.140625 28.914063 Z M 8.140625 25.164063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.214844 19.0625 L 48.3125 19.0625 L 48.3125 22.8125 L 22.214844 22.8125 Z M 22.214844 25.167969 L 48.3125 25.167969 L 48.3125 28.917969 L 22.214844 28.917969 Z M 22.214844 25.167969 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 40.691406 27.332031 C 43.773438 24.222656 43.773438 19.179688 40.691406 16.070313 L 27.082031 2.332031 C 24 -0.777344 19.003906 -0.777344 15.921875 2.332031 L 2.308594 16.070313 C -0.769531 19.179688 -0.769531 24.222656 2.308594 27.332031 L 14.285156 39.421875 L 14.285156 62.71875 L 21.5 70 L 27.769531 63.671875 L 27.769531 63.628906 L 31.449219 59.914063 L 27.800781 56.234375 L 31.449219 52.550781 L 27.800781 48.871094 L 31.449219 45.191406 L 27.769531 41.476563 L 27.769531 40.378906 Z M 21.503906 5.652344 C 23.121094 5.625 24.628906 6.480469 25.449219 7.890625 C 26.265625 9.300781 26.265625 11.046875 25.449219 12.457031 C 24.628906 13.871094 23.121094 14.726563 21.503906 14.695313 C 19.058594 14.652344 17.101563 12.640625 17.101563 10.175781 C 17.101563 7.707031 19.058594 5.695313 21.503906 5.652344 Z M 21.503906 5.652344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 55.070313 27.335938 C 58.183594 24.226563 58.183594 19.183594 55.070313 16.070313 L 41.335938 2.332031 C 38.222656 -0.777344 33.179688 -0.777344 30.070313 2.332031 L 16.332031 16.070313 C 13.222656 19.183594 13.222656 24.222656 16.332031 27.335938 L 28.417969 39.421875 L 28.417969 62.71875 L 35.703125 70 L 42.027344 63.675781 L 42.027344 63.628906 L 45.742188 59.914063 L 42.058594 56.234375 L 45.742188 52.554688 L 42.058594 48.871094 L 45.742188 45.191406 L 42.027344 41.476563 L 42.027344 40.378906 Z M 35.703125 5.65625 C 37.335938 5.625 38.859375 6.480469 39.683594 7.890625 C 40.511719 9.300781 40.511719 11.050781 39.683594 12.460938 C 38.859375 13.871094 37.335938 14.726563 35.703125 14.695313 C 33.238281 14.652344 31.261719 12.640625 31.261719 10.175781 C 31.261719 7.710938 33.238281 5.699219 35.703125 5.65625 Z M 35.703125 5.65625 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
 </g>
diff --git a/dist/Management/all.puml b/dist/Management/all.puml
index 92d915f6..0506d714 100644
--- a/dist/Management/all.puml
+++ b/dist/Management/all.puml
@@ -1,11 +1,42 @@
-sprite $AzureAutomation [70x61/16z] {
-fLS9hgmm36lQRER-z_qBwWICogpMzaIH4yTncTS-GgHhRpz2jl-0_qQasqJgDptCuh4LyiD-XcE3x7zYEn1Vg8YTxqG2-MOMexNc9nRxKD2S0mj2-ufbKnAa
-xofHPXbJK7NM-cjLDiqi5ZaBwgs9iqzhalzmQOf7zKuk2wgdbqkAgk_DoELulJLLju1-4kHLveNXVgP8xMTYI1EyPRZWu1WrgN8vohWtu-lpGPvSrhUpb7CU
-DAbPl-FDB0cAX0N5IN1_nUANrvApt5-iYxYxcO5zbCeopUt_c-vZjRM5fATaBTzxwwcIZ_HKbuifxOfb2LbK3Ih767I7NBSdRGUzkSf1J-gJ1J4zAXAwsDhA
-20ig64l2JI9jvmaML71UAPUd5uCl1adaHYDPiV2v_aTUNT8FMBYXb0kBteSW3aKSJyXro-CkaORLvM57nFa-35bpB6z340d5dBHVDx9Vdm-Mo6juTsOys-kx
-olKOg3CmkTs67q-_8Nf-walfv0EV0iYDVKKiUqu0BDNiFBsW8fhBbdFP0wqlnLSQGqaoatCp1usiIPAwWCvFGqeJXzJ2KmuMDtpdOMFQXi0SQjp_i9NZZ6B6
-IFPnS-8Hnyqk4FRfW7bj4dLBEe2m7GTGmWa0YBh6HhE2wOnpFrI6RqjuJEeIgwXBJ7B_iomRhVNO67FWFS-Viy3Pj56DTi2EHmoTrJ4k7rHmegCsxOPbHsyt
-B9HIOkbD1CLIOE_6iTc8mVagNYCMXjUqE_Yb8kP_i-p-9pB2WiHHBtORPQvsUukAUXPpfgkq5R0neds8jPNo3OrlEMGVFrGKBFjzzCVTPhHBtmhxck0l
+sprite $AzureActiveDirectoryvisor [70x70/16z] {
+nTM7agqW381X84KKt_zvBwvpCcpY6iXj_xIjtuGSItBB1H6fXr1ICA0nfW2KyRlnLOdF8KYFyWg26f5W_ZHa4Gd3I8InY6RYErdR3P2hS0ujHKUUWhxYNtxb
+7P6Ye_Z3PC0hoFa5SJPJa5I-mWytRq0f-l88AH12T3I3yDZMUrbCyOqErA-qbAG9emvzSvnHjA4ThKmZ0xVfxMO7aN-Z7iltIe49P6EIxX_jDuFZdQTJnn53
+d7s_cV9H_57O_7w_uXwKuYk2w64kfV8TvWbbU_frlPZnRl8GVlZrFSmsCEWepx-jmv5w6TuLjh-KOLZ2JBgtKVZJVIGfhIWiLQN0lC8_AsbQuJV53lEiyAkI
+q5KqOhTh6Vr9MyHUTi-CLjWgrRmAm3cIGjIrczNBqJAi47iWoZ-zgSVRyH6HKQWaftmpfdef9Sq6yemr2ARvgDwNbpxEpcabtg_g9aPNBpUbTQPtRQXsGYPP
+2tSJfVMsGo4r1Qfd6voZdK6brzhHQ-tixH5bFrN7_rCEhRJ_fxHJ5r7ElwJaTIJBEkHe9QuqA2skb0-IqeU1TGK44IQY228ChYieY30HHH1XQ5sXis4QWdPo
+G154c832WWXZbLy
+}
+
+AzureEntityColoring(AzureActiveDirectoryvisor)
+!define AzureActiveDirectoryvisor(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActiveDirectoryvisor, AzureActiveDirectoryvisor)
+!define AzureActiveDirectoryvisor(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActiveDirectoryvisor, AzureActiveDirectoryvisor)
+
+sprite $AzureActivityLog [70x70/16z] {
+xTI5OSGm341HWL7PVz-66TKSwm_mp8Qc88KsX3RCXJuS8v8roQ2KY7X2HHHx9PO8emfnlOBbShmI6HGgbS0gPAQKoUNSJD7rjWh-fcAA1CSRUJcjUDWEvQGY
+i5SygUHT9NoDOehSeXIyf-IpYcmpbEoNQZB555DCCSKKKqp9-GO5olwjq1qAmv2e5HWLjGgCmwnJQ23-
+}
+
+AzureEntityColoring(AzureActivityLog)
+!define AzureActivityLog(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureActivityLog, AzureActivityLog)
+!define AzureActivityLog(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureActivityLog, AzureActivityLog)
+
+sprite $AzureAlert [70x70/16z] {
+xTV5WGG040B17Y3_bC_TRuV7MWNGR-2Ud0DvUAAiF7QS9JKYYPWKZ5BWN1gUp15Lb8qvmegpeREjPCLdLydnLIPVkLQKdJcYYX_ad6WOPySyq3gopmpFii0B
+7r4b2-ekZnp5iexad1AdGIamAH3A7f2r0QX4m8q8Z1OVzZVEE-80dpB38hElu4e5LoguKi6L2gvKSAM2AnLKgQ1A1LKgg591FrHk0G
+}
+
+AzureEntityColoring(AzureAlert)
+!define AzureAlert(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAlert, AzureAlert)
+!define AzureAlert(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAlert, AzureAlert)
+
+sprite $AzureAutomation [70x70/16z] {
+xPQ7Rkim54DvbnB__my_sn9AXBZP66-TxbOu8kLhD_XpSSFtMEnyRVAOV2UAM6I-w_6iOQiGBUbu0ni7jGfHadZVCbmAfNzYAHPYbBSj8suBsMUM18AIm6lK
+MCr_ifX4YP7F9MFKN3in-4qKgndmYUGWlCRYfj1QyKGJGqc04kSAnmF4KN5JY6TUU3bC6Y1HwfKeNCRgj039lpt4X-nclCei3F8mZ46Z1FS8F4CaO1H6BJmX
+HMACSkAFmrYUw29VahpT9a_kXM1WAUIiJ1nA_qTZb6Qa2eB9twIGzVjrSxA8hf0VFcVtfnQJGlgqzBwHz9L2j9YKTtIaRW2HBAHuMokra4eWlPzQ_4071lMw
+XIo9M72Nw2o-xYB2estmukbAb6Z6lBfELlqesH6b7_F4awaZhXB46tS02wL4h_iM6qIYs6ihTGS7YVJx3wA44kqM5luWj4En2D-HFSBRp3Ld6YJ2DH8tSGZP
+X_1jssIakCpwteK9rzHkIN3RaiegqLEjRJZykbikZhXinNKwDNfvZDvjvt3yVFLPQ57U3gPKicaWL-xMU69LrQGb5hx88HM-4rb3O1Yn64_bEOv5RWV3O6Cx
+23x07JawGbzxM9xdKYntJPkQu5dUOW1N75os2IOycaoJVwHwPQm22ruNIa-BtdMLcJnIGIpNknO73nsAvTm-E87RSAXbjQ05oZZ3n26vCeXOZ6FRMtmxkOnr
+ADtZDPiV26kGWE1PM7Y5e-NIt4TluviIU0Tc6J67VqJj1uIFA5jNQW2mn1U4L7aNZYs-nuo3yfzV
 }
 
 AzureEntityColoring(AzureAutomation)
@@ -13,49 +44,96 @@ AzureEntityColoring(AzureAutomation)
 !define AzureAutomation(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAutomation, AzureAutomation)
 
 sprite $AzureBackup [70x58/16z] {
-hTS5aYjH20LGz27xt-_N6AqCbLCocbj8A_IXMaI6Bu4nzdmpWWdqhDQaaCYdUEGvGWk9BcNy6v9l0VRufjELHlxdJ5bIO3s-mqOBHKa1UUJ3DSsyIW6A_4lW
-Yfmbc0h3NnYFn7Dq7A5bd7vNZEUUCsnOPbgxb8C9l4S3fzQ-6JmR7VKRSlmy4CiI6Sum4x4itrQ26i-zM9QKI-AlgjyzH3ar6Hh8ClMraaSAHRuuDIyhDII3
-vvS8ClSyvd00PPcRASCEh-Z5Y5zV5lKeHtVNri9mNwhb7bvV3u9XHwwBiJmxWP2PwIB6o-bpX44VVRgSnjnUtYBs3TfP2cQBlgvqHUcdGGvx-b4fxtCp3bCa
-k_oWT2jRRk5oLItNq-optGUYZALfTrcLIGfkOWmcALH7wUN0RPDohx1wW-epV1t18UKSRIeFGE82mv3ZcoNbX4FbEQB3KghOFI2Cq5b3yvOYXnPyoAdr_Ley
-X-JxEveVBqLC5rtmj9JASe1XowVzL3ODgJH_8XYEuOfiShbxrxobWd3aDm
+nTLfSkGW38RXJsW1nFtFEojEgun9QvZj-Prw8x2eHXv9RUxUcnQSAjN71rSSiTcuTCOlepu-N3CPKefQDMK09Gx2x3E7zzJ7JswbZu11FJaD-zXX06ty89b1
+zXNOpp7n6Tb4UbKkyKyCU-IF2IK4nTyCKvyQylY_E3NAVbUfVNuaNIC5TtE5Mlv0dJ2nrSxn_ZjsY00YrkPpaXaXy-jBsvWwtfF-FSAl7PgLDfALYVkejtCo
+zV7I2ZBcbjYuc8_83NaiMdqygbWLiH-aO57KCnaI2uIIxvGHYTq8ddPsqH6eBHGh6mkys2C2Y4LLcFQP_IIJ5hKBxzv8k9ECEK_VLCXo2hxZJKLjoatJ7Yja
+QK_3f6_bTiN-L57BMpzJMtObUS4w0ZweyFqXL1nKvBPw3SULcOaHjhJu47hyfIArABzwnRrIMBZJJ7pBXvb8x8W2aHqg2DWE2GArKmZiFrVeZrJ-_Bs87L84
+nGunelFBZShvA97Q2GJ76S92poCHdp_4YCJIXB17BA9lY731t_CL
 }
 
 AzureEntityColoring(AzureBackup)
 !define AzureBackup(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureBackup, AzureBackup)
 !define AzureBackup(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureBackup, AzureBackup)
 
-sprite $AzureBlueprints [70x67/16z] {
-hT87WiCW34HHMn8gC_S_xrPIs1B7a9_UNX3szf560HMsBIJ5Niay0bw3pYh5kx3F8Or3FgSaXp2dW6Dp2ZbMpvOPRd9JLYhVkx8MsX-AojEfjGJ9M51w3jAN
-5J4G-x8YJlgXqWvTi8uK9-IW98wK_6DvYLAv5UI1eaMstnl165uVA040h1zlaimJIi95n0gwe3JsOQh6CLNbUINhogcCdL3WqcDxkH80ydcbKaJiyqQJMtbs
-TqsYogHAvXL9W4KKR4MH8a5sP5f9ia3gcW92WlGbfP4fHjQIacGJ0Qah2WYHFjAqOcH-FzI24cJhIz9v1OHspISKhwz8Z4_ob6BnMP4LNu6ChoOc0gdZ1ib9
-PJmqZSmfPTnJ47AjkNixLcu33IVnsB4o3jH7cb36WSQHxCH4TVTy7Cb8FgjWcC7kLrR4dnELkoS6XL2vA-yKP_oXbFMNk2bAbo7SVgdGtmhkFhuf9MFjfaZ8
-RwN97_zY9Z_onqTQxZALqpa9GXPpibwY96dhIYDZNTb1-hAoDP88RnEPNfNDEHz2kx9fBJbVocUxjfdmxMHN9YlsNgFW9KgyGgbjNM7kwqhgjbQ4s_SwtW4
+sprite $AzureBlueprints [70x70/16z] {
+tTU5qZCn28NXBKJWdFk_tiygR6PIsT1Vtxez0ndjzdycpG7lca8wBxci8yvRaCGaaIyY9t1VMLCAXsnDQHpoXB8GOAsSGaa4awa2Up5ta2JQL97Nqsea-weI
+5P0bhOY2dbUaa_fKKUzFXY7RKwKHAcFQgkm2xQdIIPKna5qYfpzHj8FqAliAIGmA7YiAj5eDFQMu_pnKj3tTlZgWLAZyr26JNbIwtvRGTSLCpYdBRYCpwqTc
+GSooVhg5LQgRYhciAs8mEc4e6KMC18agAQMH024vnKdjP6uM1LqAQIcbaaq4H4enKaKwMJCAwEUVMKAfP3zZI2X65lcgasL50QVrOqhzhfDMVmBnywZ7b5Xe
+VBQWWDWTyu8IFmqmcAzULMADU1wzh60orn4bVZWZ5O2zghHX2IDrzxpUKu1HwNI95A5KGgQAV-FQi5CCAhlwRZBqgT9Zs52Q326KNYRAVdGBHSPgZVLafZI9
+-lohunjJfSXYeTItA8MiUUL4UbxPd6nvHKbwAqMFDYXRvMAm6igcpjLGVvHpKcex77uS2oNrF_nDId-BekzGsfPNKBQqWdRQSjLMPFlx-WG
 }
 
 AzureEntityColoring(AzureBlueprints)
 !define AzureBlueprints(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureBlueprints, AzureBlueprints)
 !define AzureBlueprints(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureBlueprints, AzureBlueprints)
 
+sprite $AzureCostManagementAndBilling [70x70/16z] {
+fPS7hkH024J9sk_Kzp_jZnwrZ30bxxm3F1N519hkOL5pZ_1lp5JeEMBnmb-OCJs0VnNJCZ5zvCYMYH5Xs2FX6Pp78g35NVeW4SY2nz90bWc3QO05JEK1BLZZ
+0IrOum4jM6C1BRXY3MIfoPyJR86V6-1eK5oA2Ps8-GrWdhm1haNMBdawW8VFjDKiLA9LcDieIZV8NHXk9Hc-2MD0WZNq3Ue43wLLjmImOYJ3AyuK8qN2AV5l
+WViMXb6M3OOn0QtuSXpR4dqpfls2bl47zskoTg0OOzltZtqmwBSTQ1t7Ro_MB1jRjjD2mDBl-MECTIqi-iWYnnXZjpSjfFluPXEwmde5M8ZyntCeiC2luhAl
+OwoznR5b-rtL1KaMInQ-VkhijEofBc3Hw_Tv7Cj-R6CilKLolSdonyvjBSBHZkJBTXnB48X2aR2YNG8M9ey4GujeehXSd02icUgVH815CrB-mJ9rI1M59806
+IUJka68icN2w374txggPvgepofp3coQuFLErUZaL6dHt6zD4FKwo19-xRYeYQh-AIYFDwGr8KS1CM4DNuhyq35wC09-blAkHyYFr29kITz88VjPZ1BxiCSwK
+ULwE4S3U2J9X0mwX2V9W1qQyL2ZJGrZzOZ2vLtm1
+}
+
+AzureEntityColoring(AzureCostManagementAndBilling)
+!define AzureCostManagementAndBilling(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCostManagementAndBilling, AzureCostManagementAndBilling)
+!define AzureCostManagementAndBilling(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCostManagementAndBilling, AzureCostManagementAndBilling)
+
+sprite $AzureDiagnosticSetting [70x70/16z] {
+xTX5egH04431ACky_ud7XxQlbInvksuWS0NCtAu1YAmhxGyIEzqfaPcpxTJNeQpC77l8F9HMG1wLsRUG1sMpUIbFNKgSeSGuGndj38KJbCMgAvrHLz3AoeIo
+qc0LbG2Zg0pGYae3Qie2h9BI0QEa0FIACc50HUbe0MjV2PW9Sr-P4DdHlwjqz_L_sA42FJvMfeTMPa1aveF-iJ8ybB-2-U1_geJxnlzrx9dDNUkphRlkYcCb
+Sy4u_lz4UIqWEbJkZJ1WL9GE41Lb0dfMb02iaf90ovhImImg4sHHMJ2gIaAKbKxFiZ9OTMLf-QaYFyiyG-bvXX9rvQYkNCgbH9oWG5bfr9M1kkAkjQjuAAgV
+jVm4
+}
+
+AzureEntityColoring(AzureDiagnosticSetting)
+!define AzureDiagnosticSetting(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDiagnosticSetting, AzureDiagnosticSetting)
+!define AzureDiagnosticSetting(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDiagnosticSetting, AzureDiagnosticSetting)
+
+sprite $AzureFreeService [70x70/16z] {
+xTC7ajim38LXiU2XyVxdpL0oqkHnQ4Zf-q_PTViC5cy_kuzgkbR3A9tI0MY7SWq1wZuA_Q3-6W5DfUO7EId85ifJXEKE1QvtA3hi1eL7C3c5nSnKVGozD0jF
+OYRVFBccd1rdHEAIsHURZ7r170a5a3cE8lvtCnL-Mm5xh4dsvIc_DOkOcyh1Q73JO5vNTEovCljm03Q6CQi5jgJu41OzFk93vdf4R8VdSCkAnYcP38Mxs2I5
+0Hw-g4XyuLoGEORwYDjYmnQKs1YNnpZ78CQ80-Sb9QwAcp1t7MPZC06FhM8iAk54iQynuRe2i8YQcNA7s3wRIk8NKBPlwq12GVlQA8ICqW7KRmQXX59h1-XO
+LWD0FQVKIa2VxvX6JokrFHRIUrwPzJ0kAHMWsvKFfPyK99HmGY7a550B9OoC0j2kX95LW0uGiAha2oMwHS45fLn4qBTPluQWRC7a3Ph8NdaMpfKdRQzZ_Jvi
+xqSdfIUKTbBgBKhvRRFmIQ6tZGBLpFR6nQcrTM9v7gYrMb_VauBr_Wvbmt8hv_NH9m
+}
+
+AzureEntityColoring(AzureFreeService)
+!define AzureFreeService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureFreeService, AzureFreeService)
+!define AzureFreeService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureFreeService, AzureFreeService)
+
+sprite $AzureGuestAssignment [70x70/16z] {
+xTO7OeH028NXE3CymF7-vysgRA-0wVct5pzxUTkkeRagjvK2NzMXU1XJgBwUCRUKuVLWJ5v1JIl6v1LZyWfgMZ4chnYJLr2pYZ5HvLW1AAyCtq7vLne1e9fH
+2h6iSGihRJNMPvIOGhC0416OHRX4b3ORP8559Q0KDiGILVWLY9mYWAeMhr94-0m1gyAhD16S8O2gU1M8N20GrU9M-081grQdmaS5SGK71Gc5H2uGMowXTOHZ
+gkpUwbZu765LSYiamXU8QzkrM8JF4HhyIcLLuHC4eUDBKvsTNJA_u-YnJYr3OagTHhN6Jb6bJTFK-pZsldk3X69b5DfUuQY2xHM9Aho98gUAvfJUSuekI6iz
+hSnR_iACKMLSaOL9A0jYJ8ygVPg_DIQkqF4zXHMw_U7_glbV2VPTbNpl
+}
+
+AzureEntityColoring(AzureGuestAssignment)
+!define AzureGuestAssignment(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureGuestAssignment, AzureGuestAssignment)
+!define AzureGuestAssignment(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureGuestAssignment, AzureGuestAssignment)
+
 sprite $AzureLogAnalytics [70x70/16z] {
-xTG5SiKm38JXbItJwlxtRTwmfWxAvVu3uIziN2gLrWUtHgjPyAJSQAvHRaCwx7riwPP1swa9BYRTzgFYKfbsM7jwDxuXEAlOLfHHipYJQPVgE4Xe5olOhzlL
-c1u-5D_0NhGRwS6bn2zcsAqoPcKxQCXMzsyRoILurKwltokKwbAyuat5TA8akwkqYQAtbJ5Hwcs54wMxLvWkA3PHnZTI-65ArwsmKh7rXnGkKRhudYa5lcTA
-Mg4Ch50AaakUA1GiU4SLnmh7rcoE_bBcogqK2vIE1GfbWSA4kCACWEAGeCA4kD85OOKAH1KM8Afq1K8AHrC1VBEH8U-N17yayLrUTVoEvgkAMrM-hVAl_2l_
-oXi
+xTPLeeGm38NXKqiZ-r_lTHa90w6Tg_nFF7rO3LzPAhKHjLOpzbQws4Sgj4DAf7QPjA3HrRmqubIrfIHZOzsSWe-Jn6xNeuWV1v2Hfn7R4k5cPDigk56nZMdm
+VUBlr6npch6KcbFqFrLRJaL4xIHDyEELdzBij0OWrzCo02GBAGAWq6a506fCiUGgFQXKLv6WGgwYzXQtrcXTwPwIJc-2lAw8f-IeelTJYgC8CykmKW6K-oeo
+HU4f2arHAf3oQMcFak0KLGGpb3P3qOG9twK34_vHNbFqEVVg_55y9P2c6Kh51ALZWiAOe30cA8nnHGdZYXGCAzg0KKKfOL2HNd2UUtx9VIcYLXAsTkIUN-Yq
+1W1qrizI3kLG3cL-Zm
 }
 
 AzureEntityColoring(AzureLogAnalytics)
 !define AzureLogAnalytics(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureLogAnalytics, AzureLogAnalytics)
 !define AzureLogAnalytics(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureLogAnalytics, AzureLogAnalytics)
 
-sprite $AzureManagedApplications [65x70/16z] {
-fPGBcYCX28HLG46v_tat9iHrM6AwPslUazJ_bLHBkg12aFv31OdezuYCP2g_jvlmFWBefp3Vj_y70YWItXh0hmE0rLOSeXWNlXI_lRjiTjXYbGl1BI_izWH1
-fw7T8t1bEy_3x3usv6WY19UAAq6s616_XI0EPyf-_d7nTe88xWLnyLW2Flhv6y8V7u9E_sQZ1IYrWf72uWdjnHrEmZjWHs2sqD6ZQ7PayO1gOotXsCnOB1kB
-UC0KvbEhwzNIH2B0b9jcr5mcaH1WAYw2Bnv5pW1qf_3vwmL0iV-YNyePhW78AbrD6f6aNWNKQXxO3izo1r0f6sAhxWx04APiDWzO8WSmmMOF0FN7DWW0Xa2H
-2D3SQeKGK1ziYG2CmKAv0I2tKAhTrek0cb-zxYtO1gFl03iyiAlHMYlb2m1XFHOEiExH4R1w3G2hU8m1QtPqUX9jXuS01hiJ9u2500zOpTUh2mKSW6ui5B1A
-Du0rJnS0C5iWGnXWDLyF09fw0N1j-58V65xDVmHaejga3vqIGjg6iJVl0KtUUbh7w5D3HwMj46i-0aoFgNVXjsIe4Mf9rdm4OD3EiSPu4sPvBLuec9810kcW
-mtMsNay0KQ4Je4tx2S1T6pqr-slCl06uGSgbd04ybBazX5HdNuqNe27oipNs04_OrHiRe53NMPfqvG0GI_g3C8DGRaE7l8_v0J0adCdp76hs8w1hZm1DXexz
-bH4V8IPqzNOP8xyVvUupTnt-kR3i-rjAeZR5NIVR6qOtZQ7_s6Kev_HNmEedrwt6rqKJNt67z5D5hdLgwIdzgshdFidIjvmYeOvBTYdfWq37XVIOFgiCbM_f
-qr5PjDzFxqSfiVsGtlMvjlDB-lnIrPek2cmLZ2xSQgLQMsiLKw0_
+sprite $AzureManagedApplications [70x70/16z] {
+fPUDZkmW28KBWehu_izxRvSuP5rAsypP_vLy8uTJaZaU2GYFRmN4pDzo2fi8lcHyoK7-BVgQOIfl8SIXNdlovLsAEGabP1J2ntwKbPLjHlZpBtmIie13iF-P
+CrpuUN72y6evOsy2GxlBuw4Gv2FB8Ov9uqD9Gox2z4Km7Z95LONfgIy8gt8FMJ1sFyNVAAwqBPJjTXZ5fmflb6eSgoH8usEdB19GQYt68KZYivuZ4Wae9lI9
+fV6XBWcbCZm823QHIuffLLu618oHKhoh4Z3CaOSKSCuMCdX1MVO0xORqDvHbZyV7KYQlA9wU0zTyMUGjnJcUa5jA2IcLqHaIKSgsNJYWM0ejPH6bmR4BUQUO
+ZWD48agxs58N58meFLYNP0sMfnHZGALzHiQXHnGR3KUJPZIRRoaLrjW2Yg-5b6B2bgIEu8RId95brsoZ2qg5jN5ZYWlCde1YHqLUR2daZTBBootrIOzHd07q
+wfbsZb7OshpV36ool7WAJmh3QYMb43FNBaDrwgZ0rLDeNvQoa89rgG-T_wK_cbEOFOMUa9ZIfhg6zAKnXs4-szSOEyKMJDCUoJ3LjsODDeEFtYWnfdEwNsmv
+P1J3D4ufR8YSqbKhBqh_hr-KNk78AAwfpKA8r7jhhNyelI9rdLCRt59acamgRUK5gUbK7KEdtb6iYI6ceNEq4rAFqa-c5KnAA1hRVJRMnzJXNVCrHQP6_-oj
+YzerFcJCEj8fV-yYOxNYrply2HX3xZ6dmsEhiLLEuvHQmOxH8QQpvAmPszqcxsya-bvqMl2HNNSxxHuy1xM_bbhCJ3jZb2DK2IoDDQRoSIKOESODgKScsSo9
+cn4ySlMfESGDoLGzLtapkL23hiBfvcfpdk5OSNDbpKJH-GJkJ9lq7vwq2yO_
 }
 
 AzureEntityColoring(AzureManagedApplications)
@@ -63,65 +141,89 @@ AzureEntityColoring(AzureManagedApplications)
 !define AzureManagedApplications(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagedApplications, AzureManagedApplications)
 
 sprite $AzureManagementGroups [70x56/16z] {
-dPU7cWCX28GjoA1v__UzsnOodoQwErS9-ZDYYWPNL2jXKGcGOQBKV-L5YjLQaRg7nUeNIen3oYRbL4BTfHr2QslDEdW-C2OVGyl1w0TBEuK1dkS8SQbYQuGP
--uyRr8DEjRd89vNVx6mGwZUjnsNZVTsLX1R3GliKUULb0TklC9OH9OMX3XkReJc5lVHFdHyK9Khu8amewHE2XnHkRtnC4Thefoi2wWL1UKY9078gC9MeGBb1
-OOWGyGc5ooS0wJwb04glRm3nBaMwIKBO6ILRQwONXDq1hTMoGC5hLnjqGUkHgt56AQzJbGcScr1YUrtgDzPpvJT5NczrhKoUiz-KGYDPsNDrsGiUUk6-o8--
-w6IFiB97BKueePu3wK4kqNAOKNBzD-vFK5BQSmrXIb4WHGNY-1MQjroQKH9GzXUm3Dznz1WnevIZ4g33rta-t8wxo-KSnW8G0Xab2fTpcejcKuueLAwppG-n
-KQQmMRPDziXeJn4rUpk0cKfqliAGtwuC9Oufi4rEsPIkUOCeZoZ5TY4C8h53fo-Ac6Ad8aNfRSpBAqL4YJplYZ97n9If5moZDFDohLt38ChKfKGHpdETUEUt
-QTvUttVv7cq4_JYe9f73rXLbZwAKBlAZQg93yxBuDg11w02_AZx2VrnIoYs0JwpA5njP9_3LXYyfM5yMLsPtjefHx-O0lhgehpiRzOuNlX_-0G
+fPS9ckmW28H5a4Bx_lTz4yV1vejPNyrAfFy2igSfKjDqASyjouLIVyGtALfhDTbjPgkRP65BIyecvB0netPXXoYrjRPt9QjTIj-fNVlaNDklR5UG34vPnH7I
+N7KnuE7DMu1GMv2rAGqhOGwQ4dnEwr9SOIcseH864bK2XO-FZuhjXz9I6YZHAUwjxIUd5nHNx-Q48e6INrBe6rBJEqfiILvJkCvIw2s503y3eFIEGW242gp_
+XhwZA512y8RYzhEmvnG1GE7K0_WfXGSaOl9j2gErgkuSgqDj5NHDqKzNMvpdnThlcbnHv3FKLjURlxLyGUc9NML7WQ_PEOK_kyoLGwDJYanAtL4-K_b_Qd7H
+-xbOgFECeg7rgEmMSaY9XijBVXaOJLUKNDiFeoAjP6rRDBga5819WOEJgv00SaMXVZt8wwk9zZCKm1L50FRyeC7sb6EA6ytCs6psSiye_DUqPyPcdRQanCvZ
+PcpMErjJudhU5mCWUgqfh6R8dcaeDFa51l6g3Cfh2cnJ3ppor1wL6AqenRemwh9VKO-osPS5ZOWN50kPy4ntS7iPaPvGE52aHpeY3KmiA0YrQAmbCFca5lbU
+IZbCYSAKKl2JyLmdQHhwWI0XOl_Oj93vIl3zSf55EBb8oc6Kk0XzFQfcVmf_BdzijYJ-0FzO_WZF_cPKorE6lqwCetP4ygAPQcNtafNl8hm3fSN6knW-i2ts
+P3XwD0BI9xL4nty
 }
 
 AzureEntityColoring(AzureManagementGroups)
 !define AzureManagementGroups(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagementGroups, AzureManagementGroups)
 !define AzureManagementGroups(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagementGroups, AzureManagementGroups)
 
+sprite $AzureMetric [70x70/16z] {
+xPG5iWGX44CNb-xxNtSzDKRWkvBo8VMQ48RJBr78ETcHoPZ-SgatXQufNXsvDodNXzpOmossFfKxaP-MGXs-GfnIO1bJ2gSC1pc18xrzBr4Lc3W-ka9ArgiU
+1OWOkbr5ZMHPjTgJ3S6BQY45OLBxlgJxCeYg6abc5NUDPTfXzQhbncPLtGt3Px6qu6UQHQ9QZ-tSNDX5SuIYMvh9LCLniJJY6-VaDZR1A7hgvRZFkita5Rjh
+o23DGHRVbrcUtw5xTQnLhAIspOGKtIcsqooPfDSm_bsU5PcoTsYO_b62Iy8E7iEQ3QV-amOP36itN24_UAN9Eq4fFYxo-_S8xP14XbF6MxRBkzYZP5181HwG
+BiNtEy2jwrEGV7qjpI9yvHJ8vrhYsbvbqP12z7CfPgKtK1hotqAP5EDNUZF5vfL-5MLI9cLI9cLI9cLIBW
+}
+
+AzureEntityColoring(AzureMetric)
+!define AzureMetric(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMetric, AzureMetric)
+!define AzureMetric(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMetric, AzureMetric)
+
 sprite $AzureMonitor [70x70/16z] {
-bLTPek0W21CK1Ez_trdfCzfgRRvcCoGXsdbf3SgYvjwQkrKfdBuZgxS9NWkb3s2W657BCKTj6xWSSLXxWR_hqVkXkplZlH0VqfGSSHANCQgTBG4AlSsZ0cPj
-kQwUgkNLyleOVY7nlAcYxcaCF9yjyO6chaPmoPcVu-CLIHrkWV5rnXHivciYFMz7fo1BIgMtbkP6sAWQ8y5R834ue3JHQ0B0duqDrZu1rWTpmQUEcP2rrcEY
-Xk0f6v_z-A2s6s-0Wb6E-Wt6p0x2BeJFHfjZqcS0ubztPUJNPcZ8eKu6SmDGIc8EzR0usESHICaFxuCBNymrj5VKxJqPnVuKvv0tlsca9SRtC4ftuI7bifg3
-kbAw8MD2U3PZAlgZi6YwW_gwCYHJBqCwfhu2hWiolKGnKCDTtOXXe6L2GmvbUqOPt-zm8XayC7HqWNbG71SW5kZQ2ha6OeNnmO34Azpa0u0sWzcED_T2CRUI
-NhRciQfGX_c3Fdk4HBp0WiyHbdK1h5l0bopQjg0aTnQtgfAPqD0Md0GTRLgsWK-vBE4x4hvOR6mPSIwYd0BnFH1-0dNB5LQh_dG1YDzR9r0p0R-dYF_fmN26
-pyuxu8ZnjvTXXeG8XtWLdeOprBZC5Inm--efAXozCg0-zzGF4rvZXcwVm7xUk8f1wAaX74hzgX2kIRzaQ_U3VFvYZb_uWhz9vRmjXej9FlnE6dzfNCkmBmY3
-Flana0Qif_2v4dnUadcotYtwEKrzgdZzI5CVrPEtBzaOLFoHHWwsi_wt_F8J8OOOqDs4lHms8DdIk6n_xj_F8ckTvsbRnOuUGsqTfdbG8I7Ze1BP6y9DLKIr
-UXkWHpTr3mCXcm2ti9oEGEexZdFa-aWXb3w2fVgGSrvJ_0O
+fPS9TgD034IrOz__mWCM9jKq8z3ppnvuFwK51wX0rCm_cAamzM4rFwFILFX_C7xiC2ymQJX-ywW_m3f1J4MOjr-pGBCj8geuKkOMzIHMx4arIfU8PPGLfski
+SA0d4kTIebIYyOKBYT0DVAIP_yB5ShBQzZbMt0GEsA2PfsEeME6F9N6Pgh9Jo4JHiLie3lwEIoGwDGMIgEq8Md0mEdTOHmcReSK342ngR8qdF4bCJnQTMgod
+UcIMcEwdGpSbA8a4MWkT5KEW1HcVboM63kiG1Ivi8BS0UX3BilXG4qOH7DaNuSFiEHzVDZH_2M4Kex30f8KGbSs_90nX_FCjTaLKU6-EqemkEuvXUFrkYA8h
+3A56U3d8m_wTdEB2YMwWO2GEI-2OlWN94GKqPHY6dM72WaJlD7fO34eImOBq2z_N570rcSA4k8WohoGqnjCYXQKcFXXSpN9LaBtUBxkpN3ONptfll2u99lB9
+ehD5tnMlme9jyNU9aCqLYV0AqK-McNv5roo5PE6quAIluLNpqiw-yC7WuVkjWzr5orCusoBuIjUtI1R4U4ttmrWMH8wDQMlY0-DhNJyCfuL8halYHa5612MX
+fbEGdFyVzIIQbkrR6SAqB0wtPOQTeNwKF5kdCAqn6oL-2jFPk8m2dL5g8HXblYLhBLpCjxlSiFYnAmSAcfR42B6c1kxqaEA9f7WguUd0ZZwQJYAp__63ju9a
+GlnH7F520cd0KpX2Rf-cBPHfHlySpW-UxBVpHX630aPSLNMSRAQgPWO6hAQE4oN6T8zQL3pTRx4VS-0qPbofYvYFXgAb_m
 }
 
 AzureEntityColoring(AzureMonitor)
 !define AzureMonitor(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMonitor, AzureMonitor)
 !define AzureMonitor(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMonitor, AzureMonitor)
 
-sprite $AzurePolicy [62x70/16z] {
-jPTNWkmW30HHjEz_uHTNJgqPw0tzDw5i2X1Xl8jaoFXiOlyJ_nph-_zinhEwxKSsvLZ9_POKWeqTueHm9RUp-KO8bwzjXBuclCmltIUhmjv-Asl2qWz1z2GO
-zhsHFIiWt3RCreNn-K48GoR2gSkKIFK7NqsMcI43X9UY-JSn3ZOOuVmV1M66DgRyaQQCpLshq_vc54rqrT_uFss2bimBBgPZ4BJdHsfm9hIecOvA56qhj5LB
-XQSbp_YzvJgb9Qy9wBNtTDvZvuYbJ6dFQmeHZx0nfdG-uysqanUq9cHKBWDWFUr8I_S7QUb0MjiQ-m7QMneVhorjIFV5sj82S0p4_TLuHzzmqPi0qltBupB8
-CnhDvT8WGnfnW8rPM_GvnsEnlelto0mJQcN2yE_6w7tY24VN_DLp1oReGc0dol79NH1E3TIc14SqXlRzI0X_Te2J6haPIvxyihv4XdL7SZvB-XelVvlebs2B
-p_LzSZu7_UuecslwAUrZZRsOI2xF2FmlEHljgc_WGen-XQl2OA-XgCy8u-Y3C1K3OIu-4_uD
+sprite $AzurePolicy [70x70/16z] {
+fPS7jhKm28JfSVyR_ikpy3Wc2ZYdtFuP9y3Dm9jGZU2hPFidmqyC7jikwJDeR2xkCT2se45TGw8C-unX_boRXWoE_aYQORSVSPM3wZzGDq9A65cQwVGt1Zzi
+h6yzfgkCrryOsIeJM4Z6Dl01CZMrNsM5GO28uE9GPMcfcSb53ARM88wXPflOBdHAesNve91JlChQQoavGYAy_t27A1GfRYdlPUgG6aM26SG43GeU45z2ZeB4
+JEYEdgfGI6tNyIbtA6gN5BjtP47ucqjfYaQAXftEKjo3u0sh2aAQ4WXJHv65NoXqfz3i6_X8uJj5m9Ni8xbJTDNJVOhFbo95fZrLzOLdr-572jufEBaGlTIB
+BcmXYhHd2awNmjwQAGhGn1LsOf8I3URG5fAd06eOBzrP1oHgfaBGd7LpQ9SI5Lq2x578IsSlNgbIt71PdZm4FlxRzpA7H8kebpbaCbzsQUEEfYVTwc9u5MMo
+OZMbV0AOgt_uHb4k9AE7pAA5w2lhZ-ShpPtbVIUndIjG7TyBZf4zi9xgfPzPOlQZPcRnAepI3_6jr_BHvkzzGMDYQfyZy56IISP_0G
 }
 
 AzureEntityColoring(AzurePolicy)
 !define AzurePolicy(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzurePolicy, AzurePolicy)
 !define AzurePolicy(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzurePolicy, AzurePolicy)
 
+sprite $AzureResourceGraphExplorer [70x70/16z] {
+nTI7iSGm20JGHIAg_tv_qimb7RRvbru1Ex38nkTGwzmR7i8MatRy5tkS6U5IPn5ksATnhUD4VBAE7HQt65CpFr725ebLco5-oR2XnnsE7sH-HP7pcDQTr6_q
+qYXp6F9RjdEVLGFxGZWH2O7wmZGH2ONvIk-pIDXpKfwoaK5yePB8ssrFk7J7kX9NNrq0wp3bBq3me_iLPQGuxY4iCQRQaR9OTKoarqTkbPq49yHgAfrqekFJ
+25QaV-JexoxvZVJz65AFoHa9rZ-CBOr5X0avqQJX6aaQhY6Ty9YMD5pKauQBMF_qvpJSdjCmFRFXBlg36whwAOPzd9HtP9rYNF5MRzXYB1GbgZRkSLIGZKKz
+XiQg7kCZ9JXAnePMs2TdXL4U7oR69iKHRMoBoa8vmW4sTlJ2OtdmoSHxKlHf6ptUBZ_bqWq7zB43XunjXaEq_EZgVmR7GLeO9KTHQgL-fa01Po642iv2QbgC
+XH7AT5mBnd-GnZXnnhyrCV-XJ7YfRm
+}
+
+AzureEntityColoring(AzureResourceGraphExplorer)
+!define AzureResourceGraphExplorer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureResourceGraphExplorer, AzureResourceGraphExplorer)
+!define AzureResourceGraphExplorer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureResourceGraphExplorer, AzureResourceGraphExplorer)
+
 sprite $AzureResourceGroups [70x56/16z] {
-xPSBSiCW30Kb14A-_uNhCcJaFB-nTO1i_mtPWSrNagZ7a1lgiyaDYsd26CU92T3Zn5M0EDSIUu-3M2msusuv0NkRnyBXlv5qqA_rLxlwiGYJxqnVx0FWTJxs
-aNz34C2LxN_PDGvoHfl16ApbqKLc2Y48Wddo6DP9a170MvuvyPR186zvR6tZ_DA78EzvTkG3WXIu9l2R9SeOiHJ25lQIj6eNRgdtTHLg0Nhj_i8jtWjvSeqf
-jxWRoSE3c5dZbd-QREmfIBDdYm_DF1Wa7MyMl-Hn7iGg5io3GKeMo8D1YXRCCsQ3mvGic0SSDGlaWI1L2-I185KBv057qO8Qa1Gj24rYFylFyhCejOWLB20X
-5j5UjhIdrsaTtC8TQ4ciO141Iv0t_oyMlOy4Zk-wCGzQcjmdY6Wu0IpQ00iuO1eOqk4D_CQeHUauDFFNKmWUjA33uZeEAHzAH4TQo64-8ucH8GNpR0iw9CSZ
-iZjSR7tPy30oim8frQK6kKNoLWkL6hw3RFu
+xPVNhWCn20MDSVt_3qv3YhMpBbpTrvoNxMEOLCA8b5R2FRbgk4Lgos6Mt5_HW6XxfSQ0bDvxIu59hR-32x4sIn5ItgcAkxkTlfPTsZTeG9ezK0PTZCmISxi4
+LnCukHiZGmWoz71jraOXJ9651zlZCcqL5cmLfBCGXvxwHk4yizVp9hnHiX5orgFT8aiX7ZtnHgdDcxAXIFvNBUZ9xOKKlrzy1a5nljO9TuEIqnUN7K9KfvHI
+YaBFMaXKJGlAu40FtxIYkgMK_BrLAUJ2s52C0pqK4lL4iIJeWH0FXNeen4UXdbGL33V5z22gVWhqGAgN0ZrenabXMs0uAGmWMygFygFyAFb4OKYnw9yeSVaB
+cquKCaYnIFPHvF1h7_SKCepIxYE47YZnFeLCXuj42XY4TEkgeHp9AuhCHfaMKXz_lgc753AqzjvDYJRRpRm5bD4CnuauMble6HGmxgECrBxGCoWKSXzbHbjS
+C6QZW06RXEVWIncbitpKiejUDJu1
 }
 
 AzureEntityColoring(AzureResourceGroups)
 !define AzureResourceGroups(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureResourceGroups, AzureResourceGroups)
 !define AzureResourceGroups(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureResourceGroups, AzureResourceGroups)
 
-sprite $AzureScheduler [55x70/16z] {
-dPK73kmW34G16nVkVzzV26Y4bG3QKLkSFDmtwKE5HSszkQjKIbSYyRRAQZumUJAkbQdy4t5LRqfRQ5vVmWCs-mGVo6KmWVp0o3jqoEFTbG9AEPUIzr2sxehJ
-45NpaQTotbEMnwc65YXVK38XeyuZZg1EAIhpo5DA5HvpfBHVZSfqFHR2qMcbk1lpk07oqizGNHBhKH4eSEeD2fp18EqW3Y7YvrvbOWWnUrlbmjM2QL0LLTH0
-MNwnIdHM0kKPRyGmQUFieQ9TrpBc5gHOZKLvlfj7adTONQflHmp16uhZHmnHelMbNMDKK5A-nsfTA-Bg1ypqVrAFPJwqCLy18zYaDreLXPIdVR9WaIkzT6OB
-9ciRP69OSUgO-eArIX9o2vmpQHjOmoQieeM3vC7onuhw1rSTVSjjpp7CP9WI3DVHtoYteAlV7BAtySjmspU7D7W6d17bXYl3aESlHX0RJZ05ZYWnZv4hOyJm
-nwHeB6eSvGogrVacviZQXx1HjbI7Tc76W16bZMATE0gzPnolFZWskn5MydBK55__KJxsrxo6B2wp-2Xq1eVdc9duXStQjsdXhAGW0JTLn4i2vm88ylSu2ltd
-J2j587RByc8kQIjUnWz9dpXfBxaNT7F30UGyiMON7AIrZCvOsYlkjgjYUbwrcyOpb_MTa_IRmvfEggyWfwCuWEZ2GIMuT507PHRpG5spOQTliKZTOqxf5onG
-bnYd7x1FwYy
+sprite $AzureScheduler [70x70/16z] {
+xTU7rjim20LWXa1AHzx_SMlf9kOecExTtdzcVGUG9_sS_0_xhTDdfesXT1Mx7Mc95X5L4URjsTkHBidGSKiAQqDKHRMfS2WhpfiX7KztYWW0uQqkGjfjPJIA
+M7gEcqqZryny3d6bwpafF65qHZU3HO-SZs86qHRtr2FRH1GFr2EsrzRW3242CfJEY4z4uFbBekbeQx2kFqQloAhC_2AQbyMdrfaYwlv0-6n4HLYquT5mJflP
+j9GY0YG6OaoH0-fZZ6qy5mhxx4TEf3qBztDbnWipic8JKTHqX0dfiLMp1rCeRPLopeHeLn2R3DTAz0CaAS5uhTWQBMeA92aqcz9AcRE8KhXMQ1of5CDKK4gZ
+Ki5AjK9PfUYZ52eKf8_HhnLT2kCVgvGeHfAoDMGnbQp4PEnISIXRGwLYQ2afiXHzSBKIBLqf-bndZXMg5S7scvG61KK9RRczUsUq1-DDYZqLJOhSx_VtcXJz
+CgNVZxmP9fzMlEx8fe93AnF2wAXG5DDzBV_-_lP8vuzErygLHhZrnJZMebXfgxQwYDXudloysEeQ5CP_JDSH_VWUeDjuMw5yQcyKA5jBPJh6aXNshQMwcFee
+5UF5AbMJ-VGHipcOvungnAEKfB3lnLY5sC0o5qVlc4p9VFgi9b3Yv9Xdy-apR1IZ8AzMgeqPfKg9Ju9XnoFUTgM1IcebYW63HsDqKs4HVH2ZmwqLzerHNFJi
+YIOhXUHaq8b2wOLHAAJ1o6CMFeRrPPaGbShcjs3Yidc_agTqOs5niHjCShIr2kaJa4cbQrKmo2n20ep4vRUHfPk0EU9m8kNjq3XlKhQss2uTISr48_58zd8G
+is2KYjkXV9CIqudO2lQgyYC1CqMa-HwZCvxBds6F8KTOcuN2yNmQvLPZe-i44XkiqMMQDwgLhNXnOofJAqhV74QLtnWs-cNvdmy
 }
 
 AzureEntityColoring(AzureScheduler)
@@ -129,21 +231,32 @@ AzureEntityColoring(AzureScheduler)
 !define AzureScheduler(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureScheduler, AzureScheduler)
 
 sprite $AzureSiteRecovery [70x58/16z] {
-hPU7ZaGX24KLfLp-_t-txvkO1KBCdlGPWXUblT67M067oHhNRFCNCiSDP7x2DqBy3zezVpFlhpjW3x26YoduFPIsXsWtX1ePDUejQ5I8zz0wd2vLsi2xy9sK
-_ckRznafNj2_c4MqrcP5rqiDCRePKyDU8xFR4chsQ67k3Y2NapK4OLulgJH_hycQgKVo76g1Lb8FMAKH8Zz1Q2XJ7pG2j1OZHJBCMTYv57_kywuWbAb15ivJ
-hrFzGMTIhu_a9BdFsyJw_Z7p8d4tdF2J5LgdKbRSzZ03SsHLX-VdKAE6RsInCR9CtM6-nAMwikexGqBzGkAUvJkYn8fReUPTad0aLkAbc0Pqve3Di35k8lgn
-92BEQezmEY4BKk87GjgMrb68AywiA7VF80GoKoVk5ip9L6v-cYOz81tGMZHsxWwGMLXjpq5l-Ar1_TbgkMRq5w3AjBzW-Ytw_rhCB-6RrROUpiilAPRRFb9i
-j_VBfTtURLxKzvyHX0id0NeHJi0oB-Ylk7EB6b1ZcdoHlmC
+lPQ74jim34F5QOlw_-_jz34f2m-cuztCme6W46iqO3LtDnKQdqBgBup7HnmQYT47Hlnt-E5FHLH-PC2EaDO8aawwRjYVG8qipx6k28QRu_JD-7EwLZ3SJQLv
+Pho1Zak8MAshWY5jBmcZNJCOxgu9GswcAchMs1FRjiyvDsFqsJCt5YkPzZHlg97ioEjTnDlwbKa3OLTcQ1QHuDSSPYPKPA3AlWfwIDWX7xkSoPoDaw5ulBz7
+-96GeQqA_nI1Kyg9oiHMT1M2KE_J2ao5ObNcOGQf-2f4lbqnOEPweCCAq3Vq_x0gddFYs0KytGZ7eWjXTTbw6gvaBD3ckup1qxAbIVLln2fiX_ygeb5t-S9M
+9VHTHiyQj8y4HPD5O7TZrENqV23f4XQ1IfT1WFZiPX7At0W3De7TvCIoWXCDAf_fOKBmhDZCjau8zdL5ZEJATAnh2CG2-EygStqAIBVF19lku-3KzM7GW0Qe
+0PrySHkpjsr2HeLRCjdL2ktD9VE0I4DdLYFrKXWtvANnt_0L
 }
 
 AzureEntityColoring(AzureSiteRecovery)
 !define AzureSiteRecovery(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSiteRecovery, AzureSiteRecovery)
 !define AzureSiteRecovery(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSiteRecovery, AzureSiteRecovery)
 
-sprite $AzureSubscription [43x70/16z] {
-jTO7SWD130D10j3_l-niE2thncagIwr0hiBDb-GarboNbtm5bJGW6v0DIDTUo4wtszvxiYUfmskSPTORMbQQJUQmk4NsG9sqiqoqdbjbioGd9niIant1eLQX
-zKczrisaOo-vuYTqBQKu2rCDVWCpWcDfPdn5AsSCg6TgrofhWQm5iXR8MY1hWQo5SWR81cG3iW5v7cqkwErswvDY6d4QSHfnclzuLlt71eRJ45hxByiofXvA
-_I_BCgSnf_5VxJNaj4hvbHvOLcqbjHfWAvdLa5G9x5dU0m
+sprite $AzureSolution [70x70/16z] {
+xPPLOiC0241nsFqFFBTG2ipr_KtwyAImXSGyhd5JHdWLR770vUKYyJX5N-OXZng1FHfdyMqwwD51MqaFBoLlrtZCqDpO1Jv8E5Rec-fn9hQn9jca85DDktPO
+aSo-A_BitmpEagzOnQezeRW6bmN9qnAcNDhLusgQMFSbTBTnU5Ac7GQvQylfz0c0Y2tksAqSvWpjK5xicilPJK_6lSLJHIcLpfBF7-yqAPMznUv-8G2WLIfX
+5Tc20FhG7YjIYOiA14YBYq-LkMjAPMNnP-j3QUHx2ps_X_BXOxFbs2MikY-p1G_vbnT2lONJATSMXzQ2-HDrHT9Qf8XhHNUXjL0r4CCyQEajM3_8tTEbzXPU
+lMbfi7XwsfOe39Qm-Uk7GMkvmzI6L-HecJ5u1ul2sorEy7QB0CoMsV56Yol14Qbu-ds6cH2-DrRH_3unTBVy_Pij_vP_ox_bt_9lkG8
+}
+
+AzureEntityColoring(AzureSolution)
+!define AzureSolution(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSolution, AzureSolution)
+!define AzureSolution(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSolution, AzureSolution)
+
+sprite $AzureSubscription [70x70/16z] {
+pTX7WiCm30H1Og3_VtdpUfG5intO9yTI04vgLoc_KaCf_mg0f1D1d0ZYX109CFFR6cPw4S3aNtxVmMpMH1rCRfJ8kvcTwIghZ17NlSMvg7EBSrLybQx6P2KL
+4CmeYmKv5LSv5HtbaxbM54TLxam-HgbVaSY8AagG6Rd25HMKgDxTTffgIhGBfg0O8NEATfq8uaGG9u8u4SI984u4SIA84q6S2E8441SGiJ9D3r7CSEKdh9ZX
+YiOvbt5c9AgOuKfgf4a7Kenm9GQQT335p3WpIWsmk_mH0Pgq6IFT8SGPGHb16K4La4y
 }
 
 AzureEntityColoring(AzureSubscription)
diff --git a/dist/Media/AzureContentProtection(m).png b/dist/Media/AzureContentProtection(m).png
new file mode 100644
index 00000000..32948502
Binary files /dev/null and b/dist/Media/AzureContentProtection(m).png differ
diff --git a/dist/Media/AzureContentProtection(m).svg b/dist/Media/AzureContentProtection(m).svg
new file mode 100644
index 00000000..97a0af4f
--- /dev/null
+++ b/dist/Media/AzureContentProtection(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.738281 25.898438 L 11.058594 25.898438 C 5.601563 25.898438 3.640625 29.121094 3.640625 33.320313 L 3.640625 62.578125 C 3.640625 66.21875 5.878906 70 10.078125 70 L 19.460938 70 Z M 47.738281 25.898438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 58.941406 25.898438 L 58.941406 22.820313 C 58.941406 16.660156 56.699219 10.921875 52.78125 6.859375 C 49.140625 2.660156 41.019531 0 35 0 C 28.980469 0 20.859375 2.660156 17.21875 6.859375 C 13.441406 10.921875 11.058594 16.660156 11.058594 22.820313 L 11.058594 25.898438 L 22.121094 27.160156 L 22.121094 24.359375 C 22.121094 20.71875 23.378906 16.101563 25.480469 13.71875 C 27.578125 11.339844 32.058594 10.21875 35 10.078125 C 37.941406 10.078125 42.421875 11.339844 44.519531 13.71875 C 46.621094 16.101563 47.878906 19.179688 47.878906 22.679688 L 47.878906 27.160156 Z M 58.941406 25.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 11.058594 25.898438 C 5.601563 25.898438 3.640625 29.121094 3.640625 33.320313 L 3.640625 62.578125 C 3.640625 66.21875 5.878906 70 10.078125 70 L 59.921875 70 C 64.679688 70 66.359375 66.21875 66.359375 62.578125 L 66.359375 33.320313 C 66.359375 29.539063 64.820313 25.898438 58.941406 25.898438 Z M 11.058594 25.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 29.917969 36.398438 L 45.320313 46.640625 L 29.917969 56.882813 Z M 29.917969 36.398438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Media/AzureContentProtection.png b/dist/Media/AzureContentProtection.png
new file mode 100644
index 00000000..2ae2782d
Binary files /dev/null and b/dist/Media/AzureContentProtection.png differ
diff --git a/dist/Media/AzureContentProtection.puml b/dist/Media/AzureContentProtection.puml
new file mode 100644
index 00000000..57a3f6be
--- /dev/null
+++ b/dist/Media/AzureContentProtection.puml
@@ -0,0 +1,10 @@
+sprite $AzureContentProtection [70x70/16z] {
+pTO7ZkCm38LXiUYftl-wMxnAKR2ow73QZvxOtz02ZKauYHIvjjvRBIboU2T6xLCjoLL3I_zF3NJ5g7rLiZfK-abDJOYqVbwo87rRtYBSHvvfg7LByLmftHQV
+8TfVAb1cqLJxN3rJsdofXdkSpC-4QJ4aJ56UlhMDKkdyZwZbLDf0ffwdAGjakYXkzu0Molwnu_vysR2TRViUHCDMfMbbDbSqoxkwtVuILcsFj_Pxi2YyKw9b
+CMLtWIwLUa6HxrH8uhzm59Ub8uohPaYZCRp63oJQaJKZ3WHmZZ8FGou4yY7As51s8OYN5FmS1UyhZrM2HmcaVkM-sN0gnpXmAaVYLiPwEvMHk9KnZbCPYKUP
+n_4h3FWLXLzXmAye_0e3VaNXLnXmAHY3k1K6d0f02g-2qGzGy7CKV8I2BrPq_Vi5bvNWGi134PSIRdaGlIlqFZBzorBVqVu6
+}
+
+AzureEntityColoring(AzureContentProtection)
+!define AzureContentProtection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureContentProtection, AzureContentProtection)
+!define AzureContentProtection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureContentProtection, AzureContentProtection)
diff --git a/dist/Media/AzureContentProtection.svg b/dist/Media/AzureContentProtection.svg
new file mode 100644
index 00000000..56b99494
--- /dev/null
+++ b/dist/Media/AzureContentProtection.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.738281 25.898438 L 11.058594 25.898438 C 5.601563 25.898438 3.640625 29.121094 3.640625 33.320313 L 3.640625 62.578125 C 3.640625 66.21875 5.878906 70 10.078125 70 L 19.460938 70 Z M 47.738281 25.898438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 58.941406 25.898438 L 58.941406 22.820313 C 58.941406 16.660156 56.699219 10.921875 52.78125 6.859375 C 49.140625 2.660156 41.019531 0 35 0 C 28.980469 0 20.859375 2.660156 17.21875 6.859375 C 13.441406 10.921875 11.058594 16.660156 11.058594 22.820313 L 11.058594 25.898438 L 22.121094 27.160156 L 22.121094 24.359375 C 22.121094 20.71875 23.378906 16.101563 25.480469 13.71875 C 27.578125 11.339844 32.058594 10.21875 35 10.078125 C 37.941406 10.078125 42.421875 11.339844 44.519531 13.71875 C 46.621094 16.101563 47.878906 19.179688 47.878906 22.679688 L 47.878906 27.160156 Z M 58.941406 25.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 11.058594 25.898438 C 5.601563 25.898438 3.640625 29.121094 3.640625 33.320313 L 3.640625 62.578125 C 3.640625 66.21875 5.878906 70 10.078125 70 L 59.921875 70 C 64.679688 70 66.359375 66.21875 66.359375 62.578125 L 66.359375 33.320313 C 66.359375 29.539063 64.820313 25.898438 58.941406 25.898438 Z M 11.058594 25.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 29.917969 36.398438 L 45.320313 46.640625 L 29.917969 56.882813 Z M 29.917969 36.398438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Media/AzureMediaEncoding(m).png b/dist/Media/AzureMediaEncoding(m).png
new file mode 100644
index 00000000..8a48a7f6
Binary files /dev/null and b/dist/Media/AzureMediaEncoding(m).png differ
diff --git a/dist/Media/AzureMediaEncoding(m).svg b/dist/Media/AzureMediaEncoding(m).svg
new file mode 100644
index 00000000..be2441d6
--- /dev/null
+++ b/dist/Media/AzureMediaEncoding(m).svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 48.566406 58.109375 L 22.109375 58.109375 C 19.386719 58.109375 17.179688 55.902344 17.179688 53.179688 C 17.179688 50.457031 19.386719 48.25 22.109375 48.25 L 48.566406 48.25 C 52.070313 48.25 54.921875 45.402344 54.921875 41.894531 L 54.921875 16.214844 C 54.921875 12.710938 52.070313 9.859375 48.566406 9.859375 L 22.109375 9.859375 C 19.386719 9.859375 17.179688 7.652344 17.179688 4.929688 C 17.179688 2.207031 19.386719 0 22.109375 0 L 48.566406 0 C 57.507813 0 64.78125 7.273438 64.78125 16.214844 L 64.78125 41.898438 C 64.78125 50.835938 57.507813 58.109375 48.566406 58.109375 Z M 48.566406 58.109375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 14.0625 64.078125 L 40.738281 64.078125 L 40.738281 66.542969 L 14.0625 66.542969 Z M 14.0625 64.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 22.472656 66.542969 L 32.332031 66.542969 L 32.332031 70 L 22.472656 70 Z M 22.472656 66.542969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 26.167969 9.859375 L 28.632813 9.859375 L 28.632813 66.542969 L 26.167969 66.542969 Z M 26.167969 9.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13,152,255);fill-opacity:1;" d="M 5.21875 28.507813 L 44.652344 28.507813 L 44.652344 39.601563 L 5.21875 39.601563 Z M 5.21875 28.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 12.613281 17.421875 L 39.722656 17.421875 L 39.722656 28.511719 L 12.613281 28.511719 Z M 12.613281 17.421875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,117,204);fill-opacity:1;" d="M 22.472656 13.722656 L 32.332031 13.722656 L 32.332031 17.421875 L 22.472656 17.421875 Z M 22.472656 13.722656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,117,204);fill-opacity:1;" d="M 22.472656 39.601563 L 32.332031 39.601563 L 32.332031 43.058594 L 22.472656 43.058594 Z M 22.472656 39.601563 "/>
+</g>
+</svg>
diff --git a/dist/Media/AzureMediaEncoding.png b/dist/Media/AzureMediaEncoding.png
new file mode 100644
index 00000000..8b74a531
Binary files /dev/null and b/dist/Media/AzureMediaEncoding.png differ
diff --git a/dist/Media/AzureMediaEncoding.puml b/dist/Media/AzureMediaEncoding.puml
new file mode 100644
index 00000000..3365b003
--- /dev/null
+++ b/dist/Media/AzureMediaEncoding.puml
@@ -0,0 +1,10 @@
+sprite $AzureMediaEncoding [70x70/16z] {
+xTO54WCn28LX81k5-r-txYt9cxfz1_XdDqxdfAXrQCs1XeADQMRgOZL8efvaeChaAuPgqgl0bCaJ3TV8fOPBv0bgE24FvwO-Er9ee3Y_BUcmn63b73VRYLTN
+Y1Nx9H4fraI41yj1oJUrBUUBRUUMIkiCBrwfVeN3rfHIggscb69OmokIV6zP-LV-5LaByL0kEUx9Kh-I2YI_M-LV-LTYlg3Kae-bNWM_Zzwpqf0AXn2gjX02
+Znv_ZBzV_5U-qlMLQblr-agodNHjXGlsL8rBpJHUa2hs-iw6c_m_mRNE9EBa7lyJwUeVWcOvN_4bru-B1kefK2EH0_-d6ccCfyxQZPCG0DYD_yfLOjfhfka0
+uPgv25Trpypqm3L_vkxRzw_C0G
+}
+
+AzureEntityColoring(AzureMediaEncoding)
+!define AzureMediaEncoding(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMediaEncoding, AzureMediaEncoding)
+!define AzureMediaEncoding(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMediaEncoding, AzureMediaEncoding)
diff --git a/dist/Media/AzureMediaEncoding.svg b/dist/Media/AzureMediaEncoding.svg
new file mode 100644
index 00000000..76a1071f
--- /dev/null
+++ b/dist/Media/AzureMediaEncoding.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 48.566406 58.109375 L 22.109375 58.109375 C 19.386719 58.109375 17.179688 55.902344 17.179688 53.179688 C 17.179688 50.457031 19.386719 48.25 22.109375 48.25 L 48.566406 48.25 C 52.070313 48.25 54.921875 45.402344 54.921875 41.894531 L 54.921875 16.214844 C 54.921875 12.710938 52.070313 9.859375 48.566406 9.859375 L 22.109375 9.859375 C 19.386719 9.859375 17.179688 7.652344 17.179688 4.929688 C 17.179688 2.207031 19.386719 0 22.109375 0 L 48.566406 0 C 57.507813 0 64.78125 7.273438 64.78125 16.214844 L 64.78125 41.898438 C 64.78125 50.835938 57.507813 58.109375 48.566406 58.109375 Z M 48.566406 58.109375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 14.0625 64.078125 L 40.738281 64.078125 L 40.738281 66.542969 L 14.0625 66.542969 Z M 14.0625 64.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 22.472656 66.542969 L 32.332031 66.542969 L 32.332031 70 L 22.472656 70 Z M 22.472656 66.542969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 26.167969 9.859375 L 28.632813 9.859375 L 28.632813 66.542969 L 26.167969 66.542969 Z M 26.167969 9.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(35.686275%,55.686275%,84.705882%);fill-opacity:1;" d="M 5.21875 28.507813 L 44.652344 28.507813 L 44.652344 39.601563 L 5.21875 39.601563 Z M 5.21875 28.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 12.613281 17.421875 L 39.722656 17.421875 L 39.722656 28.511719 L 12.613281 28.511719 Z M 12.613281 17.421875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40%,40%,40%);fill-opacity:1;" d="M 22.472656 13.722656 L 32.332031 13.722656 L 32.332031 17.421875 L 22.472656 17.421875 Z M 22.472656 13.722656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40%,40%,40%);fill-opacity:1;" d="M 22.472656 39.601563 L 32.332031 39.601563 L 32.332031 43.058594 L 22.472656 43.058594 Z M 22.472656 39.601563 "/>
+</g>
+</svg>
diff --git a/dist/Media/AzureMediaOnDemand(m).png b/dist/Media/AzureMediaOnDemand(m).png
new file mode 100644
index 00000000..3bf0871b
Binary files /dev/null and b/dist/Media/AzureMediaOnDemand(m).png differ
diff --git a/dist/Media/AzureMediaOnDemand(m).svg b/dist/Media/AzureMediaOnDemand(m).svg
new file mode 100644
index 00000000..82302fc5
--- /dev/null
+++ b/dist/Media/AzureMediaOnDemand(m).svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 19.601563 70 L 8.398438 70 C 3.761719 70 0 66.238281 0 61.601563 L 0 8.398438 C 0 3.761719 3.761719 0 8.398438 0 L 56 0 Z M 19.601563 70 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 70 61.601563 C 70 66.238281 66.238281 70 61.601563 70 L 8.398438 70 C 3.761719 70 0 66.238281 0 61.601563 L 0 8.398438 C 0 3.761719 3.761719 0 8.398438 0 L 61.601563 0 C 66.238281 0 70 3.761719 70 8.398438 Z M 70 61.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.398438 53.667969 L 22.398438 16.332031 L 52.222656 35.019531 Z M 22.398438 53.667969 "/>
+</g>
+</svg>
diff --git a/dist/Media/AzureMediaOnDemand.png b/dist/Media/AzureMediaOnDemand.png
new file mode 100644
index 00000000..6486c5bd
Binary files /dev/null and b/dist/Media/AzureMediaOnDemand.png differ
diff --git a/dist/Media/AzureMediaOnDemand.puml b/dist/Media/AzureMediaOnDemand.puml
new file mode 100644
index 00000000..2ef66008
--- /dev/null
+++ b/dist/Media/AzureMediaOnDemand.puml
@@ -0,0 +1,9 @@
+sprite $AzureMediaOnDemand [70x70/16z] {
+pSpLOHjG54J1Yzj_nuczfa_14RmfOE9JpTvAiksCiDhRwSyuwMMBDYAA9cwMBwg2YUtGnK1omg9p5ZrYqJcBNhxCvKINbuv-o19vERcyVAY7B95p8RcyMF75
+-a9oUR7aY_LV0fR8mOkL4xHOuyMIBzPuiLoyMF751YzMVB5-o98hlhI4brpnPIIyb8INNF6b9RpaYYyZuQKalEIABotX9LTy6GaljUBBhF1Ikw9BplAbrmbO
+x66Bpbbqpg9p5ZrYqJkMfedb8vQ9uOaYOl2IuOOcLcIP-F0V
+}
+
+AzureEntityColoring(AzureMediaOnDemand)
+!define AzureMediaOnDemand(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMediaOnDemand, AzureMediaOnDemand)
+!define AzureMediaOnDemand(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMediaOnDemand, AzureMediaOnDemand)
diff --git a/dist/Media/AzureMediaOnDemand.svg b/dist/Media/AzureMediaOnDemand.svg
new file mode 100644
index 00000000..47b1a219
--- /dev/null
+++ b/dist/Media/AzureMediaOnDemand.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 19.601563 70 L 8.398438 70 C 3.761719 70 0 66.238281 0 61.601563 L 0 8.398438 C 0 3.761719 3.761719 0 8.398438 0 L 56 0 Z M 19.601563 70 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 70 61.601563 C 70 66.238281 66.238281 70 61.601563 70 L 8.398438 70 C 3.761719 70 0 66.238281 0 61.601563 L 0 8.398438 C 0 3.761719 3.761719 0 8.398438 0 L 61.601563 0 C 66.238281 0 70 3.761719 70 8.398438 Z M 70 61.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.398438 53.667969 L 22.398438 16.332031 L 52.222656 35.019531 Z M 22.398438 53.667969 "/>
+</g>
+</svg>
diff --git a/dist/Media/AzureMediaPlayer(m).png b/dist/Media/AzureMediaPlayer(m).png
new file mode 100644
index 00000000..40d0b4e6
Binary files /dev/null and b/dist/Media/AzureMediaPlayer(m).png differ
diff --git a/dist/Media/AzureMediaPlayer(m).svg b/dist/Media/AzureMediaPlayer(m).svg
new file mode 100644
index 00000000..472e96fa
--- /dev/null
+++ b/dist/Media/AzureMediaPlayer(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 11.242188 58.757813 C -1.882813 45.636719 -1.882813 24.363281 11.242188 11.242188 C 24.363281 -1.878906 45.636719 -1.878906 58.757813 11.242188 Z M 11.242188 58.757813 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 68.601563 35 C 68.601563 53.558594 53.558594 68.601563 35 68.601563 C 16.441406 68.601563 1.398438 53.558594 1.398438 35 C 1.398438 16.441406 16.441406 1.398438 35 1.398438 C 53.558594 1.398438 68.601563 16.441406 68.601563 35 Z M 68.601563 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 27.167969 49.390625 L 27.222656 20.609375 L 50.160156 35.015625 Z M 27.167969 49.390625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 35 6.480469 C 50.75 6.480469 63.519531 19.25 63.519531 35 C 63.519531 50.75 50.75 63.519531 35 63.519531 C 19.25 63.519531 6.480469 50.75 6.480469 35 C 6.480469 19.25 19.25 6.480469 35 6.480469 M 35 0 C 15.699219 0 0 15.699219 0 35 C 0 54.300781 15.699219 70 35 70 C 54.300781 70 70 54.300781 70 35 C 70 15.699219 54.300781 0 35 0 Z M 35 0 "/>
+</g>
+</svg>
diff --git a/dist/Media/AzureMediaPlayer.png b/dist/Media/AzureMediaPlayer.png
new file mode 100644
index 00000000..ee13307a
Binary files /dev/null and b/dist/Media/AzureMediaPlayer.png differ
diff --git a/dist/Media/AzureMediaPlayer.puml b/dist/Media/AzureMediaPlayer.puml
new file mode 100644
index 00000000..9e0bda24
--- /dev/null
+++ b/dist/Media/AzureMediaPlayer.puml
@@ -0,0 +1,13 @@
+sprite $AzureMediaPlayer [70x70/16z] {
+bPW7qkii34K51lNzR_Slxn65U2mCP-fNSkRgAgwGKngogBcRAMElS4uZzHiclS01bSoVaRRjO5zWkEKGVy4wl46-WQwRlkvzcCf_gDv_Zv3JVrV2s0CaKP-G
+T5rpgq8X292dI9PC9PC3-pDaNysLISAHC-Mv5XAZlWGb7oewKUnlS6XAiXtk6qGx2ZDN8id0ZuPWmXB9Uve60HrA494-rOIaVgRi-nRa-qmoj7WWmLXu_QsM
+TXq36pNyH96J9FDCPMu5-urQCyb0fsOeYr81heKZzcJJTmMVB50MbWZJ05hQIltRVIg9PYG6eim2fIMExve0_gQodbe0QcePwxrAlkOAmVKeYNvnrC9h2vIE
+ZumCE6oP9RZmYT77gBclB14dBKQYtDGIrDJoDvAkBK77vs-CnOfIInudBBvf2Th3giyjvSbYXvOBCyj-kpLfzsX73HCBxtzVQlwjspu2IbyS0Jq__zUyrM3K
+MlDLrtIO-ue8yYNLjDLxkGqaAGQnlWI9Mhp0A8OpIxIQ3wG0nHztZSDoOP3l-Nk1fPi3iSOm2MJVIsoBC7TBjBgE8lED5Dya68wNA6s-CpGCnnuQtSvXvCp2
+7b7cCCud4hA8Cb2FFU7XF5x3KZsgEPKGVC6FXWub2ZEIQd99p1CKym5l51kI1h_Kq2Y-m9O_FLR_OBmNn6dz_AgKEiHJIGmLA3yxxFrXkAX_CQ6RWjKdslQJ
+lOem_GUpg1qytJVp7GXUe9FN33cLNnmDjYYKpoKDzcdo60CB77AXJ95CgUMAVm4
+}
+
+AzureEntityColoring(AzureMediaPlayer)
+!define AzureMediaPlayer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMediaPlayer, AzureMediaPlayer)
+!define AzureMediaPlayer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMediaPlayer, AzureMediaPlayer)
diff --git a/dist/Media/AzureMediaPlayer.svg b/dist/Media/AzureMediaPlayer.svg
new file mode 100644
index 00000000..a680ce99
--- /dev/null
+++ b/dist/Media/AzureMediaPlayer.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 11.242188 58.757813 C -1.882813 45.636719 -1.882813 24.363281 11.242188 11.242188 C 24.363281 -1.878906 45.636719 -1.878906 58.757813 11.242188 Z M 11.242188 58.757813 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 68.601563 35 C 68.601563 53.558594 53.558594 68.601563 35 68.601563 C 16.441406 68.601563 1.398438 53.558594 1.398438 35 C 1.398438 16.441406 16.441406 1.398438 35 1.398438 C 53.558594 1.398438 68.601563 16.441406 68.601563 35 Z M 68.601563 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 27.167969 49.390625 L 27.222656 20.609375 L 50.160156 35.015625 Z M 27.167969 49.390625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 35 6.480469 C 50.75 6.480469 63.519531 19.25 63.519531 35 C 63.519531 50.75 50.75 63.519531 35 63.519531 C 19.25 63.519531 6.480469 50.75 6.480469 35 C 6.480469 19.25 19.25 6.480469 35 6.480469 M 35 0 C 15.699219 0 0 15.699219 0 35 C 0 54.300781 15.699219 70 35 70 C 54.300781 70 70 54.300781 70 35 C 70 15.699219 54.300781 0 35 0 Z M 35 0 "/>
+</g>
+</svg>
diff --git a/dist/Media/AzureMediaServices(m).png b/dist/Media/AzureMediaServices(m).png
index e24b019e..cd6cf046 100644
Binary files a/dist/Media/AzureMediaServices(m).png and b/dist/Media/AzureMediaServices(m).png differ
diff --git a/dist/Media/AzureMediaServices(m).svg b/dist/Media/AzureMediaServices(m).svg
index 8f453fc0..2ba1a5ab 100644
--- a/dist/Media/AzureMediaServices(m).svg
+++ b/dist/Media/AzureMediaServices(m).svg
@@ -1,8 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="61pt" height="70pt" viewBox="0 0 61 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60pt" height="70pt" viewBox="0 0 60 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<image id="image9" width="60" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABGCAYAAACQRffVAAAABmJLR0QA/wD/AP+gvaeTAAAAfElEQVR4nO3PsQ3CQADAwA9JBU3KjMlIjJRNKBgAOkb4SNbdApbHAAAAAPKWq8Lf92cf67nN7k4P/t2fx1hej9nZ2+zg1QzXGa4zXGe4znCd4TrDdYbrDNcZrjNcZ7jOcJ3hOsN1husM1xmuM1xnuM5wneE6w3WG6wzX/QATKwVyEEC8PAAAAABJRU5ErkJggg=="/>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<use xlink:href="#image9"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="60" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.210938 70.402344 L 60.417969 52.800781 L 60.417969 17.601563 C 60.417969 17.601563 35.460938 36.777344 30.210938 70.402344 "/>
+</g>
+<image id="image17" width="60" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABGCAYAAACQRffVAAAABmJLR0QA/wD/AP+gvaeTAAAAkUlEQVR4nO3WoQ3CUBQF0FcCQZGwAKIDIBkBwSgdooYFGACDZwcUm2BwJGBAlQFwP78Efs/x7+Ze9yIAAAAAAAAAAP5O1Wd4d3vMY7beJQdcjk1VL54ZK8U4Z9hn+moS3X6ZfD89jDK2iYiI7IG/zuDSGVw6g0s3uMH9Ph7XzT3qU5t8f96+MrYBAAAAAICvewNVUw+GDtkMGwAAAABJRU5ErkJggg=="/>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<use xlink:href="#image17"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="60" height="70"/>
+</clipPath>
+<g id="surface16" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 23.898438 45.355469 L 39.050781 35.222656 L 23.898438 35.222656 Z M 23.898438 45.355469 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 61.695313 17.324219 L 30.847656 0 L 0 17.851563 L 0 31.851563 C 0.175781 31.851563 0 31.851563 0 31.851563 C 4.707031 31.851563 6.621094 32.023438 8.015625 28.175781 C 11.328125 18.898438 19.519531 11.023438 30.5 11.023438 C 41.652344 11.023438 49.671875 18.898438 52.984375 28.175781 C 54.378906 32.199219 56.292969 31.851563 61.347656 31.851563 L 61.347656 17.324219 Z M 61.695313 17.324219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 61.695313 40.25 L 58.386719 40.25 C 55.421875 40.425781 54.203125 41.125 53.332031 43.226563 C 50.019531 52.5 41.828125 59.324219 30.847656 59.324219 C 19.695313 59.324219 11.675781 52.324219 8.191406 43.226563 C 7.320313 40.949219 6.101563 40.425781 3.136719 40.25 L 0.175781 40.25 C 0.175781 40.25 0.695313 40.25 0.175781 40.25 L 0.175781 52.5 L 31.195313 69.824219 L 61.695313 51.976563 Z M 61.695313 40.25 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 26.664063 45.851563 L 26.664063 25.726563 L 41.828125 35.699219 Z M 42.003906 24.148438 C 35.730469 17.851563 25.792969 17.851563 19.519531 24.148438 C 13.246094 30.449219 13.246094 40.425781 19.519531 46.726563 C 25.792969 52.851563 35.730469 52.851563 42.003906 46.726563 C 48.277344 40.601563 48.277344 30.449219 42.003906 24.148438 Z M 42.003906 24.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 0 17.601563 L 30.210938 0 L 60.421875 17.601563 L 60.421875 52.800781 L 30.210938 70.402344 L 0 52.800781 Z M 0 17.601563 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.496094 21.0625 C 35.75 13.277344 23.238281 13.277344 15.484375 21.0625 C 7.742188 28.875 7.742188 41.527344 15.484375 49.339844 C 23.226563 57.121094 35.75 57.121094 43.496094 49.339844 C 51.230469 41.535156 51.230469 28.878906 43.496094 21.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 40.78125 23.800781 C 34.539063 17.527344 24.449219 17.527344 18.199219 23.800781 C 11.957031 30.101563 11.957031 40.300781 18.199219 46.597656 C 24.441406 52.871094 34.539063 52.871094 40.78125 46.597656 C 47.019531 40.308594 47.019531 30.105469 40.78125 23.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 23.898438 35.222656 L 39.050781 35.222656 L 39.109375 35.179688 L 23.898438 25.085938 Z M 23.898438 35.222656 "/>
+<use xlink:href="#surface16" mask="url(#mask1)"/>
 </g>
 </svg>
diff --git a/dist/Media/AzureMediaServices.png b/dist/Media/AzureMediaServices.png
index 7fb9a516..87fc6f98 100644
Binary files a/dist/Media/AzureMediaServices.png and b/dist/Media/AzureMediaServices.png differ
diff --git a/dist/Media/AzureMediaServices.puml b/dist/Media/AzureMediaServices.puml
index f9116a3d..8284674e 100644
--- a/dist/Media/AzureMediaServices.puml
+++ b/dist/Media/AzureMediaServices.puml
@@ -1,10 +1,10 @@
-sprite $AzureMediaServices [61x70/16z] {
-dLTP6hKg3BDqTl_xlVUVFKJ8TxIFIg19Agq72ycKusLudsV7AwZs-IlQ7aD7dV-Yz15KufmYnoEo625Vagrp4UtVaCrp4ssFCiOeIjqGYf72xU7HiQd5UP6f
-o24oB0geSx8TCpcPbIX5ic0ALoC5oE8BxaC8rY8tSnHGnnsREZahLwhpTdBGI5P13ClHcBCCDTE1cMz29sl_Bkkqp-Uznlh7akXTKUawQRY-TceaJzfNMojB
-FFzXOvsOahq7lkkj5tTI_uhmNoh8lBQfsSt8lAsAlwntKjia0Xmk83XwNA1Wh8vMmlW2m-5zzxhBLnRdf0zOOlLpJ_nY0Go7ywxH08R3WuAXvF0AAeOL0EFX
-zUHaR0drXlDXlSg6gusTY0iM08PkWNt6tLGkIm4C3V1QEDJT2qvf1DjA1ldZ73psQINqNOKZ2gfM-W9ZRopyRWjrj0iiUV9xg6vQvEuQiajL10VhABW0mJtu
-jUuBEmla0CdXrWOt2pYjXwgGPH7MfiEEgzMLox5kTBMV2uPUjNiz_BGWeGfOO9VhmvlF5UHSmKbgV8kjWICs7wgzbykqS4i-mmNEblntP2HxFobNDYQarwBO
-sC2TRgPg5ZdPu-z7_PHdlqKufJ__H-4PRwO_dZ5NZhhFbIDrzu1wlFflvsIvSb1Gps8aj-T_
+sprite $AzureMediaServices [60x70/16z] {
+dPS7ilOW24LL42Da_zlzItX5uerZlZFrbJE0bxIqeYcbps0xp_F87vYafoDlpTpE7unVgTNEaLxUjHjfc-qU9y3gXYhd0resSdbYdLVfvnAJTIvhbDQvhEa5
+vR9B0-rkOxp8PRznGeDQbyhCjNN3ZUU7NApHU1JjOT4QIZ7VqnEO5zgUpIMVXwd9oSHScIadfqxglQwHYoo_S4P7gdftNMM9iCitLO6QPUOgpK6Dhj_MYY2k
+PMX13Qu65SawgD6beM66RPEhizklACIPwr_XzIkSk-jbISG1frsyiAlHjUkA-cOUtNzdfi2LyD_fWgV2JP5BFcrmKxcl247NMmwkbuw_HAvvG9ERIeof0xV7
+Vqi3FBe7S0_eEYKS5dRfrwK00_Uvvpp2ygbRAfmNdtDqQNdEJWxv_XQD-MP5BdiQqQMzlMfXuBcejopGDRzy1vVG1GpTayV2Kr5FY1MxEkvV9a4tsWExNZZ9
+4ocKlRkMGyRW3jqdD-oqorXjYjpmpbedi_hl5Rbnv5J02VkmWOT7w11GTJDnHov-0of4JEIYBzITpLUtSkWCUfixojrimEmDlrnfBRyY7mhm0hcV0EjDH5et
+HVIwzJA9r9QtNc8DjXl8RRTiP_HrikDsIG3Sk851CMrTzg3qvci3vF8C6MwvItxvTMKWbzslEf0B0ESLSy7WlDnjvQElPrlciixBbhdy1G
 }
 
 AzureEntityColoring(AzureMediaServices)
diff --git a/dist/Media/AzureMediaServices.svg b/dist/Media/AzureMediaServices.svg
index 0780b961..b6e3f270 100644
--- a/dist/Media/AzureMediaServices.svg
+++ b/dist/Media/AzureMediaServices.svg
@@ -4,35 +4,37 @@
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
+<image id="image9" width="60" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABGCAYAAACQRffVAAAABmJLR0QA/wD/AP+gvaeTAAAAfElEQVR4nO3PsQ3CQADAwA9JBU3KjMlIjJRNKBgAOkb4SNbdApbHAAAAAPKWq8Lf92cf67nN7k4P/t2fx1hej9nZ2+zg1QzXGa4zXGe4znCd4TrDdYbrDNcZrjNcZ7jOcJ3hOsN1husM1xmuM1xnuM5wneE6w3WG6wzX/QATKwVyEEC8PAAAAABJRU5ErkJggg=="/>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="60" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+<use xlink:href="#image9"/>
   </g>
 </mask>
 <clipPath id="clip1">
   <rect x="0" y="0" width="60" height="70"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.210938 70 L 60.417969 52.5 L 60.417969 17.5 C 60.417969 17.5 35.460938 36.566406 30.210938 70 "/>
+<g id="surface8" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.210938 70.402344 L 60.417969 52.800781 L 60.417969 17.601563 C 60.417969 17.601563 35.460938 36.777344 30.210938 70.402344 "/>
 </g>
+<image id="image17" width="60" height="70" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABGCAYAAACQRffVAAAABmJLR0QA/wD/AP+gvaeTAAAAkUlEQVR4nO3WoQ3CUBQF0FcCQZGwAKIDIBkBwSgdooYFGACDZwcUm2BwJGBAlQFwP78Efs/x7+Ze9yIAAAAAAAAAAP5O1Wd4d3vMY7beJQdcjk1VL54ZK8U4Z9hn+moS3X6ZfD89jDK2iYiI7IG/zuDSGVw6g0s3uMH9Ph7XzT3qU5t8f96+MrYBAAAAAICvewNVUw+GDtkMGwAAAABJRU5ErkJggg=="/>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="60" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+<use xlink:href="#image17"/>
   </g>
 </mask>
 <clipPath id="clip2">
   <rect x="0" y="0" width="60" height="70"/>
 </clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 23.898438 45.097656 L 39.050781 35.019531 L 23.898438 35.019531 Z M 23.898438 45.097656 "/>
+<g id="surface16" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 23.898438 45.355469 L 39.050781 35.222656 L 23.898438 35.222656 Z M 23.898438 45.355469 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 0 17.5 L 30.210938 0 L 60.421875 17.5 L 60.421875 52.5 L 30.210938 70 L 0 52.5 Z M 0 17.5 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.496094 20.941406 C 35.75 13.203125 23.238281 13.203125 15.484375 20.941406 C 7.742188 28.710938 7.742188 41.289063 15.484375 49.058594 C 23.226563 56.792969 35.75 56.792969 43.496094 49.058594 C 51.230469 41.296875 51.230469 28.714844 43.496094 20.941406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 40.78125 23.664063 C 34.539063 17.425781 24.449219 17.425781 18.199219 23.664063 C 11.957031 29.929688 11.957031 40.070313 18.199219 46.332031 C 24.441406 52.570313 34.539063 52.570313 40.78125 46.332031 C 47.019531 40.078125 47.019531 29.933594 40.78125 23.664063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 23.898438 35.019531 L 39.050781 35.019531 L 39.109375 34.980469 L 23.898438 24.941406 Z M 23.898438 35.019531 "/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 0 17.601563 L 30.210938 0 L 60.421875 17.601563 L 60.421875 52.800781 L 30.210938 70.402344 L 0 52.800781 Z M 0 17.601563 "/>
+<use xlink:href="#surface8" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.496094 21.0625 C 35.75 13.277344 23.238281 13.277344 15.484375 21.0625 C 7.742188 28.875 7.742188 41.527344 15.484375 49.339844 C 23.226563 57.121094 35.75 57.121094 43.496094 49.339844 C 51.230469 41.535156 51.230469 28.878906 43.496094 21.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 40.78125 23.800781 C 34.539063 17.527344 24.449219 17.527344 18.199219 23.800781 C 11.957031 30.101563 11.957031 40.300781 18.199219 46.597656 C 24.441406 52.871094 34.539063 52.871094 40.78125 46.597656 C 47.019531 40.308594 47.019531 30.105469 40.78125 23.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 23.898438 35.222656 L 39.050781 35.222656 L 39.109375 35.179688 L 23.898438 25.085938 Z M 23.898438 35.222656 "/>
+<use xlink:href="#surface16" mask="url(#mask1)"/>
 </g>
 </svg>
diff --git a/dist/Media/all.puml b/dist/Media/all.puml
index c363a7f4..7851ae41 100644
--- a/dist/Media/all.puml
+++ b/dist/Media/all.puml
@@ -1,10 +1,56 @@
-sprite $AzureMediaServices [61x70/16z] {
-dLTP6hKg3BDqTl_xlVUVFKJ8TxIFIg19Agq72ycKusLudsV7AwZs-IlQ7aD7dV-Yz15KufmYnoEo625Vagrp4UtVaCrp4ssFCiOeIjqGYf72xU7HiQd5UP6f
-o24oB0geSx8TCpcPbIX5ic0ALoC5oE8BxaC8rY8tSnHGnnsREZahLwhpTdBGI5P13ClHcBCCDTE1cMz29sl_Bkkqp-Uznlh7akXTKUawQRY-TceaJzfNMojB
-FFzXOvsOahq7lkkj5tTI_uhmNoh8lBQfsSt8lAsAlwntKjia0Xmk83XwNA1Wh8vMmlW2m-5zzxhBLnRdf0zOOlLpJ_nY0Go7ywxH08R3WuAXvF0AAeOL0EFX
-zUHaR0drXlDXlSg6gusTY0iM08PkWNt6tLGkIm4C3V1QEDJT2qvf1DjA1ldZ73psQINqNOKZ2gfM-W9ZRopyRWjrj0iiUV9xg6vQvEuQiajL10VhABW0mJtu
-jUuBEmla0CdXrWOt2pYjXwgGPH7MfiEEgzMLox5kTBMV2uPUjNiz_BGWeGfOO9VhmvlF5UHSmKbgV8kjWICs7wgzbykqS4i-mmNEblntP2HxFobNDYQarwBO
-sC2TRgPg5ZdPu-z7_PHdlqKufJ__H-4PRwO_dZ5NZhhFbIDrzu1wlFflvsIvSb1Gps8aj-T_
+sprite $AzureContentProtection [70x70/16z] {
+pTO7ZkCm38LXiUYftl-wMxnAKR2ow73QZvxOtz02ZKauYHIvjjvRBIboU2T6xLCjoLL3I_zF3NJ5g7rLiZfK-abDJOYqVbwo87rRtYBSHvvfg7LByLmftHQV
+8TfVAb1cqLJxN3rJsdofXdkSpC-4QJ4aJ56UlhMDKkdyZwZbLDf0ffwdAGjakYXkzu0Molwnu_vysR2TRViUHCDMfMbbDbSqoxkwtVuILcsFj_Pxi2YyKw9b
+CMLtWIwLUa6HxrH8uhzm59Ub8uohPaYZCRp63oJQaJKZ3WHmZZ8FGou4yY7As51s8OYN5FmS1UyhZrM2HmcaVkM-sN0gnpXmAaVYLiPwEvMHk9KnZbCPYKUP
+n_4h3FWLXLzXmAye_0e3VaNXLnXmAHY3k1K6d0f02g-2qGzGy7CKV8I2BrPq_Vi5bvNWGi134PSIRdaGlIlqFZBzorBVqVu6
+}
+
+AzureEntityColoring(AzureContentProtection)
+!define AzureContentProtection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureContentProtection, AzureContentProtection)
+!define AzureContentProtection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureContentProtection, AzureContentProtection)
+
+sprite $AzureMediaEncoding [70x70/16z] {
+xTO54WCn28LX81k5-r-txYt9cxfz1_XdDqxdfAXrQCs1XeADQMRgOZL8efvaeChaAuPgqgl0bCaJ3TV8fOPBv0bgE24FvwO-Er9ee3Y_BUcmn63b73VRYLTN
+Y1Nx9H4fraI41yj1oJUrBUUBRUUMIkiCBrwfVeN3rfHIggscb69OmokIV6zP-LV-5LaByL0kEUx9Kh-I2YI_M-LV-LTYlg3Kae-bNWM_Zzwpqf0AXn2gjX02
+Znv_ZBzV_5U-qlMLQblr-agodNHjXGlsL8rBpJHUa2hs-iw6c_m_mRNE9EBa7lyJwUeVWcOvN_4bru-B1kefK2EH0_-d6ccCfyxQZPCG0DYD_yfLOjfhfka0
+uPgv25Trpypqm3L_vkxRzw_C0G
+}
+
+AzureEntityColoring(AzureMediaEncoding)
+!define AzureMediaEncoding(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMediaEncoding, AzureMediaEncoding)
+!define AzureMediaEncoding(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMediaEncoding, AzureMediaEncoding)
+
+sprite $AzureMediaOnDemand [70x70/16z] {
+pSpLOHjG54J1Yzj_nuczfa_14RmfOE9JpTvAiksCiDhRwSyuwMMBDYAA9cwMBwg2YUtGnK1omg9p5ZrYqJcBNhxCvKINbuv-o19vERcyVAY7B95p8RcyMF75
+-a9oUR7aY_LV0fR8mOkL4xHOuyMIBzPuiLoyMF751YzMVB5-o98hlhI4brpnPIIyb8INNF6b9RpaYYyZuQKalEIABotX9LTy6GaljUBBhF1Ikw9BplAbrmbO
+x66Bpbbqpg9p5ZrYqJkMfedb8vQ9uOaYOl2IuOOcLcIP-F0V
+}
+
+AzureEntityColoring(AzureMediaOnDemand)
+!define AzureMediaOnDemand(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMediaOnDemand, AzureMediaOnDemand)
+!define AzureMediaOnDemand(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMediaOnDemand, AzureMediaOnDemand)
+
+sprite $AzureMediaPlayer [70x70/16z] {
+bPW7qkii34K51lNzR_Slxn65U2mCP-fNSkRgAgwGKngogBcRAMElS4uZzHiclS01bSoVaRRjO5zWkEKGVy4wl46-WQwRlkvzcCf_gDv_Zv3JVrV2s0CaKP-G
+T5rpgq8X292dI9PC9PC3-pDaNysLISAHC-Mv5XAZlWGb7oewKUnlS6XAiXtk6qGx2ZDN8id0ZuPWmXB9Uve60HrA494-rOIaVgRi-nRa-qmoj7WWmLXu_QsM
+TXq36pNyH96J9FDCPMu5-urQCyb0fsOeYr81heKZzcJJTmMVB50MbWZJ05hQIltRVIg9PYG6eim2fIMExve0_gQodbe0QcePwxrAlkOAmVKeYNvnrC9h2vIE
+ZumCE6oP9RZmYT77gBclB14dBKQYtDGIrDJoDvAkBK77vs-CnOfIInudBBvf2Th3giyjvSbYXvOBCyj-kpLfzsX73HCBxtzVQlwjspu2IbyS0Jq__zUyrM3K
+MlDLrtIO-ue8yYNLjDLxkGqaAGQnlWI9Mhp0A8OpIxIQ3wG0nHztZSDoOP3l-Nk1fPi3iSOm2MJVIsoBC7TBjBgE8lED5Dya68wNA6s-CpGCnnuQtSvXvCp2
+7b7cCCud4hA8Cb2FFU7XF5x3KZsgEPKGVC6FXWub2ZEIQd99p1CKym5l51kI1h_Kq2Y-m9O_FLR_OBmNn6dz_AgKEiHJIGmLA3yxxFrXkAX_CQ6RWjKdslQJ
+lOem_GUpg1qytJVp7GXUe9FN33cLNnmDjYYKpoKDzcdo60CB77AXJ95CgUMAVm4
+}
+
+AzureEntityColoring(AzureMediaPlayer)
+!define AzureMediaPlayer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMediaPlayer, AzureMediaPlayer)
+!define AzureMediaPlayer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMediaPlayer, AzureMediaPlayer)
+
+sprite $AzureMediaServices [60x70/16z] {
+dPS7ilOW24LL42Da_zlzItX5uerZlZFrbJE0bxIqeYcbps0xp_F87vYafoDlpTpE7unVgTNEaLxUjHjfc-qU9y3gXYhd0resSdbYdLVfvnAJTIvhbDQvhEa5
+vR9B0-rkOxp8PRznGeDQbyhCjNN3ZUU7NApHU1JjOT4QIZ7VqnEO5zgUpIMVXwd9oSHScIadfqxglQwHYoo_S4P7gdftNMM9iCitLO6QPUOgpK6Dhj_MYY2k
+PMX13Qu65SawgD6beM66RPEhizklACIPwr_XzIkSk-jbISG1frsyiAlHjUkA-cOUtNzdfi2LyD_fWgV2JP5BFcrmKxcl247NMmwkbuw_HAvvG9ERIeof0xV7
+Vqi3FBe7S0_eEYKS5dRfrwK00_Uvvpp2ygbRAfmNdtDqQNdEJWxv_XQD-MP5BdiQqQMzlMfXuBcejopGDRzy1vVG1GpTayV2Kr5FY1MxEkvV9a4tsWExNZZ9
+4ocKlRkMGyRW3jqdD-oqorXjYjpmpbedi_hl5Rbnv5J02VkmWOT7w11GTJDnHov-0of4JEIYBzITpLUtSkWCUfixojrimEmDlrnfBRyY7mhm0hcV0EjDH5et
+HVIwzJA9r9QtNc8DjXl8RRTiP_HrikDsIG3Sk851CMrTzg3qvci3vF8C6MwvItxvTMKWbzslEf0B0ESLSy7WlDnjvQElPrlciixBbhdy1G
 }
 
 AzureEntityColoring(AzureMediaServices)
diff --git a/dist/Migrate/AzureDatabaseMigrationService(m).png b/dist/Migrate/AzureDatabaseMigrationService(m).png
new file mode 100644
index 00000000..4455eddd
Binary files /dev/null and b/dist/Migrate/AzureDatabaseMigrationService(m).png differ
diff --git a/dist/Migrate/AzureDatabaseMigrationService(m).svg b/dist/Migrate/AzureDatabaseMigrationService(m).svg
new file mode 100644
index 00000000..245062b5
--- /dev/null
+++ b/dist/Migrate/AzureDatabaseMigrationService(m).svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(221,240,255);fill-opacity:1;" d="M 5.832031 33.785156 C 5.835938 28.230469 8.753906 23.085938 13.519531 20.234375 C 18.285156 17.382813 24.199219 17.242188 29.097656 19.867188 C 32.96875 13 40.238281 8.75 48.121094 8.75 C 52.1875 8.75 55.980469 9.878906 59.242188 11.816406 C 55.664063 4.808594 48.371094 0 40.039063 0 C 30.734375 -0.0234375 22.476563 5.964844 19.601563 14.816406 C 18.078125 14.257813 16.464844 13.976563 14.839844 13.980469 C 6.578125 13.980469 0 20.691406 0 28.933594 C -0.015625 34.585938 3.207031 39.75 8.292969 42.222656 C 6.6875 39.703125 5.832031 36.777344 5.832031 33.785156 Z M 5.832031 33.785156 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 61.878906 27.535156 L 60.898438 27.535156 C 61.460938 25.71875 61.601563 23.757813 61.601563 21.804688 C 61.738281 9.78125 51.941406 0 40.039063 0 C 30.734375 -0.0234375 22.476563 5.964844 19.601563 14.816406 C 18.078125 14.257813 16.464844 13.976563 14.839844 13.980469 C 6.578125 13.980469 0 20.691406 0 28.933594 C 0 37.140625 6.515625 43.675781 14.582031 43.738281 L 14.582031 36.882813 C 14.582031 30.136719 25.921875 27.058594 36.457031 27.058594 C 46.992188 27.058594 58.332031 30.136719 58.332031 36.882813 L 58.332031 43.75 L 62.441406 43.75 C 66.78125 43.332031 70 39.835938 70 35.644531 C 69.992188 31.164063 66.359375 27.539063 61.878906 27.535156 Z M 61.878906 27.535156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 17.5 36.882813 L 17.5 63.09375 C 17.5 66.875 25.851563 69.941406 36.199219 69.992188 L 36.199219 70 L 36.457031 70 C 46.929688 70 55.417969 66.90625 55.417969 63.097656 L 55.417969 36.886719 L 17.5 36.886719 Z M 17.5 36.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 36.457031 36.882813 L 36.457031 70 C 46.929688 70 55.417969 66.90625 55.417969 63.097656 L 55.417969 36.886719 L 36.457031 36.886719 Z M 36.457031 36.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 55.417969 36.882813 C 55.417969 40.695313 46.929688 43.789063 36.457031 43.789063 C 25.988281 43.789063 17.5 40.695313 17.5 36.882813 C 17.5 33.066406 25.988281 29.972656 36.457031 29.972656 C 46.929688 29.972656 55.417969 33.070313 55.417969 36.882813 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.457031 8.75 L 24.792969 20.417969 L 32.082031 20.417969 L 32.082031 37.917969 L 40.832031 37.917969 L 40.832031 20.417969 L 48.125 20.417969 Z M 36.457031 8.75 "/>
+</g>
+</svg>
diff --git a/dist/Migrate/AzureDatabaseMigrationService.png b/dist/Migrate/AzureDatabaseMigrationService.png
new file mode 100644
index 00000000..5857759e
Binary files /dev/null and b/dist/Migrate/AzureDatabaseMigrationService.png differ
diff --git a/dist/Migrate/AzureDatabaseMigrationService.puml b/dist/Migrate/AzureDatabaseMigrationService.puml
new file mode 100644
index 00000000..b2f36760
--- /dev/null
+++ b/dist/Migrate/AzureDatabaseMigrationService.puml
@@ -0,0 +1,12 @@
+sprite $AzureDatabaseMigrationService [70x70/16z] {
+xTL9ikiW38LXWL23il_zlhBZ2ZaG7boF_Ozk-rNeQLagQkxLtOJfNacyVcTymr2lVLxeRvMF0Lcc_P9LwDR7ILxdAUsL0Rd9943kCZ0dFyL2omJM9Bs_ZOZN
+KKGSTAP56P53FOLMHBNrU10XqjTGBCR47J9XAlqtHMJAC8rbCNStBHcHEMEBCmF8b0d260r4vWmFssEDZ8pqizcATzKHGMQS607Yiuw883EkDQDn5Ifd7wl8
+MKmKRyXhBDDLl31Sf0B8NSK1sLPmH1cGkugCoBvY_INmkgD8Doq_vwwQVgsqclT_fPn06GIJJ6EvQ2U5feyI7S4qBtTGy2ybsWkQScx_d5EYAucEiLwf-GAu
+7BLvEUFhUmCcIJSjVet_R50Q9B3YZ4e50vGMzwSxo45X_7jKMgdRG2JVIeK_HmLA-67UgnHjIwSjXOaAA0KLtbA4Y44vhzscP2aRAIXndSXeYie6Og087Iae
+IqRCGQcVb_5RwPpHyARWQo7Hb3EHduGU1YZu-B5wDEMIvC94HDLE0PIgUNBmXyo7ZA3RogCyogCyogEaBKLe4Uyej2ml5KkqBfN_AiQq6SjCqKn_ANCHL4pB
+XFW7
+}
+
+AzureEntityColoring(AzureDatabaseMigrationService)
+!define AzureDatabaseMigrationService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseMigrationService, AzureDatabaseMigrationService)
+!define AzureDatabaseMigrationService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseMigrationService, AzureDatabaseMigrationService)
diff --git a/dist/Migrate/AzureDatabaseMigrationService.svg b/dist/Migrate/AzureDatabaseMigrationService.svg
new file mode 100644
index 00000000..77602ba1
--- /dev/null
+++ b/dist/Migrate/AzureDatabaseMigrationService.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(92.54902%,94.117647%,94.509804%);fill-opacity:1;" d="M 5.832031 33.785156 C 5.835938 28.230469 8.753906 23.085938 13.519531 20.234375 C 18.285156 17.382813 24.199219 17.242188 29.097656 19.867188 C 32.96875 13 40.238281 8.75 48.121094 8.75 C 52.1875 8.75 55.980469 9.878906 59.242188 11.816406 C 55.664063 4.808594 48.371094 0 40.039063 0 C 30.734375 -0.0234375 22.476563 5.964844 19.601563 14.816406 C 18.078125 14.257813 16.464844 13.976563 14.839844 13.980469 C 6.578125 13.980469 0 20.691406 0 28.933594 C -0.015625 34.585938 3.207031 39.75 8.292969 42.222656 C 6.6875 39.703125 5.832031 36.777344 5.832031 33.785156 Z M 5.832031 33.785156 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 61.878906 27.535156 L 60.898438 27.535156 C 61.460938 25.71875 61.601563 23.757813 61.601563 21.804688 C 61.738281 9.78125 51.941406 0 40.039063 0 C 30.734375 -0.0234375 22.476563 5.964844 19.601563 14.816406 C 18.078125 14.257813 16.464844 13.976563 14.839844 13.980469 C 6.578125 13.980469 0 20.691406 0 28.933594 C 0 37.140625 6.515625 43.675781 14.582031 43.738281 L 14.582031 36.882813 C 14.582031 30.136719 25.921875 27.058594 36.457031 27.058594 C 46.992188 27.058594 58.332031 30.136719 58.332031 36.882813 L 58.332031 43.75 L 62.441406 43.75 C 66.78125 43.332031 70 39.835938 70 35.644531 C 69.992188 31.164063 66.359375 27.539063 61.878906 27.535156 Z M 61.878906 27.535156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 17.5 36.882813 L 17.5 63.09375 C 17.5 66.875 25.851563 69.941406 36.199219 69.992188 L 36.199219 70 L 36.457031 70 C 46.929688 70 55.417969 66.90625 55.417969 63.097656 L 55.417969 36.886719 L 17.5 36.886719 Z M 17.5 36.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 36.457031 36.882813 L 36.457031 70 C 46.929688 70 55.417969 66.90625 55.417969 63.097656 L 55.417969 36.886719 L 36.457031 36.886719 Z M 36.457031 36.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 55.417969 36.882813 C 55.417969 40.695313 46.929688 43.789063 36.457031 43.789063 C 25.988281 43.789063 17.5 40.695313 17.5 36.882813 C 17.5 33.066406 25.988281 29.972656 36.457031 29.972656 C 46.929688 29.972656 55.417969 33.070313 55.417969 36.882813 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.457031 8.75 L 24.792969 20.417969 L 32.082031 20.417969 L 32.082031 37.917969 L 40.832031 37.917969 L 40.832031 20.417969 L 48.125 20.417969 Z M 36.457031 8.75 "/>
+</g>
+</svg>
diff --git a/dist/Migrate/AzureMigrationProject(m).png b/dist/Migrate/AzureMigrationProject(m).png
new file mode 100644
index 00000000..1da6e93f
Binary files /dev/null and b/dist/Migrate/AzureMigrationProject(m).png differ
diff --git a/dist/Migrate/AzureMigrationProject(m).svg b/dist/Migrate/AzureMigrationProject(m).svg
new file mode 100644
index 00000000..a38adc18
--- /dev/null
+++ b/dist/Migrate/AzureMigrationProject(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 28.980469 17.21875 L 28.839844 17.21875 C 17.359375 17.21875 8.121094 25.898438 8.121094 36.539063 C 8.121094 38.359375 8.539063 40.039063 8.960938 41.578125 L 7.839844 41.578125 C 3.640625 41.578125 0 44.660156 0 48.859375 C 0 52.640625 3.078125 55.859375 7.140625 56.28125 L 8.261719 56.28125 C 4.058594 46.761719 14.421875 44.800781 14.421875 44.800781 C 13.441406 21.421875 35.421875 18.761719 35.980469 18.480469 C 33.878906 17.640625 31.5 17.21875 28.980469 17.21875 Z M 28.980469 17.21875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 9.378906 40.039063 C 9.378906 43.398438 12.179688 46.339844 15.820313 46.761719 L 57.261719 46.761719 C 64.261719 46.761719 70 41.441406 70 34.859375 C 70 28.140625 64.261719 22.960938 57.261719 22.960938 C 55.71875 22.960938 54.460938 23.378906 53.058594 23.660156 C 50.539063 16.660156 43.539063 11.761719 35.421875 11.761719 L 35.28125 11.761719 C 24.921875 11.761719 16.660156 19.601563 16.660156 29.121094 C 16.660156 30.660156 17.078125 32.339844 17.359375 33.738281 L 16.378906 33.738281 C 12.601563 33.460938 9.378906 36.261719 9.378906 40.039063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 0 48.859375 C 0 52.640625 3.078125 55.859375 7.140625 56.28125 L 53.199219 56.28125 C 61.039063 56.28125 67.339844 50.398438 67.339844 42.980469 C 67.339844 35.558594 61.039063 29.679688 53.199219 29.679688 C 51.519531 29.679688 49.980469 30.101563 48.578125 30.519531 C 45.78125 22.679688 38.078125 17.21875 28.980469 17.21875 L 28.839844 17.21875 C 17.359375 17.21875 8.121094 25.898438 8.121094 36.539063 C 8.121094 38.359375 8.539063 40.039063 8.960938 41.578125 L 7.839844 41.578125 C 3.640625 41.578125 0 44.660156 0 48.859375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.820313 33.039063 L 29.679688 33.039063 L 39.761719 43.121094 L 26.460938 56.28125 L 19.738281 56.28125 L 32.761719 43.121094 Z M 38.21875 18.058594 L 45.21875 18.058594 L 53.199219 26.179688 L 43.261719 35.839844 L 36.820313 35.839844 L 46.199219 26.039063 Z M 46.339844 36.121094 L 53.199219 36.121094 L 59.921875 42.839844 L 50.679688 51.941406 L 43.960938 51.941406 L 52.921875 42.839844 Z M 46.339844 36.121094 "/>
+</g>
+</svg>
diff --git a/dist/Migrate/AzureMigrationProject.png b/dist/Migrate/AzureMigrationProject.png
new file mode 100644
index 00000000..7b7dca57
Binary files /dev/null and b/dist/Migrate/AzureMigrationProject.png differ
diff --git a/dist/Migrate/AzureMigrationProject.puml b/dist/Migrate/AzureMigrationProject.puml
new file mode 100644
index 00000000..1936db1b
--- /dev/null
+++ b/dist/Migrate/AzureMigrationProject.puml
@@ -0,0 +1,10 @@
+sprite $AzureMigrationProject [70x70/16z] {
+xTO54iD028NXign1xd_UkhmmAQ6k_rZrYxAJXTk_V_-8w3OWbQx39ks5hpIA39WKkiBGmQRbGeDac4he4eHrc4xv4aIbzxQkTz4h6UwrG4rKQ1jhd64awgRM
+-_xIRnWA6CaQEwUUc3QFP2ImSZhlF6DGCSWaqyD8nIoJI-iYlN80SHZlRaR4Pvpx9_l8flr5xkU7AuMHDemQCNaMIOXC7rIA8wewOYIsAuZKrcgjhU6OvgCI
+HE3xTdHwz83uX82pPnG66H6cRSL3Depi67jQp4Kj5h69KG11naTgKqT11alR61bVGSPEKXeVapsxTOx9HmPsfZjAbD7J995Luep84I6Bn9dEk_VE34KOTyN6
+Vz34XIBu2HLFAHu2ojK83cfoZ1XIoLcSvX4ukRSZx2XXfC8KNeyaCpzH94tSJwZuI2sx30BBjeDuyVW1x2faz1XD6HayVhUS5kE8EKE9jkNpSQB5E_RltxyL
+}
+
+AzureEntityColoring(AzureMigrationProject)
+!define AzureMigrationProject(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMigrationProject, AzureMigrationProject)
+!define AzureMigrationProject(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMigrationProject, AzureMigrationProject)
diff --git a/dist/Migrate/AzureMigrationProject.svg b/dist/Migrate/AzureMigrationProject.svg
new file mode 100644
index 00000000..e641a6d3
--- /dev/null
+++ b/dist/Migrate/AzureMigrationProject.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 28.980469 17.21875 L 28.839844 17.21875 C 17.359375 17.21875 8.121094 25.898438 8.121094 36.539063 C 8.121094 38.359375 8.539063 40.039063 8.960938 41.578125 L 7.839844 41.578125 C 3.640625 41.578125 0 44.660156 0 48.859375 C 0 52.640625 3.078125 55.859375 7.140625 56.28125 L 8.261719 56.28125 C 4.058594 46.761719 14.421875 44.800781 14.421875 44.800781 C 13.441406 21.421875 35.421875 18.761719 35.980469 18.480469 C 33.878906 17.640625 31.5 17.21875 28.980469 17.21875 Z M 28.980469 17.21875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 9.378906 40.039063 C 9.378906 43.398438 12.179688 46.339844 15.820313 46.761719 L 57.261719 46.761719 C 64.261719 46.761719 70 41.441406 70 34.859375 C 70 28.140625 64.261719 22.960938 57.261719 22.960938 C 55.71875 22.960938 54.460938 23.378906 53.058594 23.660156 C 50.539063 16.660156 43.539063 11.761719 35.421875 11.761719 L 35.28125 11.761719 C 24.921875 11.761719 16.660156 19.601563 16.660156 29.121094 C 16.660156 30.660156 17.078125 32.339844 17.359375 33.738281 L 16.378906 33.738281 C 12.601563 33.460938 9.378906 36.261719 9.378906 40.039063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 0 48.859375 C 0 52.640625 3.078125 55.859375 7.140625 56.28125 L 53.199219 56.28125 C 61.039063 56.28125 67.339844 50.398438 67.339844 42.980469 C 67.339844 35.558594 61.039063 29.679688 53.199219 29.679688 C 51.519531 29.679688 49.980469 30.101563 48.578125 30.519531 C 45.78125 22.679688 38.078125 17.21875 28.980469 17.21875 L 28.839844 17.21875 C 17.359375 17.21875 8.121094 25.898438 8.121094 36.539063 C 8.121094 38.359375 8.539063 40.039063 8.960938 41.578125 L 7.839844 41.578125 C 3.640625 41.578125 0 44.660156 0 48.859375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.820313 33.039063 L 29.679688 33.039063 L 39.761719 43.121094 L 26.460938 56.28125 L 19.738281 56.28125 L 32.761719 43.121094 Z M 38.21875 18.058594 L 45.21875 18.058594 L 53.199219 26.179688 L 43.261719 35.839844 L 36.820313 35.839844 L 46.199219 26.039063 Z M 46.339844 36.121094 L 53.199219 36.121094 L 59.921875 42.839844 L 50.679688 51.941406 L 43.960938 51.941406 L 52.921875 42.839844 Z M 46.339844 36.121094 "/>
+</g>
+</svg>
diff --git a/dist/Migrate/AzureRecoveryServicesVault(m).png b/dist/Migrate/AzureRecoveryServicesVault(m).png
new file mode 100644
index 00000000..90141bb1
Binary files /dev/null and b/dist/Migrate/AzureRecoveryServicesVault(m).png differ
diff --git a/dist/Migrate/AzureRecoveryServicesVault(m).svg b/dist/Migrate/AzureRecoveryServicesVault(m).svg
new file mode 100644
index 00000000..63951aac
--- /dev/null
+++ b/dist/Migrate/AzureRecoveryServicesVault(m).svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 63.117188 20.953125 C 63.164063 20.464844 63.1875 19.949219 63.1875 19.4375 C 63.1875 11.292969 56.488281 4.667969 48.277344 4.667969 C 43.398438 4.667969 38.921875 7 36.167969 10.828125 C 34.394531 9.730469 32.339844 9.125 30.195313 9.125 C 24.335938 9.125 19.507813 13.578125 18.96875 19.25 C 19.878906 19.132813 20.789063 19.039063 21.722656 19.039063 C 26.039063 19.039063 30.195313 20.441406 33.578125 22.914063 C 36.121094 17.054688 42.582031 13.300781 49.746094 13.089844 L 49.746094 8.074219 L 58.496094 15.5625 L 49.746094 23.007813 L 49.746094 18.109375 C 45.640625 18.269531 41.648438 19.808594 39.339844 23.542969 L 39.804688 23.496094 C 48.160156 23.496094 55.066406 29.75 56.046875 37.753906 C 58.03125 39.246094 59.59375 41.042969 60.710938 43.097656 C 66.125 41.648438 70 36.984375 70 31.265625 C 70 26.671875 67.527344 23.007813 63.117188 20.953125 Z M 63.117188 20.953125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 6.882813 40.367188 C 6.835938 39.851563 6.8125 39.339844 6.8125 38.828125 C 6.8125 30.683594 13.511719 24.078125 21.722656 24.078125 C 26.601563 24.078125 31.078125 26.414063 33.832031 30.214844 C 35.609375 29.121094 37.660156 28.535156 39.808594 28.535156 C 46.015625 28.535156 51.078125 33.550781 51.078125 39.710938 L 51.054688 40.601563 C 55.253906 42.722656 57.519531 46.246094 57.519531 50.65625 C 57.519531 57.585938 51.871094 63 44.660156 63 L 12.855469 63 C 5.644531 63 0 57.585938 0 50.65625 C 0 46.082031 2.472656 42.421875 6.882813 40.367188 Z M 6.882813 40.367188 "/>
+</g>
+</svg>
diff --git a/dist/Migrate/AzureRecoveryServicesVault.png b/dist/Migrate/AzureRecoveryServicesVault.png
new file mode 100644
index 00000000..41f6e0c1
Binary files /dev/null and b/dist/Migrate/AzureRecoveryServicesVault.png differ
diff --git a/dist/Migrate/AzureRecoveryServicesVault.puml b/dist/Migrate/AzureRecoveryServicesVault.puml
new file mode 100644
index 00000000..bba9e71c
--- /dev/null
+++ b/dist/Migrate/AzureRecoveryServicesVault.puml
@@ -0,0 +1,11 @@
+sprite $AzureRecoveryServicesVault [70x70/16z] {
+xTM7qjmW30JWbP04XlT_tyJ_S8vf5wpqyaszufsb6j_1VyI12Tz4KYwd7CMTPBbyaHKU8PTM3dXCRo7sg0v9J2cPd27b1b8ZDs8uvbTtazoaWEiio_OGHW3e
+AATCUClA6awfd2BUqJAL3vF0-10_lc2iSIuJIMWOis4jpJB2hF219Iw3B8l2_61g3qAlhhvW9Qr3M2qsEq6n4fWuYAPhszKGiezlwWfjxzyGysqvfQO2bCfU
+IaMn5Ejc2tJS1YlOmOcwAUykYKJOHZ4TkKxJSkxlM4HL0cCGh4jOnR3QHMZph4SqIAqX6CKo2ctZ0MCW-MqPCLl5q6VhcxpaTPEAhxcILp4fFRomBQXTj1Qo
+POfjgVDuB5A2FOcHHOhjOfpoD8Ljb-AaqpKIUrQ6fll5zkau97wUOiErck188TINR9N9ay9eskI0YXmfEBeGiKV2xRrsiAF8VPcWvH3SGfmnZ8jvA5fYBW4D
+Sy9TC2V6ZPfJm8rvwU-QekOak97lChjiJlITTjttFm4m5tJOFIlVUfGO8_Oq6P6uzfi_HmFXBUAl8lof_li4
+}
+
+AzureEntityColoring(AzureRecoveryServicesVault)
+!define AzureRecoveryServicesVault(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRecoveryServicesVault, AzureRecoveryServicesVault)
+!define AzureRecoveryServicesVault(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRecoveryServicesVault, AzureRecoveryServicesVault)
diff --git a/dist/Migrate/AzureRecoveryServicesVault.svg b/dist/Migrate/AzureRecoveryServicesVault.svg
new file mode 100644
index 00000000..611ae12f
--- /dev/null
+++ b/dist/Migrate/AzureRecoveryServicesVault.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.117188 20.953125 C 63.164063 20.464844 63.1875 19.949219 63.1875 19.4375 C 63.1875 11.292969 56.488281 4.667969 48.277344 4.667969 C 43.398438 4.667969 38.921875 7 36.167969 10.828125 C 34.394531 9.730469 32.339844 9.125 30.195313 9.125 C 24.335938 9.125 19.507813 13.578125 18.96875 19.25 C 19.878906 19.132813 20.789063 19.039063 21.722656 19.039063 C 26.039063 19.039063 30.195313 20.441406 33.578125 22.914063 C 36.121094 17.054688 42.582031 13.300781 49.746094 13.089844 L 49.746094 8.074219 L 58.496094 15.5625 L 49.746094 23.007813 L 49.746094 18.109375 C 45.640625 18.269531 41.648438 19.808594 39.339844 23.542969 L 39.804688 23.496094 C 48.160156 23.496094 55.066406 29.75 56.046875 37.753906 C 58.03125 39.246094 59.59375 41.042969 60.710938 43.097656 C 66.125 41.648438 70 36.984375 70 31.265625 C 70 26.671875 67.527344 23.007813 63.117188 20.953125 Z M 63.117188 20.953125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 6.882813 40.367188 C 6.835938 39.851563 6.8125 39.339844 6.8125 38.828125 C 6.8125 30.683594 13.511719 24.078125 21.722656 24.078125 C 26.601563 24.078125 31.078125 26.414063 33.832031 30.214844 C 35.609375 29.121094 37.660156 28.535156 39.808594 28.535156 C 46.015625 28.535156 51.078125 33.550781 51.078125 39.710938 L 51.054688 40.601563 C 55.253906 42.722656 57.519531 46.246094 57.519531 50.65625 C 57.519531 57.585938 51.871094 63 44.660156 63 L 12.855469 63 C 5.644531 63 0 57.585938 0 50.65625 C 0 46.082031 2.472656 42.421875 6.882813 40.367188 Z M 6.882813 40.367188 "/>
+</g>
+</svg>
diff --git a/dist/Migrate/OnPremiseActiveDirectory(m).png b/dist/Migrate/OnPremiseActiveDirectory(m).png
new file mode 100644
index 00000000..9baa7f0b
Binary files /dev/null and b/dist/Migrate/OnPremiseActiveDirectory(m).png differ
diff --git a/dist/Migrate/OnPremiseActiveDirectory(m).svg b/dist/Migrate/OnPremiseActiveDirectory(m).svg
new file mode 100644
index 00000000..8a5a2ac4
--- /dev/null
+++ b/dist/Migrate/OnPremiseActiveDirectory(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13.25" y1="13.02" x2="8.62" y2="4.25" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(0,127,222);stop-opacity:1;"/>
+<stop offset="0.9" style="stop-color:rgb(53,169,255);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="11.26" y1="10.47" x2="14.46" y2="15.99" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0.1" style="stop-color:rgb(53,169,255);stop-opacity:1;"/>
+<stop offset="0.29" style="stop-color:rgb(45,165,255);stop-opacity:1;"/>
+<stop offset="0.51" style="stop-color:rgb(25,157,255);stop-opacity:1;"/>
+<stop offset="0.74" style="stop-color:rgb(0,141,246);stop-opacity:1;"/>
+<stop offset="0.88" style="stop-color:rgb(0,127,222);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 3.929688 39.628906 L 34.726563 59.617188 L 66.070313 39.550781 L 70 44.140625 L 34.726563 66.851563 L 0 44.140625 Z M 3.929688 39.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 6.261719 37.0625 L 34.726563 3.148438 L 63.777344 37.101563 L 34.726563 55.457031 Z M 6.261719 37.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 34.726563 3.148438 L 34.726563 55.457031 L 6.261719 37.0625 Z M 34.726563 3.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 34.726563 3.148438 L 34.726563 55.457031 L 63.777344 37.101563 Z M 34.726563 3.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51,168,255);fill-opacity:1;" d="M 34.726563 30.179688 L 63.777344 37.101563 L 34.726563 55.457031 Z M 34.726563 30.179688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(171,219,255);fill-opacity:1;" d="M 34.726563 55.457031 L 6.261719 37.0625 L 34.726563 30.179688 Z M 34.726563 55.457031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 34.726563 66.851563 L 70 44.140625 L 66.070313 39.550781 L 34.726563 59.617188 Z M 34.726563 66.851563 "/>
+</g>
+</svg>
diff --git a/dist/Migrate/OnPremiseActiveDirectory.png b/dist/Migrate/OnPremiseActiveDirectory.png
new file mode 100644
index 00000000..f7fca05d
Binary files /dev/null and b/dist/Migrate/OnPremiseActiveDirectory.png differ
diff --git a/dist/Migrate/OnPremiseActiveDirectory.puml b/dist/Migrate/OnPremiseActiveDirectory.puml
new file mode 100644
index 00000000..0e3e014a
--- /dev/null
+++ b/dist/Migrate/OnPremiseActiveDirectory.puml
@@ -0,0 +1,11 @@
+sprite $OnPremiseActiveDirectory [70x70/16z] {
+vTQ7aWCX30FGnJ9hylyVV5rRHHWVcHgkjpSwYt6olE4fvHM8hozWt6ETHk0UKUSHZmYVGin_bS3KPAc4JI5K_b-KKvbXS5AYJY4U4upvLGcVG7ObaAv7AEc-
+NIjHKeXGqdr3A6IIazLAr2IYbV14FK99zUqZ9IoFK4drZR7IccOqefNsVTP1FU9Sa25JVA2qxTGaucU31pr58w1nEQOH205cFQKLYGZ1Z8g0LD-cX4sHKeZ9
+Ac5JjBGgX89GfFHur6izeA0LBJty58L2Gb6h3rb5Bpv3GX6htF3xCQTmvzKel2ZsP3fuDf6V7nPsZC9_IojwQvRrfwduGvx5GNUgpXkumhTJz7IWfyeWF-Uu
+L23Y2CKPXCQFUe-3hiAf6erjNmtYGDKhDx29E4gfh9T860aPPu5Gx1gaYYsbIySzI1D1kd6eNEfj8iWW3XLizOgjEum3mwbU1d49zEFWC5KQWwTtwWxMMn0C
+31Nd5cH8w3WBQEXwnrF-hRU9UdDnN0J9nr51yd74eti-JXNtB1-dYY39E5ImJ1tpgkvPFWw3lDNv1
+}
+
+AzureEntityColoring(OnPremiseActiveDirectory)
+!define OnPremiseActiveDirectory(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, OnPremiseActiveDirectory, OnPremiseActiveDirectory)
+!define OnPremiseActiveDirectory(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, OnPremiseActiveDirectory, OnPremiseActiveDirectory)
diff --git a/dist/Migrate/OnPremiseActiveDirectory.svg b/dist/Migrate/OnPremiseActiveDirectory.svg
new file mode 100644
index 00000000..20de9f67
--- /dev/null
+++ b/dist/Migrate/OnPremiseActiveDirectory.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="13.25" y1="13.02" x2="8.62" y2="4.25" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(9.803922%,53.333333%,85.098039%);stop-opacity:1;"/>
+<stop offset="0.9" style="stop-color:rgb(32.941176%,68.235294%,94.117647%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="11.26" y1="10.47" x2="14.46" y2="15.99" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0.1" style="stop-color:rgb(32.941176%,68.235294%,94.117647%);stop-opacity:1;"/>
+<stop offset="0.29" style="stop-color:rgb(30.980392%,67.058824%,93.333333%);stop-opacity:1;"/>
+<stop offset="0.51" style="stop-color:rgb(25.490196%,63.529412%,91.372549%);stop-opacity:1;"/>
+<stop offset="0.74" style="stop-color:rgb(16.470588%,57.647059%,87.843137%);stop-opacity:1;"/>
+<stop offset="0.88" style="stop-color:rgb(9.803922%,53.333333%,85.098039%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 3.929688 39.628906 L 34.726563 59.617188 L 66.070313 39.550781 L 70 44.140625 L 34.726563 66.851563 L 0 44.140625 Z M 3.929688 39.628906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 6.261719 37.0625 L 34.726563 3.148438 L 63.777344 37.101563 L 34.726563 55.457031 Z M 6.261719 37.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 34.726563 3.148438 L 34.726563 55.457031 L 6.261719 37.0625 Z M 34.726563 3.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 34.726563 3.148438 L 34.726563 55.457031 L 63.777344 37.101563 Z M 34.726563 3.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(32.54902%,69.411765%,87.843137%);fill-opacity:1;" d="M 34.726563 30.179688 L 63.777344 37.101563 L 34.726563 55.457031 Z M 34.726563 30.179688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(61.176471%,92.156863%,100%);fill-opacity:1;" d="M 34.726563 55.457031 L 6.261719 37.0625 L 34.726563 30.179688 Z M 34.726563 55.457031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 34.726563 66.851563 L 70 44.140625 L 66.070313 39.550781 L 34.726563 59.617188 Z M 34.726563 66.851563 "/>
+</g>
+</svg>
diff --git a/dist/Migrate/all.puml b/dist/Migrate/all.puml
new file mode 100644
index 00000000..a18a51ba
--- /dev/null
+++ b/dist/Migrate/all.puml
@@ -0,0 +1,48 @@
+sprite $AzureDatabaseMigrationService [70x70/16z] {
+xTL9ikiW38LXWL23il_zlhBZ2ZaG7boF_Ozk-rNeQLagQkxLtOJfNacyVcTymr2lVLxeRvMF0Lcc_P9LwDR7ILxdAUsL0Rd9943kCZ0dFyL2omJM9Bs_ZOZN
+KKGSTAP56P53FOLMHBNrU10XqjTGBCR47J9XAlqtHMJAC8rbCNStBHcHEMEBCmF8b0d260r4vWmFssEDZ8pqizcATzKHGMQS607Yiuw883EkDQDn5Ifd7wl8
+MKmKRyXhBDDLl31Sf0B8NSK1sLPmH1cGkugCoBvY_INmkgD8Doq_vwwQVgsqclT_fPn06GIJJ6EvQ2U5feyI7S4qBtTGy2ybsWkQScx_d5EYAucEiLwf-GAu
+7BLvEUFhUmCcIJSjVet_R50Q9B3YZ4e50vGMzwSxo45X_7jKMgdRG2JVIeK_HmLA-67UgnHjIwSjXOaAA0KLtbA4Y44vhzscP2aRAIXndSXeYie6Og087Iae
+IqRCGQcVb_5RwPpHyARWQo7Hb3EHduGU1YZu-B5wDEMIvC94HDLE0PIgUNBmXyo7ZA3RogCyogCyogEaBKLe4Uyej2ml5KkqBfN_AiQq6SjCqKn_ANCHL4pB
+XFW7
+}
+
+AzureEntityColoring(AzureDatabaseMigrationService)
+!define AzureDatabaseMigrationService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDatabaseMigrationService, AzureDatabaseMigrationService)
+!define AzureDatabaseMigrationService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDatabaseMigrationService, AzureDatabaseMigrationService)
+
+sprite $AzureMigrationProject [70x70/16z] {
+xTO54iD028NXign1xd_UkhmmAQ6k_rZrYxAJXTk_V_-8w3OWbQx39ks5hpIA39WKkiBGmQRbGeDac4he4eHrc4xv4aIbzxQkTz4h6UwrG4rKQ1jhd64awgRM
+-_xIRnWA6CaQEwUUc3QFP2ImSZhlF6DGCSWaqyD8nIoJI-iYlN80SHZlRaR4Pvpx9_l8flr5xkU7AuMHDemQCNaMIOXC7rIA8wewOYIsAuZKrcgjhU6OvgCI
+HE3xTdHwz83uX82pPnG66H6cRSL3Depi67jQp4Kj5h69KG11naTgKqT11alR61bVGSPEKXeVapsxTOx9HmPsfZjAbD7J995Luep84I6Bn9dEk_VE34KOTyN6
+Vz34XIBu2HLFAHu2ojK83cfoZ1XIoLcSvX4ukRSZx2XXfC8KNeyaCpzH94tSJwZuI2sx30BBjeDuyVW1x2faz1XD6HayVhUS5kE8EKE9jkNpSQB5E_RltxyL
+}
+
+AzureEntityColoring(AzureMigrationProject)
+!define AzureMigrationProject(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMigrationProject, AzureMigrationProject)
+!define AzureMigrationProject(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMigrationProject, AzureMigrationProject)
+
+sprite $AzureRecoveryServicesVault [70x70/16z] {
+xTM7qjmW30JWbP04XlT_tyJ_S8vf5wpqyaszufsb6j_1VyI12Tz4KYwd7CMTPBbyaHKU8PTM3dXCRo7sg0v9J2cPd27b1b8ZDs8uvbTtazoaWEiio_OGHW3e
+AATCUClA6awfd2BUqJAL3vF0-10_lc2iSIuJIMWOis4jpJB2hF219Iw3B8l2_61g3qAlhhvW9Qr3M2qsEq6n4fWuYAPhszKGiezlwWfjxzyGysqvfQO2bCfU
+IaMn5Ejc2tJS1YlOmOcwAUykYKJOHZ4TkKxJSkxlM4HL0cCGh4jOnR3QHMZph4SqIAqX6CKo2ctZ0MCW-MqPCLl5q6VhcxpaTPEAhxcILp4fFRomBQXTj1Qo
+POfjgVDuB5A2FOcHHOhjOfpoD8Ljb-AaqpKIUrQ6fll5zkau97wUOiErck188TINR9N9ay9eskI0YXmfEBeGiKV2xRrsiAF8VPcWvH3SGfmnZ8jvA5fYBW4D
+Sy9TC2V6ZPfJm8rvwU-QekOak97lChjiJlITTjttFm4m5tJOFIlVUfGO8_Oq6P6uzfi_HmFXBUAl8lof_li4
+}
+
+AzureEntityColoring(AzureRecoveryServicesVault)
+!define AzureRecoveryServicesVault(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRecoveryServicesVault, AzureRecoveryServicesVault)
+!define AzureRecoveryServicesVault(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRecoveryServicesVault, AzureRecoveryServicesVault)
+
+sprite $OnPremiseActiveDirectory [70x70/16z] {
+vTQ7aWCX30FGnJ9hylyVV5rRHHWVcHgkjpSwYt6olE4fvHM8hozWt6ETHk0UKUSHZmYVGin_bS3KPAc4JI5K_b-KKvbXS5AYJY4U4upvLGcVG7ObaAv7AEc-
+NIjHKeXGqdr3A6IIazLAr2IYbV14FK99zUqZ9IoFK4drZR7IccOqefNsVTP1FU9Sa25JVA2qxTGaucU31pr58w1nEQOH205cFQKLYGZ1Z8g0LD-cX4sHKeZ9
+Ac5JjBGgX89GfFHur6izeA0LBJty58L2Gb6h3rb5Bpv3GX6htF3xCQTmvzKel2ZsP3fuDf6V7nPsZC9_IojwQvRrfwduGvx5GNUgpXkumhTJz7IWfyeWF-Uu
+L23Y2CKPXCQFUe-3hiAf6erjNmtYGDKhDx29E4gfh9T860aPPu5Gx1gaYYsbIySzI1D1kd6eNEfj8iWW3XLizOgjEum3mwbU1d49zEFWC5KQWwTtwWxMMn0C
+31Nd5cH8w3WBQEXwnrF-hRU9UdDnN0J9nr51yd74eti-JXNtB1-dYY39E5ImJ1tpgkvPFWw3lDNv1
+}
+
+AzureEntityColoring(OnPremiseActiveDirectory)
+!define OnPremiseActiveDirectory(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, OnPremiseActiveDirectory, OnPremiseActiveDirectory)
+!define OnPremiseActiveDirectory(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, OnPremiseActiveDirectory, OnPremiseActiveDirectory)
+
diff --git a/dist/MixedReality/AzureSpatialAnchor(m).png b/dist/MixedReality/AzureSpatialAnchor(m).png
new file mode 100644
index 00000000..47785b3f
Binary files /dev/null and b/dist/MixedReality/AzureSpatialAnchor(m).png differ
diff --git a/dist/MixedReality/AzureSpatialAnchor(m).svg b/dist/MixedReality/AzureSpatialAnchor(m).svg
new file mode 100644
index 00000000..cf4ed3cc
--- /dev/null
+++ b/dist/MixedReality/AzureSpatialAnchor(m).svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 10.308594 44.910156 L 32.199219 29.363281 L 54.09375 44.910156 L 32.199219 61.515625 Z M 10.308594 44.910156 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 3.210938 44.800781 L 32.199219 24.210938 L 61.191406 44.800781 L 32.199219 66.789063 Z M 3.210938 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 10.308594 44.910156 L 32.199219 29.363281 L 54.09375 44.910156 L 32.199219 61.515625 Z M 10.308594 44.910156 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.660156 44.800781 C 65.660156 50.136719 61.335938 54.460938 56 54.460938 C 50.664063 54.460938 46.339844 50.136719 46.339844 44.800781 C 46.339844 39.464844 50.664063 35.140625 56 35.140625 C 61.335938 35.140625 65.660156 39.464844 65.660156 44.800781 Z M 65.660156 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 56 39.339844 C 59.011719 39.339844 61.460938 41.789063 61.460938 44.800781 C 61.460938 47.808594 59.011719 50.261719 56 50.261719 C 52.988281 50.261719 50.539063 47.808594 50.539063 44.800781 C 50.539063 41.789063 52.988281 39.339844 56 39.339844 M 56 35.140625 C 50.664063 35.140625 46.339844 39.464844 46.339844 44.800781 C 46.339844 50.136719 50.664063 54.460938 56 54.460938 C 61.335938 54.460938 65.660156 50.136719 65.660156 44.800781 C 65.660156 39.464844 61.335938 35.140625 56 35.140625 Z M 56 35.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 68.28125 13.371094 C 68.28125 6.144531 62.78125 0.140625 56 0.140625 C 49.21875 0.140625 43.71875 5.898438 43.71875 13.371094 C 43.71875 20.84375 56 41.300781 56 46.199219 C 56 41.300781 68.28125 20.597656 68.28125 13.371094 Z M 68.28125 13.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 61.460938 12.601563 C 61.460938 15.617188 59.015625 18.058594 56 18.058594 C 52.984375 18.058594 50.539063 15.617188 50.539063 12.601563 C 50.539063 9.585938 52.984375 7.140625 56 7.140625 C 59.015625 7.140625 61.460938 9.585938 61.460938 12.601563 Z M 61.460938 12.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 39.058594 28 C 39.058594 31.789063 35.988281 34.859375 32.199219 34.859375 C 28.410156 34.859375 25.339844 31.789063 25.339844 28 C 25.339844 24.210938 28.410156 21.140625 32.199219 21.140625 C 35.988281 21.140625 39.058594 24.210938 39.058594 28 Z M 39.058594 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 15.261719 44.800781 C 15.261719 48.589844 12.1875 51.660156 8.398438 51.660156 C 4.609375 51.660156 1.539063 48.589844 1.539063 44.800781 C 1.539063 41.011719 4.609375 37.941406 8.398438 37.941406 C 12.1875 37.941406 15.261719 41.011719 15.261719 44.800781 Z M 15.261719 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 39.058594 63 C 39.058594 66.789063 35.988281 69.859375 32.199219 69.859375 C 28.410156 69.859375 25.339844 66.789063 25.339844 63 C 25.339844 59.210938 28.410156 56.140625 32.199219 56.140625 C 35.988281 56.140625 39.058594 59.210938 39.058594 63 Z M 39.058594 63 "/>
+</g>
+</svg>
diff --git a/dist/MixedReality/AzureSpatialAnchor.png b/dist/MixedReality/AzureSpatialAnchor.png
new file mode 100644
index 00000000..d8a63667
Binary files /dev/null and b/dist/MixedReality/AzureSpatialAnchor.png differ
diff --git a/dist/MixedReality/AzureSpatialAnchor.puml b/dist/MixedReality/AzureSpatialAnchor.puml
new file mode 100644
index 00000000..0ee0e2d4
--- /dev/null
+++ b/dist/MixedReality/AzureSpatialAnchor.puml
@@ -0,0 +1,13 @@
+sprite $AzureSpatialAnchor [70x70/16z] {
+fPO9beCW44IbruBx7tYUIplfQ7Y2V_O9AQdUO9cWg0DklBo0q0AR5l7sGPtS3rf69aNUorYxKeO3ssx0R6Ih4l6vhy48bxRZnyvg_3c4d1QomIb3VFt72FNx
+qTmsT485AMVZZN0awALA_IupdL71-QOiArFrBrz5I4Cgt0viDSLeAL03WGbgRIVwkgN3qBYbuAcX8kOcjvQU6zBBSDNnAUNNgLZQ1U-Bo5q0VJIszUw1F1ZR
+l7xs997xVSjOclM7-pgIvfBZQ4dzQPe9EG3mStqMxw40wgTz07BJJDHrWvKi0bZ9bTUlEC66SOt5xDZWL7cz8wGODeI8TDtFyTk6fjCQdR1kEDDE_3osunIL
+rwkuU2PTuDZZ_vNCIY-ipdH7n0iuOyxVbqRN4ileZd3bPn40ISPIGeL-8zXz_Q_ECoDax7JJSSLh6-nvyvikhKfzjgsKjV9m51PTcxGIzS7H2jZIx03qviR7
+r8K1O3UmJRBJaYGLfIvolitF4dsZGbabEv8dZe9mD1fTpfLc4Tqy0fsUPNedQQ855VuaIKx_SyYl5_EZ0JgeOSL4rAC30h9QOVrcZEdW-4G61qFOWVT4mkfl
+LueDOHmOBVSm-hDkFvT8pLJofEkxodFNbeVeXoini_sNNXpwhlIOZ19kxkFGTuKMeEDcu9nERePSjNpQqp91GNjsnHY_aOsZ7PNPlPH9bPAlahDukahEKceB
+iCn38OEolA3OgbCVsFa3
+}
+
+AzureEntityColoring(AzureSpatialAnchor)
+!define AzureSpatialAnchor(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSpatialAnchor, AzureSpatialAnchor)
+!define AzureSpatialAnchor(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSpatialAnchor, AzureSpatialAnchor)
diff --git a/dist/MixedReality/AzureSpatialAnchor.svg b/dist/MixedReality/AzureSpatialAnchor.svg
new file mode 100644
index 00000000..38db437e
--- /dev/null
+++ b/dist/MixedReality/AzureSpatialAnchor.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 10.308594 44.910156 L 32.199219 29.363281 L 54.09375 44.910156 L 32.199219 61.515625 Z M 10.308594 44.910156 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 3.210938 44.800781 L 32.199219 24.210938 L 61.191406 44.800781 L 32.199219 66.789063 Z M 3.210938 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 10.308594 44.910156 L 32.199219 29.363281 L 54.09375 44.910156 L 32.199219 61.515625 Z M 10.308594 44.910156 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.660156 44.800781 C 65.660156 50.136719 61.335938 54.460938 56 54.460938 C 50.664063 54.460938 46.339844 50.136719 46.339844 44.800781 C 46.339844 39.464844 50.664063 35.140625 56 35.140625 C 61.335938 35.140625 65.660156 39.464844 65.660156 44.800781 Z M 65.660156 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 56 39.339844 C 59.011719 39.339844 61.460938 41.789063 61.460938 44.800781 C 61.460938 47.808594 59.011719 50.261719 56 50.261719 C 52.988281 50.261719 50.539063 47.808594 50.539063 44.800781 C 50.539063 41.789063 52.988281 39.339844 56 39.339844 M 56 35.140625 C 50.664063 35.140625 46.339844 39.464844 46.339844 44.800781 C 46.339844 50.136719 50.664063 54.460938 56 54.460938 C 61.335938 54.460938 65.660156 50.136719 65.660156 44.800781 C 65.660156 39.464844 61.335938 35.140625 56 35.140625 Z M 56 35.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 68.28125 13.371094 C 68.28125 6.144531 62.78125 0.140625 56 0.140625 C 49.21875 0.140625 43.71875 5.898438 43.71875 13.371094 C 43.71875 20.84375 56 41.300781 56 46.199219 C 56 41.300781 68.28125 20.597656 68.28125 13.371094 Z M 68.28125 13.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 61.460938 12.601563 C 61.460938 15.617188 59.015625 18.058594 56 18.058594 C 52.984375 18.058594 50.539063 15.617188 50.539063 12.601563 C 50.539063 9.585938 52.984375 7.140625 56 7.140625 C 59.015625 7.140625 61.460938 9.585938 61.460938 12.601563 Z M 61.460938 12.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 39.058594 28 C 39.058594 31.789063 35.988281 34.859375 32.199219 34.859375 C 28.410156 34.859375 25.339844 31.789063 25.339844 28 C 25.339844 24.210938 28.410156 21.140625 32.199219 21.140625 C 35.988281 21.140625 39.058594 24.210938 39.058594 28 Z M 39.058594 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 15.261719 44.800781 C 15.261719 48.589844 12.1875 51.660156 8.398438 51.660156 C 4.609375 51.660156 1.539063 48.589844 1.539063 44.800781 C 1.539063 41.011719 4.609375 37.941406 8.398438 37.941406 C 12.1875 37.941406 15.261719 41.011719 15.261719 44.800781 Z M 15.261719 44.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 39.058594 63 C 39.058594 66.789063 35.988281 69.859375 32.199219 69.859375 C 28.410156 69.859375 25.339844 66.789063 25.339844 63 C 25.339844 59.210938 28.410156 56.140625 32.199219 56.140625 C 35.988281 56.140625 39.058594 59.210938 39.058594 63 Z M 39.058594 63 "/>
+</g>
+</svg>
diff --git a/dist/MixedReality/all.puml b/dist/MixedReality/all.puml
new file mode 100644
index 00000000..f6d4f7b6
--- /dev/null
+++ b/dist/MixedReality/all.puml
@@ -0,0 +1,14 @@
+sprite $AzureSpatialAnchor [70x70/16z] {
+fPO9beCW44IbruBx7tYUIplfQ7Y2V_O9AQdUO9cWg0DklBo0q0AR5l7sGPtS3rf69aNUorYxKeO3ssx0R6Ih4l6vhy48bxRZnyvg_3c4d1QomIb3VFt72FNx
+qTmsT485AMVZZN0awALA_IupdL71-QOiArFrBrz5I4Cgt0viDSLeAL03WGbgRIVwkgN3qBYbuAcX8kOcjvQU6zBBSDNnAUNNgLZQ1U-Bo5q0VJIszUw1F1ZR
+l7xs997xVSjOclM7-pgIvfBZQ4dzQPe9EG3mStqMxw40wgTz07BJJDHrWvKi0bZ9bTUlEC66SOt5xDZWL7cz8wGODeI8TDtFyTk6fjCQdR1kEDDE_3osunIL
+rwkuU2PTuDZZ_vNCIY-ipdH7n0iuOyxVbqRN4ileZd3bPn40ISPIGeL-8zXz_Q_ECoDax7JJSSLh6-nvyvikhKfzjgsKjV9m51PTcxGIzS7H2jZIx03qviR7
+r8K1O3UmJRBJaYGLfIvolitF4dsZGbabEv8dZe9mD1fTpfLc4Tqy0fsUPNedQQ855VuaIKx_SyYl5_EZ0JgeOSL4rAC30h9QOVrcZEdW-4G61qFOWVT4mkfl
+LueDOHmOBVSm-hDkFvT8pLJofEkxodFNbeVeXoini_sNNXpwhlIOZ19kxkFGTuKMeEDcu9nERePSjNpQqp91GNjsnHY_aOsZ7PNPlPH9bPAlahDukahEKceB
+iCn38OEolA3OgbCVsFa3
+}
+
+AzureEntityColoring(AzureSpatialAnchor)
+!define AzureSpatialAnchor(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSpatialAnchor, AzureSpatialAnchor)
+!define AzureSpatialAnchor(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSpatialAnchor, AzureSpatialAnchor)
+
diff --git a/dist/Mobile/AzureMobileApp(m).png b/dist/Mobile/AzureMobileApp(m).png
index 34e96b93..9780dd6a 100644
Binary files a/dist/Mobile/AzureMobileApp(m).png and b/dist/Mobile/AzureMobileApp(m).png differ
diff --git a/dist/Mobile/AzureMobileApp(m).svg b/dist/Mobile/AzureMobileApp(m).svg
index 30820350..fea73f0f 100644
--- a/dist/Mobile/AzureMobileApp(m).svg
+++ b/dist/Mobile/AzureMobileApp(m).svg
@@ -1,7 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="42pt" height="70pt" viewBox="0 0 42 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 14.3125 56.3125 L 14.3125 7 L 46.1875 7 L 49.03125 0 L 15.398438 0 C 13.082031 0 11.199219 1.878906 11.199219 4.199219 L 11.199219 65.800781 C 11.199219 68.121094 13.082031 70 15.398438 70 L 20.574219 70 L 26.136719 56.3125 Z M 14.3125 56.3125 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 33.582031 47.128906 C 33.511719 47.128906 33.449219 47.113281 33.394531 47.078125 L 21.105469 39.984375 C 20.984375 39.917969 20.914063 39.800781 20.914063 39.660156 L 20.914063 25.429688 C 20.914063 25.296875 20.984375 25.171875 21.105469 25.105469 C 21.21875 25.039063 21.359375 25.039063 21.480469 25.105469 L 33.769531 32.195313 C 33.878906 32.265625 33.949219 32.386719 33.949219 32.523438 L 33.949219 46.753906 C 33.949219 46.890625 33.878906 47.011719 33.769531 47.078125 C 33.707031 47.113281 33.640625 47.128906 33.582031 47.128906 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 37.058594 47.128906 C 36.992188 47.128906 36.929688 47.113281 36.867188 47.078125 C 36.757813 47.011719 36.6875 46.890625 36.6875 46.753906 L 36.6875 32.613281 C 36.6875 32.480469 36.757813 32.355469 36.867188 32.289063 L 49.152344 25.199219 C 49.273438 25.132813 49.410156 25.132813 49.523438 25.199219 C 49.640625 25.265625 49.710938 25.386719 49.710938 25.519531 L 49.710938 39.660156 C 49.710938 39.800781 49.640625 39.917969 49.523438 39.984375 L 37.238281 47.078125 C 37.191406 47.113281 37.125 47.128906 37.058594 47.128906 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 38.265625 0 L 3.109375 0 C 0 0.15625 0 0.777344 0 4.511719 L 0 64.867188 C 0 68.601563 0 69.222656 3.109375 69.378906 C 3.109375 69.378906 4.042969 69.378906 4.199219 69.378906 L 37.332031 69.378906 C 37.488281 69.378906 38.421875 69.378906 38.421875 69.378906 C 41.535156 69.222656 41.535156 68.601563 41.535156 64.867188 L 41.535156 4.511719 C 41.378906 0.933594 41.378906 0.15625 38.265625 0 Z M 15.867188 2.332031 L 25.667969 2.332031 C 25.820313 2.332031 25.976563 2.488281 25.976563 2.644531 C 25.976563 2.800781 25.820313 2.957031 25.667969 2.957031 L 15.867188 2.957031 C 15.710938 2.957031 15.554688 2.800781 15.554688 2.644531 C 15.554688 2.644531 15.554688 2.332031 15.867188 2.332031 Z M 16.023438 65.800781 L 13.6875 65.800781 C 13.222656 65.800781 12.910156 65.644531 12.910156 65.179688 C 12.910156 64.710938 13.222656 64.554688 13.6875 64.554688 L 16.023438 64.554688 C 16.488281 64.554688 16.800781 64.710938 16.800781 65.179688 C 16.800781 65.644531 16.488281 65.800781 16.023438 65.800781 Z M 22.398438 66.265625 L 19.132813 66.265625 C 18.667969 66.265625 18.199219 66.109375 18.199219 65.488281 C 18.199219 65.023438 18.667969 64.710938 19.132813 64.710938 L 22.398438 64.710938 C 22.867188 64.710938 23.332031 64.867188 23.332031 65.488281 C 23.332031 65.957031 22.867188 66.265625 22.398438 66.265625 Z M 27.6875 65.800781 L 25.355469 65.800781 C 24.890625 65.800781 24.578125 65.644531 24.578125 65.332031 C 24.578125 64.867188 24.890625 64.867188 25.355469 64.867188 L 27.6875 64.867188 C 28.15625 64.867188 28.464844 65.023438 28.464844 65.332031 C 28.464844 65.644531 28.15625 65.800781 27.6875 65.800781 Z M 38.421875 58.800781 C 38.421875 61.910156 38.109375 62.6875 35.15625 62.6875 L 6.222656 62.6875 C 3.265625 62.6875 2.957031 61.910156 2.957031 58.800781 L 2.957031 8.710938 C 2.957031 5.445313 3.265625 5.445313 6.535156 5.445313 L 34.84375 5.445313 C 38.109375 5.445313 38.578125 5.445313 38.578125 8.710938 Z M 38.421875 58.800781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 36.398438 10.734375 C 36.398438 7.464844 35.933594 7.464844 32.820313 7.464844 L 8.554688 7.464844 C 5.289063 7.464844 4.976563 7.464844 4.976563 10.734375 L 4.976563 56.777344 C 4.976563 60.042969 5.289063 60.511719 8.554688 60.511719 L 32.820313 60.511719 C 36.089844 60.511719 36.398438 59.890625 36.398438 56.777344 Z M 19.753906 44.644531 L 9.800781 38.890625 L 9.800781 27.378906 L 19.753906 33.132813 Z M 10.734375 25.667969 L 20.6875 19.910156 L 30.644531 25.667969 L 20.6875 31.578125 Z M 31.578125 38.890625 L 21.621094 44.644531 L 21.621094 33.132813 L 31.578125 27.378906 Z M 31.578125 38.890625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 59.421875 65.800781 C 59.421875 68.121094 57.542969 70 55.222656 70 L 15.398438 70 C 13.082031 70 11.199219 68.121094 11.199219 65.800781 L 11.199219 4.199219 C 11.199219 1.878906 13.082031 0 15.398438 0 L 55.222656 0 C 57.542969 0 59.421875 1.878906 59.421875 4.199219 Z M 59.421875 65.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 14.3125 7 L 56.3125 7 L 56.3125 56.3125 L 14.3125 56.3125 Z M 14.3125 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.355469 63.152344 C 39.355469 65.386719 37.546875 67.199219 35.3125 67.199219 C 33.078125 67.199219 31.269531 65.386719 31.269531 63.152344 C 31.269531 60.921875 33.078125 59.109375 35.3125 59.109375 C 37.546875 59.109375 39.355469 60.921875 39.355469 63.152344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 37.964844 63.152344 C 37.964844 64.617188 36.777344 65.808594 35.3125 65.808594 C 33.847656 65.808594 32.660156 64.617188 32.660156 63.152344 C 32.660156 61.691406 33.847656 60.503906 35.3125 60.503906 C 36.777344 60.503906 37.964844 61.691406 37.964844 63.152344 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 42.46875 3.945313 C 42.46875 4.515625 42.003906 4.976563 41.433594 4.976563 L 29.191406 4.976563 C 28.621094 4.976563 28.15625 4.515625 28.15625 3.945313 C 28.15625 3.371094 28.621094 2.910156 29.191406 2.910156 L 41.433594 2.910156 C 42.003906 2.910156 42.46875 3.371094 42.46875 3.945313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 42.46875 3.945313 C 42.46875 4.515625 42.003906 4.976563 41.433594 4.976563 L 29.191406 4.976563 C 28.621094 4.976563 28.15625 4.515625 28.15625 3.945313 C 28.15625 3.371094 28.621094 2.910156 29.191406 2.910156 L 41.433594 2.910156 C 42.003906 2.910156 42.46875 3.371094 42.46875 3.945313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.351563 29.835938 C 35.289063 29.835938 35.222656 29.816406 35.164063 29.78125 L 22.839844 22.667969 C 22.726563 22.601563 22.652344 22.476563 22.652344 22.34375 C 22.652344 22.210938 22.726563 22.085938 22.839844 22.023438 L 35.089844 14.953125 C 35.203125 14.890625 35.34375 14.890625 35.457031 14.953125 L 47.789063 22.070313 C 47.902344 22.136719 47.972656 22.261719 47.972656 22.394531 C 47.972656 22.527344 47.902344 22.648438 47.789063 22.714844 L 35.539063 29.78125 C 35.480469 29.816406 35.421875 29.835938 35.351563 29.835938 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
 </g>
 </svg>
diff --git a/dist/Mobile/AzureMobileApp.png b/dist/Mobile/AzureMobileApp.png
index 10518f70..e85719b8 100644
Binary files a/dist/Mobile/AzureMobileApp.png and b/dist/Mobile/AzureMobileApp.png differ
diff --git a/dist/Mobile/AzureMobileApp.puml b/dist/Mobile/AzureMobileApp.puml
index fdf9b449..940ac0aa 100644
--- a/dist/Mobile/AzureMobileApp.puml
+++ b/dist/Mobile/AzureMobileApp.puml
@@ -1,8 +1,8 @@
-sprite $AzureMobileApp [42x70/16z] {
-xTP5kgX034JXQWb9rVxt-mI73mApgsVyuxHKfvwZLuJU5JYTSMXBTgARV0fwMv4KPZtBB6PPy1X7IQ3qB02no52MxwJI2FWxAI0-b_oLGp6-aL41L7-Kx9Xg
-J2KDMyPxwGNxYjz8Dfnhl93RARVAe2iP53lsTOfn8Hr6HLrT3Mc0Nyhn4Roi5_Q2Emcq46s-S0CI2HWLVVQfd1_O2vubO3BWbUpgtqAoNyZEinoBUf8rRlzv
-BpjPXcmSqLRPgKrobLlHHjb2okIOcyob6vdtAtzb6dSoKXcB5527kCs70hpU1PLPUdc2FienPcciQ1z9NNQM1D3L01HQhPK7IUsA2CfQQvsC2Dt9FFXB62Zc
-yPnRmLy
+sprite $AzureMobileApp [70x70/16z] {
+xTTLjWCX383X419y_zkzDf9ooXIxNlvtleECmctiGxMq5GnSP4Ezc8uy5AFGfIHgcqe-QRCjI79GoZKeCKc-ebJsTbQ9JOepZxDdVaAHtBzJbg91Joi4xz6K
+mWgs58yh218EAXhoTByYYv4KTIgCK4fnbm9NzQseDfVnVO6-VI6M2qxIczwi8EgxiyRD8EfG42axAiMxqQaWicpFDfHeG47Dj_SqqvYoRuyOdOgq3o8QKYGn
+YifIbi8F56vIjkX2wNtMwPBI_pxYEsNitSYPmiFlQJeLdlfcq9loox-bbh8KxreBZNzygLAJ4YULV2hHierZYap5AtZBpoaH514fY6DAsh90xu4TK6H1l2iy
+fAIvkSXKvlT51ddeF2EJBQX-lHWefRAfL8iAYg6NgLGB2D8h
 }
 
 AzureEntityColoring(AzureMobileApp)
diff --git a/dist/Mobile/AzureMobileApp.svg b/dist/Mobile/AzureMobileApp.svg
index 073ca3ab..34e74b75 100644
--- a/dist/Mobile/AzureMobileApp.svg
+++ b/dist/Mobile/AzureMobileApp.svg
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="47pt" height="70pt" viewBox="0 0 47 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="47" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="47" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 3.074219 56.3125 L 3.074219 7 L 34.546875 7 L 37.351563 0 L 4.148438 0 C 1.855469 0 0 1.878906 0 4.199219 L 0 65.800781 C 0 68.121094 1.855469 70 4.148438 70 L 9.253906 70 L 14.75 56.3125 Z M 3.074219 56.3125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 14.3125 56.3125 L 14.3125 7 L 46.1875 7 L 49.03125 0 L 15.398438 0 C 13.082031 0 11.199219 1.878906 11.199219 4.199219 L 11.199219 65.800781 C 11.199219 68.121094 13.082031 70 15.398438 70 L 20.574219 70 L 26.136719 56.3125 Z M 14.3125 56.3125 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="47" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip2">
-  <rect x="0" y="0" width="47" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.101563 47.128906 C 22.03125 47.128906 21.96875 47.113281 21.914063 47.078125 L 9.78125 39.984375 C 9.664063 39.917969 9.59375 39.800781 9.59375 39.660156 L 9.59375 25.429688 C 9.59375 25.296875 9.664063 25.171875 9.78125 25.105469 C 9.890625 25.039063 10.03125 25.039063 10.152344 25.105469 L 22.285156 32.195313 C 22.390625 32.265625 22.464844 32.386719 22.464844 32.523438 L 22.464844 46.753906 C 22.464844 46.890625 22.390625 47.011719 22.285156 47.078125 C 22.222656 47.113281 22.160156 47.128906 22.101563 47.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 33.582031 47.128906 C 33.511719 47.128906 33.449219 47.113281 33.394531 47.078125 L 21.105469 39.984375 C 20.984375 39.917969 20.914063 39.800781 20.914063 39.660156 L 20.914063 25.429688 C 20.914063 25.296875 20.984375 25.171875 21.105469 25.105469 C 21.21875 25.039063 21.359375 25.039063 21.480469 25.105469 L 33.769531 32.195313 C 33.878906 32.265625 33.949219 32.386719 33.949219 32.523438 L 33.949219 46.753906 C 33.949219 46.890625 33.878906 47.011719 33.769531 47.078125 C 33.707031 47.113281 33.640625 47.128906 33.582031 47.128906 "/>
 </g>
 <mask id="mask2">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="47" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip3">
-  <rect x="0" y="0" width="47" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface11" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.535156 47.128906 C 25.46875 47.128906 25.40625 47.113281 25.34375 47.078125 C 25.234375 47.011719 25.164063 46.890625 25.164063 46.753906 L 25.164063 32.613281 C 25.164063 32.480469 25.234375 32.355469 25.34375 32.289063 L 37.476563 25.199219 C 37.589844 25.132813 37.726563 25.132813 37.839844 25.199219 C 37.957031 25.265625 38.027344 25.386719 38.027344 25.519531 L 38.027344 39.660156 C 38.027344 39.800781 37.957031 39.917969 37.839844 39.984375 L 25.710938 47.078125 C 25.660156 47.113281 25.597656 47.128906 25.535156 47.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.058594 47.128906 C 36.992188 47.128906 36.929688 47.113281 36.867188 47.078125 C 36.757813 47.011719 36.6875 46.890625 36.6875 46.753906 L 36.6875 32.613281 C 36.6875 32.480469 36.757813 32.355469 36.867188 32.289063 L 49.152344 25.199219 C 49.273438 25.132813 49.410156 25.132813 49.523438 25.199219 C 49.640625 25.265625 49.710938 25.386719 49.710938 25.519531 L 49.710938 39.660156 C 49.710938 39.800781 49.640625 39.917969 49.523438 39.984375 L 37.238281 47.078125 C 37.191406 47.113281 37.125 47.128906 37.058594 47.128906 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 47.613281 65.800781 C 47.613281 68.121094 45.757813 70 43.46875 70 L 4.148438 70 C 1.855469 70 0 68.121094 0 65.800781 L 0 4.199219 C 0 1.878906 1.855469 0 4.148438 0 L 43.46875 0 C 45.757813 0 47.613281 1.878906 47.613281 4.199219 Z M 47.613281 65.800781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 3.074219 7 L 44.546875 7 L 44.546875 56.3125 L 3.074219 56.3125 Z M 3.074219 7 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 27.800781 63.152344 C 27.800781 65.386719 26.011719 67.199219 23.808594 67.199219 C 21.601563 67.199219 19.816406 65.386719 19.816406 63.152344 C 19.816406 60.921875 21.601563 59.109375 23.808594 59.109375 C 26.011719 59.109375 27.800781 60.921875 27.800781 63.152344 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 26.425781 63.152344 C 26.425781 64.617188 25.253906 65.808594 23.808594 65.808594 C 22.363281 65.808594 21.191406 64.617188 21.191406 63.152344 C 21.191406 61.691406 22.363281 60.503906 23.808594 60.503906 C 25.253906 60.503906 26.425781 61.691406 26.425781 63.152344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 59.421875 65.800781 C 59.421875 68.121094 57.542969 70 55.222656 70 L 15.398438 70 C 13.082031 70 11.199219 68.121094 11.199219 65.800781 L 11.199219 4.199219 C 11.199219 1.878906 13.082031 0 15.398438 0 L 55.222656 0 C 57.542969 0 59.421875 1.878906 59.421875 4.199219 Z M 59.421875 65.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 14.3125 7 L 56.3125 7 L 56.3125 56.3125 L 14.3125 56.3125 Z M 14.3125 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.355469 63.152344 C 39.355469 65.386719 37.546875 67.199219 35.3125 67.199219 C 33.078125 67.199219 31.269531 65.386719 31.269531 63.152344 C 31.269531 60.921875 33.078125 59.109375 35.3125 59.109375 C 37.546875 59.109375 39.355469 60.921875 39.355469 63.152344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 37.964844 63.152344 C 37.964844 64.617188 36.777344 65.808594 35.3125 65.808594 C 33.847656 65.808594 32.660156 64.617188 32.660156 63.152344 C 32.660156 61.691406 33.847656 60.503906 35.3125 60.503906 C 36.777344 60.503906 37.964844 61.691406 37.964844 63.152344 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 30.875 3.945313 C 30.875 4.515625 30.417969 4.976563 29.851563 4.976563 L 17.765625 4.976563 C 17.199219 4.976563 16.742188 4.515625 16.742188 3.945313 C 16.742188 3.371094 17.199219 2.910156 17.765625 2.910156 L 29.851563 2.910156 C 30.417969 2.910156 30.875 3.371094 30.875 3.945313 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.875 3.945313 C 30.875 4.515625 30.417969 4.976563 29.851563 4.976563 L 17.765625 4.976563 C 17.199219 4.976563 16.742188 4.515625 16.742188 3.945313 C 16.742188 3.371094 17.199219 2.910156 17.765625 2.910156 L 29.851563 2.910156 C 30.417969 2.910156 30.875 3.371094 30.875 3.945313 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 23.847656 29.835938 C 23.785156 29.835938 23.722656 29.816406 23.660156 29.78125 L 11.492188 22.667969 C 11.378906 22.601563 11.308594 22.476563 11.308594 22.34375 C 11.308594 22.210938 11.378906 22.085938 11.492188 22.023438 L 23.589844 14.953125 C 23.703125 14.890625 23.839844 14.890625 23.953125 14.953125 L 36.125 22.070313 C 36.238281 22.136719 36.308594 22.261719 36.308594 22.394531 C 36.308594 22.527344 36.238281 22.648438 36.125 22.714844 L 24.035156 29.78125 C 23.972656 29.816406 23.914063 29.835938 23.847656 29.835938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 42.46875 3.945313 C 42.46875 4.515625 42.003906 4.976563 41.433594 4.976563 L 29.191406 4.976563 C 28.621094 4.976563 28.15625 4.515625 28.15625 3.945313 C 28.15625 3.371094 28.621094 2.910156 29.191406 2.910156 L 41.433594 2.910156 C 42.003906 2.910156 42.46875 3.371094 42.46875 3.945313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 42.46875 3.945313 C 42.46875 4.515625 42.003906 4.976563 41.433594 4.976563 L 29.191406 4.976563 C 28.621094 4.976563 28.15625 4.515625 28.15625 3.945313 C 28.15625 3.371094 28.621094 2.910156 29.191406 2.910156 L 41.433594 2.910156 C 42.003906 2.910156 42.46875 3.371094 42.46875 3.945313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.351563 29.835938 C 35.289063 29.835938 35.222656 29.816406 35.164063 29.78125 L 22.839844 22.667969 C 22.726563 22.601563 22.652344 22.476563 22.652344 22.34375 C 22.652344 22.210938 22.726563 22.085938 22.839844 22.023438 L 35.089844 14.953125 C 35.203125 14.890625 35.34375 14.890625 35.457031 14.953125 L 47.789063 22.070313 C 47.902344 22.136719 47.972656 22.261719 47.972656 22.394531 C 47.972656 22.527344 47.902344 22.648438 47.789063 22.714844 L 35.539063 29.78125 C 35.480469 29.816406 35.421875 29.835938 35.351563 29.835938 "/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
 <use xlink:href="#surface11" mask="url(#mask2)"/>
 </g>
diff --git a/dist/Mobile/AzureMobileEngagement(m).png b/dist/Mobile/AzureMobileEngagement(m).png
new file mode 100644
index 00000000..0d36a7b6
Binary files /dev/null and b/dist/Mobile/AzureMobileEngagement(m).png differ
diff --git a/dist/Mobile/AzureMobileEngagement(m).svg b/dist/Mobile/AzureMobileEngagement(m).svg
new file mode 100644
index 00000000..b45dce23
--- /dev/null
+++ b/dist/Mobile/AzureMobileEngagement(m).svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 14.28125 56.28125 L 14.28125 7 L 46.199219 7 L 49 0 L 15.398438 0 C 13.019531 0 11.199219 1.820313 11.199219 4.199219 L 11.199219 65.800781 C 11.199219 68.179688 13.019531 70 15.398438 70 L 20.578125 70 L 26.179688 56.28125 Z M 14.28125 56.28125 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 18.621094 45.21875 L 27.019531 45.21875 L 27.019531 53.621094 L 18.621094 53.621094 Z M 18.621094 45.21875 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.800781 38.921875 L 39.199219 38.921875 L 39.199219 53.621094 L 30.800781 53.621094 Z M 30.800781 38.921875 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;" d="M 42.980469 32.621094 L 51.378906 32.621094 L 51.378906 53.621094 L 42.980469 53.621094 Z M 42.980469 32.621094 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.460938 9.800781 L 22.539063 9.800781 C 20.300781 9.800781 18.621094 11.621094 18.621094 13.71875 L 18.621094 25.761719 C 18.621094 28 20.441406 29.679688 22.539063 29.679688 L 27.441406 29.679688 L 27.441406 34.859375 L 32.621094 29.679688 L 47.460938 29.679688 C 49.699219 29.679688 51.378906 27.859375 51.378906 25.761719 L 51.378906 13.71875 C 51.378906 11.621094 49.699219 9.800781 47.460938 9.800781 Z M 47.460938 9.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 59.359375 65.800781 C 59.359375 68.179688 57.539063 70 55.160156 70 L 15.398438 70 C 13.019531 70 11.199219 68.179688 11.199219 65.800781 L 11.199219 4.199219 C 11.199219 1.820313 13.019531 0 15.398438 0 L 55.160156 0 C 57.539063 0 59.359375 1.820313 59.359375 4.199219 Z M 59.359375 65.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 14.28125 7 L 56.28125 7 L 56.28125 56.28125 L 14.28125 56.28125 Z M 14.28125 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.339844 63.140625 C 39.339844 65.378906 37.519531 67.199219 35.28125 67.199219 C 33.039063 67.199219 31.21875 65.378906 31.21875 63.140625 C 31.21875 60.898438 33.039063 59.078125 35.28125 59.078125 C 37.519531 59.078125 39.339844 60.898438 39.339844 63.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 37.941406 63.140625 C 37.941406 64.539063 36.820313 65.800781 35.28125 65.800781 C 33.878906 65.800781 32.621094 64.679688 32.621094 63.140625 C 32.621094 61.601563 33.738281 60.480469 35.28125 60.480469 C 36.820313 60.480469 37.941406 61.738281 37.941406 63.140625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 42.421875 3.921875 C 42.421875 4.480469 42 4.898438 41.441406 4.898438 L 29.261719 4.898438 C 28.699219 4.898438 28.28125 4.480469 28.28125 3.921875 C 28.28125 3.359375 28.699219 2.941406 29.261719 2.941406 L 41.441406 2.941406 C 42 2.941406 42.421875 3.359375 42.421875 3.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 42.421875 3.921875 C 42.421875 4.480469 42 4.898438 41.441406 4.898438 L 29.261719 4.898438 C 28.699219 4.898438 28.28125 4.480469 28.28125 3.921875 C 28.28125 3.359375 28.699219 2.941406 29.261719 2.941406 L 41.441406 2.941406 C 42 2.941406 42.421875 3.359375 42.421875 3.921875 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Mobile/AzureMobileEngagement.png b/dist/Mobile/AzureMobileEngagement.png
new file mode 100644
index 00000000..0db8908c
Binary files /dev/null and b/dist/Mobile/AzureMobileEngagement.png differ
diff --git a/dist/Mobile/AzureMobileEngagement.puml b/dist/Mobile/AzureMobileEngagement.puml
new file mode 100644
index 00000000..00f881c6
--- /dev/null
+++ b/dist/Mobile/AzureMobileEngagement.puml
@@ -0,0 +1,9 @@
+sprite $AzureMobileEngagement [70x70/16z] {
+xTS5aiCm341HoGow_tKN5VAaviNw3HJpms0uqpuKqQTWu04NoY9j7DnIeQb22kxOaB1mPdY5ThPkXHp20MsoAEIwDmlDgCIgYZDvTkUxAgdlgYY1ZydAYi8i
+KLV10ZsbelvKPLLMPLN4b2k3nYnPUzsLuWE-4rTIDLwzrNj3Zzu354S6AnmPh2GHMR-dJxGsOvNKgYGa6wiWqvCggwBPM0NPVw-iYc3fUyNlkV8tnYJUdVYS
+aAcSKLvT9Kwf48j6szXRYPU_-h5A15HA8SI-2dqoeDw1xQWSAwIvehigD6DP8j7WTk5AxpuooGgLZXSDTp1TbBo8S4juhb258E3m2W
+}
+
+AzureEntityColoring(AzureMobileEngagement)
+!define AzureMobileEngagement(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMobileEngagement, AzureMobileEngagement)
+!define AzureMobileEngagement(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMobileEngagement, AzureMobileEngagement)
diff --git a/dist/Mobile/AzureMobileEngagement.svg b/dist/Mobile/AzureMobileEngagement.svg
new file mode 100644
index 00000000..bb264bed
--- /dev/null
+++ b/dist/Mobile/AzureMobileEngagement.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 14.28125 56.28125 L 14.28125 7 L 46.199219 7 L 49 0 L 15.398438 0 C 13.019531 0 11.199219 1.820313 11.199219 4.199219 L 11.199219 65.800781 C 11.199219 68.179688 13.019531 70 15.398438 70 L 20.578125 70 L 26.179688 56.28125 Z M 14.28125 56.28125 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18.621094 45.21875 L 27.019531 45.21875 L 27.019531 53.621094 L 18.621094 53.621094 Z M 18.621094 45.21875 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.800781 38.921875 L 39.199219 38.921875 L 39.199219 53.621094 L 30.800781 53.621094 Z M 30.800781 38.921875 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 42.980469 32.621094 L 51.378906 32.621094 L 51.378906 53.621094 L 42.980469 53.621094 Z M 42.980469 32.621094 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.460938 9.800781 L 22.539063 9.800781 C 20.300781 9.800781 18.621094 11.621094 18.621094 13.71875 L 18.621094 25.761719 C 18.621094 28 20.441406 29.679688 22.539063 29.679688 L 27.441406 29.679688 L 27.441406 34.859375 L 32.621094 29.679688 L 47.460938 29.679688 C 49.699219 29.679688 51.378906 27.859375 51.378906 25.761719 L 51.378906 13.71875 C 51.378906 11.621094 49.699219 9.800781 47.460938 9.800781 Z M 47.460938 9.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 59.359375 65.800781 C 59.359375 68.179688 57.539063 70 55.160156 70 L 15.398438 70 C 13.019531 70 11.199219 68.179688 11.199219 65.800781 L 11.199219 4.199219 C 11.199219 1.820313 13.019531 0 15.398438 0 L 55.160156 0 C 57.539063 0 59.359375 1.820313 59.359375 4.199219 Z M 59.359375 65.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 14.28125 7 L 56.28125 7 L 56.28125 56.28125 L 14.28125 56.28125 Z M 14.28125 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.339844 63.140625 C 39.339844 65.378906 37.519531 67.199219 35.28125 67.199219 C 33.039063 67.199219 31.21875 65.378906 31.21875 63.140625 C 31.21875 60.898438 33.039063 59.078125 35.28125 59.078125 C 37.519531 59.078125 39.339844 60.898438 39.339844 63.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 37.941406 63.140625 C 37.941406 64.539063 36.820313 65.800781 35.28125 65.800781 C 33.878906 65.800781 32.621094 64.679688 32.621094 63.140625 C 32.621094 61.601563 33.738281 60.480469 35.28125 60.480469 C 36.820313 60.480469 37.941406 61.738281 37.941406 63.140625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 42.421875 3.921875 C 42.421875 4.480469 42 4.898438 41.441406 4.898438 L 29.261719 4.898438 C 28.699219 4.898438 28.28125 4.480469 28.28125 3.921875 C 28.28125 3.359375 28.699219 2.941406 29.261719 2.941406 L 41.441406 2.941406 C 42 2.941406 42.421875 3.359375 42.421875 3.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 42.421875 3.921875 C 42.421875 4.480469 42 4.898438 41.441406 4.898438 L 29.261719 4.898438 C 28.699219 4.898438 28.28125 4.480469 28.28125 3.921875 C 28.28125 3.359375 28.699219 2.941406 29.261719 2.941406 L 41.441406 2.941406 C 42 2.941406 42.421875 3.359375 42.421875 3.921875 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Mobile/AzureNotificationHubs(m).svg b/dist/Mobile/AzureNotificationHubs(m).svg
index a8e3d68f..d9f92c25 100644
--- a/dist/Mobile/AzureNotificationHubs(m).svg
+++ b/dist/Mobile/AzureNotificationHubs(m).svg
@@ -13,7 +13,8 @@
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.820313 54.878906 L 22.398438 54.878906 L 30.378906 39.058594 L 19.039063 39.058594 L 19.039063 46.621094 L 1.398438 31.359375 L 34.019531 31.359375 L 37.941406 24.078125 L 0 24.078125 L 0 44.941406 C 0 50.121094 3.78125 54.738281 8.820313 54.878906 Z M 49.839844 0 L 8.820313 0 C 3.640625 0 0 3.078125 0 8.261719 L 0 16.519531 L 41.578125 16.519531 Z M 49.839844 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.820313 54.878906 L 22.398438 54.878906 L 30.378906 39.058594 L 19.039063 39.058594 L 19.039063 46.621094 L 1.398438 31.359375 L 34.019531 31.359375 L 37.941406 24.078125 L 0 24.078125 L 0 44.941406 C 0 50.121094 3.78125 54.738281 8.820313 54.878906 Z M 8.820313 54.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 49.839844 0 L 8.820313 0 C 3.640625 0 0 3.078125 0 8.261719 L 0 16.519531 L 41.578125 16.519531 Z M 49.839844 0 "/>
 </g>
 </defs>
 <g id="surface1">
diff --git a/dist/Mobile/AzureNotificationHubs.svg b/dist/Mobile/AzureNotificationHubs.svg
index b65ac2fd..177af43b 100644
--- a/dist/Mobile/AzureNotificationHubs.svg
+++ b/dist/Mobile/AzureNotificationHubs.svg
@@ -13,7 +13,8 @@
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.820313 54.878906 L 22.398438 54.878906 L 30.378906 39.058594 L 19.039063 39.058594 L 19.039063 46.621094 L 1.398438 31.359375 L 34.019531 31.359375 L 37.941406 24.078125 L 0 24.078125 L 0 44.941406 C 0 50.121094 3.78125 54.738281 8.820313 54.878906 Z M 49.839844 0 L 8.820313 0 C 3.640625 0 0 3.078125 0 8.261719 L 0 16.519531 L 41.578125 16.519531 Z M 49.839844 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.820313 54.878906 L 22.398438 54.878906 L 30.378906 39.058594 L 19.039063 39.058594 L 19.039063 46.621094 L 1.398438 31.359375 L 34.019531 31.359375 L 37.941406 24.078125 L 0 24.078125 L 0 44.941406 C 0 50.121094 3.78125 54.738281 8.820313 54.878906 Z M 8.820313 54.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.839844 0 L 8.820313 0 C 3.640625 0 0 3.078125 0 8.261719 L 0 16.519531 L 41.578125 16.519531 Z M 49.839844 0 "/>
 </g>
 </defs>
 <g id="surface1">
diff --git a/dist/Mobile/all.puml b/dist/Mobile/all.puml
index 21613478..a0a3d18e 100644
--- a/dist/Mobile/all.puml
+++ b/dist/Mobile/all.puml
@@ -1,14 +1,24 @@
-sprite $AzureMobileApp [42x70/16z] {
-xTP5kgX034JXQWb9rVxt-mI73mApgsVyuxHKfvwZLuJU5JYTSMXBTgARV0fwMv4KPZtBB6PPy1X7IQ3qB02no52MxwJI2FWxAI0-b_oLGp6-aL41L7-Kx9Xg
-J2KDMyPxwGNxYjz8Dfnhl93RARVAe2iP53lsTOfn8Hr6HLrT3Mc0Nyhn4Roi5_Q2Emcq46s-S0CI2HWLVVQfd1_O2vubO3BWbUpgtqAoNyZEinoBUf8rRlzv
-BpjPXcmSqLRPgKrobLlHHjb2okIOcyob6vdtAtzb6dSoKXcB5527kCs70hpU1PLPUdc2FienPcciQ1z9NNQM1D3L01HQhPK7IUsA2CfQQvsC2Dt9FFXB62Zc
-yPnRmLy
+sprite $AzureMobileApp [70x70/16z] {
+xTTLjWCX383X419y_zkzDf9ooXIxNlvtleECmctiGxMq5GnSP4Ezc8uy5AFGfIHgcqe-QRCjI79GoZKeCKc-ebJsTbQ9JOepZxDdVaAHtBzJbg91Joi4xz6K
+mWgs58yh218EAXhoTByYYv4KTIgCK4fnbm9NzQseDfVnVO6-VI6M2qxIczwi8EgxiyRD8EfG42axAiMxqQaWicpFDfHeG47Dj_SqqvYoRuyOdOgq3o8QKYGn
+YifIbi8F56vIjkX2wNtMwPBI_pxYEsNitSYPmiFlQJeLdlfcq9loox-bbh8KxreBZNzygLAJ4YULV2hHierZYap5AtZBpoaH514fY6DAsh90xu4TK6H1l2iy
+fAIvkSXKvlT51ddeF2EJBQX-lHWefRAfL8iAYg6NgLGB2D8h
 }
 
 AzureEntityColoring(AzureMobileApp)
 !define AzureMobileApp(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMobileApp, AzureMobileApp)
 !define AzureMobileApp(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMobileApp, AzureMobileApp)
 
+sprite $AzureMobileEngagement [70x70/16z] {
+xTS5aiCm341HoGow_tKN5VAaviNw3HJpms0uqpuKqQTWu04NoY9j7DnIeQb22kxOaB1mPdY5ThPkXHp20MsoAEIwDmlDgCIgYZDvTkUxAgdlgYY1ZydAYi8i
+KLV10ZsbelvKPLLMPLN4b2k3nYnPUzsLuWE-4rTIDLwzrNj3Zzu354S6AnmPh2GHMR-dJxGsOvNKgYGa6wiWqvCggwBPM0NPVw-iYc3fUyNlkV8tnYJUdVYS
+aAcSKLvT9Kwf48j6szXRYPU_-h5A15HA8SI-2dqoeDw1xQWSAwIvehigD6DP8j7WTk5AxpuooGgLZXSDTp1TbBo8S4juhb258E3m2W
+}
+
+AzureEntityColoring(AzureMobileEngagement)
+!define AzureMobileEngagement(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMobileEngagement, AzureMobileEngagement)
+!define AzureMobileEngagement(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMobileEngagement, AzureMobileEngagement)
+
 sprite $AzureNotificationHubs [70x70/16z] {
 pSo5eGKm3090ca3st_YvQuKlDy1XBqXrgnjYu2GreXuT7sfjAGB8rQGgqRI-L4j3KgHZAKDYMoOIoh4akBBKUK5Q5iJqKZSBccL1qzHIzmjmqsGtdWLEU5cm
 8YmBmhAWMHP0bWMqB4ZBWYXsqMUb7lN5BoxrVvRwjOLf82NMoT9eXvP5R8v5QfP5OLcKbaN42NLHdVJSvD8YjOUbfXQ5PL7UBZMxY9P5H0udnUU6ZaNZIOLb
diff --git a/dist/Networking/AzureApplicationGateway(m).png b/dist/Networking/AzureApplicationGateway(m).png
index fe51dc9e..dbb30191 100644
Binary files a/dist/Networking/AzureApplicationGateway(m).png and b/dist/Networking/AzureApplicationGateway(m).png differ
diff --git a/dist/Networking/AzureApplicationGateway(m).svg b/dist/Networking/AzureApplicationGateway(m).svg
index 170f0981..1c60e868 100644
--- a/dist/Networking/AzureApplicationGateway(m).svg
+++ b/dist/Networking/AzureApplicationGateway(m).svg
@@ -18,12 +18,12 @@
 </defs>
 <g id="surface1">
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 35 70 C 33.320313 70 31.640625 69.300781 30.378906 68.039063 L 1.960938 39.621094 C 0.699219 38.359375 0 36.679688 0 35 C 0 33.320313 0.699219 31.640625 1.960938 30.378906 L 30.378906 1.960938 C 31.640625 0.699219 33.320313 0 35 0 C 36.679688 0 38.359375 0.699219 39.621094 1.960938 L 68.179688 30.519531 C 69.441406 31.78125 70.140625 33.320313 70.140625 35.140625 C 70.140625 36.820313 69.441406 38.5 68.179688 39.761719 L 39.621094 68.039063 C 38.359375 69.300781 36.679688 70 35 70 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 41.632813 26.019531 C 39.753906 27.460938 37.449219 28.242188 35.082031 28.242188 C 31.714844 28.246094 28.542969 26.679688 26.496094 24.007813 C 24.753906 21.734375 23.988281 18.863281 24.367188 16.023438 C 24.742188 13.183594 26.234375 10.609375 28.507813 8.871094 C 30.386719 7.425781 32.691406 6.644531 35.058594 6.648438 C 38.425781 6.644531 41.601563 8.210938 43.644531 10.886719 C 47.269531 15.617188 46.367188 22.394531 41.632813 26.019531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 41.632813 26.019531 C 39.675781 27.515625 37.371094 28.242188 35.082031 28.242188 C 31.832031 28.242188 28.621094 26.785156 26.496094 24.007813 C 22.871094 19.273438 23.765625 12.5 28.507813 8.871094 C 30.464844 7.367188 32.773438 6.648438 35.058594 6.648438 C 38.308594 6.648438 41.519531 8.105469 43.644531 10.886719 C 47.269531 15.621094 46.367188 22.394531 41.632813 26.019531 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35 63.839844 L 44.238281 54.601563 L 37.660156 54.601563 L 37.660156 26.808594 L 32.199219 26.808594 L 32.199219 54.601563 L 25.761719 54.601563 Z M 35 63.839844 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 55.0625 46.871094 L 55.0625 33.804688 L 50.507813 38.359375 L 38.6875 26.535156 L 34.726563 30.496094 L 46.546875 42.316406 L 41.996094 46.871094 Z M 55.0625 46.871094 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 14.960938 46.921875 L 28.023438 46.921875 L 23.472656 42.367188 L 35.625 30.214844 L 31.664063 26.253906 L 19.511719 38.40625 L 14.960938 33.855469 Z M 14.960938 46.921875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 40.761719 24.878906 C 39.132813 26.128906 37.132813 26.808594 35.078125 26.808594 C 32.160156 26.8125 29.410156 25.457031 27.636719 23.136719 C 26.125 21.164063 25.460938 18.675781 25.789063 16.210938 C 26.117188 13.75 27.410156 11.519531 29.382813 10.011719 C 31.007813 8.757813 33.007813 8.078125 35.0625 8.082031 C 37.980469 8.078125 40.734375 9.4375 42.503906 11.757813 C 44.015625 13.726563 44.679688 16.21875 44.351563 18.679688 C 44.027344 21.140625 42.734375 23.371094 40.761719 24.878906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.039063 19.089844 C 39.71875 19.972656 40.980469 20.140625 41.867188 19.464844 C 41.910156 19.429688 41.945313 19.386719 41.988281 19.347656 C 42.890625 19.984375 43.519531 20.40625 43.871094 20.644531 C 43.976563 20.375 44.046875 20.113281 44.121094 19.84375 C 43.578125 19.433594 43.039063 19.015625 42.515625 18.585938 C 42.765625 17.933594 42.660156 17.203125 42.242188 16.648438 C 41.625 15.847656 40.515625 15.628906 39.640625 16.132813 C 38.582031 15.179688 37.546875 14.203125 36.535156 13.199219 C 39.96875 11.351563 42.40625 11.621094 42.40625 11.621094 C 42.007813 11.113281 41.554688 10.652344 41.054688 10.238281 C 39.609375 10.011719 37.359375 10.039063 34.789063 11.40625 L 34.789063 11.402344 C 33.890625 10.464844 33.019531 9.5 32.171875 8.515625 C 31.75 8.652344 31.332031 8.820313 30.933594 9.019531 C 31.589844 10.089844 32.46875 11.171875 33.460938 12.226563 L 33.46875 12.234375 C 32.53125 12.898438 31.660156 13.652344 30.867188 14.488281 C 30.761719 14.601563 30.65625 14.71875 30.554688 14.835938 C 30.039063 14.726563 29.503906 14.761719 29.011719 14.941406 C 28.164063 13.109375 28.230469 11.640625 28.367188 10.882813 C 27.996094 11.261719 27.660156 11.671875 27.355469 12.105469 C 27.136719 13.011719 27.074219 14.316406 27.726563 15.886719 C 26.878906 16.996094 26.96875 18.554688 27.9375 19.558594 C 27.625 20.628906 27.441406 21.730469 27.386719 22.839844 C 27.476563 22.960938 27.476563 23.058594 27.566406 23.175781 C 28.015625 23.753906 28.578125 24.238281 29.121094 24.679688 C 29.035156 23.226563 29.253906 21.777344 29.765625 20.417969 C 30.203125 20.453125 30.652344 20.382813 31.070313 20.207031 C 32.117188 21.15625 33.292969 21.957031 34.558594 22.585938 C 34.507813 23.054688 34.636719 23.527344 34.921875 23.902344 C 35.550781 24.71875 36.71875 24.871094 37.535156 24.246094 C 37.703125 24.117188 37.839844 23.960938 37.949219 23.792969 C 39.40625 24.117188 40.679688 24.175781 41.625 24.175781 C 41.769531 24.175781 42.4375 23.261719 42.824219 22.695313 C 42.25 22.816406 40.542969 23.050781 38.214844 22.382813 C 38.160156 22.113281 38.046875 21.859375 37.878906 21.640625 C 37.289063 20.871094 36.210938 20.6875 35.402344 21.214844 C 34.316406 20.625 33.296875 19.921875 32.359375 19.117188 C 32.898438 18.261719 32.945313 17.183594 32.480469 16.289063 C 32.585938 16.179688 32.691406 16.074219 32.804688 15.96875 C 33.566406 15.246094 34.382813 14.585938 35.246094 13.992188 C 35.214844 13.964844 35.1875 13.933594 35.15625 13.90625 L 35.246094 13.988281 C 36.414063 15.070313 37.65625 16.097656 38.828125 17.011719 C 38.503906 17.6875 38.585938 18.492188 39.039063 19.089844 Z M 39.039063 19.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 40.761719 24.878906 C 39.0625 26.175781 37.066406 26.808594 35.078125 26.808594 C 32.261719 26.808594 29.476563 25.542969 27.636719 23.136719 C 24.492188 19.03125 25.269531 13.160156 29.382813 10.011719 C 31.078125 8.707031 33.078125 8.082031 35.0625 8.082031 C 37.878906 8.082031 40.664063 9.347656 42.503906 11.757813 C 45.652344 15.863281 44.867188 21.738281 40.761719 24.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.039063 19.089844 C 39.722656 19.976563 40.984375 20.136719 41.867188 19.464844 C 41.910156 19.429688 41.945313 19.386719 41.988281 19.347656 C 42.890625 19.984375 43.519531 20.40625 43.871094 20.644531 C 43.976563 20.375 44.046875 20.113281 44.121094 19.84375 C 43.75 19.566406 43.242188 19.175781 42.515625 18.585938 C 42.753906 17.957031 42.675781 17.222656 42.242188 16.648438 C 41.613281 15.839844 40.507813 15.632813 39.640625 16.132813 C 38.6875 15.277344 37.640625 14.296875 36.535156 13.199219 C 39.96875 11.351563 42.40625 11.621094 42.40625 11.621094 C 42 11.101563 41.542969 10.648438 41.054688 10.238281 C 39.609375 10.011719 37.359375 10.039063 34.789063 11.40625 L 34.789063 11.402344 C 33.933594 10.507813 33.0625 9.546875 32.171875 8.515625 C 31.75 8.652344 31.332031 8.820313 30.933594 9.019531 C 31.589844 10.089844 32.46875 11.171875 33.460938 12.226563 C 33.464844 12.230469 33.46875 12.230469 33.46875 12.234375 C 32.640625 12.8125 31.71875 13.589844 30.867188 14.488281 C 30.757813 14.601563 30.65625 14.71875 30.554688 14.835938 C 30.046875 14.730469 29.511719 14.761719 29.011719 14.941406 C 28.164063 13.109375 28.230469 11.640625 28.367188 10.882813 C 27.996094 11.269531 27.652344 11.675781 27.355469 12.105469 C 27.136719 13.011719 27.074219 14.316406 27.726563 15.886719 C 26.972656 16.878906 26.933594 18.28125 27.726563 19.316406 C 27.792969 19.402344 27.863281 19.480469 27.9375 19.558594 C 27.589844 20.734375 27.4375 21.867188 27.386719 22.839844 C 27.476563 22.960938 27.476563 23.058594 27.566406 23.175781 C 28.015625 23.753906 28.578125 24.238281 29.121094 24.679688 C 29.054688 23.648438 29.128906 22.128906 29.765625 20.417969 C 30.203125 20.453125 30.652344 20.382813 31.070313 20.207031 C 31.308594 20.417969 31.558594 20.628906 31.828125 20.847656 C 32.746094 21.574219 33.664063 22.140625 34.558594 22.585938 C 34.511719 23.042969 34.625 23.511719 34.921875 23.902344 C 35.550781 24.71875 36.71875 24.871094 37.535156 24.246094 C 37.703125 24.117188 37.839844 23.960938 37.949219 23.792969 C 39.40625 24.117188 40.679688 24.175781 41.625 24.175781 C 41.769531 24.175781 42.4375 23.261719 42.824219 22.695313 C 42.25 22.816406 40.542969 23.050781 38.214844 22.382813 C 38.160156 22.121094 38.050781 21.867188 37.878906 21.640625 C 37.289063 20.863281 36.207031 20.695313 35.402344 21.214844 C 34.589844 20.777344 33.742188 20.226563 32.871094 19.535156 C 32.691406 19.394531 32.523438 19.253906 32.359375 19.117188 C 32.894531 18.273438 32.949219 17.195313 32.480469 16.289063 C 32.585938 16.179688 32.691406 16.074219 32.804688 15.96875 C 33.671875 15.15625 34.484375 14.511719 35.246094 13.992188 C 35.214844 13.964844 35.1875 13.933594 35.15625 13.90625 C 35.1875 13.933594 35.21875 13.960938 35.246094 13.988281 C 36.414063 15.070313 37.65625 16.097656 38.828125 17.011719 C 38.519531 17.667969 38.570313 18.472656 39.039063 19.089844 Z M 39.039063 19.089844 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureApplicationGateway.png b/dist/Networking/AzureApplicationGateway.png
index 5ca8a355..6fe59a13 100644
Binary files a/dist/Networking/AzureApplicationGateway.png and b/dist/Networking/AzureApplicationGateway.png differ
diff --git a/dist/Networking/AzureApplicationGateway.puml b/dist/Networking/AzureApplicationGateway.puml
index a81fef44..ee73735d 100644
--- a/dist/Networking/AzureApplicationGateway.puml
+++ b/dist/Networking/AzureApplicationGateway.puml
@@ -1,10 +1,10 @@
 sprite $AzureApplicationGateway [70x70/16z] {
-fTS5OkH034JH4fNkV-AWnsfRcvNJ-SFqnWmOKYV3yBU2t-dVaMBsaMBsaKgtaSRi8k4UnMmXeVXAR8-9mr2F21V06_CG4PWYoEDvOnuXNm-2O9YA78pz3g72
-lYt1Pw9macc_GXnQus11KkHJMPWPeOWgIQbt0ixCPqpznC0GGFo4DR-ofmWT4VXCISfhIkNAp0WDT02GSt4BEd9bPeGAAZxZLr-UWoip8pJG040kIfxP4uGE
-Sb4SegB8cIdacAs06U0dB9ep4rmJSIZfW40FE7BDPeGEhHLGWmoHl6OZGifhPF2T8B8n4y9uAIx628LbomQacEyAwSoAz481Ys2u0jw9ObQaPpWIvW_PY3ZE
-D0TcH6PcHcP61-GX8peZCqCVa8VCDRiXeW0WSMCO_rLWLuJVIbuPmgzAt1JO1Sb3kJ34NR6x0bkGKXQ6Q0gQ0bsGKef1KnpQb1KffPYc4BWoAx8gnNI5WXjp
-GqefffH2Rim5QKfwANUac59W_rA8KXQaCIWccqAKiY2TGMLtXQXyGJg3bIcba58AQKoSjNd4jK8wK-LHAQr2ElDS8Mur9fio8ft9MIcafwDIoCHaLpeoCTaK
-T6HaVZeu4HOofbdCDjAPZcmm7TbWEhB1T6IBQSWUqv0zvaG2s6Mgm4xQaNsc8_jCO3zjo5OIdmQdazPt
+fTC7hkCm38JXOHlU_yQBLC8KiFEI_2Zkdvi4aITPWTygFlBV4SreH3CQqOn65lCzKfab68MKuvx5Tqmz3S-g2WDoCNz63E4eyhc-c3yYG966OeMRFPdu3A4X
+7fRXbZcIP2z680cVTuYwiNPJXe56QEPEqcPF8TdzDsOk2R0Ci7p3tZqCDC842xUSf3ts1den0c602G3s7cx5H2z687JGSOltxbw2Yn480mm0i8lIFGmqmWI9
+KHBcvkZ528I5910Ev1isxyK8X3HBE9c0mPzmzM8KmeJF1FGYownRCSMLlLu6ZmpLcv48wwMa1QiSqKSXa64U3R8OWP3biAXYfGFPBPX1Le5dnfuMev34Es_1
+I4Gp6j6C2-IFZBb6DCCKo1-PQx4GSm2mMWphlmhYYl2Xz9KXyghKKX0Nf9_AXI6s4bj1S91HUXZYK70eS0mooZ0ub8GV2Z38ACCS2e4h0moob66MGiDY5ZBA
+CACCifY5BALpb8qCCmg2F1LYb0ko60pJXqACSa4sWocsGYnbaCLWCwCGInbaC_MEv5B8QP3D76TTbTqW9_DtXTXjfhL2G32j5GAAqGe1nRHK22Yc3mKQsSnB
+2QoCWsYcJqOZcj68PZIY6OtydT68PZIYcOLyoxoH0hvZ9ereHYEQqOXcDA8PZUYiRWO3_-yV
 }
 
 AzureEntityColoring(AzureApplicationGateway)
diff --git a/dist/Networking/AzureApplicationGateway.svg b/dist/Networking/AzureApplicationGateway.svg
index 759c9480..437ca351 100644
--- a/dist/Networking/AzureApplicationGateway.svg
+++ b/dist/Networking/AzureApplicationGateway.svg
@@ -18,12 +18,12 @@
 </defs>
 <g id="surface1">
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 35 70 C 33.320313 70 31.640625 69.300781 30.378906 68.039063 L 1.960938 39.621094 C 0.699219 38.359375 0 36.679688 0 35 C 0 33.320313 0.699219 31.640625 1.960938 30.378906 L 30.378906 1.960938 C 31.640625 0.699219 33.320313 0 35 0 C 36.679688 0 38.359375 0.699219 39.621094 1.960938 L 68.179688 30.519531 C 69.441406 31.78125 70.140625 33.320313 70.140625 35.140625 C 70.140625 36.820313 69.441406 38.5 68.179688 39.761719 L 39.621094 68.039063 C 38.359375 69.300781 36.679688 70 35 70 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 41.632813 26.019531 C 39.753906 27.460938 37.449219 28.242188 35.082031 28.242188 C 31.714844 28.246094 28.542969 26.679688 26.496094 24.007813 C 24.753906 21.734375 23.988281 18.863281 24.367188 16.023438 C 24.742188 13.183594 26.234375 10.609375 28.507813 8.871094 C 30.386719 7.425781 32.691406 6.644531 35.058594 6.648438 C 38.425781 6.644531 41.601563 8.210938 43.644531 10.886719 C 47.269531 15.617188 46.367188 22.394531 41.632813 26.019531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 41.632813 26.019531 C 39.675781 27.515625 37.371094 28.242188 35.082031 28.242188 C 31.832031 28.242188 28.621094 26.785156 26.496094 24.007813 C 22.871094 19.273438 23.765625 12.5 28.507813 8.871094 C 30.464844 7.367188 32.773438 6.648438 35.058594 6.648438 C 38.308594 6.648438 41.519531 8.105469 43.644531 10.886719 C 47.269531 15.621094 46.367188 22.394531 41.632813 26.019531 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35 63.839844 L 44.238281 54.601563 L 37.660156 54.601563 L 37.660156 26.808594 L 32.199219 26.808594 L 32.199219 54.601563 L 25.761719 54.601563 Z M 35 63.839844 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 55.0625 46.871094 L 55.0625 33.804688 L 50.507813 38.359375 L 38.6875 26.535156 L 34.726563 30.496094 L 46.546875 42.316406 L 41.996094 46.871094 Z M 55.0625 46.871094 "/>
 <path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 14.960938 46.921875 L 28.023438 46.921875 L 23.472656 42.367188 L 35.625 30.214844 L 31.664063 26.253906 L 19.511719 38.40625 L 14.960938 33.855469 Z M 14.960938 46.921875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 40.761719 24.878906 C 39.132813 26.128906 37.132813 26.808594 35.078125 26.808594 C 32.160156 26.8125 29.410156 25.457031 27.636719 23.136719 C 26.125 21.164063 25.460938 18.675781 25.789063 16.210938 C 26.117188 13.75 27.410156 11.519531 29.382813 10.011719 C 31.007813 8.757813 33.007813 8.078125 35.0625 8.082031 C 37.980469 8.078125 40.734375 9.4375 42.503906 11.757813 C 44.015625 13.726563 44.679688 16.21875 44.351563 18.679688 C 44.027344 21.140625 42.734375 23.371094 40.761719 24.878906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.039063 19.089844 C 39.71875 19.972656 40.980469 20.140625 41.867188 19.464844 C 41.910156 19.429688 41.945313 19.386719 41.988281 19.347656 C 42.890625 19.984375 43.519531 20.40625 43.871094 20.644531 C 43.976563 20.375 44.046875 20.113281 44.121094 19.84375 C 43.578125 19.433594 43.039063 19.015625 42.515625 18.585938 C 42.765625 17.933594 42.660156 17.203125 42.242188 16.648438 C 41.625 15.847656 40.515625 15.628906 39.640625 16.132813 C 38.582031 15.179688 37.546875 14.203125 36.535156 13.199219 C 39.96875 11.351563 42.40625 11.621094 42.40625 11.621094 C 42.007813 11.113281 41.554688 10.652344 41.054688 10.238281 C 39.609375 10.011719 37.359375 10.039063 34.789063 11.40625 L 34.789063 11.402344 C 33.890625 10.464844 33.019531 9.5 32.171875 8.515625 C 31.75 8.652344 31.332031 8.820313 30.933594 9.019531 C 31.589844 10.089844 32.46875 11.171875 33.460938 12.226563 L 33.46875 12.234375 C 32.53125 12.898438 31.660156 13.652344 30.867188 14.488281 C 30.761719 14.601563 30.65625 14.71875 30.554688 14.835938 C 30.039063 14.726563 29.503906 14.761719 29.011719 14.941406 C 28.164063 13.109375 28.230469 11.640625 28.367188 10.882813 C 27.996094 11.261719 27.660156 11.671875 27.355469 12.105469 C 27.136719 13.011719 27.074219 14.316406 27.726563 15.886719 C 26.878906 16.996094 26.96875 18.554688 27.9375 19.558594 C 27.625 20.628906 27.441406 21.730469 27.386719 22.839844 C 27.476563 22.960938 27.476563 23.058594 27.566406 23.175781 C 28.015625 23.753906 28.578125 24.238281 29.121094 24.679688 C 29.035156 23.226563 29.253906 21.777344 29.765625 20.417969 C 30.203125 20.453125 30.652344 20.382813 31.070313 20.207031 C 32.117188 21.15625 33.292969 21.957031 34.558594 22.585938 C 34.507813 23.054688 34.636719 23.527344 34.921875 23.902344 C 35.550781 24.71875 36.71875 24.871094 37.535156 24.246094 C 37.703125 24.117188 37.839844 23.960938 37.949219 23.792969 C 39.40625 24.117188 40.679688 24.175781 41.625 24.175781 C 41.769531 24.175781 42.4375 23.261719 42.824219 22.695313 C 42.25 22.816406 40.542969 23.050781 38.214844 22.382813 C 38.160156 22.113281 38.046875 21.859375 37.878906 21.640625 C 37.289063 20.871094 36.210938 20.6875 35.402344 21.214844 C 34.316406 20.625 33.296875 19.921875 32.359375 19.117188 C 32.898438 18.261719 32.945313 17.183594 32.480469 16.289063 C 32.585938 16.179688 32.691406 16.074219 32.804688 15.96875 C 33.566406 15.246094 34.382813 14.585938 35.246094 13.992188 C 35.214844 13.964844 35.1875 13.933594 35.15625 13.90625 L 35.246094 13.988281 C 36.414063 15.070313 37.65625 16.097656 38.828125 17.011719 C 38.503906 17.6875 38.585938 18.492188 39.039063 19.089844 Z M 39.039063 19.089844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 40.761719 24.878906 C 39.0625 26.175781 37.066406 26.808594 35.078125 26.808594 C 32.261719 26.808594 29.476563 25.542969 27.636719 23.136719 C 24.492188 19.03125 25.269531 13.160156 29.382813 10.011719 C 31.078125 8.707031 33.078125 8.082031 35.0625 8.082031 C 37.878906 8.082031 40.664063 9.347656 42.503906 11.757813 C 45.652344 15.863281 44.867188 21.738281 40.761719 24.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.039063 19.089844 C 39.722656 19.976563 40.984375 20.136719 41.867188 19.464844 C 41.910156 19.429688 41.945313 19.386719 41.988281 19.347656 C 42.890625 19.984375 43.519531 20.40625 43.871094 20.644531 C 43.976563 20.375 44.046875 20.113281 44.121094 19.84375 C 43.75 19.566406 43.242188 19.175781 42.515625 18.585938 C 42.753906 17.957031 42.675781 17.222656 42.242188 16.648438 C 41.613281 15.839844 40.507813 15.632813 39.640625 16.132813 C 38.6875 15.277344 37.640625 14.296875 36.535156 13.199219 C 39.96875 11.351563 42.40625 11.621094 42.40625 11.621094 C 42 11.101563 41.542969 10.648438 41.054688 10.238281 C 39.609375 10.011719 37.359375 10.039063 34.789063 11.40625 L 34.789063 11.402344 C 33.933594 10.507813 33.0625 9.546875 32.171875 8.515625 C 31.75 8.652344 31.332031 8.820313 30.933594 9.019531 C 31.589844 10.089844 32.46875 11.171875 33.460938 12.226563 C 33.464844 12.230469 33.46875 12.230469 33.46875 12.234375 C 32.640625 12.8125 31.71875 13.589844 30.867188 14.488281 C 30.757813 14.601563 30.65625 14.71875 30.554688 14.835938 C 30.046875 14.730469 29.511719 14.761719 29.011719 14.941406 C 28.164063 13.109375 28.230469 11.640625 28.367188 10.882813 C 27.996094 11.269531 27.652344 11.675781 27.355469 12.105469 C 27.136719 13.011719 27.074219 14.316406 27.726563 15.886719 C 26.972656 16.878906 26.933594 18.28125 27.726563 19.316406 C 27.792969 19.402344 27.863281 19.480469 27.9375 19.558594 C 27.589844 20.734375 27.4375 21.867188 27.386719 22.839844 C 27.476563 22.960938 27.476563 23.058594 27.566406 23.175781 C 28.015625 23.753906 28.578125 24.238281 29.121094 24.679688 C 29.054688 23.648438 29.128906 22.128906 29.765625 20.417969 C 30.203125 20.453125 30.652344 20.382813 31.070313 20.207031 C 31.308594 20.417969 31.558594 20.628906 31.828125 20.847656 C 32.746094 21.574219 33.664063 22.140625 34.558594 22.585938 C 34.511719 23.042969 34.625 23.511719 34.921875 23.902344 C 35.550781 24.71875 36.71875 24.871094 37.535156 24.246094 C 37.703125 24.117188 37.839844 23.960938 37.949219 23.792969 C 39.40625 24.117188 40.679688 24.175781 41.625 24.175781 C 41.769531 24.175781 42.4375 23.261719 42.824219 22.695313 C 42.25 22.816406 40.542969 23.050781 38.214844 22.382813 C 38.160156 22.121094 38.050781 21.867188 37.878906 21.640625 C 37.289063 20.863281 36.207031 20.695313 35.402344 21.214844 C 34.589844 20.777344 33.742188 20.226563 32.871094 19.535156 C 32.691406 19.394531 32.523438 19.253906 32.359375 19.117188 C 32.894531 18.273438 32.949219 17.195313 32.480469 16.289063 C 32.585938 16.179688 32.691406 16.074219 32.804688 15.96875 C 33.671875 15.15625 34.484375 14.511719 35.246094 13.992188 C 35.214844 13.964844 35.1875 13.933594 35.15625 13.90625 C 35.1875 13.933594 35.21875 13.960938 35.246094 13.988281 C 36.414063 15.070313 37.65625 16.097656 38.828125 17.011719 C 38.519531 17.667969 38.570313 18.472656 39.039063 19.089844 Z M 39.039063 19.089844 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureApplicationSecurityGroup(m).png b/dist/Networking/AzureApplicationSecurityGroup(m).png
new file mode 100644
index 00000000..0e5578b2
Binary files /dev/null and b/dist/Networking/AzureApplicationSecurityGroup(m).png differ
diff --git a/dist/Networking/AzureApplicationSecurityGroup(m).svg b/dist/Networking/AzureApplicationSecurityGroup(m).svg
new file mode 100644
index 00000000..d3f5b1b6
--- /dev/null
+++ b/dist/Networking/AzureApplicationSecurityGroup(m).svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 41.347656 23.160156 L 53 8.34375 C 37.578125 6.644531 35 0 35 0 C 35 0 31.527344 8.738281 9.34375 8.738281 L 9.34375 44.59375 C 9.34375 48.929688 11.75 52.988281 15.085938 56.539063 L 23.703125 45.589844 Z M 41.347656 23.160156 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.94902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51 18.199219 L 18.777344 18.199219 C 17.683594 18.199219 16.800781 19.179688 16.800781 20.273438 L 16.800781 42.742188 C 16.800781 43.828125 17.683594 44.796875 18.777344 44.796875 L 30.78125 44.796875 L 30.773438 44.800781 C 31.886719 48.972656 30.402344 49.59375 23.917969 49.601563 L 23.800781 49.601563 L 23.800781 51.800781 L 46.199219 51.800781 L 46.199219 49.601563 L 46.082031 49.601563 C 39.597656 49.59375 38.113281 48.972656 39.226563 44.800781 L 39.21875 44.796875 L 51 44.796875 C 52.09375 44.796875 53.199219 43.828125 53.199219 42.742188 L 53.199219 20.273438 C 53.199219 19.175781 52.09375 18.199219 51 18.199219 Z M 50.359375 41.996094 L 19.558594 41.996094 L 19.558594 21 L 50.359375 21 Z M 50.359375 41.996094 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.94902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.019531 30.863281 C 34.984375 30.863281 34.953125 30.851563 34.921875 30.835938 L 28.511719 27.136719 C 28.453125 27.097656 28.417969 27.035156 28.414063 26.96875 C 28.414063 26.898438 28.453125 26.832031 28.511719 26.796875 L 34.882813 23.125 C 34.941406 23.089844 35.015625 23.089844 35.074219 23.125 L 41.484375 26.824219 C 41.546875 26.859375 41.582031 26.921875 41.582031 26.992188 C 41.582031 27.0625 41.546875 27.125 41.484375 27.160156 L 35.117188 30.835938 C 35.085938 30.851563 35.054688 30.863281 35.019531 30.863281 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.101563 39.855469 C 34.066406 39.855469 34.03125 39.847656 34 39.828125 L 27.613281 36.140625 C 27.550781 36.109375 27.511719 36.042969 27.511719 35.972656 L 27.511719 28.574219 C 27.511719 28.503906 27.550781 28.441406 27.613281 28.40625 C 27.671875 28.371094 27.746094 28.371094 27.808594 28.40625 L 34.195313 32.089844 C 34.253906 32.128906 34.289063 32.191406 34.292969 32.261719 L 34.292969 39.660156 C 34.292969 39.730469 34.253906 39.792969 34.195313 39.828125 C 34.167969 39.84375 34.132813 39.855469 34.101563 39.855469 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.910156 39.855469 C 35.875 39.855469 35.839844 39.847656 35.808594 39.828125 C 35.75 39.792969 35.714844 39.730469 35.714844 39.660156 L 35.714844 32.304688 C 35.714844 32.238281 35.75 32.171875 35.808594 32.136719 L 42.199219 28.453125 C 42.257813 28.417969 42.332031 28.417969 42.390625 28.453125 C 42.449219 28.484375 42.488281 28.550781 42.488281 28.621094 L 42.488281 35.972656 C 42.488281 36.042969 42.449219 36.105469 42.390625 36.140625 L 36.003906 39.828125 C 35.972656 39.847656 35.941406 39.855469 35.910156 39.855469 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 53 8.34375 C 37.578125 6.644531 35 0 35 0 C 35 0 31.527344 8.738281 9.34375 8.738281 L 9.34375 44.59375 C 9.34375 48.929688 11.75 52.988281 15.085938 56.539063 C 22.652344 64.585938 35 70 35 70 C 35 70 60.65625 58.761719 60.65625 44.59375 L 60.65625 8.738281 C 57.804688 8.738281 55.265625 8.59375 53 8.34375 Z M 53 8.34375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 19.558594 41.996094 L 19.601563 41.996094 L 19.601563 21 L 47.757813 20.960938 L 47.761719 20.960938 L 19.558594 21 Z M 19.558594 41.996094 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureApplicationSecurityGroup.png b/dist/Networking/AzureApplicationSecurityGroup.png
new file mode 100644
index 00000000..250fdfa5
Binary files /dev/null and b/dist/Networking/AzureApplicationSecurityGroup.png differ
diff --git a/dist/Networking/AzureApplicationSecurityGroup.puml b/dist/Networking/AzureApplicationSecurityGroup.puml
new file mode 100644
index 00000000..d43943a2
--- /dev/null
+++ b/dist/Networking/AzureApplicationSecurityGroup.puml
@@ -0,0 +1,11 @@
+sprite $AzureApplicationSecurityGroup [70x70/16z] {
+hTM7jQGm341HIPOL-wzt4xCSVw97S0juu0otaE45QlH6n1vdIEqlXYUwVIX14NORIAdJn3QKlmfXwsh7f5sNa8WQSnUr6ohIkJMYWw3OjCYF9nNF5oeURrGY
+NwX4lb3nVA7YKQhi8yyhaRELpgUw_EFt5OHxVbk12JPH8Jtc2vchjEkPrL95-X0fLeG0WCqywnLjy0zAr2iCg-Rb2i4AjLmnGLXmH1Gho6Ry6OvthLQGkcb3
+ZH3cUWMngKKeyxCAeaNdDohyl49lLEXnfVsDh1KlLapQMf78QiL3befuPhNYaHdTebjchR941jLAv9CAqZ_j14rLNdcFEjpYEArq-o4M20k9GNu4xF3XuqF3
+67OSTfeDF6Sg2djZ9BPVwtc0OK_6IBYRAIFyrsIeBm8Eq3Wf0OTaDw0TNIDJbK0uWkFCnh6X8d2i3pDxo-6CpaU2u28JEOVX77hEwN258cS8G3spZzG75Hqc
+s4samHJ92qumYIFFACn3oqF1y9KUkQS8NqAjJEjUyno4GCquouPGrsDf43o24XEDtm
+}
+
+AzureEntityColoring(AzureApplicationSecurityGroup)
+!define AzureApplicationSecurityGroup(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureApplicationSecurityGroup, AzureApplicationSecurityGroup)
+!define AzureApplicationSecurityGroup(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureApplicationSecurityGroup, AzureApplicationSecurityGroup)
diff --git a/dist/Networking/AzureApplicationSecurityGroup.svg b/dist/Networking/AzureApplicationSecurityGroup.svg
new file mode 100644
index 00000000..457ef9b7
--- /dev/null
+++ b/dist/Networking/AzureApplicationSecurityGroup.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 41.347656 23.160156 L 53 8.34375 C 37.578125 6.644531 35 0 35 0 C 35 0 31.527344 8.738281 9.34375 8.738281 L 9.34375 44.59375 C 9.34375 48.929688 11.75 52.988281 15.085938 56.539063 L 23.703125 45.589844 Z M 41.347656 23.160156 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.94902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51 18.199219 L 18.777344 18.199219 C 17.683594 18.199219 16.800781 19.179688 16.800781 20.273438 L 16.800781 42.742188 C 16.800781 43.828125 17.683594 44.796875 18.777344 44.796875 L 30.78125 44.796875 L 30.773438 44.800781 C 31.886719 48.972656 30.402344 49.59375 23.917969 49.601563 L 23.800781 49.601563 L 23.800781 51.800781 L 46.199219 51.800781 L 46.199219 49.601563 L 46.082031 49.601563 C 39.597656 49.59375 38.113281 48.972656 39.226563 44.800781 L 39.21875 44.796875 L 51 44.796875 C 52.09375 44.796875 53.199219 43.828125 53.199219 42.742188 L 53.199219 20.273438 C 53.199219 19.175781 52.09375 18.199219 51 18.199219 Z M 50.359375 41.996094 L 19.558594 41.996094 L 19.558594 21 L 50.359375 21 Z M 50.359375 41.996094 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.94902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.019531 30.863281 C 34.984375 30.863281 34.953125 30.851563 34.921875 30.835938 L 28.511719 27.136719 C 28.453125 27.097656 28.417969 27.035156 28.414063 26.96875 C 28.414063 26.898438 28.453125 26.832031 28.511719 26.796875 L 34.882813 23.125 C 34.941406 23.089844 35.015625 23.089844 35.074219 23.125 L 41.484375 26.824219 C 41.546875 26.859375 41.582031 26.921875 41.582031 26.992188 C 41.582031 27.0625 41.546875 27.125 41.484375 27.160156 L 35.117188 30.835938 C 35.085938 30.851563 35.054688 30.863281 35.019531 30.863281 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.101563 39.855469 C 34.066406 39.855469 34.03125 39.847656 34 39.828125 L 27.613281 36.140625 C 27.550781 36.109375 27.511719 36.042969 27.511719 35.972656 L 27.511719 28.574219 C 27.511719 28.503906 27.550781 28.441406 27.613281 28.40625 C 27.671875 28.371094 27.746094 28.371094 27.808594 28.40625 L 34.195313 32.089844 C 34.253906 32.128906 34.289063 32.191406 34.292969 32.261719 L 34.292969 39.660156 C 34.292969 39.730469 34.253906 39.792969 34.195313 39.828125 C 34.167969 39.84375 34.132813 39.855469 34.101563 39.855469 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.910156 39.855469 C 35.875 39.855469 35.839844 39.847656 35.808594 39.828125 C 35.75 39.792969 35.714844 39.730469 35.714844 39.660156 L 35.714844 32.304688 C 35.714844 32.238281 35.75 32.171875 35.808594 32.136719 L 42.199219 28.453125 C 42.257813 28.417969 42.332031 28.417969 42.390625 28.453125 C 42.449219 28.484375 42.488281 28.550781 42.488281 28.621094 L 42.488281 35.972656 C 42.488281 36.042969 42.449219 36.105469 42.390625 36.140625 L 36.003906 39.828125 C 35.972656 39.847656 35.941406 39.855469 35.910156 39.855469 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 53 8.34375 C 37.578125 6.644531 35 0 35 0 C 35 0 31.527344 8.738281 9.34375 8.738281 L 9.34375 44.59375 C 9.34375 48.929688 11.75 52.988281 15.085938 56.539063 C 22.652344 64.585938 35 70 35 70 C 35 70 60.65625 58.761719 60.65625 44.59375 L 60.65625 8.738281 C 57.804688 8.738281 55.265625 8.59375 53 8.34375 Z M 53 8.34375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 19.558594 41.996094 L 19.601563 41.996094 L 19.601563 21 L 47.757813 20.960938 L 47.761719 20.960938 L 19.558594 21 Z M 19.558594 41.996094 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureAzureDDoSProtection.puml b/dist/Networking/AzureAzureDDoSProtection.puml
deleted file mode 100644
index d2766532..00000000
--- a/dist/Networking/AzureAzureDDoSProtection.puml
+++ /dev/null
@@ -1,10 +0,0 @@
-sprite $AzureAzureDDoSProtection [51x70/16z] {
-lT454jim48NXvGqellzn6z1KYcjuM_g74jkVaFOogcQXPH4X9U7nod0WqNC1WNS08hPOvSgq6wl5PcuoCsOHKJNtECxTL4IOEU2o5_-IP9bacUJ_8BbFydhx
-fMj67f3RVQDR7f7xPdNIJadxwld_bBIhUPi3I9ZTsiyU3Peb9j49i9SX03Bgl4OQIAPbBSkZmTllucdWG-xYMIjSvKUWXpmcmGzvo09f9VAvzXv6uj8tKZda
--p92I9gDIS13lhLbX6z_1CtoFqWharOcxPyG_oOD8FPb4Y6giu08yoGW4aHU94h4Gq24djaGs-I-ckJP47dT8jSSERsJGVAoKKunVTAdm1AYde52QUIGC9ep
-J1IDqZg5TpwI8n1CMt7i2gUz5DW6D94p7MRm52FsrMKWISm71QOT21Mo9r3QxWS
-}
-
-AzureEntityColoring(AzureAzureDDoSProtection)
-!define AzureAzureDDoSProtection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAzureDDoSProtection, AzureAzureDDoSProtection)
-!define AzureAzureDDoSProtection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAzureDDoSProtection, AzureAzureDDoSProtection)
diff --git a/dist/Networking/AzureConnection(m).png b/dist/Networking/AzureConnection(m).png
new file mode 100644
index 00000000..b7a65ef1
Binary files /dev/null and b/dist/Networking/AzureConnection(m).png differ
diff --git a/dist/Networking/AzureConnection(m).svg b/dist/Networking/AzureConnection(m).svg
new file mode 100644
index 00000000..c3189fd4
--- /dev/null
+++ b/dist/Networking/AzureConnection(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 52.921875 18.339844 L 48.300781 13.71875 L 33.320313 28.839844 L 48.300781 43.960938 L 52.921875 39.621094 L 42.699219 29.261719 Z M 52.921875 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 17.078125 31.078125 L 27.300781 41.300781 L 17.078125 51.660156 L 21.699219 56.28125 L 36.679688 41.160156 L 21.699219 26.039063 Z M 17.078125 31.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 35 0 C 15.539063 0 0 15.960938 0 35 C 0 54.460938 15.960938 70 35 70 C 54.039063 70 70 54.039063 70 35 C 70 15.960938 54.460938 0 35 0 Z M 35 4.621094 C 51.800781 4.621094 65.378906 18.199219 65.378906 35 C 65.378906 51.800781 51.660156 65.378906 35 65.378906 C 18.339844 65.378906 4.621094 51.660156 4.621094 35 C 4.621094 18.339844 18.199219 4.621094 35 4.621094 Z M 35 4.621094 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureConnection.png b/dist/Networking/AzureConnection.png
new file mode 100644
index 00000000..227479e8
Binary files /dev/null and b/dist/Networking/AzureConnection.png differ
diff --git a/dist/Networking/AzureConnection.puml b/dist/Networking/AzureConnection.puml
new file mode 100644
index 00000000..a89a5450
--- /dev/null
+++ b/dist/Networking/AzureConnection.puml
@@ -0,0 +1,12 @@
+sprite $AzureConnection [70x70/16z] {
+fPS9bkGm24Cj4Bd_ZMVDA4qv932jtfVw5hBD2-j1vemuVYleXZMNCOvFqKS8y2WKDcBKyXOZyk91dkb8xtxya6X8KSU5nhEH2u6rwm9vnuY_PiOIGZ4wkU4H
+mlKYUyA4Dk1LKM9Ofby7Y0Aof5PLjt2kjkncLRIT40dZAQusX4IoRv_re0MvCCpHGDGEvCA4Qj9FR4F8j3g-_Z2081qFVldU9n19wylA5A9jeRxpDiIM93Fw
+PWR9PcmjawafH77mp1PDYDyt2Nr9ChGWAWdhfY2Gw41KajiPJuQGQ42qIt4woX1X4WLrz-GM2q_jPkgUluLhd67y7oLM5rEsJb5wc9h2zGqCCgMFgIbzJ2EN
+ESPkzcYEyUtKZJ7gjxe1VOnjDq2tSPVlrx3ecO6owrg626DtpIvjKWcHYDl6gtWRaEfAdp2VGd8i-lgV47c8ecSs8EUBhoCyX-YrL6a7RY1SBIkuQeif99KX
+Cpw7g0eXzHFw42gL_H4JBOWMpvVXeg87mVR0wpcQFYJs4dNsq9vBzhZbfZ-ZOZCumQ2QfN3qPnkhbqHxMcRwnmB3bf5wjNWVOgqUOINFGtazbiURtLFXjf8W
+H39Rsn69RWQOEKLeZfVWyQZ0wgdWAB2kx1OKtYVaD4MWhL8_0G
+}
+
+AzureEntityColoring(AzureConnection)
+!define AzureConnection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureConnection, AzureConnection)
+!define AzureConnection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureConnection, AzureConnection)
diff --git a/dist/Networking/AzureConnection.svg b/dist/Networking/AzureConnection.svg
new file mode 100644
index 00000000..6ef5026d
--- /dev/null
+++ b/dist/Networking/AzureConnection.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 52.921875 18.339844 L 48.300781 13.71875 L 33.320313 28.839844 L 48.300781 43.960938 L 52.921875 39.621094 L 42.699219 29.261719 Z M 52.921875 18.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 17.078125 31.078125 L 27.300781 41.300781 L 17.078125 51.660156 L 21.699219 56.28125 L 36.679688 41.160156 L 21.699219 26.039063 Z M 17.078125 31.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 35 0 C 15.539063 0 0 15.960938 0 35 C 0 54.460938 15.960938 70 35 70 C 54.039063 70 70 54.039063 70 35 C 70 15.960938 54.460938 0 35 0 Z M 35 4.621094 C 51.800781 4.621094 65.378906 18.199219 65.378906 35 C 65.378906 51.800781 51.660156 65.378906 35 65.378906 C 18.339844 65.378906 4.621094 51.660156 4.621094 35 C 4.621094 18.339844 18.199219 4.621094 35 4.621094 Z M 35 4.621094 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureAzureDDoSProtection(m).png b/dist/Networking/AzureDDOSProtectionPlan(m).png
similarity index 100%
rename from dist/Networking/AzureAzureDDoSProtection(m).png
rename to dist/Networking/AzureDDOSProtectionPlan(m).png
diff --git a/dist/Networking/AzureAzureDDoSProtection(m).svg b/dist/Networking/AzureDDOSProtectionPlan(m).svg
similarity index 100%
rename from dist/Networking/AzureAzureDDoSProtection(m).svg
rename to dist/Networking/AzureDDOSProtectionPlan(m).svg
diff --git a/dist/Networking/AzureAzureDDoSProtection.png b/dist/Networking/AzureDDOSProtectionPlan.png
similarity index 100%
rename from dist/Networking/AzureAzureDDoSProtection.png
rename to dist/Networking/AzureDDOSProtectionPlan.png
diff --git a/dist/Networking/AzureDDOSProtectionPlan.puml b/dist/Networking/AzureDDOSProtectionPlan.puml
new file mode 100644
index 00000000..a84774e3
--- /dev/null
+++ b/dist/Networking/AzureDDOSProtectionPlan.puml
@@ -0,0 +1,10 @@
+sprite $AzureDDOSProtectionPlan [51x70/16z] {
+lT454jim48NXvGqellzn6z1KYcjuM_g74jkVaFOogcQXPH4X9U7nod0WqNC1WNS08hPOvSgq6wl5PcuoCsOHKJNtECxTL4IOEU2o5_-IP9bacUJ_8BbFydhx
+fMj67f3RVQDR7f7xPdNIJadxwld_bBIhUPi3I9ZTsiyU3Peb9j49i9SX03Bgl4OQIAPbBSkZmTllucdWG-xYMIjSvKUWXpmcmGzvo09f9VAvzXv6uj8tKZda
+-p92I9gDIS13lhLbX6z_1CtoFqWharOcxPyG_oOD8FPb4Y6giu08yoGW4aHU94h4Gq24djaGs-I-ckJP47dT8jSSERsJGVAoKKunVTAdm1AYde52QUIGC9ep
+J1IDqZg5TpwI8n1CMt7i2gUz5DW6D94p7MRm52FsrMKWISm71QOT21Mo9r3QxWS
+}
+
+AzureEntityColoring(AzureDDOSProtectionPlan)
+!define AzureDDOSProtectionPlan(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDDOSProtectionPlan, AzureDDOSProtectionPlan)
+!define AzureDDOSProtectionPlan(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDDOSProtectionPlan, AzureDDOSProtectionPlan)
diff --git a/dist/Networking/AzureAzureDDoSProtection.svg b/dist/Networking/AzureDDOSProtectionPlan.svg
similarity index 100%
rename from dist/Networking/AzureAzureDDoSProtection.svg
rename to dist/Networking/AzureDDOSProtectionPlan.svg
diff --git a/dist/Networking/AzureDNS(m).png b/dist/Networking/AzureDNS(m).png
index bfece9f6..f300acba 100644
Binary files a/dist/Networking/AzureDNS(m).png and b/dist/Networking/AzureDNS(m).png differ
diff --git a/dist/Networking/AzureDNS(m).svg b/dist/Networking/AzureDNS(m).svg
index 7bad41be..925e502c 100644
--- a/dist/Networking/AzureDNS(m).svg
+++ b/dist/Networking/AzureDNS(m).svg
@@ -1,9 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 10.25 59.75 C -3.417969 46.082031 -3.417969 23.921875 10.25 10.253906 C 23.917969 -3.414063 46.078125 -3.414063 59.746094 10.253906 Z M 10.25 59.75 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 67.199219 34.996094 C 67.199219 27.78125 64.753906 20.828125 60.246094 15.160156 L 59.988281 14.902344 C 59.859375 14.773438 59.859375 14.644531 59.730469 14.515625 L 57.667969 12.324219 C 51.613281 6.144531 43.628906 2.792969 35 2.792969 C 35 2.792969 35 2.792969 34.871094 2.792969 L 34.742188 2.792969 C 26.242188 2.921875 18.386719 6.144531 12.332031 12.195313 L 10.140625 14.515625 C 10.011719 14.644531 10.011719 14.773438 9.882813 14.902344 L 9.625 15.03125 C 5.246094 20.699219 2.800781 27.78125 2.800781 34.996094 C 2.800781 42.207031 5.246094 49.164063 9.753906 54.828125 L 10.011719 55.085938 C 10.140625 55.214844 10.140625 55.34375 10.269531 55.472656 L 12.332031 57.664063 C 18.386719 63.71875 26.242188 67.066406 34.742188 67.066406 L 34.871094 67.066406 C 34.871094 67.066406 34.871094 67.066406 35 67.066406 C 43.5 67.066406 51.613281 63.71875 57.667969 57.664063 L 59.730469 55.34375 C 59.859375 55.214844 59.859375 55.085938 59.988281 54.957031 L 60.246094 54.699219 C 64.753906 49.292969 67.199219 42.207031 67.199219 34.996094 Z M 54.191406 14 C 54.0625 14 53.933594 14.128906 53.804688 14.128906 C 53.546875 14.257813 53.289063 14.386719 53.160156 14.386719 C 52.644531 14.644531 52 14.773438 51.359375 15.03125 C 51.230469 15.03125 51.101563 15.160156 50.972656 15.160156 C 50.199219 15.417969 49.554688 15.546875 48.78125 15.804688 C 48.652344 15.804688 48.394531 15.933594 48.265625 15.933594 C 47.105469 12.839844 45.691406 10.136719 44.015625 8.074219 C 47.75 9.234375 51.230469 11.296875 54.191406 14 Z M 34.742188 6.53125 L 34.871094 6.53125 C 38.347656 6.53125 41.957031 10.265625 44.53125 16.703125 C 41.570313 17.21875 38.347656 17.476563 35 17.476563 C 31.652344 17.476563 28.300781 17.21875 25.210938 16.703125 C 27.660156 10.394531 31.265625 6.660156 34.742188 6.53125 Z M 25.597656 8.203125 C 24.050781 10.265625 22.636719 12.839844 21.476563 15.933594 C 21.347656 15.933594 21.347656 15.933594 21.21875 15.933594 C 20.445313 15.675781 19.671875 15.546875 19.027344 15.289063 C 18.898438 15.289063 18.769531 15.160156 18.640625 15.160156 C 18.128906 14.902344 17.484375 14.644531 16.96875 14.386719 C 16.710938 14.257813 16.582031 14.257813 16.324219 14.128906 C 16.195313 14 16.066406 14 15.808594 13.871094 C 18.769531 11.425781 21.992188 9.363281 25.597656 8.203125 Z M 15.808594 55.988281 C 15.9375 55.988281 16.066406 55.859375 16.195313 55.859375 C 16.453125 55.730469 16.582031 55.730469 16.839844 55.601563 C 17.355469 55.34375 18 55.214844 18.640625 54.957031 C 18.769531 54.957031 18.898438 54.828125 19.027344 54.828125 C 19.800781 54.570313 20.445313 54.441406 21.21875 54.1875 C 21.347656 54.1875 21.347656 54.1875 21.476563 54.1875 C 22.636719 57.148438 24.050781 59.851563 25.597656 61.914063 C 21.992188 60.625 18.640625 58.566406 15.808594 55.988281 Z M 34.871094 63.460938 L 34.742188 63.460938 C 31.265625 63.332031 27.660156 59.722656 25.210938 53.414063 C 28.300781 52.898438 31.652344 52.640625 35 52.640625 C 38.347656 52.640625 41.441406 52.898438 44.53125 53.414063 C 42.085938 59.722656 38.347656 63.460938 34.871094 63.460938 Z M 44.015625 61.914063 C 45.691406 59.851563 47.105469 57.148438 48.265625 54.058594 C 48.394531 54.058594 48.652344 54.1875 48.78125 54.1875 C 49.554688 54.441406 50.328125 54.570313 50.972656 54.828125 C 51.101563 54.828125 51.230469 54.957031 51.359375 54.957031 C 52 55.214844 52.515625 55.34375 53.160156 55.601563 C 53.417969 55.730469 53.546875 55.730469 53.804688 55.859375 C 53.933594 55.859375 54.0625 55.988281 54.320313 56.117188 C 51.230469 58.695313 47.75 60.753906 44.015625 61.914063 Z M 57.023438 53.027344 C 56.636719 53.027344 56.378906 52.898438 55.996094 52.769531 C 55.609375 52.640625 55.09375 52.382813 54.707031 52.253906 C 54.578125 52.253906 54.449219 52.125 54.320313 52.125 C 52.773438 51.480469 51.101563 51.09375 49.425781 50.578125 C 49.8125 49.035156 50.199219 47.488281 50.457031 45.941406 L 46.59375 45.941406 C 46.335938 47.359375 46.078125 48.648438 45.691406 49.804688 C 42.339844 49.164063 38.734375 48.90625 35 48.90625 C 31.136719 48.90625 27.53125 49.292969 24.050781 49.933594 C 23.664063 48.648438 23.40625 47.359375 23.152344 45.941406 L 19.285156 45.941406 C 19.542969 47.617188 19.929688 49.164063 20.316406 50.707031 C 18.769531 51.09375 17.226563 51.609375 15.808594 52.125 C 15.679688 52.253906 15.421875 52.253906 15.292969 52.382813 C 14.90625 52.511719 14.390625 52.769531 14.003906 52.898438 C 13.746094 52.898438 13.363281 53.027344 13.105469 53.15625 C 9.238281 48.519531 7.050781 42.722656 6.664063 36.796875 L 9.882813 36.796875 L 9.882813 33.0625 L 6.664063 33.0625 C 7.050781 27.136719 9.238281 21.46875 12.976563 16.960938 L 13.105469 16.832031 C 13.363281 16.960938 13.746094 17.089844 14.003906 17.21875 C 14.519531 17.476563 14.90625 17.605469 15.421875 17.863281 C 15.550781 17.863281 15.679688 17.992188 15.808594 17.992188 C 17.226563 18.507813 18.769531 19.023438 20.445313 19.410156 C 20.058594 20.828125 19.800781 22.242188 19.542969 23.660156 L 23.40625 23.660156 C 23.664063 22.5 23.921875 21.210938 24.179688 20.183594 C 27.660156 20.828125 31.394531 21.210938 35.128906 21.210938 C 38.863281 21.210938 42.46875 20.828125 45.820313 20.3125 C 46.078125 21.339844 46.335938 22.5 46.59375 23.789063 L 50.457031 23.789063 C 50.199219 22.371094 49.941406 20.957031 49.554688 19.539063 C 51.230469 19.152344 52.773438 18.636719 54.320313 17.992188 C 54.449219 17.992188 54.707031 17.863281 54.835938 17.863281 C 55.351563 17.734375 55.738281 17.476563 56.253906 17.347656 C 56.507813 17.21875 56.894531 17.089844 57.152344 16.960938 C 60.890625 21.597656 63.207031 27.265625 63.59375 33.191406 L 59.730469 33.191406 L 59.730469 36.925781 L 63.59375 36.925781 C 62.949219 42.722656 60.761719 48.519531 57.023438 53.027344 Z M 57.023438 53.027344 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 70 35 C 70 27.160156 67.339844 19.601563 62.441406 13.441406 L 62.160156 13.160156 C 62.019531 13.019531 62.019531 12.878906 61.878906 12.738281 L 59.640625 10.359375 C 53.058594 3.640625 44.378906 0 35 0 C 35 0 35 0 34.859375 0 L 34.71875 0 C 25.480469 0.140625 16.941406 3.640625 10.359375 10.21875 L 7.980469 12.738281 C 7.839844 12.878906 7.839844 13.019531 7.699219 13.160156 L 7.421875 13.300781 C 2.660156 19.460938 0 27.160156 0 35 C 0 42.839844 2.660156 50.398438 7.558594 56.558594 L 7.839844 56.839844 C 7.980469 56.980469 7.980469 57.121094 8.121094 57.261719 L 10.359375 59.640625 C 16.941406 66.21875 25.480469 69.859375 34.71875 69.859375 L 34.859375 69.859375 C 34.859375 69.859375 34.859375 69.859375 35 69.859375 C 44.238281 69.859375 53.058594 66.21875 59.640625 59.640625 L 61.878906 57.121094 C 62.019531 56.980469 62.019531 56.839844 62.160156 56.699219 L 62.441406 56.421875 C 67.339844 50.539063 70 42.839844 70 35 Z M 55.859375 12.179688 C 55.71875 12.179688 55.578125 12.320313 55.441406 12.320313 C 55.160156 12.460938 54.878906 12.601563 54.738281 12.601563 C 54.179688 12.878906 53.480469 13.019531 52.78125 13.300781 C 52.640625 13.300781 52.5 13.441406 52.359375 13.441406 C 51.519531 13.71875 50.820313 13.859375 49.980469 14.140625 C 49.839844 14.140625 49.558594 14.28125 49.421875 14.28125 C 48.160156 10.921875 46.621094 7.980469 44.800781 5.738281 C 48.859375 7 52.640625 9.238281 55.859375 12.179688 Z M 34.71875 4.058594 C 38.640625 4.058594 42.558594 8.121094 45.359375 15.121094 C 42.140625 15.679688 38.640625 15.960938 35 15.960938 C 31.359375 15.960938 27.71875 15.679688 24.359375 15.121094 C 27.019531 8.261719 30.941406 4.199219 34.71875 4.058594 Z M 24.78125 5.878906 C 23.101563 8.121094 21.558594 10.921875 20.300781 14.28125 C 20.160156 14.28125 20.160156 14.28125 20.019531 14.28125 C 19.179688 14 18.339844 13.859375 17.640625 13.578125 C 17.5 13.578125 17.359375 13.441406 17.21875 13.441406 C 16.660156 13.160156 15.960938 12.878906 15.398438 12.601563 C 15.121094 12.460938 14.980469 12.460938 14.699219 12.320313 C 14.558594 12.179688 14.421875 12.179688 14.140625 12.039063 C 17.359375 9.378906 20.859375 7.140625 24.78125 5.878906 Z M 14.140625 57.820313 C 14.28125 57.820313 14.421875 57.679688 14.558594 57.679688 C 14.839844 57.539063 14.980469 57.539063 15.261719 57.398438 C 15.820313 57.121094 16.519531 56.980469 17.21875 56.699219 C 17.359375 56.699219 17.5 56.558594 17.640625 56.558594 C 18.480469 56.28125 19.179688 56.140625 20.019531 55.859375 C 20.160156 55.859375 20.160156 55.859375 20.300781 55.859375 C 21.558594 59.078125 23.101563 62.019531 24.78125 64.261719 C 20.859375 62.859375 17.21875 60.621094 14.140625 57.820313 Z M 34.859375 65.941406 C 30.941406 65.800781 27.019531 61.878906 24.359375 55.019531 C 27.71875 54.460938 31.359375 54.179688 35 54.179688 C 38.640625 54.179688 42 54.460938 45.359375 55.019531 C 42.699219 61.878906 38.640625 65.941406 34.859375 65.941406 Z M 44.800781 64.261719 C 46.621094 62.019531 48.160156 59.078125 49.421875 55.71875 C 49.558594 55.71875 49.839844 55.859375 49.980469 55.859375 C 50.820313 56.140625 51.660156 56.28125 52.359375 56.558594 C 52.5 56.558594 52.640625 56.699219 52.78125 56.699219 C 53.480469 56.980469 54.039063 57.121094 54.738281 57.398438 C 55.019531 57.539063 55.160156 57.539063 55.441406 57.679688 C 55.578125 57.679688 55.71875 57.820313 56 57.960938 C 52.640625 60.761719 48.859375 63 44.800781 64.261719 Z M 58.941406 54.601563 C 58.519531 54.601563 58.238281 54.460938 57.820313 54.320313 C 57.398438 54.179688 56.839844 53.898438 56.421875 53.761719 C 56.28125 53.761719 56.140625 53.621094 56 53.621094 C 54.320313 52.921875 52.5 52.5 50.679688 51.941406 C 51.101563 50.261719 51.519531 48.578125 51.800781 46.898438 L 47.601563 46.898438 C 47.320313 48.441406 47.039063 49.839844 46.621094 51.101563 C 42.980469 50.398438 39.058594 50.121094 35 50.121094 C 30.800781 50.121094 26.878906 50.539063 23.101563 51.238281 C 22.679688 49.839844 22.398438 48.441406 22.121094 46.898438 L 17.921875 46.898438 C 18.199219 48.71875 18.621094 50.398438 19.039063 52.078125 C 17.359375 52.5 15.679688 53.058594 14.140625 53.621094 C 14 53.761719 13.71875 53.761719 13.578125 53.898438 C 13.160156 54.039063 12.601563 54.320313 12.179688 54.460938 C 11.898438 54.460938 11.480469 54.601563 11.199219 54.738281 C 7 49.699219 4.621094 43.398438 4.199219 36.960938 L 7.699219 36.960938 L 7.699219 32.898438 L 4.199219 32.898438 C 4.621094 26.460938 7 20.300781 11.058594 15.398438 L 11.199219 15.261719 C 11.480469 15.398438 11.898438 15.539063 12.179688 15.679688 C 12.738281 15.960938 13.160156 16.101563 13.71875 16.378906 C 13.859375 16.378906 14 16.519531 14.140625 16.519531 C 15.679688 17.078125 17.359375 17.640625 19.179688 18.058594 C 18.761719 19.601563 18.480469 21.140625 18.199219 22.679688 L 22.398438 22.679688 C 22.679688 21.421875 22.960938 20.019531 23.238281 18.898438 C 27.019531 19.601563 31.078125 20.019531 35.140625 20.019531 C 39.199219 20.019531 43.121094 19.601563 46.761719 19.039063 C 47.039063 20.160156 47.320313 21.421875 47.601563 22.820313 L 51.800781 22.820313 C 51.519531 21.28125 51.238281 19.738281 50.820313 18.199219 C 52.640625 17.78125 54.320313 17.21875 56 16.519531 C 56.140625 16.519531 56.421875 16.378906 56.558594 16.378906 C 57.121094 16.238281 57.539063 15.960938 58.101563 15.820313 C 58.378906 15.679688 58.800781 15.539063 59.078125 15.398438 C 63.140625 20.441406 65.660156 26.601563 66.078125 33.039063 L 61.878906 33.039063 L 61.878906 37.101563 L 66.078125 37.101563 C 65.378906 43.398438 63 49.699219 58.941406 54.601563 Z M 58.941406 54.601563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 26.179688 34.71875 C 26.179688 36.398438 25.898438 37.800781 25.480469 38.921875 C 25.058594 40.039063 24.359375 41.019531 23.660156 41.859375 C 22.820313 42.558594 21.839844 43.121094 20.71875 43.539063 C 19.601563 43.820313 18.199219 44.101563 16.519531 44.101563 L 12.179688 44.101563 C 11.898438 44.101563 11.621094 43.960938 11.339844 43.820313 C 11.058594 43.679688 11.199219 43.261719 11.199219 42.839844 L 11.199219 27.019531 C 11.199219 26.601563 11.339844 26.320313 11.480469 26.179688 C 11.621094 26.039063 11.898438 25.898438 12.320313 25.898438 L 16.941406 25.898438 C 18.621094 25.898438 19.878906 26.039063 21 26.460938 C 22.121094 26.878906 23.101563 27.441406 23.800781 28.140625 C 24.5 28.839844 25.199219 29.820313 25.621094 30.941406 C 25.898438 32.058594 26.179688 33.320313 26.179688 34.71875 Z M 22.398438 34.859375 C 22.398438 34.019531 22.261719 33.179688 22.121094 32.480469 C 21.980469 31.78125 21.558594 31.078125 21.140625 30.519531 C 20.71875 29.960938 20.160156 29.539063 19.460938 29.261719 C 18.761719 28.980469 17.921875 28.839844 16.660156 28.839844 L 14.839844 28.839844 L 14.839844 41.160156 L 16.800781 41.160156 C 17.78125 41.160156 18.621094 41.019531 19.320313 40.738281 C 20.019531 40.460938 20.578125 40.039063 21 39.621094 C 21.421875 39.058594 21.839844 38.5 21.980469 37.660156 C 22.261719 36.820313 22.398438 35.839844 22.398438 34.859375 Z M 22.398438 34.859375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 44.101563 42.699219 C 44.101563 42.980469 44.101563 43.121094 43.960938 43.261719 C 43.820313 43.398438 43.820313 43.539063 43.679688 43.679688 C 43.539063 43.820313 43.398438 43.820313 43.261719 43.960938 C 43.121094 43.960938 42.980469 44.101563 42.699219 44.101563 L 41.160156 44.101563 C 40.878906 44.101563 40.601563 44.101563 40.320313 43.960938 C 40.039063 43.960938 39.898438 43.820313 39.621094 43.539063 C 39.480469 43.398438 39.199219 43.121094 39.058594 42.839844 C 38.921875 42.558594 38.640625 42.140625 38.5 41.71875 L 34.019531 33.320313 C 33.738281 32.761719 33.460938 32.339844 33.179688 31.640625 C 32.898438 31.078125 32.621094 30.519531 32.480469 29.960938 C 32.480469 30.660156 32.480469 31.359375 32.621094 31.921875 C 32.621094 32.621094 32.621094 33.320313 32.621094 34.019531 L 32.621094 43.539063 C 32.621094 43.679688 32.621094 43.679688 32.480469 43.820313 C 32.480469 43.960938 32.339844 43.960938 32.199219 43.960938 C 32.058594 43.960938 31.921875 44.101563 31.640625 44.101563 C 31.359375 44.101563 31.21875 44.101563 30.800781 44.101563 C 30.519531 44.101563 30.238281 44.101563 29.960938 44.101563 C 29.679688 44.101563 29.539063 44.101563 29.398438 43.960938 C 29.261719 43.960938 29.261719 43.820313 29.121094 43.820313 C 29.121094 43.679688 29.121094 43.679688 29.121094 43.539063 L 29.121094 27.300781 C 29.121094 26.878906 29.261719 26.601563 29.539063 26.320313 C 29.820313 26.039063 30.101563 26.039063 30.519531 26.039063 L 32.480469 26.039063 C 32.898438 26.039063 33.179688 26.039063 33.320313 26.179688 C 33.601563 26.179688 33.738281 26.320313 34.019531 26.460938 C 34.160156 26.601563 34.441406 26.738281 34.578125 27.019531 C 34.71875 27.300781 34.859375 27.578125 35.140625 28 L 38.640625 34.578125 C 38.78125 35 39.058594 35.421875 39.199219 35.699219 C 39.339844 36.121094 39.621094 36.539063 39.761719 36.820313 C 39.898438 37.238281 40.179688 37.519531 40.320313 37.941406 C 40.460938 38.359375 40.601563 38.640625 40.878906 39.058594 C 40.878906 38.359375 40.878906 37.660156 40.878906 36.960938 C 40.878906 36.261719 40.878906 35.558594 40.878906 35 L 40.878906 26.460938 C 40.878906 26.320313 40.878906 26.320313 41.019531 26.179688 C 41.019531 26.039063 41.160156 26.039063 41.300781 26.039063 C 41.441406 26.039063 41.578125 25.898438 41.859375 25.898438 C 42.140625 25.898438 42.28125 25.898438 42.699219 25.898438 C 42.980469 25.898438 43.261719 25.898438 43.539063 25.898438 C 43.820313 25.898438 43.960938 25.898438 44.101563 26.039063 C 44.238281 26.039063 44.238281 26.179688 44.378906 26.179688 C 44.378906 26.320313 44.378906 26.320313 44.378906 26.460938 L 44.378906 42.699219 Z M 44.101563 42.699219 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 58.800781 38.640625 C 58.800781 39.621094 58.660156 40.460938 58.238281 41.160156 C 57.820313 41.859375 57.398438 42.421875 56.839844 42.980469 C 56.28125 43.398438 55.578125 43.820313 54.738281 44.101563 C 53.898438 44.378906 53.058594 44.519531 52.078125 44.519531 C 51.519531 44.519531 50.820313 44.519531 50.398438 44.378906 C 49.980469 44.238281 49.421875 44.101563 49 43.960938 C 48.578125 43.820313 48.300781 43.679688 48.019531 43.539063 C 47.738281 43.398438 47.601563 43.261719 47.460938 43.121094 C 47.320313 42.980469 47.320313 42.839844 47.179688 42.558594 C 47.179688 42.28125 47.039063 42 47.039063 41.578125 C 47.039063 41.300781 47.039063 41.019531 47.039063 40.878906 C 47.039063 40.738281 47.039063 40.460938 47.179688 40.460938 C 47.179688 40.320313 47.320313 40.320313 47.320313 40.179688 C 47.320313 40.179688 47.460938 40.039063 47.601563 40.039063 C 47.738281 40.039063 47.878906 40.179688 48.160156 40.320313 C 48.441406 40.460938 48.71875 40.601563 49.140625 40.878906 C 49.558594 41.019531 49.980469 41.300781 50.539063 41.441406 C 51.101563 41.578125 51.660156 41.71875 52.359375 41.71875 C 52.78125 41.71875 53.199219 41.71875 53.621094 41.578125 C 54.039063 41.441406 54.320313 41.300781 54.460938 41.160156 C 54.738281 41.019531 54.878906 40.738281 55.019531 40.460938 C 55.160156 40.179688 55.160156 39.898438 55.160156 39.480469 C 55.160156 39.058594 55.019531 38.78125 54.878906 38.359375 C 54.601563 38.078125 54.320313 37.800781 54.039063 37.519531 C 53.621094 37.238281 53.339844 37.101563 52.78125 36.820313 C 52.359375 36.679688 51.800781 36.398438 51.378906 36.121094 C 50.960938 35.839844 50.398438 35.699219 49.980469 35.421875 C 49.558594 35.140625 49.140625 34.859375 48.71875 34.441406 C 48.300781 34.019531 48.019531 33.601563 47.878906 33.039063 C 47.601563 32.480469 47.601563 31.921875 47.601563 31.078125 C 47.601563 30.238281 47.738281 29.398438 48.019531 28.839844 C 48.300781 28.140625 48.71875 27.578125 49.28125 27.160156 C 49.839844 26.738281 50.398438 26.460938 51.238281 26.179688 C 51.941406 25.898438 52.78125 25.898438 53.621094 25.898438 C 54.039063 25.898438 54.460938 25.898438 54.878906 26.039063 C 55.300781 26.039063 55.71875 26.179688 56.140625 26.320313 C 56.558594 26.460938 56.839844 26.601563 57.121094 26.738281 C 57.398438 26.878906 57.539063 27.019531 57.679688 27.019531 C 57.820313 27.160156 57.820313 27.160156 57.820313 27.300781 C 57.820313 27.300781 57.820313 27.441406 57.960938 27.578125 C 57.960938 27.71875 57.960938 27.859375 57.960938 28 C 57.960938 28.140625 57.960938 28.421875 57.960938 28.558594 C 57.960938 28.839844 57.960938 29.121094 57.960938 29.261719 C 57.960938 29.398438 57.960938 29.539063 57.960938 29.679688 C 57.960938 29.820313 57.820313 29.820313 57.820313 29.960938 C 57.820313 29.960938 57.679688 30.101563 57.539063 30.101563 C 57.398438 30.101563 57.261719 30.101563 57.121094 29.960938 C 56.839844 29.820313 56.558594 29.679688 56.28125 29.539063 C 56 29.398438 55.578125 29.261719 55.160156 29.121094 C 54.738281 28.980469 54.320313 28.980469 53.761719 28.980469 C 53.339844 28.980469 53.058594 28.980469 52.78125 29.121094 C 52.5 29.261719 52.21875 29.398438 52.078125 29.539063 C 51.941406 29.679688 51.800781 29.960938 51.660156 30.101563 C 51.519531 30.378906 51.519531 30.660156 51.519531 30.800781 C 51.519531 31.21875 51.660156 31.5 51.800781 31.78125 C 52.078125 32.058594 52.359375 32.339844 52.640625 32.621094 C 53.058594 32.898438 53.480469 33.039063 53.898438 33.320313 C 54.320313 33.460938 54.878906 33.738281 55.300781 34.019531 C 55.71875 34.300781 56.28125 34.441406 56.699219 34.71875 C 57.121094 35 57.539063 35.28125 57.960938 35.699219 C 58.378906 36.121094 58.660156 36.539063 58.800781 37.101563 C 58.660156 37.238281 58.800781 37.800781 58.800781 38.640625 Z M 58.800781 38.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 70 35 C 70 54.328125 54.328125 70 35 70 C 15.671875 70 0 54.328125 0 35 C 0 15.671875 15.671875 0 35 0 C 54.328125 0 70 15.671875 70 35 Z M 70 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.910156 34.796875 C 26.910156 36.324219 26.710938 37.628906 26.3125 38.710938 C 25.914063 39.796875 25.339844 40.683594 24.597656 41.367188 C 23.851563 42.054688 22.945313 42.558594 21.875 42.878906 C 20.808594 43.199219 19.539063 43.359375 18.0625 43.359375 L 14.089844 43.359375 C 13.808594 43.359375 13.570313 43.277344 13.378906 43.109375 C 13.183594 42.941406 13.089844 42.671875 13.089844 42.292969 L 13.089844 27.789063 C 13.089844 27.410156 13.183594 27.140625 13.378906 26.972656 C 13.570313 26.804688 13.808594 26.722656 14.089844 26.722656 L 18.359375 26.722656 C 19.84375 26.722656 21.101563 26.898438 22.132813 27.246094 C 23.167969 27.59375 24.035156 28.105469 24.746094 28.789063 C 25.453125 29.46875 25.988281 30.3125 26.359375 31.3125 C 26.726563 32.316406 26.910156 33.476563 26.910156 34.796875 Z M 23.414063 34.914063 C 23.414063 34.125 23.320313 33.390625 23.136719 32.714844 C 22.953125 32.039063 22.65625 31.449219 22.25 30.953125 C 21.839844 30.457031 21.320313 30.066406 20.679688 29.789063 C 20.039063 29.507813 19.203125 29.371094 18.164063 29.371094 L 16.453125 29.371094 L 16.453125 40.683594 L 18.21875 40.683594 C 19.140625 40.683594 19.921875 40.566406 20.558594 40.324219 C 21.191406 40.085938 21.722656 39.722656 22.144531 39.238281 C 22.570313 38.753906 22.886719 38.152344 23.097656 37.433594 C 23.308594 36.714844 23.414063 35.875 23.414063 34.914063 Z M 23.414063 34.914063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.40625 42.179688 C 43.40625 42.375 43.375 42.554688 43.304688 42.707031 C 43.234375 42.859375 43.140625 42.988281 43.027344 43.09375 C 42.914063 43.195313 42.773438 43.269531 42.617188 43.316406 C 42.457031 43.363281 42.296875 43.386719 42.132813 43.386719 L 40.695313 43.386719 C 40.394531 43.386719 40.136719 43.359375 39.914063 43.296875 C 39.695313 43.238281 39.492188 43.128906 39.3125 42.96875 C 39.125 42.8125 38.949219 42.597656 38.777344 42.328125 C 38.605469 42.058594 38.414063 41.707031 38.199219 41.277344 L 34.058594 33.5 C 33.820313 33.039063 33.574219 32.539063 33.328125 32 C 33.078125 31.464844 32.855469 30.945313 32.65625 30.4375 L 32.632813 30.4375 C 32.667969 31.054688 32.691406 31.671875 32.710938 32.28125 C 32.726563 32.894531 32.734375 33.527344 32.734375 34.179688 L 32.734375 42.882813 C 32.734375 42.96875 32.710938 43.046875 32.664063 43.117188 C 32.617188 43.183594 32.535156 43.242188 32.417969 43.289063 C 32.300781 43.335938 32.144531 43.375 31.949219 43.398438 C 31.753906 43.421875 31.5 43.4375 31.191406 43.4375 C 30.890625 43.4375 30.640625 43.421875 30.445313 43.398438 C 30.246094 43.371094 30.09375 43.335938 29.980469 43.289063 C 29.871094 43.242188 29.792969 43.183594 29.75 43.117188 C 29.707031 43.046875 29.6875 42.96875 29.6875 42.882813 L 29.6875 27.929688 C 29.6875 27.527344 29.804688 27.226563 30.039063 27.023438 C 30.273438 26.824219 30.5625 26.71875 30.90625 26.71875 L 32.71875 26.71875 C 33.042969 26.71875 33.320313 26.75 33.542969 26.804688 C 33.765625 26.859375 33.960938 26.953125 34.140625 27.082031 C 34.3125 27.210938 34.480469 27.386719 34.632813 27.613281 C 34.789063 27.84375 34.945313 28.125 35.109375 28.457031 L 38.351563 34.539063 C 38.535156 34.90625 38.726563 35.273438 38.910156 35.625 C 39.09375 35.980469 39.269531 36.339844 39.441406 36.695313 C 39.613281 37.050781 39.777344 37.398438 39.945313 37.742188 C 40.105469 38.085938 40.265625 38.425781 40.417969 38.769531 L 40.429688 38.769531 C 40.40625 38.167969 40.386719 37.542969 40.375 36.894531 C 40.359375 36.242188 40.355469 35.621094 40.355469 35.03125 L 40.355469 27.222656 C 40.355469 27.140625 40.378906 27.0625 40.429688 26.992188 C 40.480469 26.921875 40.566406 26.863281 40.6875 26.8125 C 40.808594 26.761719 40.96875 26.722656 41.164063 26.703125 C 41.359375 26.679688 41.613281 26.671875 41.921875 26.671875 C 42.210938 26.671875 42.453125 26.679688 42.652344 26.703125 C 42.851563 26.726563 43.003906 26.761719 43.113281 26.8125 C 43.214844 26.863281 43.292969 26.921875 43.335938 26.992188 C 43.378906 27.0625 43.398438 27.136719 43.398438 27.222656 L 43.398438 42.179688 Z M 43.40625 42.179688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56.894531 38.371094 C 56.894531 39.246094 56.730469 40.011719 56.40625 40.671875 C 56.082031 41.332031 55.640625 41.886719 55.082031 42.324219 C 54.527344 42.765625 53.875 43.097656 53.128906 43.320313 C 52.382813 43.542969 51.585938 43.65625 50.734375 43.65625 C 50.160156 43.65625 49.628906 43.605469 49.136719 43.511719 C 48.644531 43.417969 48.207031 43.304688 47.832031 43.171875 C 47.453125 43.039063 47.136719 42.902344 46.886719 42.753906 C 46.632813 42.609375 46.449219 42.480469 46.339844 42.367188 C 46.226563 42.257813 46.148438 42.097656 46.101563 41.886719 C 46.054688 41.675781 46.027344 41.375 46.027344 40.980469 C 46.027344 40.714844 46.039063 40.492188 46.054688 40.3125 C 46.074219 40.132813 46.097656 39.984375 46.140625 39.875 C 46.175781 39.761719 46.230469 39.683594 46.292969 39.636719 C 46.359375 39.589844 46.433594 39.5625 46.519531 39.5625 C 46.640625 39.5625 46.808594 39.636719 47.027344 39.777344 C 47.246094 39.917969 47.527344 40.074219 47.867188 40.246094 C 48.210938 40.417969 48.621094 40.574219 49.097656 40.714844 C 49.570313 40.855469 50.121094 40.925781 50.75 40.925781 C 51.160156 40.925781 51.527344 40.878906 51.851563 40.777344 C 52.179688 40.679688 52.457031 40.542969 52.683594 40.359375 C 52.910156 40.179688 53.082031 39.957031 53.203125 39.691406 C 53.324219 39.425781 53.382813 39.132813 53.382813 38.804688 C 53.382813 38.425781 53.28125 38.105469 53.074219 37.835938 C 52.867188 37.566406 52.597656 37.324219 52.269531 37.113281 C 51.9375 36.902344 51.566406 36.707031 51.144531 36.523438 C 50.726563 36.339844 50.289063 36.144531 49.847656 35.9375 C 49.402344 35.730469 48.96875 35.496094 48.550781 35.238281 C 48.128906 34.976563 47.753906 34.664063 47.425781 34.296875 C 47.09375 33.933594 46.828125 33.5 46.621094 33.003906 C 46.414063 32.507813 46.3125 31.910156 46.3125 31.214844 C 46.3125 30.417969 46.460938 29.71875 46.753906 29.113281 C 47.050781 28.507813 47.449219 28.007813 47.949219 27.609375 C 48.453125 27.210938 49.042969 26.910156 49.726563 26.714844 C 50.40625 26.519531 51.128906 26.417969 51.890625 26.417969 C 52.285156 26.417969 52.679688 26.449219 53.074219 26.507813 C 53.46875 26.570313 53.835938 26.652344 54.179688 26.753906 C 54.519531 26.859375 54.828125 26.972656 55.089844 27.101563 C 55.355469 27.230469 55.535156 27.335938 55.617188 27.421875 C 55.703125 27.507813 55.761719 27.582031 55.792969 27.640625 C 55.820313 27.703125 55.847656 27.78125 55.867188 27.878906 C 55.890625 27.980469 55.90625 28.101563 55.910156 28.253906 C 55.921875 28.402344 55.925781 28.589844 55.925781 28.8125 C 55.925781 29.0625 55.917969 29.273438 55.90625 29.445313 C 55.890625 29.613281 55.871094 29.757813 55.84375 29.867188 C 55.8125 29.976563 55.769531 30.0625 55.714844 30.113281 C 55.65625 30.164063 55.582031 30.191406 55.488281 30.191406 C 55.390625 30.191406 55.242188 30.128906 55.035156 30.011719 C 54.832031 29.890625 54.578125 29.761719 54.277344 29.617188 C 53.976563 29.476563 53.632813 29.347656 53.238281 29.230469 C 52.84375 29.113281 52.410156 29.058594 51.941406 29.058594 C 51.570313 29.058594 51.25 29.101563 50.976563 29.191406 C 50.703125 29.28125 50.472656 29.40625 50.289063 29.566406 C 50.105469 29.726563 49.96875 29.917969 49.878906 30.136719 C 49.789063 30.359375 49.742188 30.597656 49.742188 30.84375 C 49.742188 31.214844 49.84375 31.53125 50.042969 31.804688 C 50.246094 32.074219 50.515625 32.3125 50.855469 32.523438 C 51.195313 32.734375 51.578125 32.929688 52.007813 33.113281 C 52.4375 33.300781 52.871094 33.492188 53.320313 33.699219 C 53.765625 33.90625 54.199219 34.140625 54.628906 34.402344 C 55.058594 34.664063 55.441406 34.976563 55.777344 35.339844 C 56.109375 35.703125 56.378906 36.132813 56.585938 36.625 C 56.792969 37.125 56.894531 37.703125 56.894531 38.371094 Z M 56.894531 38.371094 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureDNS.png b/dist/Networking/AzureDNS.png
index b4e33aa1..e8d72db4 100644
Binary files a/dist/Networking/AzureDNS.png and b/dist/Networking/AzureDNS.png differ
diff --git a/dist/Networking/AzureDNS.puml b/dist/Networking/AzureDNS.puml
index be885adb..ec524bed 100644
--- a/dist/Networking/AzureDNS.puml
+++ b/dist/Networking/AzureDNS.puml
@@ -1,14 +1,16 @@
 sprite $AzureDNS [70x70/16z] {
-fLY9Skim23G2SUZ_F_XDZBec-DMzTeuq2hEiO7Nr-1p4ekOHAznjoZX-3bPV3M52Fw4O6kl_CFusXwq7X7o7Wwmb9s9xv_bQpunLu6FBooB51_LJVH2zNERv
-SKMVSfGrlfwMH7BmGV7wF0fEVZvey-Yd98ffdwcZwjwyA1nqTjYLX5z_5TKOcv1SQJf9CEJR_m8YTVcgMZk9qvKsszFdDClaxsgqMjDHlXO3CMa8xpQ1GuIE
-iQLqq6wJ63nvgnpWZZGDbhyMp3xZc5wfT0eJ8OA6J7qZyBFQenM5ZuCjrWqHwuwOupZUDOzYnlJuCqB7hMd96Sth3s14Id4Dvq_0AyCWbcaENRbfyWY4Takq
-benK1X0roymI2p7T7L99EwIPn98rwRq6kZlITOo8WD0gFB1yVmFV7acstqAolfeVlmMbYAjt4YVSvi0sxAwKVrl4p47ro0CEzHtdEgNz7J2wLaQW08hLZmRd
-zycxGs1134PcPP5YONJ9vbKMoxmasFyDZ60vtJg85HPxHHGpsjksAZdY-JjO5e9ghosrWGKgFKViDKfW8R00jZBNg2pWtrfUZ7ffYPinT1-z4M5WmIyZMSvS
-11RRXsT2tJsk0nmiL_iuMR89O24SmYZ_4mkqfA-IfTnCx96bpoWhQc31BSaQYun1drRtWpDP4iEtumSpxnxTEqrNfttNmi22D7HrsbvQEeiMrtsKAGfBZXJ2
--meuIBSKi1ou-R0WJvGL86-hCLJL0cSUMEO7YouNogKcnUTbnxT-ZTmi4AD9XwuYWMANAYoUQIeBxxLDlXBwll4Q5ZNn2sCS035J_tDCCnL2IFPS_hvx-oOR
-lsRnFHLhQztS_LDMSdThfzeY5AuTciyJU0ysY6gsjAFYyRJ7ELJ5rCDoiCWy8I8y27q53D9kT-JJ3kgnEi8LfrUx-RGlwUv7ACJ4Mtgy7MZw-WR26FiszVT6
-VvEvgUghBAfg7ls6AFt98Ql31XqTG-zXlOD8mlFryQbHHvcrtmEIuk5wnLVv8iF7pTfblT_5T7jIzCSinZ5FwcBwgucZLRQfyN7huTqTStMIJeDpj2ycC7Cy
-lyqDZ-Mv-igMFJAi5VRfGUrDCwytOzgt7lU1ArsrfKNxZyMp7C0Pv_i5fUCPi1GGPj7Mnl4zWEU6KFhDVuFwXl1Ja6XzgwaypEGV
+bPS9bfmm34H1gotV_xw9LPWHzFwpzMFWjrIMWMolsLdDlKtSL6Zx7JPlTqpsNnIaxGNENpki9Qx2j0DYiGRqAuUZUWWkiE9dyb6YMOLKHOMp8gVtXS2n5qY4
+hvvFRKcUGDNXwRrwV1vwkLoMnHwdveNI3YIF7OrY2UcrHE4GTogIzGDRXSfBZUTNmj7QB8KREAiXD7nywloyakmYnyMGIMLUhUqyoti4lPHmkQG2yLztrCU8
+MyIo95glkC9_FwOvpNsC_Z0dKiQ1CyeR3ZM6aeWunl1gWGIGEiw_0xTdl3IH64CkOs_x3MaFwBuWO6D4wGTnycrkcKKq4S7sFYLiRMhw65OcHLOF9hH_WgsF
+CHpH19sbE2OJEBzJaFOOan0YyWoub2ANCLL53xL1oOPZ7FJPKupOIobqdT86tDtCtFtqKnyBou2HZ9PIG0Rz5DspYOCuafcMykN0cLdRKsQYEYx5j9mPngn8
+-mBa2bOoCaRBROXv_qq21Fdc2j6PhKzQmRryIaaqCrywnsBpZXMILkzU90rWkn-tQyaeS3DWU08vAMDx8Ctz_aJ9ZtPOU9HvRoDX8XwZ7Uliox8BymxDikn_
+bi1ZpsXPD8FfHxXjMUHysi1o5DCjBVD0JbsBls3wY1ekB4iZQTbf5jC35ajBeQLbE4RrOi4dWcKADSPVBLGr7NE7WITclbZcGm8TPLZBWfqdXyTKjLWcTB78
+dsLsOR3CCKqaOo7mbQNFASfS40JMhN-sr8vwj9dCiepmzF3LyZpTkJAmn1Z_bJiim3SSxxqtM1pfNYoudF7F4GOLIovugojjp-Obc_TboMBGHCHfwVW4Ys9s
+7HPKe3jAEIrzMNYtsSbS_Be3Gh0R3PRhCxVtmp9aMURov5b-xaQQVPLRNR78bCHfYJnMjhJztNdpS2ln6az4xRYpXR2Ef0ldn7QbV2ILkvJDKcq5Ku7aCu9m
+z-q8HdwNe27EyFVI4b1cjkUIBY8sxeyrnLpWBGaWRHrFGGwr58hPqFb0elhEHFBSWXj1BKNNFc_tOl8h8fgRgif4LSrR1EFBIobzJRRS7lTTPcZq0ZujYbBw
+zQsE8J6Xjx2s5BKZ5Ic3IkZ9UASlq1RPZwCKu0Xu5zfF2Qkrth698w8tlnJ9Z9VCeCVNNKX4iJrkO4sKBn7PxNze18buZ62a3sxZ4Lq9zDLFwScpdLOdeL8F
+Xk1-M_jPpsAdYPTHADHZa3ZkEtTDxzcopa0LsLNEi1elYMvtg1rv4CzISMAX7QM4dYNxzWZ7gfMa3qVd9ntl_M6qlgWiJuMcnjTOoKNJEULAYSGhoNfiTg62
+O-gS2knPzVOIoqkuNcAj-KLiaGrkRv2edafrX6qVm6bDwG7CDGhvoCgYcJox8OmksrVi5WD4T13hIEFjUmHVVAFhllq8Q-i370s-Llm3
 }
 
 AzureEntityColoring(AzureDNS)
diff --git a/dist/Networking/AzureDNS.svg b/dist/Networking/AzureDNS.svg
index 12330673..c7cbefd1 100644
--- a/dist/Networking/AzureDNS.svg
+++ b/dist/Networking/AzureDNS.svg
@@ -13,7 +13,7 @@
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 10.25 59.75 C -3.417969 46.082031 -3.417969 23.921875 10.25 10.253906 C 23.917969 -3.414063 46.078125 -3.414063 59.75 10.253906 Z M 10.25 59.75 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 10.25 59.75 C -3.417969 46.082031 -3.417969 23.921875 10.25 10.253906 C 23.917969 -3.414063 46.078125 -3.414063 59.746094 10.253906 Z M 10.25 59.75 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
@@ -24,15 +24,15 @@
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 67.199219 34.996094 C 67.199219 27.78125 64.753906 20.828125 60.246094 15.160156 L 59.988281 14.902344 C 59.859375 14.773438 59.859375 14.644531 59.730469 14.515625 L 57.667969 12.324219 C 51.617188 6.144531 43.628906 2.792969 35 2.792969 C 35 2.792969 35 2.792969 34.871094 2.792969 L 34.742188 2.792969 C 26.242188 2.921875 18.386719 6.144531 12.332031 12.195313 L 10.140625 14.515625 C 10.011719 14.644531 10.011719 14.773438 9.882813 14.902344 L 9.625 15.03125 C 5.246094 20.699219 2.800781 27.78125 2.800781 34.996094 C 2.800781 42.207031 5.246094 49.164063 9.753906 54.828125 L 10.011719 55.085938 C 10.140625 55.214844 10.140625 55.34375 10.269531 55.472656 L 12.332031 57.664063 C 18.386719 63.71875 26.242188 67.066406 34.742188 67.066406 L 34.871094 67.066406 C 34.871094 67.066406 34.871094 67.066406 35 67.066406 C 43.5 67.066406 51.617188 63.71875 57.667969 57.664063 L 59.730469 55.34375 C 59.859375 55.214844 59.859375 55.085938 59.988281 54.957031 L 60.246094 54.699219 C 64.753906 49.292969 67.199219 42.207031 67.199219 34.996094 Z M 54.191406 14 C 54.0625 14 53.933594 14.128906 53.804688 14.128906 C 53.546875 14.257813 53.289063 14.386719 53.160156 14.386719 C 52.644531 14.644531 52 14.773438 51.359375 15.03125 C 51.230469 15.03125 51.101563 15.160156 50.972656 15.160156 C 50.199219 15.417969 49.554688 15.546875 48.78125 15.804688 C 48.652344 15.804688 48.394531 15.933594 48.265625 15.933594 C 47.109375 12.839844 45.691406 10.136719 44.015625 8.074219 C 47.75 9.234375 51.230469 11.296875 54.191406 14 Z M 34.742188 6.53125 L 34.871094 6.53125 C 38.347656 6.53125 41.957031 10.265625 44.53125 16.703125 C 41.570313 17.21875 38.347656 17.476563 35 17.476563 C 31.652344 17.476563 28.304688 17.21875 25.210938 16.703125 C 27.660156 10.394531 31.265625 6.660156 34.742188 6.53125 Z M 25.597656 8.203125 C 24.050781 10.265625 22.636719 12.839844 21.476563 15.933594 C 21.347656 15.933594 21.347656 15.933594 21.21875 15.933594 C 20.445313 15.675781 19.671875 15.546875 19.027344 15.289063 C 18.898438 15.289063 18.773438 15.160156 18.644531 15.160156 C 18.128906 14.902344 17.484375 14.644531 16.96875 14.386719 C 16.710938 14.257813 16.582031 14.257813 16.324219 14.128906 C 16.195313 14 16.066406 14 15.808594 13.871094 C 18.773438 11.425781 21.992188 9.363281 25.597656 8.203125 Z M 15.808594 55.988281 C 15.9375 55.988281 16.066406 55.859375 16.195313 55.859375 C 16.453125 55.730469 16.582031 55.730469 16.839844 55.601563 C 17.355469 55.34375 18 55.214844 18.644531 54.957031 C 18.773438 54.957031 18.898438 54.828125 19.027344 54.828125 C 19.800781 54.570313 20.445313 54.441406 21.21875 54.1875 C 21.347656 54.1875 21.347656 54.1875 21.476563 54.1875 C 22.636719 57.148438 24.050781 59.851563 25.597656 61.914063 C 21.992188 60.625 18.644531 58.566406 15.808594 55.988281 Z M 34.871094 63.460938 L 34.742188 63.460938 C 31.265625 63.332031 27.660156 59.722656 25.210938 53.414063 C 28.304688 52.898438 31.652344 52.640625 35 52.640625 C 38.347656 52.640625 41.441406 52.898438 44.53125 53.414063 C 42.085938 59.722656 38.347656 63.460938 34.871094 63.460938 Z M 44.015625 61.914063 C 45.691406 59.851563 47.109375 57.148438 48.265625 54.058594 C 48.394531 54.058594 48.652344 54.1875 48.78125 54.1875 C 49.554688 54.441406 50.328125 54.570313 50.972656 54.828125 C 51.101563 54.828125 51.230469 54.957031 51.359375 54.957031 C 52 55.214844 52.515625 55.34375 53.160156 55.601563 C 53.417969 55.730469 53.546875 55.730469 53.804688 55.859375 C 53.933594 55.859375 54.0625 55.988281 54.320313 56.117188 C 51.230469 58.695313 47.75 60.753906 44.015625 61.914063 Z M 57.023438 53.027344 C 56.640625 53.027344 56.382813 52.898438 55.996094 52.769531 C 55.609375 52.640625 55.09375 52.382813 54.707031 52.253906 C 54.578125 52.253906 54.449219 52.125 54.320313 52.125 C 52.773438 51.480469 51.101563 51.09375 49.425781 50.578125 C 49.8125 49.035156 50.199219 47.488281 50.457031 45.941406 L 46.59375 45.941406 C 46.335938 47.359375 46.078125 48.648438 45.691406 49.804688 C 42.34375 49.164063 38.734375 48.90625 35 48.90625 C 31.136719 48.90625 27.53125 49.292969 24.050781 49.933594 C 23.664063 48.648438 23.410156 47.359375 23.152344 45.941406 L 19.285156 45.941406 C 19.542969 47.617188 19.929688 49.164063 20.316406 50.707031 C 18.773438 51.09375 17.226563 51.609375 15.808594 52.125 C 15.679688 52.253906 15.421875 52.253906 15.292969 52.382813 C 14.90625 52.511719 14.390625 52.769531 14.007813 52.898438 C 13.75 52.898438 13.363281 53.027344 13.105469 53.15625 C 9.242188 48.519531 7.050781 42.722656 6.664063 36.796875 L 9.882813 36.796875 L 9.882813 33.0625 L 6.664063 33.0625 C 7.050781 27.136719 9.242188 21.46875 12.976563 16.960938 L 13.105469 16.832031 C 13.363281 16.960938 13.75 17.089844 14.007813 17.21875 C 14.519531 17.476563 14.90625 17.605469 15.421875 17.863281 C 15.550781 17.863281 15.679688 17.992188 15.808594 17.992188 C 17.226563 18.507813 18.773438 19.023438 20.445313 19.410156 C 20.058594 20.828125 19.800781 22.242188 19.542969 23.660156 L 23.410156 23.660156 C 23.664063 22.5 23.921875 21.210938 24.179688 20.183594 C 27.660156 20.828125 31.394531 21.210938 35.128906 21.210938 C 38.863281 21.210938 42.472656 20.828125 45.820313 20.3125 C 46.078125 21.339844 46.335938 22.5 46.59375 23.789063 L 50.457031 23.789063 C 50.199219 22.371094 49.941406 20.957031 49.554688 19.539063 C 51.230469 19.152344 52.773438 18.636719 54.320313 17.992188 C 54.449219 17.992188 54.707031 17.863281 54.835938 17.863281 C 55.351563 17.734375 55.738281 17.476563 56.253906 17.347656 C 56.511719 17.21875 56.894531 17.089844 57.152344 16.960938 C 60.890625 21.597656 63.207031 27.265625 63.59375 33.191406 L 59.730469 33.191406 L 59.730469 36.925781 L 63.59375 36.925781 C 62.949219 42.722656 60.761719 48.519531 57.023438 53.027344 Z M 57.023438 53.027344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 67.199219 34.996094 C 67.199219 27.78125 64.753906 20.828125 60.246094 15.160156 L 59.988281 14.902344 C 59.859375 14.773438 59.859375 14.644531 59.730469 14.515625 L 57.667969 12.324219 C 51.613281 6.144531 43.628906 2.792969 35 2.792969 C 35 2.792969 35 2.792969 34.871094 2.792969 L 34.742188 2.792969 C 26.242188 2.921875 18.386719 6.144531 12.332031 12.195313 L 10.140625 14.515625 C 10.011719 14.644531 10.011719 14.773438 9.882813 14.902344 L 9.625 15.03125 C 5.246094 20.699219 2.800781 27.78125 2.800781 34.996094 C 2.800781 42.207031 5.246094 49.164063 9.753906 54.828125 L 10.011719 55.085938 C 10.140625 55.214844 10.140625 55.34375 10.269531 55.472656 L 12.332031 57.664063 C 18.386719 63.71875 26.242188 67.066406 34.742188 67.066406 L 34.871094 67.066406 C 34.871094 67.066406 34.871094 67.066406 35 67.066406 C 43.5 67.066406 51.613281 63.71875 57.667969 57.664063 L 59.730469 55.34375 C 59.859375 55.214844 59.859375 55.085938 59.988281 54.957031 L 60.246094 54.699219 C 64.753906 49.292969 67.199219 42.207031 67.199219 34.996094 Z M 54.191406 14 C 54.0625 14 53.933594 14.128906 53.804688 14.128906 C 53.546875 14.257813 53.289063 14.386719 53.160156 14.386719 C 52.644531 14.644531 52 14.773438 51.359375 15.03125 C 51.230469 15.03125 51.101563 15.160156 50.972656 15.160156 C 50.199219 15.417969 49.554688 15.546875 48.78125 15.804688 C 48.652344 15.804688 48.394531 15.933594 48.265625 15.933594 C 47.105469 12.839844 45.691406 10.136719 44.015625 8.074219 C 47.75 9.234375 51.230469 11.296875 54.191406 14 Z M 34.742188 6.53125 L 34.871094 6.53125 C 38.347656 6.53125 41.957031 10.265625 44.53125 16.703125 C 41.570313 17.21875 38.347656 17.476563 35 17.476563 C 31.652344 17.476563 28.300781 17.21875 25.210938 16.703125 C 27.660156 10.394531 31.265625 6.660156 34.742188 6.53125 Z M 25.597656 8.203125 C 24.050781 10.265625 22.636719 12.839844 21.476563 15.933594 C 21.347656 15.933594 21.347656 15.933594 21.21875 15.933594 C 20.445313 15.675781 19.671875 15.546875 19.027344 15.289063 C 18.898438 15.289063 18.769531 15.160156 18.640625 15.160156 C 18.128906 14.902344 17.484375 14.644531 16.96875 14.386719 C 16.710938 14.257813 16.582031 14.257813 16.324219 14.128906 C 16.195313 14 16.066406 14 15.808594 13.871094 C 18.769531 11.425781 21.992188 9.363281 25.597656 8.203125 Z M 15.808594 55.988281 C 15.9375 55.988281 16.066406 55.859375 16.195313 55.859375 C 16.453125 55.730469 16.582031 55.730469 16.839844 55.601563 C 17.355469 55.34375 18 55.214844 18.640625 54.957031 C 18.769531 54.957031 18.898438 54.828125 19.027344 54.828125 C 19.800781 54.570313 20.445313 54.441406 21.21875 54.1875 C 21.347656 54.1875 21.347656 54.1875 21.476563 54.1875 C 22.636719 57.148438 24.050781 59.851563 25.597656 61.914063 C 21.992188 60.625 18.640625 58.566406 15.808594 55.988281 Z M 34.871094 63.460938 L 34.742188 63.460938 C 31.265625 63.332031 27.660156 59.722656 25.210938 53.414063 C 28.300781 52.898438 31.652344 52.640625 35 52.640625 C 38.347656 52.640625 41.441406 52.898438 44.53125 53.414063 C 42.085938 59.722656 38.347656 63.460938 34.871094 63.460938 Z M 44.015625 61.914063 C 45.691406 59.851563 47.105469 57.148438 48.265625 54.058594 C 48.394531 54.058594 48.652344 54.1875 48.78125 54.1875 C 49.554688 54.441406 50.328125 54.570313 50.972656 54.828125 C 51.101563 54.828125 51.230469 54.957031 51.359375 54.957031 C 52 55.214844 52.515625 55.34375 53.160156 55.601563 C 53.417969 55.730469 53.546875 55.730469 53.804688 55.859375 C 53.933594 55.859375 54.0625 55.988281 54.320313 56.117188 C 51.230469 58.695313 47.75 60.753906 44.015625 61.914063 Z M 57.023438 53.027344 C 56.636719 53.027344 56.378906 52.898438 55.996094 52.769531 C 55.609375 52.640625 55.09375 52.382813 54.707031 52.253906 C 54.578125 52.253906 54.449219 52.125 54.320313 52.125 C 52.773438 51.480469 51.101563 51.09375 49.425781 50.578125 C 49.8125 49.035156 50.199219 47.488281 50.457031 45.941406 L 46.59375 45.941406 C 46.335938 47.359375 46.078125 48.648438 45.691406 49.804688 C 42.339844 49.164063 38.734375 48.90625 35 48.90625 C 31.136719 48.90625 27.53125 49.292969 24.050781 49.933594 C 23.664063 48.648438 23.40625 47.359375 23.152344 45.941406 L 19.285156 45.941406 C 19.542969 47.617188 19.929688 49.164063 20.316406 50.707031 C 18.769531 51.09375 17.226563 51.609375 15.808594 52.125 C 15.679688 52.253906 15.421875 52.253906 15.292969 52.382813 C 14.90625 52.511719 14.390625 52.769531 14.003906 52.898438 C 13.746094 52.898438 13.363281 53.027344 13.105469 53.15625 C 9.238281 48.519531 7.050781 42.722656 6.664063 36.796875 L 9.882813 36.796875 L 9.882813 33.0625 L 6.664063 33.0625 C 7.050781 27.136719 9.238281 21.46875 12.976563 16.960938 L 13.105469 16.832031 C 13.363281 16.960938 13.746094 17.089844 14.003906 17.21875 C 14.519531 17.476563 14.90625 17.605469 15.421875 17.863281 C 15.550781 17.863281 15.679688 17.992188 15.808594 17.992188 C 17.226563 18.507813 18.769531 19.023438 20.445313 19.410156 C 20.058594 20.828125 19.800781 22.242188 19.542969 23.660156 L 23.40625 23.660156 C 23.664063 22.5 23.921875 21.210938 24.179688 20.183594 C 27.660156 20.828125 31.394531 21.210938 35.128906 21.210938 C 38.863281 21.210938 42.46875 20.828125 45.820313 20.3125 C 46.078125 21.339844 46.335938 22.5 46.59375 23.789063 L 50.457031 23.789063 C 50.199219 22.371094 49.941406 20.957031 49.554688 19.539063 C 51.230469 19.152344 52.773438 18.636719 54.320313 17.992188 C 54.449219 17.992188 54.707031 17.863281 54.835938 17.863281 C 55.351563 17.734375 55.738281 17.476563 56.253906 17.347656 C 56.507813 17.21875 56.894531 17.089844 57.152344 16.960938 C 60.890625 21.597656 63.207031 27.265625 63.59375 33.191406 L 59.730469 33.191406 L 59.730469 36.925781 L 63.59375 36.925781 C 62.949219 42.722656 60.761719 48.519531 57.023438 53.027344 Z M 57.023438 53.027344 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 70 35 C 70 54.328125 54.332031 70 35 70 C 15.671875 70 0 54.328125 0 35 C 0 15.671875 15.671875 0 35 0 C 54.332031 0 70 15.671875 70 35 Z M 70 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 70 35 C 70 54.328125 54.328125 70 35 70 C 15.671875 70 0 54.328125 0 35 C 0 15.671875 15.671875 0 35 0 C 54.328125 0 70 15.671875 70 35 Z M 70 35 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.910156 34.796875 C 26.910156 36.324219 26.710938 37.628906 26.3125 38.710938 C 25.914063 39.796875 25.339844 40.683594 24.597656 41.367188 C 23.851563 42.054688 22.945313 42.558594 21.875 42.878906 C 20.808594 43.199219 19.539063 43.359375 18.066406 43.359375 L 14.089844 43.359375 C 13.808594 43.359375 13.570313 43.277344 13.378906 43.109375 C 13.183594 42.941406 13.089844 42.671875 13.089844 42.292969 L 13.089844 27.789063 C 13.089844 27.410156 13.1875 27.140625 13.378906 26.972656 C 13.570313 26.804688 13.808594 26.722656 14.089844 26.722656 L 18.359375 26.722656 C 19.84375 26.722656 21.101563 26.898438 22.132813 27.246094 C 23.167969 27.59375 24.035156 28.105469 24.746094 28.789063 C 25.453125 29.46875 25.988281 30.3125 26.359375 31.3125 C 26.726563 32.316406 26.910156 33.476563 26.910156 34.796875 Z M 23.414063 34.914063 C 23.414063 34.125 23.320313 33.390625 23.136719 32.714844 C 22.953125 32.039063 22.65625 31.449219 22.25 30.953125 C 21.839844 30.457031 21.320313 30.066406 20.679688 29.789063 C 20.042969 29.507813 19.203125 29.371094 18.164063 29.371094 L 16.453125 29.371094 L 16.453125 40.683594 L 18.21875 40.683594 C 19.140625 40.683594 19.921875 40.566406 20.558594 40.324219 C 21.191406 40.085938 21.722656 39.722656 22.144531 39.238281 C 22.570313 38.753906 22.886719 38.152344 23.097656 37.433594 C 23.308594 36.714844 23.414063 35.875 23.414063 34.914063 Z M 23.414063 34.914063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.40625 42.179688 C 43.40625 42.375 43.375 42.554688 43.304688 42.707031 C 43.234375 42.859375 43.144531 42.988281 43.027344 43.09375 C 42.914063 43.195313 42.773438 43.269531 42.617188 43.316406 C 42.457031 43.363281 42.296875 43.386719 42.132813 43.386719 L 40.695313 43.386719 C 40.394531 43.386719 40.136719 43.359375 39.914063 43.296875 C 39.699219 43.238281 39.496094 43.128906 39.3125 42.96875 C 39.125 42.8125 38.949219 42.597656 38.777344 42.328125 C 38.605469 42.058594 38.414063 41.707031 38.199219 41.277344 L 34.058594 33.5 C 33.820313 33.039063 33.574219 32.539063 33.328125 32 C 33.078125 31.464844 32.855469 30.945313 32.65625 30.4375 L 32.632813 30.4375 C 32.667969 31.054688 32.691406 31.671875 32.710938 32.28125 C 32.726563 32.894531 32.734375 33.527344 32.734375 34.179688 L 32.734375 42.882813 C 32.734375 42.96875 32.710938 43.046875 32.664063 43.117188 C 32.617188 43.183594 32.535156 43.242188 32.417969 43.289063 C 32.300781 43.335938 32.144531 43.375 31.949219 43.398438 C 31.753906 43.421875 31.5 43.4375 31.191406 43.4375 C 30.890625 43.4375 30.640625 43.421875 30.445313 43.398438 C 30.246094 43.371094 30.09375 43.335938 29.984375 43.289063 C 29.871094 43.242188 29.792969 43.183594 29.75 43.117188 C 29.707031 43.046875 29.6875 42.96875 29.6875 42.882813 L 29.6875 27.929688 C 29.6875 27.527344 29.804688 27.226563 30.039063 27.023438 C 30.273438 26.824219 30.5625 26.71875 30.90625 26.71875 L 32.71875 26.71875 C 33.042969 26.71875 33.320313 26.75 33.542969 26.804688 C 33.765625 26.859375 33.964844 26.953125 34.140625 27.082031 C 34.3125 27.210938 34.480469 27.386719 34.636719 27.613281 C 34.789063 27.84375 34.945313 28.125 35.109375 28.457031 L 38.351563 34.539063 C 38.535156 34.90625 38.726563 35.273438 38.910156 35.625 C 39.09375 35.980469 39.273438 36.339844 39.441406 36.695313 C 39.613281 37.050781 39.777344 37.398438 39.945313 37.742188 C 40.105469 38.085938 40.265625 38.425781 40.417969 38.769531 L 40.429688 38.769531 C 40.40625 38.167969 40.386719 37.542969 40.375 36.894531 C 40.359375 36.242188 40.355469 35.621094 40.355469 35.03125 L 40.355469 27.222656 C 40.355469 27.140625 40.378906 27.0625 40.429688 26.992188 C 40.480469 26.921875 40.566406 26.863281 40.6875 26.8125 C 40.808594 26.761719 40.96875 26.722656 41.164063 26.703125 C 41.359375 26.679688 41.613281 26.671875 41.921875 26.671875 C 42.214844 26.671875 42.457031 26.679688 42.652344 26.703125 C 42.851563 26.726563 43.003906 26.761719 43.113281 26.8125 C 43.21875 26.863281 43.292969 26.921875 43.335938 26.992188 C 43.378906 27.0625 43.398438 27.136719 43.398438 27.222656 L 43.398438 42.179688 Z M 43.40625 42.179688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56.894531 38.371094 C 56.894531 39.246094 56.734375 40.011719 56.40625 40.671875 C 56.082031 41.332031 55.640625 41.886719 55.082031 42.324219 C 54.527344 42.765625 53.875 43.097656 53.128906 43.320313 C 52.382813 43.542969 51.585938 43.65625 50.738281 43.65625 C 50.164063 43.65625 49.628906 43.605469 49.136719 43.511719 C 48.644531 43.417969 48.207031 43.304688 47.832031 43.171875 C 47.453125 43.039063 47.136719 42.902344 46.886719 42.753906 C 46.632813 42.609375 46.449219 42.480469 46.339844 42.367188 C 46.226563 42.257813 46.148438 42.097656 46.101563 41.886719 C 46.054688 41.675781 46.03125 41.375 46.03125 40.980469 C 46.03125 40.714844 46.039063 40.492188 46.054688 40.3125 C 46.074219 40.132813 46.097656 39.984375 46.140625 39.875 C 46.179688 39.761719 46.230469 39.683594 46.292969 39.636719 C 46.359375 39.589844 46.433594 39.5625 46.519531 39.5625 C 46.640625 39.5625 46.808594 39.636719 47.027344 39.777344 C 47.246094 39.917969 47.527344 40.074219 47.871094 40.246094 C 48.210938 40.417969 48.621094 40.574219 49.097656 40.714844 C 49.570313 40.855469 50.125 40.925781 50.75 40.925781 C 51.160156 40.925781 51.527344 40.878906 51.855469 40.777344 C 52.179688 40.679688 52.457031 40.542969 52.683594 40.359375 C 52.910156 40.179688 53.082031 39.957031 53.203125 39.691406 C 53.324219 39.425781 53.382813 39.132813 53.382813 38.804688 C 53.382813 38.425781 53.28125 38.105469 53.074219 37.835938 C 52.867188 37.566406 52.601563 37.324219 52.269531 37.113281 C 51.9375 36.902344 51.566406 36.707031 51.144531 36.523438 C 50.726563 36.339844 50.292969 36.144531 49.847656 35.9375 C 49.402344 35.730469 48.96875 35.496094 48.550781 35.238281 C 48.128906 34.976563 47.753906 34.664063 47.425781 34.296875 C 47.09375 33.933594 46.828125 33.5 46.621094 33.003906 C 46.414063 32.507813 46.3125 31.910156 46.3125 31.214844 C 46.3125 30.417969 46.460938 29.71875 46.753906 29.113281 C 47.050781 28.507813 47.449219 28.007813 47.949219 27.609375 C 48.453125 27.210938 49.042969 26.910156 49.726563 26.714844 C 50.40625 26.519531 51.128906 26.417969 51.890625 26.417969 C 52.285156 26.417969 52.679688 26.449219 53.074219 26.507813 C 53.46875 26.570313 53.835938 26.652344 54.179688 26.753906 C 54.519531 26.859375 54.828125 26.972656 55.089844 27.101563 C 55.359375 27.230469 55.535156 27.335938 55.617188 27.421875 C 55.703125 27.507813 55.761719 27.582031 55.792969 27.640625 C 55.824219 27.703125 55.847656 27.78125 55.867188 27.878906 C 55.890625 27.980469 55.90625 28.101563 55.914063 28.253906 C 55.921875 28.402344 55.925781 28.589844 55.925781 28.8125 C 55.925781 29.0625 55.917969 29.273438 55.90625 29.445313 C 55.890625 29.613281 55.871094 29.757813 55.84375 29.867188 C 55.8125 29.976563 55.769531 30.0625 55.714844 30.113281 C 55.65625 30.164063 55.582031 30.191406 55.488281 30.191406 C 55.394531 30.191406 55.242188 30.128906 55.039063 30.011719 C 54.832031 29.890625 54.578125 29.761719 54.277344 29.617188 C 53.980469 29.476563 53.632813 29.347656 53.238281 29.230469 C 52.84375 29.113281 52.410156 29.058594 51.941406 29.058594 C 51.570313 29.058594 51.25 29.101563 50.976563 29.191406 C 50.703125 29.28125 50.472656 29.40625 50.289063 29.566406 C 50.105469 29.726563 49.96875 29.917969 49.878906 30.136719 C 49.789063 30.359375 49.742188 30.597656 49.742188 30.84375 C 49.742188 31.214844 49.84375 31.53125 50.042969 31.804688 C 50.246094 32.074219 50.515625 32.3125 50.855469 32.523438 C 51.195313 32.734375 51.578125 32.929688 52.007813 33.113281 C 52.4375 33.300781 52.871094 33.492188 53.320313 33.699219 C 53.765625 33.90625 54.203125 34.140625 54.632813 34.402344 C 55.058594 34.664063 55.441406 34.976563 55.777344 35.339844 C 56.109375 35.703125 56.378906 36.132813 56.585938 36.625 C 56.792969 37.125 56.894531 37.703125 56.894531 38.371094 Z M 56.894531 38.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.910156 34.796875 C 26.910156 36.324219 26.710938 37.628906 26.3125 38.710938 C 25.914063 39.796875 25.339844 40.683594 24.597656 41.367188 C 23.851563 42.054688 22.945313 42.558594 21.875 42.878906 C 20.808594 43.199219 19.539063 43.359375 18.0625 43.359375 L 14.089844 43.359375 C 13.808594 43.359375 13.570313 43.277344 13.378906 43.109375 C 13.183594 42.941406 13.089844 42.671875 13.089844 42.292969 L 13.089844 27.789063 C 13.089844 27.410156 13.183594 27.140625 13.378906 26.972656 C 13.570313 26.804688 13.808594 26.722656 14.089844 26.722656 L 18.359375 26.722656 C 19.84375 26.722656 21.101563 26.898438 22.132813 27.246094 C 23.167969 27.59375 24.035156 28.105469 24.746094 28.789063 C 25.453125 29.46875 25.988281 30.3125 26.359375 31.3125 C 26.726563 32.316406 26.910156 33.476563 26.910156 34.796875 Z M 23.414063 34.914063 C 23.414063 34.125 23.320313 33.390625 23.136719 32.714844 C 22.953125 32.039063 22.65625 31.449219 22.25 30.953125 C 21.839844 30.457031 21.320313 30.066406 20.679688 29.789063 C 20.039063 29.507813 19.203125 29.371094 18.164063 29.371094 L 16.453125 29.371094 L 16.453125 40.683594 L 18.21875 40.683594 C 19.140625 40.683594 19.921875 40.566406 20.558594 40.324219 C 21.191406 40.085938 21.722656 39.722656 22.144531 39.238281 C 22.570313 38.753906 22.886719 38.152344 23.097656 37.433594 C 23.308594 36.714844 23.414063 35.875 23.414063 34.914063 Z M 23.414063 34.914063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.40625 42.179688 C 43.40625 42.375 43.375 42.554688 43.304688 42.707031 C 43.234375 42.859375 43.140625 42.988281 43.027344 43.09375 C 42.914063 43.195313 42.773438 43.269531 42.617188 43.316406 C 42.457031 43.363281 42.296875 43.386719 42.132813 43.386719 L 40.695313 43.386719 C 40.394531 43.386719 40.136719 43.359375 39.914063 43.296875 C 39.695313 43.238281 39.492188 43.128906 39.3125 42.96875 C 39.125 42.8125 38.949219 42.597656 38.777344 42.328125 C 38.605469 42.058594 38.414063 41.707031 38.199219 41.277344 L 34.058594 33.5 C 33.820313 33.039063 33.574219 32.539063 33.328125 32 C 33.078125 31.464844 32.855469 30.945313 32.65625 30.4375 L 32.632813 30.4375 C 32.667969 31.054688 32.691406 31.671875 32.710938 32.28125 C 32.726563 32.894531 32.734375 33.527344 32.734375 34.179688 L 32.734375 42.882813 C 32.734375 42.96875 32.710938 43.046875 32.664063 43.117188 C 32.617188 43.183594 32.535156 43.242188 32.417969 43.289063 C 32.300781 43.335938 32.144531 43.375 31.949219 43.398438 C 31.753906 43.421875 31.5 43.4375 31.191406 43.4375 C 30.890625 43.4375 30.640625 43.421875 30.445313 43.398438 C 30.246094 43.371094 30.09375 43.335938 29.980469 43.289063 C 29.871094 43.242188 29.792969 43.183594 29.75 43.117188 C 29.707031 43.046875 29.6875 42.96875 29.6875 42.882813 L 29.6875 27.929688 C 29.6875 27.527344 29.804688 27.226563 30.039063 27.023438 C 30.273438 26.824219 30.5625 26.71875 30.90625 26.71875 L 32.71875 26.71875 C 33.042969 26.71875 33.320313 26.75 33.542969 26.804688 C 33.765625 26.859375 33.960938 26.953125 34.140625 27.082031 C 34.3125 27.210938 34.480469 27.386719 34.632813 27.613281 C 34.789063 27.84375 34.945313 28.125 35.109375 28.457031 L 38.351563 34.539063 C 38.535156 34.90625 38.726563 35.273438 38.910156 35.625 C 39.09375 35.980469 39.269531 36.339844 39.441406 36.695313 C 39.613281 37.050781 39.777344 37.398438 39.945313 37.742188 C 40.105469 38.085938 40.265625 38.425781 40.417969 38.769531 L 40.429688 38.769531 C 40.40625 38.167969 40.386719 37.542969 40.375 36.894531 C 40.359375 36.242188 40.355469 35.621094 40.355469 35.03125 L 40.355469 27.222656 C 40.355469 27.140625 40.378906 27.0625 40.429688 26.992188 C 40.480469 26.921875 40.566406 26.863281 40.6875 26.8125 C 40.808594 26.761719 40.96875 26.722656 41.164063 26.703125 C 41.359375 26.679688 41.613281 26.671875 41.921875 26.671875 C 42.210938 26.671875 42.453125 26.679688 42.652344 26.703125 C 42.851563 26.726563 43.003906 26.761719 43.113281 26.8125 C 43.214844 26.863281 43.292969 26.921875 43.335938 26.992188 C 43.378906 27.0625 43.398438 27.136719 43.398438 27.222656 L 43.398438 42.179688 Z M 43.40625 42.179688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56.894531 38.371094 C 56.894531 39.246094 56.730469 40.011719 56.40625 40.671875 C 56.082031 41.332031 55.640625 41.886719 55.082031 42.324219 C 54.527344 42.765625 53.875 43.097656 53.128906 43.320313 C 52.382813 43.542969 51.585938 43.65625 50.734375 43.65625 C 50.160156 43.65625 49.628906 43.605469 49.136719 43.511719 C 48.644531 43.417969 48.207031 43.304688 47.832031 43.171875 C 47.453125 43.039063 47.136719 42.902344 46.886719 42.753906 C 46.632813 42.609375 46.449219 42.480469 46.339844 42.367188 C 46.226563 42.257813 46.148438 42.097656 46.101563 41.886719 C 46.054688 41.675781 46.027344 41.375 46.027344 40.980469 C 46.027344 40.714844 46.039063 40.492188 46.054688 40.3125 C 46.074219 40.132813 46.097656 39.984375 46.140625 39.875 C 46.175781 39.761719 46.230469 39.683594 46.292969 39.636719 C 46.359375 39.589844 46.433594 39.5625 46.519531 39.5625 C 46.640625 39.5625 46.808594 39.636719 47.027344 39.777344 C 47.246094 39.917969 47.527344 40.074219 47.867188 40.246094 C 48.210938 40.417969 48.621094 40.574219 49.097656 40.714844 C 49.570313 40.855469 50.121094 40.925781 50.75 40.925781 C 51.160156 40.925781 51.527344 40.878906 51.851563 40.777344 C 52.179688 40.679688 52.457031 40.542969 52.683594 40.359375 C 52.910156 40.179688 53.082031 39.957031 53.203125 39.691406 C 53.324219 39.425781 53.382813 39.132813 53.382813 38.804688 C 53.382813 38.425781 53.28125 38.105469 53.074219 37.835938 C 52.867188 37.566406 52.597656 37.324219 52.269531 37.113281 C 51.9375 36.902344 51.566406 36.707031 51.144531 36.523438 C 50.726563 36.339844 50.289063 36.144531 49.847656 35.9375 C 49.402344 35.730469 48.96875 35.496094 48.550781 35.238281 C 48.128906 34.976563 47.753906 34.664063 47.425781 34.296875 C 47.09375 33.933594 46.828125 33.5 46.621094 33.003906 C 46.414063 32.507813 46.3125 31.910156 46.3125 31.214844 C 46.3125 30.417969 46.460938 29.71875 46.753906 29.113281 C 47.050781 28.507813 47.449219 28.007813 47.949219 27.609375 C 48.453125 27.210938 49.042969 26.910156 49.726563 26.714844 C 50.40625 26.519531 51.128906 26.417969 51.890625 26.417969 C 52.285156 26.417969 52.679688 26.449219 53.074219 26.507813 C 53.46875 26.570313 53.835938 26.652344 54.179688 26.753906 C 54.519531 26.859375 54.828125 26.972656 55.089844 27.101563 C 55.355469 27.230469 55.535156 27.335938 55.617188 27.421875 C 55.703125 27.507813 55.761719 27.582031 55.792969 27.640625 C 55.820313 27.703125 55.847656 27.78125 55.867188 27.878906 C 55.890625 27.980469 55.90625 28.101563 55.910156 28.253906 C 55.921875 28.402344 55.925781 28.589844 55.925781 28.8125 C 55.925781 29.0625 55.917969 29.273438 55.90625 29.445313 C 55.890625 29.613281 55.871094 29.757813 55.84375 29.867188 C 55.8125 29.976563 55.769531 30.0625 55.714844 30.113281 C 55.65625 30.164063 55.582031 30.191406 55.488281 30.191406 C 55.390625 30.191406 55.242188 30.128906 55.035156 30.011719 C 54.832031 29.890625 54.578125 29.761719 54.277344 29.617188 C 53.976563 29.476563 53.632813 29.347656 53.238281 29.230469 C 52.84375 29.113281 52.410156 29.058594 51.941406 29.058594 C 51.570313 29.058594 51.25 29.101563 50.976563 29.191406 C 50.703125 29.28125 50.472656 29.40625 50.289063 29.566406 C 50.105469 29.726563 49.96875 29.917969 49.878906 30.136719 C 49.789063 30.359375 49.742188 30.597656 49.742188 30.84375 C 49.742188 31.214844 49.84375 31.53125 50.042969 31.804688 C 50.246094 32.074219 50.515625 32.3125 50.855469 32.523438 C 51.195313 32.734375 51.578125 32.929688 52.007813 33.113281 C 52.4375 33.300781 52.871094 33.492188 53.320313 33.699219 C 53.765625 33.90625 54.199219 34.140625 54.628906 34.402344 C 55.058594 34.664063 55.441406 34.976563 55.777344 35.339844 C 56.109375 35.703125 56.378906 36.132813 56.585938 36.625 C 56.792969 37.125 56.894531 37.703125 56.894531 38.371094 Z M 56.894531 38.371094 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureDNSPrivate(m).png b/dist/Networking/AzureDNSPrivate(m).png
new file mode 100644
index 00000000..9fee0f50
Binary files /dev/null and b/dist/Networking/AzureDNSPrivate(m).png differ
diff --git a/dist/Networking/AzureDNSPrivate(m).svg b/dist/Networking/AzureDNSPrivate(m).svg
new file mode 100644
index 00000000..ce0e5242
--- /dev/null
+++ b/dist/Networking/AzureDNSPrivate(m).svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.609375 50.191406 C -2.871094 38.707031 -2.871094 20.09375 8.609375 8.613281 C 20.089844 -2.867188 38.707031 -2.867188 50.1875 8.613281 Z M 8.609375 50.191406 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56.449219 29.394531 C 56.449219 23.335938 54.394531 17.496094 50.605469 12.734375 L 50.390625 12.515625 C 50.28125 12.410156 50.28125 12.300781 50.171875 12.191406 L 48.441406 10.351563 C 43.355469 5.160156 36.648438 2.347656 29.398438 2.347656 C 29.398438 2.347656 29.398438 2.347656 29.292969 2.347656 L 29.183594 2.347656 C 22.042969 2.457031 15.445313 5.160156 10.359375 10.246094 L 8.519531 12.191406 C 8.410156 12.300781 8.410156 12.410156 8.300781 12.515625 L 8.085938 12.625 C 4.40625 17.386719 2.351563 23.335938 2.351563 29.394531 C 2.351563 35.453125 4.40625 41.296875 8.195313 46.054688 L 8.410156 46.273438 C 8.519531 46.378906 8.519531 46.488281 8.628906 46.597656 L 10.359375 48.4375 C 15.445313 53.523438 22.042969 56.335938 29.183594 56.335938 L 29.292969 56.335938 C 29.292969 56.335938 29.292969 56.335938 29.398438 56.335938 C 36.539063 56.335938 43.355469 53.523438 48.441406 48.4375 L 50.171875 46.488281 C 50.28125 46.382813 50.28125 46.273438 50.390625 46.164063 L 50.605469 45.949219 C 54.394531 41.40625 56.449219 35.453125 56.449219 29.394531 Z M 45.519531 11.761719 C 45.414063 11.761719 45.304688 11.867188 45.195313 11.867188 C 44.980469 11.976563 44.761719 12.085938 44.65625 12.085938 C 44.222656 12.300781 43.679688 12.410156 43.140625 12.625 C 43.03125 12.625 42.925781 12.734375 42.816406 12.734375 C 42.167969 12.949219 41.625 13.058594 40.976563 13.273438 C 40.867188 13.273438 40.652344 13.382813 40.542969 13.382813 C 39.570313 10.785156 38.378906 8.511719 36.972656 6.78125 C 40.113281 7.757813 43.03125 9.488281 45.519531 11.761719 Z M 29.183594 5.484375 L 29.289063 5.484375 C 32.210938 5.484375 35.242188 8.621094 37.40625 14.03125 C 34.917969 14.464844 32.210938 14.683594 29.398438 14.683594 C 26.585938 14.683594 23.773438 14.464844 21.175781 14.03125 C 23.234375 8.730469 26.261719 5.59375 29.183594 5.484375 Z M 21.503906 6.890625 C 20.203125 8.621094 19.015625 10.785156 18.039063 13.382813 C 17.933594 13.382813 17.933594 13.382813 17.824219 13.382813 C 17.171875 13.164063 16.527344 13.058594 15.984375 12.84375 C 15.875 12.84375 15.765625 12.734375 15.660156 12.734375 C 15.226563 12.515625 14.683594 12.300781 14.253906 12.085938 C 14.035156 11.976563 13.925781 11.976563 13.710938 11.867188 C 13.605469 11.761719 13.496094 11.761719 13.277344 11.652344 C 15.769531 9.59375 18.472656 7.863281 21.503906 6.890625 Z M 13.277344 47.03125 C 13.386719 47.03125 13.496094 46.921875 13.605469 46.921875 C 13.820313 46.816406 13.929688 46.816406 14.144531 46.707031 C 14.578125 46.488281 15.117188 46.378906 15.660156 46.164063 C 15.765625 46.164063 15.875 46.058594 15.984375 46.058594 C 16.632813 45.839844 17.171875 45.730469 17.824219 45.515625 C 17.929688 45.515625 17.929688 45.515625 18.039063 45.515625 C 19.015625 48.003906 20.203125 50.277344 21.503906 52.007813 C 18.472656 50.925781 15.660156 49.195313 13.277344 47.03125 Z M 29.292969 53.304688 L 29.183594 53.304688 C 26.261719 53.199219 23.234375 50.167969 21.179688 44.867188 C 23.773438 44.433594 26.585938 44.21875 29.398438 44.21875 C 32.210938 44.21875 34.808594 44.433594 37.40625 44.867188 C 35.351563 50.167969 32.210938 53.304688 29.292969 53.304688 Z M 36.972656 52.007813 C 38.382813 50.277344 39.570313 48.003906 40.542969 45.40625 C 40.652344 45.40625 40.867188 45.515625 40.976563 45.515625 C 41.625 45.730469 42.273438 45.839844 42.816406 46.054688 C 42.925781 46.054688 43.03125 46.164063 43.140625 46.164063 C 43.679688 46.378906 44.117188 46.488281 44.65625 46.703125 C 44.871094 46.8125 44.980469 46.8125 45.195313 46.921875 C 45.304688 46.921875 45.414063 47.027344 45.628906 47.136719 C 43.03125 49.300781 40.113281 51.035156 36.972656 52.007813 Z M 47.902344 44.542969 C 47.578125 44.542969 47.359375 44.433594 47.035156 44.324219 C 46.710938 44.21875 46.277344 44 45.953125 43.894531 C 45.847656 43.894531 45.738281 43.785156 45.628906 43.785156 C 44.332031 43.246094 42.925781 42.917969 41.515625 42.488281 C 41.84375 41.1875 42.167969 39.890625 42.382813 38.59375 L 39.136719 38.59375 C 38.921875 39.78125 38.703125 40.863281 38.378906 41.835938 C 35.566406 41.296875 32.539063 41.082031 29.398438 41.082031 C 26.15625 41.082031 23.125 41.40625 20.203125 41.945313 C 19.878906 40.863281 19.664063 39.78125 19.445313 38.589844 L 16.199219 38.589844 C 16.417969 39.996094 16.742188 41.296875 17.066406 42.59375 C 15.769531 42.917969 14.46875 43.351563 13.277344 43.785156 C 13.171875 43.890625 12.953125 43.890625 12.847656 44 C 12.523438 44.109375 12.089844 44.324219 11.765625 44.433594 C 11.546875 44.433594 11.222656 44.539063 11.007813 44.648438 C 7.761719 40.753906 5.921875 35.886719 5.597656 30.910156 L 8.300781 30.910156 L 8.300781 27.773438 L 5.597656 27.773438 C 5.921875 22.792969 7.761719 18.035156 10.898438 14.246094 L 11.007813 14.140625 C 11.222656 14.246094 11.546875 14.355469 11.765625 14.464844 C 12.195313 14.683594 12.523438 14.789063 12.953125 15.003906 C 13.0625 15.003906 13.171875 15.113281 13.277344 15.113281 C 14.46875 15.546875 15.765625 15.976563 17.171875 16.304688 C 16.847656 17.492188 16.632813 18.683594 16.417969 19.871094 L 19.660156 19.871094 C 19.878906 18.898438 20.09375 17.816406 20.3125 16.953125 C 23.234375 17.492188 26.371094 17.816406 29.507813 17.816406 C 32.644531 17.816406 35.675781 17.492188 38.488281 17.058594 C 38.703125 17.925781 38.921875 18.898438 39.136719 19.980469 L 42.382813 19.980469 C 42.164063 18.789063 41.949219 17.601563 41.625 16.410156 C 43.03125 16.085938 44.328125 15.652344 45.628906 15.113281 C 45.734375 15.113281 45.953125 15.003906 46.058594 15.003906 C 46.492188 14.898438 46.816406 14.679688 47.25 14.574219 C 47.46875 14.464844 47.789063 14.355469 48.007813 14.246094 C 51.144531 18.144531 53.09375 22.902344 53.417969 27.878906 L 50.171875 27.878906 L 50.171875 31.015625 L 53.417969 31.015625 C 52.878906 35.886719 51.039063 40.753906 47.902344 44.542969 Z M 47.902344 44.542969 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 58.800781 29.398438 C 58.800781 45.636719 45.636719 58.800781 29.398438 58.800781 C 13.164063 58.800781 0 45.636719 0 29.398438 C 0 13.164063 13.164063 0 29.398438 0 C 45.636719 0 58.800781 13.164063 58.800781 29.398438 Z M 58.800781 29.398438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 22.605469 29.230469 C 22.605469 30.511719 22.4375 31.609375 22.101563 32.519531 C 21.765625 33.429688 21.285156 34.171875 20.660156 34.746094 C 20.03125 35.324219 19.273438 35.746094 18.375 36.015625 C 17.480469 36.285156 16.410156 36.421875 15.171875 36.421875 L 11.835938 36.421875 C 11.601563 36.421875 11.398438 36.351563 11.238281 36.210938 C 11.074219 36.070313 10.996094 35.839844 10.996094 35.523438 L 10.996094 23.34375 C 10.996094 23.023438 11.078125 22.796875 11.238281 22.65625 C 11.398438 22.515625 11.601563 22.445313 11.835938 22.445313 L 15.421875 22.445313 C 16.667969 22.445313 17.726563 22.59375 18.59375 22.882813 C 19.460938 23.175781 20.191406 23.609375 20.789063 24.179688 C 21.378906 24.753906 21.832031 25.460938 22.144531 26.300781 C 22.449219 27.144531 22.605469 28.121094 22.605469 29.230469 Z M 19.667969 29.328125 C 19.667969 28.664063 19.589844 28.050781 19.433594 27.480469 C 19.28125 26.910156 19.03125 26.417969 18.6875 26 C 18.347656 25.582031 17.90625 25.257813 17.371094 25.023438 C 16.832031 24.785156 16.128906 24.671875 15.257813 24.671875 L 13.820313 24.671875 L 13.820313 34.175781 L 15.304688 34.175781 C 16.082031 34.175781 16.734375 34.074219 17.269531 33.871094 C 17.800781 33.671875 18.246094 33.367188 18.601563 32.960938 C 18.960938 32.554688 19.226563 32.046875 19.402344 31.441406 C 19.578125 30.839844 19.667969 30.132813 19.667969 29.328125 Z M 19.667969 29.328125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.460938 35.429688 C 36.460938 35.597656 36.433594 35.746094 36.375 35.875 C 36.316406 36.003906 36.242188 36.109375 36.140625 36.199219 C 36.046875 36.285156 35.929688 36.347656 35.796875 36.386719 C 35.664063 36.425781 35.527344 36.445313 35.390625 36.445313 L 34.183594 36.445313 C 33.929688 36.445313 33.714844 36.421875 33.527344 36.371094 C 33.34375 36.320313 33.175781 36.226563 33.019531 36.09375 C 32.863281 35.960938 32.714844 35.78125 32.574219 35.554688 C 32.429688 35.328125 32.265625 35.035156 32.089844 34.671875 L 28.609375 28.136719 C 28.40625 27.75 28.203125 27.332031 27.996094 26.878906 C 27.785156 26.429688 27.597656 25.992188 27.429688 25.566406 L 27.410156 25.566406 C 27.441406 26.085938 27.460938 26.601563 27.476563 27.117188 C 27.492188 27.628906 27.496094 28.164063 27.496094 28.707031 L 27.496094 36.019531 C 27.496094 36.09375 27.476563 36.15625 27.4375 36.214844 C 27.398438 36.273438 27.328125 36.320313 27.230469 36.359375 C 27.132813 36.402344 27 36.429688 26.839844 36.453125 C 26.671875 36.472656 26.460938 36.484375 26.199219 36.484375 C 25.949219 36.484375 25.742188 36.472656 25.574219 36.453125 C 25.410156 36.429688 25.277344 36.398438 25.1875 36.359375 C 25.09375 36.320313 25.027344 36.273438 24.992188 36.214844 C 24.957031 36.15625 24.9375 36.09375 24.9375 36.019531 L 24.9375 23.460938 C 24.9375 23.121094 25.035156 22.867188 25.234375 22.699219 C 25.429688 22.53125 25.675781 22.445313 25.964844 22.445313 L 27.484375 22.445313 C 27.757813 22.445313 27.988281 22.46875 28.175781 22.515625 C 28.363281 22.5625 28.53125 22.636719 28.679688 22.746094 C 28.824219 22.855469 28.96875 23.003906 29.09375 23.195313 C 29.222656 23.386719 29.355469 23.621094 29.492188 23.902344 L 32.21875 29.011719 C 32.375 29.320313 32.53125 29.625 32.6875 29.925781 C 32.839844 30.222656 32.992188 30.523438 33.132813 30.824219 C 33.277344 31.121094 33.417969 31.414063 33.554688 31.703125 C 33.691406 31.988281 33.824219 32.277344 33.953125 32.566406 L 33.964844 32.566406 C 33.945313 32.0625 33.925781 31.535156 33.917969 30.988281 C 33.90625 30.441406 33.902344 29.917969 33.902344 29.421875 L 33.902344 22.867188 C 33.902344 22.796875 33.921875 22.730469 33.964844 22.671875 C 34.007813 22.617188 34.082031 22.566406 34.183594 22.523438 C 34.28125 22.476563 34.417969 22.449219 34.582031 22.429688 C 34.746094 22.410156 34.960938 22.402344 35.21875 22.402344 C 35.464844 22.402344 35.667969 22.410156 35.832031 22.429688 C 36 22.449219 36.125 22.476563 36.21875 22.523438 C 36.304688 22.566406 36.371094 22.613281 36.40625 22.671875 C 36.441406 22.730469 36.460938 22.792969 36.460938 22.867188 Z M 36.460938 35.429688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.792969 32.230469 C 47.792969 32.96875 47.65625 33.609375 47.382813 34.164063 C 47.109375 34.71875 46.738281 35.183594 46.269531 35.554688 C 45.800781 35.925781 45.253906 36.203125 44.628906 36.390625 C 44.003906 36.578125 43.332031 36.671875 42.617188 36.671875 C 42.136719 36.671875 41.6875 36.628906 41.273438 36.550781 C 40.859375 36.472656 40.496094 36.378906 40.179688 36.265625 C 39.859375 36.152344 39.597656 36.039063 39.386719 35.914063 C 39.171875 35.792969 39.019531 35.683594 38.925781 35.589844 C 38.832031 35.496094 38.765625 35.359375 38.726563 35.183594 C 38.6875 35.007813 38.664063 34.753906 38.664063 34.421875 C 38.664063 34.199219 38.671875 34.011719 38.6875 33.863281 C 38.703125 33.710938 38.722656 33.585938 38.757813 33.492188 C 38.789063 33.402344 38.832031 33.335938 38.886719 33.292969 C 38.941406 33.253906 39.003906 33.234375 39.074219 33.234375 C 39.175781 33.234375 39.320313 33.292969 39.5 33.414063 C 39.683594 33.53125 39.921875 33.664063 40.210938 33.804688 C 40.496094 33.949219 40.839844 34.082031 41.242188 34.199219 C 41.640625 34.316406 42.105469 34.378906 42.628906 34.378906 C 42.972656 34.378906 43.285156 34.335938 43.558594 34.253906 C 43.828125 34.167969 44.0625 34.054688 44.253906 33.902344 C 44.441406 33.75 44.585938 33.566406 44.6875 33.339844 C 44.789063 33.117188 44.839844 32.871094 44.839844 32.59375 C 44.839844 32.277344 44.753906 32.007813 44.582031 31.78125 C 44.40625 31.554688 44.179688 31.351563 43.902344 31.171875 C 43.625 30.996094 43.3125 30.832031 42.960938 30.679688 C 42.605469 30.523438 42.242188 30.359375 41.867188 30.183594 C 41.492188 30.011719 41.128906 29.816406 40.777344 29.597656 C 40.425781 29.378906 40.109375 29.117188 39.832031 28.808594 C 39.554688 28.503906 39.332031 28.136719 39.15625 27.722656 C 38.984375 27.304688 38.894531 26.804688 38.894531 26.21875 C 38.894531 25.550781 39.019531 24.960938 39.269531 24.453125 C 39.519531 23.945313 39.851563 23.523438 40.273438 23.1875 C 40.695313 22.855469 41.191406 22.601563 41.761719 22.4375 C 42.335938 22.273438 42.945313 22.191406 43.582031 22.191406 C 43.914063 22.191406 44.246094 22.214844 44.574219 22.265625 C 44.90625 22.316406 45.21875 22.382813 45.503906 22.472656 C 45.792969 22.558594 46.046875 22.65625 46.269531 22.761719 C 46.496094 22.871094 46.640625 22.960938 46.714844 23.03125 C 46.785156 23.105469 46.835938 23.164063 46.859375 23.214844 C 46.882813 23.265625 46.90625 23.332031 46.921875 23.417969 C 46.941406 23.5 46.953125 23.605469 46.960938 23.730469 C 46.96875 23.855469 46.972656 24.011719 46.972656 24.199219 C 46.972656 24.410156 46.964844 24.585938 46.953125 24.730469 C 46.941406 24.871094 46.921875 24.992188 46.898438 25.085938 C 46.875 25.179688 46.839844 25.25 46.792969 25.292969 C 46.746094 25.335938 46.679688 25.355469 46.601563 25.355469 C 46.523438 25.355469 46.398438 25.308594 46.226563 25.207031 C 46.054688 25.105469 45.839844 24.996094 45.589844 24.875 C 45.335938 24.757813 45.046875 24.648438 44.714844 24.550781 C 44.382813 24.453125 44.019531 24.40625 43.625 24.40625 C 43.316406 24.40625 43.042969 24.441406 42.816406 24.519531 C 42.582031 24.59375 42.390625 24.699219 42.238281 24.832031 C 42.082031 24.964844 41.96875 25.125 41.890625 25.3125 C 41.816406 25.5 41.777344 25.699219 41.777344 25.90625 C 41.777344 26.214844 41.863281 26.480469 42.03125 26.710938 C 42.203125 26.9375 42.429688 27.140625 42.710938 27.316406 C 42.996094 27.492188 43.320313 27.65625 43.679688 27.8125 C 44.039063 27.964844 44.40625 28.128906 44.78125 28.304688 C 45.15625 28.476563 45.523438 28.671875 45.882813 28.890625 C 46.242188 29.113281 46.5625 29.375 46.84375 29.679688 C 47.125 29.988281 47.351563 30.347656 47.527344 30.761719 C 47.703125 31.183594 47.792969 31.671875 47.792969 32.230469 Z M 47.792969 32.230469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 68.601563 51.800781 C 68.601563 61.078125 61.078125 68.601563 51.800781 68.601563 C 42.523438 68.601563 35 61.078125 35 51.800781 C 35 42.523438 42.523438 35 51.800781 35 C 61.078125 35 68.601563 42.523438 68.601563 51.800781 Z M 68.601563 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 51.800781 36.398438 C 60.289063 36.398438 67.199219 43.308594 67.199219 51.800781 C 67.199219 60.289063 60.289063 67.199219 51.800781 67.199219 C 43.308594 67.199219 36.398438 60.289063 36.398438 51.800781 C 36.398438 43.308594 43.308594 36.398438 51.800781 36.398438 M 51.800781 33.601563 C 41.746094 33.601563 33.601563 41.746094 33.601563 51.800781 C 33.601563 61.851563 41.746094 70 51.800781 70 C 61.851563 70 70 61.851563 70 51.800781 C 70 41.746094 61.851563 33.601563 51.800781 33.601563 Z M 51.800781 33.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 56.269531 59.375 C 55.820313 59.375 55.394531 59.160156 55.128906 58.796875 L 51.800781 54.242188 L 48.46875 58.796875 C 48.207031 59.160156 47.777344 59.375 47.328125 59.375 C 47.027344 59.375 46.742188 59.28125 46.496094 59.105469 C 46.191406 58.882813 45.992188 58.554688 45.933594 58.179688 C 45.875 57.808594 45.96875 57.4375 46.191406 57.132813 L 49.621094 52.4375 L 44.460938 50.929688 C 43.710938 50.710938 43.28125 49.925781 43.5 49.179688 C 43.675781 48.578125 44.230469 48.160156 44.855469 48.160156 C 44.988281 48.160156 45.121094 48.179688 45.25 48.21875 L 50.390625 49.71875 L 50.390625 44.015625 C 50.390625 43.238281 51.023438 42.605469 51.800781 42.605469 C 52.582031 42.605469 53.214844 43.238281 53.214844 44.015625 L 53.214844 49.714844 L 58.351563 48.21875 C 58.480469 48.179688 58.613281 48.160156 58.75 48.160156 C 59.371094 48.160156 59.929688 48.578125 60.101563 49.179688 C 60.320313 49.925781 59.890625 50.710938 59.144531 50.929688 L 53.980469 52.4375 L 57.410156 57.132813 C 57.632813 57.433594 57.726563 57.804688 57.667969 58.179688 C 57.609375 58.554688 57.410156 58.882813 57.105469 59.101563 C 56.859375 59.28125 56.570313 59.375 56.269531 59.375 Z M 56.269531 59.375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.800781 51.800781 L 46.496094 59.105469 C 46.191406 58.882813 45.992188 58.554688 45.933594 58.179688 C 45.875 57.808594 45.96875 57.4375 46.191406 57.132813 L 49.621094 52.4375 L 44.460938 50.929688 C 43.710938 50.710938 43.28125 49.925781 43.5 49.179688 C 43.675781 48.578125 44.230469 48.160156 44.855469 48.160156 C 44.988281 48.160156 45.121094 48.179688 45.25 48.21875 L 50.390625 49.71875 L 50.390625 44.015625 C 50.390625 43.238281 51.023438 42.605469 51.800781 42.605469 Z M 51.800781 51.800781 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureDNSPrivate.png b/dist/Networking/AzureDNSPrivate.png
new file mode 100644
index 00000000..4165f61a
Binary files /dev/null and b/dist/Networking/AzureDNSPrivate.png differ
diff --git a/dist/Networking/AzureDNSPrivate.puml b/dist/Networking/AzureDNSPrivate.puml
new file mode 100644
index 00000000..c72663e7
--- /dev/null
+++ b/dist/Networking/AzureDNSPrivate.puml
@@ -0,0 +1,18 @@
+sprite $AzureDNSPrivate [70x70/16z] {
+fPO7mfim34QjwQ4azpzkAzbWWWd_UjsKl6XyZ7G9a6WkJbPXIBy09PSJWZzqy51aLHLLtOpy4qTnX14cIDAFVhUNx4KGh92wXxuZyQ_KwK0UDKsFVka0BuHX
+fpV7uUkUN4g6BoJ-LHXdHprQEh8V0VHZU3kI-DvUkGA0b60SrJ4jlXyEZDFHFuq0L2O4W5kXL6gZEmcDrel4foQvbpREQDO-DPN7ASN1lP_P4-v_uMRruufv
+M-SiPHAJYH0WefZb3vEL6HAC8Ix5z2qvsOml-ya-KC6PUHPHrRYMX0ctuoY2YDNQAk6-1iyK8tm6kJHhX3uQNIpb692CdnovcLEZfmPNfSo0881c5IOY_0yH
+iwX_JREE8b8pMQQYiOCPZhA2W6LOMYzcMT2n58qzBn2YsYo6pUYSbIZbbjh-OuTYwYapUOtPAh4ts0jhfok8HinKd7r0sr-5Opj5cBNhCYAPOPfGAJWQceSS
+Y6xZC9arJa7TMcecorZAi03qBeSJkexCKmRCaCfewJGOzTtYPeabzKzlMQfXmIYZZUG9Oh5wJikqZ3_LVqS_K2qi49QD78avnv_UB1mrf4IK4hTk8IzmjvH8
+pydYwBH8IXWMxtnOea7C8tIuMkHiqSqILNNBc2MrpI9cS5DBM2WirGTOkyMQn4eFjS3tvXAPuB24nuTZrchLSqTvjS3O4LdiORV4lsBL6Zkwoqj1NyUmz82I
+DMrcaH0lfR9RwiVi4k78RksM1c6fAR48n0aGSCvfmkjr12wnRZ4DIwyUJbnUqq9El8xLPaBPGaDKV4EulnAf2kF9ipx6GdAcaYkqFLyTKpngzFrUbtE-adZR
+88_NWMVsOzVtNGRWLL8HWEnrui5TCzER3tVlTYNXMSWiHqApFeyo8DPMIrQLGBNuJ3W6ig2xfXmVI1KH2Ky0qEDGmK7ut9kI_NMfAEC5072OYIMqmsmmBFET
+8JC23kAbmP78XhmcEK5vJGeC3NbFmMX7cqqQ0ZxUBVauOGBOCyCX8QsjFyqd6K1VgsKjPhpN8RVzQJuHW7PdUUmMw0_qhf7tOWXmB4MvJikZrA6XGu9h4vzA
+wUyvUXmBlO8Q9weao2rUeeT6mn9Giz2WrBYp5XlKVKEM1Z1e-s3IXkU-OFTGQ9RX6iEqS7cyLal2QbOPTtACMl5jHGz5jt3jevgMYM-cpFYJPYNicPjWWdbL
+BHR7LzGAd_FFhuacG8AvwpdT0zhRu3SBpa-qbA0QlaM85qi2zyIZgsIdL3vSYy-KGA87VEp7q2qB57Ezl08e0Vb8v32i2iEoW99hLxMQ8S8R0A2DxyVT798R
+-l_376RLCG_JjfPoJqnXPTuOlcc9QTpSUB-haMj92SdtDVhygoGq_BXy747wcGRBUpcLVYe93L2PYVsv8u20T3otu1UIcxUWd_F9yGy
+}
+
+AzureEntityColoring(AzureDNSPrivate)
+!define AzureDNSPrivate(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDNSPrivate, AzureDNSPrivate)
+!define AzureDNSPrivate(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDNSPrivate, AzureDNSPrivate)
diff --git a/dist/Networking/AzureDNSPrivate.svg b/dist/Networking/AzureDNSPrivate.svg
new file mode 100644
index 00000000..3ffe7c8e
--- /dev/null
+++ b/dist/Networking/AzureDNSPrivate.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.609375 50.191406 C -2.871094 38.707031 -2.871094 20.09375 8.609375 8.613281 C 20.089844 -2.867188 38.707031 -2.867188 50.1875 8.613281 Z M 8.609375 50.191406 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56.449219 29.394531 C 56.449219 23.335938 54.394531 17.496094 50.605469 12.734375 L 50.390625 12.515625 C 50.28125 12.410156 50.28125 12.300781 50.171875 12.191406 L 48.441406 10.351563 C 43.355469 5.160156 36.648438 2.347656 29.398438 2.347656 C 29.398438 2.347656 29.398438 2.347656 29.292969 2.347656 L 29.183594 2.347656 C 22.042969 2.457031 15.445313 5.160156 10.359375 10.246094 L 8.519531 12.191406 C 8.410156 12.300781 8.410156 12.410156 8.300781 12.515625 L 8.085938 12.625 C 4.40625 17.386719 2.351563 23.335938 2.351563 29.394531 C 2.351563 35.453125 4.40625 41.296875 8.195313 46.054688 L 8.410156 46.273438 C 8.519531 46.378906 8.519531 46.488281 8.628906 46.597656 L 10.359375 48.4375 C 15.445313 53.523438 22.042969 56.335938 29.183594 56.335938 L 29.292969 56.335938 C 29.292969 56.335938 29.292969 56.335938 29.398438 56.335938 C 36.539063 56.335938 43.355469 53.523438 48.441406 48.4375 L 50.171875 46.488281 C 50.28125 46.382813 50.28125 46.273438 50.390625 46.164063 L 50.605469 45.949219 C 54.394531 41.40625 56.449219 35.453125 56.449219 29.394531 Z M 45.519531 11.761719 C 45.414063 11.761719 45.304688 11.867188 45.195313 11.867188 C 44.980469 11.976563 44.761719 12.085938 44.65625 12.085938 C 44.222656 12.300781 43.679688 12.410156 43.140625 12.625 C 43.03125 12.625 42.925781 12.734375 42.816406 12.734375 C 42.167969 12.949219 41.625 13.058594 40.976563 13.273438 C 40.867188 13.273438 40.652344 13.382813 40.542969 13.382813 C 39.570313 10.785156 38.378906 8.511719 36.972656 6.78125 C 40.113281 7.757813 43.03125 9.488281 45.519531 11.761719 Z M 29.183594 5.484375 L 29.289063 5.484375 C 32.210938 5.484375 35.242188 8.621094 37.40625 14.03125 C 34.917969 14.464844 32.210938 14.683594 29.398438 14.683594 C 26.585938 14.683594 23.773438 14.464844 21.175781 14.03125 C 23.234375 8.730469 26.261719 5.59375 29.183594 5.484375 Z M 21.503906 6.890625 C 20.203125 8.621094 19.015625 10.785156 18.039063 13.382813 C 17.933594 13.382813 17.933594 13.382813 17.824219 13.382813 C 17.171875 13.164063 16.527344 13.058594 15.984375 12.84375 C 15.875 12.84375 15.765625 12.734375 15.660156 12.734375 C 15.226563 12.515625 14.683594 12.300781 14.253906 12.085938 C 14.035156 11.976563 13.925781 11.976563 13.710938 11.867188 C 13.605469 11.761719 13.496094 11.761719 13.277344 11.652344 C 15.769531 9.59375 18.472656 7.863281 21.503906 6.890625 Z M 13.277344 47.03125 C 13.386719 47.03125 13.496094 46.921875 13.605469 46.921875 C 13.820313 46.816406 13.929688 46.816406 14.144531 46.707031 C 14.578125 46.488281 15.117188 46.378906 15.660156 46.164063 C 15.765625 46.164063 15.875 46.058594 15.984375 46.058594 C 16.632813 45.839844 17.171875 45.730469 17.824219 45.515625 C 17.929688 45.515625 17.929688 45.515625 18.039063 45.515625 C 19.015625 48.003906 20.203125 50.277344 21.503906 52.007813 C 18.472656 50.925781 15.660156 49.195313 13.277344 47.03125 Z M 29.292969 53.304688 L 29.183594 53.304688 C 26.261719 53.199219 23.234375 50.167969 21.179688 44.867188 C 23.773438 44.433594 26.585938 44.21875 29.398438 44.21875 C 32.210938 44.21875 34.808594 44.433594 37.40625 44.867188 C 35.351563 50.167969 32.210938 53.304688 29.292969 53.304688 Z M 36.972656 52.007813 C 38.382813 50.277344 39.570313 48.003906 40.542969 45.40625 C 40.652344 45.40625 40.867188 45.515625 40.976563 45.515625 C 41.625 45.730469 42.273438 45.839844 42.816406 46.054688 C 42.925781 46.054688 43.03125 46.164063 43.140625 46.164063 C 43.679688 46.378906 44.117188 46.488281 44.65625 46.703125 C 44.871094 46.8125 44.980469 46.8125 45.195313 46.921875 C 45.304688 46.921875 45.414063 47.027344 45.628906 47.136719 C 43.03125 49.300781 40.113281 51.035156 36.972656 52.007813 Z M 47.902344 44.542969 C 47.578125 44.542969 47.359375 44.433594 47.035156 44.324219 C 46.710938 44.21875 46.277344 44 45.953125 43.894531 C 45.847656 43.894531 45.738281 43.785156 45.628906 43.785156 C 44.332031 43.246094 42.925781 42.917969 41.515625 42.488281 C 41.84375 41.1875 42.167969 39.890625 42.382813 38.59375 L 39.136719 38.59375 C 38.921875 39.78125 38.703125 40.863281 38.378906 41.835938 C 35.566406 41.296875 32.539063 41.082031 29.398438 41.082031 C 26.15625 41.082031 23.125 41.40625 20.203125 41.945313 C 19.878906 40.863281 19.664063 39.78125 19.445313 38.589844 L 16.199219 38.589844 C 16.417969 39.996094 16.742188 41.296875 17.066406 42.59375 C 15.769531 42.917969 14.46875 43.351563 13.277344 43.785156 C 13.171875 43.890625 12.953125 43.890625 12.847656 44 C 12.523438 44.109375 12.089844 44.324219 11.765625 44.433594 C 11.546875 44.433594 11.222656 44.539063 11.007813 44.648438 C 7.761719 40.753906 5.921875 35.886719 5.597656 30.910156 L 8.300781 30.910156 L 8.300781 27.773438 L 5.597656 27.773438 C 5.921875 22.792969 7.761719 18.035156 10.898438 14.246094 L 11.007813 14.140625 C 11.222656 14.246094 11.546875 14.355469 11.765625 14.464844 C 12.195313 14.683594 12.523438 14.789063 12.953125 15.003906 C 13.0625 15.003906 13.171875 15.113281 13.277344 15.113281 C 14.46875 15.546875 15.765625 15.976563 17.171875 16.304688 C 16.847656 17.492188 16.632813 18.683594 16.417969 19.871094 L 19.660156 19.871094 C 19.878906 18.898438 20.09375 17.816406 20.3125 16.953125 C 23.234375 17.492188 26.371094 17.816406 29.507813 17.816406 C 32.644531 17.816406 35.675781 17.492188 38.488281 17.058594 C 38.703125 17.925781 38.921875 18.898438 39.136719 19.980469 L 42.382813 19.980469 C 42.164063 18.789063 41.949219 17.601563 41.625 16.410156 C 43.03125 16.085938 44.328125 15.652344 45.628906 15.113281 C 45.734375 15.113281 45.953125 15.003906 46.058594 15.003906 C 46.492188 14.898438 46.816406 14.679688 47.25 14.574219 C 47.46875 14.464844 47.789063 14.355469 48.007813 14.246094 C 51.144531 18.144531 53.09375 22.902344 53.417969 27.878906 L 50.171875 27.878906 L 50.171875 31.015625 L 53.417969 31.015625 C 52.878906 35.886719 51.039063 40.753906 47.902344 44.542969 Z M 47.902344 44.542969 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 58.800781 29.398438 C 58.800781 45.636719 45.636719 58.800781 29.398438 58.800781 C 13.164063 58.800781 0 45.636719 0 29.398438 C 0 13.164063 13.164063 0 29.398438 0 C 45.636719 0 58.800781 13.164063 58.800781 29.398438 Z M 58.800781 29.398438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.605469 29.230469 C 22.605469 30.511719 22.4375 31.609375 22.101563 32.519531 C 21.765625 33.429688 21.285156 34.171875 20.660156 34.746094 C 20.03125 35.324219 19.273438 35.746094 18.375 36.015625 C 17.480469 36.285156 16.410156 36.421875 15.171875 36.421875 L 11.835938 36.421875 C 11.601563 36.421875 11.398438 36.351563 11.238281 36.210938 C 11.074219 36.070313 10.996094 35.839844 10.996094 35.523438 L 10.996094 23.34375 C 10.996094 23.023438 11.078125 22.796875 11.238281 22.65625 C 11.398438 22.515625 11.601563 22.445313 11.835938 22.445313 L 15.421875 22.445313 C 16.667969 22.445313 17.726563 22.59375 18.59375 22.882813 C 19.460938 23.175781 20.191406 23.609375 20.789063 24.179688 C 21.378906 24.753906 21.832031 25.460938 22.144531 26.300781 C 22.449219 27.144531 22.605469 28.121094 22.605469 29.230469 Z M 19.667969 29.328125 C 19.667969 28.664063 19.589844 28.050781 19.433594 27.480469 C 19.28125 26.910156 19.03125 26.417969 18.6875 26 C 18.347656 25.582031 17.90625 25.257813 17.371094 25.023438 C 16.832031 24.785156 16.128906 24.671875 15.257813 24.671875 L 13.820313 24.671875 L 13.820313 34.175781 L 15.304688 34.175781 C 16.082031 34.175781 16.734375 34.074219 17.269531 33.871094 C 17.800781 33.671875 18.246094 33.367188 18.601563 32.960938 C 18.960938 32.554688 19.226563 32.046875 19.402344 31.441406 C 19.578125 30.839844 19.667969 30.132813 19.667969 29.328125 Z M 19.667969 29.328125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.460938 35.429688 C 36.460938 35.597656 36.433594 35.746094 36.375 35.875 C 36.316406 36.003906 36.242188 36.109375 36.140625 36.199219 C 36.046875 36.285156 35.929688 36.347656 35.796875 36.386719 C 35.664063 36.425781 35.527344 36.445313 35.390625 36.445313 L 34.183594 36.445313 C 33.929688 36.445313 33.714844 36.421875 33.527344 36.371094 C 33.34375 36.320313 33.175781 36.226563 33.019531 36.09375 C 32.863281 35.960938 32.714844 35.78125 32.574219 35.554688 C 32.429688 35.328125 32.265625 35.035156 32.089844 34.671875 L 28.609375 28.136719 C 28.40625 27.75 28.203125 27.332031 27.996094 26.878906 C 27.785156 26.429688 27.597656 25.992188 27.429688 25.566406 L 27.410156 25.566406 C 27.441406 26.085938 27.460938 26.601563 27.476563 27.117188 C 27.492188 27.628906 27.496094 28.164063 27.496094 28.707031 L 27.496094 36.019531 C 27.496094 36.09375 27.476563 36.15625 27.4375 36.214844 C 27.398438 36.273438 27.328125 36.320313 27.230469 36.359375 C 27.132813 36.402344 27 36.429688 26.839844 36.453125 C 26.671875 36.472656 26.460938 36.484375 26.199219 36.484375 C 25.949219 36.484375 25.742188 36.472656 25.574219 36.453125 C 25.410156 36.429688 25.277344 36.398438 25.1875 36.359375 C 25.09375 36.320313 25.027344 36.273438 24.992188 36.214844 C 24.957031 36.15625 24.9375 36.09375 24.9375 36.019531 L 24.9375 23.460938 C 24.9375 23.121094 25.035156 22.867188 25.234375 22.699219 C 25.429688 22.53125 25.675781 22.445313 25.964844 22.445313 L 27.484375 22.445313 C 27.757813 22.445313 27.988281 22.46875 28.175781 22.515625 C 28.363281 22.5625 28.53125 22.636719 28.679688 22.746094 C 28.824219 22.855469 28.96875 23.003906 29.09375 23.195313 C 29.222656 23.386719 29.355469 23.621094 29.492188 23.902344 L 32.21875 29.011719 C 32.375 29.320313 32.53125 29.625 32.6875 29.925781 C 32.839844 30.222656 32.992188 30.523438 33.132813 30.824219 C 33.277344 31.121094 33.417969 31.414063 33.554688 31.703125 C 33.691406 31.988281 33.824219 32.277344 33.953125 32.566406 L 33.964844 32.566406 C 33.945313 32.0625 33.925781 31.535156 33.917969 30.988281 C 33.90625 30.441406 33.902344 29.917969 33.902344 29.421875 L 33.902344 22.867188 C 33.902344 22.796875 33.921875 22.730469 33.964844 22.671875 C 34.007813 22.617188 34.082031 22.566406 34.183594 22.523438 C 34.28125 22.476563 34.417969 22.449219 34.582031 22.429688 C 34.746094 22.410156 34.960938 22.402344 35.21875 22.402344 C 35.464844 22.402344 35.667969 22.410156 35.832031 22.429688 C 36 22.449219 36.125 22.476563 36.21875 22.523438 C 36.304688 22.566406 36.371094 22.613281 36.40625 22.671875 C 36.441406 22.730469 36.460938 22.792969 36.460938 22.867188 Z M 36.460938 35.429688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.792969 32.230469 C 47.792969 32.96875 47.65625 33.609375 47.382813 34.164063 C 47.109375 34.71875 46.738281 35.183594 46.269531 35.554688 C 45.800781 35.925781 45.253906 36.203125 44.628906 36.390625 C 44.003906 36.578125 43.332031 36.671875 42.617188 36.671875 C 42.136719 36.671875 41.6875 36.628906 41.273438 36.550781 C 40.859375 36.472656 40.496094 36.378906 40.179688 36.265625 C 39.859375 36.152344 39.597656 36.039063 39.386719 35.914063 C 39.171875 35.792969 39.019531 35.683594 38.925781 35.589844 C 38.832031 35.496094 38.765625 35.359375 38.726563 35.183594 C 38.6875 35.007813 38.664063 34.753906 38.664063 34.421875 C 38.664063 34.199219 38.671875 34.011719 38.6875 33.863281 C 38.703125 33.710938 38.722656 33.585938 38.757813 33.492188 C 38.789063 33.402344 38.832031 33.335938 38.886719 33.292969 C 38.941406 33.253906 39.003906 33.234375 39.074219 33.234375 C 39.175781 33.234375 39.320313 33.292969 39.5 33.414063 C 39.683594 33.53125 39.921875 33.664063 40.210938 33.804688 C 40.496094 33.949219 40.839844 34.082031 41.242188 34.199219 C 41.640625 34.316406 42.105469 34.378906 42.628906 34.378906 C 42.972656 34.378906 43.285156 34.335938 43.558594 34.253906 C 43.828125 34.167969 44.0625 34.054688 44.253906 33.902344 C 44.441406 33.75 44.585938 33.566406 44.6875 33.339844 C 44.789063 33.117188 44.839844 32.871094 44.839844 32.59375 C 44.839844 32.277344 44.753906 32.007813 44.582031 31.78125 C 44.40625 31.554688 44.179688 31.351563 43.902344 31.171875 C 43.625 30.996094 43.3125 30.832031 42.960938 30.679688 C 42.605469 30.523438 42.242188 30.359375 41.867188 30.183594 C 41.492188 30.011719 41.128906 29.816406 40.777344 29.597656 C 40.425781 29.378906 40.109375 29.117188 39.832031 28.808594 C 39.554688 28.503906 39.332031 28.136719 39.15625 27.722656 C 38.984375 27.304688 38.894531 26.804688 38.894531 26.21875 C 38.894531 25.550781 39.019531 24.960938 39.269531 24.453125 C 39.519531 23.945313 39.851563 23.523438 40.273438 23.1875 C 40.695313 22.855469 41.191406 22.601563 41.761719 22.4375 C 42.335938 22.273438 42.945313 22.191406 43.582031 22.191406 C 43.914063 22.191406 44.246094 22.214844 44.574219 22.265625 C 44.90625 22.316406 45.21875 22.382813 45.503906 22.472656 C 45.792969 22.558594 46.046875 22.65625 46.269531 22.761719 C 46.496094 22.871094 46.640625 22.960938 46.714844 23.03125 C 46.785156 23.105469 46.835938 23.164063 46.859375 23.214844 C 46.882813 23.265625 46.90625 23.332031 46.921875 23.417969 C 46.941406 23.5 46.953125 23.605469 46.960938 23.730469 C 46.96875 23.855469 46.972656 24.011719 46.972656 24.199219 C 46.972656 24.410156 46.964844 24.585938 46.953125 24.730469 C 46.941406 24.871094 46.921875 24.992188 46.898438 25.085938 C 46.875 25.179688 46.839844 25.25 46.792969 25.292969 C 46.746094 25.335938 46.679688 25.355469 46.601563 25.355469 C 46.523438 25.355469 46.398438 25.308594 46.226563 25.207031 C 46.054688 25.105469 45.839844 24.996094 45.589844 24.875 C 45.335938 24.757813 45.046875 24.648438 44.714844 24.550781 C 44.382813 24.453125 44.019531 24.40625 43.625 24.40625 C 43.316406 24.40625 43.042969 24.441406 42.816406 24.519531 C 42.582031 24.59375 42.390625 24.699219 42.238281 24.832031 C 42.082031 24.964844 41.96875 25.125 41.890625 25.3125 C 41.816406 25.5 41.777344 25.699219 41.777344 25.90625 C 41.777344 26.214844 41.863281 26.480469 42.03125 26.710938 C 42.203125 26.9375 42.429688 27.140625 42.710938 27.316406 C 42.996094 27.492188 43.320313 27.65625 43.679688 27.8125 C 44.039063 27.964844 44.40625 28.128906 44.78125 28.304688 C 45.15625 28.476563 45.523438 28.671875 45.882813 28.890625 C 46.242188 29.113281 46.5625 29.375 46.84375 29.679688 C 47.125 29.988281 47.351563 30.347656 47.527344 30.761719 C 47.703125 31.183594 47.792969 31.671875 47.792969 32.230469 Z M 47.792969 32.230469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 68.601563 51.800781 C 68.601563 61.078125 61.078125 68.601563 51.800781 68.601563 C 42.523438 68.601563 35 61.078125 35 51.800781 C 35 42.523438 42.523438 35 51.800781 35 C 61.078125 35 68.601563 42.523438 68.601563 51.800781 Z M 68.601563 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 51.800781 36.398438 C 60.289063 36.398438 67.199219 43.308594 67.199219 51.800781 C 67.199219 60.289063 60.289063 67.199219 51.800781 67.199219 C 43.308594 67.199219 36.398438 60.289063 36.398438 51.800781 C 36.398438 43.308594 43.308594 36.398438 51.800781 36.398438 M 51.800781 33.601563 C 41.746094 33.601563 33.601563 41.746094 33.601563 51.800781 C 33.601563 61.851563 41.746094 70 51.800781 70 C 61.851563 70 70 61.851563 70 51.800781 C 70 41.746094 61.851563 33.601563 51.800781 33.601563 Z M 51.800781 33.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 56.269531 59.375 C 55.820313 59.375 55.394531 59.160156 55.128906 58.796875 L 51.800781 54.242188 L 48.46875 58.796875 C 48.207031 59.160156 47.777344 59.375 47.328125 59.375 C 47.027344 59.375 46.742188 59.28125 46.496094 59.105469 C 46.191406 58.882813 45.992188 58.554688 45.933594 58.179688 C 45.875 57.808594 45.96875 57.4375 46.191406 57.132813 L 49.621094 52.4375 L 44.460938 50.929688 C 43.710938 50.710938 43.28125 49.925781 43.5 49.179688 C 43.675781 48.578125 44.230469 48.160156 44.855469 48.160156 C 44.988281 48.160156 45.121094 48.179688 45.25 48.21875 L 50.390625 49.71875 L 50.390625 44.015625 C 50.390625 43.238281 51.023438 42.605469 51.800781 42.605469 C 52.582031 42.605469 53.214844 43.238281 53.214844 44.015625 L 53.214844 49.714844 L 58.351563 48.21875 C 58.480469 48.179688 58.613281 48.160156 58.75 48.160156 C 59.371094 48.160156 59.929688 48.578125 60.101563 49.179688 C 60.320313 49.925781 59.890625 50.710938 59.144531 50.929688 L 53.980469 52.4375 L 57.410156 57.132813 C 57.632813 57.433594 57.726563 57.804688 57.667969 58.179688 C 57.609375 58.554688 57.410156 58.882813 57.105469 59.101563 C 56.859375 59.28125 56.570313 59.375 56.269531 59.375 Z M 56.269531 59.375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.800781 51.800781 L 46.496094 59.105469 C 46.191406 58.882813 45.992188 58.554688 45.933594 58.179688 C 45.875 57.808594 45.96875 57.4375 46.191406 57.132813 L 49.621094 52.4375 L 44.460938 50.929688 C 43.710938 50.710938 43.28125 49.925781 43.5 49.179688 C 43.675781 48.578125 44.230469 48.160156 44.855469 48.160156 C 44.988281 48.160156 45.121094 48.179688 45.25 48.21875 L 50.390625 49.71875 L 50.390625 44.015625 C 50.390625 43.238281 51.023438 42.605469 51.800781 42.605469 Z M 51.800781 51.800781 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureExpressRoute(m).png b/dist/Networking/AzureExpressRoute(m).png
index e49f37bc..18fcf58a 100644
Binary files a/dist/Networking/AzureExpressRoute(m).png and b/dist/Networking/AzureExpressRoute(m).png differ
diff --git a/dist/Networking/AzureExpressRoute(m).svg b/dist/Networking/AzureExpressRoute(m).svg
index a55f6678..ef313f59 100644
--- a/dist/Networking/AzureExpressRoute(m).svg
+++ b/dist/Networking/AzureExpressRoute(m).svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="42pt" viewBox="0 0 70 42" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 62.039063 26.824219 C 60.804688 26.824219 59.707031 27.097656 58.746094 27.503906 L 42 10.972656 C 42.410156 10.027344 42.6875 8.941406 42.6875 7.722656 C 42.6875 3.386719 39.117188 0 34.863281 0 C 30.609375 0 27.039063 3.523438 27.039063 7.722656 C 27.039063 8.941406 27.3125 10.027344 27.726563 10.972656 L 11.117188 27.640625 C 10.15625 27.230469 9.058594 26.960938 7.824219 26.960938 C 3.429688 26.960938 0 30.484375 0 34.683594 C 0 38.882813 3.570313 42.40625 7.824219 42.40625 C 11.253906 42.40625 14 40.238281 15.097656 37.394531 L 54.628906 37.394531 C 55.726563 40.238281 58.609375 42.40625 61.902344 42.40625 C 66.292969 42.40625 69.726563 38.882813 69.726563 34.683594 C 69.726563 30.484375 66.292969 26.824219 62.039063 26.824219 Z M 7.6875 37.121094 C 6.3125 37.121094 5.078125 36.039063 5.078125 34.546875 C 5.078125 33.195313 6.175781 31.972656 7.6875 31.972656 C 9.058594 31.972656 10.292969 33.058594 10.292969 34.546875 C 10.292969 36.039063 9.195313 37.121094 7.6875 37.121094 Z M 34.863281 5.285156 C 36.234375 5.285156 37.46875 6.367188 37.46875 7.859375 C 37.46875 9.214844 36.371094 10.433594 34.863281 10.433594 C 33.488281 10.433594 32.253906 9.347656 32.253906 7.859375 C 32.390625 6.367188 33.488281 5.285156 34.863281 5.285156 Z M 54.628906 31.972656 L 15.097656 31.972656 C 14.960938 31.703125 14.960938 31.566406 14.824219 31.433594 L 31.570313 14.769531 C 32.53125 15.175781 33.628906 15.445313 34.863281 15.445313 C 36.097656 15.445313 37.195313 15.175781 38.15625 14.769531 L 54.902344 31.296875 C 54.765625 31.433594 54.628906 31.703125 54.628906 31.972656 Z M 62.039063 36.988281 C 60.667969 36.988281 59.429688 35.902344 59.429688 34.414063 C 59.429688 33.058594 60.53125 31.839844 62.039063 31.839844 C 63.410156 31.839844 64.648438 32.921875 64.648438 34.414063 C 64.511719 35.902344 63.410156 36.988281 62.039063 36.988281 Z M 62.039063 36.988281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 13.71875 45.921875 L 57.121094 45.921875 L 57.121094 51.238281 L 13.71875 51.238281 Z M 13.71875 45.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 8.566406 44.03125 L 29.554688 23.046875 L 33.316406 26.808594 L 12.328125 47.792969 Z M 40.570313 23.082031 L 61.554688 44.066406 L 57.796875 47.828125 L 36.808594 26.84375 Z M 40.570313 23.082031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 35 13.578125 C 30.660156 13.578125 27.160156 17.078125 27.160156 21.421875 C 27.160156 25.761719 30.660156 29.261719 35 29.261719 C 39.339844 29.261719 42.839844 25.761719 42.839844 21.421875 C 42.839844 17.078125 39.339844 13.578125 35 13.578125 Z M 35 23.941406 C 33.601563 23.941406 32.480469 22.820313 32.480469 21.421875 C 32.480469 20.019531 33.601563 18.898438 35 18.898438 C 36.398438 18.898438 37.519531 20.019531 37.519531 21.421875 C 37.519531 22.820313 36.398438 23.941406 35 23.941406 Z M 7.839844 40.738281 C 3.5 40.738281 0 44.238281 0 48.578125 C 0 52.921875 3.5 56.421875 7.839844 56.421875 C 12.179688 56.421875 15.679688 52.921875 15.679688 48.578125 C 15.679688 44.238281 12.179688 40.738281 7.839844 40.738281 Z M 7.839844 51.101563 C 6.441406 51.101563 5.320313 49.980469 5.320313 48.578125 C 5.320313 47.179688 6.441406 46.058594 7.839844 46.058594 C 9.238281 46.058594 10.359375 47.179688 10.359375 48.578125 C 10.359375 49.980469 9.238281 51.101563 7.839844 51.101563 Z M 62.160156 40.738281 C 57.820313 40.738281 54.320313 44.238281 54.320313 48.578125 C 54.320313 52.921875 57.820313 56.421875 62.160156 56.421875 C 66.5 56.421875 70 52.921875 70 48.578125 C 70 44.238281 66.5 40.738281 62.160156 40.738281 Z M 62.160156 51.101563 C 60.761719 51.101563 59.640625 49.980469 59.640625 48.578125 C 59.640625 47.179688 60.761719 46.058594 62.160156 46.058594 C 63.558594 46.058594 64.679688 47.179688 64.679688 48.578125 C 64.679688 49.980469 63.558594 51.101563 62.160156 51.101563 Z M 62.160156 51.101563 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureExpressRoute.png b/dist/Networking/AzureExpressRoute.png
index b28a180c..1fada34d 100644
Binary files a/dist/Networking/AzureExpressRoute.png and b/dist/Networking/AzureExpressRoute.png differ
diff --git a/dist/Networking/AzureExpressRoute.puml b/dist/Networking/AzureExpressRoute.puml
index 149ef7fc..79ca118f 100644
--- a/dist/Networking/AzureExpressRoute.puml
+++ b/dist/Networking/AzureExpressRoute.puml
@@ -1,8 +1,8 @@
-sprite $AzureExpressRoute [70x42/16z] {
-fPO74hCX24H34_3-z_sBc_6RTCMNtjxWMiZjEsIH6Orl9rXsq0uahK-YB548pggXx03mIIaXukE9rLD17dwGZCyAfFyZwnQ4gWUrsAY04JDy1RWFt35NSZ2Y
-YpYLWA1Z2JH5ISI8E6eQdraGCrslgIHvtjv9snB7goTDKVAigKg0tJLSaDGqCIKBceBaILEI05tHn3ofVsbaHLBHO9dJ9LdJaAZGKmUCIxAc2KI8Y3ZxPlUI
-Xr-abYJFcYv85Cp6iLqDAHuTifH5O773psosFUtRw6oWEHjvR3fmXj5uEYo4lLot13950zo4PmDjY8Sb-ZPfYfyxTx1vgiPJpEtnvIBy752K_hlfym3QjI70
-tl9rkfVN8ZDijmkhPqORvynV
+sprite $AzureExpressRoute [70x70/16z] {
+xTP7aiGW341HK7JW_jUTGCccn0gBoSFVzsidGEctj5gjCa2UDL3qFPf2MAzW4h72jqMgBOagwi8O0leUvuJw7a_SaBHRcr2uNTNijU24WjS71rClILqKH7Qd
+d112IjcqTPGJGaWv6tEK4c2qr7QfXfob61D0Zfmo0AJ4nPWOOZKcZ7WcW0GPZmGPZmGPZmGPZmGPZmGPZmGPZmGPZmIOJA8gD8OqXbXK6ViJS1z1Z6cxXjGV
+YDxjXWmmfxR0dyLwL6I0CSHAMLr3YDr0YqZVOxH1PJ_6iby3QKtk0z2Up53dVVvZDmvKTXjJZdPOTWfFA7AzSdX-HtIF4tPVp5gJmRGc97Q4QsZimcxCGWsD
+WDBzDsbe79Nk1k2wonoQG2bPGCm4wM4PYGbp-a6jLgjN
 }
 
 AzureEntityColoring(AzureExpressRoute)
diff --git a/dist/Networking/AzureExpressRoute.svg b/dist/Networking/AzureExpressRoute.svg
index 1d55d8bd..9381eaa6 100644
--- a/dist/Networking/AzureExpressRoute.svg
+++ b/dist/Networking/AzureExpressRoute.svg
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="43pt" viewBox="0 0 70 43" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 13.71875 32.042969 L 57.121094 32.042969 L 57.121094 37.3125 L 13.71875 37.3125 Z M 13.71875 32.042969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 8.566406 30.171875 L 29.554688 9.378906 L 33.316406 13.105469 L 12.328125 33.898438 Z M 8.566406 30.171875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 40.570313 9.414063 L 61.558594 30.207031 L 57.796875 33.933594 L 36.808594 13.140625 Z M 40.570313 9.414063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 35 0 C 30.660156 0 27.160156 3.46875 27.160156 7.769531 C 27.160156 12.066406 30.660156 15.535156 35 15.535156 C 39.339844 15.535156 42.839844 12.066406 42.839844 7.769531 C 42.839844 3.46875 39.339844 0 35 0 Z M 35 10.265625 C 33.601563 10.265625 32.480469 9.15625 32.480469 7.769531 C 32.480469 6.378906 33.601563 5.269531 35 5.269531 C 36.398438 5.269531 37.519531 6.378906 37.519531 7.769531 C 37.519531 9.15625 36.398438 10.265625 35 10.265625 Z M 35 10.265625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 7.839844 26.910156 C 3.5 26.910156 0 30.378906 0 34.675781 C 0 38.976563 3.5 42.445313 7.839844 42.445313 C 12.179688 42.445313 15.679688 38.976563 15.679688 34.675781 C 15.679688 30.378906 12.179688 26.910156 7.839844 26.910156 Z M 7.839844 37.175781 C 6.441406 37.175781 5.320313 36.066406 5.320313 34.675781 C 5.320313 33.289063 6.441406 32.179688 7.839844 32.179688 C 9.238281 32.179688 10.359375 33.289063 10.359375 34.675781 C 10.359375 36.066406 9.238281 37.175781 7.839844 37.175781 Z M 7.839844 37.175781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 62.160156 26.910156 C 57.820313 26.910156 54.320313 30.378906 54.320313 34.675781 C 54.320313 38.976563 57.820313 42.445313 62.160156 42.445313 C 66.5 42.445313 70 38.976563 70 34.675781 C 70 30.378906 66.5 26.910156 62.160156 26.910156 Z M 62.160156 37.175781 C 60.761719 37.175781 59.640625 36.066406 59.640625 34.675781 C 59.640625 33.289063 60.761719 32.179688 62.160156 32.179688 C 63.558594 32.179688 64.679688 33.289063 64.679688 34.675781 C 64.679688 36.066406 63.558594 37.175781 62.160156 37.175781 Z M 62.160156 37.175781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 13.71875 45.921875 L 57.121094 45.921875 L 57.121094 51.238281 L 13.71875 51.238281 Z M 13.71875 45.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 8.566406 44.03125 L 29.554688 23.046875 L 33.316406 26.808594 L 12.328125 47.792969 Z M 40.570313 23.082031 L 61.554688 44.066406 L 57.796875 47.828125 L 36.808594 26.84375 Z M 40.570313 23.082031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 35 13.578125 C 30.660156 13.578125 27.160156 17.078125 27.160156 21.421875 C 27.160156 25.761719 30.660156 29.261719 35 29.261719 C 39.339844 29.261719 42.839844 25.761719 42.839844 21.421875 C 42.839844 17.078125 39.339844 13.578125 35 13.578125 Z M 35 23.941406 C 33.601563 23.941406 32.480469 22.820313 32.480469 21.421875 C 32.480469 20.019531 33.601563 18.898438 35 18.898438 C 36.398438 18.898438 37.519531 20.019531 37.519531 21.421875 C 37.519531 22.820313 36.398438 23.941406 35 23.941406 Z M 7.839844 40.738281 C 3.5 40.738281 0 44.238281 0 48.578125 C 0 52.921875 3.5 56.421875 7.839844 56.421875 C 12.179688 56.421875 15.679688 52.921875 15.679688 48.578125 C 15.679688 44.238281 12.179688 40.738281 7.839844 40.738281 Z M 7.839844 51.101563 C 6.441406 51.101563 5.320313 49.980469 5.320313 48.578125 C 5.320313 47.179688 6.441406 46.058594 7.839844 46.058594 C 9.238281 46.058594 10.359375 47.179688 10.359375 48.578125 C 10.359375 49.980469 9.238281 51.101563 7.839844 51.101563 Z M 62.160156 40.738281 C 57.820313 40.738281 54.320313 44.238281 54.320313 48.578125 C 54.320313 52.921875 57.820313 56.421875 62.160156 56.421875 C 66.5 56.421875 70 52.921875 70 48.578125 C 70 44.238281 66.5 40.738281 62.160156 40.738281 Z M 62.160156 51.101563 C 60.761719 51.101563 59.640625 49.980469 59.640625 48.578125 C 59.640625 47.179688 60.761719 46.058594 62.160156 46.058594 C 63.558594 46.058594 64.679688 47.179688 64.679688 48.578125 C 64.679688 49.980469 63.558594 51.101563 62.160156 51.101563 Z M 62.160156 51.101563 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureFirewall(m).png b/dist/Networking/AzureFirewall(m).png
new file mode 100644
index 00000000..6f3a14db
Binary files /dev/null and b/dist/Networking/AzureFirewall(m).png differ
diff --git a/dist/Networking/AzureFirewall(m).svg b/dist/Networking/AzureFirewall(m).svg
new file mode 100644
index 00000000..68a4f611
--- /dev/null
+++ b/dist/Networking/AzureFirewall(m).svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 27.300781 14.140625 C 28.558594 6.160156 35.421875 0.140625 43.820313 0.140625 C 53.058594 0.140625 60.480469 7.699219 60.480469 16.941406 C 60.480469 18.058594 60.339844 19.039063 60.199219 20.019531 C 65.660156 20.578125 69.859375 25.621094 69.859375 31.640625 C 69.859375 38.078125 64.960938 43.398438 59.078125 43.398438 L 28.28125 43.398438 C 20.441406 43.398438 14 36.679688 14 28.558594 C 14.140625 21 20.019531 14.839844 27.300781 14.140625 Z M 27.300781 14.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 57.398438 30.800781 C 57.398438 29.261719 56.140625 28 54.601563 28 L 39.199219 28 C 38.6875 28 38.214844 28.148438 37.800781 28.390625 C 37.375 28.136719 36.894531 28.003906 36.398438 28 L 21 28 C 20.488281 28 20.015625 28.148438 19.601563 28.390625 C 19.175781 28.136719 18.691406 28.003906 18.199219 28 L 2.800781 28 C 1.261719 28 0 29.261719 0 30.800781 L 0 37.800781 C 0 38.3125 0.148438 38.785156 0.390625 39.199219 C 0.136719 39.625 0.00390625 40.105469 0 40.601563 L 0 47.601563 C 0 48.109375 0.148438 48.585938 0.390625 49 C 0.136719 49.421875 0.00390625 49.90625 0 50.398438 L 0 57.398438 C 0 57.910156 0.148438 58.386719 0.390625 58.800781 C 0.136719 59.222656 0.00390625 59.707031 0 60.199219 L 0 67.199219 C 0 68.738281 1.261719 70 2.800781 70 L 18.199219 70 C 18.710938 70 19.1875 69.851563 19.601563 69.609375 C 20.015625 69.851563 20.488281 70 21 70 L 36.398438 70 C 36.910156 70 37.386719 69.851563 37.800781 69.609375 C 38.214844 69.851563 38.6875 70 39.199219 70 L 54.601563 70 C 56.140625 70 57.398438 68.738281 57.398438 67.199219 L 57.398438 60.199219 C 57.398438 59.6875 57.25 59.214844 57.007813 58.800781 C 57.25 58.386719 57.398438 57.910156 57.398438 57.398438 L 57.398438 50.398438 C 57.398438 49.890625 57.25 49.414063 57.007813 49 C 57.25 48.585938 57.398438 48.109375 57.398438 47.601563 L 57.398438 40.601563 C 57.398438 40.089844 57.25 39.613281 57.007813 39.199219 C 57.25 38.785156 57.398438 38.3125 57.398438 37.800781 Z M 57.398438 30.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 21 30.800781 L 36.398438 30.800781 L 36.398438 37.800781 L 21 37.800781 Z M 21 30.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 39.199219 30.800781 L 54.601563 30.800781 L 54.601563 37.800781 L 39.199219 37.800781 Z M 2.800781 30.800781 L 18.199219 30.800781 L 18.199219 37.800781 L 2.800781 37.800781 Z M 21 40.601563 L 36.398438 40.601563 L 36.398438 47.601563 L 21 47.601563 Z M 21 40.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 2.800781 50.398438 L 18.199219 50.398438 L 18.199219 57.398438 L 2.800781 57.398438 Z M 2.800781 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 2.800781 40.601563 L 18.199219 40.601563 L 18.199219 47.601563 L 2.800781 47.601563 Z M 21 60.199219 L 36.398438 60.199219 L 36.398438 67.199219 L 21 67.199219 Z M 39.199219 50.398438 L 54.601563 50.398438 L 54.601563 57.398438 L 39.199219 57.398438 Z M 39.199219 40.601563 L 54.601563 40.601563 L 54.601563 47.601563 L 39.199219 47.601563 Z M 21 50.398438 L 36.398438 50.398438 L 36.398438 57.398438 L 21 57.398438 Z M 21 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 39.199219 60.199219 L 54.601563 60.199219 L 54.601563 67.199219 L 39.199219 67.199219 Z M 39.199219 60.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 2.800781 60.199219 L 18.199219 60.199219 L 18.199219 67.199219 L 2.800781 67.199219 Z M 2.800781 60.199219 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureFirewall.png b/dist/Networking/AzureFirewall.png
new file mode 100644
index 00000000..79e54da0
Binary files /dev/null and b/dist/Networking/AzureFirewall.png differ
diff --git a/dist/Networking/AzureFirewall.puml b/dist/Networking/AzureFirewall.puml
new file mode 100644
index 00000000..2b3c5674
--- /dev/null
+++ b/dist/Networking/AzureFirewall.puml
@@ -0,0 +1,10 @@
+sprite $AzureFirewall [70x70/16z] {
+xPL7seGm34EJs1QGpFsl-vST6hgcbxUal4znWRIFREuHuPQJZ664NS4XUd9Woj5p5SnIZYN10aMKw8SAB19QT-HEOHKXYXucS8qms20B0wSSAHSFRE1RCG8x
+YCq5r2tJUkWMWs2Ham2kRF4KDsbUfvXw7YQo6eN9ObMOsEYoM1k7X5uM3cCn0XfXk0Q1wz2Tc1uOcFyh9wBjiNmjVXLBkOOb4gv0IGv2N6a07JEzqirSuM_u
+R5qQNndMwcBfSeldT9d5tKhwHxVGB-tfB8tfWSfN_YryfO8j0Gssk3wn8sPdjsSweEkPQLq6fXEgUqlBrpBRryeCGCzNhZQxTXtBPbtwoP-aEqFxClG3Sr_B
+rpBjz33jTC_SP7OpD2AD-GK
+}
+
+AzureEntityColoring(AzureFirewall)
+!define AzureFirewall(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureFirewall, AzureFirewall)
+!define AzureFirewall(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureFirewall, AzureFirewall)
diff --git a/dist/Networking/AzureFirewall.svg b/dist/Networking/AzureFirewall.svg
new file mode 100644
index 00000000..aeffc7ce
--- /dev/null
+++ b/dist/Networking/AzureFirewall.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 27.300781 14.140625 C 28.558594 6.160156 35.421875 0.140625 43.820313 0.140625 C 53.058594 0.140625 60.480469 7.699219 60.480469 16.941406 C 60.480469 18.058594 60.339844 19.039063 60.199219 20.019531 C 65.660156 20.578125 69.859375 25.621094 69.859375 31.640625 C 69.859375 38.078125 64.960938 43.398438 59.078125 43.398438 L 28.28125 43.398438 C 20.441406 43.398438 14 36.679688 14 28.558594 C 14.140625 21 20.019531 14.839844 27.300781 14.140625 Z M 27.300781 14.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 57.398438 30.800781 C 57.398438 29.261719 56.140625 28 54.601563 28 L 39.199219 28 C 38.6875 28 38.214844 28.148438 37.800781 28.390625 C 37.375 28.136719 36.894531 28.003906 36.398438 28 L 21 28 C 20.488281 28 20.015625 28.148438 19.601563 28.390625 C 19.175781 28.136719 18.691406 28.003906 18.199219 28 L 2.800781 28 C 1.261719 28 0 29.261719 0 30.800781 L 0 37.800781 C 0 38.3125 0.148438 38.785156 0.390625 39.199219 C 0.136719 39.625 0.00390625 40.105469 0 40.601563 L 0 47.601563 C 0 48.109375 0.148438 48.585938 0.390625 49 C 0.136719 49.421875 0.00390625 49.90625 0 50.398438 L 0 57.398438 C 0 57.910156 0.148438 58.386719 0.390625 58.800781 C 0.136719 59.222656 0.00390625 59.707031 0 60.199219 L 0 67.199219 C 0 68.738281 1.261719 70 2.800781 70 L 18.199219 70 C 18.710938 70 19.1875 69.851563 19.601563 69.609375 C 20.015625 69.851563 20.488281 70 21 70 L 36.398438 70 C 36.910156 70 37.386719 69.851563 37.800781 69.609375 C 38.214844 69.851563 38.6875 70 39.199219 70 L 54.601563 70 C 56.140625 70 57.398438 68.738281 57.398438 67.199219 L 57.398438 60.199219 C 57.398438 59.6875 57.25 59.214844 57.007813 58.800781 C 57.25 58.386719 57.398438 57.910156 57.398438 57.398438 L 57.398438 50.398438 C 57.398438 49.890625 57.25 49.414063 57.007813 49 C 57.25 48.585938 57.398438 48.109375 57.398438 47.601563 L 57.398438 40.601563 C 57.398438 40.089844 57.25 39.613281 57.007813 39.199219 C 57.25 38.785156 57.398438 38.3125 57.398438 37.800781 Z M 57.398438 30.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 21 30.800781 L 36.398438 30.800781 L 36.398438 37.800781 L 21 37.800781 Z M 21 30.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 39.199219 30.800781 L 54.601563 30.800781 L 54.601563 37.800781 L 39.199219 37.800781 Z M 2.800781 30.800781 L 18.199219 30.800781 L 18.199219 37.800781 L 2.800781 37.800781 Z M 21 40.601563 L 36.398438 40.601563 L 36.398438 47.601563 L 21 47.601563 Z M 21 40.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 2.800781 50.398438 L 18.199219 50.398438 L 18.199219 57.398438 L 2.800781 57.398438 Z M 2.800781 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 2.800781 40.601563 L 18.199219 40.601563 L 18.199219 47.601563 L 2.800781 47.601563 Z M 21 60.199219 L 36.398438 60.199219 L 36.398438 67.199219 L 21 67.199219 Z M 39.199219 50.398438 L 54.601563 50.398438 L 54.601563 57.398438 L 39.199219 57.398438 Z M 39.199219 40.601563 L 54.601563 40.601563 L 54.601563 47.601563 L 39.199219 47.601563 Z M 21 50.398438 L 36.398438 50.398438 L 36.398438 57.398438 L 21 57.398438 Z M 21 50.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 39.199219 60.199219 L 54.601563 60.199219 L 54.601563 67.199219 L 39.199219 67.199219 Z M 39.199219 60.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 2.800781 60.199219 L 18.199219 60.199219 L 18.199219 67.199219 L 2.800781 67.199219 Z M 2.800781 60.199219 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureFrontDoorService(m).png b/dist/Networking/AzureFrontDoorService(m).png
index 95869c3f..20c760a3 100644
Binary files a/dist/Networking/AzureFrontDoorService(m).png and b/dist/Networking/AzureFrontDoorService(m).png differ
diff --git a/dist/Networking/AzureFrontDoorService(m).svg b/dist/Networking/AzureFrontDoorService(m).svg
index cd456e4e..d7c4b20c 100644
--- a/dist/Networking/AzureFrontDoorService(m).svg
+++ b/dist/Networking/AzureFrontDoorService(m).svg
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="61pt" viewBox="0 0 70 61" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="61" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="62"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 48.773438 20.445313 L 35.222656 12.558594 C 35.222656 12.558594 34.648438 12.265625 34.390625 12.265625 C 33.105469 12.265625 32.058594 12.339844 32.058594 14.75 L 32.058594 22.042969 L 46.058594 22.042969 L 46.058594 49.769531 L 50.261719 49.769531 L 50.261719 22.628906 C 50.261719 21.65625 49.667969 20.792969 48.773438 20.445313 Z M 48.773438 20.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 48.914063 26.386719 L 35.363281 18.421875 C 35.363281 18.421875 34.789063 18.128906 34.53125 18.128906 C 33.246094 18.125 32.199219 18.199219 32.199219 20.632813 L 32.199219 28 L 46.199219 28 L 46.199219 56 L 50.398438 56 L 50.398438 28.589844 C 50.398438 27.609375 49.804688 26.738281 48.914063 26.386719 Z M 48.914063 26.386719 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 63.054688 26.339844 C 63.773438 24.558594 64.140625 22.65625 64.140625 20.738281 C 64.140625 12.339844 57.277344 5.53125 48.804688 5.53125 C 46.449219 5.53125 44.226563 6.074219 42.230469 7.011719 C 38.917969 2.753906 33.734375 0 27.886719 0 C 17.875 0 9.761719 8.046875 9.761719 17.972656 C 9.761719 18.777344 9.832031 19.566406 9.9375 20.34375 C 4.132813 22.511719 0 28.050781 0 34.5625 C 0 42.960938 6.867188 49.769531 15.339844 49.769531 L 57.171875 49.769531 C 64.101563 49.769531 69.71875 44.199219 69.71875 37.328125 C 69.722656 32.726563 67.15625 28.5 63.054688 26.339844 Z M 63.054688 26.339844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 25.058594 22.042969 L 44.660156 22.042969 L 44.660156 49.839844 L 25.058594 49.839844 Z M 25.058594 22.042969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 63.195313 32.339844 C 63.910156 30.539063 64.28125 28.617188 64.28125 26.679688 C 64.28125 18.199219 57.414063 11.324219 48.945313 11.324219 C 46.589844 11.324219 44.367188 11.871094 42.371094 12.820313 C 39.058594 8.523438 33.871094 5.738281 28.027344 5.738281 C 18.015625 5.738281 9.902344 13.867188 9.902344 23.890625 C 9.902344 24.703125 9.972656 25.5 10.074219 26.285156 C 4.273438 28.472656 0.140625 34.066406 0.140625 40.644531 C 0.140625 49.125 7.007813 56 15.476563 56 L 57.308594 56 C 64.242188 56 69.859375 50.375 69.859375 43.433594 C 69.859375 38.789063 67.296875 34.519531 63.195313 32.339844 Z M 63.195313 32.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 25.199219 28 L 44.800781 28 L 44.800781 56.070313 L 25.199219 56.070313 Z M 25.199219 28 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 48.222656 20.332031 L 34.6875 12.453125 C 34.085938 12.246094 33.460938 12.707031 33.460938 13.363281 L 33.460938 59.902344 C 33.460938 60.554688 34.085938 61.015625 34.6875 60.808594 L 48.222656 52.929688 C 48.609375 52.792969 48.863281 52.429688 48.859375 52.023438 L 48.859375 21.242188 C 48.863281 20.835938 48.609375 20.472656 48.222656 20.332031 Z M 48.222656 20.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 48.363281 26.273438 L 34.828125 18.316406 C 34.222656 18.109375 33.601563 18.574219 33.601563 19.234375 L 33.601563 66.230469 C 33.601563 66.890625 34.222656 67.355469 34.828125 67.148438 L 48.363281 59.191406 C 48.746094 59.050781 49.003906 58.683594 49 58.273438 L 49 27.191406 C 49.003906 26.78125 48.746094 26.414063 48.363281 26.273438 Z M 48.363281 26.273438 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureFrontDoorService.png b/dist/Networking/AzureFrontDoorService.png
index 0d88350c..59544838 100644
Binary files a/dist/Networking/AzureFrontDoorService.png and b/dist/Networking/AzureFrontDoorService.png differ
diff --git a/dist/Networking/AzureFrontDoorService.puml b/dist/Networking/AzureFrontDoorService.puml
index 8889fee8..bb31f3cb 100644
--- a/dist/Networking/AzureFrontDoorService.puml
+++ b/dist/Networking/AzureFrontDoorService.puml
@@ -1,8 +1,8 @@
-sprite $AzureFrontDoorService [70x61/16z] {
-lTTNYiD048JXwgXq__kkSowZzZJxFuiFJOJ1nqGzyb2u2NvC8nyA7JBkrHtF3pbgHNvE2eOGuyg87fBwdzoJ-uI5bH0UTpGh2L6o45r_omucoyd-MPcdfEtS
-j1cvhNDXfO8fsxPEktycgN9e8OwLb8EJdmfoX9X2fgUeaEdHoeZei8ni5wAGOHark78ekE9ymFvTkS-Bn9SpOjyL8VDQKt0j1XI_NoiDYkI8aY5aUIhATPLo
-L4a1T5n9m1iKGpGeYUnGh4M95YLxb6XHh4MH5WNHe3YqGL4WnXK0qd2E3kcW4W1Zk4A_b155S4tyLoNmc4H9uQyUzTYZn5M8FIymeWX8_w-iQ50c6LSM0qQL
-DO1HPPq4mygimAYoECOoCY6rTC-4_04
+sprite $AzureFrontDoorService [70x70/16z] {
+xTLLaiD034NH9pJjVxr3OP2d5ONZ--qwvMOyf2Nw2QLOpLSfuyB43r92FlQJ5DdCpqN8HERdumpYgoA6HLIOyiFPnc9j4wxUNEomPv90yLmQ_agTCSycpQji
+VUTXXECaKAPfI8n9poC_oZJspJzZiVBZT8q_utDAEAoK4WwBCaeuB4afguRkducXK3cedrF8l4sPB5Rap81fbHmfRj6ysCmLoVCA1qXEeM3hfnIRkrRoYbSK
+jzMGfA9iFxIguWIGbnK7v0gAGg-WEDar5BcAObTH_3gANaNXgoXq5GLs5OMle2XWTOK0AYk6dxYg11TLJX6iaegYsCGf9NxkvJB528U9fHLbd8c8jr7mJkls
+0oJY8qKGb5Bu2iheg2izewoC2XIKQ31vfIUKbK61gZ8QK5OwGZbZl5JV
 }
 
 AzureEntityColoring(AzureFrontDoorService)
diff --git a/dist/Networking/AzureFrontDoorService.svg b/dist/Networking/AzureFrontDoorService.svg
index 77983f29..53338fa4 100644
--- a/dist/Networking/AzureFrontDoorService.svg
+++ b/dist/Networking/AzureFrontDoorService.svg
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="61pt" viewBox="0 0 70 61" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="61" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="62"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 48.773438 20.445313 L 35.222656 12.558594 C 35.222656 12.558594 34.648438 12.265625 34.390625 12.265625 C 33.105469 12.265625 32.058594 12.339844 32.058594 14.75 L 32.058594 22.042969 L 46.058594 22.042969 L 46.058594 49.769531 L 50.261719 49.769531 L 50.261719 22.628906 C 50.261719 21.65625 49.667969 20.792969 48.773438 20.445313 Z M 48.773438 20.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 48.914063 26.386719 L 35.363281 18.421875 C 35.363281 18.421875 34.789063 18.128906 34.53125 18.128906 C 33.246094 18.125 32.199219 18.199219 32.199219 20.632813 L 32.199219 28 L 46.199219 28 L 46.199219 56 L 50.398438 56 L 50.398438 28.589844 C 50.398438 27.609375 49.804688 26.738281 48.914063 26.386719 Z M 48.914063 26.386719 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 63.054688 26.339844 C 63.773438 24.558594 64.140625 22.65625 64.140625 20.738281 C 64.140625 12.339844 57.277344 5.53125 48.804688 5.53125 C 46.449219 5.53125 44.226563 6.074219 42.230469 7.011719 C 38.917969 2.753906 33.734375 0 27.886719 0 C 17.875 0 9.761719 8.046875 9.761719 17.972656 C 9.761719 18.777344 9.832031 19.566406 9.9375 20.34375 C 4.132813 22.511719 0 28.050781 0 34.5625 C 0 42.960938 6.867188 49.769531 15.339844 49.769531 L 57.171875 49.769531 C 64.101563 49.769531 69.71875 44.199219 69.71875 37.328125 C 69.722656 32.726563 67.15625 28.5 63.054688 26.339844 Z M 63.054688 26.339844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.058594 22.042969 L 44.660156 22.042969 L 44.660156 49.839844 L 25.058594 49.839844 Z M 25.058594 22.042969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 63.195313 32.339844 C 63.910156 30.539063 64.28125 28.617188 64.28125 26.679688 C 64.28125 18.199219 57.414063 11.324219 48.945313 11.324219 C 46.589844 11.324219 44.367188 11.871094 42.371094 12.820313 C 39.058594 8.523438 33.871094 5.738281 28.027344 5.738281 C 18.015625 5.738281 9.902344 13.867188 9.902344 23.890625 C 9.902344 24.703125 9.972656 25.5 10.074219 26.285156 C 4.273438 28.472656 0.140625 34.066406 0.140625 40.644531 C 0.140625 49.125 7.007813 56 15.476563 56 L 57.308594 56 C 64.242188 56 69.859375 50.375 69.859375 43.433594 C 69.859375 38.789063 67.296875 34.519531 63.195313 32.339844 Z M 63.195313 32.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.199219 28 L 44.800781 28 L 44.800781 56.070313 L 25.199219 56.070313 Z M 25.199219 28 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 48.222656 20.332031 L 34.6875 12.453125 C 34.085938 12.246094 33.460938 12.707031 33.460938 13.363281 L 33.460938 59.902344 C 33.460938 60.554688 34.085938 61.015625 34.6875 60.808594 L 48.222656 52.929688 C 48.609375 52.792969 48.863281 52.429688 48.859375 52.023438 L 48.859375 21.242188 C 48.863281 20.835938 48.609375 20.472656 48.222656 20.332031 Z M 48.222656 20.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 48.363281 26.273438 L 34.828125 18.316406 C 34.222656 18.109375 33.601563 18.574219 33.601563 19.234375 L 33.601563 66.230469 C 33.601563 66.890625 34.222656 67.355469 34.828125 67.148438 L 48.363281 59.191406 C 48.746094 59.050781 49.003906 58.683594 49 58.273438 L 49 27.191406 C 49.003906 26.78125 48.746094 26.414063 48.363281 26.273438 Z M 48.363281 26.273438 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureLoadBalancer(m).png b/dist/Networking/AzureLoadBalancer(m).png
index 9b98a95f..5aee160c 100644
Binary files a/dist/Networking/AzureLoadBalancer(m).png and b/dist/Networking/AzureLoadBalancer(m).png differ
diff --git a/dist/Networking/AzureLoadBalancer(m).svg b/dist/Networking/AzureLoadBalancer(m).svg
index 4a0afcb2..7bb3db90 100644
--- a/dist/Networking/AzureLoadBalancer(m).svg
+++ b/dist/Networking/AzureLoadBalancer(m).svg
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.566406 1.890625 C 38.347656 0.671875 36.726563 0 35 0 C 33.277344 0 31.65625 0.671875 30.4375 1.890625 L 1.894531 30.433594 C 0.6875 31.636719 0 33.300781 0 35 C 0 36.699219 0.6875 38.363281 1.894531 39.5625 L 18.054688 55.726563 L 48.453125 10.777344 Z M 39.566406 1.890625 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 35.140625 70.28125 C 33.460938 70.28125 31.78125 69.578125 30.519531 68.320313 L 1.960938 39.761719 C 0.699219 38.5 0 36.960938 0 35.140625 C 0 33.460938 0.699219 31.78125 1.960938 30.519531 L 30.519531 1.960938 C 31.78125 0.699219 33.320313 0 35.140625 0 C 36.820313 0 38.5 0.699219 39.761719 1.960938 L 68.320313 30.519531 C 69.578125 31.78125 70.28125 33.320313 70.28125 35.140625 C 70.28125 36.960938 69.578125 38.5 68.320313 39.761719 L 39.761719 68.320313 C 38.5 69.578125 36.820313 70.28125 35.140625 70.28125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 63.980469 34.859375 L 54.738281 25.621094 L 54.738281 32.199219 L 44.941406 32.199219 C 43.960938 28.839844 41.300781 26.179688 37.941406 25.199219 L 37.941406 15.679688 L 44.378906 15.679688 L 35.140625 6.441406 L 25.898438 15.679688 L 32.339844 15.679688 L 32.339844 25.058594 C 28.980469 26.039063 26.320313 28.699219 25.339844 32.058594 L 15.539063 32.058594 L 15.539063 25.621094 L 6.300781 34.859375 L 15.539063 44.101563 L 15.539063 37.519531 L 25.339844 37.519531 C 26.320313 40.878906 28.980469 43.539063 32.339844 44.519531 L 32.339844 50.960938 C 30.941406 51.941406 28.839844 54.179688 28.839844 56.558594 C 28.839844 60.058594 31.640625 62.859375 35.140625 62.859375 C 38.640625 62.859375 41.441406 60.058594 41.441406 56.558594 C 41.441406 54.039063 39.339844 51.941406 37.941406 50.960938 L 37.941406 44.378906 C 41.300781 43.398438 43.960938 40.738281 44.941406 37.378906 L 54.738281 37.378906 L 54.738281 43.820313 Z M 63.980469 34.859375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 35.140625 27.441406 C 31.078125 27.441406 27.71875 30.800781 27.71875 34.859375 C 27.71875 38.921875 31.078125 42.28125 35.140625 42.28125 C 39.199219 42.28125 42.558594 38.921875 42.558594 34.859375 C 42.558594 30.800781 39.199219 27.441406 35.140625 27.441406 Z M 35.140625 27.441406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 35 70 C 33.277344 70 31.652344 69.328125 30.4375 68.105469 L 1.890625 39.5625 C 0.6875 38.363281 0 36.699219 0 35 C 0 33.300781 0.6875 31.636719 1.890625 30.433594 L 30.4375 1.890625 C 31.65625 0.671875 33.277344 0 35 0 C 36.726563 0 38.347656 0.671875 39.566406 1.890625 L 68.105469 30.433594 C 69.328125 31.648438 70 33.273438 70 35 C 70 36.726563 69.328125 38.347656 68.105469 39.566406 L 39.566406 68.105469 C 38.347656 69.328125 36.726563 70 35 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 63.859375 34.523438 L 54.601563 25.265625 L 54.601563 31.800781 L 44.777344 31.792969 C 43.828125 28.410156 41.175781 25.734375 37.800781 24.765625 L 37.800781 15.398438 L 44.257813 15.398438 L 35 6.140625 L 25.742188 15.398438 L 32.199219 15.398438 L 32.199219 24.765625 C 28.832031 25.734375 26.179688 28.398438 25.226563 31.777344 L 15.398438 31.765625 L 15.398438 25.300781 L 6.140625 34.558594 L 15.398438 43.816406 L 15.398438 37.28125 L 25.230469 37.289063 C 26.1875 40.660156 28.835938 43.316406 32.199219 44.285156 L 32.199219 50.773438 C 30.800781 51.792969 28.660156 53.9375 28.660156 56.429688 C 28.660156 59.90625 31.507813 62.730469 34.980469 62.730469 C 38.453125 62.730469 41.292969 59.90625 41.292969 56.429688 C 41.292969 53.964844 39.199219 51.847656 37.800781 50.8125 L 37.800781 44.285156 C 41.160156 43.320313 43.804688 40.667969 44.765625 37.308594 L 54.601563 37.316406 L 54.601563 43.78125 Z M 63.859375 34.523438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 35 27.164063 C 30.941406 27.164063 27.640625 30.464844 27.640625 34.523438 C 27.640625 38.582031 30.941406 41.886719 35 41.886719 C 39.058594 41.886719 42.359375 38.585938 42.359375 34.523438 C 42.359375 30.464844 39.058594 27.164063 35 27.164063 Z M 35 27.164063 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureLoadBalancer.png b/dist/Networking/AzureLoadBalancer.png
index a40500c5..2b4430a4 100644
Binary files a/dist/Networking/AzureLoadBalancer.png and b/dist/Networking/AzureLoadBalancer.png differ
diff --git a/dist/Networking/AzureLoadBalancer.puml b/dist/Networking/AzureLoadBalancer.puml
index d5731c42..2d777185 100644
--- a/dist/Networking/AzureLoadBalancer.puml
+++ b/dist/Networking/AzureLoadBalancer.puml
@@ -1,9 +1,10 @@
 sprite $AzureLoadBalancer [70x70/16z] {
-fTI7TW8X58JXeNDv__TDvxZ_IQ8EZjrTFZfwa38YPajwAMDz9Ufho4vx7I7Z8s3E4JBdI0mmXqXH1tE82Cmf0kOO8NECa3b6o1mZP6p4PuYibZ-Jz9cKFpF0
--Cj-6fk121M30KB5O81GkSyGCHGmG0m531130GF4KCW0yHGoH68XqP8-K-TYWWoHMN5lJzefz0iP8YhhaYf9gPJyzOdcA8CX0gL9AbzbeoTnS0I629GXgUqV
-aNUvhO010YLf8vjfKC3q6m9bI6bTCl5RO4e1efHtajGvBLAfEm8J0mWJKBeGCa2OXGmXO09ts4hwQGLkEUrHNs3EHdUb08EPpi_Ez5Iz5OEoCXeJ_0aahWjq
-K1cwb8loQmUKk5G0vjTkh3zpcCLDBI9aFXKoohNL915Pln0mbKiaQQTosYiGChzFp8uJ4m42nZYzWO0n521W30K864CXGiPGY91n52BtcSXtBZpBHDgBpa1-
-CGKNY3p9y0GC0o6JyJyGWz4b1OZ1K05YCEmH48VfkcK2SPX8sgb0F6PkfWGGauagIQal7-4GpuaprcOG82v3v9GXSiuGEMVE4QwJcNGtxm
+fTS75jmW30RX7uIa-zyuiHtsCMbWxRos1N_kJPkwHxZfkpoU-fS8c2e2feg0gIDaweWRc28YTJ1514mL8LD5o5WH8PDMGyXaMWKXamdc526J2MQFXDqrNTcT
+Hu9vUzZ7Kyxi5A52XCmUeGBc6A6Io0uHAaJ84DafpFO85I1WDWWK8cI8l5J8474Qe-d9aWKP8jrMmziw18Z8496jYAxwF9a65394e3H9vZ_xjLGE1GmGADTN
+lvlVe80X8iFwZ0UPIpQeV9Wk8ZAVcTGNv5BRee1f7GWRgn9DQs1y0650meJ0O0Hh4-4OjYgkltMWMDuv60Q4AqqaBS0qcpN9S5P9iayI3cS568lP44zqathE
+WeYfWp6S09qdLL3v82wHCKxNroMpX0A4Z74Tf74RNL9BA438GCcXfPvGY8WCb5oE-f5GW91Xpw060m410-Igwsg3W3bMY90XGcMFa252PO-GsIj4o12XiaV8
+_37MpX0o63kPBK86f-vix14oVtyas29a5aLB_WRX5Mt9W9mpL0QHSuPh1EIOuTPjGDun3Oj2v9o9oGmWRvaSbzC3o2i60IamG6eCaI93fCe0gJD0oZK_Ucdz
+0G
 }
 
 AzureEntityColoring(AzureLoadBalancer)
diff --git a/dist/Networking/AzureLoadBalancer.svg b/dist/Networking/AzureLoadBalancer.svg
index 8d50c2fe..1c1e5c34 100644
--- a/dist/Networking/AzureLoadBalancer.svg
+++ b/dist/Networking/AzureLoadBalancer.svg
@@ -13,13 +13,13 @@
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.566406 1.894531 C 38.347656 0.671875 36.726563 0 35 0 C 33.277344 0 31.65625 0.671875 30.4375 1.894531 L 1.894531 30.4375 C 0.6875 31.636719 0 33.300781 0 35 C 0 36.699219 0.6875 38.363281 1.894531 39.566406 L 18.054688 55.726563 L 48.453125 10.777344 Z M 39.566406 1.894531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.566406 1.890625 C 38.347656 0.671875 36.726563 0 35 0 C 33.277344 0 31.65625 0.671875 30.4375 1.890625 L 1.894531 30.433594 C 0.6875 31.636719 0 33.300781 0 35 C 0 36.699219 0.6875 38.363281 1.894531 39.5625 L 18.054688 55.726563 L 48.453125 10.777344 Z M 39.566406 1.890625 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 35 70 C 33.277344 70 31.652344 69.328125 30.4375 68.109375 L 1.890625 39.566406 C 0.6875 38.363281 0 36.699219 0 35 C 0 33.300781 0.6875 31.636719 1.890625 30.4375 L 30.4375 1.894531 C 31.65625 0.671875 33.277344 0 35 0 C 36.726563 0 38.347656 0.671875 39.566406 1.894531 L 68.105469 30.4375 C 69.328125 31.652344 70 33.273438 70 35 C 70 36.726563 69.328125 38.347656 68.105469 39.566406 L 39.566406 68.109375 C 38.347656 69.328125 36.726563 70 35 70 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 63.859375 34.527344 L 54.601563 25.269531 L 54.601563 31.804688 L 44.777344 31.796875 C 43.828125 28.410156 41.175781 25.734375 37.800781 24.765625 L 37.800781 15.402344 L 44.257813 15.402344 L 35 6.144531 L 25.742188 15.402344 L 32.199219 15.402344 L 32.199219 24.765625 C 28.832031 25.734375 26.179688 28.402344 25.226563 31.777344 L 15.398438 31.769531 L 15.398438 25.304688 L 6.140625 34.5625 L 15.398438 43.820313 L 15.398438 37.285156 L 25.230469 37.292969 C 26.1875 40.660156 28.835938 43.320313 32.199219 44.285156 L 32.199219 50.777344 C 30.800781 51.796875 28.660156 53.9375 28.660156 56.433594 C 28.660156 59.90625 31.507813 62.734375 34.980469 62.734375 C 38.453125 62.734375 41.292969 59.90625 41.292969 56.433594 C 41.292969 53.964844 39.199219 51.847656 37.800781 50.8125 L 37.800781 44.285156 C 41.160156 43.320313 43.804688 40.671875 44.765625 37.308594 L 54.601563 37.320313 L 54.601563 43.785156 Z M 63.859375 34.527344 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 35 27.164063 C 30.941406 27.164063 27.640625 30.46875 27.640625 34.527344 C 27.640625 38.585938 30.941406 41.886719 35 41.886719 C 39.058594 41.886719 42.359375 38.585938 42.359375 34.527344 C 42.359375 30.464844 39.058594 27.164063 35 27.164063 Z M 35 27.164063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 35 70 C 33.277344 70 31.652344 69.328125 30.4375 68.105469 L 1.890625 39.5625 C 0.6875 38.363281 0 36.699219 0 35 C 0 33.300781 0.6875 31.636719 1.890625 30.433594 L 30.4375 1.890625 C 31.65625 0.671875 33.277344 0 35 0 C 36.726563 0 38.347656 0.671875 39.566406 1.890625 L 68.105469 30.433594 C 69.328125 31.648438 70 33.273438 70 35 C 70 36.726563 69.328125 38.347656 68.105469 39.566406 L 39.566406 68.105469 C 38.347656 69.328125 36.726563 70 35 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 63.859375 34.523438 L 54.601563 25.265625 L 54.601563 31.800781 L 44.777344 31.792969 C 43.828125 28.410156 41.175781 25.734375 37.800781 24.765625 L 37.800781 15.398438 L 44.257813 15.398438 L 35 6.140625 L 25.742188 15.398438 L 32.199219 15.398438 L 32.199219 24.765625 C 28.832031 25.734375 26.179688 28.398438 25.226563 31.777344 L 15.398438 31.765625 L 15.398438 25.300781 L 6.140625 34.558594 L 15.398438 43.816406 L 15.398438 37.28125 L 25.230469 37.289063 C 26.1875 40.660156 28.835938 43.316406 32.199219 44.285156 L 32.199219 50.773438 C 30.800781 51.792969 28.660156 53.9375 28.660156 56.429688 C 28.660156 59.90625 31.507813 62.730469 34.980469 62.730469 C 38.453125 62.730469 41.292969 59.90625 41.292969 56.429688 C 41.292969 53.964844 39.199219 51.847656 37.800781 50.8125 L 37.800781 44.285156 C 41.160156 43.320313 43.804688 40.667969 44.765625 37.308594 L 54.601563 37.316406 L 54.601563 43.78125 Z M 63.859375 34.523438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 35 27.164063 C 30.941406 27.164063 27.640625 30.464844 27.640625 34.523438 C 27.640625 38.582031 30.941406 41.886719 35 41.886719 C 39.058594 41.886719 42.359375 38.585938 42.359375 34.523438 C 42.359375 30.464844 39.058594 27.164063 35 27.164063 Z M 35 27.164063 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureLocalNetworkGateway(m).png b/dist/Networking/AzureLocalNetworkGateway(m).png
new file mode 100644
index 00000000..f3c96cb6
Binary files /dev/null and b/dist/Networking/AzureLocalNetworkGateway(m).png differ
diff --git a/dist/Networking/AzureLocalNetworkGateway(m).svg b/dist/Networking/AzureLocalNetworkGateway(m).svg
new file mode 100644
index 00000000..e043c5a9
--- /dev/null
+++ b/dist/Networking/AzureLocalNetworkGateway(m).svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.621094 1.960938 C 38.359375 0.699219 36.679688 0 35 0 C 33.320313 0 31.640625 0.699219 30.378906 1.960938 L 1.960938 30.378906 C 0.699219 31.640625 0 33.320313 0 35 C 0 36.679688 0.699219 38.359375 1.960938 39.621094 L 18.058594 55.71875 L 48.441406 10.78125 Z M 39.621094 1.960938 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 35 70 C 33.320313 70 31.640625 69.300781 30.378906 68.039063 L 1.960938 39.621094 C 0.699219 38.359375 0 36.679688 0 35 C 0 33.320313 0.699219 31.640625 1.960938 30.378906 L 30.378906 1.960938 C 31.640625 0.699219 33.320313 0 35 0 C 36.679688 0 38.359375 0.699219 39.621094 1.960938 L 68.179688 30.519531 C 69.441406 31.78125 70.140625 33.320313 70.140625 35.140625 C 70.140625 36.820313 69.441406 38.5 68.179688 39.761719 L 39.621094 68.039063 C 38.359375 69.300781 36.679688 70 35 70 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35 6.160156 L 25.761719 15.398438 L 32.339844 15.398438 L 32.339844 28.839844 L 37.800781 28.839844 L 37.800781 15.398438 L 44.238281 15.398438 Z M 35 6.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35 63.839844 L 44.238281 54.601563 L 37.660156 54.601563 L 37.660156 41.441406 L 32.199219 41.441406 L 32.199219 54.601563 L 25.761719 54.601563 Z M 35 63.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.339844 35 L 48.578125 44.238281 L 48.578125 37.800781 L 61.039063 37.800781 L 61.039063 32.199219 L 48.578125 32.199219 L 48.578125 25.761719 Z M 39.339844 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.800781 35 L 21.558594 25.761719 L 21.558594 32.199219 L 8.960938 32.199219 L 8.960938 37.800781 L 21.558594 37.800781 L 21.558594 44.238281 Z M 30.800781 35 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureLocalNetworkGateway.png b/dist/Networking/AzureLocalNetworkGateway.png
new file mode 100644
index 00000000..1f009f14
Binary files /dev/null and b/dist/Networking/AzureLocalNetworkGateway.png differ
diff --git a/dist/Networking/AzureLocalNetworkGateway.puml b/dist/Networking/AzureLocalNetworkGateway.puml
new file mode 100644
index 00000000..c502848c
--- /dev/null
+++ b/dist/Networking/AzureLocalNetworkGateway.puml
@@ -0,0 +1,11 @@
+sprite $AzureLocalNetworkGateway [70x70/16z] {
+fTS7YiH030LHTTA__uat2GlZCYlG5DdXEOUsehdTpxBFEXxD3n4m7GHC1m7JGS2qaRF0D10pC1q4J0S1qq4Up6eXJqQhWO0Hc1e18u4f4J1ICYKIhRz607yT
+ruCfa2nMy4W2Ko5Kb94XKYjaY5010eO85I1WYDGA6I9KY90XGaK8310eGc28K2aP8di_56KB391KB1WgSmXC8b22WJ9j24mYL8A9f4H20HC8b620l2gQYL19
+vewyAXhJFPgtXWL3n6pTEeeyzzjGC4g4RLtCGm6JI5-P5-BshtAW0053PTqK8g60WMB-qWQIp93Ojlcc00ac5SwOxyhqfo9_LtmOc50IENyb4mgGLsO7mjlU
+eIH2Pa-7Sgr3929pBWIAd4X49X4gHC0KIeMG4PGI8ICeDKA62X40JqPGIeICe9G86IerGaPKY5ICe1YHak5tF1gUIDqK620DXaY38T9WY3GO8Yq6I8y1qcCI
+EMPzHa0Q39060wJ10EanG5gD8qbU3Lg_0G
+}
+
+AzureEntityColoring(AzureLocalNetworkGateway)
+!define AzureLocalNetworkGateway(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureLocalNetworkGateway, AzureLocalNetworkGateway)
+!define AzureLocalNetworkGateway(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureLocalNetworkGateway, AzureLocalNetworkGateway)
diff --git a/dist/Networking/AzureLocalNetworkGateway.svg b/dist/Networking/AzureLocalNetworkGateway.svg
new file mode 100644
index 00000000..033f338d
--- /dev/null
+++ b/dist/Networking/AzureLocalNetworkGateway.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.621094 1.960938 C 38.359375 0.699219 36.679688 0 35 0 C 33.320313 0 31.640625 0.699219 30.378906 1.960938 L 1.960938 30.378906 C 0.699219 31.640625 0 33.320313 0 35 C 0 36.679688 0.699219 38.359375 1.960938 39.621094 L 18.058594 55.71875 L 48.441406 10.78125 Z M 39.621094 1.960938 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 35 70 C 33.320313 70 31.640625 69.300781 30.378906 68.039063 L 1.960938 39.621094 C 0.699219 38.359375 0 36.679688 0 35 C 0 33.320313 0.699219 31.640625 1.960938 30.378906 L 30.378906 1.960938 C 31.640625 0.699219 33.320313 0 35 0 C 36.679688 0 38.359375 0.699219 39.621094 1.960938 L 68.179688 30.519531 C 69.441406 31.78125 70.140625 33.320313 70.140625 35.140625 C 70.140625 36.820313 69.441406 38.5 68.179688 39.761719 L 39.621094 68.039063 C 38.359375 69.300781 36.679688 70 35 70 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35 6.160156 L 25.761719 15.398438 L 32.339844 15.398438 L 32.339844 28.839844 L 37.800781 28.839844 L 37.800781 15.398438 L 44.238281 15.398438 Z M 35 6.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35 63.839844 L 44.238281 54.601563 L 37.660156 54.601563 L 37.660156 41.441406 L 32.199219 41.441406 L 32.199219 54.601563 L 25.761719 54.601563 Z M 35 63.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.339844 35 L 48.578125 44.238281 L 48.578125 37.800781 L 61.039063 37.800781 L 61.039063 32.199219 L 48.578125 32.199219 L 48.578125 25.761719 Z M 39.339844 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.800781 35 L 21.558594 25.761719 L 21.558594 32.199219 L 8.960938 32.199219 L 8.960938 37.800781 L 21.558594 37.800781 L 21.558594 44.238281 Z M 30.800781 35 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureNetworkInterface(m).png b/dist/Networking/AzureNetworkInterface(m).png
new file mode 100644
index 00000000..e7b9532e
Binary files /dev/null and b/dist/Networking/AzureNetworkInterface(m).png differ
diff --git a/dist/Networking/AzureNetworkInterface(m).svg b/dist/Networking/AzureNetworkInterface(m).svg
new file mode 100644
index 00000000..2fac7f8e
--- /dev/null
+++ b/dist/Networking/AzureNetworkInterface(m).svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 24.691406 52.3125 L 16.089844 52.3125 L 16.089844 16.671875 L 27.628906 16.671875 L 27.628906 19.609375 L 19.027344 19.609375 L 19.027344 49.375 L 24.691406 49.375 Z M 24.691406 52.3125 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 21.753906 59.652344 L 10.214844 59.652344 L 10.214844 10.796875 L 29.097656 10.796875 L 29.097656 13.734375 L 13.152344 13.734375 L 13.152344 56.71875 L 21.753906 56.71875 Z M 21.753906 59.652344 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 46.367188 56.203125 L 37.882813 56.203125 L 37.882813 31.96875 L 44.515625 31.96875 L 44.515625 21.050781 L 47.453125 21.050781 L 47.453125 34.90625 L 40.820313 34.90625 L 40.820313 53.265625 L 46.367188 53.265625 Z M 46.367188 56.203125 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 4.199219 0 L 60.488281 0 L 60.488281 70 L 4.199219 70 Z M 4.199219 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 26.867188 6.882813 L 53.355469 6.882813 L 53.355469 23.523438 L 26.867188 23.523438 Z M 26.867188 6.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 60.488281 5.382813 L 66.789063 5.382813 L 66.789063 17.390625 L 60.488281 17.390625 Z M 60.488281 5.382813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 60.488281 22.519531 L 66.789063 22.519531 L 66.789063 54.472656 L 60.488281 54.472656 Z M 60.488281 22.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 29.132813 44.40625 L 33.671875 44.40625 L 33.671875 63.152344 L 29.132813 63.152344 Z M 29.132813 44.40625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 21.789063 44.40625 L 26.332031 44.40625 L 26.332031 63.152344 L 21.789063 63.152344 Z M 21.789063 44.40625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 32.203125 33.753906 C 32.203125 35.632813 30.679688 37.15625 28.800781 37.15625 C 26.921875 37.15625 25.398438 35.632813 25.398438 33.753906 C 25.398438 31.875 26.921875 30.351563 28.800781 30.351563 C 30.679688 30.347656 32.203125 31.875 32.203125 33.753906 Z M 32.203125 33.753906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 45.984375 45.28125 L 52.035156 45.28125 L 52.035156 62.589844 L 45.984375 62.589844 Z M 45.984375 45.28125 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureNetworkInterface.png b/dist/Networking/AzureNetworkInterface.png
new file mode 100644
index 00000000..340914ba
Binary files /dev/null and b/dist/Networking/AzureNetworkInterface.png differ
diff --git a/dist/Networking/AzureNetworkInterface.puml b/dist/Networking/AzureNetworkInterface.puml
new file mode 100644
index 00000000..3fb0a1aa
--- /dev/null
+++ b/dist/Networking/AzureNetworkInterface.puml
@@ -0,0 +1,9 @@
+sprite $AzureNetworkInterface [70x70/16z] {
+xTW5WeD044HHhATwOjp_jjlK6kuEFsul2Gw19HYN2tBDhTnAnDeLRGnW4hDs9MtiVIL5VQbj5IqqLa6XaoWwOEYwa4rL0bQlw4_J5FnqB2LaxShhtTIpnvX6
+Ozuhs4wKMt4YRh8YKHX6Cb5nXXW3fimFLoHa-INxPWfo_oZtxAYXwoOfJ6XCKjX-bLjvM0fuk_6Z5Ksj9_2scqzUaIJBJLJYC4kEfgZEeLZxKA1PKnLMfr2V
+hB2I4h69YWjOFoLN7-M_KoZvz11AbDLJmTFomEDfdUDenQry0G
+}
+
+AzureEntityColoring(AzureNetworkInterface)
+!define AzureNetworkInterface(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetworkInterface, AzureNetworkInterface)
+!define AzureNetworkInterface(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetworkInterface, AzureNetworkInterface)
diff --git a/dist/Networking/AzureNetworkInterface.svg b/dist/Networking/AzureNetworkInterface.svg
new file mode 100644
index 00000000..b42b4c81
--- /dev/null
+++ b/dist/Networking/AzureNetworkInterface.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 24.691406 52.3125 L 16.089844 52.3125 L 16.089844 16.671875 L 27.628906 16.671875 L 27.628906 19.609375 L 19.027344 19.609375 L 19.027344 49.375 L 24.691406 49.375 Z M 24.691406 52.3125 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 21.753906 59.652344 L 10.214844 59.652344 L 10.214844 10.796875 L 29.097656 10.796875 L 29.097656 13.734375 L 13.152344 13.734375 L 13.152344 56.71875 L 21.753906 56.71875 Z M 21.753906 59.652344 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 46.367188 56.203125 L 37.882813 56.203125 L 37.882813 31.96875 L 44.515625 31.96875 L 44.515625 21.050781 L 47.453125 21.050781 L 47.453125 34.90625 L 40.820313 34.90625 L 40.820313 53.265625 L 46.367188 53.265625 Z M 46.367188 56.203125 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 4.199219 0 L 60.488281 0 L 60.488281 70 L 4.199219 70 Z M 4.199219 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 26.867188 6.882813 L 53.355469 6.882813 L 53.355469 23.523438 L 26.867188 23.523438 Z M 26.867188 6.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 60.488281 5.382813 L 66.789063 5.382813 L 66.789063 17.390625 L 60.488281 17.390625 Z M 60.488281 5.382813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 60.488281 22.519531 L 66.789063 22.519531 L 66.789063 54.472656 L 60.488281 54.472656 Z M 60.488281 22.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 29.132813 44.40625 L 33.671875 44.40625 L 33.671875 63.152344 L 29.132813 63.152344 Z M 29.132813 44.40625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 21.789063 44.40625 L 26.332031 44.40625 L 26.332031 63.152344 L 21.789063 63.152344 Z M 21.789063 44.40625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 32.203125 33.753906 C 32.203125 35.632813 30.679688 37.15625 28.800781 37.15625 C 26.921875 37.15625 25.398438 35.632813 25.398438 33.753906 C 25.398438 31.875 26.921875 30.351563 28.800781 30.351563 C 30.679688 30.347656 32.203125 31.875 32.203125 33.753906 Z M 32.203125 33.753906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 45.984375 45.28125 L 52.035156 45.28125 L 52.035156 62.589844 L 45.984375 62.589844 Z M 45.984375 45.28125 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureNetworkSecurityGroups(m).png b/dist/Networking/AzureNetworkSecurityGroups(m).png
new file mode 100644
index 00000000..09a74d5c
Binary files /dev/null and b/dist/Networking/AzureNetworkSecurityGroups(m).png differ
diff --git a/dist/Networking/AzureNetworkSecurityGroups(m).svg b/dist/Networking/AzureNetworkSecurityGroups(m).svg
new file mode 100644
index 00000000..122d609d
--- /dev/null
+++ b/dist/Networking/AzureNetworkSecurityGroups(m).svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9.01" y1="0.75" x2="9.01" y2="17.25" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(41,164,255);stop-opacity:1;"/>
+<stop offset="0.18" style="stop-color:rgb(31,159,255);stop-opacity:1;"/>
+<stop offset="0.47" style="stop-color:rgb(1,147,255);stop-opacity:1;"/>
+<stop offset="0.84" style="stop-color:rgb(0,120,210);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(0,108,188);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 63.621094 32.667969 C 63.621094 51.488281 40.871094 66.65625 35.933594 69.726563 C 35.359375 70.078125 34.640625 70.078125 34.066406 69.726563 C 29.128906 66.65625 6.378906 51.488281 6.378906 32.667969 L 6.378906 10.035156 C 6.378906 9.058594 7.15625 8.265625 8.128906 8.246094 C 25.820313 7.777344 21.738281 0 35 0 C 48.261719 0 44.179688 7.777344 61.871094 8.246094 C 62.84375 8.265625 63.621094 9.058594 63.621094 10.035156 Z M 63.621094 32.667969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(79,180,255);fill-opacity:1;" d="M 61.25 32.859375 C 61.25 50.128906 40.40625 63.972656 35.855469 66.851563 C 35.328125 67.164063 34.671875 67.164063 34.144531 66.851563 C 29.59375 64.050781 8.75 50.128906 8.75 32.859375 L 8.75 12.09375 C 8.75 11.207031 9.457031 10.480469 10.34375 10.460938 C 26.5625 10.035156 22.828125 2.917969 35 2.917969 C 47.171875 2.917969 43.4375 10.035156 59.65625 10.460938 C 60.542969 10.480469 61.25 11.207031 61.25 12.09375 Z M 61.25 32.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 35 35 L 35 2.917969 C 47.171875 2.917969 43.4375 10.035156 59.65625 10.460938 C 60.546875 10.503906 61.25 11.238281 61.25 12.132813 L 61.25 32.898438 C 61.289063 33.597656 61.289063 34.300781 61.25 35 Z M 35 35 L 8.867188 35 C 10.421875 51.253906 29.789063 64.167969 34.144531 66.851563 C 34.355469 66.984375 34.59375 67.0625 34.84375 67.082031 L 35 67.082031 Z M 35 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 10.34375 10.460938 C 26.5625 10.035156 22.828125 2.917969 35 2.917969 L 35 35 L 8.867188 35 C 8.828125 34.300781 8.828125 33.597656 8.867188 32.898438 L 8.867188 12.132813 C 8.859375 11.28125 9.496094 10.558594 10.34375 10.460938 Z M 61.132813 35 L 35 35 L 35 67.082031 C 35.25 67.0625 35.488281 66.984375 35.699219 66.851563 C 40.210938 64.167969 59.578125 51.253906 61.132813 35 Z M 61.132813 35 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureNetworkSecurityGroups.png b/dist/Networking/AzureNetworkSecurityGroups.png
new file mode 100644
index 00000000..a35ab340
Binary files /dev/null and b/dist/Networking/AzureNetworkSecurityGroups.png differ
diff --git a/dist/Networking/AzureNetworkSecurityGroups.puml b/dist/Networking/AzureNetworkSecurityGroups.puml
new file mode 100644
index 00000000..9fb4a536
--- /dev/null
+++ b/dist/Networking/AzureNetworkSecurityGroups.puml
@@ -0,0 +1,11 @@
+sprite $AzureNetworkSecurityGroups [70x70/16z] {
+xSw7iTuW403X4t1f--_NaHbBMBmVv1o-0dPMtbBD4o33sY6F7CP55DcdCF9ZToG0tBIrPlv1943R7x7scVbd2SJwJWqWj7sfT00gIrhqaR7ITr9V_1nL0_h8
+KEa0I6j5RgX79fttnb3faYuZxBBLe4ktDZ0VH48NScAGPgPzOb8PH013fKsPpyHOoISL_wSh_ZjLOkflhlol_A_yh-YlhQISDF0fdN92JYh4bBQPmEKC8cVc
+bKJbB1zLeCYPa_iL1Rce4DiLn-NgIGNQK35ojs8WWmAnMKbCHi7cYy8XemgnLKbSlXPilHYKcqg1sAY0oHs3zOgJSY_NAmfrKYcmM54mcL5OgoGfSm4h5OSY
+SqV2wuf3axUKXOg1oTigP7AXOmGNsSxe60bvhOqPdKJsCheVwHdojk8zigJsp5W9S96zp5ZH19CT9I6l5GLKDWNakM90bMqA9BsY0Nd80wrdzFE8opD708bg
+02gF6P0EP95lK1C0aszaAoFl0G
+}
+
+AzureEntityColoring(AzureNetworkSecurityGroups)
+!define AzureNetworkSecurityGroups(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetworkSecurityGroups, AzureNetworkSecurityGroups)
+!define AzureNetworkSecurityGroups(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetworkSecurityGroups, AzureNetworkSecurityGroups)
diff --git a/dist/Networking/AzureNetworkSecurityGroups.svg b/dist/Networking/AzureNetworkSecurityGroups.svg
new file mode 100644
index 00000000..31a862b9
--- /dev/null
+++ b/dist/Networking/AzureNetworkSecurityGroups.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="9.01" y1="0.75" x2="9.01" y2="17.25" gradientTransform="matrix(3.888889,0,0,3.888889,0,0)">
+<stop offset="0" style="stop-color:rgb(36.862745%,62.745098%,93.72549%);stop-opacity:1;"/>
+<stop offset="0.18" style="stop-color:rgb(33.333333%,61.176471%,92.54902%);stop-opacity:1;"/>
+<stop offset="0.47" style="stop-color:rgb(23.529412%,56.862745%,89.803922%);stop-opacity:1;"/>
+<stop offset="0.84" style="stop-color:rgb(7.45098%,50.196078%,85.490196%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(0%,47.058824%,83.137255%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,83.137255%);fill-opacity:1;" d="M 63.621094 32.667969 C 63.621094 51.488281 40.871094 66.65625 35.933594 69.726563 C 35.359375 70.078125 34.640625 70.078125 34.066406 69.726563 C 29.128906 66.65625 6.378906 51.488281 6.378906 32.667969 L 6.378906 10.035156 C 6.378906 9.058594 7.15625 8.265625 8.128906 8.246094 C 25.820313 7.777344 21.738281 0 35 0 C 48.261719 0 44.179688 7.777344 61.871094 8.246094 C 62.84375 8.265625 63.621094 9.058594 63.621094 10.035156 Z M 63.621094 32.667969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(41.960784%,72.54902%,94.901961%);fill-opacity:1;" d="M 61.25 32.859375 C 61.25 50.128906 40.40625 63.972656 35.855469 66.851563 C 35.328125 67.164063 34.671875 67.164063 34.144531 66.851563 C 29.59375 64.050781 8.75 50.128906 8.75 32.859375 L 8.75 12.09375 C 8.75 11.207031 9.457031 10.480469 10.34375 10.460938 C 26.5625 10.035156 22.828125 2.917969 35 2.917969 C 47.171875 2.917969 43.4375 10.035156 59.65625 10.460938 C 60.542969 10.480469 61.25 11.207031 61.25 12.09375 Z M 61.25 32.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 35 35 L 35 2.917969 C 47.171875 2.917969 43.4375 10.035156 59.65625 10.460938 C 60.546875 10.503906 61.25 11.238281 61.25 12.132813 L 61.25 32.898438 C 61.289063 33.597656 61.289063 34.300781 61.25 35 Z M 35 35 L 8.867188 35 C 10.421875 51.253906 29.789063 64.167969 34.144531 66.851563 C 34.355469 66.984375 34.59375 67.0625 34.84375 67.082031 L 35 67.082031 Z M 35 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 10.34375 10.460938 C 26.5625 10.035156 22.828125 2.917969 35 2.917969 L 35 35 L 8.867188 35 C 8.828125 34.300781 8.828125 33.597656 8.867188 32.898438 L 8.867188 12.132813 C 8.859375 11.28125 9.496094 10.558594 10.34375 10.460938 Z M 61.132813 35 L 35 35 L 35 67.082031 C 35.25 67.0625 35.488281 66.984375 35.699219 66.851563 C 40.210938 64.167969 59.578125 51.253906 61.132813 35 Z M 61.132813 35 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureNetworkSecurityGroupsClassic(m).png b/dist/Networking/AzureNetworkSecurityGroupsClassic(m).png
new file mode 100644
index 00000000..11a2534a
Binary files /dev/null and b/dist/Networking/AzureNetworkSecurityGroupsClassic(m).png differ
diff --git a/dist/Networking/AzureNetworkSecurityGroupsClassic(m).svg b/dist/Networking/AzureNetworkSecurityGroupsClassic(m).svg
new file mode 100644
index 00000000..30dd02c1
--- /dev/null
+++ b/dist/Networking/AzureNetworkSecurityGroupsClassic(m).svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 41.859375 23.101563 L 53.480469 8.398438 C 38.078125 6.71875 35.421875 0 35.421875 0 C 35.421875 0 31.921875 8.679688 9.800781 8.679688 L 9.800781 44.519531 C 9.800781 48.859375 12.179688 52.921875 15.539063 56.421875 L 24.21875 45.5 Z M 41.859375 23.101563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 15.121094 34.160156 L 15.121094 42.699219 C 15.121094 46.199219 17.078125 49.421875 19.738281 52.21875 C 25.761719 58.660156 35.558594 62.859375 35.558594 62.859375 L 35.558594 34.160156 Z M 15.121094 34.160156 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.421875 62.859375 C 35.421875 62.859375 55.859375 53.898438 55.859375 42.699219 L 55.859375 34.160156 L 35.421875 34.160156 Z M 35.421875 7.140625 C 35.421875 7.140625 32.621094 14.140625 14.980469 14.140625 L 14.980469 34.160156 L 35.421875 34.160156 Z M 35.421875 7.140625 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 49.699219 13.859375 C 37.519531 12.460938 35.421875 7.28125 35.421875 7.28125 L 35.421875 34.160156 L 55.859375 34.160156 L 55.859375 14.140625 C 53.621094 14.140625 51.519531 14 49.699219 13.859375 Z M 49.699219 13.859375 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 53.480469 8.398438 C 38.078125 6.71875 35.421875 0 35.421875 0 C 35.421875 0 31.921875 8.679688 9.800781 8.679688 L 9.800781 44.519531 C 9.800781 48.859375 12.179688 52.921875 15.539063 56.421875 C 23.101563 64.398438 35.421875 69.859375 35.421875 69.859375 C 35.421875 69.859375 61.039063 58.660156 61.039063 44.519531 L 61.039063 8.679688 C 58.238281 8.679688 55.71875 8.539063 53.480469 8.398438 Z M 53.480469 8.398438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureNetworkSecurityGroupsClassic.png b/dist/Networking/AzureNetworkSecurityGroupsClassic.png
new file mode 100644
index 00000000..9cd125a3
Binary files /dev/null and b/dist/Networking/AzureNetworkSecurityGroupsClassic.png differ
diff --git a/dist/Networking/AzureNetworkSecurityGroupsClassic.puml b/dist/Networking/AzureNetworkSecurityGroupsClassic.puml
new file mode 100644
index 00000000..39c60dff
--- /dev/null
+++ b/dist/Networking/AzureNetworkSecurityGroupsClassic.puml
@@ -0,0 +1,10 @@
+sprite $AzureNetworkSecurityGroupsClassic [70x70/16z] {
+xT1fpjmW48HXxARt-zytGiY8RroPyP8zVl_pg8loEIa_80xz4KZSPpHQjjmngaVF-RfXCRhea7fypONE00k9JOHDaF47YMgjBA8Dc5FUc449SoMYTTaV43Wb
+LekNibSFAiv4hAeEaAEA2r5NlkpC4ueh4mrbWlAOucxAbRPOHsRk1nIkupLGXcKMxnG2iOB-U-LH7kLH7aNbDLLXq5l5T9yGw0zJ7kLH_A1IiqLbrob5ixNk
+5HkJW087HTady1YiIBOCA6k0Ox1I8yVduab-GF7iWr0Kc17yjSa5Pj432a2yu1QFLiPRHJeIAoB6fimC-xwYEUt1SKC6WnJFdfOtIVR2eL8ZUrRA4IOTA08G
+76zCs8jIFH62uvYSIT58_2SuYi7uKDXpIygX5i_PaNbC1fMZIOx2f5habY_bUEIJawFWSYxDVROMqA5py277uvWDNSgr5WaqvhoZsN8gzrhrWF4D
+}
+
+AzureEntityColoring(AzureNetworkSecurityGroupsClassic)
+!define AzureNetworkSecurityGroupsClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetworkSecurityGroupsClassic, AzureNetworkSecurityGroupsClassic)
+!define AzureNetworkSecurityGroupsClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetworkSecurityGroupsClassic, AzureNetworkSecurityGroupsClassic)
diff --git a/dist/Networking/AzureNetworkSecurityGroupsClassic.svg b/dist/Networking/AzureNetworkSecurityGroupsClassic.svg
new file mode 100644
index 00000000..347186e2
--- /dev/null
+++ b/dist/Networking/AzureNetworkSecurityGroupsClassic.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 41.859375 23.101563 L 53.480469 8.398438 C 38.078125 6.71875 35.421875 0 35.421875 0 C 35.421875 0 31.921875 8.679688 9.800781 8.679688 L 9.800781 44.519531 C 9.800781 48.859375 12.179688 52.921875 15.539063 56.421875 L 24.21875 45.5 Z M 41.859375 23.101563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 15.121094 34.160156 L 15.121094 42.699219 C 15.121094 46.199219 17.078125 49.421875 19.738281 52.21875 C 25.761719 58.660156 35.558594 62.859375 35.558594 62.859375 L 35.558594 34.160156 Z M 15.121094 34.160156 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.701961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.421875 62.859375 C 35.421875 62.859375 55.859375 53.898438 55.859375 42.699219 L 55.859375 34.160156 L 35.421875 34.160156 Z M 35.421875 7.140625 C 35.421875 7.140625 32.621094 14.140625 14.980469 14.140625 L 14.980469 34.160156 L 35.421875 34.160156 Z M 35.421875 7.140625 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.699219 13.859375 C 37.519531 12.460938 35.421875 7.28125 35.421875 7.28125 L 35.421875 34.160156 L 55.859375 34.160156 L 55.859375 14.140625 C 53.621094 14.140625 51.519531 14 49.699219 13.859375 Z M 49.699219 13.859375 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 53.480469 8.398438 C 38.078125 6.71875 35.421875 0 35.421875 0 C 35.421875 0 31.921875 8.679688 9.800781 8.679688 L 9.800781 44.519531 C 9.800781 48.859375 12.179688 52.921875 15.539063 56.421875 C 23.101563 64.398438 35.421875 69.859375 35.421875 69.859375 C 35.421875 69.859375 61.039063 58.660156 61.039063 44.519531 L 61.039063 8.679688 C 58.238281 8.679688 55.71875 8.539063 53.480469 8.398438 Z M 53.480469 8.398438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureNetworkWatcher(m).png b/dist/Networking/AzureNetworkWatcher(m).png
new file mode 100644
index 00000000..92628bdc
Binary files /dev/null and b/dist/Networking/AzureNetworkWatcher(m).png differ
diff --git a/dist/Networking/AzureNetworkWatcher(m).svg b/dist/Networking/AzureNetworkWatcher(m).svg
new file mode 100644
index 00000000..2996ce19
--- /dev/null
+++ b/dist/Networking/AzureNetworkWatcher(m).svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 9.800781 54.601563 C 11.265625 56.828125 13.171875 58.734375 15.398438 60.199219 L 19.0625 56.539063 L 13.460938 50.9375 Z M 9.800781 54.601563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 18.886719 45.484375 C 18.886719 36.382813 25.226563 30.085938 34.285156 30.085938 C 37.101563 30.085938 39.730469 30.851563 42 32.171875 C 39.335938 27.582031 34.378906 24.484375 28.6875 24.484375 C 20.179688 24.484375 13.285156 31.382813 13.285156 39.886719 C 13.285156 45.578125 16.382813 50.535156 20.972656 53.199219 C 19.652344 50.929688 18.886719 48.300781 18.886719 45.484375 Z M 18.886719 45.484375 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 44.660156 1.539063 C 31.816406 1.539063 21.351563 11.835938 21.03125 24.605469 C 23.535156 23.292969 26.378906 22.539063 29.398438 22.539063 C 39.375 22.539063 47.460938 30.625 47.460938 40.601563 C 47.460938 43.5625 46.730469 46.351563 45.46875 48.820313 C 58.136719 48.386719 68.320313 37.976563 68.320313 25.199219 C 68.320313 12.15625 57.707031 1.539063 44.660156 1.539063 Z M 44.660156 1.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 46.015625 49.839844 C 51.15625 45.332031 56.644531 38.179688 56.644531 25.21875 C 56.644531 12.253906 51.246094 4.816406 45.964844 0.558594 L 43.824219 2.660156 C 48.769531 6.644531 53.339844 12.136719 53.339844 25.21875 C 53.339844 38.34375 48.613281 43.574219 43.777344 47.8125 Z M 46.015625 49.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 22.558594 23.71875 L 67.042969 23.71875 L 67.042969 26.683594 L 22.558594 26.683594 Z M 22.558594 23.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 44.800781 14.117188 C 37.503906 14.117188 30.914063 12.082031 26.980469 9.050781 L 25.203125 10.832031 C 29.585938 14.355469 36.722656 16.660156 44.800781 16.660156 C 52.878906 16.660156 60.011719 14.355469 64.398438 10.828125 L 62.621094 9.050781 C 58.6875 12.082031 52.097656 14.117188 44.800781 14.117188 Z M 44.800781 14.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 15.296875 49.105469 L 1.296875 63.105469 L 1.296875 63.109375 C 0.582031 63.824219 0.140625 64.8125 0.140625 65.90625 C 0.140625 68.089844 1.910156 69.859375 4.09375 69.859375 C 5.1875 69.859375 6.175781 69.417969 6.890625 68.703125 L 6.894531 68.703125 L 20.894531 54.703125 Z M 15.296875 49.105469 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 41.613281 40.460938 C 41.613281 47.417969 35.972656 53.058594 29.015625 53.058594 C 22.054688 53.058594 16.414063 47.417969 16.414063 40.460938 C 16.414063 33.5 22.054688 27.859375 29.015625 27.859375 C 35.972656 27.859375 41.613281 33.5 41.613281 40.460938 Z M 41.613281 40.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 44.800781 40.601563 C 44.800781 49.105469 37.90625 56 29.398438 56 C 20.894531 56 14 49.105469 14 40.601563 C 14 32.09375 20.894531 25.199219 29.398438 25.199219 C 37.90625 25.199219 44.800781 32.09375 44.800781 40.601563 Z M 44.800781 40.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 36.289063 23.90625 C 36.589844 11.78125 41.003906 6.507813 45.773438 2.660156 L 43.632813 0.558594 C 38.675781 4.558594 33.617188 11.359375 33.015625 22.902344 C 34.148438 23.132813 35.242188 23.476563 36.289063 23.90625 Z M 36.289063 23.90625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 46.121094 33.785156 C 46.457031 34.613281 46.726563 35.472656 46.9375 36.355469 C 53.371094 36.710938 59.074219 38.617188 62.621094 41.347656 L 64.398438 39.570313 C 60.253906 36.238281 53.648438 34.023438 46.121094 33.785156 Z M 46.121094 33.785156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 44.800781 0.140625 C 30.984375 0.140625 19.738281 11.382813 19.738281 25.199219 C 19.738281 25.25 19.746094 25.300781 19.75 25.355469 C 20.757813 24.714844 21.832031 24.175781 22.964844 23.742188 C 23.71875 12.339844 33.210938 3.289063 44.800781 3.289063 C 56.878906 3.289063 66.710938 13.121094 66.710938 25.199219 C 66.710938 36.789063 57.660156 46.28125 46.257813 47.035156 C 45.824219 48.167969 45.285156 49.242188 44.644531 50.25 C 44.699219 50.25 44.75 50.261719 44.800781 50.261719 C 58.617188 50.261719 69.859375 39.019531 69.859375 25.199219 C 69.859375 11.382813 58.617188 0.140625 44.800781 0.140625 Z M 44.800781 0.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 27.414063 49 L 24.519531 40.449219 L 22.296875 44.832031 L 18.199219 44.832031 L 18.199219 42.636719 L 20.917969 42.636719 L 24.929688 34.734375 L 27.402344 42.035156 L 30.9375 31.480469 L 33.832031 40.015625 L 36.539063 34.851563 L 40.597656 34.851563 L 40.597656 37.078125 L 37.816406 37.074219 L 33.425781 45.726563 L 30.949219 38.4375 Z M 27.414063 49 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 29.398438 21.140625 C 18.652344 21.140625 9.941406 29.851563 9.941406 40.601563 C 9.941406 51.347656 18.652344 60.058594 29.398438 60.058594 C 40.148438 60.058594 48.859375 51.347656 48.859375 40.601563 C 48.859375 29.851563 40.148438 21.140625 29.398438 21.140625 Z M 29.398438 55.019531 C 21.433594 55.019531 14.980469 48.566406 14.980469 40.601563 C 14.980469 32.636719 21.433594 26.179688 29.398438 26.179688 C 37.363281 26.179688 43.820313 32.636719 43.820313 40.601563 C 43.820313 48.5625 37.363281 55.019531 29.398438 55.019531 Z M 29.398438 55.019531 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureNetworkWatcher.png b/dist/Networking/AzureNetworkWatcher.png
new file mode 100644
index 00000000..7bc322dc
Binary files /dev/null and b/dist/Networking/AzureNetworkWatcher.png differ
diff --git a/dist/Networking/AzureNetworkWatcher.puml b/dist/Networking/AzureNetworkWatcher.puml
new file mode 100644
index 00000000..b7995d9a
--- /dev/null
+++ b/dist/Networking/AzureNetworkWatcher.puml
@@ -0,0 +1,15 @@
+sprite $AzureNetworkWatcher [70x70/16z] {
+nPO7UYCX38LHVN9y__jk2F8OpGxvI7zR4je_QfIs9nPp071JRf-JU1IvV9oXSI6ZJp4Gfrzqdy5ZZJ7rzTHwaza6ZlSDoQ-YG_BdDB0ZUxFZyHkrDZ1-VC0t
+87wOpTsHriglX2sCnR1-662Jbzdh6nXzpf68Q8Tm1CJIuONIyf2wxioKdBDM5eSai4t2M2fPEVH-K1IZLhpOFIAJDPDkBqIZ6lGeL9h6958wdE9tJC5v8-9D
+votfQsDeZbfogZ1dWPTPHWacYPhvgynKk8JRLzckgQrfg5srcAfedbK-N7ATkd8fyRXgp5veQImoP7EC_6A2hoPKWrdDtKrBzEh2jSlfAMwJy6uEQK6vdHL6
+HPr2Xouf7BSBnLfN5Bijz16A7ulSJDKyZWuy5H6biO2uCANaqOSItPACItSWD4kGwBqSISwcivAkYtf1eOmOp6dDpv4E36qKjvqWfT3IfxBdIoD58oOpW-Jq
+2PwsSJa0whpWsGwnaxjU5fP8bsd56SVP9y3K8h1oY8V92Q5kCW7ZvW4iln93aEceetFyG4an7SkxIm3WMP61I3bdYEo_ihM44Bnt0MXDuSoKrOHU82bmFaac
+eK-If1Z0tQ7k4Y3F74PM2zlZUQQrv0ObJG6q2LnX2f_FdUSDeDFDL2byc08qXwGvqmnw7heK2RoYjCO00m9GSy3hZAFa2ENXKJrY8eCr6ubHWCj9Uhohk3mG
+ItIr8z2DuE4AmSiEEKusBP2w0NnGiagwpywrU8SJZ2ZkrCCbYFX17LP8DVRM_H5VFflfbe79DaCknWDYqRLyAUGMEDfqSPgM-YygvwKUQwzCMJDgheENbYR5
+P8quab0TgLSCXClesfXwkTUWj0t5Izw2rAe8Ou1t8FVx0sFLqnZTkWSPcC7Xx6QBxBCDYB_S4vCAk3iIiM59vg1WpWhPWhpg_YRO1SHf4v8Oj4OM9mQtVKXt
+2bdz_W25AxLzo3aFn29Pgf-7fFuAef-6o7T0cdy7fE4x8Cs-0z8eIdO-AuworJwdVm
+}
+
+AzureEntityColoring(AzureNetworkWatcher)
+!define AzureNetworkWatcher(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetworkWatcher, AzureNetworkWatcher)
+!define AzureNetworkWatcher(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetworkWatcher, AzureNetworkWatcher)
diff --git a/dist/Networking/AzureNetworkWatcher.svg b/dist/Networking/AzureNetworkWatcher.svg
new file mode 100644
index 00000000..6519efce
--- /dev/null
+++ b/dist/Networking/AzureNetworkWatcher.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.372549%,11.372549%,11.372549%);fill-opacity:1;" d="M 9.800781 54.601563 C 11.265625 56.828125 13.171875 58.734375 15.398438 60.199219 L 19.0625 56.539063 L 13.460938 50.9375 Z M 9.800781 54.601563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(21.960784%,59.607843%,77.254902%);fill-opacity:1;" d="M 18.886719 45.484375 C 18.886719 36.382813 25.226563 30.085938 34.285156 30.085938 C 37.101563 30.085938 39.730469 30.851563 42 32.171875 C 39.335938 27.582031 34.378906 24.484375 28.6875 24.484375 C 20.179688 24.484375 13.285156 31.382813 13.285156 39.886719 C 13.285156 45.578125 16.382813 50.535156 20.972656 53.199219 C 19.652344 50.929688 18.886719 48.300781 18.886719 45.484375 Z M 18.886719 45.484375 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44.660156 1.539063 C 31.816406 1.539063 21.351563 11.835938 21.03125 24.605469 C 23.535156 23.292969 26.378906 22.539063 29.398438 22.539063 C 39.375 22.539063 47.460938 30.625 47.460938 40.601563 C 47.460938 43.5625 46.730469 46.351563 45.46875 48.820313 C 58.136719 48.386719 68.320313 37.976563 68.320313 25.199219 C 68.320313 12.15625 57.707031 1.539063 44.660156 1.539063 Z M 44.660156 1.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(21.960784%,59.607843%,77.254902%);fill-opacity:1;" d="M 46.015625 49.839844 C 51.15625 45.332031 56.644531 38.179688 56.644531 25.21875 C 56.644531 12.253906 51.246094 4.816406 45.964844 0.558594 L 43.824219 2.660156 C 48.769531 6.644531 53.339844 12.136719 53.339844 25.21875 C 53.339844 38.34375 48.613281 43.574219 43.777344 47.8125 Z M 46.015625 49.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(21.960784%,59.607843%,77.254902%);fill-opacity:1;" d="M 22.558594 23.71875 L 67.042969 23.71875 L 67.042969 26.683594 L 22.558594 26.683594 Z M 22.558594 23.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(21.960784%,59.607843%,77.254902%);fill-opacity:1;" d="M 44.800781 14.117188 C 37.503906 14.117188 30.914063 12.082031 26.980469 9.050781 L 25.203125 10.832031 C 29.585938 14.355469 36.722656 16.660156 44.800781 16.660156 C 52.878906 16.660156 60.011719 14.355469 64.398438 10.828125 L 62.621094 9.050781 C 58.6875 12.082031 52.097656 14.117188 44.800781 14.117188 Z M 44.800781 14.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,48.235294%,48.235294%);fill-opacity:1;" d="M 15.296875 49.105469 L 1.296875 63.105469 L 1.296875 63.109375 C 0.582031 63.824219 0.140625 64.8125 0.140625 65.90625 C 0.140625 68.089844 1.910156 69.859375 4.09375 69.859375 C 5.1875 69.859375 6.175781 69.417969 6.890625 68.703125 L 6.894531 68.703125 L 20.894531 54.703125 Z M 15.296875 49.105469 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 41.613281 40.460938 C 41.613281 47.417969 35.972656 53.058594 29.015625 53.058594 C 22.054688 53.058594 16.414063 47.417969 16.414063 40.460938 C 16.414063 33.5 22.054688 27.859375 29.015625 27.859375 C 35.972656 27.859375 41.613281 33.5 41.613281 40.460938 Z M 41.613281 40.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44.800781 40.601563 C 44.800781 49.105469 37.90625 56 29.398438 56 C 20.894531 56 14 49.105469 14 40.601563 C 14 32.09375 20.894531 25.199219 29.398438 25.199219 C 37.90625 25.199219 44.800781 32.09375 44.800781 40.601563 Z M 44.800781 40.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(21.960784%,59.607843%,77.254902%);fill-opacity:1;" d="M 36.289063 23.90625 C 36.589844 11.78125 41.003906 6.507813 45.773438 2.660156 L 43.632813 0.558594 C 38.675781 4.558594 33.617188 11.359375 33.015625 22.902344 C 34.148438 23.132813 35.242188 23.476563 36.289063 23.90625 Z M 36.289063 23.90625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(21.960784%,59.607843%,77.254902%);fill-opacity:1;" d="M 46.121094 33.785156 C 46.457031 34.613281 46.726563 35.472656 46.9375 36.355469 C 53.371094 36.710938 59.074219 38.617188 62.621094 41.347656 L 64.398438 39.570313 C 60.253906 36.238281 53.648438 34.023438 46.121094 33.785156 Z M 46.121094 33.785156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(21.960784%,59.607843%,77.254902%);fill-opacity:1;" d="M 44.800781 0.140625 C 30.984375 0.140625 19.738281 11.382813 19.738281 25.199219 C 19.738281 25.25 19.746094 25.300781 19.75 25.355469 C 20.757813 24.714844 21.832031 24.175781 22.964844 23.742188 C 23.71875 12.339844 33.210938 3.289063 44.800781 3.289063 C 56.878906 3.289063 66.710938 13.121094 66.710938 25.199219 C 66.710938 36.789063 57.660156 46.28125 46.257813 47.035156 C 45.824219 48.167969 45.285156 49.242188 44.644531 50.25 C 44.699219 50.25 44.75 50.261719 44.800781 50.261719 C 58.617188 50.261719 69.859375 39.019531 69.859375 25.199219 C 69.859375 11.382813 58.617188 0.140625 44.800781 0.140625 Z M 44.800781 0.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 27.414063 49 L 24.519531 40.449219 L 22.296875 44.832031 L 18.199219 44.832031 L 18.199219 42.636719 L 20.917969 42.636719 L 24.929688 34.734375 L 27.402344 42.035156 L 30.9375 31.480469 L 33.832031 40.015625 L 36.539063 34.851563 L 40.597656 34.851563 L 40.597656 37.078125 L 37.816406 37.074219 L 33.425781 45.726563 L 30.949219 38.4375 Z M 27.414063 49 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,48.235294%,48.235294%);fill-opacity:1;" d="M 29.398438 21.140625 C 18.652344 21.140625 9.941406 29.851563 9.941406 40.601563 C 9.941406 51.347656 18.652344 60.058594 29.398438 60.058594 C 40.148438 60.058594 48.859375 51.347656 48.859375 40.601563 C 48.859375 29.851563 40.148438 21.140625 29.398438 21.140625 Z M 29.398438 55.019531 C 21.433594 55.019531 14.980469 48.566406 14.980469 40.601563 C 14.980469 32.636719 21.433594 26.179688 29.398438 26.179688 C 37.363281 26.179688 43.820313 32.636719 43.820313 40.601563 C 43.820313 48.5625 37.363281 55.019531 29.398438 55.019531 Z M 29.398438 55.019531 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureOnPremisesDataGateway(m).png b/dist/Networking/AzureOnPremisesDataGateway(m).png
new file mode 100644
index 00000000..da8048ca
Binary files /dev/null and b/dist/Networking/AzureOnPremisesDataGateway(m).png differ
diff --git a/dist/Networking/AzureOnPremisesDataGateway(m).svg b/dist/Networking/AzureOnPremisesDataGateway(m).svg
new file mode 100644
index 00000000..ca0f2b4f
--- /dev/null
+++ b/dist/Networking/AzureOnPremisesDataGateway(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 9.800781 39.199219 C 9.800781 33.460938 12.738281 28.980469 18.199219 26.179688 L 18.199219 25.058594 C 18.199219 17.078125 24.78125 10.640625 32.761719 10.640625 C 35.558594 10.640625 38.21875 11.339844 40.460938 12.738281 C 43.960938 7.839844 49.839844 4.761719 56.140625 4.761719 C 52.78125 1.820313 48.441406 0 43.539063 0 C 37.660156 0 32.199219 2.800781 28.839844 7.421875 C 26.738281 6.019531 24.21875 5.320313 21.558594 5.320313 C 14 5.320313 7.839844 11.480469 7.839844 18.898438 L 7.839844 20.019531 C 2.800781 22.679688 0 27.019531 0 32.339844 C 0 39.480469 4.898438 45.359375 11.761719 46.898438 C 10.5 44.660156 9.800781 42 9.800781 39.199219 Z M 9.800781 39.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 61.601563 19.878906 C 61.601563 19.320313 61.738281 18.621094 61.738281 18.058594 C 61.738281 8.121094 53.621094 0.140625 43.539063 0.140625 C 37.660156 0 32.199219 2.800781 28.839844 7.421875 C 26.738281 6.019531 24.21875 5.320313 21.558594 5.320313 C 14 5.320313 7.839844 11.480469 7.839844 18.898438 L 7.839844 20.019531 C 2.800781 22.679688 0 27.019531 0 32.339844 C 0 40.738281 6.859375 47.320313 15.679688 47.320313 L 54.320313 47.320313 C 63.140625 47.320313 70 40.738281 70 32.339844 C 70 26.738281 66.921875 22.261719 61.601563 19.878906 Z M 61.601563 19.878906 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 37.703125 61.941406 L 47.367188 52.773438 L 47.367188 57.75 L 35.707031 70 L 24.035156 57.792969 L 24.035156 52.832031 L 33.644531 61.941406 L 33.644531 45.703125 L 37.703125 45.703125 Z M 37.703125 61.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 33.695313 31.363281 L 24.035156 40.53125 L 24.035156 35.554688 L 35.695313 23.304688 L 47.367188 35.511719 L 47.367188 40.472656 L 37.753906 31.363281 L 37.753906 47.601563 L 33.695313 47.601563 Z M 33.695313 31.363281 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureOnPremisesDataGateway.png b/dist/Networking/AzureOnPremisesDataGateway.png
new file mode 100644
index 00000000..0098e097
Binary files /dev/null and b/dist/Networking/AzureOnPremisesDataGateway.png differ
diff --git a/dist/Networking/AzureOnPremisesDataGateway.puml b/dist/Networking/AzureOnPremisesDataGateway.puml
new file mode 100644
index 00000000..1bc7827f
--- /dev/null
+++ b/dist/Networking/AzureOnPremisesDataGateway.puml
@@ -0,0 +1,11 @@
+sprite $AzureOnPremisesDataGateway [70x70/16z] {
+xTS5ajj048NXPcld_lTTwgJao6-e7Kv-CtrYJPcMOb7xI8MfcfZVfIL8_9fk6smEaat4SRQm9jyJj3HPVEH3Gi_92J4cPepwVGQCCrrVanZ962E-XeoNQGF9
+122ZjG0GF3CodhG7Y6Up4YlfPDN6KdPLj8243nSeLhig4FdrIfGLhId6tJqkTjB2LWOvG93YAupuM77Y1MRXBCBJTQCJXMZE48sDO5fWLER8d76T8vcC65j4
+nimgCcO6YD1xd7i30mOh4CbD_MM-T66zO2IL2MCTH7CHJYKPmueC1c69KpdV0Zdt5OblbP2UecGzHUAgX7GK9kue6ezAYFG6DuMA1LB2k-TmGqeW1IVqsNEA
+KiPMLnB948ELyM5l9KNfajYkuZhu_tADtxDhga8xSMljXN3_bMA65TjJZa3A4PjAYmU5ZxQjjDkzaiY-aiofy4lRLgozTvnA8areBq_cgoAVY1AL64wbWcJH
+FW3zk9FsaH4LcGmWHSQfsWqYTIRecGw0L9aRFTi1a0epHzu
+}
+
+AzureEntityColoring(AzureOnPremisesDataGateway)
+!define AzureOnPremisesDataGateway(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureOnPremisesDataGateway, AzureOnPremisesDataGateway)
+!define AzureOnPremisesDataGateway(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureOnPremisesDataGateway, AzureOnPremisesDataGateway)
diff --git a/dist/Networking/AzureOnPremisesDataGateway.svg b/dist/Networking/AzureOnPremisesDataGateway.svg
new file mode 100644
index 00000000..ab28f5c5
--- /dev/null
+++ b/dist/Networking/AzureOnPremisesDataGateway.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 9.800781 39.199219 C 9.800781 33.460938 12.738281 28.980469 18.199219 26.179688 L 18.199219 25.058594 C 18.199219 17.078125 24.78125 10.640625 32.761719 10.640625 C 35.558594 10.640625 38.21875 11.339844 40.460938 12.738281 C 43.960938 7.839844 49.839844 4.761719 56.140625 4.761719 C 52.78125 1.820313 48.441406 0 43.539063 0 C 37.660156 0 32.199219 2.800781 28.839844 7.421875 C 26.738281 6.019531 24.21875 5.320313 21.558594 5.320313 C 14 5.320313 7.839844 11.480469 7.839844 18.898438 L 7.839844 20.019531 C 2.800781 22.679688 0 27.019531 0 32.339844 C 0 39.480469 4.898438 45.359375 11.761719 46.898438 C 10.5 44.660156 9.800781 42 9.800781 39.199219 Z M 9.800781 39.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 61.601563 19.878906 C 61.601563 19.320313 61.738281 18.621094 61.738281 18.058594 C 61.738281 8.121094 53.621094 0.140625 43.539063 0.140625 C 37.660156 0 32.199219 2.800781 28.839844 7.421875 C 26.738281 6.019531 24.21875 5.320313 21.558594 5.320313 C 14 5.320313 7.839844 11.480469 7.839844 18.898438 L 7.839844 20.019531 C 2.800781 22.679688 0 27.019531 0 32.339844 C 0 40.738281 6.859375 47.320313 15.679688 47.320313 L 54.320313 47.320313 C 63.140625 47.320313 70 40.738281 70 32.339844 C 70 26.738281 66.921875 22.261719 61.601563 19.878906 Z M 61.601563 19.878906 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 37.703125 61.941406 L 47.367188 52.773438 L 47.367188 57.75 L 35.707031 70 L 24.035156 57.792969 L 24.035156 52.832031 L 33.644531 61.941406 L 33.644531 45.703125 L 37.703125 45.703125 Z M 37.703125 61.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 33.695313 31.363281 L 24.035156 40.53125 L 24.035156 35.554688 L 35.695313 23.304688 L 47.367188 35.511719 L 47.367188 40.472656 L 37.753906 31.363281 L 37.753906 47.601563 L 33.695313 47.601563 Z M 33.695313 31.363281 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzurePrivateEndpoint(m).png b/dist/Networking/AzurePrivateEndpoint(m).png
new file mode 100644
index 00000000..cf2d39c3
Binary files /dev/null and b/dist/Networking/AzurePrivateEndpoint(m).png differ
diff --git a/dist/Networking/AzurePrivateEndpoint(m).svg b/dist/Networking/AzurePrivateEndpoint(m).svg
new file mode 100644
index 00000000..369c6b8f
--- /dev/null
+++ b/dist/Networking/AzurePrivateEndpoint(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 33.601563 9.941406 L 37.800781 9.941406 L 37.800781 47.460938 L 33.601563 47.460938 Z M 33.601563 9.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 43.261719 46.898438 C 43.261719 51.003906 39.804688 54.460938 35.699219 54.460938 C 31.597656 54.460938 28.140625 51.003906 28.140625 46.898438 C 28.140625 42.796875 31.597656 39.339844 35.699219 39.339844 C 39.804688 39.339844 43.261719 42.796875 43.261719 46.898438 Z M 43.261719 46.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 41.859375 9.101563 C 41.859375 12.445313 39.042969 15.261719 35.699219 15.261719 C 32.355469 15.261719 29.539063 12.445313 29.539063 9.101563 C 29.539063 5.753906 32.355469 2.941406 35.699219 2.941406 C 39.042969 2.941406 41.859375 5.753906 41.859375 9.101563 Z M 50.433594 65.792969 C 49.917969 65.800781 49.425781 65.597656 49.058594 65.238281 C 48.25 64.429688 48.25 63.117188 49.058594 62.308594 L 63.847656 47.515625 C 64.074219 47.292969 64.203125 46.988281 64.203125 46.667969 C 64.203125 46.347656 64.074219 46.042969 63.847656 45.816406 L 49.3125 31.542969 C 48.917969 31.214844 48.675781 30.734375 48.65625 30.21875 C 48.628906 29.644531 48.867188 29.058594 49.3125 28.609375 C 49.730469 28.171875 50.324219 27.949219 50.929688 28.003906 C 51.445313 28.003906 51.941406 28.222656 52.328125 28.609375 L 66.210938 42.105469 L 69.304688 45.199219 C 69.929688 45.980469 70.152344 47.28125 69.304688 48.128906 L 65.960938 51.472656 L 52.070313 65.238281 C 51.6875 65.601563 51.175781 65.804688 50.648438 65.800781 L 50.652344 65.800781 Z M 20.761719 65.792969 C 20.234375 65.800781 19.726563 65.601563 19.34375 65.238281 L 5.195313 51.605469 L 2.09375 48.109375 C 1.257813 47.277344 1.464844 46.011719 2.078125 45.238281 L 5.195313 42.113281 L 19.089844 28.605469 C 19.507813 28.171875 20.101563 27.949219 20.703125 28.003906 C 21.214844 28.003906 21.707031 28.222656 22.097656 28.609375 C 22.542969 29.054688 22.78125 29.640625 22.753906 30.21875 C 22.726563 30.746094 22.476563 31.234375 22.070313 31.570313 L 7.824219 45.816406 C 7.597656 46.039063 7.46875 46.347656 7.46875 46.667969 C 7.46875 46.984375 7.59375 47.292969 7.824219 47.515625 L 22.359375 62.308594 C 23.164063 63.117188 23.160156 64.421875 22.359375 65.234375 C 21.992188 65.597656 21.503906 65.796875 20.976563 65.800781 Z M 20.761719 65.792969 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzurePrivateEndpoint.png b/dist/Networking/AzurePrivateEndpoint.png
new file mode 100644
index 00000000..a404572e
Binary files /dev/null and b/dist/Networking/AzurePrivateEndpoint.png differ
diff --git a/dist/Networking/AzurePrivateEndpoint.puml b/dist/Networking/AzurePrivateEndpoint.puml
new file mode 100644
index 00000000..a0fef280
--- /dev/null
+++ b/dist/Networking/AzurePrivateEndpoint.puml
@@ -0,0 +1,10 @@
+sprite $AzurePrivateEndpoint [70x70/16z] {
+xTK7RiH0241HfW6-_u7J4xmQVMI9zEHlBtxk7lbxJNEtKJEQ-LDMGjozpYn_gx1IWHGMflkfBrPQPOqY3MN9UwoI51glI9TAtHuDRLAh7G-9V87oh_mh_yhG
+bIXDjLz0fhilLcmRLN08CbRSWyaH7wpCZI5aogRmNnW1XHdwdHMPm002Iife_9OfmQm48OKPHbXXXX7fcu8C8yiV5P_4w0Ma-V6IqHWUZCLH3SW5ncXrz3Wr
+aScHTfnpOOPNHsGUDtLarjkhxArRPV9P4mkrfvULRI_piepqsBFqi8qo96FiZ6YEIFDWS66y9KZEZ41wYkHCzsV4Me84Oy38MAgh2oF0G800Kq7uX69aYZ1J
+GqGK6KQOAI3CC98plO848rGB96tboeOmCo_yMgl9N-WU
+}
+
+AzureEntityColoring(AzurePrivateEndpoint)
+!define AzurePrivateEndpoint(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzurePrivateEndpoint, AzurePrivateEndpoint)
+!define AzurePrivateEndpoint(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzurePrivateEndpoint, AzurePrivateEndpoint)
diff --git a/dist/Networking/AzurePrivateEndpoint.svg b/dist/Networking/AzurePrivateEndpoint.svg
new file mode 100644
index 00000000..5bd48647
--- /dev/null
+++ b/dist/Networking/AzurePrivateEndpoint.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 33.601563 9.941406 L 37.800781 9.941406 L 37.800781 47.460938 L 33.601563 47.460938 Z M 33.601563 9.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.117647%,63.921569%,0%);fill-opacity:1;" d="M 43.261719 46.898438 C 43.261719 51.003906 39.804688 54.460938 35.699219 54.460938 C 31.597656 54.460938 28.140625 51.003906 28.140625 46.898438 C 28.140625 42.796875 31.597656 39.339844 35.699219 39.339844 C 39.804688 39.339844 43.261719 42.796875 43.261719 46.898438 Z M 43.261719 46.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 41.859375 9.101563 C 41.859375 12.445313 39.042969 15.261719 35.699219 15.261719 C 32.355469 15.261719 29.539063 12.445313 29.539063 9.101563 C 29.539063 5.753906 32.355469 2.941406 35.699219 2.941406 C 39.042969 2.941406 41.859375 5.753906 41.859375 9.101563 Z M 50.433594 65.792969 C 49.917969 65.800781 49.425781 65.597656 49.058594 65.238281 C 48.25 64.429688 48.25 63.117188 49.058594 62.308594 L 63.847656 47.515625 C 64.074219 47.292969 64.203125 46.988281 64.203125 46.667969 C 64.203125 46.347656 64.074219 46.042969 63.847656 45.816406 L 49.3125 31.542969 C 48.917969 31.214844 48.675781 30.734375 48.65625 30.21875 C 48.628906 29.644531 48.867188 29.058594 49.3125 28.609375 C 49.730469 28.171875 50.324219 27.949219 50.929688 28.003906 C 51.445313 28.003906 51.941406 28.222656 52.328125 28.609375 L 66.210938 42.105469 L 69.304688 45.199219 C 69.929688 45.980469 70.152344 47.28125 69.304688 48.128906 L 65.960938 51.472656 L 52.070313 65.238281 C 51.6875 65.601563 51.175781 65.804688 50.648438 65.800781 L 50.652344 65.800781 Z M 20.761719 65.792969 C 20.234375 65.800781 19.726563 65.601563 19.34375 65.238281 L 5.195313 51.605469 L 2.09375 48.109375 C 1.257813 47.277344 1.464844 46.011719 2.078125 45.238281 L 5.195313 42.113281 L 19.089844 28.605469 C 19.507813 28.171875 20.101563 27.949219 20.703125 28.003906 C 21.214844 28.003906 21.707031 28.222656 22.097656 28.609375 C 22.542969 29.054688 22.78125 29.640625 22.753906 30.21875 C 22.726563 30.746094 22.476563 31.234375 22.070313 31.570313 L 7.824219 45.816406 C 7.597656 46.039063 7.46875 46.347656 7.46875 46.667969 C 7.46875 46.984375 7.59375 47.292969 7.824219 47.515625 L 22.359375 62.308594 C 23.164063 63.117188 23.160156 64.421875 22.359375 65.234375 C 21.992188 65.597656 21.503906 65.796875 20.976563 65.800781 Z M 20.761719 65.792969 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzurePrivateLink(m).png b/dist/Networking/AzurePrivateLink(m).png
new file mode 100644
index 00000000..822a2961
Binary files /dev/null and b/dist/Networking/AzurePrivateLink(m).png differ
diff --git a/dist/Networking/AzurePrivateLink(m).svg b/dist/Networking/AzurePrivateLink(m).svg
new file mode 100644
index 00000000..26655129
--- /dev/null
+++ b/dist/Networking/AzurePrivateLink(m).svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="21.5" y1="25" x2="21.5" y2="37" gradientTransform="matrix(1.4,0,0,1.4,0,0)">
+<stop offset="0.23" style="stop-color:rgb(41,164,255);stop-opacity:1;"/>
+<stop offset="0.32" style="stop-color:rgb(39,163,255);stop-opacity:1;"/>
+<stop offset="0.48" style="stop-color:rgb(25,157,255);stop-opacity:1;"/>
+<stop offset="0.57" style="stop-color:rgb(5,148,255);stop-opacity:1;"/>
+<stop offset="0.75" style="stop-color:rgb(0,133,232);stop-opacity:1;"/>
+<stop offset="0.93" style="stop-color:rgb(0,119,208);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="27.5" y1="30" x2="27.5" y2="42" gradientTransform="matrix(1.4,0,0,1.4,0,0)">
+<stop offset="0.02" style="stop-color:rgb(41,164,255);stop-opacity:1;"/>
+<stop offset="0.14" style="stop-color:rgb(39,163,255);stop-opacity:1;"/>
+<stop offset="0.23" style="stop-color:rgb(39,163,255);stop-opacity:1;"/>
+<stop offset="0.34" style="stop-color:rgb(25,157,255);stop-opacity:1;"/>
+<stop offset="0.44" style="stop-color:rgb(5,148,255);stop-opacity:1;"/>
+<stop offset="0.63" style="stop-color:rgb(0,133,232);stop-opacity:1;"/>
+<stop offset="0.93" style="stop-color:rgb(0,119,208);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 32.199219 9.941406 L 36.398438 9.941406 L 36.398438 36.398438 L 32.199219 36.398438 Z M 32.199219 9.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,132,230);fill-opacity:1;" d="M 40.460938 9.101563 C 41.855469 6.683594 44.695313 5.507813 47.390625 6.230469 C 50.082031 6.953125 51.953125 9.390625 51.953125 12.179688 C 51.953125 14.96875 50.082031 17.410156 47.390625 18.128906 C 44.695313 18.851563 41.855469 17.675781 40.460938 15.261719 Z M 40.460938 9.101563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 33.460938 35 L 26.738281 35 C 29.21875 30.390625 34.960938 28.664063 39.570313 31.144531 C 44.179688 33.621094 45.90625 39.367188 43.429688 43.972656 L 55.453125 43.972656 C 57.199219 45.394531 57.859375 47.761719 57.105469 49.882813 C 56.351563 52.003906 54.34375 53.417969 52.09375 53.417969 C 49.84375 53.417969 47.835938 52.003906 47.082031 49.882813 C 46.328125 47.761719 46.988281 45.394531 48.734375 43.972656 L 46.886719 43.972656 C 48.144531 44.84375 48.796875 46.355469 48.566406 47.867188 L 50.539063 47.867188 C 49.882813 47.945313 49.222656 47.945313 48.566406 47.867188 Z M 33.460938 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 43.160156 42.113281 C 42.746094 37.988281 44.964844 34.050781 48.710938 32.273438 C 52.453125 30.496094 56.910156 31.265625 59.84375 34.195313 C 62.773438 37.125 63.542969 41.582031 61.765625 45.328125 C 59.988281 49.070313 56.050781 51.292969 51.925781 50.875 L 57.230469 50.875 L 50.511719 50.875 C 48.765625 49.453125 48.105469 47.089844 48.859375 44.96875 C 49.613281 42.847656 51.621094 41.429688 53.871094 41.429688 C 56.121094 41.429688 58.128906 42.847656 58.882813 44.96875 C 59.636719 47.089844 58.976563 49.453125 57.230469 50.875 L 59.078125 50.875 C 59.058594 49.269531 60.011719 47.808594 61.492188 47.183594 C 62.972656 46.558594 64.683594 46.890625 65.820313 48.027344 C 66.957031 49.164063 67.289063 50.875 66.664063 52.355469 C 66.039063 53.835938 64.578125 54.789063 62.972656 54.769531 L 35.140625 54.769531 C 35.140625 47.082031 41.371094 40.851563 49.054688 40.851563 C 56.742188 40.851563 62.972656 47.082031 62.972656 54.769531 L 69.691406 54.769531 C 73.335938 56.359375 75.367188 60.289063 74.554688 64.183594 C 73.742188 68.078125 70.308594 70.867188 66.332031 70.867188 C 62.355469 70.867188 58.921875 68.078125 58.109375 64.183594 C 57.296875 60.289063 59.328125 56.359375 62.972656 54.769531 Z M 43.160156 42.113281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 22.203125 62.328125 L 20.664063 63.882813 C 3.023438 63.882813 -11.277344 49.582031 -11.277344 31.941406 C -11.277344 14.300781 3.023438 0 20.664063 0 L 1.945313 46.691406 C -10.945313 41.519531 -17.207031 26.878906 -12.039063 13.984375 C -6.871094 1.09375 7.769531 -5.167969 20.664063 0 L 22.21875 -1.539063 L 40.921875 17.136719 C 36.191406 22.730469 27.820313 23.429688 22.226563 18.695313 C 16.632813 13.964844 15.933594 5.59375 20.664063 0 Z M 22.203125 62.328125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,132,230);fill-opacity:1;" d="M 20.34375 26.769531 L 22.0625 28.488281 C 14.195313 34.582031 2.878906 33.144531 -3.214844 25.277344 C -9.304688 17.410156 -7.867188 6.09375 0 0 L 3.667969 48.425781 L 1.945313 46.71875 C -10.953125 47.253906 -21.847656 37.234375 -22.386719 24.332031 C -22.921875 11.429688 -12.902344 0.539063 0 0 L 16.910156 -16.96875 C 12.226563 -21.636719 4.640625 -21.625 -0.0273438 -16.941406 C -4.699219 -12.253906 -4.6875 -4.671875 0 0 Z M 20.34375 26.769531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(119,197,255);fill-opacity:1;" d="M 47.78125 63.546875 C 30.234375 76.742188 5.3125 73.210938 -7.882813 55.664063 C -21.078125 38.117188 -17.546875 13.195313 0 0 L 66.5 43.398438 L 68.054688 44.953125 C 55.640625 63.746094 30.34375 68.917969 11.550781 56.503906 C -7.242188 44.089844 -12.414063 18.792969 0 0 L 50.804688 65.101563 C 32.828125 65.101563 18.257813 50.527344 18.257813 32.550781 C 18.257813 14.574219 32.828125 0 50.804688 0 L 49.265625 -1.554688 Z M 47.78125 63.546875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,132,230);fill-opacity:1;" d="M 51.128906 28 L 68.054688 44.96875 C 55.636719 63.761719 30.335938 68.929688 11.542969 56.511719 C -7.25 44.09375 -12.417969 18.792969 0 0 L -1.722656 1.722656 L -20.132813 -16.730469 C -15.511719 -22.289063 -7.261719 -23.050781 -1.699219 -18.429688 C 3.859375 -13.8125 4.621094 -5.558594 0 0 L 49.644531 28 C 57.375 14.292969 52.53125 -3.089844 38.820313 -10.820313 C 25.113281 -18.554688 7.730469 -13.707031 0 0 Z M 51.128906 28 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzurePrivateLink.png b/dist/Networking/AzurePrivateLink.png
new file mode 100644
index 00000000..077e3d8a
Binary files /dev/null and b/dist/Networking/AzurePrivateLink.png differ
diff --git a/dist/Networking/AzurePrivateLink.puml b/dist/Networking/AzurePrivateLink.puml
new file mode 100644
index 00000000..0fa62287
--- /dev/null
+++ b/dist/Networking/AzurePrivateLink.puml
@@ -0,0 +1,11 @@
+sprite $AzurePrivateLink [70x70/16z] {
+fTU74SCW44HHmd71_VVhlCv6X_ONy0OHHx5SAz_5Siefg58A6lyLZtG-6OixCRyHwywOpqkIiPcI7yvCoJjjekITFbEGRJcIKS8tdB6fmE4KPCOgS5W53ZEx
+yscUhtJUQNa5cQPFmDBq-9g2N2rzCymTdqnkYMpsTAZR6ywWb71LhFDk1TDi_AiMreHJa4uKYWc28PMmIYd8jJCASjDAAM2iSGgOIYbW1gU0gL2ONA1GEHGk
+_L889jWC2fT1eHaFlbP6q8rIH2FuFIDYmTMlYdWmkLyKad7tTbF6FWP_3XU5Olp--Cijsuy8533B1guOGRhdJSAU5RGoEVWGYnS5wUBZQ0SaQ6Ls_FemZWE2
+WeQbZ6lnKu7ZCSlmG0i8AEa1kTQ2TA80qY_9JKMa5sIR2YYrQwfZoBtsQonLLiCtZHUbb2RfMgcrGcblIgbTKlLQtl9N9Ul0AAY_Ad3ouq3ZHK5jDX-_4spV
+4m
+}
+
+AzureEntityColoring(AzurePrivateLink)
+!define AzurePrivateLink(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzurePrivateLink, AzurePrivateLink)
+!define AzurePrivateLink(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzurePrivateLink, AzurePrivateLink)
diff --git a/dist/Networking/AzurePrivateLink.svg b/dist/Networking/AzurePrivateLink.svg
new file mode 100644
index 00000000..7c52ce94
--- /dev/null
+++ b/dist/Networking/AzurePrivateLink.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="21.5" y1="25" x2="21.5" y2="37" gradientTransform="matrix(1.4,0,0,1.4,0,0)">
+<stop offset="0.23" style="stop-color:rgb(36.862745%,62.745098%,93.72549%);stop-opacity:1;"/>
+<stop offset="0.32" style="stop-color:rgb(35.686275%,62.352941%,93.333333%);stop-opacity:1;"/>
+<stop offset="0.48" style="stop-color:rgb(31.372549%,60.392157%,92.156863%);stop-opacity:1;"/>
+<stop offset="0.57" style="stop-color:rgb(24.705882%,57.254902%,90.196078%);stop-opacity:1;"/>
+<stop offset="0.75" style="stop-color:rgb(14.901961%,53.333333%,87.45098%);stop-opacity:1;"/>
+<stop offset="0.93" style="stop-color:rgb(7.058824%,49.803922%,85.098039%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="27.5" y1="30" x2="27.5" y2="42" gradientTransform="matrix(1.4,0,0,1.4,0,0)">
+<stop offset="0.02" style="stop-color:rgb(36.862745%,62.745098%,93.72549%);stop-opacity:1;"/>
+<stop offset="0.14" style="stop-color:rgb(35.686275%,62.352941%,93.333333%);stop-opacity:1;"/>
+<stop offset="0.23" style="stop-color:rgb(35.686275%,62.352941%,93.333333%);stop-opacity:1;"/>
+<stop offset="0.34" style="stop-color:rgb(31.372549%,60.392157%,92.156863%);stop-opacity:1;"/>
+<stop offset="0.44" style="stop-color:rgb(24.705882%,57.254902%,90.196078%);stop-opacity:1;"/>
+<stop offset="0.63" style="stop-color:rgb(14.901961%,53.333333%,87.45098%);stop-opacity:1;"/>
+<stop offset="0.93" style="stop-color:rgb(7.058824%,49.803922%,85.098039%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 32.199219 9.941406 L 36.398438 9.941406 L 36.398438 36.398438 L 32.199219 36.398438 Z M 32.199219 9.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(7.843137%,56.470588%,87.45098%);fill-opacity:1;" d="M 40.460938 9.101563 C 41.855469 6.683594 44.695313 5.507813 47.390625 6.230469 C 50.082031 6.953125 51.953125 9.390625 51.953125 12.179688 C 51.953125 14.96875 50.082031 17.410156 47.390625 18.128906 C 44.695313 18.851563 41.855469 17.675781 40.460938 15.261719 Z M 40.460938 9.101563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 33.460938 35 L 26.738281 35 C 29.21875 30.390625 34.960938 28.664063 39.570313 31.144531 C 44.179688 33.621094 45.90625 39.367188 43.429688 43.972656 L 55.453125 43.972656 C 57.199219 45.394531 57.859375 47.761719 57.105469 49.882813 C 56.351563 52.003906 54.34375 53.417969 52.09375 53.417969 C 49.84375 53.417969 47.835938 52.003906 47.082031 49.882813 C 46.328125 47.761719 46.988281 45.394531 48.734375 43.972656 L 46.886719 43.972656 C 48.144531 44.84375 48.796875 46.355469 48.566406 47.867188 L 50.539063 47.867188 C 49.882813 47.945313 49.222656 47.945313 48.566406 47.867188 Z M 33.460938 35 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 43.160156 42.113281 C 42.746094 37.988281 44.964844 34.050781 48.710938 32.273438 C 52.453125 30.496094 56.910156 31.265625 59.84375 34.195313 C 62.773438 37.125 63.542969 41.582031 61.765625 45.328125 C 59.988281 49.070313 56.050781 51.292969 51.925781 50.875 L 57.230469 50.875 L 50.511719 50.875 C 48.765625 49.453125 48.105469 47.089844 48.859375 44.96875 C 49.613281 42.847656 51.621094 41.429688 53.871094 41.429688 C 56.121094 41.429688 58.128906 42.847656 58.882813 44.96875 C 59.636719 47.089844 58.976563 49.453125 57.230469 50.875 L 59.078125 50.875 C 59.058594 49.269531 60.011719 47.808594 61.492188 47.183594 C 62.972656 46.558594 64.683594 46.890625 65.820313 48.027344 C 66.957031 49.164063 67.289063 50.875 66.664063 52.355469 C 66.039063 53.835938 64.578125 54.789063 62.972656 54.769531 L 35.140625 54.769531 C 35.140625 47.082031 41.371094 40.851563 49.054688 40.851563 C 56.742188 40.851563 62.972656 47.082031 62.972656 54.769531 L 69.691406 54.769531 C 73.335938 56.359375 75.367188 60.289063 74.554688 64.183594 C 73.742188 68.078125 70.308594 70.867188 66.332031 70.867188 C 62.355469 70.867188 58.921875 68.078125 58.109375 64.183594 C 57.296875 60.289063 59.328125 56.359375 62.972656 54.769531 Z M 43.160156 42.113281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 22.203125 62.328125 L 20.664063 63.882813 C 3.023438 63.882813 -11.277344 49.582031 -11.277344 31.941406 C -11.277344 14.300781 3.023438 0 20.664063 0 L 1.945313 46.691406 C -10.945313 41.519531 -17.207031 26.878906 -12.039063 13.984375 C -6.871094 1.09375 7.769531 -5.167969 20.664063 0 L 22.21875 -1.539063 L 40.921875 17.136719 C 36.191406 22.730469 27.820313 23.429688 22.226563 18.695313 C 16.632813 13.964844 15.933594 5.59375 20.664063 0 Z M 22.203125 62.328125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(7.843137%,56.470588%,87.45098%);fill-opacity:1;" d="M 20.34375 26.769531 L 22.0625 28.488281 C 14.195313 34.582031 2.878906 33.144531 -3.214844 25.277344 C -9.304688 17.410156 -7.867188 6.09375 0 0 L 3.667969 48.425781 L 1.945313 46.71875 C -10.953125 47.253906 -21.847656 37.234375 -22.386719 24.332031 C -22.921875 11.429688 -12.902344 0.539063 0 0 L 16.910156 -16.96875 C 12.226563 -21.636719 4.640625 -21.625 -0.0273438 -16.941406 C -4.699219 -12.253906 -4.6875 -4.671875 0 0 Z M 20.34375 26.769531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(31.372549%,90.196078%,100%);fill-opacity:1;" d="M 47.78125 63.546875 C 30.234375 76.742188 5.3125 73.210938 -7.882813 55.664063 C -21.078125 38.117188 -17.546875 13.195313 0 0 L 66.5 43.398438 L 68.054688 44.953125 C 55.640625 63.746094 30.34375 68.917969 11.550781 56.503906 C -7.242188 44.089844 -12.414063 18.792969 0 0 L 50.804688 65.101563 C 32.828125 65.101563 18.257813 50.527344 18.257813 32.550781 C 18.257813 14.574219 32.828125 0 50.804688 0 L 49.265625 -1.554688 Z M 47.78125 63.546875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(7.843137%,56.470588%,87.45098%);fill-opacity:1;" d="M 51.128906 28 L 68.054688 44.96875 C 55.636719 63.761719 30.335938 68.929688 11.542969 56.511719 C -7.25 44.09375 -12.417969 18.792969 0 0 L -1.722656 1.722656 L -20.132813 -16.730469 C -15.511719 -22.289063 -7.261719 -23.050781 -1.699219 -18.429688 C 3.859375 -13.8125 4.621094 -5.558594 0 0 L 49.644531 28 C 57.375 14.292969 52.53125 -3.089844 38.820313 -10.820313 C 25.113281 -18.554688 7.730469 -13.707031 0 0 Z M 51.128906 28 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzurePublicIPAddress(m).png b/dist/Networking/AzurePublicIPAddress(m).png
new file mode 100644
index 00000000..dc86dd0a
Binary files /dev/null and b/dist/Networking/AzurePublicIPAddress(m).png differ
diff --git a/dist/Networking/AzurePublicIPAddress(m).svg b/dist/Networking/AzurePublicIPAddress(m).svg
new file mode 100644
index 00000000..6bbb23bc
--- /dev/null
+++ b/dist/Networking/AzurePublicIPAddress(m).svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 2.820313 5.601563 C 1.269531 5.601563 0.0117188 6.855469 0.0117188 8.410156 L 0.0117188 62.476563 C 0.0117188 64.027344 1.269531 65.289063 2.820313 65.289063 L 5.882813 65.289063 L 61.066406 5.601563 Z M 2.820313 5.601563 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 0 62.476563 C 0 64.027344 1.257813 65.289063 2.808594 65.289063 L 67.191406 65.289063 C 68.742188 65.289063 70 64.027344 70 62.476563 L 70 18.617188 L 0 18.617188 Z M 0 62.476563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 67.191406 5.601563 L 2.808594 5.601563 C 1.257813 5.601563 0 6.855469 0 8.410156 L 0 23.289063 L 70 23.289063 L 70 8.410156 C 70 6.855469 68.742188 5.601563 67.191406 5.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 18 12.289063 L 65.140625 12.289063 L 65.140625 17.808594 L 18 17.808594 Z M 18 12.289063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 15.835938 14.957031 C 15.835938 18.726563 12.777344 21.785156 9.003906 21.785156 C 5.234375 21.785156 2.175781 18.726563 2.175781 14.957031 C 2.175781 11.183594 5.234375 8.125 9.003906 8.125 C 12.773438 8.125 15.835938 11.183594 15.835938 14.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.28125 15.726563 L 11.378906 18.996094 L 9.699219 18.996094 L 5.554688 15.050781 L 9.683594 11.105469 L 11.359375 11.105469 L 8.28125 14.355469 L 15.832031 14.355469 L 15.832031 15.726563 Z M 8.28125 15.726563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 24.394531 50.507813 C 24.394531 51.304688 24.113281 51.957031 23.542969 52.464844 C 22.976563 52.972656 22.226563 53.230469 21.296875 53.230469 C 20.464844 53.230469 19.757813 52.96875 19.179688 52.449219 C 18.601563 51.929688 18.3125 51.28125 18.3125 50.503906 C 18.3125 49.71875 18.601563 49.074219 19.179688 48.570313 C 19.757813 48.066406 20.492188 47.8125 21.378906 47.8125 C 22.230469 47.8125 22.949219 48.070313 23.527344 48.585938 C 24.105469 49.097656 24.394531 49.742188 24.394531 50.507813 Z M 24.394531 50.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.863281 50.507813 C 36.863281 51.304688 36.578125 51.957031 36.007813 52.464844 C 35.441406 52.972656 34.691406 53.230469 33.761719 53.230469 C 32.929688 53.230469 32.226563 52.96875 31.644531 52.449219 C 31.066406 51.929688 30.777344 51.28125 30.777344 50.503906 C 30.777344 49.71875 31.066406 49.074219 31.644531 48.570313 C 32.226563 48.066406 32.957031 47.8125 33.84375 47.8125 C 34.695313 47.8125 35.414063 48.070313 35.992188 48.585938 C 36.570313 49.097656 36.863281 49.742188 36.863281 50.507813 Z M 36.863281 50.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 49.328125 50.507813 C 49.328125 51.304688 49.042969 51.957031 48.472656 52.464844 C 47.90625 52.972656 47.15625 53.230469 46.226563 53.230469 C 45.394531 53.230469 44.6875 52.96875 44.109375 52.449219 C 43.53125 51.929688 43.242188 51.28125 43.242188 50.503906 C 43.242188 49.71875 43.53125 49.074219 44.109375 48.570313 C 44.6875 48.066406 45.421875 47.8125 46.308594 47.8125 C 47.160156 47.8125 47.878906 48.070313 48.457031 48.585938 C 49.035156 49.097656 49.328125 49.742188 49.328125 50.507813 Z M 49.328125 50.507813 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzurePublicIPAddress.png b/dist/Networking/AzurePublicIPAddress.png
new file mode 100644
index 00000000..5fb20060
Binary files /dev/null and b/dist/Networking/AzurePublicIPAddress.png differ
diff --git a/dist/Networking/AzurePublicIPAddress.puml b/dist/Networking/AzurePublicIPAddress.puml
new file mode 100644
index 00000000..4c91498a
--- /dev/null
+++ b/dist/Networking/AzurePublicIPAddress.puml
@@ -0,0 +1,9 @@
+sprite $AzurePublicIPAddress [70x70/16z] {
+xTP9TiGW34LH2T3R_uxJcMEbvrZyz7aJstpgZii-jF-yxURc8-enwme4ye0wmfFlAiBJxoB2-TqTe8IaqYpcPtDVryu6G29CrQxLKsdc_MX3kV-b7sqeuCPH
+LPcCCp-zgYGJw-1bUHvrX5ms478aoWXnAHGA2WM5Wa91eQ1GK2We51GA2eNlew1GK2We51GA2WM5Wa91eQ1GK2We5BwFmhOotFnakdjd5ZaibM7tpTlj_htD
+gpcibPP_Ri0Uug6UmrevBe-NohYYu6Rc78qKoM6j0AEFt7iFPZci54f942G84WG9ebUe9q6G80m5GbCWOTx7RjrUxxzR
+}
+
+AzureEntityColoring(AzurePublicIPAddress)
+!define AzurePublicIPAddress(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzurePublicIPAddress, AzurePublicIPAddress)
+!define AzurePublicIPAddress(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzurePublicIPAddress, AzurePublicIPAddress)
diff --git a/dist/Networking/AzurePublicIPAddress.svg b/dist/Networking/AzurePublicIPAddress.svg
new file mode 100644
index 00000000..6caceaad
--- /dev/null
+++ b/dist/Networking/AzurePublicIPAddress.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 2.820313 5.601563 C 1.269531 5.601563 0.0117188 6.855469 0.0117188 8.410156 L 0.0117188 62.476563 C 0.0117188 64.027344 1.269531 65.289063 2.820313 65.289063 L 5.882813 65.289063 L 61.066406 5.601563 Z M 2.820313 5.601563 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 0 62.476563 C 0 64.027344 1.257813 65.289063 2.808594 65.289063 L 67.191406 65.289063 C 68.742188 65.289063 70 64.027344 70 62.476563 L 70 18.617188 L 0 18.617188 Z M 0 62.476563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 67.191406 5.601563 L 2.808594 5.601563 C 1.257813 5.601563 0 6.855469 0 8.410156 L 0 23.289063 L 70 23.289063 L 70 8.410156 C 70 6.855469 68.742188 5.601563 67.191406 5.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18 12.289063 L 65.140625 12.289063 L 65.140625 17.808594 L 18 17.808594 Z M 18 12.289063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 15.835938 14.957031 C 15.835938 18.726563 12.777344 21.785156 9.003906 21.785156 C 5.234375 21.785156 2.175781 18.726563 2.175781 14.957031 C 2.175781 11.183594 5.234375 8.125 9.003906 8.125 C 12.773438 8.125 15.835938 11.183594 15.835938 14.957031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.28125 15.726563 L 11.378906 18.996094 L 9.699219 18.996094 L 5.554688 15.050781 L 9.683594 11.105469 L 11.359375 11.105469 L 8.28125 14.355469 L 15.832031 14.355469 L 15.832031 15.726563 Z M 8.28125 15.726563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 24.394531 50.507813 C 24.394531 51.304688 24.113281 51.957031 23.542969 52.464844 C 22.976563 52.972656 22.226563 53.230469 21.296875 53.230469 C 20.464844 53.230469 19.757813 52.96875 19.179688 52.449219 C 18.601563 51.929688 18.3125 51.28125 18.3125 50.503906 C 18.3125 49.71875 18.601563 49.074219 19.179688 48.570313 C 19.757813 48.066406 20.492188 47.8125 21.378906 47.8125 C 22.230469 47.8125 22.949219 48.070313 23.527344 48.585938 C 24.105469 49.097656 24.394531 49.742188 24.394531 50.507813 Z M 24.394531 50.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.863281 50.507813 C 36.863281 51.304688 36.578125 51.957031 36.007813 52.464844 C 35.441406 52.972656 34.691406 53.230469 33.761719 53.230469 C 32.929688 53.230469 32.226563 52.96875 31.644531 52.449219 C 31.066406 51.929688 30.777344 51.28125 30.777344 50.503906 C 30.777344 49.71875 31.066406 49.074219 31.644531 48.570313 C 32.226563 48.066406 32.957031 47.8125 33.84375 47.8125 C 34.695313 47.8125 35.414063 48.070313 35.992188 48.585938 C 36.570313 49.097656 36.863281 49.742188 36.863281 50.507813 Z M 36.863281 50.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.328125 50.507813 C 49.328125 51.304688 49.042969 51.957031 48.472656 52.464844 C 47.90625 52.972656 47.15625 53.230469 46.226563 53.230469 C 45.394531 53.230469 44.6875 52.96875 44.109375 52.449219 C 43.53125 51.929688 43.242188 51.28125 43.242188 50.503906 C 43.242188 49.71875 43.53125 49.074219 44.109375 48.570313 C 44.6875 48.066406 45.421875 47.8125 46.308594 47.8125 C 47.160156 47.8125 47.878906 48.070313 48.457031 48.585938 C 49.035156 49.097656 49.328125 49.742188 49.328125 50.507813 Z M 49.328125 50.507813 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureReservedIPAddressClassic(m).png b/dist/Networking/AzureReservedIPAddressClassic(m).png
new file mode 100644
index 00000000..24894934
Binary files /dev/null and b/dist/Networking/AzureReservedIPAddressClassic(m).png differ
diff --git a/dist/Networking/AzureReservedIPAddressClassic(m).svg b/dist/Networking/AzureReservedIPAddressClassic(m).svg
new file mode 100644
index 00000000..365ad662
--- /dev/null
+++ b/dist/Networking/AzureReservedIPAddressClassic(m).svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 0.699219 63.140625 C 0.699219 64.679688 1.960938 65.941406 3.5 65.941406 L 67.898438 65.941406 C 69.441406 65.941406 70.699219 64.679688 70.699219 63.140625 L 70.699219 19.320313 L 0.699219 19.320313 Z M 0.699219 63.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 67.898438 6.300781 L 3.5 6.300781 C 1.960938 6.300781 0.699219 7.558594 0.699219 9.101563 L 0.699219 23.941406 L 70.699219 23.941406 L 70.699219 9.101563 C 70.699219 7.558594 69.441406 6.300781 67.898438 6.300781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 18.761719 13.019531 L 65.941406 13.019531 L 65.941406 18.480469 L 18.761719 18.480469 Z M 18.761719 13.019531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 16.519531 15.679688 C 16.519531 19.460938 13.441406 22.539063 9.660156 22.539063 C 5.878906 22.539063 2.800781 19.460938 2.800781 15.679688 C 2.800781 11.898438 5.878906 8.820313 9.660156 8.820313 C 13.441406 8.820313 16.519531 11.898438 16.519531 15.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.960938 16.378906 L 12.039063 19.738281 L 10.359375 19.738281 L 6.300781 15.820313 L 10.359375 11.761719 L 12.039063 11.761719 L 8.960938 15.121094 L 16.519531 15.121094 L 16.519531 16.378906 Z M 8.960938 16.378906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 25.058594 51.238281 C 25.058594 52.078125 24.78125 52.640625 24.21875 53.199219 C 23.660156 53.761719 22.960938 53.898438 21.980469 53.898438 C 21.140625 53.898438 20.441406 53.621094 19.878906 53.058594 C 19.320313 52.5 19.039063 51.941406 19.039063 51.101563 C 19.039063 50.261719 19.320313 49.699219 19.878906 49.140625 C 20.441406 48.578125 21.140625 48.441406 22.121094 48.441406 C 22.960938 48.441406 23.660156 48.71875 24.21875 49.28125 C 24.78125 49.839844 25.058594 50.398438 25.058594 51.238281 Z M 25.058594 51.238281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 37.519531 51.238281 C 37.519531 52.078125 37.238281 52.640625 36.679688 53.199219 C 36.121094 53.761719 35.421875 53.898438 34.441406 53.898438 C 33.601563 53.898438 32.898438 53.621094 32.339844 53.058594 C 31.78125 52.5 31.5 51.941406 31.5 51.101563 C 31.5 50.261719 31.78125 49.699219 32.339844 49.140625 C 32.898438 48.578125 33.601563 48.441406 34.578125 48.441406 C 35.421875 48.441406 36.121094 48.71875 36.679688 49.28125 C 37.238281 49.839844 37.519531 50.398438 37.519531 51.238281 Z M 37.519531 51.238281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 49.980469 51.238281 C 49.980469 52.078125 49.699219 52.640625 49.140625 53.199219 C 48.578125 53.761719 47.878906 53.898438 46.898438 53.898438 C 46.058594 53.898438 45.359375 53.621094 44.800781 53.058594 C 44.238281 52.5 43.960938 51.941406 43.960938 51.101563 C 43.960938 50.261719 44.238281 49.699219 44.800781 49.140625 C 45.359375 48.578125 46.058594 48.441406 47.039063 48.441406 C 47.878906 48.441406 48.578125 48.71875 49.140625 49.28125 C 49.699219 49.839844 49.980469 50.398438 49.980469 51.238281 Z M 49.980469 51.238281 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureReservedIPAddressClassic.png b/dist/Networking/AzureReservedIPAddressClassic.png
new file mode 100644
index 00000000..7b792a45
Binary files /dev/null and b/dist/Networking/AzureReservedIPAddressClassic.png differ
diff --git a/dist/Networking/AzureReservedIPAddressClassic.puml b/dist/Networking/AzureReservedIPAddressClassic.puml
new file mode 100644
index 00000000..cea1f68f
--- /dev/null
+++ b/dist/Networking/AzureReservedIPAddressClassic.puml
@@ -0,0 +1,9 @@
+sprite $AzureReservedIPAddressClassic [70x70/16z] {
+xT87ZiGW38LX88oVxNV_-wu8MnZLnB2TNsMAfK-qz0lQLSmcHm8NbDbpTyOxs3A82DHd55VfmUFAA_9uD2QicBHgEjfgmWewKgJbj7mld8gFY1WjtUj3UQIK
+UtLEASUPH1LqPcv7L6db_FfYlDvBILRIqPboBYLIKsZobZAklAq6ohZICbKrvumoNy6AYgneAqzjPIjRsSfM08pVdmPN5JZfa9uwQUD0Bof6aYvdO4l70Quf
+pXO6nGQ52Ap5XxNedRN0XkthU4Xz4BaZ2TnHeF-aR2NBYj8QfInHKYgpvVJtUW4
+}
+
+AzureEntityColoring(AzureReservedIPAddressClassic)
+!define AzureReservedIPAddressClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureReservedIPAddressClassic, AzureReservedIPAddressClassic)
+!define AzureReservedIPAddressClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureReservedIPAddressClassic, AzureReservedIPAddressClassic)
diff --git a/dist/Networking/AzureReservedIPAddressClassic.svg b/dist/Networking/AzureReservedIPAddressClassic.svg
new file mode 100644
index 00000000..c1d2fe91
--- /dev/null
+++ b/dist/Networking/AzureReservedIPAddressClassic.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 0.699219 63.140625 C 0.699219 64.679688 1.960938 65.941406 3.5 65.941406 L 67.898438 65.941406 C 69.441406 65.941406 70.699219 64.679688 70.699219 63.140625 L 70.699219 19.320313 L 0.699219 19.320313 Z M 0.699219 63.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 67.898438 6.300781 L 3.5 6.300781 C 1.960938 6.300781 0.699219 7.558594 0.699219 9.101563 L 0.699219 23.941406 L 70.699219 23.941406 L 70.699219 9.101563 C 70.699219 7.558594 69.441406 6.300781 67.898438 6.300781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18.761719 13.019531 L 65.941406 13.019531 L 65.941406 18.480469 L 18.761719 18.480469 Z M 18.761719 13.019531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 16.519531 15.679688 C 16.519531 19.460938 13.441406 22.539063 9.660156 22.539063 C 5.878906 22.539063 2.800781 19.460938 2.800781 15.679688 C 2.800781 11.898438 5.878906 8.820313 9.660156 8.820313 C 13.441406 8.820313 16.519531 11.898438 16.519531 15.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.960938 16.378906 L 12.039063 19.738281 L 10.359375 19.738281 L 6.300781 15.820313 L 10.359375 11.761719 L 12.039063 11.761719 L 8.960938 15.121094 L 16.519531 15.121094 L 16.519531 16.378906 Z M 8.960938 16.378906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 25.058594 51.238281 C 25.058594 52.078125 24.78125 52.640625 24.21875 53.199219 C 23.660156 53.761719 22.960938 53.898438 21.980469 53.898438 C 21.140625 53.898438 20.441406 53.621094 19.878906 53.058594 C 19.320313 52.5 19.039063 51.941406 19.039063 51.101563 C 19.039063 50.261719 19.320313 49.699219 19.878906 49.140625 C 20.441406 48.578125 21.140625 48.441406 22.121094 48.441406 C 22.960938 48.441406 23.660156 48.71875 24.21875 49.28125 C 24.78125 49.839844 25.058594 50.398438 25.058594 51.238281 Z M 25.058594 51.238281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 37.519531 51.238281 C 37.519531 52.078125 37.238281 52.640625 36.679688 53.199219 C 36.121094 53.761719 35.421875 53.898438 34.441406 53.898438 C 33.601563 53.898438 32.898438 53.621094 32.339844 53.058594 C 31.78125 52.5 31.5 51.941406 31.5 51.101563 C 31.5 50.261719 31.78125 49.699219 32.339844 49.140625 C 32.898438 48.578125 33.601563 48.441406 34.578125 48.441406 C 35.421875 48.441406 36.121094 48.71875 36.679688 49.28125 C 37.238281 49.839844 37.519531 50.398438 37.519531 51.238281 Z M 37.519531 51.238281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 49.980469 51.238281 C 49.980469 52.078125 49.699219 52.640625 49.140625 53.199219 C 48.578125 53.761719 47.878906 53.898438 46.898438 53.898438 C 46.058594 53.898438 45.359375 53.621094 44.800781 53.058594 C 44.238281 52.5 43.960938 51.941406 43.960938 51.101563 C 43.960938 50.261719 44.238281 49.699219 44.800781 49.140625 C 45.359375 48.578125 46.058594 48.441406 47.039063 48.441406 C 47.878906 48.441406 48.578125 48.71875 49.140625 49.28125 C 49.699219 49.839844 49.980469 50.398438 49.980469 51.238281 Z M 49.980469 51.238281 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureRouteFilter(m).png b/dist/Networking/AzureRouteFilter(m).png
new file mode 100644
index 00000000..0114dbd5
Binary files /dev/null and b/dist/Networking/AzureRouteFilter(m).png differ
diff --git a/dist/Networking/AzureRouteFilter(m).svg b/dist/Networking/AzureRouteFilter(m).svg
new file mode 100644
index 00000000..8985a25f
--- /dev/null
+++ b/dist/Networking/AzureRouteFilter(m).svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 6.65625 53.199219 L 26.601563 16.792969 L 6.65625 16.792969 C 2.980469 16.792969 0 19.773438 0 23.449219 L 0 46.546875 C 0 50.222656 2.980469 53.199219 6.65625 53.199219 Z M 6.65625 53.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 58.351563 50.839844 L 54.878906 64.398438 L 42.832031 57.265625 Z M 58.351563 50.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 33.636719 36.394531 C 33.636719 36.394531 32.96875 37.601563 32.234375 37.792969 C 41.464844 37.792969 47.496094 53.125 51.089844 62.070313 L 55.753906 60.722656 C 52.082031 51.007813 47.636719 36.394531 33.636719 36.394531 Z M 58.351563 19.152344 L 54.878906 5.589844 L 42.832031 12.722656 Z M 58.351563 19.152344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 33.636719 33.59375 C 33.636719 33.59375 32.96875 32.386719 32.234375 32.195313 C 41.464844 32.195313 47.496094 16.863281 51.089844 7.917969 L 55.753906 9.265625 C 52.082031 18.980469 47.636719 33.59375 33.636719 33.59375 Z M 58.859375 26.59375 L 70.058594 34.996094 L 58.859375 43.394531 Z M 58.859375 26.59375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 63.285156 32.195313 L 63.285156 37.800781 L 29.398438 37.800781 L 29.398438 32.195313 Z M 63.285156 32.195313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 6.65625 53.199219 L 26.601563 53.199219 C 30.277344 53.199219 33.253906 50.21875 33.253906 46.542969 L 33.253906 23.449219 C 33.253906 19.773438 30.277344 16.792969 26.601563 16.792969 L 6.65625 16.792969 C 2.980469 16.792969 0 19.773438 0 23.449219 L 0 46.546875 C 0 50.222656 2.980469 53.199219 6.65625 53.199219 Z M 6.65625 53.199219 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 19.601563 30.792969 L 28 30.792969 L 28 39.195313 L 19.601563 39.195313 Z M 5.601563 22.398438 L 14 22.398438 L 14 30.800781 L 5.601563 30.800781 Z M 5.601563 39.199219 L 14 39.199219 L 14 47.601563 L 5.601563 47.601563 Z M 5.601563 39.199219 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureRouteFilter.png b/dist/Networking/AzureRouteFilter.png
new file mode 100644
index 00000000..45c7474e
Binary files /dev/null and b/dist/Networking/AzureRouteFilter.png differ
diff --git a/dist/Networking/AzureRouteFilter.puml b/dist/Networking/AzureRouteFilter.puml
new file mode 100644
index 00000000..36c1d901
--- /dev/null
+++ b/dist/Networking/AzureRouteFilter.puml
@@ -0,0 +1,11 @@
+sprite $AzureRouteFilter [70x70/16z] {
+xPU74kCW34JLG8R__zyh5gbBF3ZAzNlJKjzermtex-G_seoooDQxKvBQlz6oOVgE9CC4Hk_2jGyInLZhGQuOZJpfOkIMoIZ1TbGC8pH3-fLdWvKwmRqgM7nl
+bajxBiRg7Fz6PHmbAb4l3yKVIDphR1G2k1vQt72K668rJm07g16o5siwA6WHkcBHoYkBNj-1n9MkjFwDZIRKTKkSjx9kSRICF9LI5XvvrYsEbd5yc6wudhQ4
+H1wFUpcoE5XG4fzj_DBYO96z4sUyIJGD2tARComILu_DRpLbRl57I_osRHLeVMVZ1KlhXqGgb9oo1EKZbWQIDonE7x0OjEjWCQrn6VByI3UXOJ4Pn2tR1kEi
+8mwFpIm-ENUh0_jt6kEWnMZPShi67YsHveI5f8DcYtVBbdaeeVCMYegLW5CMQd6tIrhabcd-LAE18qBmA3bwmleSfeN7cXn8OD5WBmik88502yDmER8eFM2t
+Piom6fzIeSbn8N1f64pK45Mc08Rn_Wsczsbzi7raEr7eNMnt19hSJGH4AKs-bjgXbbIx-f6D8sNng2KBnreiZGhzDFxp5G
+}
+
+AzureEntityColoring(AzureRouteFilter)
+!define AzureRouteFilter(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRouteFilter, AzureRouteFilter)
+!define AzureRouteFilter(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRouteFilter, AzureRouteFilter)
diff --git a/dist/Networking/AzureRouteFilter.svg b/dist/Networking/AzureRouteFilter.svg
new file mode 100644
index 00000000..5c4a85da
--- /dev/null
+++ b/dist/Networking/AzureRouteFilter.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 6.65625 53.199219 L 26.601563 16.792969 L 6.65625 16.792969 C 2.980469 16.792969 0 19.773438 0 23.449219 L 0 46.546875 C 0 50.222656 2.980469 53.199219 6.65625 53.199219 Z M 6.65625 53.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 58.351563 50.839844 L 54.878906 64.398438 L 42.832031 57.265625 Z M 58.351563 50.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 33.636719 36.394531 C 33.636719 36.394531 32.96875 37.601563 32.234375 37.792969 C 41.464844 37.792969 47.496094 53.125 51.089844 62.070313 L 55.753906 60.722656 C 52.082031 51.007813 47.636719 36.394531 33.636719 36.394531 Z M 58.351563 19.152344 L 54.878906 5.589844 L 42.832031 12.722656 Z M 58.351563 19.152344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 33.636719 33.59375 C 33.636719 33.59375 32.96875 32.386719 32.234375 32.195313 C 41.464844 32.195313 47.496094 16.863281 51.089844 7.917969 L 55.753906 9.265625 C 52.082031 18.980469 47.636719 33.59375 33.636719 33.59375 Z M 58.859375 26.59375 L 70.058594 34.996094 L 58.859375 43.394531 Z M 58.859375 26.59375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 63.285156 32.195313 L 63.285156 37.800781 L 29.398438 37.800781 L 29.398438 32.195313 Z M 63.285156 32.195313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 6.65625 53.199219 L 26.601563 53.199219 C 30.277344 53.199219 33.253906 50.21875 33.253906 46.542969 L 33.253906 23.449219 C 33.253906 19.773438 30.277344 16.792969 26.601563 16.792969 L 6.65625 16.792969 C 2.980469 16.792969 0 19.773438 0 23.449219 L 0 46.546875 C 0 50.222656 2.980469 53.199219 6.65625 53.199219 Z M 6.65625 53.199219 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 19.601563 30.792969 L 28 30.792969 L 28 39.195313 L 19.601563 39.195313 Z M 5.601563 22.398438 L 14 22.398438 L 14 30.800781 L 5.601563 30.800781 Z M 5.601563 39.199219 L 14 39.199219 L 14 47.601563 L 5.601563 47.601563 Z M 5.601563 39.199219 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureRouteTable(m).png b/dist/Networking/AzureRouteTable(m).png
new file mode 100644
index 00000000..a03c1ab4
Binary files /dev/null and b/dist/Networking/AzureRouteTable(m).png differ
diff --git a/dist/Networking/AzureRouteTable(m).svg b/dist/Networking/AzureRouteTable(m).svg
new file mode 100644
index 00000000..2e6a34c8
--- /dev/null
+++ b/dist/Networking/AzureRouteTable(m).svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.699219 22.261719 C 35.699219 28.980469 41.160156 34.441406 47.738281 34.578125 L 50.820313 10.359375 C 49.839844 9.941406 48.859375 9.941406 47.878906 9.941406 C 41.160156 9.941406 35.699219 15.398438 35.699219 22.261719 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.921875 38.921875 L 25.898438 38.921875 L 25.898438 70 L 43.261719 70 L 45.921875 48.578125 Z M 38.921875 38.921875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 60.199219 22.261719 C 60.199219 29.121094 54.738281 34.578125 47.878906 34.578125 C 41.019531 34.578125 35.558594 29.121094 35.558594 22.261719 C 35.699219 15.398438 41.160156 9.941406 47.878906 9.941406 C 54.738281 9.941406 60.199219 15.398438 60.199219 22.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 56.839844 38.921875 L 47.878906 51.519531 L 38.921875 38.921875 L 25.898438 38.921875 L 25.898438 70 L 70 70 L 70 38.921875 Z M 56.839844 38.921875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 7.839844 25.761719 L 14.699219 33.039063 L 9.101563 33.039063 L 0 23.660156 L 9.101563 14.28125 L 14.699219 14.28125 L 7.839844 21.421875 L 28 21.421875 L 28 25.761719 Z M 7.839844 25.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 28 0 L 28 25.761719 L 23.660156 25.761719 L 23.660156 0 Z M 28 0 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureRouteTable.png b/dist/Networking/AzureRouteTable.png
new file mode 100644
index 00000000..35e82ac9
Binary files /dev/null and b/dist/Networking/AzureRouteTable.png differ
diff --git a/dist/Networking/AzureRouteTable.puml b/dist/Networking/AzureRouteTable.puml
new file mode 100644
index 00000000..b3eb2779
--- /dev/null
+++ b/dist/Networking/AzureRouteTable.puml
@@ -0,0 +1,9 @@
+sprite $AzureRouteTable [70x70/16z] {
+xTLLOWCn48FX8Ud-DowJDvgaZilr_nZu5aocSv9qc-W7ArlPIbG1LUaBIk8f4dwbudY99FCg9J0gXCdglcWKFo9aAGGltoW5fmgpHxIIIc6BQCKXbLG8h5DI
+AvH8grIZ-30w0o8KD4eS4UQXDuftIXuGNIY5Ij78UCUZefuerfJBZ1uZwf4ENbgagHNOAHEzujr0pp6f59Wfndj6AEAgUO5nkHQlPmGomzIWXEdyFZjJr8kI
+jf1d5YfzWTYfbHndrnPw1KEkZesNtgkKcAJp2d9u7iuf-famf-XdAauf-fc2iueQRYufK2zbNYanoFCAqiovhD0D7w2W-04AkQwmQojRqSYwifMjt08
+}
+
+AzureEntityColoring(AzureRouteTable)
+!define AzureRouteTable(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRouteTable, AzureRouteTable)
+!define AzureRouteTable(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRouteTable, AzureRouteTable)
diff --git a/dist/Networking/AzureRouteTable.svg b/dist/Networking/AzureRouteTable.svg
new file mode 100644
index 00000000..3e65a8cf
--- /dev/null
+++ b/dist/Networking/AzureRouteTable.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.699219 22.261719 C 35.699219 28.980469 41.160156 34.441406 47.738281 34.578125 L 50.820313 10.359375 C 49.839844 9.941406 48.859375 9.941406 47.878906 9.941406 C 41.160156 9.941406 35.699219 15.398438 35.699219 22.261719 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.921875 38.921875 L 25.898438 38.921875 L 25.898438 70 L 43.261719 70 L 45.921875 48.578125 Z M 38.921875 38.921875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 60.199219 22.261719 C 60.199219 29.121094 54.738281 34.578125 47.878906 34.578125 C 41.019531 34.578125 35.558594 29.121094 35.558594 22.261719 C 35.699219 15.398438 41.160156 9.941406 47.878906 9.941406 C 54.738281 9.941406 60.199219 15.398438 60.199219 22.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 56.839844 38.921875 L 47.878906 51.519531 L 38.921875 38.921875 L 25.898438 38.921875 L 25.898438 70 L 70 70 L 70 38.921875 Z M 56.839844 38.921875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 7.839844 25.761719 L 14.699219 33.039063 L 9.101563 33.039063 L 0 23.660156 L 9.101563 14.28125 L 14.699219 14.28125 L 7.839844 21.421875 L 28 21.421875 L 28 25.761719 Z M 7.839844 25.761719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 28 0 L 28 25.761719 L 23.660156 25.761719 L 23.660156 0 Z M 28 0 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureServiceEndpoint(m).png b/dist/Networking/AzureServiceEndpoint(m).png
new file mode 100644
index 00000000..1d0789cc
Binary files /dev/null and b/dist/Networking/AzureServiceEndpoint(m).png differ
diff --git a/dist/Networking/AzureServiceEndpoint(m).svg b/dist/Networking/AzureServiceEndpoint(m).svg
new file mode 100644
index 00000000..93ccbed7
--- /dev/null
+++ b/dist/Networking/AzureServiceEndpoint(m).svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="25pt" viewBox="0 0 70 25" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 24.765625 8.667969 C 23.023438 3.773438 18.449219 0.15625 12.789063 0.15625 C 5.820313 0.15625 0.160156 5.6875 0.160156 12.5 C 0.160156 19.3125 5.820313 24.84375 12.789063 24.84375 C 18.449219 24.84375 23.023438 21.226563 24.765625 16.332031 L 69.839844 16.332031 L 69.839844 8.457031 L 24.765625 8.457031 L 24.765625 8.671875 Z M 24.765625 8.667969 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureServiceEndpoint.png b/dist/Networking/AzureServiceEndpoint.png
new file mode 100644
index 00000000..d5972f38
Binary files /dev/null and b/dist/Networking/AzureServiceEndpoint.png differ
diff --git a/dist/Networking/AzureServiceEndpoint.puml b/dist/Networking/AzureServiceEndpoint.puml
new file mode 100644
index 00000000..d2bda6ec
--- /dev/null
+++ b/dist/Networking/AzureServiceEndpoint.puml
@@ -0,0 +1,8 @@
+sprite $AzureServiceEndpoint [70x24/16z] {
+pTI5bKHH20FGF4FIVx-xusvmljqAqE2aT54pbOQyghmG90dlT2GKumD1dF79G9JoXOQOnbSytq--fyetB69m2ief6ATW6-f8E8LfDWtdIuAGpfVA52ym45IS
+JnHXrVb0fmWxGKvtNbX5MXLpqcqK9Fm3
+}
+
+AzureEntityColoring(AzureServiceEndpoint)
+!define AzureServiceEndpoint(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceEndpoint, AzureServiceEndpoint)
+!define AzureServiceEndpoint(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceEndpoint, AzureServiceEndpoint)
diff --git a/dist/Networking/AzureServiceEndpoint.svg b/dist/Networking/AzureServiceEndpoint.svg
new file mode 100644
index 00000000..79b39a64
--- /dev/null
+++ b/dist/Networking/AzureServiceEndpoint.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="25pt" viewBox="0 0 70 25" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 24.765625 8.667969 C 23.023438 3.773438 18.449219 0.15625 12.789063 0.15625 C 5.820313 0.15625 0.160156 5.6875 0.160156 12.5 C 0.160156 19.3125 5.820313 24.84375 12.789063 24.84375 C 18.449219 24.84375 23.023438 21.226563 24.765625 16.332031 L 69.839844 16.332031 L 69.839844 8.457031 L 24.765625 8.457031 L 24.765625 8.671875 Z M 24.765625 8.667969 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureServiceEndpointPolicy(m).png b/dist/Networking/AzureServiceEndpointPolicy(m).png
new file mode 100644
index 00000000..5b21f0ec
Binary files /dev/null and b/dist/Networking/AzureServiceEndpointPolicy(m).png differ
diff --git a/dist/Networking/AzureServiceEndpointPolicy(m).svg b/dist/Networking/AzureServiceEndpointPolicy(m).svg
new file mode 100644
index 00000000..3b495143
--- /dev/null
+++ b/dist/Networking/AzureServiceEndpointPolicy(m).svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 49.699219 65.800781 C 46.570313 65.800781 43.398438 63.394531 43.398438 58.800781 C 43.382813 56.726563 44.15625 54.722656 45.566406 53.199219 L 14 53.199219 L 14 13.859375 C 13.933594 10.871094 15.089844 7.980469 17.207031 5.867188 C 19.320313 3.75 22.210938 2.59375 25.199219 2.660156 L 61.058594 2.660156 L 58.667969 5.050781 C 56.980469 7.152344 56.039063 9.761719 56 12.460938 L 56 57.398438 C 56 61.273438 54.347656 65.800781 49.699219 65.800781 Z M 49.699219 65.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,0,0);fill-opacity:1;" d="M 60.199219 1.398438 L 26.601563 1.398438 C 18.199219 1.398438 12.601563 6.859375 12.601563 15.261719 L 12.601563 51.800781 L 10.5 51.800781 C 6.246094 51.800781 2.800781 55.246094 2.800781 59.5 C 2.800781 63.753906 6.246094 67.199219 10.5 67.199219 L 50.398438 67.199219 C 56 67.199219 57.398438 61.601563 57.398438 58.800781 L 57.398438 12.460938 L 66.640625 12.460938 C 66.984375 11.421875 67.175781 10.335938 67.199219 9.238281 C 67.199219 4.898438 64.121094 1.398438 60.199219 1.398438 Z M 54.601563 12.460938 L 54.601563 58.800781 C 54.601563 61.601563 53.898438 64.398438 49.699219 64.398438 C 47.320313 64.398438 44.800781 62.578125 44.800781 58.800781 C 44.816406 55.480469 47.148438 52.621094 50.398438 51.941406 L 50.398438 51.800781 L 15.398438 51.800781 L 15.398438 13.859375 C 15.335938 11.242188 16.347656 8.710938 18.199219 6.859375 C 20.050781 5.007813 22.582031 3.996094 25.199219 4.058594 L 57.679688 4.058594 C 55.726563 6.425781 54.640625 9.390625 54.601563 12.460938 Z M 54.601563 12.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 29.398438 25.199219 C 29.398438 26.746094 28.144531 28 26.601563 28 C 25.054688 28 23.800781 26.746094 23.800781 25.199219 C 23.800781 23.652344 25.054688 22.398438 26.601563 22.398438 C 28.144531 22.398438 29.398438 23.652344 29.398438 25.199219 Z M 43.398438 22.398438 C 41.855469 22.398438 40.601563 23.652344 40.601563 25.199219 C 40.601563 26.746094 41.855469 28 43.398438 28 C 44.945313 28 46.199219 26.746094 46.199219 25.199219 C 46.199219 23.652344 44.945313 22.398438 43.398438 22.398438 Z M 36.050781 41.507813 L 36.050781 27.789063 C 37.292969 27.285156 38.003906 25.972656 37.75 24.65625 C 37.492188 23.339844 36.339844 22.390625 35 22.390625 C 33.660156 22.390625 32.507813 23.339844 32.25 24.65625 C 31.996094 25.972656 32.707031 27.285156 33.949219 27.789063 L 33.949219 41.507813 C 32.707031 42.011719 31.996094 43.320313 32.25 44.636719 C 32.507813 45.953125 33.660156 46.902344 35 46.902344 C 36.339844 46.902344 37.492188 45.953125 37.75 44.636719 C 38.003906 43.320313 37.292969 42.011719 36.050781 41.507813 Z M 36.050781 41.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 28 36.398438 C 27.628906 36.398438 27.273438 36.253906 27.011719 35.988281 L 17.210938 26.191406 C 16.664063 25.644531 16.664063 24.757813 17.210938 24.210938 L 27.011719 14.410156 C 27.558594 13.878906 28.433594 13.886719 28.972656 14.425781 C 29.511719 14.96875 29.519531 15.839844 28.988281 16.390625 L 20.179688 25.199219 L 28.988281 34.011719 C 29.390625 34.410156 29.511719 35.011719 29.292969 35.535156 C 29.078125 36.058594 28.566406 36.398438 28 36.398438 Z M 42.988281 35.988281 L 52.789063 26.191406 C 53.335938 25.644531 53.335938 24.757813 52.789063 24.210938 L 42.988281 14.410156 C 42.441406 13.878906 41.566406 13.886719 41.027344 14.425781 C 40.488281 14.96875 40.480469 15.839844 41.011719 16.390625 L 49.820313 25.199219 L 41.011719 34.011719 C 40.644531 34.363281 40.5 34.882813 40.628906 35.371094 C 40.757813 35.859375 41.140625 36.242188 41.628906 36.371094 C 42.117188 36.5 42.636719 36.355469 42.988281 35.988281 Z M 42.988281 35.988281 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureServiceEndpointPolicy.png b/dist/Networking/AzureServiceEndpointPolicy.png
new file mode 100644
index 00000000..627a71c2
Binary files /dev/null and b/dist/Networking/AzureServiceEndpointPolicy.png differ
diff --git a/dist/Networking/AzureServiceEndpointPolicy.puml b/dist/Networking/AzureServiceEndpointPolicy.puml
new file mode 100644
index 00000000..e63ef206
--- /dev/null
+++ b/dist/Networking/AzureServiceEndpointPolicy.puml
@@ -0,0 +1,12 @@
+sprite $AzureServiceEndpointPolicy [70x70/16z] {
+xTS7hkCm38HXgf7klFzfKvp1EbvPqG3RouyMjm-KNvNyoBBQsC-oj2kBiwsfPQmSW8fSDRZxOYc6JiLHbBhfCMMMVc5pD5zECWVfXP5HTNzoNuGf-97ALosG
+kwaV3VKeWr1D7vIH7KKsFp8vj_eYNFvMhbxPAEpBNOS1oRc8DLBAB8toUOsvXEg8KCf9AQf9ZbGL3Ai0qTCiEEQL6W4JIQM9WE6KDWA6Kze865O1qc8e1KX8
+U0SnxU9-0anV0HBDhCWZDREdb_OJO7eAaFrXYw-7JKN4dc6Qq5LKDGaUIYBPdhsT2AgQkafwCSKU1P5e-qemNDYH8bq5J52p98_I2zbFH2240kPBQa4G44e1
+Koj0E0LCfG2X5J1d1GYdL0mK8AHICL20qCh1n3S52A-0mJ1GWF0AYiUASCGhLL3GeVnNuhSg-8tvZGf-OtwZWj-OtwZWD-OtAHX6vTiKz6tAVoMFoxRvewtN
+a5fAc9riYSrPmaOZ8arbSRROLfH6Hcah_2ZvW-9qeQt4RrLmXYu9IlLEYbTCKAbthZEjRE5u95OxLphisFLgsptop3RahC_XKtjtp6ToaMwEk8bKhiisibcH
+txax
+}
+
+AzureEntityColoring(AzureServiceEndpointPolicy)
+!define AzureServiceEndpointPolicy(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceEndpointPolicy, AzureServiceEndpointPolicy)
+!define AzureServiceEndpointPolicy(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceEndpointPolicy, AzureServiceEndpointPolicy)
diff --git a/dist/Networking/AzureServiceEndpointPolicy.svg b/dist/Networking/AzureServiceEndpointPolicy.svg
new file mode 100644
index 00000000..0d3a51e0
--- /dev/null
+++ b/dist/Networking/AzureServiceEndpointPolicy.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.699219 65.800781 C 46.570313 65.800781 43.398438 63.394531 43.398438 58.800781 C 43.382813 56.726563 44.15625 54.722656 45.566406 53.199219 L 14 53.199219 L 14 13.859375 C 13.933594 10.871094 15.089844 7.980469 17.207031 5.867188 C 19.320313 3.75 22.210938 2.59375 25.199219 2.660156 L 61.058594 2.660156 L 58.667969 5.050781 C 56.980469 7.152344 56.039063 9.761719 56 12.460938 L 56 57.398438 C 56 61.273438 54.347656 65.800781 49.699219 65.800781 Z M 49.699219 65.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 60.199219 1.398438 L 26.601563 1.398438 C 18.199219 1.398438 12.601563 6.859375 12.601563 15.261719 L 12.601563 51.800781 L 10.5 51.800781 C 6.246094 51.800781 2.800781 55.246094 2.800781 59.5 C 2.800781 63.753906 6.246094 67.199219 10.5 67.199219 L 50.398438 67.199219 C 56 67.199219 57.398438 61.601563 57.398438 58.800781 L 57.398438 12.460938 L 66.640625 12.460938 C 66.984375 11.421875 67.175781 10.335938 67.199219 9.238281 C 67.199219 4.898438 64.121094 1.398438 60.199219 1.398438 Z M 54.601563 12.460938 L 54.601563 58.800781 C 54.601563 61.601563 53.898438 64.398438 49.699219 64.398438 C 47.320313 64.398438 44.800781 62.578125 44.800781 58.800781 C 44.816406 55.480469 47.148438 52.621094 50.398438 51.941406 L 50.398438 51.800781 L 15.398438 51.800781 L 15.398438 13.859375 C 15.335938 11.242188 16.347656 8.710938 18.199219 6.859375 C 20.050781 5.007813 22.582031 3.996094 25.199219 4.058594 L 57.679688 4.058594 C 55.726563 6.425781 54.640625 9.390625 54.601563 12.460938 Z M 54.601563 12.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 29.398438 25.199219 C 29.398438 26.746094 28.144531 28 26.601563 28 C 25.054688 28 23.800781 26.746094 23.800781 25.199219 C 23.800781 23.652344 25.054688 22.398438 26.601563 22.398438 C 28.144531 22.398438 29.398438 23.652344 29.398438 25.199219 Z M 43.398438 22.398438 C 41.855469 22.398438 40.601563 23.652344 40.601563 25.199219 C 40.601563 26.746094 41.855469 28 43.398438 28 C 44.945313 28 46.199219 26.746094 46.199219 25.199219 C 46.199219 23.652344 44.945313 22.398438 43.398438 22.398438 Z M 36.050781 41.507813 L 36.050781 27.789063 C 37.292969 27.285156 38.003906 25.972656 37.75 24.65625 C 37.492188 23.339844 36.339844 22.390625 35 22.390625 C 33.660156 22.390625 32.507813 23.339844 32.25 24.65625 C 31.996094 25.972656 32.707031 27.285156 33.949219 27.789063 L 33.949219 41.507813 C 32.707031 42.011719 31.996094 43.320313 32.25 44.636719 C 32.507813 45.953125 33.660156 46.902344 35 46.902344 C 36.339844 46.902344 37.492188 45.953125 37.75 44.636719 C 38.003906 43.320313 37.292969 42.011719 36.050781 41.507813 Z M 36.050781 41.507813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 28 36.398438 C 27.628906 36.398438 27.273438 36.253906 27.011719 35.988281 L 17.210938 26.191406 C 16.664063 25.644531 16.664063 24.757813 17.210938 24.210938 L 27.011719 14.410156 C 27.558594 13.878906 28.433594 13.886719 28.972656 14.425781 C 29.511719 14.96875 29.519531 15.839844 28.988281 16.390625 L 20.179688 25.199219 L 28.988281 34.011719 C 29.390625 34.410156 29.511719 35.011719 29.292969 35.535156 C 29.078125 36.058594 28.566406 36.398438 28 36.398438 Z M 42.988281 35.988281 L 52.789063 26.191406 C 53.335938 25.644531 53.335938 24.757813 52.789063 24.210938 L 42.988281 14.410156 C 42.441406 13.878906 41.566406 13.886719 41.027344 14.425781 C 40.488281 14.96875 40.480469 15.839844 41.011719 16.390625 L 49.820313 25.199219 L 41.011719 34.011719 C 40.644531 34.363281 40.5 34.882813 40.628906 35.371094 C 40.757813 35.859375 41.140625 36.242188 41.628906 36.371094 C 42.117188 36.5 42.636719 36.355469 42.988281 35.988281 Z M 42.988281 35.988281 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureTrafficManager(m).png b/dist/Networking/AzureTrafficManager(m).png
index 999b449b..a8bbcaf5 100644
Binary files a/dist/Networking/AzureTrafficManager(m).png and b/dist/Networking/AzureTrafficManager(m).png differ
diff --git a/dist/Networking/AzureTrafficManager(m).svg b/dist/Networking/AzureTrafficManager(m).svg
index 877f5ea6..efa32d2e 100644
--- a/dist/Networking/AzureTrafficManager(m).svg
+++ b/dist/Networking/AzureTrafficManager(m).svg
@@ -1,6 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="68pt" height="70pt" viewBox="0 0 68 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 48.351563 2.800781 L 21.683594 2.800781 L 2.800781 22.15625 L 2.800781 48.429688 L 21.648438 67.199219 L 48.355469 67.199219 L 67.199219 48.523438 L 67.199219 21.589844 Z M 46.765625 63.335938 L 46.550781 63.335938 L 30.757813 47.3125 L 34.09375 43.585938 L 22.644531 43.585938 L 22.644531 55.320313 L 26.394531 51.285156 L 38.808594 63.335938 L 23.242188 63.335938 L 6.664063 46.824219 L 6.664063 23.730469 L 11.316406 18.960938 L 23.675781 30.097656 L 16.636719 37.40625 L 39.117188 37.40625 L 39.117188 15.070313 L 31.765625 22.398438 L 19.328125 10.746094 L 23.3125 6.664063 L 46.753906 6.664063 L 63.335938 23.195313 L 63.335938 43.835938 L 55.464844 36.417969 L 61.230469 31.230469 L 45.292969 31.230469 L 45.292969 46.28125 L 50.503906 41.113281 L 59.417969 50.792969 Z M 46.765625 63.335938 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.054688 10.507813 L 49.515625 0 L 20.527344 0 L 0 21.039063 L 0 49.597656 L 10.503906 60.058594 Z M 60.054688 10.507813 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 43.84375 30.871094 L 59.050781 30.871094 L 53.503906 36.078125 L 67.640625 49.71875 L 67.640625 20.460938 L 47.777344 0 L 19.863281 0 L 14.851563 5.207031 L 30.777344 22.078125 L 37.757813 14.71875 L 37.757813 37.152344 L 16.105469 37.152344 L 22.90625 29.792969 L 7.15625 13.640625 L 0 21 L 0 49.71875 L 19.863281 70.179688 L 44.378906 70.179688 L 25.410156 50.972656 L 21.832031 55.101563 L 21.832031 43.257813 L 32.925781 43.257813 L 29.707031 47.027344 L 49.925781 68.207031 L 62.273438 55.460938 L 48.851563 40.742188 L 43.84375 45.949219 Z M 43.84375 30.871094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 70 49.699219 L 70 20.421875 L 49.515625 0 L 20.527344 0 L 0 21.039063 L 0 49.597656 L 20.484375 70 L 49.515625 70 Z M 70 49.699219 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureTrafficManager.puml b/dist/Networking/AzureTrafficManager.puml
index bbe01825..c1169122 100644
--- a/dist/Networking/AzureTrafficManager.puml
+++ b/dist/Networking/AzureTrafficManager.puml
@@ -1,9 +1,10 @@
-sprite $AzureTrafficManager [68x70/16z] {
-pTS5rk0m20HWOeJC_U-xBkcoPKX_dIVrhyuZugEupsgIoK2KLK-8vqW72KSumH531YblZvGKOWHPdmMfEKJU7cclWNHaCcMFMeYi13ByXOsTwA38029arOgx
-w7NlULEALfKAWdGWGbQJo83kX4Sc03I93UXt8aIQC0FzN_CQwy8DHOn8ok08DpXoRc2S6npX1a6U6kY71a4-r1ZY35yT1dkctEY839M4CH0PKnB6W3CSGGn5
-P9WaZBf2OwhwpCtmY28V4u-S6nuvDnpopD3c-fHJGx7gXWJ66d-Y5sFyRkXsHDcTsxvs05V4CiRSr_RVCnl23Vr_5sAo8SGel7af5XWnejiJyuR_krYfwoCm
-GgIxQkADxlfCWdX3eR-HpD1ElV4TvaYD46l0XlGxf0J8MjU7F-uGrxsvK6J82QBaGyiXX7Y6gFWO-PQc--sU89pWY7522aKeaKUCZ6r3f1WXKiWAXiSKQR-t
-4y8NBbykAYSuulCL
+sprite $AzureTrafficManager [70x70/16z] {
+ZT873kj028JXX6t0_U_xoWgHzGYF_Qkc-7ERJz5KLllGEC8PZd268-rxtwGCHpZ34Suy8-qcUS6CHFIcIHY2S8OZ9CPmX3E8zE__P79c1MFUQYHwnxWZqnDv
+pSXA1f1iF38Ym01IC6igCW9C852_70EAkG83231n_HCGHwQfwW0Xc4HIIGIOH6GAC2sHK191veSiNHKJum04c0FHWbdnrJmHO7GhWUmQC1BkF11aLYY998DD
+HA9rAaspJXH0YAAZL00X2c5cWN15PwKWmfKO6Yg048KmiqQueWELHAY222h-FntNZ2hpYwsjJBcq71MEI2Y8eCAHIb4l58OKIZDdoXH4f5BCgTAXiLDKEbKm
+ymWKwKGX22ZIZ2Y0W08CA0H1fHyCA0G1PRWU35VMlzHsLsMu7unCfkpboQvVb15l9gDA8irFPIF0K2KGEnNxUPKY2vKS-asZK91PC7J6X3AGKLDvPhhydbmh
+6FDKA9DFJZ_0R6GhxOaPF-HpCe5ifVi4XY78c6-bkmD3aM1cC1jnRJ6kP3Y2L-CxC-TCZsy3mQjHZu1X238YdE58C2AKuKWmvgjY51X0a75_PZZodaba5SGh
+PXG8OzQr8S40GXaUHpZ34SvmX3EwxWE4C3IES8OZVm4
 }
 
 AzureEntityColoring(AzureTrafficManager)
diff --git a/dist/Networking/AzureTrafficManager.svg b/dist/Networking/AzureTrafficManager.svg
index 972fac81..88fc7a67 100644
--- a/dist/Networking/AzureTrafficManager.svg
+++ b/dist/Networking/AzureTrafficManager.svg
@@ -24,11 +24,11 @@
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 20.527344 0 L 0 21.039063 L 0 49.597656 L 10.503906 60.058594 L 60.054688 10.507813 L 49.515625 0 Z M 20.527344 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.054688 10.507813 L 49.515625 0 L 20.527344 0 L 0 21.039063 L 0 49.597656 L 10.503906 60.058594 Z M 60.054688 10.507813 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 49.515625 0 L 20.527344 0 L 0 21.039063 L 0 49.597656 L 20.484375 70 L 49.515625 70 L 70 49.699219 L 70 20.421875 Z M 49.515625 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 70 49.699219 L 70 20.421875 L 49.515625 0 L 20.527344 0 L 0 21.039063 L 0 49.597656 L 20.484375 70 L 49.515625 70 Z M 70 49.699219 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
 </g>
diff --git a/dist/Networking/AzureVPNGateway(m).png b/dist/Networking/AzureVPNGateway(m).png
index 8f8bea19..02a28336 100644
Binary files a/dist/Networking/AzureVPNGateway(m).png and b/dist/Networking/AzureVPNGateway(m).png differ
diff --git a/dist/Networking/AzureVPNGateway(m).svg b/dist/Networking/AzureVPNGateway(m).svg
index 57235fce..3fd015e9 100644
--- a/dist/Networking/AzureVPNGateway(m).svg
+++ b/dist/Networking/AzureVPNGateway(m).svg
@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="63pt" height="70pt" viewBox="0 0 63 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.738281 25.898438 L 11.058594 25.898438 C 5.601563 25.898438 3.640625 29.121094 3.640625 33.320313 L 3.640625 62.578125 C 3.640625 66.21875 5.878906 70 10.078125 70 L 19.460938 70 Z M 47.738281 25.898438 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 55.300781 25.898438 L 55.300781 22.820313 C 55.300781 16.660156 53.058594 10.921875 49.140625 6.859375 C 45.5 2.660156 37.378906 0 31.359375 0 C 25.339844 0 17.21875 2.660156 13.578125 6.859375 C 9.800781 10.921875 7.421875 16.660156 7.421875 22.820313 L 7.421875 25.898438 C 1.960938 25.898438 0 29.121094 0 33.320313 L 0 62.578125 C 0 66.21875 2.238281 70 6.441406 70 L 56.28125 70 C 61.039063 70 62.71875 66.21875 62.71875 62.578125 L 62.71875 33.320313 C 62.71875 29.539063 61.179688 25.898438 55.300781 25.898438 Z M 18.480469 24.359375 C 18.480469 20.71875 19.738281 16.101563 21.839844 13.71875 C 23.941406 11.339844 28.421875 10.21875 31.359375 10.078125 C 34.300781 10.078125 38.78125 11.339844 40.878906 13.71875 C 42.980469 16.101563 44.238281 19.179688 44.238281 22.679688 L 44.238281 25.761719 L 18.480469 25.761719 Z M 22.960938 37.941406 L 31.078125 29.820313 L 39.199219 37.941406 L 33.460938 37.941406 L 33.460938 43.820313 L 28.558594 43.820313 L 28.558594 37.941406 Z M 7.980469 50.261719 L 7.980469 45.5 L 16.378906 45.5 L 16.378906 39.898438 L 24.21875 47.738281 L 16.378906 55.578125 L 16.378906 50.121094 Z M 31.078125 66.078125 L 22.820313 57.820313 L 28.558594 57.820313 L 28.558594 52.078125 L 33.460938 52.078125 L 33.460938 57.820313 L 39.339844 57.820313 Z M 54.179688 50.261719 L 45.78125 50.261719 L 45.78125 55.859375 L 37.800781 47.878906 L 45.78125 39.898438 L 45.78125 45.5 L 54.179688 45.5 Z M 54.179688 50.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 58.941406 25.898438 L 58.941406 22.820313 C 58.941406 16.660156 56.699219 10.921875 52.78125 6.859375 C 49.140625 2.660156 41.019531 0 35 0 C 28.980469 0 20.859375 2.660156 17.21875 6.859375 C 13.441406 10.921875 11.058594 16.660156 11.058594 22.820313 L 11.058594 25.898438 L 22.121094 27.160156 L 22.121094 24.359375 C 22.121094 20.71875 23.378906 16.101563 25.480469 13.71875 C 27.578125 11.339844 32.058594 10.21875 35 10.078125 C 37.941406 10.078125 42.421875 11.339844 44.519531 13.71875 C 46.621094 16.101563 47.878906 19.179688 47.878906 22.679688 L 47.878906 27.160156 Z M 58.941406 25.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 11.058594 25.898438 C 5.601563 25.898438 3.640625 29.121094 3.640625 33.320313 L 3.640625 62.578125 C 3.640625 66.21875 5.878906 70 10.078125 70 L 59.921875 70 C 64.679688 70 66.359375 66.21875 66.359375 62.578125 L 66.359375 33.320313 C 66.359375 29.539063 64.820313 25.898438 58.941406 25.898438 Z M 11.058594 25.898438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.601563 37.941406 L 34.71875 29.820313 L 42.839844 37.941406 L 37.101563 37.941406 L 37.101563 43.820313 L 32.199219 43.820313 L 32.199219 37.941406 Z M 11.621094 50.261719 L 11.621094 45.5 L 20.019531 45.5 L 20.019531 39.898438 L 27.859375 47.738281 L 20.019531 55.578125 L 20.019531 50.121094 L 11.621094 50.121094 Z M 34.71875 66.078125 L 26.460938 57.820313 L 32.199219 57.820313 L 32.199219 52.078125 L 37.101563 52.078125 L 37.101563 57.820313 L 42.980469 57.820313 Z M 57.820313 50.261719 L 49.421875 50.261719 L 49.421875 55.859375 L 41.441406 47.878906 L 49.421875 39.898438 L 49.421875 45.5 L 57.820313 45.5 Z M 57.820313 50.261719 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureVPNGateway.png b/dist/Networking/AzureVPNGateway.png
index 00941682..519f8d21 100644
Binary files a/dist/Networking/AzureVPNGateway.png and b/dist/Networking/AzureVPNGateway.png differ
diff --git a/dist/Networking/AzureVPNGateway.puml b/dist/Networking/AzureVPNGateway.puml
index a7366e62..1258d6cb 100644
--- a/dist/Networking/AzureVPNGateway.puml
+++ b/dist/Networking/AzureVPNGateway.puml
@@ -1,9 +1,9 @@
-sprite $AzureVPNGateway [63x70/16z] {
-lTTdpkCm38HXKPN3-z_tIo8O4AmDX_Aszw_ps6ffoQkqhe11Hw-I7YLrs2tqSeppj7jeSeYTq6BTZOJCiQZn6jKm7lTgFEw7dLGStUmeoD74CLh9aalJpO-3
-eMjTLwJVxvo_w7nxyiGhkTrRdVD2fjU2nsExpERMqrxThjAL1Rsvf6zLDZpGZPd1FtfoSAow_uJ2nxw_Hls98Jc9_vf6r_tALZvlBeSxmVxNUFs_NDfGsBEW
-lQHP8vIccNr4nK6Is1yqWeVN5ZnUgOxcLi2_4G9VkOvyephqZUdODwPZtuYcddFzLAVKJoudLUVN2k4TFaSFUIdmE4g9UIguywNJ2Pz-vrCVyUKnMzhd65Sv
-NVxUr2cFgrzuMYs_wHNZqrCTSz3VOWy7hnBmMcjxr_DDRrxgrT76xVxXiUdrtLZ-Y6VdqAgSyAbtVldoHszOhN_sSO4_uolEKUHTcicxWfZxnrHWX1E_DE74
-BqquyKnR0_TSMrMZdckhtKWgN5lEHZtN6l_pZ8wbFZJxJ_UESx7_LNm1
+sprite $AzureVPNGateway [70x70/16z] {
+nTK5SYim38HXY_R-DtwegIEtqIhy3vQ-oZHPNMeU011kAkkUn08rrriDJUB8xZPgFaOSNJeo12HRF0NDxvZa7WQZZ6tiBBbfKznKHDG2jPYl9_HYltnytdOO
+DHyE4_slsMWOPVldV9ZwIqQ7dUmjdrRvjJM-SyvFIFWf1j-MoJEZYa_kfR0rsqCAlz_nTaK-gOZ5B5mKOGNn6DPzhiHzI6NiFYIRZQBMApcCzCYUjVrK4O9y
+CUr7d38a6VnSKENo040KWYJ3588amnMEL8OhDTbdz82YpQRqYdrJiFEfilHG75-fZfMbrnHTDoXBgxAHkN9-4niPA9uTzaRAsxsY-CeEV2Eb62bBEsIk50Go
+LBfHak5AM5QHWn7Bs4bNf39ttJgugcfiPgvS83XUWCoLZNnJ86F5uhe2gfnXAqr4mLCKMIMzIq4KH72VWc08L_8N24AK_0s2p1G4HU3vZwuYoGW6oceG80W2
+JSKw1O6-jR86eVa-nxkHUgUSA6IItm
 }
 
 AzureEntityColoring(AzureVPNGateway)
diff --git a/dist/Networking/AzureVPNGateway.svg b/dist/Networking/AzureVPNGateway.svg
index 5a0a0c04..77418170 100644
--- a/dist/Networking/AzureVPNGateway.svg
+++ b/dist/Networking/AzureVPNGateway.svg
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="63pt" height="70pt" viewBox="0 0 63 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="63" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
   </g>
 </mask>
 <clipPath id="clip1">
-  <rect x="0" y="0" width="63" height="70"/>
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 44.101563 25.898438 L 7.421875 25.898438 C 1.960938 25.898438 0 29.121094 0 33.320313 L 0 62.578125 C 0 66.21875 2.238281 70 6.441406 70 L 15.820313 70 Z M 44.101563 25.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.738281 25.898438 L 11.058594 25.898438 C 5.601563 25.898438 3.640625 29.121094 3.640625 33.320313 L 3.640625 62.578125 C 3.640625 66.21875 5.878906 70 10.078125 70 L 19.460938 70 Z M 47.738281 25.898438 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 55.300781 25.898438 L 55.300781 22.820313 C 55.300781 16.660156 53.058594 10.921875 49.140625 6.859375 C 45.5 2.660156 37.378906 0 31.359375 0 C 25.339844 0 17.21875 2.660156 13.578125 6.859375 C 9.800781 10.921875 7.421875 16.660156 7.421875 22.820313 L 7.421875 25.898438 L 18.480469 27.160156 L 18.480469 24.359375 C 18.480469 20.71875 19.738281 16.101563 21.839844 13.71875 C 23.941406 11.339844 28.421875 10.21875 31.359375 10.078125 C 34.300781 10.078125 38.78125 11.339844 40.878906 13.71875 C 42.980469 16.101563 44.238281 19.179688 44.238281 22.679688 L 44.238281 27.160156 Z M 55.300781 25.898438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 7.421875 25.898438 C 1.960938 25.898438 0 29.121094 0 33.320313 L 0 62.578125 C 0 66.21875 2.238281 70 6.441406 70 L 56.28125 70 C 61.039063 70 62.71875 66.21875 62.71875 62.578125 L 62.71875 33.320313 C 62.71875 29.539063 61.179688 25.898438 55.300781 25.898438 Z M 7.421875 25.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 58.941406 25.898438 L 58.941406 22.820313 C 58.941406 16.660156 56.699219 10.921875 52.78125 6.859375 C 49.140625 2.660156 41.019531 0 35 0 C 28.980469 0 20.859375 2.660156 17.21875 6.859375 C 13.441406 10.921875 11.058594 16.660156 11.058594 22.820313 L 11.058594 25.898438 L 22.121094 27.160156 L 22.121094 24.359375 C 22.121094 20.71875 23.378906 16.101563 25.480469 13.71875 C 27.578125 11.339844 32.058594 10.21875 35 10.078125 C 37.941406 10.078125 42.421875 11.339844 44.519531 13.71875 C 46.621094 16.101563 47.878906 19.179688 47.878906 22.679688 L 47.878906 27.160156 Z M 58.941406 25.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 11.058594 25.898438 C 5.601563 25.898438 3.640625 29.121094 3.640625 33.320313 L 3.640625 62.578125 C 3.640625 66.21875 5.878906 70 10.078125 70 L 59.921875 70 C 64.679688 70 66.359375 66.21875 66.359375 62.578125 L 66.359375 33.320313 C 66.359375 29.539063 64.820313 25.898438 58.941406 25.898438 Z M 11.058594 25.898438 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 22.960938 37.941406 L 31.078125 29.820313 L 39.199219 37.941406 L 33.460938 37.941406 L 33.460938 43.820313 L 28.558594 43.820313 L 28.558594 37.941406 C 28.558594 37.941406 22.960938 37.941406 22.960938 37.941406 Z M 7.980469 50.261719 L 7.980469 45.5 L 16.378906 45.5 L 16.378906 39.898438 L 24.21875 47.738281 L 16.378906 55.578125 L 16.378906 50.121094 L 7.980469 50.121094 Z M 31.078125 66.078125 L 22.820313 57.820313 L 28.558594 57.820313 L 28.558594 52.078125 L 33.460938 52.078125 L 33.460938 57.820313 L 39.339844 57.820313 Z M 54.179688 50.261719 L 45.78125 50.261719 L 45.78125 55.859375 L 37.800781 47.878906 L 45.78125 39.898438 L 45.78125 45.5 L 54.179688 45.5 Z M 54.179688 50.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.601563 37.941406 L 34.71875 29.820313 L 42.839844 37.941406 L 37.101563 37.941406 L 37.101563 43.820313 L 32.199219 43.820313 L 32.199219 37.941406 Z M 11.621094 50.261719 L 11.621094 45.5 L 20.019531 45.5 L 20.019531 39.898438 L 27.859375 47.738281 L 20.019531 55.578125 L 20.019531 50.121094 L 11.621094 50.121094 Z M 34.71875 66.078125 L 26.460938 57.820313 L 32.199219 57.820313 L 32.199219 52.078125 L 37.101563 52.078125 L 37.101563 57.820313 L 42.980469 57.820313 Z M 57.820313 50.261719 L 49.421875 50.261719 L 49.421875 55.859375 L 41.441406 47.878906 L 49.421875 39.898438 L 49.421875 45.5 L 57.820313 45.5 Z M 57.820313 50.261719 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureVirtualNetwork(m).png b/dist/Networking/AzureVirtualNetwork(m).png
index e8f7469b..120993a0 100644
Binary files a/dist/Networking/AzureVirtualNetwork(m).png and b/dist/Networking/AzureVirtualNetwork(m).png differ
diff --git a/dist/Networking/AzureVirtualNetwork(m).svg b/dist/Networking/AzureVirtualNetwork(m).svg
index bd1a5e62..7bb24af1 100644
--- a/dist/Networking/AzureVirtualNetwork(m).svg
+++ b/dist/Networking/AzureVirtualNetwork(m).svg
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="36pt" viewBox="0 0 70 36" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 50.449219 0 L 48.003906 2.394531 L 64.414063 18.296875 L 48.003906 34.199219 L 50.449219 36.59375 L 64.9375 22.402344 L 69.125 18.296875 L 64.9375 14.191406 Z M 50.449219 0 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 18.679688 0 L 21.121094 2.394531 L 4.714844 18.296875 L 21.121094 34.199219 L 18.679688 36.59375 L 4.363281 22.402344 L 0 18.296875 L 4.363281 14.191406 Z M 18.679688 0 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 26.183594 18.296875 C 26.183594 20.519531 24.265625 22.402344 21.996094 22.402344 C 19.550781 22.402344 17.804688 20.519531 17.804688 18.296875 C 17.804688 16.074219 19.726563 14.191406 21.996094 14.191406 C 24.4375 14.191406 26.183594 16.074219 26.183594 18.296875 Z M 26.183594 18.296875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 34.5625 14.191406 C 36.832031 14.191406 38.753906 16.074219 38.753906 18.296875 C 38.753906 20.519531 36.832031 22.402344 34.5625 22.402344 C 32.292969 22.402344 30.375 20.519531 30.375 18.296875 C 30.375 16.074219 32.292969 14.191406 34.5625 14.191406 Z M 34.5625 14.191406 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 47.132813 14.191406 C 49.402344 14.191406 51.320313 16.074219 51.320313 18.296875 C 51.320313 20.519531 49.402344 22.402344 47.132813 22.402344 C 44.6875 22.402344 42.941406 20.519531 42.941406 18.296875 C 42.941406 16.074219 44.6875 14.191406 47.132813 14.191406 Z M 47.132813 14.191406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 69.578125 35.980469 C 70.28125 35.28125 70.140625 34.160156 69.578125 33.460938 L 66.21875 30.101563 L 51.101563 15.398438 C 50.398438 14.699219 49.421875 14.699219 48.71875 15.398438 C 48.019531 16.101563 47.878906 17.21875 48.71875 17.921875 L 64.539063 33.460938 C 65.238281 34.160156 65.238281 35.28125 64.539063 35.980469 L 48.441406 52.078125 C 47.738281 52.78125 47.738281 53.898438 48.441406 54.601563 C 49.140625 55.300781 50.261719 55.160156 50.820313 54.601563 L 65.800781 39.761719 C 65.800781 39.761719 65.800781 39.761719 65.941406 39.621094 Z M 69.578125 35.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 0.421875 35.980469 C -0.28125 35.28125 -0.140625 34.160156 0.421875 33.460938 L 3.78125 30.101563 L 18.898438 15.398438 C 19.601563 14.699219 20.578125 14.699219 21.28125 15.398438 C 21.980469 16.101563 22.121094 17.21875 21.28125 17.921875 L 5.738281 33.460938 C 5.039063 34.160156 5.039063 35.28125 5.738281 35.980469 L 21.558594 52.078125 C 22.261719 52.78125 22.261719 53.898438 21.558594 54.601563 C 20.859375 55.300781 19.738281 55.160156 19.179688 54.601563 L 3.921875 39.898438 C 3.921875 39.898438 3.921875 39.898438 3.78125 39.761719 Z M 0.421875 35.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 25.480469 34.71875 C 25.480469 37.378906 23.238281 39.339844 20.859375 39.339844 C 18.480469 39.339844 15.960938 37.101563 15.960938 34.71875 C 15.960938 32.339844 17.921875 30.101563 20.859375 30.101563 C 23.660156 30.101563 25.480469 32.339844 25.480469 34.71875 Z M 25.480469 34.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 39.621094 34.71875 C 39.621094 37.378906 37.378906 39.339844 35 39.339844 C 32.621094 39.339844 30.101563 37.101563 30.101563 34.71875 C 30.101563 32.339844 32.339844 30.101563 35 30.101563 C 37.660156 30.101563 39.621094 32.339844 39.621094 34.71875 Z M 39.621094 34.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 53.898438 34.71875 C 53.898438 37.273438 51.832031 39.339844 49.28125 39.339844 C 46.726563 39.339844 44.660156 37.273438 44.660156 34.71875 C 44.660156 32.167969 46.726563 30.101563 49.28125 30.101563 C 51.832031 30.101563 53.898438 32.167969 53.898438 34.71875 Z M 53.898438 34.71875 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureVirtualNetwork.png b/dist/Networking/AzureVirtualNetwork.png
index 6c3b6d33..3084629a 100644
Binary files a/dist/Networking/AzureVirtualNetwork.png and b/dist/Networking/AzureVirtualNetwork.png differ
diff --git a/dist/Networking/AzureVirtualNetwork.puml b/dist/Networking/AzureVirtualNetwork.puml
index eb471047..ee50ee30 100644
--- a/dist/Networking/AzureVirtualNetwork.puml
+++ b/dist/Networking/AzureVirtualNetwork.puml
@@ -1,8 +1,8 @@
-sprite $AzureVirtualNetwork [70x36/16z] {
-fTK7hiGW30HG6nDCVF_x_e96o5glc2sZalv2Hqg6oJ5kmkDn6ttEaOZxyBn7W668oY4NOpZ26I0JoBbIqRz02iCGpX24n-x454HIE7CTa2-O6H4kxwI1uGXd
-HaM-OdG-eDtzKfphSE-2cFjebG5IInPtso_kSevu62SA9fz9VXSTjX2qeiNAhPMfJOqFe-73JNeaChU6oyZwIY2sXZh-NvKymzjYPcOcNbOHQJZtLDNeKXUj
-mk3_GzB_6ne1jQi82fMOAxUtx_VGXbDBTLOAesQQBsIdMPEA83rTibJaAsRW6yfmXEyp756HhnWl26CumXc-qFCDWYCrzX8p2y9MzXej2648GfXvUXvupfZp
-d-mPyWi
+sprite $AzureVirtualNetwork [70x70/16z] {
+xTO7Zkim40FGI9fs_ml_ud0HXQuW-a94LSP-ODnV3xAoihBIiiR56DDxfF9yR5LWxf2Ay_ceVx5xXAfmx9vf1KHa6D6PJiZbiN4HOKP4c94HPdI46Hq14_GJ
+48tH4VIF4qHZ66d3VKoRshngvjQ9EK9w_ayqx1NRicDesygOsJV9Tr0qi7oZ7Ql131yJJwHlFHCnc0WVc_eV5FxQq63ErJAdQeZNJyQPOedugH9RZOtv_6fV
+_wXFvbGj-4x0WMbSnj7tizk4zltjPCGuaAbRO0fcCF8_JamVOphS3Ijas6WxX9Y7OOGP7PcEZOGm8oFCw0WpEe91YWWp8iACZF3xH4UOqH5-EwWVKs0qX9bs
+EWuWTscNHyQ0t6TSTksltvwLbPM_
 }
 
 AzureEntityColoring(AzureVirtualNetwork)
diff --git a/dist/Networking/AzureVirtualNetwork.svg b/dist/Networking/AzureVirtualNetwork.svg
index ce4243f9..5a6c2bdb 100644
--- a/dist/Networking/AzureVirtualNetwork.svg
+++ b/dist/Networking/AzureVirtualNetwork.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="40pt" viewBox="0 0 70 40" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 69.632813 20.792969 C 70.332031 20.101563 70.195313 19 69.632813 18.308594 L 66.273438 15 L 51.152344 0.515625 C 50.453125 -0.171875 49.472656 -0.171875 48.773438 0.515625 C 48.074219 1.207031 47.933594 2.308594 48.773438 3 L 64.59375 18.308594 C 65.292969 19 65.292969 20.101563 64.59375 20.792969 L 48.492188 36.65625 C 47.792969 37.34375 47.792969 38.449219 48.492188 39.136719 C 49.195313 39.828125 50.3125 39.691406 50.875 39.136719 L 65.855469 24.515625 C 65.855469 24.515625 65.855469 24.515625 65.992188 24.378906 Z M 69.632813 20.792969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 0.472656 20.792969 C -0.226563 20.101563 -0.0859375 19 0.472656 18.308594 L 3.832031 15 L 18.953125 0.515625 C 19.652344 -0.171875 20.632813 -0.171875 21.332031 0.515625 C 22.035156 1.207031 22.175781 2.308594 21.332031 3 L 5.792969 18.308594 C 5.09375 19 5.09375 20.101563 5.792969 20.792969 L 21.613281 36.65625 C 22.3125 37.34375 22.3125 38.449219 21.613281 39.136719 C 20.914063 39.828125 19.792969 39.691406 19.234375 39.136719 L 3.972656 24.65625 C 3.972656 24.65625 3.972656 24.65625 3.832031 24.515625 Z M 0.472656 20.792969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 25.535156 19.550781 C 25.535156 22.171875 23.292969 24.101563 20.914063 24.101563 C 18.535156 24.101563 16.015625 21.898438 16.015625 19.550781 C 16.015625 17.207031 17.972656 15 20.914063 15 C 23.714844 15 25.535156 17.207031 25.535156 19.550781 Z M 25.535156 19.550781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 39.675781 19.550781 C 39.675781 22.171875 37.433594 24.101563 35.054688 24.101563 C 32.675781 24.101563 30.152344 21.898438 30.152344 19.550781 C 30.152344 17.207031 32.394531 15 35.054688 15 C 37.714844 15 39.675781 17.207031 39.675781 19.550781 Z M 39.675781 19.550781 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 53.953125 19.550781 C 53.953125 22.066406 51.886719 24.101563 49.332031 24.101563 C 46.78125 24.101563 44.714844 22.066406 44.714844 19.550781 C 44.714844 17.039063 46.78125 15 49.332031 15 C 51.886719 15 53.953125 17.039063 53.953125 19.550781 Z M 53.953125 19.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 69.578125 35.980469 C 70.28125 35.28125 70.140625 34.160156 69.578125 33.460938 L 66.21875 30.101563 L 51.101563 15.398438 C 50.398438 14.699219 49.421875 14.699219 48.71875 15.398438 C 48.019531 16.101563 47.878906 17.21875 48.71875 17.921875 L 64.539063 33.460938 C 65.238281 34.160156 65.238281 35.28125 64.539063 35.980469 L 48.441406 52.078125 C 47.738281 52.78125 47.738281 53.898438 48.441406 54.601563 C 49.140625 55.300781 50.261719 55.160156 50.820313 54.601563 L 65.800781 39.761719 C 65.800781 39.761719 65.800781 39.761719 65.941406 39.621094 Z M 69.578125 35.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 0.421875 35.980469 C -0.28125 35.28125 -0.140625 34.160156 0.421875 33.460938 L 3.78125 30.101563 L 18.898438 15.398438 C 19.601563 14.699219 20.578125 14.699219 21.28125 15.398438 C 21.980469 16.101563 22.121094 17.21875 21.28125 17.921875 L 5.738281 33.460938 C 5.039063 34.160156 5.039063 35.28125 5.738281 35.980469 L 21.558594 52.078125 C 22.261719 52.78125 22.261719 53.898438 21.558594 54.601563 C 20.859375 55.300781 19.738281 55.160156 19.179688 54.601563 L 3.921875 39.898438 C 3.921875 39.898438 3.921875 39.898438 3.78125 39.761719 Z M 0.421875 35.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 25.480469 34.71875 C 25.480469 37.378906 23.238281 39.339844 20.859375 39.339844 C 18.480469 39.339844 15.960938 37.101563 15.960938 34.71875 C 15.960938 32.339844 17.921875 30.101563 20.859375 30.101563 C 23.660156 30.101563 25.480469 32.339844 25.480469 34.71875 Z M 25.480469 34.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 39.621094 34.71875 C 39.621094 37.378906 37.378906 39.339844 35 39.339844 C 32.621094 39.339844 30.101563 37.101563 30.101563 34.71875 C 30.101563 32.339844 32.339844 30.101563 35 30.101563 C 37.660156 30.101563 39.621094 32.339844 39.621094 34.71875 Z M 39.621094 34.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 53.898438 34.71875 C 53.898438 37.273438 51.832031 39.339844 49.28125 39.339844 C 46.726563 39.339844 44.660156 37.273438 44.660156 34.71875 C 44.660156 32.167969 46.726563 30.101563 49.28125 30.101563 C 51.832031 30.101563 53.898438 32.167969 53.898438 34.71875 Z M 53.898438 34.71875 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureVirtualNetworkClassic(m).png b/dist/Networking/AzureVirtualNetworkClassic(m).png
new file mode 100644
index 00000000..5b976781
Binary files /dev/null and b/dist/Networking/AzureVirtualNetworkClassic(m).png differ
diff --git a/dist/Networking/AzureVirtualNetworkClassic(m).svg b/dist/Networking/AzureVirtualNetworkClassic(m).svg
new file mode 100644
index 00000000..79bf2506
--- /dev/null
+++ b/dist/Networking/AzureVirtualNetworkClassic(m).svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 69.578125 35.980469 C 70.28125 35.28125 70.140625 34.160156 69.578125 33.460938 L 66.21875 30.101563 L 51.101563 15.398438 C 50.398438 14.699219 49.421875 14.699219 48.71875 15.398438 C 48.019531 16.101563 47.878906 17.21875 48.71875 17.921875 L 64.539063 33.460938 C 65.238281 34.160156 65.238281 35.28125 64.539063 35.980469 L 48.441406 52.078125 C 47.738281 52.78125 47.738281 53.898438 48.441406 54.601563 C 49.140625 55.300781 50.261719 55.160156 50.820313 54.601563 L 65.800781 39.761719 C 65.800781 39.761719 65.800781 39.761719 65.941406 39.621094 Z M 69.578125 35.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 0.421875 35.980469 C -0.28125 35.28125 -0.140625 34.160156 0.421875 33.460938 L 3.78125 30.101563 L 18.898438 15.398438 C 19.601563 14.699219 20.578125 14.699219 21.28125 15.398438 C 21.980469 16.101563 22.121094 17.21875 21.28125 17.921875 L 5.738281 33.460938 C 5.039063 34.160156 5.039063 35.28125 5.738281 35.980469 L 21.558594 52.078125 C 22.261719 52.78125 22.261719 53.898438 21.558594 54.601563 C 20.859375 55.300781 19.738281 55.160156 19.179688 54.601563 L 3.921875 39.898438 C 3.921875 39.898438 3.921875 39.898438 3.78125 39.761719 Z M 0.421875 35.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 25.480469 34.71875 C 25.480469 37.378906 23.238281 39.339844 20.859375 39.339844 C 18.480469 39.339844 15.960938 37.101563 15.960938 34.71875 C 15.960938 32.339844 17.921875 30.101563 20.859375 30.101563 C 23.660156 30.101563 25.480469 32.339844 25.480469 34.71875 Z M 25.480469 34.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 39.621094 34.71875 C 39.621094 37.378906 37.378906 39.339844 35 39.339844 C 32.621094 39.339844 30.101563 37.101563 30.101563 34.71875 C 30.101563 32.339844 32.339844 30.101563 35 30.101563 C 37.660156 30.101563 39.621094 32.339844 39.621094 34.71875 Z M 39.621094 34.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 53.898438 34.71875 C 53.898438 37.273438 51.832031 39.339844 49.28125 39.339844 C 46.726563 39.339844 44.660156 37.273438 44.660156 34.71875 C 44.660156 32.167969 46.726563 30.101563 49.28125 30.101563 C 51.832031 30.101563 53.898438 32.167969 53.898438 34.71875 Z M 53.898438 34.71875 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureVirtualNetworkClassic.png b/dist/Networking/AzureVirtualNetworkClassic.png
new file mode 100644
index 00000000..71abb9ee
Binary files /dev/null and b/dist/Networking/AzureVirtualNetworkClassic.png differ
diff --git a/dist/Networking/AzureVirtualNetworkClassic.puml b/dist/Networking/AzureVirtualNetworkClassic.puml
new file mode 100644
index 00000000..76e48780
--- /dev/null
+++ b/dist/Networking/AzureVirtualNetworkClassic.puml
@@ -0,0 +1,10 @@
+sprite $AzureVirtualNetworkClassic [70x70/16z] {
+xTO7hiCW48HXqnUu_tbJS5aohXhrY5_D1l49xIl9zA3HQ3GoITp5DkoU8vBEjxq8C6U8nFDz9v_y4oHD5_bxnWWW10C8oLX0BcSJI0GP4a66H90X4MGu19c8
+ImqX60xHh3A0q0mY9gJKZSr_temUZ2awO8uGN-gdOXSojxVrOAZV4Z1xn9RQobChrrOnxStNkO0CpYJL9TyVgx4tQy7Po3UhgqNFzQQqpRfcz42GDQUB-Kef
+1qgxXssCqSMwr6HNVoOXorl6luHbC0Ol8pecdQuhEZFuS_A_Z966hE_fUp3R_jUW14I-1RYD2w4Rjmt1wPlnmPiT0ip34466HtGs788CYI138iXm26ua4a66
+H90X4Vmy8H5aQ0J_aL9Vff3X46JCwNO4v2npEHaFo7dkygvs-lT6ez4R
+}
+
+AzureEntityColoring(AzureVirtualNetworkClassic)
+!define AzureVirtualNetworkClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualNetworkClassic, AzureVirtualNetworkClassic)
+!define AzureVirtualNetworkClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualNetworkClassic, AzureVirtualNetworkClassic)
diff --git a/dist/Networking/AzureVirtualNetworkClassic.svg b/dist/Networking/AzureVirtualNetworkClassic.svg
new file mode 100644
index 00000000..cf82d033
--- /dev/null
+++ b/dist/Networking/AzureVirtualNetworkClassic.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 69.578125 35.980469 C 70.28125 35.28125 70.140625 34.160156 69.578125 33.460938 L 66.21875 30.101563 L 51.101563 15.398438 C 50.398438 14.699219 49.421875 14.699219 48.71875 15.398438 C 48.019531 16.101563 47.878906 17.21875 48.71875 17.921875 L 64.539063 33.460938 C 65.238281 34.160156 65.238281 35.28125 64.539063 35.980469 L 48.441406 52.078125 C 47.738281 52.78125 47.738281 53.898438 48.441406 54.601563 C 49.140625 55.300781 50.261719 55.160156 50.820313 54.601563 L 65.800781 39.761719 C 65.800781 39.761719 65.800781 39.761719 65.941406 39.621094 Z M 69.578125 35.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 0.421875 35.980469 C -0.28125 35.28125 -0.140625 34.160156 0.421875 33.460938 L 3.78125 30.101563 L 18.898438 15.398438 C 19.601563 14.699219 20.578125 14.699219 21.28125 15.398438 C 21.980469 16.101563 22.121094 17.21875 21.28125 17.921875 L 5.738281 33.460938 C 5.039063 34.160156 5.039063 35.28125 5.738281 35.980469 L 21.558594 52.078125 C 22.261719 52.78125 22.261719 53.898438 21.558594 54.601563 C 20.859375 55.300781 19.738281 55.160156 19.179688 54.601563 L 3.921875 39.898438 C 3.921875 39.898438 3.921875 39.898438 3.78125 39.761719 Z M 0.421875 35.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 25.480469 34.71875 C 25.480469 37.378906 23.238281 39.339844 20.859375 39.339844 C 18.480469 39.339844 15.960938 37.101563 15.960938 34.71875 C 15.960938 32.339844 17.921875 30.101563 20.859375 30.101563 C 23.660156 30.101563 25.480469 32.339844 25.480469 34.71875 Z M 25.480469 34.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 39.621094 34.71875 C 39.621094 37.378906 37.378906 39.339844 35 39.339844 C 32.621094 39.339844 30.101563 37.101563 30.101563 34.71875 C 30.101563 32.339844 32.339844 30.101563 35 30.101563 C 37.660156 30.101563 39.621094 32.339844 39.621094 34.71875 Z M 39.621094 34.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 53.898438 34.71875 C 53.898438 37.273438 51.832031 39.339844 49.28125 39.339844 C 46.726563 39.339844 44.660156 37.273438 44.660156 34.71875 C 44.660156 32.167969 46.726563 30.101563 49.28125 30.101563 C 51.832031 30.101563 53.898438 32.167969 53.898438 34.71875 Z M 53.898438 34.71875 "/>
+</g>
+</svg>
diff --git a/dist/Networking/AzureVirtualWAN(m).png b/dist/Networking/AzureVirtualWAN(m).png
index af5f19c8..32ab5671 100644
Binary files a/dist/Networking/AzureVirtualWAN(m).png and b/dist/Networking/AzureVirtualWAN(m).png differ
diff --git a/dist/Networking/AzureVirtualWAN(m).svg b/dist/Networking/AzureVirtualWAN(m).svg
index 4d8d9819..bb86994b 100644
--- a/dist/Networking/AzureVirtualWAN(m).svg
+++ b/dist/Networking/AzureVirtualWAN(m).svg
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
-<clipPath id="clip1">
-  <path d="M 0 0 L 68.539063 0 L 68.539063 44 L 0 44 Z M 0 0 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 0 0 L 68.539063 0 L 68.539063 68.539063 L 0 68.539063 Z M 0 0 "/>
-</clipPath>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
@@ -15,42 +9,23 @@
 <rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip3">
+<clipPath id="clip1">
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56.511719 17.171875 C 56.496094 17.171875 56.480469 17.175781 56.464844 17.175781 C 55.957031 7.609375 47.898438 0 38 0 C 30.769531 0 24.519531 4.070313 21.472656 9.988281 C 20.207031 9.703125 18.894531 9.539063 17.539063 9.539063 C 7.851563 9.539063 0 17.226563 0 26.710938 C 0 36.195313 7.851563 43.882813 17.539063 43.882813 L 56.511719 43.882813 C 64.046875 43.882813 70.152344 37.902344 70.152344 30.527344 C 70.152344 23.152344 64.046875 17.171875 56.511719 17.171875 Z M 56.511719 17.171875 "/>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 55.449219 17.921875 L 55.402344 17.921875 C 54.917969 8.796875 47.230469 1.539063 37.789063 1.539063 C 30.890625 1.539063 24.929688 5.421875 22.023438 11.070313 C 20.792969 10.789063 19.535156 10.644531 18.269531 10.640625 C 9.03125 10.640625 1.539063 17.972656 1.539063 27.019531 C 1.539063 36.066406 9.03125 43.398438 18.269531 43.398438 L 55.449219 43.398438 C 62.632813 43.398438 68.460938 37.695313 68.460938 30.660156 C 68.460938 23.625 62.632813 17.921875 55.449219 17.921875 Z M 55.449219 17.921875 "/>
 </g>
-<clipPath id="clip4">
-  <path d="M 12 21 L 61 21 L 61 68.539063 L 12 68.539063 Z M 12 21 "/>
-</clipPath>
-<clipPath id="clip5">
-  <path d="M 11 20 L 62 20 L 62 68.539063 L 11 68.539063 Z M 11 20 "/>
-</clipPath>
-<clipPath id="clip6">
-  <path d="M 25 21 L 48 21 L 48 68.539063 L 25 68.539063 Z M 25 21 "/>
-</clipPath>
 </defs>
 <g id="surface1">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 56.511719 17.171875 C 56.496094 17.171875 56.480469 17.175781 56.464844 17.175781 C 55.957031 7.609375 47.898438 0 38 0 C 30.769531 0 24.519531 4.070313 21.472656 9.988281 C 20.207031 9.703125 18.894531 9.539063 17.539063 9.539063 C 7.851563 9.539063 0 17.226563 0 26.710938 C 0 36.195313 7.851563 43.882813 17.539063 43.882813 L 56.511719 43.882813 C 64.046875 43.882813 70.152344 37.902344 70.152344 30.527344 C 70.152344 23.152344 64.046875 17.171875 56.511719 17.171875 Z M 56.511719 17.171875 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 55.449219 17.921875 L 55.402344 17.921875 C 54.917969 8.796875 47.230469 1.539063 37.789063 1.539063 C 30.890625 1.539063 24.929688 5.421875 22.023438 11.070313 C 20.792969 10.789063 19.535156 10.644531 18.269531 10.640625 C 9.03125 10.640625 1.539063 17.972656 1.539063 27.019531 C 1.539063 36.066406 9.03125 43.398438 18.269531 43.398438 L 55.449219 43.398438 C 62.632813 43.398438 68.460938 37.695313 68.460938 30.660156 C 68.460938 23.625 62.632813 17.921875 55.449219 17.921875 Z M 55.449219 17.921875 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-</g>
-<g clip-path="url(#clip4)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.542969 69.050781 C 23.476563 69.050781 12.84375 58.417969 12.84375 45.351563 C 12.84375 32.28125 23.476563 21.648438 36.542969 21.648438 C 49.613281 21.648438 60.246094 32.28125 60.246094 45.351563 C 60.246094 58.417969 49.613281 69.050781 36.542969 69.050781 Z M 36.542969 69.050781 "/>
-</g>
-<g clip-path="url(#clip5)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 36.542969 22.75 C 49.007813 22.75 59.144531 32.886719 59.144531 45.351563 C 59.144531 57.8125 49.007813 67.953125 36.542969 67.953125 C 24.082031 67.953125 13.941406 57.8125 13.941406 45.351563 C 13.941406 32.886719 24.082031 22.75 36.542969 22.75 M 36.542969 20.546875 C 22.84375 20.546875 11.742188 31.652344 11.742188 45.351563 C 11.742188 59.050781 22.84375 70.152344 36.542969 70.152344 C 50.242188 70.152344 61.347656 59.050781 61.347656 45.351563 C 61.347656 31.652344 50.242188 20.546875 36.542969 20.546875 Z M 36.542969 20.546875 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 32.597656 29.09375 C 35.019531 29.976563 36.269531 32.65625 35.390625 35.082031 C 34.507813 37.503906 31.828125 38.753906 29.402344 37.871094 C 26.980469 36.992188 25.730469 34.3125 26.613281 31.886719 C 27.496094 29.464844 30.175781 28.214844 32.597656 29.09375 Z M 32.597656 29.09375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 51.921875 42.753906 C 54.34375 43.636719 55.59375 46.316406 54.710938 48.742188 C 53.832031 51.164063 51.152344 52.414063 48.726563 51.53125 C 46.304688 50.648438 45.054688 47.96875 45.9375 45.546875 C 46.816406 43.125 49.496094 41.875 51.921875 42.753906 Z M 51.921875 42.753906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 29.042969 50.996094 C 31.46875 51.875 32.71875 54.554688 31.835938 56.980469 C 30.953125 59.402344 28.273438 60.652344 25.851563 59.769531 C 23.425781 58.890625 22.175781 56.210938 23.058594 53.785156 C 23.941406 51.363281 26.621094 50.113281 29.042969 50.996094 Z M 29.042969 50.996094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 25.957031 30.925781 C 22.132813 30.925781 18.441406 31.71875 14.9375 33.304688 C 14.324219 34.386719 13.792969 35.515625 13.34375 36.691406 C 17.15625 34.417969 21.507813 33.207031 25.957031 33.207031 C 39.578125 33.207031 50.660156 44.289063 50.660156 57.90625 C 50.660156 60.878906 50.128906 63.796875 49.085938 66.574219 L 49.039063 66.699219 C 50.085938 66.078125 51.078125 65.382813 52.019531 64.617188 C 52.566406 62.460938 52.941406 60.140625 52.941406 57.90625 C 52.941406 43.027344 40.835938 30.925781 25.957031 30.925781 Z M 25.957031 30.925781 "/>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 47.21875 23.226563 C 46.066406 22.667969 44.867188 22.195313 43.628906 21.820313 C 32.546875 25.484375 25.128906 35.703125 25.128906 47.425781 C 25.128906 56.652344 29.769531 65.125 37.539063 70.125 C 38.84375 70.066406 40.125 69.914063 41.367188 69.660156 L 41.246094 69.597656 C 32.710938 65.398438 27.414063 56.902344 27.414063 47.425781 C 27.410156 35.691406 35.734375 25.542969 47.21875 23.226563 Z M 47.21875 23.226563 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 60.296875 51.855469 C 60.519531 51.035156 60.699219 50.199219 60.832031 49.347656 C 56.59375 46.800781 51.796875 45.441406 46.855469 45.441406 C 35.109375 45.441406 24.582031 52.878906 20.660156 64.265625 L 20.636719 64.335938 L 20.691406 64.386719 C 21.21875 64.839844 21.78125 65.273438 22.363281 65.695313 C 22.449219 65.753906 22.53125 65.816406 22.617188 65.875 L 22.660156 65.746094 C 26.078125 54.921875 35.804688 47.859375 46.855469 47.859375 C 51.644531 47.855469 56.257813 49.25 60.296875 51.855469 Z M 60.296875 51.855469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.398438 67.410156 C 23.933594 67.410156 13.789063 57.265625 13.789063 44.800781 C 13.789063 32.332031 23.933594 22.191406 36.398438 22.191406 C 48.867188 22.191406 59.011719 32.332031 59.011719 44.800781 C 59.011719 57.265625 48.867188 67.410156 36.398438 67.410156 Z M 36.398438 67.410156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 36.398438 23.238281 C 48.289063 23.238281 57.960938 32.910156 57.960938 44.800781 C 57.960938 56.6875 48.289063 66.359375 36.398438 66.359375 C 24.511719 66.359375 14.839844 56.6875 14.839844 44.800781 C 14.839844 32.910156 24.511719 23.238281 36.398438 23.238281 M 36.398438 21.140625 C 23.332031 21.140625 12.738281 31.730469 12.738281 44.800781 C 12.738281 57.867188 23.332031 68.460938 36.398438 68.460938 C 49.46875 68.460938 60.058594 57.867188 60.058594 44.800781 C 60.058594 31.730469 49.46875 21.140625 36.398438 21.140625 Z M 36.398438 21.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 32.636719 29.292969 C 30.324219 28.453125 27.765625 29.644531 26.925781 31.957031 C 26.082031 34.269531 27.277344 36.824219 29.585938 37.667969 C 31.898438 38.507813 34.457031 37.316406 35.296875 35.003906 C 36.140625 32.691406 34.945313 30.136719 32.636719 29.292969 Z M 32.636719 29.292969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 51.070313 42.324219 C 48.757813 41.484375 46.199219 42.675781 45.359375 44.988281 C 44.515625 47.300781 45.710938 49.855469 48.023438 50.695313 C 50.332031 51.539063 52.890625 50.347656 53.730469 48.035156 C 54.574219 45.722656 53.378906 43.167969 51.070313 42.324219 Z M 51.070313 42.324219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 29.246094 50.183594 C 26.933594 49.34375 24.378906 50.535156 23.535156 52.847656 C 22.695313 55.160156 23.886719 57.714844 26.199219 58.558594 C 28.511719 59.398438 31.066406 58.207031 31.90625 55.894531 C 32.75 53.582031 31.558594 51.027344 29.246094 50.183594 Z M 29.246094 50.183594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 26.300781 31.039063 C 22.652344 31.039063 19.132813 31.796875 15.789063 33.308594 C 15.203125 34.347656 14.695313 35.425781 14.269531 36.539063 C 17.90625 34.367188 22.066406 33.21875 26.300781 33.214844 C 39.292969 33.214844 49.863281 43.785156 49.863281 56.777344 C 49.863281 59.613281 49.359375 62.394531 48.363281 65.046875 L 48.316406 65.164063 C 49.3125 64.574219 50.265625 63.910156 51.160156 63.179688 C 51.683594 61.125 52.039063 58.910156 52.039063 56.777344 C 52.039063 42.585938 40.496094 31.039063 26.300781 31.039063 Z M 26.300781 31.039063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 46.582031 23.695313 C 45.476563 23.160156 44.332031 22.710938 43.15625 22.355469 C 32.585938 25.847656 25.511719 35.597656 25.511719 46.78125 C 25.511719 55.582031 29.9375 63.664063 37.351563 68.433594 C 38.59375 68.378906 39.816406 68.230469 41 67.988281 L 40.882813 67.929688 C 32.746094 63.925781 27.6875 55.820313 27.6875 46.78125 C 27.6875 35.585938 35.625 25.90625 46.582031 23.695313 Z M 46.582031 23.695313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 59.058594 51.003906 C 59.269531 50.222656 59.441406 49.425781 59.570313 48.613281 C 55.546875 46.179688 50.9375 44.890625 46.234375 44.886719 C 35.03125 44.886719 24.988281 51.984375 21.246094 62.84375 L 21.222656 62.910156 L 21.277344 62.960938 C 21.78125 63.390625 22.320313 63.804688 22.871094 64.207031 C 22.953125 64.265625 23.03125 64.324219 23.117188 64.378906 L 23.15625 64.253906 C 26.417969 53.929688 35.691406 47.191406 46.234375 47.191406 C 50.804688 47.191406 55.203125 48.519531 59.058594 51.003906 Z M 59.058594 51.003906 "/>
 </g>
 </svg>
diff --git a/dist/Networking/AzureVirtualWAN.png b/dist/Networking/AzureVirtualWAN.png
index e2a31357..51f84568 100644
Binary files a/dist/Networking/AzureVirtualWAN.png and b/dist/Networking/AzureVirtualWAN.png differ
diff --git a/dist/Networking/AzureVirtualWAN.puml b/dist/Networking/AzureVirtualWAN.puml
index 92f680cf..228a1c61 100644
--- a/dist/Networking/AzureVirtualWAN.puml
+++ b/dist/Networking/AzureVirtualWAN.puml
@@ -1,12 +1,12 @@
 sprite $AzureVirtualWAN [70x70/16z] {
-jPM9biGe24LP18N__-0PgykqRpHBvvovlTPsyq0qT8TeiNyfHPbU8iLcb5x0u7ZfKTlnnxgAxH5w3XlmiYgxG5wKyxutOfSKkeP5X9di1hqSiSUyAM957uxf
-Yywe_HL-AK7afGJHYxw-RmpRAueAByF-qWJrl4UUHN7tMjrlsdnfQ963QDLF-omNYl7v6Awe9sdqqj5CcJfIBpnorfRM5ONfYtU1bSyVtzIq3nAPJMcWaHcz
-VEBkMUDiBJszqO7D3wLbnga59I5qK3CR4qZZtj8_HI1n0dJHKDb8wjXXFHKKTw9PLjf_aqXsZeUeQM0HGoA3jNXh4Vb5QQ7WIX6jJKbW58XKg8cm91yJwbPg
-3jgQXYFRR66i9zELH-g3q4rDamN3pAlAG-4zLML2vZ1uDhGCg7siaLI8iuJ1WpVIq7A4q7LkCYiSLFBRMwQvegBAur7xxsBLKLB1ixTcGEIW6PyqK1BZtQJ1
-ZkcFW4_l8Qk3vBjIaGNgLa8yuGsHjPS3i5gcq86C9c6_XOMFiBMC3q14nhOiH7QQVACv3S02NTXlvW_orEBhBcGPUoj-hbDlBHMk95OZ9wHRphBmri8McKYO
-d5H4cRAnVCjeLaHcMsrfj25Ibxxmn-4wMlv3y-mKsb2x7DUezFHb7kXEC5698pfIii64XUFzhUCnRayAYu7Z2XV5qmdtroXv9R8GDY1e0AN2ctTl6Bull9jV
-A6Y1ZtsS0zdMFGhRKxETMd0u5M8YF6O0DinkE0EZ89x1yyr8Jom6KHOYsxJG9vkM5UTsrpl_H55Hp-IjHMBrhtSh-huhJawgoA0RBBD-rqQx4HXRY-aEpnmP
-VBFKBJE4xh7VzxL5uv3aMZEs8GTUkCHJoJYRl7zS8aDdHnezHrjcXcbFazR5fPjXOfzvejDgBwB51sFw7_a7
+lPO7qkKW38F1kEh-zzqMClH_7jk-AQyaKIHZIlfVPFf1_YE5mbBXadzJWsM0ATt3ii3NHcJBNIoI0tGhiYVVnZdBt1VsliJv9tEUcV91Ytr0Ea8i7qFdDhs0
+BmRsTfYAN48NJgv6ASirl6snUvXfNvG_oYL_07rKMZLt3tSt_TeEombpz8Hz8NFKm4zSXN-WNdyTGkMpHkWRkpY0200k2yUoQ031gP8DWEP7B7INYGv6k7L2
+09hRTzkOeQs8vzQJG7IDeMigsgaOe5qt0PPw6F0bKjw8oFk0kR-IZJBBy3hIsXwhevjcobGRNhikOAcmcddWWTAC03gf5EbnX6D4qu8X9fKyvNaxLl1YYviy
+P2hpH0h0XUgT3QSbKqoBS1wijDPuaubjOaLdPbwclE-DKlCyKo3eP8RcnG4emqW08M_deqoLqLRRGKOHWsbEELMo0pmEaorR4w-12CZ3OwCCrqYqBE7HtoTp
+rzeGYe0gCc_KGvyQPEsrpXsWmdbpy026ifGq4N0nBU-F_MwTWU77SXEXcv_Utd9M8I0jz3FBZYhHzroCSQNDSkHVAdpoibSX3GneFYTAUnMETvvxq_4IeBIb
+lq28fb7dEQ4IDTSM1q_L9N_yL-mHAQaOWBH7eBsAYxmQBuftNr54cfXhqSp775vXSskV2nDLvFWcWD81VICnAldG3WnF4-jgeAYKD0DGNNoEM3KZgD0-DSzP
+PpCq57TNkrAjd55uNzsoLx5wruaSq2THD2jp8fwIhXH0KW8aPSBEDy3jL75409R7XUn7UZhHx57WVLci-MaHERkf7cZTMdqLERkfHxaooT378dLHyL9zITCm
+j9-VfdB9tUamimEmd6x8Mi_-1eI8UZqFNSE6HhNsMnHHy_Y1bVJF-Gu
 }
 
 AzureEntityColoring(AzureVirtualWAN)
diff --git a/dist/Networking/AzureVirtualWAN.svg b/dist/Networking/AzureVirtualWAN.svg
index 371a1e14..8882d629 100644
--- a/dist/Networking/AzureVirtualWAN.svg
+++ b/dist/Networking/AzureVirtualWAN.svg
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
-<clipPath id="clip1">
-  <path d="M 0 0 L 68.539063 0 L 68.539063 44 L 0 44 Z M 0 0 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 0 0 L 68.539063 0 L 68.539063 68.539063 L 0 68.539063 Z M 0 0 "/>
-</clipPath>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
@@ -15,42 +9,23 @@
 <rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip3">
+<clipPath id="clip1">
   <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip3)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56.511719 17.171875 C 56.496094 17.171875 56.480469 17.175781 56.464844 17.175781 C 55.957031 7.609375 47.898438 0 38 0 C 30.769531 0 24.519531 4.070313 21.472656 9.988281 C 20.207031 9.703125 18.894531 9.539063 17.539063 9.539063 C 7.851563 9.539063 0 17.226563 0 26.710938 C 0 36.195313 7.851563 43.882813 17.539063 43.882813 L 56.511719 43.882813 C 64.046875 43.882813 70.152344 37.902344 70.152344 30.527344 C 70.152344 23.152344 64.046875 17.171875 56.511719 17.171875 Z M 56.511719 17.171875 "/>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 55.449219 17.921875 L 55.402344 17.921875 C 54.917969 8.796875 47.230469 1.539063 37.789063 1.539063 C 30.890625 1.539063 24.929688 5.421875 22.023438 11.070313 C 20.792969 10.789063 19.535156 10.644531 18.269531 10.640625 C 9.03125 10.640625 1.539063 17.972656 1.539063 27.019531 C 1.539063 36.066406 9.03125 43.398438 18.269531 43.398438 L 55.449219 43.398438 C 62.632813 43.398438 68.460938 37.695313 68.460938 30.660156 C 68.460938 23.625 62.632813 17.921875 55.449219 17.921875 Z M 55.449219 17.921875 "/>
 </g>
-<clipPath id="clip4">
-  <path d="M 12 21 L 61 21 L 61 68.539063 L 12 68.539063 Z M 12 21 "/>
-</clipPath>
-<clipPath id="clip5">
-  <path d="M 11 20 L 62 20 L 62 68.539063 L 11 68.539063 Z M 11 20 "/>
-</clipPath>
-<clipPath id="clip6">
-  <path d="M 25 21 L 48 21 L 48 68.539063 L 25 68.539063 Z M 25 21 "/>
-</clipPath>
 </defs>
 <g id="surface1">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 56.511719 17.171875 C 56.496094 17.171875 56.480469 17.175781 56.464844 17.175781 C 55.957031 7.609375 47.898438 0 38 0 C 30.769531 0 24.519531 4.070313 21.472656 9.988281 C 20.207031 9.703125 18.894531 9.539063 17.539063 9.539063 C 7.851563 9.539063 0 17.226563 0 26.710938 C 0 36.195313 7.851563 43.882813 17.539063 43.882813 L 56.511719 43.882813 C 64.046875 43.882813 70.152344 37.902344 70.152344 30.527344 C 70.152344 23.152344 64.046875 17.171875 56.511719 17.171875 Z M 56.511719 17.171875 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 55.449219 17.921875 L 55.402344 17.921875 C 54.917969 8.796875 47.230469 1.539063 37.789063 1.539063 C 30.890625 1.539063 24.929688 5.421875 22.023438 11.070313 C 20.792969 10.789063 19.535156 10.644531 18.269531 10.640625 C 9.03125 10.640625 1.539063 17.972656 1.539063 27.019531 C 1.539063 36.066406 9.03125 43.398438 18.269531 43.398438 L 55.449219 43.398438 C 62.632813 43.398438 68.460938 37.695313 68.460938 30.660156 C 68.460938 23.625 62.632813 17.921875 55.449219 17.921875 Z M 55.449219 17.921875 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-</g>
-<g clip-path="url(#clip4)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.542969 69.050781 C 23.476563 69.050781 12.84375 58.417969 12.84375 45.351563 C 12.84375 32.28125 23.476563 21.648438 36.542969 21.648438 C 49.613281 21.648438 60.246094 32.28125 60.246094 45.351563 C 60.246094 58.417969 49.613281 69.050781 36.542969 69.050781 Z M 36.542969 69.050781 "/>
-</g>
-<g clip-path="url(#clip5)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 36.542969 22.75 C 49.007813 22.75 59.144531 32.886719 59.144531 45.351563 C 59.144531 57.8125 49.007813 67.953125 36.542969 67.953125 C 24.082031 67.953125 13.941406 57.8125 13.941406 45.351563 C 13.941406 32.886719 24.082031 22.75 36.542969 22.75 M 36.542969 20.546875 C 22.84375 20.546875 11.742188 31.652344 11.742188 45.351563 C 11.742188 59.050781 22.84375 70.152344 36.542969 70.152344 C 50.242188 70.152344 61.347656 59.050781 61.347656 45.351563 C 61.347656 31.652344 50.242188 20.546875 36.542969 20.546875 Z M 36.542969 20.546875 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 32.597656 29.09375 C 35.019531 29.976563 36.269531 32.65625 35.390625 35.082031 C 34.507813 37.503906 31.828125 38.753906 29.402344 37.871094 C 26.980469 36.992188 25.730469 34.3125 26.613281 31.886719 C 27.496094 29.464844 30.175781 28.214844 32.597656 29.09375 Z M 32.597656 29.09375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 51.921875 42.753906 C 54.34375 43.636719 55.59375 46.316406 54.710938 48.742188 C 53.832031 51.164063 51.152344 52.414063 48.726563 51.53125 C 46.304688 50.648438 45.054688 47.96875 45.9375 45.546875 C 46.816406 43.125 49.496094 41.875 51.921875 42.753906 Z M 51.921875 42.753906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 29.042969 50.996094 C 31.46875 51.875 32.71875 54.554688 31.835938 56.980469 C 30.953125 59.402344 28.273438 60.652344 25.851563 59.769531 C 23.425781 58.890625 22.175781 56.210938 23.058594 53.785156 C 23.941406 51.363281 26.621094 50.113281 29.042969 50.996094 Z M 29.042969 50.996094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 25.957031 30.925781 C 22.132813 30.925781 18.441406 31.71875 14.9375 33.304688 C 14.324219 34.386719 13.792969 35.515625 13.34375 36.691406 C 17.15625 34.417969 21.507813 33.207031 25.957031 33.207031 C 39.578125 33.207031 50.660156 44.289063 50.660156 57.90625 C 50.660156 60.878906 50.128906 63.796875 49.085938 66.574219 L 49.039063 66.699219 C 50.085938 66.078125 51.078125 65.382813 52.019531 64.617188 C 52.566406 62.460938 52.941406 60.140625 52.941406 57.90625 C 52.941406 43.027344 40.835938 30.925781 25.957031 30.925781 Z M 25.957031 30.925781 "/>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 47.21875 23.226563 C 46.066406 22.667969 44.867188 22.195313 43.628906 21.820313 C 32.546875 25.484375 25.128906 35.703125 25.128906 47.425781 C 25.128906 56.652344 29.769531 65.125 37.539063 70.125 C 38.84375 70.066406 40.125 69.914063 41.367188 69.660156 L 41.246094 69.597656 C 32.710938 65.398438 27.414063 56.902344 27.414063 47.425781 C 27.410156 35.691406 35.734375 25.542969 47.21875 23.226563 Z M 47.21875 23.226563 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 60.296875 51.855469 C 60.519531 51.035156 60.699219 50.199219 60.832031 49.347656 C 56.59375 46.800781 51.796875 45.441406 46.855469 45.441406 C 35.109375 45.441406 24.582031 52.878906 20.660156 64.265625 L 20.636719 64.335938 L 20.691406 64.386719 C 21.21875 64.839844 21.78125 65.273438 22.363281 65.695313 C 22.449219 65.753906 22.53125 65.816406 22.617188 65.875 L 22.660156 65.746094 C 26.078125 54.921875 35.804688 47.859375 46.855469 47.859375 C 51.644531 47.855469 56.257813 49.25 60.296875 51.855469 Z M 60.296875 51.855469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.398438 67.410156 C 23.933594 67.410156 13.789063 57.265625 13.789063 44.800781 C 13.789063 32.332031 23.933594 22.191406 36.398438 22.191406 C 48.867188 22.191406 59.011719 32.332031 59.011719 44.800781 C 59.011719 57.265625 48.867188 67.410156 36.398438 67.410156 Z M 36.398438 67.410156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 36.398438 23.238281 C 48.289063 23.238281 57.960938 32.910156 57.960938 44.800781 C 57.960938 56.6875 48.289063 66.359375 36.398438 66.359375 C 24.511719 66.359375 14.839844 56.6875 14.839844 44.800781 C 14.839844 32.910156 24.511719 23.238281 36.398438 23.238281 M 36.398438 21.140625 C 23.332031 21.140625 12.738281 31.730469 12.738281 44.800781 C 12.738281 57.867188 23.332031 68.460938 36.398438 68.460938 C 49.46875 68.460938 60.058594 57.867188 60.058594 44.800781 C 60.058594 31.730469 49.46875 21.140625 36.398438 21.140625 Z M 36.398438 21.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 32.636719 29.292969 C 30.324219 28.453125 27.765625 29.644531 26.925781 31.957031 C 26.082031 34.269531 27.277344 36.824219 29.585938 37.667969 C 31.898438 38.507813 34.457031 37.316406 35.296875 35.003906 C 36.140625 32.691406 34.945313 30.136719 32.636719 29.292969 Z M 32.636719 29.292969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 51.070313 42.324219 C 48.757813 41.484375 46.199219 42.675781 45.359375 44.988281 C 44.515625 47.300781 45.710938 49.855469 48.023438 50.695313 C 50.332031 51.539063 52.890625 50.347656 53.730469 48.035156 C 54.574219 45.722656 53.378906 43.167969 51.070313 42.324219 Z M 51.070313 42.324219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 29.246094 50.183594 C 26.933594 49.34375 24.378906 50.535156 23.535156 52.847656 C 22.695313 55.160156 23.886719 57.714844 26.199219 58.558594 C 28.511719 59.398438 31.066406 58.207031 31.90625 55.894531 C 32.75 53.582031 31.558594 51.027344 29.246094 50.183594 Z M 29.246094 50.183594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 26.300781 31.039063 C 22.652344 31.039063 19.132813 31.796875 15.789063 33.308594 C 15.203125 34.347656 14.695313 35.425781 14.269531 36.539063 C 17.90625 34.367188 22.066406 33.21875 26.300781 33.214844 C 39.292969 33.214844 49.863281 43.785156 49.863281 56.777344 C 49.863281 59.613281 49.359375 62.394531 48.363281 65.046875 L 48.316406 65.164063 C 49.3125 64.574219 50.265625 63.910156 51.160156 63.179688 C 51.683594 61.125 52.039063 58.910156 52.039063 56.777344 C 52.039063 42.585938 40.496094 31.039063 26.300781 31.039063 Z M 26.300781 31.039063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 46.582031 23.695313 C 45.476563 23.160156 44.332031 22.710938 43.15625 22.355469 C 32.585938 25.847656 25.511719 35.597656 25.511719 46.78125 C 25.511719 55.582031 29.9375 63.664063 37.351563 68.433594 C 38.59375 68.378906 39.816406 68.230469 41 67.988281 L 40.882813 67.929688 C 32.746094 63.925781 27.6875 55.820313 27.6875 46.78125 C 27.6875 35.585938 35.625 25.90625 46.582031 23.695313 Z M 46.582031 23.695313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 59.058594 51.003906 C 59.269531 50.222656 59.441406 49.425781 59.570313 48.613281 C 55.546875 46.179688 50.9375 44.890625 46.234375 44.886719 C 35.03125 44.886719 24.988281 51.984375 21.246094 62.84375 L 21.222656 62.910156 L 21.277344 62.960938 C 21.78125 63.390625 22.320313 63.804688 22.871094 64.207031 C 22.953125 64.265625 23.03125 64.324219 23.117188 64.378906 L 23.15625 64.253906 C 26.417969 53.929688 35.691406 47.191406 46.234375 47.191406 C 50.804688 47.191406 55.203125 48.519531 59.058594 51.003906 Z M 59.058594 51.003906 "/>
 </g>
 </svg>
diff --git a/dist/Networking/all.puml b/dist/Networking/all.puml
index f60383ed..fd7727da 100644
--- a/dist/Networking/all.puml
+++ b/dist/Networking/all.puml
@@ -1,60 +1,117 @@
 sprite $AzureApplicationGateway [70x70/16z] {
-fTS5OkH034JH4fNkV-AWnsfRcvNJ-SFqnWmOKYV3yBU2t-dVaMBsaMBsaKgtaSRi8k4UnMmXeVXAR8-9mr2F21V06_CG4PWYoEDvOnuXNm-2O9YA78pz3g72
-lYt1Pw9macc_GXnQus11KkHJMPWPeOWgIQbt0ixCPqpznC0GGFo4DR-ofmWT4VXCISfhIkNAp0WDT02GSt4BEd9bPeGAAZxZLr-UWoip8pJG040kIfxP4uGE
-Sb4SegB8cIdacAs06U0dB9ep4rmJSIZfW40FE7BDPeGEhHLGWmoHl6OZGifhPF2T8B8n4y9uAIx628LbomQacEyAwSoAz481Ys2u0jw9ObQaPpWIvW_PY3ZE
-D0TcH6PcHcP61-GX8peZCqCVa8VCDRiXeW0WSMCO_rLWLuJVIbuPmgzAt1JO1Sb3kJ34NR6x0bkGKXQ6Q0gQ0bsGKef1KnpQb1KffPYc4BWoAx8gnNI5WXjp
-GqefffH2Rim5QKfwANUac59W_rA8KXQaCIWccqAKiY2TGMLtXQXyGJg3bIcba58AQKoSjNd4jK8wK-LHAQr2ElDS8Mur9fio8ft9MIcafwDIoCHaLpeoCTaK
-T6HaVZeu4HOofbdCDjAPZcmm7TbWEhB1T6IBQSWUqv0zvaG2s6Mgm4xQaNsc8_jCO3zjo5OIdmQdazPt
+fTC7hkCm38JXOHlU_yQBLC8KiFEI_2Zkdvi4aITPWTygFlBV4SreH3CQqOn65lCzKfab68MKuvx5Tqmz3S-g2WDoCNz63E4eyhc-c3yYG966OeMRFPdu3A4X
+7fRXbZcIP2z680cVTuYwiNPJXe56QEPEqcPF8TdzDsOk2R0Ci7p3tZqCDC842xUSf3ts1den0c602G3s7cx5H2z687JGSOltxbw2Yn480mm0i8lIFGmqmWI9
+KHBcvkZ528I5910Ev1isxyK8X3HBE9c0mPzmzM8KmeJF1FGYownRCSMLlLu6ZmpLcv48wwMa1QiSqKSXa64U3R8OWP3biAXYfGFPBPX1Le5dnfuMev34Es_1
+I4Gp6j6C2-IFZBb6DCCKo1-PQx4GSm2mMWphlmhYYl2Xz9KXyghKKX0Nf9_AXI6s4bj1S91HUXZYK70eS0mooZ0ub8GV2Z38ACCS2e4h0moob66MGiDY5ZBA
+CACCifY5BALpb8qCCmg2F1LYb0ko60pJXqACSa4sWocsGYnbaCLWCwCGInbaC_MEv5B8QP3D76TTbTqW9_DtXTXjfhL2G32j5GAAqGe1nRHK22Yc3mKQsSnB
+2QoCWsYcJqOZcj68PZIY6OtydT68PZIYcOLyoxoH0hvZ9ereHYEQqOXcDA8PZUYiRWO3_-yV
 }
 
 AzureEntityColoring(AzureApplicationGateway)
 !define AzureApplicationGateway(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureApplicationGateway, AzureApplicationGateway)
 !define AzureApplicationGateway(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureApplicationGateway, AzureApplicationGateway)
 
-sprite $AzureAzureDDoSProtection [51x70/16z] {
+sprite $AzureApplicationSecurityGroup [70x70/16z] {
+hTM7jQGm341HIPOL-wzt4xCSVw97S0juu0otaE45QlH6n1vdIEqlXYUwVIX14NORIAdJn3QKlmfXwsh7f5sNa8WQSnUr6ohIkJMYWw3OjCYF9nNF5oeURrGY
+NwX4lb3nVA7YKQhi8yyhaRELpgUw_EFt5OHxVbk12JPH8Jtc2vchjEkPrL95-X0fLeG0WCqywnLjy0zAr2iCg-Rb2i4AjLmnGLXmH1Gho6Ry6OvthLQGkcb3
+ZH3cUWMngKKeyxCAeaNdDohyl49lLEXnfVsDh1KlLapQMf78QiL3befuPhNYaHdTebjchR941jLAv9CAqZ_j14rLNdcFEjpYEArq-o4M20k9GNu4xF3XuqF3
+67OSTfeDF6Sg2djZ9BPVwtc0OK_6IBYRAIFyrsIeBm8Eq3Wf0OTaDw0TNIDJbK0uWkFCnh6X8d2i3pDxo-6CpaU2u28JEOVX77hEwN258cS8G3spZzG75Hqc
+s4samHJ92qumYIFFACn3oqF1y9KUkQS8NqAjJEjUyno4GCquouPGrsDf43o24XEDtm
+}
+
+AzureEntityColoring(AzureApplicationSecurityGroup)
+!define AzureApplicationSecurityGroup(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureApplicationSecurityGroup, AzureApplicationSecurityGroup)
+!define AzureApplicationSecurityGroup(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureApplicationSecurityGroup, AzureApplicationSecurityGroup)
+
+sprite $AzureConnection [70x70/16z] {
+fPS9bkGm24Cj4Bd_ZMVDA4qv932jtfVw5hBD2-j1vemuVYleXZMNCOvFqKS8y2WKDcBKyXOZyk91dkb8xtxya6X8KSU5nhEH2u6rwm9vnuY_PiOIGZ4wkU4H
+mlKYUyA4Dk1LKM9Ofby7Y0Aof5PLjt2kjkncLRIT40dZAQusX4IoRv_re0MvCCpHGDGEvCA4Qj9FR4F8j3g-_Z2081qFVldU9n19wylA5A9jeRxpDiIM93Fw
+PWR9PcmjawafH77mp1PDYDyt2Nr9ChGWAWdhfY2Gw41KajiPJuQGQ42qIt4woX1X4WLrz-GM2q_jPkgUluLhd67y7oLM5rEsJb5wc9h2zGqCCgMFgIbzJ2EN
+ESPkzcYEyUtKZJ7gjxe1VOnjDq2tSPVlrx3ecO6owrg626DtpIvjKWcHYDl6gtWRaEfAdp2VGd8i-lgV47c8ecSs8EUBhoCyX-YrL6a7RY1SBIkuQeif99KX
+Cpw7g0eXzHFw42gL_H4JBOWMpvVXeg87mVR0wpcQFYJs4dNsq9vBzhZbfZ-ZOZCumQ2QfN3qPnkhbqHxMcRwnmB3bf5wjNWVOgqUOINFGtazbiURtLFXjf8W
+H39Rsn69RWQOEKLeZfVWyQZ0wgdWAB2kx1OKtYVaD4MWhL8_0G
+}
+
+AzureEntityColoring(AzureConnection)
+!define AzureConnection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureConnection, AzureConnection)
+!define AzureConnection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureConnection, AzureConnection)
+
+sprite $AzureDDOSProtectionPlan [51x70/16z] {
 lT454jim48NXvGqellzn6z1KYcjuM_g74jkVaFOogcQXPH4X9U7nod0WqNC1WNS08hPOvSgq6wl5PcuoCsOHKJNtECxTL4IOEU2o5_-IP9bacUJ_8BbFydhx
 fMj67f3RVQDR7f7xPdNIJadxwld_bBIhUPi3I9ZTsiyU3Peb9j49i9SX03Bgl4OQIAPbBSkZmTllucdWG-xYMIjSvKUWXpmcmGzvo09f9VAvzXv6uj8tKZda
 -p92I9gDIS13lhLbX6z_1CtoFqWharOcxPyG_oOD8FPb4Y6giu08yoGW4aHU94h4Gq24djaGs-I-ckJP47dT8jSSERsJGVAoKKunVTAdm1AYde52QUIGC9ep
 J1IDqZg5TpwI8n1CMt7i2gUz5DW6D94p7MRm52FsrMKWISm71QOT21Mo9r3QxWS
 }
 
-AzureEntityColoring(AzureAzureDDoSProtection)
-!define AzureAzureDDoSProtection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAzureDDoSProtection, AzureAzureDDoSProtection)
-!define AzureAzureDDoSProtection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAzureDDoSProtection, AzureAzureDDoSProtection)
+AzureEntityColoring(AzureDDOSProtectionPlan)
+!define AzureDDOSProtectionPlan(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDDOSProtectionPlan, AzureDDOSProtectionPlan)
+!define AzureDDOSProtectionPlan(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDDOSProtectionPlan, AzureDDOSProtectionPlan)
 
 sprite $AzureDNS [70x70/16z] {
-fLY9Skim23G2SUZ_F_XDZBec-DMzTeuq2hEiO7Nr-1p4ekOHAznjoZX-3bPV3M52Fw4O6kl_CFusXwq7X7o7Wwmb9s9xv_bQpunLu6FBooB51_LJVH2zNERv
-SKMVSfGrlfwMH7BmGV7wF0fEVZvey-Yd98ffdwcZwjwyA1nqTjYLX5z_5TKOcv1SQJf9CEJR_m8YTVcgMZk9qvKsszFdDClaxsgqMjDHlXO3CMa8xpQ1GuIE
-iQLqq6wJ63nvgnpWZZGDbhyMp3xZc5wfT0eJ8OA6J7qZyBFQenM5ZuCjrWqHwuwOupZUDOzYnlJuCqB7hMd96Sth3s14Id4Dvq_0AyCWbcaENRbfyWY4Takq
-benK1X0roymI2p7T7L99EwIPn98rwRq6kZlITOo8WD0gFB1yVmFV7acstqAolfeVlmMbYAjt4YVSvi0sxAwKVrl4p47ro0CEzHtdEgNz7J2wLaQW08hLZmRd
-zycxGs1134PcPP5YONJ9vbKMoxmasFyDZ60vtJg85HPxHHGpsjksAZdY-JjO5e9ghosrWGKgFKViDKfW8R00jZBNg2pWtrfUZ7ffYPinT1-z4M5WmIyZMSvS
-11RRXsT2tJsk0nmiL_iuMR89O24SmYZ_4mkqfA-IfTnCx96bpoWhQc31BSaQYun1drRtWpDP4iEtumSpxnxTEqrNfttNmi22D7HrsbvQEeiMrtsKAGfBZXJ2
--meuIBSKi1ou-R0WJvGL86-hCLJL0cSUMEO7YouNogKcnUTbnxT-ZTmi4AD9XwuYWMANAYoUQIeBxxLDlXBwll4Q5ZNn2sCS035J_tDCCnL2IFPS_hvx-oOR
-lsRnFHLhQztS_LDMSdThfzeY5AuTciyJU0ysY6gsjAFYyRJ7ELJ5rCDoiCWy8I8y27q53D9kT-JJ3kgnEi8LfrUx-RGlwUv7ACJ4Mtgy7MZw-WR26FiszVT6
-VvEvgUghBAfg7ls6AFt98Ql31XqTG-zXlOD8mlFryQbHHvcrtmEIuk5wnLVv8iF7pTfblT_5T7jIzCSinZ5FwcBwgucZLRQfyN7huTqTStMIJeDpj2ycC7Cy
-lyqDZ-Mv-igMFJAi5VRfGUrDCwytOzgt7lU1ArsrfKNxZyMp7C0Pv_i5fUCPi1GGPj7Mnl4zWEU6KFhDVuFwXl1Ja6XzgwaypEGV
+bPS9bfmm34H1gotV_xw9LPWHzFwpzMFWjrIMWMolsLdDlKtSL6Zx7JPlTqpsNnIaxGNENpki9Qx2j0DYiGRqAuUZUWWkiE9dyb6YMOLKHOMp8gVtXS2n5qY4
+hvvFRKcUGDNXwRrwV1vwkLoMnHwdveNI3YIF7OrY2UcrHE4GTogIzGDRXSfBZUTNmj7QB8KREAiXD7nywloyakmYnyMGIMLUhUqyoti4lPHmkQG2yLztrCU8
+MyIo95glkC9_FwOvpNsC_Z0dKiQ1CyeR3ZM6aeWunl1gWGIGEiw_0xTdl3IH64CkOs_x3MaFwBuWO6D4wGTnycrkcKKq4S7sFYLiRMhw65OcHLOF9hH_WgsF
+CHpH19sbE2OJEBzJaFOOan0YyWoub2ANCLL53xL1oOPZ7FJPKupOIobqdT86tDtCtFtqKnyBou2HZ9PIG0Rz5DspYOCuafcMykN0cLdRKsQYEYx5j9mPngn8
+-mBa2bOoCaRBROXv_qq21Fdc2j6PhKzQmRryIaaqCrywnsBpZXMILkzU90rWkn-tQyaeS3DWU08vAMDx8Ctz_aJ9ZtPOU9HvRoDX8XwZ7Uliox8BymxDikn_
+bi1ZpsXPD8FfHxXjMUHysi1o5DCjBVD0JbsBls3wY1ekB4iZQTbf5jC35ajBeQLbE4RrOi4dWcKADSPVBLGr7NE7WITclbZcGm8TPLZBWfqdXyTKjLWcTB78
+dsLsOR3CCKqaOo7mbQNFASfS40JMhN-sr8vwj9dCiepmzF3LyZpTkJAmn1Z_bJiim3SSxxqtM1pfNYoudF7F4GOLIovugojjp-Obc_TboMBGHCHfwVW4Ys9s
+7HPKe3jAEIrzMNYtsSbS_Be3Gh0R3PRhCxVtmp9aMURov5b-xaQQVPLRNR78bCHfYJnMjhJztNdpS2ln6az4xRYpXR2Ef0ldn7QbV2ILkvJDKcq5Ku7aCu9m
+z-q8HdwNe27EyFVI4b1cjkUIBY8sxeyrnLpWBGaWRHrFGGwr58hPqFb0elhEHFBSWXj1BKNNFc_tOl8h8fgRgif4LSrR1EFBIobzJRRS7lTTPcZq0ZujYbBw
+zQsE8J6Xjx2s5BKZ5Ic3IkZ9UASlq1RPZwCKu0Xu5zfF2Qkrth698w8tlnJ9Z9VCeCVNNKX4iJrkO4sKBn7PxNze18buZ62a3sxZ4Lq9zDLFwScpdLOdeL8F
+Xk1-M_jPpsAdYPTHADHZa3ZkEtTDxzcopa0LsLNEi1elYMvtg1rv4CzISMAX7QM4dYNxzWZ7gfMa3qVd9ntl_M6qlgWiJuMcnjTOoKNJEULAYSGhoNfiTg62
+O-gS2knPzVOIoqkuNcAj-KLiaGrkRv2edafrX6qVm6bDwG7CDGhvoCgYcJox8OmksrVi5WD4T13hIEFjUmHVVAFhllq8Q-i370s-Llm3
 }
 
 AzureEntityColoring(AzureDNS)
 !define AzureDNS(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDNS, AzureDNS)
 !define AzureDNS(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDNS, AzureDNS)
 
-sprite $AzureExpressRoute [70x42/16z] {
-fPO74hCX24H34_3-z_sBc_6RTCMNtjxWMiZjEsIH6Orl9rXsq0uahK-YB548pggXx03mIIaXukE9rLD17dwGZCyAfFyZwnQ4gWUrsAY04JDy1RWFt35NSZ2Y
-YpYLWA1Z2JH5ISI8E6eQdraGCrslgIHvtjv9snB7goTDKVAigKg0tJLSaDGqCIKBceBaILEI05tHn3ofVsbaHLBHO9dJ9LdJaAZGKmUCIxAc2KI8Y3ZxPlUI
-Xr-abYJFcYv85Cp6iLqDAHuTifH5O773psosFUtRw6oWEHjvR3fmXj5uEYo4lLot13950zo4PmDjY8Sb-ZPfYfyxTx1vgiPJpEtnvIBy752K_hlfym3QjI70
-tl9rkfVN8ZDijmkhPqORvynV
+sprite $AzureDNSPrivate [70x70/16z] {
+fPO7mfim34QjwQ4azpzkAzbWWWd_UjsKl6XyZ7G9a6WkJbPXIBy09PSJWZzqy51aLHLLtOpy4qTnX14cIDAFVhUNx4KGh92wXxuZyQ_KwK0UDKsFVka0BuHX
+fpV7uUkUN4g6BoJ-LHXdHprQEh8V0VHZU3kI-DvUkGA0b60SrJ4jlXyEZDFHFuq0L2O4W5kXL6gZEmcDrel4foQvbpREQDO-DPN7ASN1lP_P4-v_uMRruufv
+M-SiPHAJYH0WefZb3vEL6HAC8Ix5z2qvsOml-ya-KC6PUHPHrRYMX0ctuoY2YDNQAk6-1iyK8tm6kJHhX3uQNIpb692CdnovcLEZfmPNfSo0881c5IOY_0yH
+iwX_JREE8b8pMQQYiOCPZhA2W6LOMYzcMT2n58qzBn2YsYo6pUYSbIZbbjh-OuTYwYapUOtPAh4ts0jhfok8HinKd7r0sr-5Opj5cBNhCYAPOPfGAJWQceSS
+Y6xZC9arJa7TMcecorZAi03qBeSJkexCKmRCaCfewJGOzTtYPeabzKzlMQfXmIYZZUG9Oh5wJikqZ3_LVqS_K2qi49QD78avnv_UB1mrf4IK4hTk8IzmjvH8
+pydYwBH8IXWMxtnOea7C8tIuMkHiqSqILNNBc2MrpI9cS5DBM2WirGTOkyMQn4eFjS3tvXAPuB24nuTZrchLSqTvjS3O4LdiORV4lsBL6Zkwoqj1NyUmz82I
+DMrcaH0lfR9RwiVi4k78RksM1c6fAR48n0aGSCvfmkjr12wnRZ4DIwyUJbnUqq9El8xLPaBPGaDKV4EulnAf2kF9ipx6GdAcaYkqFLyTKpngzFrUbtE-adZR
+88_NWMVsOzVtNGRWLL8HWEnrui5TCzER3tVlTYNXMSWiHqApFeyo8DPMIrQLGBNuJ3W6ig2xfXmVI1KH2Ky0qEDGmK7ut9kI_NMfAEC5072OYIMqmsmmBFET
+8JC23kAbmP78XhmcEK5vJGeC3NbFmMX7cqqQ0ZxUBVauOGBOCyCX8QsjFyqd6K1VgsKjPhpN8RVzQJuHW7PdUUmMw0_qhf7tOWXmB4MvJikZrA6XGu9h4vzA
+wUyvUXmBlO8Q9weao2rUeeT6mn9Giz2WrBYp5XlKVKEM1Z1e-s3IXkU-OFTGQ9RX6iEqS7cyLal2QbOPTtACMl5jHGz5jt3jevgMYM-cpFYJPYNicPjWWdbL
+BHR7LzGAd_FFhuacG8AvwpdT0zhRu3SBpa-qbA0QlaM85qi2zyIZgsIdL3vSYy-KGA87VEp7q2qB57Ezl08e0Vb8v32i2iEoW99hLxMQ8S8R0A2DxyVT798R
+-l_376RLCG_JjfPoJqnXPTuOlcc9QTpSUB-haMj92SdtDVhygoGq_BXy747wcGRBUpcLVYe93L2PYVsv8u20T3otu1UIcxUWd_F9yGy
+}
+
+AzureEntityColoring(AzureDNSPrivate)
+!define AzureDNSPrivate(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDNSPrivate, AzureDNSPrivate)
+!define AzureDNSPrivate(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDNSPrivate, AzureDNSPrivate)
+
+sprite $AzureExpressRoute [70x70/16z] {
+xTP7aiGW341HK7JW_jUTGCccn0gBoSFVzsidGEctj5gjCa2UDL3qFPf2MAzW4h72jqMgBOagwi8O0leUvuJw7a_SaBHRcr2uNTNijU24WjS71rClILqKH7Qd
+d112IjcqTPGJGaWv6tEK4c2qr7QfXfob61D0Zfmo0AJ4nPWOOZKcZ7WcW0GPZmGPZmGPZmGPZmGPZmGPZmGPZmGPZmIOJA8gD8OqXbXK6ViJS1z1Z6cxXjGV
+YDxjXWmmfxR0dyLwL6I0CSHAMLr3YDr0YqZVOxH1PJ_6iby3QKtk0z2Up53dVVvZDmvKTXjJZdPOTWfFA7AzSdX-HtIF4tPVp5gJmRGc97Q4QsZimcxCGWsD
+WDBzDsbe79Nk1k2wonoQG2bPGCm4wM4PYGbp-a6jLgjN
 }
 
 AzureEntityColoring(AzureExpressRoute)
 !define AzureExpressRoute(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureExpressRoute, AzureExpressRoute)
 !define AzureExpressRoute(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureExpressRoute, AzureExpressRoute)
 
-sprite $AzureFrontDoorService [70x61/16z] {
-lTTNYiD048JXwgXq__kkSowZzZJxFuiFJOJ1nqGzyb2u2NvC8nyA7JBkrHtF3pbgHNvE2eOGuyg87fBwdzoJ-uI5bH0UTpGh2L6o45r_omucoyd-MPcdfEtS
-j1cvhNDXfO8fsxPEktycgN9e8OwLb8EJdmfoX9X2fgUeaEdHoeZei8ni5wAGOHark78ekE9ymFvTkS-Bn9SpOjyL8VDQKt0j1XI_NoiDYkI8aY5aUIhATPLo
-L4a1T5n9m1iKGpGeYUnGh4M95YLxb6XHh4MH5WNHe3YqGL4WnXK0qd2E3kcW4W1Zk4A_b155S4tyLoNmc4H9uQyUzTYZn5M8FIymeWX8_w-iQ50c6LSM0qQL
-DO1HPPq4mygimAYoECOoCY6rTC-4_04
+sprite $AzureFirewall [70x70/16z] {
+xPL7seGm34EJs1QGpFsl-vST6hgcbxUal4znWRIFREuHuPQJZ664NS4XUd9Woj5p5SnIZYN10aMKw8SAB19QT-HEOHKXYXucS8qms20B0wSSAHSFRE1RCG8x
+YCq5r2tJUkWMWs2Ham2kRF4KDsbUfvXw7YQo6eN9ObMOsEYoM1k7X5uM3cCn0XfXk0Q1wz2Tc1uOcFyh9wBjiNmjVXLBkOOb4gv0IGv2N6a07JEzqirSuM_u
+R5qQNndMwcBfSeldT9d5tKhwHxVGB-tfB8tfWSfN_YryfO8j0Gssk3wn8sPdjsSweEkPQLq6fXEgUqlBrpBRryeCGCzNhZQxTXtBPbtwoP-aEqFxClG3Sr_B
+rpBjz33jTC_SP7OpD2AD-GK
+}
+
+AzureEntityColoring(AzureFirewall)
+!define AzureFirewall(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureFirewall, AzureFirewall)
+!define AzureFirewall(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureFirewall, AzureFirewall)
+
+sprite $AzureFrontDoorService [70x70/16z] {
+xTLLaiD034NH9pJjVxr3OP2d5ONZ--qwvMOyf2Nw2QLOpLSfuyB43r92FlQJ5DdCpqN8HERdumpYgoA6HLIOyiFPnc9j4wxUNEomPv90yLmQ_agTCSycpQji
+VUTXXECaKAPfI8n9poC_oZJspJzZiVBZT8q_utDAEAoK4WwBCaeuB4afguRkducXK3cedrF8l4sPB5Rap81fbHmfRj6ysCmLoVCA1qXEeM3hfnIRkrRoYbSK
+jzMGfA9iFxIguWIGbnK7v0gAGg-WEDar5BcAObTH_3gANaNXgoXq5GLs5OMle2XWTOK0AYk6dxYg11TLJX6iaegYsCGf9NxkvJB528U9fHLbd8c8jr7mJkls
+0oJY8qKGb5Bu2iheg2izewoC2XIKQ31vfIUKbK61gZ8QK5OwGZbZl5JV
 }
 
 AzureEntityColoring(AzureFrontDoorService)
@@ -62,61 +119,234 @@ AzureEntityColoring(AzureFrontDoorService)
 !define AzureFrontDoorService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureFrontDoorService, AzureFrontDoorService)
 
 sprite $AzureLoadBalancer [70x70/16z] {
-fTI7TW8X58JXeNDv__TDvxZ_IQ8EZjrTFZfwa38YPajwAMDz9Ufho4vx7I7Z8s3E4JBdI0mmXqXH1tE82Cmf0kOO8NECa3b6o1mZP6p4PuYibZ-Jz9cKFpF0
--Cj-6fk121M30KB5O81GkSyGCHGmG0m531130GF4KCW0yHGoH68XqP8-K-TYWWoHMN5lJzefz0iP8YhhaYf9gPJyzOdcA8CX0gL9AbzbeoTnS0I629GXgUqV
-aNUvhO010YLf8vjfKC3q6m9bI6bTCl5RO4e1efHtajGvBLAfEm8J0mWJKBeGCa2OXGmXO09ts4hwQGLkEUrHNs3EHdUb08EPpi_Ez5Iz5OEoCXeJ_0aahWjq
-K1cwb8loQmUKk5G0vjTkh3zpcCLDBI9aFXKoohNL915Pln0mbKiaQQTosYiGChzFp8uJ4m42nZYzWO0n521W30K864CXGiPGY91n52BtcSXtBZpBHDgBpa1-
-CGKNY3p9y0GC0o6JyJyGWz4b1OZ1K05YCEmH48VfkcK2SPX8sgb0F6PkfWGGauagIQal7-4GpuaprcOG82v3v9GXSiuGEMVE4QwJcNGtxm
+fTS75jmW30RX7uIa-zyuiHtsCMbWxRos1N_kJPkwHxZfkpoU-fS8c2e2feg0gIDaweWRc28YTJ1514mL8LD5o5WH8PDMGyXaMWKXamdc526J2MQFXDqrNTcT
+Hu9vUzZ7Kyxi5A52XCmUeGBc6A6Io0uHAaJ84DafpFO85I1WDWWK8cI8l5J8474Qe-d9aWKP8jrMmziw18Z8496jYAxwF9a65394e3H9vZ_xjLGE1GmGADTN
+lvlVe80X8iFwZ0UPIpQeV9Wk8ZAVcTGNv5BRee1f7GWRgn9DQs1y0650meJ0O0Hh4-4OjYgkltMWMDuv60Q4AqqaBS0qcpN9S5P9iayI3cS568lP44zqathE
+WeYfWp6S09qdLL3v82wHCKxNroMpX0A4Z74Tf74RNL9BA438GCcXfPvGY8WCb5oE-f5GW91Xpw060m410-Igwsg3W3bMY90XGcMFa252PO-GsIj4o12XiaV8
+_37MpX0o63kPBK86f-vix14oVtyas29a5aLB_WRX5Mt9W9mpL0QHSuPh1EIOuTPjGDun3Oj2v9o9oGmWRvaSbzC3o2i60IamG6eCaI93fCe0gJD0oZK_Ucdz
+0G
 }
 
 AzureEntityColoring(AzureLoadBalancer)
 !define AzureLoadBalancer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureLoadBalancer, AzureLoadBalancer)
 !define AzureLoadBalancer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureLoadBalancer, AzureLoadBalancer)
 
-sprite $AzureTrafficManager [68x70/16z] {
-pTS5rk0m20HWOeJC_U-xBkcoPKX_dIVrhyuZugEupsgIoK2KLK-8vqW72KSumH531YblZvGKOWHPdmMfEKJU7cclWNHaCcMFMeYi13ByXOsTwA38029arOgx
-w7NlULEALfKAWdGWGbQJo83kX4Sc03I93UXt8aIQC0FzN_CQwy8DHOn8ok08DpXoRc2S6npX1a6U6kY71a4-r1ZY35yT1dkctEY839M4CH0PKnB6W3CSGGn5
-P9WaZBf2OwhwpCtmY28V4u-S6nuvDnpopD3c-fHJGx7gXWJ66d-Y5sFyRkXsHDcTsxvs05V4CiRSr_RVCnl23Vr_5sAo8SGel7af5XWnejiJyuR_krYfwoCm
-GgIxQkADxlfCWdX3eR-HpD1ElV4TvaYD46l0XlGxf0J8MjU7F-uGrxsvK6J82QBaGyiXX7Y6gFWO-PQc--sU89pWY7522aKeaKUCZ6r3f1WXKiWAXiSKQR-t
-4y8NBbykAYSuulCL
+sprite $AzureLocalNetworkGateway [70x70/16z] {
+fTS7YiH030LHTTA__uat2GlZCYlG5DdXEOUsehdTpxBFEXxD3n4m7GHC1m7JGS2qaRF0D10pC1q4J0S1qq4Up6eXJqQhWO0Hc1e18u4f4J1ICYKIhRz607yT
+ruCfa2nMy4W2Ko5Kb94XKYjaY5010eO85I1WYDGA6I9KY90XGaK8310eGc28K2aP8di_56KB391KB1WgSmXC8b22WJ9j24mYL8A9f4H20HC8b620l2gQYL19
+vewyAXhJFPgtXWL3n6pTEeeyzzjGC4g4RLtCGm6JI5-P5-BshtAW0053PTqK8g60WMB-qWQIp93Ojlcc00ac5SwOxyhqfo9_LtmOc50IENyb4mgGLsO7mjlU
+eIH2Pa-7Sgr3929pBWIAd4X49X4gHC0KIeMG4PGI8ICeDKA62X40JqPGIeICe9G86IerGaPKY5ICe1YHak5tF1gUIDqK620DXaY38T9WY3GO8Yq6I8y1qcCI
+EMPzHa0Q39060wJ10EanG5gD8qbU3Lg_0G
+}
+
+AzureEntityColoring(AzureLocalNetworkGateway)
+!define AzureLocalNetworkGateway(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureLocalNetworkGateway, AzureLocalNetworkGateway)
+!define AzureLocalNetworkGateway(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureLocalNetworkGateway, AzureLocalNetworkGateway)
+
+sprite $AzureNetworkInterface [70x70/16z] {
+xTW5WeD044HHhATwOjp_jjlK6kuEFsul2Gw19HYN2tBDhTnAnDeLRGnW4hDs9MtiVIL5VQbj5IqqLa6XaoWwOEYwa4rL0bQlw4_J5FnqB2LaxShhtTIpnvX6
+Ozuhs4wKMt4YRh8YKHX6Cb5nXXW3fimFLoHa-INxPWfo_oZtxAYXwoOfJ6XCKjX-bLjvM0fuk_6Z5Ksj9_2scqzUaIJBJLJYC4kEfgZEeLZxKA1PKnLMfr2V
+hB2I4h69YWjOFoLN7-M_KoZvz11AbDLJmTFomEDfdUDenQry0G
+}
+
+AzureEntityColoring(AzureNetworkInterface)
+!define AzureNetworkInterface(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetworkInterface, AzureNetworkInterface)
+!define AzureNetworkInterface(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetworkInterface, AzureNetworkInterface)
+
+sprite $AzureNetworkSecurityGroups [70x70/16z] {
+xSw7iTuW403X4t1f--_NaHbBMBmVv1o-0dPMtbBD4o33sY6F7CP55DcdCF9ZToG0tBIrPlv1943R7x7scVbd2SJwJWqWj7sfT00gIrhqaR7ITr9V_1nL0_h8
+KEa0I6j5RgX79fttnb3faYuZxBBLe4ktDZ0VH48NScAGPgPzOb8PH013fKsPpyHOoISL_wSh_ZjLOkflhlol_A_yh-YlhQISDF0fdN92JYh4bBQPmEKC8cVc
+bKJbB1zLeCYPa_iL1Rce4DiLn-NgIGNQK35ojs8WWmAnMKbCHi7cYy8XemgnLKbSlXPilHYKcqg1sAY0oHs3zOgJSY_NAmfrKYcmM54mcL5OgoGfSm4h5OSY
+SqV2wuf3axUKXOg1oTigP7AXOmGNsSxe60bvhOqPdKJsCheVwHdojk8zigJsp5W9S96zp5ZH19CT9I6l5GLKDWNakM90bMqA9BsY0Nd80wrdzFE8opD708bg
+02gF6P0EP95lK1C0aszaAoFl0G
+}
+
+AzureEntityColoring(AzureNetworkSecurityGroups)
+!define AzureNetworkSecurityGroups(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetworkSecurityGroups, AzureNetworkSecurityGroups)
+!define AzureNetworkSecurityGroups(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetworkSecurityGroups, AzureNetworkSecurityGroups)
+
+sprite $AzureNetworkSecurityGroupsClassic [70x70/16z] {
+xT1fpjmW48HXxARt-zytGiY8RroPyP8zVl_pg8loEIa_80xz4KZSPpHQjjmngaVF-RfXCRhea7fypONE00k9JOHDaF47YMgjBA8Dc5FUc449SoMYTTaV43Wb
+LekNibSFAiv4hAeEaAEA2r5NlkpC4ueh4mrbWlAOucxAbRPOHsRk1nIkupLGXcKMxnG2iOB-U-LH7kLH7aNbDLLXq5l5T9yGw0zJ7kLH_A1IiqLbrob5ixNk
+5HkJW087HTady1YiIBOCA6k0Ox1I8yVduab-GF7iWr0Kc17yjSa5Pj432a2yu1QFLiPRHJeIAoB6fimC-xwYEUt1SKC6WnJFdfOtIVR2eL8ZUrRA4IOTA08G
+76zCs8jIFH62uvYSIT58_2SuYi7uKDXpIygX5i_PaNbC1fMZIOx2f5habY_bUEIJawFWSYxDVROMqA5py277uvWDNSgr5WaqvhoZsN8gzrhrWF4D
+}
+
+AzureEntityColoring(AzureNetworkSecurityGroupsClassic)
+!define AzureNetworkSecurityGroupsClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetworkSecurityGroupsClassic, AzureNetworkSecurityGroupsClassic)
+!define AzureNetworkSecurityGroupsClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetworkSecurityGroupsClassic, AzureNetworkSecurityGroupsClassic)
+
+sprite $AzureNetworkWatcher [70x70/16z] {
+nPO7UYCX38LHVN9y__jk2F8OpGxvI7zR4je_QfIs9nPp071JRf-JU1IvV9oXSI6ZJp4Gfrzqdy5ZZJ7rzTHwaza6ZlSDoQ-YG_BdDB0ZUxFZyHkrDZ1-VC0t
+87wOpTsHriglX2sCnR1-662Jbzdh6nXzpf68Q8Tm1CJIuONIyf2wxioKdBDM5eSai4t2M2fPEVH-K1IZLhpOFIAJDPDkBqIZ6lGeL9h6958wdE9tJC5v8-9D
+votfQsDeZbfogZ1dWPTPHWacYPhvgynKk8JRLzckgQrfg5srcAfedbK-N7ATkd8fyRXgp5veQImoP7EC_6A2hoPKWrdDtKrBzEh2jSlfAMwJy6uEQK6vdHL6
+HPr2Xouf7BSBnLfN5Bijz16A7ulSJDKyZWuy5H6biO2uCANaqOSItPACItSWD4kGwBqSISwcivAkYtf1eOmOp6dDpv4E36qKjvqWfT3IfxBdIoD58oOpW-Jq
+2PwsSJa0whpWsGwnaxjU5fP8bsd56SVP9y3K8h1oY8V92Q5kCW7ZvW4iln93aEceetFyG4an7SkxIm3WMP61I3bdYEo_ihM44Bnt0MXDuSoKrOHU82bmFaac
+eK-If1Z0tQ7k4Y3F74PM2zlZUQQrv0ObJG6q2LnX2f_FdUSDeDFDL2byc08qXwGvqmnw7heK2RoYjCO00m9GSy3hZAFa2ENXKJrY8eCr6ubHWCj9Uhohk3mG
+ItIr8z2DuE4AmSiEEKusBP2w0NnGiagwpywrU8SJZ2ZkrCCbYFX17LP8DVRM_H5VFflfbe79DaCknWDYqRLyAUGMEDfqSPgM-YygvwKUQwzCMJDgheENbYR5
+P8quab0TgLSCXClesfXwkTUWj0t5Izw2rAe8Ou1t8FVx0sFLqnZTkWSPcC7Xx6QBxBCDYB_S4vCAk3iIiM59vg1WpWhPWhpg_YRO1SHf4v8Oj4OM9mQtVKXt
+2bdz_W25AxLzo3aFn29Pgf-7fFuAef-6o7T0cdy7fE4x8Cs-0z8eIdO-AuworJwdVm
+}
+
+AzureEntityColoring(AzureNetworkWatcher)
+!define AzureNetworkWatcher(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetworkWatcher, AzureNetworkWatcher)
+!define AzureNetworkWatcher(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetworkWatcher, AzureNetworkWatcher)
+
+sprite $AzureOnPremisesDataGateway [70x70/16z] {
+xTS5ajj048NXPcld_lTTwgJao6-e7Kv-CtrYJPcMOb7xI8MfcfZVfIL8_9fk6smEaat4SRQm9jyJj3HPVEH3Gi_92J4cPepwVGQCCrrVanZ962E-XeoNQGF9
+122ZjG0GF3CodhG7Y6Up4YlfPDN6KdPLj8243nSeLhig4FdrIfGLhId6tJqkTjB2LWOvG93YAupuM77Y1MRXBCBJTQCJXMZE48sDO5fWLER8d76T8vcC65j4
+nimgCcO6YD1xd7i30mOh4CbD_MM-T66zO2IL2MCTH7CHJYKPmueC1c69KpdV0Zdt5OblbP2UecGzHUAgX7GK9kue6ezAYFG6DuMA1LB2k-TmGqeW1IVqsNEA
+KiPMLnB948ELyM5l9KNfajYkuZhu_tADtxDhga8xSMljXN3_bMA65TjJZa3A4PjAYmU5ZxQjjDkzaiY-aiofy4lRLgozTvnA8areBq_cgoAVY1AL64wbWcJH
+FW3zk9FsaH4LcGmWHSQfsWqYTIRecGw0L9aRFTi1a0epHzu
+}
+
+AzureEntityColoring(AzureOnPremisesDataGateway)
+!define AzureOnPremisesDataGateway(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureOnPremisesDataGateway, AzureOnPremisesDataGateway)
+!define AzureOnPremisesDataGateway(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureOnPremisesDataGateway, AzureOnPremisesDataGateway)
+
+sprite $AzurePrivateEndpoint [70x70/16z] {
+xTK7RiH0241HfW6-_u7J4xmQVMI9zEHlBtxk7lbxJNEtKJEQ-LDMGjozpYn_gx1IWHGMflkfBrPQPOqY3MN9UwoI51glI9TAtHuDRLAh7G-9V87oh_mh_yhG
+bIXDjLz0fhilLcmRLN08CbRSWyaH7wpCZI5aogRmNnW1XHdwdHMPm002Iife_9OfmQm48OKPHbXXXX7fcu8C8yiV5P_4w0Ma-V6IqHWUZCLH3SW5ncXrz3Wr
+aScHTfnpOOPNHsGUDtLarjkhxArRPV9P4mkrfvULRI_piepqsBFqi8qo96FiZ6YEIFDWS66y9KZEZ41wYkHCzsV4Me84Oy38MAgh2oF0G800Kq7uX69aYZ1J
+GqGK6KQOAI3CC98plO848rGB96tboeOmCo_yMgl9N-WU
+}
+
+AzureEntityColoring(AzurePrivateEndpoint)
+!define AzurePrivateEndpoint(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzurePrivateEndpoint, AzurePrivateEndpoint)
+!define AzurePrivateEndpoint(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzurePrivateEndpoint, AzurePrivateEndpoint)
+
+sprite $AzurePrivateLink [70x70/16z] {
+fTU74SCW44HHmd71_VVhlCv6X_ONy0OHHx5SAz_5Siefg58A6lyLZtG-6OixCRyHwywOpqkIiPcI7yvCoJjjekITFbEGRJcIKS8tdB6fmE4KPCOgS5W53ZEx
+yscUhtJUQNa5cQPFmDBq-9g2N2rzCymTdqnkYMpsTAZR6ywWb71LhFDk1TDi_AiMreHJa4uKYWc28PMmIYd8jJCASjDAAM2iSGgOIYbW1gU0gL2ONA1GEHGk
+_L889jWC2fT1eHaFlbP6q8rIH2FuFIDYmTMlYdWmkLyKad7tTbF6FWP_3XU5Olp--Cijsuy8533B1guOGRhdJSAU5RGoEVWGYnS5wUBZQ0SaQ6Ls_FemZWE2
+WeQbZ6lnKu7ZCSlmG0i8AEa1kTQ2TA80qY_9JKMa5sIR2YYrQwfZoBtsQonLLiCtZHUbb2RfMgcrGcblIgbTKlLQtl9N9Ul0AAY_Ad3ouq3ZHK5jDX-_4spV
+4m
+}
+
+AzureEntityColoring(AzurePrivateLink)
+!define AzurePrivateLink(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzurePrivateLink, AzurePrivateLink)
+!define AzurePrivateLink(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzurePrivateLink, AzurePrivateLink)
+
+sprite $AzurePublicIPAddress [70x70/16z] {
+xTP9TiGW34LH2T3R_uxJcMEbvrZyz7aJstpgZii-jF-yxURc8-enwme4ye0wmfFlAiBJxoB2-TqTe8IaqYpcPtDVryu6G29CrQxLKsdc_MX3kV-b7sqeuCPH
+LPcCCp-zgYGJw-1bUHvrX5ms478aoWXnAHGA2WM5Wa91eQ1GK2We51GA2eNlew1GK2We51GA2WM5Wa91eQ1GK2We5BwFmhOotFnakdjd5ZaibM7tpTlj_htD
+gpcibPP_Ri0Uug6UmrevBe-NohYYu6Rc78qKoM6j0AEFt7iFPZci54f942G84WG9ebUe9q6G80m5GbCWOTx7RjrUxxzR
+}
+
+AzureEntityColoring(AzurePublicIPAddress)
+!define AzurePublicIPAddress(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzurePublicIPAddress, AzurePublicIPAddress)
+!define AzurePublicIPAddress(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzurePublicIPAddress, AzurePublicIPAddress)
+
+sprite $AzureReservedIPAddressClassic [70x70/16z] {
+xT87ZiGW38LX88oVxNV_-wu8MnZLnB2TNsMAfK-qz0lQLSmcHm8NbDbpTyOxs3A82DHd55VfmUFAA_9uD2QicBHgEjfgmWewKgJbj7mld8gFY1WjtUj3UQIK
+UtLEASUPH1LqPcv7L6db_FfYlDvBILRIqPboBYLIKsZobZAklAq6ohZICbKrvumoNy6AYgneAqzjPIjRsSfM08pVdmPN5JZfa9uwQUD0Bof6aYvdO4l70Quf
+pXO6nGQ52Ap5XxNedRN0XkthU4Xz4BaZ2TnHeF-aR2NBYj8QfInHKYgpvVJtUW4
+}
+
+AzureEntityColoring(AzureReservedIPAddressClassic)
+!define AzureReservedIPAddressClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureReservedIPAddressClassic, AzureReservedIPAddressClassic)
+!define AzureReservedIPAddressClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureReservedIPAddressClassic, AzureReservedIPAddressClassic)
+
+sprite $AzureRouteFilter [70x70/16z] {
+xPU74kCW34JLG8R__zyh5gbBF3ZAzNlJKjzermtex-G_seoooDQxKvBQlz6oOVgE9CC4Hk_2jGyInLZhGQuOZJpfOkIMoIZ1TbGC8pH3-fLdWvKwmRqgM7nl
+bajxBiRg7Fz6PHmbAb4l3yKVIDphR1G2k1vQt72K668rJm07g16o5siwA6WHkcBHoYkBNj-1n9MkjFwDZIRKTKkSjx9kSRICF9LI5XvvrYsEbd5yc6wudhQ4
+H1wFUpcoE5XG4fzj_DBYO96z4sUyIJGD2tARComILu_DRpLbRl57I_osRHLeVMVZ1KlhXqGgb9oo1EKZbWQIDonE7x0OjEjWCQrn6VByI3UXOJ4Pn2tR1kEi
+8mwFpIm-ENUh0_jt6kEWnMZPShi67YsHveI5f8DcYtVBbdaeeVCMYegLW5CMQd6tIrhabcd-LAE18qBmA3bwmleSfeN7cXn8OD5WBmik88502yDmER8eFM2t
+Piom6fzIeSbn8N1f64pK45Mc08Rn_Wsczsbzi7raEr7eNMnt19hSJGH4AKs-bjgXbbIx-f6D8sNng2KBnreiZGhzDFxp5G
+}
+
+AzureEntityColoring(AzureRouteFilter)
+!define AzureRouteFilter(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRouteFilter, AzureRouteFilter)
+!define AzureRouteFilter(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRouteFilter, AzureRouteFilter)
+
+sprite $AzureRouteTable [70x70/16z] {
+xTLLOWCn48FX8Ud-DowJDvgaZilr_nZu5aocSv9qc-W7ArlPIbG1LUaBIk8f4dwbudY99FCg9J0gXCdglcWKFo9aAGGltoW5fmgpHxIIIc6BQCKXbLG8h5DI
+AvH8grIZ-30w0o8KD4eS4UQXDuftIXuGNIY5Ij78UCUZefuerfJBZ1uZwf4ENbgagHNOAHEzujr0pp6f59Wfndj6AEAgUO5nkHQlPmGomzIWXEdyFZjJr8kI
+jf1d5YfzWTYfbHndrnPw1KEkZesNtgkKcAJp2d9u7iuf-famf-XdAauf-fc2iueQRYufK2zbNYanoFCAqiovhD0D7w2W-04AkQwmQojRqSYwifMjt08
+}
+
+AzureEntityColoring(AzureRouteTable)
+!define AzureRouteTable(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureRouteTable, AzureRouteTable)
+!define AzureRouteTable(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureRouteTable, AzureRouteTable)
+
+sprite $AzureServiceEndpoint [70x24/16z] {
+pTI5bKHH20FGF4FIVx-xusvmljqAqE2aT54pbOQyghmG90dlT2GKumD1dF79G9JoXOQOnbSytq--fyetB69m2ief6ATW6-f8E8LfDWtdIuAGpfVA52ym45IS
+JnHXrVb0fmWxGKvtNbX5MXLpqcqK9Fm3
+}
+
+AzureEntityColoring(AzureServiceEndpoint)
+!define AzureServiceEndpoint(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceEndpoint, AzureServiceEndpoint)
+!define AzureServiceEndpoint(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceEndpoint, AzureServiceEndpoint)
+
+sprite $AzureServiceEndpointPolicy [70x70/16z] {
+xTS7hkCm38HXgf7klFzfKvp1EbvPqG3RouyMjm-KNvNyoBBQsC-oj2kBiwsfPQmSW8fSDRZxOYc6JiLHbBhfCMMMVc5pD5zECWVfXP5HTNzoNuGf-97ALosG
+kwaV3VKeWr1D7vIH7KKsFp8vj_eYNFvMhbxPAEpBNOS1oRc8DLBAB8toUOsvXEg8KCf9AQf9ZbGL3Ai0qTCiEEQL6W4JIQM9WE6KDWA6Kze865O1qc8e1KX8
+U0SnxU9-0anV0HBDhCWZDREdb_OJO7eAaFrXYw-7JKN4dc6Qq5LKDGaUIYBPdhsT2AgQkafwCSKU1P5e-qemNDYH8bq5J52p98_I2zbFH2240kPBQa4G44e1
+Koj0E0LCfG2X5J1d1GYdL0mK8AHICL20qCh1n3S52A-0mJ1GWF0AYiUASCGhLL3GeVnNuhSg-8tvZGf-OtwZWj-OtwZWD-OtAHX6vTiKz6tAVoMFoxRvewtN
+a5fAc9riYSrPmaOZ8arbSRROLfH6Hcah_2ZvW-9qeQt4RrLmXYu9IlLEYbTCKAbthZEjRE5u95OxLphisFLgsptop3RahC_XKtjtp6ToaMwEk8bKhiisibcH
+txax
+}
+
+AzureEntityColoring(AzureServiceEndpointPolicy)
+!define AzureServiceEndpointPolicy(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureServiceEndpointPolicy, AzureServiceEndpointPolicy)
+!define AzureServiceEndpointPolicy(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureServiceEndpointPolicy, AzureServiceEndpointPolicy)
+
+sprite $AzureTrafficManager [70x70/16z] {
+ZT873kj028JXX6t0_U_xoWgHzGYF_Qkc-7ERJz5KLllGEC8PZd268-rxtwGCHpZ34Suy8-qcUS6CHFIcIHY2S8OZ9CPmX3E8zE__P79c1MFUQYHwnxWZqnDv
+pSXA1f1iF38Ym01IC6igCW9C852_70EAkG83231n_HCGHwQfwW0Xc4HIIGIOH6GAC2sHK191veSiNHKJum04c0FHWbdnrJmHO7GhWUmQC1BkF11aLYY998DD
+HA9rAaspJXH0YAAZL00X2c5cWN15PwKWmfKO6Yg048KmiqQueWELHAY222h-FntNZ2hpYwsjJBcq71MEI2Y8eCAHIb4l58OKIZDdoXH4f5BCgTAXiLDKEbKm
+ymWKwKGX22ZIZ2Y0W08CA0H1fHyCA0G1PRWU35VMlzHsLsMu7unCfkpboQvVb15l9gDA8irFPIF0K2KGEnNxUPKY2vKS-asZK91PC7J6X3AGKLDvPhhydbmh
+6FDKA9DFJZ_0R6GhxOaPF-HpCe5ifVi4XY78c6-bkmD3aM1cC1jnRJ6kP3Y2L-CxC-TCZsy3mQjHZu1X238YdE58C2AKuKWmvgjY51X0a75_PZZodaba5SGh
+PXG8OzQr8S40GXaUHpZ34SvmX3EwxWE4C3IES8OZVm4
 }
 
 AzureEntityColoring(AzureTrafficManager)
 !define AzureTrafficManager(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTrafficManager, AzureTrafficManager)
 !define AzureTrafficManager(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTrafficManager, AzureTrafficManager)
 
-sprite $AzureVirtualNetwork [70x36/16z] {
-fTK7hiGW30HG6nDCVF_x_e96o5glc2sZalv2Hqg6oJ5kmkDn6ttEaOZxyBn7W668oY4NOpZ26I0JoBbIqRz02iCGpX24n-x454HIE7CTa2-O6H4kxwI1uGXd
-HaM-OdG-eDtzKfphSE-2cFjebG5IInPtso_kSevu62SA9fz9VXSTjX2qeiNAhPMfJOqFe-73JNeaChU6oyZwIY2sXZh-NvKymzjYPcOcNbOHQJZtLDNeKXUj
-mk3_GzB_6ne1jQi82fMOAxUtx_VGXbDBTLOAesQQBsIdMPEA83rTibJaAsRW6yfmXEyp756HhnWl26CumXc-qFCDWYCrzX8p2y9MzXej2648GfXvUXvupfZp
-d-mPyWi
+sprite $AzureVirtualNetwork [70x70/16z] {
+xTO7Zkim40FGI9fs_ml_ud0HXQuW-a94LSP-ODnV3xAoihBIiiR56DDxfF9yR5LWxf2Ay_ceVx5xXAfmx9vf1KHa6D6PJiZbiN4HOKP4c94HPdI46Hq14_GJ
+48tH4VIF4qHZ66d3VKoRshngvjQ9EK9w_ayqx1NRicDesygOsJV9Tr0qi7oZ7Ql131yJJwHlFHCnc0WVc_eV5FxQq63ErJAdQeZNJyQPOedugH9RZOtv_6fV
+_wXFvbGj-4x0WMbSnj7tizk4zltjPCGuaAbRO0fcCF8_JamVOphS3Ijas6WxX9Y7OOGP7PcEZOGm8oFCw0WpEe91YWWp8iACZF3xH4UOqH5-EwWVKs0qX9bs
+EWuWTscNHyQ0t6TSTksltvwLbPM_
 }
 
 AzureEntityColoring(AzureVirtualNetwork)
 !define AzureVirtualNetwork(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualNetwork, AzureVirtualNetwork)
 !define AzureVirtualNetwork(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualNetwork, AzureVirtualNetwork)
 
+sprite $AzureVirtualNetworkClassic [70x70/16z] {
+xTO7hiCW48HXqnUu_tbJS5aohXhrY5_D1l49xIl9zA3HQ3GoITp5DkoU8vBEjxq8C6U8nFDz9v_y4oHD5_bxnWWW10C8oLX0BcSJI0GP4a66H90X4MGu19c8
+ImqX60xHh3A0q0mY9gJKZSr_temUZ2awO8uGN-gdOXSojxVrOAZV4Z1xn9RQobChrrOnxStNkO0CpYJL9TyVgx4tQy7Po3UhgqNFzQQqpRfcz42GDQUB-Kef
+1qgxXssCqSMwr6HNVoOXorl6luHbC0Ol8pecdQuhEZFuS_A_Z966hE_fUp3R_jUW14I-1RYD2w4Rjmt1wPlnmPiT0ip34466HtGs788CYI138iXm26ua4a66
+H90X4Vmy8H5aQ0J_aL9Vff3X46JCwNO4v2npEHaFo7dkygvs-lT6ez4R
+}
+
+AzureEntityColoring(AzureVirtualNetworkClassic)
+!define AzureVirtualNetworkClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualNetworkClassic, AzureVirtualNetworkClassic)
+!define AzureVirtualNetworkClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualNetworkClassic, AzureVirtualNetworkClassic)
+
 sprite $AzureVirtualWAN [70x70/16z] {
-jPM9biGe24LP18N__-0PgykqRpHBvvovlTPsyq0qT8TeiNyfHPbU8iLcb5x0u7ZfKTlnnxgAxH5w3XlmiYgxG5wKyxutOfSKkeP5X9di1hqSiSUyAM957uxf
-Yywe_HL-AK7afGJHYxw-RmpRAueAByF-qWJrl4UUHN7tMjrlsdnfQ963QDLF-omNYl7v6Awe9sdqqj5CcJfIBpnorfRM5ONfYtU1bSyVtzIq3nAPJMcWaHcz
-VEBkMUDiBJszqO7D3wLbnga59I5qK3CR4qZZtj8_HI1n0dJHKDb8wjXXFHKKTw9PLjf_aqXsZeUeQM0HGoA3jNXh4Vb5QQ7WIX6jJKbW58XKg8cm91yJwbPg
-3jgQXYFRR66i9zELH-g3q4rDamN3pAlAG-4zLML2vZ1uDhGCg7siaLI8iuJ1WpVIq7A4q7LkCYiSLFBRMwQvegBAur7xxsBLKLB1ixTcGEIW6PyqK1BZtQJ1
-ZkcFW4_l8Qk3vBjIaGNgLa8yuGsHjPS3i5gcq86C9c6_XOMFiBMC3q14nhOiH7QQVACv3S02NTXlvW_orEBhBcGPUoj-hbDlBHMk95OZ9wHRphBmri8McKYO
-d5H4cRAnVCjeLaHcMsrfj25Ibxxmn-4wMlv3y-mKsb2x7DUezFHb7kXEC5698pfIii64XUFzhUCnRayAYu7Z2XV5qmdtroXv9R8GDY1e0AN2ctTl6Bull9jV
-A6Y1ZtsS0zdMFGhRKxETMd0u5M8YF6O0DinkE0EZ89x1yyr8Jom6KHOYsxJG9vkM5UTsrpl_H55Hp-IjHMBrhtSh-huhJawgoA0RBBD-rqQx4HXRY-aEpnmP
-VBFKBJE4xh7VzxL5uv3aMZEs8GTUkCHJoJYRl7zS8aDdHnezHrjcXcbFazR5fPjXOfzvejDgBwB51sFw7_a7
+lPO7qkKW38F1kEh-zzqMClH_7jk-AQyaKIHZIlfVPFf1_YE5mbBXadzJWsM0ATt3ii3NHcJBNIoI0tGhiYVVnZdBt1VsliJv9tEUcV91Ytr0Ea8i7qFdDhs0
+BmRsTfYAN48NJgv6ASirl6snUvXfNvG_oYL_07rKMZLt3tSt_TeEombpz8Hz8NFKm4zSXN-WNdyTGkMpHkWRkpY0200k2yUoQ031gP8DWEP7B7INYGv6k7L2
+09hRTzkOeQs8vzQJG7IDeMigsgaOe5qt0PPw6F0bKjw8oFk0kR-IZJBBy3hIsXwhevjcobGRNhikOAcmcddWWTAC03gf5EbnX6D4qu8X9fKyvNaxLl1YYviy
+P2hpH0h0XUgT3QSbKqoBS1wijDPuaubjOaLdPbwclE-DKlCyKo3eP8RcnG4emqW08M_deqoLqLRRGKOHWsbEELMo0pmEaorR4w-12CZ3OwCCrqYqBE7HtoTp
+rzeGYe0gCc_KGvyQPEsrpXsWmdbpy026ifGq4N0nBU-F_MwTWU77SXEXcv_Utd9M8I0jz3FBZYhHzroCSQNDSkHVAdpoibSX3GneFYTAUnMETvvxq_4IeBIb
+lq28fb7dEQ4IDTSM1q_L9N_yL-mHAQaOWBH7eBsAYxmQBuftNr54cfXhqSp775vXSskV2nDLvFWcWD81VICnAldG3WnF4-jgeAYKD0DGNNoEM3KZgD0-DSzP
+PpCq57TNkrAjd55uNzsoLx5wruaSq2THD2jp8fwIhXH0KW8aPSBEDy3jL75409R7XUn7UZhHx57WVLci-MaHERkf7cZTMdqLERkfHxaooT378dLHyL9zITCm
+j9-VfdB9tUamimEmd6x8Mi_-1eI8UZqFNSE6HhNsMnHHy_Y1bVJF-Gu
 }
 
 AzureEntityColoring(AzureVirtualWAN)
 !define AzureVirtualWAN(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureVirtualWAN, AzureVirtualWAN)
 !define AzureVirtualWAN(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureVirtualWAN, AzureVirtualWAN)
 
-sprite $AzureVPNGateway [63x70/16z] {
-lTTdpkCm38HXKPN3-z_tIo8O4AmDX_Aszw_ps6ffoQkqhe11Hw-I7YLrs2tqSeppj7jeSeYTq6BTZOJCiQZn6jKm7lTgFEw7dLGStUmeoD74CLh9aalJpO-3
-eMjTLwJVxvo_w7nxyiGhkTrRdVD2fjU2nsExpERMqrxThjAL1Rsvf6zLDZpGZPd1FtfoSAow_uJ2nxw_Hls98Jc9_vf6r_tALZvlBeSxmVxNUFs_NDfGsBEW
-lQHP8vIccNr4nK6Is1yqWeVN5ZnUgOxcLi2_4G9VkOvyephqZUdODwPZtuYcddFzLAVKJoudLUVN2k4TFaSFUIdmE4g9UIguywNJ2Pz-vrCVyUKnMzhd65Sv
-NVxUr2cFgrzuMYs_wHNZqrCTSz3VOWy7hnBmMcjxr_DDRrxgrT76xVxXiUdrtLZ-Y6VdqAgSyAbtVldoHszOhN_sSO4_uolEKUHTcicxWfZxnrHWX1E_DE74
-BqquyKnR0_TSMrMZdckhtKWgN5lEHZtN6l_pZ8wbFZJxJ_UESx7_LNm1
+sprite $AzureVPNGateway [70x70/16z] {
+nTK5SYim38HXY_R-DtwegIEtqIhy3vQ-oZHPNMeU011kAkkUn08rrriDJUB8xZPgFaOSNJeo12HRF0NDxvZa7WQZZ6tiBBbfKznKHDG2jPYl9_HYltnytdOO
+DHyE4_slsMWOPVldV9ZwIqQ7dUmjdrRvjJM-SyvFIFWf1j-MoJEZYa_kfR0rsqCAlz_nTaK-gOZ5B5mKOGNn6DPzhiHzI6NiFYIRZQBMApcCzCYUjVrK4O9y
+CUr7d38a6VnSKENo040KWYJ3588amnMEL8OhDTbdz82YpQRqYdrJiFEfilHG75-fZfMbrnHTDoXBgxAHkN9-4niPA9uTzaRAsxsY-CeEV2Eb62bBEsIk50Go
+LBfHak5AM5QHWn7Bs4bNf39ttJgugcfiPgvS83XUWCoLZNnJ86F5uhe2gfnXAqr4mLCKMIMzIq4KH72VWc08L_8N24AK_0s2p1G4HU3vZwuYoGW6oceG80W2
+JSKw1O6-jR86eVa-nxkHUgUSA6IItm
 }
 
 AzureEntityColoring(AzureVPNGateway)
diff --git a/dist/Other/AzureCloudSimpleNode(m).png b/dist/Other/AzureCloudSimpleNode(m).png
new file mode 100644
index 00000000..77d9f60b
Binary files /dev/null and b/dist/Other/AzureCloudSimpleNode(m).png differ
diff --git a/dist/Other/AzureCloudSimpleNode(m).svg b/dist/Other/AzureCloudSimpleNode(m).svg
new file mode 100644
index 00000000..089e26f3
--- /dev/null
+++ b/dist/Other/AzureCloudSimpleNode(m).svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.1875 5.125 L 14.453125 5.125 C 12.730469 5.125 11.339844 6.96875 11.339844 9.027344 L 11.339844 51.363281 C 11.339844 53.410156 12.730469 55.234375 14.453125 55.234375 L 15.660156 55.234375 Z M 65.1875 5.125 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(53,169,255);stroke-opacity:1;stroke-miterlimit:4;" d="M 28.977232 45.122768 L 28.977232 40.122991 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(53,169,255);stroke-opacity:1;stroke-miterlimit:4;" d="M 45.372321 47.107589 L 33.202232 47.107589 M 23.733705 47.107589 L 11.563616 47.107589 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill-rule:evenodd;fill:rgb(255,255,255);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(53,169,255);stroke-opacity:1;stroke-miterlimit:4;" d="M 24.740625 49.167857 L 33.213839 49.167857 L 33.213839 45.296875 L 24.740625 45.296875 Z M 24.740625 49.167857 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill-rule:nonzero;fill:rgb(213,237,255);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0,108,188);stroke-opacity:1;stroke-miterlimit:4;" d="M 47.003125 29.775223 L 10.971652 29.775223 C 10.127232 29.775223 9.471429 30.317857 9.471429 31.014286 L 9.471429 38.532812 C 9.471429 39.232143 10.127232 39.774777 10.971652 39.774777 L 47.003125 39.774777 C 47.847545 39.774777 48.503348 39.232143 48.503348 38.532812 L 48.503348 31.014286 C 48.503348 30.317857 47.847545 29.775223 47.003125 29.775223 Z M 47.003125 29.775223 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0,108,188);stroke-opacity:1;stroke-miterlimit:4;" d="M 14.302902 36.095312 C 13.554241 36.095312 12.895536 35.480134 12.895536 34.775 C 12.895536 34.069866 13.554241 33.454687 14.302902 33.454687 C 15.054464 33.454687 15.710268 34.069866 15.710268 34.775 C 15.710268 35.480134 15.054464 36.095312 14.302902 36.095312 Z M 14.302902 36.095312 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 51.234375 48.585938 L 59.3125 48.585938 C 59.757813 48.585938 60.121094 48.949219 60.121094 49.394531 C 60.121094 49.839844 59.757813 50.203125 59.3125 50.203125 L 51.234375 50.203125 C 50.789063 50.203125 50.425781 49.839844 50.425781 49.394531 C 50.425781 48.949219 50.789063 48.585938 51.234375 48.585938 Z M 51.234375 48.585938 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 51.234375 45.84375 L 59.3125 45.84375 C 59.757813 45.84375 60.121094 46.207031 60.121094 46.652344 C 60.121094 47.097656 59.757813 47.460938 59.3125 47.460938 L 51.234375 47.460938 C 50.789063 47.460938 50.425781 47.097656 50.425781 46.652344 C 50.425781 46.207031 50.789063 45.84375 51.234375 45.84375 Z M 51.234375 45.84375 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 51.234375 43.152344 L 59.3125 43.152344 C 59.757813 43.152344 60.121094 43.515625 60.121094 43.960938 C 60.121094 44.40625 59.757813 44.769531 59.3125 44.769531 L 51.234375 44.769531 C 50.789063 44.769531 50.425781 44.40625 50.425781 43.960938 C 50.425781 43.515625 50.789063 43.152344 51.234375 43.152344 Z M 51.234375 43.152344 "/>
+<path style="fill-rule:nonzero;fill:rgb(213,237,255);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0,108,188);stroke-opacity:1;stroke-miterlimit:4;" d="M 47.003125 17.146652 L 10.971652 17.146652 C 10.127232 17.146652 9.471429 17.689286 9.471429 18.385714 L 9.471429 25.907143 C 9.471429 26.603571 10.127232 27.146205 10.971652 27.146205 L 47.003125 27.146205 C 47.847545 27.146205 48.503348 26.603571 48.503348 25.907143 L 48.503348 18.385714 C 48.503348 17.689286 47.847545 17.146652 47.003125 17.146652 Z M 47.003125 17.146652 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0,108,188);stroke-opacity:1;stroke-miterlimit:4;" d="M 14.302902 23.466741 C 13.554241 23.466741 12.895536 22.851562 12.895536 22.14933 C 12.895536 21.444196 13.554241 20.826116 14.302902 20.826116 C 15.054464 20.826116 15.710268 21.444196 15.710268 22.146429 C 15.710268 22.851562 15.054464 23.466741 14.302902 23.466741 Z M 14.302902 23.466741 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 51.234375 31.589844 L 59.3125 31.589844 C 59.757813 31.589844 60.121094 31.949219 60.121094 32.398438 C 60.121094 32.84375 59.757813 33.203125 59.3125 33.203125 L 51.234375 33.203125 C 50.789063 33.203125 50.425781 32.84375 50.425781 32.398438 C 50.425781 31.949219 50.789063 31.589844 51.234375 31.589844 Z M 51.234375 31.589844 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 51.234375 28.847656 L 59.3125 28.847656 C 59.757813 28.847656 60.121094 29.207031 60.121094 29.65625 C 60.121094 30.101563 59.757813 30.460938 59.3125 30.460938 L 51.234375 30.460938 C 50.789063 30.460938 50.425781 30.101563 50.425781 29.65625 C 50.425781 29.207031 50.789063 28.847656 51.234375 28.847656 Z M 51.234375 28.847656 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 51.234375 26.15625 L 59.3125 26.15625 C 59.757813 26.15625 60.121094 26.515625 60.121094 26.960938 C 60.121094 27.40625 59.757813 27.769531 59.3125 27.769531 L 51.234375 27.769531 C 50.789063 27.769531 50.425781 27.40625 50.425781 26.960938 C 50.425781 26.515625 50.789063 26.15625 51.234375 26.15625 Z M 51.234375 26.15625 "/>
+<path style="fill-rule:nonzero;fill:rgb(213,237,255);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0,108,188);stroke-opacity:1;stroke-miterlimit:4;" d="M 47.003125 4.520982 L 10.971652 4.520982 C 10.127232 4.520982 9.471429 5.060714 9.471429 5.760045 L 9.471429 13.278571 C 9.471429 13.977902 10.127232 14.517634 10.971652 14.517634 L 47.003125 14.517634 C 47.847545 14.517634 48.503348 13.977902 48.503348 13.278571 L 48.503348 5.760045 C 48.503348 5.060714 47.847545 4.51808 47.003125 4.51808 Z M 47.003125 4.520982 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0,108,188);stroke-opacity:1;stroke-miterlimit:4;" d="M 14.302902 10.841071 C 13.554241 10.841071 12.895536 10.222991 12.895536 9.520759 C 12.895536 8.815625 13.554241 8.200446 14.302902 8.200446 C 15.054464 8.200446 15.710268 8.815625 15.710268 9.517857 C 15.710268 10.222991 15.054464 10.83817 14.302902 10.83817 Z M 14.302902 10.841071 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 51.234375 14.589844 L 59.3125 14.589844 C 59.757813 14.589844 60.121094 14.953125 60.121094 15.398438 C 60.121094 15.84375 59.757813 16.203125 59.3125 16.203125 L 51.234375 16.203125 C 50.789063 16.203125 50.425781 15.84375 50.425781 15.398438 C 50.425781 14.953125 50.789063 14.589844 51.234375 14.589844 Z M 51.234375 14.589844 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 51.234375 11.847656 L 59.3125 11.847656 C 59.757813 11.847656 60.121094 12.210938 60.121094 12.65625 C 60.121094 13.101563 59.757813 13.460938 59.3125 13.460938 L 51.234375 13.460938 C 50.789063 13.460938 50.425781 13.101563 50.425781 12.65625 C 50.425781 12.210938 50.789063 11.847656 51.234375 11.847656 Z M 51.234375 11.847656 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 51.234375 9.15625 L 59.3125 9.15625 C 59.757813 9.15625 60.121094 9.515625 60.121094 9.960938 C 60.121094 10.410156 59.757813 10.769531 59.3125 10.769531 L 51.234375 10.769531 C 50.789063 10.769531 50.425781 10.410156 50.425781 9.960938 C 50.425781 9.515625 50.789063 9.15625 51.234375 9.15625 Z M 51.234375 9.15625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style="fill-rule:evenodd;fill:rgb(239,248,255);fill-opacity:1;stroke-width:1.4;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(53,169,255);stroke-opacity:1;stroke-miterlimit:4;" d="M 24.854911 12.087054 C 24.854911 18.717634 19.480804 24.091741 12.850223 24.091741 C 6.219643 24.091741 0.845536 18.717634 0.845536 12.087054 C 0.845536 5.456473 6.219643 0.0823661 12.850223 0.0823661 C 19.480804 0.0823661 24.854911 5.456473 24.854911 12.087054 Z M 24.854911 12.087054 " transform="matrix(1.346154,0,0,1.346154,1.346154,1.346154)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(53,169,255);fill-opacity:1;" d="M 19.246094 23.703125 C 18.695313 24.085938 18.09375 24.390625 17.457031 24.605469 C 16.292969 25.007813 15.066406 25.203125 13.835938 25.1875 C 12.761719 25.1875 11.738281 25.027344 10.777344 24.703125 C 9.84375 24.398438 8.980469 23.902344 8.246094 23.25 C 7.503906 22.578125 6.917969 21.757813 6.523438 20.835938 C 6.097656 19.875 5.886719 18.753906 5.886719 17.476563 C 5.886719 16.226563 6.089844 15.117188 6.5 14.148438 C 6.910156 13.175781 7.46875 12.359375 8.183594 11.691406 C 8.902344 11.015625 9.753906 10.496094 10.679688 10.160156 C 11.671875 9.800781 12.71875 9.621094 13.773438 9.632813 C 14.363281 9.632813 14.894531 9.667969 15.367188 9.738281 C 15.839844 9.8125 16.261719 9.90625 16.628906 10.019531 C 17.179688 10.1875 17.703125 10.425781 18.1875 10.730469 C 18.519531 10.976563 18.757813 11.230469 18.902344 11.496094 C 19.042969 11.761719 19.117188 12.039063 19.117188 12.324219 C 19.117188 12.597656 19.0625 12.855469 18.957031 13.101563 C 18.847656 13.347656 18.71875 13.5625 18.566406 13.757813 C 18.429688 13.9375 18.277344 14.101563 18.113281 14.253906 C 18 14.363281 17.871094 14.460938 17.738281 14.546875 C 17.558594 14.371094 17.375 14.203125 17.1875 14.039063 C 16.941406 13.828125 16.671875 13.652344 16.378906 13.511719 C 16.03125 13.339844 15.667969 13.203125 15.292969 13.101563 C 14.847656 12.980469 14.386719 12.921875 13.921875 12.929688 C 13.289063 12.929688 12.71875 13.035156 12.199219 13.242188 C 11.691406 13.445313 11.234375 13.753906 10.855469 14.148438 C 10.464844 14.558594 10.160156 15.046875 9.96875 15.578125 C 9.753906 16.1875 9.648438 16.828125 9.65625 17.476563 C 9.65625 18.191406 9.773438 18.824219 10 19.371094 C 10.230469 19.917969 10.546875 20.371094 10.949219 20.738281 C 11.363281 21.113281 11.851563 21.394531 12.382813 21.570313 C 12.933594 21.753906 13.535156 21.847656 14.183594 21.847656 C 14.988281 21.847656 15.679688 21.75 16.261719 21.546875 C 16.84375 21.347656 17.285156 21.136719 17.585938 20.921875 L 19.203125 23.703125 Z M 19.246094 23.703125 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 17.957031 20.578125 C 18.042969 20.648438 18.238281 20.761719 18.539063 20.914063 C 18.84375 21.0625 19.222656 21.214844 19.683594 21.363281 C 20.140625 21.515625 20.671875 21.652344 21.277344 21.773438 C 21.878906 21.894531 22.535156 21.957031 23.238281 21.957031 C 23.8125 21.957031 24.269531 21.917969 24.617188 21.839844 C 24.960938 21.757813 25.226563 21.65625 25.414063 21.527344 C 25.582031 21.421875 25.707031 21.265625 25.78125 21.085938 C 25.835938 20.917969 25.867188 20.75 25.867188 20.578125 C 25.871094 20.242188 25.714844 19.925781 25.445313 19.726563 C 25.167969 19.503906 24.644531 19.328125 23.886719 19.199219 L 21.6875 18.8125 C 21.101563 18.707031 20.527344 18.5625 19.960938 18.378906 C 19.410156 18.207031 18.890625 17.945313 18.421875 17.605469 C 17.964844 17.265625 17.582031 16.832031 17.3125 16.332031 C 17.023438 15.816406 16.878906 15.175781 16.878906 14.414063 C 16.878906 13.753906 17 13.132813 17.246094 12.550781 C 17.492188 11.96875 17.867188 11.464844 18.367188 11.03125 C 18.871094 10.601563 19.503906 10.261719 20.273438 10.011719 C 21.042969 9.757813 21.945313 9.632813 22.980469 9.632813 C 23.726563 9.632813 24.378906 9.671875 24.9375 9.75 C 25.425781 9.816406 25.910156 9.910156 26.382813 10.039063 C 26.785156 10.15625 27.113281 10.269531 27.363281 10.386719 C 27.613281 10.5 27.796875 10.59375 27.914063 10.667969 C 28.15625 10.808594 28.390625 11.007813 28.613281 11.257813 C 28.832031 11.503906 28.953125 11.824219 28.949219 12.152344 C 28.949219 12.398438 28.90625 12.632813 28.820313 12.851563 C 28.734375 13.066406 28.628906 13.273438 28.503906 13.46875 C 28.382813 13.65625 28.25 13.816406 28.105469 13.953125 C 27.992188 14.0625 27.867188 14.167969 27.738281 14.265625 C 27.542969 14.082031 27.328125 13.917969 27.09375 13.78125 C 26.769531 13.582031 26.421875 13.421875 26.058594 13.296875 C 25.609375 13.140625 25.148438 13.015625 24.679688 12.929688 C 24.132813 12.824219 23.578125 12.773438 23.023438 12.777344 C 22.460938 12.777344 22.015625 12.824219 21.6875 12.917969 C 21.355469 13.011719 21.109375 13.125 20.941406 13.261719 C 20.789063 13.378906 20.675781 13.542969 20.617188 13.726563 C 20.570313 13.878906 20.546875 14.039063 20.542969 14.199219 C 20.542969 14.328125 20.5625 14.449219 20.597656 14.566406 C 20.632813 14.679688 20.71875 14.792969 20.855469 14.902344 C 20.992188 15.007813 21.1875 15.109375 21.4375 15.203125 C 21.6875 15.296875 22.03125 15.386719 22.460938 15.472656 L 24.746094 15.921875 C 25.46875 16.058594 26.179688 16.257813 26.867188 16.515625 C 27.480469 16.753906 27.992188 17.042969 28.40625 17.390625 C 28.824219 17.734375 29.136719 18.148438 29.347656 18.640625 C 29.554688 19.128906 29.660156 19.710938 29.660156 20.382813 C 29.660156 21.890625 29.09375 23.070313 27.964844 23.917969 C 26.839844 24.765625 25.246094 25.1875 23.195313 25.1875 C 22.332031 25.195313 21.46875 25.117188 20.617188 24.953125 C 19.921875 24.816406 19.234375 24.632813 18.5625 24.402344 C 18.070313 24.234375 17.59375 24.039063 17.128906 23.8125 C 16.761719 23.621094 16.542969 23.496094 16.472656 23.421875 Z M 17.957031 20.578125 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureCloudSimpleNode.png b/dist/Other/AzureCloudSimpleNode.png
new file mode 100644
index 00000000..0278009e
Binary files /dev/null and b/dist/Other/AzureCloudSimpleNode.png differ
diff --git a/dist/Other/AzureCloudSimpleNode.puml b/dist/Other/AzureCloudSimpleNode.puml
new file mode 100644
index 00000000..c5282830
--- /dev/null
+++ b/dist/Other/AzureCloudSimpleNode.puml
@@ -0,0 +1,14 @@
+sprite $AzureCloudSimpleNode [70x70/16z] {
+rTM7SYiX38LXIKZd0E__ladCihCDutRhDptb7n0Oov6QfMGg7p075uZqRWCamjCF1mcNrscGOR9I1v5UNqXlR1oCP8-S8Yvd2h8yn5q4TcUN-O5Q8HsOP2WO
+FXMbLba4NSOKD9tYMZ66D6hzlcqtpmWz0nUmVILe_Mn_m1MrAT3sotIjT6bNqRQK17QbhlAoqATsv3IHn4EaB2bjazSZoujIVLS1sXJRrLNpMyD4nA9IVlXb
+InuDjhdq3JcvZhZjf55Tvkjwb6xyXsuLeui42PMct3AHL3fb37RKTkpxIX91MqeJwsXXqX1wPAdJhP9k5MuLOLr5dvjENDVI6KhFUAjSSAVMqkVIAb3Pg7ck
+jHsIalcer8COdP7qclR3Kd8MAIxd-wAgYPL-2tbVIwBhX7H1tT_TkkFjrwELR21DelVFqR7InmBE8bi6RR0MhOD0tk_OYTY0PwKMQPn-V5_QlTB-JE79Lqe0
+aplYEblZoWuL8rI64g5djiwcf5xfdA5t8gOplT85eSz6hAxyL16_VfzgzCWP1dFfqkahLXs7oFHbs6YGSDFbf0E4wr0QxMWJtFJ6aCV2TLZ9sJq0HBZfSwuL
+pnan04xqJy16yr2fSv0ZmnkHa2kzi2aT9F3oIcg9SuIlHRgudj497wgrNEwBwQjOwtiLS06RL2nDMlENOQj4pZbzlAFi2kg4bLMwMx6SDEOLvkv-HP6PNMTi
+DJkZvAOpwPdfFXOhUrZv-9N2Aygvelq3-2B8KUA7aKvj22IJ3SdpWgJAn7zPCVa0k7awfMV7Ij8Z6GfUmRlW1MJ0E83PRqskzCDAPt468ZgGYAFqmHczBh1d
+yk_x1W
+}
+
+AzureEntityColoring(AzureCloudSimpleNode)
+!define AzureCloudSimpleNode(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCloudSimpleNode, AzureCloudSimpleNode)
+!define AzureCloudSimpleNode(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCloudSimpleNode, AzureCloudSimpleNode)
diff --git a/dist/Other/AzureCloudSimpleNode.svg b/dist/Other/AzureCloudSimpleNode.svg
new file mode 100644
index 00000000..09c6c3f1
--- /dev/null
+++ b/dist/Other/AzureCloudSimpleNode.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.1875 5.125 L 14.453125 5.125 C 12.730469 5.125 11.339844 6.96875 11.339844 9.027344 L 11.339844 51.363281 C 11.339844 53.410156 12.730469 55.234375 14.453125 55.234375 L 15.660156 55.234375 Z M 65.1875 5.125 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(50.588235%,72.941176%,20%);stroke-opacity:1;stroke-miterlimit:4;" d="M 28.977232 45.122768 L 28.977232 40.122991 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke:rgb(50.588235%,72.941176%,20%);stroke-opacity:1;stroke-miterlimit:4;" d="M 45.372321 47.107589 L 33.202232 47.107589 M 23.733705 47.107589 L 11.563616 47.107589 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill-rule:evenodd;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(50.588235%,72.941176%,20%);stroke-opacity:1;stroke-miterlimit:4;" d="M 24.740625 49.167857 L 33.213839 49.167857 L 33.213839 45.296875 L 24.740625 45.296875 Z M 24.740625 49.167857 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill-rule:nonzero;fill:rgb(91.764706%,91.764706%,91.764706%);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(28.235294%,38.823529%,52.156863%);stroke-opacity:1;stroke-miterlimit:4;" d="M 47.003125 29.775223 L 10.971652 29.775223 C 10.127232 29.775223 9.471429 30.317857 9.471429 31.014286 L 9.471429 38.532812 C 9.471429 39.232143 10.127232 39.774777 10.971652 39.774777 L 47.003125 39.774777 C 47.847545 39.774777 48.503348 39.232143 48.503348 38.532812 L 48.503348 31.014286 C 48.503348 30.317857 47.847545 29.775223 47.003125 29.775223 Z M 47.003125 29.775223 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(28.235294%,38.823529%,52.156863%);stroke-opacity:1;stroke-miterlimit:4;" d="M 14.302902 36.095312 C 13.554241 36.095312 12.895536 35.480134 12.895536 34.775 C 12.895536 34.069866 13.554241 33.454687 14.302902 33.454687 C 15.054464 33.454687 15.710268 34.069866 15.710268 34.775 C 15.710268 35.480134 15.054464 36.095312 14.302902 36.095312 Z M 14.302902 36.095312 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 51.234375 48.585938 L 59.3125 48.585938 C 59.757813 48.585938 60.121094 48.949219 60.121094 49.394531 C 60.121094 49.839844 59.757813 50.203125 59.3125 50.203125 L 51.234375 50.203125 C 50.789063 50.203125 50.425781 49.839844 50.425781 49.394531 C 50.425781 48.949219 50.789063 48.585938 51.234375 48.585938 Z M 51.234375 48.585938 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 51.234375 45.84375 L 59.3125 45.84375 C 59.757813 45.84375 60.121094 46.207031 60.121094 46.652344 C 60.121094 47.097656 59.757813 47.460938 59.3125 47.460938 L 51.234375 47.460938 C 50.789063 47.460938 50.425781 47.097656 50.425781 46.652344 C 50.425781 46.207031 50.789063 45.84375 51.234375 45.84375 Z M 51.234375 45.84375 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 51.234375 43.152344 L 59.3125 43.152344 C 59.757813 43.152344 60.121094 43.515625 60.121094 43.960938 C 60.121094 44.40625 59.757813 44.769531 59.3125 44.769531 L 51.234375 44.769531 C 50.789063 44.769531 50.425781 44.40625 50.425781 43.960938 C 50.425781 43.515625 50.789063 43.152344 51.234375 43.152344 Z M 51.234375 43.152344 "/>
+<path style="fill-rule:nonzero;fill:rgb(91.764706%,91.764706%,91.764706%);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(28.235294%,38.823529%,52.156863%);stroke-opacity:1;stroke-miterlimit:4;" d="M 47.003125 17.146652 L 10.971652 17.146652 C 10.127232 17.146652 9.471429 17.689286 9.471429 18.385714 L 9.471429 25.907143 C 9.471429 26.603571 10.127232 27.146205 10.971652 27.146205 L 47.003125 27.146205 C 47.847545 27.146205 48.503348 26.603571 48.503348 25.907143 L 48.503348 18.385714 C 48.503348 17.689286 47.847545 17.146652 47.003125 17.146652 Z M 47.003125 17.146652 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(28.235294%,38.823529%,52.156863%);stroke-opacity:1;stroke-miterlimit:4;" d="M 14.302902 23.466741 C 13.554241 23.466741 12.895536 22.851562 12.895536 22.14933 C 12.895536 21.444196 13.554241 20.826116 14.302902 20.826116 C 15.054464 20.826116 15.710268 21.444196 15.710268 22.146429 C 15.710268 22.851562 15.054464 23.466741 14.302902 23.466741 Z M 14.302902 23.466741 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 51.234375 31.589844 L 59.3125 31.589844 C 59.757813 31.589844 60.121094 31.949219 60.121094 32.398438 C 60.121094 32.84375 59.757813 33.203125 59.3125 33.203125 L 51.234375 33.203125 C 50.789063 33.203125 50.425781 32.84375 50.425781 32.398438 C 50.425781 31.949219 50.789063 31.589844 51.234375 31.589844 Z M 51.234375 31.589844 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 51.234375 28.847656 L 59.3125 28.847656 C 59.757813 28.847656 60.121094 29.207031 60.121094 29.65625 C 60.121094 30.101563 59.757813 30.460938 59.3125 30.460938 L 51.234375 30.460938 C 50.789063 30.460938 50.425781 30.101563 50.425781 29.65625 C 50.425781 29.207031 50.789063 28.847656 51.234375 28.847656 Z M 51.234375 28.847656 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 51.234375 26.15625 L 59.3125 26.15625 C 59.757813 26.15625 60.121094 26.515625 60.121094 26.960938 C 60.121094 27.40625 59.757813 27.769531 59.3125 27.769531 L 51.234375 27.769531 C 50.789063 27.769531 50.425781 27.40625 50.425781 26.960938 C 50.425781 26.515625 50.789063 26.15625 51.234375 26.15625 Z M 51.234375 26.15625 "/>
+<path style="fill-rule:nonzero;fill:rgb(91.764706%,91.764706%,91.764706%);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(28.235294%,38.823529%,52.156863%);stroke-opacity:1;stroke-miterlimit:4;" d="M 47.003125 4.520982 L 10.971652 4.520982 C 10.127232 4.520982 9.471429 5.060714 9.471429 5.760045 L 9.471429 13.278571 C 9.471429 13.977902 10.127232 14.517634 10.971652 14.517634 L 47.003125 14.517634 C 47.847545 14.517634 48.503348 13.977902 48.503348 13.278571 L 48.503348 5.760045 C 48.503348 5.060714 47.847545 4.51808 47.003125 4.51808 Z M 47.003125 4.520982 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style="fill:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(28.235294%,38.823529%,52.156863%);stroke-opacity:1;stroke-miterlimit:4;" d="M 14.302902 10.841071 C 13.554241 10.841071 12.895536 10.222991 12.895536 9.520759 C 12.895536 8.815625 13.554241 8.200446 14.302902 8.200446 C 15.054464 8.200446 15.710268 8.815625 15.710268 9.517857 C 15.710268 10.222991 15.054464 10.83817 14.302902 10.83817 Z M 14.302902 10.841071 " transform="matrix(1.346154,0,0,1.346154,0,0)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 51.234375 14.589844 L 59.3125 14.589844 C 59.757813 14.589844 60.121094 14.953125 60.121094 15.398438 C 60.121094 15.84375 59.757813 16.203125 59.3125 16.203125 L 51.234375 16.203125 C 50.789063 16.203125 50.425781 15.84375 50.425781 15.398438 C 50.425781 14.953125 50.789063 14.589844 51.234375 14.589844 Z M 51.234375 14.589844 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 51.234375 11.847656 L 59.3125 11.847656 C 59.757813 11.847656 60.121094 12.210938 60.121094 12.65625 C 60.121094 13.101563 59.757813 13.460938 59.3125 13.460938 L 51.234375 13.460938 C 50.789063 13.460938 50.425781 13.101563 50.425781 12.65625 C 50.425781 12.210938 50.789063 11.847656 51.234375 11.847656 Z M 51.234375 11.847656 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 51.234375 9.15625 L 59.3125 9.15625 C 59.757813 9.15625 60.121094 9.515625 60.121094 9.960938 C 60.121094 10.410156 59.757813 10.769531 59.3125 10.769531 L 51.234375 10.769531 C 50.789063 10.769531 50.425781 10.410156 50.425781 9.960938 C 50.425781 9.515625 50.789063 9.15625 51.234375 9.15625 Z M 51.234375 9.15625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style="fill-rule:evenodd;fill:rgb(96.862745%,96.862745%,96.862745%);fill-opacity:1;stroke-width:1.4;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(50.588235%,72.941176%,20%);stroke-opacity:1;stroke-miterlimit:4;" d="M 24.854911 12.087054 C 24.854911 18.717634 19.480804 24.091741 12.850223 24.091741 C 6.219643 24.091741 0.845536 18.717634 0.845536 12.087054 C 0.845536 5.456473 6.219643 0.0823661 12.850223 0.0823661 C 19.480804 0.0823661 24.854911 5.456473 24.854911 12.087054 Z M 24.854911 12.087054 " transform="matrix(1.346154,0,0,1.346154,1.346154,1.346154)"/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(50.588235%,72.941176%,20%);fill-opacity:1;" d="M 19.246094 23.703125 C 18.695313 24.085938 18.09375 24.390625 17.457031 24.605469 C 16.292969 25.007813 15.066406 25.203125 13.835938 25.1875 C 12.761719 25.1875 11.738281 25.027344 10.777344 24.703125 C 9.84375 24.398438 8.980469 23.902344 8.246094 23.25 C 7.503906 22.578125 6.917969 21.757813 6.523438 20.835938 C 6.097656 19.875 5.886719 18.753906 5.886719 17.476563 C 5.886719 16.226563 6.089844 15.117188 6.5 14.148438 C 6.910156 13.175781 7.46875 12.359375 8.183594 11.691406 C 8.902344 11.015625 9.753906 10.496094 10.679688 10.160156 C 11.671875 9.800781 12.71875 9.621094 13.773438 9.632813 C 14.363281 9.632813 14.894531 9.667969 15.367188 9.738281 C 15.839844 9.8125 16.261719 9.90625 16.628906 10.019531 C 17.179688 10.1875 17.703125 10.425781 18.1875 10.730469 C 18.519531 10.976563 18.757813 11.230469 18.902344 11.496094 C 19.042969 11.761719 19.117188 12.039063 19.117188 12.324219 C 19.117188 12.597656 19.0625 12.855469 18.957031 13.101563 C 18.847656 13.347656 18.71875 13.5625 18.566406 13.757813 C 18.429688 13.9375 18.277344 14.101563 18.113281 14.253906 C 18 14.363281 17.871094 14.460938 17.738281 14.546875 C 17.558594 14.371094 17.375 14.203125 17.1875 14.039063 C 16.941406 13.828125 16.671875 13.652344 16.378906 13.511719 C 16.03125 13.339844 15.667969 13.203125 15.292969 13.101563 C 14.847656 12.980469 14.386719 12.921875 13.921875 12.929688 C 13.289063 12.929688 12.71875 13.035156 12.199219 13.242188 C 11.691406 13.445313 11.234375 13.753906 10.855469 14.148438 C 10.464844 14.558594 10.160156 15.046875 9.96875 15.578125 C 9.753906 16.1875 9.648438 16.828125 9.65625 17.476563 C 9.65625 18.191406 9.773438 18.824219 10 19.371094 C 10.230469 19.917969 10.546875 20.371094 10.949219 20.738281 C 11.363281 21.113281 11.851563 21.394531 12.382813 21.570313 C 12.933594 21.753906 13.535156 21.847656 14.183594 21.847656 C 14.988281 21.847656 15.679688 21.75 16.261719 21.546875 C 16.84375 21.347656 17.285156 21.136719 17.585938 20.921875 L 19.203125 23.703125 Z M 19.246094 23.703125 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 17.957031 20.578125 C 18.042969 20.648438 18.238281 20.761719 18.539063 20.914063 C 18.84375 21.0625 19.222656 21.214844 19.683594 21.363281 C 20.140625 21.515625 20.671875 21.652344 21.277344 21.773438 C 21.878906 21.894531 22.535156 21.957031 23.238281 21.957031 C 23.8125 21.957031 24.269531 21.917969 24.617188 21.839844 C 24.960938 21.757813 25.226563 21.65625 25.414063 21.527344 C 25.582031 21.421875 25.707031 21.265625 25.78125 21.085938 C 25.835938 20.917969 25.867188 20.75 25.867188 20.578125 C 25.871094 20.242188 25.714844 19.925781 25.445313 19.726563 C 25.167969 19.503906 24.644531 19.328125 23.886719 19.199219 L 21.6875 18.8125 C 21.101563 18.707031 20.527344 18.5625 19.960938 18.378906 C 19.410156 18.207031 18.890625 17.945313 18.421875 17.605469 C 17.964844 17.265625 17.582031 16.832031 17.3125 16.332031 C 17.023438 15.816406 16.878906 15.175781 16.878906 14.414063 C 16.878906 13.753906 17 13.132813 17.246094 12.550781 C 17.492188 11.96875 17.867188 11.464844 18.367188 11.03125 C 18.871094 10.601563 19.503906 10.261719 20.273438 10.011719 C 21.042969 9.757813 21.945313 9.632813 22.980469 9.632813 C 23.726563 9.632813 24.378906 9.671875 24.9375 9.75 C 25.425781 9.816406 25.910156 9.910156 26.382813 10.039063 C 26.785156 10.15625 27.113281 10.269531 27.363281 10.386719 C 27.613281 10.5 27.796875 10.59375 27.914063 10.667969 C 28.15625 10.808594 28.390625 11.007813 28.613281 11.257813 C 28.832031 11.503906 28.953125 11.824219 28.949219 12.152344 C 28.949219 12.398438 28.90625 12.632813 28.820313 12.851563 C 28.734375 13.066406 28.628906 13.273438 28.503906 13.46875 C 28.382813 13.65625 28.25 13.816406 28.105469 13.953125 C 27.992188 14.0625 27.867188 14.167969 27.738281 14.265625 C 27.542969 14.082031 27.328125 13.917969 27.09375 13.78125 C 26.769531 13.582031 26.421875 13.421875 26.058594 13.296875 C 25.609375 13.140625 25.148438 13.015625 24.679688 12.929688 C 24.132813 12.824219 23.578125 12.773438 23.023438 12.777344 C 22.460938 12.777344 22.015625 12.824219 21.6875 12.917969 C 21.355469 13.011719 21.109375 13.125 20.941406 13.261719 C 20.789063 13.378906 20.675781 13.542969 20.617188 13.726563 C 20.570313 13.878906 20.546875 14.039063 20.542969 14.199219 C 20.542969 14.328125 20.5625 14.449219 20.597656 14.566406 C 20.632813 14.679688 20.71875 14.792969 20.855469 14.902344 C 20.992188 15.007813 21.1875 15.109375 21.4375 15.203125 C 21.6875 15.296875 22.03125 15.386719 22.460938 15.472656 L 24.746094 15.921875 C 25.46875 16.058594 26.179688 16.257813 26.867188 16.515625 C 27.480469 16.753906 27.992188 17.042969 28.40625 17.390625 C 28.824219 17.734375 29.136719 18.148438 29.347656 18.640625 C 29.554688 19.128906 29.660156 19.710938 29.660156 20.382813 C 29.660156 21.890625 29.09375 23.070313 27.964844 23.917969 C 26.839844 24.765625 25.246094 25.1875 23.195313 25.1875 C 22.332031 25.195313 21.46875 25.117188 20.617188 24.953125 C 19.921875 24.816406 19.234375 24.632813 18.5625 24.402344 C 18.070313 24.234375 17.59375 24.039063 17.128906 23.8125 C 16.761719 23.621094 16.542969 23.496094 16.472656 23.421875 Z M 17.957031 20.578125 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureCloudSimpleService(m).png b/dist/Other/AzureCloudSimpleService(m).png
new file mode 100644
index 00000000..f856f2f7
Binary files /dev/null and b/dist/Other/AzureCloudSimpleService(m).png differ
diff --git a/dist/Other/AzureCloudSimpleService(m).svg b/dist/Other/AzureCloudSimpleService(m).svg
new file mode 100644
index 00000000..f2e8c5ab
--- /dev/null
+++ b/dist/Other/AzureCloudSimpleService(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(199,231,255);fill-opacity:1;" d="M 5.382813 2.691406 L 64.617188 2.691406 C 66.101563 2.691406 67.308594 3.898438 67.308594 5.382813 L 67.308594 64.617188 C 67.308594 66.101563 66.101563 67.308594 64.617188 67.308594 L 5.382813 67.308594 C 3.898438 67.308594 2.691406 66.101563 2.691406 64.617188 L 2.691406 5.382813 C 2.691406 3.898438 3.898438 2.691406 5.382813 2.691406 Z M 5.382813 2.691406 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(53,169,255);fill-opacity:1;" d="M 38.234375 49.425781 C 37.878906 49.679688 37.375 49.996094 36.710938 50.367188 C 36.050781 50.738281 35.222656 51.101563 34.222656 51.453125 C 33.222656 51.808594 32.046875 52.113281 30.695313 52.371094 C 29.339844 52.628906 27.808594 52.757813 26.101563 52.757813 C 23.683594 52.757813 21.398438 52.394531 19.238281 51.671875 C 17.078125 50.945313 15.183594 49.859375 13.558594 48.410156 C 11.929688 46.957031 10.640625 45.152344 9.691406 42.996094 C 8.738281 40.835938 8.265625 38.324219 8.265625 35.453125 C 8.265625 32.648438 8.722656 30.160156 9.640625 27.984375 C 10.5625 25.808594 11.816406 23.972656 13.410156 22.476563 C 15.007813 20.976563 16.875 19.832031 19.019531 19.042969 C 21.164063 18.253906 23.476563 17.859375 25.957031 17.859375 C 27.277344 17.859375 28.46875 17.9375 29.535156 18.101563 C 30.597656 18.261719 31.539063 18.46875 32.359375 18.730469 C 33.082031 18.945313 33.785156 19.222656 34.464844 19.550781 C 35.042969 19.839844 35.511719 20.097656 35.867188 20.324219 C 36.605469 20.871094 37.140625 21.445313 37.460938 22.039063 C 37.785156 22.636719 37.945313 23.257813 37.945313 23.902344 C 37.945313 24.511719 37.824219 25.09375 37.582031 25.640625 C 37.355469 26.167969 37.0625 26.660156 36.710938 27.117188 C 36.40625 27.515625 36.066406 27.886719 35.699219 28.226563 C 35.4375 28.472656 35.15625 28.691406 34.851563 28.878906 C 34.527344 28.558594 34.117188 28.179688 33.617188 27.746094 C 33.066406 27.273438 32.457031 26.875 31.804688 26.558594 C 31.023438 26.175781 30.203125 25.871094 29.363281 25.640625 C 28.445313 25.382813 27.421875 25.253906 26.292969 25.253906 C 24.875 25.253906 23.589844 25.488281 22.429688 25.957031 C 21.289063 26.410156 20.257813 27.101563 19.40625 27.984375 C 18.550781 28.871094 17.890625 29.945313 17.425781 31.199219 C 16.957031 32.457031 16.726563 33.875 16.726563 35.453125 C 16.726563 37.066406 16.980469 38.484375 17.496094 39.707031 C 18.011719 40.933594 18.722656 41.957031 19.625 42.777344 C 20.554688 43.613281 21.648438 44.25 22.839844 44.636719 C 24.078125 45.058594 25.421875 45.265625 26.875 45.265625 C 28.679688 45.265625 30.234375 45.039063 31.539063 44.589844 C 32.84375 44.140625 33.835938 43.671875 34.511719 43.1875 L 38.136719 49.425781 Z M 38.234375 49.425781 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,108,188);fill-opacity:1;" d="M 35.347656 42.414063 C 35.539063 42.574219 35.976563 42.824219 36.652344 43.164063 C 37.328125 43.5 38.183594 43.839844 39.214844 44.179688 C 40.246094 44.515625 41.4375 44.824219 42.789063 45.097656 C 44.144531 45.371094 45.609375 45.507813 47.1875 45.507813 C 48.476563 45.507813 49.507813 45.417969 50.28125 45.242188 C 51.058594 45.066406 51.652344 44.832031 52.070313 44.542969 C 52.488281 44.253906 52.765625 43.921875 52.894531 43.550781 C 53.023438 43.179688 53.085938 42.800781 53.085938 42.414063 C 53.085938 41.640625 52.773438 41.003906 52.144531 40.503906 C 51.515625 40.007813 50.347656 39.609375 48.640625 39.320313 L 43.707031 38.449219 C 42.398438 38.21875 41.105469 37.894531 39.84375 37.484375 C 38.605469 37.089844 37.4375 36.503906 36.386719 35.746094 C 35.355469 34.988281 34.507813 34.011719 33.894531 32.890625 C 33.25 31.730469 32.929688 30.296875 32.929688 28.589844 C 32.929688 27.109375 33.203125 25.714844 33.75 24.410156 C 34.308594 23.089844 35.171875 21.921875 36.265625 21 C 37.390625 20.035156 38.820313 19.269531 40.542969 18.703125 C 42.265625 18.140625 44.289063 17.859375 46.609375 17.859375 C 48.285156 17.859375 49.75 17.945313 51.007813 18.125 C 52.265625 18.300781 53.34375 18.519531 54.246094 18.777344 C 55.148438 19.035156 55.882813 19.292969 56.445313 19.550781 C 57.011719 19.808594 57.421875 20.015625 57.679688 20.179688 C 58.226563 20.5 58.75 20.945313 59.25 21.507813 C 59.75 22.074219 60 22.742188 60 23.511719 C 60 24.0625 59.902344 24.585938 59.707031 25.085938 C 59.523438 25.566406 59.289063 26.03125 59.007813 26.460938 C 58.734375 26.882813 58.4375 27.242188 58.113281 27.550781 C 57.855469 27.800781 57.582031 28.035156 57.292969 28.25 C 56.96875 27.929688 56.484375 27.566406 55.84375 27.164063 C 55.109375 26.71875 54.332031 26.355469 53.523438 26.078125 C 52.621094 25.753906 51.589844 25.480469 50.429688 25.253906 C 49.203125 25.023438 47.953125 24.910156 46.707031 24.914063 C 45.449219 24.914063 44.449219 25.019531 43.707031 25.230469 C 42.96875 25.441406 42.410156 25.699219 42.042969 26.003906 C 41.671875 26.308594 41.429688 26.65625 41.316406 27.042969 C 41.210938 27.386719 41.152344 27.746094 41.148438 28.105469 C 41.148438 28.394531 41.1875 28.671875 41.269531 28.925781 C 41.347656 29.1875 41.542969 29.433594 41.847656 29.675781 C 42.152344 29.917969 42.589844 30.144531 43.152344 30.355469 C 43.714844 30.5625 44.480469 30.765625 45.449219 30.957031 L 50.574219 31.972656 C 52.378906 32.328125 53.964844 32.769531 55.332031 33.300781 C 56.703125 33.835938 57.855469 34.488281 58.789063 35.261719 C 59.707031 36.011719 60.429688 36.972656 60.894531 38.0625 C 61.359375 39.160156 61.59375 40.464844 61.59375 41.980469 C 61.59375 45.363281 60.328125 48.003906 57.800781 49.90625 C 55.269531 51.808594 51.703125 52.757813 47.09375 52.757813 C 44.996094 52.757813 43.074219 52.582031 41.316406 52.226563 C 39.558594 51.871094 38.019531 51.460938 36.699219 50.996094 C 35.378906 50.527344 34.308594 50.082031 33.484375 49.664063 C 32.664063 49.246094 32.171875 48.957031 32.011719 48.796875 Z M 35.347656 42.414063 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureCloudSimpleService.png b/dist/Other/AzureCloudSimpleService.png
new file mode 100644
index 00000000..7a053e7b
Binary files /dev/null and b/dist/Other/AzureCloudSimpleService.png differ
diff --git a/dist/Other/AzureCloudSimpleService.puml b/dist/Other/AzureCloudSimpleService.puml
new file mode 100644
index 00000000..cd9e0bfb
--- /dev/null
+++ b/dist/Other/AzureCloudSimpleService.puml
@@ -0,0 +1,11 @@
+sprite $AzureCloudSimpleService [70x70/16z] {
+xPO5ikGm30N7JsJv_lTTZYlAIe7Fa2uSI9T5iHvValOyfkG3MDfjkIq5jmL8lpnj0R6ecgcA49OlnRgFttXNnf45hBRcZuXiHBfWnm9HswBJ4P3IGce9Fb8a
+jzII7AGMiem-AZYpa5h6k6J1MgBy6mr7KIQ0I9OG7Oc5RIAOPLSVyva9QPRTU1IbTUaNYxOri65PfJbA9Zxh6Y5a5bait59Bny4qXe0KBJ2pwqeuib1nbAPX
+V9HHM69Qg4LeRF0kX0EBect8siwLKeiibhO5FZ8C5oornkcIfK572jKMjDIJdQUZh15Q3bXxCjHrlzHGLDdM0aj2IW7Fw7nhQLeUfYwQ7y_qXEf6t7c_n5a1
+UUTaGlEpD0atMQoC1xFCKX-zTuL_8R-_ce_Od-_MLP9WkNYHJ91O6bl2gD7yRkHBHt6SlwTBISVEpc1RkgSInTx-GXBFeqBq_nmQdTsbJ5MOC7SZ7s6NUksz
+xZgt9UUst9RhakTx7X-Cdm
+}
+
+AzureEntityColoring(AzureCloudSimpleService)
+!define AzureCloudSimpleService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCloudSimpleService, AzureCloudSimpleService)
+!define AzureCloudSimpleService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCloudSimpleService, AzureCloudSimpleService)
diff --git a/dist/Other/AzureCloudSimpleService.svg b/dist/Other/AzureCloudSimpleService.svg
new file mode 100644
index 00000000..330c3b5f
--- /dev/null
+++ b/dist/Other/AzureCloudSimpleService.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(89.411765%,89.411765%,89.411765%);fill-opacity:1;" d="M 5.382813 2.691406 L 64.617188 2.691406 C 66.101563 2.691406 67.308594 3.898438 67.308594 5.382813 L 67.308594 64.617188 C 67.308594 66.101563 66.101563 67.308594 64.617188 67.308594 L 5.382813 67.308594 C 3.898438 67.308594 2.691406 66.101563 2.691406 64.617188 L 2.691406 5.382813 C 2.691406 3.898438 3.898438 2.691406 5.382813 2.691406 Z M 5.382813 2.691406 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(50.588235%,72.941176%,20%);fill-opacity:1;" d="M 38.234375 49.425781 C 37.878906 49.679688 37.375 49.996094 36.710938 50.367188 C 36.050781 50.738281 35.222656 51.101563 34.222656 51.453125 C 33.222656 51.808594 32.046875 52.113281 30.695313 52.371094 C 29.339844 52.628906 27.808594 52.757813 26.101563 52.757813 C 23.683594 52.757813 21.398438 52.394531 19.238281 51.671875 C 17.078125 50.945313 15.183594 49.859375 13.558594 48.410156 C 11.929688 46.957031 10.640625 45.152344 9.691406 42.996094 C 8.738281 40.835938 8.265625 38.324219 8.265625 35.453125 C 8.265625 32.648438 8.722656 30.160156 9.640625 27.984375 C 10.5625 25.808594 11.816406 23.972656 13.410156 22.476563 C 15.007813 20.976563 16.875 19.832031 19.019531 19.042969 C 21.164063 18.253906 23.476563 17.859375 25.957031 17.859375 C 27.277344 17.859375 28.46875 17.9375 29.535156 18.101563 C 30.597656 18.261719 31.539063 18.46875 32.359375 18.730469 C 33.082031 18.945313 33.785156 19.222656 34.464844 19.550781 C 35.042969 19.839844 35.511719 20.097656 35.867188 20.324219 C 36.605469 20.871094 37.140625 21.445313 37.460938 22.039063 C 37.785156 22.636719 37.945313 23.257813 37.945313 23.902344 C 37.945313 24.511719 37.824219 25.09375 37.582031 25.640625 C 37.355469 26.167969 37.0625 26.660156 36.710938 27.117188 C 36.40625 27.515625 36.066406 27.886719 35.699219 28.226563 C 35.4375 28.472656 35.15625 28.691406 34.851563 28.878906 C 34.527344 28.558594 34.117188 28.179688 33.617188 27.746094 C 33.066406 27.273438 32.457031 26.875 31.804688 26.558594 C 31.023438 26.175781 30.203125 25.871094 29.363281 25.640625 C 28.445313 25.382813 27.421875 25.253906 26.292969 25.253906 C 24.875 25.253906 23.589844 25.488281 22.429688 25.957031 C 21.289063 26.410156 20.257813 27.101563 19.40625 27.984375 C 18.550781 28.871094 17.890625 29.945313 17.425781 31.199219 C 16.957031 32.457031 16.726563 33.875 16.726563 35.453125 C 16.726563 37.066406 16.980469 38.484375 17.496094 39.707031 C 18.011719 40.933594 18.722656 41.957031 19.625 42.777344 C 20.554688 43.613281 21.648438 44.25 22.839844 44.636719 C 24.078125 45.058594 25.421875 45.265625 26.875 45.265625 C 28.679688 45.265625 30.234375 45.039063 31.539063 44.589844 C 32.84375 44.140625 33.835938 43.671875 34.511719 43.1875 L 38.136719 49.425781 Z M 38.234375 49.425781 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(28.235294%,38.823529%,52.156863%);fill-opacity:1;" d="M 35.347656 42.414063 C 35.539063 42.574219 35.976563 42.824219 36.652344 43.164063 C 37.328125 43.5 38.183594 43.839844 39.214844 44.179688 C 40.246094 44.515625 41.4375 44.824219 42.789063 45.097656 C 44.144531 45.371094 45.609375 45.507813 47.1875 45.507813 C 48.476563 45.507813 49.507813 45.417969 50.28125 45.242188 C 51.058594 45.066406 51.652344 44.832031 52.070313 44.542969 C 52.488281 44.253906 52.765625 43.921875 52.894531 43.550781 C 53.023438 43.179688 53.085938 42.800781 53.085938 42.414063 C 53.085938 41.640625 52.773438 41.003906 52.144531 40.503906 C 51.515625 40.007813 50.347656 39.609375 48.640625 39.320313 L 43.707031 38.449219 C 42.398438 38.21875 41.105469 37.894531 39.84375 37.484375 C 38.605469 37.089844 37.4375 36.503906 36.386719 35.746094 C 35.355469 34.988281 34.507813 34.011719 33.894531 32.890625 C 33.25 31.730469 32.929688 30.296875 32.929688 28.589844 C 32.929688 27.109375 33.203125 25.714844 33.75 24.410156 C 34.308594 23.089844 35.171875 21.921875 36.265625 21 C 37.390625 20.035156 38.820313 19.269531 40.542969 18.703125 C 42.265625 18.140625 44.289063 17.859375 46.609375 17.859375 C 48.285156 17.859375 49.75 17.945313 51.007813 18.125 C 52.265625 18.300781 53.34375 18.519531 54.246094 18.777344 C 55.148438 19.035156 55.882813 19.292969 56.445313 19.550781 C 57.011719 19.808594 57.421875 20.015625 57.679688 20.179688 C 58.226563 20.5 58.75 20.945313 59.25 21.507813 C 59.75 22.074219 60 22.742188 60 23.511719 C 60 24.0625 59.902344 24.585938 59.707031 25.085938 C 59.523438 25.566406 59.289063 26.03125 59.007813 26.460938 C 58.734375 26.882813 58.4375 27.242188 58.113281 27.550781 C 57.855469 27.800781 57.582031 28.035156 57.292969 28.25 C 56.96875 27.929688 56.484375 27.566406 55.84375 27.164063 C 55.109375 26.71875 54.332031 26.355469 53.523438 26.078125 C 52.621094 25.753906 51.589844 25.480469 50.429688 25.253906 C 49.203125 25.023438 47.953125 24.910156 46.707031 24.914063 C 45.449219 24.914063 44.449219 25.019531 43.707031 25.230469 C 42.96875 25.441406 42.410156 25.699219 42.042969 26.003906 C 41.671875 26.308594 41.429688 26.65625 41.316406 27.042969 C 41.210938 27.386719 41.152344 27.746094 41.148438 28.105469 C 41.148438 28.394531 41.1875 28.671875 41.269531 28.925781 C 41.347656 29.1875 41.542969 29.433594 41.847656 29.675781 C 42.152344 29.917969 42.589844 30.144531 43.152344 30.355469 C 43.714844 30.5625 44.480469 30.765625 45.449219 30.957031 L 50.574219 31.972656 C 52.378906 32.328125 53.964844 32.769531 55.332031 33.300781 C 56.703125 33.835938 57.855469 34.488281 58.789063 35.261719 C 59.707031 36.011719 60.429688 36.972656 60.894531 38.0625 C 61.359375 39.160156 61.59375 40.464844 61.59375 41.980469 C 61.59375 45.363281 60.328125 48.003906 57.800781 49.90625 C 55.269531 51.808594 51.703125 52.757813 47.09375 52.757813 C 44.996094 52.757813 43.074219 52.582031 41.316406 52.226563 C 39.558594 51.871094 38.019531 51.460938 36.699219 50.996094 C 35.378906 50.527344 34.308594 50.082031 33.484375 49.664063 C 32.664063 49.246094 32.171875 48.957031 32.011719 48.796875 Z M 35.347656 42.414063 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureControllers(m).png b/dist/Other/AzureControllers(m).png
new file mode 100644
index 00000000..bcae7e5d
Binary files /dev/null and b/dist/Other/AzureControllers(m).png differ
diff --git a/dist/Other/AzureControllers(m).svg b/dist/Other/AzureControllers(m).svg
new file mode 100644
index 00000000..53e239a4
--- /dev/null
+++ b/dist/Other/AzureControllers(m).svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56.839844 38.640625 L 43.679688 38.640625 C 42.699219 38.640625 42.140625 39.621094 42.140625 40.320313 L 42.140625 52.640625 C 42.140625 53.339844 42.839844 54.320313 43.820313 54.320313 L 48.859375 54.320313 Z M 56.839844 38.640625 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 43.539063 38.640625 L 52.78125 36.398438 L 62.578125 38.640625 Z M 43.539063 38.640625 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 17.921875 28.140625 L 34.71875 21.421875 L 34.71875 1.539063 L 17.78125 8.398438 Z M 17.921875 28.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 51.378906 7.558594 L 34.71875 1.539063 L 34.71875 35 L 51.378906 28.140625 Z M 51.378906 7.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 51.378906 28.140625 L 34.71875 35 L 17.921875 28.140625 L 34.71875 21.558594 Z M 51.378906 28.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 0 56.839844 L 16.941406 50.261719 L 16.941406 30.238281 L 0 38.78125 Z M 0 56.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 33.601563 37.800781 L 16.941406 30.238281 L 16.941406 30.519531 L 16.800781 63.699219 L 33.601563 56.839844 Z M 33.601563 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 33.601563 56.839844 L 16.941406 63.699219 L 0 56.839844 L 16.941406 50.261719 Z M 33.601563 56.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 36.398438 56.839844 L 53.339844 50.261719 L 53.339844 30.238281 L 36.398438 37.941406 Z M 36.398438 56.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 70 37.800781 L 53.339844 30.238281 L 53.339844 30.519531 L 53.199219 63.699219 L 70 56.839844 Z M 70 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,101,176);fill-opacity:1;" d="M 70 56.839844 L 53.339844 63.699219 L 36.398438 56.839844 L 53.339844 50.261719 Z M 70 56.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,27,48);fill-opacity:1;" d="M 62.71875 54.320313 L 43.820313 54.320313 C 42.839844 54.320313 42 53.480469 42 52.5 L 42 40.320313 C 42 39.339844 42.699219 38.640625 43.679688 38.640625 L 62.578125 38.640625 C 63.558594 38.640625 64.398438 39.480469 64.398438 40.460938 L 64.398438 52.5 C 64.539063 53.480469 63.699219 54.320313 62.71875 54.320313 Z M 62.71875 54.320313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 50.121094 52.921875 L 43.820313 46.621094 L 50.261719 40.460938 L 51.519531 41.71875 L 46.199219 46.621094 L 51.238281 51.800781 Z M 50.121094 52.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 56.140625 52.921875 L 62.441406 46.621094 L 56 40.460938 L 54.878906 41.71875 L 60.058594 46.621094 L 55.019531 51.800781 Z M 56.140625 52.921875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Other/AzureControllers.png b/dist/Other/AzureControllers.png
new file mode 100644
index 00000000..c4321c04
Binary files /dev/null and b/dist/Other/AzureControllers.png differ
diff --git a/dist/Other/AzureControllers.puml b/dist/Other/AzureControllers.puml
new file mode 100644
index 00000000..3ba8a7cf
--- /dev/null
+++ b/dist/Other/AzureControllers.puml
@@ -0,0 +1,12 @@
+sprite $AzureControllers [70x70/16z] {
+xTO9Sk8m48NXbcJrgd3_uuvm6weBP9SHiuT_9dlo-MMLuJULylj6gIXSqrip5kn9ZvPP8rTS4u_Av8oez1Zpr8oeE5JpApF6oldFp6ViAu9d5FmxbO_oKJwA
+j6RwdaBMF9rMI5h8T4PXQu_PYmff6sPwNk5sa9rJghN3R85JbOCnUih81Ne9RJY3avyrwT185PdzQeiypQYm6GLhFZ8GMOHhUXx4-MPS5NHdRBZImmnna2BS
+35VMojXmnIDtChKc9HgkU4iwl4C8zom9WX6Kw4J3bH2lJY2yN31KSp16olqB7OLIbagzw0GZA25Q4GUMhSfUeCugg1QxUFoYSaDaVTmsfSqf1BW-jbd54I0p
+Km2TLn20rw-AEJEb82IntjVbOWbaJgaROkkApime5RAQJzaOdb0eJEaPW4qeplYK3PbHDiQHr95THGyKPzOfpP6HugUPxYhEV0Lae4Wu0lSKetJzSEsFHmfP
+Y-cJmguq_zhsnsiM2HcVoL4fiYcnHdU3hOtJkv8NKXkcl3SZ3heg1TNsKw75aUDpkHuXjbufe-qQdC4hl6i8WZSUP0YXD1oa70_8J8-39BnvRv1YWeUgXXaK
+tpmUfBp0g4p7TpfnaCRh30PnWkCogYpmZ_Nf1m
+}
+
+AzureEntityColoring(AzureControllers)
+!define AzureControllers(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureControllers, AzureControllers)
+!define AzureControllers(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureControllers, AzureControllers)
diff --git a/dist/Other/AzureControllers.svg b/dist/Other/AzureControllers.svg
new file mode 100644
index 00000000..66f67825
--- /dev/null
+++ b/dist/Other/AzureControllers.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56.839844 38.640625 L 43.679688 38.640625 C 42.699219 38.640625 42.140625 39.621094 42.140625 40.320313 L 42.140625 52.640625 C 42.140625 53.339844 42.839844 54.320313 43.820313 54.320313 L 48.859375 54.320313 Z M 56.839844 38.640625 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 43.539063 38.640625 L 52.78125 36.398438 L 62.578125 38.640625 Z M 43.539063 38.640625 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 17.921875 28.140625 L 34.71875 21.421875 L 34.71875 1.539063 L 17.78125 8.398438 Z M 17.921875 28.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 51.378906 7.558594 L 34.71875 1.539063 L 34.71875 35 L 51.378906 28.140625 Z M 51.378906 7.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 51.378906 28.140625 L 34.71875 35 L 17.921875 28.140625 L 34.71875 21.558594 Z M 51.378906 28.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 0 56.839844 L 16.941406 50.261719 L 16.941406 30.238281 L 0 38.78125 Z M 0 56.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 33.601563 37.800781 L 16.941406 30.238281 L 16.941406 30.519531 L 16.800781 63.699219 L 33.601563 56.839844 Z M 33.601563 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 33.601563 56.839844 L 16.941406 63.699219 L 0 56.839844 L 16.941406 50.261719 Z M 33.601563 56.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(89.803922%,89.803922%,89.803922%);fill-opacity:1;" d="M 36.398438 56.839844 L 53.339844 50.261719 L 53.339844 30.238281 L 36.398438 37.941406 Z M 36.398438 56.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 70 37.800781 L 53.339844 30.238281 L 53.339844 30.519531 L 53.199219 63.699219 L 70 56.839844 Z M 70 37.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,43.921569%,78.823529%);fill-opacity:1;" d="M 70 56.839844 L 53.339844 63.699219 L 36.398438 56.839844 L 53.339844 50.261719 Z M 70 56.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,5.490196%,57.254902%);fill-opacity:1;" d="M 62.71875 54.320313 L 43.820313 54.320313 C 42.839844 54.320313 42 53.480469 42 52.5 L 42 40.320313 C 42 39.339844 42.699219 38.640625 43.679688 38.640625 L 62.578125 38.640625 C 63.558594 38.640625 64.398438 39.480469 64.398438 40.460938 L 64.398438 52.5 C 64.539063 53.480469 63.699219 54.320313 62.71875 54.320313 Z M 62.71875 54.320313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 50.121094 52.921875 L 43.820313 46.621094 L 50.261719 40.460938 L 51.519531 41.71875 L 46.199219 46.621094 L 51.238281 51.800781 Z M 50.121094 52.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 56.140625 52.921875 L 62.441406 46.621094 L 56 40.460938 L 54.878906 41.71875 L 60.058594 46.621094 L 55.019531 51.800781 Z M 56.140625 52.921875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Other/AzureCustomerLockbox(m).png b/dist/Other/AzureCustomerLockbox(m).png
new file mode 100644
index 00000000..56a18222
Binary files /dev/null and b/dist/Other/AzureCustomerLockbox(m).png differ
diff --git a/dist/Other/AzureCustomerLockbox(m).svg b/dist/Other/AzureCustomerLockbox(m).svg
new file mode 100644
index 00000000..bb67aae0
--- /dev/null
+++ b/dist/Other/AzureCustomerLockbox(m).svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 12.742188 12.601563 C 12.742188 19.378906 18.15625 24.882813 24.894531 25.046875 L 28.023438 0.476563 C 27.097656 0.253906 26.152344 0.144531 25.199219 0.140625 C 18.320313 0.140625 12.742188 5.71875 12.742188 12.601563 M 16.03125 28 L 2.800781 28 L 2.800781 60.199219 L 20.367188 60.199219 L 23.136719 38.121094 Z M 16.03125 28 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 19.601563 46.199219 C 18.828125 46.199219 18.199219 46.828125 18.199219 47.601563 L 18.199219 65.800781 C 18.199219 66.574219 18.828125 67.199219 19.601563 67.199219 L 42 67.199219 L 42 46.199219 Z M 19.601563 46.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 37.660156 12.601563 C 37.660156 19.480469 32.082031 25.058594 25.199219 25.058594 C 18.320313 25.058594 12.738281 19.480469 12.738281 12.601563 C 12.738281 5.71875 18.320313 0.140625 25.199219 0.140625 C 32.082031 0.140625 37.660156 5.71875 37.660156 12.601563 M 34.371094 28 L 25.199219 41.058594 L 16.03125 28 L 2.800781 28 L 2.800781 60.199219 L 47.601563 60.199219 L 47.601563 28 Z M 34.371094 28 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 64.050781 70 L 19.949219 70 C 17.4375 70 15.402344 67.964844 15.398438 65.453125 L 15.398438 47.949219 C 15.402344 45.4375 17.4375 43.402344 19.949219 43.398438 L 64.050781 43.398438 C 66.5625 43.402344 68.597656 45.4375 68.601563 47.949219 L 68.601563 65.453125 C 68.597656 67.964844 66.5625 70 64.050781 70 Z M 64.050781 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 18.199219 65.65625 L 18.199219 47.742188 C 18.199219 46.890625 18.890625 46.199219 19.742188 46.199219 L 64.257813 46.199219 C 65.109375 46.199219 65.800781 46.890625 65.800781 47.742188 L 65.800781 65.65625 C 65.800781 66.511719 65.109375 67.199219 64.257813 67.199219 L 19.742188 67.199219 C 18.890625 67.199219 18.199219 66.507813 18.199219 65.65625 Z M 18.199219 65.65625 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.464844 50.785156 C 38.449219 50.660156 38.382813 50.546875 38.28125 50.46875 L 36.511719 49.105469 C 36.300781 48.9375 35.996094 48.976563 35.828125 49.1875 L 28.058594 59.152344 L 23.625 54.398438 C 23.539063 54.300781 23.417969 54.246094 23.289063 54.242188 C 23.160156 54.234375 23.035156 54.28125 22.941406 54.367188 L 21.304688 55.882813 C 21.160156 56.015625 21.109375 56.222656 21.179688 56.410156 C 21.121094 56.574219 21.160156 56.761719 21.277344 56.894531 L 21.84375 57.507813 L 28.273438 64.398438 L 38.355469 51.472656 C 38.441406 51.371094 38.480469 51.238281 38.464844 51.109375 C 38.460938 51.074219 38.445313 51.046875 38.433594 51.015625 C 38.460938 50.941406 38.472656 50.863281 38.464844 50.785156 Z M 61.601563 51.566406 L 59.035156 49 L 53.898438 54.132813 L 48.765625 49 L 46.199219 51.566406 L 51.332031 56.699219 L 46.199219 61.832031 L 48.765625 64.398438 L 53.898438 59.265625 L 59.035156 64.398438 L 61.601563 61.832031 L 56.464844 56.699219 Z M 61.601563 51.566406 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureCustomerLockbox.png b/dist/Other/AzureCustomerLockbox.png
new file mode 100644
index 00000000..dadf1efb
Binary files /dev/null and b/dist/Other/AzureCustomerLockbox.png differ
diff --git a/dist/Other/AzureCustomerLockbox.puml b/dist/Other/AzureCustomerLockbox.puml
new file mode 100644
index 00000000..86d20a23
--- /dev/null
+++ b/dist/Other/AzureCustomerLockbox.puml
@@ -0,0 +1,12 @@
+sprite $AzureCustomerLockbox [70x70/16z] {
+rTM7pkim28RXpmjihFxtVxTd85fRpcX3pdorEvuiHB1NpCHCb0Fy9QvL4-48Nq4DKqG8dg8YGn5s8A6EccWLb-D5SLrKhekYHVVrp0exJqMJLm5NeWCbuqhr
+GA5Vel3TcwlLFw_WI67tvCvAmPNASdDzmnltbOPhqQwIRYm6tnFIqlRcje3BvLLf4OxIK9ndeWMQb09tiR3UNCu1zmeXu7yjy5p26hKfVZ-lMbW7IERQXmej
+tpQNKZFcM7nAZHWLyIgCLr7SIYruLltAk2QIEme7knw_CXvtkwdKf0_vhj82ijnMf8Rs2nHHvBOYDnLchksW6jV2hi9qiH9KyIFMLY6Y9bUgH7bLc4ZwVby7
+CT4lKEfdYcGPIfSlwy6Nb8XGdqe7n924Sa4f0B8gYYYZ240VAmmWY2cFg8mXQ9ygElArgpAOWPmgR8W40DHLcPXeoBcIKBgM0AHkoc0CELVoymJq-sxAn1Xo
+hh2-5Nkl-lDLIQh8MwMJCX8KisR4c7F5c0YWz6Sp4esPb39dIY_GOdyr8Uqn65MMaYbwXstSh0aPutUcQCd6RLQw8SQKSyKOscm6KSGOHSuKZNRsYxHfCnmg
+lYsr57qRSoaSRkyZNBVtMgRh1MnAdhVQTm
+}
+
+AzureEntityColoring(AzureCustomerLockbox)
+!define AzureCustomerLockbox(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCustomerLockbox, AzureCustomerLockbox)
+!define AzureCustomerLockbox(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCustomerLockbox, AzureCustomerLockbox)
diff --git a/dist/Other/AzureCustomerLockbox.svg b/dist/Other/AzureCustomerLockbox.svg
new file mode 100644
index 00000000..1e02e4d5
--- /dev/null
+++ b/dist/Other/AzureCustomerLockbox.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 12.742188 12.601563 C 12.742188 19.378906 18.15625 24.882813 24.894531 25.046875 L 28.023438 0.476563 C 27.097656 0.253906 26.152344 0.144531 25.199219 0.140625 C 18.320313 0.140625 12.742188 5.71875 12.742188 12.601563 M 16.03125 28 L 2.800781 28 L 2.800781 60.199219 L 20.367188 60.199219 L 23.136719 38.121094 Z M 16.03125 28 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 19.601563 46.199219 C 18.828125 46.199219 18.199219 46.828125 18.199219 47.601563 L 18.199219 65.800781 C 18.199219 66.574219 18.828125 67.199219 19.601563 67.199219 L 42 67.199219 L 42 46.199219 Z M 19.601563 46.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 37.660156 12.601563 C 37.660156 19.480469 32.082031 25.058594 25.199219 25.058594 C 18.320313 25.058594 12.738281 19.480469 12.738281 12.601563 C 12.738281 5.71875 18.320313 0.140625 25.199219 0.140625 C 32.082031 0.140625 37.660156 5.71875 37.660156 12.601563 M 34.371094 28 L 25.199219 41.058594 L 16.03125 28 L 2.800781 28 L 2.800781 60.199219 L 47.601563 60.199219 L 47.601563 28 Z M 34.371094 28 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 64.050781 70 L 19.949219 70 C 17.4375 70 15.402344 67.964844 15.398438 65.453125 L 15.398438 47.949219 C 15.402344 45.4375 17.4375 43.402344 19.949219 43.398438 L 64.050781 43.398438 C 66.5625 43.402344 68.597656 45.4375 68.601563 47.949219 L 68.601563 65.453125 C 68.597656 67.964844 66.5625 70 64.050781 70 Z M 64.050781 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 18.199219 65.65625 L 18.199219 47.742188 C 18.199219 46.890625 18.890625 46.199219 19.742188 46.199219 L 64.257813 46.199219 C 65.109375 46.199219 65.800781 46.890625 65.800781 47.742188 L 65.800781 65.65625 C 65.800781 66.511719 65.109375 67.199219 64.257813 67.199219 L 19.742188 67.199219 C 18.890625 67.199219 18.199219 66.507813 18.199219 65.65625 Z M 18.199219 65.65625 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.464844 50.785156 C 38.449219 50.660156 38.382813 50.546875 38.28125 50.46875 L 36.511719 49.105469 C 36.300781 48.9375 35.996094 48.976563 35.828125 49.1875 L 28.058594 59.152344 L 23.625 54.398438 C 23.539063 54.300781 23.417969 54.246094 23.289063 54.242188 C 23.160156 54.234375 23.035156 54.28125 22.941406 54.367188 L 21.304688 55.882813 C 21.160156 56.015625 21.109375 56.222656 21.179688 56.410156 C 21.121094 56.574219 21.160156 56.761719 21.277344 56.894531 L 21.84375 57.507813 L 28.273438 64.398438 L 38.355469 51.472656 C 38.441406 51.371094 38.480469 51.238281 38.464844 51.109375 C 38.460938 51.074219 38.445313 51.046875 38.433594 51.015625 C 38.460938 50.941406 38.472656 50.863281 38.464844 50.785156 Z M 61.601563 51.566406 L 59.035156 49 L 53.898438 54.132813 L 48.765625 49 L 46.199219 51.566406 L 51.332031 56.699219 L 46.199219 61.832031 L 48.765625 64.398438 L 53.898438 59.265625 L 59.035156 64.398438 L 61.601563 61.832031 L 56.464844 56.699219 Z M 61.601563 51.566406 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureEducation(m).png b/dist/Other/AzureEducation(m).png
new file mode 100644
index 00000000..fb6318af
Binary files /dev/null and b/dist/Other/AzureEducation(m).png differ
diff --git a/dist/Other/AzureEducation(m).svg b/dist/Other/AzureEducation(m).svg
new file mode 100644
index 00000000..010e3d19
--- /dev/null
+++ b/dist/Other/AzureEducation(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 54.460938 35.699219 L 36.261719 44.101563 C 35.421875 44.519531 34.578125 44.519531 33.738281 44.101563 L 15.398438 35.699219 L 15.398438 53.058594 C 15.398438 58.238281 24.078125 62.300781 34.859375 62.300781 C 45.640625 62.300781 54.320313 58.101563 54.320313 53.058594 L 54.320313 35.699219 Z M 54.460938 35.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 61.460938 37.941406 C 60.761719 34.441406 58.519531 31.640625 55.160156 30.238281 L 38.5 23.238281 C 38.078125 21.140625 31.359375 21.28125 31.359375 23.519531 C 31.359375 24.921875 34.160156 25.621094 36.398438 25.199219 L 54.179688 32.761719 C 56.558594 33.738281 58.238281 35.839844 58.800781 38.359375 C 58.101563 38.78125 57.679688 39.621094 57.679688 40.460938 L 57.679688 47.878906 C 57.679688 49.28125 58.800781 50.539063 60.339844 50.539063 C 61.878906 50.539063 63 49.421875 63 47.878906 L 63 40.460938 C 63 39.339844 62.441406 38.359375 61.460938 37.941406 Z M 61.460938 37.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 68.460938 23.519531 L 36.121094 8.679688 C 35.28125 8.261719 34.441406 8.261719 33.601563 8.679688 L 1.539063 23.519531 C 0.421875 24.078125 0.421875 25.621094 1.539063 26.179688 L 33.878906 41.019531 C 34.71875 41.441406 35.558594 41.441406 36.398438 41.019531 L 52.078125 33.738281 L 36.960938 27.019531 C 36.398438 27.160156 35.699219 27.160156 35 27.160156 C 30.660156 27.160156 27.300781 25.480469 27.300781 23.519531 C 27.300781 21.558594 30.800781 19.878906 35 19.878906 C 39.199219 19.878906 42.839844 21.140625 42.980469 22.960938 L 59.640625 30.101563 L 68.460938 26.039063 C 69.578125 25.621094 69.578125 24.078125 68.460938 23.519531 Z M 68.460938 23.519531 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureEducation.png b/dist/Other/AzureEducation.png
new file mode 100644
index 00000000..60a4b4d0
Binary files /dev/null and b/dist/Other/AzureEducation.png differ
diff --git a/dist/Other/AzureEducation.puml b/dist/Other/AzureEducation.puml
new file mode 100644
index 00000000..3e858636
--- /dev/null
+++ b/dist/Other/AzureEducation.puml
@@ -0,0 +1,10 @@
+sprite $AzureEducation [70x70/16z] {
+xPTNOWCn24J53EZ-DtRtn8tLAgHdtu-RzWa6kRMFP6F3I2ixl1y8r1qr3wBVmeAZv65_YLlH8SzCf3c1aaC4foBDuSXHyx1FuhRI4JojD30IppZIiDiraGni
+C9PGZNxIBGtUOYa_t2mrJnTQJ_5s89JGmWHees4Q0BzacPq6ggDqH4UC2uq5neS-miDDHQYnsq5ggm41xHQuQSnjykHIguAN3kIOzI3gxqOtDSRAfqj01xeL
+F0eerum3ql4ut4CRU0QEopiilTuj3rgZvR4fpukXTaEaZdCabYT3LVqKDFNavV8y6TvzLnXVEIwMqzrHhhmjZchopTAFO61H323acBV8enTcBIAWfmkMOoRm
+tWiMCM7PBDJPhLWQmwre4J_TWjAFEh7EqWQWN8eqOqbTWxOArWeHZFGVm1H6VrGuhRq70-a7I1m56njx
+}
+
+AzureEntityColoring(AzureEducation)
+!define AzureEducation(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureEducation, AzureEducation)
+!define AzureEducation(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureEducation, AzureEducation)
diff --git a/dist/Other/AzureEducation.svg b/dist/Other/AzureEducation.svg
new file mode 100644
index 00000000..d089d69a
--- /dev/null
+++ b/dist/Other/AzureEducation.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 54.460938 35.699219 L 36.261719 44.101563 C 35.421875 44.519531 34.578125 44.519531 33.738281 44.101563 L 15.398438 35.699219 L 15.398438 53.058594 C 15.398438 58.238281 24.078125 62.300781 34.859375 62.300781 C 45.640625 62.300781 54.320313 58.101563 54.320313 53.058594 L 54.320313 35.699219 Z M 54.460938 35.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 61.460938 37.941406 C 60.761719 34.441406 58.519531 31.640625 55.160156 30.238281 L 38.5 23.238281 C 38.078125 21.140625 31.359375 21.28125 31.359375 23.519531 C 31.359375 24.921875 34.160156 25.621094 36.398438 25.199219 L 54.179688 32.761719 C 56.558594 33.738281 58.238281 35.839844 58.800781 38.359375 C 58.101563 38.78125 57.679688 39.621094 57.679688 40.460938 L 57.679688 47.878906 C 57.679688 49.28125 58.800781 50.539063 60.339844 50.539063 C 61.878906 50.539063 63 49.421875 63 47.878906 L 63 40.460938 C 63 39.339844 62.441406 38.359375 61.460938 37.941406 Z M 61.460938 37.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 68.460938 23.519531 L 36.121094 8.679688 C 35.28125 8.261719 34.441406 8.261719 33.601563 8.679688 L 1.539063 23.519531 C 0.421875 24.078125 0.421875 25.621094 1.539063 26.179688 L 33.878906 41.019531 C 34.71875 41.441406 35.558594 41.441406 36.398438 41.019531 L 52.078125 33.738281 L 36.960938 27.019531 C 36.398438 27.160156 35.699219 27.160156 35 27.160156 C 30.660156 27.160156 27.300781 25.480469 27.300781 23.519531 C 27.300781 21.558594 30.800781 19.878906 35 19.878906 C 39.199219 19.878906 42.839844 21.140625 42.980469 22.960938 L 59.640625 30.101563 L 68.460938 26.039063 C 69.578125 25.621094 69.578125 24.078125 68.460938 23.519531 Z M 68.460938 23.519531 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureImageDefinition(m).png b/dist/Other/AzureImageDefinition(m).png
new file mode 100644
index 00000000..c72b8992
Binary files /dev/null and b/dist/Other/AzureImageDefinition(m).png differ
diff --git a/dist/Other/AzureImageDefinition(m).svg b/dist/Other/AzureImageDefinition(m).svg
new file mode 100644
index 00000000..7035559d
--- /dev/null
+++ b/dist/Other/AzureImageDefinition(m).svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 4.199219 5.640625 L 51.800781 5.640625 L 51.800781 67.15625 L 4.199219 67.15625 Z M 4.199219 5.640625 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 42.734375 22.347656 L 29.527344 14.777344 C 28.554688 14.230469 27.390625 14.226563 26.367188 14.789063 L 13.253906 22.304688 C 12.273438 22.875 9.800781 23.800781 9.800781 28.347656 L 9.800781 43.460938 C 9.800781 44.632813 10.441406 45.707031 11.414063 46.234375 L 24.472656 53.71875 C 24.972656 54.027344 26.601563 54.601563 28 54.601563 C 29.398438 54.601563 31 54.039063 31.484375 53.746094 L 44.554688 46.253906 C 45.570313 45.691406 46.199219 44.621094 46.199219 43.460938 L 46.199219 28.441406 C 46.199219 23.800781 43.71875 22.90625 42.734375 22.347656 Z M 42.734375 22.347656 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.148438 51.390625 C 26.078125 51.390625 26.007813 51.375 25.949219 51.335938 L 12.804688 43.804688 C 12.679688 43.738281 12.597656 43.605469 12.601563 43.460938 L 12.601563 28.347656 C 12.601563 28.203125 12.675781 28.074219 12.804688 28 C 12.925781 27.929688 13.082031 27.929688 13.203125 28 L 26.34375 35.53125 C 26.464844 35.605469 26.539063 35.738281 26.539063 35.878906 L 26.539063 50.992188 C 26.539063 51.132813 26.464844 51.265625 26.34375 51.339844 C 26.285156 51.371094 26.21875 51.390625 26.148438 51.390625 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 29.867188 51.390625 C 29.796875 51.390625 29.726563 51.371094 29.660156 51.335938 C 29.542969 51.265625 29.46875 51.132813 29.46875 50.992188 L 29.46875 35.972656 C 29.46875 35.832031 29.546875 35.703125 29.660156 35.628906 L 42.800781 28.097656 C 42.925781 28.027344 43.074219 28.027344 43.199219 28.097656 C 43.324219 28.167969 43.398438 28.300781 43.398438 28.441406 L 43.398438 43.460938 C 43.402344 43.605469 43.324219 43.738281 43.199219 43.804688 L 30.0625 51.339844 C 30.003906 51.371094 29.9375 51.390625 29.867188 51.390625 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.800781 57.523438 C 52.722656 57.304688 53.660156 57.132813 54.601563 57.003906 L 54.601563 47.261719 C 53.65625 47.40625 52.722656 47.597656 51.800781 47.839844 Z M 51.800781 57.523438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 54.601563 70 L 1.398438 70 L 1.398438 2.800781 L 54.601563 2.800781 Z M 4.199219 67.15625 L 51.800781 67.199219 L 51.800781 5.601563 L 4.199219 5.640625 Z M 4.199219 67.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 4.199219 5.640625 L 51.800781 5.640625 L 51.800781 67.15625 L 4.199219 67.15625 Z M 4.199219 5.640625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 28.042969 33.023438 C 27.972656 33.023438 27.902344 33.003906 27.84375 32.96875 L 14.660156 25.410156 C 14.539063 25.339844 14.460938 25.210938 14.460938 25.070313 C 14.460938 24.925781 14.539063 24.796875 14.660156 24.726563 L 27.761719 17.21875 C 27.882813 17.148438 28.035156 17.148438 28.15625 17.21875 L 41.34375 24.777344 C 41.464844 24.847656 41.539063 24.976563 41.539063 25.117188 C 41.539063 25.257813 41.464844 25.390625 41.34375 25.460938 L 28.246094 32.964844 C 28.183594 33.003906 28.113281 33.023438 28.042969 33.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 26.148438 51.390625 C 26.078125 51.390625 26.007813 51.375 25.949219 51.335938 L 12.804688 43.804688 C 12.679688 43.738281 12.597656 43.605469 12.601563 43.460938 L 12.601563 28.347656 C 12.601563 28.203125 12.675781 28.074219 12.804688 28 C 12.925781 27.929688 13.082031 27.929688 13.203125 28 L 26.34375 35.53125 C 26.464844 35.605469 26.539063 35.738281 26.539063 35.878906 L 26.539063 50.992188 C 26.539063 51.132813 26.464844 51.265625 26.34375 51.339844 C 26.285156 51.371094 26.21875 51.390625 26.148438 51.390625 M 29.867188 51.390625 C 29.796875 51.390625 29.726563 51.371094 29.660156 51.335938 C 29.542969 51.265625 29.46875 51.132813 29.46875 50.992188 L 29.46875 35.972656 C 29.46875 35.832031 29.546875 35.703125 29.660156 35.628906 L 42.800781 28.097656 C 42.925781 28.027344 43.074219 28.027344 43.199219 28.097656 C 43.324219 28.167969 43.398438 28.300781 43.398438 28.441406 L 43.398438 43.460938 C 43.402344 43.605469 43.324219 43.738281 43.199219 43.804688 L 30.0625 51.339844 C 30.003906 51.371094 29.9375 51.390625 29.867188 51.390625 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 58.800781 43.398438 L 70 51.800781 L 58.800781 60.199219 Z M 58.800781 43.398438 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 58.800781 55.308594 C 47.601563 55.308594 40.601563 60.898438 39.199219 63 C 39.199219 53.570313 49 48.335938 58.800781 48.335938 Z M 58.800781 55.308594 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureImageDefinition.png b/dist/Other/AzureImageDefinition.png
new file mode 100644
index 00000000..0093213c
Binary files /dev/null and b/dist/Other/AzureImageDefinition.png differ
diff --git a/dist/Other/AzureImageDefinition.puml b/dist/Other/AzureImageDefinition.puml
new file mode 100644
index 00000000..0b48549e
--- /dev/null
+++ b/dist/Other/AzureImageDefinition.puml
@@ -0,0 +1,11 @@
+sprite $AzureImageDefinition [70x70/16z] {
+xTU7SiCm30FGI1IfyV__suL31YDVJ7MtHlV8Eu7Ufv-Kj1IlQ5j8_JJ5D9QvKeAfdwCSog6elKJVgPWXkgx0aAnqmWhBbDTpY829Ap0quQ-fm8agA7FvUu8Q
+KXJ6JJAStGe7uYDWTYaOGRup_7Ys5IBESEFHHmhgw8R1LeyLSrl7Lueeyy68sNwbs7GZPRE8ab9XhVlTJdItaZ8TDn2HWFBgy42w34H58WeYt8SpZHM5u-50
+5XMCXmDPLE2mpBh2LhAj7CgXb3nLY3YboKJ18RYbJCwOVPXNo9ZC5Dw7E6Mqv1KwckyKvKAyCheunJaNfVWR6LLDEKiVhx7jgtsXuWmW3Q_7PxJQkFCGA4MT
+eHKlfe9MK6QE6LCkgIIee1MKcSEeCoPAYzmTjZ5N38scKJMzDaeVKwNBxhjclvBMQktSH06b4kYrccAlGvk0eYJqTMOL2jhiLx2KPZT70Df4bDTr64Ke3Mts
+AYXK_T6OJr75Xdx0yr7LuublKT6WqcPAE9-bF0C
+}
+
+AzureEntityColoring(AzureImageDefinition)
+!define AzureImageDefinition(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureImageDefinition, AzureImageDefinition)
+!define AzureImageDefinition(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureImageDefinition, AzureImageDefinition)
diff --git a/dist/Other/AzureImageDefinition.svg b/dist/Other/AzureImageDefinition.svg
new file mode 100644
index 00000000..98d5298e
--- /dev/null
+++ b/dist/Other/AzureImageDefinition.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 4.199219 5.640625 L 51.800781 5.640625 L 51.800781 67.15625 L 4.199219 67.15625 Z M 4.199219 5.640625 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 42.734375 22.347656 L 29.527344 14.777344 C 28.554688 14.230469 27.390625 14.226563 26.367188 14.789063 L 13.253906 22.304688 C 12.273438 22.875 9.800781 23.800781 9.800781 28.347656 L 9.800781 43.460938 C 9.800781 44.632813 10.441406 45.707031 11.414063 46.234375 L 24.472656 53.71875 C 24.972656 54.027344 26.601563 54.601563 28 54.601563 C 29.398438 54.601563 31 54.039063 31.484375 53.746094 L 44.554688 46.253906 C 45.570313 45.691406 46.199219 44.621094 46.199219 43.460938 L 46.199219 28.441406 C 46.199219 23.800781 43.71875 22.90625 42.734375 22.347656 Z M 42.734375 22.347656 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.148438 51.390625 C 26.078125 51.390625 26.007813 51.375 25.949219 51.335938 L 12.804688 43.804688 C 12.679688 43.738281 12.597656 43.605469 12.601563 43.460938 L 12.601563 28.347656 C 12.601563 28.203125 12.675781 28.074219 12.804688 28 C 12.925781 27.929688 13.082031 27.929688 13.203125 28 L 26.34375 35.53125 C 26.464844 35.605469 26.539063 35.738281 26.539063 35.878906 L 26.539063 50.992188 C 26.539063 51.132813 26.464844 51.265625 26.34375 51.339844 C 26.285156 51.371094 26.21875 51.390625 26.148438 51.390625 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 29.867188 51.390625 C 29.796875 51.390625 29.726563 51.371094 29.660156 51.335938 C 29.542969 51.265625 29.46875 51.132813 29.46875 50.992188 L 29.46875 35.972656 C 29.46875 35.832031 29.546875 35.703125 29.660156 35.628906 L 42.800781 28.097656 C 42.925781 28.027344 43.074219 28.027344 43.199219 28.097656 C 43.324219 28.167969 43.398438 28.300781 43.398438 28.441406 L 43.398438 43.460938 C 43.402344 43.605469 43.324219 43.738281 43.199219 43.804688 L 30.0625 51.339844 C 30.003906 51.371094 29.9375 51.390625 29.867188 51.390625 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.800781 57.523438 C 52.722656 57.304688 53.660156 57.132813 54.601563 57.003906 L 54.601563 47.261719 C 53.65625 47.40625 52.722656 47.597656 51.800781 47.839844 Z M 51.800781 57.523438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 54.601563 70 L 1.398438 70 L 1.398438 2.800781 L 54.601563 2.800781 Z M 4.199219 67.15625 L 51.800781 67.199219 L 51.800781 5.601563 L 4.199219 5.640625 Z M 4.199219 67.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 4.199219 5.640625 L 51.800781 5.640625 L 51.800781 67.15625 L 4.199219 67.15625 Z M 4.199219 5.640625 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 28.042969 33.023438 C 27.972656 33.023438 27.902344 33.003906 27.84375 32.96875 L 14.660156 25.410156 C 14.539063 25.339844 14.460938 25.210938 14.460938 25.070313 C 14.460938 24.925781 14.539063 24.796875 14.660156 24.726563 L 27.761719 17.21875 C 27.882813 17.148438 28.035156 17.148438 28.15625 17.21875 L 41.34375 24.777344 C 41.464844 24.847656 41.539063 24.976563 41.539063 25.117188 C 41.539063 25.257813 41.464844 25.390625 41.34375 25.460938 L 28.246094 32.964844 C 28.183594 33.003906 28.113281 33.023438 28.042969 33.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 26.148438 51.390625 C 26.078125 51.390625 26.007813 51.375 25.949219 51.335938 L 12.804688 43.804688 C 12.679688 43.738281 12.597656 43.605469 12.601563 43.460938 L 12.601563 28.347656 C 12.601563 28.203125 12.675781 28.074219 12.804688 28 C 12.925781 27.929688 13.082031 27.929688 13.203125 28 L 26.34375 35.53125 C 26.464844 35.605469 26.539063 35.738281 26.539063 35.878906 L 26.539063 50.992188 C 26.539063 51.132813 26.464844 51.265625 26.34375 51.339844 C 26.285156 51.371094 26.21875 51.390625 26.148438 51.390625 M 29.867188 51.390625 C 29.796875 51.390625 29.726563 51.371094 29.660156 51.335938 C 29.542969 51.265625 29.46875 51.132813 29.46875 50.992188 L 29.46875 35.972656 C 29.46875 35.832031 29.546875 35.703125 29.660156 35.628906 L 42.800781 28.097656 C 42.925781 28.027344 43.074219 28.027344 43.199219 28.097656 C 43.324219 28.167969 43.398438 28.300781 43.398438 28.441406 L 43.398438 43.460938 C 43.402344 43.605469 43.324219 43.738281 43.199219 43.804688 L 30.0625 51.339844 C 30.003906 51.371094 29.9375 51.390625 29.867188 51.390625 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 58.800781 43.398438 L 70 51.800781 L 58.800781 60.199219 Z M 58.800781 43.398438 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 58.800781 55.308594 C 47.601563 55.308594 40.601563 60.898438 39.199219 63 C 39.199219 53.570313 49 48.335938 58.800781 48.335938 Z M 58.800781 55.308594 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureImageVersion(m).png b/dist/Other/AzureImageVersion(m).png
new file mode 100644
index 00000000..049888f8
Binary files /dev/null and b/dist/Other/AzureImageVersion(m).png differ
diff --git a/dist/Other/AzureImageVersion(m).svg b/dist/Other/AzureImageVersion(m).svg
new file mode 100644
index 00000000..4d95bfab
--- /dev/null
+++ b/dist/Other/AzureImageVersion(m).svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 2.800781 60.199219 L 2.800781 5.601563 L 44.800781 5.601563 L 44.800781 60.199219 Z M 2.800781 60.199219 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 9.800781 12.601563 L 51.800781 12.601563 L 51.800781 67.199219 L 9.800781 67.199219 Z M 9.800781 12.601563 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 43.265625 27.953125 L 32.09375 21.546875 C 31.261719 21.082031 30.246094 21.085938 29.417969 21.558594 L 18.324219 27.914063 C 17.492188 28.398438 15.398438 29.179688 15.398438 33.027344 L 15.398438 45.820313 C 15.398438 46.808594 15.941406 47.71875 16.765625 48.164063 L 27.816406 54.496094 C 28.238281 54.757813 29.617188 55.242188 30.800781 55.242188 C 31.984375 55.242188 33.339844 54.769531 33.75 54.523438 L 44.808594 48.183594 C 45.667969 47.707031 46.199219 46.800781 46.199219 45.820313 L 46.199219 33.109375 C 46.199219 29.179688 44.101563 28.425781 43.265625 27.953125 Z M 43.265625 27.953125 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 29.230469 52.527344 C 29.171875 52.53125 29.113281 52.515625 29.0625 52.484375 L 17.941406 46.109375 C 17.835938 46.054688 17.769531 45.941406 17.769531 45.820313 L 17.769531 33.027344 C 17.769531 32.90625 17.835938 32.796875 17.941406 32.738281 C 18.046875 32.675781 18.175781 32.675781 18.28125 32.738281 L 29.398438 39.109375 C 29.5 39.171875 29.5625 39.285156 29.5625 39.402344 L 29.5625 52.195313 C 29.5625 52.3125 29.5 52.421875 29.398438 52.484375 C 29.347656 52.511719 29.289063 52.527344 29.230469 52.527344 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.378906 52.527344 C 32.320313 52.527344 32.257813 52.511719 32.207031 52.484375 C 32.105469 52.421875 32.042969 52.3125 32.042969 52.191406 L 32.042969 39.484375 C 32.042969 39.363281 32.105469 39.253906 32.207031 39.191406 L 43.324219 32.820313 C 43.429688 32.761719 43.554688 32.761719 43.660156 32.820313 C 43.765625 32.878906 43.828125 32.992188 43.828125 33.113281 L 43.828125 45.820313 C 43.828125 45.941406 43.765625 46.050781 43.660156 46.109375 L 32.542969 52.484375 C 32.496094 52.511719 32.4375 52.527344 32.378906 52.527344 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.800781 57.523438 C 52.722656 57.304688 53.660156 57.132813 54.601563 57.003906 L 54.601563 47.261719 C 53.65625 47.40625 52.722656 47.597656 51.800781 47.839844 Z M 51.800781 57.523438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 47.601563 63 L 0 63 L 0 2.800781 L 47.601563 2.800781 Z M 2.800781 60.199219 L 44.800781 60.238281 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 54.601563 70 L 7 70 L 7 9.800781 L 54.601563 9.800781 Z M 9.800781 67.199219 L 51.800781 67.238281 L 51.800781 12.601563 L 9.800781 12.636719 Z M 9.800781 67.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 9.800781 12.601563 L 51.800781 12.601563 L 51.800781 67.199219 L 9.800781 67.199219 Z M 9.800781 12.601563 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.835938 36.988281 C 30.773438 36.988281 30.71875 36.96875 30.664063 36.941406 L 19.511719 30.546875 C 19.410156 30.488281 19.34375 30.375 19.34375 30.257813 C 19.34375 30.136719 19.410156 30.027344 19.511719 29.964844 L 30.597656 23.613281 C 30.703125 23.554688 30.828125 23.554688 30.929688 23.613281 L 42.089844 30.007813 C 42.191406 30.070313 42.257813 30.179688 42.253906 30.296875 C 42.253906 30.417969 42.191406 30.527344 42.089844 30.589844 L 31.007813 36.9375 C 30.953125 36.96875 30.894531 36.988281 30.835938 36.988281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 29.230469 52.527344 C 29.171875 52.53125 29.113281 52.515625 29.0625 52.484375 L 17.941406 46.109375 C 17.835938 46.054688 17.769531 45.941406 17.769531 45.820313 L 17.769531 33.027344 C 17.769531 32.90625 17.835938 32.796875 17.941406 32.738281 C 18.046875 32.675781 18.175781 32.675781 18.28125 32.738281 L 29.398438 39.109375 C 29.5 39.171875 29.5625 39.285156 29.5625 39.402344 L 29.5625 52.195313 C 29.5625 52.3125 29.5 52.421875 29.398438 52.484375 C 29.347656 52.511719 29.289063 52.527344 29.230469 52.527344 M 32.378906 52.527344 C 32.320313 52.527344 32.257813 52.511719 32.207031 52.484375 C 32.105469 52.421875 32.042969 52.3125 32.042969 52.191406 L 32.042969 39.484375 C 32.042969 39.363281 32.105469 39.253906 32.207031 39.191406 L 43.324219 32.820313 C 43.429688 32.761719 43.554688 32.761719 43.660156 32.820313 C 43.765625 32.878906 43.828125 32.992188 43.828125 33.113281 L 43.828125 45.820313 C 43.828125 45.941406 43.765625 46.050781 43.660156 46.109375 L 32.542969 52.484375 C 32.496094 52.511719 32.4375 52.527344 32.378906 52.527344 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 58.800781 43.398438 L 70 51.800781 L 58.800781 60.199219 Z M 58.800781 43.398438 "/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 58.800781 55.308594 C 47.601563 55.308594 40.601563 60.898438 39.199219 63 C 39.199219 53.570313 49 48.335938 58.800781 48.335938 Z M 58.800781 55.308594 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureImageVersion.png b/dist/Other/AzureImageVersion.png
new file mode 100644
index 00000000..e3eea78c
Binary files /dev/null and b/dist/Other/AzureImageVersion.png differ
diff --git a/dist/Other/AzureImageVersion.puml b/dist/Other/AzureImageVersion.puml
new file mode 100644
index 00000000..66fd8190
--- /dev/null
+++ b/dist/Other/AzureImageVersion.puml
@@ -0,0 +1,11 @@
+sprite $AzureImageVersion [70x70/16z] {
+xTS7ejiW40HGbgtY_WUEC9E2XMojqfC_xeKdgahvWqB9h1NFnNwoOfVpIk7B-ISL6bahaOl_PENIIBlkUQ6uN8x_DEL3-L3KzkXtA31KuTnLR0-NmhRdhgAz
+R7caUvfMO2WLX1HEGe5HopUfS18AEcGAkkUgWWvPfEkN5I0dJ491nyuXiPJI8uj-oIdrsBzrB8MCGbJdiIRjY33d52B-Ekz8OEGLGbbqY3BVKwYA8IfyMq7t
+e36t54JHcEzJv8RoeGJ_26LhTgxmcQ87fGMTAQQyKiJigBIDbmhstS_A-5f6L9LgvQtrs5AHiT4wAMhV8Z7AZ-SMj5H47yvNHRunr54OocZLGe6ZF1GO8uwI
+K11RAt3wqzgObJXHq3qp4csjM3bNH6T3jhPKDawSIyqrYN1qSr19ADwGpTqKimxJvRAY85nxZpcKZKj2GLN2vXKGL79AhyVJEKFOyvLmHBnha8lCIZrSbRzJ
+hAbC2f9JNEMLKaU-yzmR-S-LE5Ko-LdA9m
+}
+
+AzureEntityColoring(AzureImageVersion)
+!define AzureImageVersion(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureImageVersion, AzureImageVersion)
+!define AzureImageVersion(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureImageVersion, AzureImageVersion)
diff --git a/dist/Other/AzureImageVersion.svg b/dist/Other/AzureImageVersion.svg
new file mode 100644
index 00000000..0bcad44a
--- /dev/null
+++ b/dist/Other/AzureImageVersion.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 2.800781 60.199219 L 2.800781 5.601563 L 44.800781 5.601563 L 44.800781 60.199219 Z M 2.800781 60.199219 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 9.800781 12.601563 L 51.800781 12.601563 L 51.800781 67.199219 L 9.800781 67.199219 Z M 9.800781 12.601563 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 43.265625 27.953125 L 32.09375 21.546875 C 31.261719 21.082031 30.246094 21.085938 29.417969 21.558594 L 18.324219 27.914063 C 17.492188 28.398438 15.398438 29.179688 15.398438 33.027344 L 15.398438 45.820313 C 15.398438 46.808594 15.941406 47.71875 16.765625 48.164063 L 27.816406 54.496094 C 28.238281 54.757813 29.617188 55.242188 30.800781 55.242188 C 31.984375 55.242188 33.339844 54.769531 33.75 54.523438 L 44.808594 48.183594 C 45.667969 47.707031 46.199219 46.800781 46.199219 45.820313 L 46.199219 33.109375 C 46.199219 29.179688 44.101563 28.425781 43.265625 27.953125 Z M 43.265625 27.953125 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 29.230469 52.527344 C 29.171875 52.53125 29.113281 52.515625 29.0625 52.484375 L 17.941406 46.109375 C 17.835938 46.054688 17.769531 45.941406 17.769531 45.820313 L 17.769531 33.027344 C 17.769531 32.90625 17.835938 32.796875 17.941406 32.738281 C 18.046875 32.675781 18.175781 32.675781 18.28125 32.738281 L 29.398438 39.109375 C 29.5 39.171875 29.5625 39.285156 29.5625 39.402344 L 29.5625 52.195313 C 29.5625 52.3125 29.5 52.421875 29.398438 52.484375 C 29.347656 52.511719 29.289063 52.527344 29.230469 52.527344 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.378906 52.527344 C 32.320313 52.527344 32.257813 52.511719 32.207031 52.484375 C 32.105469 52.421875 32.042969 52.3125 32.042969 52.191406 L 32.042969 39.484375 C 32.042969 39.363281 32.105469 39.253906 32.207031 39.191406 L 43.324219 32.820313 C 43.429688 32.761719 43.554688 32.761719 43.660156 32.820313 C 43.765625 32.878906 43.828125 32.992188 43.828125 33.113281 L 43.828125 45.820313 C 43.828125 45.941406 43.765625 46.050781 43.660156 46.109375 L 32.542969 52.484375 C 32.496094 52.511719 32.4375 52.527344 32.378906 52.527344 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.800781 57.523438 C 52.722656 57.304688 53.660156 57.132813 54.601563 57.003906 L 54.601563 47.261719 C 53.65625 47.40625 52.722656 47.597656 51.800781 47.839844 Z M 51.800781 57.523438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 47.601563 63 L 0 63 L 0 2.800781 L 47.601563 2.800781 Z M 2.800781 60.199219 L 44.800781 60.238281 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 54.601563 70 L 7 70 L 7 9.800781 L 54.601563 9.800781 Z M 9.800781 67.199219 L 51.800781 67.238281 L 51.800781 12.601563 L 9.800781 12.636719 Z M 9.800781 67.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 9.800781 12.601563 L 51.800781 12.601563 L 51.800781 67.199219 L 9.800781 67.199219 Z M 9.800781 12.601563 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.835938 36.988281 C 30.773438 36.988281 30.71875 36.96875 30.664063 36.941406 L 19.511719 30.546875 C 19.410156 30.488281 19.34375 30.375 19.34375 30.257813 C 19.34375 30.136719 19.410156 30.027344 19.511719 29.964844 L 30.597656 23.613281 C 30.703125 23.554688 30.828125 23.554688 30.929688 23.613281 L 42.089844 30.007813 C 42.191406 30.070313 42.257813 30.179688 42.253906 30.296875 C 42.253906 30.417969 42.191406 30.527344 42.089844 30.589844 L 31.007813 36.9375 C 30.953125 36.96875 30.894531 36.988281 30.835938 36.988281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 29.230469 52.527344 C 29.171875 52.53125 29.113281 52.515625 29.0625 52.484375 L 17.941406 46.109375 C 17.835938 46.054688 17.769531 45.941406 17.769531 45.820313 L 17.769531 33.027344 C 17.769531 32.90625 17.835938 32.796875 17.941406 32.738281 C 18.046875 32.675781 18.175781 32.675781 18.28125 32.738281 L 29.398438 39.109375 C 29.5 39.171875 29.5625 39.285156 29.5625 39.402344 L 29.5625 52.195313 C 29.5625 52.3125 29.5 52.421875 29.398438 52.484375 C 29.347656 52.511719 29.289063 52.527344 29.230469 52.527344 M 32.378906 52.527344 C 32.320313 52.527344 32.257813 52.511719 32.207031 52.484375 C 32.105469 52.421875 32.042969 52.3125 32.042969 52.191406 L 32.042969 39.484375 C 32.042969 39.363281 32.105469 39.253906 32.207031 39.191406 L 43.324219 32.820313 C 43.429688 32.761719 43.554688 32.761719 43.660156 32.820313 C 43.765625 32.878906 43.828125 32.992188 43.828125 33.113281 L 43.828125 45.820313 C 43.828125 45.941406 43.765625 46.050781 43.660156 46.109375 L 32.542969 52.484375 C 32.496094 52.511719 32.4375 52.527344 32.378906 52.527344 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 58.800781 43.398438 L 70 51.800781 L 58.800781 60.199219 Z M 58.800781 43.398438 "/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 58.800781 55.308594 C 47.601563 55.308594 40.601563 60.898438 39.199219 63 C 39.199219 53.570313 49 48.335938 58.800781 48.335938 Z M 58.800781 55.308594 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureResourceExplorer(m).png b/dist/Other/AzureResourceExplorer(m).png
new file mode 100644
index 00000000..488b1061
Binary files /dev/null and b/dist/Other/AzureResourceExplorer(m).png differ
diff --git a/dist/Other/AzureResourceExplorer(m).svg b/dist/Other/AzureResourceExplorer(m).svg
new file mode 100644
index 00000000..f6e33356
--- /dev/null
+++ b/dist/Other/AzureResourceExplorer(m).svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 38.617188 59.109375 C 38.542969 59.109375 38.464844 59.089844 38.398438 59.050781 C 38.265625 58.972656 38.1875 58.832031 38.1875 58.679688 L 38.1875 42.335938 C 38.1875 42.179688 38.269531 42.039063 38.398438 41.960938 L 52.597656 33.765625 C 52.730469 33.691406 52.894531 33.691406 53.027344 33.765625 C 53.160156 33.84375 53.242188 33.984375 53.242188 34.136719 L 53.242188 50.480469 C 53.242188 50.636719 53.160156 50.777344 53.023438 50.855469 L 38.828125 59.050781 C 38.765625 59.089844 38.691406 59.109375 38.617188 59.109375 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 6.640625 16.675781 L 6.640625 63.992188 C 6.675781 65.199219 6.050781 66.332031 5.007813 66.949219 C 3.964844 67.5625 2.671875 67.5625 1.632813 66.949219 C 0.589844 66.332031 -0.0351563 65.199219 0 63.992188 L 0 2.800781 L 22.347656 2.800781 L 30.65625 11.109375 L 67.289063 11.109375 L 67.289063 16.675781 Z M 6.640625 16.675781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(191,227,255);fill-opacity:1;" d="M 67.289063 16.675781 L 67.289063 11.109375 L 30.65625 11.109375 L 22.347656 2.800781 L 0 2.800781 L 0 63.992188 C 0 65.824219 1.484375 67.3125 3.316406 67.3125 L 66.679688 67.3125 C 68.511719 67.3125 70 65.824219 70 63.992188 L 70 16.675781 Z M 67.289063 16.675781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 36.644531 39.121094 C 36.570313 39.121094 36.496094 39.101563 36.429688 39.0625 L 22.183594 30.839844 C 22.050781 30.761719 21.972656 30.621094 21.972656 30.464844 C 21.972656 30.3125 22.050781 30.171875 22.183594 30.09375 L 36.339844 21.925781 C 36.472656 21.851563 36.636719 21.851563 36.769531 21.925781 L 51.019531 30.152344 C 51.152344 30.226563 51.230469 30.367188 51.230469 30.519531 C 51.234375 30.675781 51.152344 30.816406 51.019531 30.894531 L 36.863281 39.0625 C 36.796875 39.101563 36.722656 39.121094 36.644531 39.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 34.597656 59.109375 C 34.523438 59.109375 34.449219 59.089844 34.382813 59.050781 L 20.179688 50.855469 C 20.046875 50.78125 19.960938 50.636719 19.960938 50.480469 L 19.960938 34.03125 C 19.960938 33.878906 20.046875 33.734375 20.179688 33.65625 C 20.316406 33.582031 20.480469 33.582031 20.613281 33.65625 L 34.816406 41.851563 C 34.945313 41.933594 35.023438 42.074219 35.023438 42.226563 L 35.023438 58.679688 C 35.023438 58.835938 34.941406 58.972656 34.816406 59.050781 C 34.75 59.089844 34.675781 59.109375 34.597656 59.109375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Other/AzureResourceExplorer.png b/dist/Other/AzureResourceExplorer.png
new file mode 100644
index 00000000..f5c1590c
Binary files /dev/null and b/dist/Other/AzureResourceExplorer.png differ
diff --git a/dist/Other/AzureResourceExplorer.puml b/dist/Other/AzureResourceExplorer.puml
new file mode 100644
index 00000000..17538665
--- /dev/null
+++ b/dist/Other/AzureResourceExplorer.puml
@@ -0,0 +1,9 @@
+sprite $AzureResourceExplorer [70x70/16z] {
+xTO5TiGm30JGP6UisFS_SBbLGwu5vSmo_VTs7D3qvyBZp7ObpZ25OGh358Of35COfZ3i1mEvgHB81ygbu1QBMxaKLa5KmT8U8Z55sdCg_KffcWK-XRMj8aP5
+2rcdM1LfHwcqAApj90k6bQLrmb457KOClR1s_f1XZKhjb3kWI3bUflhoFiSK4QxgMHK23Ykl3giMycfO52buhcTL26bKv5qzByz0kwBrg65Lr573gMWzf4lH
+G96OWbFbKYu5fQzWzEZTKon7xpF5UlHUAMgO5Ar75RWc3wuLznH4LH2OfL2U5GIdGtppf7efI55cFYQAJDFyS1_BzADo3m
+}
+
+AzureEntityColoring(AzureResourceExplorer)
+!define AzureResourceExplorer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureResourceExplorer, AzureResourceExplorer)
+!define AzureResourceExplorer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureResourceExplorer, AzureResourceExplorer)
diff --git a/dist/Other/AzureResourceExplorer.svg b/dist/Other/AzureResourceExplorer.svg
new file mode 100644
index 00000000..954fd24f
--- /dev/null
+++ b/dist/Other/AzureResourceExplorer.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 38.617188 59.109375 C 38.542969 59.109375 38.464844 59.089844 38.398438 59.050781 C 38.265625 58.972656 38.1875 58.832031 38.1875 58.679688 L 38.1875 42.335938 C 38.1875 42.179688 38.269531 42.039063 38.398438 41.960938 L 52.597656 33.765625 C 52.730469 33.691406 52.894531 33.691406 53.027344 33.765625 C 53.160156 33.84375 53.242188 33.984375 53.242188 34.136719 L 53.242188 50.480469 C 53.242188 50.636719 53.160156 50.777344 53.023438 50.855469 L 38.828125 59.050781 C 38.765625 59.089844 38.691406 59.109375 38.617188 59.109375 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 6.640625 16.675781 L 6.640625 63.992188 C 6.675781 65.199219 6.050781 66.332031 5.007813 66.949219 C 3.964844 67.5625 2.671875 67.5625 1.632813 66.949219 C 0.589844 66.332031 -0.0351563 65.199219 0 63.992188 L 0 2.800781 L 22.347656 2.800781 L 30.65625 11.109375 L 67.289063 11.109375 L 67.289063 16.675781 Z M 6.640625 16.675781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(99.607843%,87.843137%,52.941176%);fill-opacity:1;" d="M 67.289063 16.675781 L 67.289063 11.109375 L 30.65625 11.109375 L 22.347656 2.800781 L 0 2.800781 L 0 63.992188 C 0 65.824219 1.484375 67.3125 3.316406 67.3125 L 66.679688 67.3125 C 68.511719 67.3125 70 65.824219 70 63.992188 L 70 16.675781 Z M 67.289063 16.675781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 36.644531 39.121094 C 36.570313 39.121094 36.496094 39.101563 36.429688 39.0625 L 22.183594 30.839844 C 22.050781 30.761719 21.972656 30.621094 21.972656 30.464844 C 21.972656 30.3125 22.050781 30.171875 22.183594 30.09375 L 36.339844 21.925781 C 36.472656 21.851563 36.636719 21.851563 36.769531 21.925781 L 51.019531 30.152344 C 51.152344 30.226563 51.230469 30.367188 51.230469 30.519531 C 51.234375 30.675781 51.152344 30.816406 51.019531 30.894531 L 36.863281 39.0625 C 36.796875 39.101563 36.722656 39.121094 36.644531 39.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 34.597656 59.109375 C 34.523438 59.109375 34.449219 59.089844 34.382813 59.050781 L 20.179688 50.855469 C 20.046875 50.78125 19.960938 50.636719 19.960938 50.480469 L 19.960938 34.03125 C 19.960938 33.878906 20.046875 33.734375 20.179688 33.65625 C 20.316406 33.582031 20.480469 33.582031 20.613281 33.65625 L 34.816406 41.851563 C 34.945313 41.933594 35.023438 42.074219 35.023438 42.226563 L 35.023438 58.679688 C 35.023438 58.835938 34.941406 58.972656 34.816406 59.050781 C 34.75 59.089844 34.675781 59.109375 34.597656 59.109375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Other/AzureSharedImageGallery(m).png b/dist/Other/AzureSharedImageGallery(m).png
new file mode 100644
index 00000000..4fc4c53c
Binary files /dev/null and b/dist/Other/AzureSharedImageGallery(m).png differ
diff --git a/dist/Other/AzureSharedImageGallery(m).svg b/dist/Other/AzureSharedImageGallery(m).svg
new file mode 100644
index 00000000..e27eadf7
--- /dev/null
+++ b/dist/Other/AzureSharedImageGallery(m).svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 1.398438 42 L 1.398438 70 L 20.214844 70 L 45.753906 42 Z M 1.398438 42 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 7 7 L 43.398438 7 L 43.398438 40.601563 L 7 40.601563 Z M 7 7 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 59.5 15.398438 L 63 15.398438 L 63 40.601563 L 59.5 40.601563 Z M 48.300781 11.199219 L 54.601563 11.199219 L 54.601563 40.601563 L 48.300781 40.601563 Z M 48.300781 11.199219 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 14.898438 37.03125 L 21.003906 40.601563 L 29.464844 40.601563 C 31.695313 39.300781 34.441406 37.695313 35.507813 37.0625 C 36.296875 36.597656 36.8125 36.203125 37.15625 35.761719 C 37.5625 35.386719 37.796875 34.859375 37.800781 34.308594 L 37.800781 21.804688 C 37.800781 21.207031 37.527344 20.664063 37.09375 20.296875 C 36.75 19.890625 36.25 19.515625 35.5 19.082031 L 26.160156 13.621094 C 25.859375 13.449219 25.519531 13.359375 25.175781 13.359375 C 24.828125 13.359375 24.480469 13.453125 24.171875 13.625 C 24.171875 13.625 16.816406 17.914063 14.890625 19.050781 C 14.105469 19.515625 13.589844 19.910156 13.246094 20.351563 C 12.835938 20.722656 12.601563 21.25 12.601563 21.804688 L 12.601563 34.308594 C 12.601563 34.902344 12.871094 35.445313 13.308594 35.8125 C 13.648438 36.222656 14.148438 36.59375 14.898438 37.03125 Z M 14.898438 37.03125 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 24.03125 28.582031 L 14.730469 23.148438 C 14.644531 23.097656 14.535156 23.097656 14.445313 23.148438 C 14.355469 23.199219 14.300781 23.292969 14.300781 23.398438 L 14.300781 34.457031 C 14.300781 34.558594 14.355469 34.652344 14.441406 34.707031 L 23.738281 40.140625 C 23.832031 40.195313 24.167969 40.171875 24.167969 39.894531 L 24.167969 28.835938 C 24.167969 28.734375 24.113281 28.640625 24.03125 28.582031 Z M 24.03125 28.582031 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.371094 28.582031 L 35.667969 23.148438 C 35.757813 23.097656 35.867188 23.097656 35.953125 23.148438 C 36.042969 23.199219 36.097656 23.292969 36.097656 23.398438 L 36.097656 34.457031 C 36.097656 34.558594 36.042969 34.652344 35.960938 34.707031 L 26.660156 40.140625 C 26.570313 40.195313 26.234375 40.171875 26.234375 39.894531 L 26.234375 28.835938 C 26.234375 28.730469 26.289063 28.636719 26.371094 28.582031 Z M 26.371094 28.582031 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 1.398438 42 L 68.601563 42 L 68.601563 70 L 1.398438 70 Z M 1.398438 42 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 2.800781 2.800781 L 2.800781 40.601563 L 7 40.601563 L 7 7 L 43.398438 7 L 43.398438 40.601563 L 47.601563 40.601563 L 47.601563 2.800781 Z M 2.800781 2.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 59.5 15.398438 L 63 15.398438 L 63 40.601563 L 67.199219 40.601563 L 67.199219 11.199219 L 59.5 11.199219 Z M 59.5 15.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 48.300781 11.199219 L 54.601563 11.199219 L 54.601563 40.601563 L 58.800781 40.601563 L 58.800781 7 L 48.300781 7 Z M 48.300781 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 7 7 L 43.398438 7 L 43.398438 40.601563 L 7 40.601563 Z M 7 7 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 48.300781 11.199219 L 54.601563 11.199219 L 54.601563 40.601563 L 48.300781 40.601563 Z M 48.300781 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 64.398438 15.398438 L 64.398438 40.601563 L 59.5 40.601563 L 59.5 15.398438 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 25.230469 26.773438 C 25.179688 26.773438 25.128906 26.761719 25.089844 26.734375 L 15.761719 21.28125 C 15.671875 21.226563 15.617188 21.132813 15.617188 21.03125 C 15.617188 20.929688 15.671875 20.835938 15.761719 20.785156 L 25.03125 15.367188 C 25.117188 15.320313 25.222656 15.320313 25.308594 15.367188 L 34.640625 20.824219 C 34.726563 20.875 34.78125 20.96875 34.777344 21.070313 C 34.78125 21.171875 34.726563 21.265625 34.640625 21.316406 L 25.371094 26.734375 C 25.328125 26.757813 25.28125 26.773438 25.230469 26.773438 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+</g>
+</svg>
diff --git a/dist/Other/AzureSharedImageGallery.png b/dist/Other/AzureSharedImageGallery.png
new file mode 100644
index 00000000..b679f67f
Binary files /dev/null and b/dist/Other/AzureSharedImageGallery.png differ
diff --git a/dist/Other/AzureSharedImageGallery.puml b/dist/Other/AzureSharedImageGallery.puml
new file mode 100644
index 00000000..5092b6a6
--- /dev/null
+++ b/dist/Other/AzureSharedImageGallery.puml
@@ -0,0 +1,10 @@
+sprite $AzureSharedImageGallery [70x70/16z] {
+xTL5WiGm30LHW_H3zx_lj9Hchc6gNUY5xVAzggIRo0WQ_fXYJ-IXz65VFHZ_IhCibBRLx1LAprAPrtH7yNTGjCdVgBZaFPpxYhjFjvGmr4if5iuznSnkAM5O
+oQe7mvL4l9PTBHsefD7ASLqIKmBfvQngaYCbx-Qy9WagafqQrOKLpxTyzbYSAbRRyGDkOVJEbLhphTJTpLX_ZHAPf5vjDLwjv6sjD_CMPRsjtj-gLCc_fVAl
+oAueBYTACDxF55CWI36Nl1sKC0A1IZgsLpmDh4IIUYXXoEn99TPSJ6hA_6JrPZzj5MtAMMqQHo_lbGsWyNgbQ7owQLwk5mf0W08GhWG2580m9H2W08Ghqu8K
+ZXmKZd1bce424Am40XI0S2KHhd0a5O00XIEX88Ghqm8KW71bch72aNC584m912e0OKeWI7a1
+}
+
+AzureEntityColoring(AzureSharedImageGallery)
+!define AzureSharedImageGallery(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSharedImageGallery, AzureSharedImageGallery)
+!define AzureSharedImageGallery(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSharedImageGallery, AzureSharedImageGallery)
diff --git a/dist/Other/AzureSharedImageGallery.svg b/dist/Other/AzureSharedImageGallery.svg
new file mode 100644
index 00000000..c8c90a62
--- /dev/null
+++ b/dist/Other/AzureSharedImageGallery.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 1.398438 42 L 1.398438 70 L 20.214844 70 L 45.753906 42 Z M 1.398438 42 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 7 7 L 43.398438 7 L 43.398438 40.601563 L 7 40.601563 Z M 7 7 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 59.5 15.398438 L 63 15.398438 L 63 40.601563 L 59.5 40.601563 Z M 48.300781 11.199219 L 54.601563 11.199219 L 54.601563 40.601563 L 48.300781 40.601563 Z M 48.300781 11.199219 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 14.898438 37.03125 L 21.003906 40.601563 L 29.464844 40.601563 C 31.695313 39.300781 34.441406 37.695313 35.507813 37.0625 C 36.296875 36.597656 36.8125 36.203125 37.15625 35.761719 C 37.5625 35.386719 37.796875 34.859375 37.800781 34.308594 L 37.800781 21.804688 C 37.800781 21.207031 37.527344 20.664063 37.09375 20.296875 C 36.75 19.890625 36.25 19.515625 35.5 19.082031 L 26.160156 13.621094 C 25.859375 13.449219 25.519531 13.359375 25.175781 13.359375 C 24.828125 13.359375 24.480469 13.453125 24.171875 13.625 C 24.171875 13.625 16.816406 17.914063 14.890625 19.050781 C 14.105469 19.515625 13.589844 19.910156 13.246094 20.351563 C 12.835938 20.722656 12.601563 21.25 12.601563 21.804688 L 12.601563 34.308594 C 12.601563 34.902344 12.871094 35.445313 13.308594 35.8125 C 13.648438 36.222656 14.148438 36.59375 14.898438 37.03125 Z M 14.898438 37.03125 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 24.03125 28.582031 L 14.730469 23.148438 C 14.644531 23.097656 14.535156 23.097656 14.445313 23.148438 C 14.355469 23.199219 14.300781 23.292969 14.300781 23.398438 L 14.300781 34.457031 C 14.300781 34.558594 14.355469 34.652344 14.441406 34.707031 L 23.738281 40.140625 C 23.832031 40.195313 24.167969 40.171875 24.167969 39.894531 L 24.167969 28.835938 C 24.167969 28.734375 24.113281 28.640625 24.03125 28.582031 Z M 24.03125 28.582031 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.371094 28.582031 L 35.667969 23.148438 C 35.757813 23.097656 35.867188 23.097656 35.953125 23.148438 C 36.042969 23.199219 36.097656 23.292969 36.097656 23.398438 L 36.097656 34.457031 C 36.097656 34.558594 36.042969 34.652344 35.960938 34.707031 L 26.660156 40.140625 C 26.570313 40.195313 26.234375 40.171875 26.234375 39.894531 L 26.234375 28.835938 C 26.234375 28.730469 26.289063 28.636719 26.371094 28.582031 Z M 26.371094 28.582031 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 1.398438 42 L 68.601563 42 L 68.601563 70 L 1.398438 70 Z M 1.398438 42 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 2.800781 2.800781 L 2.800781 40.601563 L 7 40.601563 L 7 7 L 43.398438 7 L 43.398438 40.601563 L 47.601563 40.601563 L 47.601563 2.800781 Z M 2.800781 2.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 59.5 15.398438 L 63 15.398438 L 63 40.601563 L 67.199219 40.601563 L 67.199219 11.199219 L 59.5 11.199219 Z M 59.5 15.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 48.300781 11.199219 L 54.601563 11.199219 L 54.601563 40.601563 L 58.800781 40.601563 L 58.800781 7 L 48.300781 7 Z M 48.300781 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 7 7 L 43.398438 7 L 43.398438 40.601563 L 7 40.601563 Z M 7 7 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 48.300781 11.199219 L 54.601563 11.199219 L 54.601563 40.601563 L 48.300781 40.601563 Z M 48.300781 11.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 64.398438 15.398438 L 64.398438 40.601563 L 59.5 40.601563 L 59.5 15.398438 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 25.230469 26.773438 C 25.179688 26.773438 25.128906 26.761719 25.089844 26.734375 L 15.761719 21.28125 C 15.671875 21.226563 15.617188 21.132813 15.617188 21.03125 C 15.617188 20.929688 15.671875 20.835938 15.761719 20.785156 L 25.03125 15.367188 C 25.117188 15.320313 25.222656 15.320313 25.308594 15.367188 L 34.640625 20.824219 C 34.726563 20.875 34.78125 20.96875 34.777344 21.070313 C 34.78125 21.171875 34.726563 21.265625 34.640625 21.316406 L 25.371094 26.734375 C 25.328125 26.757813 25.28125 26.773438 25.230469 26.773438 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+</g>
+</svg>
diff --git a/dist/Other/AzureTenantStatus(m).png b/dist/Other/AzureTenantStatus(m).png
new file mode 100644
index 00000000..b5bfb8a7
Binary files /dev/null and b/dist/Other/AzureTenantStatus(m).png differ
diff --git a/dist/Other/AzureTenantStatus(m).svg b/dist/Other/AzureTenantStatus(m).svg
new file mode 100644
index 00000000..6ddd3607
--- /dev/null
+++ b/dist/Other/AzureTenantStatus(m).svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 34.859375 13.300781 C 34.859375 19.792969 29.59375 25.058594 23.101563 25.058594 C 16.605469 25.058594 11.339844 19.792969 11.339844 13.300781 C 11.339844 6.804688 16.605469 1.539063 23.101563 1.539063 C 29.59375 1.539063 34.859375 6.804688 34.859375 13.300781 M 31.410156 28 L 23.101563 39.921875 L 14.789063 28 L 2.800781 28 L 2.800781 57.398438 L 43.398438 57.398438 L 43.398438 28 Z M 31.410156 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 57.152344 51.785156 L 50.957031 45.605469 L 40.058594 41.40625 L 36.609375 46.734375 L 32.035156 50.398438 L 26.429688 50.398438 L 28.164063 53.96875 L 34.828125 53.96875 C 39.667969 61.515625 46.027344 67.5625 46.027344 67.5625 C 46.027344 67.5625 52.367188 63.367188 57.226563 56 L 59.457031 56 C 60.304688 54.839844 60.96875 53.554688 61.429688 52.195313 Z M 57.152344 51.785156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.363281 53.199219 L 58.492188 53.199219 L 56.753906 56.765625 L 63.570313 56.765625 Z M 65.363281 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 53.925781 36.398438 C 50.539063 36.398438 47.632813 38.53125 46.199219 41.605469 C 44.765625 38.53125 41.863281 36.398438 38.476563 36.398438 C 33.675781 36.398438 29.785156 40.628906 29.785156 45.851563 C 29.785156 47.015625 29.957031 48.191406 30.257813 49.363281 L 25.871094 49.363281 L 27.023438 51.664063 L 35.984375 51.664063 L 40.976563 43.953125 L 46.777344 55.9375 L 52.277344 48.238281 L 56.335938 53.199219 L 61.082031 53.199219 C 62.03125 50.894531 62.621094 48.429688 62.621094 45.851563 C 62.617188 40.628906 58.726563 36.398438 53.925781 36.398438 Z M 53.925781 36.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 64.226563 55.5 L 55.242188 55.5 L 52.398438 52.027344 L 46.394531 60.433594 L 40.683594 48.640625 L 37.238281 53.96875 L 32.074219 53.96875 C 36.582031 62.613281 46.199219 70 46.199219 70 C 46.199219 70 53.746094 65.167969 58.605469 57.804688 L 63.074219 57.804688 Z M 64.226563 55.5 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureTenantStatus.png b/dist/Other/AzureTenantStatus.png
new file mode 100644
index 00000000..bc5466e9
Binary files /dev/null and b/dist/Other/AzureTenantStatus.png differ
diff --git a/dist/Other/AzureTenantStatus.puml b/dist/Other/AzureTenantStatus.puml
new file mode 100644
index 00000000..fc76eab0
--- /dev/null
+++ b/dist/Other/AzureTenantStatus.puml
@@ -0,0 +1,11 @@
+sprite $AzureTenantStatus [70x70/16z] {
+rTM7qkmW28RX3nJ4nFk_thELcAqQJlkVgTlUmP9P_3byGWX9ebVvU8Yrat5CqXsXKCI5bkC4q_I555gF2utY65D8NygHlNKIsXRtColnVN7g8jTEz1N270uj
+o4dawZeAtLp7eVKuYatYScXF72Mvpi688lnW91t2NfPD6ZvSEVfFIH-UO9siEC8c7wu8NDB3bUtBf86Atti9LTJN4whaXxVBMR_KbFXpnTSath1wKMwLV7sj
+zAsYj1sorJl32HL_dRzLXBk8Am3rh_ENYYkrfzY_vi5AtPEwKyOgfNx6GnMhdybGfJhJ-aAPh2IgBzXSHG5_qPkg605qU1RhxvStoyI-b1FpBmk3_QSoVaQb
+EWAjviCG_0gdxokokmnOQmpULcSU_5P9SBcrLguZA9006dy2S4VhgR8Ik5O3U3M0vOH7Ad9IbgNQqjfz60PgQmBdbK_AskvMGX90sqdc6nggg3LNS9BQZc-U
+VBRqmu2MrgiOHDkQ531_ONI2OQaRHjhTWadQxcpr86EMjISPysfxe9Zc9-CA4CyK89vH74Or7jaoQyPXVk0B8weqmqk_
+}
+
+AzureEntityColoring(AzureTenantStatus)
+!define AzureTenantStatus(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTenantStatus, AzureTenantStatus)
+!define AzureTenantStatus(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTenantStatus, AzureTenantStatus)
diff --git a/dist/Other/AzureTenantStatus.svg b/dist/Other/AzureTenantStatus.svg
new file mode 100644
index 00000000..ba5a471a
--- /dev/null
+++ b/dist/Other/AzureTenantStatus.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 34.859375 13.300781 C 34.859375 19.792969 29.59375 25.058594 23.101563 25.058594 C 16.605469 25.058594 11.339844 19.792969 11.339844 13.300781 C 11.339844 6.804688 16.605469 1.539063 23.101563 1.539063 C 29.59375 1.539063 34.859375 6.804688 34.859375 13.300781 M 31.410156 28 L 23.101563 39.921875 L 14.789063 28 L 2.800781 28 L 2.800781 57.398438 L 43.398438 57.398438 L 43.398438 28 Z M 31.410156 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 57.152344 51.785156 L 50.957031 45.605469 L 40.058594 41.40625 L 36.609375 46.734375 L 32.035156 50.398438 L 26.429688 50.398438 L 28.164063 53.96875 L 34.828125 53.96875 C 39.667969 61.515625 46.027344 67.5625 46.027344 67.5625 C 46.027344 67.5625 52.367188 63.367188 57.226563 56 L 59.457031 56 C 60.304688 54.839844 60.96875 53.554688 61.429688 52.195313 Z M 57.152344 51.785156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.363281 53.199219 L 58.492188 53.199219 L 56.753906 56.765625 L 63.570313 56.765625 Z M 65.363281 53.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 53.925781 36.398438 C 50.539063 36.398438 47.632813 38.53125 46.199219 41.605469 C 44.765625 38.53125 41.863281 36.398438 38.476563 36.398438 C 33.675781 36.398438 29.785156 40.628906 29.785156 45.851563 C 29.785156 47.015625 29.957031 48.191406 30.257813 49.363281 L 25.871094 49.363281 L 27.023438 51.664063 L 35.984375 51.664063 L 40.976563 43.953125 L 46.777344 55.9375 L 52.277344 48.238281 L 56.335938 53.199219 L 61.082031 53.199219 C 62.03125 50.894531 62.621094 48.429688 62.621094 45.851563 C 62.617188 40.628906 58.726563 36.398438 53.925781 36.398438 Z M 53.925781 36.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 64.226563 55.5 L 55.242188 55.5 L 52.398438 52.027344 L 46.394531 60.433594 L 40.683594 48.640625 L 37.238281 53.96875 L 32.074219 53.96875 C 36.582031 62.613281 46.199219 70 46.199219 70 C 46.199219 70 53.746094 65.167969 58.605469 57.804688 L 63.074219 57.804688 Z M 64.226563 55.5 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureWebAppFirewall(m).png b/dist/Other/AzureWebAppFirewall(m).png
new file mode 100644
index 00000000..988a8bfb
Binary files /dev/null and b/dist/Other/AzureWebAppFirewall(m).png differ
diff --git a/dist/Other/AzureWebAppFirewall(m).svg b/dist/Other/AzureWebAppFirewall(m).svg
new file mode 100644
index 00000000..5a730a22
--- /dev/null
+++ b/dist/Other/AzureWebAppFirewall(m).svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 61.128906 40.078125 C 57.09375 43.160156 52.34375 44.664063 47.625 44.664063 C 40.925781 44.664063 34.308594 41.65625 29.933594 35.933594 C 22.457031 26.171875 24.300781 12.210938 34.078125 4.730469 C 38.109375 1.625 42.871094 0.144531 47.582031 0.144531 C 54.277344 0.144531 60.898438 3.152344 65.273438 8.878906 C 72.75 18.640625 70.886719 32.605469 61.128906 40.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 57.039063 26.308594 C 58.65625 28.414063 61.65625 28.796875 63.753906 27.203125 C 63.863281 27.117188 63.949219 27.015625 64.046875 26.925781 C 66.191406 28.4375 67.679688 29.433594 68.523438 30.007813 C 68.769531 29.363281 68.941406 28.746094 69.117188 28.097656 C 68.230469 27.4375 67.03125 26.515625 65.296875 25.109375 C 65.867188 23.613281 65.6875 21.867188 64.648438 20.503906 C 63.164063 18.582031 60.53125 18.09375 58.472656 19.277344 C 56.207031 17.242188 53.714844 14.914063 51.089844 12.300781 C 59.25 7.914063 65.046875 8.554688 65.046875 8.554688 C 64.078125 7.320313 62.992188 6.242188 61.835938 5.265625 C 58.394531 4.730469 53.046875 4.792969 46.9375 8.042969 L 46.9375 8.039063 C 44.902344 5.90625 42.828125 3.625 40.71875 1.171875 C 39.710938 1.492188 38.722656 1.894531 37.769531 2.371094 C 39.328125 4.917969 41.421875 7.488281 43.785156 9.996094 C 43.789063 10.003906 43.792969 10.007813 43.800781 10.011719 C 41.832031 11.390625 39.640625 13.230469 37.617188 15.371094 C 37.359375 15.644531 37.109375 15.921875 36.867188 16.199219 C 35.660156 15.945313 34.386719 16.019531 33.203125 16.449219 C 31.1875 12.097656 31.347656 8.601563 31.667969 6.800781 C 30.792969 7.71875 29.976563 8.683594 29.269531 9.710938 C 28.746094 11.859375 28.59375 14.964844 30.148438 18.703125 C 28.351563 21.054688 28.265625 24.390625 30.144531 26.851563 C 30.300781 27.054688 30.46875 27.246094 30.640625 27.425781 C 29.820313 30.21875 29.453125 32.914063 29.339844 35.226563 C 29.550781 35.515625 29.550781 35.746094 29.761719 36.027344 C 30.828125 37.394531 32.167969 38.550781 33.464844 39.597656 C 33.304688 37.148438 33.476563 33.535156 34.992188 29.46875 C 36.035156 29.546875 37.097656 29.382813 38.09375 28.964844 C 38.664063 29.464844 39.257813 29.972656 39.894531 30.488281 C 42.078125 32.21875 44.257813 33.5625 46.382813 34.625 C 46.269531 35.703125 46.542969 36.828125 47.246094 37.757813 C 48.746094 39.695313 51.523438 40.054688 53.460938 38.574219 C 53.863281 38.265625 54.183594 37.894531 54.449219 37.492188 C 57.910156 38.261719 60.9375 38.398438 63.179688 38.398438 C 63.523438 38.398438 65.121094 36.230469 66.03125 34.886719 C 64.664063 35.171875 60.617188 35.726563 55.082031 34.136719 C 54.945313 33.515625 54.691406 32.914063 54.28125 32.375 C 52.875 30.53125 50.304688 30.128906 48.386719 31.363281 C 46.464844 30.320313 44.449219 29.011719 42.371094 27.367188 C 41.949219 27.035156 41.550781 26.703125 41.160156 26.371094 C 42.429688 24.371094 42.566406 21.804688 41.445313 19.644531 C 41.699219 19.390625 41.949219 19.136719 42.21875 18.882813 C 44.277344 16.960938 46.210938 15.421875 48.023438 14.1875 C 47.953125 14.117188 47.886719 14.046875 47.8125 13.980469 C 47.886719 14.046875 47.953125 14.113281 48.027344 14.179688 C 48.027344 14.179688 48.027344 14.183594 48.027344 14.183594 C 50.804688 16.753906 53.75 19.1875 56.542969 21.363281 C 55.800781 22.933594 55.914063 24.839844 57.039063 26.308594 Z M 57.039063 26.308594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 58.800781 39.550781 L 58.800781 30.449219 C 58.800781 29.871094 58.328125 29.398438 57.75 29.398438 L 51.449219 29.398438 C 50.871094 29.398438 50.398438 29.871094 50.398438 30.449219 C 50.398438 29.871094 49.929688 29.398438 49.351563 29.398438 L 34.648438 29.398438 C 34.070313 29.398438 33.601563 29.871094 33.601563 30.449219 C 33.601563 29.871094 33.128906 29.398438 32.550781 29.398438 L 17.851563 29.398438 C 17.269531 29.398438 16.800781 29.871094 16.800781 30.449219 C 16.800781 29.871094 16.328125 29.398438 15.75 29.398438 L 1.050781 29.398438 C 0.46875 29.398438 0 29.871094 0 30.449219 L 0 39.550781 C 0 40.128906 0.46875 40.601563 1.050781 40.601563 C 0.46875 40.601563 0 41.070313 0 41.648438 L 0 49.351563 C 0 49.929688 0.46875 50.398438 1.050781 50.398438 C 0.46875 50.398438 0 50.871094 0 51.449219 L 0 59.148438 C 0 59.730469 0.46875 60.199219 1.050781 60.199219 C 0.46875 60.199219 0 60.671875 0 61.25 L 0 68.949219 C 0 69.53125 0.46875 70 1.050781 70 L 7.351563 70 C 7.929688 70 8.398438 69.53125 8.398438 68.949219 C 8.398438 69.53125 8.871094 70 9.449219 70 L 24.148438 70 C 24.730469 70 25.199219 69.53125 25.199219 68.949219 C 25.199219 69.53125 25.671875 70 26.25 70 L 40.949219 70 C 41.53125 70 42 69.53125 42 68.949219 C 42 69.53125 42.46875 70 43.050781 70 L 57.75 70 C 58.328125 70 58.800781 69.53125 58.800781 68.949219 L 58.800781 61.25 C 58.800781 60.671875 58.328125 60.199219 57.75 60.199219 C 58.328125 60.199219 58.800781 59.730469 58.800781 59.148438 L 58.800781 51.449219 C 58.800781 50.871094 58.328125 50.398438 57.75 50.398438 C 58.328125 50.398438 58.800781 49.929688 58.800781 49.351563 L 58.800781 41.648438 C 58.800781 41.070313 58.328125 40.601563 57.75 40.601563 C 58.328125 40.601563 58.800781 40.128906 58.800781 39.550781 Z M 58.800781 39.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 18.199219 32.199219 L 32.199219 32.199219 L 32.199219 39.199219 L 18.199219 39.199219 Z M 18.199219 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 35 32.199219 L 49 32.199219 L 49 39.199219 L 35 39.199219 Z M 35 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 1.398438 32.199219 L 15.398438 32.199219 L 15.398438 39.199219 L 1.398438 39.199219 Z M 1.398438 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 26.601563 42 L 40.601563 42 L 40.601563 49 L 26.601563 49 Z M 26.601563 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 43.398438 42 L 57.398438 42 L 57.398438 49 L 43.398438 49 Z M 43.398438 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 1.398438 42 L 7 42 L 7 49 L 1.398438 49 Z M 1.398438 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 9.800781 42 L 23.800781 42 L 23.800781 49 L 9.800781 49 Z M 9.800781 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 18.199219 51.800781 L 32.199219 51.800781 L 32.199219 58.800781 L 18.199219 58.800781 Z M 18.199219 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 35 51.800781 L 49 51.800781 L 49 58.800781 L 35 58.800781 Z M 35 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 1.398438 51.800781 L 15.398438 51.800781 L 15.398438 58.800781 L 1.398438 58.800781 Z M 1.398438 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 43.398438 61.601563 L 57.398438 61.601563 L 57.398438 68.601563 L 43.398438 68.601563 Z M 43.398438 61.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 26.601563 61.601563 L 40.601563 61.601563 L 40.601563 68.601563 L 26.601563 68.601563 Z M 26.601563 61.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 1.398438 61.601563 L 7 61.601563 L 7 68.601563 L 1.398438 68.601563 Z M 1.398438 61.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 51.800781 32.199219 L 57.398438 32.199219 L 57.398438 39.199219 L 51.800781 39.199219 Z M 51.800781 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 51.800781 51.800781 L 57.398438 51.800781 L 57.398438 58.800781 L 51.800781 58.800781 Z M 51.800781 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 9.800781 61.601563 L 23.800781 61.601563 L 23.800781 68.601563 L 9.800781 68.601563 Z M 9.800781 61.601563 "/>
+</g>
+</svg>
diff --git a/dist/Other/AzureWebAppFirewall.png b/dist/Other/AzureWebAppFirewall.png
new file mode 100644
index 00000000..115895a1
Binary files /dev/null and b/dist/Other/AzureWebAppFirewall.png differ
diff --git a/dist/Other/AzureWebAppFirewall.puml b/dist/Other/AzureWebAppFirewall.puml
new file mode 100644
index 00000000..528e0c94
--- /dev/null
+++ b/dist/Other/AzureWebAppFirewall.puml
@@ -0,0 +1,11 @@
+sprite $AzureWebAppFirewall [70x70/16z] {
+xPM5aeKm34Lpq-GYo___xaeVCoyDlcvdl78W1d8Qg9a_OqNbbG36W1UvZa94d0q6kGISBaiDJIwWVAQcWWc7dCLOWOY0CrPgZ02kIMunOP4Gd0qdQfH50YSr
+qDra0geubaYmfDT0SLPEMB1XANwwu8PONTpbneZA7c3e4O_hBNvGv7kbFHNk_ClK8BILeAneVBzLT0x9mvgjQ7O3gbLH1SBIhDIp8IqVuc48mO3jMx2GnD5q
+FqoCvjqS0a9aknRDbcKCsBUKlEdhcdBDOemKcS4RB27Omxpa4br_5qtV0cnrlUzPyZEKBIM4wljTPqSQ64IAxN_zBVtTMipyPWDAotsXMagH-fCl5USQ3k4H
+paDSoBUZmgwFT6G_H3foo0lpoL3qvQLnYlJaGrguQVlOnc-tkBp9ej1dWBTPmk_-hHR86orMYa8gx5h8lc5jeQl4aJI-0UHlptNYg78ONo2xCL0N-WQo7oC3
+9Lgc5yXkYZoGtH1viKoHyTCi_vPkhYDpOTarvD9tqLBUsdGLlfveMSxqGwHdFZ4lz0UMAR9c6JxNyczX5rbfMN9rWT-yTrTcEY_acVvXbd_BZ3Dnk10jJm
+}
+
+AzureEntityColoring(AzureWebAppFirewall)
+!define AzureWebAppFirewall(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWebAppFirewall, AzureWebAppFirewall)
+!define AzureWebAppFirewall(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWebAppFirewall, AzureWebAppFirewall)
diff --git a/dist/Other/AzureWebAppFirewall.svg b/dist/Other/AzureWebAppFirewall.svg
new file mode 100644
index 00000000..7cea5cb5
--- /dev/null
+++ b/dist/Other/AzureWebAppFirewall.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 61.128906 40.078125 C 57.09375 43.160156 52.34375 44.664063 47.625 44.664063 C 40.925781 44.664063 34.308594 41.65625 29.933594 35.933594 C 22.457031 26.171875 24.300781 12.210938 34.078125 4.730469 C 38.109375 1.625 42.871094 0.144531 47.582031 0.144531 C 54.277344 0.144531 60.898438 3.152344 65.273438 8.878906 C 72.75 18.640625 70.886719 32.605469 61.128906 40.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 57.039063 26.308594 C 58.65625 28.414063 61.65625 28.796875 63.753906 27.203125 C 63.863281 27.117188 63.949219 27.015625 64.046875 26.925781 C 66.191406 28.4375 67.679688 29.433594 68.523438 30.007813 C 68.769531 29.363281 68.941406 28.746094 69.117188 28.097656 C 68.230469 27.4375 67.03125 26.515625 65.296875 25.109375 C 65.867188 23.613281 65.6875 21.867188 64.648438 20.503906 C 63.164063 18.582031 60.53125 18.09375 58.472656 19.277344 C 56.207031 17.242188 53.714844 14.914063 51.089844 12.300781 C 59.25 7.914063 65.046875 8.554688 65.046875 8.554688 C 64.078125 7.320313 62.992188 6.242188 61.835938 5.265625 C 58.394531 4.730469 53.046875 4.792969 46.9375 8.042969 L 46.9375 8.039063 C 44.902344 5.90625 42.828125 3.625 40.71875 1.171875 C 39.710938 1.492188 38.722656 1.894531 37.769531 2.371094 C 39.328125 4.917969 41.421875 7.488281 43.785156 9.996094 C 43.789063 10.003906 43.792969 10.007813 43.800781 10.011719 C 41.832031 11.390625 39.640625 13.230469 37.617188 15.371094 C 37.359375 15.644531 37.109375 15.921875 36.867188 16.199219 C 35.660156 15.945313 34.386719 16.019531 33.203125 16.449219 C 31.1875 12.097656 31.347656 8.601563 31.667969 6.800781 C 30.792969 7.71875 29.976563 8.683594 29.269531 9.710938 C 28.746094 11.859375 28.59375 14.964844 30.148438 18.703125 C 28.351563 21.054688 28.265625 24.390625 30.144531 26.851563 C 30.300781 27.054688 30.46875 27.246094 30.640625 27.425781 C 29.820313 30.21875 29.453125 32.914063 29.339844 35.226563 C 29.550781 35.515625 29.550781 35.746094 29.761719 36.027344 C 30.828125 37.394531 32.167969 38.550781 33.464844 39.597656 C 33.304688 37.148438 33.476563 33.535156 34.992188 29.46875 C 36.035156 29.546875 37.097656 29.382813 38.09375 28.964844 C 38.664063 29.464844 39.257813 29.972656 39.894531 30.488281 C 42.078125 32.21875 44.257813 33.5625 46.382813 34.625 C 46.269531 35.703125 46.542969 36.828125 47.246094 37.757813 C 48.746094 39.695313 51.523438 40.054688 53.460938 38.574219 C 53.863281 38.265625 54.183594 37.894531 54.449219 37.492188 C 57.910156 38.261719 60.9375 38.398438 63.179688 38.398438 C 63.523438 38.398438 65.121094 36.230469 66.03125 34.886719 C 64.664063 35.171875 60.617188 35.726563 55.082031 34.136719 C 54.945313 33.515625 54.691406 32.914063 54.28125 32.375 C 52.875 30.53125 50.304688 30.128906 48.386719 31.363281 C 46.464844 30.320313 44.449219 29.011719 42.371094 27.367188 C 41.949219 27.035156 41.550781 26.703125 41.160156 26.371094 C 42.429688 24.371094 42.566406 21.804688 41.445313 19.644531 C 41.699219 19.390625 41.949219 19.136719 42.21875 18.882813 C 44.277344 16.960938 46.210938 15.421875 48.023438 14.1875 C 47.953125 14.117188 47.886719 14.046875 47.8125 13.980469 C 47.886719 14.046875 47.953125 14.113281 48.027344 14.179688 C 48.027344 14.179688 48.027344 14.183594 48.027344 14.183594 C 50.804688 16.753906 53.75 19.1875 56.542969 21.363281 C 55.800781 22.933594 55.914063 24.839844 57.039063 26.308594 Z M 57.039063 26.308594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 58.800781 39.550781 L 58.800781 30.449219 C 58.800781 29.871094 58.328125 29.398438 57.75 29.398438 L 51.449219 29.398438 C 50.871094 29.398438 50.398438 29.871094 50.398438 30.449219 C 50.398438 29.871094 49.929688 29.398438 49.351563 29.398438 L 34.648438 29.398438 C 34.070313 29.398438 33.601563 29.871094 33.601563 30.449219 C 33.601563 29.871094 33.128906 29.398438 32.550781 29.398438 L 17.851563 29.398438 C 17.269531 29.398438 16.800781 29.871094 16.800781 30.449219 C 16.800781 29.871094 16.328125 29.398438 15.75 29.398438 L 1.050781 29.398438 C 0.46875 29.398438 0 29.871094 0 30.449219 L 0 39.550781 C 0 40.128906 0.46875 40.601563 1.050781 40.601563 C 0.46875 40.601563 0 41.070313 0 41.648438 L 0 49.351563 C 0 49.929688 0.46875 50.398438 1.050781 50.398438 C 0.46875 50.398438 0 50.871094 0 51.449219 L 0 59.148438 C 0 59.730469 0.46875 60.199219 1.050781 60.199219 C 0.46875 60.199219 0 60.671875 0 61.25 L 0 68.949219 C 0 69.53125 0.46875 70 1.050781 70 L 7.351563 70 C 7.929688 70 8.398438 69.53125 8.398438 68.949219 C 8.398438 69.53125 8.871094 70 9.449219 70 L 24.148438 70 C 24.730469 70 25.199219 69.53125 25.199219 68.949219 C 25.199219 69.53125 25.671875 70 26.25 70 L 40.949219 70 C 41.53125 70 42 69.53125 42 68.949219 C 42 69.53125 42.46875 70 43.050781 70 L 57.75 70 C 58.328125 70 58.800781 69.53125 58.800781 68.949219 L 58.800781 61.25 C 58.800781 60.671875 58.328125 60.199219 57.75 60.199219 C 58.328125 60.199219 58.800781 59.730469 58.800781 59.148438 L 58.800781 51.449219 C 58.800781 50.871094 58.328125 50.398438 57.75 50.398438 C 58.328125 50.398438 58.800781 49.929688 58.800781 49.351563 L 58.800781 41.648438 C 58.800781 41.070313 58.328125 40.601563 57.75 40.601563 C 58.328125 40.601563 58.800781 40.128906 58.800781 39.550781 Z M 58.800781 39.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 18.199219 32.199219 L 32.199219 32.199219 L 32.199219 39.199219 L 18.199219 39.199219 Z M 18.199219 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 35 32.199219 L 49 32.199219 L 49 39.199219 L 35 39.199219 Z M 35 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 1.398438 32.199219 L 15.398438 32.199219 L 15.398438 39.199219 L 1.398438 39.199219 Z M 1.398438 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 26.601563 42 L 40.601563 42 L 40.601563 49 L 26.601563 49 Z M 26.601563 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 43.398438 42 L 57.398438 42 L 57.398438 49 L 43.398438 49 Z M 43.398438 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 1.398438 42 L 7 42 L 7 49 L 1.398438 49 Z M 1.398438 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 9.800781 42 L 23.800781 42 L 23.800781 49 L 9.800781 49 Z M 9.800781 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 18.199219 51.800781 L 32.199219 51.800781 L 32.199219 58.800781 L 18.199219 58.800781 Z M 18.199219 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 35 51.800781 L 49 51.800781 L 49 58.800781 L 35 58.800781 Z M 35 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 1.398438 51.800781 L 15.398438 51.800781 L 15.398438 58.800781 L 1.398438 58.800781 Z M 1.398438 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 43.398438 61.601563 L 57.398438 61.601563 L 57.398438 68.601563 L 43.398438 68.601563 Z M 43.398438 61.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 26.601563 61.601563 L 40.601563 61.601563 L 40.601563 68.601563 L 26.601563 68.601563 Z M 26.601563 61.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 1.398438 61.601563 L 7 61.601563 L 7 68.601563 L 1.398438 68.601563 Z M 1.398438 61.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 51.800781 32.199219 L 57.398438 32.199219 L 57.398438 39.199219 L 51.800781 39.199219 Z M 51.800781 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 51.800781 51.800781 L 57.398438 51.800781 L 57.398438 58.800781 L 51.800781 58.800781 Z M 51.800781 51.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 9.800781 61.601563 L 23.800781 61.601563 L 23.800781 68.601563 L 9.800781 68.601563 Z M 9.800781 61.601563 "/>
+</g>
+</svg>
diff --git a/dist/Other/all.puml b/dist/Other/all.puml
new file mode 100644
index 00000000..531bd7b1
--- /dev/null
+++ b/dist/Other/all.puml
@@ -0,0 +1,133 @@
+sprite $AzureCloudSimpleNode [70x70/16z] {
+rTM7SYiX38LXIKZd0E__ladCihCDutRhDptb7n0Oov6QfMGg7p075uZqRWCamjCF1mcNrscGOR9I1v5UNqXlR1oCP8-S8Yvd2h8yn5q4TcUN-O5Q8HsOP2WO
+FXMbLba4NSOKD9tYMZ66D6hzlcqtpmWz0nUmVILe_Mn_m1MrAT3sotIjT6bNqRQK17QbhlAoqATsv3IHn4EaB2bjazSZoujIVLS1sXJRrLNpMyD4nA9IVlXb
+InuDjhdq3JcvZhZjf55Tvkjwb6xyXsuLeui42PMct3AHL3fb37RKTkpxIX91MqeJwsXXqX1wPAdJhP9k5MuLOLr5dvjENDVI6KhFUAjSSAVMqkVIAb3Pg7ck
+jHsIalcer8COdP7qclR3Kd8MAIxd-wAgYPL-2tbVIwBhX7H1tT_TkkFjrwELR21DelVFqR7InmBE8bi6RR0MhOD0tk_OYTY0PwKMQPn-V5_QlTB-JE79Lqe0
+aplYEblZoWuL8rI64g5djiwcf5xfdA5t8gOplT85eSz6hAxyL16_VfzgzCWP1dFfqkahLXs7oFHbs6YGSDFbf0E4wr0QxMWJtFJ6aCV2TLZ9sJq0HBZfSwuL
+pnan04xqJy16yr2fSv0ZmnkHa2kzi2aT9F3oIcg9SuIlHRgudj497wgrNEwBwQjOwtiLS06RL2nDMlENOQj4pZbzlAFi2kg4bLMwMx6SDEOLvkv-HP6PNMTi
+DJkZvAOpwPdfFXOhUrZv-9N2Aygvelq3-2B8KUA7aKvj22IJ3SdpWgJAn7zPCVa0k7awfMV7Ij8Z6GfUmRlW1MJ0E83PRqskzCDAPt468ZgGYAFqmHczBh1d
+yk_x1W
+}
+
+AzureEntityColoring(AzureCloudSimpleNode)
+!define AzureCloudSimpleNode(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCloudSimpleNode, AzureCloudSimpleNode)
+!define AzureCloudSimpleNode(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCloudSimpleNode, AzureCloudSimpleNode)
+
+sprite $AzureCloudSimpleService [70x70/16z] {
+xPO5ikGm30N7JsJv_lTTZYlAIe7Fa2uSI9T5iHvValOyfkG3MDfjkIq5jmL8lpnj0R6ecgcA49OlnRgFttXNnf45hBRcZuXiHBfWnm9HswBJ4P3IGce9Fb8a
+jzII7AGMiem-AZYpa5h6k6J1MgBy6mr7KIQ0I9OG7Oc5RIAOPLSVyva9QPRTU1IbTUaNYxOri65PfJbA9Zxh6Y5a5bait59Bny4qXe0KBJ2pwqeuib1nbAPX
+V9HHM69Qg4LeRF0kX0EBect8siwLKeiibhO5FZ8C5oornkcIfK572jKMjDIJdQUZh15Q3bXxCjHrlzHGLDdM0aj2IW7Fw7nhQLeUfYwQ7y_qXEf6t7c_n5a1
+UUTaGlEpD0atMQoC1xFCKX-zTuL_8R-_ce_Od-_MLP9WkNYHJ91O6bl2gD7yRkHBHt6SlwTBISVEpc1RkgSInTx-GXBFeqBq_nmQdTsbJ5MOC7SZ7s6NUksz
+xZgt9UUst9RhakTx7X-Cdm
+}
+
+AzureEntityColoring(AzureCloudSimpleService)
+!define AzureCloudSimpleService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCloudSimpleService, AzureCloudSimpleService)
+!define AzureCloudSimpleService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCloudSimpleService, AzureCloudSimpleService)
+
+sprite $AzureControllers [70x70/16z] {
+xTO9Sk8m48NXbcJrgd3_uuvm6weBP9SHiuT_9dlo-MMLuJULylj6gIXSqrip5kn9ZvPP8rTS4u_Av8oez1Zpr8oeE5JpApF6oldFp6ViAu9d5FmxbO_oKJwA
+j6RwdaBMF9rMI5h8T4PXQu_PYmff6sPwNk5sa9rJghN3R85JbOCnUih81Ne9RJY3avyrwT185PdzQeiypQYm6GLhFZ8GMOHhUXx4-MPS5NHdRBZImmnna2BS
+35VMojXmnIDtChKc9HgkU4iwl4C8zom9WX6Kw4J3bH2lJY2yN31KSp16olqB7OLIbagzw0GZA25Q4GUMhSfUeCugg1QxUFoYSaDaVTmsfSqf1BW-jbd54I0p
+Km2TLn20rw-AEJEb82IntjVbOWbaJgaROkkApime5RAQJzaOdb0eJEaPW4qeplYK3PbHDiQHr95THGyKPzOfpP6HugUPxYhEV0Lae4Wu0lSKetJzSEsFHmfP
+Y-cJmguq_zhsnsiM2HcVoL4fiYcnHdU3hOtJkv8NKXkcl3SZ3heg1TNsKw75aUDpkHuXjbufe-qQdC4hl6i8WZSUP0YXD1oa70_8J8-39BnvRv1YWeUgXXaK
+tpmUfBp0g4p7TpfnaCRh30PnWkCogYpmZ_Nf1m
+}
+
+AzureEntityColoring(AzureControllers)
+!define AzureControllers(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureControllers, AzureControllers)
+!define AzureControllers(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureControllers, AzureControllers)
+
+sprite $AzureCustomerLockbox [70x70/16z] {
+rTM7pkim28RXpmjihFxtVxTd85fRpcX3pdorEvuiHB1NpCHCb0Fy9QvL4-48Nq4DKqG8dg8YGn5s8A6EccWLb-D5SLrKhekYHVVrp0exJqMJLm5NeWCbuqhr
+GA5Vel3TcwlLFw_WI67tvCvAmPNASdDzmnltbOPhqQwIRYm6tnFIqlRcje3BvLLf4OxIK9ndeWMQb09tiR3UNCu1zmeXu7yjy5p26hKfVZ-lMbW7IERQXmej
+tpQNKZFcM7nAZHWLyIgCLr7SIYruLltAk2QIEme7knw_CXvtkwdKf0_vhj82ijnMf8Rs2nHHvBOYDnLchksW6jV2hi9qiH9KyIFMLY6Y9bUgH7bLc4ZwVby7
+CT4lKEfdYcGPIfSlwy6Nb8XGdqe7n924Sa4f0B8gYYYZ240VAmmWY2cFg8mXQ9ygElArgpAOWPmgR8W40DHLcPXeoBcIKBgM0AHkoc0CELVoymJq-sxAn1Xo
+hh2-5Nkl-lDLIQh8MwMJCX8KisR4c7F5c0YWz6Sp4esPb39dIY_GOdyr8Uqn65MMaYbwXstSh0aPutUcQCd6RLQw8SQKSyKOscm6KSGOHSuKZNRsYxHfCnmg
+lYsr57qRSoaSRkyZNBVtMgRh1MnAdhVQTm
+}
+
+AzureEntityColoring(AzureCustomerLockbox)
+!define AzureCustomerLockbox(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCustomerLockbox, AzureCustomerLockbox)
+!define AzureCustomerLockbox(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCustomerLockbox, AzureCustomerLockbox)
+
+sprite $AzureEducation [70x70/16z] {
+xPTNOWCn24J53EZ-DtRtn8tLAgHdtu-RzWa6kRMFP6F3I2ixl1y8r1qr3wBVmeAZv65_YLlH8SzCf3c1aaC4foBDuSXHyx1FuhRI4JojD30IppZIiDiraGni
+C9PGZNxIBGtUOYa_t2mrJnTQJ_5s89JGmWHees4Q0BzacPq6ggDqH4UC2uq5neS-miDDHQYnsq5ggm41xHQuQSnjykHIguAN3kIOzI3gxqOtDSRAfqj01xeL
+F0eerum3ql4ut4CRU0QEopiilTuj3rgZvR4fpukXTaEaZdCabYT3LVqKDFNavV8y6TvzLnXVEIwMqzrHhhmjZchopTAFO61H323acBV8enTcBIAWfmkMOoRm
+tWiMCM7PBDJPhLWQmwre4J_TWjAFEh7EqWQWN8eqOqbTWxOArWeHZFGVm1H6VrGuhRq70-a7I1m56njx
+}
+
+AzureEntityColoring(AzureEducation)
+!define AzureEducation(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureEducation, AzureEducation)
+!define AzureEducation(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureEducation, AzureEducation)
+
+sprite $AzureImageDefinition [70x70/16z] {
+xTU7SiCm30FGI1IfyV__suL31YDVJ7MtHlV8Eu7Ufv-Kj1IlQ5j8_JJ5D9QvKeAfdwCSog6elKJVgPWXkgx0aAnqmWhBbDTpY829Ap0quQ-fm8agA7FvUu8Q
+KXJ6JJAStGe7uYDWTYaOGRup_7Ys5IBESEFHHmhgw8R1LeyLSrl7Lueeyy68sNwbs7GZPRE8ab9XhVlTJdItaZ8TDn2HWFBgy42w34H58WeYt8SpZHM5u-50
+5XMCXmDPLE2mpBh2LhAj7CgXb3nLY3YboKJ18RYbJCwOVPXNo9ZC5Dw7E6Mqv1KwckyKvKAyCheunJaNfVWR6LLDEKiVhx7jgtsXuWmW3Q_7PxJQkFCGA4MT
+eHKlfe9MK6QE6LCkgIIee1MKcSEeCoPAYzmTjZ5N38scKJMzDaeVKwNBxhjclvBMQktSH06b4kYrccAlGvk0eYJqTMOL2jhiLx2KPZT70Df4bDTr64Ke3Mts
+AYXK_T6OJr75Xdx0yr7LuublKT6WqcPAE9-bF0C
+}
+
+AzureEntityColoring(AzureImageDefinition)
+!define AzureImageDefinition(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureImageDefinition, AzureImageDefinition)
+!define AzureImageDefinition(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureImageDefinition, AzureImageDefinition)
+
+sprite $AzureImageVersion [70x70/16z] {
+xTS7ejiW40HGbgtY_WUEC9E2XMojqfC_xeKdgahvWqB9h1NFnNwoOfVpIk7B-ISL6bahaOl_PENIIBlkUQ6uN8x_DEL3-L3KzkXtA31KuTnLR0-NmhRdhgAz
+R7caUvfMO2WLX1HEGe5HopUfS18AEcGAkkUgWWvPfEkN5I0dJ491nyuXiPJI8uj-oIdrsBzrB8MCGbJdiIRjY33d52B-Ekz8OEGLGbbqY3BVKwYA8IfyMq7t
+e36t54JHcEzJv8RoeGJ_26LhTgxmcQ87fGMTAQQyKiJigBIDbmhstS_A-5f6L9LgvQtrs5AHiT4wAMhV8Z7AZ-SMj5H47yvNHRunr54OocZLGe6ZF1GO8uwI
+K11RAt3wqzgObJXHq3qp4csjM3bNH6T3jhPKDawSIyqrYN1qSr19ADwGpTqKimxJvRAY85nxZpcKZKj2GLN2vXKGL79AhyVJEKFOyvLmHBnha8lCIZrSbRzJ
+hAbC2f9JNEMLKaU-yzmR-S-LE5Ko-LdA9m
+}
+
+AzureEntityColoring(AzureImageVersion)
+!define AzureImageVersion(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureImageVersion, AzureImageVersion)
+!define AzureImageVersion(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureImageVersion, AzureImageVersion)
+
+sprite $AzureResourceExplorer [70x70/16z] {
+xTO5TiGm30JGP6UisFS_SBbLGwu5vSmo_VTs7D3qvyBZp7ObpZ25OGh358Of35COfZ3i1mEvgHB81ygbu1QBMxaKLa5KmT8U8Z55sdCg_KffcWK-XRMj8aP5
+2rcdM1LfHwcqAApj90k6bQLrmb457KOClR1s_f1XZKhjb3kWI3bUflhoFiSK4QxgMHK23Ykl3giMycfO52buhcTL26bKv5qzByz0kwBrg65Lr573gMWzf4lH
+G96OWbFbKYu5fQzWzEZTKon7xpF5UlHUAMgO5Ar75RWc3wuLznH4LH2OfL2U5GIdGtppf7efI55cFYQAJDFyS1_BzADo3m
+}
+
+AzureEntityColoring(AzureResourceExplorer)
+!define AzureResourceExplorer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureResourceExplorer, AzureResourceExplorer)
+!define AzureResourceExplorer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureResourceExplorer, AzureResourceExplorer)
+
+sprite $AzureSharedImageGallery [70x70/16z] {
+xTL5WiGm30LHW_H3zx_lj9Hchc6gNUY5xVAzggIRo0WQ_fXYJ-IXz65VFHZ_IhCibBRLx1LAprAPrtH7yNTGjCdVgBZaFPpxYhjFjvGmr4if5iuznSnkAM5O
+oQe7mvL4l9PTBHsefD7ASLqIKmBfvQngaYCbx-Qy9WagafqQrOKLpxTyzbYSAbRRyGDkOVJEbLhphTJTpLX_ZHAPf5vjDLwjv6sjD_CMPRsjtj-gLCc_fVAl
+oAueBYTACDxF55CWI36Nl1sKC0A1IZgsLpmDh4IIUYXXoEn99TPSJ6hA_6JrPZzj5MtAMMqQHo_lbGsWyNgbQ7owQLwk5mf0W08GhWG2580m9H2W08Ghqu8K
+ZXmKZd1bce424Am40XI0S2KHhd0a5O00XIEX88Ghqm8KW71bch72aNC584m912e0OKeWI7a1
+}
+
+AzureEntityColoring(AzureSharedImageGallery)
+!define AzureSharedImageGallery(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSharedImageGallery, AzureSharedImageGallery)
+!define AzureSharedImageGallery(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSharedImageGallery, AzureSharedImageGallery)
+
+sprite $AzureTenantStatus [70x70/16z] {
+rTM7qkmW28RX3nJ4nFk_thELcAqQJlkVgTlUmP9P_3byGWX9ebVvU8Yrat5CqXsXKCI5bkC4q_I555gF2utY65D8NygHlNKIsXRtColnVN7g8jTEz1N270uj
+o4dawZeAtLp7eVKuYatYScXF72Mvpi688lnW91t2NfPD6ZvSEVfFIH-UO9siEC8c7wu8NDB3bUtBf86Atti9LTJN4whaXxVBMR_KbFXpnTSath1wKMwLV7sj
+zAsYj1sorJl32HL_dRzLXBk8Am3rh_ENYYkrfzY_vi5AtPEwKyOgfNx6GnMhdybGfJhJ-aAPh2IgBzXSHG5_qPkg605qU1RhxvStoyI-b1FpBmk3_QSoVaQb
+EWAjviCG_0gdxokokmnOQmpULcSU_5P9SBcrLguZA9006dy2S4VhgR8Ik5O3U3M0vOH7Ad9IbgNQqjfz60PgQmBdbK_AskvMGX90sqdc6nggg3LNS9BQZc-U
+VBRqmu2MrgiOHDkQ531_ONI2OQaRHjhTWadQxcpr86EMjISPysfxe9Zc9-CA4CyK89vH74Or7jaoQyPXVk0B8weqmqk_
+}
+
+AzureEntityColoring(AzureTenantStatus)
+!define AzureTenantStatus(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTenantStatus, AzureTenantStatus)
+!define AzureTenantStatus(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTenantStatus, AzureTenantStatus)
+
+sprite $AzureWebAppFirewall [70x70/16z] {
+xPM5aeKm34Lpq-GYo___xaeVCoyDlcvdl78W1d8Qg9a_OqNbbG36W1UvZa94d0q6kGISBaiDJIwWVAQcWWc7dCLOWOY0CrPgZ02kIMunOP4Gd0qdQfH50YSr
+qDra0geubaYmfDT0SLPEMB1XANwwu8PONTpbneZA7c3e4O_hBNvGv7kbFHNk_ClK8BILeAneVBzLT0x9mvgjQ7O3gbLH1SBIhDIp8IqVuc48mO3jMx2GnD5q
+FqoCvjqS0a9aknRDbcKCsBUKlEdhcdBDOemKcS4RB27Omxpa4br_5qtV0cnrlUzPyZEKBIM4wljTPqSQ64IAxN_zBVtTMipyPWDAotsXMagH-fCl5USQ3k4H
+paDSoBUZmgwFT6G_H3foo0lpoL3qvQLnYlJaGrguQVlOnc-tkBp9ej1dWBTPmk_-hHR86orMYa8gx5h8lc5jeQl4aJI-0UHlptNYg78ONo2xCL0N-WQo7oC3
+9Lgc5yXkYZoGtH1viKoHyTCi_vPkhYDpOTarvD9tqLBUsdGLlfveMSxqGwHdFZ4lz0UMAR9c6JxNyczX5rbfMN9rWT-yTrTcEY_acVvXbd_BZ3Dnk10jJm
+}
+
+AzureEntityColoring(AzureWebAppFirewall)
+!define AzureWebAppFirewall(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWebAppFirewall, AzureWebAppFirewall)
+!define AzureWebAppFirewall(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWebAppFirewall, AzureWebAppFirewall)
+
diff --git a/dist/ProductLogos/AzureAPIManagement(m).png b/dist/ProductLogos/AzureAPIManagement(m).png
new file mode 100644
index 00000000..294abd47
Binary files /dev/null and b/dist/ProductLogos/AzureAPIManagement(m).png differ
diff --git a/dist/ProductLogos/AzureAPIManagement(m).svg b/dist/ProductLogos/AzureAPIManagement(m).svg
new file mode 100644
index 00000000..bbcb5045
--- /dev/null
+++ b/dist/ProductLogos/AzureAPIManagement(m).svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 28.699219 45.5 L 16.238281 45.5 C 10.078125 45.5 5.039063 40.460938 5.039063 34.160156 C 5.039063 27.859375 9.800781 22.820313 16.238281 22.820313 C 17.359375 22.820313 18.621094 23.101563 20.019531 23.238281 L 22.398438 23.941406 L 23.101563 21.558594 C 25.339844 14.28125 32.339844 9.800781 40.320313 9.800781 C 49.980469 9.800781 57.398438 17.21875 57.398438 26.878906 C 57.398438 28.421875 57.121094 29.960938 56.699219 31.5 L 55.71875 35 L 59.5 34.578125 C 59.78125 34.578125 59.921875 34.578125 60.199219 34.578125 C 63 34.578125 65.238281 36.960938 65.238281 39.621094 C 65.238281 42.28125 63.28125 44.238281 60.898438 44.660156 C 60.898438 44.660156 48.859375 44.660156 48.441406 44.660156 C 48.019531 41.160156 46.199219 38.078125 43.820313 35.699219 C 40.738281 32.621094 36.539063 30.800781 32.199219 30.800781 C 29.121094 30.800781 26.039063 31.640625 23.660156 33.179688 L 26.320313 37.378906 C 28.28125 36.261719 30.238281 35.839844 32.480469 35.839844 C 35.558594 35.839844 38.640625 36.960938 40.601563 39.339844 C 42.839844 41.578125 44.101563 44.378906 44.101563 47.460938 C 44.101563 50.539063 42.980469 53.621094 40.601563 55.578125 C 38.359375 57.960938 35.558594 59.078125 32.480469 59.078125 C 30.238281 59.078125 28.140625 58.378906 26.320313 57.121094 L 23.660156 61.320313 C 26.320313 62.859375 29.398438 63.980469 32.199219 63.980469 C 36.539063 63.980469 40.738281 62.441406 43.820313 59.21875 C 46.480469 56.558594 48.019531 53.058594 48.441406 49.421875 C 49.140625 49.421875 61.179688 49.421875 61.179688 49.421875 L 61.460938 49.421875 C 66.5 49 70.28125 44.660156 70.28125 39.339844 C 70.28125 35.140625 66.359375 31.21875 61.738281 30.378906 C 62.019531 29.539063 62.019531 29.121094 62.019531 27.71875 C 62.019531 15.398438 53.339844 5.601563 39.480469 5.601563 C 30.660156 5.601563 22.820313 10.640625 19.601563 18.761719 C 18.480469 18.761719 17.640625 18.339844 16.378906 18.339844 C 7.28125 18.199219 0 25.199219 0 34.160156 C 0 42.980469 7.28125 49.980469 15.960938 49.980469 L 29.679688 49.980469 Z M 28.699219 45.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 39.761719 47.320313 C 39.761719 51.648438 36.25 55.160156 31.921875 55.160156 C 27.589844 55.160156 24.078125 51.648438 24.078125 47.320313 C 24.078125 42.988281 27.589844 39.480469 31.921875 39.480469 C 36.25 39.480469 39.761719 42.988281 39.761719 47.320313 Z M 39.761719 47.320313 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/AzureAPIManagement.png b/dist/ProductLogos/AzureAPIManagement.png
new file mode 100644
index 00000000..726bdf49
Binary files /dev/null and b/dist/ProductLogos/AzureAPIManagement.png differ
diff --git a/dist/ProductLogos/AzureAPIManagement.puml b/dist/ProductLogos/AzureAPIManagement.puml
new file mode 100644
index 00000000..7df300aa
--- /dev/null
+++ b/dist/ProductLogos/AzureAPIManagement.puml
@@ -0,0 +1,12 @@
+sprite $AzureAPIManagement [70x70/16z] {
+xPU7jjmm24Gr56_z_zzDyLiKpJl2aKalzvIj7Wy8XDn-DVy1H0Ij3jIsZcj9IdnxXsjPWpcdO-HXVByU5_erAk5D_QGTYV-3jLy6RSr9-cTuAfE88CdNOb3x
+_RmbADqYHKaaSxCKpw7NXPZiwuOFxWDHLH4ih84cPg3RICl9pS0smfOM09FlHcIfeZJfks2jf7mcOlBAiTjYn_DdihU6iefGpomZV568L5I4dCN7iWgLHrK5
+fNWY1aasWMKiLB8UvytQRJhBeiRGFo1p7BYa8sBJ0vNj7PvtdkVRZUOZCJBX7b7b4SLVajq2urWHf-BXm4smTwTDPBW9BLqZMMlODpF7zPAtBEyGXsq4KOmh
+wud-qHYq-_CJzsrm8ya-WtIitvulxjAjUn9HEhplpyuZB_C-H-VBU7aEt8OkPZnKC9iUU18M_xFP9DH8t8w9uCN6AbVkBSQ7u9WxgzovAHYaNVDuCh4SSv50
+_D3B8rNHHi16eHkhtBfX7p2JDW4TOvKzWOK9UgNayknO1sD-bGvgPv1xJ-qkWkBCkRpPkU9BCKWheEwMd75BUFLGm8yGjQoWrqO_W7en13SpfuOvXoPTTuw3
+oLWtuzAAYD73U1r01EtNyf-F
+}
+
+AzureEntityColoring(AzureAPIManagement)
+!define AzureAPIManagement(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAPIManagement, AzureAPIManagement)
+!define AzureAPIManagement(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAPIManagement, AzureAPIManagement)
diff --git a/dist/ProductLogos/AzureAPIManagement.svg b/dist/ProductLogos/AzureAPIManagement.svg
new file mode 100644
index 00000000..3045971f
--- /dev/null
+++ b/dist/ProductLogos/AzureAPIManagement.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 28.699219 45.5 L 16.238281 45.5 C 10.078125 45.5 5.039063 40.460938 5.039063 34.160156 C 5.039063 27.859375 9.800781 22.820313 16.238281 22.820313 C 17.359375 22.820313 18.621094 23.101563 20.019531 23.238281 L 22.398438 23.941406 L 23.101563 21.558594 C 25.339844 14.28125 32.339844 9.800781 40.320313 9.800781 C 49.980469 9.800781 57.398438 17.21875 57.398438 26.878906 C 57.398438 28.421875 57.121094 29.960938 56.699219 31.5 L 55.71875 35 L 59.5 34.578125 C 59.78125 34.578125 59.921875 34.578125 60.199219 34.578125 C 63 34.578125 65.238281 36.960938 65.238281 39.621094 C 65.238281 42.28125 63.28125 44.238281 60.898438 44.660156 C 60.898438 44.660156 48.859375 44.660156 48.441406 44.660156 C 48.019531 41.160156 46.199219 38.078125 43.820313 35.699219 C 40.738281 32.621094 36.539063 30.800781 32.199219 30.800781 C 29.121094 30.800781 26.039063 31.640625 23.660156 33.179688 L 26.320313 37.378906 C 28.28125 36.261719 30.238281 35.839844 32.480469 35.839844 C 35.558594 35.839844 38.640625 36.960938 40.601563 39.339844 C 42.839844 41.578125 44.101563 44.378906 44.101563 47.460938 C 44.101563 50.539063 42.980469 53.621094 40.601563 55.578125 C 38.359375 57.960938 35.558594 59.078125 32.480469 59.078125 C 30.238281 59.078125 28.140625 58.378906 26.320313 57.121094 L 23.660156 61.320313 C 26.320313 62.859375 29.398438 63.980469 32.199219 63.980469 C 36.539063 63.980469 40.738281 62.441406 43.820313 59.21875 C 46.480469 56.558594 48.019531 53.058594 48.441406 49.421875 C 49.140625 49.421875 61.179688 49.421875 61.179688 49.421875 L 61.460938 49.421875 C 66.5 49 70.28125 44.660156 70.28125 39.339844 C 70.28125 35.140625 66.359375 31.21875 61.738281 30.378906 C 62.019531 29.539063 62.019531 29.121094 62.019531 27.71875 C 62.019531 15.398438 53.339844 5.601563 39.480469 5.601563 C 30.660156 5.601563 22.820313 10.640625 19.601563 18.761719 C 18.480469 18.761719 17.640625 18.339844 16.378906 18.339844 C 7.28125 18.199219 0 25.199219 0 34.160156 C 0 42.980469 7.28125 49.980469 15.960938 49.980469 L 29.679688 49.980469 Z M 28.699219 45.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 39.761719 47.320313 C 39.761719 51.648438 36.25 55.160156 31.921875 55.160156 C 27.589844 55.160156 24.078125 51.648438 24.078125 47.320313 C 24.078125 42.988281 27.589844 39.480469 31.921875 39.480469 C 36.25 39.480469 39.761719 42.988281 39.761719 47.320313 Z M 39.761719 47.320313 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/AzureCDN(m).png b/dist/ProductLogos/AzureCDN(m).png
new file mode 100644
index 00000000..8f717854
Binary files /dev/null and b/dist/ProductLogos/AzureCDN(m).png differ
diff --git a/dist/ProductLogos/AzureCDN(m).svg b/dist/ProductLogos/AzureCDN(m).svg
new file mode 100644
index 00000000..54e3b1f0
--- /dev/null
+++ b/dist/ProductLogos/AzureCDN(m).svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 35.421875 46.761719 C 34.019531 45.359375 32.898438 43.679688 32.480469 41.441406 C 31.21875 35.558594 34.71875 29.820313 40.460938 28.558594 C 41.71875 28.28125 42.839844 28.28125 44.101563 28.421875 C 44.519531 22.960938 47.878906 18.199219 52.921875 15.820313 C 51.378906 15.398438 49.839844 14.980469 48.160156 14.980469 C 41.300781 14.980469 35.421875 19.601563 33.320313 25.621094 C 32.199219 25.339844 31.078125 25.058594 29.820313 25.058594 C 23.800781 25.058594 19.179688 29.960938 19.179688 35.980469 C 19.179688 42 23.941406 46.898438 29.820313 46.898438 Z M 35.421875 46.761719 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 48.859375 23.519531 L 11.621094 23.519531 C 10.078125 23.519531 8.820313 22.261719 8.820313 20.71875 C 8.820313 19.179688 10.078125 17.921875 11.621094 17.921875 L 48.859375 17.921875 C 50.398438 17.921875 51.660156 19.179688 51.660156 20.71875 C 51.660156 22.261719 50.398438 23.519531 48.859375 23.519531 Z M 48.859375 23.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 41.300781 46.898438 L 6.859375 46.898438 C 5.320313 46.898438 4.058594 45.640625 4.058594 44.101563 C 4.058594 42.558594 5.320313 41.300781 6.859375 41.300781 L 41.300781 41.300781 C 42.839844 41.300781 44.101563 42.558594 44.101563 44.101563 C 44.101563 45.640625 42.839844 46.898438 41.300781 46.898438 Z M 41.300781 46.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 37.238281 35.558594 L 2.800781 35.558594 C 1.261719 35.558594 0 34.300781 0 32.761719 C 0 31.21875 1.261719 29.960938 2.800781 29.960938 L 37.238281 29.960938 C 38.78125 29.960938 40.039063 31.21875 40.039063 32.761719 C 40.039063 34.300781 38.78125 35.558594 37.238281 35.558594 Z M 37.238281 35.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 70 40.878906 C 70 37.519531 67.339844 34.859375 64.121094 34.859375 C 63.839844 34.859375 63.699219 34.859375 63.28125 34.859375 C 63.558594 33.601563 63.839844 32.199219 63.839844 30.660156 C 63.839844 21.980469 56.699219 14.980469 48.160156 14.980469 C 41.300781 14.980469 35.421875 19.601563 33.320313 25.621094 C 32.199219 25.339844 31.078125 25.058594 29.820313 25.058594 C 23.800781 25.058594 19.179688 29.960938 19.179688 35.980469 C 19.179688 42 23.941406 46.898438 29.820313 46.898438 L 64.398438 46.898438 C 67.621094 46.480469 70 43.960938 70 40.878906 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/AzureCDN.png b/dist/ProductLogos/AzureCDN.png
new file mode 100644
index 00000000..b824d8d9
Binary files /dev/null and b/dist/ProductLogos/AzureCDN.png differ
diff --git a/dist/ProductLogos/AzureCDN.puml b/dist/ProductLogos/AzureCDN.puml
new file mode 100644
index 00000000..289db0da
--- /dev/null
+++ b/dist/ProductLogos/AzureCDN.puml
@@ -0,0 +1,9 @@
+sprite $AzureCDN [70x70/16z] {
+xTLLWWKn24HH25Pl_miUTrAjdvEpWDiIGUvObcLHyyZCS9FBHcHz04Bb2etwWbSXSua7XH-D3wNJoEDmvCEGxbYai9t1wGYWhUAqGYD8QInoZbTWSbJo2EhG
+LWqthuqAnjvMhGvDo1Ql6Ppxf22HJZZh0KRRkrFWb6us5k4Lx5UmHLW5BC8hVg-IyixoBn8XolN0Pi6-iRzlSO1APwShAPso2YSJUR5Y_bDSgYZuvZrUoMCN
+DbVoebe55pPCFBep5UFJ5KSpeV99PyQmRqFdv7zRbcLPdW4
+}
+
+AzureEntityColoring(AzureCDN)
+!define AzureCDN(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCDN, AzureCDN)
+!define AzureCDN(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCDN, AzureCDN)
diff --git a/dist/ProductLogos/AzureCDN.svg b/dist/ProductLogos/AzureCDN.svg
new file mode 100644
index 00000000..7d5244dd
--- /dev/null
+++ b/dist/ProductLogos/AzureCDN.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.421875 46.761719 C 34.019531 45.359375 32.898438 43.679688 32.480469 41.441406 C 31.21875 35.558594 34.71875 29.820313 40.460938 28.558594 C 41.71875 28.28125 42.839844 28.28125 44.101563 28.421875 C 44.519531 22.960938 47.878906 18.199219 52.921875 15.820313 C 51.378906 15.398438 49.839844 14.980469 48.160156 14.980469 C 41.300781 14.980469 35.421875 19.601563 33.320313 25.621094 C 32.199219 25.339844 31.078125 25.058594 29.820313 25.058594 C 23.800781 25.058594 19.179688 29.960938 19.179688 35.980469 C 19.179688 42 23.941406 46.898438 29.820313 46.898438 Z M 35.421875 46.761719 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 48.859375 23.519531 L 11.621094 23.519531 C 10.078125 23.519531 8.820313 22.261719 8.820313 20.71875 C 8.820313 19.179688 10.078125 17.921875 11.621094 17.921875 L 48.859375 17.921875 C 50.398438 17.921875 51.660156 19.179688 51.660156 20.71875 C 51.660156 22.261719 50.398438 23.519531 48.859375 23.519531 Z M 48.859375 23.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 41.300781 46.898438 L 6.859375 46.898438 C 5.320313 46.898438 4.058594 45.640625 4.058594 44.101563 C 4.058594 42.558594 5.320313 41.300781 6.859375 41.300781 L 41.300781 41.300781 C 42.839844 41.300781 44.101563 42.558594 44.101563 44.101563 C 44.101563 45.640625 42.839844 46.898438 41.300781 46.898438 Z M 41.300781 46.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 37.238281 35.558594 L 2.800781 35.558594 C 1.261719 35.558594 0 34.300781 0 32.761719 C 0 31.21875 1.261719 29.960938 2.800781 29.960938 L 37.238281 29.960938 C 38.78125 29.960938 40.039063 31.21875 40.039063 32.761719 C 40.039063 34.300781 38.78125 35.558594 37.238281 35.558594 Z M 37.238281 35.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 70 40.878906 C 70 37.519531 67.339844 34.859375 64.121094 34.859375 C 63.839844 34.859375 63.699219 34.859375 63.28125 34.859375 C 63.558594 33.601563 63.839844 32.199219 63.839844 30.660156 C 63.839844 21.980469 56.699219 14.980469 48.160156 14.980469 C 41.300781 14.980469 35.421875 19.601563 33.320313 25.621094 C 32.199219 25.339844 31.078125 25.058594 29.820313 25.058594 C 23.800781 25.058594 19.179688 29.960938 19.179688 35.980469 C 19.179688 42 23.941406 46.898438 29.820313 46.898438 L 64.398438 46.898438 C 67.621094 46.480469 70 43.960938 70 40.878906 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/AzureWebAppUmbraco(m).png b/dist/ProductLogos/AzureWebAppUmbraco(m).png
new file mode 100644
index 00000000..dae8eb91
Binary files /dev/null and b/dist/ProductLogos/AzureWebAppUmbraco(m).png differ
diff --git a/dist/ProductLogos/AzureWebAppUmbraco(m).svg b/dist/ProductLogos/AzureWebAppUmbraco(m).svg
new file mode 100644
index 00000000..377b5f40
--- /dev/null
+++ b/dist/ProductLogos/AzureWebAppUmbraco(m).svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 43.945313 49.023438 C 38.992188 52.8125 33.15625 54.65625 27.363281 54.65625 C 19.140625 54.65625 11.011719 50.964844 5.636719 43.9375 C -3.542969 31.953125 -1.277344 14.8125 10.730469 5.628906 C 15.679688 1.820313 21.523438 0 27.3125 0 C 35.535156 0 43.664063 3.691406 49.035156 10.726563 C 58.21875 22.707031 55.929688 39.851563 43.945313 49.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.925781 32.121094 C 40.910156 34.710938 44.59375 35.179688 47.167969 33.21875 C 47.304688 33.117188 47.40625 32.992188 47.53125 32.882813 C 50.164063 34.738281 51.992188 35.960938 53.023438 36.664063 C 53.328125 35.871094 53.539063 35.113281 53.753906 34.320313 C 52.667969 33.511719 51.195313 32.375 49.066406 30.652344 C 49.765625 28.816406 49.542969 26.671875 48.269531 25 C 46.445313 22.636719 43.210938 22.035156 40.683594 23.492188 C 37.902344 20.996094 34.84375 18.132813 31.617188 14.929688 C 41.636719 9.539063 48.757813 10.328125 48.757813 10.328125 C 47.566406 8.8125 46.238281 7.484375 44.8125 6.289063 C 40.589844 5.636719 34.023438 5.707031 26.523438 9.699219 L 26.519531 9.695313 C 24.019531 7.074219 21.476563 4.269531 18.882813 1.261719 C 17.644531 1.65625 16.433594 2.148438 15.261719 2.734375 C 17.175781 5.863281 19.75 9.019531 22.648438 12.097656 C 22.652344 12.105469 22.660156 12.109375 22.664063 12.117188 C 20.25 13.804688 17.554688 16.066406 15.074219 18.691406 C 14.757813 19.03125 14.453125 19.371094 14.152344 19.710938 C 12.667969 19.398438 11.109375 19.492188 9.652344 20.019531 C 7.175781 14.675781 7.375 10.386719 7.765625 8.175781 C 6.691406 9.304688 5.6875 10.484375 4.824219 11.75 C 4.175781 14.390625 3.996094 18.195313 5.902344 22.785156 C 3.691406 25.675781 3.589844 29.773438 5.894531 32.792969 C 6.085938 33.042969 6.292969 33.277344 6.507813 33.5 C 5.5 36.929688 5.050781 40.238281 4.910156 43.078125 C 5.171875 43.429688 5.171875 43.714844 5.429688 44.058594 C 6.738281 45.738281 8.386719 47.15625 9.976563 48.441406 C 9.777344 45.433594 9.992188 41 11.851563 36.007813 C 13.132813 36.105469 14.4375 35.902344 15.660156 35.386719 C 16.359375 36.003906 17.089844 36.625 17.871094 37.257813 C 20.554688 39.382813 23.230469 41.035156 25.835938 42.335938 C 25.703125 43.660156 26.035156 45.039063 26.894531 46.179688 C 28.738281 48.558594 32.148438 49.003906 34.53125 47.1875 C 35.027344 46.804688 35.417969 46.347656 35.742188 45.855469 C 39.992188 46.800781 43.710938 46.96875 46.464844 46.96875 C 46.882813 46.96875 48.84375 44.308594 49.964844 42.65625 C 48.289063 43.007813 43.3125 43.691406 36.515625 41.738281 C 36.351563 40.972656 36.039063 40.230469 35.535156 39.574219 C 33.808594 37.308594 30.652344 36.820313 28.296875 38.332031 C 25.933594 37.050781 23.460938 35.445313 20.910156 33.421875 C 20.394531 33.015625 19.898438 32.609375 19.421875 32.203125 C 20.984375 29.746094 21.148438 26.597656 19.769531 23.945313 C 20.082031 23.636719 20.390625 23.320313 20.722656 23.011719 C 23.25 20.648438 25.628906 18.761719 27.851563 17.242188 C 27.761719 17.160156 27.679688 17.074219 27.59375 16.988281 C 27.679688 17.070313 27.765625 17.15625 27.855469 17.238281 C 27.851563 17.238281 27.851563 17.238281 27.851563 17.238281 C 31.261719 20.394531 34.882813 23.382813 38.308594 26.058594 C 37.402344 27.976563 37.546875 30.320313 38.925781 32.121094 Z M 38.925781 32.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 70 48.914063 C 70 60.558594 60.558594 70 48.914063 70 C 37.265625 70 27.828125 60.558594 27.828125 48.914063 C 27.828125 37.265625 37.265625 27.828125 48.914063 27.828125 C 60.558594 27.828125 70 37.265625 70 48.914063 Z M 70 48.914063 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(27,158,255);fill-opacity:1;" d="M 29.390625 48.9375 C 29.390625 38.140625 38.128906 29.390625 48.914063 29.390625 C 59.695313 29.390625 68.4375 38.140625 68.4375 48.9375 C 68.4375 59.734375 59.695313 68.484375 48.914063 68.484375 C 38.128906 68.488281 29.390625 59.734375 29.390625 48.9375 Z M 48.515625 55.625 C 46.597656 55.625 45.089844 55.492188 44.007813 55.21875 C 42.8125 54.914063 41.992188 54.253906 41.539063 53.234375 C 41.085938 52.214844 40.871094 50.644531 40.894531 48.53125 C 40.90625 47.386719 40.972656 46.28125 41.101563 45.210938 C 41.230469 44.140625 41.359375 43.257813 41.484375 42.558594 L 41.621094 41.867188 C 41.625 41.84375 41.625 41.824219 41.625 41.800781 C 41.625 41.605469 41.480469 41.445313 41.296875 41.410156 L 38.773438 41.019531 C 38.753906 41.015625 38.730469 41.015625 38.710938 41.015625 C 38.523438 41.015625 38.367188 41.144531 38.324219 41.320313 C 38.28125 41.484375 38.253906 41.601563 38.179688 41.988281 C 38.035156 42.726563 37.902344 43.449219 37.753906 44.492188 C 37.609375 45.535156 37.511719 46.6875 37.472656 47.945313 C 37.472656 47.945313 37.410156 48.230469 37.472656 50.363281 C 37.53125 52.5 37.898438 54.210938 38.574219 55.484375 C 39.246094 56.761719 40.386719 57.683594 42 58.242188 C 43.609375 58.804688 45.851563 59.078125 48.726563 59.066406 L 49.097656 59.066406 C 51.972656 59.078125 54.214844 58.804688 55.828125 58.242188 C 57.4375 57.683594 58.578125 56.761719 59.253906 55.484375 C 59.925781 54.210938 60.292969 52.503906 60.355469 50.363281 C 60.414063 48.226563 60.355469 47.945313 60.355469 47.945313 C 60.3125 46.6875 60.21875 45.535156 60.070313 44.492188 C 59.921875 43.449219 59.792969 42.726563 59.644531 41.988281 C 59.570313 41.601563 59.542969 41.484375 59.503906 41.320313 C 59.460938 41.144531 59.304688 41.015625 59.117188 41.015625 C 59.09375 41.015625 59.074219 41.015625 59.054688 41.019531 L 56.53125 41.410156 C 56.34375 41.445313 56.203125 41.605469 56.203125 41.800781 C 56.203125 41.824219 56.203125 41.84375 56.207031 41.867188 L 56.339844 42.558594 C 56.46875 43.253906 56.597656 44.140625 56.726563 45.210938 C 56.851563 46.28125 56.921875 47.386719 56.933594 48.53125 C 56.953125 50.644531 56.742188 52.214844 56.289063 53.234375 C 55.835938 54.253906 55.015625 54.914063 53.820313 55.21875 C 52.738281 55.492188 51.230469 55.625 49.3125 55.625 Z M 48.515625 55.625 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/AzureWebAppUmbraco.png b/dist/ProductLogos/AzureWebAppUmbraco.png
new file mode 100644
index 00000000..316cfa73
Binary files /dev/null and b/dist/ProductLogos/AzureWebAppUmbraco.png differ
diff --git a/dist/ProductLogos/AzureWebAppUmbraco.puml b/dist/ProductLogos/AzureWebAppUmbraco.puml
new file mode 100644
index 00000000..1eb850d6
--- /dev/null
+++ b/dist/ProductLogos/AzureWebAppUmbraco.puml
@@ -0,0 +1,13 @@
+sprite $AzureWebAppUmbraco [70x70/16z] {
+jPU9aeGW34Hpjl__nrjpCSG6PQZQLyTSyWmTuxeomZmI3pBSP0iDLD9_LgY89Cw4_kB852cQ3Oy3yASD0ton43pGgIPloYaBvO6XaM7wKkkbfYwB_dFKHkj2
+9KNZG1R5lKQDStHot6gA1JOvbKU4BbkWPF3yX3rLaCLE2jeleowYyr8imOKoyR3ZIvAZ4kCcFomvEIZ0g301xuzs-dcfcDT2OudfJ2E4lzqaSS0c6YTBlkDq
+H8INxm7_-2f9bd65Ufwfol2YjRK9du-8SuLrKRPl4hXif9EPBW-r_fUWS7cRcDUlutZ9F6fja6PWCOvbNatCB4fjFaEdsBCKr6DhHzrDqzrufdEIBZVR0iU7
+T5x1k-JfSnoLw2joRhLo9OQ3yNC6Tg59aJY6G4lvb6yKIHupT3m2HcqImJ77kc3oymm4P7qEWL8busfEzwBKhfoqKoRCDmClps7URy-E6x9rn5hEDFSKoYoQ
+W7Q1rfxvSGi-nV0TBgsKakPvMXlkDM2dwVaahj-gjLeUFxUt7Sbpt1gaj3TqcLtDeDRZWZkSPKjaQGqlIyWIvx5Kja1R5XXRd89H0I7MNLcWIx_xkQ4WnDSi
+c3LftoA-RQa4vRAIRbx-kwTAIuQT3c6yvUFIbWmd8CjK4-QH2KGvBcYGspckgJlNI3mDI1VXSESS5qMZ3C0LCTTWSKCbqomURVhxKYZJp8ZCHCbv1IpSl1Vt
+DCTb3LluQxIfOSd-fa9-8aSEcFo8OQSGnaezSDd58W4WmrN-Wpy
+}
+
+AzureEntityColoring(AzureWebAppUmbraco)
+!define AzureWebAppUmbraco(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWebAppUmbraco, AzureWebAppUmbraco)
+!define AzureWebAppUmbraco(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWebAppUmbraco, AzureWebAppUmbraco)
diff --git a/dist/ProductLogos/AzureWebAppUmbraco.svg b/dist/ProductLogos/AzureWebAppUmbraco.svg
new file mode 100644
index 00000000..1dd60605
--- /dev/null
+++ b/dist/ProductLogos/AzureWebAppUmbraco.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 43.945313 49.023438 C 38.992188 52.8125 33.15625 54.65625 27.363281 54.65625 C 19.140625 54.65625 11.011719 50.964844 5.636719 43.9375 C -3.542969 31.953125 -1.277344 14.8125 10.730469 5.628906 C 15.679688 1.820313 21.523438 0 27.3125 0 C 35.535156 0 43.664063 3.691406 49.035156 10.726563 C 58.21875 22.707031 55.929688 39.851563 43.945313 49.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.925781 32.121094 C 40.910156 34.710938 44.59375 35.179688 47.167969 33.21875 C 47.304688 33.117188 47.40625 32.992188 47.53125 32.882813 C 50.164063 34.738281 51.992188 35.960938 53.023438 36.664063 C 53.328125 35.871094 53.539063 35.113281 53.753906 34.320313 C 52.667969 33.511719 51.195313 32.375 49.066406 30.652344 C 49.765625 28.816406 49.542969 26.671875 48.269531 25 C 46.445313 22.636719 43.210938 22.035156 40.683594 23.492188 C 37.902344 20.996094 34.84375 18.132813 31.617188 14.929688 C 41.636719 9.539063 48.757813 10.328125 48.757813 10.328125 C 47.566406 8.8125 46.238281 7.484375 44.8125 6.289063 C 40.589844 5.636719 34.023438 5.707031 26.523438 9.699219 L 26.519531 9.695313 C 24.019531 7.074219 21.476563 4.269531 18.882813 1.261719 C 17.644531 1.65625 16.433594 2.148438 15.261719 2.734375 C 17.175781 5.863281 19.75 9.019531 22.648438 12.097656 C 22.652344 12.105469 22.660156 12.109375 22.664063 12.117188 C 20.25 13.804688 17.554688 16.066406 15.074219 18.691406 C 14.757813 19.03125 14.453125 19.371094 14.152344 19.710938 C 12.667969 19.398438 11.109375 19.492188 9.652344 20.019531 C 7.175781 14.675781 7.375 10.386719 7.765625 8.175781 C 6.691406 9.304688 5.6875 10.484375 4.824219 11.75 C 4.175781 14.390625 3.996094 18.195313 5.902344 22.785156 C 3.691406 25.675781 3.589844 29.773438 5.894531 32.792969 C 6.085938 33.042969 6.292969 33.277344 6.507813 33.5 C 5.5 36.929688 5.050781 40.238281 4.910156 43.078125 C 5.171875 43.429688 5.171875 43.714844 5.429688 44.058594 C 6.738281 45.738281 8.386719 47.15625 9.976563 48.441406 C 9.777344 45.433594 9.992188 41 11.851563 36.007813 C 13.132813 36.105469 14.4375 35.902344 15.660156 35.386719 C 16.359375 36.003906 17.089844 36.625 17.871094 37.257813 C 20.554688 39.382813 23.230469 41.035156 25.835938 42.335938 C 25.703125 43.660156 26.035156 45.039063 26.894531 46.179688 C 28.738281 48.558594 32.148438 49.003906 34.53125 47.1875 C 35.027344 46.804688 35.417969 46.347656 35.742188 45.855469 C 39.992188 46.800781 43.710938 46.96875 46.464844 46.96875 C 46.882813 46.96875 48.84375 44.308594 49.964844 42.65625 C 48.289063 43.007813 43.3125 43.691406 36.515625 41.738281 C 36.351563 40.972656 36.039063 40.230469 35.535156 39.574219 C 33.808594 37.308594 30.652344 36.820313 28.296875 38.332031 C 25.933594 37.050781 23.460938 35.445313 20.910156 33.421875 C 20.394531 33.015625 19.898438 32.609375 19.421875 32.203125 C 20.984375 29.746094 21.148438 26.597656 19.769531 23.945313 C 20.082031 23.636719 20.390625 23.320313 20.722656 23.011719 C 23.25 20.648438 25.628906 18.761719 27.851563 17.242188 C 27.761719 17.160156 27.679688 17.074219 27.59375 16.988281 C 27.679688 17.070313 27.765625 17.15625 27.855469 17.238281 C 27.851563 17.238281 27.851563 17.238281 27.851563 17.238281 C 31.261719 20.394531 34.882813 23.382813 38.308594 26.058594 C 37.402344 27.976563 37.546875 30.320313 38.925781 32.121094 Z M 38.925781 32.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 70 48.914063 C 70 60.558594 60.558594 70 48.914063 70 C 37.265625 70 27.828125 60.558594 27.828125 48.914063 C 27.828125 37.265625 37.265625 27.828125 48.914063 27.828125 C 60.558594 27.828125 70 37.265625 70 48.914063 Z M 70 48.914063 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,43.137255%,0%);fill-opacity:1;" d="M 29.390625 48.9375 C 29.390625 38.140625 38.128906 29.390625 48.914063 29.390625 C 59.695313 29.390625 68.4375 38.140625 68.4375 48.9375 C 68.4375 59.734375 59.695313 68.484375 48.914063 68.484375 C 38.128906 68.488281 29.390625 59.734375 29.390625 48.9375 Z M 48.515625 55.625 C 46.597656 55.625 45.089844 55.492188 44.007813 55.21875 C 42.8125 54.914063 41.992188 54.253906 41.539063 53.234375 C 41.085938 52.214844 40.871094 50.644531 40.894531 48.53125 C 40.90625 47.386719 40.972656 46.28125 41.101563 45.210938 C 41.230469 44.140625 41.359375 43.257813 41.484375 42.558594 L 41.621094 41.867188 C 41.625 41.84375 41.625 41.824219 41.625 41.800781 C 41.625 41.605469 41.480469 41.445313 41.296875 41.410156 L 38.773438 41.019531 C 38.753906 41.015625 38.730469 41.015625 38.710938 41.015625 C 38.523438 41.015625 38.367188 41.144531 38.324219 41.320313 C 38.28125 41.484375 38.253906 41.601563 38.179688 41.988281 C 38.035156 42.726563 37.902344 43.449219 37.753906 44.492188 C 37.609375 45.535156 37.511719 46.6875 37.472656 47.945313 C 37.472656 47.945313 37.410156 48.230469 37.472656 50.363281 C 37.53125 52.5 37.898438 54.210938 38.574219 55.484375 C 39.246094 56.761719 40.386719 57.683594 42 58.242188 C 43.609375 58.804688 45.851563 59.078125 48.726563 59.066406 L 49.097656 59.066406 C 51.972656 59.078125 54.214844 58.804688 55.828125 58.242188 C 57.4375 57.683594 58.578125 56.761719 59.253906 55.484375 C 59.925781 54.210938 60.292969 52.503906 60.355469 50.363281 C 60.414063 48.226563 60.355469 47.945313 60.355469 47.945313 C 60.3125 46.6875 60.21875 45.535156 60.070313 44.492188 C 59.921875 43.449219 59.792969 42.726563 59.644531 41.988281 C 59.570313 41.601563 59.542969 41.484375 59.503906 41.320313 C 59.460938 41.144531 59.304688 41.015625 59.117188 41.015625 C 59.09375 41.015625 59.074219 41.015625 59.054688 41.019531 L 56.53125 41.410156 C 56.34375 41.445313 56.203125 41.605469 56.203125 41.800781 C 56.203125 41.824219 56.203125 41.84375 56.207031 41.867188 L 56.339844 42.558594 C 56.46875 43.253906 56.597656 44.140625 56.726563 45.210938 C 56.851563 46.28125 56.921875 47.386719 56.933594 48.53125 C 56.953125 50.644531 56.742188 52.214844 56.289063 53.234375 C 55.835938 54.253906 55.015625 54.914063 53.820313 55.21875 C 52.738281 55.492188 51.230469 55.625 49.3125 55.625 Z M 48.515625 55.625 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/AzureWebAppWordPress(m).png b/dist/ProductLogos/AzureWebAppWordPress(m).png
new file mode 100644
index 00000000..fe778fa6
Binary files /dev/null and b/dist/ProductLogos/AzureWebAppWordPress(m).png differ
diff --git a/dist/ProductLogos/AzureWebAppWordPress(m).svg b/dist/ProductLogos/AzureWebAppWordPress(m).svg
new file mode 100644
index 00000000..660154af
--- /dev/null
+++ b/dist/ProductLogos/AzureWebAppWordPress(m).svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 43.945313 49.023438 C 38.992188 52.8125 33.15625 54.65625 27.363281 54.65625 C 19.140625 54.65625 11.011719 50.964844 5.636719 43.9375 C -3.542969 31.953125 -1.277344 14.8125 10.730469 5.628906 C 15.679688 1.820313 21.523438 0 27.3125 0 C 35.535156 0 43.664063 3.691406 49.035156 10.726563 C 58.21875 22.707031 55.929688 39.851563 43.945313 49.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 38.925781 32.121094 C 40.910156 34.710938 44.59375 35.179688 47.167969 33.21875 C 47.304688 33.117188 47.40625 32.992188 47.53125 32.882813 C 50.164063 34.738281 51.992188 35.960938 53.023438 36.664063 C 53.328125 35.871094 53.539063 35.113281 53.753906 34.320313 C 52.667969 33.511719 51.195313 32.375 49.066406 30.652344 C 49.765625 28.816406 49.542969 26.671875 48.269531 25 C 46.445313 22.636719 43.210938 22.035156 40.683594 23.492188 C 37.902344 20.996094 34.84375 18.132813 31.617188 14.929688 C 41.636719 9.539063 48.757813 10.328125 48.757813 10.328125 C 47.566406 8.8125 46.238281 7.484375 44.8125 6.289063 C 40.589844 5.636719 34.023438 5.707031 26.523438 9.699219 L 26.519531 9.695313 C 24.019531 7.074219 21.476563 4.269531 18.882813 1.261719 C 17.644531 1.65625 16.433594 2.148438 15.261719 2.734375 C 17.175781 5.863281 19.75 9.019531 22.648438 12.097656 C 22.652344 12.105469 22.660156 12.109375 22.664063 12.117188 C 20.25 13.804688 17.554688 16.066406 15.074219 18.691406 C 14.757813 19.03125 14.453125 19.371094 14.152344 19.710938 C 12.667969 19.398438 11.109375 19.492188 9.652344 20.019531 C 7.175781 14.675781 7.375 10.386719 7.765625 8.175781 C 6.691406 9.304688 5.6875 10.484375 4.824219 11.75 C 4.175781 14.390625 3.996094 18.195313 5.902344 22.785156 C 3.691406 25.675781 3.589844 29.773438 5.894531 32.792969 C 6.085938 33.042969 6.292969 33.277344 6.507813 33.5 C 5.5 36.929688 5.050781 40.238281 4.910156 43.078125 C 5.171875 43.429688 5.171875 43.714844 5.429688 44.058594 C 6.738281 45.738281 8.386719 47.15625 9.976563 48.441406 C 9.777344 45.433594 9.992188 41 11.851563 36.007813 C 13.132813 36.105469 14.4375 35.902344 15.660156 35.386719 C 16.359375 36.003906 17.089844 36.625 17.871094 37.257813 C 20.554688 39.382813 23.230469 41.035156 25.835938 42.335938 C 25.703125 43.660156 26.035156 45.039063 26.894531 46.179688 C 28.738281 48.558594 32.148438 49.003906 34.53125 47.1875 C 35.027344 46.804688 35.417969 46.347656 35.742188 45.855469 C 39.992188 46.800781 43.710938 46.96875 46.464844 46.96875 C 46.882813 46.96875 48.84375 44.308594 49.964844 42.65625 C 48.289063 43.007813 43.3125 43.691406 36.515625 41.738281 C 36.351563 40.972656 36.039063 40.230469 35.535156 39.574219 C 33.808594 37.308594 30.652344 36.820313 28.296875 38.332031 C 25.933594 37.050781 23.460938 35.445313 20.910156 33.421875 C 20.394531 33.015625 19.898438 32.609375 19.421875 32.203125 C 20.984375 29.746094 21.148438 26.597656 19.769531 23.945313 C 20.082031 23.636719 20.390625 23.320313 20.722656 23.011719 C 23.25 20.648438 25.628906 18.761719 27.851563 17.242188 C 27.761719 17.160156 27.679688 17.074219 27.59375 16.988281 C 27.679688 17.070313 27.765625 17.15625 27.855469 17.238281 C 27.851563 17.238281 27.851563 17.238281 27.851563 17.238281 C 31.261719 20.394531 34.882813 23.382813 38.308594 26.058594 C 37.402344 27.976563 37.546875 30.320313 38.925781 32.121094 Z M 38.925781 32.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 70 48.914063 C 70 60.558594 60.558594 70 48.914063 70 C 37.265625 70 27.828125 60.558594 27.828125 48.914063 C 27.828125 37.265625 37.265625 27.828125 48.914063 27.828125 C 60.558594 27.828125 70 37.265625 70 48.914063 Z M 70 48.914063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,77,134);fill-opacity:1;" d="M 32.164063 48.914063 C 32.164063 55.542969 36.019531 61.273438 41.605469 63.988281 L 33.617188 42.097656 C 32.6875 44.179688 32.164063 46.484375 32.164063 48.914063 Z M 32.164063 48.914063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,77,134);fill-opacity:1;" d="M 60.21875 48.066406 C 60.21875 45.996094 59.476563 44.5625 58.839844 43.449219 C 57.992188 42.070313 57.195313 40.902344 57.195313 39.519531 C 57.195313 37.980469 58.363281 36.546875 60.007813 36.546875 C 60.082031 36.546875 60.152344 36.558594 60.222656 36.5625 C 57.246094 33.832031 53.273438 32.164063 48.914063 32.164063 C 43.0625 32.164063 37.914063 35.167969 34.917969 39.714844 C 35.3125 39.726563 35.683594 39.734375 35.996094 39.734375 C 37.75 39.734375 40.460938 39.523438 40.460938 39.523438 C 41.363281 39.46875 41.46875 40.796875 40.566406 40.902344 C 40.566406 40.902344 39.660156 41.007813 38.652344 41.0625 L 44.75 59.203125 L 48.414063 48.210938 L 45.804688 41.0625 C 44.902344 41.007813 44.046875 40.902344 44.046875 40.902344 C 43.144531 40.847656 43.25 39.46875 44.15625 39.523438 C 44.15625 39.523438 46.917969 39.734375 48.566406 39.734375 C 50.316406 39.734375 53.03125 39.523438 53.03125 39.523438 C 53.933594 39.46875 54.039063 40.796875 53.136719 40.902344 C 53.136719 40.902344 52.226563 41.007813 51.21875 41.0625 L 57.273438 59.066406 L 58.945313 53.484375 C 59.667969 51.164063 60.21875 49.5 60.21875 48.066406 Z M 60.21875 48.066406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,77,134);fill-opacity:1;" d="M 49.207031 50.378906 L 44.179688 64.980469 C 45.683594 65.421875 47.269531 65.660156 48.914063 65.660156 C 50.863281 65.660156 52.734375 65.324219 54.476563 64.710938 C 54.429688 64.640625 54.390625 64.5625 54.355469 64.480469 Z M 49.207031 50.378906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,77,134);fill-opacity:1;" d="M 63.609375 40.878906 C 63.683594 41.410156 63.722656 41.984375 63.722656 42.597656 C 63.722656 44.296875 63.40625 46.207031 62.449219 48.597656 L 57.332031 63.390625 C 62.3125 60.484375 65.660156 55.089844 65.660156 48.910156 C 65.660156 46 64.917969 43.261719 63.609375 40.878906 Z M 63.609375 40.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,77,134);fill-opacity:1;" d="M 48.914063 29.390625 C 38.148438 29.390625 29.390625 38.148438 29.390625 48.914063 C 29.390625 59.679688 38.148438 68.4375 48.914063 68.4375 C 59.679688 68.4375 68.4375 59.679688 68.4375 48.914063 C 68.4375 38.148438 59.679688 29.390625 48.914063 29.390625 Z M 48.914063 67.542969 C 38.640625 67.542969 30.285156 59.183594 30.285156 48.914063 C 30.285156 38.640625 38.640625 30.285156 48.914063 30.285156 C 59.183594 30.285156 67.542969 38.640625 67.542969 48.914063 C 67.542969 59.183594 59.183594 67.542969 48.914063 67.542969 Z M 48.914063 67.542969 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/AzureWebAppWordPress.png b/dist/ProductLogos/AzureWebAppWordPress.png
new file mode 100644
index 00000000..fe869a37
Binary files /dev/null and b/dist/ProductLogos/AzureWebAppWordPress.png differ
diff --git a/dist/ProductLogos/AzureWebAppWordPress.puml b/dist/ProductLogos/AzureWebAppWordPress.puml
new file mode 100644
index 00000000..6d4a90d2
--- /dev/null
+++ b/dist/ProductLogos/AzureWebAppWordPress.puml
@@ -0,0 +1,16 @@
+sprite $AzureWebAppWordPress [70x70/16z] {
+jPUBbgGe44GZdmZu_z-xGvPssWrMMxixTzuwNYAom7CAArZKV60gZ7y5gN_7v6C50J3_YT8d3ZDWqdpe4NUNiFa2UHZ41tIhCNeWyGCC-FAmChtKzAic7zFh
+lvLnXPubIOsuMoYUQuZdEQxt6pqg5F3DKgAgzDZYD1d4pc7VAYOB_r0ys3Sa0Dr7OVCvw8mEkoUsT2IA1HGPxUO_gSyGPZGiUbTR_L6OruCyIvZkD9YGmvsI
+lC4t6faiTenJN5NbUZrtyNIw9yiw8UK8LfhbfkLd9_p-YCWg8K_fnnMx7umkBifYUn1Vx-WqtBcct-UdzNXNPfsssQHPM7WUotqQlRFGpSUS8E7_Pab8z7cZ
+sKAiQYeq7u0dqusqKbhRtCrBxPlEJymjvzEdRLEwf6s5a8XFOMXE8g-7sBoKOb79cl-S0R_H6E2LHwE-drJ3k9fn3ilSCoMr05ptRpG3fF7w2F3qCG7L0Dyd
+Ae6RN0PZ691PdX0o3sX8gEuB6e6-qlnu5nbTuXZ32z1MaYZ0BMSWPxT0hlMa0kia2AmWe7EuozTgOtZlhTQ-xxMsrdjhTMGhU57b34D7W_aCQy71jjTqNonS
+pp3p6yuEJoC4iNohX2WvDav7G5zXP7LwDEviu2D9JfJsm33mY9lOuXmNHGcDvaZFQVS8re7sxWpIgr0l6FGz2ALbCDeL6x-n240DlFThfPALuWRl1MOueDdY
+1Dx6kdgfrBDItB2zGWfIunDG7mTekrQwAdr4xE2Ar2mivYZxljDD9O-_W2eks6oniDXbVKKg3JPR8Ej6UyrA7KYbe8uhLD--jo4bLhjKsf0VV8z23Roz_Rf7
+L27768_rbLAvmU9tTSo8vOxfG6xPFfRtL2fg3ASeRh_3cdjioneJEDRVq599z6hR2EzHVnKfn_hAgQnHgEPskQUTWnpq3a-beKMjgT1CCTZNDjasj5GoHnHg
+-1LgGDsFKw3AkVDAv68Km--uW_gvPUB1GucHoy0DJwW2wSSfY4AdacD2ZV44QZmq5G0a78VIXsGpF8CRWTlE0CfX2MKpe1GyHKRguiVf2HWW1hQ2vt0pWABG
+WP-NFw9K1i2bZhFKDYE0IcDyYDIgkC1b2l88AMqpeJ-mbfREZs4hzG-RA-5ly0y
+}
+
+AzureEntityColoring(AzureWebAppWordPress)
+!define AzureWebAppWordPress(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWebAppWordPress, AzureWebAppWordPress)
+!define AzureWebAppWordPress(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWebAppWordPress, AzureWebAppWordPress)
diff --git a/dist/ProductLogos/AzureWebAppWordPress.svg b/dist/ProductLogos/AzureWebAppWordPress.svg
new file mode 100644
index 00000000..121fdc16
--- /dev/null
+++ b/dist/ProductLogos/AzureWebAppWordPress.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 43.945313 49.023438 C 38.992188 52.8125 33.15625 54.65625 27.363281 54.65625 C 19.140625 54.65625 11.011719 50.964844 5.636719 43.9375 C -3.542969 31.953125 -1.277344 14.8125 10.730469 5.628906 C 15.679688 1.820313 21.523438 0 27.3125 0 C 35.535156 0 43.664063 3.691406 49.035156 10.726563 C 58.21875 22.707031 55.929688 39.851563 43.945313 49.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 38.925781 32.121094 C 40.910156 34.710938 44.59375 35.179688 47.167969 33.21875 C 47.304688 33.117188 47.40625 32.992188 47.53125 32.882813 C 50.164063 34.738281 51.992188 35.960938 53.023438 36.664063 C 53.328125 35.871094 53.539063 35.113281 53.753906 34.320313 C 52.667969 33.511719 51.195313 32.375 49.066406 30.652344 C 49.765625 28.816406 49.542969 26.671875 48.269531 25 C 46.445313 22.636719 43.210938 22.035156 40.683594 23.492188 C 37.902344 20.996094 34.84375 18.132813 31.617188 14.929688 C 41.636719 9.539063 48.757813 10.328125 48.757813 10.328125 C 47.566406 8.8125 46.238281 7.484375 44.8125 6.289063 C 40.589844 5.636719 34.023438 5.707031 26.523438 9.699219 L 26.519531 9.695313 C 24.019531 7.074219 21.476563 4.269531 18.882813 1.261719 C 17.644531 1.65625 16.433594 2.148438 15.261719 2.734375 C 17.175781 5.863281 19.75 9.019531 22.648438 12.097656 C 22.652344 12.105469 22.660156 12.109375 22.664063 12.117188 C 20.25 13.804688 17.554688 16.066406 15.074219 18.691406 C 14.757813 19.03125 14.453125 19.371094 14.152344 19.710938 C 12.667969 19.398438 11.109375 19.492188 9.652344 20.019531 C 7.175781 14.675781 7.375 10.386719 7.765625 8.175781 C 6.691406 9.304688 5.6875 10.484375 4.824219 11.75 C 4.175781 14.390625 3.996094 18.195313 5.902344 22.785156 C 3.691406 25.675781 3.589844 29.773438 5.894531 32.792969 C 6.085938 33.042969 6.292969 33.277344 6.507813 33.5 C 5.5 36.929688 5.050781 40.238281 4.910156 43.078125 C 5.171875 43.429688 5.171875 43.714844 5.429688 44.058594 C 6.738281 45.738281 8.386719 47.15625 9.976563 48.441406 C 9.777344 45.433594 9.992188 41 11.851563 36.007813 C 13.132813 36.105469 14.4375 35.902344 15.660156 35.386719 C 16.359375 36.003906 17.089844 36.625 17.871094 37.257813 C 20.554688 39.382813 23.230469 41.035156 25.835938 42.335938 C 25.703125 43.660156 26.035156 45.039063 26.894531 46.179688 C 28.738281 48.558594 32.148438 49.003906 34.53125 47.1875 C 35.027344 46.804688 35.417969 46.347656 35.742188 45.855469 C 39.992188 46.800781 43.710938 46.96875 46.464844 46.96875 C 46.882813 46.96875 48.84375 44.308594 49.964844 42.65625 C 48.289063 43.007813 43.3125 43.691406 36.515625 41.738281 C 36.351563 40.972656 36.039063 40.230469 35.535156 39.574219 C 33.808594 37.308594 30.652344 36.820313 28.296875 38.332031 C 25.933594 37.050781 23.460938 35.445313 20.910156 33.421875 C 20.394531 33.015625 19.898438 32.609375 19.421875 32.203125 C 20.984375 29.746094 21.148438 26.597656 19.769531 23.945313 C 20.082031 23.636719 20.390625 23.320313 20.722656 23.011719 C 23.25 20.648438 25.628906 18.761719 27.851563 17.242188 C 27.761719 17.160156 27.679688 17.074219 27.59375 16.988281 C 27.679688 17.070313 27.765625 17.15625 27.855469 17.238281 C 27.851563 17.238281 27.851563 17.238281 27.851563 17.238281 C 31.261719 20.394531 34.882813 23.382813 38.308594 26.058594 C 37.402344 27.976563 37.546875 30.320313 38.925781 32.121094 Z M 38.925781 32.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 70 48.914063 C 70 60.558594 60.558594 70 48.914063 70 C 37.265625 70 27.828125 60.558594 27.828125 48.914063 C 27.828125 37.265625 37.265625 27.828125 48.914063 27.828125 C 60.558594 27.828125 70 37.265625 70 48.914063 Z M 70 48.914063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.45098%,26.27451%,25.882353%);fill-opacity:1;" d="M 32.164063 48.914063 C 32.164063 55.542969 36.019531 61.273438 41.605469 63.988281 L 33.617188 42.097656 C 32.6875 44.179688 32.164063 46.484375 32.164063 48.914063 Z M 32.164063 48.914063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.45098%,26.27451%,25.882353%);fill-opacity:1;" d="M 60.21875 48.066406 C 60.21875 45.996094 59.476563 44.5625 58.839844 43.449219 C 57.992188 42.070313 57.195313 40.902344 57.195313 39.519531 C 57.195313 37.980469 58.363281 36.546875 60.007813 36.546875 C 60.082031 36.546875 60.152344 36.558594 60.222656 36.5625 C 57.246094 33.832031 53.273438 32.164063 48.914063 32.164063 C 43.0625 32.164063 37.914063 35.167969 34.917969 39.714844 C 35.3125 39.726563 35.683594 39.734375 35.996094 39.734375 C 37.75 39.734375 40.460938 39.523438 40.460938 39.523438 C 41.363281 39.46875 41.46875 40.796875 40.566406 40.902344 C 40.566406 40.902344 39.660156 41.007813 38.652344 41.0625 L 44.75 59.203125 L 48.414063 48.210938 L 45.804688 41.0625 C 44.902344 41.007813 44.046875 40.902344 44.046875 40.902344 C 43.144531 40.847656 43.25 39.46875 44.15625 39.523438 C 44.15625 39.523438 46.917969 39.734375 48.566406 39.734375 C 50.316406 39.734375 53.03125 39.523438 53.03125 39.523438 C 53.933594 39.46875 54.039063 40.796875 53.136719 40.902344 C 53.136719 40.902344 52.226563 41.007813 51.21875 41.0625 L 57.273438 59.066406 L 58.945313 53.484375 C 59.667969 51.164063 60.21875 49.5 60.21875 48.066406 Z M 60.21875 48.066406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.45098%,26.27451%,25.882353%);fill-opacity:1;" d="M 49.207031 50.378906 L 44.179688 64.980469 C 45.683594 65.421875 47.269531 65.660156 48.914063 65.660156 C 50.863281 65.660156 52.734375 65.324219 54.476563 64.710938 C 54.429688 64.640625 54.390625 64.5625 54.355469 64.480469 Z M 49.207031 50.378906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.45098%,26.27451%,25.882353%);fill-opacity:1;" d="M 63.609375 40.878906 C 63.683594 41.410156 63.722656 41.984375 63.722656 42.597656 C 63.722656 44.296875 63.40625 46.207031 62.449219 48.597656 L 57.332031 63.390625 C 62.3125 60.484375 65.660156 55.089844 65.660156 48.910156 C 65.660156 46 64.917969 43.261719 63.609375 40.878906 Z M 63.609375 40.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.45098%,26.27451%,25.882353%);fill-opacity:1;" d="M 48.914063 29.390625 C 38.148438 29.390625 29.390625 38.148438 29.390625 48.914063 C 29.390625 59.679688 38.148438 68.4375 48.914063 68.4375 C 59.679688 68.4375 68.4375 59.679688 68.4375 48.914063 C 68.4375 38.148438 59.679688 29.390625 48.914063 29.390625 Z M 48.914063 67.542969 C 38.640625 67.542969 30.285156 59.183594 30.285156 48.914063 C 30.285156 38.640625 38.640625 30.285156 48.914063 30.285156 C 59.183594 30.285156 67.542969 38.640625 67.542969 48.914063 C 67.542969 59.183594 59.183594 67.542969 48.914063 67.542969 Z M 48.914063 67.542969 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoCacheRedisProducticon(m).png b/dist/ProductLogos/LogoCacheRedisProducticon(m).png
new file mode 100644
index 00000000..251d881e
Binary files /dev/null and b/dist/ProductLogos/LogoCacheRedisProducticon(m).png differ
diff --git a/dist/ProductLogos/LogoCacheRedisProducticon(m).svg b/dist/ProductLogos/LogoCacheRedisProducticon(m).svg
new file mode 100644
index 00000000..da42305c
--- /dev/null
+++ b/dist/ProductLogos/LogoCacheRedisProducticon(m).svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 0.015625 49.882813 C -0.105469 50.625 0.53125 51.386719 1.921875 51.957031 L 30.363281 63.613281 C 32.921875 64.660156 37.078125 64.660156 39.636719 63.613281 L 68.082031 51.957031 C 69.472656 51.386719 70.105469 50.625 69.988281 49.882813 L 69.996094 43.207031 C 70.082031 43.9375 69.441406 44.679688 68.082031 45.238281 L 39.636719 56.890625 C 37.078125 57.941406 32.925781 57.941406 30.363281 56.890625 L 1.921875 45.238281 C 0.425781 44.625 -0.199219 43.789063 0.0546875 42.992188 Z M 0.015625 49.882813 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 0.015625 38.085938 C -0.105469 38.832031 0.53125 39.59375 1.921875 40.160156 L 30.363281 51.816406 C 32.921875 52.867188 37.078125 52.867188 39.636719 51.816406 L 68.082031 40.160156 C 69.472656 39.59375 70.105469 38.832031 69.988281 38.085938 L 69.996094 31.410156 C 70.082031 32.140625 69.441406 32.882813 68.082031 33.441406 L 39.636719 45.09375 C 37.078125 46.144531 32.925781 46.144531 30.363281 45.09375 L 1.921875 33.441406 C 0.425781 32.828125 -0.199219 31.996094 0.0546875 31.195313 Z M 0.015625 38.085938 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 0.015625 26.289063 C -0.105469 27.035156 0.53125 27.796875 1.921875 28.367188 L 30.363281 40.019531 C 32.921875 41.070313 37.078125 41.070313 39.636719 40.019531 L 68.082031 28.367188 C 69.472656 27.796875 70.105469 27.035156 69.988281 26.289063 L 69.996094 19.613281 C 70.082031 20.34375 69.441406 21.085938 68.082031 21.644531 L 39.636719 33.300781 C 37.078125 34.347656 32.925781 34.347656 30.363281 33.300781 L 1.921875 21.644531 C 0.425781 21.03125 -0.199219 20.199219 0.0546875 19.398438 Z M 0.015625 26.289063 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 50.132813 23.796875 L 40.171875 19.367188 L 50.132813 14.9375 L 60.097656 19.367188 Z M 50.132813 23.796875 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 50.132813 23.796875 L 40.171875 19.367188 L 50.132813 14.9375 Z M 50.132813 23.796875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 0.015625 49.882813 C -0.105469 50.625 0.53125 51.386719 1.921875 51.957031 L 30.363281 63.613281 C 32.921875 64.660156 37.078125 64.660156 39.636719 63.613281 L 68.082031 51.957031 C 69.472656 51.386719 70.105469 50.625 69.988281 49.882813 L 69.996094 43.207031 C 70.082031 43.9375 69.441406 44.679688 68.082031 45.238281 L 39.636719 56.890625 C 37.078125 57.941406 32.925781 57.941406 30.363281 56.890625 L 1.921875 45.238281 C 0.425781 44.625 -0.199219 43.789063 0.0546875 42.992188 Z M 0.015625 49.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 68.078125 41.4375 C 70.640625 42.488281 70.640625 44.191406 68.078125 45.238281 L 39.636719 56.890625 C 37.078125 57.941406 32.921875 57.941406 30.363281 56.890625 L 1.921875 45.238281 C -0.640625 44.1875 -0.640625 42.488281 1.921875 41.4375 L 30.363281 29.785156 C 32.921875 28.734375 37.078125 28.734375 39.636719 29.785156 Z M 68.078125 41.4375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 0.015625 38.085938 C -0.105469 38.832031 0.53125 39.59375 1.921875 40.160156 L 30.363281 51.816406 C 32.921875 52.867188 37.078125 52.867188 39.636719 51.816406 L 68.082031 40.160156 C 69.472656 39.59375 70.105469 38.832031 69.988281 38.085938 L 69.996094 31.410156 C 70.082031 32.140625 69.441406 32.882813 68.082031 33.441406 L 39.636719 45.09375 C 37.078125 46.144531 32.925781 46.144531 30.363281 45.09375 L 1.921875 33.441406 C 0.425781 32.828125 -0.199219 31.996094 0.0546875 31.195313 Z M 0.015625 38.085938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 68.078125 29.640625 C 70.640625 30.691406 70.640625 32.394531 68.078125 33.441406 L 39.636719 45.09375 C 37.078125 46.144531 32.921875 46.144531 30.363281 45.09375 L 1.921875 33.441406 C -0.640625 32.390625 -0.640625 30.691406 1.921875 29.640625 L 30.363281 17.988281 C 32.921875 16.9375 37.078125 16.9375 39.636719 17.988281 Z M 68.078125 29.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 0.015625 26.289063 C -0.105469 27.035156 0.53125 27.796875 1.921875 28.367188 L 30.363281 40.019531 C 32.921875 41.070313 37.078125 41.070313 39.636719 40.019531 L 68.082031 28.367188 C 69.472656 27.796875 70.105469 27.035156 69.988281 26.289063 L 69.996094 19.613281 C 70.082031 20.34375 69.441406 21.085938 68.082031 21.644531 L 39.636719 33.300781 C 37.078125 34.347656 32.925781 34.347656 30.363281 33.300781 L 1.921875 21.644531 C 0.425781 21.03125 -0.199219 20.199219 0.0546875 19.398438 Z M 0.015625 26.289063 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 68.078125 17.847656 C 70.640625 18.894531 70.640625 20.597656 68.078125 21.644531 L 39.636719 33.300781 C 37.078125 34.347656 32.921875 34.347656 30.363281 33.300781 L 1.921875 21.644531 C -0.640625 20.59375 -0.640625 18.894531 1.921875 17.847656 L 30.363281 6.191406 C 32.921875 5.140625 37.078125 5.140625 39.636719 6.191406 Z M 68.078125 17.847656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.234375 21.941406 C 22.988281 23.386719 17.726563 23.386719 14.480469 21.941406 C 11.238281 20.5 11.234375 18.15625 14.480469 16.714844 C 17.726563 15.269531 22.992188 15.269531 26.234375 16.714844 C 29.480469 18.15625 29.484375 20.5 26.234375 21.941406 Z M 26.234375 21.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 24.035156 25.660156 L 40.691406 23.675781 L 36.226563 31.085938 Z M 24.035156 25.660156 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 31.804688 13.953125 L 25.300781 13.363281 L 31.078125 11.910156 L 30.324219 8.976563 L 35.21875 10.972656 L 41.257813 9.75 L 38.503906 12.433594 L 42.988281 14.609375 L 36.394531 14.277344 L 33.125 16.847656 Z M 31.804688 13.953125 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoCacheRedisProducticon.png b/dist/ProductLogos/LogoCacheRedisProducticon.png
new file mode 100644
index 00000000..647e1f36
Binary files /dev/null and b/dist/ProductLogos/LogoCacheRedisProducticon.png differ
diff --git a/dist/ProductLogos/LogoCacheRedisProducticon.puml b/dist/ProductLogos/LogoCacheRedisProducticon.puml
new file mode 100644
index 00000000..6d8eb140
--- /dev/null
+++ b/dist/ProductLogos/LogoCacheRedisProducticon.puml
@@ -0,0 +1,12 @@
+sprite $LogoCacheRedisProducticon [70x70/16z] {
+xPU5jjim44H5AzZPz_-VM_A9x8uSAqTEkVT1I9hCai7zGluJ9MT9tjqWLTY6vaKXds57Qbg8fC8wQuQyg7sZFfuOlecYHlSYeNGR-ksL5WcnPqXUocYp0uyG
+8go34kOsEgZIbwjzHqjNXRKTb1I3tpyZ7J94XMM-hfMIHVfNN9G-zZNGLfjsnU8yR-VISs5DUoQ2w2PAeNnyaA78_GLnHmJMwHgiifK-g7Mu4uGaDcm0efJ9
+8u4rkWhJR2UJIgQrJrM0XcSonGRELPfk_nwWHB-LBHRO6OFARaEFXWmAOw1sYhRHrGYq5adHEx4HqARHa9OiSI-Qnua6R09FMxLBYX7Kt1lHBW6F_FbXHAzj
+U-VaQWc-JMsUnHunJv2VhIcmEMepchq1KBkjW8RURglikx5gY3TgMmk5e56U0xKta-qDg0lrjeRGcNM96bs2tQSkYxn_ZjHKRsiqQi45LEdf_Hb0mreeJDDb
+6nYE5NF65AJnW345dCP64p0tD7vU8rrkpmsfZgUq1xw05yyBozVWvuOmjH7SI2YdsrXqVcyYEcH80UYGABB1nFhImMsA5nZ16Pt1cMQG_S8Dx98DDiJzjK8e
+81kBn5nRgoLvzylupsS
+}
+
+AzureEntityColoring(LogoCacheRedisProducticon)
+!define LogoCacheRedisProducticon(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoCacheRedisProducticon, LogoCacheRedisProducticon)
+!define LogoCacheRedisProducticon(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoCacheRedisProducticon, LogoCacheRedisProducticon)
diff --git a/dist/ProductLogos/LogoCacheRedisProducticon.svg b/dist/ProductLogos/LogoCacheRedisProducticon.svg
new file mode 100644
index 00000000..9aa815cb
--- /dev/null
+++ b/dist/ProductLogos/LogoCacheRedisProducticon.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 0.015625 49.882813 C -0.105469 50.625 0.53125 51.386719 1.921875 51.957031 L 30.363281 63.613281 C 32.921875 64.660156 37.078125 64.660156 39.636719 63.613281 L 68.082031 51.957031 C 69.472656 51.386719 70.105469 50.625 69.988281 49.882813 L 69.996094 43.207031 C 70.082031 43.9375 69.441406 44.679688 68.082031 45.238281 L 39.636719 56.890625 C 37.078125 57.941406 32.925781 57.941406 30.363281 56.890625 L 1.921875 45.238281 C 0.425781 44.625 -0.199219 43.789063 0.0546875 42.992188 Z M 0.015625 49.882813 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 0.015625 38.085938 C -0.105469 38.832031 0.53125 39.59375 1.921875 40.160156 L 30.363281 51.816406 C 32.921875 52.867188 37.078125 52.867188 39.636719 51.816406 L 68.082031 40.160156 C 69.472656 39.59375 70.105469 38.832031 69.988281 38.085938 L 69.996094 31.410156 C 70.082031 32.140625 69.441406 32.882813 68.082031 33.441406 L 39.636719 45.09375 C 37.078125 46.144531 32.925781 46.144531 30.363281 45.09375 L 1.921875 33.441406 C 0.425781 32.828125 -0.199219 31.996094 0.0546875 31.195313 Z M 0.015625 38.085938 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 0.015625 26.289063 C -0.105469 27.035156 0.53125 27.796875 1.921875 28.367188 L 30.363281 40.019531 C 32.921875 41.070313 37.078125 41.070313 39.636719 40.019531 L 68.082031 28.367188 C 69.472656 27.796875 70.105469 27.035156 69.988281 26.289063 L 69.996094 19.613281 C 70.082031 20.34375 69.441406 21.085938 68.082031 21.644531 L 39.636719 33.300781 C 37.078125 34.347656 32.925781 34.347656 30.363281 33.300781 L 1.921875 21.644531 C 0.425781 21.03125 -0.199219 20.199219 0.0546875 19.398438 Z M 0.015625 26.289063 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 50.132813 23.796875 L 40.171875 19.367188 L 50.132813 14.9375 L 60.097656 19.367188 Z M 50.132813 23.796875 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 50.132813 23.796875 L 40.171875 19.367188 L 50.132813 14.9375 Z M 50.132813 23.796875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 0.015625 49.882813 C -0.105469 50.625 0.53125 51.386719 1.921875 51.957031 L 30.363281 63.613281 C 32.921875 64.660156 37.078125 64.660156 39.636719 63.613281 L 68.082031 51.957031 C 69.472656 51.386719 70.105469 50.625 69.988281 49.882813 L 69.996094 43.207031 C 70.082031 43.9375 69.441406 44.679688 68.082031 45.238281 L 39.636719 56.890625 C 37.078125 57.941406 32.925781 57.941406 30.363281 56.890625 L 1.921875 45.238281 C 0.425781 44.625 -0.199219 43.789063 0.0546875 42.992188 Z M 0.015625 49.882813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 68.078125 41.4375 C 70.640625 42.488281 70.640625 44.191406 68.078125 45.238281 L 39.636719 56.890625 C 37.078125 57.941406 32.921875 57.941406 30.363281 56.890625 L 1.921875 45.238281 C -0.640625 44.1875 -0.640625 42.488281 1.921875 41.4375 L 30.363281 29.785156 C 32.921875 28.734375 37.078125 28.734375 39.636719 29.785156 Z M 68.078125 41.4375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 0.015625 38.085938 C -0.105469 38.832031 0.53125 39.59375 1.921875 40.160156 L 30.363281 51.816406 C 32.921875 52.867188 37.078125 52.867188 39.636719 51.816406 L 68.082031 40.160156 C 69.472656 39.59375 70.105469 38.832031 69.988281 38.085938 L 69.996094 31.410156 C 70.082031 32.140625 69.441406 32.882813 68.082031 33.441406 L 39.636719 45.09375 C 37.078125 46.144531 32.925781 46.144531 30.363281 45.09375 L 1.921875 33.441406 C 0.425781 32.828125 -0.199219 31.996094 0.0546875 31.195313 Z M 0.015625 38.085938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 68.078125 29.640625 C 70.640625 30.691406 70.640625 32.394531 68.078125 33.441406 L 39.636719 45.09375 C 37.078125 46.144531 32.921875 46.144531 30.363281 45.09375 L 1.921875 33.441406 C -0.640625 32.390625 -0.640625 30.691406 1.921875 29.640625 L 30.363281 17.988281 C 32.921875 16.9375 37.078125 16.9375 39.636719 17.988281 Z M 68.078125 29.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 0.015625 26.289063 C -0.105469 27.035156 0.53125 27.796875 1.921875 28.367188 L 30.363281 40.019531 C 32.921875 41.070313 37.078125 41.070313 39.636719 40.019531 L 68.082031 28.367188 C 69.472656 27.796875 70.105469 27.035156 69.988281 26.289063 L 69.996094 19.613281 C 70.082031 20.34375 69.441406 21.085938 68.082031 21.644531 L 39.636719 33.300781 C 37.078125 34.347656 32.925781 34.347656 30.363281 33.300781 L 1.921875 21.644531 C 0.425781 21.03125 -0.199219 20.199219 0.0546875 19.398438 Z M 0.015625 26.289063 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 68.078125 17.847656 C 70.640625 18.894531 70.640625 20.597656 68.078125 21.644531 L 39.636719 33.300781 C 37.078125 34.347656 32.921875 34.347656 30.363281 33.300781 L 1.921875 21.644531 C -0.640625 20.59375 -0.640625 18.894531 1.921875 17.847656 L 30.363281 6.191406 C 32.921875 5.140625 37.078125 5.140625 39.636719 6.191406 Z M 68.078125 17.847656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.234375 21.941406 C 22.988281 23.386719 17.726563 23.386719 14.480469 21.941406 C 11.238281 20.5 11.234375 18.15625 14.480469 16.714844 C 17.726563 15.269531 22.992188 15.269531 26.234375 16.714844 C 29.480469 18.15625 29.484375 20.5 26.234375 21.941406 Z M 26.234375 21.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 24.035156 25.660156 L 40.691406 23.675781 L 36.226563 31.085938 Z M 24.035156 25.660156 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 31.804688 13.953125 L 25.300781 13.363281 L 31.078125 11.910156 L 30.324219 8.976563 L 35.21875 10.972656 L 41.257813 9.75 L 38.503906 12.433594 L 42.988281 14.609375 L 36.394531 14.277344 L 33.125 16.847656 Z M 31.804688 13.953125 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoCloudCycle(m).png b/dist/ProductLogos/LogoCloudCycle(m).png
new file mode 100644
index 00000000..b83ff43b
Binary files /dev/null and b/dist/ProductLogos/LogoCloudCycle(m).png differ
diff --git a/dist/ProductLogos/LogoCloudCycle(m).svg b/dist/ProductLogos/LogoCloudCycle(m).svg
new file mode 100644
index 00000000..13e82b7b
--- /dev/null
+++ b/dist/ProductLogos/LogoCloudCycle(m).svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 63.191406 35.136719 C 63.886719 33.386719 64.28125 31.480469 64.28125 29.480469 C 64.28125 21 57.410156 14.125 48.9375 14.125 C 46.582031 14.125 44.359375 14.671875 42.363281 15.621094 C 39.046875 11.320313 33.863281 8.539063 28.015625 8.539063 C 18 8.539063 9.882813 16.664063 9.882813 26.691406 C 9.882813 27.503906 9.953125 28.296875 10.058594 29.082031 C 7.671875 29.984375 5.574219 31.464844 3.925781 33.347656 C 5.308594 34.550781 7.277344 35.273438 9.308594 35.273438 C 16.695313 35.226563 26.394531 29.207031 31.523438 25.625 L 29.078125 22.941406 L 40.140625 20.597656 L 36.542969 31.328125 L 34.144531 28.742188 C 31.839844 30.605469 19.347656 39.867188 9.242188 39.867188 C 6.117188 39.867188 3.496094 38.980469 1.445313 37.226563 C 0.652344 39.003906 0.199219 40.960938 0.140625 43.019531 C 2.117188 44.828125 5.007813 45.769531 8.867188 45.769531 C 18.417969 45.769531 33.285156 39.804688 45.863281 30.933594 L 43.75 28.394531 L 54.910156 26.570313 L 50.816406 37.121094 L 48.449219 34.308594 C 35.238281 44.25 20.28125 50.421875 9.511719 50.421875 C 6.183594 50.421875 3.34375 49.835938 1.058594 48.691406 C 1.824219 50.800781 3.734375 53.632813 4.59375 54.253906 C 6.109375 55.351563 9.230469 56.230469 13.792969 56.230469 C 22.242188 56.230469 34.101563 52.734375 44.523438 46.878906 L 42.414063 44.144531 L 53.628906 42.730469 L 49.152344 53.121094 L 46.910156 50.253906 C 40.734375 54.039063 33.953125 56.984375 27.371094 58.800781 L 57.304688 58.800781 C 64.242188 58.800781 69.859375 53.175781 69.859375 46.234375 C 69.859375 41.425781 67.15625 37.25 63.191406 35.136719 Z M 63.191406 35.136719 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoCloudCycle.png b/dist/ProductLogos/LogoCloudCycle.png
new file mode 100644
index 00000000..079a7b23
Binary files /dev/null and b/dist/ProductLogos/LogoCloudCycle.png differ
diff --git a/dist/ProductLogos/LogoCloudCycle.puml b/dist/ProductLogos/LogoCloudCycle.puml
new file mode 100644
index 00000000..0da53388
--- /dev/null
+++ b/dist/ProductLogos/LogoCloudCycle.puml
@@ -0,0 +1,11 @@
+sprite $LogoCloudCycle [70x70/16z] {
+xPRdOcin28CDGhp_6tUtIGZokBa_pzSzeYE3Z3t-1nSNvX_OImfW_XBsZngH3z37EP5Fq4wDPCkP7Ky1Jfre6KUG3DXAH8FOB3Xp6ws3F264Ifv1QULrcJmc
+3Xf4k7g4RIteBnkskoRE72CtTyOqzzi5dZtBKd7Y1TM2ND9ih3pKs-tk5rYfe8O0Ra_UGZIwp5jm3DHIibU1shByV75zYVNJYqB3ynFMbqIxR3KwObdizDv9
+c9Z1Q8TpLvMuIHjR8vzVgB9h3hTwiZN68p5iFcAa1kxzEHfz6nMdsDdG9rKvFasbRnZrTB3CvEyeyaYbCI8b9boAvWfYyWZMhclatyEQZYa2xMzTtMSOS3VF
+mfDRGgNFTQM_cXjVIcIuJT87VN8DZJF5DjXMiT1ZEFTKF6QDHwC2gBjkrT27A8Tzj-yJ85O1j3R6Q6gb0uXaPoMjAPPQYdzBYak1JoH4twiLBHCkiYDl7wKl
+X5l9dmPbVd_YRY9_siaQyFpIknF0klqlBYxU0G
+}
+
+AzureEntityColoring(LogoCloudCycle)
+!define LogoCloudCycle(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoCloudCycle, LogoCloudCycle)
+!define LogoCloudCycle(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoCloudCycle, LogoCloudCycle)
diff --git a/dist/ProductLogos/LogoCloudCycle.svg b/dist/ProductLogos/LogoCloudCycle.svg
new file mode 100644
index 00000000..8da70746
--- /dev/null
+++ b/dist/ProductLogos/LogoCloudCycle.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 63.191406 35.136719 C 63.886719 33.386719 64.28125 31.480469 64.28125 29.480469 C 64.28125 21 57.410156 14.125 48.9375 14.125 C 46.582031 14.125 44.359375 14.671875 42.363281 15.621094 C 39.046875 11.320313 33.863281 8.539063 28.015625 8.539063 C 18 8.539063 9.882813 16.664063 9.882813 26.691406 C 9.882813 27.503906 9.953125 28.296875 10.058594 29.082031 C 7.671875 29.984375 5.574219 31.464844 3.925781 33.347656 C 5.308594 34.550781 7.277344 35.273438 9.308594 35.273438 C 16.695313 35.226563 26.394531 29.207031 31.523438 25.625 L 29.078125 22.941406 L 40.140625 20.597656 L 36.542969 31.328125 L 34.144531 28.742188 C 31.839844 30.605469 19.347656 39.867188 9.242188 39.867188 C 6.117188 39.867188 3.496094 38.980469 1.445313 37.226563 C 0.652344 39.003906 0.199219 40.960938 0.140625 43.019531 C 2.117188 44.828125 5.007813 45.769531 8.867188 45.769531 C 18.417969 45.769531 33.285156 39.804688 45.863281 30.933594 L 43.75 28.394531 L 54.910156 26.570313 L 50.816406 37.121094 L 48.449219 34.308594 C 35.238281 44.25 20.28125 50.421875 9.511719 50.421875 C 6.183594 50.421875 3.34375 49.835938 1.058594 48.691406 C 1.824219 50.800781 3.734375 53.632813 4.59375 54.253906 C 6.109375 55.351563 9.230469 56.230469 13.792969 56.230469 C 22.242188 56.230469 34.101563 52.734375 44.523438 46.878906 L 42.414063 44.144531 L 53.628906 42.730469 L 49.152344 53.121094 L 46.910156 50.253906 C 40.734375 54.039063 33.953125 56.984375 27.371094 58.800781 L 57.304688 58.800781 C 64.242188 58.800781 69.859375 53.175781 69.859375 46.234375 C 69.859375 41.425781 67.15625 37.25 63.191406 35.136719 Z M 63.191406 35.136719 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoDCOS(m).png b/dist/ProductLogos/LogoDCOS(m).png
new file mode 100644
index 00000000..4c5847f8
Binary files /dev/null and b/dist/ProductLogos/LogoDCOS(m).png differ
diff --git a/dist/ProductLogos/LogoDCOS(m).svg b/dist/ProductLogos/LogoDCOS(m).svg
new file mode 100644
index 00000000..2d97992e
--- /dev/null
+++ b/dist/ProductLogos/LogoDCOS(m).svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="1.0375" y1="51.2336" x2="1.0375" y2="51.1709" gradientTransform="matrix(896,0,0,-896,-894.60028,45919.15776)">
+<stop offset="0" style="stop-color:rgb(0,105,184);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(0,134,234);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="-0.0723" y1="53.3366" x2="-0.0723" y2="53.3992" gradientTransform="matrix(263.56064,0,0,-263.56288,54.05904,14116.1972)">
+<stop offset="0" style="stop-color:rgb(199,231,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(255,255,255);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="-0.6346" y1="52.7743" x2="-0.6346" y2="52.8369" gradientTransform="matrix(263.56288,0,0,-263.55952,212.16608,13957.92076)">
+<stop offset="0" style="stop-color:rgb(171,219,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(225,242,255);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="0.49" y1="52.7743" x2="0.49" y2="52.8369" gradientTransform="matrix(263.56288,0,0,-263.55952,-104.05472,13957.92076)">
+<stop offset="0" style="stop-color:rgb(171,219,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(225,242,255);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="-1.197" y1="52.2746" x2="-1.197" y2="52.212" gradientTransform="matrix(263.55952,0,0,-263.55952,370.28096,13799.80952)">
+<stop offset="0" style="stop-color:rgb(143,207,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(87,183,255);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear5" gradientUnits="userSpaceOnUse" x1="-0.0723" y1="52.2746" x2="-0.0723" y2="52.212" gradientTransform="matrix(263.56064,0,0,-263.55952,54.05904,13799.80952)">
+<stop offset="0" style="stop-color:rgb(143,207,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(87,183,255);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear6" gradientUnits="userSpaceOnUse" x1="1.0523" y1="52.2746" x2="1.0523" y2="52.212" gradientTransform="matrix(263.55952,0,0,-263.55952,-262.15952,13799.80952)">
+<stop offset="0" style="stop-color:rgb(143,207,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(87,183,255);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear7" gradientUnits="userSpaceOnUse" x1="-0.6346" y1="51.6481" x2="-0.6346" y2="51.5855" gradientTransform="matrix(263.56288,0,0,-263.56288,212.16608,13623.8389)">
+<stop offset="0" style="stop-color:rgb(87,183,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(31,159,255);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear8" gradientUnits="userSpaceOnUse" x1="0.49" y1="51.6481" x2="0.49" y2="51.5855" gradientTransform="matrix(263.56288,0,0,-263.56288,-104.05472,13623.8389)">
+<stop offset="0" style="stop-color:rgb(87,183,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(31,159,255);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear9" gradientUnits="userSpaceOnUse" x1="-0.0723" y1="51.0053" x2="-0.0723" y2="50.9427" gradientTransform="matrix(263.56064,0,0,-263.55952,54.05904,13442.93398)">
+<stop offset="0" style="stop-color:rgb(31,159,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(0,134,234);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 34.605469 69.835938 L 7.109375 42.339844 C 6.886719 42.121094 6.886719 41.765625 7.109375 41.546875 L 34.601563 14.050781 C 34.820313 13.832031 35.175781 13.832031 35.394531 14.050781 L 62.890625 41.546875 C 63.109375 41.765625 63.109375 42.121094 62.890625 42.339844 L 35.394531 69.835938 C 35.179688 70.054688 34.820313 70.054688 34.605469 69.835938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 35.402344 42.316406 C 35.179688 42.097656 34.820313 42.097656 34.597656 42.316406 L 26.914063 50.003906 C 26.691406 50.226563 26.691406 50.585938 26.914063 50.804688 L 34.597656 58.492188 C 34.820313 58.714844 35.179688 58.714844 35.402344 58.492188 L 43.085938 50.804688 C 43.308594 50.585938 43.308594 50.226563 43.085938 50.003906 Z M 35.402344 42.316406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 45.300781 32.417969 C 45.078125 32.195313 44.722656 32.195313 44.5 32.417969 L 36.8125 40.105469 C 36.59375 40.324219 36.59375 40.683594 36.8125 40.90625 L 44.5 48.59375 C 44.722656 48.8125 45.078125 48.8125 45.300781 48.59375 L 52.988281 40.90625 C 53.210938 40.683594 53.210938 40.324219 52.988281 40.105469 Z M 45.300781 32.417969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear3);" d="M 33.1875 40.105469 L 25.5 32.417969 C 25.277344 32.195313 24.917969 32.195313 24.699219 32.417969 L 17.011719 40.105469 C 16.789063 40.324219 16.789063 40.683594 17.011719 40.90625 L 24.699219 48.59375 C 24.917969 48.8125 25.277344 48.8125 25.5 48.59375 L 33.1875 40.90625 C 33.40625 40.683594 33.40625 40.324219 33.1875 40.105469 Z M 33.1875 40.105469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear4);" d="M 62.890625 30.203125 L 55.203125 22.515625 C 54.980469 22.292969 54.625 22.292969 54.402344 22.515625 L 46.714844 30.203125 C 46.492188 30.421875 46.492188 30.78125 46.714844 31.003906 L 54.402344 38.691406 C 54.625 38.910156 54.980469 38.910156 55.203125 38.691406 L 62.890625 31.003906 C 63.109375 30.78125 63.109375 30.421875 62.890625 30.203125 Z M 62.890625 30.203125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear5);" d="M 34.597656 22.515625 L 26.914063 30.203125 C 26.691406 30.421875 26.691406 30.78125 26.914063 31.003906 L 34.597656 38.691406 C 34.820313 38.910156 35.179688 38.910156 35.402344 38.691406 L 43.085938 31.003906 C 43.308594 30.78125 43.308594 30.421875 43.085938 30.203125 L 35.402344 22.515625 C 35.179688 22.292969 34.820313 22.292969 34.597656 22.515625 Z M 34.597656 22.515625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear6);" d="M 23.285156 31.003906 L 15.597656 38.691406 C 15.375 38.910156 15.015625 38.910156 14.796875 38.691406 L 7.109375 31.003906 C 6.886719 30.78125 6.886719 30.421875 7.109375 30.203125 L 14.796875 22.515625 C 15.015625 22.292969 15.375 22.292969 15.597656 22.515625 L 23.285156 30.203125 C 23.503906 30.421875 23.503906 30.78125 23.285156 31.003906 Z M 23.285156 31.003906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear7);" d="M 36.8125 19.972656 L 44.5 27.660156 C 44.722656 27.878906 45.082031 27.878906 45.300781 27.660156 L 52.988281 19.972656 C 53.210938 19.75 53.210938 19.390625 52.988281 19.171875 L 45.300781 11.484375 C 45.082031 11.261719 44.722656 11.261719 44.5 11.484375 L 36.8125 19.171875 C 36.59375 19.394531 36.59375 19.75 36.8125 19.972656 Z M 36.8125 19.972656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear8);" d="M 24.699219 27.660156 C 24.921875 27.878906 25.277344 27.878906 25.5 27.660156 L 33.1875 19.972656 C 33.40625 19.75 33.40625 19.390625 33.1875 19.171875 L 25.5 11.484375 C 25.277344 11.261719 24.921875 11.261719 24.699219 11.484375 L 17.011719 19.171875 C 16.789063 19.390625 16.789063 19.75 17.011719 19.972656 Z M 24.699219 27.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear9);" d="M 34.597656 16.339844 C 34.820313 16.5625 35.179688 16.5625 35.402344 16.339844 L 43.085938 8.652344 C 43.308594 8.429688 43.308594 8.074219 43.085938 7.851563 L 35.402344 0.164063 C 35.179688 -0.0585938 34.820313 -0.0585938 34.597656 0.164063 L 26.914063 7.851563 C 26.691406 8.074219 26.691406 8.429688 26.914063 8.652344 Z M 34.597656 16.339844 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoDCOS.png b/dist/ProductLogos/LogoDCOS.png
new file mode 100644
index 00000000..520e4ab1
Binary files /dev/null and b/dist/ProductLogos/LogoDCOS.png differ
diff --git a/dist/ProductLogos/LogoDCOS.puml b/dist/ProductLogos/LogoDCOS.puml
new file mode 100644
index 00000000..8a64a27d
--- /dev/null
+++ b/dist/ProductLogos/LogoDCOS.puml
@@ -0,0 +1,12 @@
+sprite $LogoDCOS [70x70/16z] {
+fSy9ZeCm34PXiZbnxd_WCRMcuI6wu3xjF_YJidsiolPxjNVv7HcM_8wGYIDM_naX4qV8n94uCqwLa9A8r0019eoaJARwTXDfKXwCUdLjjn0vCcrjzv0Zqx3T
+G_n4J4csoThk87uYqz9ao3qcoR7vQ8Y0kOd8s14LkSd8AJMb2yiVbIAe-uDGspvN-h7vQ1odpqZQ6I8wd06ItY6bPZ0xKclV6I2bfdT8TGO86Fd_ZmmHC8uy
+6I1aYFmpJNiVEz8gcA5swmiP8iuqkr_8OcpJNEiRnbQS0E56XWWO7d0ZGuGDksXVR6HoHKtjebziKjd6SZkcKyMOqpQwCSV94J14Sch644cfEKE43954PaSi
+yOq86I1Wn92S5aE40Nao2m4ZwGKoEmwSMHiOKKtNY7tcWJFdJNoR8rqZbX-0yOsCHOR8p8drEVLY8qF4QXaLlTokcJ6VoUbWjCKGiJ8KC4IshIw6Y1OYP8Y0
+UO-GMKZQm7n2o13P6MrV8MI8EFC60QFFfAWQiggghUhAaK-C8sI8VCUaKqBaIwOHoKHkC564J1WX4qIkcJo0X9Wp4cCAaHXJ54YG8H9aY0GP8a66I8mX4gmJ
+2JD0uWoGE0CapX29Cv-HFm
+}
+
+AzureEntityColoring(LogoDCOS)
+!define LogoDCOS(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoDCOS, LogoDCOS)
+!define LogoDCOS(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoDCOS, LogoDCOS)
diff --git a/dist/ProductLogos/LogoDCOS.svg b/dist/ProductLogos/LogoDCOS.svg
new file mode 100644
index 00000000..eadebd2e
--- /dev/null
+++ b/dist/ProductLogos/LogoDCOS.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="1.0375" y1="51.2336" x2="1.0375" y2="51.1709" gradientTransform="matrix(896,0,0,-896,-894.60028,45919.15776)">
+<stop offset="0" style="stop-color:rgb(45.882353%,25.098039%,71.764706%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(57.647059%,31.764706%,89.803922%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="-0.0723" y1="53.3366" x2="-0.0723" y2="53.3992" gradientTransform="matrix(263.56064,0,0,-263.56288,54.05904,14116.1972)">
+<stop offset="0" style="stop-color:rgb(91.372549%,86.27451%,97.647059%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="-0.6346" y1="52.7743" x2="-0.6346" y2="52.8369" gradientTransform="matrix(263.56288,0,0,-263.55952,212.16608,13957.92076)">
+<stop offset="0" style="stop-color:rgb(87.058824%,79.607843%,96.862745%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.686275%,92.941176%,98.823529%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="0.49" y1="52.7743" x2="0.49" y2="52.8369" gradientTransform="matrix(263.56288,0,0,-263.55952,-104.05472,13957.92076)">
+<stop offset="0" style="stop-color:rgb(87.058824%,79.607843%,96.862745%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(95.686275%,92.941176%,98.823529%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="-1.197" y1="52.2746" x2="-1.197" y2="52.212" gradientTransform="matrix(263.55952,0,0,-263.55952,370.28096,13799.80952)">
+<stop offset="0" style="stop-color:rgb(82.745098%,72.54902%,95.686275%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(74.509804%,58.823529%,93.72549%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear5" gradientUnits="userSpaceOnUse" x1="-0.0723" y1="52.2746" x2="-0.0723" y2="52.212" gradientTransform="matrix(263.56064,0,0,-263.55952,54.05904,13799.80952)">
+<stop offset="0" style="stop-color:rgb(82.745098%,72.54902%,95.686275%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(74.509804%,58.823529%,93.72549%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear6" gradientUnits="userSpaceOnUse" x1="1.0523" y1="52.2746" x2="1.0523" y2="52.212" gradientTransform="matrix(263.55952,0,0,-263.55952,-262.15952,13799.80952)">
+<stop offset="0" style="stop-color:rgb(82.745098%,72.54902%,95.686275%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(74.509804%,58.823529%,93.72549%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear7" gradientUnits="userSpaceOnUse" x1="-0.6346" y1="51.6481" x2="-0.6346" y2="51.5855" gradientTransform="matrix(263.56288,0,0,-263.56288,212.16608,13623.8389)">
+<stop offset="0" style="stop-color:rgb(74.509804%,58.823529%,93.72549%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(65.882353%,45.098039%,91.764706%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear8" gradientUnits="userSpaceOnUse" x1="0.49" y1="51.6481" x2="0.49" y2="51.5855" gradientTransform="matrix(263.56288,0,0,-263.56288,-104.05472,13623.8389)">
+<stop offset="0" style="stop-color:rgb(74.509804%,58.823529%,93.72549%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(65.882353%,45.098039%,91.764706%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear9" gradientUnits="userSpaceOnUse" x1="-0.0723" y1="51.0053" x2="-0.0723" y2="50.9427" gradientTransform="matrix(263.56064,0,0,-263.55952,54.05904,13442.93398)">
+<stop offset="0" style="stop-color:rgb(65.882353%,45.098039%,91.764706%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(57.647059%,31.764706%,89.803922%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 34.605469 69.835938 L 7.109375 42.339844 C 6.886719 42.121094 6.886719 41.765625 7.109375 41.546875 L 34.601563 14.050781 C 34.820313 13.832031 35.175781 13.832031 35.394531 14.050781 L 62.890625 41.546875 C 63.109375 41.765625 63.109375 42.121094 62.890625 42.339844 L 35.394531 69.835938 C 35.179688 70.054688 34.820313 70.054688 34.605469 69.835938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 35.402344 42.316406 C 35.179688 42.097656 34.820313 42.097656 34.597656 42.316406 L 26.914063 50.003906 C 26.691406 50.226563 26.691406 50.585938 26.914063 50.804688 L 34.597656 58.492188 C 34.820313 58.714844 35.179688 58.714844 35.402344 58.492188 L 43.085938 50.804688 C 43.308594 50.585938 43.308594 50.226563 43.085938 50.003906 Z M 35.402344 42.316406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 45.300781 32.417969 C 45.078125 32.195313 44.722656 32.195313 44.5 32.417969 L 36.8125 40.105469 C 36.59375 40.324219 36.59375 40.683594 36.8125 40.90625 L 44.5 48.59375 C 44.722656 48.8125 45.078125 48.8125 45.300781 48.59375 L 52.988281 40.90625 C 53.210938 40.683594 53.210938 40.324219 52.988281 40.105469 Z M 45.300781 32.417969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear3);" d="M 33.1875 40.105469 L 25.5 32.417969 C 25.277344 32.195313 24.917969 32.195313 24.699219 32.417969 L 17.011719 40.105469 C 16.789063 40.324219 16.789063 40.683594 17.011719 40.90625 L 24.699219 48.59375 C 24.917969 48.8125 25.277344 48.8125 25.5 48.59375 L 33.1875 40.90625 C 33.40625 40.683594 33.40625 40.324219 33.1875 40.105469 Z M 33.1875 40.105469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear4);" d="M 62.890625 30.203125 L 55.203125 22.515625 C 54.980469 22.292969 54.625 22.292969 54.402344 22.515625 L 46.714844 30.203125 C 46.492188 30.421875 46.492188 30.78125 46.714844 31.003906 L 54.402344 38.691406 C 54.625 38.910156 54.980469 38.910156 55.203125 38.691406 L 62.890625 31.003906 C 63.109375 30.78125 63.109375 30.421875 62.890625 30.203125 Z M 62.890625 30.203125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear5);" d="M 34.597656 22.515625 L 26.914063 30.203125 C 26.691406 30.421875 26.691406 30.78125 26.914063 31.003906 L 34.597656 38.691406 C 34.820313 38.910156 35.179688 38.910156 35.402344 38.691406 L 43.085938 31.003906 C 43.308594 30.78125 43.308594 30.421875 43.085938 30.203125 L 35.402344 22.515625 C 35.179688 22.292969 34.820313 22.292969 34.597656 22.515625 Z M 34.597656 22.515625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear6);" d="M 23.285156 31.003906 L 15.597656 38.691406 C 15.375 38.910156 15.015625 38.910156 14.796875 38.691406 L 7.109375 31.003906 C 6.886719 30.78125 6.886719 30.421875 7.109375 30.203125 L 14.796875 22.515625 C 15.015625 22.292969 15.375 22.292969 15.597656 22.515625 L 23.285156 30.203125 C 23.503906 30.421875 23.503906 30.78125 23.285156 31.003906 Z M 23.285156 31.003906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear7);" d="M 36.8125 19.972656 L 44.5 27.660156 C 44.722656 27.878906 45.082031 27.878906 45.300781 27.660156 L 52.988281 19.972656 C 53.210938 19.75 53.210938 19.390625 52.988281 19.171875 L 45.300781 11.484375 C 45.082031 11.261719 44.722656 11.261719 44.5 11.484375 L 36.8125 19.171875 C 36.59375 19.394531 36.59375 19.75 36.8125 19.972656 Z M 36.8125 19.972656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear8);" d="M 24.699219 27.660156 C 24.921875 27.878906 25.277344 27.878906 25.5 27.660156 L 33.1875 19.972656 C 33.40625 19.75 33.40625 19.390625 33.1875 19.171875 L 25.5 11.484375 C 25.277344 11.261719 24.921875 11.261719 24.699219 11.484375 L 17.011719 19.171875 C 16.789063 19.390625 16.789063 19.75 17.011719 19.972656 Z M 24.699219 27.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear9);" d="M 34.597656 16.339844 C 34.820313 16.5625 35.179688 16.5625 35.402344 16.339844 L 43.085938 8.652344 C 43.308594 8.429688 43.308594 8.074219 43.085938 7.851563 L 35.402344 0.164063 C 35.179688 -0.0585938 34.820313 -0.0585938 34.597656 0.164063 L 26.914063 7.851563 C 26.691406 8.074219 26.691406 8.429688 26.914063 8.652344 Z M 34.597656 16.339844 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoDatabrick(m).png b/dist/ProductLogos/LogoDatabrick(m).png
new file mode 100644
index 00000000..ae8c05ff
Binary files /dev/null and b/dist/ProductLogos/LogoDatabrick(m).png differ
diff --git a/dist/ProductLogos/LogoDatabrick(m).svg b/dist/ProductLogos/LogoDatabrick(m).svg
new file mode 100644
index 00000000..3445009a
--- /dev/null
+++ b/dist/ProductLogos/LogoDatabrick(m).svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="67pt" height="70pt" viewBox="0 0 67 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 0 53.023438 L 33.5 70.726563 L 67 53.023438 L 67 41.679688 L 0 41.679688 Z M 0 53.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13,152,255);fill-opacity:1;" d="M 33.5 23.972656 L 0 41.679688 L 33.5 59.386719 L 67 41.679688 Z M 33.5 23.972656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 0 29.050781 L 33.5 46.753906 L 67 29.050781 L 67 17.703125 L 0 17.703125 Z M 0 29.050781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13,152,255);fill-opacity:1;" d="M 33.5 0 L 0 17.703125 L 33.5 35.410156 L 67 17.703125 Z M 33.5 0 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoDatabrick.png b/dist/ProductLogos/LogoDatabrick.png
new file mode 100644
index 00000000..e07b677a
Binary files /dev/null and b/dist/ProductLogos/LogoDatabrick.png differ
diff --git a/dist/ProductLogos/LogoDatabrick.puml b/dist/ProductLogos/LogoDatabrick.puml
new file mode 100644
index 00000000..cd590fb3
--- /dev/null
+++ b/dist/ProductLogos/LogoDatabrick.puml
@@ -0,0 +1,10 @@
+sprite $LogoDatabrick [67x70/16z] {
+xTL7OYGn28NXKce1zx_lZ3CEI3zMRVsM3by7ADu5QRDT4094v0vIfxncraFW8Px70LBU04VABu4XFpFAEU18LkYoJa_ESPVPSW0Wl0YCL5m4pgFo8Z1IS8wS
+KHXWX1U1qtcEgGbt0XWnlKcecDr2r4pC007WdJ0x19muUYDcJXmXQW4H800u4ICCE04804umuW0GZX3WnB0e27YqNTV8lf7mxyRRoSiWQa66NwqP8WHylPyr
+HdR0V0SSaH1P0N6NT8ko74DSvsgvQ5Zompyr0b79UmqmeZ_wEQW19U07uW0Y6fJyieWOy98tpJvIknwH308zmeXkhhZi_qJvjzmZ2W3qo5-F80048T5Vq_Nc
+nwzZ1V0Lvmh8NV4gWC0LPoG6v4SDD0sH9H3MGDTyZ_HhaM4Oh_CxY0DXWZM95e6GkG4c0pvXMWH6S14uJN4HE5rn4JY35Y6F0F0V
+}
+
+AzureEntityColoring(LogoDatabrick)
+!define LogoDatabrick(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoDatabrick, LogoDatabrick)
+!define LogoDatabrick(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoDatabrick, LogoDatabrick)
diff --git a/dist/ProductLogos/LogoDatabrick.svg b/dist/ProductLogos/LogoDatabrick.svg
new file mode 100644
index 00000000..b501852c
--- /dev/null
+++ b/dist/ProductLogos/LogoDatabrick.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="67pt" height="70pt" viewBox="0 0 67 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(87.45098%,14.901961%,16.862745%);fill-opacity:1;" d="M 0 53.023438 L 33.5 70.726563 L 67 53.023438 L 67 41.679688 L 0 41.679688 Z M 0 53.023438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,37.254902%,19.607843%);fill-opacity:1;" d="M 33.5 23.972656 L 0 41.679688 L 33.5 59.386719 L 67 41.679688 Z M 33.5 23.972656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(87.45098%,14.901961%,16.862745%);fill-opacity:1;" d="M 0 29.050781 L 33.5 46.753906 L 67 29.050781 L 67 17.703125 L 0 17.703125 Z M 0 29.050781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.901961%,37.254902%,19.607843%);fill-opacity:1;" d="M 33.5 0 L 0 17.703125 L 33.5 35.410156 L 67 17.703125 Z M 33.5 0 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoDocker(m).png b/dist/ProductLogos/LogoDocker(m).png
new file mode 100644
index 00000000..fad1c433
Binary files /dev/null and b/dist/ProductLogos/LogoDocker(m).png differ
diff --git a/dist/ProductLogos/LogoDocker(m).svg b/dist/ProductLogos/LogoDocker(m).svg
new file mode 100644
index 00000000..ee69aac8
--- /dev/null
+++ b/dist/ProductLogos/LogoDocker(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,81,142);fill-opacity:1;" d="M 51.828125 60.667969 C 53.402344 59.316406 54.976563 57.96875 56.546875 56.613281 C 57.082031 56.148438 57.671875 55.667969 58.203125 55.183594 C 57.777344 54.644531 57.0625 54.253906 56.457031 54.023438 C 55.234375 53.558594 54.027344 53.714844 52.90625 54.363281 C 51.4375 55.210938 50.8125 56.5625 50.867188 58.242188 C 50.886719 58.90625 51.066406 59.542969 51.417969 60.105469 C 51.539063 60.304688 51.679688 60.488281 51.828125 60.667969 M 53.648438 61.945313 C 54.421875 62.214844 55.300781 62.179688 56.09375 62.039063 C 56.5 61.867188 57.535156 61.414063 57.917969 61.480469 L 57.976563 61.492188 L 58.03125 61.519531 C 58.265625 61.632813 58.488281 61.792969 58.605469 62.027344 C 58.882813 62.582031 58.75 63.140625 58.203125 63.453125 L 58.023438 63.558594 C 56.011719 64.722656 53.871094 64.5625 51.863281 63.476563 C 50.90625 62.957031 50.171875 62.1875 49.628906 61.25 L 49.503906 61.03125 C 48.210938 58.792969 48.386719 56.441406 49.84375 54.3125 C 50.34375 53.578125 51.003906 53.007813 51.773438 52.5625 L 52.0625 52.394531 C 53.957031 51.304688 55.988281 51.378906 57.9375 52.335938 C 58.980469 52.855469 59.832031 53.625 60.414063 54.636719 L 60.519531 54.820313 C 60.945313 55.554688 60.394531 56.195313 59.828125 56.632813 C 59.167969 57.140625 58.503906 57.753906 57.871094 58.296875 C 56.460938 59.511719 55.054688 60.730469 53.648438 61.945313 Z M 68.730469 51.769531 L 68.9375 51.769531 C 69.574219 51.769531 70 52.199219 70 52.832031 C 70 53.707031 69.160156 53.933594 68.433594 53.933594 C 67.480469 53.933594 66.570313 54.511719 65.914063 55.15625 C 65.097656 55.964844 64.738281 57 64.738281 58.136719 L 64.738281 63.273438 C 64.738281 63.859375 64.371094 64.332031 63.761719 64.332031 L 63.59375 64.332031 C 62.984375 64.332031 62.617188 63.859375 62.617188 63.273438 L 62.617188 57.839844 C 62.617188 55.753906 63.632813 54.054688 65.324219 52.859375 C 66.332031 52.144531 67.492188 51.769531 68.730469 51.769531 Z M 42.285156 55.414063 C 43.113281 54.589844 43.9375 53.765625 44.773438 52.953125 C 45.007813 52.726563 45.890625 51.769531 46.238281 51.769531 L 46.617188 51.769531 L 46.660156 51.777344 C 47.144531 51.878906 47.507813 52.1875 47.507813 52.707031 L 47.507813 52.914063 C 47.507813 53.269531 47.09375 53.683594 46.863281 53.925781 C 46.375 54.441406 45.863281 54.941406 45.363281 55.445313 L 42.800781 58.046875 C 43.902344 59.152344 45.007813 60.261719 46.101563 61.375 C 46.40625 61.683594 46.707031 61.992188 47.007813 62.304688 C 47.113281 62.417969 47.265625 62.554688 47.355469 62.707031 C 47.453125 62.851563 47.507813 63.015625 47.507813 63.1875 L 47.507813 63.40625 L 47.496094 63.457031 C 47.378906 63.941406 47.070313 64.332031 46.53125 64.332031 L 46.363281 64.332031 C 46.015625 64.332031 45.617188 63.933594 45.375 63.707031 C 44.882813 63.242188 44.402344 62.75 43.917969 62.273438 L 42.289063 60.675781 L 42.289063 63.230469 C 42.289063 63.816406 41.921875 64.289063 41.3125 64.289063 L 41.144531 64.289063 C 40.535156 64.289063 40.167969 63.816406 40.167969 63.230469 L 40.167969 48.832031 C 40.167969 48.242188 40.535156 47.769531 41.144531 47.769531 L 41.3125 47.769531 C 41.921875 47.769531 42.289063 48.242188 42.289063 48.832031 L 42.289063 55.414063 Z M 35.40625 53.976563 C 35.085938 53.828125 34.484375 53.777344 34.140625 53.765625 C 32.367188 53.699219 31.085938 54.695313 30.332031 56.261719 C 30.074219 56.800781 29.957031 57.371094 29.957031 57.96875 C 29.957031 59.785156 30.910156 61.058594 32.53125 61.832031 C 33.125 62.113281 33.890625 62.167969 34.535156 62.167969 C 35.105469 62.167969 35.910156 61.820313 36.417969 61.582031 L 36.503906 61.539063 L 36.898438 61.539063 L 36.941406 61.546875 C 37.421875 61.648438 37.789063 61.953125 37.789063 62.472656 L 37.789063 62.683594 C 37.789063 63.972656 35.425781 64.269531 34.527344 64.332031 C 31.347656 64.550781 28.96875 62.808594 28.0625 59.777344 C 27.90625 59.25 27.835938 58.726563 27.835938 58.179688 L 27.835938 57.757813 C 27.835938 55.457031 28.976563 53.636719 30.949219 52.464844 C 31.867188 51.917969 32.882813 51.644531 33.949219 51.644531 L 34.367188 51.644531 C 35.5 51.644531 36.542969 51.964844 37.472656 52.605469 L 37.550781 52.65625 L 37.601563 52.738281 C 37.699219 52.902344 37.789063 53.097656 37.789063 53.296875 L 37.789063 53.507813 C 37.789063 54.046875 37.382813 54.339844 36.894531 54.433594 L 36.851563 54.441406 L 36.726563 54.441406 C 36.410156 54.4375 35.6875 54.109375 35.40625 53.976563 Z M 16.0625 58.011719 C 16.0625 59.625 16.851563 60.808594 18.214844 61.644531 C 18.855469 62.035156 19.558594 62.210938 20.308594 62.210938 C 21.898438 62.210938 23.078125 61.402344 23.898438 60.058594 C 24.289063 59.417969 24.464844 58.714844 24.464844 57.96875 C 24.464844 56.46875 23.742188 55.324219 22.507813 54.492188 C 21.832031 54.039063 21.078125 53.808594 20.261719 53.808594 C 18.488281 53.808594 17.207031 54.707031 16.441406 56.300781 C 16.179688 56.839844 16.0625 57.414063 16.0625 58.011719 Z M 20.054688 51.683594 L 20.347656 51.683594 C 22.804688 51.683594 24.675781 52.878906 25.859375 55.023438 C 26.332031 55.882813 26.585938 56.816406 26.585938 57.800781 L 26.585938 58.21875 C 26.585938 60.519531 25.453125 62.351563 23.46875 63.515625 C 22.550781 64.054688 21.539063 64.332031 20.472656 64.332031 L 20.054688 64.332031 C 17.753906 64.332031 15.925781 63.195313 14.757813 61.214844 C 14.21875 60.296875 13.941406 59.285156 13.941406 58.21875 L 13.941406 57.800781 C 13.941406 55.5 15.082031 53.675781 17.054688 52.503906 C 17.972656 51.957031 18.988281 51.683594 20.054688 51.683594 Z M 2.171875 58.011719 C 2.171875 59.671875 2.976563 60.921875 4.429688 61.71875 C 5.019531 62.039063 5.660156 62.214844 6.332031 62.214844 C 7.960938 62.214844 9.171875 61.445313 10.003906 60.0625 C 10.390625 59.421875 10.574219 58.71875 10.574219 57.96875 C 10.574219 56.527344 9.890625 55.40625 8.730469 54.570313 C 8.027344 54.0625 7.234375 53.808594 6.371094 53.808594 C 4.59375 53.808594 3.316406 54.707031 2.546875 56.300781 C 2.289063 56.839844 2.171875 57.414063 2.171875 58.011719 Z M 10.574219 53.269531 L 10.574219 48.789063 C 10.574219 48.199219 10.941406 47.726563 11.550781 47.726563 L 11.71875 47.726563 C 12.328125 47.726563 12.695313 48.199219 12.695313 48.789063 L 12.695313 58.21875 C 12.695313 60.519531 11.558594 62.347656 9.578125 63.515625 C 8.660156 64.054688 7.644531 64.332031 6.582031 64.332031 L 6.160156 64.332031 C 3.859375 64.332031 2.03125 63.195313 0.863281 61.214844 C 0.324219 60.296875 0.046875 59.28125 0.046875 58.21875 L 0.046875 57.796875 C 0.046875 55.496094 1.183594 53.667969 3.164063 52.5 C 4.082031 51.957031 5.09375 51.683594 6.160156 51.683594 L 6.582031 51.683594 C 8.136719 51.683594 9.457031 52.289063 10.574219 53.269531 Z M 10.574219 53.269531 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,81,142);fill-opacity:1;" d="M 40.378906 18.15625 L 46.640625 18.15625 L 46.640625 24.554688 L 49.804688 24.554688 C 51.265625 24.554688 52.769531 24.296875 54.15625 23.828125 C 54.835938 23.59375 55.597656 23.273438 56.269531 22.871094 C 55.386719 21.71875 54.933594 20.261719 54.800781 18.824219 C 54.621094 16.871094 55.015625 14.332031 56.335938 12.800781 L 56.996094 12.039063 L 57.78125 12.671875 C 59.753906 14.257813 61.414063 16.472656 61.707031 19 C 64.082031 18.300781 66.875 18.464844 68.96875 19.675781 L 69.828125 20.171875 L 69.378906 21.054688 C 67.605469 24.511719 63.898438 25.585938 60.277344 25.394531 C 54.859375 38.894531 43.058594 45.285156 28.75 45.285156 C 21.359375 45.285156 14.578125 42.523438 10.714844 35.964844 L 10.652344 35.855469 L 10.089844 34.710938 C 8.785156 31.824219 8.351563 28.664063 8.644531 25.503906 L 8.734375 24.554688 L 14.085938 24.554688 L 14.085938 18.15625 L 20.347656 18.15625 L 20.347656 11.894531 L 32.867188 11.894531 L 32.867188 5.636719 L 40.378906 5.636719 Z M 40.378906 18.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,142,248);fill-opacity:1;" d="M 60.660156 20.523438 C 61.082031 17.261719 58.640625 14.699219 57.128906 13.484375 C 55.382813 15.5 55.109375 20.789063 57.847656 23.011719 C 56.320313 24.371094 53.101563 25.601563 49.804688 25.601563 L 9.683594 25.601563 C 9.363281 29.042969 9.96875 32.210938 11.347656 34.921875 L 11.804688 35.757813 C 12.09375 36.246094 12.40625 36.71875 12.75 37.175781 C 14.398438 37.28125 15.917969 37.320313 17.3125 37.289063 C 20.046875 37.226563 22.277344 36.902344 23.96875 36.320313 C 24.21875 36.230469 24.496094 36.363281 24.582031 36.617188 C 24.667969 36.867188 24.535156 37.140625 24.28125 37.230469 C 24.058594 37.308594 23.824219 37.378906 23.582031 37.449219 C 22.25 37.828125 20.820313 38.085938 18.980469 38.199219 C 19.089844 38.199219 18.867188 38.214844 18.863281 38.214844 C 18.800781 38.21875 18.722656 38.226563 18.660156 38.234375 C 17.933594 38.273438 17.152344 38.28125 16.351563 38.28125 C 15.476563 38.28125 14.617188 38.265625 13.652344 38.214844 L 13.628906 38.234375 C 16.972656 41.988281 22.195313 44.242188 28.75 44.242188 C 42.617188 44.242188 54.378906 38.09375 59.585938 24.296875 C 63.28125 24.675781 66.832031 23.734375 68.449219 20.578125 C 65.875 19.09375 62.566406 19.566406 60.660156 20.523438 Z M 60.660156 20.523438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(35,161,255);fill-opacity:1;" d="M 60.660156 20.523438 C 61.082031 17.261719 58.640625 14.699219 57.128906 13.484375 C 55.382813 15.5 55.109375 20.789063 57.847656 23.011719 C 56.320313 24.371094 53.101563 25.601563 49.804688 25.601563 L 12.058594 25.601563 C 11.894531 30.871094 13.851563 34.871094 17.3125 37.289063 C 20.046875 37.226563 22.277344 36.902344 23.96875 36.320313 C 24.21875 36.230469 24.496094 36.363281 24.582031 36.617188 C 24.667969 36.867188 24.535156 37.140625 24.28125 37.230469 C 24.058594 37.308594 23.824219 37.378906 23.582031 37.449219 C 22.25 37.828125 20.699219 38.117188 18.855469 38.230469 C 18.855469 38.230469 18.8125 38.1875 18.8125 38.1875 C 23.53125 40.609375 30.371094 40.601563 38.21875 37.585938 C 47.015625 34.207031 55.199219 27.769531 60.914063 20.40625 C 60.824219 20.441406 60.742188 20.484375 60.660156 20.523438 Z M 60.660156 20.523438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,117,204);fill-opacity:1;" d="M 9.757813 29.78125 C 10.007813 31.621094 10.546875 33.347656 11.347656 34.921875 L 11.804688 35.753906 C 12.09375 36.246094 12.40625 36.71875 12.75 37.175781 C 14.398438 37.28125 15.921875 37.316406 17.3125 37.285156 C 20.046875 37.226563 22.277344 36.902344 23.96875 36.316406 C 24.21875 36.230469 24.496094 36.363281 24.582031 36.613281 C 24.667969 36.867188 24.535156 37.140625 24.28125 37.226563 C 24.058594 37.304688 23.824219 37.378906 23.582031 37.445313 C 22.25 37.828125 20.707031 38.097656 18.863281 38.214844 C 18.800781 38.21875 18.691406 38.21875 18.628906 38.222656 C 17.902344 38.261719 17.128906 38.289063 16.328125 38.289063 C 15.453125 38.289063 14.558594 38.269531 13.597656 38.222656 C 16.941406 41.980469 22.199219 44.238281 28.75 44.238281 C 40.621094 44.238281 50.949219 39.734375 56.945313 29.777344 L 9.757813 29.777344 Z M 9.757813 29.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,131,228);fill-opacity:1;" d="M 12.421875 29.78125 C 13.128906 33.015625 14.835938 35.554688 17.3125 37.285156 C 20.046875 37.226563 22.277344 36.902344 23.964844 36.316406 C 24.21875 36.230469 24.492188 36.363281 24.578125 36.613281 C 24.667969 36.867188 24.535156 37.140625 24.28125 37.226563 C 24.054688 37.304688 23.824219 37.378906 23.582031 37.445313 C 23.582031 37.445313 23.582031 37.445313 23.578125 37.445313 C 22.246094 37.828125 20.671875 38.097656 18.828125 38.214844 C 23.546875 40.632813 30.371094 40.597656 38.214844 37.585938 C 42.960938 35.761719 47.527344 33.046875 51.625 29.78125 Z M 12.421875 29.78125 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,142,248);fill-opacity:1;" d="M 19.675781 19.652344 L 20.101563 19.652344 L 20.101563 24.171875 L 19.675781 24.171875 Z M 18.851563 19.652344 L 19.296875 19.652344 L 19.296875 24.171875 L 18.851563 24.171875 Z M 18.03125 19.652344 L 18.476563 19.652344 L 18.476563 24.171875 L 18.03125 24.171875 Z M 17.207031 19.652344 L 17.652344 19.652344 L 17.652344 24.171875 L 17.207031 24.171875 Z M 16.386719 19.652344 L 16.832031 19.652344 L 16.832031 24.171875 L 16.386719 24.171875 Z M 15.582031 19.652344 L 16.007813 19.652344 L 16.007813 24.171875 L 15.582031 24.171875 Z M 15.128906 19.199219 L 20.554688 19.199219 L 20.554688 24.625 L 15.128906 24.625 Z M 15.128906 19.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,142,248);fill-opacity:1;" d="M 25.933594 13.390625 L 26.363281 13.390625 L 26.363281 17.914063 L 25.933594 17.914063 Z M 25.113281 13.390625 L 25.558594 13.390625 L 25.558594 17.914063 L 25.113281 17.914063 Z M 24.289063 13.390625 L 24.734375 13.390625 L 24.734375 17.914063 L 24.289063 17.914063 Z M 23.46875 13.390625 L 23.914063 13.390625 L 23.914063 17.914063 L 23.46875 17.914063 Z M 22.644531 13.390625 L 23.089844 13.390625 L 23.089844 17.914063 L 22.644531 17.914063 Z M 21.839844 13.390625 L 22.269531 13.390625 L 22.269531 17.914063 L 21.839844 17.914063 Z M 21.390625 12.9375 L 26.816406 12.9375 L 26.816406 18.363281 L 21.390625 18.363281 Z M 21.390625 12.9375 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(45,165,255);fill-opacity:1;" d="M 25.933594 19.652344 L 26.363281 19.652344 L 26.363281 24.171875 L 25.933594 24.171875 Z M 25.113281 19.652344 L 25.558594 19.652344 L 25.558594 24.171875 L 25.113281 24.171875 Z M 24.289063 19.652344 L 24.734375 19.652344 L 24.734375 24.171875 L 24.289063 24.171875 Z M 23.46875 19.652344 L 23.914063 19.652344 L 23.914063 24.171875 L 23.46875 24.171875 Z M 22.644531 19.652344 L 23.089844 19.652344 L 23.089844 24.171875 L 22.644531 24.171875 Z M 21.839844 19.652344 L 22.269531 19.652344 L 22.269531 24.171875 L 21.839844 24.171875 Z M 21.390625 19.199219 L 26.816406 19.199219 L 26.816406 24.625 L 21.390625 24.625 Z M 21.390625 19.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,142,248);fill-opacity:1;" d="M 32.195313 19.652344 L 32.625 19.652344 L 32.625 24.171875 L 32.195313 24.171875 Z M 31.371094 19.652344 L 31.816406 19.652344 L 31.816406 24.171875 L 31.371094 24.171875 Z M 30.550781 19.652344 L 30.996094 19.652344 L 30.996094 24.171875 L 30.550781 24.171875 Z M 29.730469 19.652344 L 30.175781 19.652344 L 30.175781 24.171875 L 29.730469 24.171875 Z M 28.90625 19.652344 L 29.351563 19.652344 L 29.351563 24.171875 L 28.90625 24.171875 Z M 28.101563 19.652344 L 28.53125 19.652344 L 28.53125 24.171875 L 28.101563 24.171875 Z M 27.648438 19.199219 L 33.078125 19.199219 L 33.078125 24.625 L 27.648438 24.625 Z M 27.648438 19.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(45,165,255);fill-opacity:1;" d="M 32.195313 13.390625 L 32.625 13.390625 L 32.625 17.914063 L 32.195313 17.914063 Z M 31.371094 13.390625 L 31.816406 13.390625 L 31.816406 17.914063 L 31.371094 17.914063 Z M 30.550781 13.390625 L 30.996094 13.390625 L 30.996094 17.914063 L 30.550781 17.914063 Z M 29.730469 13.390625 L 30.175781 13.390625 L 30.175781 17.914063 L 29.730469 17.914063 Z M 28.90625 13.390625 L 29.351563 13.390625 L 29.351563 17.914063 L 28.90625 17.914063 Z M 28.101563 13.390625 L 28.53125 13.390625 L 28.53125 17.914063 L 28.101563 17.914063 Z M 27.648438 12.9375 L 33.078125 12.9375 L 33.078125 18.363281 L 27.648438 18.363281 Z M 27.648438 12.9375 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(45,165,255);fill-opacity:1;" d="M 38.457031 19.652344 L 38.882813 19.652344 L 38.882813 24.171875 L 38.457031 24.171875 Z M 37.632813 19.652344 L 38.078125 19.652344 L 38.078125 24.171875 L 37.632813 24.171875 Z M 36.8125 19.652344 L 37.257813 19.652344 L 37.257813 24.171875 L 36.8125 24.171875 Z M 35.988281 19.652344 L 36.433594 19.652344 L 36.433594 24.171875 L 35.988281 24.171875 Z M 35.167969 19.652344 L 35.613281 19.652344 L 35.613281 24.171875 L 35.167969 24.171875 Z M 34.363281 19.652344 L 34.789063 19.652344 L 34.789063 24.171875 L 34.363281 24.171875 Z M 33.910156 19.199219 L 39.335938 19.199219 L 39.335938 24.625 L 33.910156 24.625 Z M 33.910156 19.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,142,248);fill-opacity:1;" d="M 38.457031 13.390625 L 38.882813 13.390625 L 38.882813 17.914063 L 38.457031 17.914063 Z M 37.632813 13.390625 L 38.078125 13.390625 L 38.078125 17.914063 L 37.632813 17.914063 Z M 36.8125 13.390625 L 37.257813 13.390625 L 37.257813 17.914063 L 36.8125 17.914063 Z M 35.988281 13.390625 L 36.433594 13.390625 L 36.433594 17.914063 L 35.988281 17.914063 Z M 35.167969 13.390625 L 35.613281 13.390625 L 35.613281 17.914063 L 35.167969 17.914063 Z M 34.363281 13.390625 L 34.789063 13.390625 L 34.789063 17.914063 L 34.363281 17.914063 Z M 33.910156 12.9375 L 39.335938 12.9375 L 39.335938 18.363281 L 33.910156 18.363281 Z M 33.910156 12.9375 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(45,165,255);fill-opacity:1;" d="M 38.457031 7.132813 L 38.882813 7.132813 L 38.882813 11.652344 L 38.457031 11.652344 Z M 37.632813 7.132813 L 38.078125 7.132813 L 38.078125 11.652344 L 37.632813 11.652344 Z M 36.8125 7.132813 L 37.257813 7.132813 L 37.257813 11.652344 L 36.8125 11.652344 Z M 35.988281 7.132813 L 36.433594 7.132813 L 36.433594 11.652344 L 35.988281 11.652344 Z M 35.167969 7.132813 L 35.613281 7.132813 L 35.613281 11.652344 L 35.167969 11.652344 Z M 34.363281 7.132813 L 34.789063 7.132813 L 34.789063 11.652344 L 34.363281 11.652344 Z M 33.910156 6.679688 L 39.335938 6.679688 L 39.335938 12.105469 L 33.910156 12.105469 Z M 33.910156 6.679688 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,142,248);fill-opacity:1;" d="M 44.714844 19.652344 L 45.144531 19.652344 L 45.144531 24.171875 L 44.714844 24.171875 Z M 43.894531 19.652344 L 44.339844 19.652344 L 44.339844 24.171875 L 43.894531 24.171875 Z M 43.070313 19.652344 L 43.515625 19.652344 L 43.515625 24.171875 L 43.070313 24.171875 Z M 42.25 19.652344 L 42.695313 19.652344 L 42.695313 24.171875 L 42.25 24.171875 Z M 41.425781 19.652344 L 41.871094 19.652344 L 41.871094 24.171875 L 41.425781 24.171875 Z M 40.621094 19.652344 L 41.050781 19.652344 L 41.050781 24.171875 L 40.621094 24.171875 Z M 40.171875 19.199219 L 45.597656 19.199219 L 45.597656 24.625 L 40.171875 24.625 Z M 40.171875 19.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(203,232,255);fill-opacity:1;" d="M 26.476563 33.421875 C 27.300781 33.421875 27.972656 34.09375 27.972656 34.917969 C 27.972656 35.746094 27.300781 36.414063 26.476563 36.414063 C 25.648438 36.414063 24.980469 35.746094 24.980469 34.917969 C 24.980469 34.09375 25.648438 33.421875 26.476563 33.421875 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,81,142);fill-opacity:1;" d="M 26.476563 33.847656 C 26.613281 33.847656 26.742188 33.871094 26.863281 33.917969 C 26.734375 33.996094 26.644531 34.136719 26.644531 34.296875 C 26.644531 34.539063 26.839844 34.734375 27.082031 34.734375 C 27.25 34.734375 27.390625 34.644531 27.464844 34.507813 C 27.519531 34.632813 27.546875 34.773438 27.546875 34.917969 C 27.546875 35.511719 27.066406 35.992188 26.476563 35.992188 C 25.882813 35.992188 25.402344 35.511719 25.402344 34.917969 C 25.402344 34.328125 25.882813 33.847656 26.476563 33.847656 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0,81,142);fill-opacity:1;" d="M 0 30.320313 L 69.628906 30.320313 C 68.113281 29.933594 64.835938 29.414063 65.375 27.429688 C 62.617188 30.621094 55.96875 29.667969 54.292969 28.09375 C 52.421875 30.804688 41.546875 29.773438 40.789063 27.664063 C 38.445313 30.414063 31.1875 30.414063 28.84375 27.664063 C 28.085938 29.773438 17.207031 30.804688 15.339844 28.09375 C 13.664063 29.667969 7.015625 30.621094 4.257813 27.429688 C 4.796875 29.417969 1.515625 29.9375 0 30.320313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(167,217,255);fill-opacity:1;" d="M 30.453125 44.207031 C 26.746094 42.449219 24.710938 40.058594 23.582031 37.445313 C 22.203125 37.839844 20.546875 38.089844 18.625 38.199219 C 17.902344 38.238281 17.140625 38.261719 16.339844 38.261719 C 15.417969 38.261719 14.445313 38.234375 13.425781 38.179688 C 16.824219 41.578125 21.007813 44.191406 28.75 44.238281 C 29.320313 44.242188 29.890625 44.230469 30.453125 44.207031 Z M 30.453125 44.207031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(203,232,255);fill-opacity:1;" d="M 24.957031 39.855469 C 24.445313 39.160156 23.945313 38.285156 23.582031 37.445313 C 22.203125 37.839844 20.550781 38.089844 18.625 38.199219 C 19.945313 38.917969 21.835938 39.582031 24.957031 39.855469 Z M 24.957031 39.855469 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoDocker.png b/dist/ProductLogos/LogoDocker.png
new file mode 100644
index 00000000..8aabc33c
Binary files /dev/null and b/dist/ProductLogos/LogoDocker.png differ
diff --git a/dist/ProductLogos/LogoDocker.puml b/dist/ProductLogos/LogoDocker.puml
new file mode 100644
index 00000000..55922332
--- /dev/null
+++ b/dist/ProductLogos/LogoDocker.puml
@@ -0,0 +1,14 @@
+sprite $LogoDocker [70x70/16z] {
+xT07Tfqm48NXKPjsP__h3IhOF0x4fDVlD2xM-qD4lz9_fGwPlWcyWtnZnOPlhvZxtrLH_QfxuJZ2SAua-R3YxcO6xVhZjeLUgNlwiD9XN8WFvqg1c7rpHKp4
+vLihfYA2_8qLbuqANHBj7AlIhMVNuQKYJhcKH6U-M7Ti-VBoFn9CaYuhvdwiz7cgiCd6RN1yPIL3HDGcy5TMIEqjuaPVLqdijaTWYTxKxgFRHTqqDfYAzfU0
+DtfN0FWpPYhI8yQjPZggC9Cle6PuBQH3vN73NDUF5skpegB7ahhhrNDVPeP2csOqP8rmOPWx8k2cdVNHrtci1LWfLJn2Cr6gRU3dj-iOkErgebrls1Ehn7H5
+7rPyChfKSSg8tZSSYQwTAitBRSDHw0RxIuP3xYELxYH_oIZBJSFHw5x1ohWRsrrYVSazSTwqadDASjteCdsUQEboTrrmQAAFY9KT-nLKUg21oo8N3QPdibcx
+_Xfue-UAGcQewdi2KkZBfAPmbOsv0-7QCdsLL5fZvbPBfZzL0jEzYa9Fr32w9y5_JgKe0ffNfHhWalUqZR-jIlRszlBjI1Pt8eq1DYhx6iUJhJKh1I7d8oJZ
+xzgpgUWsZFhYRLb49I8Bj6q9ZyeMCLf7gF-WpgIKLFhek5TgeAo5DDSYOJDIzfSMe7vajeGc2piiZqQsrlxXbiOntb_ms_8eDBMmm-8GGkHZnNk4C8_eYAmZ
+XvCrxB1QwBbIg8l8uzfHvnffZ_h-hn-MZ5ME5UJzMxAlozah4aP3GhINLTVQAol3OGNXcOwLX7c5QLnvlbgh8Zuo2UkUZnLg4SvD42XqNhmjOO7t2gUPgH4G
+LlYnGXNHUPxHbyLpMGyoRHbz_u7H1dk5KXELIfzVMTAsf51NHTTJO_hH_li4
+}
+
+AzureEntityColoring(LogoDocker)
+!define LogoDocker(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoDocker, LogoDocker)
+!define LogoDocker(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoDocker, LogoDocker)
diff --git a/dist/ProductLogos/LogoDocker.svg b/dist/ProductLogos/LogoDocker.svg
new file mode 100644
index 00000000..f126df43
--- /dev/null
+++ b/dist/ProductLogos/LogoDocker.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(22.352941%,30.196078%,32.941176%);fill-opacity:1;" d="M 51.828125 60.667969 C 53.402344 59.316406 54.976563 57.96875 56.546875 56.613281 C 57.082031 56.148438 57.671875 55.667969 58.203125 55.183594 C 57.777344 54.644531 57.0625 54.253906 56.457031 54.023438 C 55.234375 53.558594 54.027344 53.714844 52.90625 54.363281 C 51.4375 55.210938 50.8125 56.5625 50.867188 58.242188 C 50.886719 58.90625 51.066406 59.542969 51.417969 60.105469 C 51.539063 60.304688 51.679688 60.488281 51.828125 60.667969 M 53.648438 61.945313 C 54.421875 62.214844 55.300781 62.179688 56.09375 62.039063 C 56.5 61.867188 57.535156 61.414063 57.917969 61.480469 L 57.976563 61.492188 L 58.03125 61.519531 C 58.265625 61.632813 58.488281 61.792969 58.605469 62.027344 C 58.882813 62.582031 58.75 63.140625 58.203125 63.453125 L 58.023438 63.558594 C 56.011719 64.722656 53.871094 64.5625 51.863281 63.476563 C 50.90625 62.957031 50.171875 62.1875 49.628906 61.25 L 49.503906 61.03125 C 48.210938 58.792969 48.386719 56.441406 49.84375 54.3125 C 50.34375 53.578125 51.003906 53.007813 51.773438 52.5625 L 52.0625 52.394531 C 53.957031 51.304688 55.988281 51.378906 57.9375 52.335938 C 58.980469 52.855469 59.832031 53.625 60.414063 54.636719 L 60.519531 54.820313 C 60.945313 55.554688 60.394531 56.195313 59.828125 56.632813 C 59.167969 57.140625 58.503906 57.753906 57.871094 58.296875 C 56.460938 59.511719 55.054688 60.730469 53.648438 61.945313 Z M 68.730469 51.769531 L 68.9375 51.769531 C 69.574219 51.769531 70 52.199219 70 52.832031 C 70 53.707031 69.160156 53.933594 68.433594 53.933594 C 67.480469 53.933594 66.570313 54.511719 65.914063 55.15625 C 65.097656 55.964844 64.738281 57 64.738281 58.136719 L 64.738281 63.273438 C 64.738281 63.859375 64.371094 64.332031 63.761719 64.332031 L 63.59375 64.332031 C 62.984375 64.332031 62.617188 63.859375 62.617188 63.273438 L 62.617188 57.839844 C 62.617188 55.753906 63.632813 54.054688 65.324219 52.859375 C 66.332031 52.144531 67.492188 51.769531 68.730469 51.769531 Z M 42.285156 55.414063 C 43.113281 54.589844 43.9375 53.765625 44.773438 52.953125 C 45.007813 52.726563 45.890625 51.769531 46.238281 51.769531 L 46.617188 51.769531 L 46.660156 51.777344 C 47.144531 51.878906 47.507813 52.1875 47.507813 52.707031 L 47.507813 52.914063 C 47.507813 53.269531 47.09375 53.683594 46.863281 53.925781 C 46.375 54.441406 45.863281 54.941406 45.363281 55.445313 L 42.800781 58.046875 C 43.902344 59.152344 45.007813 60.261719 46.101563 61.375 C 46.40625 61.683594 46.707031 61.992188 47.007813 62.304688 C 47.113281 62.417969 47.265625 62.554688 47.355469 62.707031 C 47.453125 62.851563 47.507813 63.015625 47.507813 63.1875 L 47.507813 63.40625 L 47.496094 63.457031 C 47.378906 63.941406 47.070313 64.332031 46.53125 64.332031 L 46.363281 64.332031 C 46.015625 64.332031 45.617188 63.933594 45.375 63.707031 C 44.882813 63.242188 44.402344 62.75 43.917969 62.273438 L 42.289063 60.675781 L 42.289063 63.230469 C 42.289063 63.816406 41.921875 64.289063 41.3125 64.289063 L 41.144531 64.289063 C 40.535156 64.289063 40.167969 63.816406 40.167969 63.230469 L 40.167969 48.832031 C 40.167969 48.242188 40.535156 47.769531 41.144531 47.769531 L 41.3125 47.769531 C 41.921875 47.769531 42.289063 48.242188 42.289063 48.832031 L 42.289063 55.414063 Z M 35.40625 53.976563 C 35.085938 53.828125 34.484375 53.777344 34.140625 53.765625 C 32.367188 53.699219 31.085938 54.695313 30.332031 56.261719 C 30.074219 56.800781 29.957031 57.371094 29.957031 57.96875 C 29.957031 59.785156 30.910156 61.058594 32.53125 61.832031 C 33.125 62.113281 33.890625 62.167969 34.535156 62.167969 C 35.105469 62.167969 35.910156 61.820313 36.417969 61.582031 L 36.503906 61.539063 L 36.898438 61.539063 L 36.941406 61.546875 C 37.421875 61.648438 37.789063 61.953125 37.789063 62.472656 L 37.789063 62.683594 C 37.789063 63.972656 35.425781 64.269531 34.527344 64.332031 C 31.347656 64.550781 28.96875 62.808594 28.0625 59.777344 C 27.90625 59.25 27.835938 58.726563 27.835938 58.179688 L 27.835938 57.757813 C 27.835938 55.457031 28.976563 53.636719 30.949219 52.464844 C 31.867188 51.917969 32.882813 51.644531 33.949219 51.644531 L 34.367188 51.644531 C 35.5 51.644531 36.542969 51.964844 37.472656 52.605469 L 37.550781 52.65625 L 37.601563 52.738281 C 37.699219 52.902344 37.789063 53.097656 37.789063 53.296875 L 37.789063 53.507813 C 37.789063 54.046875 37.382813 54.339844 36.894531 54.433594 L 36.851563 54.441406 L 36.726563 54.441406 C 36.410156 54.4375 35.6875 54.109375 35.40625 53.976563 Z M 16.0625 58.011719 C 16.0625 59.625 16.851563 60.808594 18.214844 61.644531 C 18.855469 62.035156 19.558594 62.210938 20.308594 62.210938 C 21.898438 62.210938 23.078125 61.402344 23.898438 60.058594 C 24.289063 59.417969 24.464844 58.714844 24.464844 57.96875 C 24.464844 56.46875 23.742188 55.324219 22.507813 54.492188 C 21.832031 54.039063 21.078125 53.808594 20.261719 53.808594 C 18.488281 53.808594 17.207031 54.707031 16.441406 56.300781 C 16.179688 56.839844 16.0625 57.414063 16.0625 58.011719 Z M 20.054688 51.683594 L 20.347656 51.683594 C 22.804688 51.683594 24.675781 52.878906 25.859375 55.023438 C 26.332031 55.882813 26.585938 56.816406 26.585938 57.800781 L 26.585938 58.21875 C 26.585938 60.519531 25.453125 62.351563 23.46875 63.515625 C 22.550781 64.054688 21.539063 64.332031 20.472656 64.332031 L 20.054688 64.332031 C 17.753906 64.332031 15.925781 63.195313 14.757813 61.214844 C 14.21875 60.296875 13.941406 59.285156 13.941406 58.21875 L 13.941406 57.800781 C 13.941406 55.5 15.082031 53.675781 17.054688 52.503906 C 17.972656 51.957031 18.988281 51.683594 20.054688 51.683594 Z M 2.171875 58.011719 C 2.171875 59.671875 2.976563 60.921875 4.429688 61.71875 C 5.019531 62.039063 5.660156 62.214844 6.332031 62.214844 C 7.960938 62.214844 9.171875 61.445313 10.003906 60.0625 C 10.390625 59.421875 10.574219 58.71875 10.574219 57.96875 C 10.574219 56.527344 9.890625 55.40625 8.730469 54.570313 C 8.027344 54.0625 7.234375 53.808594 6.371094 53.808594 C 4.59375 53.808594 3.316406 54.707031 2.546875 56.300781 C 2.289063 56.839844 2.171875 57.414063 2.171875 58.011719 Z M 10.574219 53.269531 L 10.574219 48.789063 C 10.574219 48.199219 10.941406 47.726563 11.550781 47.726563 L 11.71875 47.726563 C 12.328125 47.726563 12.695313 48.199219 12.695313 48.789063 L 12.695313 58.21875 C 12.695313 60.519531 11.558594 62.347656 9.578125 63.515625 C 8.660156 64.054688 7.644531 64.332031 6.582031 64.332031 L 6.160156 64.332031 C 3.859375 64.332031 2.03125 63.195313 0.863281 61.214844 C 0.324219 60.296875 0.046875 59.28125 0.046875 58.21875 L 0.046875 57.796875 C 0.046875 55.496094 1.183594 53.667969 3.164063 52.5 C 4.082031 51.957031 5.09375 51.683594 6.160156 51.683594 L 6.582031 51.683594 C 8.136719 51.683594 9.457031 52.289063 10.574219 53.269531 Z M 10.574219 53.269531 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(22.352941%,30.196078%,32.941176%);fill-opacity:1;" d="M 40.378906 18.15625 L 46.640625 18.15625 L 46.640625 24.554688 L 49.804688 24.554688 C 51.265625 24.554688 52.769531 24.296875 54.15625 23.828125 C 54.835938 23.59375 55.597656 23.273438 56.269531 22.871094 C 55.386719 21.71875 54.933594 20.261719 54.800781 18.824219 C 54.621094 16.871094 55.015625 14.332031 56.335938 12.800781 L 56.996094 12.039063 L 57.78125 12.671875 C 59.753906 14.257813 61.414063 16.472656 61.707031 19 C 64.082031 18.300781 66.875 18.464844 68.96875 19.675781 L 69.828125 20.171875 L 69.378906 21.054688 C 67.605469 24.511719 63.898438 25.585938 60.277344 25.394531 C 54.859375 38.894531 43.058594 45.285156 28.75 45.285156 C 21.359375 45.285156 14.578125 42.523438 10.714844 35.964844 L 10.652344 35.855469 L 10.089844 34.710938 C 8.785156 31.824219 8.351563 28.664063 8.644531 25.503906 L 8.734375 24.554688 L 14.085938 24.554688 L 14.085938 18.15625 L 20.347656 18.15625 L 20.347656 11.894531 L 32.867188 11.894531 L 32.867188 5.636719 L 40.378906 5.636719 Z M 40.378906 18.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,66.666667%,85.490196%);fill-opacity:1;" d="M 60.660156 20.523438 C 61.082031 17.261719 58.640625 14.699219 57.128906 13.484375 C 55.382813 15.5 55.109375 20.789063 57.847656 23.011719 C 56.320313 24.371094 53.101563 25.601563 49.804688 25.601563 L 9.683594 25.601563 C 9.363281 29.042969 9.96875 32.210938 11.347656 34.921875 L 11.804688 35.757813 C 12.09375 36.246094 12.40625 36.71875 12.75 37.175781 C 14.398438 37.28125 15.917969 37.320313 17.3125 37.289063 C 20.046875 37.226563 22.277344 36.902344 23.96875 36.320313 C 24.21875 36.230469 24.496094 36.363281 24.582031 36.617188 C 24.667969 36.867188 24.535156 37.140625 24.28125 37.230469 C 24.058594 37.308594 23.824219 37.378906 23.582031 37.449219 C 22.25 37.828125 20.820313 38.085938 18.980469 38.199219 C 19.089844 38.199219 18.867188 38.214844 18.863281 38.214844 C 18.800781 38.21875 18.722656 38.226563 18.660156 38.234375 C 17.933594 38.273438 17.152344 38.28125 16.351563 38.28125 C 15.476563 38.28125 14.617188 38.265625 13.652344 38.214844 L 13.628906 38.234375 C 16.972656 41.988281 22.195313 44.242188 28.75 44.242188 C 42.617188 44.242188 54.378906 38.09375 59.585938 24.296875 C 63.28125 24.675781 66.832031 23.734375 68.449219 20.578125 C 65.875 19.09375 62.566406 19.566406 60.660156 20.523438 Z M 60.660156 20.523438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117647%,72.156863%,92.156863%);fill-opacity:1;" d="M 60.660156 20.523438 C 61.082031 17.261719 58.640625 14.699219 57.128906 13.484375 C 55.382813 15.5 55.109375 20.789063 57.847656 23.011719 C 56.320313 24.371094 53.101563 25.601563 49.804688 25.601563 L 12.058594 25.601563 C 11.894531 30.871094 13.851563 34.871094 17.3125 37.289063 C 20.046875 37.226563 22.277344 36.902344 23.96875 36.320313 C 24.21875 36.230469 24.496094 36.363281 24.582031 36.617188 C 24.667969 36.867188 24.535156 37.140625 24.28125 37.230469 C 24.058594 37.308594 23.824219 37.378906 23.582031 37.449219 C 22.25 37.828125 20.699219 38.117188 18.855469 38.230469 C 18.855469 38.230469 18.8125 38.1875 18.8125 38.1875 C 23.53125 40.609375 30.371094 40.601563 38.21875 37.585938 C 47.015625 34.207031 55.199219 27.769531 60.914063 20.40625 C 60.824219 20.441406 60.742188 20.484375 60.660156 20.523438 Z M 60.660156 20.523438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,54.509804%,72.156863%);fill-opacity:1;" d="M 9.757813 29.78125 C 10.007813 31.621094 10.546875 33.347656 11.347656 34.921875 L 11.804688 35.753906 C 12.09375 36.246094 12.40625 36.71875 12.75 37.175781 C 14.398438 37.28125 15.921875 37.316406 17.3125 37.285156 C 20.046875 37.226563 22.277344 36.902344 23.96875 36.316406 C 24.21875 36.230469 24.496094 36.363281 24.582031 36.613281 C 24.667969 36.867188 24.535156 37.140625 24.28125 37.226563 C 24.058594 37.304688 23.824219 37.378906 23.582031 37.445313 C 22.25 37.828125 20.707031 38.097656 18.863281 38.214844 C 18.800781 38.21875 18.691406 38.21875 18.628906 38.222656 C 17.902344 38.261719 17.128906 38.289063 16.328125 38.289063 C 15.453125 38.289063 14.558594 38.269531 13.597656 38.222656 C 16.941406 41.980469 22.199219 44.238281 28.75 44.238281 C 40.621094 44.238281 50.949219 39.734375 56.945313 29.777344 L 9.757813 29.777344 Z M 9.757813 29.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1.176471%,60.784314%,77.647059%);fill-opacity:1;" d="M 12.421875 29.78125 C 13.128906 33.015625 14.835938 35.554688 17.3125 37.285156 C 20.046875 37.226563 22.277344 36.902344 23.964844 36.316406 C 24.21875 36.230469 24.492188 36.363281 24.578125 36.613281 C 24.667969 36.867188 24.535156 37.140625 24.28125 37.226563 C 24.054688 37.304688 23.824219 37.378906 23.582031 37.445313 C 23.582031 37.445313 23.582031 37.445313 23.578125 37.445313 C 22.246094 37.828125 20.671875 38.097656 18.828125 38.214844 C 23.546875 40.632813 30.371094 40.597656 38.214844 37.585938 C 42.960938 35.761719 47.527344 33.046875 51.625 29.78125 Z M 12.421875 29.78125 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,67.45098%,82.745098%);fill-opacity:1;" d="M 19.675781 19.652344 L 20.101563 19.652344 L 20.101563 24.171875 L 19.675781 24.171875 Z M 18.851563 19.652344 L 19.296875 19.652344 L 19.296875 24.171875 L 18.851563 24.171875 Z M 18.03125 19.652344 L 18.476563 19.652344 L 18.476563 24.171875 L 18.03125 24.171875 Z M 17.207031 19.652344 L 17.652344 19.652344 L 17.652344 24.171875 L 17.207031 24.171875 Z M 16.386719 19.652344 L 16.832031 19.652344 L 16.832031 24.171875 L 16.386719 24.171875 Z M 15.582031 19.652344 L 16.007813 19.652344 L 16.007813 24.171875 L 15.582031 24.171875 Z M 15.128906 19.199219 L 20.554688 19.199219 L 20.554688 24.625 L 15.128906 24.625 Z M 15.128906 19.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,67.45098%,82.745098%);fill-opacity:1;" d="M 25.933594 13.390625 L 26.363281 13.390625 L 26.363281 17.914063 L 25.933594 17.914063 Z M 25.113281 13.390625 L 25.558594 13.390625 L 25.558594 17.914063 L 25.113281 17.914063 Z M 24.289063 13.390625 L 24.734375 13.390625 L 24.734375 17.914063 L 24.289063 17.914063 Z M 23.46875 13.390625 L 23.914063 13.390625 L 23.914063 17.914063 L 23.46875 17.914063 Z M 22.644531 13.390625 L 23.089844 13.390625 L 23.089844 17.914063 L 22.644531 17.914063 Z M 21.839844 13.390625 L 22.269531 13.390625 L 22.269531 17.914063 L 21.839844 17.914063 Z M 21.390625 12.9375 L 26.816406 12.9375 L 26.816406 18.363281 L 21.390625 18.363281 Z M 21.390625 12.9375 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(12.54902%,76.078431%,93.72549%);fill-opacity:1;" d="M 25.933594 19.652344 L 26.363281 19.652344 L 26.363281 24.171875 L 25.933594 24.171875 Z M 25.113281 19.652344 L 25.558594 19.652344 L 25.558594 24.171875 L 25.113281 24.171875 Z M 24.289063 19.652344 L 24.734375 19.652344 L 24.734375 24.171875 L 24.289063 24.171875 Z M 23.46875 19.652344 L 23.914063 19.652344 L 23.914063 24.171875 L 23.46875 24.171875 Z M 22.644531 19.652344 L 23.089844 19.652344 L 23.089844 24.171875 L 22.644531 24.171875 Z M 21.839844 19.652344 L 22.269531 19.652344 L 22.269531 24.171875 L 21.839844 24.171875 Z M 21.390625 19.199219 L 26.816406 19.199219 L 26.816406 24.625 L 21.390625 24.625 Z M 21.390625 19.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,67.45098%,82.745098%);fill-opacity:1;" d="M 32.195313 19.652344 L 32.625 19.652344 L 32.625 24.171875 L 32.195313 24.171875 Z M 31.371094 19.652344 L 31.816406 19.652344 L 31.816406 24.171875 L 31.371094 24.171875 Z M 30.550781 19.652344 L 30.996094 19.652344 L 30.996094 24.171875 L 30.550781 24.171875 Z M 29.730469 19.652344 L 30.175781 19.652344 L 30.175781 24.171875 L 29.730469 24.171875 Z M 28.90625 19.652344 L 29.351563 19.652344 L 29.351563 24.171875 L 28.90625 24.171875 Z M 28.101563 19.652344 L 28.53125 19.652344 L 28.53125 24.171875 L 28.101563 24.171875 Z M 27.648438 19.199219 L 33.078125 19.199219 L 33.078125 24.625 L 27.648438 24.625 Z M 27.648438 19.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(12.54902%,76.078431%,93.72549%);fill-opacity:1;" d="M 32.195313 13.390625 L 32.625 13.390625 L 32.625 17.914063 L 32.195313 17.914063 Z M 31.371094 13.390625 L 31.816406 13.390625 L 31.816406 17.914063 L 31.371094 17.914063 Z M 30.550781 13.390625 L 30.996094 13.390625 L 30.996094 17.914063 L 30.550781 17.914063 Z M 29.730469 13.390625 L 30.175781 13.390625 L 30.175781 17.914063 L 29.730469 17.914063 Z M 28.90625 13.390625 L 29.351563 13.390625 L 29.351563 17.914063 L 28.90625 17.914063 Z M 28.101563 13.390625 L 28.53125 13.390625 L 28.53125 17.914063 L 28.101563 17.914063 Z M 27.648438 12.9375 L 33.078125 12.9375 L 33.078125 18.363281 L 27.648438 18.363281 Z M 27.648438 12.9375 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(12.54902%,76.078431%,93.72549%);fill-opacity:1;" d="M 38.457031 19.652344 L 38.882813 19.652344 L 38.882813 24.171875 L 38.457031 24.171875 Z M 37.632813 19.652344 L 38.078125 19.652344 L 38.078125 24.171875 L 37.632813 24.171875 Z M 36.8125 19.652344 L 37.257813 19.652344 L 37.257813 24.171875 L 36.8125 24.171875 Z M 35.988281 19.652344 L 36.433594 19.652344 L 36.433594 24.171875 L 35.988281 24.171875 Z M 35.167969 19.652344 L 35.613281 19.652344 L 35.613281 24.171875 L 35.167969 24.171875 Z M 34.363281 19.652344 L 34.789063 19.652344 L 34.789063 24.171875 L 34.363281 24.171875 Z M 33.910156 19.199219 L 39.335938 19.199219 L 39.335938 24.625 L 33.910156 24.625 Z M 33.910156 19.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,67.45098%,82.745098%);fill-opacity:1;" d="M 38.457031 13.390625 L 38.882813 13.390625 L 38.882813 17.914063 L 38.457031 17.914063 Z M 37.632813 13.390625 L 38.078125 13.390625 L 38.078125 17.914063 L 37.632813 17.914063 Z M 36.8125 13.390625 L 37.257813 13.390625 L 37.257813 17.914063 L 36.8125 17.914063 Z M 35.988281 13.390625 L 36.433594 13.390625 L 36.433594 17.914063 L 35.988281 17.914063 Z M 35.167969 13.390625 L 35.613281 13.390625 L 35.613281 17.914063 L 35.167969 17.914063 Z M 34.363281 13.390625 L 34.789063 13.390625 L 34.789063 17.914063 L 34.363281 17.914063 Z M 33.910156 12.9375 L 39.335938 12.9375 L 39.335938 18.363281 L 33.910156 18.363281 Z M 33.910156 12.9375 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(12.54902%,76.078431%,93.72549%);fill-opacity:1;" d="M 38.457031 7.132813 L 38.882813 7.132813 L 38.882813 11.652344 L 38.457031 11.652344 Z M 37.632813 7.132813 L 38.078125 7.132813 L 38.078125 11.652344 L 37.632813 11.652344 Z M 36.8125 7.132813 L 37.257813 7.132813 L 37.257813 11.652344 L 36.8125 11.652344 Z M 35.988281 7.132813 L 36.433594 7.132813 L 36.433594 11.652344 L 35.988281 11.652344 Z M 35.167969 7.132813 L 35.613281 7.132813 L 35.613281 11.652344 L 35.167969 11.652344 Z M 34.363281 7.132813 L 34.789063 7.132813 L 34.789063 11.652344 L 34.363281 11.652344 Z M 33.910156 6.679688 L 39.335938 6.679688 L 39.335938 12.105469 L 33.910156 12.105469 Z M 33.910156 6.679688 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,67.45098%,82.745098%);fill-opacity:1;" d="M 44.714844 19.652344 L 45.144531 19.652344 L 45.144531 24.171875 L 44.714844 24.171875 Z M 43.894531 19.652344 L 44.339844 19.652344 L 44.339844 24.171875 L 43.894531 24.171875 Z M 43.070313 19.652344 L 43.515625 19.652344 L 43.515625 24.171875 L 43.070313 24.171875 Z M 42.25 19.652344 L 42.695313 19.652344 L 42.695313 24.171875 L 42.25 24.171875 Z M 41.425781 19.652344 L 41.871094 19.652344 L 41.871094 24.171875 L 41.425781 24.171875 Z M 40.621094 19.652344 L 41.050781 19.652344 L 41.050781 24.171875 L 40.621094 24.171875 Z M 40.171875 19.199219 L 45.597656 19.199219 L 45.597656 24.625 L 40.171875 24.625 Z M 40.171875 19.199219 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(83.137255%,92.941176%,94.509804%);fill-opacity:1;" d="M 26.476563 33.421875 C 27.300781 33.421875 27.972656 34.09375 27.972656 34.917969 C 27.972656 35.746094 27.300781 36.414063 26.476563 36.414063 C 25.648438 36.414063 24.980469 35.746094 24.980469 34.917969 C 24.980469 34.09375 25.648438 33.421875 26.476563 33.421875 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(22.352941%,30.196078%,32.941176%);fill-opacity:1;" d="M 26.476563 33.847656 C 26.613281 33.847656 26.742188 33.871094 26.863281 33.917969 C 26.734375 33.996094 26.644531 34.136719 26.644531 34.296875 C 26.644531 34.539063 26.839844 34.734375 27.082031 34.734375 C 27.25 34.734375 27.390625 34.644531 27.464844 34.507813 C 27.519531 34.632813 27.546875 34.773438 27.546875 34.917969 C 27.546875 35.511719 27.066406 35.992188 26.476563 35.992188 C 25.882813 35.992188 25.402344 35.511719 25.402344 34.917969 C 25.402344 34.328125 25.882813 33.847656 26.476563 33.847656 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(22.352941%,30.196078%,32.941176%);fill-opacity:1;" d="M 0 30.320313 L 69.628906 30.320313 C 68.113281 29.933594 64.835938 29.414063 65.375 27.429688 C 62.617188 30.621094 55.96875 29.667969 54.292969 28.09375 C 52.421875 30.804688 41.546875 29.773438 40.789063 27.664063 C 38.445313 30.414063 31.1875 30.414063 28.84375 27.664063 C 28.085938 29.773438 17.207031 30.804688 15.339844 28.09375 C 13.664063 29.667969 7.015625 30.621094 4.257813 27.429688 C 4.796875 29.417969 1.515625 29.9375 0 30.320313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(74.901961%,85.882353%,87.843137%);fill-opacity:1;" d="M 30.453125 44.207031 C 26.746094 42.449219 24.710938 40.058594 23.582031 37.445313 C 22.203125 37.839844 20.546875 38.089844 18.625 38.199219 C 17.902344 38.238281 17.140625 38.261719 16.339844 38.261719 C 15.417969 38.261719 14.445313 38.234375 13.425781 38.179688 C 16.824219 41.578125 21.007813 44.191406 28.75 44.238281 C 29.320313 44.242188 29.890625 44.230469 30.453125 44.207031 Z M 30.453125 44.207031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(83.137255%,92.941176%,94.509804%);fill-opacity:1;" d="M 24.957031 39.855469 C 24.445313 39.160156 23.945313 38.285156 23.582031 37.445313 C 22.203125 37.839844 20.550781 38.089844 18.625 38.199219 C 19.945313 38.917969 21.835938 39.582031 24.957031 39.855469 Z M 24.957031 39.855469 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoHDInsight(m).png b/dist/ProductLogos/LogoHDInsight(m).png
new file mode 100644
index 00000000..20e2d9ee
Binary files /dev/null and b/dist/ProductLogos/LogoHDInsight(m).png differ
diff --git a/dist/ProductLogos/LogoHDInsight(m).svg b/dist/ProductLogos/LogoHDInsight(m).svg
new file mode 100644
index 00000000..2ac43f75
--- /dev/null
+++ b/dist/ProductLogos/LogoHDInsight(m).svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(147,209,255);fill-opacity:1;" d="M 24.078125 19.601563 L 19.179688 20.441406 L 14.839844 22.398438 L 11.058594 24.78125 L 7.421875 29.121094 L 5.460938 31.21875 L 3.5 31.921875 L 2.941406 30.660156 L 3.921875 29.398438 L 4.058594 27.578125 L 4.761719 27.578125 L 5.320313 28.140625 L 5.179688 26.320313 L 4.480469 25.761719 L 4.480469 25.058594 L 2.800781 26.039063 L 1.121094 27.859375 L 0.839844 29.539063 L 1.539063 30.941406 L 2.101563 33.179688 L 3.359375 33.738281 L 4.761719 33.738281 L 6.019531 32.898438 L 5.179688 37.238281 L 6.019531 42 L 5.039063 44.238281 L 2.101563 47.460938 L 2.519531 49.558594 L 4.058594 51.800781 L 6.71875 53.621094 L 8.261719 53.898438 L 9.800781 53.898438 L 8.820313 58.101563 L 12.460938 59.640625 L 17.078125 60.199219 L 18.621094 59.078125 L 18.761719 56.421875 L 20.578125 53.480469 L 20.71875 51.101563 L 24.921875 51.519531 L 28.839844 51.101563 L 24.921875 53.480469 L 25.621094 56.28125 L 28 60.199219 L 30.519531 61.179688 L 32.339844 60.480469 L 33.179688 58.800781 L 37.238281 55.71875 L 38.078125 56.421875 L 44.378906 56.699219 L 45.640625 55.578125 L 45.78125 53.761719 L 45.359375 53.058594 L 45.078125 48.160156 L 42.980469 43.960938 L 43.261719 42 L 44.519531 42.699219 L 48.160156 46.058594 L 49.839844 46.199219 L 51.800781 45.359375 L 53.761719 43.960938 L 54.738281 40.738281 L 60.339844 41.160156 L 63.839844 39.761719 L 66.640625 37.238281 L 68.601563 33.460938 L 69.160156 28.980469 L 68.738281 23.941406 L 67.621094 19.320313 L 66.5 17.78125 L 64.960938 17.359375 L 62.300781 20.300781 L 59.921875 21.140625 L 57.820313 17.640625 L 55.71875 15.679688 L 54.460938 14.980469 L 49.980469 11.058594 L 46.199219 9.101563 L 42.558594 8.820313 L 38.21875 9.519531 L 34.441406 10.921875 L 31.921875 13.019531 L 29.820313 15.539063 L 27.71875 16.101563 Z M 24.078125 19.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 5.179688 29.121094 L 5.738281 29.820313 L 5.878906 28.980469 L 5.460938 28.980469 Z M 5.179688 29.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 69.578125 23.660156 C 69.300781 21.558594 68.738281 19.460938 67.898438 18.058594 C 67.761719 17.921875 67.621094 17.640625 67.480469 17.5 C 67.058594 17.078125 66.5 16.800781 65.941406 16.519531 C 65.378906 16.238281 64.679688 16.238281 64.121094 16.519531 C 63.980469 16.660156 63.839844 16.660156 63.699219 16.800781 C 63.421875 17.078125 63.140625 17.5 62.859375 17.921875 C 62.578125 18.339844 62.160156 18.898438 61.878906 19.179688 C 61.460938 19.601563 60.898438 19.738281 60.339844 20.019531 C 60.058594 19.460938 59.921875 18.898438 59.5 18.480469 C 59.078125 17.921875 58.800781 17.359375 58.238281 16.800781 C 57.820313 16.378906 57.539063 16.101563 57.121094 15.679688 C 56.699219 15.398438 56.28125 15.121094 55.859375 14.839844 C 54.601563 14 53.621094 13.160156 52.5 12.179688 C 52.078125 11.761719 51.519531 11.339844 51.101563 10.921875 C 48.578125 8.820313 46.199219 7.839844 43.679688 7.699219 C 41.160156 7.558594 38.5 8.261719 35.28125 9.519531 C 33.738281 10.21875 32.621094 10.921875 31.640625 11.761719 C 30.660156 12.601563 29.960938 13.578125 28.980469 14.839844 C 28.421875 14.839844 28 14.980469 27.578125 15.121094 C 27.019531 15.261719 26.601563 15.679688 25.898438 16.238281 C 25.480469 16.660156 25.058594 17.078125 24.640625 17.359375 C 24.21875 17.78125 23.941406 18.058594 23.519531 18.480469 C 20.578125 18.898438 18.339844 19.460938 16.238281 20.300781 C 14.140625 21.140625 12.179688 22.261719 10.21875 23.941406 C 9.378906 24.640625 8.679688 25.339844 8.121094 26.179688 C 7.558594 27.019531 7 27.71875 6.578125 28.558594 C 6.160156 28.980469 5.738281 29.398438 5.320313 29.820313 C 4.898438 30.238281 4.480469 30.519531 3.921875 30.660156 C 3.640625 30.800781 3.5 30.800781 3.5 30.800781 C 3.5 30.800781 3.5 30.660156 3.5 30.660156 C 4.199219 29.960938 4.339844 28.980469 4.339844 28 C 4.480469 28.140625 4.480469 28.28125 4.621094 28.421875 C 4.761719 28.558594 4.761719 28.699219 4.898438 28.839844 L 5.179688 28.558594 L 5.601563 28.699219 C 5.738281 28 5.878906 27.300781 5.738281 26.460938 C 5.601563 26.039063 5.460938 25.621094 5.039063 25.339844 C 5.039063 25.199219 5.179688 25.199219 5.179688 25.058594 C 5.320313 24.78125 5.460938 24.5 5.460938 24.078125 L 5.179688 23.941406 L 5.460938 24.078125 L 5.878906 23.800781 L 5.320313 23.941406 C 4.480469 24.078125 2.800781 25.058594 1.539063 26.320313 C 1.121094 26.738281 0.699219 27.300781 0.421875 27.859375 C 0 28.558594 0 29.121094 0 29.679688 C 0.140625 30.238281 0.421875 30.660156 0.839844 31.21875 C 0.980469 31.640625 0.980469 31.921875 1.121094 32.199219 C 1.261719 32.480469 1.398438 32.761719 1.398438 33.039063 C 1.820313 33.738281 2.378906 34.300781 2.941406 34.441406 C 3.5 34.578125 4.058594 34.578125 4.621094 34.441406 C 4.480469 35.140625 4.480469 35.839844 4.339844 36.539063 C 4.339844 37.519531 4.339844 38.640625 4.480469 39.898438 C 4.480469 40.179688 4.480469 40.460938 4.621094 40.738281 C 4.621094 41.019531 4.761719 41.300781 4.761719 41.578125 C 4.621094 41.859375 4.480469 42.140625 4.480469 42.421875 C 4.339844 42.839844 4.199219 43.398438 3.921875 43.820313 C 3.5 44.238281 3.21875 44.519531 2.800781 44.941406 C 2.519531 45.21875 2.101563 45.640625 1.820313 45.921875 C 1.820313 45.921875 1.679688 46.058594 1.539063 46.199219 C 0.839844 46.898438 0.699219 47.039063 0.839844 48.160156 C 0.980469 48.859375 1.261719 49.558594 1.539063 50.398438 C 1.820313 51.101563 2.378906 51.660156 2.941406 52.359375 C 3.921875 53.199219 5.179688 54.039063 6.441406 54.601563 C 7.140625 54.878906 7.980469 55.019531 8.679688 54.878906 C 8.679688 55.019531 8.679688 55.160156 8.539063 55.160156 C 8.398438 55.441406 8.261719 55.71875 8.121094 56.140625 C 7.28125 58.101563 8.121094 59.078125 9.519531 59.640625 C 10.21875 59.921875 11.058594 60.199219 11.761719 60.339844 C 11.898438 60.339844 12.039063 60.480469 12.320313 60.480469 C 13.160156 60.761719 14.839844 61.179688 16.238281 61.320313 C 17.78125 61.460938 19.179688 61.039063 19.601563 59.640625 C 19.738281 59.078125 19.878906 58.660156 19.878906 58.238281 C 19.878906 57.820313 19.878906 57.398438 19.878906 56.980469 C 20.300781 56 20.578125 55.71875 20.859375 55.300781 C 20.859375 55.160156 21 55.160156 21 55.019531 C 21.28125 54.460938 21.558594 54.179688 21.558594 53.761719 C 21.558594 53.339844 21.558594 52.921875 21.558594 52.359375 C 21.558594 52.359375 21.558594 52.21875 21.558594 52.078125 C 22.398438 52.21875 23.378906 52.21875 24.21875 52.21875 C 24.640625 52.21875 25.058594 52.21875 25.621094 52.21875 C 25.480469 52.21875 25.339844 52.359375 25.199219 52.359375 C 25.199219 52.359375 25.058594 52.359375 25.058594 52.5 C 23.800781 53.058594 23.800781 54.320313 24.21875 55.441406 C 24.5 56.558594 25.199219 57.679688 25.761719 58.238281 C 26.738281 59.640625 27.578125 60.898438 28.558594 61.460938 C 29.679688 62.160156 30.941406 62.160156 32.621094 61.320313 C 33.460938 60.898438 33.738281 60.339844 34.019531 59.78125 C 34.160156 59.640625 34.300781 59.359375 34.441406 59.21875 C 34.71875 58.941406 35.558594 58.238281 36.539063 57.539063 C 36.820313 57.261719 37.101563 57.121094 37.519531 56.839844 C 37.800781 56.980469 37.941406 57.121094 38.359375 57.261719 C 38.78125 57.398438 39.339844 57.398438 39.898438 57.398438 C 40.320313 57.398438 41.859375 57.398438 42.839844 57.398438 C 43.121094 57.398438 43.398438 57.398438 43.539063 57.398438 C 44.519531 57.398438 45.359375 57.398438 45.921875 56.980469 C 46.621094 56.558594 46.898438 56 47.039063 54.878906 C 47.039063 54.320313 47.039063 54.039063 47.039063 53.761719 C 47.039063 53.480469 46.898438 53.199219 46.621094 52.78125 C 46.621094 52.21875 46.621094 51.800781 46.621094 51.238281 C 46.621094 50.679688 46.621094 50.121094 46.621094 49.699219 C 46.621094 49.140625 46.480469 48.578125 46.339844 48.019531 C 46.199219 47.460938 46.058594 47.039063 45.78125 46.480469 C 45.640625 46.058594 45.5 45.78125 45.359375 45.359375 L 45.078125 45.5 L 45.359375 45.359375 C 45.21875 44.800781 44.941406 44.238281 44.660156 43.679688 C 44.660156 43.539063 44.660156 43.398438 44.660156 43.261719 C 44.800781 43.398438 45.078125 43.679688 45.21875 43.820313 L 46.058594 44.660156 C 46.621094 45.21875 47.179688 45.78125 47.878906 46.199219 C 48.578125 46.621094 49.28125 46.898438 50.261719 46.761719 C 51.238281 46.761719 52.359375 46.339844 53.339844 45.640625 C 54.179688 44.941406 54.878906 44.101563 55.300781 43.121094 C 55.441406 42.839844 55.441406 42.558594 55.578125 42.28125 C 55.578125 42 55.71875 41.859375 55.71875 41.578125 C 57.121094 41.859375 58.800781 41.859375 60.199219 41.71875 C 61.601563 41.578125 63.140625 41.160156 64.261719 40.601563 C 66.078125 39.621094 67.339844 38.21875 68.320313 36.539063 C 69.441406 34.71875 70 32.480469 70.28125 30.238281 C 70.140625 28.558594 70 26.039063 69.578125 23.660156 Z M 48.578125 40.601563 C 48.160156 42 47.460938 44.378906 49.421875 44.800781 C 50.121094 44.941406 50.539063 44.941406 51.519531 44.378906 C 50.679688 44.519531 50.261719 44.519531 49.699219 44.378906 C 49.140625 44.238281 48.859375 43.960938 48.71875 43.539063 C 48.859375 43.679688 49.140625 43.679688 49.699219 43.820313 C 51.101563 44.101563 52.5 43.539063 52.78125 42.421875 C 52.921875 41.859375 52.921875 41.578125 53.199219 40.738281 C 53.480469 40.878906 53.761719 40.878906 54.179688 41.019531 C 54.039063 41.578125 53.761719 42.140625 53.621094 42.839844 C 53.199219 44.378906 51.378906 45.640625 49.699219 45.5 C 48.160156 45.5 47.320313 44.519531 46.199219 43.679688 C 45.5 43.121094 44.800781 42.421875 44.101563 41.859375 C 42.28125 41.300781 40.738281 40.601563 39.058594 39.339844 C 40.320313 40.738281 41.160156 41.578125 42.839844 42.28125 C 42.558594 44.800781 41.71875 46.621094 41.019531 49 C 40.738281 50.121094 38.078125 54.460938 37.238281 54.878906 C 36.679688 55.160156 33.460938 57.960938 32.761719 58.378906 C 32.339844 58.941406 31.921875 59.78125 31.21875 60.199219 C 29.121094 61.320313 27.71875 59.21875 26.601563 57.398438 C 26.039063 56.558594 24.640625 54.179688 25.898438 53.480469 C 27.019531 52.921875 27.71875 52.359375 28.980469 51.660156 C 29.121094 51.941406 29.398438 52.359375 29.679688 52.640625 C 29.679688 52.21875 29.539063 51.941406 29.539063 51.519531 C 29.398438 50.820313 29.398438 50.398438 29.539063 49.699219 C 29.539063 49.140625 29.679688 48.441406 29.679688 47.878906 C 29.539063 48.578125 29.121094 49.140625 28.980469 49.839844 C 28.839844 50.121094 28.839844 50.261719 28.839844 50.539063 C 26.179688 51.101563 23.378906 51.101563 20.71875 50.679688 C 20.578125 49.699219 20.300781 48.578125 20.160156 47.878906 C 20.160156 48.71875 20.160156 51.101563 20.160156 52.359375 C 20.160156 53.339844 20.160156 53.761719 19.601563 54.601563 C 19.179688 55.441406 18.898438 55.578125 18.199219 56.980469 C 18.199219 57.820313 18.199219 58.378906 18.058594 59.21875 C 17.640625 60.621094 13.859375 59.5 12.878906 59.21875 C 11.621094 58.941406 9.101563 58.378906 9.660156 56.699219 C 10.21875 55.300781 10.640625 53.761719 10.921875 51.660156 C 8.679688 48.441406 6.578125 43.960938 6.160156 39.898438 C 5.878906 36.820313 6.019531 34.859375 6.71875 33.039063 C 7.839844 30.101563 9.238281 27.441406 11.621094 25.339844 C 14.839844 22.539063 17.78125 21.421875 22.539063 20.71875 C 21.421875 21.980469 20.300781 23.378906 19.039063 24.78125 C 17.78125 26.179688 17.078125 27.71875 16.238281 29.261719 C 15.121094 31.5 15.121094 32.339844 16.660156 34.160156 C 17.921875 35.839844 18.621094 36.539063 19.039063 38.21875 C 18.621094 39.199219 18.480469 39.898438 18.339844 41.160156 C 19.878906 42.839844 21 43.960938 22.398438 44.238281 C 23.800781 44.519531 25.058594 44.519531 26.320313 43.820313 C 29.121094 42.421875 31.78125 40.460938 35 40.320313 C 36.539063 36.679688 36.398438 33.601563 35.558594 29.960938 C 35.140625 27.578125 34.859375 25.199219 34.71875 22.820313 C 34.160156 25.339844 34.019531 27.578125 34.441406 30.101563 C 35 33.179688 35.421875 36.539063 33.878906 39.199219 C 30.941406 39.480469 28.421875 41.160156 25.761719 42.558594 C 24.640625 43.121094 23.660156 43.121094 22.398438 42.839844 C 21.558594 42.699219 20.859375 42 19.601563 40.601563 C 19.601563 39.199219 19.878906 38.640625 20.441406 37.378906 C 21.421875 35.421875 22.539063 33.601563 23.800781 31.640625 C 22.398438 33.460938 21 35 19.878906 36.679688 C 19.460938 35.421875 18.761719 34.71875 17.78125 33.320313 C 16.800781 31.921875 16.660156 31.359375 17.359375 29.679688 C 18.199219 28 18.761719 26.601563 20.160156 25.199219 C 22.398438 22.679688 24.5 20.019531 27.019531 17.5 C 28.421875 16.238281 28.980469 16.238281 30.660156 15.960938 C 32.339844 15.679688 33.878906 15.398438 35.558594 14.980469 C 33.878906 15.261719 32.339844 15.398438 30.800781 15.398438 C 32.339844 13.441406 33.179688 12.320313 35.699219 11.199219 C 41.859375 8.539063 45.78125 8.261719 50.539063 12.320313 C 51.800781 13.441406 52.921875 14.421875 54.179688 15.261719 C 53.761719 15.261719 53.339844 15.398438 52.78125 15.539063 C 53.480469 15.398438 54.179688 15.539063 54.878906 15.679688 C 55.019531 15.820313 55.300781 15.960938 55.441406 16.101563 C 56.28125 16.660156 56.839844 16.941406 57.398438 17.78125 C 58.101563 18.621094 58.519531 19.601563 59.078125 20.578125 C 58.800781 20.441406 58.519531 20.441406 58.238281 20.300781 C 58.101563 20.160156 57.820313 20.160156 57.679688 20.160156 C 57.261719 20.160156 56.980469 20.160156 56.558594 20.441406 C 56 20.71875 55.300781 21 54.738281 21 C 55.019531 21.140625 55.578125 21.140625 55.859375 21 C 55.859375 21 56 21 56 21 C 55.859375 21.140625 55.859375 21.421875 55.71875 21.699219 C 55.71875 21.980469 55.71875 22.398438 55.859375 22.679688 C 55.859375 22.820313 56 22.820313 56 22.960938 C 55.71875 23.101563 55.578125 23.101563 55.300781 23.238281 C 56.421875 23.101563 57.539063 23.101563 58.660156 23.238281 C 58.800781 23.660156 58.800781 23.941406 58.941406 24.359375 C 58.800781 24.359375 58.660156 24.359375 58.519531 24.359375 C 57.960938 23.941406 57.398438 23.941406 56.558594 24.21875 C 54.179688 24.78125 54.738281 26.179688 53.621094 28.28125 C 54.738281 26.878906 54.738281 25.339844 56.558594 24.921875 C 56.980469 24.78125 57.261719 24.640625 57.539063 24.78125 C 56.980469 25.058594 56.558594 25.480469 56.28125 26.039063 C 55.71875 27.578125 56.140625 28.699219 55.441406 30.101563 C 56.140625 28.839844 56.140625 27.71875 56.839844 26.320313 C 57.121094 25.898438 57.960938 25.058594 58.378906 25.058594 C 58.519531 25.058594 58.660156 25.058594 58.800781 25.058594 C 58.941406 25.898438 58.941406 26.738281 58.941406 27.300781 C 58.800781 28.558594 58.519531 30.378906 58.378906 31.078125 C 59.078125 30.238281 59.359375 28.558594 59.640625 27.300781 C 59.921875 26.039063 59.921875 24.5 59.640625 23.101563 C 59.21875 21.140625 61.179688 21.558594 62.300781 20.578125 C 63.140625 19.878906 63.699219 18.898438 64.398438 18.199219 C 65.101563 17.5 66.359375 18.480469 66.640625 19.320313 C 67.898438 22.398438 68.460938 27.300781 68.179688 30.519531 C 67.761719 34.019531 66.078125 37.941406 63 39.621094 C 59.078125 41.859375 54.320313 40.460938 50.398438 39.199219 C 49.558594 38.921875 49 38.5 48.300781 38.078125 C 48.71875 38.78125 48.859375 39.761719 48.578125 40.601563 Z M 45.078125 54.738281 C 44.941406 56.140625 44.519531 56.28125 43.121094 56.28125 C 42.558594 56.28125 40.179688 56.28125 39.621094 56.140625 C 38.78125 56 38.359375 56 38.078125 55.859375 C 39.339844 54.878906 41.578125 50.960938 42 49.558594 C 42.421875 48.160156 42.980469 46.898438 43.261719 45.5 C 43.398438 46.058594 43.539063 46.621094 43.820313 47.179688 C 44.238281 48.160156 44.378906 48.71875 44.519531 49.839844 C 44.519531 50.960938 44.519531 52.078125 44.660156 53.199219 C 45.078125 53.898438 45.078125 54.039063 45.078125 54.738281 Z M 4.199219 25.621094 C 3.921875 26.039063 3.78125 26.460938 3.78125 26.738281 C 3.359375 28.28125 3.921875 29.679688 2.519531 30.800781 C 3.21875 32.058594 3.078125 32.621094 4.621094 32.058594 C 5.179688 31.78125 5.738281 31.5 6.160156 31.078125 C 6.019531 31.640625 5.738281 32.199219 5.601563 32.761719 C 5.601563 32.898438 5.601563 32.898438 5.460938 33.039063 C 4.339844 33.460938 2.941406 33.738281 2.378906 32.621094 C 2.101563 32.058594 1.960938 31.5 1.820313 30.800781 C 0 28.980469 2.660156 26.460938 4.199219 25.621094 Z M 4.339844 27.300781 C 4.339844 27.160156 4.339844 26.878906 4.480469 26.738281 C 4.480469 26.601563 4.480469 26.601563 4.621094 26.460938 C 5.039063 26.738281 5.039063 27.019531 5.179688 27.578125 C 4.898438 27.300781 4.621094 27.160156 4.339844 27.300781 Z M 5.738281 43.679688 C 6.578125 46.480469 7.980469 49.421875 9.519531 51.800781 C 9.378906 52.21875 9.238281 52.640625 9.101563 52.921875 C 7.980469 54.460938 5.179688 52.21875 4.339844 51.378906 C 3.359375 50.398438 2.800781 49.28125 2.660156 48.300781 C 2.519531 47.601563 2.660156 47.601563 3.21875 47.039063 C 3.921875 46.339844 4.621094 45.640625 5.320313 44.941406 C 5.460938 44.519531 5.601563 44.101563 5.738281 43.679688 Z M 59.078125 20.578125 C 59.078125 20.71875 59.21875 20.859375 59.21875 21 C 59.21875 21 59.078125 21.140625 59.078125 21.140625 C 58.941406 21 58.800781 20.71875 58.660156 20.578125 C 58.800781 20.578125 58.941406 20.578125 59.078125 20.578125 Z M 7 29.121094 Z M 4.761719 25.761719 Z M 1.261719 31.078125 Z M 20.859375 51.660156 Z M 55.019531 41.300781 Z M 67.621094 36.539063 Z M 67.621094 36.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 62.578125 22.261719 C 64.539063 21.558594 65.519531 20.019531 65.941406 18.058594 C 65.101563 19.601563 63.980469 21 62.300781 21.699219 C 61.460938 22.121094 60.898438 21.980469 59.921875 21.839844 C 60.898438 22.261719 61.601563 22.539063 62.578125 22.261719 Z M 62.578125 22.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 51.378906 24.21875 C 50.820313 24.21875 50.121094 24.359375 49.28125 24.5 C 49.28125 24.21875 49.140625 24.078125 49.140625 23.800781 C 48.859375 23.238281 48.441406 22.820313 47.878906 22.679688 C 48.300781 22.398438 48.859375 22.121094 49.28125 21.839844 C 48.160156 22.398438 46.898438 22.261719 45.921875 22.820313 C 45.078125 23.378906 43.960938 25.199219 43.121094 25.898438 C 43.679688 25.621094 44.238281 25.199219 44.800781 24.78125 C 44.800781 25.058594 44.941406 25.480469 45.078125 25.761719 C 45.359375 26.179688 45.640625 26.601563 46.058594 26.738281 C 45.78125 27.160156 45.5 27.578125 45.359375 28.140625 C 46.898438 26.320313 49.140625 24.78125 51.378906 24.21875 Z M 51.378906 24.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 41.300781 22.121094 C 41.71875 20.441406 42.28125 18.898438 44.800781 17.78125 C 41.441406 18.621094 40.878906 20.019531 41.300781 22.121094 Z M 41.300781 22.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 46.761719 38.078125 C 46.621094 38.5 46.621094 39.199219 46.480469 39.621094 C 46.621094 39.058594 46.898438 38.359375 47.179688 37.941406 C 47.460938 37.378906 47.601563 37.378906 48.160156 37.101563 C 48.578125 36.960938 49.28125 36.539063 49.558594 36.398438 C 49.140625 36.398438 48.441406 36.679688 48.019531 36.679688 C 47.039063 36.820313 46.898438 37.101563 46.761719 38.078125 Z M 46.761719 38.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 28.839844 19.179688 C 27.578125 20.441406 26.460938 24.5 26.039063 26.179688 C 26.601563 24.78125 28.140625 21 29.261719 20.019531 C 29.539063 19.738281 29.820313 19.601563 30.101563 19.460938 C 29.261719 20.859375 29.398438 21.140625 29.679688 22.960938 C 29.960938 21.140625 30.519531 20.300781 31.640625 18.898438 C 32.761719 18.621094 33.878906 18.199219 35.140625 17.78125 C 33.738281 17.921875 32.480469 18.058594 31.078125 18.199219 C 29.820313 18.480469 29.539063 18.480469 28.839844 19.179688 Z M 28.839844 19.179688 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(237,247,255);fill-opacity:1;" d="M 45.5 26.320313 C 45.21875 25.898438 45.5 25.339844 45.921875 25.058594 C 46.339844 24.78125 46.898438 25.058594 47.179688 25.480469 C 47.179688 25.480469 47.179688 25.621094 47.179688 25.621094 C 46.761719 25.898438 46.339844 26.320313 45.921875 26.738281 C 45.78125 26.738281 45.5 26.601563 45.5 26.320313 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(237,247,255);fill-opacity:1;" d="M 55.859375 22.261719 C 55.859375 21.839844 56.28125 21.558594 56.558594 21.558594 C 56.980469 21.558594 57.261719 21.980469 57.261719 22.261719 C 57.261719 22.398438 57.261719 22.398438 57.261719 22.539063 C 56.839844 22.539063 56.558594 22.679688 56.140625 22.820313 C 56 22.820313 55.859375 22.539063 55.859375 22.261719 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoHDInsight.png b/dist/ProductLogos/LogoHDInsight.png
new file mode 100644
index 00000000..0cccb59d
Binary files /dev/null and b/dist/ProductLogos/LogoHDInsight.png differ
diff --git a/dist/ProductLogos/LogoHDInsight.puml b/dist/ProductLogos/LogoHDInsight.puml
new file mode 100644
index 00000000..e586561e
--- /dev/null
+++ b/dist/ProductLogos/LogoHDInsight.puml
@@ -0,0 +1,16 @@
+sprite $LogoHDInsight [70x70/16z] {
+xTPPTlGg30HWkai3IAZslzoRjdFCjNlufzTyBvdh22G2xUp7ZziTz_PFxXR5Xx3sjpJ9YkxkOtBgtsLCLXY-QNAqFpTONO35QzxQ7qgcu4pd_CDj3WQUo2nf
+Vy2PU462_RS7P1GvN4Lm9QD-SrKeXYlUa2Yq1t5fxqdHiH6y5FLebP8SxuTr2z6HgnuvLoOpMxlNqAIrPzAJNpgWLNtzrRNbHiLCTAdvLCGeVYaE0Ec9GzTp
+HaIIATqHn2M3P7RJ6G2ik-5W-3_DOgLfTC3fhIsT-xXB9huCKLneTy561oc-5IYCThZFFGE8AG34iL4SEbcAZPaNlbKznglhFXzJyT1horB1ncNjvvSq0I0Z
+emIxP6jQnADd3C63rnucrsqL2-IqVUWiVIfsWytAArgRJ6oa72TZxQlgmCQq6rAE59HPH1kSWaq4piPA5STEqO5SsnK3FJgENLFgDMMib5FZ0z-SD8ox5GTs
+6RZeWHS4qh5gwHfMBC56QRZmYPTKLygzZCpgHt622wNWis2RvcQK8yMkeoPKV3RPj7gViSxxrYiJB6NuICZMD9AELNy0Pi1IZe_wVewCYeFJ9F0dAPEwdsN1
+aZFrNB1XKS65CzjpYZBUzoWC5rh4Ibdgt9CnSH1JnObCMjiuzHIEHQpNMBCl48OB3dQ4DADXwRa2Ht660f0kHrl97Aw0g2SdsZUmO_7Z8XgieTX9x5lY_EB1
+MMHbHpiOuzp_lcLKTS5YJ046lsZDzYHPECVKdAmXbn6jL8mYkz7RbJCk9rbwH1US6IdJB5nrpXSXfHdufK7s-mpt_kB1O2o5b-1Nvc1jpv7fxUh6KW3LyGjA
+AKfxxSPSTz0tMPyi8p4usXkv_RrKVt4bEvRfsxbxmzdNNRRhsCd0mKfWdEsTkRSvr-1dpSoSnS1X3a0_fA3e04Qjb3JpoN9RvPLyJcctPBfNhfJHcdC83ahV
+J-BjyrkV76lKlRKviCZCFPxIFhbtskdr675wiyjt2jf7MUkyQ6jDAAizdADtzy7PFhgjVWJRbxMamL8VyT1lxRCgE_gyht7_XYJptdwNJCvX0c1csrZfLbcq
+Fu4-oPdht_6ORi6wjJzqKnzZDNEGQpb_xowdZ1y__WC
+}
+
+AzureEntityColoring(LogoHDInsight)
+!define LogoHDInsight(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoHDInsight, LogoHDInsight)
+!define LogoHDInsight(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoHDInsight, LogoHDInsight)
diff --git a/dist/ProductLogos/LogoHDInsight.svg b/dist/ProductLogos/LogoHDInsight.svg
new file mode 100644
index 00000000..b4f79645
--- /dev/null
+++ b/dist/ProductLogos/LogoHDInsight.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 24.078125 19.601563 L 19.179688 20.441406 L 14.839844 22.398438 L 11.058594 24.78125 L 7.421875 29.121094 L 5.460938 31.21875 L 3.5 31.921875 L 2.941406 30.660156 L 3.921875 29.398438 L 4.058594 27.578125 L 4.761719 27.578125 L 5.320313 28.140625 L 5.179688 26.320313 L 4.480469 25.761719 L 4.480469 25.058594 L 2.800781 26.039063 L 1.121094 27.859375 L 0.839844 29.539063 L 1.539063 30.941406 L 2.101563 33.179688 L 3.359375 33.738281 L 4.761719 33.738281 L 6.019531 32.898438 L 5.179688 37.238281 L 6.019531 42 L 5.039063 44.238281 L 2.101563 47.460938 L 2.519531 49.558594 L 4.058594 51.800781 L 6.71875 53.621094 L 8.261719 53.898438 L 9.800781 53.898438 L 8.820313 58.101563 L 12.460938 59.640625 L 17.078125 60.199219 L 18.621094 59.078125 L 18.761719 56.421875 L 20.578125 53.480469 L 20.71875 51.101563 L 24.921875 51.519531 L 28.839844 51.101563 L 24.921875 53.480469 L 25.621094 56.28125 L 28 60.199219 L 30.519531 61.179688 L 32.339844 60.480469 L 33.179688 58.800781 L 37.238281 55.71875 L 38.078125 56.421875 L 44.378906 56.699219 L 45.640625 55.578125 L 45.78125 53.761719 L 45.359375 53.058594 L 45.078125 48.160156 L 42.980469 43.960938 L 43.261719 42 L 44.519531 42.699219 L 48.160156 46.058594 L 49.839844 46.199219 L 51.800781 45.359375 L 53.761719 43.960938 L 54.738281 40.738281 L 60.339844 41.160156 L 63.839844 39.761719 L 66.640625 37.238281 L 68.601563 33.460938 L 69.160156 28.980469 L 68.738281 23.941406 L 67.621094 19.320313 L 66.5 17.78125 L 64.960938 17.359375 L 62.300781 20.300781 L 59.921875 21.140625 L 57.820313 17.640625 L 55.71875 15.679688 L 54.460938 14.980469 L 49.980469 11.058594 L 46.199219 9.101563 L 42.558594 8.820313 L 38.21875 9.519531 L 34.441406 10.921875 L 31.921875 13.019531 L 29.820313 15.539063 L 27.71875 16.101563 Z M 24.078125 19.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 5.179688 29.121094 L 5.738281 29.820313 L 5.878906 28.980469 L 5.460938 28.980469 Z M 5.179688 29.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 69.578125 23.660156 C 69.300781 21.558594 68.738281 19.460938 67.898438 18.058594 C 67.761719 17.921875 67.621094 17.640625 67.480469 17.5 C 67.058594 17.078125 66.5 16.800781 65.941406 16.519531 C 65.378906 16.238281 64.679688 16.238281 64.121094 16.519531 C 63.980469 16.660156 63.839844 16.660156 63.699219 16.800781 C 63.421875 17.078125 63.140625 17.5 62.859375 17.921875 C 62.578125 18.339844 62.160156 18.898438 61.878906 19.179688 C 61.460938 19.601563 60.898438 19.738281 60.339844 20.019531 C 60.058594 19.460938 59.921875 18.898438 59.5 18.480469 C 59.078125 17.921875 58.800781 17.359375 58.238281 16.800781 C 57.820313 16.378906 57.539063 16.101563 57.121094 15.679688 C 56.699219 15.398438 56.28125 15.121094 55.859375 14.839844 C 54.601563 14 53.621094 13.160156 52.5 12.179688 C 52.078125 11.761719 51.519531 11.339844 51.101563 10.921875 C 48.578125 8.820313 46.199219 7.839844 43.679688 7.699219 C 41.160156 7.558594 38.5 8.261719 35.28125 9.519531 C 33.738281 10.21875 32.621094 10.921875 31.640625 11.761719 C 30.660156 12.601563 29.960938 13.578125 28.980469 14.839844 C 28.421875 14.839844 28 14.980469 27.578125 15.121094 C 27.019531 15.261719 26.601563 15.679688 25.898438 16.238281 C 25.480469 16.660156 25.058594 17.078125 24.640625 17.359375 C 24.21875 17.78125 23.941406 18.058594 23.519531 18.480469 C 20.578125 18.898438 18.339844 19.460938 16.238281 20.300781 C 14.140625 21.140625 12.179688 22.261719 10.21875 23.941406 C 9.378906 24.640625 8.679688 25.339844 8.121094 26.179688 C 7.558594 27.019531 7 27.71875 6.578125 28.558594 C 6.160156 28.980469 5.738281 29.398438 5.320313 29.820313 C 4.898438 30.238281 4.480469 30.519531 3.921875 30.660156 C 3.640625 30.800781 3.5 30.800781 3.5 30.800781 C 3.5 30.800781 3.5 30.660156 3.5 30.660156 C 4.199219 29.960938 4.339844 28.980469 4.339844 28 C 4.480469 28.140625 4.480469 28.28125 4.621094 28.421875 C 4.761719 28.558594 4.761719 28.699219 4.898438 28.839844 L 5.179688 28.558594 L 5.601563 28.699219 C 5.738281 28 5.878906 27.300781 5.738281 26.460938 C 5.601563 26.039063 5.460938 25.621094 5.039063 25.339844 C 5.039063 25.199219 5.179688 25.199219 5.179688 25.058594 C 5.320313 24.78125 5.460938 24.5 5.460938 24.078125 L 5.179688 23.941406 L 5.460938 24.078125 L 5.878906 23.800781 L 5.320313 23.941406 C 4.480469 24.078125 2.800781 25.058594 1.539063 26.320313 C 1.121094 26.738281 0.699219 27.300781 0.421875 27.859375 C 0 28.558594 0 29.121094 0 29.679688 C 0.140625 30.238281 0.421875 30.660156 0.839844 31.21875 C 0.980469 31.640625 0.980469 31.921875 1.121094 32.199219 C 1.261719 32.480469 1.398438 32.761719 1.398438 33.039063 C 1.820313 33.738281 2.378906 34.300781 2.941406 34.441406 C 3.5 34.578125 4.058594 34.578125 4.621094 34.441406 C 4.480469 35.140625 4.480469 35.839844 4.339844 36.539063 C 4.339844 37.519531 4.339844 38.640625 4.480469 39.898438 C 4.480469 40.179688 4.480469 40.460938 4.621094 40.738281 C 4.621094 41.019531 4.761719 41.300781 4.761719 41.578125 C 4.621094 41.859375 4.480469 42.140625 4.480469 42.421875 C 4.339844 42.839844 4.199219 43.398438 3.921875 43.820313 C 3.5 44.238281 3.21875 44.519531 2.800781 44.941406 C 2.519531 45.21875 2.101563 45.640625 1.820313 45.921875 C 1.820313 45.921875 1.679688 46.058594 1.539063 46.199219 C 0.839844 46.898438 0.699219 47.039063 0.839844 48.160156 C 0.980469 48.859375 1.261719 49.558594 1.539063 50.398438 C 1.820313 51.101563 2.378906 51.660156 2.941406 52.359375 C 3.921875 53.199219 5.179688 54.039063 6.441406 54.601563 C 7.140625 54.878906 7.980469 55.019531 8.679688 54.878906 C 8.679688 55.019531 8.679688 55.160156 8.539063 55.160156 C 8.398438 55.441406 8.261719 55.71875 8.121094 56.140625 C 7.28125 58.101563 8.121094 59.078125 9.519531 59.640625 C 10.21875 59.921875 11.058594 60.199219 11.761719 60.339844 C 11.898438 60.339844 12.039063 60.480469 12.320313 60.480469 C 13.160156 60.761719 14.839844 61.179688 16.238281 61.320313 C 17.78125 61.460938 19.179688 61.039063 19.601563 59.640625 C 19.738281 59.078125 19.878906 58.660156 19.878906 58.238281 C 19.878906 57.820313 19.878906 57.398438 19.878906 56.980469 C 20.300781 56 20.578125 55.71875 20.859375 55.300781 C 20.859375 55.160156 21 55.160156 21 55.019531 C 21.28125 54.460938 21.558594 54.179688 21.558594 53.761719 C 21.558594 53.339844 21.558594 52.921875 21.558594 52.359375 C 21.558594 52.359375 21.558594 52.21875 21.558594 52.078125 C 22.398438 52.21875 23.378906 52.21875 24.21875 52.21875 C 24.640625 52.21875 25.058594 52.21875 25.621094 52.21875 C 25.480469 52.21875 25.339844 52.359375 25.199219 52.359375 C 25.199219 52.359375 25.058594 52.359375 25.058594 52.5 C 23.800781 53.058594 23.800781 54.320313 24.21875 55.441406 C 24.5 56.558594 25.199219 57.679688 25.761719 58.238281 C 26.738281 59.640625 27.578125 60.898438 28.558594 61.460938 C 29.679688 62.160156 30.941406 62.160156 32.621094 61.320313 C 33.460938 60.898438 33.738281 60.339844 34.019531 59.78125 C 34.160156 59.640625 34.300781 59.359375 34.441406 59.21875 C 34.71875 58.941406 35.558594 58.238281 36.539063 57.539063 C 36.820313 57.261719 37.101563 57.121094 37.519531 56.839844 C 37.800781 56.980469 37.941406 57.121094 38.359375 57.261719 C 38.78125 57.398438 39.339844 57.398438 39.898438 57.398438 C 40.320313 57.398438 41.859375 57.398438 42.839844 57.398438 C 43.121094 57.398438 43.398438 57.398438 43.539063 57.398438 C 44.519531 57.398438 45.359375 57.398438 45.921875 56.980469 C 46.621094 56.558594 46.898438 56 47.039063 54.878906 C 47.039063 54.320313 47.039063 54.039063 47.039063 53.761719 C 47.039063 53.480469 46.898438 53.199219 46.621094 52.78125 C 46.621094 52.21875 46.621094 51.800781 46.621094 51.238281 C 46.621094 50.679688 46.621094 50.121094 46.621094 49.699219 C 46.621094 49.140625 46.480469 48.578125 46.339844 48.019531 C 46.199219 47.460938 46.058594 47.039063 45.78125 46.480469 C 45.640625 46.058594 45.5 45.78125 45.359375 45.359375 L 45.078125 45.5 L 45.359375 45.359375 C 45.21875 44.800781 44.941406 44.238281 44.660156 43.679688 C 44.660156 43.539063 44.660156 43.398438 44.660156 43.261719 C 44.800781 43.398438 45.078125 43.679688 45.21875 43.820313 L 46.058594 44.660156 C 46.621094 45.21875 47.179688 45.78125 47.878906 46.199219 C 48.578125 46.621094 49.28125 46.898438 50.261719 46.761719 C 51.238281 46.761719 52.359375 46.339844 53.339844 45.640625 C 54.179688 44.941406 54.878906 44.101563 55.300781 43.121094 C 55.441406 42.839844 55.441406 42.558594 55.578125 42.28125 C 55.578125 42 55.71875 41.859375 55.71875 41.578125 C 57.121094 41.859375 58.800781 41.859375 60.199219 41.71875 C 61.601563 41.578125 63.140625 41.160156 64.261719 40.601563 C 66.078125 39.621094 67.339844 38.21875 68.320313 36.539063 C 69.441406 34.71875 70 32.480469 70.28125 30.238281 C 70.140625 28.558594 70 26.039063 69.578125 23.660156 Z M 48.578125 40.601563 C 48.160156 42 47.460938 44.378906 49.421875 44.800781 C 50.121094 44.941406 50.539063 44.941406 51.519531 44.378906 C 50.679688 44.519531 50.261719 44.519531 49.699219 44.378906 C 49.140625 44.238281 48.859375 43.960938 48.71875 43.539063 C 48.859375 43.679688 49.140625 43.679688 49.699219 43.820313 C 51.101563 44.101563 52.5 43.539063 52.78125 42.421875 C 52.921875 41.859375 52.921875 41.578125 53.199219 40.738281 C 53.480469 40.878906 53.761719 40.878906 54.179688 41.019531 C 54.039063 41.578125 53.761719 42.140625 53.621094 42.839844 C 53.199219 44.378906 51.378906 45.640625 49.699219 45.5 C 48.160156 45.5 47.320313 44.519531 46.199219 43.679688 C 45.5 43.121094 44.800781 42.421875 44.101563 41.859375 C 42.28125 41.300781 40.738281 40.601563 39.058594 39.339844 C 40.320313 40.738281 41.160156 41.578125 42.839844 42.28125 C 42.558594 44.800781 41.71875 46.621094 41.019531 49 C 40.738281 50.121094 38.078125 54.460938 37.238281 54.878906 C 36.679688 55.160156 33.460938 57.960938 32.761719 58.378906 C 32.339844 58.941406 31.921875 59.78125 31.21875 60.199219 C 29.121094 61.320313 27.71875 59.21875 26.601563 57.398438 C 26.039063 56.558594 24.640625 54.179688 25.898438 53.480469 C 27.019531 52.921875 27.71875 52.359375 28.980469 51.660156 C 29.121094 51.941406 29.398438 52.359375 29.679688 52.640625 C 29.679688 52.21875 29.539063 51.941406 29.539063 51.519531 C 29.398438 50.820313 29.398438 50.398438 29.539063 49.699219 C 29.539063 49.140625 29.679688 48.441406 29.679688 47.878906 C 29.539063 48.578125 29.121094 49.140625 28.980469 49.839844 C 28.839844 50.121094 28.839844 50.261719 28.839844 50.539063 C 26.179688 51.101563 23.378906 51.101563 20.71875 50.679688 C 20.578125 49.699219 20.300781 48.578125 20.160156 47.878906 C 20.160156 48.71875 20.160156 51.101563 20.160156 52.359375 C 20.160156 53.339844 20.160156 53.761719 19.601563 54.601563 C 19.179688 55.441406 18.898438 55.578125 18.199219 56.980469 C 18.199219 57.820313 18.199219 58.378906 18.058594 59.21875 C 17.640625 60.621094 13.859375 59.5 12.878906 59.21875 C 11.621094 58.941406 9.101563 58.378906 9.660156 56.699219 C 10.21875 55.300781 10.640625 53.761719 10.921875 51.660156 C 8.679688 48.441406 6.578125 43.960938 6.160156 39.898438 C 5.878906 36.820313 6.019531 34.859375 6.71875 33.039063 C 7.839844 30.101563 9.238281 27.441406 11.621094 25.339844 C 14.839844 22.539063 17.78125 21.421875 22.539063 20.71875 C 21.421875 21.980469 20.300781 23.378906 19.039063 24.78125 C 17.78125 26.179688 17.078125 27.71875 16.238281 29.261719 C 15.121094 31.5 15.121094 32.339844 16.660156 34.160156 C 17.921875 35.839844 18.621094 36.539063 19.039063 38.21875 C 18.621094 39.199219 18.480469 39.898438 18.339844 41.160156 C 19.878906 42.839844 21 43.960938 22.398438 44.238281 C 23.800781 44.519531 25.058594 44.519531 26.320313 43.820313 C 29.121094 42.421875 31.78125 40.460938 35 40.320313 C 36.539063 36.679688 36.398438 33.601563 35.558594 29.960938 C 35.140625 27.578125 34.859375 25.199219 34.71875 22.820313 C 34.160156 25.339844 34.019531 27.578125 34.441406 30.101563 C 35 33.179688 35.421875 36.539063 33.878906 39.199219 C 30.941406 39.480469 28.421875 41.160156 25.761719 42.558594 C 24.640625 43.121094 23.660156 43.121094 22.398438 42.839844 C 21.558594 42.699219 20.859375 42 19.601563 40.601563 C 19.601563 39.199219 19.878906 38.640625 20.441406 37.378906 C 21.421875 35.421875 22.539063 33.601563 23.800781 31.640625 C 22.398438 33.460938 21 35 19.878906 36.679688 C 19.460938 35.421875 18.761719 34.71875 17.78125 33.320313 C 16.800781 31.921875 16.660156 31.359375 17.359375 29.679688 C 18.199219 28 18.761719 26.601563 20.160156 25.199219 C 22.398438 22.679688 24.5 20.019531 27.019531 17.5 C 28.421875 16.238281 28.980469 16.238281 30.660156 15.960938 C 32.339844 15.679688 33.878906 15.398438 35.558594 14.980469 C 33.878906 15.261719 32.339844 15.398438 30.800781 15.398438 C 32.339844 13.441406 33.179688 12.320313 35.699219 11.199219 C 41.859375 8.539063 45.78125 8.261719 50.539063 12.320313 C 51.800781 13.441406 52.921875 14.421875 54.179688 15.261719 C 53.761719 15.261719 53.339844 15.398438 52.78125 15.539063 C 53.480469 15.398438 54.179688 15.539063 54.878906 15.679688 C 55.019531 15.820313 55.300781 15.960938 55.441406 16.101563 C 56.28125 16.660156 56.839844 16.941406 57.398438 17.78125 C 58.101563 18.621094 58.519531 19.601563 59.078125 20.578125 C 58.800781 20.441406 58.519531 20.441406 58.238281 20.300781 C 58.101563 20.160156 57.820313 20.160156 57.679688 20.160156 C 57.261719 20.160156 56.980469 20.160156 56.558594 20.441406 C 56 20.71875 55.300781 21 54.738281 21 C 55.019531 21.140625 55.578125 21.140625 55.859375 21 C 55.859375 21 56 21 56 21 C 55.859375 21.140625 55.859375 21.421875 55.71875 21.699219 C 55.71875 21.980469 55.71875 22.398438 55.859375 22.679688 C 55.859375 22.820313 56 22.820313 56 22.960938 C 55.71875 23.101563 55.578125 23.101563 55.300781 23.238281 C 56.421875 23.101563 57.539063 23.101563 58.660156 23.238281 C 58.800781 23.660156 58.800781 23.941406 58.941406 24.359375 C 58.800781 24.359375 58.660156 24.359375 58.519531 24.359375 C 57.960938 23.941406 57.398438 23.941406 56.558594 24.21875 C 54.179688 24.78125 54.738281 26.179688 53.621094 28.28125 C 54.738281 26.878906 54.738281 25.339844 56.558594 24.921875 C 56.980469 24.78125 57.261719 24.640625 57.539063 24.78125 C 56.980469 25.058594 56.558594 25.480469 56.28125 26.039063 C 55.71875 27.578125 56.140625 28.699219 55.441406 30.101563 C 56.140625 28.839844 56.140625 27.71875 56.839844 26.320313 C 57.121094 25.898438 57.960938 25.058594 58.378906 25.058594 C 58.519531 25.058594 58.660156 25.058594 58.800781 25.058594 C 58.941406 25.898438 58.941406 26.738281 58.941406 27.300781 C 58.800781 28.558594 58.519531 30.378906 58.378906 31.078125 C 59.078125 30.238281 59.359375 28.558594 59.640625 27.300781 C 59.921875 26.039063 59.921875 24.5 59.640625 23.101563 C 59.21875 21.140625 61.179688 21.558594 62.300781 20.578125 C 63.140625 19.878906 63.699219 18.898438 64.398438 18.199219 C 65.101563 17.5 66.359375 18.480469 66.640625 19.320313 C 67.898438 22.398438 68.460938 27.300781 68.179688 30.519531 C 67.761719 34.019531 66.078125 37.941406 63 39.621094 C 59.078125 41.859375 54.320313 40.460938 50.398438 39.199219 C 49.558594 38.921875 49 38.5 48.300781 38.078125 C 48.71875 38.78125 48.859375 39.761719 48.578125 40.601563 Z M 45.078125 54.738281 C 44.941406 56.140625 44.519531 56.28125 43.121094 56.28125 C 42.558594 56.28125 40.179688 56.28125 39.621094 56.140625 C 38.78125 56 38.359375 56 38.078125 55.859375 C 39.339844 54.878906 41.578125 50.960938 42 49.558594 C 42.421875 48.160156 42.980469 46.898438 43.261719 45.5 C 43.398438 46.058594 43.539063 46.621094 43.820313 47.179688 C 44.238281 48.160156 44.378906 48.71875 44.519531 49.839844 C 44.519531 50.960938 44.519531 52.078125 44.660156 53.199219 C 45.078125 53.898438 45.078125 54.039063 45.078125 54.738281 Z M 4.199219 25.621094 C 3.921875 26.039063 3.78125 26.460938 3.78125 26.738281 C 3.359375 28.28125 3.921875 29.679688 2.519531 30.800781 C 3.21875 32.058594 3.078125 32.621094 4.621094 32.058594 C 5.179688 31.78125 5.738281 31.5 6.160156 31.078125 C 6.019531 31.640625 5.738281 32.199219 5.601563 32.761719 C 5.601563 32.898438 5.601563 32.898438 5.460938 33.039063 C 4.339844 33.460938 2.941406 33.738281 2.378906 32.621094 C 2.101563 32.058594 1.960938 31.5 1.820313 30.800781 C 0 28.980469 2.660156 26.460938 4.199219 25.621094 Z M 4.339844 27.300781 C 4.339844 27.160156 4.339844 26.878906 4.480469 26.738281 C 4.480469 26.601563 4.480469 26.601563 4.621094 26.460938 C 5.039063 26.738281 5.039063 27.019531 5.179688 27.578125 C 4.898438 27.300781 4.621094 27.160156 4.339844 27.300781 Z M 5.738281 43.679688 C 6.578125 46.480469 7.980469 49.421875 9.519531 51.800781 C 9.378906 52.21875 9.238281 52.640625 9.101563 52.921875 C 7.980469 54.460938 5.179688 52.21875 4.339844 51.378906 C 3.359375 50.398438 2.800781 49.28125 2.660156 48.300781 C 2.519531 47.601563 2.660156 47.601563 3.21875 47.039063 C 3.921875 46.339844 4.621094 45.640625 5.320313 44.941406 C 5.460938 44.519531 5.601563 44.101563 5.738281 43.679688 Z M 59.078125 20.578125 C 59.078125 20.71875 59.21875 20.859375 59.21875 21 C 59.21875 21 59.078125 21.140625 59.078125 21.140625 C 58.941406 21 58.800781 20.71875 58.660156 20.578125 C 58.800781 20.578125 58.941406 20.578125 59.078125 20.578125 Z M 7 29.121094 Z M 4.761719 25.761719 Z M 1.261719 31.078125 Z M 20.859375 51.660156 Z M 55.019531 41.300781 Z M 67.621094 36.539063 Z M 67.621094 36.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 62.578125 22.261719 C 64.539063 21.558594 65.519531 20.019531 65.941406 18.058594 C 65.101563 19.601563 63.980469 21 62.300781 21.699219 C 61.460938 22.121094 60.898438 21.980469 59.921875 21.839844 C 60.898438 22.261719 61.601563 22.539063 62.578125 22.261719 Z M 62.578125 22.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 51.378906 24.21875 C 50.820313 24.21875 50.121094 24.359375 49.28125 24.5 C 49.28125 24.21875 49.140625 24.078125 49.140625 23.800781 C 48.859375 23.238281 48.441406 22.820313 47.878906 22.679688 C 48.300781 22.398438 48.859375 22.121094 49.28125 21.839844 C 48.160156 22.398438 46.898438 22.261719 45.921875 22.820313 C 45.078125 23.378906 43.960938 25.199219 43.121094 25.898438 C 43.679688 25.621094 44.238281 25.199219 44.800781 24.78125 C 44.800781 25.058594 44.941406 25.480469 45.078125 25.761719 C 45.359375 26.179688 45.640625 26.601563 46.058594 26.738281 C 45.78125 27.160156 45.5 27.578125 45.359375 28.140625 C 46.898438 26.320313 49.140625 24.78125 51.378906 24.21875 Z M 51.378906 24.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 41.300781 22.121094 C 41.71875 20.441406 42.28125 18.898438 44.800781 17.78125 C 41.441406 18.621094 40.878906 20.019531 41.300781 22.121094 Z M 41.300781 22.121094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 46.761719 38.078125 C 46.621094 38.5 46.621094 39.199219 46.480469 39.621094 C 46.621094 39.058594 46.898438 38.359375 47.179688 37.941406 C 47.460938 37.378906 47.601563 37.378906 48.160156 37.101563 C 48.578125 36.960938 49.28125 36.539063 49.558594 36.398438 C 49.140625 36.398438 48.441406 36.679688 48.019531 36.679688 C 47.039063 36.820313 46.898438 37.101563 46.761719 38.078125 Z M 46.761719 38.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 28.839844 19.179688 C 27.578125 20.441406 26.460938 24.5 26.039063 26.179688 C 26.601563 24.78125 28.140625 21 29.261719 20.019531 C 29.539063 19.738281 29.820313 19.601563 30.101563 19.460938 C 29.261719 20.859375 29.398438 21.140625 29.679688 22.960938 C 29.960938 21.140625 30.519531 20.300781 31.640625 18.898438 C 32.761719 18.621094 33.878906 18.199219 35.140625 17.78125 C 33.738281 17.921875 32.480469 18.058594 31.078125 18.199219 C 29.820313 18.480469 29.539063 18.480469 28.839844 19.179688 Z M 28.839844 19.179688 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,98.039216%,79.607843%);fill-opacity:1;" d="M 45.5 26.320313 C 45.21875 25.898438 45.5 25.339844 45.921875 25.058594 C 46.339844 24.78125 46.898438 25.058594 47.179688 25.480469 C 47.179688 25.480469 47.179688 25.621094 47.179688 25.621094 C 46.761719 25.898438 46.339844 26.320313 45.921875 26.738281 C 45.78125 26.738281 45.5 26.601563 45.5 26.320313 "/>
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(100%,98.039216%,79.607843%);fill-opacity:1;" d="M 55.859375 22.261719 C 55.859375 21.839844 56.28125 21.558594 56.558594 21.558594 C 56.980469 21.558594 57.261719 21.980469 57.261719 22.261719 C 57.261719 22.398438 57.261719 22.398438 57.261719 22.539063 C 56.839844 22.539063 56.558594 22.679688 56.140625 22.820313 C 56 22.820313 55.859375 22.539063 55.859375 22.261719 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoHockeyApp(m).png b/dist/ProductLogos/LogoHockeyApp(m).png
new file mode 100644
index 00000000..f33dc3c3
Binary files /dev/null and b/dist/ProductLogos/LogoHockeyApp(m).png differ
diff --git a/dist/ProductLogos/LogoHockeyApp(m).svg b/dist/ProductLogos/LogoHockeyApp(m).svg
new file mode 100644
index 00000000..a895a7f0
--- /dev/null
+++ b/dist/ProductLogos/LogoHockeyApp(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,134,234);fill-opacity:1;" d="M 63.566406 43.59375 C 63.789063 43.433594 64.09375 43.570313 64.136719 43.839844 C 64.164063 44 64.175781 44.160156 64.175781 44.324219 C 64.175781 48.863281 54.453125 55.050781 35.003906 55.050781 C 15.558594 55.050781 5.832031 48.863281 5.832031 44.324219 C 5.832031 44.164063 5.847656 44.003906 5.871094 43.84375 C 5.914063 43.574219 6.21875 43.441406 6.441406 43.597656 C 11.261719 47.027344 20.78125 49.949219 35 49.949219 C 49.230469 49.949219 58.75 47.023438 63.566406 43.59375 Z M 63.566406 43.59375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,134,234);fill-opacity:1;" d="M 35 41.199219 C 19.230469 41.199219 8.789063 37.679688 3.675781 33.609375 C 3.5 33.46875 3.234375 33.523438 3.132813 33.722656 C 2.867188 34.238281 2.734375 34.777344 2.734375 35.332031 C 2.734375 40.351563 13.492188 47.03125 35 47.03125 C 56.511719 47.03125 67.265625 40.351563 67.265625 35.332031 C 67.265625 34.777344 67.132813 34.238281 66.867188 33.722656 C 66.765625 33.523438 66.5 33.46875 66.324219 33.609375 C 61.210938 37.679688 50.773438 41.199219 35 41.199219 Z M 35 41.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,134,234);fill-opacity:1;" d="M 35 14.949219 C 11.667969 14.949219 0 19.003906 0 24.792969 C 0 30.578125 11.667969 38.28125 35 38.28125 C 58.335938 38.28125 70 30.578125 70 24.792969 C 70 19.003906 58.332031 14.949219 35 14.949219 Z M 35 30.988281 C 18.472656 30.988281 10.207031 26.773438 10.207031 23.878906 C 10.207031 20.988281 18.472656 19.324219 35 19.324219 C 51.527344 19.324219 59.792969 20.988281 59.792969 23.878906 C 59.792969 26.773438 51.527344 30.988281 35 30.988281 Z M 35 30.988281 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoHockeyApp.png b/dist/ProductLogos/LogoHockeyApp.png
new file mode 100644
index 00000000..d12ae78b
Binary files /dev/null and b/dist/ProductLogos/LogoHockeyApp.png differ
diff --git a/dist/ProductLogos/LogoHockeyApp.puml b/dist/ProductLogos/LogoHockeyApp.puml
new file mode 100644
index 00000000..89e3420a
--- /dev/null
+++ b/dist/ProductLogos/LogoHockeyApp.puml
@@ -0,0 +1,11 @@
+sprite $LogoHockeyApp [70x70/16z] {
+xTO7ikqu20JG9iF-5_oIxmZRvJoLlyy248LQ0LUyNgyNiQYQnuzi4U5cAiA4Ow8MMUV2JGWRI2pgbdHbB6ZK8sdTacMjPBYxcMapC_V8h1MVwd0ksnGw6xvQ
+r8m1a1f225Unrn3WRaDm2tL3rYK5TzMG_wDARbH9mZrMWzUGVBD8uvenmbMIrHnMSowuW9SvJGAYba8P1qWyQ-X9-DP9CsMczOMn2ErwLxHsvKVjybx6ww4E
+F07WU5H3CKnDaMNT4u8VCfNYqLTF_rme_JSBmm_gkW3hXKfXWZzazKFHEvrAysjeirQ6cp0-nEiFuHVbhCj6n2AY4v5LV6ICKJ7Xd3TBECCQDLWlcyk-JPbs
+tZjRpKqnOzjJ-66_t7rpKa5e3-CRWfNxiNF14fNslN69AqtxecWvZWITnYx3kDyaGRD5xC1Y7blFxdpp9AegCHSTksNmFeZGPhdbxOSkJHdjv8yYMF7LBwUN
+NrwPUVpqS6pTb_5dyyvKjCqwvzAmYpJh2cSSEWzCAECI4ZNVoeiAuuxEYuWm4n7-6Q_Nwni
+}
+
+AzureEntityColoring(LogoHockeyApp)
+!define LogoHockeyApp(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoHockeyApp, LogoHockeyApp)
+!define LogoHockeyApp(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoHockeyApp, LogoHockeyApp)
diff --git a/dist/ProductLogos/LogoHockeyApp.svg b/dist/ProductLogos/LogoHockeyApp.svg
new file mode 100644
index 00000000..77869673
--- /dev/null
+++ b/dist/ProductLogos/LogoHockeyApp.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,61.960784%,88.235294%);fill-opacity:1;" d="M 63.566406 43.59375 C 63.789063 43.433594 64.09375 43.570313 64.136719 43.839844 C 64.164063 44 64.175781 44.160156 64.175781 44.324219 C 64.175781 48.863281 54.453125 55.050781 35.003906 55.050781 C 15.558594 55.050781 5.832031 48.863281 5.832031 44.324219 C 5.832031 44.164063 5.847656 44.003906 5.871094 43.84375 C 5.914063 43.574219 6.21875 43.441406 6.441406 43.597656 C 11.261719 47.027344 20.78125 49.949219 35 49.949219 C 49.230469 49.949219 58.75 47.023438 63.566406 43.59375 Z M 63.566406 43.59375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,61.960784%,88.235294%);fill-opacity:1;" d="M 35 41.199219 C 19.230469 41.199219 8.789063 37.679688 3.675781 33.609375 C 3.5 33.46875 3.234375 33.523438 3.132813 33.722656 C 2.867188 34.238281 2.734375 34.777344 2.734375 35.332031 C 2.734375 40.351563 13.492188 47.03125 35 47.03125 C 56.511719 47.03125 67.265625 40.351563 67.265625 35.332031 C 67.265625 34.777344 67.132813 34.238281 66.867188 33.722656 C 66.765625 33.523438 66.5 33.46875 66.324219 33.609375 C 61.210938 37.679688 50.773438 41.199219 35 41.199219 Z M 35 41.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,61.960784%,88.235294%);fill-opacity:1;" d="M 35 14.949219 C 11.667969 14.949219 0 19.003906 0 24.792969 C 0 30.578125 11.667969 38.28125 35 38.28125 C 58.335938 38.28125 70 30.578125 70 24.792969 C 70 19.003906 58.332031 14.949219 35 14.949219 Z M 35 30.988281 C 18.472656 30.988281 10.207031 26.773438 10.207031 23.878906 C 10.207031 20.988281 18.472656 19.324219 35 19.324219 C 51.527344 19.324219 59.792969 20.988281 59.792969 23.878906 C 59.792969 26.773438 51.527344 30.988281 35 30.988281 Z M 35 30.988281 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoKubernete(m).png b/dist/ProductLogos/LogoKubernete(m).png
new file mode 100644
index 00000000..b20c4be7
Binary files /dev/null and b/dist/ProductLogos/LogoKubernete(m).png differ
diff --git a/dist/ProductLogos/LogoKubernete(m).svg b/dist/ProductLogos/LogoKubernete(m).svg
new file mode 100644
index 00000000..357fec84
--- /dev/null
+++ b/dist/ProductLogos/LogoKubernete(m).svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="67pt" viewBox="0 0 70 67" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,118,206);fill-opacity:1;" d="M 34.765625 -15.71875 C 34.164063 -15.6875 33.574219 -15.542969 33.03125 -15.285156 L 9.371094 -4.144531 C 8.132813 -3.558594 7.230469 -2.453125 6.925781 -1.144531 L 1.085938 23.886719 C 0.816406 25.054688 1.035156 26.277344 1.703125 27.277344 C 1.78125 27.402344 1.867188 27.519531 1.960938 27.632813 L 18.335938 47.703125 C 19.191406 48.753906 20.496094 49.367188 21.871094 49.367188 L 48.132813 49.359375 C 49.507813 49.359375 50.808594 48.75 51.667969 47.699219 L 68.039063 27.625 C 68.898438 26.574219 69.21875 25.195313 68.914063 23.882813 L 63.066406 -1.148438 C 62.761719 -2.460938 61.859375 -3.566406 60.617188 -4.148438 L 36.957031 -15.285156 C 36.273438 -15.609375 35.519531 -15.757813 34.765625 -15.71875 Z M 34.765625 -15.71875 "/>
+<path style="fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,255,255);stroke-opacity:1;stroke-miterlimit:4;" d="M 367.748944 274.077793 C 359.63979 274.077793 353.104054 281.321733 353.104054 290.325499 C 353.104054 290.448278 353.144398 290.571056 353.144398 290.734761 C 353.144398 291.921621 353.06371 293.394965 353.104054 294.459046 C 353.305775 299.656675 354.435408 303.585591 355.121257 308.373958 C 356.331578 318.564585 357.380524 327.03631 356.735019 334.894143 C 356.129858 337.881756 353.910935 340.582886 351.974421 342.465492 L 351.651669 348.64535 C 342.856666 349.382021 334.021319 350.69166 325.185972 352.697044 C 287.222222 361.332475 254.543542 380.895204 229.651263 407.29261 C 228.037501 406.187602 225.213418 404.182218 224.366193 403.568325 C 221.74383 403.895734 219.121466 404.714259 215.651878 402.708874 C 209.116142 398.32977 203.145223 392.231764 195.963982 384.905972 C 192.65577 381.386318 190.235127 378.071295 186.321754 374.67442 C 185.434185 373.937748 184.062488 372.873666 183.09423 372.096068 C 179.987739 369.640496 176.397118 368.371783 172.887186 368.249005 C 168.408996 368.0853 164.051839 369.845127 161.227756 373.405707 C 156.18475 379.708344 157.798511 389.366929 164.818376 394.97382 C 164.899064 395.014747 164.979752 395.055673 165.06044 395.137525 C 166.028698 395.915123 167.198675 396.897352 168.086244 397.552172 C 172.241681 400.621637 176.034022 402.21776 180.189459 404.673332 C 188.944118 410.075592 196.206046 414.536549 201.934901 419.938809 C 204.194168 422.312529 204.597609 426.527929 204.880017 428.369608 L 209.559927 432.544082 C 184.465928 470.318975 172.887186 516.974855 179.745674 564.490186 L 173.613379 566.290939 C 171.999617 568.378176 169.700006 571.652273 167.319707 572.634502 C 159.815714 575.008222 151.343464 575.867673 141.096075 576.931754 C 136.295133 577.341016 132.18004 577.095459 127.09669 578.077688 C 125.967057 578.282319 124.393639 578.691581 123.183317 578.978065 C 123.142973 578.978065 123.102629 578.978065 123.062285 578.978065 C 122.981597 579.018991 122.900909 579.059917 122.820221 579.059917 C 114.226938 581.147154 108.659459 589.045913 110.434598 596.862819 C 112.25008 604.679725 120.641642 609.427166 129.315613 607.54456 C 129.396301 607.54456 129.476989 607.54456 129.557677 607.54456 C 129.638365 607.503634 129.719053 607.462708 129.840085 607.421781 C 131.050407 607.176224 132.543137 606.889741 133.592082 606.603257 C 138.594744 605.252692 142.225708 603.288234 146.744242 601.569333 C 156.426814 598.090605 164.414936 595.184844 172.241681 594.079837 C 175.509549 593.793353 178.938793 596.085221 180.633243 597.026524 L 187.007603 595.921516 C 201.692837 641.431463 232.435003 678.1832 271.36701 701.265583 L 268.704303 707.609146 C 269.67256 710.105645 270.721506 713.461594 269.995313 715.87624 C 267.171229 723.242958 262.289599 731.018938 256.762464 739.695295 C 254.099757 743.706064 251.356362 746.77553 248.935719 751.359265 C 248.330558 752.464273 247.604365 754.142248 247.039549 755.329108 C 243.287552 763.350645 246.030947 772.599969 253.252532 776.078697 C 260.514461 779.598351 269.551528 775.914992 273.464901 767.852528 C 273.464901 767.811602 273.464901 767.811602 273.464901 767.811602 C 273.505245 767.811602 273.464901 767.770676 273.464901 767.770676 C 274.029718 766.624742 274.836599 765.151398 275.280383 764.046391 C 277.378274 759.29895 278.064123 755.247255 279.516508 750.66352 C 283.389537 740.923081 285.527772 730.732455 290.853186 724.388892 C 292.305572 722.629065 294.685871 721.974246 297.146858 721.319426 L 300.45507 715.303273 C 334.384415 728.317808 372.38851 731.837463 410.311916 723.202032 C 418.985887 721.237574 427.337105 718.700149 435.405915 715.671609 C 436.333828 717.308658 438.068622 720.459976 438.552751 721.2785 C 441.054082 722.097024 443.797477 722.506286 446.0164 725.82131 C 450.010461 732.615061 452.713512 740.677524 456.062068 750.417962 C 457.514454 755.001698 458.240647 759.053393 460.298193 763.800833 C 460.782322 764.905841 461.548859 766.420111 462.113676 767.566045 C 465.986704 775.628508 475.064115 779.352793 482.326044 775.833139 C 489.547629 772.354411 492.291024 763.105088 488.539028 755.042624 C 487.974211 753.89669 487.207674 752.218716 486.642858 751.113708 C 484.222215 746.529972 481.478819 743.460506 478.816112 739.449738 C 473.248633 730.814307 468.649412 723.611294 465.825328 716.244576 C 464.655351 712.438439 466.027048 710.105645 466.954961 707.609146 C 466.390145 706.995253 465.220167 703.393746 464.534319 701.715771 C 504.959056 677.814864 534.813652 639.712562 548.813038 595.635033 C 550.709208 595.962442 554.01742 596.535409 555.066365 596.74004 C 557.285288 595.307623 559.30249 593.384091 563.256207 593.711501 C 571.082953 594.857435 579.071075 597.763196 588.753646 601.200997 C 593.27218 602.919898 596.903144 604.925282 601.905807 606.275847 C 602.954752 606.562331 604.447482 606.807888 605.657803 607.094372 C 605.778835 607.094372 605.859523 607.176224 605.940211 607.176224 C 606.0209 607.21715 606.101588 607.21715 606.182276 607.21715 C 614.856246 609.099756 623.247809 604.352316 625.063291 596.535409 C 626.838429 588.718503 621.311294 580.778818 612.677668 578.732507 C 611.427002 578.446024 609.651864 577.954909 608.401198 577.709352 C 603.317848 576.768049 599.202755 576.97268 594.401813 576.604344 C 584.154425 575.499337 575.682174 574.639886 568.178181 572.266166 C 565.112034 571.079306 562.933455 567.436873 561.844166 565.922603 L 555.953934 564.203703 C 559.020082 542.062622 558.172857 519.021166 552.887787 495.938783 C 547.522028 472.651769 538.08152 451.370139 525.494177 432.585008 C 526.986907 431.193517 529.851334 428.697018 530.658215 427.91942 C 530.90028 425.300143 530.698559 422.558087 533.401611 419.652326 C 539.17081 414.250066 546.432739 409.789109 555.187397 404.386849 C 559.342834 401.931276 563.175519 400.335154 567.330956 397.265688 C 568.258869 396.569943 569.549879 395.464935 570.55848 394.687337 C 577.578345 389.080446 579.192107 379.42186 574.149101 373.119224 C 569.106094 366.816587 559.342834 366.202694 552.32297 371.809585 C 551.314369 372.587183 549.983015 373.651264 549.095446 374.387936 C 545.141729 377.784812 542.721086 381.099835 539.412874 384.619489 C 532.191289 391.945281 526.260714 398.043286 519.684634 402.463317 C 516.860551 404.100365 512.705113 403.527398 510.808943 403.445546 L 505.281808 407.415388 C 473.531042 374.142379 430.362909 352.860749 383.84622 348.727202 C 383.725188 346.80367 383.563812 343.284016 383.523467 342.219934 C 381.627297 340.378255 379.327686 338.823059 378.722526 334.894143 C 378.117365 327.03631 379.16631 318.564585 380.376632 308.373958 C 381.06248 303.585591 382.192114 299.656675 382.393834 294.459046 C 382.434178 293.272186 382.35349 291.594212 382.35349 290.325499 C 382.35349 281.321733 375.817754 274.077793 367.748944 274.077793 Z M 349.432746 387.484324 L 345.075588 464.220969 L 344.752836 464.384674 C 344.470428 471.219351 338.822261 476.703464 331.883084 476.703464 C 329.059001 476.703464 326.436638 475.803087 324.298403 474.247891 L 324.177371 474.329743 L 261.280998 429.720173 C 280.605798 410.689485 305.3367 396.651795 333.819599 390.185454 C 339.023981 388.998594 344.228363 388.139143 349.432746 387.484324 Z M 386.065143 387.484324 C 419.348983 391.576945 450.131493 406.63779 473.692418 429.7611 L 411.199485 474.04326 L 410.997765 473.961407 C 405.430286 478.013102 397.603541 477.030873 393.286727 471.587687 C 391.511589 469.377672 390.583676 466.758394 390.502988 464.139117 L 390.4223 464.098191 Z M 238.446266 458.368521 L 295.896192 509.730916 L 295.815504 510.058326 C 301.019887 514.560209 301.786424 522.377115 297.46961 527.820301 C 295.694472 530.030316 293.314173 531.50366 290.772498 532.199406 L 290.69181 532.485889 L 217.06392 553.726593 C 213.311923 519.430428 221.421077 486.157418 238.446266 458.368521 Z M 496.607838 458.409447 C 505.160776 472.242507 511.615824 487.671688 515.448509 504.451435 C 519.240849 520.985624 520.209107 537.519813 518.635689 553.481035 L 444.644702 532.158479 L 444.564014 531.83107 C 437.94759 530.030316 433.872841 523.277492 435.405915 516.524667 C 436.05142 513.741684 437.503805 511.40889 439.521008 509.68999 L 439.480664 509.526285 Z M 355.968482 513.700758 L 379.489063 513.700758 L 394.093608 531.994775 L 388.848882 554.790674 L 367.748944 564.981301 L 346.527974 554.790674 L 341.283248 531.953848 Z M 431.37151 576.276935 C 432.380111 576.236009 433.388712 576.317861 434.35697 576.481566 L 434.478002 576.358787 L 510.647567 589.209617 C 499.512609 620.518169 478.170607 647.652247 449.687708 665.823484 L 420.11552 594.407246 L 420.196208 594.284468 C 417.493157 587.981831 420.196208 580.574187 426.449536 577.545647 C 428.063298 576.808976 429.717404 576.358787 431.37151 576.276935 Z M 303.480874 576.604344 C 309.290417 576.686197 314.494799 580.696966 315.866497 586.631266 C 316.471658 589.373322 316.189249 592.115378 315.140304 594.570951 L 315.342024 594.857435 L 286.092588 665.537001 C 258.779667 647.979656 236.99388 621.705029 225.33445 589.455175 L 300.818166 576.645271 L 300.939199 576.808976 C 301.786424 576.645271 302.633649 576.563418 303.480874 576.604344 Z M 367.264816 607.54456 C 369.282018 607.503634 371.339565 607.912896 373.276079 608.854199 C 375.858098 610.081985 377.834957 612.005517 379.085622 614.338311 L 379.36803 614.338311 L 416.565244 681.580076 C 411.764302 683.217124 406.76164 684.608615 401.718634 685.754549 C 373.235735 692.22089 344.873868 690.256432 319.174709 681.498223 L 356.291234 614.379237 L 356.371922 614.379237 C 358.590845 610.204764 362.82697 607.708265 367.264816 607.54456 Z M 367.264816 607.54456 " transform="matrix(0.0968234,0,0,0.0954462,-0.606721,-33.358894)"/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoKubernete.png b/dist/ProductLogos/LogoKubernete.png
new file mode 100644
index 00000000..78faa171
Binary files /dev/null and b/dist/ProductLogos/LogoKubernete.png differ
diff --git a/dist/ProductLogos/LogoKubernete.puml b/dist/ProductLogos/LogoKubernete.puml
new file mode 100644
index 00000000..720eae7b
--- /dev/null
+++ b/dist/ProductLogos/LogoKubernete.puml
@@ -0,0 +1,13 @@
+sprite $LogoKubernete [70x67/16z] {
+xPNNekqW24H1RF3__tjB389xJZylj-prb480PyJGHRKN6RNG1KjNUub9YUvFTPgZZGuaNgKeIgY_ZhOQ0VKE6wbieGtl8hwwwMyB4z4E7NSIQeR5n9nEHAA-
+N1bgShKwAnEjh_kXupXaSRGIaQmSrmAkB55LcAZC54-RU9go3r-ulzUI3KLXxA16viWIQLWXscN1vtptmhij5OeiA4p3ZHITRzq6v-SepB2CR7dBz2nBTNzn
+DkF9CRTEDtQi9G-_bzKx2bCiqrRFoeJqjLwsJ7_DkHc-PeOlG1zqH5cYbj01pzrhHs4mirXEKslnC9YY26Em_nZhVcl4KCRfA4kK6dL9xt6bgtiekC6wOPRP
+9HyQpM_gKCnY8CjoaX_SpVS53rWvP8co6HPuLFJn6uasHgybnmfJ8EMuQtse6PwWDPTluzfvvuxJ6MNoS6iweSeg8Q5UpjApRcrKfkFJM53jwb_Ej1DOqh35
+D8xMaxng3zHeXbVVDUPaXAi9yLO3ZNDfxrrFhBnQWIyOCZSlBSVUrNlE6RltE3pMnsfgx2Tj9N7DWexdo-wRMWk1ndKoS9YLcDb5J9CB2vpq63jUUrNcVTzV
+JL9eC-5bZJaGyN8y34s6pOoQ1HY5moiVoO9k3Zffs2fFxRNmFPrMSTDEEa2Z9chE9E01C1y263MW0RlpJUtQA-C2lzOtpq69texQ-eRyQDIKRe3MZlOWpJxC
+fDSPzW7G7ZJgOmW1ODIRe3r8iGy0zW3rEye6_JlA1lLjRJhJn-3oAan_7q-UF7do4m
+}
+
+AzureEntityColoring(LogoKubernete)
+!define LogoKubernete(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoKubernete, LogoKubernete)
+!define LogoKubernete(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoKubernete, LogoKubernete)
diff --git a/dist/ProductLogos/LogoKubernete.svg b/dist/ProductLogos/LogoKubernete.svg
new file mode 100644
index 00000000..5845e8b1
--- /dev/null
+++ b/dist/ProductLogos/LogoKubernete.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="67pt" viewBox="0 0 70 67" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(19.607843%,42.352941%,89.803922%);fill-opacity:1;" d="M 34.765625 -15.71875 C 34.164063 -15.6875 33.574219 -15.542969 33.03125 -15.285156 L 9.371094 -4.144531 C 8.132813 -3.558594 7.230469 -2.453125 6.925781 -1.144531 L 1.085938 23.886719 C 0.816406 25.054688 1.035156 26.277344 1.703125 27.277344 C 1.78125 27.402344 1.867188 27.519531 1.960938 27.632813 L 18.335938 47.703125 C 19.191406 48.753906 20.496094 49.367188 21.871094 49.367188 L 48.132813 49.359375 C 49.507813 49.359375 50.808594 48.75 51.667969 47.699219 L 68.039063 27.625 C 68.898438 26.574219 69.21875 25.195313 68.914063 23.882813 L 63.066406 -1.148438 C 62.761719 -2.460938 61.859375 -3.566406 60.617188 -4.148438 L 36.957031 -15.285156 C 36.273438 -15.609375 35.519531 -15.757813 34.765625 -15.71875 Z M 34.765625 -15.71875 "/>
+<path style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 367.748944 274.077793 C 359.63979 274.077793 353.104054 281.321733 353.104054 290.325499 C 353.104054 290.448278 353.144398 290.571056 353.144398 290.734761 C 353.144398 291.921621 353.06371 293.394965 353.104054 294.459046 C 353.305775 299.656675 354.435408 303.585591 355.121257 308.373958 C 356.331578 318.564585 357.380524 327.03631 356.735019 334.894143 C 356.129858 337.881756 353.910935 340.582886 351.974421 342.465492 L 351.651669 348.64535 C 342.856666 349.382021 334.021319 350.69166 325.185972 352.697044 C 287.222222 361.332475 254.543542 380.895204 229.651263 407.29261 C 228.037501 406.187602 225.213418 404.182218 224.366193 403.568325 C 221.74383 403.895734 219.121466 404.714259 215.651878 402.708874 C 209.116142 398.32977 203.145223 392.231764 195.963982 384.905972 C 192.65577 381.386318 190.235127 378.071295 186.321754 374.67442 C 185.434185 373.937748 184.062488 372.873666 183.09423 372.096068 C 179.987739 369.640496 176.397118 368.371783 172.887186 368.249005 C 168.408996 368.0853 164.051839 369.845127 161.227756 373.405707 C 156.18475 379.708344 157.798511 389.366929 164.818376 394.97382 C 164.899064 395.014747 164.979752 395.055673 165.06044 395.137525 C 166.028698 395.915123 167.198675 396.897352 168.086244 397.552172 C 172.241681 400.621637 176.034022 402.21776 180.189459 404.673332 C 188.944118 410.075592 196.206046 414.536549 201.934901 419.938809 C 204.194168 422.312529 204.597609 426.527929 204.880017 428.369608 L 209.559927 432.544082 C 184.465928 470.318975 172.887186 516.974855 179.745674 564.490186 L 173.613379 566.290939 C 171.999617 568.378176 169.700006 571.652273 167.319707 572.634502 C 159.815714 575.008222 151.343464 575.867673 141.096075 576.931754 C 136.295133 577.341016 132.18004 577.095459 127.09669 578.077688 C 125.967057 578.282319 124.393639 578.691581 123.183317 578.978065 C 123.142973 578.978065 123.102629 578.978065 123.062285 578.978065 C 122.981597 579.018991 122.900909 579.059917 122.820221 579.059917 C 114.226938 581.147154 108.659459 589.045913 110.434598 596.862819 C 112.25008 604.679725 120.641642 609.427166 129.315613 607.54456 C 129.396301 607.54456 129.476989 607.54456 129.557677 607.54456 C 129.638365 607.503634 129.719053 607.462708 129.840085 607.421781 C 131.050407 607.176224 132.543137 606.889741 133.592082 606.603257 C 138.594744 605.252692 142.225708 603.288234 146.744242 601.569333 C 156.426814 598.090605 164.414936 595.184844 172.241681 594.079837 C 175.509549 593.793353 178.938793 596.085221 180.633243 597.026524 L 187.007603 595.921516 C 201.692837 641.431463 232.435003 678.1832 271.36701 701.265583 L 268.704303 707.609146 C 269.67256 710.105645 270.721506 713.461594 269.995313 715.87624 C 267.171229 723.242958 262.289599 731.018938 256.762464 739.695295 C 254.099757 743.706064 251.356362 746.77553 248.935719 751.359265 C 248.330558 752.464273 247.604365 754.142248 247.039549 755.329108 C 243.287552 763.350645 246.030947 772.599969 253.252532 776.078697 C 260.514461 779.598351 269.551528 775.914992 273.464901 767.852528 C 273.464901 767.811602 273.464901 767.811602 273.464901 767.811602 C 273.505245 767.811602 273.464901 767.770676 273.464901 767.770676 C 274.029718 766.624742 274.836599 765.151398 275.280383 764.046391 C 277.378274 759.29895 278.064123 755.247255 279.516508 750.66352 C 283.389537 740.923081 285.527772 730.732455 290.853186 724.388892 C 292.305572 722.629065 294.685871 721.974246 297.146858 721.319426 L 300.45507 715.303273 C 334.384415 728.317808 372.38851 731.837463 410.311916 723.202032 C 418.985887 721.237574 427.337105 718.700149 435.405915 715.671609 C 436.333828 717.308658 438.068622 720.459976 438.552751 721.2785 C 441.054082 722.097024 443.797477 722.506286 446.0164 725.82131 C 450.010461 732.615061 452.713512 740.677524 456.062068 750.417962 C 457.514454 755.001698 458.240647 759.053393 460.298193 763.800833 C 460.782322 764.905841 461.548859 766.420111 462.113676 767.566045 C 465.986704 775.628508 475.064115 779.352793 482.326044 775.833139 C 489.547629 772.354411 492.291024 763.105088 488.539028 755.042624 C 487.974211 753.89669 487.207674 752.218716 486.642858 751.113708 C 484.222215 746.529972 481.478819 743.460506 478.816112 739.449738 C 473.248633 730.814307 468.649412 723.611294 465.825328 716.244576 C 464.655351 712.438439 466.027048 710.105645 466.954961 707.609146 C 466.390145 706.995253 465.220167 703.393746 464.534319 701.715771 C 504.959056 677.814864 534.813652 639.712562 548.813038 595.635033 C 550.709208 595.962442 554.01742 596.535409 555.066365 596.74004 C 557.285288 595.307623 559.30249 593.384091 563.256207 593.711501 C 571.082953 594.857435 579.071075 597.763196 588.753646 601.200997 C 593.27218 602.919898 596.903144 604.925282 601.905807 606.275847 C 602.954752 606.562331 604.447482 606.807888 605.657803 607.094372 C 605.778835 607.094372 605.859523 607.176224 605.940211 607.176224 C 606.0209 607.21715 606.101588 607.21715 606.182276 607.21715 C 614.856246 609.099756 623.247809 604.352316 625.063291 596.535409 C 626.838429 588.718503 621.311294 580.778818 612.677668 578.732507 C 611.427002 578.446024 609.651864 577.954909 608.401198 577.709352 C 603.317848 576.768049 599.202755 576.97268 594.401813 576.604344 C 584.154425 575.499337 575.682174 574.639886 568.178181 572.266166 C 565.112034 571.079306 562.933455 567.436873 561.844166 565.922603 L 555.953934 564.203703 C 559.020082 542.062622 558.172857 519.021166 552.887787 495.938783 C 547.522028 472.651769 538.08152 451.370139 525.494177 432.585008 C 526.986907 431.193517 529.851334 428.697018 530.658215 427.91942 C 530.90028 425.300143 530.698559 422.558087 533.401611 419.652326 C 539.17081 414.250066 546.432739 409.789109 555.187397 404.386849 C 559.342834 401.931276 563.175519 400.335154 567.330956 397.265688 C 568.258869 396.569943 569.549879 395.464935 570.55848 394.687337 C 577.578345 389.080446 579.192107 379.42186 574.149101 373.119224 C 569.106094 366.816587 559.342834 366.202694 552.32297 371.809585 C 551.314369 372.587183 549.983015 373.651264 549.095446 374.387936 C 545.141729 377.784812 542.721086 381.099835 539.412874 384.619489 C 532.191289 391.945281 526.260714 398.043286 519.684634 402.463317 C 516.860551 404.100365 512.705113 403.527398 510.808943 403.445546 L 505.281808 407.415388 C 473.531042 374.142379 430.362909 352.860749 383.84622 348.727202 C 383.725188 346.80367 383.563812 343.284016 383.523467 342.219934 C 381.627297 340.378255 379.327686 338.823059 378.722526 334.894143 C 378.117365 327.03631 379.16631 318.564585 380.376632 308.373958 C 381.06248 303.585591 382.192114 299.656675 382.393834 294.459046 C 382.434178 293.272186 382.35349 291.594212 382.35349 290.325499 C 382.35349 281.321733 375.817754 274.077793 367.748944 274.077793 Z M 349.432746 387.484324 L 345.075588 464.220969 L 344.752836 464.384674 C 344.470428 471.219351 338.822261 476.703464 331.883084 476.703464 C 329.059001 476.703464 326.436638 475.803087 324.298403 474.247891 L 324.177371 474.329743 L 261.280998 429.720173 C 280.605798 410.689485 305.3367 396.651795 333.819599 390.185454 C 339.023981 388.998594 344.228363 388.139143 349.432746 387.484324 Z M 386.065143 387.484324 C 419.348983 391.576945 450.131493 406.63779 473.692418 429.7611 L 411.199485 474.04326 L 410.997765 473.961407 C 405.430286 478.013102 397.603541 477.030873 393.286727 471.587687 C 391.511589 469.377672 390.583676 466.758394 390.502988 464.139117 L 390.4223 464.098191 Z M 238.446266 458.368521 L 295.896192 509.730916 L 295.815504 510.058326 C 301.019887 514.560209 301.786424 522.377115 297.46961 527.820301 C 295.694472 530.030316 293.314173 531.50366 290.772498 532.199406 L 290.69181 532.485889 L 217.06392 553.726593 C 213.311923 519.430428 221.421077 486.157418 238.446266 458.368521 Z M 496.607838 458.409447 C 505.160776 472.242507 511.615824 487.671688 515.448509 504.451435 C 519.240849 520.985624 520.209107 537.519813 518.635689 553.481035 L 444.644702 532.158479 L 444.564014 531.83107 C 437.94759 530.030316 433.872841 523.277492 435.405915 516.524667 C 436.05142 513.741684 437.503805 511.40889 439.521008 509.68999 L 439.480664 509.526285 Z M 355.968482 513.700758 L 379.489063 513.700758 L 394.093608 531.994775 L 388.848882 554.790674 L 367.748944 564.981301 L 346.527974 554.790674 L 341.283248 531.953848 Z M 431.37151 576.276935 C 432.380111 576.236009 433.388712 576.317861 434.35697 576.481566 L 434.478002 576.358787 L 510.647567 589.209617 C 499.512609 620.518169 478.170607 647.652247 449.687708 665.823484 L 420.11552 594.407246 L 420.196208 594.284468 C 417.493157 587.981831 420.196208 580.574187 426.449536 577.545647 C 428.063298 576.808976 429.717404 576.358787 431.37151 576.276935 Z M 303.480874 576.604344 C 309.290417 576.686197 314.494799 580.696966 315.866497 586.631266 C 316.471658 589.373322 316.189249 592.115378 315.140304 594.570951 L 315.342024 594.857435 L 286.092588 665.537001 C 258.779667 647.979656 236.99388 621.705029 225.33445 589.455175 L 300.818166 576.645271 L 300.939199 576.808976 C 301.786424 576.645271 302.633649 576.563418 303.480874 576.604344 Z M 367.264816 607.54456 C 369.282018 607.503634 371.339565 607.912896 373.276079 608.854199 C 375.858098 610.081985 377.834957 612.005517 379.085622 614.338311 L 379.36803 614.338311 L 416.565244 681.580076 C 411.764302 683.217124 406.76164 684.608615 401.718634 685.754549 C 373.235735 692.22089 344.873868 690.256432 319.174709 681.498223 L 356.291234 614.379237 L 356.371922 614.379237 C 358.590845 610.204764 362.82697 607.708265 367.264816 607.54456 Z M 367.264816 607.54456 " transform="matrix(0.0968234,0,0,0.0954462,-0.606721,-33.358894)"/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoOkta(m).png b/dist/ProductLogos/LogoOkta(m).png
new file mode 100644
index 00000000..e1710268
Binary files /dev/null and b/dist/ProductLogos/LogoOkta(m).png differ
diff --git a/dist/ProductLogos/LogoOkta(m).svg b/dist/ProductLogos/LogoOkta(m).svg
new file mode 100644
index 00000000..8ffdd512
--- /dev/null
+++ b/dist/ProductLogos/LogoOkta(m).svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="23pt" viewBox="0 0 70 23" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 8.800781 5.785156 C 3.9375 5.785156 0 9.617188 0 14.355469 C 0 19.089844 3.9375 22.921875 8.800781 22.921875 C 13.667969 22.921875 17.605469 19.089844 17.605469 14.355469 C 17.605469 9.617188 13.667969 5.785156 8.800781 5.785156 Z M 8.800781 18.648438 C 6.371094 18.648438 4.390625 16.722656 4.390625 14.355469 C 4.390625 11.984375 6.371094 10.058594 8.800781 10.058594 C 11.234375 10.058594 13.210938 11.984375 13.210938 14.355469 C 13.210938 16.722656 11.234375 18.648438 8.800781 18.648438 Z M 8.800781 18.648438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 24.273438 17.234375 C 24.273438 16.550781 25.113281 16.226563 25.601563 16.703125 C 27.808594 18.886719 31.449219 22.632813 31.464844 22.652344 C 31.515625 22.703125 31.570313 22.785156 31.78125 22.855469 C 31.867188 22.890625 32.007813 22.890625 32.164063 22.890625 L 36.136719 22.890625 C 36.855469 22.890625 37.066406 22.089844 36.734375 21.679688 L 30.152344 15.121094 L 29.800781 14.78125 C 29.050781 13.910156 29.136719 13.570313 29.996094 12.683594 L 35.210938 7.011719 C 35.542969 6.601563 35.332031 5.816406 34.597656 5.816406 L 30.992188 5.816406 C 30.851563 5.816406 30.746094 5.816406 30.640625 5.851563 C 30.433594 5.921875 30.34375 5.988281 30.292969 6.058594 C 30.273438 6.074219 27.386719 9.105469 25.601563 10.964844 C 25.113281 11.472656 24.238281 11.132813 24.238281 10.433594 L 24.238281 0.707031 C 24.238281 0.214844 23.816406 0.0273438 23.484375 0.0273438 L 20.546875 0.0273438 C 20.039063 0.0273438 19.792969 0.347656 19.792969 0.640625 L 19.792969 22.207031 C 19.792969 22.703125 20.210938 22.839844 20.5625 22.839844 L 23.503906 22.839844 C 23.957031 22.839844 24.253906 22.515625 24.253906 22.191406 L 24.253906 17.234375 Z M 24.273438 17.234375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 48.28125 22.105469 L 47.96875 19.242188 C 47.933594 18.851563 47.546875 18.578125 47.144531 18.648438 C 46.917969 18.679688 46.691406 18.699219 46.460938 18.699219 C 44.117188 18.699219 42.210938 16.910156 42.070313 14.644531 C 42.070313 14.574219 42.070313 14.488281 42.070313 14.40625 L 42.070313 10.894531 C 42.070313 10.433594 42.421875 10.058594 42.890625 10.058594 L 46.828125 10.058594 C 47.109375 10.058594 47.53125 9.820313 47.53125 9.328125 L 47.53125 6.617188 C 47.53125 6.089844 47.179688 5.816406 46.863281 5.816406 L 42.890625 5.816406 C 42.4375 5.816406 42.070313 5.496094 42.050781 5.050781 L 42.050781 0.707031 C 42.050781 0.433594 41.84375 0.0273438 41.300781 0.0273438 L 38.378906 0.0273438 C 38.011719 0.0273438 37.660156 0.246094 37.660156 0.691406 C 37.660156 0.691406 37.660156 14.574219 37.660156 14.644531 C 37.78125 19.277344 41.683594 22.972656 46.460938 22.972656 C 46.863281 22.972656 47.25 22.941406 47.636719 22.890625 C 48.054688 22.839844 48.335938 22.496094 48.28125 22.105469 Z M 48.28125 22.105469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 69.492188 18.511719 C 67.007813 18.511719 66.621094 17.640625 66.621094 14.386719 C 66.621094 14.371094 66.621094 14.371094 66.621094 14.355469 L 66.621094 6.535156 C 66.621094 6.261719 66.414063 5.800781 65.851563 5.800781 L 62.914063 5.800781 C 62.546875 5.800781 62.140625 6.089844 62.140625 6.535156 L 62.140625 6.890625 C 60.863281 6.175781 59.378906 5.765625 57.800781 5.765625 C 52.9375 5.765625 49 9.601563 49 14.335938 C 49 19.074219 52.9375 22.90625 57.800781 22.90625 C 59.988281 22.90625 61.984375 22.121094 63.523438 20.84375 C 64.347656 22.070313 65.675781 22.890625 67.761719 22.90625 C 68.109375 22.90625 70 22.972656 70 22.105469 L 70 19.054688 C 70 18.800781 69.789063 18.511719 69.492188 18.511719 Z M 57.820313 18.648438 C 55.386719 18.648438 53.410156 16.722656 53.410156 14.355469 C 53.410156 11.984375 55.386719 10.058594 57.820313 10.058594 C 60.253906 10.058594 62.230469 11.984375 62.230469 14.355469 C 62.210938 16.722656 60.234375 18.648438 57.820313 18.648438 Z M 57.820313 18.648438 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoOkta.png b/dist/ProductLogos/LogoOkta.png
new file mode 100644
index 00000000..7372766c
Binary files /dev/null and b/dist/ProductLogos/LogoOkta.png differ
diff --git a/dist/ProductLogos/LogoOkta.puml b/dist/ProductLogos/LogoOkta.puml
new file mode 100644
index 00000000..f25bbcfb
--- /dev/null
+++ b/dist/ProductLogos/LogoOkta.puml
@@ -0,0 +1,10 @@
+sprite $LogoOkta [70x23/16z] {
+vPC7Ri0m30CzjVx_u1eEbJ03xGDAh82GpeGKbGzvHBJVdRzLOscydFuVARMr-aLfIt2aBTL70rbLF9PiFYbr-tCvAIjRqsE39PPWHSeRKm2nygJq884Yx7Ic
+s2RN9sN4NKZ2QaaX256ab1OFdGMochjn_acGT0uTPNtXzAHCAh0ZJELehqqt7d9I31uzMHb25Egid0jtDWkPSfl2coBqR9cWO98NHHyRULAKAOEoI9hEMHY3
+uMKMXxsH0JCgaVj1iSaOkrhxbHxlDPZUJaYS_qidpDYV5RaIqt07EURGAOSrJig1GQ-ZQkPwNQO5v8fZIIbT032-RvTEHECbv298KWY3J_YCGI_Veuz25C9i
+L-FSrCY71HNOZgZENY1HbOgDw99W8rDD6_mfAdsxOttz
+}
+
+AzureEntityColoring(LogoOkta)
+!define LogoOkta(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoOkta, LogoOkta)
+!define LogoOkta(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoOkta, LogoOkta)
diff --git a/dist/ProductLogos/LogoOkta.svg b/dist/ProductLogos/LogoOkta.svg
new file mode 100644
index 00000000..85a6cbec
--- /dev/null
+++ b/dist/ProductLogos/LogoOkta.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="23pt" viewBox="0 0 70 23" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,49.019608%,75.686275%);fill-opacity:1;" d="M 8.800781 5.785156 C 3.9375 5.785156 0 9.617188 0 14.355469 C 0 19.089844 3.9375 22.921875 8.800781 22.921875 C 13.667969 22.921875 17.605469 19.089844 17.605469 14.355469 C 17.605469 9.617188 13.667969 5.785156 8.800781 5.785156 Z M 8.800781 18.648438 C 6.371094 18.648438 4.390625 16.722656 4.390625 14.355469 C 4.390625 11.984375 6.371094 10.058594 8.800781 10.058594 C 11.234375 10.058594 13.210938 11.984375 13.210938 14.355469 C 13.210938 16.722656 11.234375 18.648438 8.800781 18.648438 Z M 8.800781 18.648438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,49.019608%,75.686275%);fill-opacity:1;" d="M 24.273438 17.234375 C 24.273438 16.550781 25.113281 16.226563 25.601563 16.703125 C 27.808594 18.886719 31.449219 22.632813 31.464844 22.652344 C 31.515625 22.703125 31.570313 22.785156 31.78125 22.855469 C 31.867188 22.890625 32.007813 22.890625 32.164063 22.890625 L 36.136719 22.890625 C 36.855469 22.890625 37.066406 22.089844 36.734375 21.679688 L 30.152344 15.121094 L 29.800781 14.78125 C 29.050781 13.910156 29.136719 13.570313 29.996094 12.683594 L 35.210938 7.011719 C 35.542969 6.601563 35.332031 5.816406 34.597656 5.816406 L 30.992188 5.816406 C 30.851563 5.816406 30.746094 5.816406 30.640625 5.851563 C 30.433594 5.921875 30.34375 5.988281 30.292969 6.058594 C 30.273438 6.074219 27.386719 9.105469 25.601563 10.964844 C 25.113281 11.472656 24.238281 11.132813 24.238281 10.433594 L 24.238281 0.707031 C 24.238281 0.214844 23.816406 0.0273438 23.484375 0.0273438 L 20.546875 0.0273438 C 20.039063 0.0273438 19.792969 0.347656 19.792969 0.640625 L 19.792969 22.207031 C 19.792969 22.703125 20.210938 22.839844 20.5625 22.839844 L 23.503906 22.839844 C 23.957031 22.839844 24.253906 22.515625 24.253906 22.191406 L 24.253906 17.234375 Z M 24.273438 17.234375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,49.019608%,75.686275%);fill-opacity:1;" d="M 48.28125 22.105469 L 47.96875 19.242188 C 47.933594 18.851563 47.546875 18.578125 47.144531 18.648438 C 46.917969 18.679688 46.691406 18.699219 46.460938 18.699219 C 44.117188 18.699219 42.210938 16.910156 42.070313 14.644531 C 42.070313 14.574219 42.070313 14.488281 42.070313 14.40625 L 42.070313 10.894531 C 42.070313 10.433594 42.421875 10.058594 42.890625 10.058594 L 46.828125 10.058594 C 47.109375 10.058594 47.53125 9.820313 47.53125 9.328125 L 47.53125 6.617188 C 47.53125 6.089844 47.179688 5.816406 46.863281 5.816406 L 42.890625 5.816406 C 42.4375 5.816406 42.070313 5.496094 42.050781 5.050781 L 42.050781 0.707031 C 42.050781 0.433594 41.84375 0.0273438 41.300781 0.0273438 L 38.378906 0.0273438 C 38.011719 0.0273438 37.660156 0.246094 37.660156 0.691406 C 37.660156 0.691406 37.660156 14.574219 37.660156 14.644531 C 37.78125 19.277344 41.683594 22.972656 46.460938 22.972656 C 46.863281 22.972656 47.25 22.941406 47.636719 22.890625 C 48.054688 22.839844 48.335938 22.496094 48.28125 22.105469 Z M 48.28125 22.105469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,49.019608%,75.686275%);fill-opacity:1;" d="M 69.492188 18.511719 C 67.007813 18.511719 66.621094 17.640625 66.621094 14.386719 C 66.621094 14.371094 66.621094 14.371094 66.621094 14.355469 L 66.621094 6.535156 C 66.621094 6.261719 66.414063 5.800781 65.851563 5.800781 L 62.914063 5.800781 C 62.546875 5.800781 62.140625 6.089844 62.140625 6.535156 L 62.140625 6.890625 C 60.863281 6.175781 59.378906 5.765625 57.800781 5.765625 C 52.9375 5.765625 49 9.601563 49 14.335938 C 49 19.074219 52.9375 22.90625 57.800781 22.90625 C 59.988281 22.90625 61.984375 22.121094 63.523438 20.84375 C 64.347656 22.070313 65.675781 22.890625 67.761719 22.90625 C 68.109375 22.90625 70 22.972656 70 22.105469 L 70 19.054688 C 70 18.800781 69.789063 18.511719 69.492188 18.511719 Z M 57.820313 18.648438 C 55.386719 18.648438 53.410156 16.722656 53.410156 14.355469 C 53.410156 11.984375 55.386719 10.058594 57.820313 10.058594 C 60.253906 10.058594 62.230469 11.984375 62.230469 14.355469 C 62.210938 16.722656 60.234375 18.648438 57.820313 18.648438 Z M 57.820313 18.648438 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoOpenShift(m).png b/dist/ProductLogos/LogoOpenShift(m).png
new file mode 100644
index 00000000..b0da53dd
Binary files /dev/null and b/dist/ProductLogos/LogoOpenShift(m).png differ
diff --git a/dist/ProductLogos/LogoOpenShift(m).svg b/dist/ProductLogos/LogoOpenShift(m).svg
new file mode 100644
index 00000000..07172fec
--- /dev/null
+++ b/dist/ProductLogos/LogoOpenShift(m).svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 20.722656 33.074219 C 20.742188 32.238281 20.796875 31.40625 20.914063 30.589844 L 9.464844 34.515625 C 9.488281 35.296875 9.566406 36.082031 9.652344 36.867188 Z M 20.722656 33.074219 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 68.421875 16.722656 C 68.007813 16.050781 67.585938 15.382813 67.125 14.746094 L 55.675781 18.671875 C 56.269531 19.25 56.824219 19.871094 57.347656 20.519531 Z M 68.421875 16.722656 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 68.652344 36.289063 C 68.699219 35.097656 68.707031 33.898438 68.617188 32.6875 L 57.390625 36.539063 C 57.289063 37.851563 57.054688 39.140625 56.710938 40.398438 Z M 68.652344 36.289063 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 24.453125 51.5 C 23.398438 50.710938 22.40625 49.824219 21.511719 48.835938 L 10.28125 52.6875 C 10.96875 53.714844 11.726563 54.679688 12.515625 55.609375 Z M 24.453125 51.5 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 9.464844 34.515625 C 9.527344 36.476563 9.777344 38.453125 10.21875 40.421875 L 20.964844 36.738281 C 20.632813 34.667969 20.625 32.597656 20.914063 30.589844 Z M 9.464844 34.515625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 67.128906 14.746094 L 55.675781 18.671875 C 57.136719 20.082031 58.402344 21.722656 59.410156 23.5625 L 70.15625 19.875 C 69.296875 18.050781 68.28125 16.335938 67.128906 14.746094 Z M 67.128906 14.746094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 50.789063 30.257813 C 51.726563 32.988281 52.054688 35.78125 51.851563 38.488281 L 63.078125 34.640625 C 62.882813 31.964844 62.34375 29.269531 61.433594 26.609375 C 61.046875 25.480469 60.59375 24.382813 60.09375 23.324219 L 49.347656 27.011719 C 49.910156 28.035156 50.398438 29.117188 50.789063 30.257813 Z M 50.789063 30.257813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 11.761719 43.640625 C 11.367188 42.496094 11.089844 41.34375 10.902344 40.1875 L 0.15625 43.875 C 0.410156 45.015625 0.726563 46.15625 1.113281 47.289063 C 2.027344 49.945313 3.253906 52.402344 4.742188 54.636719 L 15.96875 50.789063 C 14.148438 48.773438 12.695313 46.371094 11.761719 43.640625 Z M 11.761719 43.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 57.390625 36.539063 C 56.789063 44.515625 51.554688 51.753906 43.507813 54.515625 C 35.460938 57.273438 26.878906 54.769531 21.511719 48.835938 L 10.285156 52.6875 C 18.117188 64.453125 33.15625 69.957031 47.15625 65.160156 C 61.15625 60.363281 69.652344 46.789063 68.621094 32.691406 Z M 57.390625 36.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,80,140);fill-opacity:1;" d="M 16.398438 32.085938 C 17.460938 24.664063 22.542969 18.082031 30.125 15.484375 C 37.710938 12.886719 45.757813 14.960938 51.152344 20.171875 L 62.601563 16.25 C 54.589844 5.21875 40.046875 0.191406 26.476563 4.839844 C 12.90625 9.492188 4.507813 22.386719 4.949219 36.011719 Z M 16.398438 32.085938 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoOpenShift.png b/dist/ProductLogos/LogoOpenShift.png
new file mode 100644
index 00000000..d339f91b
Binary files /dev/null and b/dist/ProductLogos/LogoOpenShift.png differ
diff --git a/dist/ProductLogos/LogoOpenShift.puml b/dist/ProductLogos/LogoOpenShift.puml
new file mode 100644
index 00000000..06b21030
--- /dev/null
+++ b/dist/ProductLogos/LogoOpenShift.puml
@@ -0,0 +1,13 @@
+sprite $LogoOpenShift [70x70/16z] {
+vPS7Sgqw340bLpNslzt_oV22x35OkTDUELFJ3kgNm3z6AesOHPYfbGGVW8NK1fGgme_8Nk556S8KiKUa1ECGUqKYyNJRqZ4UoEVXLBKGMk6PPc5wg2HnJJoI
+kAQkykVUQckTL_LQrIRRZ3JNYjJ4PlBNTttRKMo42qnajW5XiUCu26ueCkX5d49FXVrFkdzk0_JMHgyuOVY5cAV18zMqPwXssCswFnLUm6agb0fSQ4ZY8QTO
+LQL315Gp7e-VRw50Z3hVXpIEKe1pskHbWIYGJ9NLyyHkqbR1wmUYtV1EOZSAdXBlyhWf-Qai21loquZJsEQDI1xIPpznLIpyIQDBktuTZ8sbFEIlJd5iXnV7
+ycQwddehZiWAg2ildNzrVPiArFleACJAg-U3Jt2PBImPco6NudpsOWoauZOMQQbzEqpdcabBiAMU8qkNOggZEaK0ELQpXpt3Jz35RIoayqc8RrFzLiHkzdg1
+qwNuWZvCI8TrLeGmTJonTSWl2ghTbF7wAqJfyr_91y5aS_GXmtXbafeZkHJT5AOk2Lv0CGSjtYjxwdhkHmf8N2X3VLNKhaqjZpNHzNjcdnM7-_5C6oMAllbA
+fLoE-yu4_kF9RX2fm7Knp2CD5v_ndlvyJptSIq84pAMlVlfybkC81feOaSGqSOa7sO8mnjPrJV2a5RKjMc07RiCXX029xGNE42IHsXgAElmBwGYxdOY2fR7Q
+XN8h21-3AUUKu8_XFm
+}
+
+AzureEntityColoring(LogoOpenShift)
+!define LogoOpenShift(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoOpenShift, LogoOpenShift)
+!define LogoOpenShift(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoOpenShift, LogoOpenShift)
diff --git a/dist/ProductLogos/LogoOpenShift.svg b/dist/ProductLogos/LogoOpenShift.svg
new file mode 100644
index 00000000..14642bbd
--- /dev/null
+++ b/dist/ProductLogos/LogoOpenShift.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 20.722656 33.074219 C 20.742188 32.238281 20.796875 31.40625 20.914063 30.589844 L 9.464844 34.515625 C 9.488281 35.296875 9.566406 36.082031 9.652344 36.867188 Z M 20.722656 33.074219 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 68.421875 16.722656 C 68.007813 16.050781 67.585938 15.382813 67.125 14.746094 L 55.675781 18.671875 C 56.269531 19.25 56.824219 19.871094 57.347656 20.519531 Z M 68.421875 16.722656 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 68.652344 36.289063 C 68.699219 35.097656 68.707031 33.898438 68.617188 32.6875 L 57.390625 36.539063 C 57.289063 37.851563 57.054688 39.140625 56.710938 40.398438 Z M 68.652344 36.289063 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 24.453125 51.5 C 23.398438 50.710938 22.40625 49.824219 21.511719 48.835938 L 10.28125 52.6875 C 10.96875 53.714844 11.726563 54.679688 12.515625 55.609375 Z M 24.453125 51.5 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 9.464844 34.515625 C 9.527344 36.476563 9.777344 38.453125 10.21875 40.421875 L 20.964844 36.738281 C 20.632813 34.667969 20.625 32.597656 20.914063 30.589844 Z M 9.464844 34.515625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 67.128906 14.746094 L 55.675781 18.671875 C 57.136719 20.082031 58.402344 21.722656 59.410156 23.5625 L 70.15625 19.875 C 69.296875 18.050781 68.28125 16.335938 67.128906 14.746094 Z M 67.128906 14.746094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 50.789063 30.257813 C 51.726563 32.988281 52.054688 35.78125 51.851563 38.488281 L 63.078125 34.640625 C 62.882813 31.964844 62.34375 29.269531 61.433594 26.609375 C 61.046875 25.480469 60.59375 24.382813 60.09375 23.324219 L 49.347656 27.011719 C 49.910156 28.035156 50.398438 29.117188 50.789063 30.257813 Z M 50.789063 30.257813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 11.761719 43.640625 C 11.367188 42.496094 11.089844 41.34375 10.902344 40.1875 L 0.15625 43.875 C 0.410156 45.015625 0.726563 46.15625 1.113281 47.289063 C 2.027344 49.945313 3.253906 52.402344 4.742188 54.636719 L 15.96875 50.789063 C 14.148438 48.773438 12.695313 46.371094 11.761719 43.640625 Z M 11.761719 43.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 57.390625 36.539063 C 56.789063 44.515625 51.554688 51.753906 43.507813 54.515625 C 35.460938 57.273438 26.878906 54.769531 21.511719 48.835938 L 10.285156 52.6875 C 18.117188 64.453125 33.15625 69.957031 47.15625 65.160156 C 61.15625 60.363281 69.652344 46.789063 68.621094 32.691406 Z M 57.390625 36.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.941176%,7.843137%,10.196078%);fill-opacity:1;" d="M 16.398438 32.085938 C 17.460938 24.664063 22.542969 18.082031 30.125 15.484375 C 37.710938 12.886719 45.757813 14.960938 51.152344 20.171875 L 62.601563 16.25 C 54.589844 5.21875 40.046875 0.191406 26.476563 4.839844 C 12.90625 9.492188 4.507813 22.386719 4.949219 36.011719 Z M 16.398438 32.085938 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoPluralsightMono(m).png b/dist/ProductLogos/LogoPluralsightMono(m).png
new file mode 100644
index 00000000..d22c6670
Binary files /dev/null and b/dist/ProductLogos/LogoPluralsightMono(m).png differ
diff --git a/dist/ProductLogos/LogoPluralsightMono(m).svg b/dist/ProductLogos/LogoPluralsightMono(m).svg
new file mode 100644
index 00000000..dc7a0154
--- /dev/null
+++ b/dist/ProductLogos/LogoPluralsightMono(m).svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 1.09375 35 C 1.09375 53.726563 16.273438 68.90625 35 68.90625 C 53.726563 68.90625 68.90625 53.726563 68.90625 35 C 68.90625 16.273438 53.726563 1.09375 35 1.09375 C 16.273438 1.09375 1.09375 16.273438 1.09375 35 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,99,172);fill-opacity:1;" d="M 1.09375 35 C 1.09375 53.726563 16.273438 68.90625 35 68.90625 C 53.726563 68.90625 68.90625 53.726563 68.90625 35 C 68.90625 16.273438 53.726563 1.09375 35 1.09375 C 16.273438 1.09375 1.09375 16.273438 1.09375 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.25 16.40625 L 26.328125 53.59375 L 55.78125 35 Z M 29.53125 22.355469 L 49.632813 35 L 29.53125 47.65625 Z M 29.53125 22.355469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 19.6875 20.78125 L 19.6875 49.21875 L 43.75 35 Z M 22.96875 26.535156 L 37.296875 35 L 22.96875 43.464844 Z M 22.96875 26.535156 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoPluralsightMono.png b/dist/ProductLogos/LogoPluralsightMono.png
new file mode 100644
index 00000000..47c29da7
Binary files /dev/null and b/dist/ProductLogos/LogoPluralsightMono.png differ
diff --git a/dist/ProductLogos/LogoPluralsightMono.puml b/dist/ProductLogos/LogoPluralsightMono.puml
new file mode 100644
index 00000000..2361c8c2
--- /dev/null
+++ b/dist/ProductLogos/LogoPluralsightMono.puml
@@ -0,0 +1,12 @@
+sprite $LogoPluralsightMono [70x70/16z] {
+jPS7aaCX240fYi3zxxkzC8a8QM_gRf8tWC3tmylX8KlLp5JNPBp3GA9-WQq1ju1JVOi9jHrYdgEzW89ZZzRn3FCQgGBn5dOAXyoxp4BIH8gID5bxYPVK6ZQ_
+HzElIRysvlV0097bTs5OLLQzWLRv3EnuHj7tezL1zYT1Ioo0qXy5oMEjsyYIK9GrPZnxmSphkW_xiY1yGje9HZUdX_9fOHkDEINuWFOzG0p0xWk_abxL74ZU
+IVoVDziv9Sqj5BUrUCPdkBQpw8o5bNELvsVKEukvOSZafyhJiZqp4ij5lvogh01oi23y_zJoAXl0EbZOEFnK2PBHGj2JvJEJK17vTkhD5dU9QV5sPWZiQ0a7
+n1ggh1xXXiNr9wkW73TPOYZvWLDHbtrPp6-pn2FA1m6F_KAXNKv32J2h2Q3bnOAmV1gTgp6AquXxYyPaYiKfsNxvIQUpNhwZNiN6L0gPfHjp91O2uAIgk-_R
+xh-a0u33DgWU-79jGVdkbr3Lwgb6LvPXuGcBgtUxqmkvXa33q2HGE8eaNTB-HLCpYtW9_LbeRs7p4YbUHMHvZHNNtHxSlthtBz_Jxq3BjxJ-pRj_YU-_zgtx
+9RMcbjnV6qL8OMiVyGdKLZRyX9TxWOfweoo2Wj9Z2w4FYMqKEk1MS2wr48Gmt0iYCHDLQRm3
+}
+
+AzureEntityColoring(LogoPluralsightMono)
+!define LogoPluralsightMono(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoPluralsightMono, LogoPluralsightMono)
+!define LogoPluralsightMono(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoPluralsightMono, LogoPluralsightMono)
diff --git a/dist/ProductLogos/LogoPluralsightMono.svg b/dist/ProductLogos/LogoPluralsightMono.svg
new file mode 100644
index 00000000..19a75255
--- /dev/null
+++ b/dist/ProductLogos/LogoPluralsightMono.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.117647%,35.294118%,15.686275%);fill-opacity:1;" d="M 1.09375 35 C 1.09375 53.726563 16.273438 68.90625 35 68.90625 C 53.726563 68.90625 68.90625 53.726563 68.90625 35 C 68.90625 16.273438 53.726563 1.09375 35 1.09375 C 16.273438 1.09375 1.09375 16.273438 1.09375 35 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(92.54902%,0%,54.901961%);fill-opacity:1;" d="M 1.09375 35 C 1.09375 53.726563 16.273438 68.90625 35 68.90625 C 53.726563 68.90625 68.90625 53.726563 68.90625 35 C 68.90625 16.273438 53.726563 1.09375 35 1.09375 C 16.273438 1.09375 1.09375 16.273438 1.09375 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.25 16.40625 L 26.328125 53.59375 L 55.78125 35 Z M 29.53125 22.355469 L 49.632813 35 L 29.53125 47.65625 Z M 29.53125 22.355469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 19.6875 20.78125 L 19.6875 49.21875 L 43.75 35 Z M 22.96875 26.535156 L 37.296875 35 L 22.96875 43.464844 Z M 22.96875 26.535156 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoPluralsightTwoTone(m).png b/dist/ProductLogos/LogoPluralsightTwoTone(m).png
new file mode 100644
index 00000000..77f5c08e
Binary files /dev/null and b/dist/ProductLogos/LogoPluralsightTwoTone(m).png differ
diff --git a/dist/ProductLogos/LogoPluralsightTwoTone(m).svg b/dist/ProductLogos/LogoPluralsightTwoTone(m).svg
new file mode 100644
index 00000000..c7cb7b36
--- /dev/null
+++ b/dist/ProductLogos/LogoPluralsightTwoTone(m).svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="32" y1="63" x2="32" y2="1" gradientTransform="matrix(1.09375,0,0,-1.09375,0,70)">
+<stop offset="0" style="stop-color:rgb(3,148,255);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(0,99,172);stop-opacity:1;"/>
+</linearGradient>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(3,148,255);fill-opacity:1;" d="M 1.46875 29.96875 C 1.46875 29.96875 5.222656 30.164063 11.992188 28.398438 C 17.679688 26.914063 25.488281 22.324219 34.984375 22.324219 C 44.449219 22.324219 52.28125 26.960938 57.96875 28.441406 C 64.78125 30.210938 68.535156 29.96875 68.535156 29.96875 C 66.101563 13.628906 52.015625 1.09375 35 1.09375 C 17.984375 1.09375 3.898438 13.628906 1.46875 29.96875 Z M 1.46875 29.96875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 1.09375 35 C 1.09375 53.726563 16.273438 68.90625 35 68.90625 C 53.726563 68.90625 68.90625 53.726563 68.90625 35 C 68.90625 16.273438 53.726563 1.09375 35 1.09375 C 16.273438 1.09375 1.09375 16.273438 1.09375 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.25 16.40625 L 26.328125 53.59375 L 55.78125 35 Z M 29.53125 22.355469 L 49.632813 35 L 29.53125 47.65625 Z M 29.53125 22.355469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 19.6875 20.78125 L 19.6875 49.21875 L 43.75 35 Z M 22.96875 26.535156 L 37.296875 35 L 22.96875 43.464844 Z M 22.96875 26.535156 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoPluralsightTwoTone.png b/dist/ProductLogos/LogoPluralsightTwoTone.png
new file mode 100644
index 00000000..56d09891
Binary files /dev/null and b/dist/ProductLogos/LogoPluralsightTwoTone.png differ
diff --git a/dist/ProductLogos/LogoPluralsightTwoTone.puml b/dist/ProductLogos/LogoPluralsightTwoTone.puml
new file mode 100644
index 00000000..eb88c4ca
--- /dev/null
+++ b/dist/ProductLogos/LogoPluralsightTwoTone.puml
@@ -0,0 +1,13 @@
+sprite $LogoPluralsightTwoTone [70x70/16z] {
+jTC9aeKs30JGbcHho_tlcmBY6GyO6wZAgvsblzNYut_7fQhjj1OXl4VL_CHKy4en7rD-VWoVCC4JrHUCiIB-GCMS-ZECUsJ-LC4TzXTqNSdt6F6NT3xEznZo
+UA_YnE835w2dyOaJEX9Nvh5cw7XS2LciTJFLc_lYiUAB_GW0qkTxgfEpiiUStxHYxFt4DURA-343YkyfX0tRayFuDGLKjnJsWas96GO07dy3BFij8wnQrk7S
+XeP_bo0-7ydkKoWspekM2K2CKhpqnUfywGNWSKeuzPF8h6K5oarAbFvxQIrR31XG9oc4xjKZLM80q4cAUFiRT2thACLcATiaNIFrfcM2prCYj1lBPRXqNgJi
+IdS4RIslKloKqgQgNMHvczAMu_SBPrYUEO38t58oMotxOz5goRzeaMBKlTV-27b6q4aA2pQolzS-bxm8e4nITdmCKu_0o2i7v2v5iAkvQQtcY08qJd7fVljd
+lJbK0VWefM3dEMkruL5TZaQwLclUYVReA8MFMtshOuPDZ5BO2o3_7OGq9sJu1VZnMW5urceJsF4bPN-ju42UKug3dS8ZypUbvWAX7MQajFNEAHgx-vOqbmWD
+ZLCaSgcY6G-lbck1NkGtWXxb9nL_bVp0SLRpjI1SwFUGdhqCOGpfnvDyxyO9jpZo6SKCMJuGWWM9VnPIyK2DQOOHdYbnVmx2SwmnEeRWBIhg-HCGLXbV4R48
+Cs7kNm
+}
+
+AzureEntityColoring(LogoPluralsightTwoTone)
+!define LogoPluralsightTwoTone(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoPluralsightTwoTone, LogoPluralsightTwoTone)
+!define LogoPluralsightTwoTone(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoPluralsightTwoTone, LogoPluralsightTwoTone)
diff --git a/dist/ProductLogos/LogoPluralsightTwoTone.svg b/dist/ProductLogos/LogoPluralsightTwoTone.svg
new file mode 100644
index 00000000..a9435140
--- /dev/null
+++ b/dist/ProductLogos/LogoPluralsightTwoTone.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="32" y1="63" x2="32" y2="1" gradientTransform="matrix(1.09375,0,0,-1.09375,0,70)">
+<stop offset="0" style="stop-color:rgb(94.117647%,35.294118%,15.686275%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(92.54902%,0%,54.901961%);stop-opacity:1;"/>
+</linearGradient>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(94.117647%,35.294118%,15.686275%);fill-opacity:1;" d="M 1.46875 29.96875 C 1.46875 29.96875 5.222656 30.164063 11.992188 28.398438 C 17.679688 26.914063 25.488281 22.324219 34.984375 22.324219 C 44.449219 22.324219 52.28125 26.960938 57.96875 28.441406 C 64.78125 30.210938 68.535156 29.96875 68.535156 29.96875 C 66.101563 13.628906 52.015625 1.09375 35 1.09375 C 17.984375 1.09375 3.898438 13.628906 1.46875 29.96875 Z M 1.46875 29.96875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 1.09375 35 C 1.09375 53.726563 16.273438 68.90625 35 68.90625 C 53.726563 68.90625 68.90625 53.726563 68.90625 35 C 68.90625 16.273438 53.726563 1.09375 35 1.09375 C 16.273438 1.09375 1.09375 16.273438 1.09375 35 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.25 16.40625 L 26.328125 53.59375 L 55.78125 35 Z M 29.53125 22.355469 L 49.632813 35 L 29.53125 47.65625 Z M 29.53125 22.355469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 19.6875 20.78125 L 19.6875 49.21875 L 43.75 35 Z M 22.96875 26.535156 L 37.296875 35 L 22.96875 43.464844 Z M 22.96875 26.535156 "/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoStackOverflow(m).png b/dist/ProductLogos/LogoStackOverflow(m).png
new file mode 100644
index 00000000..2032f3d2
Binary files /dev/null and b/dist/ProductLogos/LogoStackOverflow(m).png differ
diff --git a/dist/ProductLogos/LogoStackOverflow(m).svg b/dist/ProductLogos/LogoStackOverflow(m).svg
new file mode 100644
index 00000000..72d4dba8
--- /dev/null
+++ b/dist/ProductLogos/LogoStackOverflow(m).svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 16.921875 45.042969 L 44.984375 47.089844 L 44.527344 53.375 L 16.460938 51.324219 Z M 16.921875 45.042969 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.34902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 19.722656 32.535156 L 46.949219 39.65625 L 45.351563 45.75 L 18.128906 38.632813 Z M 19.722656 32.535156 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 26.207031 18.691406 L 50.476563 32.933594 L 47.289063 38.367188 L 23.015625 24.125 Z M 26.207031 18.691406 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 58.617188 -0.0546875 L 63.179688 27.714844 L 56.960938 28.738281 L 52.398438 0.96875 Z M 58.617188 -0.0546875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 16.101563 54.738281 L 44.238281 54.738281 L 44.238281 61.039063 L 16.101563 61.039063 Z M 16.101563 54.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 48.578125 39.621094 L 48.578125 64.261719 L 12.601563 64.261719 L 12.601563 39.621094 L 6.859375 39.621094 L 6.859375 70 L 54.179688 70 L 54.179688 39.621094 Z M 48.578125 39.621094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 16.921875 45.042969 L 44.984375 47.089844 L 44.527344 53.375 L 16.460938 51.324219 Z M 16.921875 45.042969 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 19.722656 32.535156 L 46.949219 39.65625 L 45.351563 45.75 L 18.128906 38.632813 Z M 19.722656 32.535156 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 26.207031 18.691406 L 50.476563 32.933594 L 47.289063 38.367188 L 23.015625 24.125 Z M 26.207031 18.691406 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 40.539063 5.734375 L 56.34375 29.015625 L 51.132813 32.554688 L 35.328125 9.273438 Z M 40.539063 5.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 58.617188 -0.0546875 L 63.179688 27.714844 L 56.960938 28.738281 L 52.398438 0.96875 Z M 58.617188 -0.0546875 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/LogoStackOverflow.png b/dist/ProductLogos/LogoStackOverflow.png
new file mode 100644
index 00000000..7b75dac1
Binary files /dev/null and b/dist/ProductLogos/LogoStackOverflow.png differ
diff --git a/dist/ProductLogos/LogoStackOverflow.puml b/dist/ProductLogos/LogoStackOverflow.puml
new file mode 100644
index 00000000..b2f085d6
--- /dev/null
+++ b/dist/ProductLogos/LogoStackOverflow.puml
@@ -0,0 +1,11 @@
+sprite $LogoStackOverflow [70x70/16z] {
+xPP7pkim30R5hjp_mW-MKXYwF2eC_bLcRGmy-5pKFW6GHQtL01jWKMC3-eg5YnOT5YbQn0Pj5LHeB-Wp2wkATtuo4ke6rqO2dM1j9DP9SIITS1X9LnUQO6aa
+t-H7WaMDkAOmKc4dDrAXoOrKQ78Z5Pgo8q6yNz89f4PovNpKDEIG6mbdE1uqKNuajOd2GLDs9BOdl6_AZiJce8CcJeq4wZGAiIaz4dgFXARmPqjdSMXQU1_5
+P-5RamWJja0wIrvhBq0notzd8laiL4sLmFNgb6le9dIU9Is5zesNAQpUSbX_O8AlB5dwra9_GndzwjfoS8_OmyJvSuBq8qnecuwkCpRQ15dxcSbVkUUsuPhF
+J0rk6voo351s9ijQeicyHTAM2D3BXCiM3x0EKyjQL9W94VPnh9gsT8UfYWpdNPgrGFS49MGjs2_uZYLTH5-ne9hLBNS048b5L9tJrYoHeMIHWiMHjcW_XzCM
+kvrJjVmiIEV07pylTOlH_-5BIvwyvMVv1m
+}
+
+AzureEntityColoring(LogoStackOverflow)
+!define LogoStackOverflow(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoStackOverflow, LogoStackOverflow)
+!define LogoStackOverflow(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoStackOverflow, LogoStackOverflow)
diff --git a/dist/ProductLogos/LogoStackOverflow.svg b/dist/ProductLogos/LogoStackOverflow.svg
new file mode 100644
index 00000000..216b9a54
--- /dev/null
+++ b/dist/ProductLogos/LogoStackOverflow.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 16.921875 45.042969 L 44.984375 47.089844 L 44.527344 53.375 L 16.460938 51.324219 Z M 16.921875 45.042969 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.34902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 19.722656 32.535156 L 46.949219 39.65625 L 45.351563 45.75 L 18.128906 38.632813 Z M 19.722656 32.535156 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.74902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 26.207031 18.691406 L 50.476563 32.933594 L 47.289063 38.367188 L 23.015625 24.125 Z M 26.207031 18.691406 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 58.617188 -0.0546875 L 63.179688 27.714844 L 56.960938 28.738281 L 52.398438 0.96875 Z M 58.617188 -0.0546875 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 16.101563 54.738281 L 44.238281 54.738281 L 44.238281 61.039063 L 16.101563 61.039063 Z M 16.101563 54.738281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 48.578125 39.621094 L 48.578125 64.261719 L 12.601563 64.261719 L 12.601563 39.621094 L 6.859375 39.621094 L 6.859375 70 L 54.179688 70 L 54.179688 39.621094 Z M 48.578125 39.621094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 16.921875 45.042969 L 44.984375 47.089844 L 44.527344 53.375 L 16.460938 51.324219 Z M 16.921875 45.042969 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 19.722656 32.535156 L 46.949219 39.65625 L 45.351563 45.75 L 18.128906 38.632813 Z M 19.722656 32.535156 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 26.207031 18.691406 L 50.476563 32.933594 L 47.289063 38.367188 L 23.015625 24.125 Z M 26.207031 18.691406 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 40.539063 5.734375 L 56.34375 29.015625 L 51.132813 32.554688 L 35.328125 9.273438 Z M 40.539063 5.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 58.617188 -0.0546875 L 63.179688 27.714844 L 56.960938 28.738281 L 52.398438 0.96875 Z M 58.617188 -0.0546875 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/ProductLogos/all.puml b/dist/ProductLogos/all.puml
new file mode 100644
index 00000000..63485660
--- /dev/null
+++ b/dist/ProductLogos/all.puml
@@ -0,0 +1,225 @@
+sprite $AzureAPIManagement [70x70/16z] {
+xPU7jjmm24Gr56_z_zzDyLiKpJl2aKalzvIj7Wy8XDn-DVy1H0Ij3jIsZcj9IdnxXsjPWpcdO-HXVByU5_erAk5D_QGTYV-3jLy6RSr9-cTuAfE88CdNOb3x
+_RmbADqYHKaaSxCKpw7NXPZiwuOFxWDHLH4ih84cPg3RICl9pS0smfOM09FlHcIfeZJfks2jf7mcOlBAiTjYn_DdihU6iefGpomZV568L5I4dCN7iWgLHrK5
+fNWY1aasWMKiLB8UvytQRJhBeiRGFo1p7BYa8sBJ0vNj7PvtdkVRZUOZCJBX7b7b4SLVajq2urWHf-BXm4smTwTDPBW9BLqZMMlODpF7zPAtBEyGXsq4KOmh
+wud-qHYq-_CJzsrm8ya-WtIitvulxjAjUn9HEhplpyuZB_C-H-VBU7aEt8OkPZnKC9iUU18M_xFP9DH8t8w9uCN6AbVkBSQ7u9WxgzovAHYaNVDuCh4SSv50
+_D3B8rNHHi16eHkhtBfX7p2JDW4TOvKzWOK9UgNayknO1sD-bGvgPv1xJ-qkWkBCkRpPkU9BCKWheEwMd75BUFLGm8yGjQoWrqO_W7en13SpfuOvXoPTTuw3
+oLWtuzAAYD73U1r01EtNyf-F
+}
+
+AzureEntityColoring(AzureAPIManagement)
+!define AzureAPIManagement(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAPIManagement, AzureAPIManagement)
+!define AzureAPIManagement(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAPIManagement, AzureAPIManagement)
+
+sprite $AzureCDN [70x70/16z] {
+xTLLWWKn24HH25Pl_miUTrAjdvEpWDiIGUvObcLHyyZCS9FBHcHz04Bb2etwWbSXSua7XH-D3wNJoEDmvCEGxbYai9t1wGYWhUAqGYD8QInoZbTWSbJo2EhG
+LWqthuqAnjvMhGvDo1Ql6Ppxf22HJZZh0KRRkrFWb6us5k4Lx5UmHLW5BC8hVg-IyixoBn8XolN0Pi6-iRzlSO1APwShAPso2YSJUR5Y_bDSgYZuvZrUoMCN
+DbVoebe55pPCFBep5UFJ5KSpeV99PyQmRqFdv7zRbcLPdW4
+}
+
+AzureEntityColoring(AzureCDN)
+!define AzureCDN(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCDN, AzureCDN)
+!define AzureCDN(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCDN, AzureCDN)
+
+sprite $AzureWebAppUmbraco [70x70/16z] {
+jPU9aeGW34Hpjl__nrjpCSG6PQZQLyTSyWmTuxeomZmI3pBSP0iDLD9_LgY89Cw4_kB852cQ3Oy3yASD0ton43pGgIPloYaBvO6XaM7wKkkbfYwB_dFKHkj2
+9KNZG1R5lKQDStHot6gA1JOvbKU4BbkWPF3yX3rLaCLE2jeleowYyr8imOKoyR3ZIvAZ4kCcFomvEIZ0g301xuzs-dcfcDT2OudfJ2E4lzqaSS0c6YTBlkDq
+H8INxm7_-2f9bd65Ufwfol2YjRK9du-8SuLrKRPl4hXif9EPBW-r_fUWS7cRcDUlutZ9F6fja6PWCOvbNatCB4fjFaEdsBCKr6DhHzrDqzrufdEIBZVR0iU7
+T5x1k-JfSnoLw2joRhLo9OQ3yNC6Tg59aJY6G4lvb6yKIHupT3m2HcqImJ77kc3oymm4P7qEWL8busfEzwBKhfoqKoRCDmClps7URy-E6x9rn5hEDFSKoYoQ
+W7Q1rfxvSGi-nV0TBgsKakPvMXlkDM2dwVaahj-gjLeUFxUt7Sbpt1gaj3TqcLtDeDRZWZkSPKjaQGqlIyWIvx5Kja1R5XXRd89H0I7MNLcWIx_xkQ4WnDSi
+c3LftoA-RQa4vRAIRbx-kwTAIuQT3c6yvUFIbWmd8CjK4-QH2KGvBcYGspckgJlNI3mDI1VXSESS5qMZ3C0LCTTWSKCbqomURVhxKYZJp8ZCHCbv1IpSl1Vt
+DCTb3LluQxIfOSd-fa9-8aSEcFo8OQSGnaezSDd58W4WmrN-Wpy
+}
+
+AzureEntityColoring(AzureWebAppUmbraco)
+!define AzureWebAppUmbraco(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWebAppUmbraco, AzureWebAppUmbraco)
+!define AzureWebAppUmbraco(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWebAppUmbraco, AzureWebAppUmbraco)
+
+sprite $AzureWebAppWordPress [70x70/16z] {
+jPUBbgGe44GZdmZu_z-xGvPssWrMMxixTzuwNYAom7CAArZKV60gZ7y5gN_7v6C50J3_YT8d3ZDWqdpe4NUNiFa2UHZ41tIhCNeWyGCC-FAmChtKzAic7zFh
+lvLnXPubIOsuMoYUQuZdEQxt6pqg5F3DKgAgzDZYD1d4pc7VAYOB_r0ys3Sa0Dr7OVCvw8mEkoUsT2IA1HGPxUO_gSyGPZGiUbTR_L6OruCyIvZkD9YGmvsI
+lC4t6faiTenJN5NbUZrtyNIw9yiw8UK8LfhbfkLd9_p-YCWg8K_fnnMx7umkBifYUn1Vx-WqtBcct-UdzNXNPfsssQHPM7WUotqQlRFGpSUS8E7_Pab8z7cZ
+sKAiQYeq7u0dqusqKbhRtCrBxPlEJymjvzEdRLEwf6s5a8XFOMXE8g-7sBoKOb79cl-S0R_H6E2LHwE-drJ3k9fn3ilSCoMr05ptRpG3fF7w2F3qCG7L0Dyd
+Ae6RN0PZ691PdX0o3sX8gEuB6e6-qlnu5nbTuXZ32z1MaYZ0BMSWPxT0hlMa0kia2AmWe7EuozTgOtZlhTQ-xxMsrdjhTMGhU57b34D7W_aCQy71jjTqNonS
+pp3p6yuEJoC4iNohX2WvDav7G5zXP7LwDEviu2D9JfJsm33mY9lOuXmNHGcDvaZFQVS8re7sxWpIgr0l6FGz2ALbCDeL6x-n240DlFThfPALuWRl1MOueDdY
+1Dx6kdgfrBDItB2zGWfIunDG7mTekrQwAdr4xE2Ar2mivYZxljDD9O-_W2eks6oniDXbVKKg3JPR8Ej6UyrA7KYbe8uhLD--jo4bLhjKsf0VV8z23Roz_Rf7
+L27768_rbLAvmU9tTSo8vOxfG6xPFfRtL2fg3ASeRh_3cdjioneJEDRVq599z6hR2EzHVnKfn_hAgQnHgEPskQUTWnpq3a-beKMjgT1CCTZNDjasj5GoHnHg
+-1LgGDsFKw3AkVDAv68Km--uW_gvPUB1GucHoy0DJwW2wSSfY4AdacD2ZV44QZmq5G0a78VIXsGpF8CRWTlE0CfX2MKpe1GyHKRguiVf2HWW1hQ2vt0pWABG
+WP-NFw9K1i2bZhFKDYE0IcDyYDIgkC1b2l88AMqpeJ-mbfREZs4hzG-RA-5ly0y
+}
+
+AzureEntityColoring(AzureWebAppWordPress)
+!define AzureWebAppWordPress(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureWebAppWordPress, AzureWebAppWordPress)
+!define AzureWebAppWordPress(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureWebAppWordPress, AzureWebAppWordPress)
+
+sprite $LogoCacheRedisProducticon [70x70/16z] {
+xPU5jjim44H5AzZPz_-VM_A9x8uSAqTEkVT1I9hCai7zGluJ9MT9tjqWLTY6vaKXds57Qbg8fC8wQuQyg7sZFfuOlecYHlSYeNGR-ksL5WcnPqXUocYp0uyG
+8go34kOsEgZIbwjzHqjNXRKTb1I3tpyZ7J94XMM-hfMIHVfNN9G-zZNGLfjsnU8yR-VISs5DUoQ2w2PAeNnyaA78_GLnHmJMwHgiifK-g7Mu4uGaDcm0efJ9
+8u4rkWhJR2UJIgQrJrM0XcSonGRELPfk_nwWHB-LBHRO6OFARaEFXWmAOw1sYhRHrGYq5adHEx4HqARHa9OiSI-Qnua6R09FMxLBYX7Kt1lHBW6F_FbXHAzj
+U-VaQWc-JMsUnHunJv2VhIcmEMepchq1KBkjW8RURglikx5gY3TgMmk5e56U0xKta-qDg0lrjeRGcNM96bs2tQSkYxn_ZjHKRsiqQi45LEdf_Hb0mreeJDDb
+6nYE5NF65AJnW345dCP64p0tD7vU8rrkpmsfZgUq1xw05yyBozVWvuOmjH7SI2YdsrXqVcyYEcH80UYGABB1nFhImMsA5nZ16Pt1cMQG_S8Dx98DDiJzjK8e
+81kBn5nRgoLvzylupsS
+}
+
+AzureEntityColoring(LogoCacheRedisProducticon)
+!define LogoCacheRedisProducticon(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoCacheRedisProducticon, LogoCacheRedisProducticon)
+!define LogoCacheRedisProducticon(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoCacheRedisProducticon, LogoCacheRedisProducticon)
+
+sprite $LogoCloudCycle [70x70/16z] {
+xPRdOcin28CDGhp_6tUtIGZokBa_pzSzeYE3Z3t-1nSNvX_OImfW_XBsZngH3z37EP5Fq4wDPCkP7Ky1Jfre6KUG3DXAH8FOB3Xp6ws3F264Ifv1QULrcJmc
+3Xf4k7g4RIteBnkskoRE72CtTyOqzzi5dZtBKd7Y1TM2ND9ih3pKs-tk5rYfe8O0Ra_UGZIwp5jm3DHIibU1shByV75zYVNJYqB3ynFMbqIxR3KwObdizDv9
+c9Z1Q8TpLvMuIHjR8vzVgB9h3hTwiZN68p5iFcAa1kxzEHfz6nMdsDdG9rKvFasbRnZrTB3CvEyeyaYbCI8b9boAvWfYyWZMhclatyEQZYa2xMzTtMSOS3VF
+mfDRGgNFTQM_cXjVIcIuJT87VN8DZJF5DjXMiT1ZEFTKF6QDHwC2gBjkrT27A8Tzj-yJ85O1j3R6Q6gb0uXaPoMjAPPQYdzBYak1JoH4twiLBHCkiYDl7wKl
+X5l9dmPbVd_YRY9_siaQyFpIknF0klqlBYxU0G
+}
+
+AzureEntityColoring(LogoCloudCycle)
+!define LogoCloudCycle(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoCloudCycle, LogoCloudCycle)
+!define LogoCloudCycle(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoCloudCycle, LogoCloudCycle)
+
+sprite $LogoDatabrick [67x70/16z] {
+xTL7OYGn28NXKce1zx_lZ3CEI3zMRVsM3by7ADu5QRDT4094v0vIfxncraFW8Px70LBU04VABu4XFpFAEU18LkYoJa_ESPVPSW0Wl0YCL5m4pgFo8Z1IS8wS
+KHXWX1U1qtcEgGbt0XWnlKcecDr2r4pC007WdJ0x19muUYDcJXmXQW4H800u4ICCE04804umuW0GZX3WnB0e27YqNTV8lf7mxyRRoSiWQa66NwqP8WHylPyr
+HdR0V0SSaH1P0N6NT8ko74DSvsgvQ5Zompyr0b79UmqmeZ_wEQW19U07uW0Y6fJyieWOy98tpJvIknwH308zmeXkhhZi_qJvjzmZ2W3qo5-F80048T5Vq_Nc
+nwzZ1V0Lvmh8NV4gWC0LPoG6v4SDD0sH9H3MGDTyZ_HhaM4Oh_CxY0DXWZM95e6GkG4c0pvXMWH6S14uJN4HE5rn4JY35Y6F0F0V
+}
+
+AzureEntityColoring(LogoDatabrick)
+!define LogoDatabrick(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoDatabrick, LogoDatabrick)
+!define LogoDatabrick(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoDatabrick, LogoDatabrick)
+
+sprite $LogoDCOS [70x70/16z] {
+fSy9ZeCm34PXiZbnxd_WCRMcuI6wu3xjF_YJidsiolPxjNVv7HcM_8wGYIDM_naX4qV8n94uCqwLa9A8r0019eoaJARwTXDfKXwCUdLjjn0vCcrjzv0Zqx3T
+G_n4J4csoThk87uYqz9ao3qcoR7vQ8Y0kOd8s14LkSd8AJMb2yiVbIAe-uDGspvN-h7vQ1odpqZQ6I8wd06ItY6bPZ0xKclV6I2bfdT8TGO86Fd_ZmmHC8uy
+6I1aYFmpJNiVEz8gcA5swmiP8iuqkr_8OcpJNEiRnbQS0E56XWWO7d0ZGuGDksXVR6HoHKtjebziKjd6SZkcKyMOqpQwCSV94J14Sch644cfEKE43954PaSi
+yOq86I1Wn92S5aE40Nao2m4ZwGKoEmwSMHiOKKtNY7tcWJFdJNoR8rqZbX-0yOsCHOR8p8drEVLY8qF4QXaLlTokcJ6VoUbWjCKGiJ8KC4IshIw6Y1OYP8Y0
+UO-GMKZQm7n2o13P6MrV8MI8EFC60QFFfAWQiggghUhAaK-C8sI8VCUaKqBaIwOHoKHkC564J1WX4qIkcJo0X9Wp4cCAaHXJ54YG8H9aY0GP8a66I8mX4gmJ
+2JD0uWoGE0CapX29Cv-HFm
+}
+
+AzureEntityColoring(LogoDCOS)
+!define LogoDCOS(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoDCOS, LogoDCOS)
+!define LogoDCOS(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoDCOS, LogoDCOS)
+
+sprite $LogoDocker [70x70/16z] {
+xT07Tfqm48NXKPjsP__h3IhOF0x4fDVlD2xM-qD4lz9_fGwPlWcyWtnZnOPlhvZxtrLH_QfxuJZ2SAua-R3YxcO6xVhZjeLUgNlwiD9XN8WFvqg1c7rpHKp4
+vLihfYA2_8qLbuqANHBj7AlIhMVNuQKYJhcKH6U-M7Ti-VBoFn9CaYuhvdwiz7cgiCd6RN1yPIL3HDGcy5TMIEqjuaPVLqdijaTWYTxKxgFRHTqqDfYAzfU0
+DtfN0FWpPYhI8yQjPZggC9Cle6PuBQH3vN73NDUF5skpegB7ahhhrNDVPeP2csOqP8rmOPWx8k2cdVNHrtci1LWfLJn2Cr6gRU3dj-iOkErgebrls1Ehn7H5
+7rPyChfKSSg8tZSSYQwTAitBRSDHw0RxIuP3xYELxYH_oIZBJSFHw5x1ohWRsrrYVSazSTwqadDASjteCdsUQEboTrrmQAAFY9KT-nLKUg21oo8N3QPdibcx
+_Xfue-UAGcQewdi2KkZBfAPmbOsv0-7QCdsLL5fZvbPBfZzL0jEzYa9Fr32w9y5_JgKe0ffNfHhWalUqZR-jIlRszlBjI1Pt8eq1DYhx6iUJhJKh1I7d8oJZ
+xzgpgUWsZFhYRLb49I8Bj6q9ZyeMCLf7gF-WpgIKLFhek5TgeAo5DDSYOJDIzfSMe7vajeGc2piiZqQsrlxXbiOntb_ms_8eDBMmm-8GGkHZnNk4C8_eYAmZ
+XvCrxB1QwBbIg8l8uzfHvnffZ_h-hn-MZ5ME5UJzMxAlozah4aP3GhINLTVQAol3OGNXcOwLX7c5QLnvlbgh8Zuo2UkUZnLg4SvD42XqNhmjOO7t2gUPgH4G
+LlYnGXNHUPxHbyLpMGyoRHbz_u7H1dk5KXELIfzVMTAsf51NHTTJO_hH_li4
+}
+
+AzureEntityColoring(LogoDocker)
+!define LogoDocker(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoDocker, LogoDocker)
+!define LogoDocker(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoDocker, LogoDocker)
+
+sprite $LogoHDInsight [70x70/16z] {
+xTPPTlGg30HWkai3IAZslzoRjdFCjNlufzTyBvdh22G2xUp7ZziTz_PFxXR5Xx3sjpJ9YkxkOtBgtsLCLXY-QNAqFpTONO35QzxQ7qgcu4pd_CDj3WQUo2nf
+Vy2PU462_RS7P1GvN4Lm9QD-SrKeXYlUa2Yq1t5fxqdHiH6y5FLebP8SxuTr2z6HgnuvLoOpMxlNqAIrPzAJNpgWLNtzrRNbHiLCTAdvLCGeVYaE0Ec9GzTp
+HaIIATqHn2M3P7RJ6G2ik-5W-3_DOgLfTC3fhIsT-xXB9huCKLneTy561oc-5IYCThZFFGE8AG34iL4SEbcAZPaNlbKznglhFXzJyT1horB1ncNjvvSq0I0Z
+emIxP6jQnADd3C63rnucrsqL2-IqVUWiVIfsWytAArgRJ6oa72TZxQlgmCQq6rAE59HPH1kSWaq4piPA5STEqO5SsnK3FJgENLFgDMMib5FZ0z-SD8ox5GTs
+6RZeWHS4qh5gwHfMBC56QRZmYPTKLygzZCpgHt622wNWis2RvcQK8yMkeoPKV3RPj7gViSxxrYiJB6NuICZMD9AELNy0Pi1IZe_wVewCYeFJ9F0dAPEwdsN1
+aZFrNB1XKS65CzjpYZBUzoWC5rh4Ibdgt9CnSH1JnObCMjiuzHIEHQpNMBCl48OB3dQ4DADXwRa2Ht660f0kHrl97Aw0g2SdsZUmO_7Z8XgieTX9x5lY_EB1
+MMHbHpiOuzp_lcLKTS5YJ046lsZDzYHPECVKdAmXbn6jL8mYkz7RbJCk9rbwH1US6IdJB5nrpXSXfHdufK7s-mpt_kB1O2o5b-1Nvc1jpv7fxUh6KW3LyGjA
+AKfxxSPSTz0tMPyi8p4usXkv_RrKVt4bEvRfsxbxmzdNNRRhsCd0mKfWdEsTkRSvr-1dpSoSnS1X3a0_fA3e04Qjb3JpoN9RvPLyJcctPBfNhfJHcdC83ahV
+J-BjyrkV76lKlRKviCZCFPxIFhbtskdr675wiyjt2jf7MUkyQ6jDAAizdADtzy7PFhgjVWJRbxMamL8VyT1lxRCgE_gyht7_XYJptdwNJCvX0c1csrZfLbcq
+Fu4-oPdht_6ORi6wjJzqKnzZDNEGQpb_xowdZ1y__WC
+}
+
+AzureEntityColoring(LogoHDInsight)
+!define LogoHDInsight(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoHDInsight, LogoHDInsight)
+!define LogoHDInsight(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoHDInsight, LogoHDInsight)
+
+sprite $LogoHockeyApp [70x70/16z] {
+xTO7ikqu20JG9iF-5_oIxmZRvJoLlyy248LQ0LUyNgyNiQYQnuzi4U5cAiA4Ow8MMUV2JGWRI2pgbdHbB6ZK8sdTacMjPBYxcMapC_V8h1MVwd0ksnGw6xvQ
+r8m1a1f225Unrn3WRaDm2tL3rYK5TzMG_wDARbH9mZrMWzUGVBD8uvenmbMIrHnMSowuW9SvJGAYba8P1qWyQ-X9-DP9CsMczOMn2ErwLxHsvKVjybx6ww4E
+F07WU5H3CKnDaMNT4u8VCfNYqLTF_rme_JSBmm_gkW3hXKfXWZzazKFHEvrAysjeirQ6cp0-nEiFuHVbhCj6n2AY4v5LV6ICKJ7Xd3TBECCQDLWlcyk-JPbs
+tZjRpKqnOzjJ-66_t7rpKa5e3-CRWfNxiNF14fNslN69AqtxecWvZWITnYx3kDyaGRD5xC1Y7blFxdpp9AegCHSTksNmFeZGPhdbxOSkJHdjv8yYMF7LBwUN
+NrwPUVpqS6pTb_5dyyvKjCqwvzAmYpJh2cSSEWzCAECI4ZNVoeiAuuxEYuWm4n7-6Q_Nwni
+}
+
+AzureEntityColoring(LogoHockeyApp)
+!define LogoHockeyApp(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoHockeyApp, LogoHockeyApp)
+!define LogoHockeyApp(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoHockeyApp, LogoHockeyApp)
+
+sprite $LogoKubernete [70x67/16z] {
+xPNNekqW24H1RF3__tjB389xJZylj-prb480PyJGHRKN6RNG1KjNUub9YUvFTPgZZGuaNgKeIgY_ZhOQ0VKE6wbieGtl8hwwwMyB4z4E7NSIQeR5n9nEHAA-
+N1bgShKwAnEjh_kXupXaSRGIaQmSrmAkB55LcAZC54-RU9go3r-ulzUI3KLXxA16viWIQLWXscN1vtptmhij5OeiA4p3ZHITRzq6v-SepB2CR7dBz2nBTNzn
+DkF9CRTEDtQi9G-_bzKx2bCiqrRFoeJqjLwsJ7_DkHc-PeOlG1zqH5cYbj01pzrhHs4mirXEKslnC9YY26Em_nZhVcl4KCRfA4kK6dL9xt6bgtiekC6wOPRP
+9HyQpM_gKCnY8CjoaX_SpVS53rWvP8co6HPuLFJn6uasHgybnmfJ8EMuQtse6PwWDPTluzfvvuxJ6MNoS6iweSeg8Q5UpjApRcrKfkFJM53jwb_Ej1DOqh35
+D8xMaxng3zHeXbVVDUPaXAi9yLO3ZNDfxrrFhBnQWIyOCZSlBSVUrNlE6RltE3pMnsfgx2Tj9N7DWexdo-wRMWk1ndKoS9YLcDb5J9CB2vpq63jUUrNcVTzV
+JL9eC-5bZJaGyN8y34s6pOoQ1HY5moiVoO9k3Zffs2fFxRNmFPrMSTDEEa2Z9chE9E01C1y263MW0RlpJUtQA-C2lzOtpq69texQ-eRyQDIKRe3MZlOWpJxC
+fDSPzW7G7ZJgOmW1ODIRe3r8iGy0zW3rEye6_JlA1lLjRJhJn-3oAan_7q-UF7do4m
+}
+
+AzureEntityColoring(LogoKubernete)
+!define LogoKubernete(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoKubernete, LogoKubernete)
+!define LogoKubernete(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoKubernete, LogoKubernete)
+
+sprite $LogoOkta [70x23/16z] {
+vPC7Ri0m30CzjVx_u1eEbJ03xGDAh82GpeGKbGzvHBJVdRzLOscydFuVARMr-aLfIt2aBTL70rbLF9PiFYbr-tCvAIjRqsE39PPWHSeRKm2nygJq884Yx7Ic
+s2RN9sN4NKZ2QaaX256ab1OFdGMochjn_acGT0uTPNtXzAHCAh0ZJELehqqt7d9I31uzMHb25Egid0jtDWkPSfl2coBqR9cWO98NHHyRULAKAOEoI9hEMHY3
+uMKMXxsH0JCgaVj1iSaOkrhxbHxlDPZUJaYS_qidpDYV5RaIqt07EURGAOSrJig1GQ-ZQkPwNQO5v8fZIIbT032-RvTEHECbv298KWY3J_YCGI_Veuz25C9i
+L-FSrCY71HNOZgZENY1HbOgDw99W8rDD6_mfAdsxOttz
+}
+
+AzureEntityColoring(LogoOkta)
+!define LogoOkta(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoOkta, LogoOkta)
+!define LogoOkta(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoOkta, LogoOkta)
+
+sprite $LogoOpenShift [70x70/16z] {
+vPS7Sgqw340bLpNslzt_oV22x35OkTDUELFJ3kgNm3z6AesOHPYfbGGVW8NK1fGgme_8Nk556S8KiKUa1ECGUqKYyNJRqZ4UoEVXLBKGMk6PPc5wg2HnJJoI
+kAQkykVUQckTL_LQrIRRZ3JNYjJ4PlBNTttRKMo42qnajW5XiUCu26ueCkX5d49FXVrFkdzk0_JMHgyuOVY5cAV18zMqPwXssCswFnLUm6agb0fSQ4ZY8QTO
+LQL315Gp7e-VRw50Z3hVXpIEKe1pskHbWIYGJ9NLyyHkqbR1wmUYtV1EOZSAdXBlyhWf-Qai21loquZJsEQDI1xIPpznLIpyIQDBktuTZ8sbFEIlJd5iXnV7
+ycQwddehZiWAg2ildNzrVPiArFleACJAg-U3Jt2PBImPco6NudpsOWoauZOMQQbzEqpdcabBiAMU8qkNOggZEaK0ELQpXpt3Jz35RIoayqc8RrFzLiHkzdg1
+qwNuWZvCI8TrLeGmTJonTSWl2ghTbF7wAqJfyr_91y5aS_GXmtXbafeZkHJT5AOk2Lv0CGSjtYjxwdhkHmf8N2X3VLNKhaqjZpNHzNjcdnM7-_5C6oMAllbA
+fLoE-yu4_kF9RX2fm7Knp2CD5v_ndlvyJptSIq84pAMlVlfybkC81feOaSGqSOa7sO8mnjPrJV2a5RKjMc07RiCXX029xGNE42IHsXgAElmBwGYxdOY2fR7Q
+XN8h21-3AUUKu8_XFm
+}
+
+AzureEntityColoring(LogoOpenShift)
+!define LogoOpenShift(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoOpenShift, LogoOpenShift)
+!define LogoOpenShift(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoOpenShift, LogoOpenShift)
+
+sprite $LogoPluralsightMono [70x70/16z] {
+jPS7aaCX240fYi3zxxkzC8a8QM_gRf8tWC3tmylX8KlLp5JNPBp3GA9-WQq1ju1JVOi9jHrYdgEzW89ZZzRn3FCQgGBn5dOAXyoxp4BIH8gID5bxYPVK6ZQ_
+HzElIRysvlV0097bTs5OLLQzWLRv3EnuHj7tezL1zYT1Ioo0qXy5oMEjsyYIK9GrPZnxmSphkW_xiY1yGje9HZUdX_9fOHkDEINuWFOzG0p0xWk_abxL74ZU
+IVoVDziv9Sqj5BUrUCPdkBQpw8o5bNELvsVKEukvOSZafyhJiZqp4ij5lvogh01oi23y_zJoAXl0EbZOEFnK2PBHGj2JvJEJK17vTkhD5dU9QV5sPWZiQ0a7
+n1ggh1xXXiNr9wkW73TPOYZvWLDHbtrPp6-pn2FA1m6F_KAXNKv32J2h2Q3bnOAmV1gTgp6AquXxYyPaYiKfsNxvIQUpNhwZNiN6L0gPfHjp91O2uAIgk-_R
+xh-a0u33DgWU-79jGVdkbr3Lwgb6LvPXuGcBgtUxqmkvXa33q2HGE8eaNTB-HLCpYtW9_LbeRs7p4YbUHMHvZHNNtHxSlthtBz_Jxq3BjxJ-pRj_YU-_zgtx
+9RMcbjnV6qL8OMiVyGdKLZRyX9TxWOfweoo2Wj9Z2w4FYMqKEk1MS2wr48Gmt0iYCHDLQRm3
+}
+
+AzureEntityColoring(LogoPluralsightMono)
+!define LogoPluralsightMono(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoPluralsightMono, LogoPluralsightMono)
+!define LogoPluralsightMono(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoPluralsightMono, LogoPluralsightMono)
+
+sprite $LogoPluralsightTwoTone [70x70/16z] {
+jTC9aeKs30JGbcHho_tlcmBY6GyO6wZAgvsblzNYut_7fQhjj1OXl4VL_CHKy4en7rD-VWoVCC4JrHUCiIB-GCMS-ZECUsJ-LC4TzXTqNSdt6F6NT3xEznZo
+UA_YnE835w2dyOaJEX9Nvh5cw7XS2LciTJFLc_lYiUAB_GW0qkTxgfEpiiUStxHYxFt4DURA-343YkyfX0tRayFuDGLKjnJsWas96GO07dy3BFij8wnQrk7S
+XeP_bo0-7ydkKoWspekM2K2CKhpqnUfywGNWSKeuzPF8h6K5oarAbFvxQIrR31XG9oc4xjKZLM80q4cAUFiRT2thACLcATiaNIFrfcM2prCYj1lBPRXqNgJi
+IdS4RIslKloKqgQgNMHvczAMu_SBPrYUEO38t58oMotxOz5goRzeaMBKlTV-27b6q4aA2pQolzS-bxm8e4nITdmCKu_0o2i7v2v5iAkvQQtcY08qJd7fVljd
+lJbK0VWefM3dEMkruL5TZaQwLclUYVReA8MFMtshOuPDZ5BO2o3_7OGq9sJu1VZnMW5urceJsF4bPN-ju42UKug3dS8ZypUbvWAX7MQajFNEAHgx-vOqbmWD
+ZLCaSgcY6G-lbck1NkGtWXxb9nL_bVp0SLRpjI1SwFUGdhqCOGpfnvDyxyO9jpZo6SKCMJuGWWM9VnPIyK2DQOOHdYbnVmx2SwmnEeRWBIhg-HCGLXbV4R48
+Cs7kNm
+}
+
+AzureEntityColoring(LogoPluralsightTwoTone)
+!define LogoPluralsightTwoTone(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoPluralsightTwoTone, LogoPluralsightTwoTone)
+!define LogoPluralsightTwoTone(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoPluralsightTwoTone, LogoPluralsightTwoTone)
+
+sprite $LogoStackOverflow [70x70/16z] {
+xPP7pkim30R5hjp_mW-MKXYwF2eC_bLcRGmy-5pKFW6GHQtL01jWKMC3-eg5YnOT5YbQn0Pj5LHeB-Wp2wkATtuo4ke6rqO2dM1j9DP9SIITS1X9LnUQO6aa
+t-H7WaMDkAOmKc4dDrAXoOrKQ78Z5Pgo8q6yNz89f4PovNpKDEIG6mbdE1uqKNuajOd2GLDs9BOdl6_AZiJce8CcJeq4wZGAiIaz4dgFXARmPqjdSMXQU1_5
+P-5RamWJja0wIrvhBq0notzd8laiL4sLmFNgb6le9dIU9Is5zesNAQpUSbX_O8AlB5dwra9_GndzwjfoS8_OmyJvSuBq8qnecuwkCpRQ15dxcSbVkUUsuPhF
+J0rk6voo351s9ijQeicyHTAM2D3BXCiM3x0EKyjQL9W94VPnh9gsT8UfYWpdNPgrGFS49MGjs2_uZYLTH5-ne9hLBNS048b5L9tJrYoHeMIHWiMHjcW_XzCM
+kvrJjVmiIEV07pylTOlH_-5BIvwyvMVv1m
+}
+
+AzureEntityColoring(LogoStackOverflow)
+!define LogoStackOverflow(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, LogoStackOverflow, LogoStackOverflow)
+!define LogoStackOverflow(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, LogoStackOverflow, LogoStackOverflow)
+
diff --git a/dist/Security/AzureKeyVault(m).png b/dist/Security/AzureKeyVault(m).png
index 2d543fa6..5d904d3b 100644
Binary files a/dist/Security/AzureKeyVault(m).png and b/dist/Security/AzureKeyVault(m).png differ
diff --git a/dist/Security/AzureKeyVault(m).svg b/dist/Security/AzureKeyVault(m).svg
index 8c314ebc..a37d1a32 100644
--- a/dist/Security/AzureKeyVault(m).svg
+++ b/dist/Security/AzureKeyVault(m).svg
@@ -1,7 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="63pt" height="70pt" viewBox="0 0 63 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 35 35 L 35 56 L 37.917969 53.082031 L 37.917969 34.417969 C 36.964844 34.699219 35.988281 34.894531 35 35 Z M 35 35 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 33.542969 29.167969 C 38.65625 29.21875 43.019531 25.480469 43.75 20.417969 L 23.332031 20.417969 C 24.0625 25.480469 28.425781 29.21875 33.542969 29.167969 Z M 33.542969 29.167969 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 62.71875 38.640625 C 62.71875 28.421875 57.820313 19.460938 50.398438 13.71875 C 50.398438 14 50.398438 14.421875 50.398438 14.699219 C 50.398438 17.78125 49.558594 20.71875 48.300781 23.238281 C 51.941406 27.300781 54.179688 32.621094 54.179688 38.5 C 54.179688 51.101563 43.960938 61.320313 31.359375 61.320313 C 18.761719 61.320313 8.539063 51.101563 8.539063 38.5 C 8.539063 32.199219 11.058594 26.601563 15.121094 22.398438 C 14 20.019531 13.300781 17.359375 13.300781 14.558594 C 13.300781 14 13.300781 13.300781 13.441406 12.738281 C 5.320313 18.339844 0 27.859375 0 38.5 C 0 55.859375 14 69.859375 31.359375 69.859375 C 48.71875 69.859375 62.71875 56 62.71875 38.640625 Z M 62.71875 38.640625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 31.78125 0 C 23.800781 0 17.359375 6.441406 17.359375 14.421875 C 17.359375 21 21.699219 26.460938 27.71875 28.28125 L 27.71875 42.558594 L 21 42.558594 L 21 49.839844 L 27.71875 49.839844 L 27.71875 55.160156 L 35.699219 55.160156 L 35.699219 28.28125 C 41.71875 26.601563 46.058594 21 46.058594 14.421875 C 46.199219 6.441406 39.761719 0 31.78125 0 Z M 31.78125 7.558594 C 35.558594 7.558594 38.640625 10.640625 38.640625 14.421875 C 38.640625 18.199219 35.558594 21.28125 31.78125 21.28125 C 28 21.28125 24.921875 18.199219 24.921875 14.421875 C 24.921875 10.640625 28 7.558594 31.78125 7.558594 Z M 31.78125 7.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 33.542969 2.917969 C 24.792969 2.917969 17.5 10.207031 17.5 18.957031 C 17.5 26.25 22.167969 32.082031 28.292969 34.125 L 24.792969 37.917969 L 29.167969 41.707031 L 24.792969 45.792969 L 29.167969 49.582031 L 24.792969 53.957031 L 33.542969 62.125 L 40.832031 54.542969 L 40.832031 33.25 C 46.082031 30.332031 49.582031 25.082031 49.582031 18.667969 C 49.582031 9.917969 42.292969 2.917969 33.542969 2.917969 Z M 36.457031 14.582031 C 36.457031 14.582031 35.875 14.582031 35.582031 15.167969 C 35.292969 15.75 35 15.75 34.707031 15.75 L 32.082031 15.75 L 31.5 15.167969 L 30.917969 14.292969 L 30.917969 11.667969 L 31.5 11.082031 L 32.375 10.5 L 35 10.5 L 35.582031 11.082031 L 36.167969 11.957031 L 36.167969 14.582031 Z M 36.457031 14.582031 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 50.75 11.082031 C 51.625 12.832031 51.917969 14 52.207031 16.042969 C 57.84375 21.328125 61.015625 28.730469 60.957031 36.457031 C 60.957031 51.625 48.417969 64.167969 33.25 64.167969 C 18.082031 64.167969 5.832031 51.625 5.832031 36.457031 C 5.773438 28.730469 8.945313 21.328125 14.582031 16.042969 L 16.332031 11.082031 C 7.929688 16.792969 2.902344 26.296875 2.917969 36.457031 C 2.917969 53.375 16.625 67.082031 33.542969 67.082031 C 50.457031 67.082031 64.167969 53.375 64.167969 36.457031 C 64.167969 25.957031 58.917969 16.625 50.75 11.082031 Z M 50.75 11.082031 "/>
 </g>
 </svg>
diff --git a/dist/Security/AzureKeyVault.png b/dist/Security/AzureKeyVault.png
index 44c954f4..016cf3e8 100644
Binary files a/dist/Security/AzureKeyVault.png and b/dist/Security/AzureKeyVault.png differ
diff --git a/dist/Security/AzureKeyVault.puml b/dist/Security/AzureKeyVault.puml
index db73cf90..b38b30d2 100644
--- a/dist/Security/AzureKeyVault.puml
+++ b/dist/Security/AzureKeyVault.puml
@@ -1,10 +1,10 @@
-sprite $AzureKeyVault [63x70/16z] {
-hPVd0kiW28NBKC3tVz-xRuu9sj1n_dJnoOpMnrxIpIFSb1wlgyKuPFmYh35Ewg-v7bSvrUa-ieBglbVo8Yqhk9w_8s3htLyB7yv3_tncVyczeTQNIaO5HwXf
-HQd7tXuG8_fgrsXHJNjAgY3HMAtfpsUDWVi5nvgTTkqkUVVWDJsaahiFy6U3jgyylekHUJjMfvk-4tvSbiQVJvsY2jVW1j_FlEK9Wi7z4nTfW1ii44jMG-np
--1G7pRUxJSTgQMSJV9FfQw91S8xCrppwm07tfr2ZiCzd-yDGTwTCu9H905-IosxiF68elirfwis-azt7vNqHR-WKeJXb70mcNEeudYe4GY_WU0GDgPTnr9uS
-JIZZQBOuAbV7wS03DdNySSpAPtZxalV-7lvXwMprlF4VjIsEKSK0vTYsE4PLiSNNSOmgmwYE1pB6sp8kqo-6w8iu49bthYAEjiNyOL0HxvSZCxcdFz8rpkEK
-hk2CgamTJYbFfrO1n_cbCCDwDpYC8uKpx0xdoAboB7dIl-9fnQLbArvvDDPt0mSVKheXwMcGOa1z7O34uhn7-b0qoh2FINPpVJAPL-0MOvPlOuEyDnLHxHQL
-6oNulH1v5dk9xeNE91NwYlfkPLI-zMSvPw2yWCcZ9EcH7MEK2k9c7lXNBpls9m
+sprite $AzureKeyVault [70x70/16z] {
+vPO7hkGm34CjokN-9zuYZ84eBncli_r_ean_GzAAaFAvPFAGx2SHKte6aP_qn8zJsaxZbte4ePx4eVGG8cc_OhESnuAQCoqDgVD7fIXdylOUKaSDAw3aTqQt
+jv1X_0tVwGb3ICS1uTmjlZZi7Z842gHIRCJ_NKalYFb2vHuJ7tWXXPf_MGlLu-qVfHGFvsVvjBYag8JQLQO3Uau-bIwbYqmrtbfGqfKKcMWbBxbx2fg4bMCn
+X6GApUHPT60GQ9hnF72DUzilhUG4BR_KrPOI8NOQL7QRciaSR4n6ikaCcQ0onKW-aKiCB-2EMXXgYd5OJCFE0GRhdnFI9n4SfE4YqEc8g2Mb7HhDrpWhhhK-
+fyX_0SLybp8AfItA-en8uHd5Sxl1WC8zYzc5GE7iuZg2R45HKB2aDX9nJGLoirskp3Q67ioBdTOr8t5UxkvK46cLY84gPd2tNOz0EFZDUUdeeOMvvRpG2klU
+IpJ22WTegzt6_-Nj2EU5UVpcvl1kNh1tDVCWqxG8J41mfiYJaX93I4_6i_fzAC4980dZfuO9yO5cYQd4w1ISJjXDLy9aYFhh6n3iDXqnEZ32I2jBMPiSoFjO
+LC8lLxUKBEWmik24MgqnktsyLAriI6rGtS5OIhKV2MqYzcMIkqjM_YDz1G
 }
 
 AzureEntityColoring(AzureKeyVault)
diff --git a/dist/Security/AzureKeyVault.svg b/dist/Security/AzureKeyVault.svg
index 1327531a..2372b059 100644
--- a/dist/Security/AzureKeyVault.svg
+++ b/dist/Security/AzureKeyVault.svg
@@ -1,7 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="63pt" height="70pt" viewBox="0 0 63 70" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 35 35 L 35 56 L 37.917969 53.082031 L 37.917969 34.417969 C 36.964844 34.699219 35.988281 34.894531 35 35 Z M 35 35 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 33.542969 29.167969 C 38.65625 29.21875 43.019531 25.480469 43.75 20.417969 L 23.332031 20.417969 C 24.0625 25.480469 28.425781 29.21875 33.542969 29.167969 Z M 33.542969 29.167969 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 62.71875 38.640625 C 62.71875 28.421875 57.820313 19.460938 50.398438 13.71875 C 50.398438 14 50.398438 14.421875 50.398438 14.699219 C 50.398438 17.78125 49.558594 20.71875 48.300781 23.238281 C 51.941406 27.300781 54.179688 32.621094 54.179688 38.5 C 54.179688 51.101563 43.960938 61.320313 31.359375 61.320313 C 18.761719 61.320313 8.539063 51.101563 8.539063 38.5 C 8.539063 32.199219 11.058594 26.601563 15.121094 22.398438 C 14 20.019531 13.300781 17.359375 13.300781 14.558594 C 13.300781 14 13.300781 13.300781 13.441406 12.738281 C 5.320313 18.339844 0 27.859375 0 38.5 C 0 56 14 70 31.359375 70 C 48.71875 70 62.71875 56 62.71875 38.640625 Z M 62.71875 38.640625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 31.78125 0 C 23.800781 0 17.359375 6.441406 17.359375 14.421875 C 17.359375 21 21.699219 26.460938 27.71875 28.28125 L 27.71875 42.558594 L 21 42.558594 L 21 49.839844 L 27.71875 49.839844 L 27.71875 55.160156 L 35.699219 55.160156 L 35.699219 28.140625 C 41.71875 26.460938 46.058594 20.859375 46.058594 14.28125 C 46.199219 6.441406 39.761719 0 31.78125 0 Z M 31.78125 7.558594 C 35.558594 7.558594 38.640625 10.640625 38.640625 14.421875 C 38.640625 18.199219 35.558594 21.28125 31.78125 21.28125 C 28 21.28125 24.921875 18.199219 24.921875 14.421875 C 24.921875 10.640625 28 7.558594 31.78125 7.558594 Z M 31.78125 7.558594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 33.542969 2.917969 C 24.792969 2.917969 17.5 10.207031 17.5 18.957031 C 17.5 26.25 22.167969 32.082031 28.292969 34.125 L 24.792969 37.917969 L 29.167969 41.707031 L 24.792969 45.792969 L 29.167969 49.582031 L 24.792969 53.957031 L 33.542969 62.125 L 40.832031 54.542969 L 40.832031 33.25 C 46.082031 30.332031 49.582031 25.082031 49.582031 18.667969 C 49.582031 9.917969 42.292969 2.917969 33.542969 2.917969 Z M 36.457031 14.582031 C 36.457031 14.582031 35.875 14.582031 35.582031 15.167969 C 35.292969 15.75 35 15.75 34.707031 15.75 L 32.082031 15.75 L 31.5 15.167969 L 30.917969 14.292969 L 30.917969 11.667969 L 31.5 11.082031 L 32.375 10.5 L 35 10.5 L 35.582031 11.082031 L 36.167969 11.957031 L 36.167969 14.582031 Z M 36.457031 14.582031 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 50.75 11.082031 C 51.625 12.832031 51.917969 14 52.207031 16.042969 C 57.84375 21.328125 61.015625 28.730469 60.957031 36.457031 C 60.957031 51.625 48.417969 64.167969 33.25 64.167969 C 18.082031 64.167969 5.832031 51.625 5.832031 36.457031 C 5.773438 28.730469 8.945313 21.328125 14.582031 16.042969 L 16.332031 11.082031 C 7.929688 16.792969 2.902344 26.296875 2.917969 36.457031 C 2.917969 53.375 16.625 67.082031 33.542969 67.082031 C 50.457031 67.082031 64.167969 53.375 64.167969 36.457031 C 64.167969 25.957031 58.917969 16.625 50.75 11.082031 Z M 50.75 11.082031 "/>
 </g>
 </svg>
diff --git a/dist/Security/AzureSecurityCenter(m).png b/dist/Security/AzureSecurityCenter(m).png
new file mode 100644
index 00000000..1e45c993
Binary files /dev/null and b/dist/Security/AzureSecurityCenter(m).png differ
diff --git a/dist/Security/AzureSecurityCenter(m).svg b/dist/Security/AzureSecurityCenter(m).svg
new file mode 100644
index 00000000..0b0bbe18
--- /dev/null
+++ b/dist/Security/AzureSecurityCenter(m).svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 41.804688 23.160156 L 53.460938 8.34375 C 38.035156 6.644531 35.457031 0 35.457031 0 C 35.457031 0 31.984375 8.738281 9.800781 8.738281 L 9.800781 44.59375 C 9.800781 48.929688 12.210938 52.988281 15.546875 56.539063 L 24.160156 45.589844 Z M 41.804688 23.160156 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 53.460938 8.34375 C 38.035156 6.644531 35.457031 0 35.457031 0 C 35.457031 0 31.984375 8.738281 9.800781 8.738281 L 9.800781 44.59375 C 9.800781 48.929688 12.210938 52.988281 15.546875 56.539063 C 23.109375 64.585938 35.457031 70 35.457031 70 C 35.457031 70 61.117188 58.761719 61.117188 44.59375 L 61.117188 8.738281 C 58.261719 8.738281 55.722656 8.59375 53.460938 8.34375 Z M 53.460938 8.34375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 45.632813 34.242188 L 44.140625 34.242188 L 44.140625 29.269531 C 44.140625 26.878906 43.261719 24.683594 41.804688 23.042969 C 41.75 22.980469 41.699219 22.914063 41.648438 22.855469 C 40.097656 21.195313 37.890625 20.128906 35.457031 20.128906 C 33.027344 20.128906 30.820313 21.195313 29.269531 22.855469 C 27.714844 24.515625 26.773438 26.789063 26.773438 29.269531 L 26.773438 34.242188 L 25.28125 34.242188 C 24.664063 34.242188 24.160156 34.746094 24.160156 35.367188 L 24.160156 48.515625 C 24.160156 49.132813 24.664063 49.636719 25.28125 49.636719 L 45.632813 49.636719 C 46.25 49.636719 46.753906 49.132813 46.753906 48.515625 L 46.753906 35.367188 C 46.753906 34.746094 46.25 34.242188 45.632813 34.242188 Z M 40.019531 34.246094 L 32.988281 34.246094 L 32.992188 34.242188 L 30.898438 34.242188 L 30.898438 29.269531 C 30.898438 27.839844 31.4375 26.574219 32.28125 25.671875 C 33.128906 24.773438 34.234375 24.253906 35.457031 24.253906 C 36.679688 24.253906 37.789063 24.773438 38.632813 25.671875 C 38.835938 25.886719 39.015625 26.125 39.179688 26.378906 L 39.175781 26.378906 C 39.699219 27.191406 40.019531 28.183594 40.019531 29.269531 Z M 40.019531 34.246094 "/>
+</g>
+</svg>
diff --git a/dist/Security/AzureSecurityCenter.png b/dist/Security/AzureSecurityCenter.png
new file mode 100644
index 00000000..60b5b827
Binary files /dev/null and b/dist/Security/AzureSecurityCenter.png differ
diff --git a/dist/Security/AzureSecurityCenter.puml b/dist/Security/AzureSecurityCenter.puml
new file mode 100644
index 00000000..1efa39a4
--- /dev/null
+++ b/dist/Security/AzureSecurityCenter.puml
@@ -0,0 +1,10 @@
+sprite $AzureSecurityCenter [70x70/16z] {
+xTK54eD038NX5x__YUkoKomRwkq_WdyuO3d57HAtUo3kYfMfxpF2YjZybAmtwWwftwQCdbZKnpDPa8YPHLJDbp9LuLqqWdY-E2LhbBY74k-Zn3sKk8SIzr3Y
+VPIuXn9LnOI9nOv8KJ76CRAwOhYc7ZN5q6P5XR6FHGZxlAJOvOAuO9UK5CQkThoaO9Uq4rvLx3WQSPXOfqG40T22OXSbtaU9UoXHKzfVASkfuuHrAepHEXLw
+lF9N_WeApou_IZ5lYfH26AGjab8SmxX5GZ4M3o_kz2b5Bi98t8aeHhCk931H5yAOY3iGmsIQLXmpQGKPPZc4C9yMa1BZI2ILkpECF6OIPBEOoXdvf78smyWJ
+1r8w74Cb7JmafSYkXg0U--3s5fs4iGK
+}
+
+AzureEntityColoring(AzureSecurityCenter)
+!define AzureSecurityCenter(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSecurityCenter, AzureSecurityCenter)
+!define AzureSecurityCenter(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSecurityCenter, AzureSecurityCenter)
diff --git a/dist/Security/AzureSecurityCenter.svg b/dist/Security/AzureSecurityCenter.svg
new file mode 100644
index 00000000..2ba410b1
--- /dev/null
+++ b/dist/Security/AzureSecurityCenter.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 41.804688 23.160156 L 53.460938 8.34375 C 38.035156 6.644531 35.457031 0 35.457031 0 C 35.457031 0 31.984375 8.738281 9.800781 8.738281 L 9.800781 44.59375 C 9.800781 48.929688 12.210938 52.988281 15.546875 56.539063 L 24.160156 45.589844 Z M 41.804688 23.160156 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 53.460938 8.34375 C 38.035156 6.644531 35.457031 0 35.457031 0 C 35.457031 0 31.984375 8.738281 9.800781 8.738281 L 9.800781 44.59375 C 9.800781 48.929688 12.210938 52.988281 15.546875 56.539063 C 23.109375 64.585938 35.457031 70 35.457031 70 C 35.457031 70 61.117188 58.761719 61.117188 44.59375 L 61.117188 8.738281 C 58.261719 8.738281 55.722656 8.59375 53.460938 8.34375 Z M 53.460938 8.34375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.632813 34.242188 L 44.140625 34.242188 L 44.140625 29.269531 C 44.140625 26.878906 43.261719 24.683594 41.804688 23.042969 C 41.75 22.980469 41.699219 22.914063 41.648438 22.855469 C 40.097656 21.195313 37.890625 20.128906 35.457031 20.128906 C 33.027344 20.128906 30.820313 21.195313 29.269531 22.855469 C 27.714844 24.515625 26.773438 26.789063 26.773438 29.269531 L 26.773438 34.242188 L 25.28125 34.242188 C 24.664063 34.242188 24.160156 34.746094 24.160156 35.367188 L 24.160156 48.515625 C 24.160156 49.132813 24.664063 49.636719 25.28125 49.636719 L 45.632813 49.636719 C 46.25 49.636719 46.753906 49.132813 46.753906 48.515625 L 46.753906 35.367188 C 46.753906 34.746094 46.25 34.242188 45.632813 34.242188 Z M 40.019531 34.246094 L 32.988281 34.246094 L 32.992188 34.242188 L 30.898438 34.242188 L 30.898438 29.269531 C 30.898438 27.839844 31.4375 26.574219 32.28125 25.671875 C 33.128906 24.773438 34.234375 24.253906 35.457031 24.253906 C 36.679688 24.253906 37.789063 24.773438 38.632813 25.671875 C 38.835938 25.886719 39.015625 26.125 39.179688 26.378906 L 39.175781 26.378906 C 39.699219 27.191406 40.019531 28.183594 40.019531 29.269531 Z M 40.019531 34.246094 "/>
+</g>
+</svg>
diff --git a/dist/Security/AzureSentinel(m).png b/dist/Security/AzureSentinel(m).png
index da580b35..652dae20 100644
Binary files a/dist/Security/AzureSentinel(m).png and b/dist/Security/AzureSentinel(m).png differ
diff --git a/dist/Security/AzureSentinel(m).svg b/dist/Security/AzureSentinel(m).svg
index e46e72e9..f950b70a 100644
--- a/dist/Security/AzureSentinel(m).svg
+++ b/dist/Security/AzureSentinel(m).svg
@@ -13,13 +13,13 @@
   <rect x="0" y="0" width="61" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 21.582031 62.09375 L 41.582031 4.890625 L 41.269531 4.679688 C 38.679688 2.953125 36.457031 1.453125 30.496094 1.453125 C 24.535156 1.453125 22.40625 2.910156 19.714844 4.695313 C 16.292969 6.992188 12.414063 9.601563 2.46875 10.1875 L 1.449219 10.285156 L 1.449219 31.75 C 1.449219 44.066406 12.757813 55.246094 21.578125 62.09375 Z M 21.582031 62.09375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 21.582031 62.09375 L 41.582031 4.890625 L 41.269531 4.679688 C 38.679688 2.957031 36.457031 1.457031 30.496094 1.457031 C 24.535156 1.457031 22.40625 2.910156 19.714844 4.695313 C 16.292969 6.996094 12.414063 9.601563 2.46875 10.191406 L 1.449219 10.285156 L 1.449219 31.75 C 1.449219 44.066406 12.757813 55.246094 21.578125 62.097656 Z M 21.582031 62.09375 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 29.164063 69.148438 C 22.324219 64.902344 0 49.605469 0 31.75 L 0 8.917969 L 2.386719 8.734375 C 11.933594 8.136719 15.636719 5.648438 18.90625 3.449219 C 21.691406 1.613281 24.09375 0 30.496094 0 C 36.902344 0 39.40625 1.683594 42.046875 3.464844 C 45.328125 5.648438 49.042969 8.175781 58.589844 8.761719 L 60.972656 8.917969 L 60.972656 31.75 C 60.972656 49.613281 38.644531 64.902344 31.804688 69.164063 L 30.46875 70 Z M 29.164063 69.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 29.164063 69.148438 C 22.324219 64.90625 0 49.605469 0 31.75 L 0 8.917969 L 2.386719 8.738281 C 11.933594 8.140625 15.636719 5.648438 18.90625 3.453125 C 21.691406 1.617188 24.09375 0.00390625 30.496094 0.00390625 C 36.902344 0.00390625 39.40625 1.683594 42.046875 3.46875 C 45.328125 5.648438 49.042969 8.175781 58.589844 8.765625 L 60.972656 8.917969 L 60.972656 31.75 C 60.972656 49.613281 38.644531 64.90625 31.804688 69.164063 L 30.46875 70.003906 Z M 29.164063 69.148438 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.496094 20.414063 L 30.511719 20.414063 C 38.742188 20.414063 45.621094 26.703125 46.390625 34.929688 L 46.394531 34.992188 L 53.644531 34.992188 C 52.972656 22.671875 42.855469 12.9375 30.476563 12.9375 C 18.097656 12.9375 7.984375 22.671875 7.316406 34.933594 L 7.3125 34.992188 L 14.5625 34.992188 C 15.316406 26.789063 22.140625 20.414063 30.445313 20.414063 Z M 30.496094 20.414063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.066406 36.457031 C 39.066406 41.207031 35.230469 45.058594 30.496094 45.058594 C 25.765625 45.058594 21.929688 41.207031 21.929688 36.457031 C 21.929688 31.707031 25.765625 27.851563 30.496094 27.851563 C 35.230469 27.851563 39.066406 31.707031 39.066406 36.457031 Z M 39.066406 36.457031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 30.496094 20.414063 L 30.511719 20.414063 C 38.742188 20.414063 45.621094 26.703125 46.390625 34.933594 L 46.394531 34.996094 L 53.644531 34.996094 C 52.972656 22.671875 42.855469 12.9375 30.476563 12.9375 C 18.097656 12.9375 7.984375 22.675781 7.316406 34.9375 L 7.3125 34.996094 L 14.5625 34.996094 C 15.316406 26.789063 22.140625 20.414063 30.445313 20.414063 Z M 30.496094 20.414063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 39.066406 36.460938 C 39.066406 41.210938 35.230469 45.0625 30.496094 45.0625 C 25.765625 45.0625 21.929688 41.210938 21.929688 36.460938 C 21.929688 31.707031 25.765625 27.855469 30.496094 27.855469 C 35.230469 27.855469 39.066406 31.707031 39.066406 36.460938 Z M 39.066406 36.460938 "/>
 </g>
 </svg>
diff --git a/dist/Security/AzureSentinel.png b/dist/Security/AzureSentinel.png
index 38b3134f..a94fab29 100644
Binary files a/dist/Security/AzureSentinel.png and b/dist/Security/AzureSentinel.png differ
diff --git a/dist/Security/AzureSentinel.puml b/dist/Security/AzureSentinel.puml
index 91646b69..d97821bf 100644
--- a/dist/Security/AzureSentinel.puml
+++ b/dist/Security/AzureSentinel.puml
@@ -1,10 +1,10 @@
 sprite $AzureSentinel [61x70/16z] {
-lPLfUYCX34H1e1Ogxd_Uh4rmopMsFDlxDvEyhxGrAR-WgJam0Hz7AwzG5HERYQEcNGNWjm0uSghuX4S0pnH_0Cx0j6UrTzzkb2VquPn2nK7-r7cwwC1I6VDa
-gDp4IUjgNrL5DGOluAQzIItp4o28J6R0Kym_aF7_PDCczNkUQkupBuyUrjb7LZPsnJ8oykY5q_of_EZwxOcivH4TZ-HLSjO6pLrNtwGIcyd7zIFpBy83g5ns
-kr7jSbr-emykxmBrxZHjDmCYxuQhaG_AvQTj8e-zJlfDuCVsUxa7DyhJwtqqGiVgWRdugGrHNckgsrAffOfYBjRCDSej5ht_F1tpnDSYeno3jMnwZCPLjj3n
-sKN8jl1v0PTV7jVnXUqWDEsuB2eK7Gi_TztM_74xBpbbMLQuoNwP6EnR7lO5htgF2ECBFwjMEA54V19Cvk_BlG145bfsH8enkGUtCTS__v_88yY3oP_x18r-
-7epFbV1vIzXoPDqggDrsBdFNjV5eDpaVKkxQMYAtWM43auFzA54xU77KYq7bHwxVZXEl1KCkYyHBieQ7vfMgxmuG-M2lGQwEh0mf4G5oLQCj9TY9OFJ2Q412
-rc0nE-To6pcNsyZrowUMd3FTDnBxfTY4WzzL0WLpBQFoHmjQieYJKUKvBkwevIKQICbfwZXTb_8RT93ODDNcU1Zx3W
+lPK7ikim24KH4aPSxN-zlpaJ8inpo6zdsYivmwNOeI_eeWOimERHwHEQOC5PE5hP5G3s2e2Zfh8jLrstIlW3i0miVPTzcBjHNf3RENdYJFwfvzLP9boziaum
+XLrgt8Ven5fmDIliOAgCpetEt-1YGNPW9TOVoFX_iahdTivJr6pLvJd2EiUioffTCS-AF0VbT7ihtrs_lf65xXYuapropKPIrw--SqliJ3xsXynEzXUWV27h
+YwhcODcBFdFP0yhbDDMRGI9xmqsJ1yhusNOYJrzd-apWQTjL7kwcyh9sBOtGiGJNwpopmULzJSqjuKQDnJ_QVLsxt6De_tewrWEZ4uvoB2paZ5WQkwoXuuCS
+hwtXyGAs3yzzV64x24qRjaM5q37uOzTzdKoypeljX8FSridO9WOzvQc_o5FxY31_OO_K0akWYAq4vVNxyY0WaJcD7M7IJ1x1xPbhH3tBFOCyCrc8yjpZVM4q
+8XBOcwuRekYtYjJkNlVg-hNbfKtvyIBDNQKJosrWwiJAWR-KKjkz1F5DfFATQw_Zn6U5mTiYyP4iuKNpIUhB0Q9Us5gGcw4gWod2G2qrEb5cLmfZK4O72h84
+AxDhRcwZvkOsQltcKolEETqt2ljDqOLKjaO519chLADVPGXLOKj6LUVOtDde8pgIo6NQN2V6z1iC96NBD5tpjknt
 }
 
 AzureEntityColoring(AzureSentinel)
diff --git a/dist/Security/AzureSentinel.svg b/dist/Security/AzureSentinel.svg
index cac08e57..0d7d99a8 100644
--- a/dist/Security/AzureSentinel.svg
+++ b/dist/Security/AzureSentinel.svg
@@ -13,13 +13,13 @@
   <rect x="0" y="0" width="61" height="70"/>
 </clipPath>
 <g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21.582031 62.09375 L 41.582031 4.890625 L 41.269531 4.679688 C 38.679688 2.953125 36.457031 1.453125 30.496094 1.453125 C 24.535156 1.453125 22.40625 2.910156 19.714844 4.695313 C 16.292969 6.992188 12.414063 9.601563 2.46875 10.1875 L 1.449219 10.285156 L 1.449219 31.75 C 1.449219 44.066406 12.757813 55.246094 21.578125 62.09375 Z M 21.582031 62.09375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21.582031 62.09375 L 41.582031 4.890625 L 41.269531 4.679688 C 38.679688 2.957031 36.457031 1.457031 30.496094 1.457031 C 24.535156 1.457031 22.40625 2.910156 19.714844 4.695313 C 16.292969 6.996094 12.414063 9.601563 2.46875 10.191406 L 1.449219 10.285156 L 1.449219 31.75 C 1.449219 44.066406 12.757813 55.246094 21.578125 62.097656 Z M 21.582031 62.09375 "/>
 </g>
 </defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 29.164063 69.148438 C 22.324219 64.902344 0 49.605469 0 31.75 L 0 8.917969 L 2.386719 8.734375 C 11.933594 8.136719 15.636719 5.648438 18.90625 3.449219 C 21.691406 1.613281 24.09375 0 30.496094 0 C 36.902344 0 39.40625 1.683594 42.046875 3.464844 C 45.328125 5.648438 49.042969 8.175781 58.589844 8.761719 L 60.972656 8.917969 L 60.972656 31.75 C 60.972656 49.613281 38.644531 64.902344 31.804688 69.164063 L 30.46875 70 Z M 29.164063 69.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 29.164063 69.148438 C 22.324219 64.90625 0 49.605469 0 31.75 L 0 8.917969 L 2.386719 8.738281 C 11.933594 8.140625 15.636719 5.648438 18.90625 3.453125 C 21.691406 1.617188 24.09375 0.00390625 30.496094 0.00390625 C 36.902344 0.00390625 39.40625 1.683594 42.046875 3.46875 C 45.328125 5.648438 49.042969 8.175781 58.589844 8.765625 L 60.972656 8.917969 L 60.972656 31.75 C 60.972656 49.613281 38.644531 64.90625 31.804688 69.164063 L 30.46875 70.003906 Z M 29.164063 69.148438 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.496094 20.414063 L 30.511719 20.414063 C 38.742188 20.414063 45.621094 26.703125 46.390625 34.929688 L 46.394531 34.992188 L 53.644531 34.992188 C 52.972656 22.671875 42.855469 12.9375 30.476563 12.9375 C 18.097656 12.9375 7.984375 22.671875 7.316406 34.933594 L 7.3125 34.992188 L 14.5625 34.992188 C 15.316406 26.789063 22.140625 20.414063 30.445313 20.414063 Z M 30.496094 20.414063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.066406 36.457031 C 39.066406 41.207031 35.230469 45.058594 30.496094 45.058594 C 25.765625 45.058594 21.929688 41.207031 21.929688 36.457031 C 21.929688 31.707031 25.765625 27.851563 30.496094 27.851563 C 35.230469 27.851563 39.066406 31.707031 39.066406 36.457031 Z M 39.066406 36.457031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.496094 20.414063 L 30.511719 20.414063 C 38.742188 20.414063 45.621094 26.703125 46.390625 34.933594 L 46.394531 34.996094 L 53.644531 34.996094 C 52.972656 22.671875 42.855469 12.9375 30.476563 12.9375 C 18.097656 12.9375 7.984375 22.675781 7.316406 34.9375 L 7.3125 34.996094 L 14.5625 34.996094 C 15.316406 26.789063 22.140625 20.414063 30.445313 20.414063 Z M 30.496094 20.414063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 39.066406 36.460938 C 39.066406 41.210938 35.230469 45.0625 30.496094 45.0625 C 25.765625 45.0625 21.929688 41.210938 21.929688 36.460938 C 21.929688 31.707031 25.765625 27.855469 30.496094 27.855469 C 35.230469 27.855469 39.066406 31.707031 39.066406 36.460938 Z M 39.066406 36.460938 "/>
 </g>
 </svg>
diff --git a/dist/Security/all.puml b/dist/Security/all.puml
index 85be0a34..b0d86d68 100644
--- a/dist/Security/all.puml
+++ b/dist/Security/all.puml
@@ -1,23 +1,34 @@
-sprite $AzureKeyVault [63x70/16z] {
-hPVd0kiW28NBKC3tVz-xRuu9sj1n_dJnoOpMnrxIpIFSb1wlgyKuPFmYh35Ewg-v7bSvrUa-ieBglbVo8Yqhk9w_8s3htLyB7yv3_tncVyczeTQNIaO5HwXf
-HQd7tXuG8_fgrsXHJNjAgY3HMAtfpsUDWVi5nvgTTkqkUVVWDJsaahiFy6U3jgyylekHUJjMfvk-4tvSbiQVJvsY2jVW1j_FlEK9Wi7z4nTfW1ii44jMG-np
--1G7pRUxJSTgQMSJV9FfQw91S8xCrppwm07tfr2ZiCzd-yDGTwTCu9H905-IosxiF68elirfwis-azt7vNqHR-WKeJXb70mcNEeudYe4GY_WU0GDgPTnr9uS
-JIZZQBOuAbV7wS03DdNySSpAPtZxalV-7lvXwMprlF4VjIsEKSK0vTYsE4PLiSNNSOmgmwYE1pB6sp8kqo-6w8iu49bthYAEjiNyOL0HxvSZCxcdFz8rpkEK
-hk2CgamTJYbFfrO1n_cbCCDwDpYC8uKpx0xdoAboB7dIl-9fnQLbArvvDDPt0mSVKheXwMcGOa1z7O34uhn7-b0qoh2FINPpVJAPL-0MOvPlOuEyDnLHxHQL
-6oNulH1v5dk9xeNE91NwYlfkPLI-zMSvPw2yWCcZ9EcH7MEK2k9c7lXNBpls9m
+sprite $AzureKeyVault [70x70/16z] {
+vPO7hkGm34CjokN-9zuYZ84eBncli_r_ean_GzAAaFAvPFAGx2SHKte6aP_qn8zJsaxZbte4ePx4eVGG8cc_OhESnuAQCoqDgVD7fIXdylOUKaSDAw3aTqQt
+jv1X_0tVwGb3ICS1uTmjlZZi7Z842gHIRCJ_NKalYFb2vHuJ7tWXXPf_MGlLu-qVfHGFvsVvjBYag8JQLQO3Uau-bIwbYqmrtbfGqfKKcMWbBxbx2fg4bMCn
+X6GApUHPT60GQ9hnF72DUzilhUG4BR_KrPOI8NOQL7QRciaSR4n6ikaCcQ0onKW-aKiCB-2EMXXgYd5OJCFE0GRhdnFI9n4SfE4YqEc8g2Mb7HhDrpWhhhK-
+fyX_0SLybp8AfItA-en8uHd5Sxl1WC8zYzc5GE7iuZg2R45HKB2aDX9nJGLoirskp3Q67ioBdTOr8t5UxkvK46cLY84gPd2tNOz0EFZDUUdeeOMvvRpG2klU
+IpJ22WTegzt6_-Nj2EU5UVpcvl1kNh1tDVCWqxG8J41mfiYJaX93I4_6i_fzAC4980dZfuO9yO5cYQd4w1ISJjXDLy9aYFhh6n3iDXqnEZ32I2jBMPiSoFjO
+LC8lLxUKBEWmik24MgqnktsyLAriI6rGtS5OIhKV2MqYzcMIkqjM_YDz1G
 }
 
 AzureEntityColoring(AzureKeyVault)
 !define AzureKeyVault(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureKeyVault, AzureKeyVault)
 !define AzureKeyVault(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureKeyVault, AzureKeyVault)
 
+sprite $AzureSecurityCenter [70x70/16z] {
+xTK54eD038NX5x__YUkoKomRwkq_WdyuO3d57HAtUo3kYfMfxpF2YjZybAmtwWwftwQCdbZKnpDPa8YPHLJDbp9LuLqqWdY-E2LhbBY74k-Zn3sKk8SIzr3Y
+VPIuXn9LnOI9nOv8KJ76CRAwOhYc7ZN5q6P5XR6FHGZxlAJOvOAuO9UK5CQkThoaO9Uq4rvLx3WQSPXOfqG40T22OXSbtaU9UoXHKzfVASkfuuHrAepHEXLw
+lF9N_WeApou_IZ5lYfH26AGjab8SmxX5GZ4M3o_kz2b5Bi98t8aeHhCk931H5yAOY3iGmsIQLXmpQGKPPZc4C9yMa1BZI2ILkpECF6OIPBEOoXdvf78smyWJ
+1r8w74Cb7JmafSYkXg0U--3s5fs4iGK
+}
+
+AzureEntityColoring(AzureSecurityCenter)
+!define AzureSecurityCenter(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureSecurityCenter, AzureSecurityCenter)
+!define AzureSecurityCenter(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSecurityCenter, AzureSecurityCenter)
+
 sprite $AzureSentinel [61x70/16z] {
-lPLfUYCX34H1e1Ogxd_Uh4rmopMsFDlxDvEyhxGrAR-WgJam0Hz7AwzG5HERYQEcNGNWjm0uSghuX4S0pnH_0Cx0j6UrTzzkb2VquPn2nK7-r7cwwC1I6VDa
-gDp4IUjgNrL5DGOluAQzIItp4o28J6R0Kym_aF7_PDCczNkUQkupBuyUrjb7LZPsnJ8oykY5q_of_EZwxOcivH4TZ-HLSjO6pLrNtwGIcyd7zIFpBy83g5ns
-kr7jSbr-emykxmBrxZHjDmCYxuQhaG_AvQTj8e-zJlfDuCVsUxa7DyhJwtqqGiVgWRdugGrHNckgsrAffOfYBjRCDSej5ht_F1tpnDSYeno3jMnwZCPLjj3n
-sKN8jl1v0PTV7jVnXUqWDEsuB2eK7Gi_TztM_74xBpbbMLQuoNwP6EnR7lO5htgF2ECBFwjMEA54V19Cvk_BlG145bfsH8enkGUtCTS__v_88yY3oP_x18r-
-7epFbV1vIzXoPDqggDrsBdFNjV5eDpaVKkxQMYAtWM43auFzA54xU77KYq7bHwxVZXEl1KCkYyHBieQ7vfMgxmuG-M2lGQwEh0mf4G5oLQCj9TY9OFJ2Q412
-rc0nE-To6pcNsyZrowUMd3FTDnBxfTY4WzzL0WLpBQFoHmjQieYJKUKvBkwevIKQICbfwZXTb_8RT93ODDNcU1Zx3W
+lPK7ikim24KH4aPSxN-zlpaJ8inpo6zdsYivmwNOeI_eeWOimERHwHEQOC5PE5hP5G3s2e2Zfh8jLrstIlW3i0miVPTzcBjHNf3RENdYJFwfvzLP9boziaum
+XLrgt8Ven5fmDIliOAgCpetEt-1YGNPW9TOVoFX_iahdTivJr6pLvJd2EiUioffTCS-AF0VbT7ihtrs_lf65xXYuapropKPIrw--SqliJ3xsXynEzXUWV27h
+YwhcODcBFdFP0yhbDDMRGI9xmqsJ1yhusNOYJrzd-apWQTjL7kwcyh9sBOtGiGJNwpopmULzJSqjuKQDnJ_QVLsxt6De_tewrWEZ4uvoB2paZ5WQkwoXuuCS
+hwtXyGAs3yzzV64x24qRjaM5q37uOzTzdKoypeljX8FSridO9WOzvQc_o5FxY31_OO_K0akWYAq4vVNxyY0WaJcD7M7IJ1x1xPbhH3tBFOCyCrc8yjpZVM4q
+8XBOcwuRekYtYjJkNlVg-hNbfKtvyIBDNQKJosrWwiJAWR-KKjkz1F5DfFATQw_Zn6U5mTiYyP4iuKNpIUhB0Q9Us5gGcw4gWod2G2qrEb5cLmfZK4O72h84
+AxDhRcwZvkOsQltcKolEETqt2ljDqOLKjaO519chLADVPGXLOKj6LUVOtDde8pgIo6NQN2V6z1iC96NBD5tpjknt
 }
 
 AzureEntityColoring(AzureSentinel)
diff --git a/dist/Storage/AzureArchiveStorage(m).png b/dist/Storage/AzureArchiveStorage(m).png
new file mode 100644
index 00000000..ceb55429
Binary files /dev/null and b/dist/Storage/AzureArchiveStorage(m).png differ
diff --git a/dist/Storage/AzureArchiveStorage(m).svg b/dist/Storage/AzureArchiveStorage(m).svg
new file mode 100644
index 00000000..d71c1ae7
--- /dev/null
+++ b/dist/Storage/AzureArchiveStorage(m).svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.85098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 5.601563 26.601563 L 64.398438 26.601563 L 64.398438 43.398438 L 5.601563 43.398438 Z M 5.601563 26.601563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 5.601563 47.601563 L 64.398438 47.601563 L 64.398438 64.398438 L 5.601563 64.398438 Z M 5.601563 47.601563 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 26.601563 L 64.398438 26.601563 L 64.398438 29.398438 L 5.601563 29.398438 Z M 5.601563 26.601563 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 5.601563 L 64.398438 5.601563 L 64.398438 8.398438 L 5.601563 8.398438 Z M 5.601563 5.601563 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 47.601563 L 64.398438 47.601563 L 64.398438 50.398438 L 5.601563 50.398438 Z M 5.601563 47.601563 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.398438 70 L 12.175781 70 L 56.113281 5.601563 L 0 5.601563 L 0 61.601563 C 0 66.238281 3.761719 70 8.398438 70 Z M 8.398438 70 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 17.953125 33.601563 L 14.851563 3.921875 L 21.296875 3.921875 L 18.195313 33.601563 Z M 17.953125 33.601563 "/>
+</g>
+<mask id="mask7">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip8">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface26" clip-path="url(#clip8)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 17.953125 33.601563 L 14.851563 3.921875 L 18.074219 3.921875 L 18.195313 33.601563 Z M 17.953125 33.601563 "/>
+</g>
+<mask id="mask8">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip9">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface29" clip-path="url(#clip9)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 54.449219 39.199219 L 50.570313 4.199219 L 58.628906 4.199219 L 54.75 39.199219 Z M 54.449219 39.199219 "/>
+</g>
+<mask id="mask9">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip10">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface32" clip-path="url(#clip10)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 42.78125 4.199219 L 48.601563 4.199219 L 45.691406 32.082031 Z M 42.78125 4.199219 "/>
+</g>
+<mask id="mask10">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip11">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface35" clip-path="url(#clip11)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 42.78125 4.199219 L 45.691406 4.199219 L 45.691406 32.082031 Z M 42.78125 4.199219 "/>
+</g>
+<mask id="mask11">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip12">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface38" clip-path="url(#clip12)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 54.449219 39.199219 L 50.570313 4.199219 L 54.601563 4.199219 L 54.75 39.199219 Z M 54.449219 39.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 61.601563 70 L 8.398438 70 C 3.761719 70 0 66.238281 0 61.601563 L 0 5.601563 L 70 5.601563 L 70 61.601563 C 70 66.238281 66.238281 70 61.601563 70 Z M 61.601563 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 26.601563 L 64.398438 26.601563 L 64.398438 43.398438 L 5.601563 43.398438 Z M 5.601563 26.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 47.601563 L 64.398438 47.601563 L 64.398438 64.398438 L 5.601563 64.398438 Z M 5.601563 47.601563 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 5.601563 5.601563 L 64.398438 5.601563 L 64.398438 22.398438 L 5.601563 22.398438 Z M 5.601563 5.601563 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 18.074219 34.71875 C 18.710938 34.71875 19.246094 34.242188 19.320313 33.605469 L 22.390625 4.199219 C 22.476563 3.457031 21.894531 2.800781 21.144531 2.800781 L 15.003906 2.800781 C 14.253906 2.800781 13.667969 3.457031 13.753906 4.203125 L 16.824219 33.609375 C 16.898438 34.242188 17.433594 34.71875 18.074219 34.71875 Z M 18.074219 34.71875 "/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<use xlink:href="#surface26" mask="url(#mask7)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 54.601563 40.601563 C 55.398438 40.601563 56.070313 40.003906 56.160156 39.210938 L 60 4.550781 C 60.105469 3.617188 59.375 2.800781 58.4375 2.800781 L 50.761719 2.800781 C 49.824219 2.800781 49.09375 3.617188 49.203125 4.550781 L 53.039063 39.210938 C 53.132813 40.003906 53.800781 40.601563 54.601563 40.601563 Z M 54.601563 40.601563 "/>
+<use xlink:href="#surface29" mask="url(#mask8)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 45.691406 34.71875 C 46.328125 34.71875 46.863281 34.242188 46.9375 33.605469 L 50.007813 4.203125 C 50.09375 3.457031 49.511719 2.800781 48.761719 2.800781 L 42.621094 2.800781 C 41.867188 2.800781 41.285156 3.457031 41.371094 4.203125 L 44.441406 33.609375 C 44.515625 34.242188 45.050781 34.71875 45.691406 34.71875 Z M 45.691406 34.71875 "/>
+<use xlink:href="#surface32" mask="url(#mask9)"/>
+<use xlink:href="#surface35" mask="url(#mask10)"/>
+<use xlink:href="#surface38" mask="url(#mask11)"/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureArchiveStorage.png b/dist/Storage/AzureArchiveStorage.png
new file mode 100644
index 00000000..8fb29a95
Binary files /dev/null and b/dist/Storage/AzureArchiveStorage.png differ
diff --git a/dist/Storage/AzureArchiveStorage.puml b/dist/Storage/AzureArchiveStorage.puml
new file mode 100644
index 00000000..27eebc36
--- /dev/null
+++ b/dist/Storage/AzureArchiveStorage.puml
@@ -0,0 +1,12 @@
+sprite $AzureArchiveStorage [70x70/16z] {
+pTG7beCm34LHhF8bm-n_lOE985DiOaXzwR6vQJePFhUqjB-MeYQ2Y2e6_jLKKaf411x-HM0Y4G5eJkP0mvgKT6rLz7-n9a2wR6BerbXoYJP5_gMWtueiYdsL
+_YZKL6HJgALeTDd9q4hWigQuAgMgmXqANnH5oMkAD9LOGxSYTKL3aOk2jg8x2aBH6qhirBR2cy9jHNiKtAr8dqBBPzTQe51Y_6ufUg_2gJukiQO0OlpEAjAj
+I2BPKL2A8TvHT4VHKBIkP5-pefXNCyoAv-n5ONWkZQ7y3edKnsePYJ7EXs1Hfg-eeUInNb6cBiKIeQ5C8C5yo0HAvTvV9Tir8bWjpxaeUMvHBF_zNg1RQ8qk
+vbXHYl5Rqhh2V5gnBGZ3AlcSYSPj8fWleQgOI0jnKzWwLF1THNSKm4FX6mgaZfH2STnMj8BqA-rypMnLvBHo3IHsLF5_WVMeul-pnoY2WufNCi0FALxDx7ub
+wbVyWEBQ23UpKFRwwgmNEQzC1vLSRUnekYf8jQWdVhX2zUvNk2_PLVWH2d-EmezG-7CKVeJ2dwFm8nG-e-G_2fzIK1JZQt8iBSX4xJ_9_comNyefP4h3aCyZ
+4G_3aFo-ppFni2Gvb3E6fLdu1W
+}
+
+AzureEntityColoring(AzureArchiveStorage)
+!define AzureArchiveStorage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureArchiveStorage, AzureArchiveStorage)
+!define AzureArchiveStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureArchiveStorage, AzureArchiveStorage)
diff --git a/dist/Storage/AzureArchiveStorage.svg b/dist/Storage/AzureArchiveStorage.svg
new file mode 100644
index 00000000..a233126f
--- /dev/null
+++ b/dist/Storage/AzureArchiveStorage.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.85098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 5.601563 26.601563 L 64.398438 26.601563 L 64.398438 43.398438 L 5.601563 43.398438 Z M 5.601563 26.601563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 5.601563 47.601563 L 64.398438 47.601563 L 64.398438 64.398438 L 5.601563 64.398438 Z M 5.601563 47.601563 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 26.601563 L 64.398438 26.601563 L 64.398438 29.398438 L 5.601563 29.398438 Z M 5.601563 26.601563 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 5.601563 L 64.398438 5.601563 L 64.398438 8.398438 L 5.601563 8.398438 Z M 5.601563 5.601563 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 47.601563 L 64.398438 47.601563 L 64.398438 50.398438 L 5.601563 50.398438 Z M 5.601563 47.601563 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.398438 70 L 12.175781 70 L 56.113281 5.601563 L 0 5.601563 L 0 61.601563 C 0 66.238281 3.761719 70 8.398438 70 Z M 8.398438 70 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.953125 33.601563 L 14.851563 3.921875 L 21.296875 3.921875 L 18.195313 33.601563 Z M 17.953125 33.601563 "/>
+</g>
+<mask id="mask7">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip8">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface26" clip-path="url(#clip8)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 17.953125 33.601563 L 14.851563 3.921875 L 18.074219 3.921875 L 18.195313 33.601563 Z M 17.953125 33.601563 "/>
+</g>
+<mask id="mask8">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip9">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface29" clip-path="url(#clip9)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 54.449219 39.199219 L 50.570313 4.199219 L 58.628906 4.199219 L 54.75 39.199219 Z M 54.449219 39.199219 "/>
+</g>
+<mask id="mask9">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip10">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface32" clip-path="url(#clip10)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 42.78125 4.199219 L 48.601563 4.199219 L 45.691406 32.082031 Z M 42.78125 4.199219 "/>
+</g>
+<mask id="mask10">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip11">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface35" clip-path="url(#clip11)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 42.78125 4.199219 L 45.691406 4.199219 L 45.691406 32.082031 Z M 42.78125 4.199219 "/>
+</g>
+<mask id="mask11">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip12">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface38" clip-path="url(#clip12)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 54.449219 39.199219 L 50.570313 4.199219 L 54.601563 4.199219 L 54.75 39.199219 Z M 54.449219 39.199219 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 61.601563 70 L 8.398438 70 C 3.761719 70 0 66.238281 0 61.601563 L 0 5.601563 L 70 5.601563 L 70 61.601563 C 70 66.238281 66.238281 70 61.601563 70 Z M 61.601563 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 26.601563 L 64.398438 26.601563 L 64.398438 43.398438 L 5.601563 43.398438 Z M 5.601563 26.601563 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 47.601563 L 64.398438 47.601563 L 64.398438 64.398438 L 5.601563 64.398438 Z M 5.601563 47.601563 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 5.601563 5.601563 L 64.398438 5.601563 L 64.398438 22.398438 L 5.601563 22.398438 Z M 5.601563 5.601563 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 18.074219 34.71875 C 18.710938 34.71875 19.246094 34.242188 19.320313 33.605469 L 22.390625 4.199219 C 22.476563 3.457031 21.894531 2.800781 21.144531 2.800781 L 15.003906 2.800781 C 14.253906 2.800781 13.667969 3.457031 13.753906 4.203125 L 16.824219 33.609375 C 16.898438 34.242188 17.433594 34.71875 18.074219 34.71875 Z M 18.074219 34.71875 "/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<use xlink:href="#surface26" mask="url(#mask7)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 54.601563 40.601563 C 55.398438 40.601563 56.070313 40.003906 56.160156 39.210938 L 60 4.550781 C 60.105469 3.617188 59.375 2.800781 58.4375 2.800781 L 50.761719 2.800781 C 49.824219 2.800781 49.09375 3.617188 49.203125 4.550781 L 53.039063 39.210938 C 53.132813 40.003906 53.800781 40.601563 54.601563 40.601563 Z M 54.601563 40.601563 "/>
+<use xlink:href="#surface29" mask="url(#mask8)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 45.691406 34.71875 C 46.328125 34.71875 46.863281 34.242188 46.9375 33.605469 L 50.007813 4.203125 C 50.09375 3.457031 49.511719 2.800781 48.761719 2.800781 L 42.621094 2.800781 C 41.867188 2.800781 41.285156 3.457031 41.371094 4.203125 L 44.441406 33.609375 C 44.515625 34.242188 45.050781 34.71875 45.691406 34.71875 Z M 45.691406 34.71875 "/>
+<use xlink:href="#surface32" mask="url(#mask9)"/>
+<use xlink:href="#surface35" mask="url(#mask10)"/>
+<use xlink:href="#surface38" mask="url(#mask11)"/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureBlobStorage(m).png b/dist/Storage/AzureBlobStorage(m).png
index 33ad2b7e..6bdfffe7 100644
Binary files a/dist/Storage/AzureBlobStorage(m).png and b/dist/Storage/AzureBlobStorage(m).png differ
diff --git a/dist/Storage/AzureBlobStorage(m).svg b/dist/Storage/AzureBlobStorage(m).svg
index be982772..a7650530 100644
--- a/dist/Storage/AzureBlobStorage(m).svg
+++ b/dist/Storage/AzureBlobStorage(m).svg
@@ -1,9 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="59pt" viewBox="0 0 70 59" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 2.800781 5.601563 C 1.261719 5.601563 0 6.859375 0 8.398438 L 0 62.441406 C 0 63.980469 1.261719 65.238281 2.800781 65.238281 L 5.878906 65.238281 L 61.039063 5.601563 Z M 2.800781 5.601563 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 51.871094 0 L 17.230469 0 L 0 29.859375 L 17.230469 59.714844 L 51.871094 59.714844 L 69.101563 29.859375 Z M 52.050781 43.265625 C 52.050781 45.769531 49.898438 47.914063 47.382813 47.914063 L 21.898438 47.914063 C 19.382813 47.914063 17.230469 45.769531 17.230469 43.265625 L 17.230469 16.628906 C 17.230469 14.125 19.382813 11.980469 21.898438 11.980469 L 40.742188 11.980469 C 42.539063 11.980469 44.332031 11.980469 44.332031 11.980469 L 44.871094 11.980469 L 52.050781 19.128906 Z M 52.050781 43.265625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 31.949219 34.683594 C 31.949219 34.328125 31.769531 34.148438 31.769531 33.96875 C 31.769531 33.789063 31.589844 33.613281 31.410156 33.433594 C 31.230469 33.253906 31.230469 33.253906 31.050781 33.253906 C 30.871094 33.253906 30.691406 33.253906 30.511719 33.253906 C 30.152344 33.253906 29.972656 33.253906 29.792969 33.433594 C 29.617188 33.613281 29.4375 33.789063 29.257813 34.148438 C 29.078125 34.507813 29.078125 34.863281 29.078125 35.222656 C 29.078125 35.578125 29.078125 36.113281 29.078125 36.832031 C 29.078125 37.546875 29.078125 38.082031 29.078125 38.617188 C 29.078125 39.15625 29.257813 39.511719 29.4375 39.691406 C 29.617188 40.046875 29.792969 40.226563 29.972656 40.226563 C 30.152344 40.40625 30.332031 40.40625 30.691406 40.40625 C 30.871094 40.40625 31.050781 40.40625 31.230469 40.226563 C 31.410156 40.226563 31.589844 40.046875 31.589844 39.871094 C 31.769531 39.691406 31.769531 39.511719 31.949219 39.332031 C 31.949219 39.15625 32.128906 38.976563 32.128906 38.617188 C 32.128906 38.4375 32.128906 38.082031 32.308594 37.722656 C 32.308594 37.367188 32.308594 37.007813 32.308594 36.652344 C 32.308594 36.113281 32.308594 35.757813 32.308594 35.398438 C 31.949219 35.222656 31.949219 35.042969 31.949219 34.683594 Z M 31.949219 34.683594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 40.027344 20.738281 C 40.027344 20.382813 39.847656 20.203125 39.847656 20.023438 C 39.847656 19.84375 39.667969 19.667969 39.488281 19.488281 C 39.308594 19.308594 39.308594 19.308594 39.128906 19.308594 C 38.949219 19.308594 38.769531 19.308594 38.589844 19.308594 C 38.230469 19.308594 38.050781 19.308594 37.871094 19.488281 C 37.691406 19.667969 37.511719 19.84375 37.332031 20.203125 C 37.152344 20.5625 37.152344 20.917969 37.152344 21.277344 C 37.152344 21.632813 37.152344 22.167969 37.152344 22.886719 C 37.152344 23.601563 37.152344 24.136719 37.152344 24.671875 C 37.152344 25.210938 37.332031 25.566406 37.511719 25.746094 C 37.691406 26.101563 37.871094 26.28125 38.050781 26.28125 C 38.230469 26.460938 38.410156 26.460938 38.769531 26.460938 C 38.949219 26.460938 39.128906 26.460938 39.308594 26.28125 C 39.488281 26.28125 39.667969 26.101563 39.667969 25.925781 C 39.847656 25.746094 39.847656 25.566406 40.027344 25.386719 C 40.027344 25.210938 40.207031 25.03125 40.207031 24.671875 C 40.207031 24.492188 40.207031 24.136719 40.382813 23.777344 C 40.382813 23.421875 40.382813 23.0625 40.382813 22.707031 C 40.382813 22.167969 40.382813 21.8125 40.382813 21.453125 C 40.207031 21.453125 40.207031 21.097656 40.027344 20.738281 Z M 40.027344 20.738281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 43.617188 14.480469 C 42.898438 14.480469 41.820313 14.480469 40.742188 14.480469 L 21.898438 14.480469 C 20.640625 14.480469 19.742188 15.375 19.742188 16.628906 L 19.742188 43.265625 C 19.742188 44.519531 20.640625 45.414063 21.898438 45.414063 L 47.382813 45.414063 C 48.460938 45.414063 49.539063 44.519531 49.539063 43.265625 L 49.539063 20.382813 L 43.792969 20.382813 L 43.792969 14.480469 Z M 27.640625 19.84375 C 27.640625 19.84375 27.640625 19.667969 27.640625 19.667969 C 27.640625 19.667969 27.640625 19.488281 27.640625 19.488281 C 27.640625 19.488281 27.640625 19.488281 27.820313 19.308594 L 29.972656 17.878906 C 29.972656 17.878906 29.972656 17.878906 30.152344 17.878906 C 30.152344 17.878906 30.332031 17.878906 30.332031 17.878906 C 30.332031 17.878906 30.511719 17.878906 30.511719 17.878906 C 30.691406 17.878906 30.691406 17.878906 30.871094 17.878906 C 31.050781 17.878906 31.230469 17.878906 31.410156 17.878906 C 31.589844 17.878906 31.589844 17.878906 31.769531 17.878906 C 31.769531 17.878906 31.949219 17.878906 31.949219 17.878906 C 31.949219 17.878906 31.949219 17.878906 31.949219 18.058594 L 31.949219 26.460938 L 33.5625 26.460938 C 33.5625 26.460938 33.742188 26.460938 33.742188 26.460938 C 33.742188 26.460938 33.742188 26.460938 33.921875 26.640625 C 34.101563 26.816406 33.921875 26.816406 33.921875 26.816406 C 33.921875 26.996094 33.921875 26.996094 33.921875 27.175781 C 33.921875 27.355469 33.921875 27.535156 33.921875 27.535156 C 33.921875 27.710938 33.921875 27.710938 33.921875 27.710938 C 33.921875 27.710938 33.921875 27.890625 33.742188 27.890625 C 33.742188 27.890625 33.742188 27.890625 33.5625 27.890625 L 28 27.890625 C 28 27.890625 28 27.890625 27.820313 27.890625 C 27.820313 27.890625 27.820313 27.890625 27.640625 27.710938 C 27.640625 27.710938 27.640625 27.535156 27.640625 27.535156 C 27.640625 27.355469 27.640625 27.355469 27.640625 27.175781 C 27.640625 26.996094 27.640625 26.816406 27.640625 26.816406 C 27.640625 26.640625 27.640625 26.640625 27.640625 26.640625 C 27.640625 26.640625 27.640625 26.460938 27.820313 26.460938 C 27.820313 26.460938 27.820313 26.460938 28 26.460938 L 29.972656 26.460938 L 29.972656 19.84375 L 28.359375 20.738281 C 28.179688 20.738281 28.179688 20.917969 28 20.917969 C 28 20.917969 27.820313 20.917969 27.820313 20.917969 C 27.820313 20.917969 27.820313 20.738281 27.640625 20.738281 C 27.640625 20.5625 27.640625 20.5625 27.640625 20.203125 C 27.640625 20.023438 27.640625 19.84375 27.640625 19.84375 Z M 33.921875 38.976563 C 33.742188 39.691406 33.5625 40.226563 33.207031 40.585938 C 32.847656 41.121094 32.488281 41.480469 32.128906 41.65625 C 31.589844 41.835938 31.050781 42.015625 30.332031 42.015625 C 29.617188 42.015625 29.078125 41.835938 28.539063 41.65625 C 28 41.480469 27.640625 41.121094 27.460938 40.585938 C 27.28125 40.046875 26.921875 39.511719 26.921875 38.976563 C 26.742188 38.261719 26.742188 37.546875 26.742188 36.832031 C 26.742188 35.9375 26.742188 35.222656 26.921875 34.683594 C 27.101563 33.96875 27.28125 33.433594 27.640625 33.074219 C 28 32.71875 28.359375 32.183594 28.71875 32.003906 C 29.257813 31.824219 29.792969 31.644531 30.511719 31.644531 C 31.230469 31.644531 31.769531 31.824219 32.308594 32.003906 C 32.847656 32.183594 33.207031 32.539063 33.382813 33.074219 C 33.5625 33.613281 33.921875 34.148438 33.921875 34.683594 C 34.101563 35.398438 34.101563 36.113281 34.101563 36.832031 C 34.101563 37.722656 34.101563 38.4375 33.921875 38.976563 Z M 42 41.480469 C 42 41.65625 42 41.65625 42 41.65625 C 42 41.65625 42 41.835938 41.820313 41.835938 C 41.820313 41.835938 41.820313 41.835938 41.640625 41.835938 L 36.078125 41.835938 C 36.078125 41.835938 36.078125 41.835938 35.898438 41.835938 C 35.898438 41.835938 35.898438 41.835938 35.71875 41.65625 C 35.71875 41.65625 35.71875 41.480469 35.71875 41.480469 C 35.71875 41.300781 35.71875 41.300781 35.71875 41.121094 C 35.71875 40.941406 35.71875 40.761719 35.71875 40.761719 C 35.71875 40.585938 35.71875 40.585938 35.71875 40.585938 C 35.71875 40.585938 35.71875 40.40625 35.898438 40.40625 C 35.898438 40.40625 35.898438 40.40625 36.078125 40.40625 L 38.050781 40.40625 L 38.050781 33.789063 L 36.4375 34.683594 C 36.257813 34.683594 36.257813 34.863281 36.078125 34.863281 C 36.078125 34.863281 35.898438 34.863281 35.898438 34.863281 C 35.898438 34.863281 35.898438 34.683594 35.71875 34.683594 C 35.71875 34.507813 35.71875 34.507813 35.71875 34.148438 C 35.71875 33.96875 35.71875 33.96875 35.71875 33.789063 C 35.71875 33.789063 35.71875 33.613281 35.71875 33.613281 C 35.71875 33.613281 35.71875 33.433594 35.71875 33.433594 C 35.71875 33.433594 35.71875 33.433594 35.898438 33.253906 L 38.050781 31.824219 C 38.050781 31.824219 38.050781 31.824219 38.230469 31.824219 C 38.230469 31.824219 38.410156 31.824219 38.410156 31.824219 C 38.410156 31.824219 38.589844 31.824219 38.589844 31.824219 C 38.769531 31.824219 38.769531 31.824219 38.949219 31.824219 C 39.128906 31.824219 39.308594 31.824219 39.488281 31.824219 C 39.667969 31.824219 39.667969 31.824219 39.847656 31.824219 C 39.847656 31.824219 40.027344 31.824219 40.027344 31.824219 C 40.027344 31.824219 40.027344 31.824219 40.027344 32.003906 L 40.027344 40.40625 L 41.640625 40.40625 C 41.640625 40.40625 41.820313 40.40625 41.820313 40.40625 C 41.820313 40.40625 41.820313 40.40625 42 40.585938 C 42 40.585938 42 40.761719 42 40.761719 C 42 40.941406 42 40.941406 42 41.121094 C 42 41.300781 42 41.480469 42 41.480469 Z M 42.179688 25.03125 C 42 25.746094 41.820313 26.28125 41.460938 26.640625 C 41.101563 27.175781 40.742188 27.535156 40.382813 27.710938 C 39.847656 27.890625 39.308594 28.070313 38.589844 28.070313 C 37.871094 28.070313 37.332031 27.890625 36.792969 27.710938 C 36.257813 27.535156 35.898438 27.175781 35.71875 26.640625 C 35.539063 26.28125 35.179688 25.566406 35.179688 25.03125 C 35.179688 24.492188 35 23.601563 35 22.886719 C 35 21.992188 35 21.277344 35.179688 20.738281 C 35.359375 20.023438 35.539063 19.488281 35.898438 19.128906 C 36.257813 18.59375 36.617188 18.238281 36.972656 18.058594 C 37.511719 17.878906 38.050781 17.699219 38.769531 17.699219 C 39.488281 17.699219 40.027344 17.878906 40.5625 18.058594 C 41.101563 18.238281 41.460938 18.59375 41.640625 19.128906 C 41.820313 19.667969 42.179688 20.203125 42.179688 20.738281 C 42.359375 21.453125 42.359375 22.167969 42.359375 22.886719 C 42.359375 23.777344 42.179688 24.492188 42.179688 25.03125 Z M 42.179688 25.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 0 62.71875 C 0 64.121094 1.121094 65.378906 2.519531 65.378906 L 67.339844 65.378906 C 68.738281 65.378906 70 64.261719 70 62.71875 L 70 16.378906 L 0 16.378906 Z M 0 62.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 67.339844 5.601563 L 2.519531 5.601563 C 1.121094 5.601563 0 6.859375 0 8.261719 L 0 16.238281 L 70 16.238281 L 70 8.261719 C 70 6.859375 68.878906 5.601563 67.339844 5.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 5.179688 21.140625 L 33.738281 21.140625 L 33.738281 39.339844 L 5.179688 39.339844 Z M 5.179688 21.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 5.179688 41.859375 L 33.738281 41.859375 L 33.738281 60.058594 L 5.179688 60.058594 Z M 5.179688 41.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 36.261719 21.140625 L 64.679688 21.140625 L 64.679688 39.339844 L 36.261719 39.339844 Z M 36.261719 21.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 36.261719 41.859375 L 64.679688 41.859375 L 64.679688 60.058594 L 36.261719 60.058594 Z M 36.261719 41.859375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureBlobStorage.png b/dist/Storage/AzureBlobStorage.png
index 56286aa7..d9578212 100644
Binary files a/dist/Storage/AzureBlobStorage.png and b/dist/Storage/AzureBlobStorage.png differ
diff --git a/dist/Storage/AzureBlobStorage.puml b/dist/Storage/AzureBlobStorage.puml
index aa32c033..032b3997 100644
--- a/dist/Storage/AzureBlobStorage.puml
+++ b/dist/Storage/AzureBlobStorage.puml
@@ -1,10 +1,7 @@
-sprite $AzureBlobStorage [70x59/16z] {
-fPVTZiOW24H7L8Hv__VT7zF4PXNRRpttFJ5CIGRynVb8mHELptZ2dkHyWM9Fuoi4EpBVOTXXV4b6JE5R737ErrH4A2zEqXP-GZj9UI1FANl4b7OysYO8oFwq
-JZMOVgpnpG8PWA9B_ceq7cs9_-0Uv5qZOSePYQ6bQ-AqRMqnwzzuQ_vhcJHvMg3POeAkrslwc3G-fJnP3EWM0ve2piMcr6c19aksz6ifgAH0gRzKG9Vh99mi
-5x-MBc15kTo0BjDkBomQM2XZWGuiDbBUMZAq3sTjOHaBjBDKP7f22onzmCaZYvK2vE86Y40OMAWzvT0Y7MSJfEoXXG9XO9c8BGrsQEdaodEB9tXiyLRL-Kjh
-lh4Ke8GMb-l7DW5QO1bR6rWAn1H21xQM300IMHAKJ70l9XjBGqVN5kyFAFtxZSNJr9zcItsoL5oKWxVuilmC2xj5O5jB6PQyj0WA3OaxYmLrOLWK443f8e28
-hImI5DHXeKeI9JrtLXQDolARFGeBbGyBkAFTB3MibtNVubq0ZtkGtLwP9EIUQDvqGqlO8hxhXsDcDKj83aOxfNtMcoi_mKzlYKuvksj6okVjMz0v6x1YWvvS
-90C_I7bGFXljKTeP3yY_3gnl
+sprite $AzureBlobStorage [70x70/16z] {
+xTLLOiGm38HXe-AHxd_Ueigj2fhIhl_7m1UqNRwpNUtfQcd7rrlmfYGKt4T1G450GP1yinu50GK11G45mVXyav6y4aUX8C90N3cYvkmrw45PKNEs4dJoobQs
+qXcA41G8GO4I52X1WTh75GbMdYKoMf0hGVBH68WhnrjlzZgHfK4IlrsrcwuL2ueLDO828oWmWW8bA8ua54TIYYCvnP6SuWX1KICeQWH5ZQ2e4HGrWW8ZAB2S
+8jSTw_MkzmI9AvuaeY12GQGpa5dQIDVBw-qk0G
 }
 
 AzureEntityColoring(AzureBlobStorage)
diff --git a/dist/Storage/AzureBlobStorage.svg b/dist/Storage/AzureBlobStorage.svg
index be982772..28f14cfa 100644
--- a/dist/Storage/AzureBlobStorage.svg
+++ b/dist/Storage/AzureBlobStorage.svg
@@ -1,9 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="59pt" viewBox="0 0 70 59" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 2.800781 5.601563 C 1.261719 5.601563 0 6.859375 0 8.398438 L 0 62.441406 C 0 63.980469 1.261719 65.238281 2.800781 65.238281 L 5.878906 65.238281 L 61.039063 5.601563 Z M 2.800781 5.601563 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 51.871094 0 L 17.230469 0 L 0 29.859375 L 17.230469 59.714844 L 51.871094 59.714844 L 69.101563 29.859375 Z M 52.050781 43.265625 C 52.050781 45.769531 49.898438 47.914063 47.382813 47.914063 L 21.898438 47.914063 C 19.382813 47.914063 17.230469 45.769531 17.230469 43.265625 L 17.230469 16.628906 C 17.230469 14.125 19.382813 11.980469 21.898438 11.980469 L 40.742188 11.980469 C 42.539063 11.980469 44.332031 11.980469 44.332031 11.980469 L 44.871094 11.980469 L 52.050781 19.128906 Z M 52.050781 43.265625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 31.949219 34.683594 C 31.949219 34.328125 31.769531 34.148438 31.769531 33.96875 C 31.769531 33.789063 31.589844 33.613281 31.410156 33.433594 C 31.230469 33.253906 31.230469 33.253906 31.050781 33.253906 C 30.871094 33.253906 30.691406 33.253906 30.511719 33.253906 C 30.152344 33.253906 29.972656 33.253906 29.792969 33.433594 C 29.617188 33.613281 29.4375 33.789063 29.257813 34.148438 C 29.078125 34.507813 29.078125 34.863281 29.078125 35.222656 C 29.078125 35.578125 29.078125 36.113281 29.078125 36.832031 C 29.078125 37.546875 29.078125 38.082031 29.078125 38.617188 C 29.078125 39.15625 29.257813 39.511719 29.4375 39.691406 C 29.617188 40.046875 29.792969 40.226563 29.972656 40.226563 C 30.152344 40.40625 30.332031 40.40625 30.691406 40.40625 C 30.871094 40.40625 31.050781 40.40625 31.230469 40.226563 C 31.410156 40.226563 31.589844 40.046875 31.589844 39.871094 C 31.769531 39.691406 31.769531 39.511719 31.949219 39.332031 C 31.949219 39.15625 32.128906 38.976563 32.128906 38.617188 C 32.128906 38.4375 32.128906 38.082031 32.308594 37.722656 C 32.308594 37.367188 32.308594 37.007813 32.308594 36.652344 C 32.308594 36.113281 32.308594 35.757813 32.308594 35.398438 C 31.949219 35.222656 31.949219 35.042969 31.949219 34.683594 Z M 31.949219 34.683594 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 40.027344 20.738281 C 40.027344 20.382813 39.847656 20.203125 39.847656 20.023438 C 39.847656 19.84375 39.667969 19.667969 39.488281 19.488281 C 39.308594 19.308594 39.308594 19.308594 39.128906 19.308594 C 38.949219 19.308594 38.769531 19.308594 38.589844 19.308594 C 38.230469 19.308594 38.050781 19.308594 37.871094 19.488281 C 37.691406 19.667969 37.511719 19.84375 37.332031 20.203125 C 37.152344 20.5625 37.152344 20.917969 37.152344 21.277344 C 37.152344 21.632813 37.152344 22.167969 37.152344 22.886719 C 37.152344 23.601563 37.152344 24.136719 37.152344 24.671875 C 37.152344 25.210938 37.332031 25.566406 37.511719 25.746094 C 37.691406 26.101563 37.871094 26.28125 38.050781 26.28125 C 38.230469 26.460938 38.410156 26.460938 38.769531 26.460938 C 38.949219 26.460938 39.128906 26.460938 39.308594 26.28125 C 39.488281 26.28125 39.667969 26.101563 39.667969 25.925781 C 39.847656 25.746094 39.847656 25.566406 40.027344 25.386719 C 40.027344 25.210938 40.207031 25.03125 40.207031 24.671875 C 40.207031 24.492188 40.207031 24.136719 40.382813 23.777344 C 40.382813 23.421875 40.382813 23.0625 40.382813 22.707031 C 40.382813 22.167969 40.382813 21.8125 40.382813 21.453125 C 40.207031 21.453125 40.207031 21.097656 40.027344 20.738281 Z M 40.027344 20.738281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 43.617188 14.480469 C 42.898438 14.480469 41.820313 14.480469 40.742188 14.480469 L 21.898438 14.480469 C 20.640625 14.480469 19.742188 15.375 19.742188 16.628906 L 19.742188 43.265625 C 19.742188 44.519531 20.640625 45.414063 21.898438 45.414063 L 47.382813 45.414063 C 48.460938 45.414063 49.539063 44.519531 49.539063 43.265625 L 49.539063 20.382813 L 43.792969 20.382813 L 43.792969 14.480469 Z M 27.640625 19.84375 C 27.640625 19.84375 27.640625 19.667969 27.640625 19.667969 C 27.640625 19.667969 27.640625 19.488281 27.640625 19.488281 C 27.640625 19.488281 27.640625 19.488281 27.820313 19.308594 L 29.972656 17.878906 C 29.972656 17.878906 29.972656 17.878906 30.152344 17.878906 C 30.152344 17.878906 30.332031 17.878906 30.332031 17.878906 C 30.332031 17.878906 30.511719 17.878906 30.511719 17.878906 C 30.691406 17.878906 30.691406 17.878906 30.871094 17.878906 C 31.050781 17.878906 31.230469 17.878906 31.410156 17.878906 C 31.589844 17.878906 31.589844 17.878906 31.769531 17.878906 C 31.769531 17.878906 31.949219 17.878906 31.949219 17.878906 C 31.949219 17.878906 31.949219 17.878906 31.949219 18.058594 L 31.949219 26.460938 L 33.5625 26.460938 C 33.5625 26.460938 33.742188 26.460938 33.742188 26.460938 C 33.742188 26.460938 33.742188 26.460938 33.921875 26.640625 C 34.101563 26.816406 33.921875 26.816406 33.921875 26.816406 C 33.921875 26.996094 33.921875 26.996094 33.921875 27.175781 C 33.921875 27.355469 33.921875 27.535156 33.921875 27.535156 C 33.921875 27.710938 33.921875 27.710938 33.921875 27.710938 C 33.921875 27.710938 33.921875 27.890625 33.742188 27.890625 C 33.742188 27.890625 33.742188 27.890625 33.5625 27.890625 L 28 27.890625 C 28 27.890625 28 27.890625 27.820313 27.890625 C 27.820313 27.890625 27.820313 27.890625 27.640625 27.710938 C 27.640625 27.710938 27.640625 27.535156 27.640625 27.535156 C 27.640625 27.355469 27.640625 27.355469 27.640625 27.175781 C 27.640625 26.996094 27.640625 26.816406 27.640625 26.816406 C 27.640625 26.640625 27.640625 26.640625 27.640625 26.640625 C 27.640625 26.640625 27.640625 26.460938 27.820313 26.460938 C 27.820313 26.460938 27.820313 26.460938 28 26.460938 L 29.972656 26.460938 L 29.972656 19.84375 L 28.359375 20.738281 C 28.179688 20.738281 28.179688 20.917969 28 20.917969 C 28 20.917969 27.820313 20.917969 27.820313 20.917969 C 27.820313 20.917969 27.820313 20.738281 27.640625 20.738281 C 27.640625 20.5625 27.640625 20.5625 27.640625 20.203125 C 27.640625 20.023438 27.640625 19.84375 27.640625 19.84375 Z M 33.921875 38.976563 C 33.742188 39.691406 33.5625 40.226563 33.207031 40.585938 C 32.847656 41.121094 32.488281 41.480469 32.128906 41.65625 C 31.589844 41.835938 31.050781 42.015625 30.332031 42.015625 C 29.617188 42.015625 29.078125 41.835938 28.539063 41.65625 C 28 41.480469 27.640625 41.121094 27.460938 40.585938 C 27.28125 40.046875 26.921875 39.511719 26.921875 38.976563 C 26.742188 38.261719 26.742188 37.546875 26.742188 36.832031 C 26.742188 35.9375 26.742188 35.222656 26.921875 34.683594 C 27.101563 33.96875 27.28125 33.433594 27.640625 33.074219 C 28 32.71875 28.359375 32.183594 28.71875 32.003906 C 29.257813 31.824219 29.792969 31.644531 30.511719 31.644531 C 31.230469 31.644531 31.769531 31.824219 32.308594 32.003906 C 32.847656 32.183594 33.207031 32.539063 33.382813 33.074219 C 33.5625 33.613281 33.921875 34.148438 33.921875 34.683594 C 34.101563 35.398438 34.101563 36.113281 34.101563 36.832031 C 34.101563 37.722656 34.101563 38.4375 33.921875 38.976563 Z M 42 41.480469 C 42 41.65625 42 41.65625 42 41.65625 C 42 41.65625 42 41.835938 41.820313 41.835938 C 41.820313 41.835938 41.820313 41.835938 41.640625 41.835938 L 36.078125 41.835938 C 36.078125 41.835938 36.078125 41.835938 35.898438 41.835938 C 35.898438 41.835938 35.898438 41.835938 35.71875 41.65625 C 35.71875 41.65625 35.71875 41.480469 35.71875 41.480469 C 35.71875 41.300781 35.71875 41.300781 35.71875 41.121094 C 35.71875 40.941406 35.71875 40.761719 35.71875 40.761719 C 35.71875 40.585938 35.71875 40.585938 35.71875 40.585938 C 35.71875 40.585938 35.71875 40.40625 35.898438 40.40625 C 35.898438 40.40625 35.898438 40.40625 36.078125 40.40625 L 38.050781 40.40625 L 38.050781 33.789063 L 36.4375 34.683594 C 36.257813 34.683594 36.257813 34.863281 36.078125 34.863281 C 36.078125 34.863281 35.898438 34.863281 35.898438 34.863281 C 35.898438 34.863281 35.898438 34.683594 35.71875 34.683594 C 35.71875 34.507813 35.71875 34.507813 35.71875 34.148438 C 35.71875 33.96875 35.71875 33.96875 35.71875 33.789063 C 35.71875 33.789063 35.71875 33.613281 35.71875 33.613281 C 35.71875 33.613281 35.71875 33.433594 35.71875 33.433594 C 35.71875 33.433594 35.71875 33.433594 35.898438 33.253906 L 38.050781 31.824219 C 38.050781 31.824219 38.050781 31.824219 38.230469 31.824219 C 38.230469 31.824219 38.410156 31.824219 38.410156 31.824219 C 38.410156 31.824219 38.589844 31.824219 38.589844 31.824219 C 38.769531 31.824219 38.769531 31.824219 38.949219 31.824219 C 39.128906 31.824219 39.308594 31.824219 39.488281 31.824219 C 39.667969 31.824219 39.667969 31.824219 39.847656 31.824219 C 39.847656 31.824219 40.027344 31.824219 40.027344 31.824219 C 40.027344 31.824219 40.027344 31.824219 40.027344 32.003906 L 40.027344 40.40625 L 41.640625 40.40625 C 41.640625 40.40625 41.820313 40.40625 41.820313 40.40625 C 41.820313 40.40625 41.820313 40.40625 42 40.585938 C 42 40.585938 42 40.761719 42 40.761719 C 42 40.941406 42 40.941406 42 41.121094 C 42 41.300781 42 41.480469 42 41.480469 Z M 42.179688 25.03125 C 42 25.746094 41.820313 26.28125 41.460938 26.640625 C 41.101563 27.175781 40.742188 27.535156 40.382813 27.710938 C 39.847656 27.890625 39.308594 28.070313 38.589844 28.070313 C 37.871094 28.070313 37.332031 27.890625 36.792969 27.710938 C 36.257813 27.535156 35.898438 27.175781 35.71875 26.640625 C 35.539063 26.28125 35.179688 25.566406 35.179688 25.03125 C 35.179688 24.492188 35 23.601563 35 22.886719 C 35 21.992188 35 21.277344 35.179688 20.738281 C 35.359375 20.023438 35.539063 19.488281 35.898438 19.128906 C 36.257813 18.59375 36.617188 18.238281 36.972656 18.058594 C 37.511719 17.878906 38.050781 17.699219 38.769531 17.699219 C 39.488281 17.699219 40.027344 17.878906 40.5625 18.058594 C 41.101563 18.238281 41.460938 18.59375 41.640625 19.128906 C 41.820313 19.667969 42.179688 20.203125 42.179688 20.738281 C 42.359375 21.453125 42.359375 22.167969 42.359375 22.886719 C 42.359375 23.777344 42.179688 24.492188 42.179688 25.03125 Z M 42.179688 25.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 0 62.71875 C 0 64.121094 1.121094 65.378906 2.519531 65.378906 L 67.339844 65.378906 C 68.738281 65.378906 70 64.261719 70 62.71875 L 70 16.378906 L 0 16.378906 Z M 0 62.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 67.339844 5.601563 L 2.519531 5.601563 C 1.121094 5.601563 0 6.859375 0 8.261719 L 0 16.238281 L 70 16.238281 L 70 8.261719 C 70 6.859375 68.878906 5.601563 67.339844 5.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 5.179688 21.140625 L 33.738281 21.140625 L 33.738281 39.339844 L 5.179688 39.339844 Z M 5.179688 21.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 5.179688 41.859375 L 33.738281 41.859375 L 33.738281 60.058594 L 5.179688 60.058594 Z M 5.179688 41.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.261719 21.140625 L 64.679688 21.140625 L 64.679688 39.339844 L 36.261719 39.339844 Z M 36.261719 21.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 36.261719 41.859375 L 64.679688 41.859375 L 64.679688 60.058594 L 36.261719 60.058594 Z M 36.261719 41.859375 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureDataBox(m).png b/dist/Storage/AzureDataBox(m).png
index 2b372acd..0eef3b41 100644
Binary files a/dist/Storage/AzureDataBox(m).png and b/dist/Storage/AzureDataBox(m).png differ
diff --git a/dist/Storage/AzureDataBox(m).svg b/dist/Storage/AzureDataBox(m).svg
index f56f7ae6..04c2df4e 100644
--- a/dist/Storage/AzureDataBox(m).svg
+++ b/dist/Storage/AzureDataBox(m).svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="67pt" viewBox="0 0 70 67" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(35,161,255);fill-opacity:1;" d="M 34.125 40.359375 L 34.125 33.796875 C 34.125 33.132813 33.566406 32.589844 32.882813 32.589844 L 27.617188 32.589844 C 27.355469 32.589844 27.144531 32.503906 26.988281 32.34375 C 26.828125 32.1875 26.742188 31.976563 26.742188 31.714844 C 26.742188 31.488281 26.828125 31.277344 27.023438 31.050781 L 35.773438 22.320313 C 35.929688 22.164063 36.121094 22.09375 36.367188 22.078125 C 34.441406 14.273438 27.652344 8.328125 19.304688 7.941406 C 8.472656 7.453125 -0.472656 16.410156 0.0195313 27.21875 C 0.472656 37.105469 8.769531 44.816406 18.675781 44.816406 L 34.144531 44.816406 L 34.144531 40.359375 Z M 34.125 40.359375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,111,194);fill-opacity:1;" d="M 44.609375 48.683594 L 44.609375 44.816406 L 51.730469 44.816406 C 61.757813 44.816406 69.933594 36.980469 69.933594 27.359375 C 69.933594 18.125 62.320313 10.566406 52.800781 10.199219 C 49.230469 3.902344 42.371094 0 34.757813 0 C 29.714844 0 25.078125 1.730469 21.527344 4.6875 C 26.078125 5.40625 30.292969 7.523438 33.621094 10.863281 C 37.523438 14.765625 39.777344 19.871094 40.042969 25.3125 L 45.816406 31.070313 C 45.972656 31.226563 46.0625 31.4375 46.0625 31.699219 C 46.0625 31.941406 45.972656 32.136719 45.800781 32.308594 C 45.625 32.484375 45.414063 32.574219 45.1875 32.574219 L 40.078125 32.574219 L 40.078125 55.210938 C 40.078125 55.890625 39.515625 56.453125 38.816406 56.453125 L 38.851563 56.453125 L 33.585938 56.453125 C 33.339844 56.453125 33.148438 56.539063 32.972656 56.714844 C 32.796875 56.890625 32.710938 57.097656 32.710938 57.324219 C 32.710938 57.589844 32.796875 57.796875 32.953125 57.957031 L 41.738281 66.703125 C 41.898438 66.859375 42.105469 66.949219 42.371094 66.949219 C 42.632813 66.949219 42.839844 66.859375 43 66.703125 L 51.75 57.972656 C 51.925781 57.746094 52.027344 57.535156 52.027344 57.308594 C 52.027344 57.046875 51.941406 56.835938 51.785156 56.679688 C 51.625 56.519531 51.417969 56.433594 51.152344 56.433594 L 45.886719 56.433594 C 45.203125 56.433594 44.644531 55.890625 44.644531 55.226563 L 44.644531 48.683594 Z M 44.609375 48.683594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(35,161,255);fill-opacity:1;" d="M 34.199219 39.945313 L 34.199219 33.699219 C 34.199219 33.066406 33.667969 32.550781 33.019531 32.550781 L 28.003906 32.550781 C 27.753906 32.550781 27.554688 32.46875 27.402344 32.316406 C 27.253906 32.167969 27.171875 31.96875 27.171875 31.71875 C 27.171875 31.5 27.253906 31.300781 27.4375 31.085938 L 35.765625 22.773438 C 35.917969 22.621094 36.097656 22.554688 36.332031 22.539063 C 34.5 15.109375 28.035156 9.445313 20.089844 9.078125 C 9.777344 8.613281 1.265625 17.140625 1.734375 27.4375 C 2.164063 36.847656 10.0625 44.195313 19.492188 44.195313 L 34.21875 44.195313 L 34.21875 39.945313 Z M 34.199219 39.945313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,111,194);fill-opacity:1;" d="M 44.179688 47.875 L 44.179688 44.195313 L 50.960938 44.195313 C 60.503906 44.195313 68.285156 36.730469 68.285156 27.570313 C 68.285156 18.773438 61.039063 11.578125 51.976563 11.226563 C 48.578125 5.230469 42.046875 1.515625 34.800781 1.515625 C 30.003906 1.515625 25.585938 3.164063 22.207031 5.980469 C 26.539063 6.664063 30.550781 8.679688 33.71875 11.859375 C 37.433594 15.574219 39.582031 20.441406 39.832031 25.621094 L 45.328125 31.101563 C 45.476563 31.25 45.5625 31.449219 45.5625 31.699219 C 45.5625 31.933594 45.476563 32.117188 45.3125 32.285156 C 45.144531 32.449219 44.945313 32.535156 44.730469 32.535156 L 39.863281 32.535156 L 39.863281 54.089844 C 39.863281 54.738281 39.332031 55.273438 38.664063 55.273438 L 38.699219 55.273438 L 33.683594 55.273438 C 33.449219 55.273438 33.265625 55.355469 33.101563 55.523438 C 32.933594 55.6875 32.851563 55.890625 32.851563 56.105469 C 32.851563 56.355469 32.933594 56.554688 33.085938 56.707031 L 41.445313 65.035156 C 41.597656 65.183594 41.796875 65.269531 42.046875 65.269531 C 42.296875 65.269531 42.496094 65.183594 42.644531 65.035156 L 50.976563 56.722656 C 51.140625 56.503906 51.242188 56.304688 51.242188 56.089844 C 51.242188 55.839844 51.160156 55.640625 51.007813 55.488281 C 50.859375 55.339844 50.660156 55.257813 50.410156 55.257813 L 45.394531 55.257813 C 44.746094 55.257813 44.210938 54.738281 44.210938 54.105469 L 44.210938 47.875 Z M 44.179688 47.875 "/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureDataBox.png b/dist/Storage/AzureDataBox.png
index 172f6642..cabae475 100644
Binary files a/dist/Storage/AzureDataBox.png and b/dist/Storage/AzureDataBox.png differ
diff --git a/dist/Storage/AzureDataBox.puml b/dist/Storage/AzureDataBox.puml
index f8fb0159..70327b2b 100644
--- a/dist/Storage/AzureDataBox.puml
+++ b/dist/Storage/AzureDataBox.puml
@@ -1,8 +1,8 @@
 sprite $AzureDataBox [70x67/16z] {
-xTO7sXiX38JX4I24TFy3PzTnDp1RqlE_1_YUaUjY9gkvHtWppJWcMJppcWuqMdneUmTPT5NiqMB04tQGRD6NiOkeayn66Ztig5oghQgcyJiLZecazkmQibtl
-bAYzKy6YngTcjKZl5kl9rqnNAtXJh4-lH_NvQqVDPXcFaIPioIEJOYntNfF1QrDZx7gLs9m04dIDaegICI5qoYgHCUqwXOzfv2RZ0EXyJ38k0obcKZ5AiOYP
-gjiYy9ZmkYs25ZCR8oYamYCyGoERCjKc2h0jesJ9jamcIxPbn8Qs__CsrF6MYuIBh8iQVOfiX61bv1V6Y4GhTTrwkY9Or9CLnKhELHg-IsSgBY0PMhb6hgGU
-h3IXVzMyelG1XbTCy4dAdeghO41IAVf67XMxgfe5HnXvBFnJAr-LhqgB1GvJMtcit2u4ktbyE5197vaCWcH8X6LuX1DdaUqP7k4P6jcUuH6UuH5EQiBGDm
+xTO7SWOX28PX4G7r_WTEoFXtv9jDR-y1dbbTM_cCYDjpJENrDHlpbBLNIQJpBgk74Pb1UioWFiF6iS-fOh7JZawC3CYyVd8O3wI9cga8qtv-A2MesLNAnTD7
+fMV8CkuT2HZJpHeajSVaHPzXlGKJOc5AQr1HW-yGjbtEzBd9u9Uir4SxFRYMBKdM36-wC69PFlgzCWYDPnLCSB1w12ZyC3F1nY83wVutUIDQi_7V5lGnOgXQ
+2aymCuQYRCciJKuOyJA5NS58FhrJbWAHGcElg2i0mOm1XV3jigufX616V8y013EShLqkzt6iKBQFj7dB4gydkrhH-lS6sjJLqXWe0nymXXLP2hr5wVWECAmG
+le-mKeDh3IZmRLNr5Ked-6R0Yg3t2rQ6KFAMWeeB9hMyfX6Cu7LA-qpbN_bNQDsahqs7Tzf07hz2iUnuUpq3FmKp6C4CHZ234SnW1AS0ES101AUZbX_H4m
 }
 
 AzureEntityColoring(AzureDataBox)
diff --git a/dist/Storage/AzureDataBox.svg b/dist/Storage/AzureDataBox.svg
index 4ccb7e68..a2312325 100644
--- a/dist/Storage/AzureDataBox.svg
+++ b/dist/Storage/AzureDataBox.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="67pt" viewBox="0 0 70 67" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.058824%,67.843137%,82.352941%);fill-opacity:1;" d="M 34.125 40.359375 L 34.125 33.796875 C 34.125 33.132813 33.566406 32.589844 32.882813 32.589844 L 27.617188 32.589844 C 27.355469 32.589844 27.144531 32.503906 26.988281 32.34375 C 26.828125 32.1875 26.742188 31.976563 26.742188 31.714844 C 26.742188 31.488281 26.828125 31.277344 27.023438 31.050781 L 35.773438 22.320313 C 35.929688 22.164063 36.121094 22.09375 36.367188 22.078125 C 34.441406 14.273438 27.652344 8.328125 19.304688 7.941406 C 8.472656 7.453125 -0.472656 16.410156 0.0195313 27.21875 C 0.472656 37.105469 8.769531 44.816406 18.675781 44.816406 L 34.144531 44.816406 L 34.144531 40.359375 Z M 34.125 40.359375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13.333333%,44.705882%,72.54902%);fill-opacity:1;" d="M 44.609375 48.683594 L 44.609375 44.816406 L 51.730469 44.816406 C 61.757813 44.816406 69.933594 36.980469 69.933594 27.359375 C 69.933594 18.125 62.320313 10.566406 52.800781 10.199219 C 49.230469 3.902344 42.371094 0 34.757813 0 C 29.714844 0 25.078125 1.730469 21.527344 4.6875 C 26.078125 5.40625 30.292969 7.523438 33.621094 10.863281 C 37.523438 14.765625 39.777344 19.871094 40.042969 25.3125 L 45.816406 31.070313 C 45.972656 31.226563 46.0625 31.4375 46.0625 31.699219 C 46.0625 31.941406 45.972656 32.136719 45.800781 32.308594 C 45.625 32.484375 45.414063 32.574219 45.1875 32.574219 L 40.078125 32.574219 L 40.078125 55.210938 C 40.078125 55.890625 39.515625 56.453125 38.816406 56.453125 L 38.851563 56.453125 L 33.585938 56.453125 C 33.339844 56.453125 33.148438 56.539063 32.972656 56.714844 C 32.796875 56.890625 32.710938 57.097656 32.710938 57.324219 C 32.710938 57.589844 32.796875 57.796875 32.953125 57.957031 L 41.738281 66.703125 C 41.898438 66.859375 42.105469 66.949219 42.371094 66.949219 C 42.632813 66.949219 42.839844 66.859375 43 66.703125 L 51.75 57.972656 C 51.925781 57.746094 52.027344 57.535156 52.027344 57.308594 C 52.027344 57.046875 51.941406 56.835938 51.785156 56.679688 C 51.625 56.519531 51.417969 56.433594 51.152344 56.433594 L 45.886719 56.433594 C 45.203125 56.433594 44.644531 55.890625 44.644531 55.226563 L 44.644531 48.683594 Z M 44.609375 48.683594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.058824%,67.843137%,82.352941%);fill-opacity:1;" d="M 34.199219 39.945313 L 34.199219 33.699219 C 34.199219 33.066406 33.667969 32.550781 33.019531 32.550781 L 28.003906 32.550781 C 27.753906 32.550781 27.554688 32.46875 27.402344 32.316406 C 27.253906 32.167969 27.171875 31.96875 27.171875 31.71875 C 27.171875 31.5 27.253906 31.300781 27.4375 31.085938 L 35.765625 22.773438 C 35.917969 22.621094 36.097656 22.554688 36.332031 22.539063 C 34.5 15.109375 28.035156 9.445313 20.089844 9.078125 C 9.777344 8.613281 1.265625 17.140625 1.734375 27.4375 C 2.164063 36.847656 10.0625 44.195313 19.492188 44.195313 L 34.21875 44.195313 L 34.21875 39.945313 Z M 34.199219 39.945313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13.333333%,44.705882%,72.54902%);fill-opacity:1;" d="M 44.179688 47.875 L 44.179688 44.195313 L 50.960938 44.195313 C 60.503906 44.195313 68.285156 36.730469 68.285156 27.570313 C 68.285156 18.773438 61.039063 11.578125 51.976563 11.226563 C 48.578125 5.230469 42.046875 1.515625 34.800781 1.515625 C 30.003906 1.515625 25.585938 3.164063 22.207031 5.980469 C 26.539063 6.664063 30.550781 8.679688 33.71875 11.859375 C 37.433594 15.574219 39.582031 20.441406 39.832031 25.621094 L 45.328125 31.101563 C 45.476563 31.25 45.5625 31.449219 45.5625 31.699219 C 45.5625 31.933594 45.476563 32.117188 45.3125 32.285156 C 45.144531 32.449219 44.945313 32.535156 44.730469 32.535156 L 39.863281 32.535156 L 39.863281 54.089844 C 39.863281 54.738281 39.332031 55.273438 38.664063 55.273438 L 38.699219 55.273438 L 33.683594 55.273438 C 33.449219 55.273438 33.265625 55.355469 33.101563 55.523438 C 32.933594 55.6875 32.851563 55.890625 32.851563 56.105469 C 32.851563 56.355469 32.933594 56.554688 33.085938 56.707031 L 41.445313 65.035156 C 41.597656 65.183594 41.796875 65.269531 42.046875 65.269531 C 42.296875 65.269531 42.496094 65.183594 42.644531 65.035156 L 50.976563 56.722656 C 51.140625 56.503906 51.242188 56.304688 51.242188 56.089844 C 51.242188 55.839844 51.160156 55.640625 51.007813 55.488281 C 50.859375 55.339844 50.660156 55.257813 50.410156 55.257813 L 45.394531 55.257813 C 44.746094 55.257813 44.210938 54.738281 44.210938 54.105469 L 44.210938 47.875 Z M 44.179688 47.875 "/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureDataBoxEdgeDataBoxGateway(m).png b/dist/Storage/AzureDataBoxEdgeDataBoxGateway(m).png
new file mode 100644
index 00000000..fa55c5e7
Binary files /dev/null and b/dist/Storage/AzureDataBoxEdgeDataBoxGateway(m).png differ
diff --git a/dist/Storage/AzureDataBoxEdgeDataBoxGateway(m).svg b/dist/Storage/AzureDataBoxEdgeDataBoxGateway(m).svg
new file mode 100644
index 00000000..00d1fcec
--- /dev/null
+++ b/dist/Storage/AzureDataBoxEdgeDataBoxGateway(m).svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="45pt" viewBox="0 0 70 45" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,111,194);fill-opacity:1;" d="M 51.992188 10.863281 C 48.578125 4.867188 42.046875 1.152344 34.800781 1.152344 C 30.003906 1.152344 25.585938 2.800781 22.207031 5.617188 C 26.539063 6.300781 30.550781 8.316406 33.71875 11.496094 C 37.664063 15.445313 39.847656 20.691406 39.847656 26.257813 L 39.847656 43.832031 L 50.960938 43.832031 C 60.503906 43.832031 68.285156 36.367188 68.285156 27.207031 C 68.285156 18.425781 61.039063 11.230469 51.992188 10.863281 Z M 51.992188 10.863281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(35,161,255);fill-opacity:1;" d="M 20.089844 8.730469 C 9.777344 8.265625 1.265625 16.792969 1.734375 27.089844 C 2.164063 36.5 10.0625 43.847656 19.492188 43.847656 L 36.867188 43.847656 L 36.867188 26.472656 C 36.847656 17.042969 29.503906 9.148438 20.089844 8.730469 Z M 20.089844 8.730469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 33.050781 27.789063 L 33.050781 25.65625 C 33.050781 25.390625 32.882813 25.15625 32.617188 25.074219 L 29.652344 24.109375 C 29.484375 24.058594 29.335938 23.925781 29.269531 23.757813 L 28.621094 22.191406 C 28.554688 22.023438 28.554688 21.84375 28.636719 21.691406 L 29.984375 18.828125 C 30.101563 18.59375 30.050781 18.308594 29.867188 18.128906 L 28.351563 16.609375 C 28.167969 16.429688 27.871094 16.378906 27.636719 16.496094 L 24.855469 17.910156 C 24.6875 17.992188 24.503906 17.992188 24.339844 17.925781 L 22.773438 17.277344 C 22.605469 17.210938 22.488281 17.078125 22.421875 16.910156 L 21.355469 13.929688 C 21.273438 13.679688 21.039063 13.511719 20.773438 13.511719 L 18.65625 13.511719 C 18.390625 13.511719 18.15625 13.679688 18.074219 13.945313 L 17.109375 16.910156 C 17.058594 17.078125 16.925781 17.226563 16.757813 17.292969 L 15.191406 17.945313 C 15.027344 18.011719 14.84375 18.011719 14.691406 17.925781 L 11.828125 16.578125 C 11.59375 16.460938 11.3125 16.511719 11.128906 16.695313 L 9.613281 18.210938 C 9.429688 18.394531 9.378906 18.695313 9.496094 18.925781 L 10.910156 21.707031 C 10.996094 21.875 10.996094 22.058594 10.929688 22.226563 L 10.277344 23.792969 C 10.210938 23.957031 10.078125 24.074219 9.910156 24.140625 L 6.929688 25.207031 C 6.679688 25.289063 6.511719 25.523438 6.511719 25.789063 L 6.511719 27.921875 C 6.511719 28.1875 6.679688 28.421875 6.929688 28.503906 L 9.894531 29.472656 C 10.0625 29.523438 10.210938 29.65625 10.277344 29.820313 L 10.929688 31.386719 C 10.996094 31.554688 10.996094 31.738281 10.910156 31.886719 L 9.5625 34.753906 C 9.445313 34.984375 9.496094 35.269531 9.679688 35.453125 L 11.195313 36.96875 C 11.378906 37.152344 11.679688 37.203125 11.910156 37.085938 L 14.691406 35.667969 C 14.859375 35.585938 15.042969 35.585938 15.210938 35.652344 L 16.773438 36.300781 C 16.941406 36.367188 17.058594 36.5 17.125 36.667969 L 18.191406 39.648438 C 18.273438 39.898438 18.507813 40.066406 18.773438 40.066406 L 20.90625 40.066406 C 21.171875 40.066406 21.40625 39.898438 21.488281 39.632813 L 22.457031 36.667969 C 22.507813 36.5 22.640625 36.351563 22.804688 36.285156 L 24.371094 35.636719 C 24.539063 35.570313 24.722656 35.570313 24.871094 35.652344 L 27.738281 37 C 27.96875 37.117188 28.253906 37.066406 28.4375 36.886719 L 29.953125 35.367188 C 30.136719 35.1875 30.1875 34.886719 30.070313 34.652344 L 28.652344 31.871094 C 28.570313 31.703125 28.570313 31.519531 28.636719 31.355469 L 29.285156 29.789063 C 29.351563 29.621094 29.484375 29.503906 29.652344 29.4375 L 32.632813 28.371094 C 32.882813 28.273438 33.050781 28.039063 33.050781 27.789063 Z M 20.40625 33.253906 C 18.675781 33.417969 16.976563 32.902344 15.640625 31.789063 C 14.292969 30.6875 13.460938 29.121094 13.292969 27.390625 C 13.128906 25.65625 13.644531 23.957031 14.757813 22.625 C 15.859375 21.277344 17.425781 20.441406 19.15625 20.277344 C 21.554688 20.027344 23.804688 21.160156 25.121094 23.007813 C 25.753906 23.90625 26.136719 24.972656 26.269531 26.140625 C 26.621094 29.722656 24.003906 32.921875 20.40625 33.253906 Z M 20.40625 33.253906 "/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureDataBoxEdgeDataBoxGateway.png b/dist/Storage/AzureDataBoxEdgeDataBoxGateway.png
new file mode 100644
index 00000000..1dfa50a4
Binary files /dev/null and b/dist/Storage/AzureDataBoxEdgeDataBoxGateway.png differ
diff --git a/dist/Storage/AzureDataBoxEdgeDataBoxGateway.puml b/dist/Storage/AzureDataBoxEdgeDataBoxGateway.puml
new file mode 100644
index 00000000..90878ef2
--- /dev/null
+++ b/dist/Storage/AzureDataBoxEdgeDataBoxGateway.puml
@@ -0,0 +1,11 @@
+sprite $AzureDataBoxEdgeDataBoxGateway [70x45/16z] {
+jPO7acCX34GHIi3zxxk1LRlaMc3mhvbNOOBjPxNwf_Bp4AktrjoLwQb3saWqUUJe8m1TFyxIneBE7qbg7slims6aBJLUFgJQSmtzuULfJqAHcFy31uWkDFn5
+0i_ezF2YAJhC0KVoRElg9aiL-uhwLpFM-FyUIHE8s9j6nWQZhUHla_Lz6jjfUbt6mJBynPoxZnsI5XkVj_Zoc4tL_s0fqx5scn8kXSqu8iwYfqQEmupwbaVA
+0ejCkhVqjr5i8I7uQUonl1MFqOX545PUhRM3XkAjQHZrb0_-OwIXCr2ssAfmmUbqs8m7Z4dod_3JE4V2mS9O4PZrANuzMIG-gHIT9mWDVcdHi4Zg94UALEVZ
+RjYtM3mijat4VZCBEZ91NwbuKlSBYwPs1P7IXSMlB9nZbAHq57zZeVHUJQknMihrB2rQG8G9SQNubQyiaavgAmlime8BZ29GWgujKW9q992HkVFTNbeuSESm
+b8F6xQAZJYLhW64u0Cl57Ibf27yTBP3iRlQcwfUMThnLtrcwb0KaHylzSsiLjGjBTwtb-_aD
+}
+
+AzureEntityColoring(AzureDataBoxEdgeDataBoxGateway)
+!define AzureDataBoxEdgeDataBoxGateway(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataBoxEdgeDataBoxGateway, AzureDataBoxEdgeDataBoxGateway)
+!define AzureDataBoxEdgeDataBoxGateway(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataBoxEdgeDataBoxGateway, AzureDataBoxEdgeDataBoxGateway)
diff --git a/dist/Storage/AzureDataBoxEdgeDataBoxGateway.svg b/dist/Storage/AzureDataBoxEdgeDataBoxGateway.svg
new file mode 100644
index 00000000..c06c7326
--- /dev/null
+++ b/dist/Storage/AzureDataBoxEdgeDataBoxGateway.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="45pt" viewBox="0 0 70 45" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(13.333333%,44.705882%,72.54902%);fill-opacity:1;" d="M 51.992188 10.863281 C 48.578125 4.867188 42.046875 1.152344 34.800781 1.152344 C 30.003906 1.152344 25.585938 2.800781 22.207031 5.617188 C 26.539063 6.300781 30.550781 8.316406 33.71875 11.496094 C 37.664063 15.445313 39.847656 20.691406 39.847656 26.257813 L 39.847656 43.832031 L 50.960938 43.832031 C 60.503906 43.832031 68.285156 36.367188 68.285156 27.207031 C 68.285156 18.425781 61.039063 11.230469 51.992188 10.863281 Z M 51.992188 10.863281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.058824%,67.843137%,82.352941%);fill-opacity:1;" d="M 20.089844 8.730469 C 9.777344 8.265625 1.265625 16.792969 1.734375 27.089844 C 2.164063 36.5 10.0625 43.847656 19.492188 43.847656 L 36.867188 43.847656 L 36.867188 26.472656 C 36.847656 17.042969 29.503906 9.148438 20.089844 8.730469 Z M 20.089844 8.730469 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 33.050781 27.789063 L 33.050781 25.65625 C 33.050781 25.390625 32.882813 25.15625 32.617188 25.074219 L 29.652344 24.109375 C 29.484375 24.058594 29.335938 23.925781 29.269531 23.757813 L 28.621094 22.191406 C 28.554688 22.023438 28.554688 21.84375 28.636719 21.691406 L 29.984375 18.828125 C 30.101563 18.59375 30.050781 18.308594 29.867188 18.128906 L 28.351563 16.609375 C 28.167969 16.429688 27.871094 16.378906 27.636719 16.496094 L 24.855469 17.910156 C 24.6875 17.992188 24.503906 17.992188 24.339844 17.925781 L 22.773438 17.277344 C 22.605469 17.210938 22.488281 17.078125 22.421875 16.910156 L 21.355469 13.929688 C 21.273438 13.679688 21.039063 13.511719 20.773438 13.511719 L 18.65625 13.511719 C 18.390625 13.511719 18.15625 13.679688 18.074219 13.945313 L 17.109375 16.910156 C 17.058594 17.078125 16.925781 17.226563 16.757813 17.292969 L 15.191406 17.945313 C 15.027344 18.011719 14.84375 18.011719 14.691406 17.925781 L 11.828125 16.578125 C 11.59375 16.460938 11.3125 16.511719 11.128906 16.695313 L 9.613281 18.210938 C 9.429688 18.394531 9.378906 18.695313 9.496094 18.925781 L 10.910156 21.707031 C 10.996094 21.875 10.996094 22.058594 10.929688 22.226563 L 10.277344 23.792969 C 10.210938 23.957031 10.078125 24.074219 9.910156 24.140625 L 6.929688 25.207031 C 6.679688 25.289063 6.511719 25.523438 6.511719 25.789063 L 6.511719 27.921875 C 6.511719 28.1875 6.679688 28.421875 6.929688 28.503906 L 9.894531 29.472656 C 10.0625 29.523438 10.210938 29.65625 10.277344 29.820313 L 10.929688 31.386719 C 10.996094 31.554688 10.996094 31.738281 10.910156 31.886719 L 9.5625 34.753906 C 9.445313 34.984375 9.496094 35.269531 9.679688 35.453125 L 11.195313 36.96875 C 11.378906 37.152344 11.679688 37.203125 11.910156 37.085938 L 14.691406 35.667969 C 14.859375 35.585938 15.042969 35.585938 15.210938 35.652344 L 16.773438 36.300781 C 16.941406 36.367188 17.058594 36.5 17.125 36.667969 L 18.191406 39.648438 C 18.273438 39.898438 18.507813 40.066406 18.773438 40.066406 L 20.90625 40.066406 C 21.171875 40.066406 21.40625 39.898438 21.488281 39.632813 L 22.457031 36.667969 C 22.507813 36.5 22.640625 36.351563 22.804688 36.285156 L 24.371094 35.636719 C 24.539063 35.570313 24.722656 35.570313 24.871094 35.652344 L 27.738281 37 C 27.96875 37.117188 28.253906 37.066406 28.4375 36.886719 L 29.953125 35.367188 C 30.136719 35.1875 30.1875 34.886719 30.070313 34.652344 L 28.652344 31.871094 C 28.570313 31.703125 28.570313 31.519531 28.636719 31.355469 L 29.285156 29.789063 C 29.351563 29.621094 29.484375 29.503906 29.652344 29.4375 L 32.632813 28.371094 C 32.882813 28.273438 33.050781 28.039063 33.050781 27.789063 Z M 20.40625 33.253906 C 18.675781 33.417969 16.976563 32.902344 15.640625 31.789063 C 14.292969 30.6875 13.460938 29.121094 13.292969 27.390625 C 13.128906 25.65625 13.644531 23.957031 14.757813 22.625 C 15.859375 21.277344 17.425781 20.441406 19.15625 20.277344 C 21.554688 20.027344 23.804688 21.160156 25.121094 23.007813 C 25.753906 23.90625 26.136719 24.972656 26.269531 26.140625 C 26.621094 29.722656 24.003906 32.921875 20.40625 33.253906 Z M 20.40625 33.253906 "/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureDataLakeStorage(m).png b/dist/Storage/AzureDataLakeStorage(m).png
index ef98d696..3ed1d769 100644
Binary files a/dist/Storage/AzureDataLakeStorage(m).png and b/dist/Storage/AzureDataLakeStorage(m).png differ
diff --git a/dist/Storage/AzureDataLakeStorage(m).svg b/dist/Storage/AzureDataLakeStorage(m).svg
index b732ba20..8a60518f 100644
--- a/dist/Storage/AzureDataLakeStorage(m).svg
+++ b/dist/Storage/AzureDataLakeStorage(m).svg
@@ -1,6 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="54pt" viewBox="0 0 70 54" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 58.03125 51.800781 C 54.902344 51.800781 52.207031 50.464844 50.976563 48.542969 C 50.703125 48.117188 50.09375 48.113281 49.820313 48.539063 C 48.578125 50.464844 45.859375 51.800781 42.699219 51.800781 C 39.539063 51.800781 36.816406 50.460938 35.578125 48.535156 C 35.304688 48.109375 34.695313 48.109375 34.421875 48.535156 C 33.183594 50.460938 30.460938 51.800781 27.300781 51.800781 C 24.144531 51.800781 21.425781 50.46875 20.183594 48.546875 C 19.910156 48.121094 19.300781 48.121094 19.027344 48.550781 C 17.804688 50.46875 15.136719 51.800781 12.039063 51.800781 C 9.953125 51.800781 8.0625 51.195313 6.675781 50.214844 C 6.222656 49.894531 5.601563 50.25 5.601563 50.804688 L 5.601563 64.398438 L 64.398438 64.398438 L 64.398438 49.402344 C 62.996094 50.851563 60.667969 51.800781 58.03125 51.800781 Z M 58.03125 51.800781 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 58.03125 51.800781 C 54.902344 51.800781 52.207031 50.464844 50.976563 48.542969 C 50.703125 48.117188 50.09375 48.113281 49.820313 48.539063 C 48.578125 50.464844 45.859375 51.800781 42.699219 51.800781 C 39.539063 51.800781 36.816406 50.460938 35.578125 48.535156 C 35.304688 48.109375 34.695313 48.109375 34.421875 48.535156 C 33.183594 50.460938 30.460938 51.800781 27.300781 51.800781 C 24.144531 51.800781 21.425781 50.46875 20.183594 48.546875 C 19.910156 48.121094 19.300781 48.121094 19.027344 48.550781 C 17.804688 50.46875 15.136719 51.800781 12.039063 51.800781 C 9.953125 51.800781 8.0625 51.195313 6.675781 50.214844 C 6.222656 49.894531 5.601563 50.25 5.601563 50.804688 L 5.601563 53.464844 C 6.976563 54.992188 9.34375 56 12.039063 56 C 15.800781 56 18.929688 54.039063 19.601563 51.445313 C 20.285156 54.039063 23.46875 56 27.300781 56 C 31.132813 56 34.316406 54.035156 35 51.4375 C 35.683594 54.035156 38.867188 56 42.699219 56 C 46.53125 56 49.714844 54.035156 50.398438 51.441406 C 51.078125 54.035156 54.234375 56 58.03125 56 C 60.667969 56 62.996094 55.050781 64.398438 53.601563 L 64.398438 49.402344 C 62.996094 50.851563 60.667969 51.800781 58.03125 51.800781 Z M 58.03125 51.800781 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 58.03125 30.800781 C 54.902344 30.800781 52.207031 29.464844 50.976563 27.542969 C 50.703125 27.117188 50.09375 27.113281 49.820313 27.539063 C 48.578125 29.464844 45.859375 30.800781 42.699219 30.800781 C 39.539063 30.800781 36.816406 29.460938 35.578125 27.535156 C 35.304688 27.109375 34.695313 27.109375 34.421875 27.535156 C 33.183594 29.460938 30.460938 30.800781 27.300781 30.800781 C 24.144531 30.800781 21.425781 29.46875 20.183594 27.546875 C 19.910156 27.121094 19.300781 27.121094 19.027344 27.550781 C 17.804688 29.46875 15.136719 30.800781 12.039063 30.800781 C 9.953125 30.800781 8.0625 30.195313 6.675781 29.214844 C 6.222656 28.894531 5.601563 29.25 5.601563 29.804688 L 5.601563 32.464844 C 6.976563 33.992188 9.34375 35 12.039063 35 C 15.800781 35 18.929688 33.039063 19.601563 30.445313 C 20.285156 33.039063 23.46875 35 27.300781 35 C 31.132813 35 34.316406 33.035156 35 30.4375 C 35.683594 33.035156 38.867188 35 42.699219 35 C 46.53125 35 49.714844 33.035156 50.398438 30.441406 C 51.078125 33.035156 54.234375 35 58.03125 35 C 60.667969 35 62.996094 34.050781 64.398438 32.601563 L 64.398438 28.402344 C 62.996094 29.851563 60.667969 30.800781 58.03125 30.800781 Z M 58.03125 30.800781 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 41.242188 5.566406 L 39.222656 2.132813 C 38.453125 0.824219 36.988281 0 35.453125 0 L 4.328125 0 C 1.957031 0 0 1.925781 0 4.257813 L 0 6.457031 L 42.011719 6.457031 C 41.664063 6.25 41.453125 5.90625 41.242188 5.566406 Z M 43.753906 29.253906 L 31.402344 46.628906 C 31.269531 46.765625 31.128906 46.90625 30.917969 46.90625 C 30.847656 46.90625 30.707031 46.90625 30.636719 46.835938 C 30.359375 46.695313 30.21875 46.425781 30.359375 46.148438 L 33.570313 35.78125 L 26.378906 35.78125 C 26.167969 35.78125 25.964844 35.640625 25.824219 35.433594 C 25.753906 35.226563 25.753906 35.027344 25.894531 34.816406 L 37.894531 17.652344 C 38.035156 17.511719 38.175781 17.375 38.386719 17.375 C 38.453125 17.375 38.523438 17.375 38.660156 17.445313 C 38.941406 17.582031 39.082031 17.851563 38.941406 18.128906 L 35.871094 28.292969 L 43.269531 28.292969 C 43.621094 28.292969 43.894531 28.566406 43.894531 28.914063 C 43.894531 29.050781 43.824219 29.121094 43.753906 29.253906 Z M 67.066406 8.652344 L 0 8.652344 L 0 49.652344 C 0 51.984375 1.957031 53.910156 4.328125 53.910156 L 65.460938 53.910156 C 67.832031 53.910156 69.789063 51.984375 69.789063 49.652344 L 69.789063 12.570313 C 69.789063 10.851563 68.671875 9.339844 67.066406 8.652344 Z M 67.066406 8.652344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 61.601563 70 L 8.398438 70 C 3.761719 70 0 66.238281 0 61.601563 L 0 11.199219 L 70 11.199219 L 70 61.601563 C 70 66.238281 66.238281 70 61.601563 70 Z M 61.601563 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 58.03125 51.800781 C 54.902344 51.800781 52.207031 50.464844 50.976563 48.542969 C 50.703125 48.117188 50.09375 48.113281 49.820313 48.539063 C 48.578125 50.464844 45.859375 51.800781 42.699219 51.800781 C 39.539063 51.800781 36.816406 50.460938 35.578125 48.535156 C 35.304688 48.109375 34.695313 48.109375 34.421875 48.535156 C 33.183594 50.460938 30.460938 51.800781 27.300781 51.800781 C 24.144531 51.800781 21.425781 50.46875 20.183594 48.546875 C 19.910156 48.121094 19.300781 48.121094 19.027344 48.550781 C 17.804688 50.46875 15.136719 51.800781 12.039063 51.800781 C 9.953125 51.800781 8.0625 51.195313 6.675781 50.214844 C 6.222656 49.894531 5.601563 50.25 5.601563 50.804688 L 5.601563 64.398438 L 64.398438 64.398438 L 64.398438 49.402344 C 62.996094 50.851563 60.667969 51.800781 58.03125 51.800781 Z M 58.03125 51.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 58.03125 9.800781 C 54.902344 9.800781 52.207031 8.464844 50.976563 6.542969 C 50.703125 6.117188 50.09375 6.113281 49.820313 6.539063 C 48.578125 8.464844 45.859375 9.800781 42.699219 9.800781 C 39.539063 9.800781 36.816406 8.460938 35.578125 6.535156 C 35.304688 6.109375 34.695313 6.109375 34.421875 6.535156 C 33.183594 8.460938 30.460938 9.800781 27.300781 9.800781 C 24.144531 9.800781 21.425781 8.46875 20.183594 6.546875 C 19.910156 6.121094 19.300781 6.121094 19.027344 6.550781 C 17.804688 8.46875 15.136719 9.800781 12.039063 9.800781 C 9.953125 9.800781 8.0625 9.195313 6.675781 8.214844 C 6.222656 7.894531 5.601563 8.25 5.601563 8.804688 L 5.601563 22.398438 L 64.398438 22.398438 L 64.398438 8.886719 C 64.398438 8.339844 63.785156 7.984375 63.332031 8.289063 C 61.945313 9.226563 60.082031 9.800781 58.03125 9.800781 Z M 58.03125 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 58.03125 30.800781 C 54.902344 30.800781 52.207031 29.464844 50.976563 27.542969 C 50.703125 27.117188 50.09375 27.113281 49.820313 27.539063 C 48.578125 29.464844 45.859375 30.800781 42.699219 30.800781 C 39.539063 30.800781 36.816406 29.460938 35.578125 27.535156 C 35.304688 27.109375 34.695313 27.109375 34.421875 27.535156 C 33.183594 29.460938 30.460938 30.800781 27.300781 30.800781 C 24.144531 30.800781 21.425781 29.46875 20.183594 27.546875 C 19.910156 27.121094 19.300781 27.121094 19.027344 27.550781 C 17.804688 29.46875 15.136719 30.800781 12.039063 30.800781 C 9.953125 30.800781 8.0625 30.195313 6.675781 29.214844 C 6.222656 28.894531 5.601563 29.25 5.601563 29.804688 L 5.601563 43.398438 L 64.398438 43.398438 L 64.398438 28.402344 C 62.996094 29.851563 60.667969 30.800781 58.03125 30.800781 Z M 58.03125 30.800781 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureDataLakeStorage.png b/dist/Storage/AzureDataLakeStorage.png
index 3a5093dc..1cc3b6ff 100644
Binary files a/dist/Storage/AzureDataLakeStorage.png and b/dist/Storage/AzureDataLakeStorage.png differ
diff --git a/dist/Storage/AzureDataLakeStorage.puml b/dist/Storage/AzureDataLakeStorage.puml
index b6dc902d..3fa1563e 100644
--- a/dist/Storage/AzureDataLakeStorage.puml
+++ b/dist/Storage/AzureDataLakeStorage.puml
@@ -1,7 +1,8 @@
-sprite $AzureDataLakeStorage [70x54/16z] {
-xTQ5OGGW44JHZxFJVxznERSXdjS0iWejTCPid3DrWSbfJHVfd1IwJEOKlV3Uf4jLJgYNAdouwYkW1GPQeMk5q5Vx5oNaguHiWo9R9Bfi1KAk1bck2JIP8WFJ
-3p8aFyX0zOCC33l86rBe9frDvUOW-rU9pAQXcpGsrHNloM44-StKRThcbE_or9SWUz9Ba2rpByYtXhl9bL-2R3zeojMWovQfiWKfPEjC-URGZnDQOMg1A5gW
-KPTi5QJQB3N1FG
+sprite $AzureDataLakeStorage [70x70/16z] {
+xOm7pkmW30OXTbnp__EcRC548jAIVVLdrFWqPjA_o01pDITiwpP85Eyo4RPr9C-vF6a3tWhsUQ6XLARj4AQS9vZf2Kvvs_XSRJt7IY_FYku8TSEwi-mOTID7
+u0zLHcLKNBknvIC6ujKqQUis3EWnWi1HKwqzFCdA4m1Gtqfms-HlFPyqbOe2afYxAI70_czcysqpmh6HjDQoQztq72iHnAjPxsO5wpCyxtOb23oevuMcM7aQ
+BC1fDsPLwUA7LaR5k1jPFcBWxHtdDSOIfmjRt5hhIiKhPl7Ib6rVwA1yEpoCg_21cE_JNlEb-QohIaIuHYvckwBrdUXfIgiYyKhBNTajRQ7oDh9VXSFNREgg
+qijlg8oAVwLYNwdmKR5-Zl_JyWKuoVs8vvJiTWLIIbdlDHpI0TgD1kUji08
 }
 
 AzureEntityColoring(AzureDataLakeStorage)
diff --git a/dist/Storage/AzureDataLakeStorage.svg b/dist/Storage/AzureDataLakeStorage.svg
index d951b6f6..9183460d 100644
--- a/dist/Storage/AzureDataLakeStorage.svg
+++ b/dist/Storage/AzureDataLakeStorage.svg
@@ -1,7 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="55pt" viewBox="0 0 70 55" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 58.03125 51.800781 C 54.902344 51.800781 52.207031 50.464844 50.976563 48.542969 C 50.703125 48.117188 50.09375 48.113281 49.820313 48.539063 C 48.578125 50.464844 45.859375 51.800781 42.699219 51.800781 C 39.539063 51.800781 36.816406 50.460938 35.578125 48.535156 C 35.304688 48.109375 34.695313 48.109375 34.421875 48.535156 C 33.183594 50.460938 30.460938 51.800781 27.300781 51.800781 C 24.144531 51.800781 21.425781 50.46875 20.183594 48.546875 C 19.910156 48.121094 19.300781 48.121094 19.027344 48.550781 C 17.804688 50.46875 15.136719 51.800781 12.039063 51.800781 C 9.953125 51.800781 8.0625 51.195313 6.675781 50.214844 C 6.222656 49.894531 5.601563 50.25 5.601563 50.804688 L 5.601563 64.398438 L 64.398438 64.398438 L 64.398438 49.402344 C 62.996094 50.851563 60.667969 51.800781 58.03125 51.800781 Z M 58.03125 51.800781 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 58.03125 51.800781 C 54.902344 51.800781 52.207031 50.464844 50.976563 48.542969 C 50.703125 48.117188 50.09375 48.113281 49.820313 48.539063 C 48.578125 50.464844 45.859375 51.800781 42.699219 51.800781 C 39.539063 51.800781 36.816406 50.460938 35.578125 48.535156 C 35.304688 48.109375 34.695313 48.109375 34.421875 48.535156 C 33.183594 50.460938 30.460938 51.800781 27.300781 51.800781 C 24.144531 51.800781 21.425781 50.46875 20.183594 48.546875 C 19.910156 48.121094 19.300781 48.121094 19.027344 48.550781 C 17.804688 50.46875 15.136719 51.800781 12.039063 51.800781 C 9.953125 51.800781 8.0625 51.195313 6.675781 50.214844 C 6.222656 49.894531 5.601563 50.25 5.601563 50.804688 L 5.601563 53.464844 C 6.976563 54.992188 9.34375 56 12.039063 56 C 15.800781 56 18.929688 54.039063 19.601563 51.445313 C 20.285156 54.039063 23.46875 56 27.300781 56 C 31.132813 56 34.316406 54.035156 35 51.4375 C 35.683594 54.035156 38.867188 56 42.699219 56 C 46.53125 56 49.714844 54.035156 50.398438 51.441406 C 51.078125 54.035156 54.234375 56 58.03125 56 C 60.667969 56 62.996094 55.050781 64.398438 53.601563 L 64.398438 49.402344 C 62.996094 50.851563 60.667969 51.800781 58.03125 51.800781 Z M 58.03125 51.800781 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 58.03125 30.800781 C 54.902344 30.800781 52.207031 29.464844 50.976563 27.542969 C 50.703125 27.117188 50.09375 27.113281 49.820313 27.539063 C 48.578125 29.464844 45.859375 30.800781 42.699219 30.800781 C 39.539063 30.800781 36.816406 29.460938 35.578125 27.535156 C 35.304688 27.109375 34.695313 27.109375 34.421875 27.535156 C 33.183594 29.460938 30.460938 30.800781 27.300781 30.800781 C 24.144531 30.800781 21.425781 29.46875 20.183594 27.546875 C 19.910156 27.121094 19.300781 27.121094 19.027344 27.550781 C 17.804688 29.46875 15.136719 30.800781 12.039063 30.800781 C 9.953125 30.800781 8.0625 30.195313 6.675781 29.214844 C 6.222656 28.894531 5.601563 29.25 5.601563 29.804688 L 5.601563 32.464844 C 6.976563 33.992188 9.34375 35 12.039063 35 C 15.800781 35 18.929688 33.039063 19.601563 30.445313 C 20.285156 33.039063 23.46875 35 27.300781 35 C 31.132813 35 34.316406 33.035156 35 30.4375 C 35.683594 33.035156 38.867188 35 42.699219 35 C 46.53125 35 49.714844 33.035156 50.398438 30.441406 C 51.078125 33.035156 54.234375 35 58.03125 35 C 60.667969 35 62.996094 34.050781 64.398438 32.601563 L 64.398438 28.402344 C 62.996094 29.851563 60.667969 30.800781 58.03125 30.800781 Z M 58.03125 30.800781 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 41.371094 5.640625 L 39.339844 2.160156 C 38.570313 0.835938 37.101563 0 35.558594 0 L 4.339844 0 C 1.960938 0 0 1.949219 0 4.316406 L 0 6.542969 L 42.140625 6.542969 C 41.789063 6.335938 41.578125 5.988281 41.371094 5.640625 Z M 41.371094 5.640625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 67.269531 8.773438 L 0 8.773438 L 0 50.335938 C 0 52.703125 1.960938 54.652344 4.339844 54.652344 L 65.660156 54.652344 C 68.039063 54.652344 70 52.703125 70 50.335938 L 70 12.742188 C 70 11 68.878906 9.46875 67.269531 8.773438 Z M 43.890625 29.660156 L 31.5 47.273438 C 31.359375 47.410156 31.21875 47.550781 31.011719 47.550781 C 30.941406 47.550781 30.800781 47.550781 30.730469 47.480469 C 30.449219 47.339844 30.308594 47.0625 30.449219 46.785156 L 33.671875 36.273438 L 26.460938 36.273438 C 26.25 36.273438 26.039063 36.132813 25.898438 35.925781 C 25.828125 35.714844 25.828125 35.507813 25.96875 35.296875 L 38.011719 17.890625 C 38.148438 17.753906 38.289063 17.613281 38.5 17.613281 C 38.570313 17.613281 38.640625 17.613281 38.78125 17.683594 C 39.058594 17.824219 39.199219 18.101563 39.058594 18.378906 L 35.980469 28.683594 L 43.398438 28.683594 C 43.75 28.683594 44.03125 28.960938 44.03125 29.308594 C 44.03125 29.449219 43.960938 29.519531 43.890625 29.660156 Z M 43.890625 29.660156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 61.601563 70 L 8.398438 70 C 3.761719 70 0 66.238281 0 61.601563 L 0 11.199219 L 70 11.199219 L 70 61.601563 C 70 66.238281 66.238281 70 61.601563 70 Z M 61.601563 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 58.03125 51.800781 C 54.902344 51.800781 52.207031 50.464844 50.976563 48.542969 C 50.703125 48.117188 50.09375 48.113281 49.820313 48.539063 C 48.578125 50.464844 45.859375 51.800781 42.699219 51.800781 C 39.539063 51.800781 36.816406 50.460938 35.578125 48.535156 C 35.304688 48.109375 34.695313 48.109375 34.421875 48.535156 C 33.183594 50.460938 30.460938 51.800781 27.300781 51.800781 C 24.144531 51.800781 21.425781 50.46875 20.183594 48.546875 C 19.910156 48.121094 19.300781 48.121094 19.027344 48.550781 C 17.804688 50.46875 15.136719 51.800781 12.039063 51.800781 C 9.953125 51.800781 8.0625 51.195313 6.675781 50.214844 C 6.222656 49.894531 5.601563 50.25 5.601563 50.804688 L 5.601563 64.398438 L 64.398438 64.398438 L 64.398438 49.402344 C 62.996094 50.851563 60.667969 51.800781 58.03125 51.800781 Z M 58.03125 51.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 58.03125 9.800781 C 54.902344 9.800781 52.207031 8.464844 50.976563 6.542969 C 50.703125 6.117188 50.09375 6.113281 49.820313 6.539063 C 48.578125 8.464844 45.859375 9.800781 42.699219 9.800781 C 39.539063 9.800781 36.816406 8.460938 35.578125 6.535156 C 35.304688 6.109375 34.695313 6.109375 34.421875 6.535156 C 33.183594 8.460938 30.460938 9.800781 27.300781 9.800781 C 24.144531 9.800781 21.425781 8.46875 20.183594 6.546875 C 19.910156 6.121094 19.300781 6.121094 19.027344 6.550781 C 17.804688 8.46875 15.136719 9.800781 12.039063 9.800781 C 9.953125 9.800781 8.0625 9.195313 6.675781 8.214844 C 6.222656 7.894531 5.601563 8.25 5.601563 8.804688 L 5.601563 22.398438 L 64.398438 22.398438 L 64.398438 8.886719 C 64.398438 8.339844 63.785156 7.984375 63.332031 8.289063 C 61.945313 9.226563 60.082031 9.800781 58.03125 9.800781 Z M 58.03125 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 58.03125 30.800781 C 54.902344 30.800781 52.207031 29.464844 50.976563 27.542969 C 50.703125 27.117188 50.09375 27.113281 49.820313 27.539063 C 48.578125 29.464844 45.859375 30.800781 42.699219 30.800781 C 39.539063 30.800781 36.816406 29.460938 35.578125 27.535156 C 35.304688 27.109375 34.695313 27.109375 34.421875 27.535156 C 33.183594 29.460938 30.460938 30.800781 27.300781 30.800781 C 24.144531 30.800781 21.425781 29.46875 20.183594 27.546875 C 19.910156 27.121094 19.300781 27.121094 19.027344 27.550781 C 17.804688 29.46875 15.136719 30.800781 12.039063 30.800781 C 9.953125 30.800781 8.0625 30.195313 6.675781 29.214844 C 6.222656 28.894531 5.601563 29.25 5.601563 29.804688 L 5.601563 43.398438 L 64.398438 43.398438 L 64.398438 28.402344 C 62.996094 29.851563 60.667969 30.800781 58.03125 30.800781 Z M 58.03125 30.800781 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureDiskStorage(m).png b/dist/Storage/AzureDiskStorage(m).png
index 330441a3..c3f23f56 100644
Binary files a/dist/Storage/AzureDiskStorage(m).png and b/dist/Storage/AzureDiskStorage(m).png differ
diff --git a/dist/Storage/AzureDiskStorage(m).svg b/dist/Storage/AzureDiskStorage(m).svg
index a6a113e4..e1358ab3 100644
--- a/dist/Storage/AzureDiskStorage(m).svg
+++ b/dist/Storage/AzureDiskStorage(m).svg
@@ -1,94 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="59pt" viewBox="0 0 70 59" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
-<clipPath id="clip1">
-  <path d="M 0 39 L 69.929688 39 L 69.929688 58.851563 L 0 58.851563 Z M 0 39 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 0 27 L 69.929688 27 L 69.929688 53 L 0 53 Z M 0 27 "/>
-</clipPath>
-<clipPath id="clip3">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 58.851563 L 0 58.851563 Z M 0 0 "/>
-</clipPath>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip4">
-  <rect x="0" y="0" width="70" height="59"/>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip4)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.238281 30.96875 C 55.339844 29.132813 48.90625 27.828125 41.667969 27.324219 L 37.128906 35.636719 C 39.082031 35.726563 41.015625 36.035156 42.898438 36.554688 Z M 60.238281 30.96875 "/>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.300781 36.5625 C 55.398438 34.703125 48.953125 33.382813 41.707031 32.875 L 37.167969 41.28125 C 39.402344 41.410156 41.398438 41.742188 42.945313 42.207031 Z M 60.300781 36.5625 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip5">
-  <rect x="0" y="0" width="70" height="59"/>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface8" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.253906 47.714844 C 13.289063 49.851563 20.277344 51.375 28.238281 51.929688 L 33.542969 42.210938 C 31.578125 42.15625 29.625 41.898438 27.714844 41.445313 Z M 8.253906 47.714844 "/>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.261719 53.492188 C 13.304688 55.652344 20.300781 57.191406 28.265625 57.753906 L 33.578125 47.925781 C 31.367188 47.84375 29.355469 47.566406 27.742188 47.152344 Z M 8.261719 53.492188 "/>
 </g>
-<clipPath id="clip6">
-  <path d="M 0 12 L 69.929688 12 L 69.929688 32 L 0 32 Z M 0 12 "/>
-</clipPath>
-<clipPath id="clip7">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 26 L 0 26 Z M 0 0 "/>
-</clipPath>
-<clipPath id="clip8">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 58.851563 L 0 58.851563 Z M 0 0 "/>
-</clipPath>
 <mask id="mask2">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip9">
-  <rect x="0" y="0" width="70" height="59"/>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface11" clip-path="url(#clip9)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.238281 3.878906 C 55.339844 2.042969 48.90625 0.738281 41.667969 0.234375 L 37.128906 8.546875 C 39.082031 8.636719 41.015625 8.941406 42.898438 9.464844 Z M 60.238281 3.878906 "/>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.300781 9.167969 C 55.398438 7.3125 48.953125 5.992188 41.707031 5.480469 L 37.167969 13.886719 C 39.402344 14.019531 41.398438 14.347656 42.945313 14.816406 Z M 60.300781 9.167969 "/>
 </g>
 <mask id="mask3">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip10">
-  <rect x="0" y="0" width="70" height="59"/>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface14" clip-path="url(#clip10)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.253906 20.621094 C 13.289063 22.757813 20.277344 24.28125 28.238281 24.835938 L 33.542969 15.117188 C 31.578125 15.0625 29.625 14.808594 27.714844 14.355469 Z M 8.253906 20.621094 "/>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.261719 26.097656 C 13.304688 28.257813 20.300781 29.800781 28.265625 30.363281 L 33.578125 20.535156 C 31.367188 20.449219 29.355469 20.175781 27.742188 19.761719 Z M 8.261719 26.097656 "/>
 </g>
 </defs>
 <g id="surface1">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 69.929688 46.316406 C 69.929688 53.242188 54.273438 58.851563 34.964844 58.851563 C 15.65625 58.851563 0 53.242188 0 46.316406 L 0 39.558594 L 69.929688 39.558594 Z M 69.929688 46.316406 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 69.929688 39.558594 C 69.929688 46.484375 54.273438 52.09375 34.964844 52.09375 C 15.65625 52.09375 0 46.484375 0 39.558594 C 0 32.632813 15.65625 27.023438 34.964844 27.023438 C 54.273438 27.023438 69.929688 32.636719 69.929688 39.558594 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 46.171875 38.835938 C 46.171875 40.679688 41.152344 42.171875 34.960938 42.171875 C 28.769531 42.171875 23.753906 40.679688 23.753906 38.835938 C 23.753906 36.996094 28.773438 35.503906 34.960938 35.503906 C 41.152344 35.503906 46.171875 36.996094 46.171875 38.835938 "/>
-<g clip-path="url(#clip3)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 70 52.078125 C 70 59.078125 54.328125 64.753906 35 64.753906 C 15.671875 64.753906 0 59.078125 0 52.078125 L 0 45.246094 L 70 45.246094 Z M 70 52.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 70 45.246094 C 70 52.246094 54.328125 57.921875 35 57.921875 C 15.671875 57.921875 0 52.246094 0 45.246094 C 0 38.246094 15.671875 32.570313 35 32.570313 C 54.328125 32.570313 70 38.246094 70 45.246094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 46.21875 44.515625 C 46.21875 46.378906 41.195313 47.886719 35 47.886719 C 28.800781 47.886719 23.777344 46.378906 23.777344 44.515625 C 23.777344 42.652344 28.800781 41.144531 35 41.144531 C 41.195313 41.144531 46.21875 42.65625 46.21875 44.515625 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
-</g>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 69.929688 19.292969 C 69.929688 26.214844 54.273438 31.828125 34.964844 31.828125 C 15.65625 31.828125 0 26.214844 0 19.292969 L 0 12.535156 L 69.929688 12.535156 Z M 69.929688 19.292969 "/>
-</g>
-<g clip-path="url(#clip7)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 69.929688 12.535156 C 69.929688 19.460938 54.273438 25.074219 34.964844 25.074219 C 15.65625 25.074219 0 19.460938 0 12.535156 C 0 5.613281 15.65625 0 34.964844 0 C 54.273438 0 69.929688 5.613281 69.929688 12.535156 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 46.171875 11.816406 C 46.171875 13.65625 41.152344 15.148438 34.960938 15.148438 C 28.769531 15.148438 23.753906 13.65625 23.753906 11.816406 C 23.753906 9.972656 28.773438 8.480469 34.960938 8.480469 C 41.152344 8.480469 46.171875 9.972656 46.171875 11.816406 "/>
-<g clip-path="url(#clip8)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 70 24.753906 C 70 31.757813 54.328125 37.429688 35 37.429688 C 15.671875 37.429688 0 31.753906 0 24.753906 L 0 17.921875 L 70 17.921875 Z M 70 24.753906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 70 17.921875 C 70 24.925781 54.328125 30.597656 35 30.597656 C 15.671875 30.597656 0 24.921875 0 17.921875 C 0 10.921875 15.671875 5.246094 35 5.246094 C 54.328125 5.246094 70 10.921875 70 17.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 46.21875 17.195313 C 46.21875 19.054688 41.195313 20.5625 35 20.5625 C 28.800781 20.5625 23.777344 19.054688 23.777344 17.195313 C 23.777344 15.332031 28.800781 13.824219 35 13.824219 C 41.195313 13.824219 46.21875 15.332031 46.21875 17.195313 "/>
 <use xlink:href="#surface11" mask="url(#mask2)"/>
 <use xlink:href="#surface14" mask="url(#mask3)"/>
 </g>
-</g>
 </svg>
diff --git a/dist/Storage/AzureDiskStorage.png b/dist/Storage/AzureDiskStorage.png
index 55455fcb..e5caaf0a 100644
Binary files a/dist/Storage/AzureDiskStorage.png and b/dist/Storage/AzureDiskStorage.png differ
diff --git a/dist/Storage/AzureDiskStorage.puml b/dist/Storage/AzureDiskStorage.puml
index c4880f96..0eaf140a 100644
--- a/dist/Storage/AzureDiskStorage.puml
+++ b/dist/Storage/AzureDiskStorage.puml
@@ -1,10 +1,10 @@
-sprite $AzureDiskStorage [70x59/16z] {
-dTTHZkiW38LXm3x7mEn_lvU9IaekU0hzdgjVfZ922MinYIWQNj2eI8enx8cYu09UL5lixuA27enQoKaa9NsOgCHv2luDCnBfqG1F8xoC7ULXX0D4Vn2_madw
-ZT1dbfkIiz59N2G4UdAfzUUjbjPo9F4QlJ2ecMlUaDOY2vbdoYfIZMl6xIFLul-OFkj_SAsrP3Dwp1iI7SqsZh_AOB3t7quPu2nYPLe3D6x5tuawT33xFCWL
-o7qjiRHncARgiDv-n1_ZOY4_rsglOhabRZM6dhbB-PrQ1tgXgoaqdEzBQsNhQ9USItdjyaE9uIBbvsiLuQPVTYfZ64cknus2k7WOxI1KCzpd4RdKZKB9T1EY
-5rXBEQtw6u1S5ez-57q2Nkz8BYKtPYHK1jeaf-6G_sZtxZWDjw8FhnTMZo8wIHyY_Ie1gkj2p_W5sWC9TSJaHMo1UiYMe6TuL87k7ubG1zK7a3r0G5rmXvIN
-pUDZUylyI8ETRVVrlQAJsAh0RbWMcir1S7TaOQlHf66zDolpFKF0SwsSY9ze64BFTCGxvQ_YY34qOZCI4vAsq1-bIFkUX5lYzurHWXsZh3ySRHya1aSKSAUW
-ANoIHBqMsG8n78Xfs1Zv-yF-7m
+sprite $AzureDiskStorage [70x70/16z] {
+xTZNjkCW38LXGDBUWD__UQUGQa1soFGvvxjE_YMyPAU4F-5JJ4b4z4f4KefBRnSr3AnHbVDO58F3dgYau4aAd_LKucGAnI6RaMuCmse4pLCd6ixC4lkEO2s2
+FMiHnJ7okOA9U1HXBhNMxPjQIo4CdX3Xo7Nhr4BCgMAkR1ELM5EtcOmv-WSQr087ZwxjBb4BuIc7Eq8obszo9k7Bpb7j3kTOjveNDjMBR7t6R3tI57Q9XGfB
+c-InbMRB4LuNWlTLi9dJEPgQwdqXyXWw7wD1iEv-Sol-HfOG0lerpuGRQLjOjvqImpSwksLgAVc2P6vAgNKRCLn4Rcyh6kxIcvrgOIUXBYUoX56oif2WnZ2N
+bBdMyqAXfNaZ9hqmC1UdrTP0vM8CHT6E0IJp5GcOoZFz9kqQUaOwskmweciLtOd-87v41-aaShkLp5IxGfVn4-1EQyt5v3Ku0Lt4ATCrMAhOGWR-YzLb1ZmA
+C5EFqKvMHCti_FXOtRAHpKuhiXO16-iIInL3V_5byE8Wk7TaviKvX3pel7gM0D8F7UqI7rA86FPpYFZBs4W8zypm493fquO32Oto2C0ZYE4g6jy42K-Yljde
+YIqcDBg_OlaQanYE936Sp21nuVVzVYy0q-vVWYKnlEdJLm
 }
 
 AzureEntityColoring(AzureDiskStorage)
diff --git a/dist/Storage/AzureDiskStorage.svg b/dist/Storage/AzureDiskStorage.svg
index ed9b93e0..ef939e68 100644
--- a/dist/Storage/AzureDiskStorage.svg
+++ b/dist/Storage/AzureDiskStorage.svg
@@ -1,94 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="59pt" viewBox="0 0 70 59" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <defs>
-<clipPath id="clip1">
-  <path d="M 0 39 L 69.929688 39 L 69.929688 58.851563 L 0 58.851563 Z M 0 39 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 0 27 L 69.929688 27 L 69.929688 53 L 0 53 Z M 0 27 "/>
-</clipPath>
-<clipPath id="clip3">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 58.851563 L 0 58.851563 Z M 0 0 "/>
-</clipPath>
 <filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
   <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
 </filter>
 <mask id="mask0">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip4">
-  <rect x="0" y="0" width="70" height="59"/>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface5" clip-path="url(#clip4)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.238281 30.96875 C 55.339844 29.132813 48.90625 27.828125 41.667969 27.324219 L 37.128906 35.636719 C 39.082031 35.726563 41.015625 36.035156 42.898438 36.554688 Z M 60.238281 30.96875 "/>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.300781 36.5625 C 55.398438 34.703125 48.953125 33.382813 41.707031 32.875 L 37.167969 41.28125 C 39.402344 41.410156 41.398438 41.742188 42.945313 42.207031 Z M 60.300781 36.5625 "/>
 </g>
 <mask id="mask1">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip5">
-  <rect x="0" y="0" width="70" height="59"/>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface8" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.253906 47.714844 C 13.289063 49.851563 20.277344 51.375 28.238281 51.929688 L 33.542969 42.210938 C 31.578125 42.15625 29.625 41.898438 27.714844 41.445313 Z M 8.253906 47.714844 "/>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.261719 53.492188 C 13.304688 55.652344 20.300781 57.191406 28.265625 57.753906 L 33.578125 47.925781 C 31.367188 47.84375 29.355469 47.566406 27.742188 47.152344 Z M 8.261719 53.492188 "/>
 </g>
-<clipPath id="clip6">
-  <path d="M 0 12 L 69.929688 12 L 69.929688 32 L 0 32 Z M 0 12 "/>
-</clipPath>
-<clipPath id="clip7">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 26 L 0 26 Z M 0 0 "/>
-</clipPath>
-<clipPath id="clip8">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 58.851563 L 0 58.851563 Z M 0 0 "/>
-</clipPath>
 <mask id="mask2">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip9">
-  <rect x="0" y="0" width="70" height="59"/>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface11" clip-path="url(#clip9)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.238281 3.878906 C 55.339844 2.042969 48.90625 0.738281 41.667969 0.234375 L 37.128906 8.546875 C 39.082031 8.636719 41.015625 8.941406 42.898438 9.464844 Z M 60.238281 3.878906 "/>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.300781 9.167969 C 55.398438 7.3125 48.953125 5.992188 41.707031 5.480469 L 37.167969 13.886719 C 39.402344 14.019531 41.398438 14.347656 42.945313 14.816406 Z M 60.300781 9.167969 "/>
 </g>
 <mask id="mask3">
   <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
   </g>
 </mask>
-<clipPath id="clip10">
-  <rect x="0" y="0" width="70" height="59"/>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
 </clipPath>
-<g id="surface14" clip-path="url(#clip10)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.253906 20.621094 C 13.289063 22.757813 20.277344 24.28125 28.238281 24.835938 L 33.542969 15.117188 C 31.578125 15.0625 29.625 14.808594 27.714844 14.355469 Z M 8.253906 20.621094 "/>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.261719 26.097656 C 13.304688 28.257813 20.300781 29.800781 28.265625 30.363281 L 33.578125 20.535156 C 31.367188 20.449219 29.355469 20.175781 27.742188 19.761719 Z M 8.261719 26.097656 "/>
 </g>
 </defs>
 <g id="surface1">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 69.929688 46.316406 C 69.929688 53.242188 54.273438 58.851563 34.964844 58.851563 C 15.65625 58.851563 0 53.242188 0 46.316406 L 0 39.558594 L 69.929688 39.558594 Z M 69.929688 46.316406 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 69.929688 39.558594 C 69.929688 46.484375 54.273438 52.09375 34.964844 52.09375 C 15.65625 52.09375 0 46.484375 0 39.558594 C 0 32.632813 15.65625 27.023438 34.964844 27.023438 C 54.273438 27.023438 69.929688 32.636719 69.929688 39.558594 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 46.171875 38.835938 C 46.171875 40.679688 41.152344 42.171875 34.960938 42.171875 C 28.769531 42.171875 23.753906 40.679688 23.753906 38.835938 C 23.753906 36.996094 28.773438 35.503906 34.960938 35.503906 C 41.152344 35.503906 46.171875 36.996094 46.171875 38.835938 "/>
-<g clip-path="url(#clip3)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 70 52.078125 C 70 59.078125 54.328125 64.753906 35 64.753906 C 15.671875 64.753906 0 59.078125 0 52.078125 L 0 45.246094 L 70 45.246094 Z M 70 52.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 70 45.246094 C 70 52.246094 54.328125 57.921875 35 57.921875 C 15.671875 57.921875 0 52.246094 0 45.246094 C 0 38.246094 15.671875 32.570313 35 32.570313 C 54.328125 32.570313 70 38.246094 70 45.246094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 46.21875 44.515625 C 46.21875 46.378906 41.195313 47.886719 35 47.886719 C 28.800781 47.886719 23.777344 46.378906 23.777344 44.515625 C 23.777344 42.652344 28.800781 41.144531 35 41.144531 C 41.195313 41.144531 46.21875 42.65625 46.21875 44.515625 "/>
 <use xlink:href="#surface5" mask="url(#mask0)"/>
 <use xlink:href="#surface8" mask="url(#mask1)"/>
-</g>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 69.929688 19.292969 C 69.929688 26.214844 54.273438 31.828125 34.964844 31.828125 C 15.65625 31.828125 0 26.214844 0 19.292969 L 0 12.535156 L 69.929688 12.535156 Z M 69.929688 19.292969 "/>
-</g>
-<g clip-path="url(#clip7)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 69.929688 12.535156 C 69.929688 19.460938 54.273438 25.074219 34.964844 25.074219 C 15.65625 25.074219 0 19.460938 0 12.535156 C 0 5.613281 15.65625 0 34.964844 0 C 54.273438 0 69.929688 5.613281 69.929688 12.535156 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 46.171875 11.816406 C 46.171875 13.65625 41.152344 15.148438 34.960938 15.148438 C 28.769531 15.148438 23.753906 13.65625 23.753906 11.816406 C 23.753906 9.972656 28.773438 8.480469 34.960938 8.480469 C 41.152344 8.480469 46.171875 9.972656 46.171875 11.816406 "/>
-<g clip-path="url(#clip8)" clip-rule="nonzero">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 70 24.753906 C 70 31.757813 54.328125 37.429688 35 37.429688 C 15.671875 37.429688 0 31.753906 0 24.753906 L 0 17.921875 L 70 17.921875 Z M 70 24.753906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 70 17.921875 C 70 24.925781 54.328125 30.597656 35 30.597656 C 15.671875 30.597656 0 24.921875 0 17.921875 C 0 10.921875 15.671875 5.246094 35 5.246094 C 54.328125 5.246094 70 10.921875 70 17.921875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 46.21875 17.195313 C 46.21875 19.054688 41.195313 20.5625 35 20.5625 C 28.800781 20.5625 23.777344 19.054688 23.777344 17.195313 C 23.777344 15.332031 28.800781 13.824219 35 13.824219 C 41.195313 13.824219 46.21875 15.332031 46.21875 17.195313 "/>
 <use xlink:href="#surface11" mask="url(#mask2)"/>
 <use xlink:href="#surface14" mask="url(#mask3)"/>
 </g>
-</g>
 </svg>
diff --git a/dist/Storage/AzureFXTEdgeFiler(m).png b/dist/Storage/AzureFXTEdgeFiler(m).png
new file mode 100644
index 00000000..c1a5f7fb
Binary files /dev/null and b/dist/Storage/AzureFXTEdgeFiler(m).png differ
diff --git a/dist/Storage/AzureFXTEdgeFiler(m).svg b/dist/Storage/AzureFXTEdgeFiler(m).svg
new file mode 100644
index 00000000..98ee8d4a
--- /dev/null
+++ b/dist/Storage/AzureFXTEdgeFiler(m).svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 7 47.601563 C 7 49.144531 5.746094 50.398438 4.199219 50.398438 C 2.652344 50.398438 1.398438 49.144531 1.398438 47.601563 L 1.398438 1.398438 L 21.070313 1.398438 L 28 8.398438 L 58.800781 8.398438 L 58.800781 12.601563 L 7 12.601563 Z M 7 47.601563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 14 22.398438 L 61.601563 22.398438 L 61.601563 50.398438 L 12.601563 50.398438 L 12.601563 23.800781 C 12.601563 23.027344 13.226563 22.398438 14 22.398438 Z M 14 22.398438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(191,227,255);fill-opacity:1;" d="M 4.199219 50.398438 C 2.652344 50.398438 1.398438 49.144531 1.398438 47.601563 L 1.398438 1.398438 L 21.070313 1.398438 L 28 8.398438 L 58.800781 8.398438 L 58.800781 12.601563 L 61.601563 12.601563 L 61.601563 47.472656 C 61.601563 49.089844 60.292969 50.398438 58.679688 50.398438 Z M 4.199219 50.398438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 67.199219 23.800781 L 15.398438 23.800781 C 14.625 23.800781 14 24.425781 14 25.199219 L 14 36.398438 C 14 37.171875 14.625 37.800781 15.398438 37.800781 L 67.199219 37.800781 C 67.972656 37.800781 68.601563 37.171875 68.601563 36.398438 L 68.601563 25.199219 C 68.601563 24.425781 67.972656 23.800781 67.199219 23.800781 Z M 67.199219 23.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 63.699219 26.601563 L 65.101563 26.601563 C 65.488281 26.601563 65.800781 26.914063 65.800781 27.300781 L 65.800781 28.699219 C 65.800781 29.085938 65.488281 29.398438 65.101563 29.398438 L 63.699219 29.398438 C 63.3125 29.398438 63 29.085938 63 28.699219 L 63 27.300781 C 63 26.914063 63.3125 26.601563 63.699219 26.601563 Z M 63.699219 26.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 63.699219 32.199219 L 65.101563 32.199219 C 65.488281 32.199219 65.800781 32.511719 65.800781 32.898438 L 65.800781 34.300781 C 65.800781 34.6875 65.488281 35 65.101563 35 L 63.699219 35 C 63.3125 35 63 34.6875 63 34.300781 L 63 32.898438 C 63 32.511719 63.3125 32.199219 63.699219 32.199219 Z M 63.699219 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 67.199219 39.199219 L 15.398438 39.199219 C 14.625 39.199219 14 39.828125 14 40.601563 L 14 51.800781 C 14 52.574219 14.625 53.199219 15.398438 53.199219 L 67.199219 53.199219 C 67.972656 53.199219 68.601563 52.574219 68.601563 51.800781 L 68.601563 40.601563 C 68.601563 39.828125 67.972656 39.199219 67.199219 39.199219 Z M 67.199219 39.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 63.699219 42 L 65.101563 42 C 65.488281 42 65.800781 42.3125 65.800781 42.699219 L 65.800781 44.101563 C 65.800781 44.488281 65.488281 44.800781 65.101563 44.800781 L 63.699219 44.800781 C 63.3125 44.800781 63 44.488281 63 44.101563 L 63 42.699219 C 63 42.3125 63.3125 42 63.699219 42 Z M 63.699219 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 63.699219 47.601563 L 65.101563 47.601563 C 65.488281 47.601563 65.800781 47.914063 65.800781 48.300781 L 65.800781 49.699219 C 65.800781 50.085938 65.488281 50.398438 65.101563 50.398438 L 63.699219 50.398438 C 63.3125 50.398438 63 50.085938 63 49.699219 L 63 48.300781 C 63 47.914063 63.3125 47.601563 63.699219 47.601563 Z M 63.699219 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 67.199219 54.601563 L 15.398438 54.601563 C 14.625 54.601563 14 55.226563 14 56 L 14 67.199219 C 14 67.972656 14.625 68.601563 15.398438 68.601563 L 67.199219 68.601563 C 67.972656 68.601563 68.601563 67.972656 68.601563 67.199219 L 68.601563 56 C 68.601563 55.226563 67.972656 54.601563 67.199219 54.601563 Z M 67.199219 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 63.699219 57.398438 L 65.101563 57.398438 C 65.488281 57.398438 65.800781 57.714844 65.800781 58.101563 L 65.800781 59.5 C 65.800781 59.886719 65.488281 60.199219 65.101563 60.199219 L 63.699219 60.199219 C 63.3125 60.199219 63 59.886719 63 59.5 L 63 58.101563 C 63 57.714844 63.3125 57.398438 63.699219 57.398438 Z M 63.699219 57.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 63.699219 63 L 65.101563 63 C 65.488281 63 65.800781 63.3125 65.800781 63.699219 L 65.800781 65.101563 C 65.800781 65.488281 65.488281 65.800781 65.101563 65.800781 L 63.699219 65.800781 C 63.3125 65.800781 63 65.488281 63 65.101563 L 63 63.699219 C 63 63.3125 63.3125 63 63.699219 63 Z M 63.699219 63 "/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureFXTEdgeFiler.png b/dist/Storage/AzureFXTEdgeFiler.png
new file mode 100644
index 00000000..7f4aeea4
Binary files /dev/null and b/dist/Storage/AzureFXTEdgeFiler.png differ
diff --git a/dist/Storage/AzureFXTEdgeFiler.puml b/dist/Storage/AzureFXTEdgeFiler.puml
new file mode 100644
index 00000000..20342770
--- /dev/null
+++ b/dist/Storage/AzureFXTEdgeFiler.puml
@@ -0,0 +1,9 @@
+sprite $AzureFXTEdgeFiler [70x70/16z] {
+xTG73iGW34HH1fpGxd_UxRtlC97ItW6-9B3jDE2VuU-AjnSWgHWa5OEaOf1K39AAGL8n_zb3XJJkIY3WgU8v8wcibRM2VxskMC-mXqhFQQx4AAZaMkDOAZ4d
+nRliZAKISnxL7urZwiuasnW6kGpU204FbMxAivj6DBkfbkRAsRYkDnfVz_WkpdP2un_jN1U8ldNtsDUzn-rHvnu41jmGGi-mGLwNdTrxrDIDfH9pqipkQ2en
+vn7zKOdZcBepoJO6fx45
+}
+
+AzureEntityColoring(AzureFXTEdgeFiler)
+!define AzureFXTEdgeFiler(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureFXTEdgeFiler, AzureFXTEdgeFiler)
+!define AzureFXTEdgeFiler(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureFXTEdgeFiler, AzureFXTEdgeFiler)
diff --git a/dist/Storage/AzureFXTEdgeFiler.svg b/dist/Storage/AzureFXTEdgeFiler.svg
new file mode 100644
index 00000000..c58896b2
--- /dev/null
+++ b/dist/Storage/AzureFXTEdgeFiler.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 7 47.601563 C 7 49.144531 5.746094 50.398438 4.199219 50.398438 C 2.652344 50.398438 1.398438 49.144531 1.398438 47.601563 L 1.398438 1.398438 L 21.070313 1.398438 L 28 8.398438 L 58.800781 8.398438 L 58.800781 12.601563 L 7 12.601563 Z M 7 47.601563 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 14 22.398438 L 61.601563 22.398438 L 61.601563 50.398438 L 12.601563 50.398438 L 12.601563 23.800781 C 12.601563 23.027344 13.226563 22.398438 14 22.398438 Z M 14 22.398438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(99.607843%,87.843137%,52.941176%);fill-opacity:1;" d="M 4.199219 50.398438 C 2.652344 50.398438 1.398438 49.144531 1.398438 47.601563 L 1.398438 1.398438 L 21.070313 1.398438 L 28 8.398438 L 58.800781 8.398438 L 58.800781 12.601563 L 61.601563 12.601563 L 61.601563 47.472656 C 61.601563 49.089844 60.292969 50.398438 58.679688 50.398438 Z M 4.199219 50.398438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 67.199219 23.800781 L 15.398438 23.800781 C 14.625 23.800781 14 24.425781 14 25.199219 L 14 36.398438 C 14 37.171875 14.625 37.800781 15.398438 37.800781 L 67.199219 37.800781 C 67.972656 37.800781 68.601563 37.171875 68.601563 36.398438 L 68.601563 25.199219 C 68.601563 24.425781 67.972656 23.800781 67.199219 23.800781 Z M 67.199219 23.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.699219 26.601563 L 65.101563 26.601563 C 65.488281 26.601563 65.800781 26.914063 65.800781 27.300781 L 65.800781 28.699219 C 65.800781 29.085938 65.488281 29.398438 65.101563 29.398438 L 63.699219 29.398438 C 63.3125 29.398438 63 29.085938 63 28.699219 L 63 27.300781 C 63 26.914063 63.3125 26.601563 63.699219 26.601563 Z M 63.699219 26.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.699219 32.199219 L 65.101563 32.199219 C 65.488281 32.199219 65.800781 32.511719 65.800781 32.898438 L 65.800781 34.300781 C 65.800781 34.6875 65.488281 35 65.101563 35 L 63.699219 35 C 63.3125 35 63 34.6875 63 34.300781 L 63 32.898438 C 63 32.511719 63.3125 32.199219 63.699219 32.199219 Z M 63.699219 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 67.199219 39.199219 L 15.398438 39.199219 C 14.625 39.199219 14 39.828125 14 40.601563 L 14 51.800781 C 14 52.574219 14.625 53.199219 15.398438 53.199219 L 67.199219 53.199219 C 67.972656 53.199219 68.601563 52.574219 68.601563 51.800781 L 68.601563 40.601563 C 68.601563 39.828125 67.972656 39.199219 67.199219 39.199219 Z M 67.199219 39.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.699219 42 L 65.101563 42 C 65.488281 42 65.800781 42.3125 65.800781 42.699219 L 65.800781 44.101563 C 65.800781 44.488281 65.488281 44.800781 65.101563 44.800781 L 63.699219 44.800781 C 63.3125 44.800781 63 44.488281 63 44.101563 L 63 42.699219 C 63 42.3125 63.3125 42 63.699219 42 Z M 63.699219 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.699219 47.601563 L 65.101563 47.601563 C 65.488281 47.601563 65.800781 47.914063 65.800781 48.300781 L 65.800781 49.699219 C 65.800781 50.085938 65.488281 50.398438 65.101563 50.398438 L 63.699219 50.398438 C 63.3125 50.398438 63 50.085938 63 49.699219 L 63 48.300781 C 63 47.914063 63.3125 47.601563 63.699219 47.601563 Z M 63.699219 47.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 67.199219 54.601563 L 15.398438 54.601563 C 14.625 54.601563 14 55.226563 14 56 L 14 67.199219 C 14 67.972656 14.625 68.601563 15.398438 68.601563 L 67.199219 68.601563 C 67.972656 68.601563 68.601563 67.972656 68.601563 67.199219 L 68.601563 56 C 68.601563 55.226563 67.972656 54.601563 67.199219 54.601563 Z M 67.199219 54.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.699219 57.398438 L 65.101563 57.398438 C 65.488281 57.398438 65.800781 57.714844 65.800781 58.101563 L 65.800781 59.5 C 65.800781 59.886719 65.488281 60.199219 65.101563 60.199219 L 63.699219 60.199219 C 63.3125 60.199219 63 59.886719 63 59.5 L 63 58.101563 C 63 57.714844 63.3125 57.398438 63.699219 57.398438 Z M 63.699219 57.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.699219 63 L 65.101563 63 C 65.488281 63 65.800781 63.3125 65.800781 63.699219 L 65.800781 65.101563 C 65.800781 65.488281 65.488281 65.800781 65.101563 65.800781 L 63.699219 65.800781 C 63.3125 65.800781 63 65.488281 63 65.101563 L 63 63.699219 C 63 63.3125 63.3125 63 63.699219 63 Z M 63.699219 63 "/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureFileStorage(m).png b/dist/Storage/AzureFileStorage(m).png
index 85208150..3b538452 100644
Binary files a/dist/Storage/AzureFileStorage(m).png and b/dist/Storage/AzureFileStorage(m).png differ
diff --git a/dist/Storage/AzureFileStorage(m).svg b/dist/Storage/AzureFileStorage(m).svg
index f5725b27..a52e0a10 100644
--- a/dist/Storage/AzureFileStorage(m).svg
+++ b/dist/Storage/AzureFileStorage(m).svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="60pt" viewBox="0 0 70 60" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 43.734375 14.605469 L 21.96875 14.605469 C 20.863281 14.605469 20.132813 15.53125 20.132813 16.421875 L 20.132813 43.234375 C 20.132813 44.332031 21.070313 45.257813 21.96875 45.257813 L 47.613281 45.257813 C 48.722656 45.257813 49.449219 44.332031 49.449219 43.234375 L 49.449219 20.605469 L 43.558594 20.605469 L 43.558594 14.570313 Z M 43.003906 37.78125 L 26.578125 37.78125 L 26.578125 34.695313 L 43.003906 34.695313 Z M 43.003906 32.125 L 26.578125 32.125 L 26.578125 29.039063 L 43.003906 29.039063 Z M 43.003906 26.296875 L 26.578125 26.296875 L 26.578125 23.210938 L 43.003906 23.210938 Z M 43.003906 26.296875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 52.394531 0 L 17.535156 0 L 0 29.929688 L 17.535156 59.863281 L 52.394531 59.863281 L 69.929688 29.929688 Z M 47.789063 48.171875 L 22.144531 48.171875 C 19.371094 48.171875 17.152344 45.976563 17.152344 43.234375 L 17.152344 16.421875 C 17.152344 13.679688 19.371094 11.484375 22.144531 11.484375 L 45.394531 11.484375 L 52.777344 18.789063 L 52.777344 43.234375 C 52.777344 45.976563 50.558594 48.171875 47.789063 48.171875 Z M 47.789063 48.171875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 43.984375 14.605469 L 22.09375 14.605469 C 20.984375 14.605469 20.25 15.53125 20.25 16.421875 L 20.25 43.234375 C 20.25 44.332031 21.191406 45.257813 22.09375 45.257813 L 47.886719 45.257813 C 49.003906 45.257813 49.734375 44.332031 49.734375 43.234375 L 49.734375 20.605469 L 43.808594 20.605469 L 43.808594 14.570313 Z M 43.25 37.78125 L 26.730469 37.78125 L 26.730469 34.695313 L 43.25 34.695313 Z M 43.25 32.125 L 26.730469 32.125 L 26.730469 29.039063 L 43.25 29.039063 Z M 43.25 26.296875 L 26.730469 26.296875 L 26.730469 23.210938 L 43.25 23.210938 Z M 43.25 26.296875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,108,188);fill-opacity:1;" d="M 52.695313 0 L 17.636719 0 L 0 29.929688 L 17.636719 59.863281 L 52.695313 59.863281 L 70.332031 29.929688 Z M 48.0625 48.171875 L 22.273438 48.171875 C 19.484375 48.171875 17.25 45.976563 17.25 43.234375 L 17.25 16.421875 C 17.25 13.679688 19.484375 11.484375 22.273438 11.484375 L 45.65625 11.484375 L 53.082031 18.789063 L 53.082031 43.234375 C 53.082031 45.976563 50.847656 48.171875 48.0625 48.171875 Z M 48.0625 48.171875 "/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureFileStorage.png b/dist/Storage/AzureFileStorage.png
index cdbb3732..85208150 100644
Binary files a/dist/Storage/AzureFileStorage.png and b/dist/Storage/AzureFileStorage.png differ
diff --git a/dist/Storage/AzureFileStorage.puml b/dist/Storage/AzureFileStorage.puml
index 9155d419..a04be72e 100644
--- a/dist/Storage/AzureFileStorage.puml
+++ b/dist/Storage/AzureFileStorage.puml
@@ -1,8 +1,8 @@
 sprite $AzureFileStorage [70x60/16z] {
-hPS7giKm30JNNUlx7_XJFoBo9X4lGtzb21FaWYjpFq8yKVSB1Xwm_G8MtDBtAnPkuNv7Gq2crJ2PDXzuxK0-SDi9LY9jFl3OAGmd2l-_7_tCu7RqkxHia3I6
-m29jHK1e9WBclghzH0kQAjCseD_bhDI12vr_AKlGz3X0pvQWOHYWDnQlYO4jPG6FWVj-PVb_KpoE4uL5JI5FupJt3nRwjD6owWLpbhXUBM49WtQsiFYqUOiF
-J67Xka1XsSqDKAwknr3uksLtzuzS5m_d9vR23omTNLbe5wZh0lPptGgW2Gld1GhB_6u2KFYJfSUjDJ_JziagLUE-cBVCk4VdBInnKyjRHjpLyXPJvwZgb2Uc
-_t5Jn-Nkzxu8Ar3qsSxSGvOgAG26FWRL44nH6NyP0y-2Eph3WU7yjcaQXW4AWJEOl1jbg2hRJZ2_lat4m6_fq8nCMeqbqcfQAcqYS29jBl304yCUMRZo1m
+hPT9biCW30N5Z7J_0sT74dz_G0zgsPrKJ7aIygJQcYGBWcsWig3P3aMc9DiZo0orFPfCABPBSgJbT4zQJlQazGTMyr1PMXzndbPh8UWoS8DkID15uCYk1AvH
+0VhFSSRy2cWWS1w7oSyu7araQHD_n8n5iS1rtoAXazifciCYek-1kyzIRL0WxSeopbHzlPqKBPo7fS41EYmGEDghHUE32fRVm9rOy9v7omYSxS0o0YknM7kW
+pD8mfQFk80MxOD5cTjp5x8ubtB1qARIBFk1TeeWUrwrm0qokbpwxwgGTTiauAVWjVVpxv9wELvzIaWui0T_HVal1bvhVeY_z_PP4vgZiiJGsqnK-QeuGdSvs
+_NUbaVDxpnG-1LK1w0y2FukDCYCfIGkJGEUizWBPV0IsNWUG5WAVxTUgmv8kxcmE0qUPq7qRahF0UcKdd6LEyAJbP5q3QJy
 }
 
 AzureEntityColoring(AzureFileStorage)
diff --git a/dist/Storage/AzureFileStorage.svg b/dist/Storage/AzureFileStorage.svg
index f5725b27..fc0171ae 100644
--- a/dist/Storage/AzureFileStorage.svg
+++ b/dist/Storage/AzureFileStorage.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="60pt" viewBox="0 0 70 60" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 43.734375 14.605469 L 21.96875 14.605469 C 20.863281 14.605469 20.132813 15.53125 20.132813 16.421875 L 20.132813 43.234375 C 20.132813 44.332031 21.070313 45.257813 21.96875 45.257813 L 47.613281 45.257813 C 48.722656 45.257813 49.449219 44.332031 49.449219 43.234375 L 49.449219 20.605469 L 43.558594 20.605469 L 43.558594 14.570313 Z M 43.003906 37.78125 L 26.578125 37.78125 L 26.578125 34.695313 L 43.003906 34.695313 Z M 43.003906 32.125 L 26.578125 32.125 L 26.578125 29.039063 L 43.003906 29.039063 Z M 43.003906 26.296875 L 26.578125 26.296875 L 26.578125 23.210938 L 43.003906 23.210938 Z M 43.003906 26.296875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 52.394531 0 L 17.535156 0 L 0 29.929688 L 17.535156 59.863281 L 52.394531 59.863281 L 69.929688 29.929688 Z M 47.789063 48.171875 L 22.144531 48.171875 C 19.371094 48.171875 17.152344 45.976563 17.152344 43.234375 L 17.152344 16.421875 C 17.152344 13.679688 19.371094 11.484375 22.144531 11.484375 L 45.394531 11.484375 L 52.777344 18.789063 L 52.777344 43.234375 C 52.777344 45.976563 50.558594 48.171875 47.789063 48.171875 Z M 47.789063 48.171875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 43.984375 14.605469 L 22.09375 14.605469 C 20.984375 14.605469 20.25 15.53125 20.25 16.421875 L 20.25 43.234375 C 20.25 44.332031 21.191406 45.257813 22.09375 45.257813 L 47.886719 45.257813 C 49.003906 45.257813 49.734375 44.332031 49.734375 43.234375 L 49.734375 20.605469 L 43.808594 20.605469 L 43.808594 14.570313 Z M 43.25 37.78125 L 26.730469 37.78125 L 26.730469 34.695313 L 43.25 34.695313 Z M 43.25 32.125 L 26.730469 32.125 L 26.730469 29.039063 L 43.25 29.039063 Z M 43.25 26.296875 L 26.730469 26.296875 L 26.730469 23.210938 L 43.25 23.210938 Z M 43.25 26.296875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 52.695313 0 L 17.636719 0 L 0 29.929688 L 17.636719 59.863281 L 52.695313 59.863281 L 70.332031 29.929688 Z M 48.0625 48.171875 L 22.273438 48.171875 C 19.484375 48.171875 17.25 45.976563 17.25 43.234375 L 17.25 16.421875 C 17.25 13.679688 19.484375 11.484375 22.273438 11.484375 L 45.65625 11.484375 L 53.082031 18.789063 L 53.082031 43.234375 C 53.082031 45.976563 50.847656 48.171875 48.0625 48.171875 Z M 48.0625 48.171875 "/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureGeneralStorage(m).png b/dist/Storage/AzureGeneralStorage(m).png
new file mode 100644
index 00000000..7e93ae59
Binary files /dev/null and b/dist/Storage/AzureGeneralStorage(m).png differ
diff --git a/dist/Storage/AzureGeneralStorage(m).svg b/dist/Storage/AzureGeneralStorage(m).svg
new file mode 100644
index 00000000..fa4a4d9b
--- /dev/null
+++ b/dist/Storage/AzureGeneralStorage(m).svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 28 L 64.398438 28 L 64.398438 30.800781 L 5.601563 30.800781 Z M 5.601563 28 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 7 L 64.398438 7 L 64.398438 9.800781 L 5.601563 9.800781 Z M 5.601563 7 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 49 L 64.398438 49 L 64.398438 51.800781 L 5.601563 51.800781 Z M 5.601563 49 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.398438 70 L 12.433594 70 L 60.191406 0 L 8.398438 0 C 3.761719 0 0 3.761719 0 8.398438 L 0 61.601563 C 0 66.238281 3.761719 70 8.398438 70 Z M 8.398438 70 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 61.601563 0 L 8.398438 0 C 3.761719 0 0 3.761719 0 8.398438 L 0 61.601563 C 0 66.238281 3.761719 70 8.398438 70 L 61.601563 70 C 66.238281 70 70 66.238281 70 61.601563 L 70 8.398438 C 70 3.761719 66.238281 0 61.601563 0 Z M 61.601563 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 5.601563 28 L 64.398438 28 L 64.398438 43.398438 L 5.601563 43.398438 Z M 5.601563 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 5.601563 49 L 64.398438 49 L 64.398438 64.398438 L 5.601563 64.398438 Z M 5.601563 49 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 5.601563 7 L 64.398438 7 L 64.398438 22.398438 L 5.601563 22.398438 Z M 5.601563 7 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureGeneralStorage.png b/dist/Storage/AzureGeneralStorage.png
new file mode 100644
index 00000000..8dfd0931
Binary files /dev/null and b/dist/Storage/AzureGeneralStorage.png differ
diff --git a/dist/Storage/AzureGeneralStorage.puml b/dist/Storage/AzureGeneralStorage.puml
new file mode 100644
index 00000000..0942bdf4
--- /dev/null
+++ b/dist/Storage/AzureGeneralStorage.puml
@@ -0,0 +1,9 @@
+sprite $AzureGeneralStorage [70x70/16z] {
+xTXLWeH038JXOEcaElU_xhXhKsHz_xSPuCDLjatc88geABti6y5LOvVj5uH7zg7ZbmHnoaL0BygvSKf00WQkkCgnoSQvJSVAJa6YmXZtoZGlFMUqejz7qGn5
+lu-Y6Of-7qKp5FrunQqjlmzdXRY-NKSYl18PIcrGQ6Jc5NDwc9wLCj1DPyLob95E_vLz_yg_ulgiyYvhk4f5O_prxR9MX5SYGwap5I-FifPmeKmFqgOiMu7T
+vMZibUBuDeeZGN5aACXGF4DnP2Z8K3n3SH2AtofW5CKsFqLzAQZzxPzCHGekev3QYVZYHHb4fBDbI1rar-Zy-jJIYSWQ
+}
+
+AzureEntityColoring(AzureGeneralStorage)
+!define AzureGeneralStorage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureGeneralStorage, AzureGeneralStorage)
+!define AzureGeneralStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureGeneralStorage, AzureGeneralStorage)
diff --git a/dist/Storage/AzureGeneralStorage.svg b/dist/Storage/AzureGeneralStorage.svg
new file mode 100644
index 00000000..20e3fc82
--- /dev/null
+++ b/dist/Storage/AzureGeneralStorage.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 28 L 64.398438 28 L 64.398438 30.800781 L 5.601563 30.800781 Z M 5.601563 28 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 7 L 64.398438 7 L 64.398438 9.800781 L 5.601563 9.800781 Z M 5.601563 7 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 49 L 64.398438 49 L 64.398438 51.800781 L 5.601563 51.800781 Z M 5.601563 49 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.398438 70 L 12.433594 70 L 60.191406 0 L 8.398438 0 C 3.761719 0 0 3.761719 0 8.398438 L 0 61.601563 C 0 66.238281 3.761719 70 8.398438 70 Z M 8.398438 70 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 61.601563 0 L 8.398438 0 C 3.761719 0 0 3.761719 0 8.398438 L 0 61.601563 C 0 66.238281 3.761719 70 8.398438 70 L 61.601563 70 C 66.238281 70 70 66.238281 70 61.601563 L 70 8.398438 C 70 3.761719 66.238281 0 61.601563 0 Z M 61.601563 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 5.601563 28 L 64.398438 28 L 64.398438 43.398438 L 5.601563 43.398438 Z M 5.601563 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 5.601563 49 L 64.398438 49 L 64.398438 64.398438 L 5.601563 64.398438 Z M 5.601563 49 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 5.601563 7 L 64.398438 7 L 64.398438 22.398438 L 5.601563 22.398438 Z M 5.601563 7 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureManagedDisks(m).png b/dist/Storage/AzureManagedDisks(m).png
deleted file mode 100644
index 60a9dd07..00000000
Binary files a/dist/Storage/AzureManagedDisks(m).png and /dev/null differ
diff --git a/dist/Storage/AzureManagedDisks(m).svg b/dist/Storage/AzureManagedDisks(m).svg
deleted file mode 100644
index 9e2f0901..00000000
--- a/dist/Storage/AzureManagedDisks(m).svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="59pt" viewBox="0 0 70 59" version="1.1">
-<defs>
-<clipPath id="clip1">
-  <path d="M 0 39 L 69.929688 39 L 69.929688 58.851563 L 0 58.851563 Z M 0 39 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 0 27 L 69.929688 27 L 69.929688 53 L 0 53 Z M 0 27 "/>
-</clipPath>
-<clipPath id="clip3">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 58.851563 L 0 58.851563 Z M 0 0 "/>
-</clipPath>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip4">
-  <rect x="0" y="0" width="70" height="59"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip4)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.238281 30.902344 C 55.335938 29.0625 48.902344 27.757813 41.664063 27.253906 L 37.128906 35.570313 C 39.082031 35.65625 41.015625 35.964844 42.898438 36.484375 Z M 60.238281 30.902344 "/>
-</g>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip5">
-  <rect x="0" y="0" width="70" height="59"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.253906 47.644531 C 13.289063 49.78125 20.277344 51.304688 28.234375 51.859375 L 33.539063 42.144531 C 31.574219 42.089844 29.621094 41.832031 27.710938 41.378906 Z M 8.253906 47.644531 "/>
-</g>
-<clipPath id="clip6">
-  <path d="M 0 12 L 69.929688 12 L 69.929688 32 L 0 32 Z M 0 12 "/>
-</clipPath>
-<clipPath id="clip7">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 26 L 0 26 Z M 0 0 "/>
-</clipPath>
-<clipPath id="clip8">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 58.851563 L 0 58.851563 Z M 0 0 "/>
-</clipPath>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip9">
-  <rect x="0" y="0" width="70" height="59"/>
-</clipPath>
-<g id="surface11" clip-path="url(#clip9)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 60.238281 3.949219 C 55.335938 2.109375 48.902344 0.804688 41.664063 0.300781 L 37.128906 8.617188 C 39.082031 8.703125 41.015625 9.011719 42.898438 9.53125 Z M 60.238281 3.949219 "/>
-</g>
-<mask id="mask3">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0,0,0);fill-opacity:0.25098;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip10">
-  <rect x="0" y="0" width="70" height="59"/>
-</clipPath>
-<g id="surface14" clip-path="url(#clip10)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.253906 20.691406 C 13.289063 22.828125 20.277344 24.351563 28.234375 24.90625 L 33.539063 15.1875 C 31.574219 15.132813 29.621094 14.875 27.710938 14.421875 Z M 8.253906 20.691406 "/>
-</g>
-</defs>
-<g id="surface1">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 69.925781 46.316406 C 69.925781 53.242188 54.273438 58.851563 34.960938 58.851563 C 15.652344 58.851563 0 53.242188 0 46.316406 L 0 39.558594 L 69.925781 39.558594 Z M 69.925781 46.316406 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 69.925781 39.558594 C 69.925781 46.484375 54.273438 52.09375 34.960938 52.09375 C 15.652344 52.09375 0 46.480469 0 39.558594 C 0 32.636719 15.65625 27.023438 34.964844 27.023438 C 54.273438 27.023438 69.929688 32.632813 69.929688 39.558594 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 46.167969 38.835938 C 46.167969 40.679688 41.152344 42.171875 34.960938 42.171875 C 28.769531 42.171875 23.75 40.679688 23.75 38.835938 C 23.75 36.996094 28.769531 35.503906 34.960938 35.503906 C 41.148438 35.503906 46.167969 36.996094 46.167969 38.835938 "/>
-<g clip-path="url(#clip3)" clip-rule="nonzero">
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-</g>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 69.925781 19.292969 C 69.925781 26.214844 54.273438 31.828125 34.960938 31.828125 C 15.652344 31.828125 0 26.21875 0 19.292969 L 0 12.535156 L 69.925781 12.535156 Z M 69.925781 19.292969 "/>
-</g>
-<g clip-path="url(#clip7)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,125,218);fill-opacity:1;" d="M 69.925781 12.535156 C 69.925781 19.460938 54.273438 25.074219 34.960938 25.074219 C 15.652344 25.074219 0 19.460938 0 12.535156 C 0 5.613281 15.652344 0 34.960938 0 C 54.273438 0 69.925781 5.613281 69.925781 12.535156 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,73,128);fill-opacity:1;" d="M 46.167969 11.816406 C 46.167969 13.65625 41.152344 15.148438 34.960938 15.148438 C 28.769531 15.148438 23.75 13.65625 23.75 11.816406 C 23.75 9.972656 28.769531 8.480469 34.960938 8.480469 C 41.148438 8.480469 46.167969 9.976563 46.167969 11.816406 "/>
-<g clip-path="url(#clip8)" clip-rule="nonzero">
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-<use xlink:href="#surface14" mask="url(#mask3)"/>
-</g>
-</g>
-</svg>
diff --git a/dist/Storage/AzureManagedDisks.png b/dist/Storage/AzureManagedDisks.png
deleted file mode 100644
index 84ba6bbc..00000000
Binary files a/dist/Storage/AzureManagedDisks.png and /dev/null differ
diff --git a/dist/Storage/AzureManagedDisks.puml b/dist/Storage/AzureManagedDisks.puml
deleted file mode 100644
index 39610909..00000000
--- a/dist/Storage/AzureManagedDisks.puml
+++ /dev/null
@@ -1,12 +0,0 @@
-sprite $AzureManagedDisks [70x59/16z] {
-dTTLWeH034NHqiWB-z_kI8RsPAgwppTSB5W9rTR796OHqLyYp3H7RxNiQODO0y8d6lt_LfkY6NumUubrKitn2nelkzGyaHD-8QhS7ngi2q72oQr3kY9Xmd7r
-HXLToXBkTtUQvl33Va3aho0Q6QL8ch3ZdXcWYJQpnX4mZObex0X1tsDlLV16nlA5DGVOxTmQD8K3YpbJOEFm3Md2RPv3m-Qqvn67EE5q1RudjvClmYys6h_q
-S0RXoBhXnd4HTTO99qMF6oIdDfyaPxKKVPbFuLCIC7jSfPKVVBZWCO1Vgd3dwY_GYXiuFaVbQjhn6Qxbtj3ZRPZUU52dsB5FgPLO8zqAcNBshkwJ78iYRHbK
-QBhn6gg37fqZXvFVPJGV4Ctsq9YqC9_GHIyNWrRYX9ld6vRMieJhYyZbYqoOA4cScRoWi3lmLgnrYWdi1PHYsKuoB2Bq7hK0c69CsuS4PKeevLXK0JC0VcvJ
-35vC26s0WTE4spo7u9rfpx7QBqYIsAe8VXEtpWnixeYOWypvVaNK7FhTD2IHzNt6XH_7Agba2OTQYjZBhJjFMG1sx-_bE67F0F-Q4RuHEIVvcTJYcjh7CExV
-Z1ysPddG6VOk6V6Fess3p5OIRRBk5AYNXTgdZqC4oZDxG-U_zpuoVw-HCLg--ZS
-}
-
-AzureEntityColoring(AzureManagedDisks)
-!define AzureManagedDisks(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagedDisks, AzureManagedDisks)
-!define AzureManagedDisks(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagedDisks, AzureManagedDisks)
diff --git a/dist/Storage/AzureManagedDisks.svg b/dist/Storage/AzureManagedDisks.svg
deleted file mode 100644
index 4b588ef1..00000000
--- a/dist/Storage/AzureManagedDisks.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="59pt" viewBox="0 0 70 59" version="1.1">
-<defs>
-<clipPath id="clip1">
-  <path d="M 0 39 L 69.929688 39 L 69.929688 58.851563 L 0 58.851563 Z M 0 39 "/>
-</clipPath>
-<clipPath id="clip2">
-  <path d="M 0 27 L 69.929688 27 L 69.929688 53 L 0 53 Z M 0 27 "/>
-</clipPath>
-<clipPath id="clip3">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 58.851563 L 0 58.851563 Z M 0 0 "/>
-</clipPath>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip4">
-  <rect x="0" y="0" width="70" height="59"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip4)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.238281 30.902344 C 55.335938 29.0625 48.902344 27.757813 41.664063 27.253906 L 37.128906 35.570313 C 39.082031 35.65625 41.015625 35.964844 42.898438 36.484375 Z M 60.238281 30.902344 "/>
-</g>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip5">
-  <rect x="0" y="0" width="70" height="59"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip5)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.253906 47.644531 C 13.289063 49.78125 20.277344 51.304688 28.234375 51.859375 L 33.539063 42.144531 C 31.574219 42.089844 29.621094 41.832031 27.710938 41.378906 Z M 8.253906 47.644531 "/>
-</g>
-<clipPath id="clip6">
-  <path d="M 0 12 L 69.929688 12 L 69.929688 32 L 0 32 Z M 0 12 "/>
-</clipPath>
-<clipPath id="clip7">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 26 L 0 26 Z M 0 0 "/>
-</clipPath>
-<clipPath id="clip8">
-  <path d="M 0 0 L 69.929688 0 L 69.929688 58.851563 L 0 58.851563 Z M 0 0 "/>
-</clipPath>
-<mask id="mask2">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip9">
-  <rect x="0" y="0" width="70" height="59"/>
-</clipPath>
-<g id="surface11" clip-path="url(#clip9)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 60.238281 3.949219 C 55.335938 2.109375 48.902344 0.804688 41.664063 0.300781 L 37.128906 8.617188 C 39.082031 8.703125 41.015625 9.011719 42.898438 9.53125 Z M 60.238281 3.949219 "/>
-</g>
-<mask id="mask3">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="59" style="fill:rgb(0%,0%,0%);fill-opacity:0.25098;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip10">
-  <rect x="0" y="0" width="70" height="59"/>
-</clipPath>
-<g id="surface14" clip-path="url(#clip10)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.253906 20.691406 C 13.289063 22.828125 20.277344 24.351563 28.234375 24.90625 L 33.539063 15.1875 C 31.574219 15.132813 29.621094 14.875 27.710938 14.421875 Z M 8.253906 20.691406 "/>
-</g>
-</defs>
-<g id="surface1">
-<g clip-path="url(#clip1)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 69.925781 46.316406 C 69.925781 53.242188 54.273438 58.851563 34.960938 58.851563 C 15.652344 58.851563 0 53.242188 0 46.316406 L 0 39.558594 L 69.925781 39.558594 Z M 69.925781 46.316406 "/>
-</g>
-<g clip-path="url(#clip2)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 69.925781 39.558594 C 69.925781 46.484375 54.273438 52.09375 34.960938 52.09375 C 15.652344 52.09375 0 46.480469 0 39.558594 C 0 32.636719 15.65625 27.023438 34.964844 27.023438 C 54.273438 27.023438 69.929688 32.632813 69.929688 39.558594 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 46.167969 38.835938 C 46.167969 40.679688 41.152344 42.171875 34.960938 42.171875 C 28.769531 42.171875 23.75 40.679688 23.75 38.835938 C 23.75 36.996094 28.769531 35.503906 34.960938 35.503906 C 41.148438 35.503906 46.167969 36.996094 46.167969 38.835938 "/>
-<g clip-path="url(#clip3)" clip-rule="nonzero">
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
-</g>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 69.925781 19.292969 C 69.925781 26.214844 54.273438 31.828125 34.960938 31.828125 C 15.652344 31.828125 0 26.21875 0 19.292969 L 0 12.535156 L 69.925781 12.535156 Z M 69.925781 19.292969 "/>
-</g>
-<g clip-path="url(#clip7)" clip-rule="nonzero">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(60.784314%,30.980392%,58.823529%);fill-opacity:1;" d="M 69.925781 12.535156 C 69.925781 19.460938 54.273438 25.074219 34.960938 25.074219 C 15.652344 25.074219 0 19.460938 0 12.535156 C 0 5.613281 15.652344 0 34.960938 0 C 54.273438 0 69.925781 5.613281 69.925781 12.535156 "/>
-</g>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 46.167969 11.816406 C 46.167969 13.65625 41.152344 15.148438 34.960938 15.148438 C 28.769531 15.148438 23.75 13.65625 23.75 11.816406 C 23.75 9.972656 28.769531 8.480469 34.960938 8.480469 C 41.148438 8.480469 46.167969 9.976563 46.167969 11.816406 "/>
-<g clip-path="url(#clip8)" clip-rule="nonzero">
-<use xlink:href="#surface11" mask="url(#mask2)"/>
-<use xlink:href="#surface14" mask="url(#mask3)"/>
-</g>
-</g>
-</svg>
diff --git a/dist/Storage/AzureNetAppFiles.puml b/dist/Storage/AzureNetAppFiles.puml
index b3a3777f..a139570e 100644
--- a/dist/Storage/AzureNetAppFiles.puml
+++ b/dist/Storage/AzureNetAppFiles.puml
@@ -1,9 +1,9 @@
-sprite $AzureNetAppFiles [70x70/16z] {
+sprite $AzureNetAppfiles [70x70/16z] {
 xTC5OaGX38HXI2P1Ul_pLcc1sXDcg_iTu4SJBkfAT5KCqTDfkJHOZ3JflCAe54QbC2g5KSbbGeaKIgJWE3D_pOxpjoWHfqIS4d56f5Kqd2QKIlmtbIXRzbJI
 pPRuFoeppPiLc7T_kQAnstEx0zdnHjMRilBIDJH-hRnKhXL3ftciQ9DMvgYYoR-iWe5C5SMZL_S2wuQATdD5MdggABgVNu5OwlovOccmMG5qXaSwsQfWdyyh
 O5J0g62Xqlbvb8XJ8Wv6n8KHiI2uPqiqNDBL7G
 }
 
-AzureEntityColoring(AzureNetAppFiles)
-!define AzureNetAppFiles(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetAppFiles, AzureNetAppFiles)
-!define AzureNetAppFiles(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetAppFiles, AzureNetAppFiles)
+AzureEntityColoring(AzureNetAppfiles)
+!define AzureNetAppfiles(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetAppfiles, AzureNetAppfiles)
+!define AzureNetAppfiles(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetAppfiles, AzureNetAppfiles)
diff --git a/dist/Storage/AzureQueueStorage(m).png b/dist/Storage/AzureQueueStorage(m).png
index 2b01ce40..e871b4e6 100644
Binary files a/dist/Storage/AzureQueueStorage(m).png and b/dist/Storage/AzureQueueStorage(m).png differ
diff --git a/dist/Storage/AzureQueueStorage(m).svg b/dist/Storage/AzureQueueStorage(m).svg
index f6eac543..dc9d975d 100644
--- a/dist/Storage/AzureQueueStorage(m).svg
+++ b/dist/Storage/AzureQueueStorage(m).svg
@@ -1,11 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="60pt" viewBox="0 0 70 60" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.601563 64.398438 L 26.601563 9.800781 L 29.398438 9.800781 L 29.398438 64.398438 Z M 26.601563 64.398438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 64.398438 L 5.601563 9.800781 L 8.398438 9.800781 L 8.398438 64.398438 Z M 5.601563 64.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.601563 64.398438 L 47.601563 9.800781 L 50.398438 9.800781 L 50.398438 64.398438 Z M 47.601563 64.398438 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 6.90625 69.859375 L 11.199219 69.859375 L 56 9.800781 L 0 9.800781 L 0 60.199219 C 0 64.328125 2.980469 69.15625 6.90625 69.859375 Z M 6.90625 69.859375 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 46.789063 31.636719 L 54.34375 25.816406 L 39.238281 25.816406 Z M 46.789063 31.636719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 23.761719 33.636719 C 23.578125 33.636719 23.394531 33.636719 23.210938 33.453125 L 16.210938 28 L 16.210938 36.910156 L 32.238281 36.910156 L 32.238281 27.816406 L 24.683594 33.453125 C 24.316406 33.636719 23.949219 33.636719 23.761719 33.636719 Z M 23.761719 33.636719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 46.789063 33.636719 C 46.605469 33.636719 46.238281 33.636719 46.238281 33.453125 L 39.050781 28 L 39.050781 36.910156 L 55.078125 36.910156 L 55.078125 27.816406 L 47.527344 33.453125 C 47.15625 33.636719 46.972656 33.636719 46.789063 33.636719 Z M 46.789063 33.636719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 52.5 0 L 17.5 0 L 0 29.816406 L 17.5 59.636719 L 52.316406 59.636719 L 69.816406 29.816406 Z M 58.578125 42.546875 L 10.867188 42.546875 C 9.394531 42.546875 8.289063 41.273438 8.289063 39.816406 L 8.289063 21.816406 C 8.289063 20.363281 9.394531 19.089844 10.867188 19.089844 L 58.578125 19.089844 C 59.132813 19.089844 60.050781 19.089844 66.316406 30.726563 L 66.5 31.273438 L 66.316406 31.816406 C 60.050781 42.546875 59.132813 42.546875 58.578125 42.546875 Z M 58.578125 42.546875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 23.578125 31.636719 L 31.316406 25.816406 L 16.027344 25.816406 Z M 23.578125 31.636719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 10.867188 21.089844 C 10.5 21.089844 10.132813 21.453125 10.132813 21.816406 L 10.132813 39.816406 C 10.132813 40.183594 10.5 40.726563 10.867188 40.726563 L 58.210938 40.726563 C 59.132813 39.816406 61.894531 35.453125 64.289063 31.273438 C 61.894531 26.726563 58.949219 22 58.210938 21.089844 Z M 34.078125 37.816406 C 34.078125 38.363281 33.527344 38.910156 32.789063 38.910156 L 14.738281 38.910156 C 14.183594 38.910156 14 38.363281 14 37.816406 L 14 24.546875 C 14 24 14.183594 23.816406 14.738281 23.816406 L 32.789063 23.816406 C 33.34375 23.816406 34.078125 24 34.078125 24.546875 Z M 56.738281 37.816406 C 56.738281 38.363281 56.367188 38.910156 55.816406 38.910156 L 37.949219 38.910156 C 37.394531 38.910156 37.027344 38.363281 37.027344 37.816406 L 37.027344 24.546875 C 37.027344 24 37.394531 23.816406 37.949219 23.816406 L 55.816406 23.816406 C 56.367188 23.816406 56.738281 24 56.738281 24.546875 Z M 56.738281 37.816406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 61.601563 70 L 8.398438 70 C 3.761719 70 0 64.839844 0 60.199219 L 0 9.800781 L 68.601563 9.800781 L 68.601563 61.601563 C 68.601563 66.238281 66.238281 70 61.601563 70 Z M 61.601563 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.601563 9.800781 L 42 9.800781 L 42 64.398438 L 26.601563 64.398438 Z M 26.601563 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 26.601563 9.800781 L 42 9.800781 L 42 64.398438 L 26.601563 64.398438 Z M 26.601563 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,112,196);fill-opacity:1;" d="M 47.601563 9.800781 L 63 9.800781 L 63 64.398438 L 47.601563 64.398438 Z M 47.601563 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 5.601563 9.800781 L 21 9.800781 L 21 64.398438 L 5.601563 64.398438 Z M 5.601563 9.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureQueueStorage.png b/dist/Storage/AzureQueueStorage.png
index 771e866a..c0ea46f7 100644
Binary files a/dist/Storage/AzureQueueStorage.png and b/dist/Storage/AzureQueueStorage.png differ
diff --git a/dist/Storage/AzureQueueStorage.puml b/dist/Storage/AzureQueueStorage.puml
index 07a705e1..0468a790 100644
--- a/dist/Storage/AzureQueueStorage.puml
+++ b/dist/Storage/AzureQueueStorage.puml
@@ -1,10 +1,7 @@
-sprite $AzureQueueStorage [70x60/16z] {
-fPO7bkmW30IRBEd-z_s1VYClPXAhsZWEPMWiMxWpx2EQy85iNz3n0R5lo7XBjQyGl2EfVKV56xfzYKQZ9JqQBSd1QCd02zHEAC5eYOPMsMaWdmhel9oA7TD3
-qRvUxMQ_GABHaXgCrWFUemq6B6OzuP2YQy2DPN46wsuiqLOqFMCmpVApW0haV86INkMKpIqg6_foioRKgvpaiYJi22EyepCJcJ9cv1OWvGK0OrhoGcB55EH7
-mBfQbdYwMzhzEJTdoamp_rmMS0FH0hUWg6zkVl4s0nPaMoqj-V6IW5ffQSb7gHbeXHPDSv1LRfQXPHxFx8VHCZTpb2CX3QkqM9-3qdwtpDFxd4rMSyiyeQer
-RgPbPbBD17gpy78rCL2tS8QvS3Cj_2TJTRTmwcdOQc7QtEmM0SPSITajfgsghPR9jTblaCBRBcyMibiSjmn0hR8OVslXGei_62vBrnLQjiq5-gZg358lomuj
-E-hHFf27fM0Zgrd3HfahMHajoRISmI9gowWhoZYZ0pAZTP8Apkdt29ffguUC_SqXWLTZyEtOOaqGqM13HWfscf5Whwh1JegKQ5T7HZ1Qaa-RiN3tBNYD1gCb
-DHejaQC22WPSyPuUZ9Oa3KPBIlz8mvs_
+sprite $AzureQueueStorage [70x70/16z] {
+xSu5RaCn48JXVJIBzpzlixMW3Cue2lq2yoVBnNlsR7bjVT-FczlRngv4Pzjsl2qw_R2fqG5gfpn6MTsaud4rYWT1yI0e7bUZM5oDebUZf3AKOYZ5K9AXP36K
+OYZ5K8oXu7eKC1Gm55oF0eO2XeBhKS1Gm51mFGeO2l1PUIexGzaPYZ6KOYZ9KB8OIZ6Kf2X5K91Neu2XO4BnZmfc52CeASS71LFAqdC_3epKkkhyfBpDnwx7
+9yL4zCFcH8V8yXQlgHOHsSxz2gJRpaDCHelE8tcqy08
 }
 
 AzureEntityColoring(AzureQueueStorage)
diff --git a/dist/Storage/AzureQueueStorage.svg b/dist/Storage/AzureQueueStorage.svg
index f6eac543..e4e7bd07 100644
--- a/dist/Storage/AzureQueueStorage.svg
+++ b/dist/Storage/AzureQueueStorage.svg
@@ -1,11 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="60pt" viewBox="0 0 70 60" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.601563 64.398438 L 26.601563 9.800781 L 29.398438 9.800781 L 29.398438 64.398438 Z M 26.601563 64.398438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 64.398438 L 5.601563 9.800781 L 8.398438 9.800781 L 8.398438 64.398438 Z M 5.601563 64.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.601563 64.398438 L 47.601563 9.800781 L 50.398438 9.800781 L 50.398438 64.398438 Z M 47.601563 64.398438 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 6.90625 69.859375 L 11.199219 69.859375 L 56 9.800781 L 0 9.800781 L 0 60.199219 C 0 64.328125 2.980469 69.15625 6.90625 69.859375 Z M 6.90625 69.859375 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 46.789063 31.636719 L 54.34375 25.816406 L 39.238281 25.816406 Z M 46.789063 31.636719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 23.761719 33.636719 C 23.578125 33.636719 23.394531 33.636719 23.210938 33.453125 L 16.210938 28 L 16.210938 36.910156 L 32.238281 36.910156 L 32.238281 27.816406 L 24.683594 33.453125 C 24.316406 33.636719 23.949219 33.636719 23.761719 33.636719 Z M 23.761719 33.636719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 46.789063 33.636719 C 46.605469 33.636719 46.238281 33.636719 46.238281 33.453125 L 39.050781 28 L 39.050781 36.910156 L 55.078125 36.910156 L 55.078125 27.816406 L 47.527344 33.453125 C 47.15625 33.636719 46.972656 33.636719 46.789063 33.636719 Z M 46.789063 33.636719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 52.5 0 L 17.5 0 L 0 29.816406 L 17.5 59.636719 L 52.316406 59.636719 L 69.816406 29.816406 Z M 58.578125 42.546875 L 10.867188 42.546875 C 9.394531 42.546875 8.289063 41.273438 8.289063 39.816406 L 8.289063 21.816406 C 8.289063 20.363281 9.394531 19.089844 10.867188 19.089844 L 58.578125 19.089844 C 59.132813 19.089844 60.050781 19.089844 66.316406 30.726563 L 66.5 31.273438 L 66.316406 31.816406 C 60.050781 42.546875 59.132813 42.546875 58.578125 42.546875 Z M 58.578125 42.546875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 23.578125 31.636719 L 31.316406 25.816406 L 16.027344 25.816406 Z M 23.578125 31.636719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 10.867188 21.089844 C 10.5 21.089844 10.132813 21.453125 10.132813 21.816406 L 10.132813 39.816406 C 10.132813 40.183594 10.5 40.726563 10.867188 40.726563 L 58.210938 40.726563 C 59.132813 39.816406 61.894531 35.453125 64.289063 31.273438 C 61.894531 26.726563 58.949219 22 58.210938 21.089844 Z M 34.078125 37.816406 C 34.078125 38.363281 33.527344 38.910156 32.789063 38.910156 L 14.738281 38.910156 C 14.183594 38.910156 14 38.363281 14 37.816406 L 14 24.546875 C 14 24 14.183594 23.816406 14.738281 23.816406 L 32.789063 23.816406 C 33.34375 23.816406 34.078125 24 34.078125 24.546875 Z M 56.738281 37.816406 C 56.738281 38.363281 56.367188 38.910156 55.816406 38.910156 L 37.949219 38.910156 C 37.394531 38.910156 37.027344 38.363281 37.027344 37.816406 L 37.027344 24.546875 C 37.027344 24 37.394531 23.816406 37.949219 23.816406 L 55.816406 23.816406 C 56.367188 23.816406 56.738281 24 56.738281 24.546875 Z M 56.738281 37.816406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 61.601563 70 L 8.398438 70 C 3.761719 70 0 64.839844 0 60.199219 L 0 9.800781 L 68.601563 9.800781 L 68.601563 61.601563 C 68.601563 66.238281 66.238281 70 61.601563 70 Z M 61.601563 70 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.601563 9.800781 L 42 9.800781 L 42 64.398438 L 26.601563 64.398438 Z M 26.601563 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 26.601563 9.800781 L 42 9.800781 L 42 64.398438 L 26.601563 64.398438 Z M 26.601563 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 47.601563 9.800781 L 63 9.800781 L 63 64.398438 L 47.601563 64.398438 Z M 47.601563 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 5.601563 9.800781 L 21 9.800781 L 21 64.398438 L 5.601563 64.398438 Z M 5.601563 9.800781 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureStorSimple(m).png b/dist/Storage/AzureStorSimple(m).png
index fcdeaf4f..a2a3f85f 100644
Binary files a/dist/Storage/AzureStorSimple(m).png and b/dist/Storage/AzureStorSimple(m).png differ
diff --git a/dist/Storage/AzureStorSimple(m).svg b/dist/Storage/AzureStorSimple(m).svg
index 7685d7b7..c172c176 100644
--- a/dist/Storage/AzureStorSimple(m).svg
+++ b/dist/Storage/AzureStorSimple(m).svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="61pt" viewBox="0 0 70 61" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 36.140625 60.839844 L 51.929688 60.839844 L 51.929688 56.503906 L 36.140625 56.503906 Z M 36.140625 60.839844 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 36.140625 53.9375 L 51.929688 53.9375 L 51.929688 49.601563 L 36.140625 49.601563 Z M 36.140625 53.9375 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 14.976563 43.34375 L 13.835938 43.34375 L 20.675781 43.34375 L 20.675781 39.488281 L 35.8125 39.488281 L 35.8125 47.195313 L 51.605469 47.195313 L 51.605469 43.34375 L 61.859375 43.34375 C 66.582031 43.34375 69.835938 39.488281 69.835938 35.316406 C 69.835938 30.820313 66.09375 27.128906 61.699219 27.128906 C 61.371094 27.128906 61.046875 27.128906 60.722656 27.128906 C 61.210938 25.363281 61.535156 23.4375 61.535156 21.351563 C 61.699219 9.632813 52.90625 0 40.699219 0 C 31.09375 0 22.789063 6.101563 19.859375 14.769531 C 18.394531 14.285156 16.765625 13.964844 14.976563 13.964844 C 6.675781 13.964844 0 20.867188 0 28.734375 C 0.164063 37.082031 6.675781 43.34375 14.976563 43.34375 Z M 20.835938 25.84375 L 36.140625 25.84375 L 36.140625 30.179688 L 20.835938 30.179688 Z M 20.835938 37.082031 L 20.835938 32.746094 L 35.976563 32.746094 L 35.976563 37.082031 Z M 20.835938 37.082031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 37.101563 55.441406 L 53.621094 55.441406 L 53.621094 58.941406 L 37.101563 58.941406 Z M 37.101563 62.859375 L 53.621094 62.859375 L 53.621094 66.359375 L 37.101563 66.359375 Z M 62.160156 31.640625 L 61.039063 31.640625 C 61.460938 29.679688 61.878906 27.71875 61.878906 25.761719 C 61.878906 13.441406 53.058594 3.640625 40.878906 3.640625 C 31.21875 3.640625 22.820313 9.941406 20.019531 18.761719 C 18.480469 18.339844 16.660156 17.921875 14.980469 17.921875 C 6.859375 17.921875 0 24.921875 0 33.320313 C 0 42.140625 6.160156 48.019531 14.421875 48.019531 L 20.300781 48.019531 L 20.300781 44.238281 L 36.960938 44.238281 L 36.960938 51.660156 L 53.480469 51.660156 L 53.480469 47.878906 L 62.019531 47.878906 C 66.640625 47.878906 69.859375 44.519531 69.859375 40.039063 C 70.28125 35.421875 66.5 31.640625 62.160156 31.640625 Z M 36.820313 40.460938 L 20.441406 40.460938 L 20.441406 36.960938 L 36.960938 36.960938 L 36.960938 40.460938 Z M 36.820313 33.179688 L 20.441406 33.179688 L 20.441406 29.679688 L 36.960938 29.679688 L 36.960938 33.179688 Z M 36.820313 33.179688 "/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureStorSimple.png b/dist/Storage/AzureStorSimple.png
index 844542a5..0ed58f05 100644
Binary files a/dist/Storage/AzureStorSimple.png and b/dist/Storage/AzureStorSimple.png differ
diff --git a/dist/Storage/AzureStorSimple.puml b/dist/Storage/AzureStorSimple.puml
index b5743baa..3e4ee77c 100644
--- a/dist/Storage/AzureStorSimple.puml
+++ b/dist/Storage/AzureStorSimple.puml
@@ -1,7 +1,7 @@
-sprite $AzureStorSimple [70x61/16z] {
-xTK7OiCW38LXCGnwx_xtxLvAOv1bkliTu4yibipbhQi2qBvbYIaTV0Cj4AhAT_h1JbPUrUI0ZNiqYrVZFdWpdJoVwHn32ix4KfagdDjaHZc7TE9x_Di6T4ao
-KkcpNJ-wZmUtA7rKBbNmk3GuTtvrF8Z8O1g3Uk2V3CTRkAAYAogLAogW4PjkvWbjU7nnWJlgQBRmtkFPZ2LQqTvAj6AXHYjMsvbBjp0zb8td8LLUeHOuqP9Z
-Bie9Y2weKFAIYlGbbOJWTEtFPj08dkq26cYMyzrFEdppu7sMAkALAgzgHwZIirYvr0TbN45zLP9uORITVcIbN90lbB8b8OrM_gyyIfPyeHpSTVyhVGi
+sprite $AzureStorSimple [70x70/16z] {
+xTHLTi0m34HHuUn_nsMSW1pPvTxld1Up_5LgfYeJp1FFmgJ5GKBbgi2Ea4iC1wmt4EQTI7zMYLFU64bpRHmbbOgYbhr5OTQR3oig66FrcMskZ7e2o71D3Dh-
+Fr6efwI9Zg25w4cADD51RPgDy5sA5HN5YafYWZp3ZDDTJbAUbnXvKxCwkpbLKLgMuGhpeqe6AMys5Z19BB2c4ewjK98eQ6kFcAof63R222fhzbf4brJ4CIja
+9nDEKDXzP6nqZ_ZxQ5RuSyzM9LsOFfAgajBm0oh_b4b7WFp8Ihqk_pp9Zzzfdb78htSB
 }
 
 AzureEntityColoring(AzureStorSimple)
diff --git a/dist/Storage/AzureStorSimple.svg b/dist/Storage/AzureStorSimple.svg
index 5e9955c0..f9f0e661 100644
--- a/dist/Storage/AzureStorSimple.svg
+++ b/dist/Storage/AzureStorSimple.svg
@@ -1,37 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="63pt" viewBox="0 0 70 63" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="63" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="63"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 27.429688 19.324219 C 29.113281 18.902344 30.792969 18.902344 32.332031 19.042969 C 33.03125 11.492188 38.984375 3.933594 45.695313 0.570313 C 44.140625 0.207031 42.511719 0 40.808594 0 C 31.15625 0 22.820313 6.363281 19.96875 15.140625 C 18.429688 14.703125 16.675781 14.261719 14.921875 14.261719 C 6.800781 14.261719 0 21.28125 0 29.621094 C 0 38.394531 6.144531 44.320313 14.480469 44.320313 L 20.378906 44.320313 C 18.449219 42.371094 17.066406 40.011719 16.371094 37.101563 C 14.550781 29.121094 19.453125 21.144531 27.429688 19.324219 Z M 27.429688 19.324219 "/>
-</g>
-<mask id="mask1">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="63" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip2">
-  <rect x="0" y="0" width="70" height="63"/>
-</clipPath>
-<g id="surface8" clip-path="url(#clip2)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 45.71875 0.554688 C 45.710938 0.558594 45.703125 0.5625 45.695313 0.566406 C 45.699219 0.570313 45.703125 0.570313 45.707031 0.570313 Z M 45.71875 0.554688 "/>
-</g>
-</defs>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 62.09375 28.085938 C 61.65625 28.085938 61.433594 28.085938 60.996094 28.085938 C 61.433594 26.109375 61.871094 24.132813 61.871094 22.160156 C 61.871094 9.875 53.097656 0 40.808594 0 C 31.15625 0 22.820313 6.363281 19.96875 15.140625 C 18.429688 14.703125 16.675781 14.261719 14.921875 14.261719 C 6.800781 14.261719 0 21.28125 0 29.621094 C 0 38.394531 6.144531 44.320313 14.480469 44.320313 L 20.402344 44.320313 L 20.402344 40.589844 L 37.078125 40.589844 L 37.078125 48.050781 L 53.535156 48.050781 L 53.535156 44.320313 L 62.09375 44.320313 C 66.699219 44.320313 69.992188 41.027344 69.992188 36.421875 C 70.210938 31.8125 66.480469 28.085938 62.09375 28.085938 Z M 36.859375 36.859375 L 20.40625 36.859375 L 20.40625 33.347656 L 36.859375 33.347656 Z M 36.859375 29.621094 L 20.40625 29.621094 L 20.40625 26.109375 L 36.859375 26.109375 Z M 36.859375 29.621094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 37.082031 51.78125 L 53.535156 51.78125 L 53.535156 55.292969 L 37.082031 55.292969 Z M 37.082031 51.78125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 37.082031 59.238281 L 53.535156 59.238281 L 53.535156 62.75 L 37.082031 62.75 Z M 37.082031 59.238281 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 37.101563 55.441406 L 53.621094 55.441406 L 53.621094 58.941406 L 37.101563 58.941406 Z M 37.101563 62.859375 L 53.621094 62.859375 L 53.621094 66.359375 L 37.101563 66.359375 Z M 62.160156 31.640625 L 61.039063 31.640625 C 61.460938 29.679688 61.878906 27.71875 61.878906 25.761719 C 61.878906 13.441406 53.058594 3.640625 40.878906 3.640625 C 31.21875 3.640625 22.820313 9.941406 20.019531 18.761719 C 18.480469 18.339844 16.660156 17.921875 14.980469 17.921875 C 6.859375 17.921875 0 24.921875 0 33.320313 C 0 42.140625 6.160156 48.019531 14.421875 48.019531 L 20.300781 48.019531 L 20.300781 44.238281 L 36.960938 44.238281 L 36.960938 51.660156 L 53.480469 51.660156 L 53.480469 47.878906 L 62.019531 47.878906 C 66.640625 47.878906 69.859375 44.519531 69.859375 40.039063 C 70.28125 35.421875 66.5 31.640625 62.160156 31.640625 Z M 36.820313 40.460938 L 20.441406 40.460938 L 20.441406 36.960938 L 36.960938 36.960938 L 36.960938 40.460938 Z M 36.820313 33.179688 L 20.441406 33.179688 L 20.441406 29.679688 L 36.960938 29.679688 L 36.960938 33.179688 Z M 36.820313 33.179688 "/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureStorSimpleDataManager(m).png b/dist/Storage/AzureStorSimpleDataManager(m).png
new file mode 100644
index 00000000..de2e3760
Binary files /dev/null and b/dist/Storage/AzureStorSimpleDataManager(m).png differ
diff --git a/dist/Storage/AzureStorSimpleDataManager(m).svg b/dist/Storage/AzureStorSimpleDataManager(m).svg
new file mode 100644
index 00000000..c5d10d6a
--- /dev/null
+++ b/dist/Storage/AzureStorSimpleDataManager(m).svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="62pt" height="70pt" viewBox="0 0 62 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(97,187,255);fill-opacity:1;" d="M 20.761719 68.949219 L 20.761719 69.164063 L 20.976563 69.164063 Z M 20.761719 68.949219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(1,147,255);fill-opacity:1;" d="M 6.113281 10.84375 L 6.113281 59.585938 C 6.113281 64.628906 17.136719 68.730469 30.574219 68.875 L 30.574219 19.84375 C 17.277344 19.84375 6.398438 15.882813 6.113281 10.84375 Z M 6.113281 10.84375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 31.140625 19.988281 L 30.574219 19.988281 L 30.574219 68.875 L 31.140625 68.875 C 45.148438 68.875 56.167969 64.773438 56.167969 59.585938 L 56.167969 10.628906 C 56.167969 15.957031 44.863281 19.988281 31.140625 19.988281 Z M 31.140625 19.988281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 6.113281 10.773438 L 6.113281 11.058594 C 6.542969 15.957031 17.417969 19.988281 30.644531 19.988281 L 31.214844 19.988281 C 44.863281 19.988281 56.167969 15.957031 56.167969 10.773438 C 56.167969 6.8125 49.414063 3.429688 40.03125 2.203125 C 37.1875 1.773438 34.269531 1.554688 31.140625 1.554688 C 17.417969 1.484375 6.113281 5.730469 6.113281 10.773438 Z M 51.050781 10.339844 C 51.050781 11.5625 49.839844 12.644531 47.921875 13.507813 C 44.296875 15.308594 38.109375 16.386719 31.070313 16.386719 C 20.976563 16.386719 12.371094 14.085938 11.164063 10.917969 L 11.164063 10.195313 C 11.164063 6.8125 20.050781 4.078125 31.070313 4.078125 C 41.878906 4.21875 51.050781 6.957031 51.050781 10.339844 Z M 51.050781 10.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(55,170,255);fill-opacity:1;" d="M 51.050781 10.339844 C 51.050781 6.957031 41.878906 4.21875 31.140625 4.21875 C 41.878906 4.21875 51.050781 7.171875 51.050781 10.339844 Z M 31.285156 11.5625 C 24.8125 11.5625 19.054688 12.5 15.429688 14.011719 C 13.152344 13.21875 11.660156 12.210938 11.234375 10.988281 C 12.300781 14.15625 20.902344 16.460938 31.140625 16.460938 C 38.109375 16.460938 44.296875 15.234375 47.992188 13.582031 C 47.566406 13.722656 47.210938 13.867188 46.785156 14.15625 C 42.875 12.5 37.328125 11.5625 31.285156 11.5625 Z M 31.285156 11.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 31.140625 4.21875 C 20.121094 4.21875 11.234375 6.957031 11.234375 10.339844 L 11.234375 11.058594 C 11.660156 12.285156 13.226563 13.21875 15.429688 14.085938 C 19.054688 12.570313 24.8125 11.636719 31.285156 11.636719 C 37.328125 11.636719 42.875 12.570313 46.640625 14.085938 C 47.070313 13.941406 47.425781 13.796875 47.851563 13.507813 C 49.699219 12.714844 50.980469 11.636719 50.980469 10.339844 C 51.050781 7.171875 41.878906 4.21875 31.140625 4.21875 Z M 31.140625 4.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(53,169,255);fill-opacity:1;" d="M 7.820313 37.484375 C 7.964844 37.699219 7.890625 37.914063 7.820313 38.132813 Z M 7.820313 37.484375 "/>
+<path style="fill-rule:nonzero;fill:rgb(0,141,246);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,255,255);stroke-opacity:1;stroke-miterlimit:10;" d="M 63.999042 58.497822 C 63.999042 57.998686 63.80126 57.901029 63.400202 57.70029 L 58.598488 56.197457 C 58.301815 56.0998 58.098538 56.002143 57.999647 55.698321 C 57.69748 54.900789 57.301915 54.000174 56.999748 53.202642 C 56.900857 52.89882 56.900857 52.600423 56.999748 52.302027 C 57.69748 50.799194 58.400706 49.301786 59.197329 47.798953 C 59.400605 47.397474 59.400605 47.099078 58.999546 46.800681 C 58.197429 45.997724 57.400806 45.297848 56.59869 44.402659 C 56.197631 43.898098 55.802067 43.898098 55.302117 44.299577 L 55.197732 44.402659 C 53.802268 45.102534 52.40131 45.80241 51.099244 46.502285 C 50.802571 46.599942 50.599294 46.697599 50.302621 46.502285 C 49.500504 46.100806 48.698387 45.80241 47.901764 45.498588 C 47.599597 45.400931 47.401815 45.200191 47.297429 44.798713 C 46.698589 43.198222 46.099748 41.597732 45.599798 40.002668 C 45.500907 39.698846 45.297631 39.498107 45.000958 39.498107 L 41.100252 39.498107 C 40.699194 39.498107 40.600302 39.601189 40.40252 40.002668 C 39.902571 41.597732 39.402621 43.198222 38.798286 44.798713 C 38.699395 45.102534 38.600504 45.297848 38.298337 45.400931 C 37.501714 45.699327 36.600706 46.100806 35.798589 46.399203 C 35.501915 46.502285 35.199748 46.502285 34.897581 46.399203 C 33.298841 45.60167 31.700101 44.901795 30.200252 44.098837 C 29.898085 44.00118 29.799194 44.00118 29.50252 44.20192 C 28.601512 45.102534 27.700504 46.100806 26.700605 47.001421 C 26.398438 47.299817 26.398438 47.500557 26.601714 47.798953 C 27.398337 49.301786 28.101563 50.799194 28.898185 52.302027 C 29.101462 52.600423 29.101462 52.89882 29.002571 53.202642 C 28.700403 54.000174 28.299345 54.700049 28.002671 55.497582 C 27.898286 55.89906 27.700504 56.0998 27.299446 56.197457 C 25.700706 56.799675 24.101966 57.401893 22.497732 57.901029 C 22.102167 57.998686 21.997782 58.199426 21.997782 58.497822 L 21.997782 62.398678 C 21.997782 62.800157 22.102167 63.000896 22.497732 63.098553 C 24.101966 63.597689 25.700706 64.199907 27.299446 64.699043 C 27.601613 64.802125 27.799395 64.899782 27.898286 65.301261 C 28.200454 66.098794 28.601512 66.901751 28.898185 67.699284 C 29.002571 67.99768 29.002571 68.301502 28.898185 68.599898 C 28.101563 70.200388 27.398337 71.800878 26.601714 73.401369 C 26.497329 73.602108 26.497329 73.797422 26.700605 73.998161 L 29.601411 76.900745 C 29.700302 76.998402 29.799194 77.199142 30.101361 76.998402 C 31.002369 76.499266 32.002268 76.00013 32.897782 75.500994 C 33.601008 75.202598 34.199849 74.801119 34.897581 74.497297 C 35.199748 74.39964 35.39753 74.301983 35.699698 74.497297 C 36.501815 74.898776 37.397329 75.202598 38.199446 75.500994 C 38.501613 75.598651 38.600504 75.799391 38.699395 76.097787 C 39.298236 77.698277 39.902571 79.40185 40.40252 81.00234 C 40.501411 81.300736 40.699194 81.501476 41.001361 81.501476 L 44.902067 81.501476 C 45.297631 81.501476 45.402016 81.300736 45.599798 81.00234 C 46.099748 79.40185 46.698589 77.80136 47.198538 76.20087 C 47.297429 75.902473 47.401815 75.701734 47.698488 75.598651 C 48.500605 75.300255 49.401613 74.898776 50.198236 74.60038 C 50.500403 74.497297 50.802571 74.497297 51.000353 74.60038 C 52.599093 75.397912 54.197833 76.097787 55.697681 76.900745 C 55.999849 76.998402 56.09874 76.998402 56.400907 76.797663 C 57.301915 75.902473 58.197429 74.898776 59.197329 73.998161 C 59.499496 73.699765 59.499496 73.602108 59.301714 73.200629 C 58.499597 71.697796 57.69748 70.097306 56.999748 68.599898 C 56.801966 68.301502 56.801966 67.99768 56.999748 67.699284 C 57.400806 66.901751 57.69748 66.098794 57.999647 65.301261 C 58.098538 64.997439 58.301815 64.802125 58.598488 64.699043 C 60.202722 64.10225 61.801462 63.500032 63.400202 63.000896 C 63.80126 62.897814 63.900151 62.702499 63.900151 62.301021 C 63.900151 60.90127 63.900151 59.702259 63.999042 58.497822 Z M 63.999042 58.497822 " transform="matrix(0.711009,0,0,0.719994,0,0.116275)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.058594 38.421875 C 34.625 37.914063 34.625 37.914063 35.054688 38.347656 C 37.898438 41.082031 37.824219 45.835938 34.910156 48.429688 C 32.847656 50.300781 29.507813 50.515625 27.089844 48.933594 C 26.945313 48.859375 26.804688 48.714844 26.664063 48.644531 C 25.242188 47.492188 24.316406 46.125 24.03125 44.324219 C 23.605469 42.019531 24.316406 40.003906 25.953125 38.347656 C 26.164063 38.132813 26.164063 38.058594 25.953125 37.84375 C 25.738281 37.628906 25.597656 37.410156 25.382813 37.195313 L 28.652344 37.195313 C 28.796875 37.195313 28.867188 37.269531 28.867188 37.410156 L 28.867188 40.652344 C 28.511719 40.292969 28.226563 40.074219 27.941406 39.789063 C 27.800781 39.644531 27.730469 39.570313 27.515625 39.789063 C 25.3125 41.660156 25.453125 45.332031 27.800781 47.058594 C 28.015625 47.058594 28.15625 47.203125 28.296875 47.277344 C 29.007813 47.78125 29.863281 47.996094 30.644531 47.996094 C 32.351563 47.925781 33.703125 47.277344 34.554688 45.691406 C 35.550781 43.820313 35.265625 41.660156 33.773438 40.074219 C 33.628906 39.933594 33.347656 39.789063 33.273438 39.5 C 33.203125 39.429688 33.203125 39.355469 33.273438 39.210938 C 33.558594 38.925781 33.84375 38.707031 34.058594 38.421875 Z M 34.058594 38.421875 "/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureStorSimpleDataManager.png b/dist/Storage/AzureStorSimpleDataManager.png
new file mode 100644
index 00000000..5a0a2643
Binary files /dev/null and b/dist/Storage/AzureStorSimpleDataManager.png differ
diff --git a/dist/Storage/AzureStorSimpleDataManager.puml b/dist/Storage/AzureStorSimpleDataManager.puml
new file mode 100644
index 00000000..2c0483f4
--- /dev/null
+++ b/dist/Storage/AzureStorSimpleDataManager.puml
@@ -0,0 +1,12 @@
+sprite $AzureStorSimpleDataManager [62x70/16z] {
+xTK5SYH134JHJ77V_yBhAiiqgBO3bhuPtgX20utF_OyKqKw4d4ErMwaGpnAr1oaVMdlQVQysI0QJptFxaTQP9YwJ2-uUN_8BtA1Bx6WlnRtSpBI1urFL769n
+FrVYjVYggnGTnVmQRjb9NEbAmQS-7kSYxJfwtD0z_qaIgqlTfH9teovuLtUkmWl7NkT0VtInlvFQuq_I_pK1o7UrmqpnNIqyZeAUrQQvli2Eun3kVnQVQWCW
+cOfyqGuD9m2VQOEL0zYZZr80Z1BuI4CMSg_ZjJIlNi10AzfzAOQp4tP3ap7IFJnK_VDe6-hOomv0bakhlVgOpkPQ6riJkcvZE3i4wyG6bYyTs4SHY3_L1d0V
+5OZZDONr_Gvxh1EQcoJmiJ3sDu9dkYTcao_VsbJNJSrdMleHIcGRW_OZ5azqEG6ftdcV0h4i0V7xkak3BKHmgM3VxRJv8tLpK0YmPe-MphS-oh2owdKFjR3t
+LHczkldiX1_N2U87hmu96sck7QTgjej-PPAHTcWf0EZHgmSy2P_k7B0gG-vbMxZCNf6RMxrV3RWFxEenrPtoObcdT41L4D_KfGHreFD7LtyxgmM3uJuP3J3F
+QCTbDjU6w-WpRSJDQFbKAt4_MjpNhiJJgEQHNxIR2d4gKaW-HBy
+}
+
+AzureEntityColoring(AzureStorSimpleDataManager)
+!define AzureStorSimpleDataManager(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStorSimpleDataManager, AzureStorSimpleDataManager)
+!define AzureStorSimpleDataManager(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStorSimpleDataManager, AzureStorSimpleDataManager)
diff --git a/dist/Storage/AzureStorSimpleDataManager.svg b/dist/Storage/AzureStorSimpleDataManager.svg
new file mode 100644
index 00000000..4175a878
--- /dev/null
+++ b/dist/Storage/AzureStorSimpleDataManager.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="62pt" height="70pt" viewBox="0 0 62 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,76.470588%,87.843137%);fill-opacity:1;" d="M 20.761719 68.949219 L 20.761719 69.164063 L 20.976563 69.164063 Z M 20.761719 68.949219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(20%,60%,80%);fill-opacity:1;" d="M 6.113281 10.84375 L 6.113281 59.585938 C 6.113281 64.628906 17.136719 68.730469 30.574219 68.875 L 30.574219 19.84375 C 17.277344 19.84375 6.398438 15.882813 6.113281 10.84375 Z M 6.113281 10.84375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 31.140625 19.988281 L 30.574219 19.988281 L 30.574219 68.875 L 31.140625 68.875 C 45.148438 68.875 56.167969 64.773438 56.167969 59.585938 L 56.167969 10.628906 C 56.167969 15.957031 44.863281 19.988281 31.140625 19.988281 Z M 31.140625 19.988281 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 6.113281 10.773438 L 6.113281 11.058594 C 6.542969 15.957031 17.417969 19.988281 30.644531 19.988281 L 31.214844 19.988281 C 44.863281 19.988281 56.167969 15.957031 56.167969 10.773438 C 56.167969 6.8125 49.414063 3.429688 40.03125 2.203125 C 37.1875 1.773438 34.269531 1.554688 31.140625 1.554688 C 17.417969 1.484375 6.113281 5.730469 6.113281 10.773438 Z M 51.050781 10.339844 C 51.050781 11.5625 49.839844 12.644531 47.921875 13.507813 C 44.296875 15.308594 38.109375 16.386719 31.070313 16.386719 C 20.976563 16.386719 12.371094 14.085938 11.164063 10.917969 L 11.164063 10.195313 C 11.164063 6.8125 20.050781 4.078125 31.070313 4.078125 C 41.878906 4.21875 51.050781 6.957031 51.050781 10.339844 Z M 51.050781 10.339844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,73.333333%,25.882353%);fill-opacity:1;" d="M 51.050781 10.339844 C 51.050781 6.957031 41.878906 4.21875 31.140625 4.21875 C 41.878906 4.21875 51.050781 7.171875 51.050781 10.339844 Z M 31.285156 11.5625 C 24.8125 11.5625 19.054688 12.5 15.429688 14.011719 C 13.152344 13.21875 11.660156 12.210938 11.234375 10.988281 C 12.300781 14.15625 20.902344 16.460938 31.140625 16.460938 C 38.109375 16.460938 44.296875 15.234375 47.992188 13.582031 C 47.566406 13.722656 47.210938 13.867188 46.785156 14.15625 C 42.875 12.5 37.328125 11.5625 31.285156 11.5625 Z M 31.285156 11.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,20%);fill-opacity:1;" d="M 31.140625 4.21875 C 20.121094 4.21875 11.234375 6.957031 11.234375 10.339844 L 11.234375 11.058594 C 11.660156 12.285156 13.226563 13.21875 15.429688 14.085938 C 19.054688 12.570313 24.8125 11.636719 31.285156 11.636719 C 37.328125 11.636719 42.875 12.570313 46.640625 14.085938 C 47.070313 13.941406 47.425781 13.796875 47.851563 13.507813 C 49.699219 12.714844 50.980469 11.636719 50.980469 10.339844 C 51.050781 7.171875 41.878906 4.21875 31.140625 4.21875 Z M 31.140625 4.21875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(60.392157%,60.784314%,61.176471%);fill-opacity:1;" d="M 7.820313 37.484375 C 7.964844 37.699219 7.890625 37.914063 7.820313 38.132813 Z M 7.820313 37.484375 "/>
+<path style="fill-rule:nonzero;fill:rgb(48.627451%,48.235294%,48.235294%);fill-opacity:1;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 63.999042 58.497822 C 63.999042 57.998686 63.80126 57.901029 63.400202 57.70029 L 58.598488 56.197457 C 58.301815 56.0998 58.098538 56.002143 57.999647 55.698321 C 57.69748 54.900789 57.301915 54.000174 56.999748 53.202642 C 56.900857 52.89882 56.900857 52.600423 56.999748 52.302027 C 57.69748 50.799194 58.400706 49.301786 59.197329 47.798953 C 59.400605 47.397474 59.400605 47.099078 58.999546 46.800681 C 58.197429 45.997724 57.400806 45.297848 56.59869 44.402659 C 56.197631 43.898098 55.802067 43.898098 55.302117 44.299577 L 55.197732 44.402659 C 53.802268 45.102534 52.40131 45.80241 51.099244 46.502285 C 50.802571 46.599942 50.599294 46.697599 50.302621 46.502285 C 49.500504 46.100806 48.698387 45.80241 47.901764 45.498588 C 47.599597 45.400931 47.401815 45.200191 47.297429 44.798713 C 46.698589 43.198222 46.099748 41.597732 45.599798 40.002668 C 45.500907 39.698846 45.297631 39.498107 45.000958 39.498107 L 41.100252 39.498107 C 40.699194 39.498107 40.600302 39.601189 40.40252 40.002668 C 39.902571 41.597732 39.402621 43.198222 38.798286 44.798713 C 38.699395 45.102534 38.600504 45.297848 38.298337 45.400931 C 37.501714 45.699327 36.600706 46.100806 35.798589 46.399203 C 35.501915 46.502285 35.199748 46.502285 34.897581 46.399203 C 33.298841 45.60167 31.700101 44.901795 30.200252 44.098837 C 29.898085 44.00118 29.799194 44.00118 29.50252 44.20192 C 28.601512 45.102534 27.700504 46.100806 26.700605 47.001421 C 26.398438 47.299817 26.398438 47.500557 26.601714 47.798953 C 27.398337 49.301786 28.101563 50.799194 28.898185 52.302027 C 29.101462 52.600423 29.101462 52.89882 29.002571 53.202642 C 28.700403 54.000174 28.299345 54.700049 28.002671 55.497582 C 27.898286 55.89906 27.700504 56.0998 27.299446 56.197457 C 25.700706 56.799675 24.101966 57.401893 22.497732 57.901029 C 22.102167 57.998686 21.997782 58.199426 21.997782 58.497822 L 21.997782 62.398678 C 21.997782 62.800157 22.102167 63.000896 22.497732 63.098553 C 24.101966 63.597689 25.700706 64.199907 27.299446 64.699043 C 27.601613 64.802125 27.799395 64.899782 27.898286 65.301261 C 28.200454 66.098794 28.601512 66.901751 28.898185 67.699284 C 29.002571 67.99768 29.002571 68.301502 28.898185 68.599898 C 28.101563 70.200388 27.398337 71.800878 26.601714 73.401369 C 26.497329 73.602108 26.497329 73.797422 26.700605 73.998161 L 29.601411 76.900745 C 29.700302 76.998402 29.799194 77.199142 30.101361 76.998402 C 31.002369 76.499266 32.002268 76.00013 32.897782 75.500994 C 33.601008 75.202598 34.199849 74.801119 34.897581 74.497297 C 35.199748 74.39964 35.39753 74.301983 35.699698 74.497297 C 36.501815 74.898776 37.397329 75.202598 38.199446 75.500994 C 38.501613 75.598651 38.600504 75.799391 38.699395 76.097787 C 39.298236 77.698277 39.902571 79.40185 40.40252 81.00234 C 40.501411 81.300736 40.699194 81.501476 41.001361 81.501476 L 44.902067 81.501476 C 45.297631 81.501476 45.402016 81.300736 45.599798 81.00234 C 46.099748 79.40185 46.698589 77.80136 47.198538 76.20087 C 47.297429 75.902473 47.401815 75.701734 47.698488 75.598651 C 48.500605 75.300255 49.401613 74.898776 50.198236 74.60038 C 50.500403 74.497297 50.802571 74.497297 51.000353 74.60038 C 52.599093 75.397912 54.197833 76.097787 55.697681 76.900745 C 55.999849 76.998402 56.09874 76.998402 56.400907 76.797663 C 57.301915 75.902473 58.197429 74.898776 59.197329 73.998161 C 59.499496 73.699765 59.499496 73.602108 59.301714 73.200629 C 58.499597 71.697796 57.69748 70.097306 56.999748 68.599898 C 56.801966 68.301502 56.801966 67.99768 56.999748 67.699284 C 57.400806 66.901751 57.69748 66.098794 57.999647 65.301261 C 58.098538 64.997439 58.301815 64.802125 58.598488 64.699043 C 60.202722 64.10225 61.801462 63.500032 63.400202 63.000896 C 63.80126 62.897814 63.900151 62.702499 63.900151 62.301021 C 63.900151 60.90127 63.900151 59.702259 63.999042 58.497822 Z M 63.999042 58.497822 " transform="matrix(0.711009,0,0,0.719994,0,0.116275)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.058594 38.421875 C 34.625 37.914063 34.625 37.914063 35.054688 38.347656 C 37.898438 41.082031 37.824219 45.835938 34.910156 48.429688 C 32.847656 50.300781 29.507813 50.515625 27.089844 48.933594 C 26.945313 48.859375 26.804688 48.714844 26.664063 48.644531 C 25.242188 47.492188 24.316406 46.125 24.03125 44.324219 C 23.605469 42.019531 24.316406 40.003906 25.953125 38.347656 C 26.164063 38.132813 26.164063 38.058594 25.953125 37.84375 C 25.738281 37.628906 25.597656 37.410156 25.382813 37.195313 L 28.652344 37.195313 C 28.796875 37.195313 28.867188 37.269531 28.867188 37.410156 L 28.867188 40.652344 C 28.511719 40.292969 28.226563 40.074219 27.941406 39.789063 C 27.800781 39.644531 27.730469 39.570313 27.515625 39.789063 C 25.3125 41.660156 25.453125 45.332031 27.800781 47.058594 C 28.015625 47.058594 28.15625 47.203125 28.296875 47.277344 C 29.007813 47.78125 29.863281 47.996094 30.644531 47.996094 C 32.351563 47.925781 33.703125 47.277344 34.554688 45.691406 C 35.550781 43.820313 35.265625 41.660156 33.773438 40.074219 C 33.628906 39.933594 33.347656 39.789063 33.273438 39.5 C 33.203125 39.429688 33.203125 39.355469 33.273438 39.210938 C 33.558594 38.925781 33.84375 38.707031 34.058594 38.421875 Z M 34.058594 38.421875 "/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureStorage(m).png b/dist/Storage/AzureStorage(m).png
index 6351eee9..bf4979b8 100644
Binary files a/dist/Storage/AzureStorage(m).png and b/dist/Storage/AzureStorage(m).png differ
diff --git a/dist/Storage/AzureStorage(m).svg b/dist/Storage/AzureStorage(m).svg
index 502d9e33..e5429a44 100644
--- a/dist/Storage/AzureStorage(m).svg
+++ b/dist/Storage/AzureStorage(m).svg
@@ -1,6 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="60pt" viewBox="0 0 70 60" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 5.601563 22.398438 L 64.398438 22.398438 L 64.398438 37.800781 L 5.601563 37.800781 Z M 5.601563 22.398438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 7 L 64.398438 7 L 64.398438 16.800781 L 5.601563 16.800781 Z M 5.601563 7 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 43.398438 L 64.398438 43.398438 L 64.398438 46.199219 L 5.601563 46.199219 Z M 5.601563 43.398438 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 22.398438 L 64.398438 22.398438 L 64.398438 25.199219 L 5.601563 25.199219 Z M 5.601563 22.398438 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 0 7 L 0 66.769531 C 0 68.46875 1.378906 69.859375 3.0625 69.859375 L 11.199219 69.859375 L 56 7 Z M 0 7 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 59.921875 23.582031 L 55.300781 23.582031 L 55.300781 2.09375 C 55.300781 0.976563 54.320313 0 53.199219 0 L 2.101563 0 C 0.980469 0 0 0.976563 0 2.09375 L 0 44.929688 C 0 46.046875 0.980469 47.023438 2.101563 47.023438 L 31.078125 47.023438 L 38.640625 60.140625 L 59.78125 60.140625 L 70.28125 41.859375 Z M 41.019531 12.277344 L 51.238281 12.277344 L 51.238281 18.417969 L 41.019531 18.417969 Z M 51.238281 20.511719 L 51.238281 23.582031 L 41.019531 23.582031 L 41.019531 20.511719 Z M 28.699219 12.277344 L 38.921875 12.277344 L 38.921875 18.417969 L 28.699219 18.417969 Z M 28.699219 20.511719 L 38.921875 20.511719 L 38.921875 23.582031 L 38.640625 23.582031 L 36.820313 26.652344 L 28.558594 26.652344 L 28.558594 20.511719 Z M 28.699219 28.605469 L 35.699219 28.605469 L 32.199219 34.746094 L 28.699219 34.746094 Z M 31.078125 36.699219 L 28.699219 40.746094 L 28.699219 36.699219 Z M 14.421875 42.835938 L 4.199219 42.835938 L 4.199219 36.699219 L 14.421875 36.699219 Z M 14.421875 34.746094 L 4.199219 34.746094 L 4.199219 28.605469 L 14.421875 28.605469 Z M 14.421875 26.511719 L 4.199219 26.511719 L 4.199219 20.371094 L 14.421875 20.371094 Z M 14.421875 18.417969 L 4.199219 18.417969 L 4.199219 12.277344 L 14.421875 12.277344 Z M 26.738281 42.835938 L 16.519531 42.835938 L 16.519531 36.699219 L 26.738281 36.699219 Z M 26.738281 34.746094 L 16.519531 34.746094 L 16.519531 28.605469 L 26.738281 28.605469 Z M 26.738281 26.511719 L 16.519531 26.511719 L 16.519531 20.371094 L 26.738281 20.371094 Z M 26.738281 18.417969 L 16.519531 18.417969 L 16.519531 12.277344 L 26.738281 12.277344 Z M 28.699219 42.835938 L 28.699219 42.699219 Z M 28.699219 42.835938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 61.601563 70 L 8.398438 70 C 3.761719 70 0 66.238281 0 61.601563 L 0 7 L 70 7 L 70 61.601563 C 70 66.238281 66.238281 70 61.601563 70 Z M 61.601563 70 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 5.601563 43.398438 L 64.398438 43.398438 L 64.398438 64.398438 L 5.601563 64.398438 Z M 5.601563 43.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureStorage.png b/dist/Storage/AzureStorage.png
index e08214f0..dad59254 100644
Binary files a/dist/Storage/AzureStorage.png and b/dist/Storage/AzureStorage.png differ
diff --git a/dist/Storage/AzureStorage.puml b/dist/Storage/AzureStorage.puml
index 9238e378..cf33e27c 100644
--- a/dist/Storage/AzureStorage.puml
+++ b/dist/Storage/AzureStorage.puml
@@ -1,8 +1,7 @@
-sprite $AzureStorage [70x60/16z] {
-xTO5iW9138JXqKZV_xvFsU2J36vV6VeZlLjG1FEKqZR1ILhQWjFG8rG-bK-bbGM1xNA55gER3pfSAMdHD-xEa6Hauq5jflAfa1486IWP1TjblkRnqjk2mSr0
-kb6GNUQvxuMTx-K-bQmR7vk0_m-U9ok4GtYkKd1OFRQHsEKEgIk2myGgP-aJnowEqXm-ZmOLKBII5GCbM66CSAnICLP35S6OH7u3UkWF4Swc-R_21uyNXX8f
-VEHzBmKHnQam8dXSQOYfeuegOcHKcLFpeeFiSi6DCN0-pOBpzLJEpsZoDFXQSWayadmrS1O5i7j6HsHrLauXtLavI2ChdxLsJM5opigcdBMoeU3AyslRod7T
-MVaR
+sprite $AzureStorage [70x70/16z] {
+xTL70iCW34HH70GZ8jt_kkczKJoBjBzpU-uGVgH_osqw3PTisqufCnJVzblANrcq5w_3MUd97zMDC1HZAEOCnLygsbQvp_hVTBmlTokneiIMv57eL8IXoFie
+mb24eSZxAC9Gv7qKOIZIebJpXke8Gp66OivGl4VH9vLbjREYygHK3NKbTIabFIfdrDCB9JyAU1i530Nleu2Xu7qKC1Gm5BoF0eQ2zr4mekYDWY4bxvJpojxA
+5h55VVgfXv0lbJ74fX1qBk8nRD9vzsCnx18THmpJHbW3
 }
 
 AzureEntityColoring(AzureStorage)
diff --git a/dist/Storage/AzureStorage.svg b/dist/Storage/AzureStorage.svg
index 502d9e33..6ef375d4 100644
--- a/dist/Storage/AzureStorage.svg
+++ b/dist/Storage/AzureStorage.svg
@@ -1,6 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="60pt" viewBox="0 0 70 60" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 5.601563 22.398438 L 64.398438 22.398438 L 64.398438 37.800781 L 5.601563 37.800781 Z M 5.601563 22.398438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 7 L 64.398438 7 L 64.398438 16.800781 L 5.601563 16.800781 Z M 5.601563 7 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 43.398438 L 64.398438 43.398438 L 64.398438 46.199219 L 5.601563 46.199219 Z M 5.601563 43.398438 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 22.398438 L 64.398438 22.398438 L 64.398438 25.199219 L 5.601563 25.199219 Z M 5.601563 22.398438 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 0 7 L 0 66.769531 C 0 68.46875 1.378906 69.859375 3.0625 69.859375 L 11.199219 69.859375 L 56 7 Z M 0 7 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 59.921875 23.582031 L 55.300781 23.582031 L 55.300781 2.09375 C 55.300781 0.976563 54.320313 0 53.199219 0 L 2.101563 0 C 0.980469 0 0 0.976563 0 2.09375 L 0 44.929688 C 0 46.046875 0.980469 47.023438 2.101563 47.023438 L 31.078125 47.023438 L 38.640625 60.140625 L 59.78125 60.140625 L 70.28125 41.859375 Z M 41.019531 12.277344 L 51.238281 12.277344 L 51.238281 18.417969 L 41.019531 18.417969 Z M 51.238281 20.511719 L 51.238281 23.582031 L 41.019531 23.582031 L 41.019531 20.511719 Z M 28.699219 12.277344 L 38.921875 12.277344 L 38.921875 18.417969 L 28.699219 18.417969 Z M 28.699219 20.511719 L 38.921875 20.511719 L 38.921875 23.582031 L 38.640625 23.582031 L 36.820313 26.652344 L 28.558594 26.652344 L 28.558594 20.511719 Z M 28.699219 28.605469 L 35.699219 28.605469 L 32.199219 34.746094 L 28.699219 34.746094 Z M 31.078125 36.699219 L 28.699219 40.746094 L 28.699219 36.699219 Z M 14.421875 42.835938 L 4.199219 42.835938 L 4.199219 36.699219 L 14.421875 36.699219 Z M 14.421875 34.746094 L 4.199219 34.746094 L 4.199219 28.605469 L 14.421875 28.605469 Z M 14.421875 26.511719 L 4.199219 26.511719 L 4.199219 20.371094 L 14.421875 20.371094 Z M 14.421875 18.417969 L 4.199219 18.417969 L 4.199219 12.277344 L 14.421875 12.277344 Z M 26.738281 42.835938 L 16.519531 42.835938 L 16.519531 36.699219 L 26.738281 36.699219 Z M 26.738281 34.746094 L 16.519531 34.746094 L 16.519531 28.605469 L 26.738281 28.605469 Z M 26.738281 26.511719 L 16.519531 26.511719 L 16.519531 20.371094 L 26.738281 20.371094 Z M 26.738281 18.417969 L 16.519531 18.417969 L 16.519531 12.277344 L 26.738281 12.277344 Z M 28.699219 42.835938 L 28.699219 42.699219 Z M 28.699219 42.835938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 61.601563 70 L 8.398438 70 C 3.761719 70 0 66.238281 0 61.601563 L 0 7 L 70 7 L 70 61.601563 C 70 66.238281 66.238281 70 61.601563 70 Z M 61.601563 70 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 5.601563 43.398438 L 64.398438 43.398438 L 64.398438 64.398438 L 5.601563 64.398438 Z M 5.601563 43.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
 </g>
 </svg>
diff --git a/dist/Storage/AzureStorageAccountClassic(m).png b/dist/Storage/AzureStorageAccountClassic(m).png
new file mode 100644
index 00000000..f6417c35
Binary files /dev/null and b/dist/Storage/AzureStorageAccountClassic(m).png differ
diff --git a/dist/Storage/AzureStorageAccountClassic(m).svg b/dist/Storage/AzureStorageAccountClassic(m).svg
new file mode 100644
index 00000000..025b2c67
--- /dev/null
+++ b/dist/Storage/AzureStorageAccountClassic(m).svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 0 63.140625 C 0 64.539063 1.121094 65.800781 2.519531 65.800781 L 67.339844 65.800781 C 68.738281 65.800781 70 64.679688 70 63.140625 L 70 16.800781 L 0 16.800781 Z M 0 63.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 67.339844 5.738281 L 2.519531 5.738281 C 1.121094 5.738281 0 7 0 8.398438 L 0 16.800781 L 70 16.800781 L 70 8.398438 C 70 7 68.878906 6.160156 67.339844 6.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 5.601563 35.699219 L 64.398438 35.699219 L 64.398438 45.5 L 5.601563 45.5 Z M 5.601563 35.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 21 L 64.398438 21 L 64.398438 30.800781 L 5.601563 30.800781 Z M 5.601563 21 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 5.601563 50.398438 L 64.398438 50.398438 L 64.398438 60.199219 L 5.601563 60.199219 Z M 5.601563 50.398438 "/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureStorageAccountClassic.png b/dist/Storage/AzureStorageAccountClassic.png
new file mode 100644
index 00000000..dea768de
Binary files /dev/null and b/dist/Storage/AzureStorageAccountClassic.png differ
diff --git a/dist/Storage/AzureStorageAccountClassic.puml b/dist/Storage/AzureStorageAccountClassic.puml
new file mode 100644
index 00000000..d921a096
--- /dev/null
+++ b/dist/Storage/AzureStorageAccountClassic.puml
@@ -0,0 +1,8 @@
+sprite $AzureStorageAccountClassic [70x70/16z] {
+xTIt0GCn3CLGaihI_lkwS-N8SF6_0L22Ge5OCP6CPJMRzELWplKxWE6YlWUPrCIbmeeAAgYy1qslFlMbDfKLL52PQgD-0QshxNe6L51fGwtNQohL0tjaX8ZD
+w88U
+}
+
+AzureEntityColoring(AzureStorageAccountClassic)
+!define AzureStorageAccountClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStorageAccountClassic, AzureStorageAccountClassic)
+!define AzureStorageAccountClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStorageAccountClassic, AzureStorageAccountClassic)
diff --git a/dist/Storage/AzureStorageAccountClassic.svg b/dist/Storage/AzureStorageAccountClassic.svg
new file mode 100644
index 00000000..468971d6
--- /dev/null
+++ b/dist/Storage/AzureStorageAccountClassic.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 0 63.140625 C 0 64.539063 1.121094 65.800781 2.519531 65.800781 L 67.339844 65.800781 C 68.738281 65.800781 70 64.679688 70 63.140625 L 70 16.800781 L 0 16.800781 Z M 0 63.140625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 67.339844 5.738281 L 2.519531 5.738281 C 1.121094 5.738281 0 7 0 8.398438 L 0 16.800781 L 70 16.800781 L 70 8.398438 C 70 7 68.878906 6.160156 67.339844 6.160156 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 5.601563 35.699219 L 64.398438 35.699219 L 64.398438 45.5 L 5.601563 45.5 Z M 5.601563 35.699219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 21 L 64.398438 21 L 64.398438 30.800781 L 5.601563 30.800781 Z M 5.601563 21 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 5.601563 50.398438 L 64.398438 50.398438 L 64.398438 60.199219 L 5.601563 60.199219 Z M 5.601563 50.398438 "/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureStorageExplorer(m).png b/dist/Storage/AzureStorageExplorer(m).png
new file mode 100644
index 00000000..1a0a4bdd
Binary files /dev/null and b/dist/Storage/AzureStorageExplorer(m).png differ
diff --git a/dist/Storage/AzureStorageExplorer(m).svg b/dist/Storage/AzureStorageExplorer(m).svg
new file mode 100644
index 00000000..3b58c35b
--- /dev/null
+++ b/dist/Storage/AzureStorageExplorer(m).svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 1.398438 1.398438 L 26.601563 1.398438 L 26.601563 15.398438 L 1.398438 15.398438 Z M 1.398438 1.398438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 51.800781 26.601563 L 51.800781 12.601563 L 65.800781 12.601563 Z M 37.800781 40.601563 L 46.199219 32.199219 L 37.800781 32.199219 Z M 23.800781 43.398438 L 23.800781 54.601563 L 35 43.398438 Z M 9.800781 54.601563 L 9.800781 68.601563 L 23.800781 54.601563 Z M 46.199219 26.601563 L 26.601563 26.601563 L 26.601563 15.398438 L 46.199219 15.398438 Z M 26.601563 15.398438 L 1.398438 15.398438 L 1.398438 1.398438 L 26.601563 1.398438 Z M 26.601563 37.800781 L 9.800781 37.800781 L 9.800781 26.601563 L 26.601563 26.601563 Z M 15.398438 49 L 4.199219 49 L 4.199219 40.601563 L 15.398438 40.601563 Z M 15.398438 49 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 65.800781 46.199219 L 65.800781 65.800781 L 12.601563 65.800781 L 12.601563 57.398438 L 40.601563 57.398438 L 40.601563 46.199219 Z M 46.199219 15.398438 L 26.601563 15.398438 L 26.601563 26.601563 L 46.199219 26.601563 Z M 26.601563 1.398438 L 1.398438 1.398438 L 1.398438 15.398438 L 26.601563 15.398438 Z M 26.601563 26.601563 L 9.800781 26.601563 L 9.800781 37.800781 L 26.601563 37.800781 Z M 15.398438 40.601563 L 4.199219 40.601563 L 4.199219 49 L 15.398438 49 Z M 15.398438 40.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 65.800781 23.800781 L 65.800781 43.398438 L 40.601563 43.398438 L 40.601563 35 L 54.601563 35 L 54.601563 23.800781 Z M 37.800781 46.199219 L 26.601563 46.199219 L 26.601563 54.601563 L 37.800781 54.601563 Z M 37.800781 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 51.800781 21 L 51.800781 32.199219 L 37.800781 32.199219 L 37.800781 43.398438 L 23.800781 43.398438 L 23.800781 54.601563 L 9.800781 54.601563 L 9.800781 66.5 C 9.800781 67.660156 10.738281 68.601563 11.898438 68.601563 L 66.5 68.601563 C 67.660156 68.601563 68.601563 67.660156 68.601563 66.5 L 68.601563 21 Z M 40.601563 35 L 51.800781 35 L 51.800781 43.398438 L 40.601563 43.398438 Z M 51.800781 54.601563 L 40.601563 54.601563 L 40.601563 46.199219 L 51.800781 46.199219 Z M 26.601563 46.199219 L 37.800781 46.199219 L 37.800781 54.601563 L 26.601563 54.601563 Z M 23.800781 65.800781 L 12.601563 65.800781 L 12.601563 57.398438 L 23.800781 57.398438 Z M 37.800781 65.800781 L 26.601563 65.800781 L 26.601563 57.398438 L 37.800781 57.398438 Z M 51.800781 65.800781 L 40.601563 65.800781 L 40.601563 57.398438 L 51.800781 57.398438 Z M 65.800781 65.800781 L 54.601563 65.800781 L 54.601563 57.398438 L 65.800781 57.398438 Z M 65.800781 54.601563 L 54.601563 54.601563 L 54.601563 46.199219 L 65.800781 46.199219 Z M 65.800781 43.398438 L 54.601563 43.398438 L 54.601563 35 L 65.800781 35 Z M 54.601563 32.199219 L 54.601563 23.800781 L 65.800781 23.800781 L 65.800781 32.199219 Z M 54.601563 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 68.601563 21 L 51.800781 21 L 51.800781 12.601563 L 66.5 12.601563 C 67.660156 12.601563 68.601563 13.539063 68.601563 14.699219 Z M 68.601563 21 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureStorageExplorer.png b/dist/Storage/AzureStorageExplorer.png
new file mode 100644
index 00000000..7dbdec1f
Binary files /dev/null and b/dist/Storage/AzureStorageExplorer.png differ
diff --git a/dist/Storage/AzureStorageExplorer.puml b/dist/Storage/AzureStorageExplorer.puml
new file mode 100644
index 00000000..6fbc24c9
--- /dev/null
+++ b/dist/Storage/AzureStorageExplorer.puml
@@ -0,0 +1,9 @@
+sprite $AzureStorageExplorer [70x70/16z] {
+xT07ieCm34LHDpqZsFzwVtLG12EQqfCx5MmVbt2PCepA7WMTKNqvvQDybAJAyPXIk_EOYrzXvYw4J3jACuL_2tQ9vvMfmfTG-18ANqBXIoZiK-WlI8SLu66K
+8D5H1J2LD2dNUNbDYJof1gCBAnybdog_0IWIDYlq7unsAV0hKG8G9TgX5FDrBwkiHqINKB2kHCbGi46fF4QFg2GLGEeBILfIQ0phhIjmAkct_DTnfUZN7QGA
+319TL4bvB1vLT2-iu18AGFghbohGIqg9T1vsP2hmAkBehohfhvd2__N3q0DraEJBVbrH6k9J6k9K6k9K6k9K6k9K6k9K6k9IL02sVmM9S3GAKgAZI0oNwHi
+}
+
+AzureEntityColoring(AzureStorageExplorer)
+!define AzureStorageExplorer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStorageExplorer, AzureStorageExplorer)
+!define AzureStorageExplorer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStorageExplorer, AzureStorageExplorer)
diff --git a/dist/Storage/AzureStorageExplorer.svg b/dist/Storage/AzureStorageExplorer.svg
new file mode 100644
index 00000000..4503ce35
--- /dev/null
+++ b/dist/Storage/AzureStorageExplorer.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 1.398438 1.398438 L 26.601563 1.398438 L 26.601563 15.398438 L 1.398438 15.398438 Z M 1.398438 1.398438 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 51.800781 26.601563 L 51.800781 12.601563 L 65.800781 12.601563 Z M 37.800781 40.601563 L 46.199219 32.199219 L 37.800781 32.199219 Z M 23.800781 43.398438 L 23.800781 54.601563 L 35 43.398438 Z M 9.800781 54.601563 L 9.800781 68.601563 L 23.800781 54.601563 Z M 46.199219 26.601563 L 26.601563 26.601563 L 26.601563 15.398438 L 46.199219 15.398438 Z M 26.601563 15.398438 L 1.398438 15.398438 L 1.398438 1.398438 L 26.601563 1.398438 Z M 26.601563 37.800781 L 9.800781 37.800781 L 9.800781 26.601563 L 26.601563 26.601563 Z M 15.398438 49 L 4.199219 49 L 4.199219 40.601563 L 15.398438 40.601563 Z M 15.398438 49 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 65.800781 46.199219 L 65.800781 65.800781 L 12.601563 65.800781 L 12.601563 57.398438 L 40.601563 57.398438 L 40.601563 46.199219 Z M 46.199219 15.398438 L 26.601563 15.398438 L 26.601563 26.601563 L 46.199219 26.601563 Z M 26.601563 1.398438 L 1.398438 1.398438 L 1.398438 15.398438 L 26.601563 15.398438 Z M 26.601563 26.601563 L 9.800781 26.601563 L 9.800781 37.800781 L 26.601563 37.800781 Z M 15.398438 40.601563 L 4.199219 40.601563 L 4.199219 49 L 15.398438 49 Z M 15.398438 40.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 65.800781 23.800781 L 65.800781 43.398438 L 40.601563 43.398438 L 40.601563 35 L 54.601563 35 L 54.601563 23.800781 Z M 37.800781 46.199219 L 26.601563 46.199219 L 26.601563 54.601563 L 37.800781 54.601563 Z M 37.800781 46.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 51.800781 21 L 51.800781 32.199219 L 37.800781 32.199219 L 37.800781 43.398438 L 23.800781 43.398438 L 23.800781 54.601563 L 9.800781 54.601563 L 9.800781 66.5 C 9.800781 67.660156 10.738281 68.601563 11.898438 68.601563 L 66.5 68.601563 C 67.660156 68.601563 68.601563 67.660156 68.601563 66.5 L 68.601563 21 Z M 40.601563 35 L 51.800781 35 L 51.800781 43.398438 L 40.601563 43.398438 Z M 51.800781 54.601563 L 40.601563 54.601563 L 40.601563 46.199219 L 51.800781 46.199219 Z M 26.601563 46.199219 L 37.800781 46.199219 L 37.800781 54.601563 L 26.601563 54.601563 Z M 23.800781 65.800781 L 12.601563 65.800781 L 12.601563 57.398438 L 23.800781 57.398438 Z M 37.800781 65.800781 L 26.601563 65.800781 L 26.601563 57.398438 L 37.800781 57.398438 Z M 51.800781 65.800781 L 40.601563 65.800781 L 40.601563 57.398438 L 51.800781 57.398438 Z M 65.800781 65.800781 L 54.601563 65.800781 L 54.601563 57.398438 L 65.800781 57.398438 Z M 65.800781 54.601563 L 54.601563 54.601563 L 54.601563 46.199219 L 65.800781 46.199219 Z M 65.800781 43.398438 L 54.601563 43.398438 L 54.601563 35 L 65.800781 35 Z M 54.601563 32.199219 L 54.601563 23.800781 L 65.800781 23.800781 L 65.800781 32.199219 Z M 54.601563 32.199219 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 68.601563 21 L 51.800781 21 L 51.800781 12.601563 L 66.5 12.601563 C 67.660156 12.601563 68.601563 13.539063 68.601563 14.699219 Z M 68.601563 21 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureStorageSyncService(m).png b/dist/Storage/AzureStorageSyncService(m).png
new file mode 100644
index 00000000..27873dc5
Binary files /dev/null and b/dist/Storage/AzureStorageSyncService(m).png differ
diff --git a/dist/Storage/AzureStorageSyncService(m).svg b/dist/Storage/AzureStorageSyncService(m).svg
new file mode 100644
index 00000000..d814ecca
--- /dev/null
+++ b/dist/Storage/AzureStorageSyncService(m).svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 11.828125 27.945313 C 11.503906 26.914063 11.320313 25.84375 11.320313 24.695313 C 11.320313 18.121094 17.28125 12.804688 24.597656 12.804688 C 28.589844 12.804688 32.167969 14.390625 34.59375 16.871094 C 37.277344 10.378906 44.273438 5.734375 52.511719 5.734375 C 54.632813 5.734375 56.667969 6.054688 58.574219 6.625 C 55.558594 2.710938 50.5 0.140625 44.761719 0.140625 C 37.546875 0.140625 31.417969 4.207031 29.066406 9.894531 C 26.941406 7.722656 23.808594 6.332031 20.3125 6.332031 C 13.902344 6.332031 8.679688 10.992188 8.679688 16.75 C 8.679688 17.757813 8.839844 18.695313 9.125 19.597656 C 3.890625 21.324219 0.140625 25.835938 0.140625 31.121094 C 0.140625 33.441406 0.871094 35.601563 2.121094 37.453125 C 3.449219 33.054688 7.105469 29.503906 11.828125 27.945313 Z M 11.828125 27.945313 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 53.199219 21.699219 L 22.398438 21 L 22.398438 17.414063 C 22.398438 16.503906 21.324219 16.023438 20.648438 16.632813 L 11.207031 24.5 L 20.648438 32.367188 C 21.324219 32.972656 22.398438 32.492188 22.398438 31.585938 L 22.398438 28 L 29.398438 28 L 29.398438 65.972656 C 29.398438 67.421875 30.589844 68.601563 32.0625 68.601563 L 53.199219 68.601563 C 54.667969 68.601563 55.859375 67.421875 55.859375 65.972656 L 55.859375 24.328125 C 55.859375 22.878906 54.667969 21.699219 53.199219 21.699219 Z M 29.398438 22.398438 L 29.722656 22.398438 C 29.523438 22.769531 29.398438 23.183594 29.398438 23.628906 Z M 29.398438 22.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 40.601563 44.800781 L 29.328125 44.800781 L 29.328125 39.199219 L 28 39.199219 L 29.398438 37.800781 L 40.601563 37.800781 L 40.601563 34.214844 C 40.601563 33.304688 41.675781 32.824219 42.351563 33.433594 L 51.792969 41.300781 L 42.351563 49.167969 C 41.675781 49.773438 40.601563 49.292969 40.601563 48.386719 Z M 40.601563 44.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 60.6875 19.574219 C 61.207031 18.136719 61.492188 16.605469 61.492188 15.011719 C 61.492188 6.796875 54.003906 0.140625 44.761719 0.140625 C 37.546875 0.140625 31.414063 4.207031 29.066406 9.894531 C 26.941406 7.722656 23.808594 6.332031 20.308594 6.332031 C 13.898438 6.332031 8.675781 10.992188 8.675781 16.75 C 8.675781 17.757813 8.839844 18.695313 9.125 19.597656 C 3.890625 21.324219 0.140625 25.835938 0.140625 31.121094 C 0.140625 37.894531 6.273438 43.398438 13.847656 43.398438 L 56.148438 43.398438 C 63.742188 43.398438 69.859375 37.902344 69.859375 31.121094 C 69.878906 25.773438 66.042969 21.242188 60.6875 19.574219 Z M 60.6875 19.574219 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 56 67.371094 C 56 68.824219 54.808594 70 53.339844 70 L 32.0625 70 C 30.589844 70 29.398438 68.824219 29.398438 67.371094 L 29.398438 25.027344 C 29.398438 23.578125 30.589844 22.398438 32.0625 22.398438 L 53.339844 22.398438 C 54.808594 22.398438 56 23.578125 56 25.027344 Z M 56 67.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 32.269531 62.148438 C 32.269531 60.300781 33.773438 58.800781 35.632813 58.800781 L 49.628906 58.800781 C 51.484375 58.800781 52.988281 60.300781 52.988281 62.148438 C 52.988281 64 51.484375 65.5 49.628906 65.5 L 35.632813 65.5 C 33.773438 65.5 32.269531 64 32.269531 62.148438 Z M 32.269531 62.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 38.203125 62.148438 C 38.203125 63.394531 37.199219 64.398438 35.953125 64.398438 C 34.710938 64.398438 33.703125 63.394531 33.703125 62.148438 C 33.703125 60.90625 34.710938 59.902344 35.953125 59.902344 C 37.199219 59.902344 38.203125 60.90625 38.203125 62.148438 Z M 38.203125 62.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 32.269531 52.351563 C 32.269531 50.5 33.773438 49 35.632813 49 L 49.628906 49 C 51.484375 49 52.988281 50.5 52.988281 52.351563 C 52.988281 54.199219 51.484375 55.699219 49.628906 55.699219 L 35.632813 55.699219 C 33.773438 55.699219 32.269531 54.199219 32.269531 52.351563 Z M 32.269531 52.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 38.203125 52.351563 C 38.203125 53.59375 37.199219 54.601563 35.953125 54.601563 C 34.710938 54.601563 33.703125 53.59375 33.703125 52.351563 C 33.703125 51.109375 34.710938 50.101563 35.953125 50.101563 C 37.199219 50.101563 38.203125 51.109375 38.203125 52.351563 Z M 38.203125 52.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 32.269531 30.101563 C 32.269531 28.25 33.773438 26.75 35.632813 26.75 L 49.628906 26.75 C 51.484375 26.75 52.988281 28.25 52.988281 30.101563 C 52.988281 31.949219 51.484375 33.449219 49.628906 33.449219 L 35.632813 33.449219 C 33.773438 33.453125 32.269531 31.949219 32.269531 30.101563 Z M 32.269531 30.101563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 38.203125 30.101563 C 38.203125 31.34375 37.199219 32.351563 35.953125 32.351563 C 34.710938 32.351563 33.703125 31.34375 33.703125 30.101563 C 33.703125 28.859375 34.710938 27.851563 35.953125 27.851563 C 37.199219 27.851563 38.203125 28.859375 38.203125 30.101563 Z M 38.203125 30.101563 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 26.53125 43.398438 L 41.929688 43.398438 L 41.929688 47.601563 L 49.628906 41.300781 L 41.929688 35 L 41.929688 39.199219 L 26.53125 39.199219 Z M 26.53125 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 36.398438 22.398438 L 21 22.398438 L 21 18.199219 L 13.300781 24.5 L 21 30.800781 L 21 26.601563 L 36.398438 26.601563 Z M 36.398438 22.398438 "/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureStorageSyncService.png b/dist/Storage/AzureStorageSyncService.png
new file mode 100644
index 00000000..1a622c8b
Binary files /dev/null and b/dist/Storage/AzureStorageSyncService.png differ
diff --git a/dist/Storage/AzureStorageSyncService.puml b/dist/Storage/AzureStorageSyncService.puml
new file mode 100644
index 00000000..c69a9232
--- /dev/null
+++ b/dist/Storage/AzureStorageSyncService.puml
@@ -0,0 +1,12 @@
+sprite $AzureStorageSyncService [70x70/16z] {
+rTK7UjmW443XwUgw_t63bos8GSb0-alSvTzy8yH2C6Hvn0YZ8MkHu90XMZJei3PYw4kqcOmZSGQ9cGbl4FiaaPl1a297575ea0JWZRBO39XBn2SHfCoQWO-x
+4IE7O2VIdYytVkb7YZh56H_8kXL_fLfSmTkrVqSHftmGHHHpXHHu8u9CGOLk5KQPemfM1dyGNPQeObewz1ujeIr9GShnAtdKs0tY7g14qxoawWseLSA5WnKY
+o0a9vQR3dvETbt1JmLoUGcFK8KK0of49olouv5LCCKJLWj4y6SASfC_NuwpQdS9K8byCJKbXowNBZzrqSSnLKQct0A4j96zbErL4zYjJAoQ5aMFKKZaajLwL
+jQrOcI1-bFMSHFI8hCMkAUbdBdlwonMoEOKBnBUarltHkkwvRLsSGXNYbTmC8FFTVb48AXCmqdoZ4B055LN4gQq0W4OLIuor54eA1az4VLolNX7uYcuLbIBx
+Ya7cIX78eSKJfFcYCBoJ3WQeK9IW2AEEbcj9HXqIIvasv_8wcfMP81RLzuX1bXn1E9xVJQ3vxEbNnE_TSSK_H-CAS4A6bMq_Klkwfe_vim5bFzARE-lwbFQv
+swsqNmEwbTFywr7_N8vzicefUxVYHdiU-pAW-FvtPJkgjW7bEEPf-zbxj9uceljVshlZQncVo_Wz-YlxXN-9GlSAGZoxGnGkVGC
+}
+
+AzureEntityColoring(AzureStorageSyncService)
+!define AzureStorageSyncService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStorageSyncService, AzureStorageSyncService)
+!define AzureStorageSyncService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStorageSyncService, AzureStorageSyncService)
diff --git a/dist/Storage/AzureStorageSyncService.svg b/dist/Storage/AzureStorageSyncService.svg
new file mode 100644
index 00000000..e0a467cc
--- /dev/null
+++ b/dist/Storage/AzureStorageSyncService.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 11.828125 27.945313 C 11.503906 26.914063 11.320313 25.84375 11.320313 24.695313 C 11.320313 18.121094 17.28125 12.804688 24.597656 12.804688 C 28.589844 12.804688 32.167969 14.390625 34.59375 16.871094 C 37.277344 10.378906 44.273438 5.734375 52.511719 5.734375 C 54.632813 5.734375 56.667969 6.054688 58.574219 6.625 C 55.558594 2.710938 50.5 0.140625 44.761719 0.140625 C 37.546875 0.140625 31.417969 4.207031 29.066406 9.894531 C 26.941406 7.722656 23.808594 6.332031 20.3125 6.332031 C 13.902344 6.332031 8.679688 10.992188 8.679688 16.75 C 8.679688 17.757813 8.839844 18.695313 9.125 19.597656 C 3.890625 21.324219 0.140625 25.835938 0.140625 31.121094 C 0.140625 33.441406 0.871094 35.601563 2.121094 37.453125 C 3.449219 33.054688 7.105469 29.503906 11.828125 27.945313 Z M 11.828125 27.945313 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 53.199219 21.699219 L 22.398438 21 L 22.398438 17.414063 C 22.398438 16.503906 21.324219 16.023438 20.648438 16.632813 L 11.207031 24.5 L 20.648438 32.367188 C 21.324219 32.972656 22.398438 32.492188 22.398438 31.585938 L 22.398438 28 L 29.398438 28 L 29.398438 65.972656 C 29.398438 67.421875 30.589844 68.601563 32.0625 68.601563 L 53.199219 68.601563 C 54.667969 68.601563 55.859375 67.421875 55.859375 65.972656 L 55.859375 24.328125 C 55.859375 22.878906 54.667969 21.699219 53.199219 21.699219 Z M 29.398438 22.398438 L 29.722656 22.398438 C 29.523438 22.769531 29.398438 23.183594 29.398438 23.628906 Z M 29.398438 22.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 40.601563 44.800781 L 29.328125 44.800781 L 29.328125 39.199219 L 28 39.199219 L 29.398438 37.800781 L 40.601563 37.800781 L 40.601563 34.214844 C 40.601563 33.304688 41.675781 32.824219 42.351563 33.433594 L 51.792969 41.300781 L 42.351563 49.167969 C 41.675781 49.773438 40.601563 49.292969 40.601563 48.386719 Z M 40.601563 44.800781 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 60.6875 19.574219 C 61.207031 18.136719 61.492188 16.605469 61.492188 15.011719 C 61.492188 6.796875 54.003906 0.140625 44.761719 0.140625 C 37.546875 0.140625 31.414063 4.207031 29.066406 9.894531 C 26.941406 7.722656 23.808594 6.332031 20.308594 6.332031 C 13.898438 6.332031 8.675781 10.992188 8.675781 16.75 C 8.675781 17.757813 8.839844 18.695313 9.125 19.597656 C 3.890625 21.324219 0.140625 25.835938 0.140625 31.121094 C 0.140625 37.894531 6.273438 43.398438 13.847656 43.398438 L 56.148438 43.398438 C 63.742188 43.398438 69.859375 37.902344 69.859375 31.121094 C 69.878906 25.773438 66.042969 21.242188 60.6875 19.574219 Z M 60.6875 19.574219 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 56 67.371094 C 56 68.824219 54.808594 70 53.339844 70 L 32.0625 70 C 30.589844 70 29.398438 68.824219 29.398438 67.371094 L 29.398438 25.027344 C 29.398438 23.578125 30.589844 22.398438 32.0625 22.398438 L 53.339844 22.398438 C 54.808594 22.398438 56 23.578125 56 25.027344 Z M 56 67.371094 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 32.269531 62.148438 C 32.269531 60.300781 33.773438 58.800781 35.632813 58.800781 L 49.628906 58.800781 C 51.484375 58.800781 52.988281 60.300781 52.988281 62.148438 C 52.988281 64 51.484375 65.5 49.628906 65.5 L 35.632813 65.5 C 33.773438 65.5 32.269531 64 32.269531 62.148438 Z M 32.269531 62.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 38.203125 62.148438 C 38.203125 63.394531 37.199219 64.398438 35.953125 64.398438 C 34.710938 64.398438 33.703125 63.394531 33.703125 62.148438 C 33.703125 60.90625 34.710938 59.902344 35.953125 59.902344 C 37.199219 59.902344 38.203125 60.90625 38.203125 62.148438 Z M 38.203125 62.148438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 32.269531 52.351563 C 32.269531 50.5 33.773438 49 35.632813 49 L 49.628906 49 C 51.484375 49 52.988281 50.5 52.988281 52.351563 C 52.988281 54.199219 51.484375 55.699219 49.628906 55.699219 L 35.632813 55.699219 C 33.773438 55.699219 32.269531 54.199219 32.269531 52.351563 Z M 32.269531 52.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 38.203125 52.351563 C 38.203125 53.59375 37.199219 54.601563 35.953125 54.601563 C 34.710938 54.601563 33.703125 53.59375 33.703125 52.351563 C 33.703125 51.109375 34.710938 50.101563 35.953125 50.101563 C 37.199219 50.101563 38.203125 51.109375 38.203125 52.351563 Z M 38.203125 52.351563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 32.269531 30.101563 C 32.269531 28.25 33.773438 26.75 35.632813 26.75 L 49.628906 26.75 C 51.484375 26.75 52.988281 28.25 52.988281 30.101563 C 52.988281 31.949219 51.484375 33.449219 49.628906 33.449219 L 35.632813 33.449219 C 33.773438 33.453125 32.269531 31.949219 32.269531 30.101563 Z M 32.269531 30.101563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 38.203125 30.101563 C 38.203125 31.34375 37.199219 32.351563 35.953125 32.351563 C 34.710938 32.351563 33.703125 31.34375 33.703125 30.101563 C 33.703125 28.859375 34.710938 27.851563 35.953125 27.851563 C 37.199219 27.851563 38.203125 28.859375 38.203125 30.101563 Z M 38.203125 30.101563 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 26.53125 43.398438 L 41.929688 43.398438 L 41.929688 47.601563 L 49.628906 41.300781 L 41.929688 35 L 41.929688 39.199219 L 26.53125 39.199219 Z M 26.53125 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 36.398438 22.398438 L 21 22.398438 L 21 18.199219 L 13.300781 24.5 L 21 30.800781 L 21 26.601563 L 36.398438 26.601563 Z M 36.398438 22.398438 "/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureTableStorage(m).png b/dist/Storage/AzureTableStorage(m).png
new file mode 100644
index 00000000..e6ad885f
Binary files /dev/null and b/dist/Storage/AzureTableStorage(m).png differ
diff --git a/dist/Storage/AzureTableStorage(m).svg b/dist/Storage/AzureTableStorage(m).svg
new file mode 100644
index 00000000..f179a1b5
--- /dev/null
+++ b/dist/Storage/AzureTableStorage(m).svg
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.601563 9.800781 L 63 9.800781 L 63 25.199219 L 47.601563 25.199219 Z M 47.601563 9.800781 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.601563 9.800781 L 42 9.800781 L 42 25.199219 L 26.601563 25.199219 Z M 26.601563 9.800781 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 9.800781 L 21 9.800781 L 21 25.199219 L 5.601563 25.199219 Z M 5.601563 9.800781 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.601563 29.398438 L 63 29.398438 L 63 44.800781 L 47.601563 44.800781 Z M 47.601563 29.398438 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 29.398438 L 21 29.398438 L 21 44.800781 L 5.601563 44.800781 Z M 5.601563 29.398438 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.601563 49 L 63 49 L 63 51.800781 L 47.601563 51.800781 Z M 47.601563 49 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.601563 49 L 42 49 L 42 51.800781 L 26.601563 51.800781 Z M 26.601563 49 "/>
+</g>
+<mask id="mask7">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip8">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface26" clip-path="url(#clip8)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 49 L 21 49 L 21 51.800781 L 5.601563 51.800781 Z M 5.601563 49 "/>
+</g>
+<mask id="mask8">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip9">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface29" clip-path="url(#clip9)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 29.398438 L 21 29.398438 L 21 32.199219 L 5.601563 32.199219 Z M 5.601563 29.398438 "/>
+</g>
+<mask id="mask9">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip10">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface32" clip-path="url(#clip10)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.601563 29.398438 L 42 29.398438 L 42 32.199219 L 26.601563 32.199219 Z M 26.601563 29.398438 "/>
+</g>
+<mask id="mask10">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip11">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface35" clip-path="url(#clip11)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.601563 29.398438 L 63 29.398438 L 63 32.199219 L 47.601563 32.199219 Z M 47.601563 29.398438 "/>
+</g>
+<mask id="mask11">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip12">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface38" clip-path="url(#clip12)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.601563 9.800781 L 63 9.800781 L 63 12.601563 L 47.601563 12.601563 Z M 47.601563 9.800781 "/>
+</g>
+<mask id="mask12">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip13">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface41" clip-path="url(#clip13)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.601563 9.800781 L 42 9.800781 L 42 12.601563 L 26.601563 12.601563 Z M 26.601563 9.800781 "/>
+</g>
+<mask id="mask13">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip14">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface44" clip-path="url(#clip14)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 5.601563 9.800781 L 21 9.800781 L 21 12.601563 L 5.601563 12.601563 Z M 5.601563 9.800781 "/>
+</g>
+<mask id="mask14">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip15">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface47" clip-path="url(#clip15)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.398438 70 L 12.433594 70 L 58.792969 4.199219 L 8.398438 4.199219 C 3.761719 4.199219 0 7.960938 0 12.601563 L 0 61.601563 C 0 66.238281 3.761719 70 8.398438 70 Z M 8.398438 70 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 60.199219 4.199219 L 8.398438 4.199219 C 3.761719 4.199219 0 7.960938 0 12.601563 L 0 61.601563 C 0 66.238281 3.761719 70 8.398438 70 L 60.199219 70 C 64.839844 70 68.601563 66.238281 68.601563 61.601563 L 68.601563 12.601563 C 68.601563 7.960938 64.839844 4.199219 60.199219 4.199219 Z M 60.199219 4.199219 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 26.601563 29.398438 L 42 29.398438 L 42 44.800781 L 26.601563 44.800781 Z M 26.601563 29.398438 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 47.601563 49 L 63 49 L 63 64.398438 L 47.601563 64.398438 Z M 47.601563 49 "/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 26.601563 49 L 42 49 L 42 64.398438 L 26.601563 64.398438 Z M 26.601563 49 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 5.601563 49 L 21 49 L 21 64.398438 L 5.601563 64.398438 Z M 5.601563 49 "/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<use xlink:href="#surface26" mask="url(#mask7)"/>
+<use xlink:href="#surface29" mask="url(#mask8)"/>
+<use xlink:href="#surface32" mask="url(#mask9)"/>
+<use xlink:href="#surface35" mask="url(#mask10)"/>
+<use xlink:href="#surface38" mask="url(#mask11)"/>
+<use xlink:href="#surface41" mask="url(#mask12)"/>
+<use xlink:href="#surface44" mask="url(#mask13)"/>
+<use xlink:href="#surface47" mask="url(#mask14)"/>
+</g>
+</svg>
diff --git a/dist/Storage/AzureTableStorage.png b/dist/Storage/AzureTableStorage.png
new file mode 100644
index 00000000..32f6af92
Binary files /dev/null and b/dist/Storage/AzureTableStorage.png differ
diff --git a/dist/Storage/AzureTableStorage.puml b/dist/Storage/AzureTableStorage.puml
new file mode 100644
index 00000000..a3dad967
--- /dev/null
+++ b/dist/Storage/AzureTableStorage.puml
@@ -0,0 +1,10 @@
+sprite $AzureTableStorage [70x70/16z] {
+xTHNUWCn24LXfdWaBkn_lGdkDrsOftpw7rMEwo3VczQZTHq6xSVwQ7Ha-9bUEnjIp2ziYyYQZrp5kr6a-0D4zlHRUTYbnLeNXg32544Oej952ogW2zcANoyi
+36T_MRH_MfaLAwbuHSKhAbPIyHyhKFRDObmmvezAOZ8noKNo5V-rqXY2DcOUb3qgtqpClZ9u48PSPNHYzet1my9gAZOhc1NCIdA-CQc8k0n4aXKVg_ITQIpg
+YPsZzcdnKMahkrHMTgcihFzICGnNDXOLnyOkbOtfpnMhg9XNLBoYOXKLU4N5AYgpOg855SW1dWodSAdyUJ8Sie9vmYhINeuqUQSqQST1mj9VYkWY5xkcFmzs
+2My
+}
+
+AzureEntityColoring(AzureTableStorage)
+!define AzureTableStorage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTableStorage, AzureTableStorage)
+!define AzureTableStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTableStorage, AzureTableStorage)
diff --git a/dist/Storage/AzureTableStorage.svg b/dist/Storage/AzureTableStorage.svg
new file mode 100644
index 00000000..41273161
--- /dev/null
+++ b/dist/Storage/AzureTableStorage.svg
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.601563 9.800781 L 63 9.800781 L 63 25.199219 L 47.601563 25.199219 Z M 47.601563 9.800781 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.601563 9.800781 L 42 9.800781 L 42 25.199219 L 26.601563 25.199219 Z M 26.601563 9.800781 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 9.800781 L 21 9.800781 L 21 25.199219 L 5.601563 25.199219 Z M 5.601563 9.800781 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.601563 29.398438 L 63 29.398438 L 63 44.800781 L 47.601563 44.800781 Z M 47.601563 29.398438 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.901961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 29.398438 L 21 29.398438 L 21 44.800781 L 5.601563 44.800781 Z M 5.601563 29.398438 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.601563 49 L 63 49 L 63 51.800781 L 47.601563 51.800781 Z M 47.601563 49 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.601563 49 L 42 49 L 42 51.800781 L 26.601563 51.800781 Z M 26.601563 49 "/>
+</g>
+<mask id="mask7">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip8">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface26" clip-path="url(#clip8)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 49 L 21 49 L 21 51.800781 L 5.601563 51.800781 Z M 5.601563 49 "/>
+</g>
+<mask id="mask8">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip9">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface29" clip-path="url(#clip9)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 29.398438 L 21 29.398438 L 21 32.199219 L 5.601563 32.199219 Z M 5.601563 29.398438 "/>
+</g>
+<mask id="mask9">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip10">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface32" clip-path="url(#clip10)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.601563 29.398438 L 42 29.398438 L 42 32.199219 L 26.601563 32.199219 Z M 26.601563 29.398438 "/>
+</g>
+<mask id="mask10">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip11">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface35" clip-path="url(#clip11)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.601563 29.398438 L 63 29.398438 L 63 32.199219 L 47.601563 32.199219 Z M 47.601563 29.398438 "/>
+</g>
+<mask id="mask11">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip12">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface38" clip-path="url(#clip12)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.601563 9.800781 L 63 9.800781 L 63 12.601563 L 47.601563 12.601563 Z M 47.601563 9.800781 "/>
+</g>
+<mask id="mask12">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip13">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface41" clip-path="url(#clip13)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.601563 9.800781 L 42 9.800781 L 42 12.601563 L 26.601563 12.601563 Z M 26.601563 9.800781 "/>
+</g>
+<mask id="mask13">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip14">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface44" clip-path="url(#clip14)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 5.601563 9.800781 L 21 9.800781 L 21 12.601563 L 5.601563 12.601563 Z M 5.601563 9.800781 "/>
+</g>
+<mask id="mask14">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip15">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface47" clip-path="url(#clip15)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.398438 70 L 12.433594 70 L 58.792969 4.199219 L 8.398438 4.199219 C 3.761719 4.199219 0 7.960938 0 12.601563 L 0 61.601563 C 0 66.238281 3.761719 70 8.398438 70 Z M 8.398438 70 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 60.199219 4.199219 L 8.398438 4.199219 C 3.761719 4.199219 0 7.960938 0 12.601563 L 0 61.601563 C 0 66.238281 3.761719 70 8.398438 70 L 60.199219 70 C 64.839844 70 68.601563 66.238281 68.601563 61.601563 L 68.601563 12.601563 C 68.601563 7.960938 64.839844 4.199219 60.199219 4.199219 Z M 60.199219 4.199219 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 26.601563 29.398438 L 42 29.398438 L 42 44.800781 L 26.601563 44.800781 Z M 26.601563 29.398438 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 47.601563 49 L 63 49 L 63 64.398438 L 47.601563 64.398438 Z M 47.601563 49 "/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 26.601563 49 L 42 49 L 42 64.398438 L 26.601563 64.398438 Z M 26.601563 49 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 5.601563 49 L 21 49 L 21 64.398438 L 5.601563 64.398438 Z M 5.601563 49 "/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<use xlink:href="#surface26" mask="url(#mask7)"/>
+<use xlink:href="#surface29" mask="url(#mask8)"/>
+<use xlink:href="#surface32" mask="url(#mask9)"/>
+<use xlink:href="#surface35" mask="url(#mask10)"/>
+<use xlink:href="#surface38" mask="url(#mask11)"/>
+<use xlink:href="#surface41" mask="url(#mask12)"/>
+<use xlink:href="#surface44" mask="url(#mask13)"/>
+<use xlink:href="#surface47" mask="url(#mask14)"/>
+</g>
+</svg>
diff --git a/dist/Storage/all.puml b/dist/Storage/all.puml
index 16d67459..bb0ab884 100644
--- a/dist/Storage/all.puml
+++ b/dist/Storage/all.puml
@@ -1,10 +1,20 @@
-sprite $AzureBlobStorage [70x59/16z] {
-fPVTZiOW24H7L8Hv__VT7zF4PXNRRpttFJ5CIGRynVb8mHELptZ2dkHyWM9Fuoi4EpBVOTXXV4b6JE5R737ErrH4A2zEqXP-GZj9UI1FANl4b7OysYO8oFwq
-JZMOVgpnpG8PWA9B_ceq7cs9_-0Uv5qZOSePYQ6bQ-AqRMqnwzzuQ_vhcJHvMg3POeAkrslwc3G-fJnP3EWM0ve2piMcr6c19aksz6ifgAH0gRzKG9Vh99mi
-5x-MBc15kTo0BjDkBomQM2XZWGuiDbBUMZAq3sTjOHaBjBDKP7f22onzmCaZYvK2vE86Y40OMAWzvT0Y7MSJfEoXXG9XO9c8BGrsQEdaodEB9tXiyLRL-Kjh
-lh4Ke8GMb-l7DW5QO1bR6rWAn1H21xQM300IMHAKJ70l9XjBGqVN5kyFAFtxZSNJr9zcItsoL5oKWxVuilmC2xj5O5jB6PQyj0WA3OaxYmLrOLWK443f8e28
-hImI5DHXeKeI9JrtLXQDolARFGeBbGyBkAFTB3MibtNVubq0ZtkGtLwP9EIUQDvqGqlO8hxhXsDcDKj83aOxfNtMcoi_mKzlYKuvksj6okVjMz0v6x1YWvvS
-90C_I7bGFXljKTeP3yY_3gnl
+sprite $AzureArchiveStorage [70x70/16z] {
+pTG7beCm34LHhF8bm-n_lOE985DiOaXzwR6vQJePFhUqjB-MeYQ2Y2e6_jLKKaf411x-HM0Y4G5eJkP0mvgKT6rLz7-n9a2wR6BerbXoYJP5_gMWtueiYdsL
+_YZKL6HJgALeTDd9q4hWigQuAgMgmXqANnH5oMkAD9LOGxSYTKL3aOk2jg8x2aBH6qhirBR2cy9jHNiKtAr8dqBBPzTQe51Y_6ufUg_2gJukiQO0OlpEAjAj
+I2BPKL2A8TvHT4VHKBIkP5-pefXNCyoAv-n5ONWkZQ7y3edKnsePYJ7EXs1Hfg-eeUInNb6cBiKIeQ5C8C5yo0HAvTvV9Tir8bWjpxaeUMvHBF_zNg1RQ8qk
+vbXHYl5Rqhh2V5gnBGZ3AlcSYSPj8fWleQgOI0jnKzWwLF1THNSKm4FX6mgaZfH2STnMj8BqA-rypMnLvBHo3IHsLF5_WVMeul-pnoY2WufNCi0FALxDx7ub
+wbVyWEBQ23UpKFRwwgmNEQzC1vLSRUnekYf8jQWdVhX2zUvNk2_PLVWH2d-EmezG-7CKVeJ2dwFm8nG-e-G_2fzIK1JZQt8iBSX4xJ_9_comNyefP4h3aCyZ
+4G_3aFo-ppFni2Gvb3E6fLdu1W
+}
+
+AzureEntityColoring(AzureArchiveStorage)
+!define AzureArchiveStorage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureArchiveStorage, AzureArchiveStorage)
+!define AzureArchiveStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureArchiveStorage, AzureArchiveStorage)
+
+sprite $AzureBlobStorage [70x70/16z] {
+xTLLOiGm38HXe-AHxd_Ueigj2fhIhl_7m1UqNRwpNUtfQcd7rrlmfYGKt4T1G450GP1yinu50GK11G45mVXyav6y4aUX8C90N3cYvkmrw45PKNEs4dJoobQs
+qXcA41G8GO4I52X1WTh75GbMdYKoMf0hGVBH68WhnrjlzZgHfK4IlrsrcwuL2ueLDO828oWmWW8bA8ua54TIYYCvnP6SuWX1KICeQWH5ZQ2e4HGrWW8ZAB2S
+8jSTw_MkzmI9AvuaeY12GQGpa5dQIDVBw-qk0G
 }
 
 AzureEntityColoring(AzureBlobStorage)
@@ -12,33 +22,46 @@ AzureEntityColoring(AzureBlobStorage)
 !define AzureBlobStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureBlobStorage, AzureBlobStorage)
 
 sprite $AzureDataBox [70x67/16z] {
-xTO7sXiX38JX4I24TFy3PzTnDp1RqlE_1_YUaUjY9gkvHtWppJWcMJppcWuqMdneUmTPT5NiqMB04tQGRD6NiOkeayn66Ztig5oghQgcyJiLZecazkmQibtl
-bAYzKy6YngTcjKZl5kl9rqnNAtXJh4-lH_NvQqVDPXcFaIPioIEJOYntNfF1QrDZx7gLs9m04dIDaegICI5qoYgHCUqwXOzfv2RZ0EXyJ38k0obcKZ5AiOYP
-gjiYy9ZmkYs25ZCR8oYamYCyGoERCjKc2h0jesJ9jamcIxPbn8Qs__CsrF6MYuIBh8iQVOfiX61bv1V6Y4GhTTrwkY9Or9CLnKhELHg-IsSgBY0PMhb6hgGU
-h3IXVzMyelG1XbTCy4dAdeghO41IAVf67XMxgfe5HnXvBFnJAr-LhqgB1GvJMtcit2u4ktbyE5197vaCWcH8X6LuX1DdaUqP7k4P6jcUuH6UuH5EQiBGDm
+xTO7SWOX28PX4G7r_WTEoFXtv9jDR-y1dbbTM_cCYDjpJENrDHlpbBLNIQJpBgk74Pb1UioWFiF6iS-fOh7JZawC3CYyVd8O3wI9cga8qtv-A2MesLNAnTD7
+fMV8CkuT2HZJpHeajSVaHPzXlGKJOc5AQr1HW-yGjbtEzBd9u9Uir4SxFRYMBKdM36-wC69PFlgzCWYDPnLCSB1w12ZyC3F1nY83wVutUIDQi_7V5lGnOgXQ
+2aymCuQYRCciJKuOyJA5NS58FhrJbWAHGcElg2i0mOm1XV3jigufX616V8y013EShLqkzt6iKBQFj7dB4gydkrhH-lS6sjJLqXWe0nymXXLP2hr5wVWECAmG
+le-mKeDh3IZmRLNr5Ked-6R0Yg3t2rQ6KFAMWeeB9hMyfX6Cu7LA-qpbN_bNQDsahqs7Tzf07hz2iUnuUpq3FmKp6C4CHZ234SnW1AS0ES101AUZbX_H4m
 }
 
 AzureEntityColoring(AzureDataBox)
 !define AzureDataBox(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataBox, AzureDataBox)
 !define AzureDataBox(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataBox, AzureDataBox)
 
-sprite $AzureDataLakeStorage [70x54/16z] {
-xTQ5OGGW44JHZxFJVxznERSXdjS0iWejTCPid3DrWSbfJHVfd1IwJEOKlV3Uf4jLJgYNAdouwYkW1GPQeMk5q5Vx5oNaguHiWo9R9Bfi1KAk1bck2JIP8WFJ
-3p8aFyX0zOCC33l86rBe9frDvUOW-rU9pAQXcpGsrHNloM44-StKRThcbE_or9SWUz9Ba2rpByYtXhl9bL-2R3zeojMWovQfiWKfPEjC-URGZnDQOMg1A5gW
-KPTi5QJQB3N1FG
+sprite $AzureDataBoxEdgeDataBoxGateway [70x45/16z] {
+jPO7acCX34GHIi3zxxk1LRlaMc3mhvbNOOBjPxNwf_Bp4AktrjoLwQb3saWqUUJe8m1TFyxIneBE7qbg7slims6aBJLUFgJQSmtzuULfJqAHcFy31uWkDFn5
+0i_ezF2YAJhC0KVoRElg9aiL-uhwLpFM-FyUIHE8s9j6nWQZhUHla_Lz6jjfUbt6mJBynPoxZnsI5XkVj_Zoc4tL_s0fqx5scn8kXSqu8iwYfqQEmupwbaVA
+0ejCkhVqjr5i8I7uQUonl1MFqOX545PUhRM3XkAjQHZrb0_-OwIXCr2ssAfmmUbqs8m7Z4dod_3JE4V2mS9O4PZrANuzMIG-gHIT9mWDVcdHi4Zg94UALEVZ
+RjYtM3mijat4VZCBEZ91NwbuKlSBYwPs1P7IXSMlB9nZbAHq57zZeVHUJQknMihrB2rQG8G9SQNubQyiaavgAmlime8BZ29GWgujKW9q992HkVFTNbeuSESm
+b8F6xQAZJYLhW64u0Cl57Ibf27yTBP3iRlQcwfUMThnLtrcwb0KaHylzSsiLjGjBTwtb-_aD
+}
+
+AzureEntityColoring(AzureDataBoxEdgeDataBoxGateway)
+!define AzureDataBoxEdgeDataBoxGateway(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataBoxEdgeDataBoxGateway, AzureDataBoxEdgeDataBoxGateway)
+!define AzureDataBoxEdgeDataBoxGateway(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataBoxEdgeDataBoxGateway, AzureDataBoxEdgeDataBoxGateway)
+
+sprite $AzureDataLakeStorage [70x70/16z] {
+xOm7pkmW30OXTbnp__EcRC548jAIVVLdrFWqPjA_o01pDITiwpP85Eyo4RPr9C-vF6a3tWhsUQ6XLARj4AQS9vZf2Kvvs_XSRJt7IY_FYku8TSEwi-mOTID7
+u0zLHcLKNBknvIC6ujKqQUis3EWnWi1HKwqzFCdA4m1Gtqfms-HlFPyqbOe2afYxAI70_czcysqpmh6HjDQoQztq72iHnAjPxsO5wpCyxtOb23oevuMcM7aQ
+BC1fDsPLwUA7LaR5k1jPFcBWxHtdDSOIfmjRt5hhIiKhPl7Ib6rVwA1yEpoCg_21cE_JNlEb-QohIaIuHYvckwBrdUXfIgiYyKhBNTajRQ7oDh9VXSFNREgg
+qijlg8oAVwLYNwdmKR5-Zl_JyWKuoVs8vvJiTWLIIbdlDHpI0TgD1kUji08
 }
 
 AzureEntityColoring(AzureDataLakeStorage)
 !define AzureDataLakeStorage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureDataLakeStorage, AzureDataLakeStorage)
 !define AzureDataLakeStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDataLakeStorage, AzureDataLakeStorage)
 
-sprite $AzureDiskStorage [70x59/16z] {
-dTTHZkiW38LXm3x7mEn_lvU9IaekU0hzdgjVfZ922MinYIWQNj2eI8enx8cYu09UL5lixuA27enQoKaa9NsOgCHv2luDCnBfqG1F8xoC7ULXX0D4Vn2_madw
-ZT1dbfkIiz59N2G4UdAfzUUjbjPo9F4QlJ2ecMlUaDOY2vbdoYfIZMl6xIFLul-OFkj_SAsrP3Dwp1iI7SqsZh_AOB3t7quPu2nYPLe3D6x5tuawT33xFCWL
-o7qjiRHncARgiDv-n1_ZOY4_rsglOhabRZM6dhbB-PrQ1tgXgoaqdEzBQsNhQ9USItdjyaE9uIBbvsiLuQPVTYfZ64cknus2k7WOxI1KCzpd4RdKZKB9T1EY
-5rXBEQtw6u1S5ez-57q2Nkz8BYKtPYHK1jeaf-6G_sZtxZWDjw8FhnTMZo8wIHyY_Ie1gkj2p_W5sWC9TSJaHMo1UiYMe6TuL87k7ubG1zK7a3r0G5rmXvIN
-pUDZUylyI8ETRVVrlQAJsAh0RbWMcir1S7TaOQlHf66zDolpFKF0SwsSY9ze64BFTCGxvQ_YY34qOZCI4vAsq1-bIFkUX5lYzurHWXsZh3ySRHya1aSKSAUW
-ANoIHBqMsG8n78Xfs1Zv-yF-7m
+sprite $AzureDiskStorage [70x70/16z] {
+xTZNjkCW38LXGDBUWD__UQUGQa1soFGvvxjE_YMyPAU4F-5JJ4b4z4f4KefBRnSr3AnHbVDO58F3dgYau4aAd_LKucGAnI6RaMuCmse4pLCd6ixC4lkEO2s2
+FMiHnJ7okOA9U1HXBhNMxPjQIo4CdX3Xo7Nhr4BCgMAkR1ELM5EtcOmv-WSQr087ZwxjBb4BuIc7Eq8obszo9k7Bpb7j3kTOjveNDjMBR7t6R3tI57Q9XGfB
+c-InbMRB4LuNWlTLi9dJEPgQwdqXyXWw7wD1iEv-Sol-HfOG0lerpuGRQLjOjvqImpSwksLgAVc2P6vAgNKRCLn4Rcyh6kxIcvrgOIUXBYUoX56oif2WnZ2N
+bBdMyqAXfNaZ9hqmC1UdrTP0vM8CHT6E0IJp5GcOoZFz9kqQUaOwskmweciLtOd-87v41-aaShkLp5IxGfVn4-1EQyt5v3Ku0Lt4ATCrMAhOGWR-YzLb1ZmA
+C5EFqKvMHCti_FXOtRAHpKuhiXO16-iIInL3V_5byE8Wk7TaviKvX3pel7gM0D8F7UqI7rA86FPpYFZBs4W8zypm493fquO32Oto2C0ZYE4g6jy42K-Yljde
+YIqcDBg_OlaQanYE936Sp21nuVVzVYy0q-vVWYKnlEdJLm
 }
 
 AzureEntityColoring(AzureDiskStorage)
@@ -46,70 +69,129 @@ AzureEntityColoring(AzureDiskStorage)
 !define AzureDiskStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureDiskStorage, AzureDiskStorage)
 
 sprite $AzureFileStorage [70x60/16z] {
-hPS7giKm30JNNUlx7_XJFoBo9X4lGtzb21FaWYjpFq8yKVSB1Xwm_G8MtDBtAnPkuNv7Gq2crJ2PDXzuxK0-SDi9LY9jFl3OAGmd2l-_7_tCu7RqkxHia3I6
-m29jHK1e9WBclghzH0kQAjCseD_bhDI12vr_AKlGz3X0pvQWOHYWDnQlYO4jPG6FWVj-PVb_KpoE4uL5JI5FupJt3nRwjD6owWLpbhXUBM49WtQsiFYqUOiF
-J67Xka1XsSqDKAwknr3uksLtzuzS5m_d9vR23omTNLbe5wZh0lPptGgW2Gld1GhB_6u2KFYJfSUjDJ_JziagLUE-cBVCk4VdBInnKyjRHjpLyXPJvwZgb2Uc
-_t5Jn-Nkzxu8Ar3qsSxSGvOgAG26FWRL44nH6NyP0y-2Eph3WU7yjcaQXW4AWJEOl1jbg2hRJZ2_lat4m6_fq8nCMeqbqcfQAcqYS29jBl304yCUMRZo1m
+hPT9biCW30N5Z7J_0sT74dz_G0zgsPrKJ7aIygJQcYGBWcsWig3P3aMc9DiZo0orFPfCABPBSgJbT4zQJlQazGTMyr1PMXzndbPh8UWoS8DkID15uCYk1AvH
+0VhFSSRy2cWWS1w7oSyu7araQHD_n8n5iS1rtoAXazifciCYek-1kyzIRL0WxSeopbHzlPqKBPo7fS41EYmGEDghHUE32fRVm9rOy9v7omYSxS0o0YknM7kW
+pD8mfQFk80MxOD5cTjp5x8ubtB1qARIBFk1TeeWUrwrm0qokbpwxwgGTTiauAVWjVVpxv9wELvzIaWui0T_HVal1bvhVeY_z_PP4vgZiiJGsqnK-QeuGdSvs
+_NUbaVDxpnG-1LK1w0y2FukDCYCfIGkJGEUizWBPV0IsNWUG5WAVxTUgmv8kxcmE0qUPq7qRahF0UcKdd6LEyAJbP5q3QJy
 }
 
 AzureEntityColoring(AzureFileStorage)
 !define AzureFileStorage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureFileStorage, AzureFileStorage)
 !define AzureFileStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureFileStorage, AzureFileStorage)
 
-sprite $AzureManagedDisks [70x59/16z] {
-dTTLWeH034NHqiWB-z_kI8RsPAgwppTSB5W9rTR796OHqLyYp3H7RxNiQODO0y8d6lt_LfkY6NumUubrKitn2nelkzGyaHD-8QhS7ngi2q72oQr3kY9Xmd7r
-HXLToXBkTtUQvl33Va3aho0Q6QL8ch3ZdXcWYJQpnX4mZObex0X1tsDlLV16nlA5DGVOxTmQD8K3YpbJOEFm3Md2RPv3m-Qqvn67EE5q1RudjvClmYys6h_q
-S0RXoBhXnd4HTTO99qMF6oIdDfyaPxKKVPbFuLCIC7jSfPKVVBZWCO1Vgd3dwY_GYXiuFaVbQjhn6Qxbtj3ZRPZUU52dsB5FgPLO8zqAcNBshkwJ78iYRHbK
-QBhn6gg37fqZXvFVPJGV4Ctsq9YqC9_GHIyNWrRYX9ld6vRMieJhYyZbYqoOA4cScRoWi3lmLgnrYWdi1PHYsKuoB2Bq7hK0c69CsuS4PKeevLXK0JC0VcvJ
-35vC26s0WTE4spo7u9rfpx7QBqYIsAe8VXEtpWnixeYOWypvVaNK7FhTD2IHzNt6XH_7Agba2OTQYjZBhJjFMG1sx-_bE67F0F-Q4RuHEIVvcTJYcjh7CExV
-Z1ysPddG6VOk6V6Fess3p5OIRRBk5AYNXTgdZqC4oZDxG-U_zpuoVw-HCLg--ZS
+sprite $AzureFXTEdgeFiler [70x70/16z] {
+xTG73iGW34HH1fpGxd_UxRtlC97ItW6-9B3jDE2VuU-AjnSWgHWa5OEaOf1K39AAGL8n_zb3XJJkIY3WgU8v8wcibRM2VxskMC-mXqhFQQx4AAZaMkDOAZ4d
+nRliZAKISnxL7urZwiuasnW6kGpU204FbMxAivj6DBkfbkRAsRYkDnfVz_WkpdP2un_jN1U8ldNtsDUzn-rHvnu41jmGGi-mGLwNdTrxrDIDfH9pqipkQ2en
+vn7zKOdZcBepoJO6fx45
 }
 
-AzureEntityColoring(AzureManagedDisks)
-!define AzureManagedDisks(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureManagedDisks, AzureManagedDisks)
-!define AzureManagedDisks(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureManagedDisks, AzureManagedDisks)
+AzureEntityColoring(AzureFXTEdgeFiler)
+!define AzureFXTEdgeFiler(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureFXTEdgeFiler, AzureFXTEdgeFiler)
+!define AzureFXTEdgeFiler(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureFXTEdgeFiler, AzureFXTEdgeFiler)
 
-sprite $AzureNetAppFiles [70x70/16z] {
+sprite $AzureGeneralStorage [70x70/16z] {
+xTXLWeH038JXOEcaElU_xhXhKsHz_xSPuCDLjatc88geABti6y5LOvVj5uH7zg7ZbmHnoaL0BygvSKf00WQkkCgnoSQvJSVAJa6YmXZtoZGlFMUqejz7qGn5
+lu-Y6Of-7qKp5FrunQqjlmzdXRY-NKSYl18PIcrGQ6Jc5NDwc9wLCj1DPyLob95E_vLz_yg_ulgiyYvhk4f5O_prxR9MX5SYGwap5I-FifPmeKmFqgOiMu7T
+vMZibUBuDeeZGN5aACXGF4DnP2Z8K3n3SH2AtofW5CKsFqLzAQZzxPzCHGekev3QYVZYHHb4fBDbI1rar-Zy-jJIYSWQ
+}
+
+AzureEntityColoring(AzureGeneralStorage)
+!define AzureGeneralStorage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureGeneralStorage, AzureGeneralStorage)
+!define AzureGeneralStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureGeneralStorage, AzureGeneralStorage)
+
+sprite $AzureNetAppfiles [70x70/16z] {
 xTC5OaGX38HXI2P1Ul_pLcc1sXDcg_iTu4SJBkfAT5KCqTDfkJHOZ3JflCAe54QbC2g5KSbbGeaKIgJWE3D_pOxpjoWHfqIS4d56f5Kqd2QKIlmtbIXRzbJI
 pPRuFoeppPiLc7T_kQAnstEx0zdnHjMRilBIDJH-hRnKhXL3ftciQ9DMvgYYoR-iWe5C5SMZL_S2wuQATdD5MdggABgVNu5OwlovOccmMG5qXaSwsQfWdyyh
 O5J0g62Xqlbvb8XJ8Wv6n8KHiI2uPqiqNDBL7G
 }
 
-AzureEntityColoring(AzureNetAppFiles)
-!define AzureNetAppFiles(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetAppFiles, AzureNetAppFiles)
-!define AzureNetAppFiles(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetAppFiles, AzureNetAppFiles)
+AzureEntityColoring(AzureNetAppfiles)
+!define AzureNetAppfiles(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNetAppfiles, AzureNetAppfiles)
+!define AzureNetAppfiles(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNetAppfiles, AzureNetAppfiles)
 
-sprite $AzureQueueStorage [70x60/16z] {
-fPO7bkmW30IRBEd-z_s1VYClPXAhsZWEPMWiMxWpx2EQy85iNz3n0R5lo7XBjQyGl2EfVKV56xfzYKQZ9JqQBSd1QCd02zHEAC5eYOPMsMaWdmhel9oA7TD3
-qRvUxMQ_GABHaXgCrWFUemq6B6OzuP2YQy2DPN46wsuiqLOqFMCmpVApW0haV86INkMKpIqg6_foioRKgvpaiYJi22EyepCJcJ9cv1OWvGK0OrhoGcB55EH7
-mBfQbdYwMzhzEJTdoamp_rmMS0FH0hUWg6zkVl4s0nPaMoqj-V6IW5ffQSb7gHbeXHPDSv1LRfQXPHxFx8VHCZTpb2CX3QkqM9-3qdwtpDFxd4rMSyiyeQer
-RgPbPbBD17gpy78rCL2tS8QvS3Cj_2TJTRTmwcdOQc7QtEmM0SPSITajfgsghPR9jTblaCBRBcyMibiSjmn0hR8OVslXGei_62vBrnLQjiq5-gZg358lomuj
-E-hHFf27fM0Zgrd3HfahMHajoRISmI9gowWhoZYZ0pAZTP8Apkdt29ffguUC_SqXWLTZyEtOOaqGqM13HWfscf5Whwh1JegKQ5T7HZ1Qaa-RiN3tBNYD1gCb
-DHejaQC22WPSyPuUZ9Oa3KPBIlz8mvs_
+sprite $AzureQueueStorage [70x70/16z] {
+xSu5RaCn48JXVJIBzpzlixMW3Cue2lq2yoVBnNlsR7bjVT-FczlRngv4Pzjsl2qw_R2fqG5gfpn6MTsaud4rYWT1yI0e7bUZM5oDebUZf3AKOYZ5K9AXP36K
+OYZ5K8oXu7eKC1Gm55oF0eO2XeBhKS1Gm51mFGeO2l1PUIexGzaPYZ6KOYZ9KB8OIZ6Kf2X5K91Neu2XO4BnZmfc52CeASS71LFAqdC_3epKkkhyfBpDnwx7
+9yL4zCFcH8V8yXQlgHOHsSxz2gJRpaDCHelE8tcqy08
 }
 
 AzureEntityColoring(AzureQueueStorage)
 !define AzureQueueStorage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureQueueStorage, AzureQueueStorage)
 !define AzureQueueStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureQueueStorage, AzureQueueStorage)
 
-sprite $AzureStorage [70x60/16z] {
-xTO5iW9138JXqKZV_xvFsU2J36vV6VeZlLjG1FEKqZR1ILhQWjFG8rG-bK-bbGM1xNA55gER3pfSAMdHD-xEa6Hauq5jflAfa1486IWP1TjblkRnqjk2mSr0
-kb6GNUQvxuMTx-K-bQmR7vk0_m-U9ok4GtYkKd1OFRQHsEKEgIk2myGgP-aJnowEqXm-ZmOLKBII5GCbM66CSAnICLP35S6OH7u3UkWF4Swc-R_21uyNXX8f
-VEHzBmKHnQam8dXSQOYfeuegOcHKcLFpeeFiSi6DCN0-pOBpzLJEpsZoDFXQSWayadmrS1O5i7j6HsHrLauXtLavI2ChdxLsJM5opigcdBMoeU3AyslRod7T
-MVaR
+sprite $AzureStorage [70x70/16z] {
+xTL70iCW34HH70GZ8jt_kkczKJoBjBzpU-uGVgH_osqw3PTisqufCnJVzblANrcq5w_3MUd97zMDC1HZAEOCnLygsbQvp_hVTBmlTokneiIMv57eL8IXoFie
+mb24eSZxAC9Gv7qKOIZIebJpXke8Gp66OivGl4VH9vLbjREYygHK3NKbTIabFIfdrDCB9JyAU1i530Nleu2Xu7qKC1Gm5BoF0eQ2zr4mekYDWY4bxvJpojxA
+5h55VVgfXv0lbJ74fX1qBk8nRD9vzsCnx18THmpJHbW3
 }
 
 AzureEntityColoring(AzureStorage)
 !define AzureStorage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStorage, AzureStorage)
 !define AzureStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStorage, AzureStorage)
 
-sprite $AzureStorSimple [70x61/16z] {
-xTK7OiCW38LXCGnwx_xtxLvAOv1bkliTu4yibipbhQi2qBvbYIaTV0Cj4AhAT_h1JbPUrUI0ZNiqYrVZFdWpdJoVwHn32ix4KfagdDjaHZc7TE9x_Di6T4ao
-KkcpNJ-wZmUtA7rKBbNmk3GuTtvrF8Z8O1g3Uk2V3CTRkAAYAogLAogW4PjkvWbjU7nnWJlgQBRmtkFPZ2LQqTvAj6AXHYjMsvbBjp0zb8td8LLUeHOuqP9Z
-Bie9Y2weKFAIYlGbbOJWTEtFPj08dkq26cYMyzrFEdppu7sMAkALAgzgHwZIirYvr0TbN45zLP9uORITVcIbN90lbB8b8OrM_gyyIfPyeHpSTVyhVGi
+sprite $AzureStorageAccountClassic [70x70/16z] {
+xTIt0GCn3CLGaihI_lkwS-N8SF6_0L22Ge5OCP6CPJMRzELWplKxWE6YlWUPrCIbmeeAAgYy1qslFlMbDfKLL52PQgD-0QshxNe6L51fGwtNQohL0tjaX8ZD
+w88U
+}
+
+AzureEntityColoring(AzureStorageAccountClassic)
+!define AzureStorageAccountClassic(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStorageAccountClassic, AzureStorageAccountClassic)
+!define AzureStorageAccountClassic(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStorageAccountClassic, AzureStorageAccountClassic)
+
+sprite $AzureStorageExplorer [70x70/16z] {
+xT07ieCm34LHDpqZsFzwVtLG12EQqfCx5MmVbt2PCepA7WMTKNqvvQDybAJAyPXIk_EOYrzXvYw4J3jACuL_2tQ9vvMfmfTG-18ANqBXIoZiK-WlI8SLu66K
+8D5H1J2LD2dNUNbDYJof1gCBAnybdog_0IWIDYlq7unsAV0hKG8G9TgX5FDrBwkiHqINKB2kHCbGi46fF4QFg2GLGEeBILfIQ0phhIjmAkct_DTnfUZN7QGA
+319TL4bvB1vLT2-iu18AGFghbohGIqg9T1vsP2hmAkBehohfhvd2__N3q0DraEJBVbrH6k9J6k9K6k9K6k9K6k9K6k9K6k9IL02sVmM9S3GAKgAZI0oNwHi
+}
+
+AzureEntityColoring(AzureStorageExplorer)
+!define AzureStorageExplorer(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStorageExplorer, AzureStorageExplorer)
+!define AzureStorageExplorer(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStorageExplorer, AzureStorageExplorer)
+
+sprite $AzureStorageSyncService [70x70/16z] {
+rTK7UjmW443XwUgw_t63bos8GSb0-alSvTzy8yH2C6Hvn0YZ8MkHu90XMZJei3PYw4kqcOmZSGQ9cGbl4FiaaPl1a297575ea0JWZRBO39XBn2SHfCoQWO-x
+4IE7O2VIdYytVkb7YZh56H_8kXL_fLfSmTkrVqSHftmGHHHpXHHu8u9CGOLk5KQPemfM1dyGNPQeObewz1ujeIr9GShnAtdKs0tY7g14qxoawWseLSA5WnKY
+o0a9vQR3dvETbt1JmLoUGcFK8KK0of49olouv5LCCKJLWj4y6SASfC_NuwpQdS9K8byCJKbXowNBZzrqSSnLKQct0A4j96zbErL4zYjJAoQ5aMFKKZaajLwL
+jQrOcI1-bFMSHFI8hCMkAUbdBdlwonMoEOKBnBUarltHkkwvRLsSGXNYbTmC8FFTVb48AXCmqdoZ4B055LN4gQq0W4OLIuor54eA1az4VLolNX7uYcuLbIBx
+Ya7cIX78eSKJfFcYCBoJ3WQeK9IW2AEEbcj9HXqIIvasv_8wcfMP81RLzuX1bXn1E9xVJQ3vxEbNnE_TSSK_H-CAS4A6bMq_Klkwfe_vim5bFzARE-lwbFQv
+swsqNmEwbTFywr7_N8vzicefUxVYHdiU-pAW-FvtPJkgjW7bEEPf-zbxj9uceljVshlZQncVo_Wz-YlxXN-9GlSAGZoxGnGkVGC
+}
+
+AzureEntityColoring(AzureStorageSyncService)
+!define AzureStorageSyncService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStorageSyncService, AzureStorageSyncService)
+!define AzureStorageSyncService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStorageSyncService, AzureStorageSyncService)
+
+sprite $AzureStorSimple [70x70/16z] {
+xTHLTi0m34HHuUn_nsMSW1pPvTxld1Up_5LgfYeJp1FFmgJ5GKBbgi2Ea4iC1wmt4EQTI7zMYLFU64bpRHmbbOgYbhr5OTQR3oig66FrcMskZ7e2o71D3Dh-
+Fr6efwI9Zg25w4cADD51RPgDy5sA5HN5YafYWZp3ZDDTJbAUbnXvKxCwkpbLKLgMuGhpeqe6AMys5Z19BB2c4ewjK98eQ6kFcAof63R222fhzbf4brJ4CIja
+9nDEKDXzP6nqZ_ZxQ5RuSyzM9LsOFfAgajBm0oh_b4b7WFp8Ihqk_pp9Zzzfdb78htSB
 }
 
 AzureEntityColoring(AzureStorSimple)
 !define AzureStorSimple(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStorSimple, AzureStorSimple)
 !define AzureStorSimple(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStorSimple, AzureStorSimple)
 
+sprite $AzureStorSimpleDataManager [62x70/16z] {
+xTK5SYH134JHJ77V_yBhAiiqgBO3bhuPtgX20utF_OyKqKw4d4ErMwaGpnAr1oaVMdlQVQysI0QJptFxaTQP9YwJ2-uUN_8BtA1Bx6WlnRtSpBI1urFL769n
+FrVYjVYggnGTnVmQRjb9NEbAmQS-7kSYxJfwtD0z_qaIgqlTfH9teovuLtUkmWl7NkT0VtInlvFQuq_I_pK1o7UrmqpnNIqyZeAUrQQvli2Eun3kVnQVQWCW
+cOfyqGuD9m2VQOEL0zYZZr80Z1BuI4CMSg_ZjJIlNi10AzfzAOQp4tP3ap7IFJnK_VDe6-hOomv0bakhlVgOpkPQ6riJkcvZE3i4wyG6bYyTs4SHY3_L1d0V
+5OZZDONr_Gvxh1EQcoJmiJ3sDu9dkYTcao_VsbJNJSrdMleHIcGRW_OZ5azqEG6ftdcV0h4i0V7xkak3BKHmgM3VxRJv8tLpK0YmPe-MphS-oh2owdKFjR3t
+LHczkldiX1_N2U87hmu96sck7QTgjej-PPAHTcWf0EZHgmSy2P_k7B0gG-vbMxZCNf6RMxrV3RWFxEenrPtoObcdT41L4D_KfGHreFD7LtyxgmM3uJuP3J3F
+QCTbDjU6w-WpRSJDQFbKAt4_MjpNhiJJgEQHNxIR2d4gKaW-HBy
+}
+
+AzureEntityColoring(AzureStorSimpleDataManager)
+!define AzureStorSimpleDataManager(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureStorSimpleDataManager, AzureStorSimpleDataManager)
+!define AzureStorSimpleDataManager(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureStorSimpleDataManager, AzureStorSimpleDataManager)
+
+sprite $AzureTableStorage [70x70/16z] {
+xTHNUWCn24LXfdWaBkn_lGdkDrsOftpw7rMEwo3VczQZTHq6xSVwQ7Ha-9bUEnjIp2ziYyYQZrp5kr6a-0D4zlHRUTYbnLeNXg32544Oej952ogW2zcANoyi
+36T_MRH_MfaLAwbuHSKhAbPIyHyhKFRDObmmvezAOZ8noKNo5V-rqXY2DcOUb3qgtqpClZ9u48PSPNHYzet1my9gAZOhc1NCIdA-CQc8k0n4aXKVg_ITQIpg
+YPsZzcdnKMahkrHMTgcihFzICGnNDXOLnyOkbOtfpnMhg9XNLBoYOXKLU4N5AYgpOg855SW1dWodSAdyUJ8Sie9vmYhINeuqUQSqQST1mj9VYkWY5xkcFmzs
+2My
+}
+
+AzureEntityColoring(AzureTableStorage)
+!define AzureTableStorage(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureTableStorage, AzureTableStorage)
+!define AzureTableStorage(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureTableStorage, AzureTableStorage)
+
diff --git a/dist/Web/AzureAPIConnection(m).png b/dist/Web/AzureAPIConnection(m).png
new file mode 100644
index 00000000..5e80b8c1
Binary files /dev/null and b/dist/Web/AzureAPIConnection(m).png differ
diff --git a/dist/Web/AzureAPIConnection(m).svg b/dist/Web/AzureAPIConnection(m).svg
new file mode 100644
index 00000000..97576b1c
--- /dev/null
+++ b/dist/Web/AzureAPIConnection(m).svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(39,163,255);fill-opacity:1;" d="M 54.6875 26.25 C 56.808594 26.25 58.796875 26.65625 60.652344 27.464844 C 62.507813 28.273438 64.128906 29.367188 65.507813 30.746094 C 66.886719 32.125 67.976563 33.742188 68.789063 35.597656 C 69.597656 37.457031 70 39.445313 70 41.5625 C 70 43.683594 69.59375 45.671875 68.785156 47.527344 C 67.976563 49.382813 66.882813 51.003906 65.503906 52.382813 C 64.125 53.761719 62.507813 54.851563 60.652344 55.664063 C 58.792969 56.472656 56.804688 56.875 54.6875 56.875 L 37.1875 56.875 C 35.066406 56.875 33.078125 56.472656 31.222656 55.664063 C 29.367188 54.851563 27.746094 53.761719 26.367188 52.382813 C 24.988281 51.003906 23.898438 49.386719 23.085938 47.527344 C 22.277344 45.667969 21.875 43.679688 21.875 41.5625 C 21.875 39.445313 22.277344 37.457031 23.085938 35.597656 C 23.898438 33.742188 24.988281 32.125 26.367188 30.746094 C 27.746094 29.367188 29.363281 28.273438 31.222656 27.464844 C 33.082031 26.65625 35.070313 26.25 37.1875 26.25 L 39.375 26.25 L 39.375 30.625 C 37.644531 30.625 35.984375 30.824219 34.402344 31.222656 C 32.820313 31.621094 31.421875 32.261719 30.214844 33.136719 C 29.007813 34.011719 28.042969 35.140625 27.328125 36.519531 C 26.609375 37.898438 26.25 39.578125 26.25 41.5625 C 26.25 43.066406 26.542969 44.476563 27.121094 45.800781 C 27.703125 47.121094 28.488281 48.277344 29.480469 49.269531 C 30.472656 50.261719 31.628906 51.046875 32.949219 51.628906 C 34.273438 52.207031 35.683594 52.5 37.1875 52.5 L 54.6875 52.5 C 56.191406 52.5 57.605469 52.207031 58.925781 51.628906 C 60.246094 51.046875 61.402344 50.261719 62.394531 49.269531 C 63.386719 48.277344 64.171875 47.121094 64.753906 45.800781 C 65.335938 44.476563 65.625 43.066406 65.625 41.5625 C 65.625 39.578125 65.269531 37.898438 64.550781 36.519531 C 63.832031 35.140625 62.871094 34.015625 61.660156 33.136719 C 60.453125 32.257813 59.058594 31.621094 57.472656 31.222656 C 55.890625 30.824219 54.234375 30.625 52.5 30.625 L 52.5 26.25 Z M 54.6875 26.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 30.625 43.75 L 30.625 39.375 C 32.355469 39.375 34.015625 39.175781 35.597656 38.777344 C 37.179688 38.378906 38.578125 37.738281 39.785156 36.863281 C 40.992188 35.988281 41.957031 34.859375 42.671875 33.480469 C 43.390625 32.101563 43.75 30.421875 43.75 28.4375 C 43.75 26.933594 43.457031 25.523438 42.878906 24.199219 C 42.296875 22.878906 41.511719 21.722656 40.519531 20.730469 C 39.527344 19.738281 38.371094 18.953125 37.050781 18.371094 C 35.726563 17.792969 34.316406 17.5 32.8125 17.5 L 15.3125 17.5 C 13.808594 17.5 12.398438 17.792969 11.074219 18.371094 C 9.753906 18.953125 8.597656 19.738281 7.605469 20.730469 C 6.613281 21.722656 5.828125 22.878906 5.246094 24.199219 C 4.667969 25.523438 4.375 26.933594 4.375 28.4375 C 4.375 30.421875 4.734375 32.101563 5.453125 33.480469 C 6.167969 34.859375 7.132813 35.984375 8.339844 36.863281 C 9.546875 37.742188 10.945313 38.378906 12.527344 38.777344 C 14.109375 39.175781 15.769531 39.375 17.5 39.375 L 17.5 43.75 L 15.3125 43.75 C 13.191406 43.75 11.203125 43.34375 9.347656 42.535156 C 7.492188 41.726563 5.871094 40.632813 4.492188 39.257813 C 3.113281 37.878906 2.023438 36.261719 1.210938 34.402344 C 0.402344 32.542969 0 30.554688 0 28.4375 C 0 26.320313 0.40625 24.332031 1.214844 22.472656 C 2.023438 20.617188 3.117188 19 4.496094 17.621094 C 5.875 16.242188 7.492188 15.148438 9.347656 14.339844 C 11.207031 13.53125 13.195313 13.125 15.3125 13.125 L 32.8125 13.125 C 34.933594 13.125 36.921875 13.53125 38.777344 14.339844 C 40.632813 15.148438 42.253906 16.242188 43.632813 17.621094 C 45.011719 19 46.101563 20.617188 46.914063 22.472656 C 47.722656 24.332031 48.125 26.320313 48.125 28.4375 C 48.125 30.554688 47.722656 32.546875 46.914063 34.402344 C 46.101563 36.257813 45.011719 37.878906 43.632813 39.257813 C 42.253906 40.636719 40.636719 41.726563 38.777344 42.539063 C 36.917969 43.347656 34.929688 43.75 32.8125 43.75 Z M 30.625 43.75 "/>
+</g>
+</svg>
diff --git a/dist/Web/AzureAPIConnection.png b/dist/Web/AzureAPIConnection.png
new file mode 100644
index 00000000..deb46f5f
Binary files /dev/null and b/dist/Web/AzureAPIConnection.png differ
diff --git a/dist/Web/AzureAPIConnection.puml b/dist/Web/AzureAPIConnection.puml
new file mode 100644
index 00000000..f5bb0c52
--- /dev/null
+++ b/dist/Web/AzureAPIConnection.puml
@@ -0,0 +1,11 @@
+sprite $AzureAPIConnection [70x70/16z] {
+xPHbsYGX30OZRyBzJxpIcSu84bO_w_eBJqM1tXyN5nUYi060q3Rm1ROdKYymfWeshz5AaW4n82EWa1IrCpQoYM2oKR9Km-6j4HRryDucwF9KgCPMoHoDfGra
+aOncFLl9sA8Wsj_lUG1KZpGU96VQ05GU2oYsIQqTuBnxwDg18qNB2OctDh44sCZ5MYiipRde2tlUZK3P5tPlYSICPfRRJLD-N9YC8KZDOdmM3buiXOQ6YNZI
+NiquJ-F489JFdqUsxZaL7cMiH39yIEWoaKXbsBqp6HkaWauoU71yIuO7VxmSNUi-APrCmJACcpmNvDs_2wB962WqWK5ZE_miI1MMfpI2mnAQ18zjuQU3ma9i
+lKMVBK8JmXA8BIrAL5a2LjXfySUA3957MT5uV5l8t88yAh6yEjt86iujdtqkswa8ZT6srnbPt_FCj9GqBiwBRE8hGtbZjMviSOLMe0KGuHvHRxKaigbngX1l
+5Q2AEXrZsaFCPmeDnouyWFuo5nSNtm4
+}
+
+AzureEntityColoring(AzureAPIConnection)
+!define AzureAPIConnection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAPIConnection, AzureAPIConnection)
+!define AzureAPIConnection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAPIConnection, AzureAPIConnection)
diff --git a/dist/Web/AzureAPIConnection.svg b/dist/Web/AzureAPIConnection.svg
new file mode 100644
index 00000000..7738a6fc
--- /dev/null
+++ b/dist/Web/AzureAPIConnection.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 54.6875 26.25 C 56.808594 26.25 58.796875 26.65625 60.652344 27.464844 C 62.507813 28.273438 64.128906 29.367188 65.507813 30.746094 C 66.886719 32.125 67.976563 33.742188 68.789063 35.597656 C 69.597656 37.457031 70 39.445313 70 41.5625 C 70 43.683594 69.59375 45.671875 68.785156 47.527344 C 67.976563 49.382813 66.882813 51.003906 65.503906 52.382813 C 64.125 53.761719 62.507813 54.851563 60.652344 55.664063 C 58.792969 56.472656 56.804688 56.875 54.6875 56.875 L 37.1875 56.875 C 35.066406 56.875 33.078125 56.472656 31.222656 55.664063 C 29.367188 54.851563 27.746094 53.761719 26.367188 52.382813 C 24.988281 51.003906 23.898438 49.386719 23.085938 47.527344 C 22.277344 45.667969 21.875 43.679688 21.875 41.5625 C 21.875 39.445313 22.277344 37.457031 23.085938 35.597656 C 23.898438 33.742188 24.988281 32.125 26.367188 30.746094 C 27.746094 29.367188 29.363281 28.273438 31.222656 27.464844 C 33.082031 26.65625 35.070313 26.25 37.1875 26.25 L 39.375 26.25 L 39.375 30.625 C 37.644531 30.625 35.984375 30.824219 34.402344 31.222656 C 32.820313 31.621094 31.421875 32.261719 30.214844 33.136719 C 29.007813 34.011719 28.042969 35.140625 27.328125 36.519531 C 26.609375 37.898438 26.25 39.578125 26.25 41.5625 C 26.25 43.066406 26.542969 44.476563 27.121094 45.800781 C 27.703125 47.121094 28.488281 48.277344 29.480469 49.269531 C 30.472656 50.261719 31.628906 51.046875 32.949219 51.628906 C 34.273438 52.207031 35.683594 52.5 37.1875 52.5 L 54.6875 52.5 C 56.191406 52.5 57.605469 52.207031 58.925781 51.628906 C 60.246094 51.046875 61.402344 50.261719 62.394531 49.269531 C 63.386719 48.277344 64.171875 47.121094 64.753906 45.800781 C 65.335938 44.476563 65.625 43.066406 65.625 41.5625 C 65.625 39.578125 65.269531 37.898438 64.550781 36.519531 C 63.832031 35.140625 62.871094 34.015625 61.660156 33.136719 C 60.453125 32.257813 59.058594 31.621094 57.472656 31.222656 C 55.890625 30.824219 54.234375 30.625 52.5 30.625 L 52.5 26.25 Z M 54.6875 26.25 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 30.625 43.75 L 30.625 39.375 C 32.355469 39.375 34.015625 39.175781 35.597656 38.777344 C 37.179688 38.378906 38.578125 37.738281 39.785156 36.863281 C 40.992188 35.988281 41.957031 34.859375 42.671875 33.480469 C 43.390625 32.101563 43.75 30.421875 43.75 28.4375 C 43.75 26.933594 43.457031 25.523438 42.878906 24.199219 C 42.296875 22.878906 41.511719 21.722656 40.519531 20.730469 C 39.527344 19.738281 38.371094 18.953125 37.050781 18.371094 C 35.726563 17.792969 34.316406 17.5 32.8125 17.5 L 15.3125 17.5 C 13.808594 17.5 12.398438 17.792969 11.074219 18.371094 C 9.753906 18.953125 8.597656 19.738281 7.605469 20.730469 C 6.613281 21.722656 5.828125 22.878906 5.246094 24.199219 C 4.667969 25.523438 4.375 26.933594 4.375 28.4375 C 4.375 30.421875 4.734375 32.101563 5.453125 33.480469 C 6.167969 34.859375 7.132813 35.984375 8.339844 36.863281 C 9.546875 37.742188 10.945313 38.378906 12.527344 38.777344 C 14.109375 39.175781 15.769531 39.375 17.5 39.375 L 17.5 43.75 L 15.3125 43.75 C 13.191406 43.75 11.203125 43.34375 9.347656 42.535156 C 7.492188 41.726563 5.871094 40.632813 4.492188 39.257813 C 3.113281 37.878906 2.023438 36.261719 1.210938 34.402344 C 0.402344 32.542969 0 30.554688 0 28.4375 C 0 26.320313 0.40625 24.332031 1.214844 22.472656 C 2.023438 20.617188 3.117188 19 4.496094 17.621094 C 5.875 16.242188 7.492188 15.148438 9.347656 14.339844 C 11.207031 13.53125 13.195313 13.125 15.3125 13.125 L 32.8125 13.125 C 34.933594 13.125 36.921875 13.53125 38.777344 14.339844 C 40.632813 15.148438 42.253906 16.242188 43.632813 17.621094 C 45.011719 19 46.101563 20.617188 46.914063 22.472656 C 47.722656 24.332031 48.125 26.320313 48.125 28.4375 C 48.125 30.554688 47.722656 32.546875 46.914063 34.402344 C 46.101563 36.257813 45.011719 37.878906 43.632813 39.257813 C 42.253906 40.636719 40.636719 41.726563 38.777344 42.539063 C 36.917969 43.347656 34.929688 43.75 32.8125 43.75 Z M 30.625 43.75 "/>
+</g>
+</svg>
diff --git a/dist/Web/AzureAPIManagement(m).png b/dist/Web/AzureAPIManagement(m).png
deleted file mode 100644
index e506187b..00000000
Binary files a/dist/Web/AzureAPIManagement(m).png and /dev/null differ
diff --git a/dist/Web/AzureAPIManagement(m).svg b/dist/Web/AzureAPIManagement(m).svg
deleted file mode 100644
index a53e97c6..00000000
--- a/dist/Web/AzureAPIManagement(m).svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="61pt" viewBox="0 0 70 61" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 62.417969 26.433594 C 62.5625 25.417969 62.5625 23.964844 62.5625 22.949219 C 62.5625 10.601563 52.355469 0 39.957031 0 L 39.8125 0 C 30.917969 0 22.894531 5.664063 19.25 13.652344 C 18.230469 13.507813 17.207031 13.652344 16.1875 13.652344 C 7.144531 13.652344 0 21.058594 0 29.917969 C 0 38.777344 7.292969 46.039063 16.332031 46.039063 L 24.644531 46.039063 C 24.9375 47.203125 25.667969 48.21875 26.542969 49.089844 C 29.457031 51.996094 34.269531 51.996094 37.1875 49.089844 C 40.105469 46.1875 40.105469 41.539063 37.1875 38.632813 C 34.269531 35.730469 29.605469 35.730469 26.542969 38.632813 C 25.8125 39.359375 25.230469 39.941406 24.9375 40.957031 C 24.9375 40.957031 16.480469 40.667969 16.480469 40.667969 C 10.207031 40.667969 5.25 36.019531 5.105469 29.773438 C 5.105469 23.527344 10.207031 18.589844 16.480469 18.589844 C 17.644531 18.589844 18.957031 18.882813 20.125 19.316406 L 22.457031 20.1875 L 23.1875 17.863281 C 25.519531 10.601563 32.375 5.808594 39.957031 5.808594 C 49.730469 5.808594 57.605469 13.652344 57.605469 23.382813 C 57.605469 24.980469 57.457031 26.578125 57.019531 28.03125 L 56 31.515625 L 59.644531 31.082031 C 59.9375 31.082031 60.082031 31.082031 60.230469 31.082031 C 63 31.082031 65.332031 33.40625 65.332031 36.164063 C 65.332031 38.777344 63.4375 40.957031 60.8125 41.246094 C 60.8125 41.246094 48.707031 41.394531 47.980469 41.394531 C 47.394531 38.050781 45.792969 34.855469 43.3125 32.386719 C 40.25 29.191406 36.019531 27.449219 31.5 27.449219 C 28.4375 27.449219 25.519531 28.320313 22.894531 29.773438 L 25.519531 33.984375 C 27.269531 32.824219 29.457031 32.242188 31.644531 32.242188 C 34.707031 32.242188 37.769531 33.40625 39.957031 35.730469 C 42.144531 37.90625 43.457031 40.8125 43.457031 44.007813 C 43.457031 47.058594 42.292969 50.105469 39.957031 52.285156 C 37.769531 54.464844 34.855469 55.769531 31.644531 55.769531 C 29.457031 55.769531 27.269531 55.191406 25.519531 54.027344 L 22.894531 58.242188 C 25.519531 59.839844 28.582031 60.710938 31.644531 60.710938 C 36.167969 60.710938 40.25 58.964844 43.457031 55.769531 C 46.082031 53.15625 47.6875 49.816406 48.125 46.332031 C 48.707031 46.332031 60.957031 46.1875 60.957031 46.1875 L 61.105469 46.1875 C 66.355469 45.75 70.292969 41.394531 70.292969 36.164063 C 70.4375 31.371094 67.082031 27.304688 62.417969 26.433594 Z M 62.417969 26.433594 "/>
-</g>
-</svg>
diff --git a/dist/Web/AzureAPIManagement.png b/dist/Web/AzureAPIManagement.png
deleted file mode 100644
index 5bf33150..00000000
Binary files a/dist/Web/AzureAPIManagement.png and /dev/null differ
diff --git a/dist/Web/AzureAPIManagement.puml b/dist/Web/AzureAPIManagement.puml
deleted file mode 100644
index 5d70ec02..00000000
--- a/dist/Web/AzureAPIManagement.puml
+++ /dev/null
@@ -1,12 +0,0 @@
-sprite $AzureAPIManagement [70x61/16z] {
-fPO7ceGm28Mf2UJ-zztEV15bOjn_wrYGyW1X2KapStVhol0CL1yJtXyOeZvEcC0URLnYjEE8Zmg5kyXinCri_jpX7Zg2BWG_83VVCoFXXEBnk6sOuRWMoqWR
-hC3VAvtX0hJnWy02-pLILVHNHOwBfAokwdTIuycJobckb4RCtDRAGg-S8RLPvdVaH91W6mTMlUjNrSxDQxUqxKa2s_s6KqYvUwst_cCHOKLFoaEF-OE_dyKC
-bcXAZ9tbZZTRhQUY6S8UU2W2FZC2U2XIYvxPvM35Ks4V-SBJX-TvQP7gNJYMIXPF1fb5cDwETzTNMWZEK0j5UvTAk-6FPxtd5eydPdm4JfKlEXBEvxG41buC
-4n-9b3mM9eerftsIItwMDM7H5WQrN2lUgfdK6-OaIVbEmDEqgP5YBOJWmC_Eb8-qIdtmTcyGCyrcjBA2NiQiFcb5hXekZh-aeTLMZ-5Z5vg8m_5t3EDoBpYc
-4Pbt-ZIzXpTXGiJpgs4B8VgbndiiWOIdGnXsLKH_QD_uc8I2VIoGSFuAFPQZHbC3fd03RFxCYWlCe7JVZiWLuGnIaBCRErLUC3D2JL5f2tCxPDNXevsJEw25
-KplaRgJGrpx4GhDd1eb7uJ7y1xBekas4KuAUn8C-J1a1YRjFzTwZZumJxC8Zqn6sQKNdRaBDqol3GrYxVT6KOCKd
-}
-
-AzureEntityColoring(AzureAPIManagement)
-!define AzureAPIManagement(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAPIManagement, AzureAPIManagement)
-!define AzureAPIManagement(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAPIManagement, AzureAPIManagement)
diff --git a/dist/Web/AzureAPIManagement.svg b/dist/Web/AzureAPIManagement.svg
deleted file mode 100644
index 3e734a75..00000000
--- a/dist/Web/AzureAPIManagement.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="58pt" viewBox="0 0 70 58" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 28.699219 39.355469 L 16.238281 39.355469 C 10.078125 39.355469 5.039063 34.386719 5.039063 28.171875 C 5.039063 21.957031 9.800781 16.984375 16.238281 16.984375 C 17.359375 16.984375 18.621094 17.261719 20.019531 17.398438 L 22.398438 18.089844 L 23.101563 15.742188 C 25.339844 8.5625 32.339844 4.144531 40.320313 4.144531 C 49.980469 4.144531 57.398438 11.460938 57.398438 20.992188 C 57.398438 22.507813 57.121094 24.027344 56.699219 25.546875 L 55.71875 29 L 59.5 28.585938 C 59.78125 28.585938 59.921875 28.585938 60.199219 28.585938 C 63 28.585938 65.238281 30.933594 65.238281 33.558594 C 65.238281 36.179688 63.28125 38.113281 60.898438 38.527344 C 60.898438 38.527344 48.859375 38.527344 48.441406 38.527344 C 48.019531 35.078125 46.199219 32.039063 43.820313 29.691406 C 40.738281 26.652344 36.539063 24.855469 32.199219 24.855469 C 29.121094 24.855469 26.039063 25.6875 23.660156 27.203125 L 26.320313 31.347656 C 28.28125 30.242188 30.238281 29.828125 32.480469 29.828125 C 35.558594 29.828125 38.640625 30.933594 40.601563 33.28125 C 42.839844 35.492188 44.101563 38.253906 44.101563 41.289063 C 44.101563 44.328125 42.980469 47.367188 40.601563 49.300781 C 38.359375 51.648438 35.558594 52.753906 32.480469 52.753906 C 30.238281 52.753906 28.140625 52.0625 26.320313 50.820313 L 23.660156 54.960938 C 26.320313 56.480469 29.398438 57.585938 32.199219 57.585938 C 36.539063 57.585938 40.738281 56.066406 43.820313 52.890625 C 46.480469 50.265625 48.019531 46.8125 48.441406 43.222656 C 49.140625 43.222656 61.179688 43.222656 61.179688 43.222656 L 61.460938 43.222656 C 66.5 42.808594 70.28125 38.527344 70.28125 33.28125 C 70.28125 29.136719 66.359375 25.269531 61.738281 24.441406 C 62.019531 23.613281 62.019531 23.199219 62.019531 21.820313 C 62.019531 9.667969 53.339844 0 39.480469 0 C 30.660156 0 22.820313 4.972656 19.601563 12.980469 C 18.480469 12.980469 17.640625 12.566406 16.378906 12.566406 C 7.28125 12.429688 0 19.332031 0 28.171875 C 0 36.871094 7.28125 43.777344 15.960938 43.777344 L 29.679688 43.777344 Z M 28.699219 39.355469 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(40.784314%,12.941176%,47.843137%);fill-opacity:1;" d="M 39.761719 41.152344 C 39.761719 45.421875 36.25 48.886719 31.921875 48.886719 C 27.589844 48.886719 24.078125 45.421875 24.078125 41.152344 C 24.078125 36.882813 27.589844 33.417969 31.921875 33.417969 C 36.25 33.417969 39.761719 36.882813 39.761719 41.152344 Z M 39.761719 41.152344 "/>
-</g>
-</svg>
diff --git a/dist/Web/AzureAppServiceCertificate(m).png b/dist/Web/AzureAppServiceCertificate(m).png
new file mode 100644
index 00000000..7e4c524d
Binary files /dev/null and b/dist/Web/AzureAppServiceCertificate(m).png differ
diff --git a/dist/Web/AzureAppServiceCertificate(m).svg b/dist/Web/AzureAppServiceCertificate(m).svg
new file mode 100644
index 00000000..9c4590ff
--- /dev/null
+++ b/dist/Web/AzureAppServiceCertificate(m).svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(147,209,255);fill-opacity:1;" d="M 70 52.597656 C 70 55.363281 67.761719 57.597656 65 57.597656 L 5 57.597656 C 2.238281 57.601563 0 55.363281 0 52.597656 L 0 10.597656 C 0 7.839844 2.238281 5.601563 5 5.601563 L 65 5.601563 C 67.761719 5.601563 70 7.839844 70 10.597656 Z M 70 52.597656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 6 11.601563 L 64 11.601563 L 64 51.601563 L 6 51.601563 Z M 6 11.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 25 42.601563 C 25 47.019531 21.417969 50.601563 17 50.601563 C 12.582031 50.601563 9 47.019531 9 42.601563 C 9 38.183594 12.582031 34.601563 17 34.601563 C 21.417969 34.601563 25 38.183594 25 42.601563 Z M 25 42.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 23 42.601563 C 23 45.914063 20.3125 48.601563 17 48.601563 C 13.6875 48.601563 11 45.914063 11 42.601563 C 11 39.285156 13.6875 36.601563 17 36.601563 C 20.3125 36.601563 23 39.285156 23 42.601563 Z M 23 42.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,135,236);fill-opacity:1;" d="M 17 48.597656 C 14.671875 48.597656 12.554688 47.703125 10.957031 46.25 L 10.007813 64.492188 L 16.898438 57.601563 L 23.898438 64.601563 L 24 63.601563 L 23.042969 46.25 C 21.445313 47.703125 19.328125 48.597656 17 48.597656 Z M 17 48.597656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 57.347656 40.71875 C 57.347656 41.335938 56.84375 41.835938 56.226563 41.835938 L 31.117188 41.835938 C 30.5 41.835938 30 41.335938 30 40.71875 C 30 40.101563 30.5 39.601563 31.117188 39.601563 L 56.226563 39.601563 C 56.84375 39.601563 57.347656 40.101563 57.347656 40.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 57.347656 34.597656 C 57.347656 35.21875 56.84375 35.71875 56.226563 35.71875 L 31.117188 35.71875 C 30.5 35.71875 30 35.21875 30 34.597656 C 30 33.980469 30.5 33.480469 31.117188 33.480469 L 56.226563 33.480469 C 56.84375 33.480469 57.347656 33.980469 57.347656 34.597656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,140,244);fill-opacity:1;" d="M 57.347656 25.601563 C 57.347656 26.21875 56.84375 26.71875 56.226563 26.71875 L 14.117188 26.71875 C 13.5 26.71875 13 26.21875 13 25.601563 C 13 24.984375 13.5 24.480469 14.117188 24.480469 L 56.226563 24.480469 C 56.84375 24.480469 57.347656 24.980469 57.347656 25.601563 "/>
+</g>
+</svg>
diff --git a/dist/Web/AzureAppServiceCertificate.png b/dist/Web/AzureAppServiceCertificate.png
new file mode 100644
index 00000000..14454ec2
Binary files /dev/null and b/dist/Web/AzureAppServiceCertificate.png differ
diff --git a/dist/Web/AzureAppServiceCertificate.puml b/dist/Web/AzureAppServiceCertificate.puml
new file mode 100644
index 00000000..ad9511c4
--- /dev/null
+++ b/dist/Web/AzureAppServiceCertificate.puml
@@ -0,0 +1,9 @@
+sprite $AzureAppServiceCertificate [70x70/16z] {
+xT87TiD024LHce2__mMx5t9YMn9Apzm5l2b0dspWJUX4T2icqW_0h7-Jj6b1RJ8gRutAgB0kzxmIM6vwMh5OJlxKZ4P5z0bvMM6cmZjRfuw3k4Sjdz9d5ST5
+SFzV0WW_222vMt6aNoIYMM4W_0fGEk6d7bScfDy4Ocv6zh0I2By3w6XQMqbu0N3hN_BTNJgLg9L0zYfMVpVXlKfzKW3Ih1WGjuXJiq8uo8XC0DAjC0hztegW
+i4RbP4BXsh2r8dhbA49NuO-e2F7sYfHlTXIvei5KJ3Womr5Gar_sv9J9TkKSEMVQbJX7Bfb-nUZ2-fKqkZ4mzIWLHZ_6i0S
+}
+
+AzureEntityColoring(AzureAppServiceCertificate)
+!define AzureAppServiceCertificate(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppServiceCertificate, AzureAppServiceCertificate)
+!define AzureAppServiceCertificate(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppServiceCertificate, AzureAppServiceCertificate)
diff --git a/dist/Web/AzureAppServiceCertificate.svg b/dist/Web/AzureAppServiceCertificate.svg
new file mode 100644
index 00000000..fff0f6d2
--- /dev/null
+++ b/dist/Web/AzureAppServiceCertificate.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(98.823529%,81.960784%,8.627451%);fill-opacity:1;" d="M 70 52.597656 C 70 55.363281 67.761719 57.597656 65 57.597656 L 5 57.597656 C 2.238281 57.601563 0 55.363281 0 52.597656 L 0 10.597656 C 0 7.839844 2.238281 5.601563 5 5.601563 L 65 5.601563 C 67.761719 5.601563 70 7.839844 70 10.597656 Z M 70 52.597656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 6 11.601563 L 64 11.601563 L 64 51.601563 L 6 51.601563 Z M 6 11.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 25 42.601563 C 25 47.019531 21.417969 50.601563 17 50.601563 C 12.582031 50.601563 9 47.019531 9 42.601563 C 9 38.183594 12.582031 34.601563 17 34.601563 C 21.417969 34.601563 25 38.183594 25 42.601563 Z M 25 42.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 23 42.601563 C 23 45.914063 20.3125 48.601563 17 48.601563 C 13.6875 48.601563 11 45.914063 11 42.601563 C 11 39.285156 13.6875 36.601563 17 36.601563 C 20.3125 36.601563 23 39.285156 23 42.601563 Z M 23 42.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 17 48.597656 C 14.671875 48.597656 12.554688 47.703125 10.957031 46.25 L 10.007813 64.492188 L 16.898438 57.601563 L 23.898438 64.601563 L 24 63.601563 L 23.042969 46.25 C 21.445313 47.703125 19.328125 48.597656 17 48.597656 Z M 17 48.597656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 57.347656 40.71875 C 57.347656 41.335938 56.84375 41.835938 56.226563 41.835938 L 31.117188 41.835938 C 30.5 41.835938 30 41.335938 30 40.71875 C 30 40.101563 30.5 39.601563 31.117188 39.601563 L 56.226563 39.601563 C 56.84375 39.601563 57.347656 40.101563 57.347656 40.71875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 57.347656 34.597656 C 57.347656 35.21875 56.84375 35.71875 56.226563 35.71875 L 31.117188 35.71875 C 30.5 35.71875 30 35.21875 30 34.597656 C 30 33.980469 30.5 33.480469 31.117188 33.480469 L 56.226563 33.480469 C 56.84375 33.480469 57.347656 33.980469 57.347656 34.597656 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 57.347656 25.601563 C 57.347656 26.21875 56.84375 26.71875 56.226563 26.71875 L 14.117188 26.71875 C 13.5 26.71875 13 26.21875 13 25.601563 C 13 24.984375 13.5 24.480469 14.117188 24.480469 L 56.226563 24.480469 C 56.84375 24.480469 57.347656 24.980469 57.347656 25.601563 "/>
+</g>
+</svg>
diff --git a/dist/Web/AzureAppServiceDomain(m).png b/dist/Web/AzureAppServiceDomain(m).png
new file mode 100644
index 00000000..d560f62d
Binary files /dev/null and b/dist/Web/AzureAppServiceDomain(m).png differ
diff --git a/dist/Web/AzureAppServiceDomain(m).svg b/dist/Web/AzureAppServiceDomain(m).svg
new file mode 100644
index 00000000..864f5754
--- /dev/null
+++ b/dist/Web/AzureAppServiceDomain(m).svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 2.820313 5.386719 C 1.269531 5.386719 0.0117188 6.644531 0.0117188 8.195313 L 0.0117188 62.261719 C 0.0117188 63.816406 1.269531 65.074219 2.820313 65.074219 L 5.882813 65.074219 L 61.066406 5.386719 Z M 2.820313 5.386719 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,102,178);fill-opacity:1;" d="M 0 62.261719 C 0 63.816406 1.257813 65.074219 2.808594 65.074219 L 67.191406 65.074219 C 68.742188 65.074219 70 63.816406 70 62.261719 L 70 18.402344 L 0 18.402344 Z M 0 62.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 67.191406 5.386719 L 2.808594 5.386719 C 1.257813 5.386719 0 6.644531 0 8.195313 L 0 23.074219 L 70 23.074219 L 70 8.195313 C 70 6.644531 68.742188 5.386719 67.191406 5.386719 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 18 12.078125 L 65.140625 12.078125 L 65.140625 17.59375 L 18 17.59375 Z M 18 12.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 15.835938 14.742188 C 15.835938 18.511719 12.777344 21.570313 9.003906 21.570313 C 5.234375 21.570313 2.175781 18.511719 2.175781 14.742188 C 2.175781 10.96875 5.234375 7.910156 9.003906 7.910156 C 12.773438 7.910156 15.835938 10.96875 15.835938 14.742188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.28125 15.511719 L 11.378906 18.78125 L 9.699219 18.78125 L 5.554688 14.835938 L 9.683594 10.890625 L 11.359375 10.890625 L 8.28125 14.140625 L 15.832031 14.140625 L 15.832031 15.511719 Z M 8.28125 15.511719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 24.199219 37.0625 L 20.5 49.40625 L 18.449219 49.40625 L 15.90625 40.570313 C 15.808594 40.230469 15.746094 39.847656 15.714844 39.425781 L 15.664063 39.425781 C 15.640625 39.714844 15.558594 40.085938 15.414063 40.546875 L 12.652344 49.40625 L 10.675781 49.40625 L 6.9375 37.0625 L 9.011719 37.0625 L 11.566406 46.34375 C 11.648438 46.625 11.703125 46.992188 11.734375 47.453125 L 11.832031 47.453125 C 11.855469 47.097656 11.929688 46.722656 12.050781 46.320313 L 14.894531 37.0625 L 16.703125 37.0625 L 19.257813 46.367188 C 19.339844 46.664063 19.398438 47.035156 19.4375 47.476563 L 19.535156 47.476563 C 19.550781 47.160156 19.621094 46.792969 19.738281 46.367188 L 22.246094 37.0625 Z M 24.199219 37.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.273438 37.0625 L 39.574219 49.40625 L 37.523438 49.40625 L 34.980469 40.570313 C 34.882813 40.230469 34.820313 39.847656 34.789063 39.425781 L 34.738281 39.425781 C 34.714844 39.714844 34.628906 40.085938 34.484375 40.546875 L 31.722656 49.40625 L 29.75 49.40625 L 26.011719 37.0625 L 28.085938 37.0625 L 30.640625 46.34375 C 30.722656 46.625 30.777344 46.992188 30.8125 47.453125 L 30.90625 47.453125 C 30.929688 47.097656 31.003906 46.722656 31.125 46.320313 L 33.96875 37.0625 L 35.777344 37.0625 L 38.332031 46.367188 C 38.414063 46.664063 38.476563 47.035156 38.515625 47.476563 L 38.609375 47.476563 C 38.625 47.160156 38.695313 46.792969 38.816406 46.367188 L 41.324219 37.0625 Z M 43.273438 37.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 62.347656 37.0625 L 58.648438 49.40625 L 56.597656 49.40625 L 54.054688 40.570313 C 53.957031 40.230469 53.894531 39.847656 53.863281 39.425781 L 53.8125 39.425781 C 53.789063 39.714844 53.707031 40.085938 53.558594 40.546875 L 50.800781 49.40625 L 48.820313 49.40625 L 45.085938 37.0625 L 47.160156 37.0625 L 49.714844 46.34375 C 49.796875 46.625 49.851563 46.992188 49.882813 47.453125 L 49.980469 47.453125 C 50.003906 47.097656 50.078125 46.722656 50.195313 46.320313 L 53.042969 37.0625 L 54.851563 37.0625 L 57.40625 46.367188 C 57.484375 46.664063 57.546875 47.035156 57.585938 47.476563 L 57.683594 47.476563 C 57.699219 47.160156 57.765625 46.792969 57.886719 46.367188 L 60.394531 37.0625 Z M 62.347656 37.0625 "/>
+</g>
+</svg>
diff --git a/dist/Web/AzureAppServiceDomain.png b/dist/Web/AzureAppServiceDomain.png
new file mode 100644
index 00000000..2bbb5576
Binary files /dev/null and b/dist/Web/AzureAppServiceDomain.png differ
diff --git a/dist/Web/AzureAppServiceDomain.puml b/dist/Web/AzureAppServiceDomain.puml
new file mode 100644
index 00000000..1b92231f
--- /dev/null
+++ b/dist/Web/AzureAppServiceDomain.puml
@@ -0,0 +1,12 @@
+sprite $AzureAppServiceDomain [70x70/16z] {
+xTC7SYGX30NGhu08klzzrrAFARTnPDYA_WvqqYiY_cV-Gh8VpGY3otxiDQed57jxlutOxNuNiVlz9cBpdkXNZAtAHEAUy8FGZ4JLAu8vm_XTtYWqzUSKuYlF
+ACPFZkZ6n2tJD-5RT2h9_72bRScowxQGzGJiAv6yt4EMqbt4scyoFiilZ3xyinn1_0ZYHn3VGFQL6xBc2E9743-2-0QofNG_e7G_eFJn2uMvNgraeo-toXR8
+44x8kBgnUKIvPItRNH6KQ0gG6l0YGQ8d3QZn8QDx1SVb04fYg7UbWADXf6PnLq4nd09eLbAMHxygBeqmxae3yh-afcaHUdpAH56Pbg3cVudw7jPTOLZqo0Xv
+SutIujEYeIbYAYoi0RNG3FPUKMZKDGtj6bw5nAUzmhBth-Dgg3qqGN-lrAY4D8FcNsiZPu791yHxY8yvLWmd2d7TBuHcCHsW9gYvxmLje4JfY2542in9Oe2z
+eQoAnWIq71LH8bvHAbgKjfZEI8TqMBooWhOg1Y7EDI-GH7o0XKREy5mEGWbmG1XZLHe8vT5Qzmo3D3IYsNi59IWKCxKgyjYtX3dt1hIhT3vgk403waUAiMHR
+M8TVwI9vsKJzaI7IvwkPdMEyvWZYHn0_WlYA753s43-2-174Zo2-84ygtVTp1F4ZYDTbj-s4Jo06qfUKPwACZ_ENVm
+}
+
+AzureEntityColoring(AzureAppServiceDomain)
+!define AzureAppServiceDomain(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppServiceDomain, AzureAppServiceDomain)
+!define AzureAppServiceDomain(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppServiceDomain, AzureAppServiceDomain)
diff --git a/dist/Web/AzureAppServiceDomain.svg b/dist/Web/AzureAppServiceDomain.svg
new file mode 100644
index 00000000..e6d5b40b
--- /dev/null
+++ b/dist/Web/AzureAppServiceDomain.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 2.820313 5.386719 C 1.269531 5.386719 0.0117188 6.644531 0.0117188 8.195313 L 0.0117188 62.261719 C 0.0117188 63.816406 1.269531 65.074219 2.820313 65.074219 L 5.882813 65.074219 L 61.066406 5.386719 Z M 2.820313 5.386719 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 62.261719 C 0 63.816406 1.257813 65.074219 2.808594 65.074219 L 67.191406 65.074219 C 68.742188 65.074219 70 63.816406 70 62.261719 L 70 18.402344 L 0 18.402344 Z M 0 62.261719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 67.191406 5.386719 L 2.808594 5.386719 C 1.257813 5.386719 0 6.644531 0 8.195313 L 0 23.074219 L 70 23.074219 L 70 8.195313 C 70 6.644531 68.742188 5.386719 67.191406 5.386719 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 18 12.078125 L 65.140625 12.078125 L 65.140625 17.59375 L 18 17.59375 Z M 18 12.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 15.835938 14.742188 C 15.835938 18.511719 12.777344 21.570313 9.003906 21.570313 C 5.234375 21.570313 2.175781 18.511719 2.175781 14.742188 C 2.175781 10.96875 5.234375 7.910156 9.003906 7.910156 C 12.773438 7.910156 15.835938 10.96875 15.835938 14.742188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.28125 15.511719 L 11.378906 18.78125 L 9.699219 18.78125 L 5.554688 14.835938 L 9.683594 10.890625 L 11.359375 10.890625 L 8.28125 14.140625 L 15.832031 14.140625 L 15.832031 15.511719 Z M 8.28125 15.511719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 24.199219 37.0625 L 20.5 49.40625 L 18.449219 49.40625 L 15.90625 40.570313 C 15.808594 40.230469 15.746094 39.847656 15.714844 39.425781 L 15.664063 39.425781 C 15.640625 39.714844 15.558594 40.085938 15.414063 40.546875 L 12.652344 49.40625 L 10.675781 49.40625 L 6.9375 37.0625 L 9.011719 37.0625 L 11.566406 46.34375 C 11.648438 46.625 11.703125 46.992188 11.734375 47.453125 L 11.832031 47.453125 C 11.855469 47.097656 11.929688 46.722656 12.050781 46.320313 L 14.894531 37.0625 L 16.703125 37.0625 L 19.257813 46.367188 C 19.339844 46.664063 19.398438 47.035156 19.4375 47.476563 L 19.535156 47.476563 C 19.550781 47.160156 19.621094 46.792969 19.738281 46.367188 L 22.246094 37.0625 Z M 24.199219 37.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.273438 37.0625 L 39.574219 49.40625 L 37.523438 49.40625 L 34.980469 40.570313 C 34.882813 40.230469 34.820313 39.847656 34.789063 39.425781 L 34.738281 39.425781 C 34.714844 39.714844 34.628906 40.085938 34.484375 40.546875 L 31.722656 49.40625 L 29.75 49.40625 L 26.011719 37.0625 L 28.085938 37.0625 L 30.640625 46.34375 C 30.722656 46.625 30.777344 46.992188 30.8125 47.453125 L 30.90625 47.453125 C 30.929688 47.097656 31.003906 46.722656 31.125 46.320313 L 33.96875 37.0625 L 35.777344 37.0625 L 38.332031 46.367188 C 38.414063 46.664063 38.476563 47.035156 38.515625 47.476563 L 38.609375 47.476563 C 38.625 47.160156 38.695313 46.792969 38.816406 46.367188 L 41.324219 37.0625 Z M 43.273438 37.0625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 62.347656 37.0625 L 58.648438 49.40625 L 56.597656 49.40625 L 54.054688 40.570313 C 53.957031 40.230469 53.894531 39.847656 53.863281 39.425781 L 53.8125 39.425781 C 53.789063 39.714844 53.707031 40.085938 53.558594 40.546875 L 50.800781 49.40625 L 48.820313 49.40625 L 45.085938 37.0625 L 47.160156 37.0625 L 49.714844 46.34375 C 49.796875 46.625 49.851563 46.992188 49.882813 47.453125 L 49.980469 47.453125 C 50.003906 47.097656 50.078125 46.722656 50.195313 46.320313 L 53.042969 37.0625 L 54.851563 37.0625 L 57.40625 46.367188 C 57.484375 46.664063 57.546875 47.035156 57.585938 47.476563 L 57.683594 47.476563 C 57.699219 47.160156 57.765625 46.792969 57.886719 46.367188 L 60.394531 37.0625 Z M 62.347656 37.0625 "/>
+</g>
+</svg>
diff --git a/dist/Web/AzureAppServiceEnvironment(m).png b/dist/Web/AzureAppServiceEnvironment(m).png
new file mode 100644
index 00000000..af975e93
Binary files /dev/null and b/dist/Web/AzureAppServiceEnvironment(m).png differ
diff --git a/dist/Web/AzureAppServiceEnvironment(m).svg b/dist/Web/AzureAppServiceEnvironment(m).svg
new file mode 100644
index 00000000..09622ed9
--- /dev/null
+++ b/dist/Web/AzureAppServiceEnvironment(m).svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 26.878906 46.898438 C 25.621094 45.640625 24.78125 44.101563 24.359375 42.28125 C 23.238281 37.101563 26.320313 32.058594 31.5 30.941406 C 32.621094 30.660156 33.601563 30.660156 34.578125 30.800781 C 35 26.039063 37.941406 21.699219 42.28125 19.601563 C 41.019531 19.179688 39.621094 18.898438 38.078125 18.898438 C 32.058594 18.898438 26.878906 22.820313 25.058594 28.421875 C 24.078125 28.140625 23.101563 27.859375 21.980469 27.859375 C 16.800781 27.859375 12.601563 32.058594 12.601563 37.378906 C 12.601563 42.699219 16.800781 46.898438 21.980469 46.898438 Z M 26.878906 46.898438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(65,174,255);fill-opacity:1;" d="M 28.140625 65.101563 L 4.898438 65.101563 L 4.898438 42 L 9.660156 42 C 9.101563 40.601563 8.820313 39.058594 8.820313 37.378906 L 8.820313 37.101563 L 0 37.101563 L 0 70 L 33.039063 70 L 33.039063 50.398438 L 28.140625 50.398438 Z M 60.898438 42 L 65.101563 42 L 65.101563 65.238281 L 41.859375 65.238281 L 41.859375 50.539063 L 36.960938 50.539063 L 36.960938 70 L 70 70 L 70 37.101563 L 59.640625 37.101563 C 60.339844 38.5 60.898438 39.898438 60.898438 41.71875 Z M 4.898438 28 L 4.898438 4.898438 L 28.140625 4.898438 L 28.140625 18.339844 C 29.539063 17.21875 31.359375 16.519531 33.039063 16.101563 L 33.039063 0 L 0 0 L 0 32.898438 L 9.519531 32.898438 C 10.21875 31.21875 11.199219 29.398438 12.601563 28.140625 Z M 41.859375 15.539063 L 41.859375 4.898438 L 65.101563 4.898438 L 65.101563 28.140625 L 54.878906 28.140625 C 55.300781 29.539063 55.578125 31.21875 55.578125 32.898438 L 55.578125 33.039063 L 70 33.039063 L 70 0 L 36.960938 0 L 36.960938 15.261719 C 37.378906 15.261719 37.660156 15.121094 38.078125 15.121094 C 39.339844 15.261719 40.601563 15.261719 41.859375 15.539063 Z M 41.859375 15.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 57.121094 41.578125 C 57.121094 38.640625 54.738281 36.398438 51.941406 36.398438 L 51.238281 36.398438 C 51.519531 35.28125 51.800781 34.019531 51.800781 32.761719 C 51.800781 25.058594 45.640625 18.898438 37.941406 18.898438 C 31.921875 18.898438 26.738281 22.820313 24.921875 28.421875 C 23.941406 28.140625 22.960938 27.859375 21.839844 27.859375 C 16.660156 27.859375 12.460938 32.058594 12.460938 37.378906 C 12.460938 42.699219 16.660156 46.898438 21.839844 46.898438 L 52.359375 46.898438 C 55.019531 46.621094 57.121094 44.378906 57.121094 41.578125 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Web/AzureAppServiceEnvironment.png b/dist/Web/AzureAppServiceEnvironment.png
new file mode 100644
index 00000000..c5b4d675
Binary files /dev/null and b/dist/Web/AzureAppServiceEnvironment.png differ
diff --git a/dist/Web/AzureAppServiceEnvironment.puml b/dist/Web/AzureAppServiceEnvironment.puml
new file mode 100644
index 00000000..3bc6cb2b
--- /dev/null
+++ b/dist/Web/AzureAppServiceEnvironment.puml
@@ -0,0 +1,10 @@
+sprite $AzureAppServiceEnvironment [70x70/16z] {
+xTXNieCm38LXjSF-btpJn8o2yF7jpVyp-KQXuusb8eBjxIr5-g8eqkS_M5dAKbJD_1qAJ4XS2HKMLwZ1bKmj0eXmVRkYWKUNpUoDYYFRha7VeaH5Bjdh5HIa
+PRWI1SdqL67xfFGw1IUA4uMCafqfk1Hvlgi748vMoHtiaM6hUJdDpfN82ReWbmp7kWsj4t9G9S2-OtGqIczmfUvlZkHlj5GKXgGoJESGZ1MRL4pbgNZakLku
+ijzeFB8jUvfbvXNB-yF7bRfpUfmf_7slxXYks479CqTVgUYbE9v6Di_eu2xbiqeCxtKsnu3TCJsu4bFtNHqdmXNUDoXgb_O_-C_UL9UobALu7uhYrXPh5UUy
+5m
+}
+
+AzureEntityColoring(AzureAppServiceEnvironment)
+!define AzureAppServiceEnvironment(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppServiceEnvironment, AzureAppServiceEnvironment)
+!define AzureAppServiceEnvironment(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppServiceEnvironment, AzureAppServiceEnvironment)
diff --git a/dist/Web/AzureAppServiceEnvironment.svg b/dist/Web/AzureAppServiceEnvironment.svg
new file mode 100644
index 00000000..e05ff1dc
--- /dev/null
+++ b/dist/Web/AzureAppServiceEnvironment.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.878906 46.898438 C 25.621094 45.640625 24.78125 44.101563 24.359375 42.28125 C 23.238281 37.101563 26.320313 32.058594 31.5 30.941406 C 32.621094 30.660156 33.601563 30.660156 34.578125 30.800781 C 35 26.039063 37.941406 21.699219 42.28125 19.601563 C 41.019531 19.179688 39.621094 18.898438 38.078125 18.898438 C 32.058594 18.898438 26.878906 22.820313 25.058594 28.421875 C 24.078125 28.140625 23.101563 27.859375 21.980469 27.859375 C 16.800781 27.859375 12.601563 32.058594 12.601563 37.378906 C 12.601563 42.699219 16.800781 46.898438 21.980469 46.898438 Z M 26.878906 46.898438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 28.140625 65.101563 L 4.898438 65.101563 L 4.898438 42 L 9.660156 42 C 9.101563 40.601563 8.820313 39.058594 8.820313 37.378906 L 8.820313 37.101563 L 0 37.101563 L 0 70 L 33.039063 70 L 33.039063 50.398438 L 28.140625 50.398438 Z M 60.898438 42 L 65.101563 42 L 65.101563 65.238281 L 41.859375 65.238281 L 41.859375 50.539063 L 36.960938 50.539063 L 36.960938 70 L 70 70 L 70 37.101563 L 59.640625 37.101563 C 60.339844 38.5 60.898438 39.898438 60.898438 41.71875 Z M 4.898438 28 L 4.898438 4.898438 L 28.140625 4.898438 L 28.140625 18.339844 C 29.539063 17.21875 31.359375 16.519531 33.039063 16.101563 L 33.039063 0 L 0 0 L 0 32.898438 L 9.519531 32.898438 C 10.21875 31.21875 11.199219 29.398438 12.601563 28.140625 Z M 41.859375 15.539063 L 41.859375 4.898438 L 65.101563 4.898438 L 65.101563 28.140625 L 54.878906 28.140625 C 55.300781 29.539063 55.578125 31.21875 55.578125 32.898438 L 55.578125 33.039063 L 70 33.039063 L 70 0 L 36.960938 0 L 36.960938 15.261719 C 37.378906 15.261719 37.660156 15.121094 38.078125 15.121094 C 39.339844 15.261719 40.601563 15.261719 41.859375 15.539063 Z M 41.859375 15.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.121094 41.578125 C 57.121094 38.640625 54.738281 36.398438 51.941406 36.398438 L 51.238281 36.398438 C 51.519531 35.28125 51.800781 34.019531 51.800781 32.761719 C 51.800781 25.058594 45.640625 18.898438 37.941406 18.898438 C 31.921875 18.898438 26.738281 22.820313 24.921875 28.421875 C 23.941406 28.140625 22.960938 27.859375 21.839844 27.859375 C 16.660156 27.859375 12.460938 32.058594 12.460938 37.378906 C 12.460938 42.699219 16.660156 46.898438 21.839844 46.898438 L 52.359375 46.898438 C 55.019531 46.621094 57.121094 44.378906 57.121094 41.578125 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Web/AzureAppServicePlan(m).png b/dist/Web/AzureAppServicePlan(m).png
new file mode 100644
index 00000000..08c7e27b
Binary files /dev/null and b/dist/Web/AzureAppServicePlan(m).png differ
diff --git a/dist/Web/AzureAppServicePlan(m).svg b/dist/Web/AzureAppServicePlan(m).svg
new file mode 100644
index 00000000..c947f99f
--- /dev/null
+++ b/dist/Web/AzureAppServicePlan(m).svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 32.378906 70 C 30.839844 68.472656 29.695313 66.503906 29.171875 64.226563 C 27.722656 57.875 31.648438 51.554688 37.953125 50.117188 C 39.261719 49.820313 40.5625 49.765625 41.824219 49.910156 C 42.398438 43.972656 46.019531 38.691406 51.414063 36.085938 C 49.773438 35.5625 48.027344 35.273438 46.214844 35.273438 C 38.664063 35.273438 32.257813 40.203125 29.984375 47.050781 C 28.785156 46.628906 27.503906 46.390625 26.160156 46.390625 C 19.695313 46.390625 14.460938 51.675781 14.460938 58.191406 C 14.460938 64.714844 19.695313 70 26.160156 70 C 26.160156 70 26.171875 69.996094 26.179688 69.996094 L 26.179688 70 Z M 32.378906 70 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 41.109375 66.445313 C 41.109375 68.410156 39.519531 70 37.554688 70 L 3.554688 70 C 1.589844 70 0 68.410156 0 66.445313 L 0 3.554688 C 0 1.589844 1.589844 0 3.554688 0 L 37.554688 0 C 39.519531 0 41.109375 1.589844 41.109375 3.554688 Z M 41.109375 66.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 6.042969 37.832031 C 6.042969 35.367188 8.042969 33.367188 10.511719 33.367188 L 30.96875 33.367188 C 33.4375 33.367188 35.4375 35.367188 35.4375 37.832031 C 35.4375 40.300781 33.4375 42.300781 30.96875 42.300781 L 10.511719 42.300781 C 8.042969 42.300781 6.042969 40.300781 6.042969 37.832031 Z M 6.042969 37.832031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 13.699219 37.832031 C 13.699219 39.488281 12.355469 40.832031 10.699219 40.832031 C 9.042969 40.832031 7.703125 39.488281 7.703125 37.832031 C 7.703125 36.175781 9.042969 34.835938 10.699219 34.835938 C 12.355469 34.835938 13.699219 36.175781 13.699219 37.832031 Z M 13.699219 37.832031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 6.042969 24.5625 C 6.042969 22.097656 8.042969 20.09375 10.511719 20.09375 L 30.96875 20.09375 C 33.4375 20.09375 35.4375 22.097656 35.4375 24.5625 C 35.4375 27.03125 33.4375 29.03125 30.96875 29.03125 L 10.511719 29.03125 C 8.042969 29.03125 6.042969 27.03125 6.042969 24.5625 Z M 6.042969 24.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 13.699219 24.5625 C 13.699219 26.21875 12.355469 27.5625 10.699219 27.5625 C 9.042969 27.5625 7.703125 26.21875 7.703125 24.5625 C 7.703125 22.90625 9.042969 21.5625 10.699219 21.5625 C 12.355469 21.5625 13.699219 22.90625 13.699219 24.5625 Z M 13.699219 24.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 6.042969 11.289063 C 6.042969 8.824219 8.042969 6.824219 10.511719 6.824219 L 30.96875 6.824219 C 33.4375 6.824219 35.4375 8.824219 35.4375 11.289063 C 35.4375 13.757813 33.4375 15.757813 30.96875 15.757813 L 10.511719 15.757813 C 8.042969 15.761719 6.042969 13.757813 6.042969 11.289063 Z M 6.042969 11.289063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(115,195,255);fill-opacity:1;" d="M 13.699219 11.289063 C 13.699219 12.945313 12.355469 14.289063 10.699219 14.289063 C 9.042969 14.289063 7.703125 12.945313 7.703125 11.289063 C 7.703125 9.636719 9.042969 8.292969 10.699219 8.292969 C 12.355469 8.292969 13.699219 9.636719 13.699219 11.289063 Z M 13.699219 11.289063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 69.929688 63.523438 C 69.929688 59.945313 67.058594 57.046875 63.507813 57.046875 C 63.242188 57.046875 62.980469 57.066406 62.726563 57.101563 C 63.117188 55.648438 63.335938 54.117188 63.335938 52.535156 C 63.335938 43.003906 55.667969 35.273438 46.21875 35.273438 C 38.664063 35.273438 32.261719 40.207031 29.984375 47.050781 C 28.785156 46.628906 27.503906 46.390625 26.164063 46.390625 C 19.695313 46.390625 14.464844 51.675781 14.464844 58.195313 C 14.464844 64.714844 19.695313 70 26.164063 70 C 26.164063 70 26.175781 69.996094 26.179688 69.996094 L 26.179688 70 L 64.03125 70 L 64.023438 69.96875 C 67.324219 69.707031 69.929688 66.925781 69.929688 63.523438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Web/AzureAppServicePlan.png b/dist/Web/AzureAppServicePlan.png
new file mode 100644
index 00000000..13df96fc
Binary files /dev/null and b/dist/Web/AzureAppServicePlan.png differ
diff --git a/dist/Web/AzureAppServicePlan.puml b/dist/Web/AzureAppServicePlan.puml
new file mode 100644
index 00000000..ee5ef2a5
--- /dev/null
+++ b/dist/Web/AzureAppServicePlan.puml
@@ -0,0 +1,10 @@
+sprite $AzureAppServicePlan [70x70/16z] {
+vTK7mjiW38RXC2IckFznIzh-4_WYnzbv3_3O1eGFBjNJPJx0NDKLe9AgCeEKgirTHF7FfaXR91kKrafC0XYD8YrvxsdEg9Kcv7iHl8n6gVvOsAU8aE-bdKeh
+j7eL_RfqHafj-_Qe9m8CZO9xSqNcookoHP4c5UpqfKyTLdPCm8MdiOc_mCqWBNQ4wivfR2tlk34lU7lZtboHUTkKTf4_h4JYWgVHMEkSDUZi1jyhwxT9z9K5
+quZcA7uHVCoTCTEPVo4zC_qYNdzHeW7fkUdg1g8yHUA0Z0mOHl0cNupkr6LQAcor4r1uYVIqIYIaE9rI4D8xfPISSy6lqdD8oO7-nX3fqLefWMRnhAMIYVIA
+7HI0y2etLmeYnlnSOO2ebGmClH8keW14lxfv8yBc8eftTbJI7C6v4-_2kln55BPmZrWPmVF2sdufwI9AvOie-I9AJMSmb273kWpNeSmRcJu4iOwbi86XFf5_
+}
+
+AzureEntityColoring(AzureAppServicePlan)
+!define AzureAppServicePlan(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppServicePlan, AzureAppServicePlan)
+!define AzureAppServicePlan(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppServicePlan, AzureAppServicePlan)
diff --git a/dist/Web/AzureAppServicePlan.svg b/dist/Web/AzureAppServicePlan.svg
new file mode 100644
index 00000000..3706c273
--- /dev/null
+++ b/dist/Web/AzureAppServicePlan.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 32.378906 70 C 30.839844 68.472656 29.695313 66.503906 29.171875 64.226563 C 27.722656 57.875 31.648438 51.554688 37.953125 50.117188 C 39.261719 49.820313 40.5625 49.765625 41.824219 49.910156 C 42.398438 43.972656 46.019531 38.691406 51.414063 36.085938 C 49.773438 35.5625 48.027344 35.273438 46.214844 35.273438 C 38.664063 35.273438 32.257813 40.203125 29.984375 47.050781 C 28.785156 46.628906 27.503906 46.390625 26.160156 46.390625 C 19.695313 46.390625 14.460938 51.675781 14.460938 58.191406 C 14.460938 64.714844 19.695313 70 26.160156 70 C 26.160156 70 26.171875 69.996094 26.179688 69.996094 L 26.179688 70 Z M 32.378906 70 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 41.109375 66.445313 C 41.109375 68.410156 39.519531 70 37.554688 70 L 3.554688 70 C 1.589844 70 0 68.410156 0 66.445313 L 0 3.554688 C 0 1.589844 1.589844 0 3.554688 0 L 37.554688 0 C 39.519531 0 41.109375 1.589844 41.109375 3.554688 Z M 41.109375 66.445313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 6.042969 37.832031 C 6.042969 35.367188 8.042969 33.367188 10.511719 33.367188 L 30.96875 33.367188 C 33.4375 33.367188 35.4375 35.367188 35.4375 37.832031 C 35.4375 40.300781 33.4375 42.300781 30.96875 42.300781 L 10.511719 42.300781 C 8.042969 42.300781 6.042969 40.300781 6.042969 37.832031 Z M 6.042969 37.832031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 13.699219 37.832031 C 13.699219 39.488281 12.355469 40.832031 10.699219 40.832031 C 9.042969 40.832031 7.703125 39.488281 7.703125 37.832031 C 7.703125 36.175781 9.042969 34.835938 10.699219 34.835938 C 12.355469 34.835938 13.699219 36.175781 13.699219 37.832031 Z M 13.699219 37.832031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 6.042969 24.5625 C 6.042969 22.097656 8.042969 20.09375 10.511719 20.09375 L 30.96875 20.09375 C 33.4375 20.09375 35.4375 22.097656 35.4375 24.5625 C 35.4375 27.03125 33.4375 29.03125 30.96875 29.03125 L 10.511719 29.03125 C 8.042969 29.03125 6.042969 27.03125 6.042969 24.5625 Z M 6.042969 24.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 13.699219 24.5625 C 13.699219 26.21875 12.355469 27.5625 10.699219 27.5625 C 9.042969 27.5625 7.703125 26.21875 7.703125 24.5625 C 7.703125 22.90625 9.042969 21.5625 10.699219 21.5625 C 12.355469 21.5625 13.699219 22.90625 13.699219 24.5625 Z M 13.699219 24.5625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(11.764706%,11.764706%,11.764706%);fill-opacity:1;" d="M 6.042969 11.289063 C 6.042969 8.824219 8.042969 6.824219 10.511719 6.824219 L 30.96875 6.824219 C 33.4375 6.824219 35.4375 8.824219 35.4375 11.289063 C 35.4375 13.757813 33.4375 15.757813 30.96875 15.757813 L 10.511719 15.757813 C 8.042969 15.761719 6.042969 13.757813 6.042969 11.289063 Z M 6.042969 11.289063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 13.699219 11.289063 C 13.699219 12.945313 12.355469 14.289063 10.699219 14.289063 C 9.042969 14.289063 7.703125 12.945313 7.703125 11.289063 C 7.703125 9.636719 9.042969 8.292969 10.699219 8.292969 C 12.355469 8.292969 13.699219 9.636719 13.699219 11.289063 Z M 13.699219 11.289063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 69.929688 63.523438 C 69.929688 59.945313 67.058594 57.046875 63.507813 57.046875 C 63.242188 57.046875 62.980469 57.066406 62.726563 57.101563 C 63.117188 55.648438 63.335938 54.117188 63.335938 52.535156 C 63.335938 43.003906 55.667969 35.273438 46.21875 35.273438 C 38.664063 35.273438 32.261719 40.207031 29.984375 47.050781 C 28.785156 46.628906 27.503906 46.390625 26.164063 46.390625 C 19.695313 46.390625 14.464844 51.675781 14.464844 58.195313 C 14.464844 64.714844 19.695313 70 26.164063 70 C 26.164063 70 26.175781 69.996094 26.179688 69.996094 L 26.179688 70 L 64.03125 70 L 64.023438 69.96875 C 67.324219 69.707031 69.929688 66.925781 69.929688 63.523438 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Web/AzureCDN(m).png b/dist/Web/AzureCDN(m).png
deleted file mode 100644
index 321881c5..00000000
Binary files a/dist/Web/AzureCDN(m).png and /dev/null differ
diff --git a/dist/Web/AzureCDN(m).svg b/dist/Web/AzureCDN(m).svg
deleted file mode 100644
index bb5caebf..00000000
--- a/dist/Web/AzureCDN(m).svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="32pt" viewBox="0 0 70 32" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 70 25.515625 C 70 22.285156 67.375 19.515625 64.078125 19.515625 L 63.203125 19.515625 C 63.4375 18.230469 63.875 16.914063 63.875 15.429688 C 63.875 6.855469 56.640625 0 48.125 0 C 41.328125 0 35.4375 4.515625 33.25 10.484375 C 32.140625 10.285156 31.0625 9.855469 29.75 9.855469 C 23.625 9.855469 19.015625 14.570313 19.015625 20.570313 C 19.015625 26.570313 23.828125 31.285156 29.75 31.285156 L 64.3125 31.285156 C 67.609375 31.058594 70 28.714844 70 25.515625 Z M 2.859375 15 C 1.3125 15 0 16.285156 0 17.769531 C 0 19.285156 1.3125 20.570313 2.859375 20.570313 L 16.390625 20.570313 C 16.390625 18.628906 16.859375 16.714844 17.734375 15 Z M 17.5 25.914063 L 6.796875 25.914063 C 5.25 25.914063 3.9375 27.230469 3.9375 28.714844 C 3.9375 30.199219 5.25 31.484375 6.796875 31.484375 L 21.671875 31.484375 C 19.921875 30 18.375 28.285156 17.5 25.914063 Z M 31.734375 7.484375 C 32.609375 5.769531 33.6875 4.285156 35 3 L 11.578125 3 C 10.0625 3 8.75 4.285156 8.75 5.769531 C 8.75 7.285156 10.0625 8.570313 11.578125 8.570313 L 24.265625 8.570313 C 26.015625 7.714844 27.796875 7.285156 31.179688 7.3125 C 30.390625 7.484375 31.0625 7.484375 31.734375 7.484375 Z M 31.734375 7.484375 "/>
-</g>
-</svg>
diff --git a/dist/Web/AzureCDN.png b/dist/Web/AzureCDN.png
deleted file mode 100644
index 969d5e7e..00000000
Binary files a/dist/Web/AzureCDN.png and /dev/null differ
diff --git a/dist/Web/AzureCDN.puml b/dist/Web/AzureCDN.puml
deleted file mode 100644
index 0fd4d68a..00000000
--- a/dist/Web/AzureCDN.puml
+++ /dev/null
@@ -1,9 +0,0 @@
-sprite $AzureCDN [70x32/16z] {
-hTC5SkWm40DGBHYa-z_tOtcTrCxq3PfHs6Sv9iNPq_1KJBqRZYTywhDXMB51BGq0MTiOM9XQcm2QLXA5QOrM9hcRXbfgGEW2wnrdEKhBY0ICkZ9HUEiVDCEB
-hck93OPFMwc8RtYRaZY6xWJksD2MZXjExU6JIIh35QDEP-ai9-tQv-lVu33gT2-itp6rZoNAJmuqy4-mf6zetymm0B3MFmfWwWWxLeOE3InqdMgeKgU8odJi
-PuvKKZ1BZZRKjGDmFhWNbghW-HlD-lm-Z_-BSr4RdRiXm7-Mdpd-CTzW0F0R
-}
-
-AzureEntityColoring(AzureCDN)
-!define AzureCDN(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCDN, AzureCDN)
-!define AzureCDN(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCDN, AzureCDN)
diff --git a/dist/Web/AzureCDN.svg b/dist/Web/AzureCDN.svg
deleted file mode 100644
index 6275f206..00000000
--- a/dist/Web/AzureCDN.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="32pt" viewBox="0 0 70 32" version="1.1">
-<defs>
-<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
-  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-</filter>
-<mask id="mask0">
-  <g filter="url(#alpha)">
-<rect x="0" y="0" width="70" height="32" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
-  </g>
-</mask>
-<clipPath id="clip1">
-  <rect x="0" y="0" width="70" height="32"/>
-</clipPath>
-<g id="surface5" clip-path="url(#clip1)">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.421875 31.582031 C 34.019531 30.191406 32.898438 28.523438 32.480469 26.296875 C 31.21875 20.453125 34.71875 14.746094 40.460938 13.496094 C 41.71875 13.21875 42.839844 13.21875 44.101563 13.355469 C 44.519531 7.929688 47.878906 3.199219 52.921875 0.835938 C 51.378906 0.417969 49.839844 0 48.160156 0 C 41.300781 0 35.421875 4.589844 33.320313 10.574219 C 32.199219 10.296875 31.078125 10.015625 29.820313 10.015625 C 23.800781 10.015625 19.179688 14.886719 19.179688 20.871094 C 19.179688 26.851563 23.941406 31.722656 29.820313 31.722656 Z M 35.421875 31.582031 "/>
-</g>
-</defs>
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 48.859375 8.488281 L 11.621094 8.488281 C 10.078125 8.488281 8.820313 7.234375 8.820313 5.703125 C 8.820313 4.175781 10.078125 2.921875 11.621094 2.921875 L 48.859375 2.921875 C 50.398438 2.921875 51.660156 4.175781 51.660156 5.703125 C 51.660156 7.234375 50.398438 8.488281 48.859375 8.488281 Z M 48.859375 8.488281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 41.300781 31.722656 L 6.859375 31.722656 C 5.320313 31.722656 4.058594 30.46875 4.058594 28.9375 C 4.058594 27.410156 5.320313 26.15625 6.859375 26.15625 L 41.300781 26.15625 C 42.839844 26.15625 44.101563 27.410156 44.101563 28.9375 C 44.101563 30.46875 42.839844 31.722656 41.300781 31.722656 Z M 41.300781 31.722656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 37.238281 20.453125 L 2.800781 20.453125 C 1.261719 20.453125 0 19.199219 0 17.667969 C 0 16.140625 1.261719 14.886719 2.800781 14.886719 L 37.238281 14.886719 C 38.78125 14.886719 40.039063 16.140625 40.039063 17.667969 C 40.039063 19.199219 38.78125 20.453125 37.238281 20.453125 Z M 37.238281 20.453125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 70 25.738281 C 70 22.398438 67.339844 19.757813 64.121094 19.757813 C 63.839844 19.757813 63.699219 19.757813 63.28125 19.757813 C 63.558594 18.503906 63.839844 17.113281 63.839844 15.582031 C 63.839844 6.957031 56.699219 0 48.160156 0 C 41.300781 0 35.421875 4.589844 33.320313 10.574219 C 32.199219 10.296875 31.078125 10.015625 29.820313 10.015625 C 23.800781 10.015625 19.179688 14.886719 19.179688 20.871094 C 19.179688 26.851563 23.941406 31.722656 29.820313 31.722656 L 64.398438 31.722656 C 67.621094 31.304688 70 28.800781 70 25.738281 "/>
-<use xlink:href="#surface5" mask="url(#mask0)"/>
-</g>
-</svg>
diff --git a/dist/Web/AzureMediaService(m).png b/dist/Web/AzureMediaService(m).png
new file mode 100644
index 00000000..caa32753
Binary files /dev/null and b/dist/Web/AzureMediaService(m).png differ
diff --git a/dist/Web/AzureMediaService(m).svg b/dist/Web/AzureMediaService(m).svg
new file mode 100644
index 00000000..e0433d40
--- /dev/null
+++ b/dist/Web/AzureMediaService(m).svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 34.511719 70 L 64.820313 52.5 L 64.820313 17.5 C 64.820313 17.5 39.777344 36.566406 34.511719 70 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.378906 35.019531 L 28.179688 35.019531 L 28.179688 45.097656 Z M 43.378906 35.019531 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 34.511719 70 L 4.199219 52.5 L 4.199219 17.5 L 34.511719 0 L 64.820313 17.5 L 64.820313 52.5 Z M 34.511719 70 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 47.839844 20.941406 C 40.070313 13.203125 27.515625 13.203125 19.738281 20.941406 C 11.96875 28.710938 11.96875 41.289063 19.738281 49.058594 C 27.503906 56.792969 40.070313 56.792969 47.839844 49.058594 C 55.601563 41.296875 55.601563 28.714844 47.839844 20.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 45.117188 23.664063 C 38.855469 17.425781 28.730469 17.425781 22.457031 23.664063 C 16.195313 29.929688 16.195313 40.070313 22.457031 46.332031 C 28.722656 52.570313 38.855469 52.570313 45.117188 46.332031 C 51.375 40.078125 51.375 29.933594 45.117188 23.664063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 43.441406 34.980469 L 28.179688 24.941406 L 28.179688 35.019531 L 43.378906 35.019531 Z M 43.441406 34.980469 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Web/AzureMediaService.png b/dist/Web/AzureMediaService.png
new file mode 100644
index 00000000..6ec74e95
Binary files /dev/null and b/dist/Web/AzureMediaService.png differ
diff --git a/dist/Web/AzureMediaService.puml b/dist/Web/AzureMediaService.puml
new file mode 100644
index 00000000..e600b1e7
--- /dev/null
+++ b/dist/Web/AzureMediaService.puml
@@ -0,0 +1,13 @@
+sprite $AzureMediaService [70x70/16z] {
+fPY7UkiW34QjYH6y_-lUGPS88c3wTpVE-QJ3yBXM8KlNRmDthRN8xo1QFs9qpk1IltF36OEiTj4J8Qc-fl2fa3uPJuNqITjwCDTvYfuAwMCRUgJKPJ8-6zq3
+FKx8ClD5aUgJ69qAwNF3df2iJFyYcYTwXlK_vEvAvdkbHxT60K9E_ZvkhDSm74EhRuxCitw1MFw52MR3Q7EAVXfNbqz9qcknEKKSO-1e3_6Ke1tH8UARQf0v
+9JSX6gRfCGUPKc0EqIOClyNEAUhQ8GcRIWuIKqgRf_eHZ1L3SP2GehuVl2wGG4roa922hXJ5OCIvcR6t56jJmbE6SjeROegVA-GfBUWWxP_wdiAjeOxI8drB
+55Ey5Wqe5tQ3ZUyfLqXf4IS6ZYaNEhrFA8m-98SKSA7zZc1A4TsdaDFeAMu2otgaso4ZHLxMeyGKlqN1AuN6vJYXUBtIKsJSOVA2mdwUiYl4po6s1SLyCGme
+qMPthoYLd1ccSFycMrBCJVOns4fPKwgw3IuyiObjK2hvQiPAC6zH2hfzqaMW_J_R5gKMY4xKU7d8dEAhQK7Mp_3NVxBjKFnbGmlyo_KLoRQWh2-lyROnxa2j
+0OTw1YKBSkFgogya_cm6M7F4oBnv1r3CIliUCFJXnNS4IV3qHc0XPEV2E6Weoy4DqaB8ffuN8NXqurWw8NHu4riMGlRqE26mInZrB4PtJq-9f_j3FSK9ENy0
+yv-HuBSFWqw4Z8jYGyXV
+}
+
+AzureEntityColoring(AzureMediaService)
+!define AzureMediaService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMediaService, AzureMediaService)
+!define AzureMediaService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMediaService, AzureMediaService)
diff --git a/dist/Web/AzureMediaService.svg b/dist/Web/AzureMediaService.svg
new file mode 100644
index 00000000..5b5c38ac
--- /dev/null
+++ b/dist/Web/AzureMediaService.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 34.511719 70 L 64.820313 52.5 L 64.820313 17.5 C 64.820313 17.5 39.777344 36.566406 34.511719 70 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.378906 35.019531 L 28.179688 35.019531 L 28.179688 45.097656 Z M 43.378906 35.019531 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 34.511719 70 L 4.199219 52.5 L 4.199219 17.5 L 34.511719 0 L 64.820313 17.5 L 64.820313 52.5 Z M 34.511719 70 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 47.839844 20.941406 C 40.070313 13.203125 27.515625 13.203125 19.738281 20.941406 C 11.96875 28.710938 11.96875 41.289063 19.738281 49.058594 C 27.503906 56.792969 40.070313 56.792969 47.839844 49.058594 C 55.601563 41.296875 55.601563 28.714844 47.839844 20.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 45.117188 23.664063 C 38.855469 17.425781 28.730469 17.425781 22.457031 23.664063 C 16.195313 29.929688 16.195313 40.070313 22.457031 46.332031 C 28.722656 52.570313 38.855469 52.570313 45.117188 46.332031 C 51.375 40.078125 51.375 29.933594 45.117188 23.664063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.441406 34.980469 L 28.179688 24.941406 L 28.179688 35.019531 L 43.378906 35.019531 Z M 43.441406 34.980469 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/dist/Web/AzureNotificationHubNamespace(m).png b/dist/Web/AzureNotificationHubNamespace(m).png
new file mode 100644
index 00000000..cf7ca307
Binary files /dev/null and b/dist/Web/AzureNotificationHubNamespace(m).png differ
diff --git a/dist/Web/AzureNotificationHubNamespace(m).svg b/dist/Web/AzureNotificationHubNamespace(m).svg
new file mode 100644
index 00000000..a8e3d68f
--- /dev/null
+++ b/dist/Web/AzureNotificationHubNamespace(m).svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 8.820313 54.878906 L 22.398438 54.878906 L 30.378906 39.058594 L 19.039063 39.058594 L 19.039063 46.621094 L 1.398438 31.359375 L 34.019531 31.359375 L 37.941406 24.078125 L 0 24.078125 L 0 44.941406 C 0 50.121094 3.78125 54.738281 8.820313 54.878906 Z M 49.839844 0 L 8.820313 0 C 3.640625 0 0 3.078125 0 8.261719 L 0 16.519531 L 41.578125 16.519531 Z M 49.839844 0 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(63,173,255);fill-opacity:1;" d="M 19.179688 38.921875 L 19.179688 46.480469 L 1.398438 31.359375 L 70 31.359375 L 70 8.679688 C 70 3.640625 65.800781 0 60.761719 0 L 8.820313 0 C 3.640625 0 0 3.078125 0 8.261719 L 0 16.519531 L 51.238281 16.519531 L 51.238281 8.960938 L 69.019531 24.078125 L 0 24.078125 L 0 44.941406 C 0 50.121094 3.78125 54.738281 8.820313 54.738281 L 27.578125 54.738281 L 42.980469 69.859375 L 43.121094 54.738281 L 60.621094 54.738281 C 65.800781 54.738281 70 50.679688 70 45.5 L 70 38.78125 L 19.179688 38.78125 Z M 19.179688 38.921875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Web/AzureNotificationHubNamespace.png b/dist/Web/AzureNotificationHubNamespace.png
new file mode 100644
index 00000000..08bc12ab
Binary files /dev/null and b/dist/Web/AzureNotificationHubNamespace.png differ
diff --git a/dist/Web/AzureNotificationHubNamespace.puml b/dist/Web/AzureNotificationHubNamespace.puml
new file mode 100644
index 00000000..a73bbf38
--- /dev/null
+++ b/dist/Web/AzureNotificationHubNamespace.puml
@@ -0,0 +1,9 @@
+sprite $AzureNotificationHubNamespace [70x70/16z] {
+pSo5eGKm3090ca3st_YvQuKlDy1XBqXrgnjYu2GreXuT7sfjAGB8rQGgqRI-L4j3KgHZAKDYMoOIoh4akBBKUK5Q5iJqKZSBccL1qzHIzmjmqsGtdWLEU5cm
+8YmBmhAWMHP0bWMqB4ZBWYXsqMUb7lN5BoxrVvRwjOLf82NMoT9eXvP5R8v5QfP5OLcKbaN42NLHdVJSvD8YjOUbfXQ5PL7UBZMxY9P5H0udnUU6ZaNZIOLb
+WID9f641mEKayAuPJG2k96euQSd9XO5l7gx075eMqBA0bWMqBA1b0IqBU5aSJSCQMXQaPK5Q5gHbGLeMv8Tb2m
+}
+
+AzureEntityColoring(AzureNotificationHubNamespace)
+!define AzureNotificationHubNamespace(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNotificationHubNamespace, AzureNotificationHubNamespace)
+!define AzureNotificationHubNamespace(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNotificationHubNamespace, AzureNotificationHubNamespace)
diff --git a/dist/Web/AzureNotificationHubNamespace.svg b/dist/Web/AzureNotificationHubNamespace.svg
new file mode 100644
index 00000000..b65ac2fd
--- /dev/null
+++ b/dist/Web/AzureNotificationHubNamespace.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 8.820313 54.878906 L 22.398438 54.878906 L 30.378906 39.058594 L 19.039063 39.058594 L 19.039063 46.621094 L 1.398438 31.359375 L 34.019531 31.359375 L 37.941406 24.078125 L 0 24.078125 L 0 44.941406 C 0 50.121094 3.78125 54.738281 8.820313 54.878906 Z M 49.839844 0 L 8.820313 0 C 3.640625 0 0 3.078125 0 8.261719 L 0 16.519531 L 41.578125 16.519531 Z M 49.839844 0 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,54.901961%,0%);fill-opacity:1;" d="M 19.179688 38.921875 L 19.179688 46.480469 L 1.398438 31.359375 L 70 31.359375 L 70 8.679688 C 70 3.640625 65.800781 0 60.761719 0 L 8.820313 0 C 3.640625 0 0 3.078125 0 8.261719 L 0 16.519531 L 51.238281 16.519531 L 51.238281 8.960938 L 69.019531 24.078125 L 0 24.078125 L 0 44.941406 C 0 50.121094 3.78125 54.738281 8.820313 54.738281 L 27.578125 54.738281 L 42.980469 69.859375 L 43.121094 54.738281 L 60.621094 54.738281 C 65.800781 54.738281 70 50.679688 70 45.5 L 70 38.78125 L 19.179688 38.78125 Z M 19.179688 38.921875 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/dist/Web/AzureSearch(m).png b/dist/Web/AzureSearch(m).png
index 96f92f5c..34b2991b 100644
Binary files a/dist/Web/AzureSearch(m).png and b/dist/Web/AzureSearch(m).png differ
diff --git a/dist/Web/AzureSearch(m).svg b/dist/Web/AzureSearch(m).svg
index 923b0cae..3bb5a68a 100644
--- a/dist/Web/AzureSearch(m).svg
+++ b/dist/Web/AzureSearch(m).svg
@@ -1,7 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="47pt" viewBox="0 0 70 47" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 9.800781 39.199219 C 9.800781 33.460938 12.738281 28.980469 18.199219 26.179688 L 18.199219 25.058594 C 18.199219 17.078125 24.78125 10.640625 32.761719 10.640625 C 35.558594 10.640625 38.21875 11.339844 40.460938 12.738281 C 43.960938 7.839844 49.839844 4.761719 56.140625 4.761719 C 52.78125 1.820313 48.441406 0 43.539063 0 C 37.660156 0 32.199219 2.800781 28.839844 7.421875 C 26.738281 6.019531 24.21875 5.320313 21.558594 5.320313 C 14 5.320313 7.839844 11.480469 7.839844 18.898438 L 7.839844 20.019531 C 2.800781 22.679688 0 27.019531 0 32.339844 C 0 39.480469 4.898438 45.359375 11.761719 46.898438 C 10.5 44.660156 9.800781 42 9.800781 39.199219 Z M 9.800781 39.199219 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 48.019531 43.398438 C 46.621094 48.859375 41.859375 52.640625 36.261719 52.640625 C 35.28125 52.640625 34.300781 52.5 33.320313 52.21875 C 31.921875 51.800781 30.519531 51.238281 29.398438 50.398438 C 28.140625 49.558594 27.160156 48.441406 26.320313 47.320313 C 24.5 44.519531 23.660156 41.160156 24.5 37.660156 C 25.898438 32.199219 30.660156 28.421875 36.261719 28.421875 C 37.238281 28.421875 38.21875 28.558594 39.199219 28.839844 C 42.28125 29.679688 44.941406 31.5 46.621094 34.300781 C 48.300781 36.960938 48.859375 40.320313 48.019531 43.398438 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.301961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 42.839844 30.378906 C 41.71875 29.679688 40.460938 29.121094 39.199219 28.839844 C 38.21875 28.558594 37.238281 28.421875 36.261719 28.421875 C 30.660156 28.421875 25.898438 32.199219 24.5 37.660156 C 23.660156 41.160156 24.359375 44.660156 26.320313 47.320313 C 26.601563 47.738281 27.019531 48.300781 27.441406 48.71875 C 29.960938 40.738281 35.558594 34.160156 42.839844 30.378906 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0,0,0);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,33,58);fill-opacity:1;" d="M 26.460938 54.738281 C 24.640625 53.480469 23.238281 52.078125 21.980469 50.261719 C 21.699219 49.839844 21.558594 49.558594 21.28125 49.140625 L 20.160156 50.398438 L 20.019531 50.539063 C 20.160156 50.820313 20.300781 51.101563 20.578125 51.378906 C 21.980469 53.339844 23.519531 55.019531 25.480469 56.421875 C 25.621094 56.558594 26.039063 56.699219 26.460938 56.839844 L 27.71875 55.578125 C 27.160156 55.160156 26.878906 55.019531 26.460938 54.738281 Z M 26.460938 54.738281 "/>
+</g>
+</defs>
 <g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 60.136719 20.992188 C 60.613281 19.582031 60.773438 18.171875 60.773438 16.761719 C 60.773438 7.519531 53.296875 0 44.226563 0 C 37.386719 0 31.5 4.230469 28.953125 10.339844 C 26.886719 7.675781 23.703125 6.265625 20.046875 6.265625 C 13.683594 6.265625 8.433594 11.59375 8.433594 18.171875 C 8.433594 19.269531 8.589844 20.367188 8.910156 21.464844 C 3.660156 23.34375 0 27.886719 0 33.839844 C 0 41.515625 6.203125 47.15625 13.839844 47.15625 L 56.316406 47.15625 C 63.953125 47.15625 70 41.515625 70 33.839844 C 69.839844 27.574219 65.863281 22.875 60.136719 20.992188 Z M 50.910156 26.789063 C 49.636719 31.648438 45.339844 35.09375 40.25 35.09375 C 39.453125 35.09375 38.5 34.9375 37.546875 34.78125 C 36.75 34.464844 35.796875 34.152344 34.839844 33.839844 L 27.203125 41.359375 C 26.566406 41.988281 25.773438 42.300781 24.976563 42.300781 C 24.183594 42.300781 23.226563 41.988281 22.75 41.359375 C 22.113281 40.734375 21.796875 39.949219 21.796875 39.167969 C 21.796875 38.382813 22.113281 37.441406 22.75 36.972656 L 30.386719 29.453125 C 29.113281 27.101563 28.636719 24.285156 29.433594 21.777344 C 30.703125 16.921875 35 13.472656 40.089844 13.472656 C 40.886719 13.472656 41.839844 13.628906 42.796875 13.785156 C 45.660156 14.414063 48.046875 16.292969 49.476563 18.800781 C 51.226563 21.148438 51.703125 24.125 50.910156 26.789063 Z M 50.910156 26.789063 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 42 17.703125 C 41.363281 17.546875 40.886719 17.546875 40.25 17.546875 C 37.226563 17.546875 34.363281 19.582031 33.726563 22.714844 C 33.25 24.441406 33.566406 26.632813 34.683594 28.042969 C 35.160156 28.671875 35.796875 29.296875 36.433594 29.765625 C 37.066406 30.238281 37.863281 30.550781 38.660156 30.707031 C 39.296875 30.863281 39.773438 30.863281 40.410156 30.863281 C 43.433594 30.863281 46.296875 28.828125 46.933594 25.691406 C 47.410156 23.96875 47.089844 22.089844 46.136719 20.523438 C 45.183594 19.269531 43.589844 18.171875 42 17.703125 Z M 42 17.703125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 61.601563 19.878906 C 61.601563 19.320313 61.738281 18.621094 61.738281 18.058594 C 61.738281 8.121094 53.621094 0.140625 43.539063 0.140625 C 37.660156 0 32.199219 2.800781 28.839844 7.421875 C 26.738281 6.019531 24.21875 5.320313 21.558594 5.320313 C 14 5.320313 7.839844 11.480469 7.839844 18.898438 L 7.839844 20.019531 C 2.800781 22.679688 0 27.019531 0 32.339844 C 0 40.738281 6.859375 47.320313 15.679688 47.320313 L 54.320313 47.320313 C 63.140625 47.320313 70 40.738281 70 32.339844 C 70 26.738281 66.921875 22.261719 61.601563 19.878906 Z M 61.601563 19.878906 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 48.019531 43.398438 C 46.621094 48.859375 41.859375 52.640625 36.261719 52.640625 C 35.28125 52.640625 34.300781 52.5 33.320313 52.21875 C 31.921875 51.800781 30.519531 51.238281 29.398438 50.398438 C 28.140625 49.558594 27.160156 48.441406 26.320313 47.320313 C 24.5 44.519531 23.660156 41.160156 24.5 37.660156 C 25.898438 32.199219 30.660156 28.421875 36.261719 28.421875 C 37.238281 28.421875 38.21875 28.558594 39.199219 28.839844 C 42.28125 29.679688 44.941406 31.5 46.621094 34.300781 C 48.300781 36.960938 48.859375 40.320313 48.019531 43.398438 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0,71,124);fill-opacity:1;" d="M 51.101563 31.640625 C 48.71875 27.71875 44.941406 24.921875 40.460938 23.800781 C 39.058594 23.519531 37.660156 23.238281 36.261719 23.238281 C 28.28125 23.238281 21.421875 28.699219 19.460938 36.398438 C 18.339844 40.738281 19.039063 45.21875 21.28125 49.140625 L 8.121094 62.441406 C 6.441406 64.121094 6.441406 67.058594 8.121094 68.738281 C 9.101563 69.578125 10.21875 70 11.339844 70 C 12.460938 70 13.578125 69.578125 14.558594 68.738281 L 27.71875 55.441406 C 29.121094 56.28125 30.660156 56.839844 32.199219 57.261719 C 33.601563 57.539063 35 57.820313 36.398438 57.820313 C 44.378906 57.820313 51.238281 52.359375 53.199219 44.660156 C 54.179688 40.179688 53.480469 35.558594 51.101563 31.640625 Z M 48.019531 43.398438 C 46.621094 48.859375 41.859375 52.640625 36.261719 52.640625 C 35.28125 52.640625 34.300781 52.5 33.320313 52.21875 C 31.921875 51.800781 30.519531 51.238281 29.398438 50.398438 C 28.140625 49.558594 27.160156 48.441406 26.320313 47.320313 C 24.5 44.519531 23.660156 41.160156 24.5 37.660156 C 25.898438 32.199219 30.660156 28.421875 36.261719 28.421875 C 37.238281 28.421875 38.21875 28.558594 39.199219 28.839844 C 42.28125 29.679688 44.941406 31.5 46.621094 34.300781 C 48.300781 37.101563 48.859375 40.320313 48.019531 43.398438 Z M 48.019531 43.398438 "/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
 </g>
 </svg>
diff --git a/dist/Web/AzureSearch.puml b/dist/Web/AzureSearch.puml
index 42b0d673..3f1b0ef3 100644
--- a/dist/Web/AzureSearch.puml
+++ b/dist/Web/AzureSearch.puml
@@ -1,8 +1,10 @@
-sprite $AzureSearch [70x47/16z] {
-dPPNmZCW20G54LdkVz-_VYaMZ6IUKiUsMLFkOEa6XtNXyYrY_iBaAqSr7x6QbwYljAoa-uwUb-Gr9DgxDWwNyq1Z1p-7nh-bLu-fLnk9MWey1fTx8E8dv4hY
-W7jsCispy2eXU9QMcueraQRc4xPQu05ezCY1VjeOze1ExvyQnreizIwYD2oBPeiSVouiJNWzX79dmN_7_maOJn_4QedZMJ4yxOSpud0gZD7AXxn8kBLzrjhp
-cVBeGBmWpA7NVGx8V0ylIwrpob67ADrRP5SGX6ETqUBLNUcPXxJvVUnw2FIOto6vTPezOVCn-04UsrY3JF1Zf5FFDpokXQ12j7aCwjibfKBX3GKxIQxR6Jc9
-UcmvIwWyOFES1VowfaoO2d4pZx3FaWiq8Ocfv_y3vZVODhl8ILpsASf9GFjYaBYyWazB41Q-bLWSQi0lCIgn9Y49cZU11bT9XivbX5it9B17u_pbDm
+sprite $AzureSearch [70x70/16z] {
+rPS7TlOW30Gb93gv_t7JZ1jU77r-VvtNKuRLWXkPO2VwXJYcfpZr1uGVEVo8qAkmUe1xKU8nQcZo4zUd0OGl_Ar2zkKSCLRyf95pREpeYBb9BEcmiKaikP_9
+Bkau8Bbh0KXm67U_D92WPXGwxf4VgWqczFwa11l-Tg1WXGQ0v5-mXCSMUMPHdfwuy0hoO9S1Vf10Iqovb9nJ_47Z_DGIIsqhDSSxZHyuEDgP4gVToCoIsvMC
+DPSeOn1J774JoLv8oJdNUusVxFAQf7ZtZMpP2WgZKD8xgUfsGfrt0oMf_xqxmCGz3fW9IVggwIYXJtY9MB45Hocd8DzmryDUSBLob7HaKh22CxlFiqiw6JVZ
+PWCfaf30aJnF1YfGGbJHI49wiTG-499GGhl4nDWIiOGYi2WHoMXfNuHkeO7bj-0UhiWIKHHiwIl1Ne04zoA7Dp6yHtIXT0jwRz3hJKvW51uFBu-l-kTJ5tiK
+L4i2GLRFkTuAezH3kLvklr_MC3o9abL5G50qV5CQaVODaucop2IZf2uXoKH-QmkUZcXTv6GYjRTLa_SuBhK5HnPY-xIicbQ2E7QoFodLAkaQY5qorrGnI-QQ
+n5R9hb4EzUHmP9TqggDF9FOdMLAcXv8ECza9jXhjalR_I_HNIAZy2Wdz4Wdz4WcLNo4X_HMIVZiiJoKV
 }
 
 AzureEntityColoring(AzureSearch)
diff --git a/dist/Web/AzureWebApp(m).png b/dist/Web/AzureWebApp(m).png
index 55641df1..8f839d3d 100644
Binary files a/dist/Web/AzureWebApp(m).png and b/dist/Web/AzureWebApp(m).png differ
diff --git a/dist/Web/AzureWebApp(m).svg b/dist/Web/AzureWebApp(m).svg
index 9be0cc29..cb1d5c9b 100644
--- a/dist/Web/AzureWebApp(m).svg
+++ b/dist/Web/AzureWebApp(m).svg
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 53.507813 59.199219 C 47.964844 63.460938 41.460938 65.488281 34.996094 65.488281 C 25.757813 65.488281 16.875 61.402344 10.761719 53.441406 C 0.597656 40.117188 3.15625 21.070313 16.484375 10.875 C 22.027344 6.609375 28.527344 4.582031 34.996094 4.582031 C 44.234375 4.582031 53.117188 8.671875 59.230469 16.628906 C 69.425781 29.953125 66.832031 49.035156 53.507813 59.199219 Z M 62.78125 13.679688 C 55.925781 4.621094 45.371094 0 35.03125 0 C 27.640625 0 20.035156 2.417969 13.746094 7.214844 C -1.605469 19.046875 -4.589844 40.898438 7.28125 56.25 C 14.136719 65.308594 24.476563 69.929688 35.03125 69.929688 C 42.421875 69.929688 50.027344 67.511719 56.316406 62.714844 C 71.664063 51.0625 74.613281 29.03125 62.78125 13.679688 Z M 62.78125 13.679688 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 19.160156 41.515625 C 17.136719 39.488281 15.464844 37.640625 14.152344 35.792969 C 11.203125 41.726563 10.277344 47.839844 9.886719 52.8125 C 10.242188 53.167969 10.242188 53.558594 10.457031 53.914063 C 11.949219 55.761719 13.796875 57.609375 15.464844 58.925781 C 15.464844 54.839844 15.820313 48.160156 19.160156 41.515625 Z M 19.160156 41.515625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 29.929688 18.015625 C 27.15625 19.863281 24.386719 22.277344 21.402344 25.40625 C 19.910156 27.074219 18.453125 28.746094 17.316406 30.417969 C 18.59375 32.441406 20.085938 34.503906 22.113281 36.527344 C 23.605469 34.503906 25.453125 32.265625 27.65625 30.238281 C 30.425781 27.644531 33.019531 25.441406 35.613281 23.773438 C 33.800781 21.925781 31.777344 19.863281 29.929688 18.015625 Z M 29.929688 18.015625 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 58.941406 16.226563 C 57.664063 14.558594 56.347656 13.101563 54.679688 11.785156 C 50.058594 11.039063 42.417969 11.179688 34.105469 15.621094 C 35.953125 17.648438 37.976563 19.710938 39.824219 21.34375 C 50.910156 15.265625 58.941406 16.226563 58.941406 16.226563 Z M 58.941406 16.226563 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 14.28125 35.539063 C 15.203125 33.871094 16.128906 32.199219 17.230469 30.351563 C 12.433594 22.746094 12.609375 16.457031 13.144531 13.507813 C 12.042969 14.789063 10.726563 16.101563 9.800781 17.382813 C 8.914063 21.683594 8.914063 27.972656 14.28125 35.539063 Z M 14.28125 35.539063 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 27.949219 41.910156 C 25.710938 40.0625 23.863281 38.390625 22.230469 36.722656 C 21.128906 38.390625 20.203125 39.886719 19.28125 41.519531 C 20.773438 43.011719 22.621094 44.683594 24.644531 46.140625 C 37.046875 55.945313 49.449219 56.871094 56.484375 56.871094 C 56.839844 56.871094 59.078125 53.921875 60.355469 52.074219 C 57.160156 52.820313 43.832031 54.488281 27.949219 41.910156 Z M 27.949219 41.910156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 14.238281 35.578125 C 15.515625 37.425781 17.1875 39.453125 19.246094 41.300781 C 19.992188 39.628906 20.917969 38.136719 22.195313 36.503906 C 20.171875 34.476563 18.679688 32.417969 17.398438 30.390625 C 16.121094 32.238281 15.160156 33.910156 14.238281 35.578125 Z M 14.238281 35.578125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 35.605469 23.796875 C 47.082031 34.347656 60.40625 43.234375 63.921875 45.648438 C 64.277344 44.726563 64.492188 43.980469 64.667969 43.054688 C 60.972656 40.285156 51.34375 32.890625 39.691406 21.203125 C 38.554688 21.949219 37.0625 22.445313 35.605469 23.796875 Z M 35.605469 23.796875 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 34.292969 15.542969 C 31.519531 12.59375 28.570313 9.289063 25.585938 5.949219 C 24.308594 6.304688 22.816406 6.871094 21.5 7.617188 C 23.527344 11.136719 26.6875 14.761719 29.816406 18.101563 C 31.519531 17.175781 32.835938 16.289063 34.292969 15.542969 Z M 34.292969 15.542969 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 34.285156 15.53125 C 32.792969 16.277344 31.089844 16.988281 29.808594 18.089844 C 31.65625 19.9375 33.578125 21.929688 35.601563 23.777344 C 37.09375 22.851563 38.335938 22.105469 39.828125 21.359375 C 37.980469 19.546875 36.3125 17.59375 34.285156 15.53125 Z M 34.285156 15.53125 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 49.109375 31.230469 C 46.339844 33.46875 45.769531 37.519531 47.832031 40.289063 C 50.070313 43.238281 54.121094 43.628906 57.070313 41.570313 C 59.839844 39.332031 60.410156 35.28125 58.347656 32.332031 C 56.144531 29.558594 52.09375 29.027344 49.109375 31.230469 Z M 49.109375 31.230469 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 35.609375 47.628906 C 33.015625 49.65625 32.445313 53.5625 34.507813 56.15625 C 36.53125 58.75 40.441406 59.320313 43.035156 57.257813 C 45.628906 55.234375 46.199219 51.539063 44.136719 48.730469 C 42.113281 45.960938 38.378906 45.605469 35.609375 47.628906 Z M 35.609375 47.628906 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 12.957031 28.367188 C 8.871094 31.527344 8.160156 37.25 11.289063 41.335938 C 14.449219 45.421875 20.171875 46.132813 24.257813 43.007813 C 28.34375 39.878906 29.054688 34.121094 25.929688 30.035156 C 22.765625 25.949219 16.832031 25.203125 12.957031 28.367188 Z M 12.957031 28.367188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(57,171,255);fill-opacity:1;" d="M 56.269531 62.773438 C 50.179688 67.453125 42.714844 69.988281 35.035156 69.984375 C 24.507813 69.984375 14.097656 65.257813 7.21875 56.261719 C -4.535156 40.914063 -1.636719 18.96875 13.738281 7.207031 C 20.082031 2.328125 27.558594 0 34.96875 0 C 45.5 0 55.910156 4.726563 62.789063 13.734375 C 74.546875 29.074219 71.617188 51.027344 56.269531 62.773438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(255,255,255);fill-opacity:1;" d="M 49.839844 41.128906 C 52.371094 44.429688 57.09375 45.058594 60.398438 42.535156 C 60.570313 42.402344 60.703125 42.242188 60.859375 42.101563 C 64.230469 44.476563 66.574219 46.046875 67.894531 46.945313 C 68.285156 45.933594 68.554688 44.960938 68.832031 43.945313 C 66.796875 42.421875 64.796875 40.855469 62.828125 39.246094 C 63.722656 36.894531 63.4375 34.152344 61.804688 32.007813 C 59.511719 29.019531 55.355469 28.195313 52.09375 30.082031 C 48.132813 26.523438 44.261719 22.867188 40.484375 19.113281 C 53.316406 12.214844 62.429688 13.222656 62.429688 13.222656 C 60.910156 11.285156 59.203125 9.585938 57.382813 8.046875 C 51.972656 7.210938 43.566406 7.304688 33.960938 12.414063 L 33.957031 12.410156 C 30.605469 8.898438 27.34375 5.296875 24.179688 1.613281 C 22.589844 2.121094 21.039063 2.753906 19.542969 3.5 C 21.992188 7.507813 25.285156 11.546875 29 15.492188 L 29.023438 15.515625 C 25.511719 17.992188 22.253906 20.8125 19.300781 23.9375 C 18.894531 24.367188 18.503906 24.804688 18.121094 25.238281 C 16.203125 24.832031 14.207031 24.96875 12.359375 25.632813 C 9.191406 18.796875 9.445313 13.300781 9.945313 10.46875 C 8.570313 11.910156 7.285156 13.425781 6.175781 15.042969 C 5.347656 18.425781 5.113281 23.300781 7.554688 29.175781 C 4.664063 32.957031 4.660156 38.207031 7.546875 41.988281 C 7.796875 42.3125 8.058594 42.609375 8.332031 42.894531 C 7.171875 46.886719 6.484375 51.003906 6.289063 55.160156 C 6.621094 55.609375 6.621094 55.972656 6.949219 56.414063 C 8.625 58.566406 10.734375 60.378906 12.773438 62.023438 C 12.519531 58.175781 12.792969 52.496094 15.171875 46.101563 C 16.835938 46.230469 18.507813 45.957031 20.046875 45.3125 C 20.945313 46.097656 21.882813 46.894531 22.882813 47.707031 C 26.046875 50.21875 29.464844 52.398438 33.082031 54.207031 C 32.894531 55.960938 33.378906 57.722656 34.4375 59.132813 C 36.789063 62.175781 41.15625 62.75 44.214844 60.417969 C 44.824219 59.941406 45.347656 59.367188 45.765625 58.714844 C 51.210938 59.929688 55.964844 60.144531 59.492188 60.144531 C 60.035156 60.144531 62.539063 56.730469 63.976563 54.617188 C 61.828125 55.066406 55.460938 55.941406 46.757813 53.441406 C 46.546875 52.4375 46.121094 51.488281 45.5 50.671875 C 43.289063 47.773438 39.246094 47.144531 36.234375 49.085938 C 32.90625 47.265625 29.738281 45.164063 26.773438 42.796875 C 26.128906 42.289063 25.496094 41.765625 24.871094 41.234375 C 26.890625 38.039063 27.058594 34.015625 25.316406 30.664063 C 25.714844 30.261719 26.109375 29.859375 26.535156 29.464844 C 29.769531 26.441406 32.816406 24.019531 35.664063 22.078125 C 35.546875 21.972656 35.445313 21.859375 35.332031 21.753906 C 35.445313 21.859375 35.550781 21.964844 35.667969 22.070313 L 35.664063 22.074219 C 40.03125 26.113281 44.664063 29.941406 49.054688 33.363281 C 47.894531 35.824219 48.074219 38.820313 49.839844 41.128906 Z M 49.839844 41.128906 "/>
 </g>
 </svg>
diff --git a/dist/Web/AzureWebApp.png b/dist/Web/AzureWebApp.png
index 1faafdc6..8625c813 100644
Binary files a/dist/Web/AzureWebApp.png and b/dist/Web/AzureWebApp.png differ
diff --git a/dist/Web/AzureWebApp.puml b/dist/Web/AzureWebApp.puml
index 41d010f6..80b3bf6c 100644
--- a/dist/Web/AzureWebApp.puml
+++ b/dist/Web/AzureWebApp.puml
@@ -1,13 +1,10 @@
 sprite $AzureWebApp [70x70/16z] {
-dLY9WeIe3ZG9kVp__trlLrgBbc0xcxcHBYgLWqnlQoDHyyZCZ71jlFtTH6E_MNgZlq2mvbwRosiCtnyizGq6ZHWPRcRcaUDY-ma2NyA41d1Mm0S_EnCNYIns
-jaln9xVQXqZ4lq1K7MCddMMuFZjIjjW1iz0-5ruvoD91AXQfb0ymFZxJdXsFOKnPWC1TBs5Oshycjc3JrmqBULkWvaFIH5RAjJl8nZc4bAQIY48vxcjKYDYs
-JMAVBQPpj-Zh5R_Ks4lhodM54P7Syrh0ScJcHCEq2RDzIyDPesns87p1XEBq-FB9Ju9rtG0cbMOrF-7cuun_LQ0fXG1JTIWzbWSgebqg60L2aL5tEP2XO_E1
-gxT00oQ0CONHBbfo_F09f0kMYMoVoIH-EM1p0ZbWObt2UYPcp_F-Kowci21TTmBg-lOof4-aV0PHPB4i-adsr0deJTAamPsKmS6KXRv2L-5wJs3Ow0MlOFhh
-8KShwfPksREtCaf-A4T8eT6yQ8Qj5COGu7m0GIysjiWm_bhrBcxXKLRN5SmWRqzmhnqgf8mPHiwWMA_ikrcP7h3k59yeMeSeVg3OY8AYV1PcSZl-AmhDpu7o
-tgEzv88OqIjrvo09yWKRfXZ0xeoJhnMz79JQePeC1ZmxVi6fTXDNAXIAiGDQXmr2YJ4GqA3guIvT-gd1NQ6yIg2jEyDwgChEmYzX7AEwmwj7itxHK6SWo4id
-6ky0Nz91cSVPnP4mWiaNWM2H2WqtI7U4paWds6BGoAEVBKTAEk6i62jR_amWnai-WxPDqIL_A0bGaV7AlarOK0T65PKOivgZt2Wv-dJJECPpPHYO9j8wptJC
-HCJI35I-hyLyGYb7NeQC7Q6C0rS086zLsx2dNf3ps1npoB94uSG59Sqy4f39nOa9b3bCAL20kBZy8OtNDUVXIdElqXLnBM7glRP-5FGJH9UH0CtyGOS3_NGD
-yzpXs7_lqVBV1fZuguxCkNwRH2nVlsEXYUnq5MOYPcaMM7VWBuriVxIGxPMHvWeYZLz1G0COjDh-QlobHRe-UF9_
+bPZdOgiX34EH1-__nlUs9Si9vtFGduwGWsoCCWPBvf7pLvdXfd4knVnGs1b2O-JSARy6tQnFa7_5o6dhbqdg_VorOpIOL6VaLx7-Ce0qPVcRPz_vM8hhQfQq
+mMIKcO6gylKP3p0ViHXoLxnYqdaagWJzYuqDn4Wq5Hi6KtKsNEOUxoUbxOm9TlGixUE-BC5T1yDUAJpddhoJSdU70spGiemDnO11tTFYrLM2eKGpkNvnWBGO
+BIkBedgB04Dculwi18YhmToxMc8WFopODSPkWLRokZ2iNCsaak9vhEucIQMQzw20aieYJh-ymfZkjBFqgtBZ553E8c6afzCh0mUEpNIJlPeA6ZFjd6FNIa54
+eNci56fjbpa1KG8hw9v2lTLkcwBHKMmUTEQG4h2ehwYd9API75GKUDBpeBj19JbGVBVC8AsRiAwTIM5UH_yMqnwl8VpIuOI9jTZlcuVTdSCxJb96rhJug4Y2
+gcY0VjUNpdjahNpsCjqFm-gG-3YnyzZklQ5HkbCI4iRvXPBREDArBIidreTENDsiHm7gtf5T3Q5DBoV2TkpgagUJOsjlrzEmRBC6oh98iYikMsCZcPcRcJQF
+OlDOtrBY5AAvKmCX2fkn_fi20MN6nxHaHBWRSEYwsUujl0zGJbBcmTa5GFfXv8l2Yj783uoWQXUvrxtaHmoMnHRX6eUIbmp8k73n7m
 }
 
 AzureEntityColoring(AzureWebApp)
diff --git a/dist/Web/AzureWebApp.svg b/dist/Web/AzureWebApp.svg
index 2ec23360..f20733b7 100644
--- a/dist/Web/AzureWebApp.svg
+++ b/dist/Web/AzureWebApp.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
 <g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 56.269531 62.773438 C 49.929688 67.625 42.457031 69.984375 35.035156 69.984375 C 24.507813 69.984375 14.097656 65.257813 7.21875 56.261719 C -4.535156 40.914063 -1.636719 18.96875 13.738281 7.207031 C 20.078125 2.328125 27.558594 0 34.96875 0 C 45.5 0 55.910156 4.726563 62.789063 13.734375 C 74.546875 29.074219 71.617188 51.027344 56.269531 62.773438 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.839844 41.128906 C 52.382813 44.445313 57.101563 45.042969 60.398438 42.535156 C 60.570313 42.402344 60.703125 42.242188 60.859375 42.101563 C 64.230469 44.476563 66.574219 46.046875 67.894531 46.945313 C 68.285156 45.933594 68.554688 44.960938 68.832031 43.945313 C 67.4375 42.910156 65.550781 41.457031 62.828125 39.246094 C 63.722656 36.894531 63.4375 34.152344 61.804688 32.007813 C 59.46875 28.984375 55.328125 28.214844 52.09375 30.082031 C 48.53125 26.882813 44.613281 23.21875 40.484375 19.113281 C 53.316406 12.214844 62.429688 13.222656 62.429688 13.222656 C 60.910156 11.285156 59.203125 9.585938 57.382813 8.046875 C 51.96875 7.210938 43.566406 7.304688 33.960938 12.414063 L 33.957031 12.410156 C 30.757813 9.0625 27.5 5.46875 24.179688 1.613281 C 22.59375 2.121094 21.042969 2.75 19.542969 3.5 C 21.992188 7.507813 25.285156 11.546875 29 15.492188 C 29.007813 15.5 29.015625 15.507813 29.023438 15.515625 C 25.929688 17.679688 22.480469 20.574219 19.300781 23.9375 C 18.894531 24.367188 18.503906 24.804688 18.121094 25.238281 C 16.222656 24.839844 14.226563 24.957031 12.359375 25.632813 C 9.1875 18.796875 9.445313 13.300781 9.945313 10.46875 C 8.570313 11.910156 7.285156 13.425781 6.175781 15.042969 C 5.347656 18.425781 5.113281 23.300781 7.554688 29.175781 C 4.730469 32.875 4.597656 38.121094 7.546875 41.988281 C 7.796875 42.3125 8.058594 42.609375 8.332031 42.894531 C 7.042969 47.285156 6.464844 51.519531 6.289063 55.160156 C 6.617188 55.609375 6.617188 55.972656 6.949219 56.414063 C 8.625 58.566406 10.734375 60.378906 12.773438 62.023438 C 12.519531 58.175781 12.792969 52.496094 15.171875 46.101563 C 16.8125 46.226563 18.484375 45.96875 20.046875 45.3125 C 20.945313 46.097656 21.882813 46.894531 22.882813 47.707031 C 26.316406 50.425781 29.742188 52.539063 33.082031 54.207031 C 32.910156 55.90625 33.332031 57.671875 34.4375 59.132813 C 36.796875 62.179688 41.164063 62.746094 44.214844 60.417969 C 44.847656 59.933594 45.347656 59.347656 45.765625 58.714844 C 51.210938 59.929688 55.964844 60.144531 59.492188 60.144531 C 60.035156 60.144531 62.539063 56.730469 63.976563 54.617188 C 61.828125 55.066406 55.460938 55.941406 46.757813 53.441406 C 46.546875 52.464844 46.144531 51.515625 45.5 50.671875 C 43.289063 47.773438 39.246094 47.144531 36.234375 49.085938 C 33.210938 47.441406 30.039063 45.386719 26.773438 42.796875 C 26.113281 42.277344 25.480469 41.753906 24.871094 41.234375 C 26.867188 38.085938 27.078125 34.054688 25.316406 30.664063 C 25.714844 30.261719 26.109375 29.859375 26.535156 29.464844 C 29.769531 26.441406 32.8125 24.019531 35.660156 22.078125 C 35.546875 21.972656 35.445313 21.859375 35.332031 21.753906 C 35.445313 21.859375 35.550781 21.964844 35.667969 22.070313 C 35.664063 22.070313 35.664063 22.074219 35.664063 22.074219 C 40.03125 26.113281 44.664063 29.941406 49.054688 33.363281 C 47.890625 35.824219 48.074219 38.820313 49.839844 41.128906 Z M 49.839844 41.128906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 56.269531 62.773438 C 50.179688 67.453125 42.714844 69.988281 35.035156 69.984375 C 24.507813 69.984375 14.097656 65.257813 7.21875 56.261719 C -4.535156 40.914063 -1.636719 18.96875 13.738281 7.207031 C 20.082031 2.328125 27.558594 0 34.96875 0 C 45.5 0 55.910156 4.726563 62.789063 13.734375 C 74.546875 29.074219 71.617188 51.027344 56.269531 62.773438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 49.839844 41.128906 C 52.371094 44.429688 57.09375 45.058594 60.398438 42.535156 C 60.570313 42.402344 60.703125 42.242188 60.859375 42.101563 C 64.230469 44.476563 66.574219 46.046875 67.894531 46.945313 C 68.285156 45.933594 68.554688 44.960938 68.832031 43.945313 C 66.796875 42.421875 64.796875 40.855469 62.828125 39.246094 C 63.722656 36.894531 63.4375 34.152344 61.804688 32.007813 C 59.511719 29.019531 55.355469 28.195313 52.09375 30.082031 C 48.132813 26.523438 44.261719 22.867188 40.484375 19.113281 C 53.316406 12.214844 62.429688 13.222656 62.429688 13.222656 C 60.910156 11.285156 59.203125 9.585938 57.382813 8.046875 C 51.972656 7.210938 43.566406 7.304688 33.960938 12.414063 L 33.957031 12.410156 C 30.605469 8.898438 27.34375 5.296875 24.179688 1.613281 C 22.589844 2.121094 21.039063 2.753906 19.542969 3.5 C 21.992188 7.507813 25.285156 11.546875 29 15.492188 L 29.023438 15.515625 C 25.511719 17.992188 22.253906 20.8125 19.300781 23.9375 C 18.894531 24.367188 18.503906 24.804688 18.121094 25.238281 C 16.203125 24.832031 14.207031 24.96875 12.359375 25.632813 C 9.191406 18.796875 9.445313 13.300781 9.945313 10.46875 C 8.570313 11.910156 7.285156 13.425781 6.175781 15.042969 C 5.347656 18.425781 5.113281 23.300781 7.554688 29.175781 C 4.664063 32.957031 4.660156 38.207031 7.546875 41.988281 C 7.796875 42.3125 8.058594 42.609375 8.332031 42.894531 C 7.171875 46.886719 6.484375 51.003906 6.289063 55.160156 C 6.621094 55.609375 6.621094 55.972656 6.949219 56.414063 C 8.625 58.566406 10.734375 60.378906 12.773438 62.023438 C 12.519531 58.175781 12.792969 52.496094 15.171875 46.101563 C 16.835938 46.230469 18.507813 45.957031 20.046875 45.3125 C 20.945313 46.097656 21.882813 46.894531 22.882813 47.707031 C 26.046875 50.21875 29.464844 52.398438 33.082031 54.207031 C 32.894531 55.960938 33.378906 57.722656 34.4375 59.132813 C 36.789063 62.175781 41.15625 62.75 44.214844 60.417969 C 44.824219 59.941406 45.347656 59.367188 45.765625 58.714844 C 51.210938 59.929688 55.964844 60.144531 59.492188 60.144531 C 60.035156 60.144531 62.539063 56.730469 63.976563 54.617188 C 61.828125 55.066406 55.460938 55.941406 46.757813 53.441406 C 46.546875 52.4375 46.121094 51.488281 45.5 50.671875 C 43.289063 47.773438 39.246094 47.144531 36.234375 49.085938 C 32.90625 47.265625 29.738281 45.164063 26.773438 42.796875 C 26.128906 42.289063 25.496094 41.765625 24.871094 41.234375 C 26.890625 38.039063 27.058594 34.015625 25.316406 30.664063 C 25.714844 30.261719 26.109375 29.859375 26.535156 29.464844 C 29.769531 26.441406 32.816406 24.019531 35.664063 22.078125 C 35.546875 21.972656 35.445313 21.859375 35.332031 21.753906 C 35.445313 21.859375 35.550781 21.964844 35.667969 22.070313 L 35.664063 22.074219 C 40.03125 26.113281 44.664063 29.941406 49.054688 33.363281 C 47.894531 35.824219 48.074219 38.820313 49.839844 41.128906 Z M 49.839844 41.128906 "/>
 </g>
 </svg>
diff --git a/dist/Web/all.puml b/dist/Web/all.puml
index 420e170f..ac228402 100644
--- a/dist/Web/all.puml
+++ b/dist/Web/all.puml
@@ -1,31 +1,91 @@
-sprite $AzureAPIManagement [70x61/16z] {
-fPO7ceGm28Mf2UJ-zztEV15bOjn_wrYGyW1X2KapStVhol0CL1yJtXyOeZvEcC0URLnYjEE8Zmg5kyXinCri_jpX7Zg2BWG_83VVCoFXXEBnk6sOuRWMoqWR
-hC3VAvtX0hJnWy02-pLILVHNHOwBfAokwdTIuycJobckb4RCtDRAGg-S8RLPvdVaH91W6mTMlUjNrSxDQxUqxKa2s_s6KqYvUwst_cCHOKLFoaEF-OE_dyKC
-bcXAZ9tbZZTRhQUY6S8UU2W2FZC2U2XIYvxPvM35Ks4V-SBJX-TvQP7gNJYMIXPF1fb5cDwETzTNMWZEK0j5UvTAk-6FPxtd5eydPdm4JfKlEXBEvxG41buC
-4n-9b3mM9eerftsIItwMDM7H5WQrN2lUgfdK6-OaIVbEmDEqgP5YBOJWmC_Eb8-qIdtmTcyGCyrcjBA2NiQiFcb5hXekZh-aeTLMZ-5Z5vg8m_5t3EDoBpYc
-4Pbt-ZIzXpTXGiJpgs4B8VgbndiiWOIdGnXsLKH_QD_uc8I2VIoGSFuAFPQZHbC3fd03RFxCYWlCe7JVZiWLuGnIaBCRErLUC3D2JL5f2tCxPDNXevsJEw25
-KplaRgJGrpx4GhDd1eb7uJ7y1xBekas4KuAUn8C-J1a1YRjFzTwZZumJxC8Zqn6sQKNdRaBDqol3GrYxVT6KOCKd
+sprite $AzureAPIConnection [70x70/16z] {
+xPHbsYGX30OZRyBzJxpIcSu84bO_w_eBJqM1tXyN5nUYi060q3Rm1ROdKYymfWeshz5AaW4n82EWa1IrCpQoYM2oKR9Km-6j4HRryDucwF9KgCPMoHoDfGra
+aOncFLl9sA8Wsj_lUG1KZpGU96VQ05GU2oYsIQqTuBnxwDg18qNB2OctDh44sCZ5MYiipRde2tlUZK3P5tPlYSICPfRRJLD-N9YC8KZDOdmM3buiXOQ6YNZI
+NiquJ-F489JFdqUsxZaL7cMiH39yIEWoaKXbsBqp6HkaWauoU71yIuO7VxmSNUi-APrCmJACcpmNvDs_2wB962WqWK5ZE_miI1MMfpI2mnAQ18zjuQU3ma9i
+lKMVBK8JmXA8BIrAL5a2LjXfySUA3957MT5uV5l8t88yAh6yEjt86iujdtqkswa8ZT6srnbPt_FCj9GqBiwBRE8hGtbZjMviSOLMe0KGuHvHRxKaigbngX1l
+5Q2AEXrZsaFCPmeDnouyWFuo5nSNtm4
 }
 
-AzureEntityColoring(AzureAPIManagement)
-!define AzureAPIManagement(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAPIManagement, AzureAPIManagement)
-!define AzureAPIManagement(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAPIManagement, AzureAPIManagement)
+AzureEntityColoring(AzureAPIConnection)
+!define AzureAPIConnection(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAPIConnection, AzureAPIConnection)
+!define AzureAPIConnection(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAPIConnection, AzureAPIConnection)
 
-sprite $AzureCDN [70x32/16z] {
-hTC5SkWm40DGBHYa-z_tOtcTrCxq3PfHs6Sv9iNPq_1KJBqRZYTywhDXMB51BGq0MTiOM9XQcm2QLXA5QOrM9hcRXbfgGEW2wnrdEKhBY0ICkZ9HUEiVDCEB
-hck93OPFMwc8RtYRaZY6xWJksD2MZXjExU6JIIh35QDEP-ai9-tQv-lVu33gT2-itp6rZoNAJmuqy4-mf6zetymm0B3MFmfWwWWxLeOE3InqdMgeKgU8odJi
-PuvKKZ1BZZRKjGDmFhWNbghW-HlD-lm-Z_-BSr4RdRiXm7-Mdpd-CTzW0F0R
+sprite $AzureAppServiceCertificate [70x70/16z] {
+xT87TiD024LHce2__mMx5t9YMn9Apzm5l2b0dspWJUX4T2icqW_0h7-Jj6b1RJ8gRutAgB0kzxmIM6vwMh5OJlxKZ4P5z0bvMM6cmZjRfuw3k4Sjdz9d5ST5
+SFzV0WW_222vMt6aNoIYMM4W_0fGEk6d7bScfDy4Ocv6zh0I2By3w6XQMqbu0N3hN_BTNJgLg9L0zYfMVpVXlKfzKW3Ih1WGjuXJiq8uo8XC0DAjC0hztegW
+i4RbP4BXsh2r8dhbA49NuO-e2F7sYfHlTXIvei5KJ3Womr5Gar_sv9J9TkKSEMVQbJX7Bfb-nUZ2-fKqkZ4mzIWLHZ_6i0S
 }
 
-AzureEntityColoring(AzureCDN)
-!define AzureCDN(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureCDN, AzureCDN)
-!define AzureCDN(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureCDN, AzureCDN)
+AzureEntityColoring(AzureAppServiceCertificate)
+!define AzureAppServiceCertificate(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppServiceCertificate, AzureAppServiceCertificate)
+!define AzureAppServiceCertificate(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppServiceCertificate, AzureAppServiceCertificate)
 
-sprite $AzureSearch [70x47/16z] {
-dPPNmZCW20G54LdkVz-_VYaMZ6IUKiUsMLFkOEa6XtNXyYrY_iBaAqSr7x6QbwYljAoa-uwUb-Gr9DgxDWwNyq1Z1p-7nh-bLu-fLnk9MWey1fTx8E8dv4hY
-W7jsCispy2eXU9QMcueraQRc4xPQu05ezCY1VjeOze1ExvyQnreizIwYD2oBPeiSVouiJNWzX79dmN_7_maOJn_4QedZMJ4yxOSpud0gZD7AXxn8kBLzrjhp
-cVBeGBmWpA7NVGx8V0ylIwrpob67ADrRP5SGX6ETqUBLNUcPXxJvVUnw2FIOto6vTPezOVCn-04UsrY3JF1Zf5FFDpokXQ12j7aCwjibfKBX3GKxIQxR6Jc9
-UcmvIwWyOFES1VowfaoO2d4pZx3FaWiq8Ocfv_y3vZVODhl8ILpsASf9GFjYaBYyWazB41Q-bLWSQi0lCIgn9Y49cZU11bT9XivbX5it9B17u_pbDm
+sprite $AzureAppServiceDomain [70x70/16z] {
+xTC7SYGX30NGhu08klzzrrAFARTnPDYA_WvqqYiY_cV-Gh8VpGY3otxiDQed57jxlutOxNuNiVlz9cBpdkXNZAtAHEAUy8FGZ4JLAu8vm_XTtYWqzUSKuYlF
+ACPFZkZ6n2tJD-5RT2h9_72bRScowxQGzGJiAv6yt4EMqbt4scyoFiilZ3xyinn1_0ZYHn3VGFQL6xBc2E9743-2-0QofNG_e7G_eFJn2uMvNgraeo-toXR8
+44x8kBgnUKIvPItRNH6KQ0gG6l0YGQ8d3QZn8QDx1SVb04fYg7UbWADXf6PnLq4nd09eLbAMHxygBeqmxae3yh-afcaHUdpAH56Pbg3cVudw7jPTOLZqo0Xv
+SutIujEYeIbYAYoi0RNG3FPUKMZKDGtj6bw5nAUzmhBth-Dgg3qqGN-lrAY4D8FcNsiZPu791yHxY8yvLWmd2d7TBuHcCHsW9gYvxmLje4JfY2542in9Oe2z
+eQoAnWIq71LH8bvHAbgKjfZEI8TqMBooWhOg1Y7EDI-GH7o0XKREy5mEGWbmG1XZLHe8vT5Qzmo3D3IYsNi59IWKCxKgyjYtX3dt1hIhT3vgk403waUAiMHR
+M8TVwI9vsKJzaI7IvwkPdMEyvWZYHn0_WlYA753s43-2-174Zo2-84ygtVTp1F4ZYDTbj-s4Jo06qfUKPwACZ_ENVm
+}
+
+AzureEntityColoring(AzureAppServiceDomain)
+!define AzureAppServiceDomain(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppServiceDomain, AzureAppServiceDomain)
+!define AzureAppServiceDomain(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppServiceDomain, AzureAppServiceDomain)
+
+sprite $AzureAppServiceEnvironment [70x70/16z] {
+xTXNieCm38LXjSF-btpJn8o2yF7jpVyp-KQXuusb8eBjxIr5-g8eqkS_M5dAKbJD_1qAJ4XS2HKMLwZ1bKmj0eXmVRkYWKUNpUoDYYFRha7VeaH5Bjdh5HIa
+PRWI1SdqL67xfFGw1IUA4uMCafqfk1Hvlgi748vMoHtiaM6hUJdDpfN82ReWbmp7kWsj4t9G9S2-OtGqIczmfUvlZkHlj5GKXgGoJESGZ1MRL4pbgNZakLku
+ijzeFB8jUvfbvXNB-yF7bRfpUfmf_7slxXYks479CqTVgUYbE9v6Di_eu2xbiqeCxtKsnu3TCJsu4bFtNHqdmXNUDoXgb_O_-C_UL9UobALu7uhYrXPh5UUy
+5m
+}
+
+AzureEntityColoring(AzureAppServiceEnvironment)
+!define AzureAppServiceEnvironment(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppServiceEnvironment, AzureAppServiceEnvironment)
+!define AzureAppServiceEnvironment(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppServiceEnvironment, AzureAppServiceEnvironment)
+
+sprite $AzureAppServicePlan [70x70/16z] {
+vTK7mjiW38RXC2IckFznIzh-4_WYnzbv3_3O1eGFBjNJPJx0NDKLe9AgCeEKgirTHF7FfaXR91kKrafC0XYD8YrvxsdEg9Kcv7iHl8n6gVvOsAU8aE-bdKeh
+j7eL_RfqHafj-_Qe9m8CZO9xSqNcookoHP4c5UpqfKyTLdPCm8MdiOc_mCqWBNQ4wivfR2tlk34lU7lZtboHUTkKTf4_h4JYWgVHMEkSDUZi1jyhwxT9z9K5
+quZcA7uHVCoTCTEPVo4zC_qYNdzHeW7fkUdg1g8yHUA0Z0mOHl0cNupkr6LQAcor4r1uYVIqIYIaE9rI4D8xfPISSy6lqdD8oO7-nX3fqLefWMRnhAMIYVIA
+7HI0y2etLmeYnlnSOO2ebGmClH8keW14lxfv8yBc8eftTbJI7C6v4-_2kln55BPmZrWPmVF2sdufwI9AvOie-I9AJMSmb273kWpNeSmRcJu4iOwbi86XFf5_
+}
+
+AzureEntityColoring(AzureAppServicePlan)
+!define AzureAppServicePlan(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureAppServicePlan, AzureAppServicePlan)
+!define AzureAppServicePlan(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureAppServicePlan, AzureAppServicePlan)
+
+sprite $AzureMediaService [70x70/16z] {
+fPY7UkiW34QjYH6y_-lUGPS88c3wTpVE-QJ3yBXM8KlNRmDthRN8xo1QFs9qpk1IltF36OEiTj4J8Qc-fl2fa3uPJuNqITjwCDTvYfuAwMCRUgJKPJ8-6zq3
+FKx8ClD5aUgJ69qAwNF3df2iJFyYcYTwXlK_vEvAvdkbHxT60K9E_ZvkhDSm74EhRuxCitw1MFw52MR3Q7EAVXfNbqz9qcknEKKSO-1e3_6Ke1tH8UARQf0v
+9JSX6gRfCGUPKc0EqIOClyNEAUhQ8GcRIWuIKqgRf_eHZ1L3SP2GehuVl2wGG4roa922hXJ5OCIvcR6t56jJmbE6SjeROegVA-GfBUWWxP_wdiAjeOxI8drB
+55Ey5Wqe5tQ3ZUyfLqXf4IS6ZYaNEhrFA8m-98SKSA7zZc1A4TsdaDFeAMu2otgaso4ZHLxMeyGKlqN1AuN6vJYXUBtIKsJSOVA2mdwUiYl4po6s1SLyCGme
+qMPthoYLd1ccSFycMrBCJVOns4fPKwgw3IuyiObjK2hvQiPAC6zH2hfzqaMW_J_R5gKMY4xKU7d8dEAhQK7Mp_3NVxBjKFnbGmlyo_KLoRQWh2-lyROnxa2j
+0OTw1YKBSkFgogya_cm6M7F4oBnv1r3CIliUCFJXnNS4IV3qHc0XPEV2E6Weoy4DqaB8ffuN8NXqurWw8NHu4riMGlRqE26mInZrB4PtJq-9f_j3FSK9ENy0
+yv-HuBSFWqw4Z8jYGyXV
+}
+
+AzureEntityColoring(AzureMediaService)
+!define AzureMediaService(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureMediaService, AzureMediaService)
+!define AzureMediaService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureMediaService, AzureMediaService)
+
+sprite $AzureNotificationHubNamespace [70x70/16z] {
+pSo5eGKm3090ca3st_YvQuKlDy1XBqXrgnjYu2GreXuT7sfjAGB8rQGgqRI-L4j3KgHZAKDYMoOIoh4akBBKUK5Q5iJqKZSBccL1qzHIzmjmqsGtdWLEU5cm
+8YmBmhAWMHP0bWMqB4ZBWYXsqMUb7lN5BoxrVvRwjOLf82NMoT9eXvP5R8v5QfP5OLcKbaN42NLHdVJSvD8YjOUbfXQ5PL7UBZMxY9P5H0udnUU6ZaNZIOLb
+WID9f641mEKayAuPJG2k96euQSd9XO5l7gx075eMqBA0bWMqBA1b0IqBU5aSJSCQMXQaPK5Q5gHbGLeMv8Tb2m
+}
+
+AzureEntityColoring(AzureNotificationHubNamespace)
+!define AzureNotificationHubNamespace(e_alias, e_label, e_techn) AzureEntity(e_alias, e_label, e_techn, AZURE_SYMBOL_COLOR, AzureNotificationHubNamespace, AzureNotificationHubNamespace)
+!define AzureNotificationHubNamespace(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureNotificationHubNamespace, AzureNotificationHubNamespace)
+
+sprite $AzureSearch [70x70/16z] {
+rPS7TlOW30Gb93gv_t7JZ1jU77r-VvtNKuRLWXkPO2VwXJYcfpZr1uGVEVo8qAkmUe1xKU8nQcZo4zUd0OGl_Ar2zkKSCLRyf95pREpeYBb9BEcmiKaikP_9
+Bkau8Bbh0KXm67U_D92WPXGwxf4VgWqczFwa11l-Tg1WXGQ0v5-mXCSMUMPHdfwuy0hoO9S1Vf10Iqovb9nJ_47Z_DGIIsqhDSSxZHyuEDgP4gVToCoIsvMC
+DPSeOn1J774JoLv8oJdNUusVxFAQf7ZtZMpP2WgZKD8xgUfsGfrt0oMf_xqxmCGz3fW9IVggwIYXJtY9MB45Hocd8DzmryDUSBLob7HaKh22CxlFiqiw6JVZ
+PWCfaf30aJnF1YfGGbJHI49wiTG-499GGhl4nDWIiOGYi2WHoMXfNuHkeO7bj-0UhiWIKHHiwIl1Ne04zoA7Dp6yHtIXT0jwRz3hJKvW51uFBu-l-kTJ5tiK
+L4i2GLRFkTuAezH3kLvklr_MC3o9abL5G50qV5CQaVODaucop2IZf2uXoKH-QmkUZcXTv6GYjRTLa_SuBhK5HnPY-xIicbQ2E7QoFodLAkaQY5qorrGnI-QQ
+n5R9hb4EzUHmP9TqggDF9FOdMLAcXv8ECza9jXhjalR_I_HNIAZy2Wdz4Wdz4WcLNo4X_HMIVZiiJoKV
 }
 
 AzureEntityColoring(AzureSearch)
@@ -44,15 +104,12 @@ AzureEntityColoring(AzureSignalRService)
 !define AzureSignalRService(e_alias, e_label, e_techn, e_descr) AzureEntity(e_alias, e_label, e_techn, e_descr, AZURE_SYMBOL_COLOR, AzureSignalRService, AzureSignalRService)
 
 sprite $AzureWebApp [70x70/16z] {
-dLY9WeIe3ZG9kVp__trlLrgBbc0xcxcHBYgLWqnlQoDHyyZCZ71jlFtTH6E_MNgZlq2mvbwRosiCtnyizGq6ZHWPRcRcaUDY-ma2NyA41d1Mm0S_EnCNYIns
-jaln9xVQXqZ4lq1K7MCddMMuFZjIjjW1iz0-5ruvoD91AXQfb0ymFZxJdXsFOKnPWC1TBs5Oshycjc3JrmqBULkWvaFIH5RAjJl8nZc4bAQIY48vxcjKYDYs
-JMAVBQPpj-Zh5R_Ks4lhodM54P7Syrh0ScJcHCEq2RDzIyDPesns87p1XEBq-FB9Ju9rtG0cbMOrF-7cuun_LQ0fXG1JTIWzbWSgebqg60L2aL5tEP2XO_E1
-gxT00oQ0CONHBbfo_F09f0kMYMoVoIH-EM1p0ZbWObt2UYPcp_F-Kowci21TTmBg-lOof4-aV0PHPB4i-adsr0deJTAamPsKmS6KXRv2L-5wJs3Ow0MlOFhh
-8KShwfPksREtCaf-A4T8eT6yQ8Qj5COGu7m0GIysjiWm_bhrBcxXKLRN5SmWRqzmhnqgf8mPHiwWMA_ikrcP7h3k59yeMeSeVg3OY8AYV1PcSZl-AmhDpu7o
-tgEzv88OqIjrvo09yWKRfXZ0xeoJhnMz79JQePeC1ZmxVi6fTXDNAXIAiGDQXmr2YJ4GqA3guIvT-gd1NQ6yIg2jEyDwgChEmYzX7AEwmwj7itxHK6SWo4id
-6ky0Nz91cSVPnP4mWiaNWM2H2WqtI7U4paWds6BGoAEVBKTAEk6i62jR_amWnai-WxPDqIL_A0bGaV7AlarOK0T65PKOivgZt2Wv-dJJECPpPHYO9j8wptJC
-HCJI35I-hyLyGYb7NeQC7Q6C0rS086zLsx2dNf3ps1npoB94uSG59Sqy4f39nOa9b3bCAL20kBZy8OtNDUVXIdElqXLnBM7glRP-5FGJH9UH0CtyGOS3_NGD
-yzpXs7_lqVBV1fZuguxCkNwRH2nVlsEXYUnq5MOYPcaMM7VWBuriVxIGxPMHvWeYZLz1G0COjDh-QlobHRe-UF9_
+bPZdOgiX34EH1-__nlUs9Si9vtFGduwGWsoCCWPBvf7pLvdXfd4knVnGs1b2O-JSARy6tQnFa7_5o6dhbqdg_VorOpIOL6VaLx7-Ce0qPVcRPz_vM8hhQfQq
+mMIKcO6gylKP3p0ViHXoLxnYqdaagWJzYuqDn4Wq5Hi6KtKsNEOUxoUbxOm9TlGixUE-BC5T1yDUAJpddhoJSdU70spGiemDnO11tTFYrLM2eKGpkNvnWBGO
+BIkBedgB04Dculwi18YhmToxMc8WFopODSPkWLRokZ2iNCsaak9vhEucIQMQzw20aieYJh-ymfZkjBFqgtBZ553E8c6afzCh0mUEpNIJlPeA6ZFjd6FNIa54
+eNci56fjbpa1KG8hw9v2lTLkcwBHKMmUTEQG4h2ehwYd9API75GKUDBpeBj19JbGVBVC8AsRiAwTIM5UH_yMqnwl8VpIuOI9jTZlcuVTdSCxJb96rhJug4Y2
+gcY0VjUNpdjahNpsCjqFm-gG-3YnyzZklQ5HkbCI4iRvXPBREDArBIidreTENDsiHm7gtf5T3Q5DBoV2TkpgagUJOsjlrzEmRBC6oh98iYikMsCZcPcRcJQF
+OlDOtrBY5AAvKmCX2fkn_fi20MN6nxHaHBWRSEYwsUujl0zGJbBcmTa5GFfXv8l2Yj783uoWQXUvrxtaHmoMnHRX6eUIbmp8k73n7m
 }
 
 AzureEntityColoring(AzureWebApp)
diff --git a/scripts/.vscode/launch.json b/scripts/.vscode/launch.json
index 778df8e6..b0cadc12 100644
--- a/scripts/.vscode/launch.json
+++ b/scripts/.vscode/launch.json
@@ -8,7 +8,7 @@
             "program": "dotnet",
             "args": [
               "exec", 
-              "${env:USERPROFILE}/.dotnet/tools/.store/dotnet-script/0.26.1/dotnet-script/0.26.1/tools/netcoreapp2.1/any/dotnet-script.dll", 
+              "${env:USERPROFILE}/.dotnet/tools/.store/dotnet-script/0.53.0/dotnet-script/0.53.0/tools/netcoreapp3.1/any/dotnet-script.dll", 
               "${file}"
             ],
             "cwd": "${workspaceFolder}",
diff --git a/scripts/Config.yaml b/scripts/Config.yaml
index 5ad1eb90..f00f886e 100644
--- a/scripts/Config.yaml
+++ b/scripts/Config.yaml
@@ -1,247 +1,633 @@
 Categories:
 - Name: General
   Services:
-  - Source: Azure_logo_icon_50
+  - Source: Azure
     Target: Azure
+  - Source: All Resources
+    Target: AzureAllResources
+  - Source: Azure Home
+    Target: AzureHome
+  - Source: DeveloperTools
+    Target: AzureDeveloperTool
+  - Source: Help + Support
+    Target: AzureHelpAndSupport
+  - Source: Information
+    Target: AzureInformation
+  - Source: Management Groups
+    Target: AzureManagementGroup
+  - Source: Marketplace
+    Target: AzureMarketplace
+  - Source: Quick Start Center
+    Target: AzureQuickStartCenter
+  - Source: Recent
+    Target: AzureRecent
+  - Source: Reservations
+    Target: AzureReservation
+  - Source: Resource Groups
+    Target: AzureResourceGroup
+  - Source: Resource
+    Target: AzureResource
+  - Source: Service Health
+    Target: AzureServiceHealth
+  - Source: Shared Dashboard
+    Target: AzureSharedDashboard
+  - Source: Support Requests
+    Target: AzureSupportRequest
+  - Source: Support
+    Target: AzureSupport
+  - Source: Tag
+    Target: AzureTag
+  - Source: Tags
+    Target: AzureTag
+  - Source: Templates
+    Target: AzureTemplate
+  - Source: Two User Icon
+    Target: AzureTwoUserIcon
+  - Source: User Health Icon
+    Target: AzureUserHealthIcon
+  - Source: User Icon
+    Target: AzureUserIcon
+  - Source: User Privacy
+    Target: AzureUserPrivacy
+  - Source: User Resource
+    Target: AzureUserResource
+  - Source: What's New
+    Target: AzureWhatsNew
+
 
 - Name: AIMachineLearning
   Services:
-  - Source: Azure Batch AI
-    Target: AzureBatchAI   
-  - Source: Azure Bot Service
+  - Source: Batch AI
+    Target: AzureBatchAI
+  - Source: Bot Services
     Target: AzureBotService
-  - Source: Azure Cognitive Services
+  - Source: Cognitive Services
     Target: AzureCognitiveServices
-  - Source: Azure Machine Learning Service
+  - Source: Genomics Accounts
+    Target: MicrosoftGenomics
+  - Source: Machine Learning Service Workspaces
     Target: AzureMachineLearningService
-  - Source: Azure Machine Learning Studio
+  - Source: Machine Learning Studio Web Service Plans
+    Target: AzureMachineLearningStudioWebServicePlan
+  - Source: Machine Learning Studio Web Services
+    Target: AzureMachineLearningStudioWebService
+  - Source: Machine Learning Studio Workspaces
     Target: AzureMachineLearningStudio
-  - Source: Microsoft Genomics
-    Target: MicrosoftGenomics
 
 - Name: Analytics
   Services:
-  - Source: AzureStreamAnalytics
-    Target: AzureStreamAnalytics
+  - Source: Analysis Services
+    Target: AzureAnalysisServices
+  - Source: Azure Data Explorer Clusters
+    Target: AzureDataExplorer
   - Source: Azure Databricks
     Target: AzureDatabricks
-  - Source: AzureHDInsight
-    Target: AzureHDInsight
-  - Source: Azure Data Lake Analytics
+  - Source: Data Factories
+    Target: AzureDataFactory
+  - Source: Data Lake Analytics
     Target: AzureDataLakeAnalytics
-  - Source: Azure Analysis Service
-    Target: AzureAnalysisServices
-  - Source: Azure Event Hubs
-    Target: AzureEventHub    
+  - Source: Data Lake Store Gen1
+    Target: AzureDataLakeStoreGen1
+  - Source: Event Hub Clusters
+    Target: AzureEventHub
+  - Source: Event Hubs
+    Target: AzureEventHub
+  - Source: HDInsightClusters
+    Target: AzureHDInsight
+  - Source: Stream Analytics Jobs
+    Target: AzureStreamAnalytics
+  - Source: synapse-analytics
+    Target: AzureSynapseAnalytics
   - Source: Azure Data Catalog
     Target: AzureDataCatalog
-  - Source: Azure Data Explorer
-    Target: AzureDataExplorer    
+  - Source: pipe-svgrepo-com
+    Target: AzurePipeline
+   
 
 - Name: Compute
   Services:
-  - Source: Azure Virtual Machine
+  - Source: Availability Sets
+    Target: AzureAvailabilitySet
+  - Source: Non-azure-machine
+    Target: AzureNon-azure-machine
+  - Source: OS Images (Classic)
+    Target: AzureOSImagesClassic
+  - Source: VM (Classic)
+    Target: VirtualMachineClassic
+  - Source: VM Scale Sets
+    Target: AzureVirtualMachineScaleSet
+  - Source: VM
     Target: AzureVirtualMachine
-  - Source: Azure App Service
-    Target: AzureAppService
-  - Source: Azure Functions
-    Target: AzureFunction
-  - Source: Azure Batch
+  - Source: VM-Linux
+    Target: AzureVirtualMachineLinux
+  - Source: VM-Linux-non-azure
+    Target: VirtualMachineLinux
+  - Source: VM-non-azure
+    Target: VirtualMachine
+  - Source: VM-windows
+    Target: AzureVirtualMachineWindows
+  - Source: VM-windows-non-azure
+    Target: VirtualMachineWindows
+  - Source: AzureBatch
     Target: AzureBatch
-  - Source: Azure Service Fabric
+  - Source: Batch Accounts
+    Target: AzureBatchAccount
+  - Source: Citrix Virtual Desktops Essentials
+    Target: CitrixVirtualDesktopsEssential
+  - Source: Cloud Services (Classic)
+    Target: AzureCloudServiceClassic
+  - Source: Cloud Services
+    Target: AzureCloudService
+  - Source: CloudSimple Virtual Machines
+    Target: AzureCloudSimpleVirtualMachine
+  - Source: Disk Snapshots
+    Target: AzureDiskSnapshot
+  - Source: Disks
+    Target: AzureDisk
+  - Source: Function Apps
+    Target: AzureFunction
+  - Source: Mesh Applications
+    Target: AzureMeshApplication
+  - Source: SAP HANA on Azure
+    Target: AzureSapHana
+  - Source: Service Fabric Clusters
     Target: AzureServiceFabric
-  - Source: Azure VM Scale Set
-    Target: AzureVirtualMachineScaleSet
+  - Source: VM Images
+    Target: AzureVirtualMachineImage
+  - Source: AzureAppService
+    Target: AzureAppService
+  - Source: windows-virtual-desktop
+    Target: AzureWindowsVirtualDesktop
+  - Source: WVD Host pools
+    Target: AzureWindowsVirtualDesktopHostPools
+  - Source: WVD Application groups
+    Target: AzureWindowsVirtualDesktopApplicationGroups
+  - Source: WVD Workspaces
+    Target: AzureWindowsVirtualDesktopWorkspaces
+  - Source: WVD Users
+    Target: AzureWindowsVirtualDesktopUsers
 
 - Name: Containers
   Services:
-  - Source: Azure Container Registry
-    Target: AzureContainerRegistry
-  - Source: container-instances
+  - Source: Container Instances
     Target: AzureContainerInstance
-  - Source: Azure Service Fabric Mesh
+  - Source: Container Registries
+    Target: AzureContainerRegistry
+  - Source: Kubernetes Services
+    Target: AzureKubernetesService
+  - Source: AzureServiceFabricMesh
     Target: AzureServiceFabricMesh
-  - Source: Azure Kubernetes Service
-    Target: AzureKubernetesService   
-  - Source: app-service-containers
+  - Source: AzureWebAppForContainers
     Target: AzureWebAppForContainers
 
 - Name: Databases
   Services:
-  - Source: Azure SQL Database
-    Target: AzureSqlDatabase
-  - Source: CosmosDB
-    Target: AzureCosmosDb
+  - Source: Azure Cache for Redis
+    Target: AzureRedisCacheforRedis
+  - Source: Azure Cache plus Redis
+    Target: AzureCacheplusRedis
+  - Source: Azure Cosmos DB
+    Target: AzureCosmosDB
+  - Source: Azure Database (Generic)
+    Target: AzureDatabase
+  - Source: Azure Database for MariaDB servers
+    Target: AzureDatabaseforMariaDB
+  - Source: Azure Database for MySQL servers
+    Target: AzureDatabaseforMySql
+  - Source: Azure Database for PostgreSQL servers
+    Target: AzureDatabaseforPostgreSql
   - Source: Azure SQL DataWarehouse
     Target: AzureSqlDataWarehouse
-  - Source: Azure Data Factory
-    Target: AzureDataFactory
-  - Source: Azure Cache including Redis
-    Target: AzureRedisCache
-  - Source: Azure SQL Stretch Database
+  - Source: Data Lake
+    Target: AzureDataLake
+  - Source: Elastic Database Pools
+    Target: AzureElasticDatabasePool
+  - Source: Elastic Job Agents
+    Target: AzureElasticJobAgent
+  - Source: Managed Databases
+    Target: AzureManagedDatabase
+  - Source: SQL Databases
+    Target: AzureSqlDatabase
+  - Source: SQL Managed Instances
+    Target: AzureSqlManagedInstance
+  - Source: SQL Server stretch Databases
     Target: AzureSqlStretchDatabase
-  - Source: postgresql
-    Target: AzureDatabaseForPostgreSQL
-  - Source: mysql
-    Target: AzureDatabaseForMySQL
-  - Source: Azure Database MariaDB
-    Target: AzureDatabaseForMariaDB
+  - Source: SQL Servers
+    Target: AzureSqlServer
+  - Source: Virtual Clusters
+    Target: AzureVirtualCluster
+  - Source: Virtual Datacenter
+    Target: AzureVirtualDatacenter
 
 - Name: DevOps
   Services:
-  - Source: Azure DevOps
-    Target: AzureDevOps
+  - Source: Application Insights
+    Target: AzureApplicationInsights
+  - Source: Azure Artifacts
+    Target: AzureArtifacts
   - Source: Azure Boards
     Target: AzureBoards
+  - Source: Azure DevOps
+    Target: AzureDevOps
+  - Source: Azure DevTest Labs
+    Target: AzureDevTestLabs
   - Source: Azure Pipelines
     Target: AzurePipelines
   - Source: Azure Repos
     Target: AzureRepos
   - Source: Azure Test Plans
     Target: AzureTestPlans
-  - Source: Azure Artifacts
-    Target: AzureArtifacts
-  - Source: Azure Application Insights
-    Target: AzureApplicationInsights
-  - Source: Azure DevTest Labs
-    Target: AzureDevTestLabs
-  - Source: Azure Lab Services
-    Target: AzureLabServices
 
 - Name: Identity
   Services:
-  - Source: Azure Active Directory
+  - Source: Access Review
+    Target: AzureAccessReview
+  - Source: Active Directory Connect Health
+    Target: AzureActiveDirectoryConnectHealth
+  - Source: Active Directory
     Target: AzureActiveDirectory
-  - Source: ActiveDirectoryDomain
-    Target: AzureActiveDirectoryDomainServices
-  - Source: ActiveDirectoryB2C
+  - Source: App Registrations
+    Target: AzureAppRegistration
+  - Source: Azure AD B2C
     Target: AzureActiveDirectoryB2C
+  - Source: Azure AD Domain Services
+    Target: AzureActiveDirectoryDomainServices
+  - Source: Azure AD Identity Protection
+    Target: AzureActiveDirectoryIdentityProtection
+  - Source: Azure AD Privileged Identity Management
+    Target: AzureActiveDirectoryPrivilegedIdentityManagement
+  - Source: Azure Information Protection
+    Target: AzureInformationProtection
+  - Source: Conditional Access
+    Target: AzureConditionalAccess
+  - Source: Enterprise Applications
+    Target: AzureEnterpriseApplication
+  - Source: Identity governance
+    Target: AzureIdentitygovernance
+  - Source: Managed Identities
+    Target: AzureManagedIdentities
 
 - Name: Integration
   Services:
-  - Source: Azure Event Grid
-    Target: AzureEventGrid
-  - Source: Azure Logic Apps
-    Target: AzureLogicApps
+  - Source: App Configuration
+    Target: AzureAppConfiguration
+  - Source: Azure API for FHIR
+    Target: AzureAPIforFHIR
+  - Source: Azure Service Bus Relays
+    Target: AzureServiceBusRelay
   - Source: Azure Service Bus
     Target: AzureServiceBus
+  - Source: Event Grid Subscriptions
+    Target: AzureEventGrid
+  - Source: Event Grid Topics
+    Target: AzureEventGridTopic
+  - Source: Integration Accounts
+    Target: AzureIntegrationAccount
+  - Source: Integration Service Environments
+    Target: AzureIntegrationServiceEnvironment
+  - Source: Logic Apps Custom Connector
+    Target: AzureLogicAppsCustomConnector
+  - Source: Logic Apps
+    Target: AzureLogicApps
+  - Source: SendGrid Accounts
+    Target: AzureSendGridAccount
+  - Source: Service Catalog Managed Application Definitions
+    Target: AzureServiceCatalogManagedApplicationDefinition
+  - Source: Software as a Service (SaaS)
+    Target: AzureSoftwareAsAService
 
 - Name: InternetOfThings
   Services:
+  - Source: Azure Digital Twins
+    Target: AzureDigitalTwins
+  - Source: Azure IoT Hub Security
+    Target: AzureIoTHubSecurity
   - Source: Azure IoT Hub
     Target: AzureIoTHub
-  - Source: IOT edge
-    Target: AzureIoTEdge
-  - Source: IoT_Central_50
+  - Source: Azure Maps
+    Target: AzureMaps
+  - Source: Azure Sphere
+    Target: AzureSphere
+  - Source: Device Provisioning Services
+    Target: AzureDeviceProvisioningServices
+  - Source: IoT Central Applications
     Target: AzureIoTCentral
-  - Source: Azure Time Series Insights
+  - Source: Time Series Insights environments
     Target: AzureTimeSeriesInsights
-  - Source: azure-maps
-    Target: AzureMaps
-  - Source: Azure Digital Twins
-    Target: AzureDigitalTwins
+  - Source: Time Series Insights Events Sources
+    Target: AzureTimeSeriesInsightsEventsSources
+  - Source: Windows 10 IoT Core Services
+    Target: AzureWindows10IoTCoreServices
+  - Source: AzureIoTEdge
+    Target: AzureIoTEdge
+
+- Name: Intune
+  Services:
+  - Source: Client Apps
+    Target: AzureClientApps
+  - Source: Dedicated Event Hub
+    Target: AzureDedicatedEventHub
+  - Source: Device Compliance
+    Target: AzureDeviceCompliance
+  - Source: Device Config
+    Target: AzureDeviceConfig
+  - Source: Devices Groups
+    Target: AzureDevicesGroup
+  - Source: eBooks
+    Target: AzureeBook
+  - Source: Enrollment
+    Target: AzureEnrollment
+  - Source: Exchange On-Premises Access
+    Target: AzureExchangeOn-PremisesAccess
+  - Source: Intune App Protection
+    Target: AzureIntuneAppProtection
+  - Source: Managed Desktop
+    Target: AzureManagedDesktop
+  - Source: Security Baselines
+    Target: AzureSecurityBaseline
+  - Source: Software Update
+    Target: AzureSoftwareUpdate
+  - Source: Tools
+    Target: AzureTool
 
 - Name: Management
   Services:
-  - Source: Azure Backup
-    Target: AzureBackup
-  - Source: Azure Site Recovery
-    Target: AzureSiteRecovery
-  - Source: Azure Scheduler
-    Target: AzureScheduler
-  - Source: Azure Automation
+  - Source: Activity Log
+    Target: AzureActivityLog
+  - Source: Advisor
+    Target: AzureActiveDirectoryvisor
+  - Source: Alerts
+    Target: AzureAlert
+  - Source: Automation Accounts
     Target: AzureAutomation
-  - Source: Azure Log Analytics
-    Target: AzureLogAnalytics
-  - Source: Azure Monitor
+  - Source: Blueprints
+    Target: AzureBlueprints
+  - Source: Cost Management + Billing
+    Target: AzureCostManagementAndBilling
+  - Source: Diagnostic Settings
+    Target: AzureDiagnosticSetting
+  - Source: Free Services
+    Target: AzureFreeService
+  - Source: Guest Assignments
+    Target: AzureGuestAssignment
+  - Source: Managed Applications
+    Target: AzureManagedApplications
+  - Source: Metrics
+    Target: AzureMetric
+  - Source: Monitor
     Target: AzureMonitor
-  - Source: Azure Resource Groups
-    Target: AzureResourceGroups
-  - Source: AzurePolicy
+  - Source: Policy
     Target: AzurePolicy
-  - Source: Azure Blueprints
-    Target: AzureBlueprints
-  - Source: Azure Subscription New
-    Target: AzureSubscription
-  - Source: Azure Management Groups
+  - Source: Resource Graph Explorer
+    Target: AzureResourceGraphExplorer
+  - Source: Scheduler Job Collections
+    Target: AzureScheduler
+  - Source: Solutions
+    Target: AzureSolution
+  - Source: AzureBackup
+    Target: AzureBackup
+  - Source: Log Analytics Workspaces
+    Target: AzureLogAnalytics
+  - Source: AzureManagementGroups
     Target: AzureManagementGroups
-  - Source: Azure Managed Applications
-    Target: AzureManagedApplications   
-           
+  - Source: AzureResourceGroups
+    Target: AzureResourceGroups
+  - Source: AzureSiteRecovery
+    Target: AzureSiteRecovery
+  - Source: Subscriptions
+    Target: AzureSubscription
+
+          
 - Name: Media
   Services:
-  - Source: Azure Media Services
+  - Source: Azure Media Player
+    Target: AzureMediaPlayer
+  - Source: Content Protection
+    Target: AzureContentProtection
+  - Source: Media Encoding
+    Target: AzureMediaEncoding
+  - Source: Media On-Demand
+    Target: AzureMediaOnDemand
+  - Source: AzureMediaServices
     Target: AzureMediaServices
 
+- Name: Migrate
+  Services:
+  - Source: Azure Database Migration Services
+    Target: AzureDatabaseMigrationService
+  - Source: Migration Projects
+    Target: AzureMigrationProject
+  - Source: Recovery Services Vaults
+    Target: AzureRecoveryServicesVault
+  - Source: active-directory
+    Target: OnPremiseActiveDirectory
+
+- Name: MixedReality
+  Services:
+  - Source: Spatial Anchor
+    Target: AzureSpatialAnchor
+
+
 - Name: Mobile
   Services:
-  - Source: AzureNotificationHubs
-    Target: AzureNotificationHubs
-  - Source: Azure App Service - Mobile App
+  - Source: Azure App Service - Mobile
     Target: AzureMobileApp
-    
+  - Source: Azure Mobile Engagement
+    Target: AzureMobileEngagement
+  - Source: Notification Hubs
+    Target: AzureNotificationHubs
+  
 - Name: Networking
   Services:
-  - Source: Azure ExpressRoute
-    Target: AzureExpressRoute 
-  - Source: Azure DNS
-    Target: AzureDNS   
-  - Source: Azure Virtual Network
-    Target: AzureVirtualNetwork
-  - Source: Azure Traffic Manager
-    Target: AzureTrafficManager
-  - Source: Azure Load Balancer (feature)
+  - Source: Application Gateway
+    Target: AzureApplicationGateway
+  - Source: Application Security Groups
+    Target: AzureApplicationSecurityGroup
+  - Source: Azure Firewall
+    Target: AzureFirewall
+  - Source: Connections
+    Target: AzureConnection
+  - Source: DDOS Protection Plans
+    Target: AzureDDOSProtectionPlan
+  - Source: DNS Private Zones
+    Target: AzureDNSPrivate
+  - Source: DNS Zones
+    Target: AzureDNS
+  - Source: ExpressRoute Circuits
+    Target: AzureExpressRoute
+  - Source: Front Doors
+    Target: AzureFrontDoorService
+  - Source: Load Balancers
     Target: AzureLoadBalancer
-  - Source: Azure VPN Gateway
+  - Source: Local Network Gateways
+    Target: AzureLocalNetworkGateway
+  - Source: Network Interfaces
+    Target: AzureNetworkInterface
+  - Source: Network Security Groups
+    Target: AzureNetworkSecurityGroups   
+  - Source: Network Security Groups (Classic)
+    Target: AzureNetworkSecurityGroupsClassic
+  - Source: Network Watcher
+    Target: AzureNetworkWatcher
+  - Source: On-premises Data Gateways
+    Target: AzureOnPremisesDataGateway
+  - Source: Public IP Addresses
+    Target: AzurePublicIPAddress
+  - Source: Reserved IP Addresses (Classic)
+    Target: AzureReservedIPAddressClassic
+  - Source: Route Filters
+    Target: AzureRouteFilter
+  - Source: Route Tables
+    Target: AzureRouteTable
+  - Source: Service Endpoint Policies
+    Target: AzureServiceEndpointPolicy
+  - Source: Traffic Manager Profiles
+    Target: AzureTrafficManager
+  - Source: Virtual Network (Classic)
+    Target: AzureVirtualNetworkClassic
+  - Source: Virtual Network Gateways
     Target: AzureVPNGateway
-  - Source: AzureApplicationGateway
-    Target: AzureApplicationGateway
-  - Source: ddos-protection
-    Target: AzureAzureDDoSProtection
-  - Source: virtual-wan
+  - Source: Virtual Networks
+    Target: AzureVirtualNetwork
+  - Source: Virtual WANs
     Target: AzureVirtualWAN
-  - Source: Azure Front Door Service
-    Target: AzureFrontDoorService
+  - Source: service-endpoint
+    Target: AzureServiceEndpoint
+  - Source: Private-endpoints
+    Target: AzurePrivateEndpoint
+  - Source: private-link
+    Target: AzurePrivateLink
 
 - Name: Security
   Services:
-  - Source: Azure Key Vault
-    Target: AzureKeyVault
   - Source: Azure Sentinel
-    Target: AzureSentinel    
+    Target: AzureSentinel
+  - Source: Key Vaults
+    Target: AzureKeyVault
+  - Source: Security Center
+    Target: AzureSecurityCenter  
 
 - Name: Storage
   Services:
-  - Source: Azure Storage
+  - Source: Archive Storage
+    Target: AzureArchiveStorage
+  - Source: Azure NetApp files
+    Target: AzureNetAppfiles
+  - Source: AzureFXTEdgeFiler
+    Target: AzureFXTEdgeFiler
+  - Source: Blob Storage
+    Target: AzureBlobStorage
+  - Source: Data Box Edge _ Data Box Gateway
+    Target: AzureDataBoxEdgeDataBoxGateway
+  - Source: Data Box
+    Target: AzureDataBox
+  - Source: Data Lake Storage
+    Target: AzureDataLakeStorage
+  - Source: General Storage
+    Target: AzureGeneralStorage
+  - Source: Queues Storage
+    Target: AzureQueueStorage
+  - Source: Storage Accounts (classic)
+    Target: AzureStorageAccountClassic
+  - Source: Storage Accounts
     Target: AzureStorage
-  - Source: Azure StorSimple
+  - Source: Storage Explorer
+    Target: AzureStorageExplorer
+  - Source: Storage Sync Services
+    Target: AzureStorageSyncService
+  - Source: StorSimple Data Managers
+    Target: AzureStorSimpleDataManager
+  - Source: StorSimple Device Managers
     Target: AzureStorSimple
-  - Source: Azure Data Lake Store
-    Target: AzureDataLakeStorage
-  - Source: Azure Storage - Blob
-    Target: AzureBlobStorage
-  - Source: disks
+  - Source: Table Storage
+    Target: AzureTableStorage
+  - Source: Disks
     Target: AzureDiskStorage
-  - Source: managed-disks
-    Target: AzureManagedDisks
-  - Source: Azure Storage - Queue
-    Target: AzureQueueStorage
-  - Source: Azure Storage - Files
+  - Source: AzureFileStorage
     Target: AzureFileStorage
-  - Source: Azure Data Box
-    Target: AzureDataBox
-  - Source: Azure NetApp Files
-    Target: AzureNetAppFiles
 
 - Name: Web
   Services:
-  - Source: Azure Content Delivery Network (CDN)
-    Target: AzureCDN
-  - Source: Azure API Management
-    Target: AzureAPIManagement
+  - Source: API Connections
+    Target: AzureAPIConnection
+  - Source: App Service Certificates
+    Target: AzureAppServiceCertificate
+  - Source: App Service Domains
+    Target: AzureAppServiceDomain
+  - Source: App Service Environments
+    Target: AzureAppServiceEnvironment
+  - Source: App Service Plans
+    Target: AzureAppServicePlan
+  - Source: App Services
+    Target: AzureWebApp
+  - Source: Azure Media Services
+    Target: AzureMediaService
   - Source: Azure Search
     Target: AzureSearch
-  - Source: Azure App Service - Web App (was Websites)
-    Target: AzureWebApp
-  - Source: Azure SignalR Service
-    Target: AzureSignalRService
\ No newline at end of file
+  - Source: Notification Hub Namespaces
+    Target: AzureNotificationHubNamespace
+  - Source: SignalR
+    Target: AzureSignalRService
+
+- Name: ProductLogos
+  Services:
+  - Source: Azure Cache Redis Product icon
+    Target: LogoCacheRedisProducticon
+  - Source: Azure Databricks
+    Target: LogoDatabrick
+  - Source: Azure OpenShift
+    Target: LogoOpenShift
+  - Source: Cloud_Cycle
+    Target: LogoCloudCycle
+  - Source: HD-Insight
+    Target: LogoHDInsight
+  - Source: HockeyApp
+    Target: LogoHockeyApp
+  - Source: Kubernetes
+    Target: LogoKubernete
+  - Source: logo_pluralsight_mono
+    Target: LogoPluralsightMono
+  - Source: logo_pluralsight_twotone
+    Target: LogoPluralsightTwoTone
+  - Source: Logo-DC-OS
+    Target: LogoDCOS
+  - Source: Logo-docker
+    Target: LogoDocker
+  - Source: StackOverflow
+    Target: LogoStackOverflow
+  - Source: WebAppUmbraco
+    Target: AzureWebAppUmbraco
+  - Source: WebAppWordPress
+    Target: AzureWebAppWordPress
+  - Source: API Management Services
+    Target: AzureAPIManagement
+  - Source: CDN Profiles
+    Target: AzureCDN
+  - Source: Okta_logo
+    Target: LogoOkta
+
+- Name: Other
+  Services:
+  - Source: CloudSimple Nodes
+    Target: AzureCloudSimpleNode
+  - Source: CloudSimple Services
+    Target: AzureCloudSimpleService
+  - Source: Controllers
+    Target: AzureControllers
+  - Source: Customer Lockbox
+    Target: AzureCustomerLockbox
+  - Source: Education
+    Target: AzureEducation
+  - Source: Image Definitions
+    Target: AzureImageDefinition
+  - Source: Image Versions
+    Target: AzureImageVersion
+  - Source: Resource Explorer
+    Target: AzureResourceExplorer
+  - Source: Shared Image Galleries
+    Target: AzureSharedImageGallery
+  - Source: Tenant Status
+    Target: AzureTenantStatus
+  - Source: Web App Firewall
+    Target: AzureWebAppFirewall
+
diff --git a/scripts/lib/HSLColor.csx b/scripts/lib/HSLColor.csx
index da8824dd..d9762db1 100644
--- a/scripts/lib/HSLColor.csx
+++ b/scripts/lib/HSLColor.csx
@@ -1,4 +1,4 @@
-#r "System.Drawing"
+//#r "nuget: System.Drawing.Common, 4.7.0"
 
 // From Rich Newman
 // https://richnewman.wordpress.com/about/code-listings-and-diagrams/hslcolor-class/
diff --git a/scripts/main.csx b/scripts/main.csx
index fb7bd202..1e5e757a 100644
--- a/scripts/main.csx
+++ b/scripts/main.csx
@@ -1,6 +1,8 @@
 #! "netcoreapp2.0"
 
-#r "nuget: System.Drawing.Common, 4.5.0"
+#r "nuget: System.Drawing.Common, 4.7.0"
+#r "nuget: System.Drawing.Primitives, 4.3.0"
+
 
 #load "lib/Config.csx"
 #load "lib/HSLColor.csx"
@@ -53,8 +55,8 @@ public void Main()
 
     foreach (var service in lookupTable)
     {
-        var coloredSourceFileName = $"{service.ServiceSource}_COLOR.svg";
-        var monochromSourceFileName = $"{service.ServiceSource}.svg";
+        var coloredSourceFileName = $"{service.ServiceSource}.svg";
+        var monochromSourceFileName = $"{service.ServiceSource}(m).svg";
 
         var coloredSourceFilePath = GetSourceFilePath(coloredSourceFileName);
         var monochromSourceFilePath = GetSourceFilePath(monochromSourceFileName);
@@ -273,17 +275,9 @@ private static void CombineMultipleFilesIntoSingleFile(string inputDirectoryPath
 
 public string GetSourceFilePath(string sourceFileName)
 {
-    var sourceFilePath = Path.Combine(originalSourceFolder, sourceFileName);
-    if (!File.Exists(sourceFilePath))
-    {
-        sourceFilePath = Path.Combine(manualSourceFolder, sourceFileName);
-        if (!File.Exists(sourceFilePath))
-        {
-            return null;
-        }
-    }
-
-    return sourceFilePath;
+    
+    return Directory.GetFiles(originalSourceFolder, sourceFileName, SearchOption.AllDirectories).FirstOrDefault()
+        ?? Directory.GetFiles(manualSourceFolder, sourceFileName, SearchOption.AllDirectories).FirstOrDefault();
 }
 
 public void WriteWarningLine(string message)
diff --git a/source/manual/ActiveDirectoryB2C_COLOR.svg b/source/manual/ActiveDirectoryB2C_COLOR.svg
deleted file mode 100644
index 11dd411c..00000000
--- a/source/manual/ActiveDirectoryB2C_COLOR.svg
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   enable-background="new 0 0 24 24"
-   xml:space="preserve"
-   sodipodi:docname="ActiveDirectoryB2C_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata37"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs35" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview33"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="m 14,20 c 0,-0.409 0.08,-0.803 0.236,-1.17 0.155,-0.359 0.37,-0.678 0.641,-0.949 0.275,-0.274 0.594,-0.489 0.949,-0.643 0.728,-0.311 1.578,-0.315 2.303,-0.019 0.023,-0.024 0.047,-0.048 0.07,-0.071 0.007,-0.007 0.015,-0.015 0.022,-0.021 C 18.219,17.123 18.218,17.119 18.216,17.115 18.072,16.755 18,16.381 18,16 c 0,-0.409 0.08,-0.803 0.236,-1.17 0.155,-0.359 0.37,-0.678 0.641,-0.949 0.275,-0.274 0.594,-0.489 0.949,-0.643 0.742,-0.316 1.609,-0.314 2.344,-0.002 0.243,0.105 0.458,0.246 0.661,0.403 L 23,13.5 11.5,0 0,13.5 11.5,23 14.131,20.826 C 14.053,20.556 14,20.281 14,20 Z"
-     id="path2"
-     inkscape:connector-curvature="0"
-     style="fill:#3c9be4" /><polygon
-     enable-background="new    "
-     points="0,13.5 11.5,23 11.5,0 "
-     id="polygon4"
-     style="opacity:0.2;fill:#ffffff" /><circle
-     cx="11.5"
-     cy="17.5"
-     r="1.5"
-     id="circle6"
-     style="fill:#ffffff" /><circle
-     cx="5.5"
-     cy="13.5"
-     r="1.5"
-     id="circle8"
-     style="fill:#ffffff" /><circle
-     cx="11.5"
-     cy="5.5"
-     r="1.5"
-     id="circle10"
-     style="fill:#ffffff" /><rect
-     x="5.4005799"
-     y="11.29906"
-     transform="rotate(-36.869898)"
-     enable-background="new    "
-     width="1"
-     height="10"
-     id="rect12"
-     style="opacity:0.5;fill:#ffffff" /><rect
-     x="-8.6812553"
-     y="12.065569"
-     transform="rotate(-56.311522)"
-     width="1.0000412"
-     height="7.2112975"
-     id="rect14"
-     style="fill:#ffffff;stroke-width:1.00004125" /><rect
-     x="-7.5023198"
-     y="11.998859"
-     transform="rotate(-53.142708)"
-     enable-background="new    "
-     width="9.9996004"
-     height="0.99996001"
-     id="rect16"
-     style="opacity:0.5;fill:#ffffff;stroke-width:0.99996001" /><rect
-     x="-0.1368859"
-     y="20.442009"
-     transform="rotate(-33.688478)"
-     width="7.2112975"
-     height="1.0000412"
-     id="rect18"
-     style="fill:#ffffff;stroke-width:1.00004125" /><rect
-     x="11"
-     y="5.5"
-     width="1"
-     height="12"
-     id="rect20"
-     style="fill:#ffffff" /><circle
-     cx="21"
-     cy="16"
-     r="2"
-     id="circle22"
-     style="fill:#000c82" /><path
-     d="m 14,24 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 z"
-     id="path24"
-     inkscape:connector-curvature="0"
-     style="fill:#68217a" /><circle
-     cx="17"
-     cy="20"
-     r="2"
-     id="circle26"
-     style="fill:#68217a" /><path
-     d="m 21,17 c -0.772,0 -1.469,0.3 -2.001,0.779 C 19.609,18.329 20,19.116 20,20 h 4 c 0,-1.657 -1.343,-3 -3,-3 z"
-     id="path28"
-     inkscape:connector-curvature="0"
-     style="fill:#000c82" /><path
-     d="m 17.5,15 c 0.279,0 0.536,-0.081 0.76,-0.214 0.154,-0.341 0.358,-0.646 0.617,-0.906 0.028,-0.028 0.062,-0.049 0.092,-0.076 C 18.989,13.707 19,13.605 19,13.5 19,12.672 18.328,12 17.5,12 16.672,12 16,12.672 16,13.5 c 0,0.828 0.672,1.5 1.5,1.5 z"
-     id="path30"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /></svg>
\ No newline at end of file
diff --git a/source/manual/ActiveDirectoryDomain_COLOR.svg b/source/manual/ActiveDirectoryDomain_COLOR.svg
deleted file mode 100644
index d0609277..00000000
--- a/source/manual/ActiveDirectoryDomain_COLOR.svg
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   enable-background="new 0 0 24 24"
-   xml:space="preserve"
-   sodipodi:docname="ActiveDirectoryDomain_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata31"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs29" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview27"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><polygon
-     points="16.5,24 24,17.804 16.5,9 9,17.804 "
-     id="polygon2"
-     style="fill:#3c9be4" /><polygon
-     enable-background="new    "
-     points="9,17.804 16.5,24 16.5,9 "
-     id="polygon4"
-     style="opacity:0.2;fill:#ffffff" /><path
-     enable-background="new    "
-     d="m 14.748,16.669 1.308,-1.743 c -0.331,-0.103 -0.615,-0.312 -0.804,-0.594 l -1.308,1.744 c 0.331,0.102 0.615,0.31 0.804,0.593 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     style="opacity:0.5;fill:#ffffff" /><path
-     enable-background="new    "
-     d="m 17.748,14.331 c -0.188,0.282 -0.473,0.491 -0.804,0.594 l 1.308,1.743 c 0.188,-0.282 0.472,-0.491 0.803,-0.594 z"
-     id="path8"
-     inkscape:connector-curvature="0"
-     style="opacity:0.5;fill:#ffffff" /><path
-     d="M 15.605,18.303 14.95,17.866 c -0.085,0.338 -0.284,0.629 -0.555,0.832 l 0.655,0.437 c 0.085,-0.339 0.284,-0.629 0.555,-0.832 z"
-     id="path10"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="m 18.05,17.866 -0.655,0.437 c 0.271,0.203 0.47,0.493 0.555,0.832 l 0.655,-0.437 c -0.271,-0.204 -0.47,-0.494 -0.555,-0.832 z"
-     id="path12"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="M 16.5,12 C 15.672,12 15,12.672 15,13.5 15,14.328 15.672,15 16.5,15 17.328,15 18,14.328 18,13.5 18,12.672 17.328,12 16.5,12 Z"
-     id="path14"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="M 16.5,18 C 15.672,18 15,18.672 15,19.5 15,20.328 15.672,21 16.5,21 17.328,21 18,20.328 18,19.5 18,18.672 17.328,18 16.5,18 Z"
-     id="path16"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="M 13.5,16 C 12.672,16 12,16.672 12,17.5 12,18.328 12.672,19 13.5,19 14.328,19 15,18.328 15,17.5 15,16.672 14.328,16 13.5,16 Z"
-     id="path18"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="M 19.5,16 C 18.672,16 18,16.672 18,17.5 18,18.328 18.672,19 19.5,19 20.328,19 21,18.328 21,17.5 21,16.672 20.328,16 19.5,16 Z"
-     id="path20"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><rect
-     x="16"
-     y="14.5"
-     width="1"
-     height="4"
-     id="rect22"
-     style="fill:#ffffff" /><polygon
-     points="22.206,14.156 23,13.5 11.5,0 0,13.5 11.5,23 12.61,22.083 7.581,17.929 16.5,7.458 "
-     id="polygon24"
-     style="fill:#0072c6" /></svg>
\ No newline at end of file
diff --git a/source/manual/Azure AD Domain Services.svg b/source/manual/Azure AD Domain Services.svg
new file mode 100644
index 00000000..cd754465
--- /dev/null
+++ b/source/manual/Azure AD Domain Services.svg	
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 18 18" class="" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-012" data-type="1"><g><title>Icon-identity-222</title><path fill="#50e6ff" d="M1.01 10.23l7.92 5.14 8.06-5.16L18 11.38l-9.07 5.85L0 11.39l1.01-1.16z"></path><path d="M1.61 9.57L8.93.85l7.47 8.73-7.47 4.72-7.32-4.73z" class="msportalfx-svg-c01" fill="#ffffff"></path><path fill="#50e6ff" d="M8.93.85V14.3L1.61 9.57 8.93.85z"></path><path fill="url(#f92ae47d-0835-4bac-a4f5-649f41e19a24)" d="M8.93.85V14.3l7.47-4.72L8.93.85z"></path><path fill="#53b1e0" d="M8.93 7.8l7.47 1.78-7.47 4.72V7.8z"></path><path fill="#9cebff" d="M8.93 14.3L1.61 9.57 8.93 7.8v6.5z"></path><path fill="url(#f418fd20-54c9-41f7-a889-8b791ff60efa)" d="M8.93 17.23L18 11.38l-1.01-1.17-8.06 5.16v1.86z"></path><path fill="#773adc" d="M13.53 9.04L9.06 15.3l4.47 1.82L18 15.3l-4.47-6.26z"></path><path fill="#f9f9f9" opacity=".5" d="M13.53 9.04L9.06 15.3l4.47 1.82V9.04z"></path></g><defs>
+<linearGradient id="f92ae47d-0835-4bac-a4f5-649f41e19a24" x1="13.25" y1="13.06" x2="8.62" y2="4.29" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1988d9"></stop><stop offset=".9" stop-color="#54aef0"></stop></linearGradient>
+<linearGradient id="f418fd20-54c9-41f7-a889-8b791ff60efa" x1="11.26" y1="10.51" x2="14.46" y2="16.03" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#54aef0"></stop><stop offset=".29" stop-color="#4fabee"></stop><stop offset=".51" stop-color="#41a2e9"></stop><stop offset=".74" stop-color="#2a93e0"></stop><stop offset=".88" stop-color="#1988d9"></stop></linearGradient>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/source/manual/Azure Analysis Service_COLOR.svg b/source/manual/Azure Analysis Service_COLOR.svg
deleted file mode 100644
index 2f0d990b..00000000
--- a/source/manual/Azure Analysis Service_COLOR.svg	
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="50"
-   height="40"
-   viewBox="0 0 50 40"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="Azure Analysis Service.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata13"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs11" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview9"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="25"
-     inkscape:cy="20"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><g
-     id="g6"
-     transform="translate(0,-5)"><g
-       id="g4"><path
-         d="m 39.706,26.725 c 1.444,0 2.614,-1.17 2.614,-2.614 0,-1.444 -1.17,-2.614 -2.614,-2.614 -0.943,0 -1.762,0.504 -2.222,1.252 L 12.897,15.236 c 0.002,-0.038 0.011,-0.074 0.011,-0.112 0,-1.444 -1.171,-2.614 -2.614,-2.614 -1.444,0 -2.614,1.171 -2.614,2.614 0,1.358 1.039,2.461 2.362,2.589 l 2.806,17.727 c -0.925,0.403 -1.573,1.323 -1.573,2.396 0,1.444 1.17,2.614 2.614,2.614 1.444,0 2.614,-1.171 2.614,-2.614 0,-0.21 -0.031,-0.412 -0.078,-0.608 l 21.36,-11.356 c 0.478,0.521 1.158,0.853 1.921,0.853 z M 15.81,36.075 C 15.386,35.613 14.801,35.311 14.141,35.247 L 11.335,17.52 c 0.493,-0.215 0.902,-0.58 1.181,-1.034 l 24.587,7.513 c -0.002,0.038 -0.011,0.074 -0.011,0.112 0,0.21 0.031,0.412 0.078,0.608 z M 14.64,32 h 6.705 L 24,30.588 V 28.013 L 14.008,28.007 Z M 22,43 H 5 V 32 h 6.291 L 10.659,28.005 3,28 V 45 H 24 V 34.334 l -2,1.063 z m 7,-15.07 2,-1.063 V 23.18 L 29,22.569 Z M 29,14 v 5.111 l 2,0.611 V 18 H 48 V 29 H 34.033 l -3.762,2 H 50 V 14.013 Z m -8,6.124 -2,-0.611 V 20 h -6.259 l 0.316,2 H 21 Z M 9.392,20 H 2 V 9 h 17 v 7.055 l 2,0.611 V 5.013 L 0,5 v 17 h 9.708 z"
-         id="path2"
-         inkscape:connector-curvature="0"
-         style="fill:#0072c6" /></g></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure App Service - Web App (was Websites)_COLOR.svg b/source/manual/Azure App Service - Web App (was Websites)_COLOR.svg
deleted file mode 100644
index b663c2e4..00000000
--- a/source/manual/Azure App Service - Web App (was Websites)_COLOR.svg	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="50.000008"
-   height="49.990002"
-   viewBox="0 0 50.000008 49.990002"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="Azure App Service - Web App (was Websites)_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata11"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs9" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="24.999866"
-     inkscape:cy="24.99"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="m 40.192866,44.839 c -4.53,3.464 -9.867,5.151 -15.167,5.151 -7.52,0 -14.956,-3.376 -19.87,-9.803 -8.396,-10.962 -6.324,-26.639 4.658,-35.039 4.529,-3.485 9.872,-5.148 15.165,-5.148 7.52,0 14.958,3.376 19.87,9.809 8.398,10.959 6.305,26.639 -4.656,35.03"
-     id="path2"
-     inkscape:connector-curvature="0"
-     style="fill:#59b4d9" /><path
-     d="m 35.599866,29.378 c 1.816,2.368 5.186,2.796 7.541,1.004 0.123,-0.094 0.218,-0.208 0.33,-0.309 2.409,1.697 4.082,2.817 5.025,3.459 0.279,-0.723 0.472,-1.417 0.67,-2.142 -0.996,-0.741 -2.343,-1.778 -4.29,-3.356 0.639,-1.68 0.437,-3.64 -0.73,-5.171 -1.669,-2.16 -4.626,-2.709 -6.936,-1.377 -2.546,-2.284 -5.343,-4.902 -8.293,-7.833 9.165,-4.929 15.676,-4.207 15.676,-4.207 -1.087,-1.386 -2.305,-2.6 -3.606,-3.697 -3.865,-0.597 -9.869,-0.53 -16.729,3.119 l -0.002,-0.003 h -0.001 c -2.286,-2.393 -4.613,-4.958 -6.983,-7.712 -1.134,0.363 -2.242,0.812 -3.312,1.347 1.749,2.862 4.102,5.749 6.754,8.565 v 0 c 0.005,0.006 0.011,0.011 0.017,0.017 -2.211,1.546 -4.673,3.613 -6.944,6.015 -0.29,0.309 -0.569,0.62 -0.842,0.931 -1.357,-0.284 -2.784,-0.201 -4.117,0.282 -2.264,-4.885 -2.082,-8.809 -1.724,-10.832 -0.983,1.03 -1.901,2.113 -2.692,3.267 -0.591,2.415 -0.759,5.898 0.985,10.095 -2.019,2.642 -2.114,6.389 -0.005,9.153 0.176,0.229 0.364,0.442 0.559,0.645 -0.921,3.137 -1.333,6.163 -1.46,8.761 0.237,0.322 0.237,0.582 0.472,0.896 1.199,1.538 2.705,2.834 4.16,4.008 -0.18,-2.75 0.014,-6.806 1.714,-11.372 1.173,0.089 2.366,-0.096 3.483,-0.566 0.64,0.563 1.31,1.132 2.025,1.711 2.453,1.942 4.9,3.453 7.285,4.643 -0.124,1.213 0.18,2.474 0.968,3.518 1.685,2.176 4.805,2.582 6.983,0.919 0.453,-0.347 0.811,-0.766 1.108,-1.216 3.889,0.866 7.287,1.019 9.806,1.019 0.386,0 2.177,-2.436 3.203,-3.946 -1.534,0.321 -6.083,0.946 -12.3,-0.84 -0.15,-0.698 -0.437,-1.376 -0.898,-1.98 -1.579,-2.07 -4.466,-2.518 -6.618,-1.133 -2.161,-1.172 -4.424,-2.641 -6.758,-4.49 -0.471,-0.373 -0.923,-0.745 -1.359,-1.118 1.426,-2.247 1.578,-5.127 0.318,-7.55 0.286,-0.286 0.567,-0.573 0.871,-0.857 2.311,-2.159 4.485,-3.887 6.519,-5.274 -0.082,-0.076 -0.156,-0.156 -0.236,-0.233 0.081,0.075 0.157,0.152 0.239,0.227 -0.001,0 -0.001,10e-4 -0.002,10e-4 3.121,2.886 6.43,5.621 9.564,8.065 -0.829,1.758 -0.699,3.899 0.562,5.547 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Artifacts_COLOR.svg b/source/manual/Azure Artifacts_COLOR.svg
deleted file mode 100644
index 3227c6ca..00000000
--- a/source/manual/Azure Artifacts_COLOR.svg	
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="104"
-   height="112"
-   viewBox="0 0 104 112"
-   overflow="hidden"
-   id="svg58"
-   sodipodi:docname="Azure Artifacts_COLOR.svg"
-   style="overflow:hidden;fill:none"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata62">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview60"
-     showgrid="false"
-     inkscape:zoom="2.4583333"
-     inkscape:cx="48"
-     inkscape:cy="56"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg58" />
-  <defs
-     id="defs26">
-    <filter
-       id="filter0_f"
-       x="8"
-       y="-8"
-       width="80"
-       height="64"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood2" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend4" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="4 4"
-         id="feGaussianBlur6" />
-    </filter>
-    <filter
-       id="filter1_f"
-       x="24"
-       y="40"
-       width="80"
-       height="64"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood9" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend11" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="4 4"
-         id="feGaussianBlur13" />
-    </filter>
-    <linearGradient
-       x2="1"
-       gradientUnits="userSpaceOnUse"
-       id="paint0_linear"
-       gradientTransform="matrix(0,48,-32,0,32,0)">
-      <stop
-         offset="0"
-         stop-color="#E66398"
-         id="stop16" />
-      <stop
-         offset="1"
-         stop-color="#EF74A6"
-         id="stop18" />
-    </linearGradient>
-    <linearGradient
-       x2="1"
-       gradientUnits="userSpaceOnUse"
-       id="paint1_linear"
-       gradientTransform="matrix(0,96,-96,0,96,0)">
-      <stop
-         offset="0"
-         stop-color="#FFFFFF"
-         id="stop21" />
-      <stop
-         offset="1"
-         stop-color="#FFFFFF"
-         stop-opacity="0"
-         id="stop23" />
-    </linearGradient>
-  </defs>
-  <g
-     id="DevOpsIconArtifacts96"
-     transform="translate(0,8)">
-    <mask
-       maskUnits="userSpaceOnUse"
-       x="0"
-       y="0"
-       width="96"
-       height="96"
-       id="mask0">
-      <path
-         d="m 16,4 c 0,-2.20898 1.7909,-4 4,-4 h 56 c 2.2091,0 4,1.79102 4,4 v 44 h 12 c 2.2091,0 4,1.791 4,4 v 40 c 0,2.209 -1.7909,4 -4,4 H 4 C 1.79086,96 0,94.209 0,92 V 52 c 0,-2.209 1.79086,-4 4,-4 h 12 z"
-         id="Union"
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff" />
-    </mask>
-    <g
-       mask="url(#mask0)"
-       id="g55">
-      <g
-         id="Group">
-        <path
-           d="M 0,4 C 0,1.79086 1.79086,0 4,0 h 40 c 2.2091,0 4,1.79086 4,4 v 40 c 0,2.2091 -1.7909,4 -4,4 H 4 C 1.79086,48 0,46.2091 0,44 Z"
-           id="Rectangle 2.1"
-           transform="translate(0,48)"
-           inkscape:connector-curvature="0"
-           style="fill:#b21756" />
-        <path
-           d="m 0,0 h 8.8 c 2.2091,0 4,1.79086 4,4 v 38 c 0,2.2091 -1.7909,4 -4,4 H 0 Z"
-           id="Rectangle 2.4"
-           transform="translate(35.2,48)"
-           inkscape:connector-curvature="0"
-           style="fill:#a61550" />
-        <rect
-           x="0"
-           y="0"
-           rx="3"
-           width="16"
-           height="6"
-           id="Rectangle"
-           transform="translate(16,56)"
-           style="fill:#8d0a3f" />
-      </g>
-      <g
-         id="Rectangle 2.4_2"
-         style="filter:url(#filter0_f)">
-        <path
-           d="M 0,4 C 0,1.79086 1.79086,0 4,0 h 56 c 2.2091,0 4,1.79086 4,4 V 48 H 0 Z"
-           transform="translate(16)"
-           id="path34"
-           inkscape:connector-curvature="0"
-           style="fill:#890038" />
-      </g>
-      <g
-         id="Group 3">
-        <path
-           d="M 0,4 C 0,1.79086 1.79086,0 4,0 h 56 c 2.2091,0 4,1.79086 4,4 V 48 H 0 Z"
-           id="Rectangle 2.3"
-           transform="translate(16)"
-           inkscape:connector-curvature="0"
-           style="fill:#cb2e6d" />
-        <rect
-           x="0"
-           y="0"
-           rx="3"
-           width="16"
-           height="6"
-           id="Rectangle_2"
-           transform="translate(32,10)"
-           style="fill:#b01c57" />
-        <path
-           d="m 0,0 h 12 c 2.2091,0 4,1.79086 4,4 V 48 H 0 Z"
-           id="Rectangle 2"
-           transform="translate(64)"
-           inkscape:connector-curvature="0"
-           style="fill:#bd2461" />
-      </g>
-      <g
-         id="Rectangle 2_2"
-         style="opacity:0.5;filter:url(#filter1_f)">
-        <path
-           d="m 0,0 h 60 c 2.2091,0 4,1.79086 4,4 v 40 c 0,2.2091 -1.7909,4 -4,4 H 4 C 1.79086,48 0,46.2091 0,44 Z"
-           transform="translate(32,48)"
-           id="path41"
-           inkscape:connector-curvature="0"
-           style="fill:#780031" />
-      </g>
-      <g
-         id="Group 2">
-        <path
-           d="m 0,0 h 60 c 2.2091,0 4,1.79086 4,4 v 40 c 0,2.2091 -1.7909,4 -4,4 H 4 C 1.79086,48 0,46.2091 0,44 Z"
-           id="Rectangle 2.4_3"
-           transform="translate(32,48)"
-           inkscape:connector-curvature="0"
-           style="fill:#ef74a6" />
-        <path
-           d="M 4.57143,48 H 32 V 0 H 0 V 43.8261 C 0,46.1311 2.0467,48 4.57143,48 Z"
-           id="Intersect"
-           transform="translate(32,48)"
-           inkscape:connector-curvature="0"
-           style="fill:url(#paint0_linear)" />
-        <rect
-           x="0"
-           y="0"
-           rx="3"
-           width="16"
-           height="6"
-           id="Rectangle_3"
-           transform="translate(48,56)"
-           style="fill:#c82f6d" />
-        <path
-           d="m 0,0 h 12 c 2.2091,0 4,1.79086 4,4 v 40 c 0,2.2091 -1.7909,4 -4,4 H 0 Z"
-           id="Rectangle 2.3_2"
-           transform="translate(80,48)"
-           inkscape:connector-curvature="0"
-           style="fill:#e66398" />
-      </g>
-      <g
-         id="Union_2"
-         transform="translate(40,76)">
-        <path
-           d="M 24,0 H 0 v 4 h 24 z"
-           id="path49"
-           inkscape:connector-curvature="0"
-           style="fill:#fc92be" />
-        <path
-           d="M 14,8 H 0 v 4 h 14 z"
-           id="path51"
-           inkscape:connector-curvature="0"
-           style="fill:#fc92be" />
-      </g>
-      <path
-         d="m 16,4 c 0,-2.20898 1.7909,-4 4,-4 h 56 c 2.2091,0 4,1.79102 4,4 v 44 h 12 c 2.2091,0 4,1.791 4,4 v 40 c 0,2.209 -1.7909,4 -4,4 H 4 C 1.79086,96 0,94.209 0,92 V 52 c 0,-2.209 1.79086,-4 4,-4 h 12 z"
-         id="Union_3"
-         inkscape:connector-curvature="0"
-         style="opacity:0.2;fill:url(#paint1_linear)" />
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/Azure Batch AI_COLOR.svg b/source/manual/Azure Batch AI_COLOR.svg
deleted file mode 100644
index 44f86cef..00000000
--- a/source/manual/Azure Batch AI_COLOR.svg	
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 50 50" class="" role="presentation" focusable="false" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-085"><g><title></title><path d="M19 42h12v3H19zm3 8h5l3.638-3h-11.5z" class="msportalfx-svg-c04" fill="#7a7a7a"></path><path d="M19.175 39.9a.41.41 0 0 1-.419-.392c-.172-5.371-3.152-8.821-6.033-12.158-2.868-3.321-5.577-6.458-5.577-11.29C7.145 5.981 13.653.2 25 .2s17.855 5.781 17.855 15.86c0 4.832-2.709 7.969-5.577 11.29-2.881 3.337-5.861 6.788-6.033 12.158a.41.41 0 0 1-.419.392H19.175z" class="msportalfx-svg-c01" fill="#ffffff"></path><path d="M24 1.187c0-.573-.486-1.041-1.058-1.003C12.645.863 7.045 6.695 7.045 16.06c0 9.825 11.272 12.876 11.61 23.451a.513.513 0 0 0 .52.489H23a1 1 0 0 0 1-1V1.187z" class="msportalfx-svg-c15" fill="#59b4d9"></path><path d="M26.045 1.187c0-.573.486-1.041 1.058-1.003C37.4.863 43 6.695 43 16.06c0 9.825-11.272 12.876-11.61 23.451a.513.513 0 0 1-.52.489h-3.825a1 1 0 0 1-1-1V1.187z" class="msportalfx-svg-c16" fill="#3999c6"></path><path d="M31.092 15.776l-.895-1.788L25 16.586l-5.197-2.598-.895 1.788 5.472 2.736h1.24zm-.2 16.1l-.895-1.788L25 32.586l-4.997-2.498-.895 1.788 5.272 2.636h1.24zM19.833 8.397L19.201 6.5l-4.34 1.447-3.4-3.4c-.488.461-.931.961-1.34 1.489l3.325 3.325L12 13.701l1.897.633 1.484-4.452 4.452-1.485zm19.608-2.924a13.23 13.23 0 0 0-1.433-1.396l-3.869 3.869-4.34-1.446-.632 1.897 4.452 1.484 1.484 4.452L37 13.701l-1.447-4.34 3.888-3.888zm.629 18.61l-4.608-1.769-.393-4.436-1.992.177.414 4.674L30 25.864l1.337 1.488 3.494-3.139 3.955 1.519a34.31 34.31 0 0 0 1.284-1.649zM20 25.864l-3.491-3.136.414-4.674-1.992-.177-.393 4.436-4.608 1.77c.407.56.838 1.108 1.285 1.649l3.955-1.519 3.494 3.139L20 25.864z" class="msportalfx-svg-c01" fill="#ffffff"></path></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Batch_COLOR.svg b/source/manual/Azure Batch_COLOR.svg
deleted file mode 100644
index 58a46472..00000000
--- a/source/manual/Azure Batch_COLOR.svg	
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg39"
-   sodipodi:docname="Azure Batch_COLOR.svg"
-   width="50"
-   height="46.400002"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata45">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs43" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="690"
-     inkscape:window-height="480"
-     id="namedview41"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="0.39999847"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg39"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <svg
-     id="svg-batch"
-     version="1.1"
-     width="100%"
-     height="100%"
-     transform="translate(0,-2)">
-    <path
-       d="m 0,27.2 c 0,0.7 0.5,1.2 1.2,1.2 h 27.6 c 0.7,0 1.2,-0.5 1.2,-1.2 V 7.2 H 0 Z"
-       id="path2"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="M 28.8,2 H 1.2 C 0.5,2 0,2.5 0,3.2 V 7.6 H 30 V 3.2 C 30,2.5 29.5,2 28.8,2 Z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#a0a1a2" />
-    <path
-       d="M 1.2,2 C 0.5,2 0,2.5 0,3.2 v 4.4 2 17.6 c 0,0.7 0.5,1.2 1.2,1.2 H 12.7 L 26.2,2 Z"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="opacity:0.1;fill:#ffffff" />
-    <path
-       d="M 5.1,14.6 4.8,14.3 C 4.7,14.2 4.7,14.1 4.8,14 l 0.8,-0.7 c 0,0 0.1,-0.1 0.1,-0.1 0.1,0 0.1,0 0.1,0.1 l 2.2,2.4 3.9,-4.9 c 0,0 0.1,-0.1 0.2,-0.1 0,0 0.1,0 0.1,0 l 0.9,0.7 c 0,0 0.1,0.1 0.1,0.1 0,0.1 0,0.1 0,0.1 l -5,6.3 z"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="M 5.1,22.4 4.8,22.1 C 4.7,22 4.7,21.9 4.8,21.8 l 0.8,-0.7 c 0,0 0.1,-0.1 0.1,-0.1 0.1,0 0.1,0 0.1,0.1 l 2.2,2.4 3.9,-4.9 c 0,0 0.1,-0.1 0.2,-0.1 0,0 0.1,0 0.1,0 l 0.9,0.7 c 0,0 0.1,0.1 0.1,0.1 0,0.1 0,0.1 0,0.1 l -5,6.3 z"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 10,37.2 c 0,0.7 0.5,1.2 1.2,1.2 h 27.6 c 0.7,0 1.2,-0.5 1.2,-1.2 v -20 H 10 Z"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#3999c6" />
-    <path
-       d="M 38.8,12 H 11.2 C 10.5,12 10,12.5 10,13.2 v 4.4 H 40 V 13.2 C 40,12.5 39.5,12 38.8,12 Z"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="fill:#a0a1a2" />
-    <path
-       d="M 11.2,12 C 10.5,12 10,12.5 10,13.2 v 4.4 2 17.6 c 0,0.7 0.5,1.2 1.2,1.2 H 22.7 L 36.2,12 Z"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="opacity:0.1;fill:#ffffff" />
-    <path
-       d="m 15.1,24.6 -0.3,-0.3 c -0.1,-0.1 -0.1,-0.2 0,-0.3 l 0.8,-0.7 c 0,0 0.1,-0.1 0.1,-0.1 0.1,0 0.1,0 0.1,0.1 l 2.2,2.4 3.9,-4.9 c 0,0 0.1,-0.1 0.2,-0.1 0,0 0.1,0 0.1,0 l 0.9,0.7 c 0,0 0.1,0.1 0.1,0.1 0,0.1 0,0.1 0,0.1 l -5,6.3 z"
-       id="path18"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 15.1,32.4 -0.3,-0.3 c -0.1,-0.1 -0.1,-0.2 0,-0.3 l 0.8,-0.7 c 0,0 0.1,-0.1 0.1,-0.1 0.1,0 0.1,0 0.1,0.1 l 2.2,2.4 3.9,-4.9 c 0,0 0.1,-0.1 0.2,-0.1 0,0 0.1,0 0.1,0 l 0.9,0.7 c 0,0 0.1,0.1 0.1,0.1 0,0.1 0,0.1 0,0.1 l -5,6.3 z"
-       id="path20"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 20,47.2 c 0,0.7 0.5,1.2 1.2,1.2 h 27.6 c 0.7,0 1.2,-0.5 1.2,-1.2 v -20 H 20 Z"
-       id="path22"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="M 48.8,22 H 21.2 C 20.5,22 20,22.5 20,23.2 v 4.4 H 50 V 23.2 C 50,22.5 49.5,22 48.8,22 Z"
-       id="path24"
-       inkscape:connector-curvature="0"
-       style="fill:#a0a1a2" />
-    <rect
-       x="20"
-       y="27.6"
-       width="30"
-       height="2"
-       id="rect26"
-       style="opacity:0.15;fill:#ffffff" />
-    <path
-       d="M 21.2,22 C 20.5,22 20,22.5 20,23.2 v 4.4 2 17.6 c 0,0.7 0.5,1.2 1.2,1.2 H 32.7 L 46.2,22 Z"
-       id="path28"
-       inkscape:connector-curvature="0"
-       style="opacity:0.1;fill:#ffffff" />
-    <path
-       d="m 25.1,34.6 -0.3,-0.3 c -0.1,-0.1 -0.1,-0.2 0,-0.3 l 0.8,-0.7 c 0,0 0.1,-0.1 0.1,-0.1 0.1,0 0.1,0 0.1,0.1 l 2.2,2.4 3.9,-4.9 c 0,0 0.1,-0.1 0.2,-0.1 0,0 0.1,0 0.1,0 l 0.9,0.7 c 0,0 0.1,0.1 0.1,0.1 0,0.1 0,0.1 0,0.1 l -5,6.3 z"
-       id="path30"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <rect
-       x="33.200001"
-       y="34.5"
-       width="12"
-       height="2"
-       id="rect32"
-       style="opacity:0.6;fill:#ffffff" />
-    <path
-       d="m 25.1,42.4 -0.3,-0.3 c -0.1,-0.1 -0.1,-0.2 0,-0.3 l 0.8,-0.7 c 0,0 0.1,-0.1 0.1,-0.1 0.1,0 0.1,0 0.1,0.1 l 2.2,2.4 3.9,-4.9 c 0,0 0.1,-0.1 0.2,-0.1 0,0 0.1,0 0.1,0 l 0.9,0.7 c 0,0 0.1,0.1 0.1,0.1 0,0.1 0,0.1 0,0.1 l -5,6.3 z"
-       id="path34"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <rect
-       x="33.200001"
-       y="42.400002"
-       width="12"
-       height="2"
-       id="rect36"
-       style="opacity:0.6;fill:#ffffff" />
-  </svg>
-</svg>
diff --git a/source/manual/Azure Blueprints_COLOR.svg b/source/manual/Azure Blueprints_COLOR.svg
deleted file mode 100644
index d14d2eb0..00000000
--- a/source/manual/Azure Blueprints_COLOR.svg	
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg25"
-   sodipodi:docname="Azure Blueprints_COLOR.svg"
-   width="132"
-   height="127"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata31">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs29" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview27"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="77"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg25" />
-  <svg
-     id="svg-blueprints"
-     version="1.1"
-     width="100%"
-     height="100%">
-    <path
-       d="m 116.6,124.111 c -1.32,0 0.025,0.272 -1.1,0 V 110.396 H 16.5005 c -0.561,0 -13.75001,-0.127 -13.75001,-11.0676 V 13.555 c 0,-7.41524 6.41575,-10.79084 12.37501,-10.79084 5.9592,0 12.375,3.37837 12.375,10.79084 v 2.7669 h 77.2745 c 14.87,0 24.475,4.5156 24.475,19.6449 V 115.93 c 0,6.209 -5.557,8.181 -12.65,8.181 z"
-       id="path2"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="m 116.6,124.111 c -1.32,0 0.025,0.272 -1.1,0 V 110.396 H 16.5005 c -0.561,0 -13.75001,-0.127 -13.75001,-11.0676 V 13.555 c 0,-7.41524 6.41575,-10.79084 12.37501,-10.79084 5.9592,0 12.375,3.37837 12.375,10.79084 v 2.7669 h 77.2745 c 14.87,0 24.475,4.5156 24.475,19.6449 V 115.93 c 0,6.209 -5.557,8.181 -12.65,8.181 z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#ffffff" />
-    <path
-       d="M 104.775,13.5577 H 30.25 C 30.25,5.25708 23.375,0 15.125,0 6.875,0 0,5.25708 0,13.5577 c 0,0 0,71.939 0,83.0066 0,13.8347 8.25,16.6017 16.5,16.6017 h 96.25 V 127 c 0,0 19.25,0 19.25,-13.834 V 35.9695 C 132,19.3682 123.75,13.5577 104.775,13.5577 Z M 126.5,113.719 c 0,0 -5.5,-6.087 -16.225,-6.087 H 16.5 c -5.5,0 -11,-1.384 -11,-9.6843 0,-4.7037 3.575,-9.6841 11,-9.6841 8.25,0 13.475,8.3007 13.475,8.3007 H 30.25 V 19.0915 h 77.275 c 11,0 18.975,3.0436 18.975,14.1111 z"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="m 96.251,82.5941 4.125,11.0676 4.125,-11.0676 z"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="m 104.502,43.8605 h -8.25 v 33.2026 h 8.25 z"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="m 100.375,30.303 c 2.277,0 4.125,1.7902 4.125,4.0009 l -0.074,4.023 -8.1755,-0.0719 v -3.9539 c 0,-2.2079 1.848,-3.9981 4.1245,-3.9981 z"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="m 63.2505,27.5359 c 1.518,0 2.75,1.7902 2.75,4.0009 l -0.0495,4.0231 -5.4505,-0.072 V 31.534 c 0,-2.2079 1.232,-3.9981 2.75,-3.9981 z"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="m 63.2499,33.0697 c -5.9235,0 -10.725,4.831 -10.725,10.7909 0,5.9598 4.8015,10.7908 10.725,10.7908 5.9235,0 10.725,-4.831 10.725,-10.7908 0,-5.9599 -4.8015,-10.7909 -10.725,-10.7909 z m 0,18.8148 c -4.3972,0 -7.975,-3.5997 -7.975,-8.0239 0,-4.4243 3.5778,-8.024 7.975,-8.024 4.3973,0 7.975,3.5997 7.975,8.024 0,4.4242 -3.5777,8.0239 -7.975,8.0239 z"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="m 63.2499,51.9234 v -5.2958 l -5.1342,3.6163 -11.0468,34.2097 -0.7837,11.3775 6.0115,-9.6675 h 0.0027 L 63.3462,51.9538 Z"
-       id="path18"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="M 79.4311,84.4536 68.3843,50.2439 63.2501,46.6276 v 5.2958 l -0.0963,0.0304 11.0468,34.2098 h 0.0027 l 6.0115,9.6675 z"
-       id="path20"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="m 85.2505,71.5296 h -44 c -0.759,0 -1.375,-0.6198 -1.375,-1.3835 0,-0.7636 0.616,-1.3834 1.375,-1.3834 h 44 c 0.759,0 1.375,0.6198 1.375,1.3834 0,0.7637 -0.616,1.3835 -1.375,1.3835 z"
-       id="path22"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-  </svg>
-</svg>
diff --git a/source/manual/Azure Boards_COLOR.svg b/source/manual/Azure Boards_COLOR.svg
deleted file mode 100644
index 29d8edcc..00000000
--- a/source/manual/Azure Boards_COLOR.svg	
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="104"
-   height="104"
-   viewBox="0 0 104 104"
-   overflow="hidden"
-   id="svg52"
-   sodipodi:docname="Azure Boards_COLOR.svg"
-   style="overflow:hidden;fill:none"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata56">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview54"
-     showgrid="false"
-     inkscape:zoom="2.4583333"
-     inkscape:cx="48"
-     inkscape:cy="56"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg52" />
-  <defs
-     id="defs21">
-    <filter
-       id="filter0_f"
-       x="32"
-       y="32"
-       width="72"
-       height="72"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood2" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend4" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="4 4"
-         id="feGaussianBlur6" />
-    </filter>
-    <filter
-       id="filter1_f"
-       x="0"
-       y="18"
-       width="36"
-       height="28"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood9" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend11" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="4 4"
-         id="feGaussianBlur13" />
-    </filter>
-    <linearGradient
-       x2="1"
-       gradientUnits="userSpaceOnUse"
-       id="paint0_linear"
-       gradientTransform="matrix(0,96,-96,0,96,0)">
-      <stop
-         offset="0"
-         stop-color="#FFFFFF"
-         id="stop16" />
-      <stop
-         offset="1"
-         stop-color="#FFFFFF"
-         stop-opacity="0"
-         id="stop18" />
-    </linearGradient>
-  </defs>
-  <g
-     id="DevOpsIconBoards96">
-    <mask
-       maskUnits="userSpaceOnUse"
-       x="0"
-       y="0"
-       width="96"
-       height="96"
-       id="mask0">
-      <path
-         d="M 4,0 C 1.79083,0 0,1.79102 0,4 v 64 c 0,2.209 1.79083,4 4,4 H 40.2836 C 42.2245,85.5693 53.8941,96 68,96 83.464,96 96,83.4639 96,68 96,60.3711 92.9487,53.4541 88,48.4043 V 4 C 88,1.79102 86.2092,0 84,0 Z"
-         id="Union"
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff" />
-    </mask>
-    <g
-       mask="url(#mask0)"
-       id="g49">
-      <path
-         d="M 0,4 C 0,1.79086 1.79086,0 4,0 h 80 c 2.2091,0 4,1.79086 4,4 v 64 c 0,2.2091 -1.7909,4 -4,4 H 4 C 1.79086,72 0,70.2091 0,68 Z"
-         id="Rectangle"
-         inkscape:connector-curvature="0"
-         style="fill:#008d75" />
-      <g
-         id="Ellipse"
-         style="filter:url(#filter0_f)">
-        <circle
-           cx="28"
-           cy="28"
-           r="28"
-           transform="translate(40,40)"
-           id="circle26"
-           style="fill:#007d5f" />
-      </g>
-      <circle
-         cx="28"
-         cy="28"
-         r="28"
-         id="Ellipse_2"
-         transform="translate(40,40)"
-         style="fill:#16c8aa" />
-      <path
-         d="M 48,8.4043 V 28 c 0,2.2091 -1.7909,4 -4,4 H 0.283569 C 0.0966797,30.6934 0,29.3584 0,28 0,12.5361 12.536,0 28,0 35.8348,0 42.9179,3.21777 48,8.4043 Z"
-         id="Intersect"
-         transform="translate(40,40)"
-         inkscape:connector-curvature="0"
-         style="fill:#00b294" />
-      <g
-         id="Union_2"
-         transform="translate(8,8)">
-        <path
-           d="M 46,0 H 26 v 12 h 20 z"
-           id="path31"
-           inkscape:connector-curvature="0"
-           style="fill:#00b294" />
-        <path
-           d="M 72,0 H 52 v 12 h 20 z"
-           id="path33"
-           inkscape:connector-curvature="0"
-           style="fill:#00b294" />
-        <path
-           d="M 46,18 H 26 v 12 h 20 z"
-           id="path35"
-           inkscape:connector-curvature="0"
-           style="fill:#00b294" />
-        <path
-           d="M 20,36 H 0 v 12 h 20 z"
-           id="path37"
-           inkscape:connector-curvature="0"
-           style="fill:#00b294" />
-        <path
-           d="M 20,0 H 0 v 12 h 20 z"
-           id="path39"
-           inkscape:connector-curvature="0"
-           style="fill:#00b294" />
-      </g>
-      <path
-         d="M 20,0 H 0 v 12 h 20 z"
-         id="Union_3"
-         transform="translate(34,8)"
-         inkscape:connector-curvature="0"
-         style="fill:#35d6bb" />
-      <g
-         id="Union_4"
-         style="filter:url(#filter1_f)">
-        <path
-           d="M 20,0 H 0 v 12 h 20 z"
-           transform="translate(8,26)"
-           id="path43"
-           inkscape:connector-curvature="0"
-           style="fill:#00654c" />
-      </g>
-      <path
-         d="M 20,0 H 0 v 12 h 20 z"
-         id="Union_5"
-         transform="translate(8,26)"
-         inkscape:connector-curvature="0"
-         style="fill:#72f8e1" />
-      <path
-         d="M 37.6569,5.65685 14.8284,28.4853 0,13.6569 5.65685,8 14.8284,17.1716 32,0 Z"
-         id="Vector (Stroke)"
-         transform="translate(50.1714,54.1719)"
-         inkscape:connector-curvature="0"
-         style="clip-rule:evenodd;fill:#c6fdf4;fill-rule:evenodd" />
-      <path
-         d="M 4,0 C 1.79083,0 0,1.79102 0,4 v 64 c 0,2.209 1.79083,4 4,4 H 40.2836 C 42.2245,85.5693 53.8941,96 68,96 83.464,96 96,83.4639 96,68 96,60.3711 92.9487,53.4541 88,48.4043 V 4 C 88,1.79102 86.2092,0 84,0 Z"
-         id="Union_6"
-         inkscape:connector-curvature="0"
-         style="opacity:0.2;fill:url(#paint0_linear)" />
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/Azure Bot Service_COLOR.svg b/source/manual/Azure Bot Service_COLOR.svg
deleted file mode 100644
index 5321bd80..00000000
--- a/source/manual/Azure Bot Service_COLOR.svg	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 88 88"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-086"
-   version="1.1"
-   sodipodi:docname="Azure Bot Service_COLOR.svg"
-   width="88"
-   height="88"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="2.6818182"
-     inkscape:cx="44"
-     inkscape:cy="44"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-086" />
-  <g
-     id="g20">
-    <title
-       id="title2" />
-    <title
-       id="title4">Asset 5</title>
-    <g
-       class="msportalfx-svg-c15"
-       id="g18"
-       style="fill:#59b4d9">
-      <circle
-         cx="36"
-         cy="44"
-         r="4"
-         id="circle6" />
-      <circle
-         cx="52"
-         cy="44"
-         r="4"
-         id="circle8" />
-      <path
-         d="m 20,33 h 5 v 35 h -5 z"
-         id="path10"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 20,63 h 35 v 5 H 20 Z M 63,20 h 5 v 35 h -5 z"
-         id="path12"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 33,20 h 35 v 5 H 33 Z"
-         id="path14"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 44,0 A 44,44 0 1 0 88,44 44,44 0 0 0 44,0 Z m 0,82 A 38,38 0 1 1 82,44 38,38 0 0 1 44,82 Z"
-         id="path16"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/Azure Cognitive Services_COLOR.svg b/source/manual/Azure Cognitive Services_COLOR.svg
deleted file mode 100644
index 06513f99..00000000
--- a/source/manual/Azure Cognitive Services_COLOR.svg	
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="64.048 -1062.413 193.08178 114.372"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-087"
-   version="1.1"
-   sodipodi:docname="Azure Cognitive Services_COLOR.svg"
-   width="193.08177"
-   height="114.372"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs13" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="1.4684592"
-     inkscape:cx="96.540305"
-     inkscape:cy="57.186001"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-087" />
-  <g
-     id="g8"
-     transform="translate(-0.15969234,-0.024)">
-    <title
-       id="title2" />
-    <path
-       d="m 254.908,-1005.695 c -3.504,-8.302 -10.753,-15.332 -20.133,-19.63 -4.324,-14.539 -16.426,-29.079 -34.475,-29.079 -0.575,0 -1.156,0.015 -1.741,0.044 -7.528,-5.398 -14.84,-8.029 -22.287,-8.029 -4.489,0 -9.076,0.991 -13.674,2.952 -3.405,-1.785 -7.312,-2.715 -11.487,-2.715 -9.237,0 -17.998,4.266 -23.406,9.264 a 23.086,23.086 0 0 0 -5.304,-0.604 c -13.779,0 -27.433,11.384 -31.124,25.186 -11.877,4.309 -20.551,12.139 -24.624,22.323 -3.952,9.882 -3.083,20.93 2.384,30.313 5.43,9.319 14.928,14.883 25.408,14.883 4.021,0 7.896,-0.821 11.431,-2.402 6.372,5.793 14.571,9.256 22.334,9.256 2.707,0 5.299,-0.4 7.749,-1.193 6.286,5.17 15.922,7.109 23.74,7.109 9.226,0 17.242,-2.437 22.557,-6.693 3.444,1.594 7.237,2.421 11.194,2.42 h 0.003 c 9.899,0 20.127,-5.274 25.713,-12.607 3.116,1.277 6.396,1.938 9.712,1.938 h 0.003 c 10.816,-0.002 20.86,-7.063 25.589,-17.989 3.604,-8.33 3.756,-16.886 0.438,-24.747 z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#3176bc" />
-    <path
-       d="m 118.612,-995.661 h -9.739 c -1.215,-5.369 -6.015,-9.394 -11.744,-9.394 -6.644,0 -12.049,5.406 -12.049,12.05 0,6.645 5.405,12.051 12.049,12.051 5.696,0 10.471,-3.979 11.72,-9.3 h 9.764 a 2.245,2.245 0 0 1 2.242,2.242 v 33.091 a 29.66,29.66 0 0 0 5.408,0.906 v -33.997 c 0,-4.217 -3.432,-7.649 -7.651,-7.649 z m -21.483,9.708 c -3.887,0 -7.049,-3.163 -7.049,-7.051 0,-3.888 3.162,-7.05 7.049,-7.05 3.887,0 7.049,3.163 7.049,7.05 0,3.888 -3.162,7.051 -7.049,7.051 z m 60.294,-7.315 v -11.256 c 0,-4.218 -3.432,-7.648 -7.648,-7.648 H 132.66 a 2.245,2.245 0 0 1 -2.242,-2.243 v -40.697 a 31.657,31.657 0 0 0 -2.712,2.223 22.18,22.18 0 0 0 -2.696,-0.46 v 38.934 c 0,4.219 3.432,7.651 7.65,7.651 h 17.115 a 2.243,2.243 0 0 1 2.24,2.24 v 11.256 c -5.344,1.232 -9.344,6.02 -9.344,11.733 0,6.644 5.404,12.05 12.048,12.05 6.644,0 12.049,-5.406 12.049,-12.05 0,-5.713 -4.001,-10.501 -9.345,-11.733 z m -2.704,18.784 c -3.886,0 -7.048,-3.163 -7.048,-7.05 0,-3.888 3.162,-7.051 7.048,-7.051 3.887,0 7.049,3.163 7.049,7.051 0,3.887 -3.163,7.05 -7.049,7.05 z m 76.442,-30.02 c 0,-6.644 -5.404,-12.049 -12.047,-12.049 -6.644,0 -12.049,5.405 -12.049,12.049 0,5.696 3.978,10.47 9.297,11.72 v 2.231 a 2.243,2.243 0 0 1 -2.24,2.242 h -21.668 v -38.774 c 0,-4.218 -3.431,-7.65 -7.649,-7.65 h -11.743 c -1.215,-5.368 -6.014,-9.392 -11.743,-9.392 -6.644,0 -12.049,5.406 -12.049,12.05 0,6.644 5.405,12.048 12.049,12.048 5.696,0 10.471,-3.978 11.72,-9.298 h 11.767 a 2.243,2.243 0 0 1 2.241,2.242 v 74.031 c 1.75,0.423 3.559,0.672 5.408,0.737 v -30.585 h 21.668 c 4.219,0 7.65,-3.432 7.65,-7.65 v -2.207 c 5.366,-1.216 9.388,-6.015 9.388,-11.745 z m -69.843,-20.525 c -3.887,0 -7.049,-3.162 -7.049,-7.048 0,-3.887 3.162,-7.05 7.049,-7.05 3.887,0 7.049,3.163 7.049,7.05 0,3.886 -3.162,7.048 -7.049,7.048 z m 57.796,27.574 c -3.887,0 -7.049,-3.163 -7.049,-7.05 0,-3.887 3.162,-7.049 7.049,-7.049 3.886,0 7.047,3.162 7.047,7.049 0,3.887 -3.161,7.05 -7.047,7.05 z"
-       class="msportalfx-svg-c01"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Container Registry_COLOR.svg b/source/manual/Azure Container Registry_COLOR.svg
deleted file mode 100644
index 42cc46cd..00000000
--- a/source/manual/Azure Container Registry_COLOR.svg	
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="1 1 45 45" class="" role="presentation" focusable="false" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-03b"><g><title></title><path d="M15 34H9c-4-1-7.085-4.151-7.085-8.33 0-3.459 2.232-6.617 5.263-7.819a10.937 10.937 0 0 1-.055-1.092c0-5.94 4.817-10.753 10.757-10.753a10.74 10.74 0 0 1 8.376 4.019 8.672 8.672 0 0 1 3.924-.927c4.704 0 8.778 4.173 8.944 8.839l-16.063-6.625L15 16.167V34z" class="msportalfx-svg-c15" fill="#59b4d9"></path><path fill="#959595" d="M45 38.435l-22.132 4.218.102-15.559L45 31.179v7.256zM22.945 13.348L45 21.649v8.311l-22.017-4.691"></path><path fill="#b3b4b5" d="M22.983 25.268l-5.999 2.789v-11.08l5.96-3.63M44 29l-20-4.563V14.5l20 7.375V29zm-11-3.563l2 .548v-6.478l-2-.7v6.63zm-2-7.268l-2-.722v6.926l2 .564v-6.768zm6 8.363l1.972.52.034-6.175-2.006-.67v6.325zm-12-3.187l2 .515v-7.07l-2-.658v7.213zm18-1.101l-2-.7v6.034l2 .548v-5.882zM24 28.75v12.833l20-3.667v-6.083L24 28.75zm1 11.333v-9.875l2 .25v9.292l-2 .333zm6-1.01l-2 .365v-8.73L31 31v8.073zm2-.288v-7.577l2 .25v6.958l-2 .369zm6-1.052l-2 .34v-6.365L39 32v5.733zm4.068-.647L41 37.444v-5.236l1.931.241.137 4.637z"></path><path fill="#959595" d="M19.009 25.077l-1 .585v-7.88l1-.538v7.833zM21 16.098l-.997.688L20 24.44l1-.547v-7.795z"></path><path fill="#b3b4b5" d="M16.984 39.1l-.038-9.094 6.021-2.912L23 42.691"></path><path fill="#959595" d="M18.887 39.066l-.91-.463v-7.679l.91-.41v8.552zm2.147-9.518l-.993.435-.038 9.69 1.032.535v-10.66z"></path><path d="M42.981 22.892l-17.977-6.031.029-.779 17.948 6.175v.635zm-.05 9.556l-17.899-2.246v.777l17.916 2.119-.017-.65zM21 17.129v-.982l-2.904 1.611-.039.825L21 17.129zm-3.019 14.369l3.049-1.104.006-.847-3.061 1.374.006.577z" class="msportalfx-svg-c04" fill="#7a7a7a"></path><path opacity=".2" d="M45 21.695v16.74L23 42.65l16.669-22.973L45 21.695z" class="msportalfx-svg-c01" fill="#ffffff"></path></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Data Box_COLOR.svg b/source/manual/Azure Data Box_COLOR.svg
deleted file mode 100644
index 61b3ae05..00000000
--- a/source/manual/Azure Data Box_COLOR.svg	
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg10"
-   sodipodi:docname="Azure Data Box_COLOR.svg"
-   width="399.60986"
-   height="382.70001"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs14" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview12"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="39.709858"
-     inkscape:cy="341.6"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg10" />
-  <g
-     id="g8"
-     transform="translate(-10.290142,-8.9)">
-    <title
-       id="title2" />
-    <path
-       d="m 205.3,239.6 v -37.5 c 0,-3.8 -3.2,-6.9 -7.1,-6.9 h -30.1 c -1.5,0 -2.7,-0.5 -3.6,-1.4 -0.9,-0.9 -1.4,-2.1 -1.4,-3.6 0,-1.3 0.5,-2.5 1.6,-3.8 l 50,-49.9 c 0.9,-0.9 2,-1.3 3.4,-1.4 C 207.1,90.5 168.3,56.5 120.6,54.3 58.7,51.5 7.6,102.7 10.4,164.5 13,221 60.4,265.1 117,265.1 h 88.4 v -25.5 z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#45add2" />
-    <path
-       d="m 265.2,287.2 v -22.1 h 40.7 c 57.3,0 104,-44.8 104,-99.8 0,-52.8 -43.5,-96 -97.9,-98.1 -20.4,-36 -59.6,-58.3 -103.1,-58.3 -28.8,0 -55.3,9.9 -75.6,26.8 26,4.1 50.1,16.2 69.1,35.3 22.3,22.3 35.2,51.5 36.7,82.6 l 33,32.9 c 0.9,0.9 1.4,2.1 1.4,3.6 0,1.4 -0.5,2.5 -1.5,3.5 -1,1 -2.2,1.5 -3.5,1.5 h -29.2 v 129.4 c 0,3.9 -3.2,7.1 -7.2,7.1 h 0.2 -30.1 c -1.4,0 -2.5,0.5 -3.5,1.5 -1,1 -1.5,2.2 -1.5,3.5 0,1.5 0.5,2.7 1.4,3.6 l 50.2,50 c 0.9,0.9 2.1,1.4 3.6,1.4 1.5,0 2.7,-0.5 3.6,-1.4 l 50,-49.9 c 1,-1.3 1.6,-2.5 1.6,-3.8 0,-1.5 -0.5,-2.7 -1.4,-3.6 -0.9,-0.9 -2.1,-1.4 -3.6,-1.4 h -30.1 c -3.9,0 -7.1,-3.1 -7.1,-6.9 v -37.4 z"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#2272b9" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Data Explorer_COLOR.svg b/source/manual/Azure Data Explorer_COLOR.svg
deleted file mode 100644
index 61118127..00000000
--- a/source/manual/Azure Data Explorer_COLOR.svg	
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 60 60.002289"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-084"
-   version="1.1"
-   sodipodi:docname="Azure Data Explorer_COLOR.svg"
-   width="60"
-   height="60.002289"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata33">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs31" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview29"
-     showgrid="false"
-     inkscape:zoom="3.9333333"
-     inkscape:cx="30"
-     inkscape:cy="30.00229"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-084" />
-  <g
-     id="g26">
-    <title
-       id="title2" />
-    <title
-       id="title4">1- Icon - Query 60x60 Color</title>
-    <path
-       d="M 60,0 H 0 l 60,60 z"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#0078d4" />
-    <rect
-       x="-3.108"
-       y="43.584999"
-       width="33.070999"
-       height="5.9910002"
-       rx="0.94099998"
-       transform="rotate(-45,13.428,46.58)"
-       class="msportalfx-svg-c13"
-       id="rect8"
-       style="fill:#b8d432" />
-    <rect
-       x="-1.347"
-       y="30.819"
-       width="21.125999"
-       height="5.9910002"
-       rx="0.94099998"
-       transform="rotate(-45,9.216,33.814)"
-       class="msportalfx-svg-c13"
-       id="rect10"
-       style="fill:#b8d432" />
-    <path
-       d="M 17.747,17.747 42.253,42.253 60,24.506 V 0 H 35.494 Z"
-       class="msportalfx-svg-c15"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <rect
-       x="15.498"
-       y="47.789001"
-       width="21.125999"
-       height="5.9910002"
-       rx="0.94099998"
-       transform="rotate(-45,26.062,50.785)"
-       class="msportalfx-svg-c13"
-       id="rect14"
-       style="fill:#b8d432" />
-    <path
-       d="M 60,60 V 0 L 30,30 Z"
-       class="msportalfx-svg-c01"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="opacity:0.2;fill:#ffffff" />
-    <rect
-       x="30.483999"
-       y="15.004"
-       width="5.9910002"
-       height="5.9910002"
-       rx="1.3329999"
-       transform="rotate(-45,33.479,18)"
-       class="msportalfx-svg-c01"
-       id="rect18"
-       style="fill:#ffffff" />
-    <rect
-       x="38.957001"
-       y="6.5320001"
-       width="5.9910002"
-       height="5.9910002"
-       rx="1.3329999"
-       transform="rotate(-45,41.952,9.527)"
-       class="msportalfx-svg-c01"
-       id="rect20"
-       style="fill:#ffffff" />
-    <rect
-       x="38.957001"
-       y="23.476999"
-       width="5.9910002"
-       height="5.9910002"
-       rx="1.3329999"
-       transform="rotate(-45,41.952,26.473)"
-       class="msportalfx-svg-c01"
-       id="rect22"
-       style="fill:#ffffff" />
-    <rect
-       x="47.429001"
-       y="15.004"
-       width="5.9910002"
-       height="5.9910002"
-       rx="1.3329999"
-       transform="rotate(-45,50.425,18)"
-       class="msportalfx-svg-c01"
-       id="rect24"
-       style="fill:#ffffff" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Database MariaDB_COLOR.svg b/source/manual/Azure Database MariaDB_COLOR.svg
deleted file mode 100644
index cdc7aed7..00000000
--- a/source/manual/Azure Database MariaDB_COLOR.svg	
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 84.1 111.4"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-074"
-   version="1.1"
-   sodipodi:docname="Azure Database MariaDB_COLOR.svg"
-   width="84.099998"
-   height="111.4"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata29">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs27" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview25"
-     showgrid="false"
-     inkscape:zoom="2.1184919"
-     inkscape:cx="42.049999"
-     inkscape:cy="55.699999"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-074" />
-  <g
-     id="g22">
-    <title
-       id="title2" />
-    <path
-       d="m 0,15.2 v 80.9 c 0,8.5 18.8,15.2 41.9,15.2 V 15.2 Z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#1b3662" />
-    <path
-       d="m 41.5,111.4 h 0.7 c 23.3,0 41.9,-6.7 41.9,-15.2 v -81 H 41.5 Z"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#2f4c77" />
-    <path
-       d="M 84.1,15.2 C 84.1,23.5 65.3,30.4 42.2,30.4 19.1,30.4 0,23.5 0,15.2 0,6.9 18.8,0 41.9,0 65,0 84.1,7 84.1,15.2"
-       class="msportalfx-svg-c01"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 75.6,14.3 c 0,5.6 -15,10.1 -33.4,10.1 C 23.8,24.4 8.5,20 8.5,14.3 8.5,8.6 23.5,4.2 41.9,4.2 c 18.4,0 33.7,4.5 33.7,10.1"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#7fb900" />
-    <path
-       d="m 68.4,20.4 c 4.5,-1.8 7,-3.8 7,-6.1 C 75.4,8.7 60.4,4.2 42,4.2 23.6,4.2 8.5,8.7 8.5,14.3 c 0,2.2 2.7,4.5 7,6.1 6.1,-2.5 15.7,-3.8 26.5,-3.8 10.8,0 20.3,1.6 26.4,3.8"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#b7d332" />
-    <path
-       d="m 6.5,82.71 c 0,0 3.51,-1.58 4.57,-1.58 0,0 3.86,-0.53 5.62,-0.53 1.76,0 3.31,-1.4 4.57,-3.34 1.26,-1.94 6.32,-7.73 12.12,-9 5.8,-1.27 14.76,-2.64 19.68,-9.14 4.92,-6.5 7.55,-14.23 15.11,-14.58 7.56,-0.35 5.09,-1.93 7.2,-1.93 2.11,0 0.88,4 0.88,4 0,0 -0.7,0.53 -0.7,0.7 0,0.17 -0.55,2.37 -4.4,4.69 -3.85,2.32 -4,7.73 -4.39,10 -0.39,2.27 -3.86,13.35 -7.38,16.34 l -0.88,0.35 c 0,0 -0.35,0.88 -0.7,1.05 -0.35,0.17 -1.23,-0.7 -1.41,-1.05 -0.18,-0.35 -1.76,3 -2.28,3.69 a 13.7,13.7 0 0 1 -10.72,6.5 c 0,0 5.8,-9.66 5.27,-13.18 a 21.6,21.6 0 0 0 -1.58,3.86 c 0,0.7 -1.23,2.11 -3.16,2.28 -1.93,0.17 -14.23,-2.81 -19.32,0 -5.09,2.81 -7.2,5.27 -10,5.45 -2.8,0.18 -5.62,0.18 -6.68,-0.35 0,0 2.28,-2.46 2.46,-2.81 C 10.36,84.12 7,84.82 6.5,82.71 Z"
-       class="msportalfx-svg-c01"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 75.72,47.22 0.53,-0.53 c 0,0 -2.46,-0.7 -3.16,-2.46 a 0.85,0.85 0 0 0 0,0.7 10.72,10.72 0 0 0 2.63,2.29 z M 64.82,49 c 0,0 1.05,-2.46 3.34,-1.93 A 1.82,1.82 0 0 1 66.75,49.53 2.54,2.54 0 0 1 64.82,49 Z"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="fill:#1b3662" />
-    <path
-       d="m 72.73,46 c 0,0 -1.93,2.64 -2.11,3.69 m 2.46,-3.17 a 23.66,23.66 0 0 0 -1.41,3.34 m 1.59,-3.34 a 10.76,10.76 0 0 0 -0.53,3.34"
-       stroke-miterlimit="10"
-       class="msportalfx-svg-c01"
-       id="path18"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;stroke:#1b3662;stroke-width:0.5;stroke-miterlimit:10" />
-    <path
-       d="m 62.19,76.21 c 0,0 -3.16,3 -3.34,4 -0.18,1 3.51,2.64 5.8,2.11 0,0.04 -2.46,-5.41 -2.46,-6.11 z"
-       class="msportalfx-svg-c01"
-       id="path20"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Databricks_COLOR.svg b/source/manual/Azure Databricks_COLOR.svg
deleted file mode 100644
index 4b018869..00000000
--- a/source/manual/Azure Databricks_COLOR.svg	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="Azure Databricks_COLOR.svg"
-   width="59"
-   height="61.080002"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="48"
-     inkscape:cy="13.08"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg21" />
-  <defs
-     id="defs4">
-    <style
-       id="style2">
-      .cls-1 {
-        fill: #dc2126;
-      }
-
-      .cls-2 {
-        fill: #f0542d;
-      }
-    </style>
-  </defs>
-  <title
-     id="title6">i_databricks</title>
-  <g
-     id="Layer_5"
-     data-name="Layer 5"
-     transform="translate(-2,-2)">
-    <g
-       id="Market">
-      <g
-         id="Desktop">
-        <g
-           id="DB_bug"
-           data-name="DB bug">
-          <polygon
-             class="cls-1"
-             points="2,37.27 31.48,22.08 60.97,37.27 60.97,47.03 31.59,63.08 2,47.03 "
-             id="polygon8"
-             style="fill:#dc2126" />
-          <polygon
-             id="Shape"
-             class="cls-2"
-             points="31.48,52.69 2,37.28 31.5,22.08 61,37.28 "
-             style="fill:#f0542d" />
-        </g>
-      </g>
-    </g>
-    <g
-       id="Market-2"
-       data-name="Market">
-      <g
-         id="Desktop-2"
-         data-name="Desktop">
-        <g
-           id="DB_bug-2"
-           data-name="DB bug">
-          <polygon
-             class="cls-1"
-             points="2,17.19 31.48,2 60.97,17.19 60.97,26.95 31.59,43 2,26.95 "
-             id="polygon14"
-             style="fill:#dc2126" />
-          <polygon
-             id="Shape-2"
-             data-name="Shape"
-             class="cls-2"
-             points="31.48,32.6 2,17.19 31.5,2 61,17.19 "
-             style="fill:#f0542d" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/Azure DevOps_COLOR.svg b/source/manual/Azure DevOps_COLOR.svg
deleted file mode 100644
index 16c63bf7..00000000
--- a/source/manual/Azure DevOps_COLOR.svg	
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="256.00269"
-   height="256.00034"
-   viewBox="0 0 256.00269 256.00034"
-   overflow="hidden"
-   id="svg24"
-   sodipodi:docname="Azure DevOps_COLOR.svg"
-   style="overflow:hidden"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata28">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview26"
-     showgrid="false"
-     inkscape:zoom="0.921875"
-     inkscape:cx="128"
-     inkscape:cy="128.00037"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg24" />
-  <defs
-     id="defs6">
-    <path
-       d="M 9.72656,-9.67496e-6 0,12.7049 v 27.1746 l 9.72656,1.8065 z"
-       id="path0_fill"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M -3.27778e-5,4.28298 V 78.4837 L 23.4705,59.132 V -6.25618e-6 Z"
-       id="path1_fill"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 0,35.5653 72.5295,21.761 42.7189,8.15647e-6 V 9.96245 L 9.72656,22.8604 Z"
-       id="path2_fill"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 2.5e-6,5.27567e-6 86.2734,12.0637 62.803,31.4153 26.6239,19.3276 v 12.126 z"
-       id="path3_fill"
-       inkscape:connector-curvature="0" />
-  </defs>
-  <g
-     id="Canvas"
-     transform="translate(-2092,-232.00002)">
-    <g
-       id="VSTS_color_scalable">
-      <g
-         id="layer1">
-        <g
-           id="g14217">
-          <g
-             id="path14209">
-            <use
-               width="100%"
-               height="100%"
-               xlink:href="#path0_fill"
-               transform="matrix(2.66667,0,0,2.66667,2092,292.961)"
-               id="use8"
-               style="fill:#0078d7"
-               x="0"
-               y="0" />
-          </g>
-          <g
-             id="path14211">
-            <use
-               width="100%"
-               height="100%"
-               xlink:href="#path1_fill"
-               transform="matrix(2.66667,0,0,2.66667,2285.41,278.608)"
-               id="use11"
-               style="fill:#0078d7"
-               x="0"
-               y="0" />
-          </g>
-          <g
-             id="path14213">
-            <use
-               width="100%"
-               height="100%"
-               xlink:href="#path2_fill"
-               transform="matrix(2.66667,0,0,2.66667,2092,232)"
-               id="use14"
-               style="fill:#0078d7"
-               x="0"
-               y="0" />
-          </g>
-          <g
-             id="path14215">
-            <use
-               width="100%"
-               height="100%"
-               xlink:href="#path3_fill"
-               transform="matrix(2.66667,0,0,2.66667,2117.94,404.124)"
-               id="use17"
-               style="fill:#0078d7"
-               x="0"
-               y="0" />
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/Azure Digital Twins_COLOR.svg b/source/manual/Azure Digital Twins_COLOR.svg
deleted file mode 100644
index 300cc483..00000000
--- a/source/manual/Azure Digital Twins_COLOR.svg	
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 44.900002 49.900002"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-096"
-   version="1.1"
-   sodipodi:docname="Azure Digital Twins_COLOR.svg"
-   width="44.900002"
-   height="49.900002"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata35">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs33" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview31"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="22"
-     inkscape:cy="24.9"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-096" />
-  <g
-     id="g28"
-     transform="translate(-3)">
-    <title
-       id="title2" />
-    <path
-       d="M 31,0 H 3 v 36 h 28 z"
-       class="msportalfx-svg-c19"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="M 18,9 V 46 H 43.901 L 44,9 Z m 23.915,2 V 26 H 19.986 V 11 Z M 19.986,44 V 28 h 21.929 v 16 z"
-       class="msportalfx-svg-c19"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <circle
-       cx="19"
-       cy="45"
-       r="4.9000001"
-       class="msportalfx-svg-c14"
-       id="circle8"
-       style="fill:#7fba00" />
-    <path
-       d="m 19,46.9 c -1.048,0 -1.9,-0.853 -1.9,-1.9 0,-1.047 0.853,-1.9 1.9,-1.9 1.047,0 1.9,0.852 1.9,1.9 0,1.048 -0.852,1.9 -1.9,1.9 z"
-       class="msportalfx-svg-c01"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <circle
-       cx="43"
-       cy="45"
-       r="4.9000001"
-       class="msportalfx-svg-c14"
-       id="circle12"
-       style="fill:#7fba00" />
-    <path
-       d="m 43,46.9 c -1.048,0 -1.9,-0.853 -1.9,-1.9 0,-1.047 0.853,-1.9 1.9,-1.9 1.047,0 1.9,0.852 1.9,1.9 0,1.048 -0.852,1.9 -1.9,1.9 z"
-       class="msportalfx-svg-c01"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <circle
-       cx="43"
-       cy="10"
-       r="4.9000001"
-       class="msportalfx-svg-c14"
-       id="circle16"
-       style="fill:#7fba00" />
-    <circle
-       cx="43"
-       cy="10"
-       r="1.9"
-       class="msportalfx-svg-c01"
-       id="circle18"
-       style="fill:#ffffff" />
-    <circle
-       cx="43"
-       cy="27"
-       r="4.9000001"
-       class="msportalfx-svg-c14"
-       id="circle20"
-       style="fill:#7fba00" />
-    <circle
-       cx="43"
-       cy="27"
-       r="1.9"
-       class="msportalfx-svg-c01"
-       id="circle22"
-       style="fill:#ffffff" />
-    <path
-       d="M 5.901,2.9 H 28.158 V 32.899 H 5.901 Z"
-       class="msportalfx-svg-c01"
-       id="path24"
-       inkscape:connector-curvature="0"
-       style="opacity:0.3;fill:#ffffff" />
-    <path
-       d="M 22.854,11 H 31 V 9 H 22.854 C 22.409,7.336 20.903,6.1 19.1,6.1 c -2.151,0 -3.9,1.75 -3.9,3.9 0,1.766 1.188,3.245 2.801,3.723 v 9.554 C 16.388,23.755 15.2,25.234 15.2,27 c 0,1.766 1.188,3.245 2.801,3.723 L 18,36 h 1.986 V 30.789 A 3.9,3.9 0 0 0 22.854,28 H 31 V 26 H 22.854 A 3.896,3.896 0 0 0 19.986,23.211 V 13.789 A 3.9,3.9 0 0 0 22.854,11 Z"
-       class="msportalfx-svg-c21"
-       id="path26"
-       inkscape:connector-curvature="0"
-       style="opacity:0.6;fill:#00188f" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Event Grid_COLOR.svg b/source/manual/Azure Event Grid_COLOR.svg
deleted file mode 100644
index e60fe681..00000000
--- a/source/manual/Azure Event Grid_COLOR.svg	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="50.000156"
-   height="50"
-   viewBox="0 0 50.000156 50"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="Azure Event Grid_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata21"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs19" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview17"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="25"
-     inkscape:cy="25"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><polygon
-     points="24.004,20 23.996,19.996 16.991,27 11.82,27 23.82,15 32,15 32,13 23,13 23,13.005 22.992,13 8.991,27 7,27 7,29 13,29 20,35.999 20,35.999 20,36 37,36 37,34 20.828,34 15.829,29 28,29 28,27 19.82,27 24.82,22 39,22 39,20 "
-     id="polygon2"
-     style="fill:#0072c6" /><circle
-     cx="30"
-     cy="28"
-     r="2.9000001"
-     id="circle4"
-     style="fill:#59b4d9" /><circle
-     transform="rotate(-45)"
-     cx="13.434958"
-     cy="33.233948"
-     id="ellipse6"
-     r="2.8999722"
-     style="fill:#59b4d9;stroke-width:0.9999904" /><circle
-     transform="rotate(-45)"
-     cx="13.434888"
-     cy="43.133373"
-     id="ellipse8"
-     r="2.8999722"
-     style="fill:#b8d432;stroke-width:0.9999904" /><circle
-     transform="rotate(-45)"
-     cx="1.4141428"
-     cy="50.911476"
-     id="ellipse10"
-     r="2.8999722"
-     style="fill:#b8d432;stroke-width:0.9999904" /><path
-     d="M 0.801,0 C 0.3,0 0,0.3 0,0.8 v 10 c 0,0.5 0.3,0.8 0.801,0.8 H 5.809 C 6.31,11.6 6.61,11.3 6.61,10.8 V 6.7 h 36.76 v 4.2 c 0,0.5 0.3,0.8 1.002,0.8 h 4.808 c 0.501,0 0.801,-0.3 0.801,-0.8 v -5 -5 C 50.081,0.3 49.781,0 49.28,0 v 0 z"
-     id="path12"
-     inkscape:connector-curvature="0"
-     style="fill:#0072c6" /><path
-     d="m 49.2,50 c 0.5,0 0.8,-0.3 0.8,-0.8 v -9.8 c 0,-0.5 -0.3,-0.8 -0.8,-0.8 h -4.8 c -0.5,0 -0.8,0.3 -0.8,0.8 v 4 H 6.7 v -4.2 c 0,-0.5 -0.3,-0.8 -1,-0.8 H 0.8 c -0.5,0 -0.8,0.3 -0.8,1 v 9.8 C 0,49.7 0.3,50 0.8,50 Z"
-     id="path14"
-     inkscape:connector-curvature="0"
-     style="fill:#0072c6" /></svg>
\ No newline at end of file
diff --git a/source/manual/Azure ExpressRoute_COLOR.svg b/source/manual/Azure ExpressRoute_COLOR.svg
deleted file mode 100644
index d7b50820..00000000
--- a/source/manual/Azure ExpressRoute_COLOR.svg	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="50"
-   height="30.6"
-   viewBox="0 0 50 30.6"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="Azure ExpressRoute_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata19"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs17" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview15"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="25"
-     inkscape:cy="15.3"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><rect
-     x="9.8000002"
-     y="23.099998"
-     width="31"
-     height="3.8"
-     id="rect2"
-     style="fill:#68217a" /><rect
-     x="-11.053578"
-     y="19.708536"
-     transform="rotate(-45)"
-     width="21.199797"
-     height="3.7999635"
-     id="rect4"
-     style="fill:#68217a;stroke-width:0.9999904" /><rect
-     x="25.289461"
-     y="-15.693048"
-     transform="rotate(45)"
-     width="21.199797"
-     height="3.7999635"
-     id="rect6"
-     style="fill:#68217a;stroke-width:0.9999904" /><path
-     d="m 25,0 c -3.1,0 -5.6,2.5 -5.6,5.6 0,3.1 2.5,5.6 5.6,5.6 3.1,0 5.6,-2.5 5.6,-5.6 C 30.6,2.5 28.1,0 25,0 Z m 0,7.4 c -1,0 -1.8,-0.8 -1.8,-1.8 0,-1 0.8,-1.8 1.8,-1.8 1,0 1.8,0.8 1.8,1.8 0,1 -0.8,1.8 -1.8,1.8 z"
-     id="path8"
-     inkscape:connector-curvature="0"
-     style="fill:#7fba00" /><path
-     d="M 5.6,19.4 C 2.5,19.4 0,21.9 0,25 c 0,3.1 2.5,5.6 5.6,5.6 3.1,0 5.6,-2.5 5.6,-5.6 0,-3.1 -2.5,-5.6 -5.6,-5.6 z m 0,7.4 c -1,0 -1.8,-0.8 -1.8,-1.8 0,-1 0.8,-1.8 1.8,-1.8 1,0 1.8,0.8 1.8,1.8 0,1 -0.8,1.8 -1.8,1.8 z"
-     id="path10"
-     inkscape:connector-curvature="0"
-     style="fill:#7fba00" /><path
-     d="m 44.4,19.4 c -3.1,0 -5.6,2.5 -5.6,5.6 0,3.1 2.5,5.6 5.6,5.6 3.1,0 5.6,-2.5 5.6,-5.6 0,-3.1 -2.5,-5.6 -5.6,-5.6 z m 0,7.4 c -1,0 -1.8,-0.8 -1.8,-1.8 0,-1 0.8,-1.8 1.8,-1.8 1,0 1.8,0.8 1.8,1.8 0,1 -0.8,1.8 -1.8,1.8 z"
-     id="path12"
-     inkscape:connector-curvature="0"
-     style="fill:#7fba00" /></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Front Door Service_COLOR.svg b/source/manual/Azure Front Door Service_COLOR.svg
deleted file mode 100644
index f93bcf91..00000000
--- a/source/manual/Azure Front Door Service_COLOR.svg	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg18"
-   sodipodi:docname="Azure Front Door Service_COLOR.svg"
-   width="49.799999"
-   height="43.898933"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata22">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview20"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="49.9"
-     inkscape:cy="-2.0010662"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg18" />
-  <defs
-     id="defs4">
-    <style
-       type="text/css"
-       id="style2"><![CDATA[
-        .msportalfx-svg-c01{fill:#fff}.msportalfx-svg-c02{fill:#e5e5e5}.msportalfx-svg-c03{fill:#a0a1a2}.msportalfx-svg-c04{fill:#7a7a7a}.msportalfx-svg-c05{fill:#3e3e3e}.msportalfx-svg-c06{fill:#1e1e1e}.msportalfx-svg-c07{fill:#0f0f0f}.msportalfx-svg-c08{fill:#ba141a}.msportalfx-svg-c09{fill:#dd5900}.msportalfx-svg-c10{fill:#ff8c00}.msportalfx-svg-c11{fill:#fcd116}.msportalfx-svg-c12{fill:#fee087}.msportalfx-svg-c13{fill:#b8d432}.msportalfx-svg-c14{fill:#7fba00}.msportalfx-svg-c15{fill:#59b4d9}.msportalfx-svg-c16{fill:#3999c6}.msportalfx-svg-c17{fill:#804998}.msportalfx-svg-c18{fill:#ec008c}.msportalfx-svg-c19{fill:#0072c6}.msportalfx-svg-c20{fill:#68217a}.msportalfx-svg-c21{fill:#00188f}.msportalfx-svg-c22{fill:#e81123}.msportalfx-svg-c23{fill:#cae3f3}.msportalfx-svg-c24{fill:#59aed3}.msportalfx-svg-c25{fill:#4c3b12}.msportalfx-svg-c26{fill:#be9555}.msportalfx-svg-c27{fill:#4f4d52}.msportalfx-svg-c28{fill:#ef6f59}.msportalfx-svg-c29{fill:#f7cb64}.msportalfx-svg-c97{fill:#ffb900}.msportalfx-svg-c98{fill:#00a4ef}.msportalfx-svg-c99{fill:#f25022}
-      ]]></style>
-  </defs>
-  <g
-     id="g16"
-     transform="translate(-0.1,-4.1)">
-    <title
-       id="title6" />
-    <path
-       d="m 45.139,23.099 a 10.94,10.94 0 0 0 0.777,-4.041 C 45.916,13 41.011,8.089 34.96,8.089 33.278,8.089 31.69,8.48 30.266,9.158 27.898,6.087 24.195,4.1 20.02,4.1 12.869,4.1 7.072,9.904 7.072,17.064 c 0,0.581 0.052,1.149 0.125,1.71 C 3.053,20.339 0.1,24.334 0.1,29.031 0.1,35.089 5.005,40 11.056,40 h 29.88 c 4.951,0 8.964,-4.018 8.964,-8.975 a 8.974,8.974 0 0 0 -4.761,-7.926 z"
-       class="msportalfx-svg-c15"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="M 18,20 H 32 V 40.05 H 18 Z"
-       class="msportalfx-svg-c01"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="M 34.938,18.847 25.26,13.158 c 0,0 -0.412,-0.21 -0.596,-0.21 C 23.747,12.947 23,13 23,14.738 V 20 h 10 v 20 h 3 V 20.422 c 0,-0.7 -0.424,-1.324 -1.062,-1.575 z"
-       class="msportalfx-svg-c01"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="opacity:0.4;fill:#ffffff" />
-    <path
-       d="M 34.544,18.767 24.877,13.083 C 24.446,12.934 24,13.267 24,13.738 v 33.57 c 0,0.471 0.446,0.804 0.877,0.655 l 9.667,-5.684 A 0.687,0.687 0 0 0 35,41.625 V 19.422 a 0.69,0.69 0 0 0 -0.456,-0.655 z"
-       class="msportalfx-svg-c19"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Functions_COLOR.svg b/source/manual/Azure Functions_COLOR.svg
deleted file mode 100644
index 324b6a65..00000000
--- a/source/manual/Azure Functions_COLOR.svg	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 64.026695 59"
-   enable-background="new 0 0 64 64"
-   xml:space="preserve"
-   sodipodi:docname="Azure Functions_COLOR.svg"
-   width="64.026695"
-   height="59"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata17"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs15" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview13"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32.013349"
-     inkscape:cy="29.5"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><g
-     id="g10"
-     transform="translate(0.01334878,-2.5)"><path
-       d="m 63.6,32.4 c 0.6,-0.6 0.5,-1.7 0,-2.3 L 60.5,27 46.7,13.6 C 46.1,13 45.2,13 44.5,13.6 v 0 c -0.6,0.6 -0.8,1.7 0,2.3 L 59,30.1 c 0.6,0.6 0.6,1.7 0,2.3 L 44.2,47.1 c -0.6,0.6 -0.6,1.7 0,2.3 v 0 c 0.6,0.6 1.7,0.5 2.2,0 L 60.1,35.8 c 0,0 0,0 0.1,-0.1 z"
-       id="path2"
-       inkscape:connector-curvature="0"
-       style="fill:#3999c6" /><path
-       d="m 0.4,32.4 c -0.6,-0.6 -0.5,-1.7 0,-2.3 L 3.5,27 17.3,13.6 c 0.6,-0.6 1.5,-0.6 2.2,0 v 0 c 0.6,0.6 0.8,1.7 0,2.3 L 5.3,30.1 c -0.6,0.6 -0.6,1.7 0,2.3 l 14.5,14.7 c 0.6,0.6 0.6,1.7 0,2.3 v 0 c -0.6,0.6 -1.7,0.5 -2.2,0 L 3.6,36 c 0,0 0,0 -0.1,-0.1 z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#3999c6" /><polygon
-       points="17.6,32.1 30.4,32.2 20.4,61.5 48,22.4 34.6,22.4 47.6,2.5 28.1,2.5 "
-       id="polygon6"
-       style="fill:#fcd116" /><polygon
-       enable-background="new    "
-       points="37.4,2.5 26.6,27.1 39.4,27.2 20.4,61.5 48,22.4 34.6,22.4 47.6,2.5 "
-       id="polygon8"
-       style="opacity:0.3;fill:#ff8c00" /></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure IoT Hub_COLOR.svg b/source/manual/Azure IoT Hub_COLOR.svg
deleted file mode 100644
index cc62bcbe..00000000
--- a/source/manual/Azure IoT Hub_COLOR.svg	
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4753"
-   version="1.1"
-   viewBox="0 0 13.27041 13.22903"
-   height="49.999481"
-   width="50.15588"
-   sodipodi:docname="Azure IoT Hub_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview17"
-     showgrid="false"
-     inkscape:zoom="4.7200486"
-     inkscape:cx="25.07794"
-     inkscape:cy="24.99974"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4753" />
-  <defs
-     id="defs4747" />
-  <metadata
-     id="metadata4750">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-1.68027,-272.6206)"
-     id="layer1">
-    <polygon
-       style="fill:#b8d432;fill-rule:evenodd;stroke:none;stroke-width:1"
-       id="polygon51"
-       points="325.8628,236.117 327.9148,234.675 339.0018,250.447 336.9498,251.889 "
-       transform="matrix(0.26458333,0,0,0.26458333,-79.312631,212.29848)" />
-    <polygon
-       style="fill:#b8d432;fill-rule:evenodd;stroke:none;stroke-width:1"
-       id="polygon53"
-       points="336.959,251.7162 339.136,250.4702 348.948,267.6122 346.771,268.8572 "
-       transform="matrix(0.26458333,0,0,0.26458333,-79.312631,212.29848)" />
-    <polygon
-       style="fill:#b8d432;fill-rule:evenodd;stroke:none;stroke-width:1"
-       id="polygon55"
-       points="313.8872,252.0643 337.7872,250.0813 337.9952,252.5803 314.0942,254.5643 "
-       transform="matrix(0.26458333,0,0,0.26458333,-79.312631,212.29848)" />
-    <polygon
-       style="fill:#b8d432;fill-rule:evenodd;stroke:none;stroke-width:1"
-       id="polygon57"
-       points="328.4907,264.5541 336.9037,250.5931 339.0517,251.8871 330.6387,265.8491 "
-       transform="matrix(0.26458333,0,0,0.26458333,-79.312631,212.29848)" />
-    <path
-       style="fill:#0072c6;fill-rule:evenodd;stroke:none;stroke-width:0.26458332"
-       id="path59"
-       d="m 14.74352,272.6206 h -3.35915 c -0.12436,0 -0.20744,0.0828 -0.20744,0.24871 v 1.20253 c 0,0.12435 0.0828,0.20743 0.20744,0.20743 h 1.90764 v 1.86611 c 0,0.12435 0.0828,0.20743 0.24871,0.20743 h 1.20253 c 0.12436,0 0.20743,-0.0828 0.20743,-0.20743 v -3.31735 c 0,-0.12435 -0.0828,-0.20743 -0.20716,-0.20743"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#0072c6;fill-rule:evenodd;stroke:none;stroke-width:0.26458332"
-       id="path61"
-       d="m 1.88744,285.84963 h 3.35915 c 0.12435,0 0.20743,-0.0825 0.20743,-0.24844 v -1.20253 c 0,-0.12462 -0.0828,-0.2077 -0.20743,-0.2077 H 3.33894 v -1.86584 c 0,-0.12462 -0.0828,-0.20744 -0.24871,-0.20744 H 1.8877 c -0.12435,0 -0.20743,0.0826 -0.20743,0.20744 v 3.31761 c 0,0.12435 0.0828,0.2069 0.20717,0.2069"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#006dd6;fill-rule:evenodd;stroke:none;stroke-width:0.26458332"
-       id="path63"
-       d="m 7.23737,273.3672 c 0.71014,0 1.28561,0.57573 1.28561,1.28561 0,0.70988 -0.57547,1.28561 -1.28561,1.28561 -0.71015,0 -1.28561,-0.57573 -1.28561,-1.28561 0,-0.70988 0.57546,-1.28561 1.28561,-1.28561"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#006dd6;fill-rule:evenodd;stroke:none;stroke-width:0.26458332"
-       id="path65"
-       d="m 10.18165,277.26554 c 0.84746,0 1.53432,0.68713 1.53432,1.53432 0,0.8472 -0.68686,1.53432 -1.53432,1.53432 -0.84746,0 -1.53432,-0.68712 -1.53432,-1.53432 0,-0.84719 0.68686,-1.53432 1.53432,-1.53432"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#006dd6;fill-rule:evenodd;stroke:none;stroke-width:0.26458332"
-       id="path67"
-       d="m 12.75279,282.15917 c 0.66411,0 1.20253,0.53816 1.20253,1.20253 0,0.66411 -0.53842,1.20253 -1.20253,1.20253 -0.6641,0 -1.20253,-0.53842 -1.20253,-1.20253 0,-0.66437 0.53843,-1.20253 1.20253,-1.20253"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#006dd6;fill-rule:evenodd;stroke:none;stroke-width:0.26458332"
-       id="path69"
-       d="m 7.9837,281.49538 c 0.57256,0 1.03664,0.46435 1.03664,1.03664 0,0.57256 -0.46408,1.03664 -1.03664,1.03664 -0.57256,0 -1.03664,-0.46408 -1.03664,-1.03664 0,-0.57229 0.46408,-1.03664 1.03664,-1.03664"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#006dd6;fill-rule:evenodd;stroke:none;stroke-width:0.26458332"
-       id="path71"
-       d="m 3.79508,278.34377 c 0.57256,0 1.03664,0.46408 1.03664,1.03664 0,0.57256 -0.46408,1.03664 -1.03664,1.03664 -0.57255,0 -1.03663,-0.46408 -1.03663,-1.03664 0,-0.57256 0.46408,-1.03664 1.03663,-1.03664"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Key Vault_COLOR.svg b/source/manual/Azure Key Vault_COLOR.svg
deleted file mode 100644
index 7f39e2f5..00000000
--- a/source/manual/Azure Key Vault_COLOR.svg	
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="44.799999"
-   height="50"
-   viewBox="0 0 44.799999 50"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="Azure Key Vault_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata13"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs11" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview9"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="22.4"
-     inkscape:cy="25"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="m 44.8,27.6 c 0,-7.3 -3.5,-13.7 -8.8,-17.8 0,0.2 0,0.5 0,0.7 0,2.2 -0.6,4.3 -1.5,6.1 2.6,2.9 4.2,6.7 4.2,10.9 0,9 -7.3,16.3 -16.3,16.3 C 13.4,43.8 6.1,36.5 6.1,27.5 6.1,23 7.9,19 10.8,16 10,14.3 9.5,12.4 9.5,10.4 9.5,10 9.5,9.5 9.6,9.1 3.8,13.1 0,19.9 0,27.5 0,40 10,50 22.4,50 34.8,50 44.8,40 44.8,27.6 Z"
-     id="path2"
-     inkscape:connector-curvature="0"
-     style="fill:#7fba00" /><g
-     id="g6"
-     transform="translate(-2.6)"><path
-       d="M 25.3,0 C 19.6,0 15,4.6 15,10.3 c 0,4.7 3.1,8.6 7.4,9.9 v 10.2 h -4.8 v 5.2 h 4.8 v 3.8 h 5.7 V 20.1 c 4.3,-1.2 7.4,-5.2 7.4,-9.9 C 35.6,4.6 31,0 25.3,0 Z m 0,5.4 c 2.7,0 4.9,2.2 4.9,4.9 0,2.7 -2.2,4.9 -4.9,4.9 -2.7,0 -4.9,-2.2 -4.9,-4.9 0,-2.7 2.2,-4.9 4.9,-4.9 z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#fcd116" /></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Kubernetes Service_COLOR.svg b/source/manual/Azure Kubernetes Service_COLOR.svg
deleted file mode 100644
index 60012a5b..00000000
--- a/source/manual/Azure Kubernetes Service_COLOR.svg	
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 50 50" class="fxs-portal-svg" role="presentation" focusable="false" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-039"><g><title></title><path d="M22.891 15.949l-7.647 2.921V6.537l7.647 2.708z" class="msportalfx-svg-c17" fill="#804998"></path><path d="M8.289 8.565v8.1l5.728 2.179V6.537L8.289 8.565zm.628 7.513l-.312-.097V9.274l.312-.088.328-.092.349-.098v7.292l-.349-.108-.328-.102zm1.436.445l-.392-.121v-7.51l.392-.11.415-.117.444-.125v8.249l-.444-.138-.415-.128zm1.84.569l-.508-.157V8.407l.508-.143.542-.153.586-.165v9.496l-.586-.181-.542-.169z" class="msportalfx-svg-c20" fill="#68217a"></path><path d="M40.791 15.949l-7.648 2.921V6.537l7.648 2.708z" class="msportalfx-svg-c17" fill="#804998"></path><path d="M26.189 8.565v8.1l5.728 2.179V6.537l-5.728 2.028zm.627 7.513l-.312-.097V9.274l.312-.088.328-.092.349-.098v7.292l-.349-.108-.328-.102zm1.436.445l-.392-.121v-7.51l.392-.11.415-.117.444-.125v8.249l-.444-.138-.415-.128zm1.84.569l-.508-.157V8.407l.508-.143.542-.153.586-.165v9.496l-.586-.181-.542-.169z" class="msportalfx-svg-c20" fill="#68217a"></path><path d="M22.891 40.543l-7.647 2.92V31.13l7.647 2.709z" class="msportalfx-svg-c17" fill="#804998"></path><path d="M8.289 33.159v8.1l5.728 2.179V31.13l-5.728 2.029zm.628 7.513l-.312-.097v-6.707l.312-.088.328-.092.349-.098v7.292l-.349-.108-.328-.102zm1.436.444l-.392-.121v-7.509l.392-.111.415-.117.444-.125v8.249l-.444-.138-.415-.128zm1.84.57l-.508-.157V33l.508-.143.542-.153.586-.165v9.496l-.586-.181-.542-.168z" class="msportalfx-svg-c20" fill="#68217a"></path><path d="M40.791 40.543l-7.648 2.92V31.13l7.648 2.709z" class="msportalfx-svg-c17" fill="#804998"></path><path d="M26.189 33.159v8.1l5.728 2.179V31.13l-5.728 2.029zm.627 7.513l-.312-.097v-6.707l.312-.088.328-.092.349-.098v7.292l-.349-.108-.328-.102zm1.436.444l-.392-.121v-7.509l.392-.111.415-.117.444-.125v8.249l-.444-.138-.415-.128zm1.84.57l-.508-.157V33l.508-.143.542-.153.586-.165v9.496l-.586-.181-.542-.168z" class="msportalfx-svg-c20" fill="#68217a"></path><path d="M32.417 28.21l-7.648 2.92V18.798l7.648 2.708z" class="msportalfx-svg-c17" fill="#804998"></path><path d="M17.815 20.826v8.1l5.728 2.179V18.798l-5.728 2.028zm.627 7.513l-.312-.097v-6.707l.312-.088.328-.092.349-.098v7.292l-.349-.108-.328-.102zm1.436.445l-.392-.121v-7.509l.392-.11.415-.117.444-.125v8.249l-.444-.138-.415-.129zm1.84.569l-.508-.157v-8.528l.508-.143.542-.153.586-.165v9.496l-.586-.181-.542-.169z" class="msportalfx-svg-c20" fill="#68217a"></path><path d="M14.61 28.21l-7.648 2.92V18.798l7.648 2.708z" class="msportalfx-svg-c17" fill="#804998"></path><path d="M.008 20.826v8.1l5.728 2.179V18.798L.008 20.826zm.627 7.513l-.312-.097v-6.707l.312-.088.328-.092.349-.098v7.292l-.349-.108-.328-.102zm1.436.445l-.392-.121v-7.509l.392-.11.415-.117.445-.127v8.249l-.444-.138-.416-.127zm1.84.569l-.508-.157v-8.528l.508-.143.542-.153.586-.165v9.496l-.586-.181-.542-.169z" class="msportalfx-svg-c20" fill="#68217a"></path><path d="M50 28.21l-7.648 2.92V18.798L50 21.506z" class="msportalfx-svg-c17" fill="#804998"></path><path d="M35.398 20.826v8.1l5.728 2.179V18.798l-5.728 2.028zm.627 7.513l-.312-.097v-6.707l.312-.088.328-.092.349-.098v7.292l-.349-.108-.328-.102zm1.436.445l-.392-.121v-7.509l.392-.11.415-.117.444-.125v8.249l-.444-.138-.415-.129zm1.84.569l-.508-.157v-8.528l.508-.143.542-.153.586-.165v9.496l-.586-.181-.542-.169z" class="msportalfx-svg-c20" fill="#68217a"></path></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Lab Services_COLOR.svg b/source/manual/Azure Lab Services_COLOR.svg
deleted file mode 100644
index 4b184a7f..00000000
--- a/source/manual/Azure Lab Services_COLOR.svg	
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 16.013298 12.588001"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-0b0"
-   version="1.1"
-   sodipodi:docname="Azure Lab Services_COLOR.svg"
-   width="16.013298"
-   height="12.588001"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs13" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview11"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="8.0132879"
-     inkscape:cy="6.0000025"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-0b0" />
-  <g
-     id="g8"
-     transform="translate(0.01328787,-1.4120015)">
-    <title
-       id="title2" />
-    <path
-       d="M 16,8.806 A 2.679,2.679 0 0 1 13.345,11.48 H 12.62 L 10,7.465 V 5 L 10.509,4.991 A 0.493,0.493 0 0 0 11,4.5 0.493,0.493 0 0 0 10.509,4 H 7.491 A 0.493,0.493 0 0 0 7,4.491 0.493,0.493 0 0 0 7.491,4.982 L 8,5 V 7.47 L 5.338,11.484 H 3.155 a 3.411,3.411 0 0 1 0.415,-6.809 3.333,3.333 0 0 1 1.489,0.348 4.1,4.1 0 1 1 8.12,1.132 h 0.188 A 2.644,2.644 0 0 1 16,8.806 Z"
-       class="msportalfx-svg-c19"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="M 12.373,14 H 5.588 A 0.275,0.275 0 0 1 5.357,13.574 L 7.688,10 h 2.562 l 2.35,3.573 A 0.275,0.275 0 0 1 12.373,14 Z"
-       class="msportalfx-svg-c15"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Log Analytics_COLOR.svg b/source/manual/Azure Log Analytics_COLOR.svg
deleted file mode 100644
index 3f6065cd..00000000
--- a/source/manual/Azure Log Analytics_COLOR.svg	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 48 48"
-   class="fxs-portal-svg"
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-0e3"
-   version="1.1"
-   sodipodi:docname="Azure Log Analytics_COLOR.svg"
-   width="48"
-   height="48"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs15" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview13"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="24"
-     inkscape:cy="24"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-0e3" />
-  <g
-     id="g10"
-     transform="translate(-1,-1)">
-    <title
-       id="title2" />
-    <path
-       d="M 1,26 H 11 V 36 H 1 Z M 1,13 H 11 V 23 H 1 Z M 1,39 H 11 V 49 H 1 Z m 13,0 H 24 V 49 H 14 Z m 13,0 H 37 V 49 H 27 Z"
-       class="msportalfx-svg-c03"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill:#a0a1a2;fill-rule:evenodd" />
-    <path
-       d="M 31.5,1 C 21.705,1 14,8.705 14,18.5 V 36 H 31.5 C 41.295,36 49,28.295 49,18.5 49,8.705 41.295,1 31.5,1 Z"
-       class="msportalfx-svg-c19"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill:#0072c6;fill-rule:evenodd" />
-    <path
-       d="m 21,16 h 3 v 11 h -3 z m 7,3 h 3 v 8 h -3 z m 7,-7 h 3 v 15 h -3 z"
-       class="msportalfx-svg-c01"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Machine Learning Service_COLOR.svg b/source/manual/Azure Machine Learning Service_COLOR.svg
deleted file mode 100644
index c9e70531..00000000
--- a/source/manual/Azure Machine Learning Service_COLOR.svg	
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 950.85699 1024"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-088"
-   version="1.1"
-   sodipodi:docname="Azure Machine Learning Service_COLOR.svg"
-   width="950.85699"
-   height="1024"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs21" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview19"
-     showgrid="false"
-     inkscape:zoom="0.23046875"
-     inkscape:cx="475.5"
-     inkscape:cy="512"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-088" />
-  <g
-     id="g16">
-    <title
-       id="title2" />
-    <title
-       id="title4">workbench_icon copy</title>
-    <g
-       id="g14"
-       style="fill:none">
-      <path
-         d="m 347.429,0 h 256 v 384 h -256 z"
-         id="path6"
-         inkscape:connector-curvature="0"
-         style="fill:#046eab" />
-      <path
-         d="M 886.857,1024 H 64 L 0,777.143 h 950.857 z"
-         id="path8"
-         inkscape:connector-curvature="0"
-         style="fill:#19457a" />
-      <path
-         d="M 64,1024 0,777.143 347.429,384 h 256 z"
-         id="path10"
-         inkscape:connector-curvature="0"
-         style="fill:#1590cf" />
-      <path
-         d="M 886.857,1024 512,640 667.429,457.143 l 283.428,320 z"
-         id="path12"
-         inkscape:connector-curvature="0"
-         style="fill:#046eab" />
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/Azure Machine Learning Studio_COLOR.svg b/source/manual/Azure Machine Learning Studio_COLOR.svg
deleted file mode 100644
index bcaf1cc4..00000000
--- a/source/manual/Azure Machine Learning Studio_COLOR.svg	
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 18 18"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-08a"
-   version="1.1"
-   sodipodi:docname="Azure Machine Learning Studio_COLOR.svg"
-   width="18"
-   height="18"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata21">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs19" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview17"
-     showgrid="false"
-     inkscape:zoom="13.111111"
-     inkscape:cx="9"
-     inkscape:cy="9"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-08a" />
-  <g
-     id="g14">
-    <title
-       id="title2" />
-    <path
-       d="m 3.25,2 h 0.3 v 10 h -0.3 z m 11.5,0 h 0.3 v 10 h -0.3 z M 9,2 H 9.3 V 4 H 9 Z m 2.88,0 h 0.3 v 2 h -0.3 z M 6.13,2 h 0.3 v 2 h -0.3 z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#c9c9c9" />
-    <path
-       d="M 0,0 V 13 H 3.21 L 3.72,12 H 1 V 2 h 16 v 10 h -3.29 l 0.5,1 H 18 V 0 Z"
-       class="msportalfx-svg-c03"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#a0a1a2" />
-    <path
-       d="m 11.71,6.94 a 0.78,0.78 0 0 0 1,-0.73 V 5.75 A 0.86,0.86 0 0 0 11.78,5.08 H 6 A 0.83,0.83 0 0 0 5,5.75 V 6.26 A 0.77,0.77 0 0 0 6,6.94 V 10 L 2.78,16.2 4,18 h 9.5 L 14.75,16.2 11.71,10 Z"
-       class="msportalfx-svg-c15"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="M 12,13.81 H 8.01 L 6.57,16.18 H 4.62 L 8.04,10.07 V 6.95 h 1.98 v 3.12 z"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#d5ecf6" />
-    <path
-       d="m 1,4.01 h 16 v 0.3 H 1 Z M 4.36,7.16 H 1 v -0.3 h 3.07 z m 12.64,0 h -3.74 l 0.32,-0.3 H 17 Z M 1,9.709 5,9.705 v 0.3 l -4,0.004 z m 11.725,0.289 v -0.3 l 4.27,0.005 v 0.3 z"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#c9c9c9" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Managed Applications_COLOR.svg b/source/manual/Azure Managed Applications_COLOR.svg
deleted file mode 100644
index 13fd0df3..00000000
--- a/source/manual/Azure Managed Applications_COLOR.svg	
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 47.000004 49.851093"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-0bb"
-   version="1.1"
-   sodipodi:docname="Azure Managed Applications_COLOR.svg"
-   width="47.000004"
-   height="49.851093"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="24"
-     inkscape:cy="25"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-0bb" />
-  <g
-     id="g20"
-     transform="translate(-1,-0.14890632)">
-    <title
-       id="title2" />
-    <path
-       d="m 29.194,32.171 c 0.044,0 0.087,-0.01 0.125,-0.031 L 37.4,27.664 a 0.23,0.23 0 0 0 0.125,-0.204 v -8.982 a 0.237,0.237 0 0 0 -0.125,-0.206 0.263,0.263 0 0 0 -0.247,0 l -8.08,4.476 a 0.236,0.236 0 0 0 -0.12,0.205 v 8.983 c 0,0.086 0.046,0.161 0.12,0.204 0.04,0.021 0.08,0.031 0.121,0.031 m 0,11.829 c 0.044,0 0.087,-0.01 0.125,-0.031 L 37.4,39.493 a 0.23,0.23 0 0 0 0.125,-0.204 v -8.982 a 0.237,0.237 0 0 0 -0.125,-0.206 0.263,0.263 0 0 0 -0.247,0 l -8.08,4.476 a 0.236,0.236 0 0 0 -0.12,0.205 v 8.983 c 0,0.086 0.046,0.161 0.12,0.204 0.04,0.021 0.08,0.031 0.121,0.031 M 39.67,26.256 c 0.044,0 0.087,-0.01 0.125,-0.031 l 8.081,-4.476 A 0.229,0.229 0 0 0 48,21.545 v -8.982 a 0.237,0.237 0 0 0 -0.125,-0.206 0.263,0.263 0 0 0 -0.247,0 l -8.08,4.476 a 0.236,0.236 0 0 0 -0.12,0.205 v 8.983 c 0,0.086 0.046,0.161 0.12,0.204 a 0.251,0.251 0 0 0 0.122,0.031 m 0,11.829 c 0.044,0 0.087,-0.01 0.125,-0.031 l 8.081,-4.476 A 0.228,0.228 0 0 0 48,33.374 v -8.982 a 0.237,0.237 0 0 0 -0.125,-0.206 0.263,0.263 0 0 0 -0.247,0 l -8.08,4.476 a 0.236,0.236 0 0 0 -0.12,0.205 v 8.983 c 0,0.086 0.046,0.161 0.12,0.204 a 0.251,0.251 0 0 0 0.122,0.031"
-       class="msportalfx-svg-c16"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#3999c6" />
-    <path
-       d="m 29.194,44 c 0.044,0 0.087,-0.01 0.125,-0.031 L 37.4,39.493 a 0.23,0.23 0 0 0 0.125,-0.204 v -8.982 a 0.237,0.237 0 0 0 -0.125,-0.206 0.263,0.263 0 0 0 -0.247,0 l -8.08,4.476 a 0.236,0.236 0 0 0 -0.12,0.205 v 8.983 c 0,0.086 0.046,0.161 0.12,0.204 0.04,0.021 0.08,0.031 0.121,0.031 M 39.67,38.085 c 0.044,0 0.087,-0.01 0.125,-0.031 l 8.081,-4.476 A 0.228,0.228 0 0 0 48,33.374 v -8.982 a 0.237,0.237 0 0 0 -0.125,-0.206 0.263,0.263 0 0 0 -0.247,0 l -8.08,4.476 a 0.236,0.236 0 0 0 -0.12,0.205 v 8.983 c 0,0.086 0.046,0.161 0.12,0.204 a 0.251,0.251 0 0 0 0.122,0.031 M 29.194,32.171 c 0.044,0 0.087,-0.01 0.125,-0.031 L 37.4,27.664 a 0.23,0.23 0 0 0 0.125,-0.204 v -8.982 a 0.237,0.237 0 0 0 -0.125,-0.206 0.263,0.263 0 0 0 -0.247,0 l -8.08,4.476 a 0.236,0.236 0 0 0 -0.12,0.205 v 8.983 c 0,0.086 0.046,0.161 0.12,0.204 0.04,0.021 0.08,0.031 0.121,0.031 M 39.67,26.256 c 0.044,0 0.087,-0.01 0.125,-0.031 l 8.081,-4.476 A 0.229,0.229 0 0 0 48,21.545 v -8.982 a 0.237,0.237 0 0 0 -0.125,-0.206 0.263,0.263 0 0 0 -0.247,0 l -8.08,4.476 a 0.236,0.236 0 0 0 -0.12,0.205 v 8.983 c 0,0.086 0.046,0.161 0.12,0.204 a 0.251,0.251 0 0 0 0.122,0.031"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="opacity:0.15;fill:#62117a" />
-    <path
-       d="M 26.806,32.171 A 0.257,0.257 0 0 1 26.681,32.14 L 18.6,27.664 A 0.23,0.23 0 0 1 18.475,27.46 v -8.982 c 0,-0.084 0.046,-0.161 0.125,-0.206 a 0.263,0.263 0 0 1 0.247,0 l 8.08,4.476 c 0.075,0.043 0.12,0.121 0.12,0.205 v 8.983 a 0.234,0.234 0 0 1 -0.12,0.204 0.256,0.256 0 0 1 -0.121,0.031 m 0,11.829 A 0.257,0.257 0 0 1 26.681,43.969 L 18.6,39.493 a 0.23,0.23 0 0 1 -0.125,-0.204 v -8.982 c 0,-0.084 0.046,-0.161 0.125,-0.206 a 0.263,0.263 0 0 1 0.247,0 l 8.08,4.476 c 0.075,0.043 0.12,0.121 0.12,0.205 v 8.983 A 0.234,0.234 0 0 1 26.927,43.969 0.256,0.256 0 0 1 26.806,44 M 16.33,26.256 A 0.257,0.257 0 0 1 16.205,26.225 L 8.124,21.749 A 0.229,0.229 0 0 1 8,21.545 v -8.982 c 0,-0.084 0.046,-0.161 0.125,-0.206 a 0.263,0.263 0 0 1 0.247,0 l 8.08,4.476 c 0.075,0.043 0.12,0.121 0.12,0.205 v 8.983 a 0.234,0.234 0 0 1 -0.12,0.204 0.251,0.251 0 0 1 -0.122,0.031 m 0,11.829 A 0.257,0.257 0 0 1 16.205,38.054 L 8.124,33.578 A 0.228,0.228 0 0 1 8,33.374 v -8.982 c 0,-0.084 0.046,-0.161 0.125,-0.206 a 0.263,0.263 0 0 1 0.247,0 l 8.08,4.476 c 0.075,0.043 0.12,0.121 0.12,0.205 v 8.983 a 0.234,0.234 0 0 1 -0.12,0.204 0.251,0.251 0 0 1 -0.122,0.031 m 3.51,-22.3 A 0.237,0.237 0 0 1 19.93,15.7 l 8.031,-4.364 a 0.25,0.25 0 0 1 0.243,-0.002 l 7.95,4.327 a 0.226,0.226 0 0 1 0.119,0.2 0.24,0.24 0 0 1 -0.124,0.199 l -8.03,4.363 a 0.256,0.256 0 0 1 -0.242,-0.002 l -7.951,-4.328 a 0.222,0.222 0 0 1 -0.12,-0.195 0.234,0.234 0 0 1 0.034,-0.113 M 9.37,10.086 a 0.234,0.234 0 0 1 0.089,-0.085 l 7.942,-4.364 a 0.246,0.246 0 0 1 0.241,-0.002 l 7.862,4.327 a 0.225,0.225 0 0 1 0.118,0.2 0.238,0.238 0 0 1 -0.123,0.199 l -7.942,4.363 A 0.25,0.25 0 0 1 17.318,14.722 L 9.455,10.394 A 0.225,0.225 0 0 1 9.336,10.199 0.224,0.224 0 0 1 9.37,10.086 m 21.161,0.096 a 0.234,0.234 0 0 1 0.089,-0.085 l 7.942,-4.364 a 0.246,0.246 0 0 1 0.241,-0.002 l 7.862,4.327 a 0.225,0.225 0 0 1 0.118,0.2 0.238,0.238 0 0 1 -0.123,0.199 L 38.718,14.82 A 0.25,0.25 0 0 1 38.479,14.818 L 30.616,10.49 a 0.225,0.225 0 0 1 -0.119,-0.195 0.228,0.228 0 0 1 0.034,-0.113 M 19.88,4.558 a 0.242,0.242 0 0 1 0.09,-0.084 l 8.031,-4.293 a 0.253,0.253 0 0 1 0.243,-0.002 l 7.95,4.257 a 0.22,0.22 0 0 1 0.119,0.196 0.236,0.236 0 0 1 -0.124,0.196 L 28.159,9.12 A 0.262,0.262 0 0 1 27.917,9.118 L 19.966,4.861 A 0.218,0.218 0 0 1 19.846,4.669 0.23,0.23 0 0 1 19.88,4.558"
-       class="msportalfx-svg-c15"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="M 19.84,15.785 A 0.237,0.237 0 0 1 19.93,15.7 l 8.031,-4.364 a 0.25,0.25 0 0 1 0.243,-0.002 l 7.95,4.327 a 0.226,0.226 0 0 1 0.119,0.2 0.24,0.24 0 0 1 -0.124,0.199 l -8.03,4.363 a 0.256,0.256 0 0 1 -0.242,-0.002 l -7.951,-4.328 a 0.222,0.222 0 0 1 -0.12,-0.195 0.234,0.234 0 0 1 0.034,-0.113 M 9.37,10.086 a 0.234,0.234 0 0 1 0.089,-0.085 l 7.942,-4.364 a 0.246,0.246 0 0 1 0.241,-0.002 l 7.862,4.327 a 0.225,0.225 0 0 1 0.118,0.2 0.238,0.238 0 0 1 -0.123,0.199 l -7.942,4.363 A 0.25,0.25 0 0 1 17.318,14.722 L 9.455,10.394 A 0.225,0.225 0 0 1 9.336,10.199 0.224,0.224 0 0 1 9.37,10.086 m 21.161,0.096 a 0.234,0.234 0 0 1 0.089,-0.085 l 7.942,-4.364 a 0.246,0.246 0 0 1 0.241,-0.002 l 7.862,4.327 a 0.225,0.225 0 0 1 0.118,0.2 0.238,0.238 0 0 1 -0.123,0.199 L 38.718,14.82 A 0.25,0.25 0 0 1 38.479,14.818 L 30.616,10.49 a 0.225,0.225 0 0 1 -0.119,-0.195 0.228,0.228 0 0 1 0.034,-0.113 M 19.88,4.558 a 0.242,0.242 0 0 1 0.09,-0.084 l 8.031,-4.293 a 0.253,0.253 0 0 1 0.243,-0.002 l 7.95,4.257 a 0.22,0.22 0 0 1 0.119,0.196 0.236,0.236 0 0 1 -0.124,0.196 L 28.159,9.12 A 0.262,0.262 0 0 1 27.917,9.118 L 19.966,4.861 A 0.218,0.218 0 0 1 19.846,4.669 0.23,0.23 0 0 1 19.88,4.558 m -11.755,29.02 8.081,4.476 a 0.256,0.256 0 0 0 0.246,0 0.234,0.234 0 0 0 0.12,-0.204 V 31.084 A 7.336,7.336 0 0 0 15.5,31 c -2.196,0 -3.833,0.355 -5.152,0.642 C 9.424,31.842 8.694,32 8,32 v 1.374 c 0,0.086 0.046,0.163 0.125,0.204 z M 26.806,44 c 0.041,0 0.081,-0.01 0.121,-0.031 a 0.234,0.234 0 0 0 0.12,-0.204 v -7.223 c -0.762,0.016 -1.558,0.031 -2.254,0.031 -0.932,0 -1.328,-0.026 -1.489,-0.044 -0.233,-0.168 -0.686,-0.802 -0.994,-1.234 -0.793,-1.11 -1.956,-2.736 -3.834,-3.635 v 7.63 c 0,0.086 0.046,0.162 0.125,0.204 l 8.081,4.476 c 0.037,0.02 0.08,0.03 0.124,0.03 z m 10.718,-4.711 v -0.963 c -0.965,0.417 -2.026,0.871 -3.053,1.306 -0.367,-2.963 -3.394,-3.088 -4.402,-3.13 a 10.01,10.01 0 0 0 -0.436,-0.008 c -0.189,0 -0.422,0.003 -0.68,0.007 v 7.263 c 0,0.086 0.046,0.161 0.12,0.204 a 0.257,0.257 0 0 0 0.246,10e-4 L 37.4,39.493 a 0.229,0.229 0 0 0 0.124,-0.204 z m 3.031,-2.311 c -0.263,0.126 -0.655,0.305 -1.126,0.515 v 0.358 c 0,0.086 0.046,0.161 0.12,0.204 a 0.257,0.257 0 0 0 0.246,0 l 3.302,-1.829 a 8.033,8.033 0 0 0 -2.542,0.752 z"
-       class="msportalfx-svg-c01"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="opacity:0.2;fill:#ffffff" />
-    <path
-       d="m 19.811,49.5 c -2.676,0 -6.009,-2.854 -7.317,-4.08 A 41.176,41.176 0 0 0 11.637,44.631 C 9.586,42.836 7.478,42 5,42 2.728,42 1.501,41.991 1.5,41.991 V 33.5 H 8 c 0.858,0 1.698,-0.183 2.67,-0.394 1.245,-0.27 2.795,-0.606 4.83,-0.606 2.975,0 4.426,2.035 5.592,3.67 0.659,0.924 1.229,1.722 1.909,1.83 0.306,0.049 0.87,0.072 1.774,0.072 0.908,0 1.994,-0.024 2.909,-0.044 a 101.43,101.43 0 0 1 1.958,-0.034 c 0.146,0 0.266,0.002 0.357,0.006 2.069,0.087 2.91,0.647 3,2 0.023,0.36 -0.016,0.71 -0.117,1.04 l -0.313,1.023 0.985,-0.416 c 2.297,-0.97 6.345,-2.689 7.651,-3.319 1.225,-0.591 2.52,-0.916 3.649,-0.916 1.193,0 2.073,0.367 2.414,1.008 0.01,0.019 0.942,1.851 -2.093,3.628 a 784.929,784.929 0 0 1 -5.263,3.043 c -2.637,1.515 -4.719,2.711 -5.671,3.341 -0.887,0.589 -2.109,0.664 -3.076,0.664 -0.523,0 -1.058,-0.025 -1.588,-0.05 a 33.155,33.155 0 0 0 -1.58,-0.052 c -1.288,0 -3.22,0.146 -5.266,0.301 -0.911,0.069 -1.841,0.14 -2.734,0.199 A 2.797,2.797 0 0 1 19.811,49.5 Z"
-       class="msportalfx-svg-c17"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#804998" />
-    <path
-       d="m 33.75,42.108 c 2.818,-1.19 6.437,-2.733 7.674,-3.33 1.158,-0.559 2.377,-0.866 3.433,-0.866 0.988,0 1.726,0.277 1.973,0.742 0.022,0.049 0.66,1.461 -1.904,2.962 a 760.073,760.073 0 0 1 -5.259,3.041 c -2.643,1.518 -4.729,2.717 -5.697,3.357 -0.776,0.515 -1.904,0.581 -2.801,0.581 -0.5,0 -1.009,-0.023 -1.516,-0.047 a 34.347,34.347 0 0 0 -1.652,-0.055 c -1.296,0 -3.218,0.145 -5.253,0.299 -0.96,0.072 -1.889,0.143 -2.78,0.202 L 19.811,49 C 17.244,49 13.823,45.98 12.835,45.055 12.455,44.7 12.186,44.449 11.966,44.255 9.819,42.375 7.605,41.5 5,41.5 3.571,41.5 2.557,41.496 2,41.494 V 34 H 8 C 8.91,34 9.772,33.812 10.771,33.596 12.007,33.328 13.524,33 15.5,33 c 2.717,0 4.027,1.838 5.185,3.46 0.725,1.016 1.351,1.893 2.237,2.034 0.34,0.054 0.912,0.078 1.854,0.078 0.86,0 1.88,-0.021 2.764,-0.041 l 0.311,-0.007 a 92.61,92.61 0 0 1 1.793,-0.03 c 0.137,0 0.25,0.002 0.336,0.006 2.245,0.094 2.471,0.75 2.522,1.533 0.02,0.3 -0.013,0.589 -0.096,0.859 L 31.741,42.7 c 0,0 1.318,-0.299 2.009,-0.592"
-       class="msportalfx-svg-c01"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="opacity:0.2;fill:#ffffff" />
-    <path
-       d="M 19.811,50 C 17.189,50 14.049,47.564 12.152,45.785 11.823,45.477 11.537,45.209 11.306,45.007 9.354,43.297 7.35,42.5 5,42.5 2.725,42.5 1.496,42.491 1.496,42.491 A 0.5,0.5 0 0 1 1,41.991 V 33.5 A 0.5,0.5 0 0 1 1.5,33 H 8 C 8.803,33 9.619,32.823 10.563,32.618 11.832,32.343 13.411,32 15.5,32 c 3.231,0 4.831,2.242 5.999,3.88 0.569,0.798 1.107,1.551 1.58,1.626 0.686,0.11 2.987,0.058 4.666,0.021 1.014,-0.022 1.89,-0.042 2.275,-0.026 1.644,0.069 3.343,0.416 3.479,2.467 0.03,0.464 -0.031,0.872 -0.138,1.22 2.198,-0.928 6.323,-2.68 7.629,-3.309 2.846,-1.374 5.871,-1.291 6.721,0.307 0.274,0.514 0.734,2.529 -2.281,4.295 a 785.507,785.507 0 0 1 -5.267,3.045 c -2.63,1.511 -4.707,2.704 -5.645,3.324 -1.313,0.871 -3.183,0.779 -4.991,0.695 -0.521,-0.025 -1.036,-0.05 -1.528,-0.05 -1.266,0 -3.19,0.146 -5.228,0.3 -0.913,0.069 -1.844,0.14 -2.739,0.199 A 4.048,4.048 0 0 1 19.811,50 Z M 2,41.494 c 0.557,0.002 1.571,0.006 3,0.006 2.571,0 4.849,0.901 6.964,2.755 0.238,0.208 0.532,0.484 0.871,0.801 1.713,1.605 4.924,4.118 7.132,3.939 0.893,-0.059 1.82,-0.129 2.73,-0.198 2.057,-0.155 3.999,-0.303 5.303,-0.303 0.508,0 1.039,0.025 1.576,0.051 1.646,0.079 3.351,0.159 4.391,-0.53 0.965,-0.638 3.054,-1.838 5.699,-3.357 1.618,-0.93 3.425,-1.968 5.259,-3.041 1.516,-0.888 2.353,-2.12 1.905,-2.962 -0.537,-1.006 -2.898,-1.084 -5.406,0.124 -1.823,0.88 -8.79,3.8 -9.086,3.924 a 0.5,0.5 0 1 1 -0.515,-0.844 c 0.028,-0.024 0.755,-0.669 0.678,-1.825 -0.06,-0.907 -0.492,-1.449 -2.521,-1.533 -0.354,-0.017 -1.216,0.004 -2.213,0.026 -1.908,0.044 -4.069,0.091 -4.846,-0.032 C 22.035,38.353 21.41,37.476 20.686,36.461 19.585,34.919 18.217,33 15.5,33 13.519,33 12.062,33.316 10.775,33.596 9.774,33.813 8.91,34 8,34 H 2 Z"
-       class="msportalfx-svg-c20"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="fill:#68217a" />
-    <path
-       d="m 24.644,43.517 c -1.974,0 -3.384,-0.236 -4.177,-0.932 l -3.077,-2.696 0.658,-0.752 3.078,2.696 c 1.051,0.92 5.578,0.575 7.284,0.463 2.714,-0.179 2.996,-0.314 4.641,-0.979 a 0.5,0.5 0 0 1 0.375,0.927 c -1.739,0.702 -2.145,0.864 -4.949,1.049 -1.053,0.07 -2.985,0.224 -3.833,0.224 z"
-       class="msportalfx-svg-c20"
-       id="path18"
-       inkscape:connector-curvature="0"
-       style="fill:#68217a" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Management Groups_COLOR.svg b/source/manual/Azure Management Groups_COLOR.svg
deleted file mode 100644
index 5b691fae..00000000
--- a/source/manual/Azure Management Groups_COLOR.svg	
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 50 40.400002"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-03c"
-   version="1.1"
-   sodipodi:docname="Azure Management Groups_COLOR.svg"
-   width="50"
-   height="40.400002"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata31">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs29" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview27"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="25"
-     inkscape:cy="20.4"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-03c" />
-  <g
-     id="g24"
-     transform="translate(0,-5)">
-    <title
-       id="title2" />
-    <title
-       id="title4">ManagementGroups</title>
-    <path
-       d="M 35,21.4 34.712,22.092 25.768,11.36 25,12 24.232,11.36 15.288,22.092 15,21.4 9.077,35.615 10.923,36.385 15,26.6 l 4.077,9.785 1.846,-0.77 -4.767,-11.44 8.844,-10.613 8.844,10.613 -4.767,11.44 1.846,0.77 L 35,26.6 l 4.077,9.785 1.846,-0.77 z"
-       class="msportalfx-svg-c14"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#7fba00" />
-    <circle
-       cx="40"
-       cy="36"
-       r="3"
-       class="msportalfx-svg-c16"
-       id="circle8"
-       style="fill:#3999c6" />
-    <circle
-       cx="30"
-       cy="36"
-       r="3"
-       class="msportalfx-svg-c16"
-       id="circle10"
-       style="fill:#3999c6" />
-    <circle
-       cx="25"
-       cy="12"
-       r="5"
-       class="msportalfx-svg-c17"
-       id="circle12"
-       style="fill:#804998" />
-    <circle
-       cx="15"
-       cy="24"
-       r="4"
-       class="msportalfx-svg-c19"
-       id="circle14"
-       style="fill:#0072c6" />
-    <circle
-       cx="35"
-       cy="24"
-       r="4"
-       class="msportalfx-svg-c19"
-       id="circle16"
-       style="fill:#0072c6" />
-    <circle
-       cx="20"
-       cy="36"
-       r="3"
-       class="msportalfx-svg-c16"
-       id="circle18"
-       style="fill:#3999c6" />
-    <circle
-       cx="10"
-       cy="36"
-       r="3"
-       class="msportalfx-svg-c16"
-       id="circle20"
-       style="fill:#3999c6" />
-    <path
-       d="M 9.5,45.4 A 1.854,1.854 0 0 1 8.8,45.2 L 2,41.2 A 4.125,4.125 0 0 1 0,37.8 V 12.6 A 3.994,3.994 0 0 1 2,9.2 l 6.8,-4 a 1.458,1.458 0 0 1 1.5,2.5 l -6.8,4 A 1.346,1.346 0 0 0 3,12.6 v 25.2 a 1.346,1.346 0 0 0 0.5,0.9 l 6.8,4 a 1.456,1.456 0 0 1 0.5,2 1.709,1.709 0 0 1 -1.3,0.7 z M 40.5,5 a 1.854,1.854 0 0 1 0.7,0.2 l 6.8,4 a 4.125,4.125 0 0 1 2,3.4 v 25.2 a 3.994,3.994 0 0 1 -2,3.4 l -6.8,4 a 1.458,1.458 0 0 1 -1.5,-2.5 l 6.8,-4 A 1.346,1.346 0 0 0 47,37.8 V 12.6 a 1.346,1.346 0 0 0 -0.5,-0.9 l -6.8,-4 A 1.456,1.456 0 0 1 39.2,5.7 1.889,1.889 0 0 1 40.5,5 Z"
-       class="msportalfx-svg-c04"
-       id="path22"
-       inkscape:connector-curvature="0"
-       style="fill:#7a7a7a" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Media Services_COLOR.svg b/source/manual/Azure Media Services_COLOR.svg
deleted file mode 100644
index e73a3183..00000000
--- a/source/manual/Azure Media Services_COLOR.svg	
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="43.300999"
-   height="50"
-   viewBox="0 0 43.300999 50"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="Azure Media Services_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata19"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs17" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview15"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="22"
-     inkscape:cy="25"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><polygon
-     points="3,12.5 24.65,0 46.301,12.5 46.301,37.5 24.65,50 3,37.5 "
-     id="polygon2"
-     style="fill:#3e3e3e"
-     transform="translate(-3)" /><path
-     enable-background="new    "
-     d="M 21.651,50 43.3,37.5 v -25 c 0,0 -17.887,13.62 -21.649,37.5"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="opacity:0.2;fill:#ffffff" /><path
-     d="m 31.172,14.958 c -5.55,-5.526 -14.518,-5.526 -20.074,0 -5.549,5.549 -5.549,14.535 0,20.084 5.549,5.525 14.524,5.525 20.074,0 5.543,-5.545 5.543,-14.531 0,-20.084"
-     id="path6"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="m 29.227,16.903 c -4.474,-4.456 -11.705,-4.456 -16.185,0 -4.473,4.474 -4.473,11.719 0,16.192 4.475,4.456 11.711,4.456 16.185,0 4.47,-4.469 4.47,-11.715 0,-16.192"
-     id="path8"
-     inkscape:connector-curvature="0"
-     style="fill:#59b4d9" /><polygon
-     points="20.127,25.015 30.986,25.015 31.029,24.986 20.127,17.816 "
-     id="polygon10"
-     style="fill:#ffffff"
-     transform="translate(-3)" /><polygon
-     enable-background="new    "
-     points="20.127,32.213 30.986,25.015 20.127,25.015 "
-     id="polygon12"
-     style="opacity:0.8;fill:#ffffff"
-     transform="translate(-3)" /></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Monitor_COLOR.svg b/source/manual/Azure Monitor_COLOR.svg
deleted file mode 100644
index 4cb37d78..00000000
--- a/source/manual/Azure Monitor_COLOR.svg	
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg25"
-   sodipodi:docname="Azure Monitor_COLOR.svg"
-   width="49.999908"
-   height="49.996754"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata31">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs29" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview27"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="49.999948"
-     inkscape:cy="-0.0012600065"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg25" />
-  <svg
-     id="svg-monitor"
-     version="1.1"
-     width="100%"
-     height="100%"
-     transform="translate(-5.2151327e-5,-0.00198621)">
-    <path
-       d="m 22.83,4.37 c -5.706,0.602 -10.609,3.448 -13.953,7.579 -3.345,4.134 -5.106,9.52 -4.508,15.227 0.604,5.703 3.449,10.604 7.581,13.949 4.134,3.346 9.52,5.109 15.222,4.509 5.705,-0.601 10.606,-3.451 13.955,-7.581 3.34,-4.132 5.106,-9.519 4.505,-15.225 C 45.024,17.077 42.104,12.159 37.908,8.764 34.377,5.905 29.876,4.254 25.052,4.254 c -0.733,0 -1.474,0.038 -2.222,0.116"
-       id="path2"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="M 16.456,19.472 11.408,15.386 C 9.25,18.474 8.271,22.074 8.417,25.618 l 6.454,-0.679 c 0,-1.89 0.521,-3.788 1.585,-5.467"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="opacity:0.4;fill:#7fba00" />
-    <path
-       d="M 30.575,16.279 34.662,11.23 C 31.572,9.074 27.969,8.1 24.424,8.248 l 0.679,6.453 c 1.891,-0.002 3.791,0.516 5.472,1.578"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="opacity:0.8;fill:#7fba00" />
-    <path
-       d="m 22.853,14.956 -0.68,-6.46 c -3.49,0.623 -6.795,2.35 -9.348,5.123 l 5.044,4.084 c 1.405,-1.409 3.143,-2.332 4.984,-2.747"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="opacity:0.6;fill:#7fba00" />
-    <path
-       d="m 15.121,27.189 -6.46,0.682 c 0.62,3.492 2.345,6.801 5.121,9.357 l 4.083,-5.044 c -1.41,-1.409 -2.331,-3.15 -2.744,-4.995"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="opacity:0.25;fill:#7fba00" />
-    <path
-       d="M 49.859,22.383 C 49.131,15.446 45.588,9.5 40.586,5.455 39.615,4.669 38.568,3.983 37.486,3.355 l -1.963,3.777 c 0.83,0.493 1.636,1.024 2.385,1.632 4.196,3.395 7.116,8.312 7.723,14.063 0.602,5.706 -1.165,11.093 -4.504,15.226 -3.349,4.131 -8.25,6.98 -13.955,7.581 -3.82,0.4 -7.489,-0.277 -10.744,-1.761 l -1.961,3.774 c 3.976,1.851 8.479,2.708 13.151,2.214 6.862,-0.719 12.796,-4.164 16.814,-9.133 4.021,-4.963 6.155,-11.487 5.427,-18.345"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#a0a1a2" />
-    <path
-       d="M 11.951,41.125 C 7.818,37.78 4.973,32.879 4.37,27.177 3.771,21.469 5.532,16.083 8.878,11.949 12.221,7.819 17.124,4.972 22.829,4.371 27.442,3.887 31.845,4.945 35.523,7.131 L 37.486,3.355 C 33.07,0.791 27.825,-0.432 22.381,0.141 15.522,0.863 9.588,4.307 5.569,9.272 L 5.562,9.281 c -4.018,4.965 -6.144,11.484 -5.423,18.338 0.723,6.859 4.164,12.796 9.135,16.815 1.582,1.282 3.335,2.346 5.194,3.212 l 1.961,-3.774 c -1.603,-0.73 -3.114,-1.643 -4.478,-2.747"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="fill:#a0a1a2" />
-    <path
-       d="M 11.951,41.125 C 7.818,37.78 4.973,32.879 4.37,27.177 3.771,21.469 5.532,16.083 8.878,11.949 12.221,7.819 17.124,4.972 22.829,4.371 27.442,3.887 31.845,4.945 35.523,7.131 L 37.486,3.355 C 33.07,0.791 27.825,-0.432 22.381,0.141 15.522,0.863 9.588,4.307 5.569,9.272 L 5.562,9.281 c -4.018,4.965 -6.144,11.484 -5.423,18.338 0.723,6.859 4.164,12.796 9.135,16.815 1.582,1.282 3.335,2.346 5.194,3.212 l 1.961,-3.774 c -1.603,-0.73 -3.114,-1.643 -4.478,-2.747"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="opacity:0.2;fill:#ffffff" />
-    <path
-       d="m 36.43,12.647 -4.084,5.045 c 1.008,1.002 1.759,2.178 2.264,3.437 h 6.775 C 40.643,17.958 38.977,14.985 36.43,12.647 Z"
-       id="path18"
-       inkscape:connector-curvature="0"
-       style="fill:#7fba00" />
-    <path
-       d="m 23.082,27.041 c -1.147,-1.136 -1.154,-2.986 -0.018,-4.131 0.573,-0.578 1.327,-0.866 2.079,-0.866 0.743,0 1.487,0.248 2.057,0.813 0.007,0.007 0.01,-0.008 0.019,0 h 7.601 6.685 l 0.621,-0.005 0.004,0.005 c 1.173,0 2.125,0.943 2.133,2.113 0.003,1.178 -0.944,2.133 -2.121,2.137 H 27.057 c -0.55,0.481 -1.235,0.779 -1.923,0.779 -0.74,0 -1.482,-0.28 -2.052,-0.845"
-       id="path20"
-       inkscape:connector-curvature="0"
-       style="fill:#dd5900" />
-    <path
-       d="M 42.13,22.875 42.126,22.87 41.505,22.875 H 34.82 27.219 c -0.009,-0.008 -0.012,0.007 -0.019,0 -0.57,-0.565 -1.314,-0.813 -2.057,-0.813 -0.752,0 -1.506,0.288 -2.079,0.866 -0.564,0.569 -0.845,1.312 -0.846,2.055 H 44.262 C 44.251,23.815 43.301,22.875 42.13,22.875 Z"
-       id="path22"
-       inkscape:connector-curvature="0"
-       style="fill:#ff8c00" />
-  </svg>
-</svg>
diff --git a/source/manual/Azure NetApp Files_COLOR.svg b/source/manual/Azure NetApp Files_COLOR.svg
deleted file mode 100644
index 476ada63..00000000
--- a/source/manual/Azure NetApp Files_COLOR.svg	
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 50 50" class="" role="presentation" focusable="false" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-03b"><g><title></title><path d="M2 46h46a2 2 0 0 0 2-2V11H0v33a2 2 0 0 0 2 2z" class="msportalfx-svg-c03" fill="#a0a1a2"></path><path d="M0 5.988V11h50V5.988A1.994 1.994 0 0 0 48 4H2C.895 4 0 4.89 0 5.988z" class="msportalfx-svg-c04" fill="#7a7a7a"></path><path d="M4 25h42v7H4zm0-10h42v7H4z" class="msportalfx-svg-c01" fill="#ffffff"></path><path d="M4 35h42v7H4z" class="msportalfx-svg-c13" fill="#b8d432"></path><path opacity=".2" d="M43.6 4H1.988C.89 4 0 4.89 0 5.988V44a2 2 0 0 0 2 2h2L43.6 4z" class="msportalfx-svg-c01" fill="#ffffff"></path><path opacity=".4" d="M12 22v17h11v-4h4v4h11V22z" class="msportalfx-svg-c01" fill="#ffffff"></path><path d="M13 19v19h9V26h6v12h9V19z" class="msportalfx-svg-c19" fill="#0072c6"></path></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Pipelines_COLOR.svg b/source/manual/Azure Pipelines_COLOR.svg
deleted file mode 100644
index 25b2dd1c..00000000
--- a/source/manual/Azure Pipelines_COLOR.svg	
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="103.9999"
-   height="104"
-   viewBox="0 0 103.9999 104"
-   overflow="hidden"
-   id="svg64"
-   sodipodi:docname="Azure Pipelines_COLOR.svg"
-   style="overflow:hidden;fill:none"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata68">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview66"
-     showgrid="false"
-     inkscape:zoom="2.4583333"
-     inkscape:cx="48"
-     inkscape:cy="48"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg64" />
-  <defs
-     id="defs33">
-    <filter
-       id="filter0_f"
-       x="7"
-       y="-8"
-       width="96.999901"
-       height="97"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood2" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend4" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="4 4"
-         id="feGaussianBlur6" />
-    </filter>
-    <filter
-       id="filter1_f"
-       x="6.2950401"
-       y="25.936501"
-       width="63.7677"
-       height="63.767799"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood9" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend11" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="4 4"
-         id="feGaussianBlur13" />
-    </filter>
-    <filter
-       id="filter2_f"
-       x="50"
-       y="6"
-       width="40"
-       height="40"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood16" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend18" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="4 4"
-         id="feGaussianBlur20" />
-    </filter>
-    <linearGradient
-       x2="1"
-       gradientUnits="userSpaceOnUse"
-       id="paint0_linear"
-       gradientTransform="matrix(0,95.9999,-95.9999,0,95.9999,0)">
-      <stop
-         offset="0"
-         stop-color="#FFFFFF"
-         id="stop23" />
-      <stop
-         offset="1"
-         stop-color="#FFFFFF"
-         stop-opacity="0"
-         id="stop25" />
-    </linearGradient>
-    <linearGradient
-       x2="1"
-       gradientUnits="userSpaceOnUse"
-       id="paint1_linear"
-       gradientTransform="matrix(0,95.9999,-95.9999,0,95.9999,0)">
-      <stop
-         offset="0"
-         stop-color="#FFFFFF"
-         id="stop28" />
-      <stop
-         offset="1"
-         stop-color="#FFFFFF"
-         stop-opacity="0"
-         id="stop30" />
-    </linearGradient>
-  </defs>
-  <g
-     id="DevOpsIconPipelines96"
-     transform="translate(0,8)">
-    <mask
-       maskUnits="userSpaceOnUse"
-       x="0"
-       y="0"
-       width="96"
-       height="96"
-       id="mask0">
-      <g
-         id="Union">
-        <path
-           d="m 14,64.416 4.8301,-5.165 6.0022,6.0019 -4.8804,4.8809 5.914,5.9141 4.8803,-4.8799 6.0433,6.0429 L 32,82 46,96 h 22 c 2.2091,0 4,-1.791 4,-4 V 60.0225 L 92.442,46.375 c 2.223,-1.4834 3.5579,-3.9805 3.5579,-6.6533 V 4 c 0,-2.20898 -1.7908,-4 -4,-4 H 56.2781 C 53.6052,0 51.1088,1.33496 49.6246,3.55762 L 35.9772,24 H 4 c -2.20917,0 -4,1.791 -4,4 v 22 z"
-           id="path35"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff" />
-        <path
-           d="M 8,88 V 72 H 0 v 24 h 24 v -8 z"
-           id="path37"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff" />
-      </g>
-    </mask>
-    <g
-       mask="url(#mask0)"
-       id="g61">
-      <path
-         d="M 0,0 7.99999,2.97878e-8 V 16.0001 H 24 V 24 H 0 Z"
-         id="Flame"
-         transform="translate(0,72)"
-         inkscape:connector-curvature="0"
-         style="clip-rule:evenodd;fill:#91b0f2;fill-rule:evenodd" />
-      <path
-         d="M 0,4 V 26 L 14,40.4156 20,34 38,52 32,58 46,72 h 22 c 2.2091,0 4,-1.7909 4,-4 V 36 L 36,0 H 4 C 1.79086,0 0,1.79086 0,4 Z"
-         id="Wings"
-         transform="translate(0,24)"
-         inkscape:connector-curvature="0"
-         style="fill:#0f46bd" />
-      <g
-         id="Body"
-         style="filter:url(#filter0_f)">
-        <path
-           d="M 0,55.4213 37,0 h 43.9999 v 44.0002 l -55.421,37.0002 z"
-           transform="translate(15)"
-           id="path43"
-           inkscape:connector-curvature="0"
-           style="clip-rule:evenodd;fill:#062aa9;fill-rule:evenodd" />
-      </g>
-      <path
-         d="M 2.32029,57.7416 C 0.971342,56.3927 0.762734,54.2789 1.82198,52.6922 L 34.6246,3.55804 C 36.1087,1.33497 38.6051,0 41.2781,0 h 35.7218 c 2.2091,0 4,1.79086 4,4 v 35.7222 c 0,2.6729 -1.335,5.1693 -3.558,6.6534 L 28.308,79.1784 c -1.5866,1.0593 -3.7004,0.8507 -5.0494,-0.4983 z"
-         id="Body_2"
-         transform="translate(15)"
-         inkscape:connector-curvature="0"
-         style="clip-rule:evenodd;fill:#2560e0;fill-rule:evenodd" />
-      <g
-         id="Wing shadow"
-         style="filter:url(#filter1_f)">
-        <path
-           d="M 0,30.5401 30.54,0 36.454,5.91397 5.91399,36.4541 Z"
-           transform="translate(19.9519,39.5938)"
-           id="path47"
-           inkscape:connector-curvature="0"
-           style="clip-rule:evenodd;fill:#0a44c2;fill-rule:evenodd" />
-      </g>
-      <path
-         d="M 0,30.5401 30.54,0 36.454,5.91397 5.91399,36.4541 Z"
-         id="Wing"
-         transform="translate(19.9519,39.5938)"
-         inkscape:connector-curvature="0"
-         style="clip-rule:evenodd;fill:#729af2;fill-rule:evenodd" />
-      <path
-         d="M 5.914,31.5732 0,25.6592 25.6595,0 31.5734,5.91406 Z"
-         id="Intersect"
-         transform="translate(24.8325,39.5938)"
-         inkscape:connector-curvature="0"
-         style="fill:#4c80f0" />
-      <g
-         id="Window shadow"
-         style="filter:url(#filter2_f)">
-        <path
-           d="m 12,24.0001 c 6.6274,0 12,-5.3726 12,-12 C 24,5.37261 18.6274,0 12,0 5.37258,0 0,5.37261 0,12.0001 c 0,6.6274 5.37258,12 12,12 z"
-           transform="translate(58,14)"
-           id="path52"
-           inkscape:connector-curvature="0"
-           style="fill:#0a44c2" />
-      </g>
-      <path
-         d="m 12,24.0001 c 6.6274,0 12,-5.3726 12,-12 C 24,5.37261 18.6274,0 12,0 5.37258,0 0,5.37261 0,12.0001 c 0,6.6274 5.37258,12 12,12 z"
-         id="Window"
-         transform="translate(58,14)"
-         inkscape:connector-curvature="0"
-         style="fill:#91b0f2" />
-      <g
-         id="Union_2"
-         style="opacity:0.2">
-        <path
-           d="m 14,64.416 4.8301,-5.165 6.0022,6.0019 -4.8804,4.8809 5.914,5.9141 4.8803,-4.8799 6.0433,6.0429 L 32,82 46,96 h 22 c 2.2091,0 4,-1.791 4,-4 V 60.0225 L 92.442,46.375 c 2.223,-1.4834 3.5579,-3.9805 3.5579,-6.6533 V 4 c 0,-2.20898 -1.7908,-4 -4,-4 H 56.2781 C 53.6052,0 51.1088,1.33496 49.6246,3.55762 L 35.9772,24 H 4 c -2.20917,0 -4,1.791 -4,4 v 22 z"
-           id="path56"
-           inkscape:connector-curvature="0"
-           style="fill:url(#paint0_linear)" />
-        <path
-           d="M 8,88 V 72 H 0 v 24 h 24 v -8 z"
-           id="path58"
-           inkscape:connector-curvature="0"
-           style="fill:url(#paint1_linear)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/Azure Repos_COLOR.svg b/source/manual/Azure Repos_COLOR.svg
deleted file mode 100644
index b362af1d..00000000
--- a/source/manual/Azure Repos_COLOR.svg	
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="104"
-   height="104"
-   viewBox="0 0 104 104"
-   overflow="hidden"
-   id="svg68"
-   sodipodi:docname="Azure Repos_COLOR.svg"
-   style="overflow:hidden;fill:none"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata72">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview70"
-     showgrid="false"
-     inkscape:zoom="2.4583333"
-     inkscape:cx="52"
-     inkscape:cy="56"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg68" />
-  <defs
-     id="defs38">
-    <filter
-       id="filter0_f"
-       x="4"
-       y="0"
-       width="88"
-       height="94"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood2" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend4" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="4 4"
-         id="feGaussianBlur6" />
-    </filter>
-    <filter
-       id="filter1_f"
-       x="-4"
-       y="8"
-       width="104"
-       height="96"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood9" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend11" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="4 4"
-         id="feGaussianBlur13" />
-    </filter>
-    <filter
-       id="filter2_f"
-       x="13"
-       y="14"
-       width="71"
-       height="84"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood16" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend18" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="4 4"
-         id="feGaussianBlur20" />
-    </filter>
-    <linearGradient
-       x2="1"
-       gradientUnits="userSpaceOnUse"
-       id="paint0_linear"
-       gradientTransform="matrix(0,64,-65.8286,0,68.9143,0)">
-      <stop
-         offset="0"
-         stop-color="#C82400"
-         id="stop23" />
-      <stop
-         offset="1"
-         stop-color="#D83B01"
-         stop-opacity="0"
-         id="stop25" />
-    </linearGradient>
-    <linearGradient
-       x2="1"
-       gradientUnits="userSpaceOnUse"
-       id="paint1_linear"
-       gradientTransform="matrix(0,31.5,-7.52212,0,7.76106,3.5)">
-      <stop
-         offset="0"
-         stop-color="#FC9F7C"
-         id="stop28" />
-      <stop
-         offset="1"
-         stop-color="#D83B01"
-         id="stop30" />
-    </linearGradient>
-    <linearGradient
-       x2="1"
-       gradientUnits="userSpaceOnUse"
-       id="paint2_linear"
-       gradientTransform="matrix(80,0,0,74.1667,5.58874e-8,6.41667)">
-      <stop
-         offset="0"
-         stop-color="#FFD7C1"
-         id="stop33" />
-      <stop
-         offset="1"
-         stop-color="#FFC29F"
-         stop-opacity="0"
-         id="stop35" />
-    </linearGradient>
-  </defs>
-  <g
-     id="DevOpsIconRepos96"
-     transform="translate(4)">
-    <mask
-       maskUnits="userSpaceOnUse"
-       x="4"
-       y="0"
-       width="88"
-       height="96"
-       id="mask0">
-      <path
-         d="m 68,0 c 2.2091,0 4,1.79102 4,4 v 4 h 4 c 2.2091,0 4,1.79102 4,4 v 4 h 4 c 2.2091,0 4,1.791 4,4 v 72 c 0,2.209 -1.7909,4 -4,4 H 4 C 1.79086,96 0,94.209 0,92 V 20 C 0,17.791 1.79086,16 4,16 H 8 V 12 C 8,9.79102 9.79086,8 12,8 h 4 V 4 c 0,-2.20898 1.7909,-4 4,-4 z"
-         id="Union"
-         transform="translate(4)"
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff" />
-    </mask>
-    <g
-       mask="url(#mask0)"
-       id="g65">
-      <path
-         d="M 0,4 C 0,1.79086 1.79086,0 4,0 H 32.9314 39.5 75 c 2.2091,0 4,1.79086 4,4 v 48 c 0,2.2091 -1.7909,4 -4,4 H 4 C 1.79086,56 0,54.2091 0,52 Z"
-         id="Rectangle"
-         transform="rotate(90,38,38)"
-         inkscape:connector-curvature="0"
-         style="fill:#c43601" />
-      <g
-         id="Rectangle_2"
-         style="opacity:0.75;filter:url(#filter0_f)">
-        <path
-           d="M 0,4 C 0,1.79086 1.79086,0 4,0 H 32.5145 39 74 c 2.2091,0 4,1.79086 4,4 v 64 c 0,2.2091 -1.7909,4 -4,4 H 4 C 1.79086,72 0,70.2091 0,68 Z"
-           transform="rotate(90,38,46)"
-           id="path43"
-           inkscape:connector-curvature="0"
-           style="fill:#5f1400" />
-      </g>
-      <path
-         d="M 0,4 C 0,1.79086 1.79086,0 4,0 H 32.5145 39 74 c 2.2091,0 4,1.79086 4,4 v 64 c 0,2.2091 -1.7909,4 -4,4 H 4 C 1.79086,72 0,70.2091 0,68 Z"
-         id="Rectangle_3"
-         transform="rotate(90,38,46)"
-         inkscape:connector-curvature="0"
-         style="fill:#d83b01" />
-      <rect
-         x="0"
-         y="0"
-         width="56"
-         height="8"
-         id="Rectangle 2"
-         transform="translate(20,8)"
-         style="fill:#ca3701" />
-      <g
-         id="Rectangle_4"
-         style="opacity:0.6;filter:url(#filter1_f)">
-        <path
-           d="M 0,4 C 0,1.79086 1.79086,0 4,0 H 33.3482 40 76 c 2.2091,0 4,1.79086 4,4 v 80 c 0,2.2091 -1.7909,4 -4,4 H 4 C 1.79086,88 0,86.2091 0,84 Z"
-           transform="rotate(90,38,54)"
-           id="path48"
-           inkscape:connector-curvature="0"
-           style="fill:#7c1a00" />
-      </g>
-      <path
-         d="M 0,4 C 0,1.79086 1.79086,0 4,0 H 33.3482 40 76 c 2.2091,0 4,1.79086 4,4 v 80 c 0,2.2091 -1.7909,4 -4,4 H 4 C 1.79086,88 0,86.2091 0,84 Z"
-         id="Rectangle_5"
-         transform="rotate(90,38,54)"
-         inkscape:connector-curvature="0"
-         style="fill:#d83b01" />
-      <path
-         d="M 72,0 H 0 v 66 c 0,2.209 1.59191,4 3.55556,4 H 68.4444 C 70.4081,70 72,68.209 72,66 Z"
-         id="Intersect"
-         transform="translate(12,16)"
-         inkscape:connector-curvature="0"
-         style="fill:url(#paint0_linear)" />
-      <g
-         id="Group 2">
-        <path
-           d="M 8,0 V 36 H 0 V 0 Z"
-           id="Vector (Stroke)"
-           transform="translate(27,38)"
-           inkscape:connector-curvature="0"
-           style="clip-rule:evenodd;fill:url(#paint1_linear);fill-rule:evenodd" />
-        <path
-           d="M 20,10 C 20,15.5229 15.5228,20 10,20 4.47717,20 0,15.5229 0,10 0,4.47705 4.47717,0 10,0 15.5228,0 20,4.47705 20,10 Z m -10,6 c 3.3137,0 6,-2.6865 6,-6 0,-3.31348 -2.6863,-6 -6,-6 -3.31372,0 -6,2.68652 -6,6 0,3.3135 2.68628,6 6,6 z"
-           id="Subtract"
-           transform="translate(21,22)"
-           inkscape:connector-curvature="0"
-           style="clip-rule:evenodd;fill:#fc9f7c;fill-rule:evenodd" />
-      </g>
-      <g
-         id="Union_2"
-         style="filter:url(#filter2_f)">
-        <path
-           d="M 49,19.168 C 52.5318,17.625 55,14.1006 55,10 55,4.47656 50.5228,0 45,0 39.4772,0 35,4.47656 35,10 c 0,4.1006 2.4682,7.625 6,9.168 v 5.0693 l -35,15 V 48.832 C 2.4682,50.375 0,53.8994 0,58 c 0,5.5234 4.47717,10 10,10 5.5228,0 10,-4.4766 10,-10 0,-4.1006 -2.4682,-7.625 -6,-9.168 v -4.3193 l 35,-15 z M 45,16 c 3.3137,0 6,-2.6865 6,-6 0,-3.31348 -2.6863,-6 -6,-6 -3.3137,0 -6,2.68652 -6,6 0,3.3135 2.6863,6 6,6 z M 4,58 c 0,-3.3135 2.68628,-6 6,-6 3.3137,0 6,2.6865 6,6 0,3.3135 -2.6863,6 -6,6 -3.31372,0 -6,-2.6865 -6,-6 z"
-           transform="translate(21,22)"
-           id="path56"
-           inkscape:connector-curvature="0"
-           style="clip-rule:evenodd;fill:#bf2200;fill-rule:evenodd" />
-      </g>
-      <g
-         id="Group">
-        <path
-           d="M 20,10 C 20,15.5229 15.5228,20 10,20 4.47717,20 0,15.5229 0,10 0,4.47705 4.47717,0 10,0 15.5228,0 20,4.47705 20,10 Z m -10,6 c 3.3137,0 6,-2.6865 6,-6 0,-3.31348 -2.6863,-6 -6,-6 -3.31372,0 -6,2.68652 -6,6 0,3.3135 2.68628,6 6,6 z"
-           id="Subtract_2"
-           transform="translate(21,70)"
-           inkscape:connector-curvature="0"
-           style="clip-rule:evenodd;fill:#ffd5c6;fill-rule:evenodd" />
-        <path
-           d="m 43,0 v 13.5126 l -35,15 V 36 H 0 V 23.2374 L 35,8.23742 V 0 Z"
-           id="Vector (Stroke)_2"
-           transform="translate(27,38)"
-           inkscape:connector-curvature="0"
-           style="clip-rule:evenodd;fill:#febca3;fill-rule:evenodd" />
-        <path
-           d="M 0.00936455,3.43363 0,16.1999 H 7.99999 L 8.01642,0 Z"
-           id="Intersect_2"
-           transform="translate(27,57.7998)"
-           inkscape:connector-curvature="0"
-           style="fill:#ffd5c6" />
-        <path
-           d="M 20,10 C 20,15.5229 15.5228,20 10,20 4.47717,20 0,15.5229 0,10 0,4.47705 4.47717,0 10,0 15.5228,0 20,4.47705 20,10 Z m -10,6 c 3.3137,0 6,-2.6865 6,-6 0,-3.31348 -2.6863,-6 -6,-6 -3.31372,0 -6,2.68652 -6,6 0,3.3135 2.68628,6 6,6 z"
-           id="Subtract_3"
-           transform="translate(56,22)"
-           inkscape:connector-curvature="0"
-           style="clip-rule:evenodd;fill:#febca3;fill-rule:evenodd" />
-      </g>
-      <path
-         d="m 0,84 c 0,2.2091 1.79102,4 4,4 h 72 c 2.209,0 4,-1.7909 4,-4 V 4 C 80,1.79086 78.209,0 76,0 H 4 C 1.79102,0 0,1.79086 0,4 v 4 72 z"
-         id="Subtract_4"
-         transform="rotate(90,38,54)"
-         inkscape:connector-curvature="0"
-         style="clip-rule:evenodd;opacity:0.2;fill:url(#paint2_linear);fill-rule:evenodd" />
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/Azure Resource Groups_COLOR.svg b/source/manual/Azure Resource Groups_COLOR.svg
deleted file mode 100644
index fe037346..00000000
--- a/source/manual/Azure Resource Groups_COLOR.svg	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 50 40.342018"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-023"
-   version="1.1"
-   sodipodi:docname="Azure Resource Groups_COLOR.svg"
-   width="50"
-   height="40.342018"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata19">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs17" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview15"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="25"
-     inkscape:cy="20.171009"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-023" />
-  <g
-     id="g12"
-     transform="translate(0,-4.8289909)">
-    <title
-       id="title2" />
-    <path
-       d="m 25.047,22.647 a 0.428,0.428 0 0 1 -0.22,-0.064 l -14.711,-8.49 a 0.445,0.445 0 0 1 0,-0.771 L 24.732,4.887 a 0.452,0.452 0 0 1 0.442,0 l 14.714,8.495 a 0.447,0.447 0 0 1 0.221,0.382 0.45,0.45 0 0 1 -0.221,0.387 l -14.619,8.433 a 0.438,0.438 0 0 1 -0.222,0.063"
-       class="msportalfx-svg-c16"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#3999c6" />
-    <path
-       d="M 22.932,43.284 A 0.444,0.444 0 0 1 22.706,43.225 L 8.042,34.761 A 0.436,0.436 0 0 1 7.816,34.375 V 17.39 a 0.45,0.45 0 0 1 0.226,-0.389 0.463,0.463 0 0 1 0.448,0 l 14.662,8.464 a 0.45,0.45 0 0 1 0.218,0.387 v 16.987 a 0.445,0.445 0 0 1 -0.218,0.386 0.44,0.44 0 0 1 -0.22,0.059 m 4.149,0 A 0.444,0.444 0 0 1 26.635,42.839 V 25.962 c 0,-0.159 0.084,-0.305 0.22,-0.387 l 14.66,-8.461 a 0.458,0.458 0 0 1 0.448,0 c 0.134,0.08 0.22,0.227 0.22,0.385 v 16.877 a 0.446,0.446 0 0 1 -0.22,0.386 l -14.665,8.464 a 0.401,0.401 0 0 1 -0.217,0.058"
-       class="msportalfx-svg-c15"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="M 27.081,43.284 A 0.444,0.444 0 0 1 26.635,42.839 V 25.962 c 0,-0.159 0.084,-0.305 0.22,-0.387 l 14.66,-8.461 a 0.458,0.458 0 0 1 0.448,0 c 0.134,0.08 0.22,0.227 0.22,0.385 v 16.877 a 0.446,0.446 0 0 1 -0.22,0.386 l -14.665,8.464 a 0.401,0.401 0 0 1 -0.217,0.058"
-       class="msportalfx-svg-c01"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="opacity:0.5;fill:#ffffff" />
-    <path
-       d="M 9.558,45.171 A 1.45,1.45 0 0 1 8.832,44.976 L 1.987,41.024 C 0.835,40.358 0,38.911 0,37.582 V 12.418 C 0,11.089 0.835,9.641 1.987,8.977 L 8.832,5.025 a 1.455,1.455 0 0 1 1.455,2.519 L 3.442,11.496 C 3.199,11.637 2.91,12.137 2.91,12.418 v 25.164 c 0,0.281 0.289,0.782 0.532,0.922 l 6.845,3.952 A 1.454,1.454 0 0 1 9.558,45.171 Z M 40.442,4.829 c 0.247,0 0.497,0.063 0.726,0.195 l 6.845,3.952 C 49.165,9.642 50,11.089 50,12.418 v 25.164 c 0,1.329 -0.835,2.777 -1.987,3.441 l -6.845,3.952 a 1.455,1.455 0 0 1 -1.455,-2.519 l 6.845,-3.952 c 0.243,-0.141 0.532,-0.641 0.532,-0.922 V 12.418 c 0,-0.281 -0.289,-0.782 -0.532,-0.922 L 39.713,7.544 a 1.454,1.454 0 0 1 0.729,-2.715 z"
-       class="msportalfx-svg-c04"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#7a7a7a" />
-  </g>
-</svg>
diff --git a/source/manual/Azure SQL Database_COLOR.svg b/source/manual/Azure SQL Database_COLOR.svg
deleted file mode 100644
index 9d20b326..00000000
--- a/source/manual/Azure SQL Database_COLOR.svg	
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="37.486"
-   height="49.688"
-   viewBox="-0.5 0.5 37.486 49.688"
-   enable-background="new -0.5 0.5 50 50"
-   xml:space="preserve"
-   sodipodi:docname="Azure SQL Database_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata25"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs23" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview21"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="18.743"
-     inkscape:cy="24.688"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="m -0.5,7.288 v 36.111 c 0,3.749 8.392,6.789 18.743,6.789 v -42.9 c 0,0 -18.743,0 -18.743,0 z"
-     id="path2"
-     inkscape:connector-curvature="0"
-     style="fill:#0072c6" /><path
-     d="m 17.986,50.187 h 0.257 c 10.351,0 18.743,-3.038 18.743,-6.788 V 7.288 h -19 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:#0072c6" /><path
-     d="m 17.986,50.187 h 0.257 c 10.351,0 18.743,-3.038 18.743,-6.788 V 7.288 h -19 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     style="opacity:0.15;fill:#ffffff" /><path
-     d="m 36.986,7.288 c 0,3.749 -8.392,6.788 -18.743,6.788 C 7.892,14.076 -0.5,11.037 -0.5,7.288 -0.5,3.539 7.892,0.5 18.243,0.5 c 10.351,0 18.743,3.039 18.743,6.788"
-     id="path8"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="m 33.154,6.897 c 0,2.475 -6.676,4.479 -14.911,4.479 -8.235,0 -14.912,-2.004 -14.912,-4.479 0,-2.474 6.677,-4.479 14.912,-4.479 8.235,0 14.911,2.005 14.911,4.479"
-     id="path10"
-     inkscape:connector-curvature="0"
-     style="fill:#7fba00" /><path
-     d="m 30.03,9.634 c 1.952,-0.757 3.125,-1.705 3.125,-2.735 0,-2.475 -6.676,-4.48 -14.912,-4.48 -8.235,0 -14.911,2.005 -14.911,4.48 0,1.03 1.173,1.978 3.125,2.735 2.726,-1.058 6.986,-1.741 11.786,-1.741 4.801,0 9.059,0.683 11.787,1.741"
-     id="path12"
-     inkscape:connector-curvature="0"
-     style="fill:#b8d432" /><path
-     d="m 12.29,32.354 c 0,1.122 -0.407,1.991 -1.221,2.607 -0.814,0.616 -1.938,0.924 -3.373,0.924 -1.221,0 -2.241,-0.22 -3.061,-0.66 v -2.64 c 0.946,0.803 1.988,1.205 3.126,1.205 0.55,0 0.975,-0.11 1.275,-0.33 0.3,-0.22 0.45,-0.511 0.45,-0.875 0,-0.357 -0.144,-0.668 -0.433,-0.932 C 8.764,31.389 8.177,31.048 7.292,30.63 5.488,29.784 4.586,28.628 4.586,27.166 c 0,-1.061 0.393,-1.912 1.18,-2.553 0.786,-0.64 1.831,-0.961 3.134,-0.961 1.155,0 2.111,0.152 2.871,0.454 v 2.466 c -0.797,-0.55 -1.705,-0.825 -2.722,-0.825 -0.511,0 -0.915,0.108 -1.212,0.325 -0.297,0.218 -0.445,0.508 -0.445,0.87 0,0.374 0.119,0.681 0.359,0.92 0.239,0.239 0.73,0.535 1.472,0.887 1.106,0.523 1.893,1.053 2.364,1.592 0.468,0.54 0.703,1.211 0.703,2.013 z"
-     id="path14"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="m 25.017,29.682 c 0,1.391 -0.317,2.599 -0.949,3.621 -0.633,1.023 -1.523,1.74 -2.672,2.153 l 3.431,3.176 h -3.464 l -2.45,-2.747 c -1.05,-0.038 -1.998,-0.316 -2.842,-0.833 -0.844,-0.516 -1.496,-1.225 -1.955,-2.124 -0.459,-0.899 -0.689,-1.902 -0.689,-3.007 0,-1.226 0.249,-2.319 0.746,-3.279 0.498,-0.96 1.197,-1.698 2.099,-2.215 0.902,-0.516 1.935,-0.775 3.102,-0.775 1.088,0 2.063,0.25 2.924,0.751 0.86,0.5 1.528,1.212 2.004,2.136 0.477,0.924 0.715,1.972 0.715,3.143 z m -2.804,0.149 c 0,-1.199 -0.261,-2.146 -0.784,-2.842 -0.523,-0.696 -1.237,-1.044 -2.145,-1.044 -0.924,0 -1.663,0.349 -2.219,1.047 -0.555,0.699 -0.833,1.628 -0.833,2.788 0,1.155 0.272,2.077 0.816,2.767 0.545,0.69 1.267,1.035 2.169,1.035 0.919,0 1.647,-0.334 2.186,-1.002 0.54,-0.667 0.81,-1.584 0.81,-2.749 z"
-     id="path16"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><polygon
-     points="33.229,23.851 35.893,23.851 35.893,33.518 40.273,33.518 40.273,35.679 33.229,35.679 "
-     id="polygon18"
-     style="fill:#ffffff"
-     transform="translate(-6.257)" /></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Scheduler_COLOR.svg b/source/manual/Azure Scheduler_COLOR.svg
deleted file mode 100644
index b37c291e..00000000
--- a/source/manual/Azure Scheduler_COLOR.svg	
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg35"
-   sodipodi:docname="Azure Scheduler_COLOR.svg"
-   width="42.595165"
-   height="50"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata41">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs39" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview37"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="46.3"
-     inkscape:cy="2.1316282e-014"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg35" />
-  <svg
-     id="svg-scheduler"
-     version="1.1"
-     width="100%"
-     height="100%"
-     transform="translate(-3.7)">
-    <path
-       d="m 27.9,6.2 c -4,0.4 -7.5,2.4 -9.9,5.4 -2.4,2.9 -3.6,6.7 -3.2,10.8 0.4,4 2.4,7.5 5.4,9.9 2.9,2.4 6.7,3.6 10.8,3.2 4,-0.4 7.5,-2.4 9.9,-5.4 2.4,-2.9 3.6,-6.7 3.2,-10.8 -0.4,-4.1 -2.5,-7.6 -5.5,-10 -2.5,-2 -5.7,-3.2 -9.1,-3.2 -0.6,0.1 -1.1,0.1 -1.6,0.1"
-       id="path2"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="M 46.2,19.1 C 45.7,14.3 43.3,10.2 39.8,7.4 39.1,6.9 38.4,6.4 37.7,6 l -1.4,2.6 c 0.6,0.3 1.1,0.7 1.6,1.1 2.9,2.3 4.9,5.7 5.3,9.7 0.4,3.9 -0.8,7.6 -3.1,10.5 -2.3,2.8 -5.7,4.8 -9.6,5.2 -2.6,0.3 -5.2,-0.2 -7.4,-1.2 l -1.4,2.6 c 2.7,1.3 5.8,1.9 9.1,1.5 4.7,-0.5 8.8,-2.9 11.6,-6.3 2.8,-3.4 4.3,-7.9 3.8,-12.6"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#3999c6" />
-    <path
-       d="m 20.1,32 c -2.8,-2.3 -4.8,-5.7 -5.2,-9.6 -0.4,-3.9 0.8,-7.6 3.1,-10.5 2.3,-2.8 5.7,-4.8 9.6,-5.2 3.2,-0.3 6.2,0.4 8.7,1.9 L 37.7,6 C 34.7,4.2 31,3.4 27.3,3.8 22.6,4.3 18.5,6.7 15.7,10.1 v 0 c -2.8,3.4 -4.2,7.9 -3.7,12.6 0.5,4.7 2.9,8.8 6.3,11.6 1.1,0.9 2.3,1.6 3.6,2.2 l 1.4,-2.6 C 22.1,33.4 21,32.7 20.1,32"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#a0a1a2" />
-    <path
-       d="m 20.1,32 c -2.8,-2.3 -4.8,-5.7 -5.2,-9.6 -0.4,-3.9 0.8,-7.6 3.1,-10.5 2.3,-2.8 5.7,-4.8 9.6,-5.2 3.2,-0.3 6.2,0.4 8.7,1.9 L 37.7,6 C 34.7,4.2 31,3.4 27.3,3.8 22.6,4.3 18.5,6.7 15.7,10.1 v 0 c -2.8,3.4 -4.2,7.9 -3.7,12.6 0.5,4.7 2.9,8.8 6.3,11.6 1.1,0.9 2.3,1.6 3.6,2.2 l 1.4,-2.6 C 22.1,33.4 21,32.7 20.1,32"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="M 36.3,25.4 29.7,23 c -0.7,-0.3 -1.1,-1 -0.8,-1.8 0.3,-0.7 1,-1.1 1.8,-0.8 l 6.6,2.4 c 0.7,0.3 1.1,1 0.8,1.8 -0.3,0.7 -1.1,1 -1.8,0.8 z"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#7a7a7a" />
-    <path
-       d="m 28.9,22.8 c -0.8,0 -1.4,-0.6 -1.4,-1.4 V 9.7 c 0,-0.8 0.6,-1.4 1.4,-1.4 0.8,0 1.4,0.6 1.4,1.4 v 11.7 c 0,0.8 -0.6,1.4 -1.4,1.4 z"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#7a7a7a" />
-    <circle
-       cx="28.9"
-       cy="21.4"
-       r="2"
-       id="circle14"
-       style="fill:#1e1e1e" />
-    <path
-       d="M 29.1,39.4"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="fill:#bad80a" />
-    <path
-       d="M 29.4,45"
-       id="path18"
-       inkscape:connector-curvature="0"
-       style="fill:#bad80a" />
-    <path
-       d="M 33.9,44.1"
-       id="path20"
-       inkscape:connector-curvature="0"
-       style="fill:#bad80a" />
-    <path
-       d="M 32.9,44.4"
-       id="path22"
-       inkscape:connector-curvature="0"
-       style="fill:#bad80a" />
-    <path
-       d="M 42.6,6.8"
-       id="path24"
-       inkscape:connector-curvature="0"
-       style="fill:#bad80a" />
-    <path
-       d="M 31.5,40.3"
-       id="path26"
-       inkscape:connector-curvature="0"
-       style="fill:#bad80a" />
-    <path
-       d="M 27.5,40.4"
-       id="path28"
-       inkscape:connector-curvature="0"
-       style="fill:#bad80a" />
-    <path
-       d="m 27.3,36.3 7,6.5 -6.3,7.2 0.1,-4.7 c -0.5,0 -1.2,0 -1.7,0 C 13.9,45.3 3.7,35.1 3.7,22.6 3.7,10.1 13.9,0 26.4,0 32.7,0 38.5,2.6 42.6,6.8 39,3.3 34.2,1.2 28.8,1.2 17.9,1.1 9.2,9.9 9.1,20.8 c 0,10.4 8.5,18.9 18.7,19.6 z"
-       id="path30"
-       inkscape:connector-curvature="0"
-       style="fill:#b8d432" />
-    <path
-       d="M 28.5,43.4 C 16.1,42.9 6.4,32.4 6.9,20 7.2,12.3 11.4,5.6 17.5,1.8 9.4,5.3 3.7,13.3 3.7,22.7 c 0,12.5 10.2,22.7 22.7,22.7 0.5,0 1.2,0 1.7,0 L 28,50 34.2,42.9 c -1.8,0.4 -3.7,0.5 -5.7,0.5 z"
-       id="path32"
-       inkscape:connector-curvature="0"
-       style="opacity:0.2;fill:#1e1e1e" />
-  </svg>
-</svg>
diff --git a/source/manual/Azure Sentinel_COLOR.svg b/source/manual/Azure Sentinel_COLOR.svg
deleted file mode 100644
index 33fa77b5..00000000
--- a/source/manual/Azure Sentinel_COLOR.svg	
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 27.988001 32"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-0ad"
-   version="1.1"
-   sodipodi:docname="Azure Sentinel_COLOR.svg"
-   width="27.988001"
-   height="32"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata19">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs17" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview15"
-     showgrid="false"
-     inkscape:zoom="7.375"
-     inkscape:cx="14"
-     inkscape:cy="16.001"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-0ad" />
-  <g
-     id="g12"
-     transform="translate(0,-0.001)">
-    <title
-       id="title2" />
-    <path
-       d="M 13.386,31.611 C 10.248,29.671 0,22.677 0,14.515 V 4.077 L 1.095,3.994 C 5.477,3.721 7.178,2.583 8.678,1.578 9.956,0.739 11.06,0.001 13.999,0.001 c 2.939,0 4.089,0.769 5.301,1.584 1.507,0.998 3.211,2.153 7.593,2.422 l 1.095,0.07 v 10.438 c 0,8.166 -10.249,15.156 -13.39,17.103 l -0.612,0.383 z"
-       class="msportalfx-svg-c19"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="M 9.906,28.386 19.086,2.236 18.943,2.14 C 17.755,1.351 16.734,0.666 13.998,0.666 11.262,0.666 10.285,1.331 9.05,2.147 7.479,3.198 5.699,4.39 1.134,4.659 L 0.665,4.702 v 9.813 c 0,5.63 5.191,10.741 9.24,13.872 z"
-       class="msportalfx-svg-c01"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="opacity:0.15;fill:#ffffff" />
-    <path
-       d="m 13.999,9.333 h 0.006 a 7.321,7.321 0 0 1 7.289,6.636 l 0.002,0.029 h 3.327 C 24.315,10.365 19.672,5.915 13.99,5.915 8.308,5.915 3.665,10.366 3.358,15.971 l -10e-4,0.027 h 3.327 c 0.347,-3.751 3.479,-6.665 7.291,-6.665 h 0.024 -0.001 z"
-       class="msportalfx-svg-c01"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 17.932,16.667 a 3.933,3.933 0 1 1 -7.866,0 3.933,3.933 0 0 1 7.866,0 z"
-       class="msportalfx-svg-c01"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Service Fabric Mesh_COLOR.svg b/source/manual/Azure Service Fabric Mesh_COLOR.svg
deleted file mode 100644
index 4f1bf3bd..00000000
--- a/source/manual/Azure Service Fabric Mesh_COLOR.svg	
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg12"
-   sodipodi:docname="Azure Service Fabric Mesh_COLOR.svg"
-   width="47.800293"
-   height="47.800709"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="48.900354"
-     inkscape:cy="-1.0996464"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg12" />
-  <defs
-     id="defs4">
-    <style
-       type="text/css"
-       id="style2"><![CDATA[
-        .msportalfx-svg-c01{fill:#fff}.msportalfx-svg-c02{fill:#e5e5e5}.msportalfx-svg-c03{fill:#a0a1a2}.msportalfx-svg-c04{fill:#7a7a7a}.msportalfx-svg-c05{fill:#3e3e3e}.msportalfx-svg-c06{fill:#1e1e1e}.msportalfx-svg-c07{fill:#0f0f0f}.msportalfx-svg-c08{fill:#ba141a}.msportalfx-svg-c09{fill:#dd5900}.msportalfx-svg-c10{fill:#ff8c00}.msportalfx-svg-c11{fill:#fcd116}.msportalfx-svg-c12{fill:#fee087}.msportalfx-svg-c13{fill:#b8d432}.msportalfx-svg-c14{fill:#7fba00}.msportalfx-svg-c15{fill:#59b4d9}.msportalfx-svg-c16{fill:#3999c6}.msportalfx-svg-c17{fill:#804998}.msportalfx-svg-c18{fill:#ec008c}.msportalfx-svg-c19{fill:#0072c6}.msportalfx-svg-c20{fill:#68217a}.msportalfx-svg-c21{fill:#00188f}.msportalfx-svg-c22{fill:#e81123}.msportalfx-svg-c23{fill:#cae3f3}.msportalfx-svg-c24{fill:#59aed3}.msportalfx-svg-c25{fill:#4c3b12}.msportalfx-svg-c26{fill:#be9555}.msportalfx-svg-c27{fill:#4f4d52}.msportalfx-svg-c28{fill:#ef6f59}.msportalfx-svg-c29{fill:#f7cb64}.msportalfx-svg-c97{fill:#ffb900}.msportalfx-svg-c98{fill:#00a4ef}.msportalfx-svg-c99{fill:#f25022}
-      ]]></style>
-  </defs>
-  <g
-     id="g10"
-     transform="translate(-1.0996464,-1.0996464)">
-    <title
-       id="title6" />
-    <path
-       d="m 47.465,21.535 c -1.349,-1.349 -3.284,-1.726 -4.982,-1.173 l -3.8,-3.8 a 4,4 0 0 0 -5.245,-5.245 l -3.8,-3.8 C 30.191,5.819 29.814,3.884 28.465,2.535 a 4.9,4.9 0 0 0 -6.93,0 c -1.349,1.349 -1.726,3.284 -1.173,4.982 l -3.8,3.8 a 4,4 0 0 0 -5.245,5.245 l -3.8,3.8 C 5.819,19.809 3.884,20.186 2.535,21.535 a 4.9,4.9 0 0 0 0,6.93 c 1.349,1.349 3.284,1.726 4.982,1.173 l 3.8,3.8 a 4,4 0 0 0 5.245,5.245 l 3.8,3.8 c -0.553,1.698 -0.176,3.633 1.173,4.982 a 4.9,4.9 0 0 0 6.93,0 c 1.349,-1.349 1.726,-3.284 1.173,-4.982 l 3.8,-3.8 a 4,4 0 0 0 5.245,-5.245 l 3.8,-3.8 c 1.698,0.553 3.633,0.176 4.982,-1.173 a 4.901,4.901 0 0 0 0,-6.93 z M 22.152,40.031 18.683,36.562 C 18.887,36.082 19,35.554 19,35 19,34.446 18.887,33.918 18.683,33.438 L 25,27.121 31.317,33.438 C 31.113,33.918 31,34.446 31,35 c 0,0.554 0.113,1.082 0.317,1.562 l -3.469,3.469 a 4.883,4.883 0 0 0 -5.696,0 z M 9.969,22.152 13.438,18.683 C 13.918,18.887 14.446,19 15,19 c 0.554,0 1.082,-0.113 1.562,-0.317 L 22.879,25 16.562,31.317 C 16.082,31.113 15.554,31 15,31 c -0.554,0 -1.082,0.113 -1.562,0.317 L 9.969,27.848 a 4.883,4.883 0 0 0 0,-5.696 z M 27.848,9.969 31.317,13.438 C 31.113,13.918 31,14.446 31,15 c 0,0.554 0.113,1.082 0.317,1.562 L 25,22.879 18.683,16.562 C 18.887,16.082 19,15.554 19,15 19,14.446 18.887,13.918 18.683,13.438 l 3.469,-3.469 a 4.883,4.883 0 0 0 5.696,0 z M 35,31 c -0.554,0 -1.082,0.113 -1.562,0.317 L 27.121,25 33.438,18.683 C 33.918,18.887 34.446,19 35,19 c 0.554,0 1.082,-0.113 1.562,-0.317 l 3.469,3.469 a 4.88,4.88 0 0 0 0,5.696 l -3.469,3.469 A 3.984,3.984 0 0 0 35,31 Z"
-       class="msportalfx-svg-c09"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#dd5900" />
-  </g>
-</svg>
diff --git a/source/manual/Azure SignalR Service_COLOR.svg b/source/manual/Azure SignalR Service_COLOR.svg
deleted file mode 100644
index ddf74b24..00000000
--- a/source/manual/Azure SignalR Service_COLOR.svg	
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 50 50" class="" role="presentation" focusable="false" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-03b"><g><title></title><title>SignalRServiceblue</title><path d="M20.455 36.363l2.823-6.818h6.267a4.551 4.551 0 0 0 4.546-4.544 4.551 4.551 0 0 0-4.546-4.546H9.09L20.455 9.09v4.547h9.09c6.277 0 11.365 5.088 11.365 11.364 0 6.102-4.825 11.044-10.863 11.314l9.209 9.209C45.745 41.007 50 33.504 50 25 50 11.194 38.806 0 25 0S0 11.194 0 25s11.194 25 25 25c2.737 0 5.36-.455 7.825-1.265l-12.37-12.372z" fill-rule="evenodd" class="msportalfx-svg-c15" fill="#59b4d9"></path></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Site Recovery_COLOR.svg b/source/manual/Azure Site Recovery_COLOR.svg
deleted file mode 100644
index f665f8fc..00000000
--- a/source/manual/Azure Site Recovery_COLOR.svg	
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="49.900002"
-   height="41.799999"
-   viewBox="0 0 49.900002 41.799999"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="Azure Site Recovery_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata11"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs9" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="25"
-     inkscape:cy="20"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="m 28.4,13.6 c 6,0 10.9,4.5 11.6,10.2 1.4,1.1 2.5,2.4 3.3,3.8 3.9,-1 6.6,-4.4 6.6,-8.5 0,-3.3 -1.8,-5.9 -4.9,-7.4 0,-0.4 0,-0.7 0,-1.1 C 45,4.8 40.2,0 34.4,0 30.9,0 27.7,1.7 25.7,4.4 24.4,3.6 23,3.2 21.4,3.2 c -4.2,0 -7.6,3.2 -8,7.2 0.6,-0.1 1.3,-0.1 2,-0.1 3.1,0 6.6,0.5 9.5,3.6 z"
-     id="path2"
-     inkscape:connector-curvature="0"
-     style="fill:#59b4d9" /><path
-     d="m 36.5,25.8 v -0.6 c 0,-4.4 -3.6,-8 -8,-8 -1.4,0 -2.7,0.4 -3.9,1 v 0.1 -0.1 c -0.1,0.1 -0.3,0.1 -0.4,0.2 0,0 0,0 -0.1,-0.1 -2.3,1.7 -3.3,4.3 -3.4,7.1 h 3.5 l -5.3,6.3 -5.4,-6.3 h 3.6 C 17.2,21.6 18.7,18 21.3,15.7 19.6,14.6 17.6,14 15.5,14 9.6,14 4.8,18.7 4.8,24.5 c 0,0.4 0,0.7 0,1.1 -3,1.5 -4.8,4.1 -4.8,7.4 0,5 4,8.8 9.2,8.8 h 22.7 c 5.2,0 9.2,-3.9 9.2,-8.8 0,-3.2 -1.6,-5.7 -4.6,-7.2 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:#0072c6" /></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Storage - Blob_COLOR.svg b/source/manual/Azure Storage - Blob_COLOR.svg
deleted file mode 100644
index 6e3decbd..00000000
--- a/source/manual/Azure Storage - Blob_COLOR.svg	
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   x="0px"
-   y="0px"
-   viewBox="0 0 38.5 33.400002"
-   enable-background="new 0 0 152 117.5"
-   xml:space="preserve"
-   id="svg70"
-   sodipodi:docname="Azure Storage - Blob.svg"
-   width="38.5"
-   height="33.400002"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata76"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs74" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview72"
-     showgrid="false"
-     inkscape:zoom="1.8684211"
-     inkscape:cx="19.2"
-     inkscape:cy="14.35"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg70" /><g
-     id="Layer_1"
-     transform="translate(-56.8,-39.7)"><g
-       id="Azure" /><g
-       id="BizTalk_Services"
-       transform="translate(37.3575,-2500.2)" /><g
-       id="Key_Vault" /><g
-       id="Mobile_Engagement" /><g
-       id="Office_subscription"><g
-         id="Office_subscription_1_" /></g></g><g
-     id="paths"
-     transform="translate(-56.8,-39.7)"><g
-       id="Access_control" /><g
-       id="Azure_active_directory" /><g
-       id="API_Management" /><g
-       id="Azure_automation" /><g
-       id="Azure_SQL_database" /><g
-       id="Azure_subscription" /><g
-       id="Backup_service" /><g
-       id="Bitbucket_code_source" /><g
-       id="Azure_cache" /><g
-       id="Content_delivery_network__x28_CDN_x29_" /><g
-       id="Cloud_service" /><g
-       id="CodePlex" /><g
-       id="Dropbox_code_source" /><g
-       id="Express_route" /><g
-       id="Git_repository" /><g
-       id="GitHub_code" /><g
-       id="HD_Insight" /><g
-       id="Health_monitoring" /><g
-       id="Healthy" /><g
-       id="BizTalk_hybrid_connection" /><g
-       id="Hybrid_connection_manager_for_BizTalk_hybrid_connection" /><g
-       id="Hyper-V_recovery_manager" /><g
-       id="Machine_learning" /><g
-       id="Media_services" /><g
-       id="Microsoft_account" /><g
-       id="Mobile_services" /><g
-       id="Multi-factor_authentication" /><g
-       id="MySQL_database" /><g
-       id="Notification_hub" /><g
-       id="Notification_topic" /><g
-       id="Cloud_Office_365" /><g
-       id="Office_365" /><g
-       id="OS_image" /><g
-       id="Remote_app" /><g
-       id="Task_scheduler" /><g
-       id="Azure_SDK" /><g
-       id="Service_bus" /><g
-       id="Service_bus_queue" /><g
-       id="Service_bus_relay" /><g
-       id="Service_bus_topic" /><g
-       id="Service_endpoint" /><g
-       id="Custom_create" /><g
-       id="SQL_data_sync" /><g
-       id="SQL_reporting" /><g
-       id="Startup_task" /><g
-       id="Windows_Azure_storage" /><g
-       id="Storage_blob"><g
-         id="g63"><path
-           d="M 85.7,39.7 H 66.4 l -9.6,16.7 9.6,16.7 h 19.3 l 9.6,-16.7 z m 0.1,24.2 c 0,1.4 -1.2,2.6 -2.6,2.6 H 69 c -1.4,0 -2.6,-1.2 -2.6,-2.6 V 49 c 0,-1.4 1.2,-2.6 2.6,-2.6 h 10.5 c 1,0 2,0 2,0 h 0.3 l 4,4 v 2.1 z"
-           id="path55"
-           inkscape:connector-curvature="0"
-           style="fill:#0078d7" /><path
-           d="m 74.6,59.1 c 0,-0.2 -0.1,-0.3 -0.1,-0.4 0,-0.1 -0.1,-0.2 -0.2,-0.3 -0.1,-0.1 -0.1,-0.1 -0.2,-0.1 -0.1,0 -0.2,0 -0.3,0 -0.2,0 -0.3,0 -0.4,0.1 -0.1,0.1 -0.2,0.2 -0.3,0.4 C 73,59 73,59.2 73,59.4 c 0,0.2 0,0.5 0,0.9 0,0.4 0,0.7 0,1 0,0.3 0.1,0.5 0.2,0.6 0.1,0.2 0.2,0.3 0.3,0.3 0.1,0.1 0.2,0.1 0.4,0.1 0.1,0 0.2,0 0.3,-0.1 0.1,0 0.2,-0.1 0.2,-0.2 0.1,-0.1 0.1,-0.2 0.2,-0.3 0,-0.1 0.1,-0.2 0.1,-0.4 0,-0.1 0,-0.3 0.1,-0.5 0,-0.2 0,-0.4 0,-0.6 0,-0.3 0,-0.5 0,-0.7 -0.2,-0.1 -0.2,-0.2 -0.2,-0.4 z"
-           id="path57"
-           inkscape:connector-curvature="0"
-           style="fill:#0078d7" /><path
-           d="M 79.1,51.3 C 79.1,51.1 79,51 79,50.9 c 0,-0.1 -0.1,-0.2 -0.2,-0.3 -0.1,-0.1 -0.1,-0.1 -0.2,-0.1 -0.1,0 -0.2,0 -0.3,0 -0.2,0 -0.3,0 -0.4,0.1 -0.1,0.1 -0.2,0.2 -0.3,0.4 -0.1,0.2 -0.1,0.4 -0.1,0.6 0,0.2 0,0.5 0,0.9 0,0.4 0,0.7 0,1 0,0.3 0.1,0.5 0.2,0.6 0.1,0.2 0.2,0.3 0.3,0.3 0.1,0.1 0.2,0.1 0.4,0.1 0.1,0 0.2,0 0.3,-0.1 0.1,0 0.2,-0.1 0.2,-0.2 0.1,-0.1 0.1,-0.2 0.2,-0.3 0,-0.1 0.1,-0.2 0.1,-0.4 0,-0.1 0,-0.3 0.1,-0.5 0,-0.2 0,-0.4 0,-0.6 0,-0.3 0,-0.5 0,-0.7 -0.1,0 -0.1,-0.2 -0.2,-0.4 z"
-           id="path59"
-           inkscape:connector-curvature="0"
-           style="fill:#0078d7" /><path
-           d="m 81.1,47.8 c -0.4,0 -1,0 -1.6,0 H 69 c -0.7,0 -1.2,0.5 -1.2,1.2 v 14.9 c 0,0.7 0.5,1.2 1.2,1.2 h 14.2 c 0.6,0 1.2,-0.5 1.2,-1.2 V 51.1 h -3.2 v -3.3 z m -8.9,3 c 0,0 0,-0.1 0,-0.1 0,0 0,-0.1 0,-0.1 0,0 0,0 0.1,-0.1 l 1.2,-0.8 c 0,0 0,0 0.1,0 0,0 0.1,0 0.1,0 0,0 0.1,0 0.1,0 0.1,0 0.1,0 0.2,0 0.1,0 0.2,0 0.3,0 0.1,0 0.1,0 0.2,0 0,0 0.1,0 0.1,0 0,0 0,0 0,0.1 v 4.7 h 0.9 c 0,0 0.1,0 0.1,0 0,0 0,0 0.1,0.1 0.1,0.1 0,0.1 0,0.1 0,0.1 0,0.1 0,0.2 0,0.1 0,0.2 0,0.2 0,0.1 0,0.1 0,0.1 0,0 0,0.1 -0.1,0.1 0,0 0,0 -0.1,0 h -3.1 c 0,0 0,0 -0.1,0 0,0 0,0 -0.1,-0.1 0,0 0,-0.1 0,-0.1 0,-0.1 0,-0.1 0,-0.2 0,-0.1 0,-0.2 0,-0.2 0,-0.1 0,-0.1 0,-0.1 0,0 0,-0.1 0.1,-0.1 0,0 0,0 0.1,0 h 1.1 v -3.7 l -0.9,0.5 c -0.1,0 -0.1,0.1 -0.2,0.1 0,0 -0.1,0 -0.1,0 0,0 0,-0.1 -0.1,-0.1 0,-0.1 0,-0.1 0,-0.3 0,-0.1 0,-0.2 0,-0.2 z m 3.5,10.7 c -0.1,0.4 -0.2,0.7 -0.4,0.9 -0.2,0.3 -0.4,0.5 -0.6,0.6 -0.3,0.1 -0.6,0.2 -1,0.2 -0.4,0 -0.7,-0.1 -1,-0.2 -0.3,-0.1 -0.5,-0.3 -0.6,-0.6 -0.1,-0.3 -0.3,-0.6 -0.3,-0.9 -0.1,-0.4 -0.1,-0.8 -0.1,-1.2 0,-0.5 0,-0.9 0.1,-1.2 0.1,-0.4 0.2,-0.7 0.4,-0.9 0.2,-0.2 0.4,-0.5 0.6,-0.6 0.3,-0.1 0.6,-0.2 1,-0.2 0.4,0 0.7,0.1 1,0.2 0.3,0.1 0.5,0.3 0.6,0.6 0.1,0.3 0.3,0.6 0.3,0.9 0.1,0.4 0.1,0.8 0.1,1.2 0,0.5 0,0.9 -0.1,1.2 z m 4.5,1.4 c 0,0.1 0,0.1 0,0.1 0,0 0,0.1 -0.1,0.1 0,0 0,0 -0.1,0 h -3.1 c 0,0 0,0 -0.1,0 0,0 0,0 -0.1,-0.1 0,0 0,-0.1 0,-0.1 0,-0.1 0,-0.1 0,-0.2 0,-0.1 0,-0.2 0,-0.2 0,-0.1 0,-0.1 0,-0.1 0,0 0,-0.1 0.1,-0.1 0,0 0,0 0.1,0 H 78 v -3.7 l -0.9,0.5 c -0.1,0 -0.1,0.1 -0.2,0.1 0,0 -0.1,0 -0.1,0 0,0 0,-0.1 -0.1,-0.1 0,-0.1 0,-0.1 0,-0.3 0,-0.1 0,-0.1 0,-0.2 0,0 0,-0.1 0,-0.1 0,0 0,-0.1 0,-0.1 0,0 0,0 0.1,-0.1 L 78,57.5 c 0,0 0,0 0.1,0 0,0 0.1,0 0.1,0 0,0 0.1,0 0.1,0 0.1,0 0.1,0 0.2,0 0.1,0 0.2,0 0.3,0 0.1,0 0.1,0 0.2,0 0,0 0.1,0 0.1,0 0,0 0,0 0,0.1 v 4.7 H 80 c 0,0 0.1,0 0.1,0 0,0 0,0 0.1,0.1 0,0 0,0.1 0,0.1 0,0.1 0,0.1 0,0.2 0,0.1 0,0.2 0,0.2 z m 0.1,-9.2 c -0.1,0.4 -0.2,0.7 -0.4,0.9 -0.2,0.3 -0.4,0.5 -0.6,0.6 -0.3,0.1 -0.6,0.2 -1,0.2 -0.4,0 -0.7,-0.1 -1,-0.2 -0.3,-0.1 -0.5,-0.3 -0.6,-0.6 -0.1,-0.2 -0.3,-0.6 -0.3,-0.9 0,-0.3 -0.1,-0.8 -0.1,-1.2 0,-0.5 0,-0.9 0.1,-1.2 0.1,-0.4 0.2,-0.7 0.4,-0.9 0.2,-0.3 0.4,-0.5 0.6,-0.6 0.3,-0.1 0.6,-0.2 1,-0.2 0.4,0 0.7,0.1 1,0.2 0.3,0.1 0.5,0.3 0.6,0.6 0.1,0.3 0.3,0.6 0.3,0.9 0.1,0.4 0.1,0.8 0.1,1.2 0,0.5 -0.1,0.9 -0.1,1.2 z"
-           id="path61"
-           inkscape:connector-curvature="0"
-           style="fill:#0078d7" /></g></g></g><g
-     id="Layer_57"
-     transform="translate(-56.8,-39.7)" /><g
-     id="Ibiza_Symbols"
-     transform="translate(-56.8,-39.7)"><g
-       id="SQL_Database_Premium" /></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Storage - Files_COLOR.svg b/source/manual/Azure Storage - Files_COLOR.svg
deleted file mode 100644
index 91d4aa7d..00000000
--- a/source/manual/Azure Storage - Files_COLOR.svg	
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 201.8 174.60001"
-   enable-background="new 0 0 792 612"
-   xml:space="preserve"
-   sodipodi:docname="Azure Storage - Files.svg"
-   width="201.8"
-   height="174.60001"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata16"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs14" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview12"
-     showgrid="false"
-     inkscape:zoom="0.35858586"
-     inkscape:cx="89.6"
-     inkscape:cy="105.9"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><g
-     id="Layer_1_1_"
-     transform="translate(-306.4,-237.3)" /><g
-     id="g7"
-     transform="translate(-306.4,-237.3)"><path
-       d="m 432.6,279.9 h -62.8 c -3.2,0 -5.3,2.7 -5.3,5.3 v 78.2 c 0,3.2 2.7,5.9 5.3,5.9 h 74 c 3.2,0 5.3,-2.7 5.3,-5.9 v -66 h -17 v -17.6 z m -2.1,67.6 h -47.4 v -9 h 47.4 z m 0,-16.5 h -47.4 v -9 h 47.4 z m 0,-17 h -47.4 v -9 h 47.4 z"
-       id="path3"
-       inkscape:connector-curvature="0"
-       style="fill:#0078d7" /><path
-       d="M 457.6,237.3 H 357 l -50.6,87.3 50.6,87.3 h 100.6 l 50.6,-87.3 z m -13.3,140.5 h -74 c -8,0 -14.4,-6.4 -14.4,-14.4 v -78.2 c 0,-8 6.4,-14.4 14.4,-14.4 h 67.1 l 21.3,21.3 v 71.3 c 0,8 -6.4,14.4 -14.4,14.4 z"
-       id="path5"
-       inkscape:connector-curvature="0"
-       style="fill:#0078d7" /></g><g
-     id="Ibiza_Symbols"
-     transform="translate(-306.4,-237.3)"><g
-       id="SQL_Database_Premium" /></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Storage - Queue_COLOR.svg b/source/manual/Azure Storage - Queue_COLOR.svg
deleted file mode 100644
index 151ae429..00000000
--- a/source/manual/Azure Storage - Queue_COLOR.svg	
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   x="0px"
-   y="0px"
-   viewBox="0 0 37.900002 32.799999"
-   enable-background="new 0 0 152 117.5"
-   xml:space="preserve"
-   id="svg76"
-   sodipodi:docname="Azure Storage - Queue.svg"
-   width="37.900002"
-   height="32.799999"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata82"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs80" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview78"
-     showgrid="false"
-     inkscape:zoom="1.8684211"
-     inkscape:cx="19"
-     inkscape:cy="16.35"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg76" /><g
-     id="Layer_1"
-     transform="translate(-57,-42.3)"><g
-       id="Azure" /><g
-       id="BizTalk_Services"
-       transform="translate(37.3575,-2500.2)" /><g
-       id="Key_Vault" /><g
-       id="Mobile_Engagement" /><g
-       id="Office_subscription"><g
-         id="Office_subscription_1_" /></g></g><g
-     id="paths"
-     transform="translate(-57,-42.3)"><g
-       id="Access_control" /><g
-       id="Azure_active_directory" /><g
-       id="API_Management" /><g
-       id="Azure_automation" /><g
-       id="Azure_SQL_database" /><g
-       id="Azure_subscription" /><g
-       id="Backup_service" /><g
-       id="Bitbucket_code_source" /><g
-       id="Azure_cache" /><g
-       id="Content_delivery_network__x28_CDN_x29_" /><g
-       id="Cloud_service" /><g
-       id="CodePlex" /><g
-       id="Dropbox_code_source" /><g
-       id="Express_route" /><g
-       id="Git_repository" /><g
-       id="GitHub_code" /><g
-       id="HD_Insight" /><g
-       id="Health_monitoring" /><g
-       id="Healthy" /><g
-       id="BizTalk_hybrid_connection" /><g
-       id="Hybrid_connection_manager_for_BizTalk_hybrid_connection" /><g
-       id="Hyper-V_recovery_manager" /><g
-       id="Machine_learning" /><g
-       id="Media_services" /><g
-       id="Microsoft_account" /><g
-       id="Mobile_services" /><g
-       id="Multi-factor_authentication" /><g
-       id="MySQL_database" /><g
-       id="Notification_hub" /><g
-       id="Notification_topic" /><g
-       id="Cloud_Office_365" /><g
-       id="Office_365" /><g
-       id="OS_image" /><g
-       id="Remote_app" /><g
-       id="Task_scheduler" /><g
-       id="Azure_SDK" /><g
-       id="Service_bus" /><g
-       id="Service_bus_queue" /><g
-       id="Service_bus_relay" /><g
-       id="Service_bus_topic" /><g
-       id="Service_endpoint" /><g
-       id="Custom_create" /><g
-       id="SQL_data_sync" /><g
-       id="SQL_reporting" /><g
-       id="Startup_task" /><g
-       id="Windows_Azure_storage" /><g
-       id="Storage_blob" /><g
-       id="Storage_table" /><g
-       id="Storage_queue"><g
-         id="g69"><polygon
-           points="82.4,59.7 86.5,56.5 78.3,56.5 "
-           id="polygon57"
-           style="fill:#0078d7" /><path
-           d="m 69.9,60.8 c -0.1,0 -0.2,0 -0.3,-0.1 l -3.8,-3 v 4.9 h 8.7 v -5 l -4.1,3.1 c -0.2,0.1 -0.4,0.1 -0.5,0.1 z"
-           id="path59"
-           inkscape:connector-curvature="0"
-           style="fill:#0078d7" /><path
-           d="m 82.4,60.8 c -0.1,0 -0.3,0 -0.3,-0.1 l -3.9,-3 v 4.9 h 8.7 v -5 l -4.1,3.1 c -0.2,0.1 -0.3,0.1 -0.4,0.1 z"
-           id="path61"
-           inkscape:connector-curvature="0"
-           style="fill:#0078d7" /><path
-           d="m 85.5,42.3 h -19 L 57,58.7 66.5,75.1 h 18.9 l 9.5,-16.4 z m 3.3,23.4 H 62.9 c -0.8,0 -1.4,-0.7 -1.4,-1.5 v -9.9 c 0,-0.8 0.6,-1.5 1.4,-1.5 h 25.9 c 0.3,0 0.8,0 4.2,6.4 l 0.1,0.3 -0.1,0.3 c -3.4,5.9 -3.9,5.9 -4.2,5.9 z"
-           id="path63"
-           inkscape:connector-curvature="0"
-           style="fill:#0078d7" /><polygon
-           points="69.8,59.7 74,56.5 65.7,56.5 "
-           id="polygon65"
-           style="fill:#0078d7" /><path
-           d="m 62.9,53.9 c -0.2,0 -0.4,0.2 -0.4,0.4 v 9.9 c 0,0.2 0.2,0.5 0.4,0.5 h 25.7 c 0.5,-0.5 2,-2.9 3.3,-5.2 C 90.6,57 89,54.4 88.6,53.9 Z m 12.6,9.2 c 0,0.3 -0.3,0.6 -0.7,0.6 H 65 c -0.3,0 -0.4,-0.3 -0.4,-0.6 v -7.3 c 0,-0.3 0.1,-0.4 0.4,-0.4 h 9.8 c 0.3,0 0.7,0.1 0.7,0.4 z m 12.3,0 c 0,0.3 -0.2,0.6 -0.5,0.6 h -9.7 c -0.3,0 -0.5,-0.3 -0.5,-0.6 v -7.3 c 0,-0.3 0.2,-0.4 0.5,-0.4 h 9.7 c 0.3,0 0.5,0.1 0.5,0.4 z"
-           id="path67"
-           inkscape:connector-curvature="0"
-           style="fill:#0078d7" /></g></g></g><g
-     id="Layer_57"
-     transform="translate(-57,-42.3)" /><g
-     id="Ibiza_Symbols"
-     transform="translate(-57,-42.3)"><g
-       id="SQL_Database_Premium" /></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Storage_COLOR.svg b/source/manual/Azure Storage_COLOR.svg
deleted file mode 100644
index 843fdf54..00000000
--- a/source/manual/Azure Storage_COLOR.svg	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   x="0px"
-   y="0px"
-   viewBox="0 0 50.200001 43.099998"
-   enable-background="new 0 0 152 117.5"
-   xml:space="preserve"
-   id="svg61"
-   sodipodi:docname="Azure Storage.svg"
-   width="50.200001"
-   height="43.099998"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata67"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs65" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview63"
-     showgrid="false"
-     inkscape:zoom="1.8684211"
-     inkscape:cx="25.2"
-     inkscape:cy="21.55"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg61" /><g
-     id="Layer_1"
-     transform="translate(-50.8,-37.2)"><g
-       id="Azure" /><g
-       id="BizTalk_Services"
-       transform="translate(37.3575,-2500.2)" /><g
-       id="Key_Vault" /><g
-       id="Mobile_Engagement" /><g
-       id="Office_subscription"><g
-         id="Office_subscription_1_" /></g></g><g
-     id="paths"
-     transform="translate(-50.8,-37.2)"><g
-       id="Access_control" /><g
-       id="Azure_active_directory" /><g
-       id="API_Management" /><g
-       id="Azure_automation" /><g
-       id="Azure_SQL_database" /><g
-       id="Azure_subscription" /><g
-       id="Backup_service" /><g
-       id="Bitbucket_code_source" /><g
-       id="Azure_cache" /><g
-       id="Content_delivery_network__x28_CDN_x29_" /><g
-       id="Cloud_service" /><g
-       id="CodePlex" /><g
-       id="Dropbox_code_source" /><g
-       id="Express_route" /><g
-       id="Git_repository" /><g
-       id="GitHub_code" /><g
-       id="HD_Insight" /><g
-       id="Health_monitoring" /><g
-       id="Healthy" /><g
-       id="BizTalk_hybrid_connection" /><g
-       id="Hybrid_connection_manager_for_BizTalk_hybrid_connection" /><g
-       id="Hyper-V_recovery_manager" /><g
-       id="Machine_learning" /><g
-       id="Media_services" /><g
-       id="Microsoft_account" /><g
-       id="Mobile_services" /><g
-       id="Multi-factor_authentication" /><g
-       id="MySQL_database" /><g
-       id="Notification_hub" /><g
-       id="Notification_topic" /><g
-       id="Cloud_Office_365" /><g
-       id="Office_365" /><g
-       id="OS_image" /><g
-       id="Remote_app" /><g
-       id="Task_scheduler" /><g
-       id="Azure_SDK" /><g
-       id="Service_bus" /><g
-       id="Service_bus_queue" /><g
-       id="Service_bus_relay" /><g
-       id="Service_bus_topic" /><g
-       id="Service_endpoint" /><g
-       id="Custom_create" /><g
-       id="SQL_data_sync" /><g
-       id="SQL_reporting" /><g
-       id="Startup_task" /><g
-       id="Windows_Azure_storage"><path
-         d="M 93.6,54.1 H 90.3 V 38.7 c 0,-0.8 -0.7,-1.5 -1.5,-1.5 H 52.3 c -0.8,0 -1.5,0.7 -1.5,1.5 v 30.7 c 0,0.8 0.7,1.5 1.5,1.5 H 73 l 5.4,9.4 H 93.5 L 101,67.2 Z M 80.1,46 h 7.3 v 4.4 h -7.3 z m 7.3,5.9 v 2.2 H 80.1 V 51.9 Z M 71.3,46 h 7.3 v 4.4 h -7.3 z m 0,5.9 h 7.3 v 2.2 h -0.2 l -1.3,2.2 h -5.9 v -4.4 z m 0,5.8 h 5 l -2.5,4.4 h -2.5 z m 1.7,5.8 -1.7,2.9 v -2.9 z m -11.9,4.4 h -7.3 v -4.4 h 7.3 z m 0,-5.8 h -7.3 v -4.4 h 7.3 z m 0,-5.9 h -7.3 v -4.4 h 7.3 z m 0,-5.8 H 53.8 V 46 h 7.3 z m 8.8,17.5 h -7.3 v -4.4 h 7.3 z m 0,-5.8 h -7.3 v -4.4 h 7.3 z m 0,-5.9 h -7.3 v -4.4 h 7.3 z m 0,-5.8 H 62.6 V 46 h 7.3 z m 1.4,17.5 v -0.1 z"
-         id="path54"
-         inkscape:connector-curvature="0"
-         style="fill:#0078d7" /></g></g><g
-     id="Layer_57"
-     transform="translate(-50.8,-37.2)" /><g
-     id="Ibiza_Symbols"
-     transform="translate(-50.8,-37.2)"><g
-       id="SQL_Database_Premium" /></g></svg>
\ No newline at end of file
diff --git a/source/manual/Azure Subscription New_COLOR.svg b/source/manual/Azure Subscription New_COLOR.svg
deleted file mode 100644
index c9ebadb3..00000000
--- a/source/manual/Azure Subscription New_COLOR.svg	
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 31.003078 50.000126"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-022"
-   version="1.1"
-   sodipodi:docname="Azure Subscription New_COLOR.svg"
-   width="31.003078"
-   height="50.000126"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs15" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview13"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="14.999625"
-     inkscape:cy="25.001"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-022" />
-  <g
-     id="g10"
-     transform="translate(-10.000375,-8.7512232e-4)">
-    <title
-       id="title2" />
-    <path
-       d="m 39.337,19.525 a 5.688,5.688 0 0 0 0,-8.045 L 29.525,1.667 a 5.69,5.69 0 0 0 -8.046,0 l -9.813,9.813 a 5.69,5.69 0 0 0 0,8.045 l 8.633,8.633 v 16.641 l 5.202,5.202 4.519,-4.519 v -0.033 l 2.652,-2.653 -2.629,-2.629 2.629,-2.629 -2.629,-2.629 2.629,-2.629 -2.652,-2.653 V 28.843 Z M 25.502,4.039 a 3.23,3.23 0 1 1 0,6.459 3.23,3.23 0 0 1 0,-6.459 z"
-       class="msportalfx-svg-c11"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#fcd116" />
-    <path
-       d="m 22.728,43.961 2.03,2 V 30.008 l -2.03,-1 z"
-       class="msportalfx-svg-c10"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="opacity:0.4;fill:#ff8c00" />
-    <path
-       d="m 15.868,13.617 h 18.64 v 2.679 h -18.64 z m 0,4.359 h 18.64 v 2.679 h -18.64 z"
-       class="msportalfx-svg-c01"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="opacity:0.5;fill:#ffffff" />
-  </g>
-</svg>
diff --git a/source/manual/Azure Test Plans_COLOR.svg b/source/manual/Azure Test Plans_COLOR.svg
deleted file mode 100644
index 70db6a8b..00000000
--- a/source/manual/Azure Test Plans_COLOR.svg	
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="104.526"
-   height="116.1163"
-   viewBox="0 0 104.526 116.1163"
-   overflow="hidden"
-   id="svg41"
-   sodipodi:docname="Azure Test Plans_COLOR.svg"
-   style="overflow:hidden;fill:none"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata45">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="2.4583333"
-     inkscape:cx="56.29289"
-     inkscape:cy="68.116302"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs19">
-    <filter
-       id="filter0_f"
-       x="-8.2928896"
-       y="11.8833"
-       width="104.526"
-       height="104.233"
-       filterUnits="userSpaceOnUse"
-       primitiveUnits="userSpaceOnUse"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood2" />
-      <feBlend
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         mode="normal"
-         id="feBlend4" />
-      <feGaussianBlur
-         result="effect1_foregroundBlur"
-         stdDeviation="16.0584 16.0584"
-         id="feGaussianBlur6" />
-    </filter>
-    <linearGradient
-       x2="1"
-       gradientUnits="userSpaceOnUse"
-       id="paint0_linear"
-       gradientTransform="matrix(2.53165e-4,-8,16.117,1.25664e-4,2.01437,7.99976)">
-      <stop
-         offset="0"
-         stop-color="#7B3FC0"
-         id="stop9" />
-      <stop
-         offset="1"
-         stop-color="#6724B4"
-         id="stop11" />
-    </linearGradient>
-    <linearGradient
-       x2="1"
-       gradientUnits="userSpaceOnUse"
-       id="paint1_linear"
-       gradientTransform="matrix(0,96,-94,0,94,0)">
-      <stop
-         offset="0"
-         stop-color="#FFFFFF"
-         id="stop14" />
-      <stop
-         offset="1"
-         stop-color="#FFFFFF"
-         stop-opacity="0"
-         id="stop16" />
-    </linearGradient>
-  </defs>
-  <g
-     id="DevOpsIconTestPlans96"
-     transform="translate(8.2928896)">
-    <mask
-       maskUnits="userSpaceOnUse"
-       x="1"
-       y="0"
-       width="94"
-       height="96"
-       id="mask0">
-      <path
-         d="m 26.8538,2 c 0,-1.105469 0.9021,-2 2.0147,-2 h 36.2631 c 1.1126,0 2.0146,0.894531 2.0146,2 v 4 c 0,1.10547 -0.902,2 -2.0146,2 H 63.117 V 27.7109 L 92.3624,78 c 4.6527,8 -1.163,18 -10.468,18 H 12.1057 C 2.80063,96 -3.01501,86 1.63741,78 L 30.8831,27.7109 V 8 H 28.8685 C 27.7559,8 26.8538,7.10547 26.8538,6 Z"
-         id="Mask"
-         transform="translate(1)"
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff" />
-    </mask>
-    <g
-       mask="url(#mask0)"
-       id="g38">
-      <g
-         id="Beaker">
-        <path
-           d="m 36.5317,6 c 4.6526,-8 16.284,-8 20.9366,0 l 34.8942,60 c 4.6526,8 -1.1632,18 -10.4683,18 H 12.1058 C 2.80062,84 -3.01508,74 1.63748,66 Z"
-           id="Polygon"
-           transform="translate(1,12)"
-           inkscape:connector-curvature="0"
-           style="fill:#854cc7" />
-        <path
-           d="M 32.2339,20 V 0 H 0 v 20 z"
-           id="Vector"
-           transform="translate(31.8831,8)"
-           inkscape:connector-curvature="0"
-           style="fill:url(#paint0_linear)" />
-        <path
-           d="M 0,2.0073 C 0,0.898697 0.898697,0 2.0073,0 h 36.2778 c 1.1086,0 2.0073,0.898697 2.0073,2.0073 V 5.9927 C 40.2924,7.1013 39.3937,8 38.2851,8 H 2.0073 C 0.898699,8 0,7.1013 0,5.9927 Z"
-           id="Rectangle 2.1"
-           transform="translate(27.8538)"
-           inkscape:connector-curvature="0"
-           style="fill:#a676df" />
-        <path
-           d="M 32.2339,8 H 0 V 0 h 32.2339 z"
-           id="Vector 2 (Stroke).1"
-           transform="translate(31.8831)"
-           inkscape:connector-curvature="0"
-           style="clip-rule:evenodd;fill:#854cc7;fill-rule:evenodd" />
-      </g>
-      <path
-         d="m 86.5468,0 5.8157,10 c 4.6526,8 -1.1631,18 -10.4683,18 H 12.1058 C 2.80061,28 -3.01506,18 1.63746,10 L 7.4532,0 Z"
-         id="Liquid"
-         transform="translate(0.999756,68)"
-         inkscape:connector-curvature="0"
-         style="clip-rule:evenodd;fill:#5f1faa;fill-rule:evenodd" />
-      <g
-         id="Union"
-         style="opacity:0.5;filter:url(#filter0_f)">
-        <path
-           d="M 31.698,19.8945 C 36.5605,19.1836 40.2929,15.0234 40.2929,10 40.2929,4.47656 35.7831,0 30.2198,0 25.1586,0 20.9696,3.70312 20.2544,8.53125 18.934,8.18359 17.5473,8 16.117,8 7.21569,8 0,15.1641 0,24 c 0,8.8359 7.21569,16 16.117,16 8.9012,0 16.1169,-7.1641 16.1169,-16 0,-1.418 -0.1862,-2.793 -0.5359,-4.1055 z"
-           transform="translate(23.8239,44)"
-           id="path29"
-           inkscape:connector-curvature="0"
-           style="fill:#4d008a" />
-      </g>
-      <g
-         id="Bubbles">
-        <path
-           d="M 10.0731,20 C 15.6363,20 20.1462,15.5228 20.1462,10 20.1462,4.47715 15.6363,0 10.0731,0 4.50988,0 0,4.47715 0,10 0,15.5228 4.50988,20 10.0731,20 Z"
-           id="Vector_2"
-           transform="translate(43.9705,44)"
-           inkscape:connector-curvature="0"
-           style="fill:#b68ce6" />
-        <path
-           d="M 20.1462,40 C 31.2726,40 40.2924,31.0457 40.2924,20 40.2924,8.9543 31.2726,0 20.1462,0 9.01976,0 0,8.9543 0,20 0,31.0457 9.01976,40 20.1462,40 Z"
-           id="Vector_3"
-           transform="matrix(0.8,0,0,0.8,23.8239,52)"
-           inkscape:connector-curvature="0"
-           style="fill:#c9a4f3" />
-        <path
-           d="m 32.2339,0 c 0,8.83691 -7.2158,16 -16.117,16 C 7.21582,16 0,8.83691 0,0 Z"
-           id="Intersect"
-           transform="translate(23.8239,68)"
-           inkscape:connector-curvature="0"
-           style="fill:#9b60db" />
-        <path
-           d="m 11.5514,11.3613 c -0.4825,0.0703 -0.9761,0.1065 -1.4783,0.1065 C 4.50989,11.4678 0,6.99023 0,1.46777 0,0.96875 0.0368042,0.479492 0.107788,0 5.68402,1.46582 10.0748,5.82519 11.5514,11.3613 Z"
-           id="Intersect_2"
-           transform="translate(43.9705,52.5322)"
-           inkscape:connector-curvature="0"
-           style="clip-rule:evenodd;fill:#e3ccfe;fill-rule:evenodd" />
-      </g>
-      <path
-         d="m 26.8538,2 c 0,-1.104614 0.9021,-2 2.0146,-2 h 36.2632 c 1.1125,0 2.0146,0.895386 2.0146,2 v 4 c 0,1.10461 -0.9021,2 -2.0146,2 H 63.117 V 27.7131 L 92.3624,78 c 4.6529,8 -1.1632,18 -10.4681,18 H 12.1057 C 2.80084,96 -3.01529,86 1.63761,78 L 30.883,27.7131 V 8 H 28.8684 C 27.7559,8 26.8538,7.10461 26.8538,6 Z"
-         id="Overlay gradient"
-         transform="translate(1)"
-         inkscape:connector-curvature="0"
-         style="opacity:0.2;fill:url(#paint1_linear)" />
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/Azure Time Series Insights_COLOR.svg b/source/manual/Azure Time Series Insights_COLOR.svg
deleted file mode 100644
index 629392c0..00000000
--- a/source/manual/Azure Time Series Insights_COLOR.svg	
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 63 64"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-091"
-   version="1.1"
-   sodipodi:docname="Azure Time Series Insights_COLOR.svg"
-   width="63"
-   height="64"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs15" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview13"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="31.5"
-     inkscape:cy="32"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-091" />
-  <g
-     id="g10"
-     transform="translate(-0.5)">
-    <title
-       id="title2" />
-    <g
-       id="g8"
-       style="fill:#00b294">
-      <path
-         d="M 63,24.3 C 59.5,10 46.7,0 32,0 17.1,0 4,10.6 0.8,25.1 L 0.5,26.4 H 6.9 L 7.1,25.6 C 10,14.2 20.3,6.2 32,6.2 c 11.3,0 21.5,7.7 24.7,18.6 l 0.2,0.7 h 6.4 z M 56.4,40 56.2,40.7 C 52.5,50.9 42.8,57.8 32,57.8 21.4,57.8 12,51.4 8.1,41.5 L 7.8,40.8 H 1.3 l 0.5,1.4 C 6.1,55.2 18.3,64 32,64 46.1,64 58.4,54.9 62.6,41.3 L 63,40 Z"
-         id="path4"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 35.1,49 -7,-20.2 -4,7.4 H 3.3 C 1.9,36.2 0.7,35 0.7,33.6 0.7,32.2 1.9,31 3.3,31 H 21 l 8.2,-15 7.3,21.2 4.5,-7 h 19.9 c 1.4,0 2.6,1.2 2.6,2.6 0,1.4 -1.2,2.6 -2.6,2.6 H 43.8 Z"
-         id="path6"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/Azure VM Scale Set_COLOR.svg b/source/manual/Azure VM Scale Set_COLOR.svg
deleted file mode 100644
index c5affed5..00000000
--- a/source/manual/Azure VM Scale Set_COLOR.svg	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="50"
-   height="50"
-   viewBox="0 0 50 50"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="Azure VM Scale Set_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata45"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs43" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview41"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="25"
-     inkscape:cy="25.000001"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="M 35.723,0 H 2.066 C 0.923,0 0.001,1.021 0.001,2.162 v 23.439 c 0,1.134 0.922,2.144 2.066,2.144 h 33.656 c 1.141,0 2.297,-1.01 2.297,-2.144 V 2.162 C 38.02,1.018 36.864,0 35.723,0"
-     id="path2"
-     inkscape:connector-curvature="0"
-     style="fill:#a0a1a2" /><path
-     d="M 35.746,0.002 C 35.738,0.002 35.73,0 35.722,0 H 2.066 C 0.922,0.001 0,1.021 0,2.163 v 23.438 c 0,1.134 0.922,2.144 2.066,2.144 h 0.801 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="opacity:0.2;fill:#ffffff" /><polygon
-     points="2.882,2.922 35.129,2.875 35.129,24.823 2.882,24.823 "
-     id="polygon6"
-     style="fill:#59b4d9" /><path
-     d="m 19.404,1.591 c 0,0.298 -0.242,0.539 -0.54,0.539 -0.299,0 -0.539,-0.241 -0.539,-0.539 0,-0.298 0.24,-0.539 0.539,-0.539 0.298,0 0.54,0.241 0.54,0.539"
-     id="path8"
-     inkscape:connector-curvature="0"
-     style="fill:#b8d432" /><path
-     d="m 19.425,13.209 c -0.035,0 -0.069,-0.011 -0.102,-0.029 L 12.628,9.321 c -0.061,-0.036 -0.1,-0.104 -0.1,-0.175 0,-0.072 0.039,-0.139 0.1,-0.175 l 6.654,-3.834 c 0.062,-0.035 0.138,-0.035 0.2,0 l 6.697,3.861 c 0.062,0.036 0.1,0.103 0.1,0.175 0,0.073 -0.037,0.139 -0.1,0.175 l -6.652,3.833 c -0.032,0.017 -0.065,0.028 -0.102,0.028"
-     id="path10"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="M 41.671,7.456 H 8.015 c -1.144,0 -2.066,1.021 -2.066,2.162 v 23.439 c 0,1.134 0.922,2.144 2.066,2.144 h 33.656 c 1.141,0 2.297,-1.01 2.297,-2.144 V 9.618 C 43.969,8.474 42.813,7.456 41.671,7.456"
-     id="path12"
-     inkscape:connector-curvature="0"
-     style="fill:#a0a1a2" /><path
-     d="m 41.695,7.458 c -0.008,0 -0.016,-0.002 -0.024,-0.002 H 8.015 c -1.144,0 -2.066,1.021 -2.066,2.162 v 23.438 c 0,1.134 0.922,2.144 2.066,2.144 h 0.801 z"
-     id="path14"
-     inkscape:connector-curvature="0"
-     style="opacity:0.2;fill:#ffffff" /><polygon
-     points="8.83,10.378 41.078,10.331 41.078,32.279 8.83,32.279 "
-     id="polygon16"
-     style="fill:#59b4d9" /><path
-     d="m 25.352,9.047 c 0,0.298 -0.242,0.539 -0.54,0.539 -0.299,0 -0.539,-0.241 -0.539,-0.539 0,-0.298 0.24,-0.539 0.539,-0.539 0.298,0 0.54,0.24 0.54,0.539"
-     id="path18"
-     inkscape:connector-curvature="0"
-     style="fill:#b8d432" /><path
-     d="m 25.374,20.664 c -0.035,0 -0.069,-0.011 -0.102,-0.029 l -6.695,-3.859 c -0.061,-0.036 -0.1,-0.104 -0.1,-0.175 0,-0.072 0.039,-0.139 0.1,-0.175 l 6.654,-3.834 c 0.062,-0.035 0.138,-0.035 0.2,0 l 6.697,3.861 c 0.062,0.036 0.1,0.103 0.1,0.175 0,0.073 -0.037,0.139 -0.1,0.175 l -6.652,3.833 c -0.033,0.018 -0.065,0.028 -0.102,0.028"
-     id="path20"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="M 36.636,42.698 H 35.73 26.765 26.297 c 1.242,4.38 -0.427,5.008 -7.737,5.008 V 50 h 9.297 6.788 8.773 v -2.293 c -7.309,-10e-4 -8.026,-0.626 -6.782,-5.009"
-     id="path22"
-     inkscape:connector-curvature="0"
-     style="fill:#7a7a7a" /><path
-     d="M 47.703,14.955 H 14.047 c -1.144,0 -2.066,1.021 -2.066,2.162 v 23.439 c 0,1.134 0.922,2.144 2.066,2.144 H 47.703 C 48.844,42.7 50,41.69 50,40.556 V 17.117 c 0,-1.143 -1.156,-2.162 -2.297,-2.162"
-     id="path24"
-     inkscape:connector-curvature="0"
-     style="fill:#a0a1a2" /><path
-     d="m 47.727,14.958 c -0.008,0 -0.016,-0.002 -0.024,-0.002 H 14.046 c -1.144,0 -2.066,1.021 -2.066,2.162 v 23.438 c 0,1.134 0.922,2.144 2.066,2.144 h 0.801 z"
-     id="path26"
-     inkscape:connector-curvature="0"
-     style="opacity:0.2;fill:#ffffff" /><polygon
-     points="14.862,17.878 47.109,17.83 47.109,39.779 14.862,39.779 "
-     id="polygon28"
-     style="fill:#59b4d9" /><rect
-     x="18.561001"
-     y="47.706001"
-     width="24.858"
-     height="2.2939999"
-     id="rect30"
-     style="fill:#a0a1a2" /><path
-     d="m 31.384,16.546 c 0,0.298 -0.242,0.539 -0.54,0.539 -0.299,0 -0.539,-0.241 -0.539,-0.539 0,-0.298 0.24,-0.539 0.539,-0.539 0.298,0 0.54,0.241 0.54,0.539"
-     id="path32"
-     inkscape:connector-curvature="0"
-     style="fill:#b8d432" /><path
-     d="m 31.405,28.164 c -0.035,0 -0.069,-0.011 -0.102,-0.029 l -6.695,-3.859 c -0.061,-0.036 -0.1,-0.104 -0.1,-0.175 0,-0.072 0.039,-0.139 0.1,-0.175 l 6.654,-3.834 c 0.062,-0.035 0.138,-0.035 0.2,0 l 6.697,3.861 c 0.062,0.036 0.1,0.103 0.1,0.175 0,0.073 -0.037,0.139 -0.1,0.175 l -6.652,3.833 c -0.032,0.017 -0.065,0.028 -0.102,0.028"
-     id="path34"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /><path
-     d="m 30.443,37.544 c -0.038,0 -0.072,-0.009 -0.102,-0.027 L 23.666,33.67 c -0.065,-0.036 -0.104,-0.101 -0.104,-0.175 v -7.72 c 0,-0.073 0.039,-0.139 0.104,-0.175 0.062,-0.037 0.137,-0.037 0.204,0 l 6.674,3.846 c 0.059,0.038 0.099,0.104 0.099,0.177 v 7.72 c 0,0.074 -0.039,0.139 -0.099,0.175 -0.033,0.017 -0.068,0.026 -0.101,0.026"
-     id="path36"
-     inkscape:connector-curvature="0"
-     style="opacity:0.7;fill:#ffffff" /><path
-     d="m 32.333,37.544 c -0.037,0 -0.071,-0.009 -0.105,-0.027 C 32.169,37.481 32.13,37.415 32.13,37.342 V 29.67 c 0,-0.071 0.039,-0.138 0.098,-0.175 l 6.674,-3.845 c 0.064,-0.036 0.138,-0.036 0.201,0 0.064,0.036 0.102,0.102 0.102,0.175 v 7.671 c 0,0.074 -0.039,0.14 -0.102,0.175 l -6.672,3.847 c -0.028,0.017 -0.064,0.026 -0.098,0.026"
-     id="path38"
-     inkscape:connector-curvature="0"
-     style="opacity:0.4;fill:#ffffff" /></svg>
\ No newline at end of file
diff --git a/source/manual/Azure.svg b/source/manual/Azure.svg
new file mode 100644
index 00000000..f323dfbe
--- /dev/null
+++ b/source/manual/Azure.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="54pt" viewBox="0 0 70 54" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 15.992188 53.523438 L 49.0625 47.769531 L 32.050781 27.800781 L 40.910156 3.78125 L 70 53.527344 Z M 38.59375 0 L 16.054688 47.683594 L 16.054688 47.636719 L 0 47.636719 L 17.804688 17.210938 Z M 38.59375 0 "/>
+</g>
+</svg>
diff --git a/source/manual/AzureAppService.svg b/source/manual/AzureAppService.svg
new file mode 100644
index 00000000..2a196a49
--- /dev/null
+++ b/source/manual/AzureAppService.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 26.878906 46.898438 C 25.621094 45.640625 24.78125 44.101563 24.359375 42.28125 C 23.238281 37.101563 26.320313 32.058594 31.5 30.941406 C 32.621094 30.660156 33.601563 30.660156 34.578125 30.800781 C 35 26.039063 37.941406 21.699219 42.28125 19.601563 C 41.019531 19.179688 39.621094 18.898438 38.078125 18.898438 C 32.058594 18.898438 26.878906 22.820313 25.058594 28.421875 C 24.078125 28.140625 23.101563 27.859375 21.980469 27.859375 C 16.800781 27.859375 12.601563 32.058594 12.601563 37.378906 C 12.601563 42.699219 16.800781 46.898438 21.980469 46.898438 Z M 26.878906 46.898438 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 28.140625 65.101563 L 4.898438 65.101563 L 4.898438 42 L 9.660156 42 C 9.101563 40.601563 8.820313 39.058594 8.820313 37.378906 C 8.820313 37.378906 8.820313 37.238281 8.820313 37.101563 L 0 37.101563 L 0 70 L 33.039063 70 L 33.039063 50.398438 L 28.140625 50.398438 Z M 28.140625 65.101563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 60.898438 42 L 65.101563 42 L 65.101563 65.238281 L 41.859375 65.238281 L 41.859375 50.539063 L 36.960938 50.539063 L 36.960938 70 L 70 70 L 70 37.101563 L 59.640625 37.101563 C 60.339844 38.5 60.898438 39.898438 60.898438 41.71875 C 60.898438 41.71875 60.898438 41.859375 60.898438 42 Z M 60.898438 42 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 4.898438 28 L 4.898438 4.898438 L 28.140625 4.898438 L 28.140625 18.339844 C 29.539063 17.21875 31.359375 16.519531 33.039063 16.101563 L 33.039063 0 L 0 0 L 0 32.898438 L 9.519531 32.898438 C 10.21875 31.21875 11.199219 29.398438 12.601563 28.140625 Z M 4.898438 28 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 41.859375 15.539063 L 41.859375 4.898438 L 65.101563 4.898438 L 65.101563 28.140625 L 54.878906 28.140625 C 55.300781 29.539063 55.578125 31.21875 55.578125 32.898438 C 55.578125 32.898438 55.578125 33.039063 55.578125 33.039063 L 70 33.039063 L 70 0 L 36.960938 0 L 36.960938 15.261719 C 37.378906 15.261719 37.660156 15.121094 38.078125 15.121094 C 39.339844 15.261719 40.601563 15.261719 41.859375 15.539063 Z M 41.859375 15.539063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.121094 41.578125 C 57.121094 38.640625 54.738281 36.398438 51.941406 36.398438 C 51.660156 36.398438 51.519531 36.398438 51.238281 36.398438 C 51.519531 35.28125 51.800781 34.019531 51.800781 32.761719 C 51.800781 25.058594 45.640625 18.898438 37.941406 18.898438 C 31.921875 18.898438 26.738281 22.820313 24.921875 28.421875 C 23.941406 28.140625 22.960938 27.859375 21.839844 27.859375 C 16.660156 27.859375 12.460938 32.058594 12.460938 37.378906 C 12.460938 42.699219 16.660156 46.898438 21.839844 46.898438 L 52.359375 46.898438 C 55.019531 46.621094 57.121094 44.378906 57.121094 41.578125 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/source/manual/AzureApplicationGateway_COLOR.svg b/source/manual/AzureApplicationGateway_COLOR.svg
deleted file mode 100644
index 546de5b9..00000000
--- a/source/manual/AzureApplicationGateway_COLOR.svg
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg26"
-   sodipodi:docname="AzureApplicationGateway_COLOR.svg"
-   width="50.099998"
-   height="50"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata30">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview28"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="2.1316282e-014"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg26" />
-  <defs
-     id="defs4">
-    <style
-       type="text/css"
-       id="style2"><![CDATA[
-        .msportalfx-svg-c01{fill:#fff}.msportalfx-svg-c02{fill:#e5e5e5}.msportalfx-svg-c03{fill:#a0a1a2}.msportalfx-svg-c04{fill:#7a7a7a}.msportalfx-svg-c05{fill:#3e3e3e}.msportalfx-svg-c06{fill:#1e1e1e}.msportalfx-svg-c07{fill:#0f0f0f}.msportalfx-svg-c08{fill:#ba141a}.msportalfx-svg-c09{fill:#dd5900}.msportalfx-svg-c10{fill:#ff8c00}.msportalfx-svg-c11{fill:#fcd116}.msportalfx-svg-c12{fill:#fee087}.msportalfx-svg-c13{fill:#b8d432}.msportalfx-svg-c14{fill:#7fba00}.msportalfx-svg-c15{fill:#59b4d9}.msportalfx-svg-c16{fill:#3999c6}.msportalfx-svg-c17{fill:#804998}.msportalfx-svg-c18{fill:#ec008c}.msportalfx-svg-c19{fill:#0072c6}.msportalfx-svg-c20{fill:#68217a}.msportalfx-svg-c21{fill:#00188f}.msportalfx-svg-c22{fill:#e81123}.msportalfx-svg-c23{fill:#cae3f3}.msportalfx-svg-c24{fill:#59aed3}.msportalfx-svg-c25{fill:#4c3b12}.msportalfx-svg-c26{fill:#be9555}.msportalfx-svg-c27{fill:#4f4d52}.msportalfx-svg-c28{fill:#ef6f59}.msportalfx-svg-c29{fill:#f7cb64}.msportalfx-svg-c97{fill:#ffb900}.msportalfx-svg-c98{fill:#00a4ef}.msportalfx-svg-c99{fill:#f25022}
-      ]]></style>
-  </defs>
-  <g
-     id="g24">
-    <title
-       id="title6" />
-    <path
-       d="m 25,50 c -1.2,0 -2.4,-0.5 -3.3,-1.4 L 1.4,28.3 C 0.5,27.4 0,26.2 0,25 0,23.8 0.5,22.6 1.4,21.7 L 21.7,1.4 C 22.6,0.5 23.8,0 25,0 c 1.2,0 2.4,0.5 3.3,1.4 l 20.4,20.4 c 0.9,0.9 1.4,2 1.4,3.3 0,1.2 -0.5,2.4 -1.4,3.3 L 28.3,48.6 C 27.4,49.5 26.2,50 25,50"
-       class="msportalfx-svg-c14"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#7fba00" />
-    <path
-       d="m 29.738,18.584 a 7.68,7.68 0 0 1 -4.68,1.589 7.7,7.7 0 0 1 -6.131,-3.025 7.706,7.706 0 0 1 1.437,-10.811 7.643,7.643 0 0 1 4.679,-1.588 7.697,7.697 0 0 1 6.131,3.026 7.708,7.708 0 0 1 -1.436,10.809"
-       class="msportalfx-svg-c01"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="M 28.3,1.4 C 27.4,0.5 26.2,0 25,0 23.8,0 22.6,0.5 21.7,1.4 L 1.4,21.7 C 0.5,22.6 0,23.8 0,25 c 0,1.2 0.5,2.4 1.4,3.3 L 12.9,39.8 34.6,7.7 Z"
-       class="msportalfx-svg-c01"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="opacity:0.15;fill:#ffffff" />
-    <path
-       d="M 25,45.6 31.6,39 H 26.9 V 19.149 H 23 V 39 h -4.6 z"
-       class="msportalfx-svg-c01"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 39.33,33.48 v -9.334 l -3.253,3.253 -8.444,-8.444 -2.828,2.828 8.444,8.444 -3.253,3.253 z"
-       class="msportalfx-svg-c01"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 10.685,33.515 h 9.333 l -3.252,-3.252 8.681,-8.681 -2.829,-2.829 -8.681,8.681 -3.252,-3.252 z"
-       class="msportalfx-svg-c01"
-       id="path18"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 29.115,17.771 a 6.66,6.66 0 0 1 -4.058,1.378 6.673,6.673 0 0 1 -5.316,-2.623 6.682,6.682 0 0 1 1.246,-9.375 6.629,6.629 0 0 1 4.057,-1.377 6.67,6.67 0 0 1 5.316,2.624 6.682,6.682 0 0 1 -1.245,9.373"
-       class="msportalfx-svg-c15"
-       id="path20"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="m 27.886,13.635 a 1.441,1.441 0 0 0 2.018,0.269 c 0.033,-0.025 0.058,-0.056 0.088,-0.083 0.645,0.454 1.092,0.754 1.344,0.925 0.075,-0.193 0.126,-0.379 0.179,-0.573 A 35.537,35.537 0 0 1 30.367,13.275 1.437,1.437 0 0 0 30.172,11.891 1.434,1.434 0 0 0 28.316,11.523 60.051,60.051 0 0 1 26.097,9.427 C 28.549,8.108 30.291,8.301 30.291,8.301 A 6.698,6.698 0 0 0 29.326,7.312 C 28.292,7.152 26.686,7.17 24.85,8.146 L 24.849,8.145 A 53.625,53.625 0 0 1 22.981,6.082 c -0.303,0.097 -0.6,0.217 -0.886,0.36 0.468,0.766 1.098,1.538 1.807,2.292 l 0.005,0.005 a 12.44,12.44 0 0 0 -1.858,1.609 10.12,10.12 0 0 0 -0.225,0.249 2.023,2.023 0 0 0 -1.102,0.075 C 20.116,9.365 20.165,8.315 20.261,7.774 a 7.005,7.005 0 0 0 -0.72,0.874 c -0.158,0.646 -0.203,1.578 0.264,2.701 a 2.016,2.016 0 0 0 0.149,2.622 10.156,10.156 0 0 0 -0.391,2.344 c 0.063,0.086 0.063,0.156 0.126,0.24 0.321,0.411 0.724,0.758 1.113,1.072 a 7.376,7.376 0 0 1 0.459,-3.043 c 0.314,0.024 0.633,-0.026 0.932,-0.151 a 11.093,11.093 0 0 0 2.491,1.7 1.33,1.33 0 0 0 0.259,0.941 1.337,1.337 0 0 0 1.868,0.246 c 0.121,-0.093 0.217,-0.205 0.296,-0.325 1.041,0.232 1.95,0.273 2.624,0.273 0.103,0 0.582,-0.652 0.857,-1.056 -0.41,0.086 -1.628,0.253 -3.291,-0.225 a 1.329,1.329 0 0 0 -0.24,-0.53 1.323,1.323 0 0 0 -1.771,-0.303 12.61,12.61 0 0 1 -2.172,-1.5 2.027,2.027 0 0 0 0.085,-2.02 c 0.077,-0.077 0.152,-0.153 0.233,-0.229 A 14.63,14.63 0 0 1 25.176,9.994 C 25.154,9.974 25.134,9.952 25.113,9.932 l 0.064,0.061 h -0.001 c 0.835,0.772 1.72,1.504 2.559,2.158 a 1.433,1.433 0 0 0 0.151,1.484 z"
-       class="msportalfx-svg-c01"
-       id="path22"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-  </g>
-</svg>
diff --git a/source/manual/AzureBackup.svg b/source/manual/AzureBackup.svg
new file mode 100644
index 00000000..6d14562f
--- /dev/null
+++ b/source/manual/AzureBackup.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="58pt" viewBox="0 0 70 58" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 63.117188 16.066406 C 63.164063 15.582031 63.1875 15.074219 63.1875 14.570313 C 63.1875 6.535156 56.488281 0 48.277344 0 C 43.398438 0 38.921875 2.300781 36.167969 6.074219 C 34.394531 4.992188 32.339844 4.394531 30.195313 4.394531 C 24.335938 4.394531 19.507813 8.792969 18.96875 14.382813 C 19.878906 14.269531 20.789063 14.175781 21.722656 14.175781 C 26.039063 14.175781 30.195313 15.558594 33.578125 17.996094 C 36.121094 12.21875 42.582031 8.515625 49.746094 8.308594 L 49.746094 3.359375 L 58.496094 10.746094 L 49.746094 18.089844 L 49.746094 13.257813 C 45.640625 13.417969 41.648438 14.9375 39.339844 18.621094 L 39.804688 18.574219 C 48.160156 18.574219 55.066406 24.742188 56.046875 32.636719 C 58.03125 34.109375 59.59375 35.882813 60.710938 37.90625 C 66.125 36.480469 70 31.875 70 26.238281 C 70 21.703125 67.527344 18.089844 63.117188 16.066406 Z M 63.117188 16.066406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 6.882813 35.214844 C 6.835938 34.707031 6.8125 34.199219 6.8125 33.695313 C 6.8125 25.660156 13.511719 19.148438 21.722656 19.148438 C 26.601563 19.148438 31.078125 21.449219 33.832031 25.199219 C 35.609375 24.121094 37.660156 23.542969 39.808594 23.542969 C 46.015625 23.542969 51.078125 28.492188 51.078125 34.566406 L 51.054688 35.445313 C 55.253906 37.539063 57.519531 41.011719 57.519531 45.363281 C 57.519531 52.199219 51.871094 57.539063 44.660156 57.539063 L 12.855469 57.539063 C 5.644531 57.539063 0 52.199219 0 45.363281 C 0 40.851563 2.472656 37.238281 6.882813 35.214844 Z M 6.882813 35.214844 "/>
+</g>
+</svg>
diff --git a/source/manual/AzureBatch.svg b/source/manual/AzureBatch.svg
new file mode 100644
index 00000000..ac0e90ee
--- /dev/null
+++ b/source/manual/AzureBatch.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="64pt" viewBox="0 0 70 64" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 1.679688 2.78125 C 0.699219 2.78125 0 3.476563 0 4.453125 L 0 37.84375 C 0 38.816406 0.699219 39.511719 1.679688 39.511719 L 17.78125 39.511719 L 36.679688 2.78125 Z M 1.679688 2.78125 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 15.679688 16.695313 C 14.699219 16.695313 14 17.390625 14 18.363281 L 14 51.757813 C 14 52.730469 14.699219 53.425781 15.679688 53.425781 L 31.78125 53.425781 L 50.679688 16.695313 Z M 15.679688 16.695313 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.14902;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 28 38.398438 L 70 38.398438 L 70 41.183594 L 28 41.183594 Z M 28 38.398438 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.101961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 29.679688 30.609375 C 28.699219 30.609375 28 31.304688 28 32.277344 L 28 65.667969 C 28 66.644531 28.699219 67.339844 29.679688 67.339844 L 45.78125 67.339844 L 64.679688 30.609375 Z M 29.679688 30.609375 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.480469 48 L 63.28125 48 L 63.28125 50.78125 L 46.480469 50.78125 Z M 46.480469 48 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="64" style="fill:rgb(0%,0%,0%);fill-opacity:0.6;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="64"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 46.480469 58.992188 L 63.28125 58.992188 L 63.28125 61.773438 L 46.480469 61.773438 Z M 46.480469 58.992188 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 0 37.84375 C 0 38.816406 0.699219 39.511719 1.679688 39.511719 L 40.320313 39.511719 C 41.300781 39.511719 42 38.816406 42 37.84375 L 42 10.015625 L 0 10.015625 Z M 0 37.84375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 40.320313 2.78125 L 1.679688 2.78125 C 0.699219 2.78125 0 3.476563 0 4.453125 L 0 10.574219 L 42 10.574219 L 42 4.453125 C 42 3.476563 41.300781 2.78125 40.320313 2.78125 Z M 40.320313 2.78125 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 7.140625 20.3125 L 6.71875 19.894531 C 6.578125 19.757813 6.578125 19.617188 6.71875 19.476563 L 7.839844 18.503906 C 7.839844 18.503906 7.980469 18.363281 7.980469 18.363281 C 8.121094 18.363281 8.121094 18.363281 8.121094 18.503906 L 11.199219 21.84375 L 16.660156 15.027344 C 16.660156 15.027344 16.800781 14.886719 16.941406 14.886719 C 16.941406 14.886719 17.078125 14.886719 17.078125 14.886719 L 18.339844 15.859375 C 18.339844 15.859375 18.480469 16 18.480469 16 C 18.480469 16.140625 18.480469 16.140625 18.480469 16.140625 L 11.480469 24.90625 Z M 7.140625 20.3125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 7.140625 31.164063 L 6.71875 30.746094 C 6.578125 30.609375 6.578125 30.46875 6.71875 30.332031 L 7.839844 29.355469 C 7.839844 29.355469 7.980469 29.21875 7.980469 29.21875 C 8.121094 29.21875 8.121094 29.21875 8.121094 29.355469 L 11.199219 32.695313 L 16.660156 25.878906 C 16.660156 25.878906 16.800781 25.738281 16.941406 25.738281 C 16.941406 25.738281 17.078125 25.738281 17.078125 25.738281 L 18.339844 26.714844 C 18.339844 26.714844 18.480469 26.851563 18.480469 26.851563 C 18.480469 26.992188 18.480469 26.992188 18.480469 26.992188 L 11.480469 35.757813 Z M 7.140625 31.164063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 14 51.757813 C 14 52.730469 14.699219 53.425781 15.679688 53.425781 L 54.320313 53.425781 C 55.300781 53.425781 56 52.730469 56 51.757813 L 56 23.929688 L 14 23.929688 Z M 14 51.757813 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 54.320313 16.695313 L 15.679688 16.695313 C 14.699219 16.695313 14 17.390625 14 18.363281 L 14 24.488281 L 56 24.488281 L 56 18.363281 C 56 17.390625 55.300781 16.695313 54.320313 16.695313 Z M 54.320313 16.695313 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21.140625 34.226563 L 20.71875 33.808594 C 20.578125 33.667969 20.578125 33.53125 20.71875 33.390625 L 21.839844 32.417969 C 21.839844 32.417969 21.980469 32.277344 21.980469 32.277344 C 22.121094 32.277344 22.121094 32.277344 22.121094 32.417969 L 25.199219 35.757813 L 30.660156 28.9375 C 30.660156 28.9375 30.800781 28.800781 30.941406 28.800781 C 30.941406 28.800781 31.078125 28.800781 31.078125 28.800781 L 32.339844 29.773438 C 32.339844 29.773438 32.480469 29.914063 32.480469 29.914063 C 32.480469 30.050781 32.480469 30.050781 32.480469 30.050781 L 25.480469 38.816406 Z M 21.140625 34.226563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 21.140625 45.078125 L 20.71875 44.660156 C 20.578125 44.523438 20.578125 44.382813 20.71875 44.242188 L 21.839844 43.269531 C 21.839844 43.269531 21.980469 43.128906 21.980469 43.128906 C 22.121094 43.128906 22.121094 43.128906 22.121094 43.269531 L 25.199219 46.609375 L 30.660156 39.792969 C 30.660156 39.792969 30.800781 39.652344 30.941406 39.652344 C 30.941406 39.652344 31.078125 39.652344 31.078125 39.652344 L 32.339844 40.625 C 32.339844 40.625 32.480469 40.765625 32.480469 40.765625 C 32.480469 40.90625 32.480469 40.90625 32.480469 40.90625 L 25.480469 49.667969 Z M 21.140625 45.078125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 28 65.667969 C 28 66.644531 28.699219 67.339844 29.679688 67.339844 L 68.320313 67.339844 C 69.300781 67.339844 70 66.644531 70 65.667969 L 70 37.84375 L 28 37.84375 Z M 28 65.667969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(62.745098%,63.137255%,63.529412%);fill-opacity:1;" d="M 68.320313 30.609375 L 29.679688 30.609375 C 28.699219 30.609375 28 31.304688 28 32.277344 L 28 38.398438 L 70 38.398438 L 70 32.277344 C 70 31.304688 69.300781 30.609375 68.320313 30.609375 Z M 68.320313 30.609375 "/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.140625 48.140625 L 34.71875 47.722656 C 34.578125 47.582031 34.578125 47.445313 34.71875 47.304688 L 35.839844 46.332031 C 35.839844 46.332031 35.980469 46.191406 35.980469 46.191406 C 36.121094 46.191406 36.121094 46.191406 36.121094 46.332031 L 39.199219 49.667969 L 44.660156 42.851563 C 44.660156 42.851563 44.800781 42.714844 44.941406 42.714844 C 44.941406 42.714844 45.078125 42.714844 45.078125 42.714844 L 46.339844 43.6875 C 46.339844 43.6875 46.480469 43.824219 46.480469 43.824219 C 46.480469 43.964844 46.480469 43.964844 46.480469 43.964844 L 39.480469 52.730469 Z M 35.140625 48.140625 "/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 35.140625 58.992188 L 34.71875 58.574219 C 34.578125 58.433594 34.578125 58.296875 34.71875 58.15625 L 35.839844 57.183594 C 35.839844 57.183594 35.980469 57.042969 35.980469 57.042969 C 36.121094 57.042969 36.121094 57.042969 36.121094 57.183594 L 39.199219 60.523438 L 44.660156 53.703125 C 44.660156 53.703125 44.800781 53.566406 44.941406 53.566406 C 44.941406 53.566406 45.078125 53.566406 45.078125 53.566406 L 46.339844 54.539063 C 46.339844 54.539063 46.480469 54.679688 46.480469 54.679688 C 46.480469 54.816406 46.480469 54.816406 46.480469 54.816406 L 39.480469 63.582031 Z M 35.140625 58.992188 "/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+</g>
+</svg>
diff --git a/source/manual/AzureFileStorage.svg b/source/manual/AzureFileStorage.svg
new file mode 100644
index 00000000..f5725b27
--- /dev/null
+++ b/source/manual/AzureFileStorage.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="60pt" viewBox="0 0 70 60" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 43.734375 14.605469 L 21.96875 14.605469 C 20.863281 14.605469 20.132813 15.53125 20.132813 16.421875 L 20.132813 43.234375 C 20.132813 44.332031 21.070313 45.257813 21.96875 45.257813 L 47.613281 45.257813 C 48.722656 45.257813 49.449219 44.332031 49.449219 43.234375 L 49.449219 20.605469 L 43.558594 20.605469 L 43.558594 14.570313 Z M 43.003906 37.78125 L 26.578125 37.78125 L 26.578125 34.695313 L 43.003906 34.695313 Z M 43.003906 32.125 L 26.578125 32.125 L 26.578125 29.039063 L 43.003906 29.039063 Z M 43.003906 26.296875 L 26.578125 26.296875 L 26.578125 23.210938 L 43.003906 23.210938 Z M 43.003906 26.296875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,47.058824%,84.313725%);fill-opacity:1;" d="M 52.394531 0 L 17.535156 0 L 0 29.929688 L 17.535156 59.863281 L 52.394531 59.863281 L 69.929688 29.929688 Z M 47.789063 48.171875 L 22.144531 48.171875 C 19.371094 48.171875 17.152344 45.976563 17.152344 43.234375 L 17.152344 16.421875 C 17.152344 13.679688 19.371094 11.484375 22.144531 11.484375 L 45.394531 11.484375 L 52.777344 18.789063 L 52.777344 43.234375 C 52.777344 45.976563 50.558594 48.171875 47.789063 48.171875 Z M 47.789063 48.171875 "/>
+</g>
+</svg>
diff --git a/source/manual/AzureHDInsight_COLOR.svg b/source/manual/AzureHDInsight_COLOR.svg
deleted file mode 100644
index e6bd0567..00000000
--- a/source/manual/AzureHDInsight_COLOR.svg
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg20"
-   sodipodi:docname="AzureHDInsight_COLOR.svg"
-   width="24"
-   height="23.382"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata24">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview22"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="-26.309"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg20" />
-  <defs
-     id="defs4">
-    <style
-       type="text/css"
-       id="style2"><![CDATA[
-        .msportalfx-svg-c01{fill:#fff}.msportalfx-svg-c02{fill:#e5e5e5}.msportalfx-svg-c03{fill:#a0a1a2}.msportalfx-svg-c04{fill:#7a7a7a}.msportalfx-svg-c05{fill:#3e3e3e}.msportalfx-svg-c06{fill:#1e1e1e}.msportalfx-svg-c07{fill:#0f0f0f}.msportalfx-svg-c08{fill:#ba141a}.msportalfx-svg-c09{fill:#dd5900}.msportalfx-svg-c10{fill:#ff8c00}.msportalfx-svg-c11{fill:#fcd116}.msportalfx-svg-c12{fill:#fee087}.msportalfx-svg-c13{fill:#b8d432}.msportalfx-svg-c14{fill:#7fba00}.msportalfx-svg-c15{fill:#59b4d9}.msportalfx-svg-c16{fill:#3999c6}.msportalfx-svg-c17{fill:#804998}.msportalfx-svg-c18{fill:#ec008c}.msportalfx-svg-c19{fill:#0072c6}.msportalfx-svg-c20{fill:#68217a}.msportalfx-svg-c21{fill:#00188f}.msportalfx-svg-c22{fill:#e81123}.msportalfx-svg-c23{fill:#cae3f3}.msportalfx-svg-c24{fill:#59aed3}.msportalfx-svg-c25{fill:#4c3b12}.msportalfx-svg-c26{fill:#be9555}.msportalfx-svg-c27{fill:#4f4d52}.msportalfx-svg-c28{fill:#ef6f59}.msportalfx-svg-c29{fill:#f7cb64}.msportalfx-svg-c97{fill:#ffb900}.msportalfx-svg-c98{fill:#00a4ef}.msportalfx-svg-c99{fill:#f25022}
-      ]]></style>
-  </defs>
-  <g
-     id="g18"
-     transform="translate(0,-0.30900002)">
-    <title
-       id="title6">- Icon - SVG 24x24 Color</title>
-    <path
-       d="M 20.217,2.907 H 17.182 A 5.169,5.169 0 0 1 15.91,6.303 l 1.823,3.157 1.255,2.174 a 5.05,5.05 0 0 1 3.39,0.636 L 24,9.46 Z m -5.41,15.356 H 9.165 a 5.215,5.215 0 0 1 -2.36,2.984 l 1.412,2.444 h 7.566 l 1.404,-2.432 a 5.216,5.216 0 0 1 -2.38,-2.996 z m -5.48,-2.25 h 5.318 a 5.2,5.2 0 0 1 2.223,-3.55 l -2.777,-4.81 a 5.156,5.156 0 0 1 -4.188,0.01 l -2.78,4.814 a 5.199,5.199 0 0 1 2.205,3.536 z M 6.79,2.907 H 3.784 L 0,9.46 1.615,12.257 A 5.06,5.06 0 0 1 5.01,11.637 L 6.267,9.46 8.079,6.321 A 5.169,5.169 0 0 1 6.79,2.907 Z"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#59b3d8" />
-    <circle
-       cx="11.986"
-       cy="2.9070001"
-       r="2.598"
-       class="msportalfx-svg-c05"
-       id="circle10"
-       style="fill:#3e3e3e" />
-    <circle
-       cx="19.780001"
-       cy="16.763"
-       r="2.598"
-       class="msportalfx-svg-c05"
-       id="circle12"
-       style="fill:#3e3e3e" />
-    <circle
-       cx="4.1919999"
-       cy="16.763"
-       r="2.598"
-       class="msportalfx-svg-c05"
-       id="circle14"
-       style="fill:#3e3e3e" />
-    <path
-       d="m 14.807,18.263 h -3.284 a 8.395,8.395 0 0 0 3.514,5.428 h 0.746 l 1.405,-2.432 a 5.216,5.216 0 0 1 -2.38,-2.996 z M 19.78,8.365 a 8.393,8.393 0 0 0 -2.466,0.37 l 0.419,0.725 1.255,2.174 a 5.05,5.05 0 0 1 3.39,0.636 l 1.6,-2.773 A 8.348,8.348 0 0 0 19.78,8.365 Z m -2.912,4.098 -1.602,-2.774 a 8.386,8.386 0 0 0 -3.846,6.324 h 3.225 a 5.2,5.2 0 0 1 2.223,-3.55 z"
-       class="msportalfx-svg-c01"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="opacity:0.2;fill:#ffffff" />
-  </g>
-</svg>
diff --git a/source/manual/AzureIoTEdge.svg b/source/manual/AzureIoTEdge.svg
new file mode 100644
index 00000000..55b862ed
--- /dev/null
+++ b/source/manual/AzureIoTEdge.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="67pt" height="70pt" viewBox="0 0 67 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="67" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="67" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 4.640625 40.308594 C 4.640625 34.617188 8.414063 29.800781 13.625 27.90625 C 13.304688 26.867188 13.132813 25.722656 13.132813 24.582031 C 13.132813 18.171875 18.503906 13.019531 25.191406 13.019531 C 28.683594 13.019531 31.832031 14.398438 34.042969 16.667969 C 36.53125 10.863281 42.472656 6.769531 49.425781 6.769531 C 52.210938 6.769531 54.835938 7.429688 57.144531 8.589844 C 54.570313 3.503906 49.136719 0 42.847656 0 C 36.21875 0 30.554688 3.90625 28.175781 9.4375 C 26.070313 7.273438 23.070313 5.960938 19.734375 5.960938 C 13.359375 5.960938 8.238281 10.871094 8.238281 16.984375 C 8.238281 18.074219 8.402344 19.164063 8.707031 20.15625 C 3.738281 21.960938 0.140625 26.554688 0.140625 31.984375 C 0.140625 35.820313 1.910156 39.261719 4.707031 41.589844 C 4.664063 41.167969 4.640625 40.742188 4.640625 40.308594 Z M 4.640625 40.308594 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="67" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="67" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,9.411765%,56.078431%);fill-opacity:1;" d="M 56.4375 34.996094 C 55.652344 32.980469 53.746094 31.675781 51.589844 31.675781 C 50.941406 31.675781 50.304688 31.796875 49.695313 32.035156 C 49.527344 32.101563 49.382813 32.195313 49.226563 32.277344 L 44.078125 27.3125 C 44.457031 26.402344 44.667969 25.40625 44.667969 24.359375 C 44.667969 20.113281 41.222656 16.660156 36.988281 16.660156 C 34.941406 16.660156 33.082031 17.472656 31.703125 18.789063 L 28.910156 17.042969 C 28.976563 16.253906 28.886719 15.453125 28.589844 14.695313 C 27.804688 12.679688 25.902344 11.378906 23.742188 11.378906 C 23.09375 11.378906 22.457031 11.5 21.847656 11.738281 C 19.175781 12.785156 17.855469 15.820313 18.898438 18.5 C 19.683594 20.511719 21.589844 21.816406 23.746094 21.816406 C 24.394531 21.816406 25.035156 21.695313 25.640625 21.457031 C 26.058594 21.292969 26.429688 21.066406 26.785156 20.8125 L 29.539063 22.53125 C 29.394531 23.121094 29.3125 23.730469 29.3125 24.359375 C 29.3125 25.195313 29.449219 26 29.699219 26.753906 L 24.316406 30.148438 C 23.652344 29.761719 22.890625 29.535156 22.082031 29.535156 C 21.527344 29.535156 20.984375 29.636719 20.464844 29.84375 C 18.183594 30.738281 17.054688 33.328125 17.945313 35.613281 C 18.617188 37.335938 20.242188 38.445313 22.082031 38.445313 C 22.636719 38.445313 23.183594 38.34375 23.703125 38.136719 C 25.488281 37.4375 26.546875 35.695313 26.503906 33.875 L 32.140625 30.320313 C 32.839844 30.890625 33.640625 31.335938 34.507813 31.636719 L 30.871094 53.394531 C 28.355469 54.21875 26.519531 56.566406 26.519531 59.359375 C 26.519531 62.832031 29.339844 65.660156 32.800781 65.660156 C 36.265625 65.660156 39.082031 62.832031 39.082031 59.359375 C 39.082031 56.683594 37.402344 54.402344 35.046875 53.492188 L 38.671875 31.867188 C 39.648438 31.648438 40.558594 31.242188 41.359375 30.683594 L 46.539063 35.683594 C 46.300781 36.6875 46.34375 37.769531 46.746094 38.796875 C 47.53125 40.8125 49.4375 42.113281 51.59375 42.117188 C 52.242188 42.117188 52.878906 41.996094 53.488281 41.757813 C 56.160156 40.707031 57.480469 37.675781 56.4375 34.996094 Z M 56.4375 34.996094 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 65.152344 48.859375 L 1.847656 48.859375 C 0.828125 48.859375 0 49.6875 0 50.710938 L 0 68.007813 C 0 69.03125 0.828125 69.859375 1.847656 69.859375 L 65.152344 69.859375 C 66.171875 69.859375 67 69.03125 67 68.007813 L 67 50.710938 C 67 49.691406 66.167969 48.859375 65.152344 48.859375 Z M 65.152344 48.859375 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 57.230469 53.058594 L 61.417969 53.058594 L 61.417969 57.261719 L 57.230469 57.261719 Z M 57.230469 53.058594 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(72.156863%,83.137255%,19.607843%);fill-opacity:1;" d="M 57.230469 61.460938 L 61.417969 61.460938 L 61.417969 65.660156 L 57.230469 65.660156 Z M 57.230469 61.460938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 57.914063 20.632813 C 58.433594 19.078125 58.726563 17.425781 58.726563 15.699219 C 58.726563 7.03125 51.617188 0 42.847656 0 C 36.21875 0 30.554688 4.027344 28.175781 9.734375 C 26.070313 7.503906 23.070313 6.148438 19.734375 6.148438 C 13.359375 6.148438 8.238281 11.214844 8.238281 17.519531 C 8.238281 18.640625 8.402344 19.765625 8.707031 20.789063 C 3.738281 22.652344 0.140625 27.386719 0.140625 32.988281 C 0.140625 40.195313 6.007813 46.058594 13.257813 46.058594 L 53.738281 46.058594 C 61.007813 46.058594 66.863281 40.207031 66.863281 32.988281 C 66.878906 27.230469 63.128906 22.359375 57.914063 20.632813 Z M 57.914063 20.632813 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 55.136719 35.503906 C 54.371094 33.539063 52.164063 32.570313 50.203125 33.339844 C 49.765625 33.511719 49.382813 33.765625 49.050781 34.066406 L 42.359375 27.585938 C 42.925781 26.640625 43.269531 25.542969 43.269531 24.359375 C 43.269531 20.882813 40.457031 18.058594 36.988281 18.058594 C 34.929688 18.058594 33.117188 19.070313 31.972656 20.605469 L 27.363281 17.730469 C 27.613281 16.929688 27.621094 16.046875 27.292969 15.207031 C 26.523438 13.242188 24.316406 12.273438 22.359375 13.042969 C 20.398438 13.8125 19.433594 16.027344 20.199219 17.988281 C 20.96875 19.953125 23.175781 20.921875 25.132813 20.15625 C 25.738281 19.917969 26.234375 19.53125 26.628906 19.066406 L 31.199219 21.921875 C 30.882813 22.671875 30.707031 23.496094 30.707031 24.359375 C 30.707031 25.425781 30.996094 26.414063 31.464844 27.292969 L 24.25 31.84375 C 23.417969 31.003906 22.140625 30.6875 20.972656 31.144531 C 19.40625 31.761719 18.632813 33.53125 19.246094 35.105469 C 19.859375 36.675781 21.625 37.449219 23.191406 36.835938 C 24.660156 36.257813 25.417969 34.664063 25 33.171875 L 32.332031 28.550781 C 33.292969 29.625 34.605469 30.355469 36.097656 30.570313 L 32.519531 54.488281 C 29.953125 54.640625 27.917969 56.75 27.917969 59.359375 C 27.917969 62.066406 30.105469 64.261719 32.800781 64.261719 C 35.5 64.261719 37.6875 62.066406 37.6875 59.359375 C 37.6875 57.03125 36.066406 55.09375 33.898438 54.59375 L 37.488281 30.609375 C 39.023438 30.488281 40.414063 29.839844 41.4375 28.804688 L 48.140625 35.296875 C 47.722656 36.207031 47.652344 37.277344 48.046875 38.289063 C 48.8125 40.25 51.023438 41.21875 52.980469 40.453125 C 54.9375 39.683594 55.902344 37.46875 55.136719 35.503906 Z M 55.136719 35.503906 "/>
+</g>
+</svg>
diff --git a/source/manual/AzureManagementGroups.svg b/source/manual/AzureManagementGroups.svg
new file mode 100644
index 00000000..b7da0968
--- /dev/null
+++ b/source/manual/AzureManagementGroups.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="56pt" viewBox="0 0 70 56" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(49.803922%,72.941176%,0%);fill-opacity:1;" d="M 49 22.960938 L 48.597656 23.929688 L 36.074219 8.902344 L 35 9.800781 L 33.925781 8.902344 L 21.402344 23.929688 L 21 22.960938 L 12.707031 42.859375 L 15.292969 43.9375 L 21 30.238281 L 26.707031 43.9375 L 29.292969 42.859375 L 22.617188 26.84375 L 35 11.988281 L 47.382813 26.84375 L 40.707031 42.859375 L 43.292969 43.9375 L 49 30.238281 L 54.707031 43.9375 L 57.292969 42.859375 Z M 49 22.960938 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 60.199219 43.398438 C 60.199219 45.71875 58.320313 47.601563 56 47.601563 C 53.679688 47.601563 51.800781 45.71875 51.800781 43.398438 C 51.800781 41.082031 53.679688 39.199219 56 39.199219 C 58.320313 39.199219 60.199219 41.082031 60.199219 43.398438 Z M 60.199219 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 46.199219 43.398438 C 46.199219 45.71875 44.320313 47.601563 42 47.601563 C 39.679688 47.601563 37.800781 45.71875 37.800781 43.398438 C 37.800781 41.082031 39.679688 39.199219 42 39.199219 C 44.320313 39.199219 46.199219 41.082031 46.199219 43.398438 Z M 46.199219 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 42 9.800781 C 42 13.664063 38.867188 16.800781 35 16.800781 C 31.132813 16.800781 28 13.664063 28 9.800781 C 28 5.933594 31.132813 2.800781 35 2.800781 C 38.867188 2.800781 42 5.933594 42 9.800781 Z M 42 9.800781 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 26.601563 26.601563 C 26.601563 29.691406 24.09375 32.199219 21 32.199219 C 17.90625 32.199219 15.398438 29.691406 15.398438 26.601563 C 15.398438 23.507813 17.90625 21 21 21 C 24.09375 21 26.601563 23.507813 26.601563 26.601563 Z M 26.601563 26.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 54.601563 26.601563 C 54.601563 29.691406 52.09375 32.199219 49 32.199219 C 45.90625 32.199219 43.398438 29.691406 43.398438 26.601563 C 43.398438 23.507813 45.90625 21 49 21 C 52.09375 21 54.601563 23.507813 54.601563 26.601563 Z M 54.601563 26.601563 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 32.199219 43.398438 C 32.199219 45.71875 30.320313 47.601563 28 47.601563 C 25.679688 47.601563 23.800781 45.71875 23.800781 43.398438 C 23.800781 41.082031 25.679688 39.199219 28 39.199219 C 30.320313 39.199219 32.199219 41.082031 32.199219 43.398438 Z M 32.199219 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 18.199219 43.398438 C 18.199219 45.71875 16.320313 47.601563 14 47.601563 C 11.679688 47.601563 9.800781 45.71875 9.800781 43.398438 C 9.800781 41.082031 11.679688 39.199219 14 39.199219 C 16.320313 39.199219 18.199219 41.082031 18.199219 43.398438 Z M 18.199219 43.398438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 13.300781 56.558594 C 12.957031 56.53125 12.625 56.4375 12.320313 56.28125 L 2.800781 50.679688 C 1.121094 49.671875 0.0664063 47.878906 0 45.921875 L 0 10.640625 C 0.03125 8.671875 1.09375 6.863281 2.800781 5.878906 L 12.320313 0.28125 C 13.285156 -0.273438 14.515625 0.046875 15.085938 1 C 15.660156 1.953125 15.363281 3.191406 14.421875 3.78125 L 4.898438 9.378906 C 4.507813 9.691406 4.257813 10.144531 4.199219 10.640625 L 4.199219 45.921875 C 4.257813 46.417969 4.507813 46.871094 4.898438 47.179688 L 14.421875 52.78125 C 14.882813 53.058594 15.21875 53.507813 15.351563 54.035156 C 15.480469 54.558594 15.398438 55.117188 15.121094 55.578125 C 14.691406 56.164063 14.023438 56.527344 13.300781 56.558594 Z M 56.699219 0 C 57.042969 0.0273438 57.375 0.121094 57.679688 0.28125 L 67.199219 5.878906 C 68.878906 6.890625 69.933594 8.679688 70 10.640625 L 70 45.921875 C 69.96875 47.890625 68.90625 49.695313 67.199219 50.679688 L 57.679688 56.28125 C 56.714844 56.835938 55.484375 56.515625 54.914063 55.558594 C 54.339844 54.605469 54.636719 53.371094 55.578125 52.78125 L 65.101563 47.179688 C 65.492188 46.871094 65.742188 46.417969 65.800781 45.921875 L 65.800781 10.640625 C 65.742188 10.144531 65.492188 9.691406 65.101563 9.378906 L 55.578125 3.78125 C 55.117188 3.503906 54.78125 3.050781 54.648438 2.523438 C 54.519531 2 54.601563 1.445313 54.878906 0.980469 C 55.328125 0.421875 55.984375 0.0664063 56.699219 0 Z M 56.699219 0 "/>
+</g>
+</svg>
diff --git a/source/manual/AzureMediaServices.svg b/source/manual/AzureMediaServices.svg
new file mode 100644
index 00000000..0780b961
--- /dev/null
+++ b/source/manual/AzureMediaServices.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60pt" height="70pt" viewBox="0 0 60 70" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="60" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="60" height="70"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.210938 70 L 60.417969 52.5 L 60.417969 17.5 C 60.417969 17.5 35.460938 36.566406 30.210938 70 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="60" height="70" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="60" height="70"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 23.898438 45.097656 L 39.050781 35.019531 L 23.898438 35.019531 Z M 23.898438 45.097656 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(24.313725%,24.313725%,24.313725%);fill-opacity:1;" d="M 0 17.5 L 30.210938 0 L 60.421875 17.5 L 60.421875 52.5 L 30.210938 70 L 0 52.5 Z M 0 17.5 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 43.496094 20.941406 C 35.75 13.203125 23.238281 13.203125 15.484375 20.941406 C 7.742188 28.710938 7.742188 41.289063 15.484375 49.058594 C 23.226563 56.792969 35.75 56.792969 43.496094 49.058594 C 51.230469 41.296875 51.230469 28.714844 43.496094 20.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 40.78125 23.664063 C 34.539063 17.425781 24.449219 17.425781 18.199219 23.664063 C 11.957031 29.929688 11.957031 40.070313 18.199219 46.332031 C 24.441406 52.570313 34.539063 52.570313 40.78125 46.332031 C 47.019531 40.078125 47.019531 29.933594 40.78125 23.664063 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 23.898438 35.019531 L 39.050781 35.019531 L 39.109375 34.980469 L 23.898438 24.941406 Z M 23.898438 35.019531 "/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+</g>
+</svg>
diff --git a/source/manual/AzureNotificationHubs_COLOR.svg b/source/manual/AzureNotificationHubs_COLOR.svg
deleted file mode 100644
index caea1052..00000000
--- a/source/manual/AzureNotificationHubs_COLOR.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg14"
-   sodipodi:docname="AzureNotificationHubs_COLOR.svg"
-   width="50"
-   height="49.900002"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview16"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="-0.1"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg14" />
-  <defs
-     id="defs4">
-    <style
-       type="text/css"
-       id="style2"><![CDATA[
-        .msportalfx-svg-c01{fill:#fff}.msportalfx-svg-c02{fill:#e5e5e5}.msportalfx-svg-c03{fill:#a0a1a2}.msportalfx-svg-c04{fill:#7a7a7a}.msportalfx-svg-c05{fill:#3e3e3e}.msportalfx-svg-c06{fill:#1e1e1e}.msportalfx-svg-c07{fill:#0f0f0f}.msportalfx-svg-c08{fill:#ba141a}.msportalfx-svg-c09{fill:#dd5900}.msportalfx-svg-c10{fill:#ff8c00}.msportalfx-svg-c11{fill:#fcd116}.msportalfx-svg-c12{fill:#fee087}.msportalfx-svg-c13{fill:#b8d432}.msportalfx-svg-c14{fill:#7fba00}.msportalfx-svg-c15{fill:#59b4d9}.msportalfx-svg-c16{fill:#3999c6}.msportalfx-svg-c17{fill:#804998}.msportalfx-svg-c18{fill:#ec008c}.msportalfx-svg-c19{fill:#0072c6}.msportalfx-svg-c20{fill:#68217a}.msportalfx-svg-c21{fill:#00188f}.msportalfx-svg-c22{fill:#e81123}.msportalfx-svg-c23{fill:#cae3f3}.msportalfx-svg-c24{fill:#59aed3}.msportalfx-svg-c25{fill:#4c3b12}.msportalfx-svg-c26{fill:#be9555}.msportalfx-svg-c27{fill:#4f4d52}.msportalfx-svg-c28{fill:#ef6f59}.msportalfx-svg-c29{fill:#f7cb64}.msportalfx-svg-c97{fill:#ffb900}.msportalfx-svg-c98{fill:#00a4ef}.msportalfx-svg-c99{fill:#f25022}
-      ]]></style>
-  </defs>
-  <g
-     id="g12">
-    <title
-       id="title6" />
-    <path
-       d="m 13.7,27.8 v 5.4 L 1,22.4 H 50 V 6.2 C 50,2.6 47,0 43.4,0 H 6.3 C 2.6,0 0,2.2 0,5.9 v 5.9 H 36.6 V 6.4 L 49.3,17.2 H 0 v 14.9 c 0,3.7 2.7,7 6.3,7 h 13.4 l 11,10.8 0.1,-10.8 H 43.3 C 47,39.1 50,36.2 50,32.5 V 27.7 H 13.7 Z"
-       class="msportalfx-svg-c10"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#ff8c00" />
-    <path
-       d="M 6.3,39.2 H 16 l 5.7,-11.3 h -8.1 v 5.4 L 1,22.4 h 23.3 l 2.8,-5.2 H 0 v 14.9 c 0,3.7 2.7,7 6.3,7.1 z M 35.6,0 H 6.3 C 2.6,0 0,2.2 0,5.9 v 5.9 h 29.7 z"
-       class="msportalfx-svg-c01"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="opacity:0.2;fill:#ffffff" />
-  </g>
-</svg>
diff --git a/source/manual/AzurePolicy_COLOR.svg b/source/manual/AzurePolicy_COLOR.svg
deleted file mode 100644
index 9d23729d..00000000
--- a/source/manual/AzurePolicy_COLOR.svg
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg28"
-   sodipodi:docname="AzurePolicy_COLOR.svg"
-   width="16.044001"
-   height="18"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata32">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview30"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="49.044"
-     inkscape:cy="-32"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg28" />
-  <defs
-     id="defs4">
-    <style
-       type="text/css"
-       id="style2"><![CDATA[
-        .msportalfx-svg-c01{fill:#fff}.msportalfx-svg-c02{fill:#e5e5e5}.msportalfx-svg-c03{fill:#a0a1a2}.msportalfx-svg-c04{fill:#7a7a7a}.msportalfx-svg-c05{fill:#3e3e3e}.msportalfx-svg-c06{fill:#1e1e1e}.msportalfx-svg-c07{fill:#0f0f0f}.msportalfx-svg-c08{fill:#ba141a}.msportalfx-svg-c09{fill:#dd5900}.msportalfx-svg-c10{fill:#ff8c00}.msportalfx-svg-c11{fill:#fcd116}.msportalfx-svg-c12{fill:#fee087}.msportalfx-svg-c13{fill:#b8d432}.msportalfx-svg-c14{fill:#7fba00}.msportalfx-svg-c15{fill:#59b4d9}.msportalfx-svg-c16{fill:#3999c6}.msportalfx-svg-c17{fill:#804998}.msportalfx-svg-c18{fill:#ec008c}.msportalfx-svg-c19{fill:#0072c6}.msportalfx-svg-c20{fill:#68217a}.msportalfx-svg-c21{fill:#00188f}.msportalfx-svg-c22{fill:#e81123}.msportalfx-svg-c23{fill:#cae3f3}.msportalfx-svg-c24{fill:#59aed3}.msportalfx-svg-c25{fill:#4c3b12}.msportalfx-svg-c26{fill:#be9555}.msportalfx-svg-c27{fill:#4f4d52}.msportalfx-svg-c28{fill:#ef6f59}.msportalfx-svg-c29{fill:#f7cb64}.msportalfx-svg-c97{fill:#ffb900}.msportalfx-svg-c98{fill:#00a4ef}.msportalfx-svg-c99{fill:#f25022}
-      ]]></style>
-  </defs>
-  <g
-     id="g26"
-     transform="translate(-0.956)">
-    <title
-       id="title6" />
-    <circle
-       cx="8.9560003"
-       cy="9.0039997"
-       r="2.5"
-       class="msportalfx-svg-c15"
-       id="circle8"
-       style="fill:#59b4d9" />
-    <circle
-       cx="13.116"
-       cy="6.664"
-       r="1.224"
-       class="msportalfx-svg-c15"
-       id="circle10"
-       style="fill:#59b4d9" />
-    <circle
-       cx="13.116"
-       cy="11.344"
-       r="1.224"
-       class="msportalfx-svg-c15"
-       id="circle12"
-       style="fill:#59b4d9" />
-    <circle
-       cx="15.956"
-       cy="13.011"
-       r="1.044"
-       class="msportalfx-svg-c15"
-       id="circle14"
-       style="fill:#59b4d9" />
-    <circle
-       cx="15.956"
-       cy="5.0110002"
-       r="1"
-       class="msportalfx-svg-c15"
-       id="circle16"
-       style="fill:#59b4d9" />
-    <circle
-       cx="15.956"
-       cy="9.0039997"
-       r="1"
-       class="msportalfx-svg-c15"
-       id="circle18"
-       style="fill:#59b4d9" />
-    <circle
-       cx="12.644"
-       cy="2.8840001"
-       r="0.72000003"
-       class="msportalfx-svg-c16"
-       id="circle20"
-       style="fill:#3999c6" />
-    <path
-       d="M 8.976,16.344 2.396,12.662 V 5.338 L 8.976,1.656 12.26,3.494 12.986,2.25 8.976,0 0.956,4.5 v 9 l 8.02,4.5 4.01,-2.25 -0.726,-1.244 z"
-       class="msportalfx-svg-c16"
-       id="path22"
-       inkscape:connector-curvature="0"
-       style="fill:#3999c6" />
-    <circle
-       cx="12.644"
-       cy="15.116"
-       r="0.72000003"
-       class="msportalfx-svg-c16"
-       id="circle24"
-       style="fill:#3999c6" />
-  </g>
-</svg>
diff --git a/source/manual/AzureResourceGroups.svg b/source/manual/AzureResourceGroups.svg
new file mode 100644
index 00000000..8583b694
--- /dev/null
+++ b/source/manual/AzureResourceGroups.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="56pt" viewBox="0 0 70 56" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="56" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="56"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 37.914063 53.835938 C 37.746094 53.835938 37.589844 53.773438 37.472656 53.65625 C 37.355469 53.539063 37.289063 53.378906 37.289063 53.214844 L 37.289063 29.585938 C 37.289063 29.363281 37.40625 29.160156 37.597656 29.042969 L 58.121094 17.199219 C 58.316406 17.089844 58.554688 17.089844 58.75 17.199219 C 58.9375 17.3125 59.054688 17.515625 59.054688 17.738281 L 59.054688 41.367188 C 59.058594 41.589844 58.941406 41.792969 58.75 41.90625 L 38.21875 53.753906 C 38.125 53.8125 38.019531 53.839844 37.914063 53.835938 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.352941%,60%,77.647059%);fill-opacity:1;" d="M 35.066406 24.945313 C 34.957031 24.945313 34.851563 24.914063 34.757813 24.855469 L 14.164063 12.96875 C 13.96875 12.859375 13.851563 12.652344 13.851563 12.429688 C 13.851563 12.207031 13.96875 12 14.164063 11.890625 L 34.625 0.0820313 C 34.816406 -0.0273438 35.050781 -0.0273438 35.242188 0.0820313 L 55.84375 11.972656 C 56.035156 12.085938 56.152344 12.289063 56.152344 12.507813 C 56.152344 12.730469 56.035156 12.9375 55.84375 13.050781 L 35.375 24.855469 C 35.28125 24.914063 35.175781 24.945313 35.066406 24.945313 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 32.105469 53.835938 C 31.992188 53.839844 31.882813 53.808594 31.789063 53.753906 L 11.257813 41.90625 C 11.0625 41.796875 10.941406 41.589844 10.941406 41.363281 L 10.941406 17.585938 C 10.941406 17.359375 11.0625 17.152344 11.257813 17.039063 C 11.453125 16.933594 11.691406 16.933594 11.886719 17.039063 L 32.414063 28.890625 C 32.601563 29.003906 32.71875 29.210938 32.71875 29.433594 L 32.71875 53.214844 C 32.71875 53.4375 32.601563 53.640625 32.414063 53.753906 C 32.320313 53.808594 32.214844 53.835938 32.105469 53.835938 M 37.914063 53.835938 C 37.746094 53.835938 37.589844 53.773438 37.472656 53.65625 C 37.355469 53.539063 37.289063 53.378906 37.289063 53.214844 L 37.289063 29.585938 C 37.289063 29.363281 37.40625 29.160156 37.597656 29.042969 L 58.121094 17.199219 C 58.316406 17.089844 58.554688 17.089844 58.75 17.199219 C 58.9375 17.3125 59.054688 17.515625 59.054688 17.738281 L 59.054688 41.367188 C 59.058594 41.589844 58.941406 41.792969 58.75 41.90625 L 38.21875 53.753906 C 38.125 53.8125 38.019531 53.839844 37.914063 53.835938 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(47.843137%,47.843137%,47.843137%);fill-opacity:1;" d="M 13.382813 56.480469 C 13.023438 56.480469 12.671875 56.382813 12.363281 56.207031 L 2.78125 50.671875 C 1.167969 49.742188 0 47.714844 0 45.855469 L 0 10.625 C 0 8.765625 1.167969 6.738281 2.78125 5.808594 L 12.363281 0.273438 C 13.335938 -0.253906 14.550781 0.0898438 15.101563 1.046875 C 15.652344 2 15.34375 3.222656 14.402344 3.800781 L 4.820313 9.332031 C 4.480469 9.53125 4.074219 10.230469 4.074219 10.625 L 4.074219 45.855469 C 4.074219 46.246094 4.480469 46.949219 4.820313 47.144531 L 14.402344 52.679688 C 15.203125 53.136719 15.59375 54.078125 15.355469 54.972656 C 15.113281 55.863281 14.304688 56.480469 13.382813 56.480469 Z M 56.617188 0 C 56.964844 0 57.316406 0.0898438 57.636719 0.273438 L 67.21875 5.804688 C 68.832031 6.738281 70 8.765625 70 10.625 L 70 45.855469 C 70 47.714844 68.832031 49.742188 67.21875 50.671875 L 57.636719 56.203125 C 56.664063 56.730469 55.449219 56.390625 54.898438 55.433594 C 54.347656 54.476563 54.65625 53.253906 55.597656 52.679688 L 65.179688 47.144531 C 65.519531 46.949219 65.925781 46.246094 65.925781 45.855469 L 65.925781 10.625 C 65.925781 10.230469 65.519531 9.53125 65.179688 9.332031 L 55.597656 3.800781 C 54.796875 3.339844 54.40625 2.398438 54.644531 1.507813 C 54.886719 0.617188 55.695313 -0.00390625 56.617188 0 Z M 56.617188 0 "/>
+</g>
+</svg>
diff --git a/source/manual/AzureServiceFabricMesh.svg b/source/manual/AzureServiceFabricMesh.svg
new file mode 100644
index 00000000..826c5dd1
--- /dev/null
+++ b/source/manual/AzureServiceFabricMesh.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="70pt" viewBox="0 0 70 70" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(86.666667%,34.901961%,0%);fill-opacity:1;" d="M 67.617188 29.800781 C 65.648438 27.835938 62.828125 27.285156 60.351563 28.089844 L 54.808594 22.550781 C 55.738281 20.359375 55.246094 17.828125 53.5625 16.144531 C 51.882813 14.464844 49.347656 13.972656 47.160156 14.898438 L 41.617188 9.359375 C 42.425781 6.882813 41.875 4.058594 39.90625 2.09375 C 37.117188 -0.699219 32.59375 -0.699219 29.800781 2.09375 C 27.835938 4.058594 27.285156 6.882813 28.089844 9.359375 L 22.550781 14.898438 C 20.359375 13.972656 17.828125 14.464844 16.144531 16.144531 C 14.464844 17.828125 13.972656 20.359375 14.898438 22.550781 L 9.359375 28.089844 C 6.882813 27.285156 4.058594 27.835938 2.09375 29.800781 C -0.699219 32.59375 -0.699219 37.117188 2.09375 39.90625 C 4.058594 41.875 6.882813 42.425781 9.359375 41.617188 L 14.898438 47.160156 C 13.972656 49.347656 14.464844 51.882813 16.144531 53.5625 C 17.828125 55.246094 20.359375 55.738281 22.550781 54.808594 L 28.089844 60.351563 C 27.285156 62.828125 27.835938 65.648438 29.800781 67.617188 C 32.59375 70.40625 37.117188 70.40625 39.90625 67.617188 C 41.875 65.648438 42.425781 62.828125 41.617188 60.351563 L 47.160156 54.808594 C 49.347656 55.738281 51.882813 55.246094 53.5625 53.5625 C 55.246094 51.882813 55.738281 49.347656 54.808594 47.160156 L 60.351563 41.617188 C 62.828125 42.425781 65.648438 41.875 67.617188 39.90625 C 70.40625 37.117188 70.40625 32.59375 67.617188 29.800781 Z M 30.703125 56.773438 L 25.640625 51.714844 C 25.941406 51.015625 26.105469 50.246094 26.105469 49.4375 C 26.105469 48.628906 25.941406 47.859375 25.640625 47.160156 L 34.855469 37.949219 L 44.066406 47.160156 C 43.769531 47.859375 43.605469 48.628906 43.605469 49.4375 C 43.605469 50.246094 43.769531 51.015625 44.066406 51.714844 L 39.007813 56.773438 C 36.527344 54.992188 33.183594 54.992188 30.703125 56.773438 Z M 12.933594 30.703125 L 17.992188 25.640625 C 18.695313 25.941406 19.464844 26.105469 20.269531 26.105469 C 21.078125 26.105469 21.847656 25.941406 22.550781 25.640625 L 31.761719 34.855469 L 22.550781 44.066406 C 21.847656 43.769531 21.078125 43.605469 20.269531 43.605469 C 19.464844 43.605469 18.695313 43.769531 17.992188 44.066406 L 12.933594 39.007813 C 14.714844 36.527344 14.714844 33.183594 12.933594 30.703125 Z M 39.007813 12.933594 L 44.066406 17.992188 C 43.769531 18.695313 43.605469 19.464844 43.605469 20.269531 C 43.605469 21.078125 43.769531 21.847656 44.066406 22.550781 L 34.855469 31.761719 L 25.640625 22.550781 C 25.941406 21.847656 26.105469 21.078125 26.105469 20.269531 C 26.105469 19.464844 25.941406 18.695313 25.640625 17.992188 L 30.703125 12.933594 C 33.183594 14.714844 36.527344 14.714844 39.007813 12.933594 Z M 49.4375 43.605469 C 48.628906 43.605469 47.859375 43.769531 47.160156 44.066406 L 37.949219 34.855469 L 47.160156 25.640625 C 47.859375 25.941406 48.628906 26.105469 49.4375 26.105469 C 50.246094 26.105469 51.015625 25.941406 51.714844 25.640625 L 56.773438 30.703125 C 54.992188 33.183594 54.992188 36.527344 56.773438 39.007813 L 51.714844 44.066406 C 50.996094 43.761719 50.222656 43.605469 49.4375 43.605469 Z M 49.4375 43.605469 "/>
+</g>
+</svg>
diff --git a/source/manual/AzureSiteRecovery.svg b/source/manual/AzureSiteRecovery.svg
new file mode 100644
index 00000000..1b70b2fc
--- /dev/null
+++ b/source/manual/AzureSiteRecovery.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="58pt" viewBox="0 0 70 58" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 39.761719 18.78125 C 48.160156 18.78125 55.019531 24.996094 56 32.867188 C 57.960938 34.386719 59.5 36.179688 60.621094 38.113281 C 66.078125 36.734375 69.859375 32.039063 69.859375 26.375 C 69.859375 21.820313 67.339844 18.230469 63 16.15625 C 63 15.605469 63 15.191406 63 14.636719 C 63 6.628906 56.28125 0 48.160156 0 C 43.261719 0 38.78125 2.347656 35.980469 6.078125 C 34.160156 4.972656 32.199219 4.417969 29.960938 4.417969 C 24.078125 4.417969 19.320313 8.839844 18.761719 14.363281 C 19.601563 14.222656 20.578125 14.222656 21.558594 14.222656 C 25.898438 14.222656 30.800781 14.914063 34.859375 19.195313 Z M 39.761719 18.78125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,44.705882%,77.647059%);fill-opacity:1;" d="M 51.101563 35.628906 L 51.101563 34.800781 C 51.101563 28.722656 46.058594 23.753906 39.898438 23.753906 C 37.941406 23.753906 36.121094 24.304688 34.441406 25.132813 L 34.441406 25.269531 L 34.441406 25.132813 C 34.300781 25.269531 34.019531 25.269531 33.878906 25.410156 C 33.878906 25.410156 33.878906 25.410156 33.738281 25.269531 C 30.519531 27.617188 29.121094 31.210938 28.980469 35.078125 L 33.878906 35.078125 L 26.460938 43.777344 L 18.898438 35.078125 L 23.941406 35.078125 C 24.078125 29.828125 26.179688 24.855469 29.820313 21.679688 C 27.441406 20.160156 24.640625 19.332031 21.699219 19.332031 C 13.441406 19.332031 6.71875 25.824219 6.71875 33.832031 C 6.71875 34.386719 6.71875 34.800781 6.71875 35.351563 C 2.519531 37.421875 0 41.015625 0 45.570313 C 0 52.476563 5.601563 57.722656 12.878906 57.722656 L 44.660156 57.722656 C 51.941406 57.722656 57.539063 52.339844 57.539063 45.570313 C 57.539063 41.152344 55.300781 37.699219 51.101563 35.628906 Z M 51.101563 35.628906 "/>
+</g>
+</svg>
diff --git a/source/manual/AzureStreamAnalytics_COLOR.svg b/source/manual/AzureStreamAnalytics_COLOR.svg
deleted file mode 100644
index fddce670..00000000
--- a/source/manual/AzureStreamAnalytics_COLOR.svg
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg18"
-   sodipodi:docname="AzureStreamAnalytics_COLOR.svg"
-   width="39.599998"
-   height="31.799999"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata22">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview20"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="44.7"
-     inkscape:cy="-9"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg18" />
-  <defs
-     id="defs4">
-    <style
-       type="text/css"
-       id="style2"><![CDATA[
-        .msportalfx-svg-c01{fill:#fff}.msportalfx-svg-c02{fill:#e5e5e5}.msportalfx-svg-c03{fill:#a0a1a2}.msportalfx-svg-c04{fill:#7a7a7a}.msportalfx-svg-c05{fill:#3e3e3e}.msportalfx-svg-c06{fill:#1e1e1e}.msportalfx-svg-c07{fill:#0f0f0f}.msportalfx-svg-c08{fill:#ba141a}.msportalfx-svg-c09{fill:#dd5900}.msportalfx-svg-c10{fill:#ff8c00}.msportalfx-svg-c11{fill:#fcd116}.msportalfx-svg-c12{fill:#fee087}.msportalfx-svg-c13{fill:#b8d432}.msportalfx-svg-c14{fill:#7fba00}.msportalfx-svg-c15{fill:#59b4d9}.msportalfx-svg-c16{fill:#3999c6}.msportalfx-svg-c17{fill:#804998}.msportalfx-svg-c18{fill:#ec008c}.msportalfx-svg-c19{fill:#0072c6}.msportalfx-svg-c20{fill:#68217a}.msportalfx-svg-c21{fill:#00188f}.msportalfx-svg-c22{fill:#e81123}.msportalfx-svg-c23{fill:#cae3f3}.msportalfx-svg-c24{fill:#59aed3}.msportalfx-svg-c25{fill:#4c3b12}.msportalfx-svg-c26{fill:#be9555}.msportalfx-svg-c27{fill:#4f4d52}.msportalfx-svg-c28{fill:#ef6f59}.msportalfx-svg-c29{fill:#f7cb64}.msportalfx-svg-c97{fill:#ffb900}.msportalfx-svg-c98{fill:#00a4ef}.msportalfx-svg-c99{fill:#f25022}
-      ]]></style>
-  </defs>
-  <g
-     id="g16"
-     transform="translate(-5.3,-9.2)">
-    <title
-       id="title6" />
-    <g
-       class="msportalfx-svg-c14"
-       id="g14"
-       style="fill:#7fba00">
-      <path
-         d="m 39.6,30.5 1,-2.5 4.3,-1.6 -0.1,-3.6 -0.5,-0.2 -3.8,-1.2 -1.2,-2.4 1.9,-4.2 -0.1,-0.1 -2.5,-2.4 -0.5,0.3 -3.5,1.9 -2.5,-1 -1.6,-4.3 -3.6,0.1 -0.2,0.5 -1.2,3.8 -2.4,1.1 -4.1,-1.7 -2.5,2.6 0.3,0.5 1.2,2.2 c 1.9,-1.2 4.1,-1.8 6.4,-1.8 3.5,0 6.9,1.5 9.4,4.3 0,0 0,0.1 0.1,0.1 L 34,21 c 2.2,2.7 1.9,6.7 -0.8,8.9 -2.5,2.1 -6.2,1.9 -8.5,-0.3 h -0.2 c -0.5,0 -1,0.2 -1.4,0.7 L 23,30.4 c -1.5,1.6 -3.2,2.8 -5.2,3.5 l -0.6,1.4 2.4,2.3 0.2,0.2 0.5,-0.2 3.5,-1.9 2.5,1 1.6,4.3 3.6,-0.1 0.2,-0.5 1.2,-3.8 2.4,-1.1 4.2,1.9 L 42,34.8 41.5,34 Z"
-         id="path8"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 18.4,24.4 c 0,0.1 0,0.1 0,0 l -0.1,0.1 c -2.7,2.9 -7,2.9 -9.7,0 -0.3,-0.4 -0.9,-0.4 -1.2,0 -0.2,0.2 -0.2,0.4 -0.2,0.7 0,0.3 0.1,0.5 0.2,0.7 3.3,3.7 8.7,3.7 12.1,0 0,0 0,-0.1 0.1,-0.1 2.7,-2.9 7,-2.9 9.7,0 0.3,0.4 0.9,0.4 1.2,0 0.2,-0.2 0.2,-0.4 0.2,-0.7 0,-0.2 -0.1,-0.5 -0.2,-0.7 -3.4,-3.6 -8.8,-3.6 -12.1,0"
-         id="path10"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 24.5,25.6 c -1.5,0 -2.8,0.6 -3.8,1.8 0,0 0,0.1 -0.1,0.1 l -0.1,0.1 c -1.9,2 -4.3,3.2 -6.9,3.2 -2.6,0 -5.1,-1.1 -6.9,-3.2 -0.3,-0.4 -0.9,-0.4 -1.2,0 -0.2,0.2 -0.2,0.4 -0.2,0.7 0,0.2 0.1,0.5 0.2,0.7 2.2,2.4 5.1,3.7 8.1,3.7 3.1,0 6,-1.3 8.1,-3.7 0,0 0,-0.1 0.1,-0.1 l 0.1,-0.1 c 0.7,-0.8 1.7,-1.2 2.7,-1.2 1,0 1.9,0.4 2.7,1.2 0.3,0.4 0.9,0.4 1.2,0 0.2,-0.2 0.2,-0.4 0.2,-0.7 0,-0.3 -0.1,-0.5 -0.2,-0.7 -1.2,-1.2 -2.6,-1.8 -4,-1.8 m 8,-4.1 c -2.2,-2.4 -5.1,-3.7 -8.1,-3.7 -3.1,0 -6,1.3 -8.1,3.7 0,0 0,0.1 -0.1,0.1 l -0.1,0.1 c -0.7,0.8 -1.7,1.2 -2.7,1.2 -1,0 -2,-0.4 -2.7,-1.2 -0.3,-0.4 -0.9,-0.4 -1.2,0 -0.2,0.2 -0.2,0.4 -0.2,0.7 0,0.2 0.1,0.5 0.2,0.7 1,1.1 2.4,1.8 3.9,1.8 1.5,0 2.8,-0.6 3.8,-1.8 0,0 0,-0.1 0.1,-0.1 l 0.1,-0.1 c 1.9,-2 4.3,-3.2 6.9,-3.2 2.6,0 5.1,1.1 6.9,3.2 0.3,0.4 0.9,0.4 1.2,0 0.2,-0.2 0.2,-0.4 0.2,-0.7 0.2,-0.3 0.1,-0.5 -0.1,-0.7"
-         id="path12"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/source/manual/AzureWebAppForContainers.svg b/source/manual/AzureWebAppForContainers.svg
new file mode 100644
index 00000000..3aed1a8d
--- /dev/null
+++ b/source/manual/AzureWebAppForContainers.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70pt" height="51pt" viewBox="0 0 70 51" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="70" height="51"/>
+</clipPath>
+<g id="surface5" clip-path="url(#clip1)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 30.136719 0.0429688 L 60.605469 10.011719 L 60.601563 34.746094 L 30.136719 45.71875 Z M 30.136719 0.0429688 "/>
+</g>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="70" height="51"/>
+</clipPath>
+<g id="surface8" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 3.214844 12.289063 L 4.460938 11.757813 L 4.460938 10.773438 L 2.492188 11.578125 L 2.496094 33.546875 L 3 33.769531 L 3.230469 33.875 Z M 3.214844 12.289063 "/>
+</g>
+<mask id="mask2">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="70" height="51"/>
+</clipPath>
+<g id="surface11" clip-path="url(#clip3)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 10.976563 8.984375 L 10.976563 36.515625 L 11.910156 37.027344 L 11.910156 9.664063 L 14.765625 8.464844 L 14.765625 7.367188 Z M 10.976563 8.984375 "/>
+</g>
+<mask id="mask3">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="70" height="51"/>
+</clipPath>
+<g id="surface14" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 20.5 6.492188 L 20.96875 6.351563 L 20.96875 5.390625 L 19.539063 5.820313 L 18.113281 6.242188 L 16.800781 6.632813 L 16.800781 38.589844 L 17.761719 38.875 L 17.761719 7.308594 L 19.074219 6.917969 Z M 20.5 6.492188 "/>
+</g>
+<mask id="mask4">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip5">
+  <rect x="0" y="0" width="70" height="51"/>
+</clipPath>
+<g id="surface17" clip-path="url(#clip5)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 27.953125 2.972656 L 22.75 4.867188 L 22.75 41.007813 L 23.71875 41.46875 L 23.71875 5.546875 L 27.953125 4.023438 Z M 27.953125 2.972656 "/>
+</g>
+<mask id="mask5">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.501961;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip6">
+  <rect x="0" y="0" width="70" height="51"/>
+</clipPath>
+<g id="surface20" clip-path="url(#clip6)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 9.292969 10.410156 L 9.292969 9.417969 L 7.339844 10.066406 L 6.367188 10.390625 L 6.367188 34.679688 L 7.328125 35 L 7.328125 11.0625 L 8.300781 10.738281 L 9.277344 10.417969 Z M 9.292969 10.410156 "/>
+</g>
+<mask id="mask6">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.2;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip7">
+  <rect x="0" y="0" width="70" height="51"/>
+</clipPath>
+<g id="surface23" clip-path="url(#clip7)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 36.945313 51 C 34.371094 48.410156 33.40625 44.640625 34.425781 41.144531 C 35.445313 37.648438 38.285156 34.972656 41.855469 34.152344 C 42.921875 33.886719 44.035156 33.835938 45.121094 34.003906 C 45.589844 28.914063 48.6875 24.4375 53.300781 22.179688 C 51.867188 21.695313 50.359375 21.449219 48.839844 21.441406 C 42.519531 21.453125 36.929688 25.515625 35 31.496094 C 33.945313 31.140625 32.84375 30.941406 31.734375 30.902344 C 26.230469 31.019531 21.832031 35.484375 21.832031 40.949219 C 21.832031 46.417969 26.230469 50.882813 31.734375 51 Z M 36.945313 51 "/>
+</g>
+<mask id="mask7">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip8">
+  <rect x="0" y="0" width="70" height="51"/>
+</clipPath>
+<g id="surface26" clip-path="url(#clip8)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 33.085938 3.019531 C 33.085938 3.460938 32.726563 3.820313 32.28125 3.820313 C 31.832031 3.820313 31.472656 3.460938 31.472656 3.019531 C 31.472656 2.574219 31.832031 2.214844 32.28125 2.214844 C 32.726563 2.214844 33.085938 2.574219 33.085938 3.019531 Z M 33.085938 3.019531 "/>
+</g>
+<mask id="mask8">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="70" height="51" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<clipPath id="clip9">
+  <rect x="0" y="0" width="70" height="51"/>
+</clipPath>
+<g id="surface29" clip-path="url(#clip9)">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 59.167969 11.34375 C 59.167969 11.789063 58.808594 12.148438 58.363281 12.148438 C 57.914063 12.148438 57.554688 11.789063 57.554688 11.34375 C 57.554688 10.902344 57.914063 10.542969 58.363281 10.542969 C 58.808594 10.542969 59.167969 10.902344 59.167969 11.34375 Z M 59.167969 11.34375 "/>
+</g>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(50.196078%,28.627451%,59.607843%);fill-opacity:1;" d="M 0 34.660156 L 27.914063 44.90625 L 30.105469 45.71875 L 30.105469 45.710938 L 60.605469 34.710938 L 60.605469 9.957031 L 30.132813 0 L 0 9.953125 Z M 0 34.660156 "/>
+<use xlink:href="#surface5" mask="url(#mask0)"/>
+<use xlink:href="#surface8" mask="url(#mask1)"/>
+<use xlink:href="#surface11" mask="url(#mask2)"/>
+<use xlink:href="#surface14" mask="url(#mask3)"/>
+<use xlink:href="#surface17" mask="url(#mask4)"/>
+<use xlink:href="#surface20" mask="url(#mask5)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.901961%,70.588235%,85.098039%);fill-opacity:1;" d="M 69.300781 45.386719 C 69.304688 43.933594 68.726563 42.539063 67.691406 41.511719 C 66.65625 40.484375 65.253906 39.910156 63.792969 39.914063 L 63.050781 39.914063 C 63.40625 38.660156 63.605469 37.371094 63.648438 36.070313 C 63.695313 28.898438 58.472656 22.761719 51.34375 21.617188 C 44.214844 20.472656 37.3125 24.664063 35.085938 31.488281 C 34.03125 31.136719 32.929688 30.9375 31.816406 30.898438 C 26.230469 30.898438 21.699219 35.398438 21.699219 40.949219 C 21.699219 46.5 26.230469 51 31.816406 51 L 64.25 51 C 67.132813 50.691406 69.3125 48.265625 69.300781 45.386719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 31.8125 51.699219 C 25.839844 51.699219 20.996094 46.886719 20.996094 40.953125 C 20.996094 35.015625 25.839844 30.207031 31.8125 30.207031 C 32.769531 30.226563 33.722656 30.371094 34.640625 30.644531 C 36.84375 24.699219 42.542969 20.746094 48.921875 20.742188 C 57.441406 20.75 64.34375 27.609375 64.351563 36.074219 C 64.332031 37.136719 64.195313 38.195313 63.941406 39.226563 C 67.308594 39.3125 69.992188 42.042969 70 45.386719 C 70.011719 48.625 67.554688 51.351563 64.3125 51.691406 Z M 31.8125 31.601563 C 26.613281 31.601563 22.398438 35.789063 22.398438 40.953125 C 22.398438 46.117188 26.613281 50.304688 31.8125 50.304688 L 64.242188 50.304688 C 66.746094 50.007813 68.621094 47.890625 68.601563 45.386719 C 68.59375 42.75 66.445313 40.617188 63.792969 40.613281 L 62.152344 40.613281 L 62.371094 39.746094 C 62.707031 38.550781 62.902344 37.316406 62.945313 36.070313 C 62.933594 28.378906 56.660156 22.144531 48.914063 22.132813 C 42.898438 22.140625 37.578125 26.011719 35.746094 31.703125 L 35.535156 32.34375 L 34.886719 32.164063 C 33.894531 31.828125 32.859375 31.640625 31.8125 31.601563 Z M 31.8125 31.601563 "/>
+<use xlink:href="#surface23" mask="url(#mask6)"/>
+<use xlink:href="#surface26" mask="url(#mask7)"/>
+<use xlink:href="#surface29" mask="url(#mask8)"/>
+</g>
+</svg>
diff --git a/source/manual/Azure_logo_icon_50_COLOR.svg b/source/manual/Azure_logo_icon_50_COLOR.svg
deleted file mode 100644
index 355ec3d8..00000000
--- a/source/manual/Azure_logo_icon_50_COLOR.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="50"
-   height="38.66"
-   viewBox="0 0 50 38.66"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="Azure_logo_icon_50.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata13"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs11" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview9"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="25"
-     inkscape:cy="19.33"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><title
-     id="title2">Combined Shape</title><desc
-     id="desc4">Created with Sketch.</desc><g
-     id="Page-1"
-     transform="translate(0,-5.67)"><path
-       id="Combined-Shape"
-       d="M 11.423,44.326 35.046,40.17 22.894,25.748 29.222,8.402 50,44.33 Z M 27.566,5.67 11.469,40.109 V 40.075 H 0 L 12.717,18.1 Z"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" /></g></svg>
\ No newline at end of file
diff --git a/source/manual/CosmosDB_COLOR.svg b/source/manual/CosmosDB_COLOR.svg
deleted file mode 100644
index 52b1c7d0..00000000
--- a/source/manual/CosmosDB_COLOR.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   enable-background="new 0 0 24 24"
-   xml:space="preserve"
-   sodipodi:docname="CosmosDB_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata25"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs23" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview21"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="m 8.147,19.01 c 1.73,-1.219 3.716,-2.861 5.859,-5.004 2.201,-2.201 3.819,-4.167 5.008,-5.853 C 17.654,5.678 15.024,4 12,4 7.582,4 4,7.582 4,12 c 0,3.021 1.675,5.649 4.147,7.01 z"
-     id="path2"
-     inkscape:connector-curvature="0"
-     style="fill:#b8d432" /><path
-     d="m 16.127,16.127 c -1.43,1.429 -2.888,2.725 -4.318,3.863 0.064,0.002 0.127,0.01 0.191,0.01 4.418,0 8,-3.582 8,-8 0,-0.065 -0.008,-0.127 -0.01,-0.191 -1.17,1.467 -2.477,2.932 -3.863,4.318 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:#b8d432" /><path
-     d="M 23.417,0.583 C 23.075,0.241 22.578,0.079 21.956,0.079 c -1.703,0 -4.348,1.225 -7.312,3.328 0.389,0.121 0.768,0.262 1.133,0.433 2.682,-1.821 4.904,-2.761 6.18,-2.761 0.247,0 0.579,0.037 0.754,0.211 0.947,0.947 -0.966,6.391 -7.997,13.422 C 9.325,20.101 4.262,22.92 2.046,22.92 1.798,22.92 1.467,22.883 1.292,22.709 0.666,22.083 1.303,19.481 3.834,15.76 3.667,15.4 3.528,15.026 3.409,14.642 c -2.872,4.047 -4.1,7.497 -2.824,8.774 0.342,0.342 0.839,0.504 1.461,0.504 2.819,0 8.21,-3.337 13.375,-8.501 6.304,-6.305 9.884,-12.947 7.996,-14.836 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     style="fill:#0078d7" /><path
-     d="M 4,0 C 4,2.209 2.209,4 0,4 2.209,4 4,5.791 4,8 4,5.791 5.791,4 8,4 5.791,4 4,2.209 4,0 Z"
-     id="path8"
-     inkscape:connector-curvature="0"
-     style="fill:#0078d7" /><path
-     d="m 21,18 c 0,1.657 -1.343,3 -3,3 1.657,0 3,1.343 3,3 0,-1.657 1.343,-3 3,-3 -1.657,0 -3,-1.343 -3,-3 z"
-     id="path10"
-     inkscape:connector-curvature="0"
-     style="fill:#0078d7" /><path
-     d="M 8.639,13.194 H 8.312 C 8.353,13.031 8.373,12.867 8.373,12.684 8.373,11.479 7.393,10.5 6.189,10.5 H 4.146 C 4.053,10.986 4,11.487 4,12 c 0,2.164 0.863,4.123 2.258,5.563 h 2.381 c 1.205,0 2.184,-0.98 2.184,-2.184 0,-1.205 -0.98,-2.185 -2.184,-2.185 z"
-     id="path12"
-     inkscape:connector-curvature="0"
-     style="fill:#59b4d9" /><path
-     d="m 14.001,14.011 c 0.002,-0.002 0.003,-0.003 0.005,-0.005 0.296,-0.296 0.572,-0.584 0.847,-0.871 -0.373,0.188 -0.675,0.496 -0.852,0.876 z"
-     id="path14"
-     inkscape:connector-curvature="0"
-     style="fill:#59b4d9" /><path
-     d="m 16.127,16.127 c -0.936,0.936 -1.885,1.815 -2.831,2.632 0.336,0.333 0.797,0.54 1.304,0.54 h 0.665 c 2.519,-1.129 4.346,-3.519 4.676,-6.37 H 19.07 c -0.923,1.088 -1.911,2.165 -2.943,3.198 z"
-     id="path16"
-     inkscape:connector-curvature="0"
-     style="fill:#59b4d9" /><path
-     d="m 12.661,11.234 h 3.926 C 17.545,10.127 18.346,9.1 19.009,8.161 18.21,6.709 16.977,5.528 15.478,4.803 h -0.449 c -0.817,0 -1.47,0.653 -1.47,1.47 0,0.122 0.02,0.265 0.061,0.388 h -0.939 c -1.286,0 -2.307,1.021 -2.307,2.286 0,1.265 1.021,2.287 2.287,2.287 z"
-     id="path18"
-     inkscape:connector-curvature="0"
-     style="fill:#59b4d9" /></svg>
\ No newline at end of file
diff --git a/source/manual/IOT edge_COLOR.svg b/source/manual/IOT edge_COLOR.svg
deleted file mode 100644
index ca944a74..00000000
--- a/source/manual/IOT edge_COLOR.svg	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="48"
-   height="49.900002"
-   viewBox="0 0 48 49.900002"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="IOT edge_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata21"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs19" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview17"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="24"
-     inkscape:cy="25"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><path
-     d="M 46.677,34.9 H 1.323 C 0.592,34.9 0,35.492 0,36.223 V 48.577 C 0,49.308 0.592,49.9 1.323,49.9 H 46.677 C 47.408,49.9 48,49.308 48,48.577 V 36.223 C 48,35.495 47.405,34.9 46.677,34.9 Z"
-     id="path2"
-     inkscape:connector-curvature="0"
-     style="fill:#7a7a7a" /><rect
-     x="41"
-     y="37.900002"
-     width="3"
-     height="3"
-     id="rect4"
-     style="fill:#b8d432" /><rect
-     x="41"
-     y="43.900002"
-     width="3"
-     height="3"
-     id="rect6"
-     style="fill:#b8d432" /><path
-     d="m 41.492,14.737 c 0.372,-1.109 0.581,-2.291 0.581,-3.522 C 42.073,5.021 36.98,0 30.697,0 25.947,0 21.889,2.876 20.186,6.954 18.676,5.359 16.527,4.391 14.139,4.391 c -4.567,0 -8.238,3.619 -8.238,8.123 0,0.8 0.119,1.604 0.337,2.335 -3.56,1.33 -6.138,4.714 -6.138,8.713 0,5.15 4.205,9.338 9.399,9.338 h 29 c 5.208,0 9.402,-4.182 9.402,-9.338 0.011,-4.111 -2.674,-7.59 -6.409,-8.825 z"
-     id="path8"
-     inkscape:connector-curvature="0"
-     style="fill:#59b4d9" /><path
-     enable-background="new    "
-     d="m 3.325,28.792 c 0,-4.066 2.703,-7.507 6.436,-8.859 -0.229,-0.743 -0.353,-1.56 -0.353,-2.374 0,-4.579 3.849,-8.259 8.639,-8.259 2.503,0 4.758,0.984 6.341,2.606 1.785,-4.146 6.04,-7.07 11.022,-7.07 1.996,0 3.876,0.471 5.529,1.299 C 39.095,2.504 35.202,0 30.697,0 25.947,0 21.889,2.789 20.186,6.742 18.676,5.195 16.527,4.257 14.139,4.257 c -4.567,0 -8.238,3.509 -8.238,7.876 0,0.776 0.119,1.555 0.337,2.264 -3.561,1.29 -6.138,4.571 -6.138,8.449 0,2.741 1.269,5.199 3.271,6.861 -0.03,-0.301 -0.046,-0.606 -0.046,-0.915 z"
-     id="path10"
-     inkscape:connector-curvature="0"
-     style="opacity:0.2;fill:#ffffff" /><path
-     enable-background="new    "
-     d="m 40.433,24.996 c -0.563,-1.439 -1.927,-2.37 -3.473,-2.37 -0.465,0 -0.922,0.086 -1.357,0.257 -0.12,0.047 -0.224,0.115 -0.337,0.173 L 31.578,19.508 C 31.849,18.858 32,18.147 32,17.4 c 0,-3.033 -2.468,-5.5 -5.5,-5.5 -1.467,0 -2.799,0.581 -3.787,1.521 L 20.711,12.174 C 20.76,11.61 20.695,11.039 20.482,10.497 19.919,9.058 18.556,8.127 17.01,8.127 c -0.465,0 -0.922,0.086 -1.357,0.257 -1.914,0.749 -2.861,2.916 -2.113,4.829 0.563,1.439 1.927,2.37 3.472,2.37 0.001,0 0.001,0 0.001,0 0.465,0 0.922,-0.086 1.357,-0.257 0.298,-0.117 0.566,-0.279 0.818,-0.461 l 1.975,1.23 C 21.06,16.514 21,16.949 21,17.4 c 0,0.597 0.099,1.171 0.276,1.71 l -3.855,2.424 C 16.946,21.257 16.4,21.096 15.82,21.096 c -0.397,0 -0.787,0.074 -1.159,0.22 -1.634,0.64 -2.442,2.489 -1.804,4.123 0.481,1.229 1.645,2.022 2.963,2.022 0,0 0,0 10e-4,0 0.396,0 0.787,-0.074 1.159,-0.22 1.279,-0.501 2.04,-1.744 2.009,-3.044 l 4.038,-2.539 c 0.499,0.408 1.073,0.726 1.695,0.939 L 22.116,38.139 C 20.314,38.729 19,40.405 19,42.4 c 0,2.481 2.019,4.5 4.5,4.5 2.481,0 4.5,-2.019 4.5,-4.5 0,-1.913 -1.205,-3.54 -2.892,-4.19 l 2.596,-15.447 c 0.702,-0.158 1.353,-0.448 1.926,-0.846 l 3.712,3.572 c -0.172,0.716 -0.14,1.488 0.148,2.224 0.563,1.439 1.927,2.369 3.472,2.37 0.465,0 0.922,-0.086 1.357,-0.257 1.914,-0.75 2.862,-2.916 2.114,-4.83 z"
-     id="path12"
-     inkscape:connector-curvature="0"
-     style="opacity:0.2;fill:#00188f" /><path
-     d="m 39.501,25.36 c -0.549,-1.403 -2.131,-2.095 -3.534,-1.546 -0.315,0.123 -0.588,0.305 -0.825,0.518 L 30.346,19.704 C 30.752,19.028 31,18.246 31,17.4 c 0,-2.485 -2.015,-4.5 -4.5,-4.5 -1.476,0 -2.775,0.721 -3.595,1.819 l -3.301,-2.055 c 0.179,-0.571 0.183,-1.201 -0.052,-1.802 -0.549,-1.403 -2.131,-2.095 -3.534,-1.546 -1.403,0.549 -2.095,2.131 -1.546,3.534 0.549,1.403 2.131,2.095 3.534,1.546 0.434,-0.17 0.789,-0.446 1.072,-0.777 l 3.274,2.039 C 22.125,16.193 22,16.782 22,17.4 c 0,0.761 0.207,1.468 0.541,2.096 l -5.169,3.25 c -0.594,-0.601 -1.51,-0.827 -2.347,-0.499 -1.123,0.439 -1.676,1.704 -1.237,2.827 0.439,1.123 1.704,1.676 2.827,1.237 1.053,-0.412 1.594,-1.55 1.296,-2.616 l 5.252,-3.302 c 0.688,0.767 1.629,1.289 2.698,1.443 L 23.297,38.92 C 21.46,39.028 20,40.537 20,42.4 c 0,1.933 1.567,3.5 3.5,3.5 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.662 -1.161,-3.046 -2.714,-3.404 l 2.57,-17.132 c 1.101,-0.088 2.096,-0.55 2.831,-1.288 l 4.803,4.635 c -0.301,0.651 -0.35,1.416 -0.068,2.137 0.549,1.403 2.131,2.095 3.534,1.546 1.403,-0.549 2.094,-2.131 1.545,-3.534 z"
-     id="path14"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" /></svg>
\ No newline at end of file
diff --git a/source/manual/IoT_Central_50_COLOR.svg b/source/manual/IoT_Central_50_COLOR.svg
deleted file mode 100644
index 3390c490..00000000
--- a/source/manual/IoT_Central_50_COLOR.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="42"
-   height="48"
-   viewBox="0 0 42 48"
-   enable-background="new 0 0 50 50"
-   xml:space="preserve"
-   sodipodi:docname="IoT_Central_50.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata11"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs9" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="4.72"
-     inkscape:cx="21"
-     inkscape:cy="24"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><polygon
-     points="34,19.271 24.995,14 16,19.243 16,30.696 25,36 34,30.732 "
-     id="polygon2"
-     style="fill:#0072c6"
-     transform="translate(-4,-1)" /><polygon
-     points="4,21.075 14,26.789 14,22.182 8,18.753 8,15.277 24.996,5.604 42,15.321 42,34.679 25,44.393 4,32.393 4,37 25,49 46,37 46,13 25,1 4,12.951 "
-     id="polygon4"
-     style="fill:#0072c6"
-     transform="translate(-4,-1)" /></svg>
\ No newline at end of file
diff --git a/source/manual/Microsoft Genomics_COLOR.svg b/source/manual/Microsoft Genomics_COLOR.svg
deleted file mode 100644
index 87fae4cb..00000000
--- a/source/manual/Microsoft Genomics_COLOR.svg	
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 30.98089 60.021187"
-   class=""
-   role="presentation"
-   focusable="false"
-   id="FxSymbol0-08b"
-   version="1.1"
-   sodipodi:docname="Microsoft Genomics_COLOR.svg"
-   width="30.98089"
-   height="60.021187"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs15" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview13"
-     showgrid="false"
-     inkscape:zoom="3.9333333"
-     inkscape:cx="15.470019"
-     inkscape:cy="30.006869"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="FxSymbol0-08b" />
-  <g
-     id="g10"
-     transform="translate(-14.529981,0.01431773)">
-    <title
-       id="title2" />
-    <title
-       id="title4">Microsoft Genomics icon</title>
-    <path
-       d="m 26.525,38.635 c -0.242,-0.154 -0.443,-0.259 -0.619,-0.4 -1.435,-1.132 -2.948,-2.181 -4.277,-3.427 a 6.979,6.979 0 0 1 -1.249,-7.88 12.787,12.787 0 0 1 3.327,-3.608 52.382,52.382 0 0 1 9.386,-5.683 31.349,31.349 0 0 0 6.3,-3.793 16.8,16.8 0 0 0 5.919,-9.729 12.209,12.209 0 0 0 0.165,-1.238 2.537,2.537 0 1 0 -5.033,-0.64 c -0.71,4.342 -3.311,7.315 -6.962,9.469 -1.737,1.025 -3.585,1.859 -5.365,2.812 a 40.761,40.761 0 0 0 -9,6.147 c -1.716,1.627 -3.334,3.339 -4,5.706 A 11.7,11.7 0 0 0 18.158,38.5 c 0.916,0.934 1.943,1.76 2.942,2.609 a 0.752,0.752 0 0 0 0.643,0.156 c 1.579,-0.836 3.137,-1.716 4.782,-2.63 z m 6.886,9.13 c 0.55,0.347 1.053,0.668 1.56,0.984 a 10.593,10.593 0 0 1 5.225,7.758 c 0.062,0.432 0.09,0.87 0.157,1.3 a 2.515,2.515 0 0 0 2.739,2.183 2.463,2.463 0 0 0 2.27,-2.542 14.466,14.466 0 0 0 -3.451,-9.3 34.445,34.445 0 0 0 -2.946,-2.781 0.735,0.735 0 0 0 -0.642,-0.145 c -1.618,0.814 -3.217,1.66 -4.912,2.543 z"
-       class="msportalfx-svg-c10"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#ff8c00" />
-    <path
-       d="m 20.285,5.363 a 10.03,10.03 0 0 0 1.738,3.231 H 32.959 A 19.116,19.116 0 0 1 31.13,9.816 c -0.351,0.207 -0.709,0.4 -1.067,0.6 h -6.19 a 13.561,13.561 0 0 0 1.191,0.839 c 0.507,0.315 1.01,0.637 1.56,0.983 -1.7,0.883 -3.294,1.729 -4.912,2.537 A 0.736,0.736 0 0 1 21.07,14.63 34.379,34.379 0 0 1 18.124,11.849 14.466,14.466 0 0 1 14.673,2.549 2.463,2.463 0 0 1 16.942,0.01 2.515,2.515 0 0 1 19.681,2.192 c 0.067,0.432 0.1,0.869 0.157,1.3 0,0.018 0.008,0.033 0.01,0.051 H 37.103 V 3.6 a 11.97,11.97 0 0 1 -1,1.763 z m -5.559,50.519 a 16.8,16.8 0 0 1 5.919,-9.729 31.342,31.342 0 0 1 6.3,-3.793 52.408,52.408 0 0 0 9.386,-5.683 c 0.324,-0.267 0.646,-0.537 0.961,-0.815 H 26.46 a 22.566,22.566 0 0 1 -1.119,-0.975 5.4,5.4 0 0 1 -0.724,-0.843 h 14.4 a 7.7,7.7 0 0 0 0.637,-0.975 6.019,6.019 0 0 0 0.655,-2.307 H 23.434 a 7.264,7.264 0 0 1 0.032,-1.818 h 16.8 a 6.8,6.8 0 0 0 -1.36,-3.181 H 24.94 a 14.547,14.547 0 0 1 1.828,-1.818 h 10.15 c -0.921,-0.737 -1.864,-1.452 -2.79,-2.183 -0.175,-0.138 -0.376,-0.243 -0.619,-0.4 1.646,-0.914 3.2,-1.793 4.782,-2.633 a 0.752,0.752 0 0 1 0.643,0.155 c 1,0.849 2.026,1.675 2.942,2.608 a 11.7,11.7 0 0 1 3.05,12.129 c -0.67,2.367 -2.288,4.08 -4,5.707 a 40.765,40.765 0 0 1 -9,6.147 c -1.78,0.954 -3.628,1.788 -5.365,2.812 a 18.674,18.674 0 0 0 -2.194,1.521 h 7.311 l 0.117,0.073 a 12.659,12.659 0 0 1 2.216,1.745 H 22.468 A 12.115,12.115 0 0 0 20.414,54.9 h 15.83 a 10.626,10.626 0 0 1 0.586,1.817 h -17 c -0.085,0.344 -0.176,0.682 -0.235,1.044 a 2.537,2.537 0 1 1 -5.033,-0.641 12.223,12.223 0 0 1 0.164,-1.238 z"
-       class="msportalfx-svg-c15"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-  </g>
-</svg>
diff --git a/source/manual/Network security groups.svg b/source/manual/Network security groups.svg
new file mode 100644
index 00000000..2c3e63e2
--- /dev/null
+++ b/source/manual/Network security groups.svg	
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 18 18" class="" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-01e" data-type="1"><g><title>Icon-networking-67</title><path d="M16.36 8.4c0 4.84-5.85 8.74-7.12 9.53a.46.46 0 0 1-.48 0c-1.27-.79-7.12-4.69-7.12-9.53V2.58a.46.46 0 0 1 .45-.46C6.64 2 5.59 0 9 0s2.36 2 6.91 2.12a.46.46 0 0 1 .45.46z" fill="#0078d4"></path><path d="M15.75 8.45c0 4.44-5.36 8-6.53 8.74a.43.43 0 0 1-.44 0c-1.17-.72-6.53-4.3-6.53-8.74V3.11a.42.42 0 0 1 .41-.42C6.83 2.58 5.87.75 9 .75s2.17 1.83 6.34 1.94a.42.42 0 0 1 .41.42z" fill="#6bb9f2"></path><path d="M9 9V.75c3.13 0 2.17 1.83 6.34 1.94a.43.43 0 0 1 .41.43v5.34a4.89 4.89 0 0 1 0 .54zm0 0H2.28c.4 4.18 5.38 7.5 6.5 8.19a.39.39 0 0 0 .18.06H9z" fill="url(#fe5ce43f-2823-4617-bb54-57df9e778372)"></path><path d="M2.66 2.69C6.83 2.58 5.87.75 9 .75V9H2.28a4.89 4.89 0 0 1 0-.54V3.12a.43.43 0 0 1 .38-.43zM15.72 9H9v8.25a.39.39 0 0 0 .18-.06c1.16-.69 6.14-4.01 6.54-8.19z" fill="#50e6ff"></path></g><defs>
+<linearGradient id="fe5ce43f-2823-4617-bb54-57df9e778372" x1="9.01" y1=".75" x2="9.01" y2="17.25" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5ea0ef"></stop><stop offset=".18" stop-color="#559cec"></stop><stop offset=".47" stop-color="#3c91e5"></stop><stop offset=".84" stop-color="#1380da"></stop><stop offset="1" stop-color="#0078d4"></stop></linearGradient>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/source/manual/Okta_logo.svg b/source/manual/Okta_logo.svg
new file mode 100644
index 00000000..83bf4c54
--- /dev/null
+++ b/source/manual/Okta_logo.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 400 134.7" style="enable-background:new 0 0 400 134.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#007DC1;}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M50.3,33.8C22.5,33.8,0,56.3,0,84.1s22.5,50.3,50.3,50.3s50.3-22.5,50.3-50.3S78.1,33.8,50.3,33.8z
+				 M50.3,109.3c-13.9,0-25.2-11.3-25.2-25.2s11.3-25.2,25.2-25.2s25.2,11.3,25.2,25.2S64.2,109.3,50.3,109.3z"/>
+		</g>
+		<path class="st0" d="M138.7,101c0-4,4.8-5.9,7.6-3.1c12.6,12.8,33.4,34.8,33.5,34.9c0.3,0.3,0.6,0.8,1.8,1.2
+			c0.5,0.2,1.3,0.2,2.2,0.2l22.7,0c4.1,0,5.3-4.7,3.4-7.1l-37.6-38.5l-2-2c-4.3-5.1-3.8-7.1,1.1-12.3L201.2,41c1.9-2.4,0.7-7-3.5-7
+			h-20.6c-0.8,0-1.4,0-2,0.2c-1.2,0.4-1.7,0.8-2,1.2c-0.1,0.1-16.6,17.9-26.8,28.8c-2.8,3-7.8,1-7.8-3.1l0-57.1c0-2.9-2.4-4-4.3-4
+			h-16.8c-2.9,0-4.3,1.9-4.3,3.6v126.6c0,2.9,2.4,3.7,4.4,3.7h16.8c2.6,0,4.3-1.9,4.3-3.8v-1.3V101z"/>
+		<path class="st0" d="M275.9,129.6l-1.8-16.8c-0.2-2.3-2.4-3.9-4.7-3.5c-1.3,0.2-2.6,0.3-3.9,0.3c-13.4,0-24.3-10.5-25.1-23.8
+			c0-0.4,0-0.9,0-1.4V63.8c0-2.7,2-4.9,4.7-4.9l22.5,0c1.6,0,4-1.4,4-4.3V38.7c0-3.1-2-4.7-3.8-4.7h-22.7c-2.6,0-4.7-1.9-4.8-4.5
+			l0-25.5c0-1.6-1.2-4-4.3-4h-16.7c-2.1,0-4.1,1.3-4.1,3.9c0,0,0,81.5,0,81.9c0.7,27.2,23,48.9,50.3,48.9c2.3,0,4.5-0.2,6.7-0.5
+			C274.6,133.9,276.2,131.9,275.9,129.6z"/>
+	</g>
+	<g>
+		<path class="st0" d="M397.1,108.5c-14.2,0-16.4-5.1-16.4-24.2c0-0.1,0-0.1,0-0.2l0-45.9c0-1.6-1.2-4.3-4.4-4.3h-16.8
+			c-2.1,0-4.4,1.7-4.4,4.3l0,2.1c-7.3-4.2-15.8-6.6-24.8-6.6c-27.8,0-50.3,22.5-50.3,50.3c0,27.8,22.5,50.3,50.3,50.3
+			c12.5,0,23.9-4.6,32.7-12.1c4.7,7.2,12.3,12,24.2,12.1c2,0,12.8,0.4,12.8-4.7v-17.9C400,110.2,398.8,108.5,397.1,108.5z
+			 M330.4,109.3c-13.9,0-25.2-11.3-25.2-25.2c0-13.9,11.3-25.2,25.2-25.2c13.9,0,25.2,11.3,25.2,25.2
+			C355.5,98,344.2,109.3,330.4,109.3z"/>
+	</g>
+</g>
+</svg>
diff --git a/source/manual/Private-endpoints.svg b/source/manual/Private-endpoints.svg
new file mode 100644
index 00000000..f0020381
--- /dev/null
+++ b/source/manual/Private-endpoints.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 50 50" class="" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-01d" data-type="1"><g><title></title><path d="M24 7.1h3v26.8h-3z" class="msportalfx-svg-c04" fill="#7a7a7a"></path><path d="M30.9 33.5c0 2.931-2.469 5.4-5.4 5.4s-5.4-2.469-5.4-5.4 2.469-5.4 5.4-5.4 5.4 2.469 5.4 5.4z" class="msportalfx-svg-c14" fill="#57a300"></path><path d="M29.9 6.5c0 2.389-2.011 4.4-4.4 4.4s-4.4-2.011-4.4-4.4 2.011-4.4 4.4-4.4 4.4 2.011 4.4 4.4zm6.125 40.496a1.38 1.38 0 0 1-.984-.398 1.481 1.481 0 0 1 0-2.091l10.564-10.566a.856.856 0 0 0 .001-1.215L35.224 22.53a1.29 1.29 0 0 1-.469-.945c-.02-.41.149-.829.467-1.149a1.425 1.425 0 0 1 1.156-.432c.37 0 .722.154 1 .431l9.916 9.641 2.21 2.209c.447.558.604 1.487 0 2.093l-2.389 2.389-9.923 9.831a1.456 1.456 0 0 1-1.014.402h.003l-.156-.004zm-21.196 0a1.45 1.45 0 0 1-1.012-.398L3.712 36.861l-2.217-2.497c-.596-.594-.45-1.499-.012-2.052l2.229-2.232 9.924-9.648a1.417 1.417 0 0 1 1.151-.428c.367 0 .717.154.998.431.317.318.487.737.469 1.149a1.34 1.34 0 0 1-.49.965L5.589 32.726a.853.853 0 0 0-.001 1.215l10.384 10.564a1.487 1.487 0 0 1-.001 2.091c-.261.26-.611.403-.987.404l-.155-.004z" class="msportalfx-svg-c16" fill="#3999c6"></path></g><defs>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/source/manual/WVD Application groups.svg b/source/manual/WVD Application groups.svg
new file mode 100644
index 00000000..2a745985
--- /dev/null
+++ b/source/manual/WVD Application groups.svg	
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 18 18" class="" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-169" data-type="1"><g><title>Application group</title><circle cx="9" cy="9" r="8.5" fill="url(#a26c9420-22ea-437d-963a-d91a07052fe8)"></circle><path d="M7.776 10.632h2.448v2.448H7.776zM4.92 7.368h2.448V4.92H5.262a.341.341 0 0 0-.342.342zm.342 5.712h2.106v-2.448H4.92v2.106a.341.341 0 0 0 .342.342zm-.342-2.856h2.448V7.776H4.92zm5.712 2.856h2.106a.341.341 0 0 0 .342-.342v-2.106h-2.448zm-2.856-2.856h2.448V7.776H7.776zm2.856 0h2.448V7.776h-2.448zm0-5.3v2.444h2.448V5.262a.341.341 0 0 0-.342-.342zM7.776 7.368h2.448V4.92H7.776z" class="msportalfx-svg-c01" fill="#ffffff"></path></g><defs>
+<linearGradient id="a26c9420-22ea-437d-963a-d91a07052fe8" x1="9" y1="17.5" x2="9" y2=".5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#005ba1"></stop><stop offset=".168" stop-color="#0063ae"></stop><stop offset=".577" stop-color="#0072ca"></stop><stop offset=".815" stop-color="#0078d4"></stop></linearGradient>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/source/manual/WVD Host pools.svg b/source/manual/WVD Host pools.svg
new file mode 100644
index 00000000..7462e6b1
--- /dev/null
+++ b/source/manual/WVD Host pools.svg	
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 18 18" class="" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-131" data-type="1"><g><title>HostPools</title><circle cx="9" cy="9" r="8.5" fill="url(#b7b52328-afea-4ae3-a11b-e21cf942d33d)"></circle><path d="M13.046 6.635v4.709l-4.062 2.363V8.992z" fill="#32bedd"></path><path d="M13.046 6.635L8.99 9 4.928 6.635 8.99 4.272z" fill="#9cebff"></path><path d="M8.984 9v4.709l-4.056-2.365V6.635z" fill="#50e6ff"></path><path d="M4.928 11.344l4.056-2.352v4.715z" fill="#9cebff"></path><path d="M13.046 11.344L8.984 8.992v4.715z" fill="#50e6ff"></path></g><defs>
+<linearGradient id="b7b52328-afea-4ae3-a11b-e21cf942d33d" x1="9" y1="17.5" x2="9" y2=".5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#005ba1"></stop><stop offset=".168" stop-color="#0063ae"></stop><stop offset=".577" stop-color="#0072ca"></stop><stop offset=".815" stop-color="#0078d4"></stop></linearGradient>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/source/manual/WVD Users.svg b/source/manual/WVD Users.svg
new file mode 100644
index 00000000..389247ed
--- /dev/null
+++ b/source/manual/WVD Users.svg	
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 18 18" class="" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-041" data-type="1"><g><title>Icon-identity-223</title><path d="M17.22 13.92a.79.79 0 0 0 .8-.79A.28.28 0 0 0 18 13c-.31-2.5-1.74-4.54-4.46-4.54S9.35 10.22 9.07 13a.81.81 0 0 0 .72.88h7.43z" fill="#0078d4"></path><path d="M13.55 9.09a2.44 2.44 0 0 1-1.36-.4l1.35 3.52 1.33-3.49a2.54 2.54 0 0 1-1.32.37z" opacity=".8" class="msportalfx-svg-c01" fill="#ffffff"></path><circle cx="13.55" cy="6.58" r="2.51" fill="#0078d4"></circle><path d="M12.19 16.36a1.19 1.19 0 0 0 1.19-1.19.66.66 0 0 0 0-.14c-.47-3.74-2.6-6.78-6.66-6.78S.44 10.83 0 15a1.2 1.2 0 0 0 1.07 1.31h11.1z" fill="url(#f97360fa-fd13-420b-9b43-74b8dde83a11)"></path><path d="M6.77 9.14a3.72 3.72 0 0 1-2-.6l2 5.25 2-5.21a3.81 3.81 0 0 1-2 .56z" opacity=".8" class="msportalfx-svg-c01" fill="#ffffff"></path><circle cx="6.74" cy="5.39" r="3.75" fill="url(#b2ab4071-529d-4450-9443-e6dc0939cc4e)"></circle></g><defs>
+<linearGradient id="f97360fa-fd13-420b-9b43-74b8dde83a11" x1="6.7" y1="7.26" x2="6.7" y2="18.36" gradientUnits="userSpaceOnUse"><stop offset=".22" stop-color="#32d4f5"></stop><stop offset="1" stop-color="#198ab3"></stop></linearGradient>
+<linearGradient id="b2ab4071-529d-4450-9443-e6dc0939cc4e" x1="6.42" y1="1.32" x2="7.23" y2="11.39" gradientUnits="userSpaceOnUse"><stop offset=".22" stop-color="#32d4f5"></stop><stop offset="1" stop-color="#198ab3"></stop></linearGradient>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/source/manual/WVD Workspaces.svg b/source/manual/WVD Workspaces.svg
new file mode 100644
index 00000000..f032f039
--- /dev/null
+++ b/source/manual/WVD Workspaces.svg	
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 18 18" class="" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-166" data-type="1"><g><title>Workspaces</title><circle cx="9" cy="9" r="8.5" fill="url(#f9a99d0c-9195-42e6-b829-35824fadf772)"></circle><path d="M8.88 4.69a.753.753 0 0 0-.753.752v3.694a.753.753 0 0 0 .753.752h3.693a.752.752 0 0 0 .752-.752V5.442a.752.752 0 0 0-.752-.752zm.677.978a.451.451 0 0 0-.452.451v2.339a.452.452 0 0 0 .452.452H11.9a.451.451 0 0 0 .451-.452V6.119a.451.451 0 0 0-.451-.451z" fill="#7de2fb" fill-rule="evenodd"></path><path d="M4.675 7.5a.451.451 0 0 1 .451-.451h1.851a.451.451 0 0 1 .451.451v1.861a.451.451 0 0 1-.451.451H5.126a.451.451 0 0 1-.451-.451zm0 3.508a.451.451 0 0 1 .451-.451h1.851a.451.451 0 0 1 .451.451v1.851a.451.451 0 0 1-.451.451H5.126a.451.451 0 0 1-.451-.451zm3.452-.045a.451.451 0 0 1 .452-.451h1.85a.452.452 0 0 1 .452.451v1.851a.452.452 0 0 1-.452.451h-1.85a.451.451 0 0 1-.452-.451z" class="msportalfx-svg-c01" fill="#ffffff"></path></g><defs>
+<linearGradient id="f9a99d0c-9195-42e6-b829-35824fadf772" x1="9" y1="17.5" x2="9" y2=".5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#005ba1"></stop><stop offset=".168" stop-color="#0063ae"></stop><stop offset=".577" stop-color="#0072ca"></stop><stop offset=".815" stop-color="#0078d4"></stop></linearGradient>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/source/manual/active-directory.svg b/source/manual/active-directory.svg
new file mode 100644
index 00000000..21dad3e7
--- /dev/null
+++ b/source/manual/active-directory.svg
@@ -0,0 +1 @@
+<svg data-name="fluent_icons" xmlns="http://www.w3.org/2000/svg" width="18" height="18"><defs><linearGradient id="a" x1="13.25" y1="13.02" x2="8.62" y2="4.25" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1988d9"/><stop offset=".9" stop-color="#54aef0"/></linearGradient><linearGradient id="b" x1="11.26" y1="10.47" x2="14.46" y2="15.99" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#54aef0"/><stop offset=".29" stop-color="#4fabee"/><stop offset=".51" stop-color="#41a2e9"/><stop offset=".74" stop-color="#2a93e0"/><stop offset=".88" stop-color="#1988d9"/></linearGradient></defs><path fill="#50e6ff" style="isolation:isolate" d="M1.01 10.19l7.92 5.14 8.06-5.16L18 11.35l-9.07 5.84L0 11.35l1.01-1.16z"/><path fill="#fff" d="M1.61 9.53L8.93.81l7.47 8.73-7.47 4.72-7.32-4.73z"/><path fill="#50e6ff" style="isolation:isolate" d="M8.93.81v13.45L1.61 9.53 8.93.81z"/><path fill="url(#a)" d="M8.93.81v13.45l7.47-4.72L8.93.81z"/><path fill="#53b1e0" style="isolation:isolate" d="M8.93 7.76l7.47 1.78-7.47 4.72v-6.5z"/><path fill="#9cebff" style="isolation:isolate" d="M8.93 14.26L1.61 9.53l7.32-1.77v6.5z"/><path fill="url(#b)" d="M8.93 17.19L18 11.35l-1.01-1.18-8.06 5.16v1.86z"/></svg>
\ No newline at end of file
diff --git a/source/manual/app-service-containers_COLOR.svg b/source/manual/app-service-containers_COLOR.svg
deleted file mode 100644
index 1ff03ab9..00000000
--- a/source/manual/app-service-containers_COLOR.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg27"
-   sodipodi:docname="app-service-containers_COLOR.svg"
-   width="15.000011"
-   height="11.151"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata33">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs31" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview29"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="-38.849"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg27" />
-  <svg
-     id="svg-app-service\containers"
-     version="1.1"
-     width="100%"
-     height="100%">
-    <polygon
-       points="0,7.476 5.982,9.686 6.451,9.861 6.451,9.859 12.987,7.487 12.987,2.148 6.457,0 0,2.147 "
-       id="polygon2"
-       style="fill:#804998" />
-    <polygon
-       points="6.458,0.009 12.987,2.159 12.986,7.494 6.458,9.861 "
-       style="opacity:0.2;isolation:isolate;fill:#ffffff"
-       id="polygon4" />
-    <polygon
-       points="0.689,2.651 0.956,2.536 0.956,2.324 0.534,2.497 0.535,7.236 0.643,7.284 0.692,7.306 "
-       id="polygon6"
-       style="opacity:0.5" />
-    <polygon
-       points="2.352,1.938 2.352,7.876 2.552,7.986 2.552,2.084 3.164,1.826 3.164,1.589 "
-       id="polygon8"
-       style="opacity:0.5" />
-    <polygon
-       points="4.393,1.4 4.493,1.37 4.493,1.163 4.187,1.255 3.881,1.346 3.6,1.431 3.6,8.323 3.806,8.385 3.806,1.576 4.087,1.492 "
-       id="polygon10"
-       style="opacity:0.5" />
-    <polygon
-       points="5.99,0.641 4.875,1.05 4.875,8.845 5.083,8.944 5.083,1.196 5.99,0.868 "
-       id="polygon12"
-       style="opacity:0.5" />
-    <polygon
-       points="1.991,2.245 1.991,2.031 1.782,2.101 1.573,2.171 1.364,2.241 1.364,7.48 1.57,7.549 1.57,2.386 1.779,2.316 1.988,2.247 "
-       id="polygon14"
-       style="opacity:0.5" />
-    <path
-       d="M 14.85,9.789 A 1.177,1.177 0 0 0 13.67,8.609 H 13.511 A 3.466,3.466 0 0 0 13.639,7.78 3.137,3.137 0 0 0 7.518,6.792 2.487,2.487 0 0 0 6.818,6.664 2.168,2.168 0 0 0 6.818,11 h 6.95 A 1.212,1.212 0 0 0 14.85,9.789"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="m 6.817,11.151 a 2.318,2.318 0 0 1 0,-4.636 2.267,2.267 0 0 1 0.606,0.095 3.262,3.262 0 0 1 3.06,-2.136 3.31,3.31 0 0 1 3.307,3.307 3.163,3.163 0 0 1 -0.088,0.68 1.331,1.331 0 0 1 1.298,1.328 1.362,1.362 0 0 1 -1.219,1.36 z m 0,-4.335 a 2.017,2.017 0 0 0 0,4.034 h 6.949 A 1.059,1.059 0 0 0 14.7,9.789 1.031,1.031 0 0 0 13.67,8.76 H 13.318 L 13.365,8.573 A 3.359,3.359 0 0 0 13.488,7.78 3.01,3.01 0 0 0 10.482,4.774 2.967,2.967 0 0 0 7.66,6.838 L 7.615,6.976 7.476,6.937 A 2.341,2.341 0 0 0 6.817,6.816 Z"
-       id="path18"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="M 7.917,11 A 2.167,2.167 0 0 1 8.969,7.366 1.761,1.761 0 0 1 9.669,7.334 3.162,3.162 0 0 1 11.422,4.784 3.005,3.005 0 0 0 10.466,4.625 3.12,3.12 0 0 0 7.5,6.793 2.487,2.487 0 0 0 6.8,6.665 2.168,2.168 0 0 0 6.8,11 Z"
-       style="opacity:0.2;isolation:isolate;fill:#ffffff"
-       id="path20"
-       inkscape:connector-curvature="0" />
-    <circle
-       cx="6.9169998"
-       cy="0.65100002"
-       r="0.17299999"
-       id="circle22"
-       style="opacity:0.4" />
-    <circle
-       cx="12.506"
-       cy="2.447"
-       r="0.17299999"
-       id="circle24"
-       style="opacity:0.4" />
-  </svg>
-</svg>
diff --git a/source/manual/azure-application-gateway_COLOR.svg b/source/manual/azure-application-gateway_COLOR.svg
deleted file mode 100644
index ea549bad..00000000
--- a/source/manual/azure-application-gateway_COLOR.svg
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="-226.7 398.7 36.2 34.3"
-   style="enable-background:new -226.7 398.7 36.2 34.3;"
-   xml:space="preserve"
-   sodipodi:docname="Azure Application Gateway.svg"
-   inkscape:export-filename="C:\Sources\PlantUML-Azure\Azure Symbols\ManualSource\Azure Application Gateway.png"
-   inkscape:export-xdpi="600"
-   inkscape:export-ydpi="600"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
-     id="metadata63"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs61" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1537"
-     inkscape:window-height="748"
-     id="namedview59"
-     showgrid="false"
-     inkscape:zoom="1.7201167"
-     inkscape:cx="-198.84081"
-     inkscape:cy="-110.44502"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1" /><style
-     type="text/css"
-     id="style2">
-	.st0{fill:#0078D7;}
-	.st1{fill:none;}
-</style><v:documentProperties
-     v:viewMarkup="false"
-     v:langID="1033"><v:userDefs><v:ud
-         v:nameU="visTLShowProps"
-         v:prompt=""
-         v:val="VT0(0):26" /></v:userDefs></v:documentProperties><title
-     id="title4">Sheet.169</title><path
-     class="st0"
-     d="M-197.7,422h-6.2l2.2-2.2l-4.2-4.2v10.1h3.1l-4.4,4.4l-4.4-4.4h3.1v-10l-4.2,4.2l2.2,2.2h-6.2v-6.2l2.2,2.2  l5.3-5.3c-0.8-0.3-1.4-0.9-2-1.6c-1.7-2.3-1.3-5.5,1-7.2c0.9-0.7,2-1.1,3.1-1.1c1.5,0,3.1,0.7,4.1,2c1.7,2.3,1.3,5.5-1,7.2  c-0.3,0.3-0.7,0.5-1,0.6l5.3,5.3l2.2-2.2v6.2H-197.7z M-207.2,433c0.8,0,1.6-0.3,2.2-0.9l13.6-13.5c0.6-0.6,0.9-1.4,0.9-2.2  c0-0.9-0.3-1.6-0.9-2.2l-13.6-13.6c-0.6-0.6-1.4-0.9-2.2-0.9s-1.6,0.3-2.2,0.9l-13.5,13.5c-0.6,0.6-0.9,1.4-0.9,2.2  c0,0.8,0.3,1.6,0.9,2.2l13.5,13.5C-208.8,432.6-208,433-207.2,433z M-210,411.4c0.8,0.7,1.8,1,2.8,1c0.9,0,1.9-0.3,2.7-0.9  c0.1-0.1,0.3-0.2,0.4-0.3c-0.4,0-1,0-1.7-0.2c-0.1,0.1-0.1,0.2-0.2,0.2c-0.4,0.3-0.9,0.2-1.3-0.2c-0.1-0.2-0.2-0.4-0.2-0.6  c-0.4-0.2-0.9-0.5-1.3-0.8c-0.1-0.1-0.3-0.2-0.4-0.3c-0.2,0.1-0.4,0.1-0.6,0.1C-210,410.2-210.1,410.9-210,411.4L-210,411.4z   M-210,411.4C-210.1,411.4-210.1,411.4-210,411.4C-210.1,411.4-210.1,411.4-210,411.4L-210,411.4z M-210.9,410.5  C-210.8,410.6-210.8,410.5-210.9,410.5L-210.9,410.5z M-210.9,410.5c0-0.5,0.1-1,0.3-1.5l-0.1-0.1c-0.4-0.5-0.4-1.2,0-1.6  c-0.3-0.7-0.3-1.4-0.2-1.8C-211.9,406.9-212,408.9-210.9,410.5z M-210.4,404.8c-0.1,0.4-0.1,1.1,0.3,1.9c0.2-0.1,0.5-0.1,0.7,0  c0.1-0.1,0.1-0.1,0.2-0.2c0.4-0.4,0.8-0.8,1.2-1.1l0,0c-0.5-0.5-0.9-1-1.2-1.5c-0.3,0.1-0.5,0.3-0.7,0.5  C-210.1,404.5-210.3,404.7-210.4,404.8z M-209.2,403.9c0.6-0.2,0.6-0.2,0.6-0.3C-209.2,403.9-209.2,403.9-209.2,403.9z   M-208.6,403.7c0.4,0.5,0.8,0.9,1.2,1.4l0,0c1.2-0.6,2.3-0.7,3-0.6c-0.8-0.7-1.8-1-2.8-1C-207.7,403.5-208.1,403.6-208.6,403.7z   M-204.4,404.5c0.2,0.2,0.4,0.4,0.7,0.7l0,0C-203.9,404.9-204.1,404.7-204.4,404.5L-204.4,404.5z M-203.7,405.2  c-0.1,0-1.2-0.1-2.8,0.8c0.5,0.5,1,1,1.5,1.4c0.4-0.2,0.9-0.1,1.2,0.3c0.2,0.3,0.3,0.6,0.1,0.9c0.4,0.3,0.6,0.5,0.8,0.6  C-202.6,407.8-202.8,406.4-203.7,405.2L-203.7,405.2z M-202.9,409.1C-202.9,409.2-202.9,409.1-202.9,409.1L-202.9,409.1z   M-202.9,409.3c0,0.1,0,0.1-0.1,0.2C-203,409.4-203,409.3-202.9,409.3z M-203,409.5c-0.2-0.1-0.5-0.3-0.9-0.6c0,0,0,0-0.1,0  c-0.4,0.3-1,0.2-1.3-0.2c-0.2-0.3-0.3-0.7-0.1-1c-0.6-0.4-1.1-0.9-1.7-1.4c-0.4,0.3-0.8,0.6-1.2,0.9c-0.1,0.1-0.1,0.1-0.2,0.2  c0.2,0.4,0.2,0.9-0.1,1.3c0.1,0.1,0.2,0.1,0.3,0.2c0.4,0.3,0.8,0.6,1.2,0.8c0.4-0.3,0.9-0.2,1.2,0.2c0.1,0.1,0.1,0.2,0.2,0.4  c1.1,0.3,1.9,0.2,2.2,0.1C-203.3,410.1-203.1,409.8-203,409.5L-203,409.5z M-203,409.4C-203,409.5-203,409.5-203,409.4  C-203,409.5-203,409.5-203,409.4z M-203.5,410.4c0,0,0,0.1-0.1,0.1C-203.6,410.5-203.5,410.5-203.5,410.4L-203.5,410.4z   M-207.1,406.3C-207.1,406.3-207.2,406.3-207.1,406.3C-207.2,406.3-207.1,406.3-207.1,406.3L-207.1,406.3z M-207.1,406.3  L-207.1,406.3L-207.1,406.3z"
-     id="path6" /><path
-     class="st1"
-     d="M-207.2,433c0.8,0,1.6-0.3,2.2-0.9l13.6-13.5c0.6-0.6,0.9-1.4,0.9-2.2c0-0.9-0.3-1.6-0.9-2.2l-13.6-13.6  c-0.6-0.6-1.4-0.9-2.2-0.9s-1.6,0.3-2.2,0.9l-13.5,13.5c-0.6,0.6-0.9,1.4-0.9,2.2c0,0.8,0.3,1.6,0.9,2.2l13.5,13.5  C-208.8,432.6-208,433-207.2,433"
-     id="path8" /><path
-     class="st1"
-     d="M-210,411.4c0.8,0.7,1.8,1,2.8,1c0.9,0,1.9-0.3,2.7-0.9c0.1-0.1,0.3-0.2,0.4-0.3c-0.4,0-1,0-1.7-0.2  c-0.1,0.1-0.1,0.2-0.2,0.2c-0.4,0.3-0.9,0.2-1.3-0.2c-0.1-0.2-0.2-0.4-0.2-0.6c-0.4-0.2-0.9-0.5-1.3-0.8c-0.1-0.1-0.3-0.2-0.4-0.3  c-0.2,0.1-0.4,0.1-0.6,0.1C-210,410.2-210.1,410.9-210,411.4"
-     id="path10" /><path
-     class="st1"
-     d="M-210,411.4C-210.1,411.4-210.1,411.4-210,411.4C-210.1,411.4-210.1,411.4-210,411.4"
-     id="path14" /><path
-     class="st1"
-     d="M-210.9,410.5C-210.8,410.6-210.8,410.5-210.9,410.5L-210.9,410.5"
-     id="path18" /><path
-     class="st1"
-     d="M-210.9,410.5c0-0.5,0.1-1,0.3-1.5l-0.1-0.1c-0.4-0.5-0.4-1.2,0-1.6c-0.3-0.7-0.3-1.4-0.2-1.8  C-211.9,406.9-212,408.9-210.9,410.5"
-     id="path20" /><path
-     class="st1"
-     d="M-210.9,405.4"
-     id="path22" /><path
-     class="st1"
-     d="M-210.4,404.8c-0.1,0.4-0.1,1.1,0.3,1.9c0.2-0.1,0.5-0.1,0.7,0c0.1-0.1,0.1-0.1,0.2-0.2  c0.4-0.4,0.8-0.8,1.2-1.1l0,0c-0.5-0.5-0.9-1-1.2-1.5c-0.3,0.1-0.5,0.3-0.7,0.5C-210.1,404.5-210.3,404.7-210.4,404.8"
-     id="path24" /><path
-     class="st1"
-     d="M-209.2,403.9c0.6-0.2,0.6-0.2,0.6-0.3C-209.2,403.9-209.2,403.9-209.2,403.9"
-     id="path26" /><path
-     class="st1"
-     d="M-208.6,403.7c0.4,0.5,0.8,0.9,1.2,1.4l0,0c1.2-0.6,2.3-0.7,3-0.6c-0.8-0.7-1.8-1-2.8-1  C-207.7,403.5-208.1,403.6-208.6,403.7"
-     id="path28" /><path
-     class="st1"
-     d="M-204.4,404.5c0.2,0.2,0.4,0.4,0.7,0.7l0,0C-203.9,404.9-204.1,404.7-204.4,404.5L-204.4,404.5"
-     id="path30" /><path
-     class="st1"
-     d="M-203.7,405.2c-0.1,0-1.2-0.1-2.8,0.8c0.5,0.5,1,1,1.5,1.4c0.4-0.2,0.9-0.1,1.2,0.3c0.2,0.3,0.3,0.6,0.1,0.9  c0.4,0.3,0.6,0.5,0.8,0.6C-202.6,407.8-202.8,406.4-203.7,405.2L-203.7,405.2"
-     id="path32" /><path
-     class="st1"
-     d="M-202.9,409.1C-202.9,409.2-202.9,409.1-202.9,409.1"
-     id="path34" /><path
-     class="st1"
-     d="M-202.9,409.3c0,0.1,0,0.1-0.1,0.2C-203,409.4-203,409.3-202.9,409.3"
-     id="path38" /><path
-     class="st1"
-     d="M-203,409.5c-0.2-0.1-0.5-0.3-0.9-0.6c0,0,0,0-0.1,0c-0.4,0.3-1,0.2-1.3-0.2c-0.2-0.3-0.3-0.7-0.1-1  c-0.6-0.4-1.1-0.9-1.7-1.4c-0.4,0.3-0.8,0.6-1.2,0.9c-0.1,0.1-0.1,0.1-0.2,0.2c0.2,0.4,0.2,0.9-0.1,1.3c0.1,0.1,0.2,0.1,0.3,0.2  c0.4,0.3,0.8,0.6,1.2,0.8c0.4-0.3,0.9-0.2,1.2,0.2c0.1,0.1,0.1,0.2,0.2,0.4c1.1,0.3,1.9,0.2,2.2,0.1  C-203.3,410.1-203.1,409.8-203,409.5"
-     id="path40" /><path
-     class="st1"
-     d="M-203,409.4C-203,409.5-203,409.5-203,409.4C-203,409.5-203,409.5-203,409.4"
-     id="path44" /><path
-     class="st1"
-     d="M-203.5,410.4c0,0,0,0.1-0.1,0.1C-203.6,410.5-203.5,410.5-203.5,410.4"
-     id="path46" /><path
-     class="st1"
-     d="M-207.1,406.3C-207.1,406.3-207.2,406.3-207.1,406.3C-207.2,406.3-207.1,406.3-207.1,406.3"
-     id="path50" /><path
-     class="st1"
-     d="M-207.1,406.3L-207.1,406.3"
-     id="path54" /></svg>
\ No newline at end of file
diff --git a/source/manual/azure-maps_COLOR.svg b/source/manual/azure-maps_COLOR.svg
deleted file mode 100644
index 65cc1bdd..00000000
--- a/source/manual/azure-maps_COLOR.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg31"
-   sodipodi:docname="azure-maps_COLOR.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   width="97.401855"
-   height="124.224">
-  <metadata
-     id="metadata37">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs35" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1377"
-     id="namedview33"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="49.790503"
-     inkscape:cy="63.20745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g28" />
-  <svg
-     id="svg-azure-maps"
-     version="1.1"
-     width="100%"
-     height="100%"
-     transform="translate(-0.20949656,11.016549)">
-    <g
-       id="g28"
-       transform="translate(-12.711864,-7.2033898)"
-       style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1">
-      <polygon
-         points="120.8935,23.0518 161.1095,120.7008 161.8345,122.3458 134.5415,1.8748 "
-         id="polygon20"
-         style="fill:#0babd1"
-         transform="translate(-53.389831,-3.8135593)" />
-      <polygon
-         points="143.3627,77.609 68.3657,106.76 121.0737,22.992 "
-         id="polygon22"
-         style="fill:#0058a1"
-         transform="translate(-53.389831,-3.8135593)" />
-      <polygon
-         points="161.8368,122.3505 143.3628,77.6115 118.6388,87.2115 "
-         id="polygon24"
-         style="fill:#1e74bd"
-         transform="translate(-53.389831,-3.8135593)" />
-      <path
-         d="m 81.150669,-3.8131593 c -0.635,0 -1.236,0.323 -1.583,0.873 l -66.356,104.9449993 c -0.433,0.684 -0.377,1.568 0.137,2.193 0.364,0.442 0.899,0.683 1.448,0.683 0.227,0 0.457,-0.041 0.678,-0.127 l 49.451,-19.203 42.340001,34.44 c 0.343,0.279 0.762,0.42 1.183,0.42 0.342,0 0.684,-0.093 0.988,-0.281 0.679,-0.422 1.017,-1.228 0.84,-2.007 L 82.979669,-2.3531593 c -0.168,-0.739 -0.764,-1.304 -1.51,-1.433 -0.107,-0.018 -0.214,-0.027 -0.319,-0.027 m 0,1.874 27.298001,120.4759993 -43.186001,-35.127 -50.283,19.525 66.171,-104.8739993"
-         id="path26"
-         inkscape:connector-curvature="0"
-         style="fill:#ffffff" />
-    </g>
-  </svg>
-</svg>
diff --git a/source/manual/azure-policy_COLOR.svg b/source/manual/azure-policy_COLOR.svg
deleted file mode 100644
index 34584592..00000000
--- a/source/manual/azure-policy_COLOR.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg aria-hidden="true" role="presentation">
-<svg id="svg-azure-policy"> <path fill="#0072C6" d="M21.8,18c0.3,0.3,0.8,0.3,1.1,0l0,0c0.3-0.3,0.3-0.8,0-1.1l-3.6-3.6c-0.2-0.2-0.5-0.2-0.7,0l-0.4,0.4 			c-0.2,0.2-0.2,0.5,0,0.7L21.8,18z"></path> <path opacity="0.1" fill="#FFFFFF" d="M18.4,13.4L23,18c0.3-0.3,0.3-0.8,0-1.1l-3.6-3.6c-0.2-0.2-0.5-0.2-0.7,0L18.4,13.4z"></path> <path fill="#FFFFFF" d="M0.3,0.4h15v4.8c0,0-2.5,1.5-2.6,3.7c0,1.9,1,3.6,2.7,4.4V17l-0.1,6.5L0.4,23.3L0.3,0.4z"></path> <polygon fill="#4A4A4A" points="3.9,6.8 13.8,6.8 13.8,5.8 3.9,5.8 3.9,6.8 			"></polygon> <polygon fill="#4A4A4A" points="3.9,10.8 13.8,10.8 13.8,9.8 3.9,9.8 3.9,10.8 			"></polygon> <polygon fill="#4A4A4A" points="3.9,14.8 13.8,14.8 13.8,13.8 3.9,13.8 3.9,14.8 			"></polygon> <polygon fill="#4A4A4A" points="14.9,13.2 14.9,23 1,23 1,14 1,11 1,1 14.9,1 14.9,5.3 15.9,5 15.9,0 0,0 0,11 0,14 0,24 15.9,24  				15.9,13.4 			"></polygon> <circle fill="#EEF7FB" cx="14.2" cy="9.2" r="4.2"></circle> <path fill="#4A4A4A" d="M9.5,9.2c0,2.6,2.1,4.7,4.6,4.7c1.1,0,2.3-0.4,3.1-1.2l0.7,0.7l0,0c-0.2,0.2-0.2,0.6,0,0.8l4,4 			c0.3,0.3,0.9,0.3,1.2,0l0,0c0.3-0.3,0.3-0.9,0-1.2l-4-4c-0.2-0.2-0.6-0.2-0.8,0l0,0l-0.7-0.7c1.7-1.9,1.5-4.9-0.4-6.6 			s-4.9-1.5-6.6,0.4C9.9,6.9,9.5,8,9.5,9.2L9.5,9.2z M18.4,13.8l0.4-0.4l4,4c0.1,0.1,0.1,0.3,0,0.4c-0.1,0.1-0.3,0.1-0.4,0 			L18.4,13.8z M10,9.2c0-2.3,1.8-4.1,4.1-4.1s4.1,1.8,4.1,4.1s-1.8,4.1-4.1,4.1C11.9,13.2,10.1,11.4,10,9.2L10,9.2z"></path> </svg>
-</svg>
\ No newline at end of file
diff --git a/source/manual/container-instances_COLOR.svg b/source/manual/container-instances_COLOR.svg
deleted file mode 100644
index ac6778f8..00000000
--- a/source/manual/container-instances_COLOR.svg
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg23"
-   sodipodi:docname="container-instances_COLOR.svg"
-   width="135.99071"
-   height="136.26958"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata29">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs27" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview25"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="49.999872"
-     inkscape:cy="86.269"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg23" />
-  <svg
-     id="svg-container-instances"
-     version="1.1"
-     width="100%"
-     height="100%"
-     transform="translate(-1.2821264e-4,5.7505693e-4)">
-    <path
-       d="M 114.978,31.772 A 32.577,32.577 0 0 0 56.009,14.548 25.789,25.789 0 0 0 15.231,41.306 24.494,24.494 0 0 0 25.314,88.116 h 82.96 a 28.573,28.573 0 0 0 6.7,-56.344 z"
-       transform="translate(-0.834,-1)"
-       id="path2"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="M 114.978,31.772 A 32.577,32.577 0 0 0 56.009,14.548 25.789,25.789 0 0 0 15.231,41.306 24.494,24.494 0 0 0 25.314,88.116 h 82.96 a 28.573,28.573 0 0 0 6.7,-56.344 z"
-       transform="translate(-0.834,-1)"
-       style="opacity:0.6;isolation:isolate;fill:#25a8e0"
-       id="path4"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 36.063,60.807 a 2.732,2.732 0 0 0 -2.731,2.731 v 71 a 2.732,2.732 0 0 0 2.731,2.731 H 101.6 a 2.732,2.732 0 0 0 2.731,-2.731 v -71 A 2.732,2.732 0 0 0 101.6,60.807 Z"
-       transform="translate(-0.834,-1)"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#672a7b" />
-    <path
-       d="m 36.063,60.807 a 2.732,2.732 0 0 0 -2.731,2.731 v 71 a 2.732,2.732 0 0 0 2.731,2.731 h 8.193 L 93.412,60.807 Z"
-       transform="translate(-0.834,-1)"
-       style="opacity:0.15;isolation:isolate;fill:#ffffff"
-       id="path8"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 74.159,44.422"
-       transform="translate(-0.834,-1)"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:none" />
-    <path
-       d="M 96.006,55.345"
-       transform="translate(-0.834,-1)"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:none" />
-    <polygon
-       points="54.345,40.691 68,21.574 81.655,40.691 73.462,40.691 73.462,59.807 62.538,59.807 62.538,40.691 "
-       id="polygon14"
-       style="fill:#ffffff" />
-    <path
-       d="M 74.159,44.422"
-       transform="translate(-0.834,-1)"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="fill:#804997" />
-    <path
-       d="M 90.681,69 H 41.524 v 60.08 H 96.143 V 69 Z M 57.91,123.618 H 46.986 V 74.462 H 57.91 Z m 16.386,0 H 63.372 V 74.462 H 74.3 Z m 16.386,0 H 79.757 V 74.462 h 10.924 z"
-       transform="translate(-0.834,-1)"
-       style="opacity:0.3;isolation:isolate;fill:#b92025"
-       id="path18"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 90.681,69 H 41.524 v 60.08 H 96.143 V 69 Z M 57.91,123.618 H 46.986 V 74.462 H 57.91 Z m 16.386,0 H 63.372 V 74.462 H 74.3 Z m 16.386,0 H 79.757 V 74.462 h 10.924 z"
-       transform="translate(-0.834,-1)"
-       style="isolation:isolate;fill:#ffffff"
-       id="path20"
-       inkscape:connector-curvature="0" />
-  </svg>
-</svg>
diff --git a/source/manual/ddos-protection_COLOR.svg b/source/manual/ddos-protection_COLOR.svg
deleted file mode 100644
index 5c9d137b..00000000
--- a/source/manual/ddos-protection_COLOR.svg
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg25"
-   sodipodi:docname="ddos-protection_COLOR.svg"
-   width="154"
-   height="210.07001"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata31">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs29" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview27"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="160.16"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg25" />
-  <svg
-     id="svg-ddos-protection"
-     version="1.1"
-     width="100%"
-     height="100%"
-     transform="translate(0,-0.09)">
-    <path
-       style="fill:#7fba00"
-       d="m 131,25.14 v 0 C 84.74,20 77,0.09 77,0.09 77,0.09 66.58,26.32 0,26.32 v 107.6 c 0,13 7.23,25.2 17.24,35.85 v 0 c 22.7,24.14 59.76,40.39 59.76,40.39 0,0 77,-33.72 77,-76.24 V 26.32 a 208.8,208.8 0 0 1 -23,-1.18 z"
-       id="path2"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.4;isolation:isolate;fill:#b8d432"
-       d="m 96.06,69.6 35,-44.46 C 84.74,20 77,0.09 77,0.09 77,0.09 66.58,26.32 0,26.32 v 107.6 c 0,13 7.23,25.2 17.24,35.85 l 25.84,-32.86 z"
-       id="path4"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#3e3e3e"
-       d="m 108.95,156.06 a 5.61,5.61 0 0 1 -5.66,5.66 h -55 a 5.61,5.61 0 0 1 -5.66,-5.66 V 54.28 a 5.61,5.61 0 0 1 5.66,-5.66 h 55 a 5.61,5.61 0 0 1 5.66,5.66 z"
-       id="path6"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#1e1e1e"
-       d="m 52.16,109.69 a 7.14,7.14 0 0 1 7.23,-7.23 h 33 a 7.14,7.14 0 0 1 7.23,7.23 v 0 a 7.14,7.14 0 0 1 -7.23,7.23 h -33 a 7.29,7.29 0 0 1 -7.25,-7.23 z"
-       id="path8"
-       inkscape:connector-curvature="0" />
-    <circle
-       style="fill:#b8d432"
-       cx="59.860001"
-       cy="109.69"
-       r="4.7600002"
-       id="circle10" />
-    <path
-       style="fill:#1e1e1e"
-       d="M 52.16,88.19 A 7.14,7.14 0 0 1 59.39,81 h 33 a 7.14,7.14 0 0 1 7.23,7.23 v 0 a 7.14,7.14 0 0 1 -7.23,7.23 h -33 a 7.26,7.26 0 0 1 -7.25,-7.23 z"
-       id="path12"
-       inkscape:connector-curvature="0" />
-    <circle
-       style="fill:#b8d432"
-       cx="59.860001"
-       cy="88.190002"
-       r="4.7600002"
-       id="circle14" />
-    <path
-       style="fill:#1e1e1e"
-       d="m 52.16,66.93 a 7.14,7.14 0 0 1 7.23,-7.23 h 33 a 7.14,7.14 0 0 1 7.23,7.23 v 0 a 7.14,7.14 0 0 1 -7.23,7.23 h -33 a 7.42,7.42 0 0 1 -7.25,-7.23 z"
-       id="path16"
-       inkscape:connector-curvature="0" />
-    <circle
-       style="fill:#b8d432"
-       cx="59.860001"
-       cy="66.93"
-       r="4.7600002"
-       id="circle18" />
-    <line
-       style="fill:none"
-       x1="43.099998"
-       y1="136.91"
-       x2="108.95"
-       y2="54.279999"
-       id="line20" />
-    <path
-       style="opacity:0.1;isolation:isolate;fill:#ffffff"
-       d="M 43.1,136.91 96,69.6 108.8,53.31 a 5.59,5.59 0 0 0 -5.57,-4.69 h -54.9 a 5.61,5.61 0 0 0 -5.66,5.66 v 83.19 z"
-       id="path22"
-       inkscape:connector-curvature="0" />
-  </svg>
-</svg>
diff --git a/source/manual/disks_COLOR.svg b/source/manual/disks_COLOR.svg
deleted file mode 100644
index 8b474528..00000000
--- a/source/manual/disks_COLOR.svg
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg23"
-   sodipodi:docname="disks_COLOR.svg"
-   width="147.851"
-   height="125.685"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata29">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs27" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview25"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="75.685"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg23" />
-  <svg
-     id="svg-disks"
-     width="100%"
-     height="100%"
-     version="1.1">
-    <path
-       d="m 147.851,98.912 c 0,14.788 -33.1,26.773 -73.925,26.773 C 33.101,125.685 0,113.7 0,98.912 v -14.43 h 147.851 z"
-       id="path2"
-       inkscape:connector-curvature="0"
-       style="fill:#7fba00" />
-    <path
-       d="m 147.851,84.482 c 0,14.788 -33.1,26.773 -73.925,26.773 C 33.101,111.255 0,99.27 0,84.482 0,69.694 33.1,57.709 73.925,57.709 c 40.825,0 73.926,11.991 73.926,26.773"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#b8d432" />
-    <path
-       d="m 97.62,82.941 c 0,3.933 -10.61,7.118 -23.7,7.118 -13.09,0 -23.7,-3.185 -23.7,-7.118 0,-3.933 10.613,-7.118 23.7,-7.118 13.087,0 23.7,3.188 23.7,7.118"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#7fba00" />
-    <path
-       isolation="isolate"
-       d="M 127.362,66.14 C 117.006,62.216 103.4,59.43 88.1,58.354 l -9.6,17.754 a 54.679,54.679 0 0 1 12.2,1.958 z"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="opacity:0.25;isolation:isolate;fill:#ffffff" />
-    <path
-       isolation="isolate"
-       d="m 17.452,101.9 c 10.648,4.563 25.424,7.815 42.25,9 L 70.918,90.145 A 60.208,60.208 0 0 1 58.593,88.513 Z"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="opacity:0.25;isolation:isolate;fill:#ffffff" />
-    <path
-       d="m 147.851,41.2 c 0,14.788 -33.1,26.773 -73.925,26.773 C 33.101,67.973 0,55.988 0,41.2 V 26.773 h 147.851 z"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="m 147.851,26.773 c 0,14.788 -33.1,26.773 -73.925,26.773 C 33.101,53.546 0,41.558 0,26.773 0,11.988 33.1,0 73.925,0 114.75,0 147.85,11.985 147.85,26.773"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="m 97.62,25.232 c 0,3.933 -10.61,7.118 -23.7,7.118 -13.09,0 -23.7,-3.185 -23.7,-7.118 0,-3.933 10.613,-7.118 23.7,-7.118 13.087,0 23.7,3.185 23.7,7.118"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       isolation="isolate"
-       d="M 127.362,8.283 C 117.006,4.359 103.4,1.573 88.1,0.5 l -9.6,17.751 a 54.679,54.679 0 0 1 12.2,1.958 z"
-       id="path18"
-       inkscape:connector-curvature="0"
-       style="opacity:0.25;isolation:isolate;fill:#ffffff" />
-    <path
-       isolation="isolate"
-       d="m 17.452,44.042 c 10.648,4.563 25.424,7.815 42.25,9 L 70.918,32.288 A 60.208,60.208 0 0 1 58.593,30.656 Z"
-       id="path20"
-       inkscape:connector-curvature="0"
-       style="opacity:0.25;isolation:isolate;fill:#ffffff" />
-  </svg>
-</svg>
diff --git a/source/manual/managed-disks_COLOR.svg b/source/manual/managed-disks_COLOR.svg
deleted file mode 100644
index 5900f846..00000000
--- a/source/manual/managed-disks_COLOR.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg23"
-   sodipodi:docname="managed-disks_COLOR.svg"
-   width="147.85001"
-   height="125.685"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata29">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs27" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview25"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="75.685"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg23" />
-  <svg
-     id="svg-managed-disks"
-     version="1.1"
-     width="100%"
-     height="100%">
-    <path
-       d="m 147.846,98.912 c 0,14.788 -33.1,26.773 -73.925,26.773 C 33.096,125.685 0,113.7 0,98.912 v -14.43 h 147.846 z"
-       id="path2"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="m 147.846,84.482 c 0,14.788 -33.1,26.773 -73.925,26.773 C 33.096,111.255 0,99.267 0,84.482 0,69.697 33.1,57.709 73.925,57.709 c 40.825,0 73.925,11.985 73.925,26.773"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#59b4d9" />
-    <path
-       d="m 97.615,82.941 c 0,3.933 -10.61,7.118 -23.7,7.118 -13.09,0 -23.7,-3.185 -23.7,-7.118 0,-3.933 10.613,-7.118 23.7,-7.118 13.087,0 23.7,3.185 23.7,7.118"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#0072c6" />
-    <path
-       d="M 127.357,65.992 C 117,62.068 103.393,59.282 88.091,58.206 L 78.5,75.96 a 54.679,54.679 0 0 1 12.2,1.958 z"
-       style="opacity:0.25;isolation:isolate;fill:#ffffff"
-       id="path8"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 17.447,101.751 c 10.648,4.563 25.424,7.815 42.25,9 L 70.913,90 A 60.208,60.208 0 0 1 58.588,88.368 Z"
-       style="opacity:0.25;isolation:isolate;fill:#ffffff"
-       id="path10"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 147.846,41.2 c 0,14.788 -33.1,26.773 -73.925,26.773 C 33.096,67.973 0,55.991 0,41.2 V 26.773 h 147.846 z"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#68217a" />
-    <path
-       d="m 147.846,26.773 c 0,14.788 -33.1,26.773 -73.925,26.773 C 33.096,53.546 0,41.561 0,26.773 0,11.985 33.093,0 73.921,0 c 40.828,0 73.925,11.988 73.925,26.773"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="fill:#9b4f96" />
-    <path
-       d="m 97.615,25.232 c 0,3.933 -10.61,7.118 -23.7,7.118 -13.09,0 -23.7,-3.185 -23.7,-7.118 0,-3.933 10.613,-7.118 23.7,-7.118 13.087,0 23.7,3.188 23.7,7.118"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="fill:#68217a" />
-    <path
-       d="M 127.357,8.43 C 117,4.506 103.393,1.721 88.091,0.645 L 78.5,18.4 a 54.679,54.679 0 0 1 12.2,1.958 z"
-       style="opacity:0.25;isolation:isolate;fill:#ffffff"
-       id="path18"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 17.447,44.19 c 10.648,4.563 25.424,7.815 42.25,9 L 70.913,32.436 A 60.208,60.208 0 0 1 58.588,30.8 Z"
-       style="opacity:0.25;isolation:isolate;fill:#ffffff"
-       id="path20"
-       inkscape:connector-curvature="0" />
-  </svg>
-</svg>
diff --git a/source/manual/mysql_COLOR.svg b/source/manual/mysql_COLOR.svg
deleted file mode 100644
index 49ced21d..00000000
--- a/source/manual/mysql_COLOR.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg15"
-   sodipodi:docname="mysql_COLOR.svg"
-   width="84.080002"
-   height="111.44"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata21">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs19" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview17"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="61.44"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg15" />
-  <svg
-     id="svg-mysql"
-     version="1.1"
-     width="100%"
-     height="100%">
-    <path
-       d="m 18,19.25 v 80.94 c 0,8.52 18.83,15.25 41.93,15.25 V 19.25 Z"
-       transform="translate(-18,-4)"
-       id="path2"
-       inkscape:connector-curvature="0"
-       style="fill:#005f87" />
-    <path
-       d="m 59.48,115.43 h 0.67 C 83.47,115.43 102,108.52 102,100 V 19 l -42.52,0.25 z"
-       transform="translate(-18,-4)"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#0f80b0" />
-    <path
-       d="m 102.08,19.25 c 0,8.3 -18.83,15.25 -41.93,15.25 C 37.05,34.5 18,27.54 18,19.25 18,10.96 36.83,4 59.93,4 c 23.1,0 42.15,7 42.15,15.25"
-       transform="translate(-18,-4)"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 93.56,18.35 c 0,5.61 -15,10.09 -33.41,10.09 -18.41,0 -33.63,-4.44 -33.63,-10.09 0,-5.65 15,-10.09 33.41,-10.09 18.41,0 33.63,4.48 33.63,10.09"
-       transform="translate(-18,-4)"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#7fb900" />
-    <path
-       d="m 86.38,24.4 c 4.48,-1.79 7,-3.81 7,-6.05 C 93.34,12.74 78.39,8 60,8 41.61,8 26.52,12.74 26.52,18.35 c 0,2.24 2.69,4.48 7,6.05 C 39.53,21.94 49.24,21 60,21 c 10.76,0 20.33,1.16 26.39,3.4"
-       transform="translate(-18,-4)"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#b7d332" />
-    <path
-       d="m 93,77.05 c 0,4.78 -3.26,8.87 -8,8.95 H 67 v -7 h 16 c 1,-0.08 1.83,-2.9 1.83,-2.9 L 83,77 H 73 c -4,0 -7,-2.35 -7,-6 v -1 c 0,-6.14 0,-8.93 0,-10 L 63,59 V 78 H 55 V 63.48 L 50.42,73.61 C 49.26,76.3 48.06,78 45,78 A 7.16,7.16 0 0 1 38.26,73.61 L 34,63 V 78 H 26 V 55.76 c 0,-2.58 0.5,-4.16 2.86,-4.9 a 11.71,11.71 0 0 1 3.4,-0.58 6.3,6.3 0 0 1 6.11,3.91 L 45,67 50.34,54.19 a 6.32,6.32 0 0 1 6.1,-3.91 12.7,12.7 0 0 1 3.36,0.54 c 2.37,0.75 3.2,2.6 3.2,5.18 v 2.77 C 63,58.9 62.87,59 63,59 h 12 v 10 a 3,3 0 0 0 2,1 h 7 V 59 h 9 z"
-       transform="translate(-18,-4)"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-  </svg>
-</svg>
diff --git a/source/manual/notification-hubs_COLOR.svg b/source/manual/notification-hubs_COLOR.svg
deleted file mode 100644
index 00e33c4c..00000000
--- a/source/manual/notification-hubs_COLOR.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg aria-hidden="true" role="presentation">
-<svg id="svg-notification-hubs"> <path fill="#0072C6" d="M13.7,27.8v5.4L1,22.4h49l0-16.2C50,2.6,47,0,43.4,0H6.3C2.6,0,0,2.2,0,5.9v5.9h36.6V6.4l12.7,10.8H0v14.9 c0,3.7,2.7,7,6.3,7l13.4,0l11,10.8l0.1-10.8h12.5c3.7,0,6.7-2.9,6.7-6.6l0-4.8H13.7z"></path> <g opacity="0.2"> <path fill="#FFFFFF" d="M6.3,39.2h9.7l5.7-11.3h-8.1v5.4L1,22.4h23.3l2.8-5.2H0v14.9C0,35.8,2.7,39.1,6.3,39.2z"></path> <path fill="#FFFFFF" d="M35.6,0H6.3C2.6,0,0,2.2,0,5.9v5.9h29.7L35.6,0z"></path> </g> </svg>
-</svg>
\ No newline at end of file
diff --git a/source/manual/pipe-svgrepo-com.svg b/source/manual/pipe-svgrepo-com.svg
new file mode 100644
index 00000000..0eec8250
--- /dev/null
+++ b/source/manual/pipe-svgrepo-com.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+	<g>
+		<path d="M486.038,102.894h-29.275c-14.316,0-25.962,11.646-25.962,25.962v9.894H81.719v-9.894
+			c0-14.316-11.647-25.962-25.963-25.962H25.962C11.646,102.894,0,114.54,0,128.856v254.289c0,14.316,11.646,25.962,25.962,25.962
+			h29.794c14.316,0,25.963-11.646,25.963-25.962v-9.894h349.082v9.894c0,14.316,11.646,25.962,25.962,25.962h29.275
+			c14.316,0,25.962-11.646,25.962-25.962V128.856C512,114.54,500.354,102.894,486.038,102.894z M61.321,383.144
+			c0,3.068-2.496,5.564-5.565,5.564H25.962c-3.068,0-5.564-2.496-5.564-5.564V128.856c0-3.068,2.496-5.564,5.564-5.564h29.794
+			c3.069,0,5.565,2.496,5.565,5.564V383.144z M430.801,352.852H81.719V159.148h349.082V352.852z M491.602,383.144
+			c0,3.068-2.496,5.564-5.564,5.564h-29.275c-3.068,0-5.564-2.496-5.564-5.564V128.856c0-3.068,2.496-5.564,5.564-5.564h29.275
+			c3.068,0,5.564,2.496,5.564,5.564V383.144z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M277.306,319.593h-5.196c-5.632,0-10.199,4.567-10.199,10.199c0,5.632,4.567,10.199,10.199,10.199h5.196
+			c5.632,0,10.199-4.567,10.199-10.199C287.505,324.16,282.938,319.593,277.306,319.593z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M232.615,319.593h-123.68c-5.632,0-10.199,4.567-10.199,10.199c0,5.632,4.567,10.199,10.199,10.199h123.681
+			c5.632,0,10.199-4.567,10.199-10.199C242.815,324.16,238.248,319.593,232.615,319.593z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/source/manual/postgresql_COLOR.svg b/source/manual/postgresql_COLOR.svg
deleted file mode 100644
index 2c7a9626..00000000
--- a/source/manual/postgresql_COLOR.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   aria-hidden="true"
-   role="presentation"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="postgresql_COLOR.svg"
-   width="37.727001"
-   height="50"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="2.36"
-     inkscape:cx="50"
-     inkscape:cy="2.1316282e-014"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg21" />
-  <svg
-     id="svg-postgresql"
-     version="1.1"
-     width="100%"
-     height="100%">
-    <path
-       d="M 0,6.841 V 43.159 C 0,46.982 8.451,50 18.813,50 V 6.841 Z"
-       id="path2"
-       inkscape:connector-curvature="0"
-       style="fill:#3998c5" />
-    <path
-       d="m 18.612,50 h 0.3 c 10.463,0 18.813,-3.018 18.813,-6.841 V 6.841 H 18.612 Z"
-       id="path4"
-       inkscape:connector-curvature="0"
-       style="fill:#59b3d8" />
-    <path
-       d="m 37.727,6.841 c 0,3.724 -8.451,6.841 -18.813,6.841 C 8.552,13.682 0,10.563 0,6.841 0,3.119 8.451,0 18.813,0 29.175,0 37.727,3.119 37.727,6.841"
-       id="path6"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 33.9,6.438 c 0,2.515 -6.74,4.527 -14.99,4.527 -8.25,0 -15.087,-2.011 -15.087,-4.527 0,-2.516 6.74,-4.527 14.99,-4.527 8.25,0 15.087,2.012 15.087,4.527"
-       id="path8"
-       inkscape:connector-curvature="0"
-       style="fill:#7fb900" />
-    <path
-       d="m 30.684,9.154 c 2.012,-0.8 3.119,-1.71 3.119,-2.716 0,-2.515 -6.74,-4.527 -14.99,-4.527 -8.25,0 -14.99,2.012 -14.99,4.527 0,1.006 1.207,2.012 3.119,2.716 2.716,-1.107 7.042,-1.71 11.871,-1.71 a 36.668,36.668 0 0 1 11.871,1.71"
-       id="path10"
-       inkscape:connector-curvature="0"
-       style="fill:#b7d332" />
-    <path
-       d="m 29.465,33.817 c -2.994,0.617 -3.2,-0.4 -3.2,-0.4 3.161,-4.691 4.483,-10.645 3.342,-12.1 -3.111,-3.975 -8.5,-2.095 -8.586,-2.046 l -0.029,0.005 a 10.679,10.679 0 0 0 -2,-0.208 4.936,4.936 0 0 0 -3.162,0.946 c 0,0 -9.608,-3.958 -9.161,4.976 0.1,1.9 2.725,14.384 5.861,10.613 1.146,-1.379 2.254,-2.544 2.254,-2.544 a 2.908,2.908 0 0 0 1.9,0.485 l 0.054,-0.045 a 2.093,2.093 0 0 0 0.022,0.538 c -0.808,0.9 -0.571,1.061 -2.186,1.394 -1.634,0.337 -0.673,0.936 -0.048,1.093 a 3.32,3.32 0 0 0 3.706,-1.2 l -0.048,0.19 a 5.4,5.4 0 0 1 0.5,2.917 8.044,8.044 0 0 0 0.187,2.812 c 0.249,0.678 0.5,2.205 2.621,1.75 a 3.132,3.132 0 0 0 2.821,-3.009 c 0.09,-1.167 0.3,-1 0.309,-2.04 l 0.165,-0.494 c 0.19,-1.584 0.03,-2.095 1.122,-1.857 l 0.266,0.023 a 6.053,6.053 0 0 0 2.476,-0.417 c 1.331,-0.617 2.12,-1.649 0.808,-1.378 z"
-       id="path12"
-       inkscape:connector-curvature="0"
-       style="fill:#336790" />
-    <path
-       d="m 16.826,25.98 a 1.274,1.274 0 0 0 -0.433,-0.135 0.928,0.928 0 0 0 -0.638,0.09 0.232,0.232 0 0 0 -0.1,0.155 c -0.028,0.2 0.269,0.576 0.641,0.628 a 0.684,0.684 0 0 0 0.09,0.006 0.7,0.7 0 0 0 0.634,-0.407 l 0.01,-0.035 c 0.013,-0.064 -0.001,-0.191 -0.204,-0.302 z"
-       id="path14"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 25.1,25.668 a 1.189,1.189 0 0 0 -0.43,-0.009 c -0.311,0.045 -0.612,0.184 -0.587,0.368 l 0.005,0.018 a 0.634,0.634 0 0 0 0.578,0.371 0.649,0.649 0 0 0 0.082,-0.005 0.758,0.758 0 0 0 0.426,-0.234 0.487,0.487 0 0 0 0.161,-0.325 C 25.32,25.766 25.236,25.7 25.1,25.668 Z"
-       id="path16"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-    <path
-       d="m 30.37,33.778 c -0.144,-0.442 -0.774,-0.31 -0.981,-0.267 -2.109,0.435 -2.7,0.006 -2.823,-0.115 a 24.589,24.589 0 0 0 3.263,-7.336 c 0.583,-2.333 0.572,-4.184 -0.025,-4.947 a 6.82,6.82 0 0 0 -5.3,-2.62 10.256,10.256 0 0 0 -3.545,0.473 l -0.025,0.006 -0.04,0.014 v 0 L 20.858,19 a 8.253,8.253 0 0 0 -1.877,-0.244 5.326,5.326 0 0 0 -3.174,0.9 13.884,13.884 0 0 0 -3.035,-0.763 6.277,6.277 0 0 0 -4.487,0.808 c -1.391,0.987 -2.036,2.76 -1.911,5.268 0.061,1.183 1.792,10.606 4.509,11.513 a 1.66,1.66 0 0 0 1.84,-0.732 c 0.968,-1.164 1.872,-2.13 2.1,-2.37 a 3.314,3.314 0 0 0 1.577,0.42 1.42,1.42 0 0 0 0.013,0.167 c -0.1,0.113 -0.19,0.227 -0.285,0.348 -0.363,0.462 -0.449,0.571 -1.626,0.814 -0.477,0.1 -1.112,0.284 -1.122,0.757 -0.01,0.473 0.654,0.77 1.046,0.867 a 3.574,3.574 0 0 0 3.643,-0.882 24.271,24.271 0 0 0 0.351,5.6 2.607,2.607 0 0 0 2.504,1.929 4.022,4.022 0 0 0 0.836,-0.095 3.167,3.167 0 0 0 2.913,-2.961 c 0.173,-1 0.473,-3.431 0.6,-4.654 a 3.085,3.085 0 0 0 1.122,0.17 6.206,6.206 0 0 0 2.356,-0.444 c 0.749,-0.358 1.803,-1.08 1.619,-1.638 z m -5.588,1.3 c -0.052,0.683 -0.446,3.974 -0.652,5.167 a 2.646,2.646 0 0 1 -2.487,2.519 2.105,2.105 0 0 1 -2.717,-1.5 29.554,29.554 0 0 1 -0.29,-6.526 0.261,0.261 0 0 0 -0.028,-0.122 1.41,1.41 0 0 0 -0.051,-0.25 1.375,1.375 0 0 0 -0.675,-0.818 l -0.033,-0.017 a 1,1 0 0 0 -0.871,-0.052 7.083,7.083 0 0 1 0.359,-1.142 l 0.056,-0.15 c 0.064,-0.172 0.141,-0.343 0.224,-0.532 0.441,-0.98 1.044,-2.32 0.387,-5.356 a 1.847,1.847 0 0 0 -2.233,-1.5 5.445,5.445 0 0 0 -2.112,0.753 8.094,8.094 0 0 1 1.855,-4.94 4.581,4.581 0 0 1 3.455,-1.3 7.126,7.126 0 0 1 5.2,2.271 8.431,8.431 0 0 1 1.9,3.12 c -1.427,-0.171 -2.386,0.085 -2.858,0.759 -1,1.436 0.583,4.281 1.346,5.649 0.13,0.233 0.265,0.474 0.307,0.576 a 5.055,5.055 0 0 0 0.805,1.293 2.731,2.731 0 0 1 0.269,0.372 l -0.065,0.018 c -0.404,0.109 -1.159,0.321 -1.091,1.706 z m -13.725,0.881 c -0.91,-0.3 -1.92,-2.128 -2.844,-5.137 A 32.865,32.865 0 0 1 6.925,24.944 C 6.81,22.635 7.374,21.023 8.604,20.152 a 4.988,4.988 0 0 1 2.906,-0.782 12.57,12.57 0 0 1 3.792,0.689 v 0 c -0.058,0.051 -0.118,0.1 -0.175,0.161 -2.113,2.132 -2.038,5.794 -2.034,5.948 v 0.018 a 17.6,17.6 0 0 1 -0.062,3.425 3.766,3.766 0 0 0 0.992,3.153 3.283,3.283 0 0 0 0.337,0.3 c -0.346,0.368 -1.17,1.261 -2.06,2.333 v 0 c -0.428,0.512 -0.836,0.695 -1.243,0.56 z m 2.519,-6.279 a 18,18 0 0 0 0.07,-3.455 4.21,4.21 0 0 1 2.8,-0.873 1.212,1.212 0 0 1 1.019,1.06 c 0.618,2.859 0.081,4.054 -0.352,5.015 -0.083,0.185 -0.169,0.376 -0.24,0.565 l -0.056,0.15 a 8.794,8.794 0 0 0 -0.361,1.109 2.717,2.717 0 0 1 -2.041,-0.868 3.226,3.226 0 0 1 -0.839,-2.705 z m 3.368,4.508 a 0.269,0.269 0 0 0 0.026,-0.033 0.459,0.459 0 0 1 0.61,-0.148 l 0.045,0.023 a 0.841,0.841 0 0 1 0.365,1.1 3.051,3.051 0 0 1 -3.414,1.1 v 0 a 1.468,1.468 0 0 1 -0.639,-0.314 1.531,1.531 0 0 1 0.673,-0.242 c 1.314,-0.269 1.5,-0.446 1.947,-1.012 0.1,-0.128 0.224,-0.285 0.39,-0.47 z m 8.43,-2.713 C 25.322,31.348 25.206,31.141 25.046,30.853 L 25.039,30.841 C 24.386,29.67 22.857,26.928 23.664,25.774 a 1.829,1.829 0 0 1 1.585,-0.575 6.573,6.573 0 0 1 0.866,0.065 7.15,7.15 0 0 1 -0.109,1.149 9.552,9.552 0 0 0 -0.13,1.216 9.135,9.135 0 0 0 0.1,1.378 4.869,4.869 0 0 1 -0.309,3.027 3.671,3.671 0 0 1 -0.292,-0.561 z m 3.756,-4.986 a 27.62,27.62 0 0 1 -2.865,6.361 c -0.045,-0.064 -0.1,-0.135 -0.17,-0.22 l -0.064,-0.082 -0.018,-0.022 a 5.11,5.11 0 0 0 0.5,-3.595 8.686,8.686 0 0 1 -0.092,-1.287 9.194,9.194 0 0 1 0.125,-1.154 6.974,6.974 0 0 0 0.114,-1.407 0.459,0.459 0 0 0 0.015,-0.179 8.566,8.566 0 0 0 -4.906,-5.609 c 4.478,-1.094 6.8,1.136 7.6,2.154 0.6,0.763 0.511,2.553 -0.239,5.039 z m -3.1,7.4 a 1.611,1.611 0 0 0 0.2,-0.066 1.354,1.354 0 0 0 0.14,0.107 4.469,4.469 0 0 0 3.136,0.114 1.71,1.71 0 0 1 0.288,-0.038 3.572,3.572 0 0 1 -1.266,0.9 4.911,4.911 0 0 1 -3.123,0.231 c -0.054,-0.032 -0.066,-0.055 -0.067,-0.061 -0.056,-0.972 0.325,-1.079 0.7,-1.183 z"
-       id="path18"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" />
-  </svg>
-</svg>
diff --git a/source/manual/private-link.svg b/source/manual/private-link.svg
new file mode 100644
index 00000000..0faf3ad2
--- /dev/null
+++ b/source/manual/private-link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="50" width="50"><path d="M23 7.1h3V26h-3z" class="msportalfx-svg-c04" fill="#7a7a7a"/><path d="M28.9 6.5a4.4 4.4 0 01-8.8 0 4.4 4.4 0 018.8 0z" fill="#1490df"/><path d="M23.9 25h-4.8a6 6 0 00-.93 11.92 6.41 6.41 0 01.06-2.23 3.79 3.79 0 01.87-7.49h4.8a3.8 3.8 0 110 7.6h-1.32a2.86 2.86 0 00-.28 1.2 2.78 2.78 0 00.19 1h1.41a6 6 0 000-12z" fill="url(#f4e2e105-ea0e-4261-8e34-8267886551a7)"/><path d="M30.83 30.08a7 7 0 01.07.92 6.26 6.26 0 01-.13 1.31 3.79 3.79 0 01-.87 7.49h-4.8a3.8 3.8 0 010-7.6h1.32a2.82 2.82 0 00.28-1.2 2.78 2.78 0 00-.19-1H25.1a6 6 0 000 12h4.8a6 6 0 00.93-11.92z" fill="url(#bc3491d6-d39f-4035-8a15-97dffe92ccfb)"/><path d="M15.86 44.52l-1.1 1.11a.75.75 0 01-1.06 0L1.39 33.35a1.51 1.51 0 010-2.13l1.11-1.1 13.36 13.34a.74.74 0 010 1.06z" fill="#50e6ff"/><path d="M14.53 19.12l1.23 1.23a.75.75 0 010 1.06L2.62 34.59l-1.23-1.22a1.51 1.51 0 010-2.13l12.08-12.12a.75.75 0 011.06 0z" fill="#1490df"/><path d="M34.13 45.39a.74.74 0 010-1.06L47.5 31l1.11 1.11a1.51 1.51 0 010 2.13L36.29 46.5a.74.74 0 01-1.06 0l-1.1-1.11z" fill="#50e6ff"/><path d="M36.52 20l12.09 12.12a1.5 1.5 0 010 2.12l-1.23 1.23-13.15-13.18a.77.77 0 010-1.07L35.46 20a.75.75 0 011.06 0z" fill="#1490df"/><defs><linearGradient id="f4e2e105-ea0e-4261-8e34-8267886551a7" x1="21.5" y1="25" x2="21.5" y2="37" gradientUnits="userSpaceOnUse"><stop offset=".23" stop-color="#5ea0ef"/><stop offset=".32" stop-color="#5b9fee"/><stop offset=".48" stop-color="#509aeb"/><stop offset=".57" stop-color="#3f92e6"/><stop offset=".75" stop-color="#2688df"/><stop offset=".93" stop-color="#127fd9"/></linearGradient><linearGradient id="bc3491d6-d39f-4035-8a15-97dffe92ccfb" x1="27.5" y1="30" x2="27.5" y2="42" gradientUnits="userSpaceOnUse"><stop offset=".02" stop-color="#5ea0ef"/><stop offset=".14" stop-color="#5b9fee"/><stop offset=".23" stop-color="#5b9fee"/><stop offset=".34" stop-color="#509aeb"/><stop offset=".44" stop-color="#3f92e6"/><stop offset=".63" stop-color="#2688df"/><stop offset=".93" stop-color="#127fd9"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/source/manual/service-endpoint.svg b/source/manual/service-endpoint.svg
new file mode 100644
index 00000000..54275552
--- /dev/null
+++ b/source/manual/service-endpoint.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 221 81" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><path d="M77.688 27.586C72.188 11.723 57.75 0 39.875 0 17.875 0 0 17.93 0 40s17.875 40 39.875 40c17.875 0 32.312-11.723 37.812-27.586H220V26.896H77.688v.7z" fill="#0078d7" stroke="none"/></symbol></svg>
\ No newline at end of file
diff --git a/source/manual/synapse-analytics.svg b/source/manual/synapse-analytics.svg
new file mode 100644
index 00000000..7dab73e4
--- /dev/null
+++ b/source/manual/synapse-analytics.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 18 18" class="" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-010" data-type="1"><g><path d="M9 0L1.15 4.49v9L9 18l7.85-4.49v-9zm6.4 12.57L9 16.27l-6.4-3.66V5.38L9 1.68l6.4 3.71z" fill="#0078d4"></path><path fill="url(#7134245962897694)" d="M9 0L1.15 4.49l1.45.89L9 1.68l6.4 3.7 1.45-.89L9 0z"></path><path d="M11.32 11.59a4.32 4.32 0 0 0-5.2-3.19l-.35-1.46a5.82 5.82 0 0 1 7 4.31z" fill="#50e6ff"></path><path d="M12.74 10.47a.74.74 0 0 0-1-.27l-8.13 4.68 1.5.87 7.36-4.25a.76.76 0 0 0 .27-1.03zm.17-8.23L5.53 6.5a.76.76 0 0 0-.27 1 .75.75 0 0 0 .65.37.69.69 0 0 0 .37-.1l8.14-4.7z" fill="#50e6ff"></path><path d="M12.09 9a1.85 1.85 0 1 0 1.85 1.85A1.85 1.85 0 0 0 12.09 9zM5.91 5.27a1.85 1.85 0 1 0 1.85 1.85 1.85 1.85 0 0 0-1.85-1.85z" fill="url(#32821257235536905)"></path></g><defs>
+<linearGradient id="7134245962897694" x1="9" y1="5.38" x2="9" gradientUnits="userSpaceOnUse"><stop offset=".2" stop-color="#005ba1"></stop><stop offset="1" stop-color="#0078d4"></stop></linearGradient>
+<linearGradient id="32821257235536905" x1="9" y1="12.71" x2="9" y2="5.29" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#198ab3"></stop><stop offset=".17" stop-color="#32bedd"></stop><stop offset=".5" stop-color="#50e6ff"></stop><stop offset=".5" stop-color="#4fe4fd"></stop><stop offset=".5" stop-color="#4bddf8"></stop><stop offset=".5" stop-color="#44d2ee"></stop><stop offset=".5" stop-color="#3ac1e0"></stop><stop offset=".5" stop-color="#2dabce"></stop><stop offset=".5" stop-color="#1d90b8"></stop><stop offset=".5" stop-color="#198ab3"></stop><stop offset=".66" stop-color="#32bedd"></stop><stop offset=".98" stop-color="#50e6ff"></stop></linearGradient>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/source/manual/virtual-wan_COLOR.svg b/source/manual/virtual-wan_COLOR.svg
deleted file mode 100644
index 889a1c40..00000000
--- a/source/manual/virtual-wan_COLOR.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg42"
-   version="1.1"
-   viewBox="0 0 47.799999 47.799999"
-   height="47.799999mm"
-   width="47.799999mm">
-  <defs
-     id="defs36" />
-  <metadata
-     id="metadata39">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-1.1,-1.1)"
-     id="layer1">
-    <svg
-       height="100%"
-       width="100%"
-       version="1.1"
-       id="svg-virtual-wan">
-      <path
-         style="fill:#59b4d9"
-         id="path2"
-         d="m 39.606,12.8 c -0.011,0 -0.022,0.002 -0.033,0.002 C 39.226,6.284 33.735,1.1 26.992,1.1 22.064,1.1 17.807,3.873 15.732,7.906 14.868,7.712 13.973,7.6 13.05,7.6 6.45,7.6 1.1,12.838 1.1,19.3 1.1,25.762 6.45,31 13.05,31 h 26.556 c 5.133,0 9.294,-4.074 9.294,-9.1 0,-5.026 -4.161,-9.1 -9.294,-9.1 z" />
-      <path
-         style="opacity:0.2;fill:#ffffff"
-         id="path4"
-         d="m 39.606,12.8 c -0.011,0 -0.022,0.002 -0.033,0.002 C 39.226,6.284 33.735,1.1 26.992,1.1 22.064,1.1 17.807,3.873 15.732,7.906 14.868,7.712 13.973,7.6 13.05,7.6 6.45,7.6 1.1,12.838 1.1,19.3 1.1,25.762 6.45,31 13.05,31 h 26.556 c 5.133,0 9.294,-4.074 9.294,-9.1 0,-5.026 -4.161,-9.1 -9.294,-9.1 z" />
-      <path
-         style="fill:#ffffff"
-         id="path6"
-         d="M 26,48.15 C 17.095,48.15 9.85,40.905 9.85,32 9.85,23.095 17.095,15.85 26,15.85 c 8.905,0 16.15,7.245 16.15,16.15 0,8.905 -7.245,16.15 -16.15,16.15 z" />
-      <path
-         style="fill:#804998"
-         id="path8"
-         d="m 26,16.6 c 8.492,0 15.4,6.908 15.4,15.4 0,8.492 -6.908,15.4 -15.4,15.4 -8.492,0 -15.4,-6.908 -15.4,-15.4 0,-8.492 6.908,-15.4 15.4,-15.4 m 0,-1.5 C 16.666,15.1 9.1,22.666 9.1,32 9.1,41.334 16.666,48.9 26,48.9 35.334,48.9 42.9,41.334 42.9,32 42.9,22.666 35.334,15.1 26,15.1 Z" />
-      <circle
-         style="fill:#804998"
-         r="3.1819999"
-         id="ellipse10"
-         cy="23.916"
-         cx="22.223"
-         transform="rotate(-70.001229,22.222094,23.915651)" />
-      <circle
-         style="fill:#804998"
-         r="3.1819999"
-         id="ellipse12"
-         cy="33.223"
-         cx="35.389999"
-         transform="rotate(-70.001229,35.389033,33.223139)" />
-      <circle
-         style="fill:#804998"
-         r="3.1819999"
-         id="ellipse14"
-         cy="38.837002"
-         cx="19.802"
-         transform="rotate(-70.001229,19.801081,38.836662)" />
-      <path
-         style="fill:#804998"
-         id="path16"
-         d="m 18.787,22.171 c -2.607,0 -5.121,0.541 -7.509,1.621 -0.417,0.737 -0.781,1.507 -1.085,2.308 2.598,-1.55 5.562,-2.374 8.594,-2.374 9.28,0 16.83,7.55 16.83,16.83 0,2.025 -0.361,4.012 -1.072,5.905 l -0.032,0.085 c 0.713,-0.423 1.391,-0.897 2.031,-1.418 0.372,-1.468 0.628,-3.049 0.628,-4.572 0,-10.138 -8.247,-18.385 -18.385,-18.385 z" />
-      <path
-         style="fill:#804998"
-         id="path18"
-         d="m 33.273,16.925 c -0.784,-0.381 -1.602,-0.701 -2.447,-0.958 -7.55,2.497 -12.604,9.461 -12.604,17.447 0,6.288 3.161,12.061 8.457,15.467 0.889,-0.039 1.76,-0.145 2.608,-0.317 L 29.203,48.522 C 23.389,45.661 19.778,39.872 19.778,33.414 19.777,25.418 25.447,18.505 33.273,16.925 Z" />
-      <path
-         style="fill:#804998"
-         id="path20"
-         d="m 42.185,36.432 c 0.15,-0.559 0.272,-1.128 0.364,-1.708 -2.889,-1.736 -6.157,-2.663 -9.524,-2.663 -8.002,0 -15.175,5.07 -17.849,12.827 l -0.016,0.049 0.038,0.034 c 0.359,0.308 0.744,0.605 1.139,0.891 0.058,0.041 0.115,0.084 0.174,0.124 l 0.028,-0.09 c 2.331,-7.374 8.956,-12.187 16.486,-12.187 3.263,-0.001 6.407,0.948 9.16,2.723 z" />
-    </svg>
-  </g>
-</svg>
diff --git a/source/manual/windows-virtual-desktop.svg b/source/manual/windows-virtual-desktop.svg
new file mode 100644
index 00000000..c96250f7
--- /dev/null
+++ b/source/manual/windows-virtual-desktop.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 18 18" class="" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="FxSymbol0-011" data-type="1"><g><circle cx="9" cy="9" r="8.5" fill="url(#37028337608217043)"></circle><circle cx="9" cy="9" r="7.321" fill="#005ba1"></circle><path d="M9.1 9.937L6.266 7.125a.507.507 0 0 0-.709 0L5.2 7.48a.469.469 0 0 0-.143.337.476.476 0 0 0 .141.339l2.132 2.122-2.178 2.163a.473.473 0 0 0 0 .676l.36.355a.507.507 0 0 0 .709 0l2.878-2.86a.475.475 0 0 0 .141-.338.468.468 0 0 0-.141-.337zm-.345-2.26a.475.475 0 0 0 .141.338l2.88 2.86a.507.507 0 0 0 .709 0l.36-.356a.469.469 0 0 0 .143-.337.475.475 0 0 0-.141-.338l-2.174-2.162 2.132-2.123a.475.475 0 0 0 .141-.338.469.469 0 0 0-.143-.337l-.36-.356a.507.507 0 0 0-.709 0L8.9 7.34a.472.472 0 0 0-.145.338z" fill="#f2f2f2"></path></g><defs>
+<radialGradient id="37028337608217043" cx="9" cy="9" r="8.5" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#198ab3"></stop><stop offset=".382" stop-color="#1a8cb5"></stop><stop offset=".576" stop-color="#1c94bc"></stop><stop offset=".727" stop-color="#21a1c8"></stop><stop offset=".856" stop-color="#27b4d8"></stop><stop offset=".97" stop-color="#2fccee"></stop><stop offset="1" stop-color="#32d4f5"></stop></radialGradient>
+</defs>
+</svg>
\ No newline at end of file