diff --git a/diagrams/azure/ai_machine_learning.py b/diagrams/azure/ai_machine_learning.py
new file mode 100644
index 00000000..04304f1d
--- /dev/null
+++ b/diagrams/azure/ai_machine_learning.py
@@ -0,0 +1,35 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Ai_Machine_Learning(_Azure):
+    _type = "ai_machine_learning"
+    _icon_dir = "resources/azure/ai_machine_learning"
+
+
+class BotServices(_Ai_Machine_Learning):
+    _icon = "bot-services.png"
+
+
+class CognitiveServices(_Ai_Machine_Learning):
+    _icon = "cognitive-services.png"
+
+
+class MachineLearningStudioClassicWebServices(_Ai_Machine_Learning):
+    _icon = "machine-learning-studio-classic-web-services.png"
+
+
+class MachineLearningStudioWebServicePlans(_Ai_Machine_Learning):
+    _icon = "machine-learning-studio-web-service-plans.png"
+
+
+class MachineLearningStudioWorkspaces(_Ai_Machine_Learning):
+    _icon = "machine-learning-studio-workspaces.png"
+
+
+class TranslatorText(_Ai_Machine_Learning):
+    _icon = "translator-text.png"
+
+
+# Aliases
diff --git a/diagrams/azure/analytics.py b/diagrams/azure/analytics.py
index 216b3582..a3e28454 100644
--- a/diagrams/azure/analytics.py
+++ b/diagrams/azure/analytics.py
@@ -12,18 +12,6 @@ class AnalysisServices(_Analytics):
     _icon = "analysis-services.png"
 
 
-class DataExplorerClusters(_Analytics):
-    _icon = "data-explorer-clusters.png"
-
-
-class DataFactories(_Analytics):
-    _icon = "data-factories.png"
-
-
-class DataLakeAnalytics(_Analytics):
-    _icon = "data-lake-analytics.png"
-
-
 class DataLakeStoreGen1(_Analytics):
     _icon = "data-lake-store-gen1.png"
 
@@ -40,8 +28,8 @@ class EventHubs(_Analytics):
     _icon = "event-hubs.png"
 
 
-class Hdinsightclusters(_Analytics):
-    _icon = "hdinsightclusters.png"
+class HDInsightClusters(_Analytics):
+    _icon = "hd-insight-clusters.png"
 
 
 class LogAnalyticsWorkspaces(_Analytics):
diff --git a/diagrams/azure/app_services.py b/diagrams/azure/app_services.py
new file mode 100644
index 00000000..1fcc1474
--- /dev/null
+++ b/diagrams/azure/app_services.py
@@ -0,0 +1,47 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _App_Services(_Azure):
+    _type = "app_services"
+    _icon_dir = "resources/azure/app_services"
+
+
+class APIManagementServices(_App_Services):
+    _icon = "api-management-services.png"
+
+
+class AppServiceCertificates(_App_Services):
+    _icon = "app-service-certificates.png"
+
+
+class AppServiceDomains(_App_Services):
+    _icon = "app-service-domains.png"
+
+
+class AppServiceEnvironments(_App_Services):
+    _icon = "app-service-environments.png"
+
+
+class AppServicePlans(_App_Services):
+    _icon = "app-service-plans.png"
+
+
+class AppServices(_App_Services):
+    _icon = "app-services.png"
+
+
+class CDNProfiles(_App_Services):
+    _icon = "cdn-profiles.png"
+
+
+class NotificationHubs(_App_Services):
+    _icon = "notification-hubs.png"
+
+
+class SearchServices(_App_Services):
+    _icon = "search-services.png"
+
+
+# Aliases
diff --git a/diagrams/azure/azure_stack.py b/diagrams/azure/azure_stack.py
new file mode 100644
index 00000000..8479c2c9
--- /dev/null
+++ b/diagrams/azure/azure_stack.py
@@ -0,0 +1,43 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Azure_Stack(_Azure):
+    _type = "azure_stack"
+    _icon_dir = "resources/azure/azure_stack"
+
+
+class Capacity(_Azure_Stack):
+    _icon = "capacity.png"
+
+
+class InfrastructureBackup(_Azure_Stack):
+    _icon = "infrastructure-backup.png"
+
+
+class MultiTenancy(_Azure_Stack):
+    _icon = "multi-tenancy.png"
+
+
+class Offers(_Azure_Stack):
+    _icon = "offers.png"
+
+
+class Plans(_Azure_Stack):
+    _icon = "plans.png"
+
+
+class Stack(_Azure_Stack):
+    _icon = "stack.png"
+
+
+class Updates(_Azure_Stack):
+    _icon = "updates.png"
+
+
+class UserSubscriptions(_Azure_Stack):
+    _icon = "user-subscriptions.png"
+
+
+# Aliases
diff --git a/diagrams/azure/azure_vmware_solution.py b/diagrams/azure/azure_vmware_solution.py
new file mode 100644
index 00000000..0ed68d34
--- /dev/null
+++ b/diagrams/azure/azure_vmware_solution.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Azure_Vmware_Solution(_Azure):
+    _type = "azure_vmware_solution"
+    _icon_dir = "resources/azure/azure_vmware_solution"
+
+
+class Avs(_Azure_Vmware_Solution):
+    _icon = "avs.png"
+
+
+# Aliases
diff --git a/diagrams/azure/blockchain.py b/diagrams/azure/blockchain.py
new file mode 100644
index 00000000..4ffe512c
--- /dev/null
+++ b/diagrams/azure/blockchain.py
@@ -0,0 +1,31 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Blockchain(_Azure):
+    _type = "blockchain"
+    _icon_dir = "resources/azure/blockchain"
+
+
+class AbsMember(_Blockchain):
+    _icon = "abs-member.png"
+
+
+class BlockchainService(_Blockchain):
+    _icon = "blockchain-service.png"
+
+
+class Consortium(_Blockchain):
+    _icon = "consortium.png"
+
+
+class OutboundConnection(_Blockchain):
+    _icon = "outbound-connection.png"
+
+
+class TokenService(_Blockchain):
+    _icon = "token-service.png"
+
+
+# Aliases
diff --git a/diagrams/azure/compute.py b/diagrams/azure/compute.py
index e2e23ba6..c1cf0876 100644
--- a/diagrams/azure/compute.py
+++ b/diagrams/azure/compute.py
@@ -24,36 +24,28 @@ class BatchAccounts(_Compute):
     _icon = "batch-accounts.png"
 
 
-class CitrixVirtualDesktopsEssentials(_Compute):
-    _icon = "citrix-virtual-desktops-essentials.png"
-
-
 class CloudServicesClassic(_Compute):
     _icon = "cloud-services-classic.png"
 
 
-class CloudServices(_Compute):
-    _icon = "cloud-services.png"
-
-
-class CloudsimpleVirtualMachines(_Compute):
-    _icon = "cloudsimple-virtual-machines.png"
-
-
 class ContainerInstances(_Compute):
     _icon = "container-instances.png"
 
 
-class ContainerRegistries(_Compute):
-    _icon = "container-registries.png"
+class ContainerServicesDeprecated(_Compute):
+    _icon = "container-services-deprecated.png"
 
 
 class DiskEncryptionSets(_Compute):
     _icon = "disk-encryption-sets.png"
 
 
-class DiskSnapshots(_Compute):
-    _icon = "disk-snapshots.png"
+class DisksClassic(_Compute):
+    _icon = "disks-classic.png"
+
+
+class DisksSnapshots(_Compute):
+    _icon = "disks-snapshots.png"
 
 
 class Disks(_Compute):
@@ -72,6 +64,10 @@ class ImageVersions(_Compute):
     _icon = "image-versions.png"
 
 
+class Images(_Compute):
+    _icon = "images.png"
+
+
 class KubernetesServices(_Compute):
     _icon = "kubernetes-services.png"
 
@@ -80,12 +76,8 @@ class MeshApplications(_Compute):
     _icon = "mesh-applications.png"
 
 
-class OsImages(_Compute):
-    _icon = "os-images.png"
-
-
-class SAPHANAOnAzure(_Compute):
-    _icon = "sap-hana-on-azure.png"
+class OsImagesClassic(_Compute):
+    _icon = "os-images-classic.png"
 
 
 class ServiceFabricClusters(_Compute):
@@ -100,28 +92,20 @@ class SpringCloud(_Compute):
     _icon = "spring-cloud.png"
 
 
-class VMClassic(_Compute):
-    _icon = "vm-classic.png"
-
-
-class VMImages(_Compute):
-    _icon = "vm-images.png"
-
-
-class VMLinux(_Compute):
-    _icon = "vm-linux.png"
+class VirtualMachine(_Compute):
+    _icon = "virtual-machine.png"
 
 
-class VMScaleSet(_Compute):
-    _icon = "vm-scale-set.png"
+class VirtualMachinesClassic(_Compute):
+    _icon = "virtual-machines-classic.png"
 
 
-class VMWindows(_Compute):
-    _icon = "vm-windows.png"
+class VMImagesClassic(_Compute):
+    _icon = "vm-images-classic.png"
 
 
-class VM(_Compute):
-    _icon = "vm.png"
+class VMScaleSets(_Compute):
+    _icon = "vm-scale-sets.png"
 
 
 class Workspaces(_Compute):
diff --git a/diagrams/azure/containers.py b/diagrams/azure/containers.py
new file mode 100644
index 00000000..f57c6723
--- /dev/null
+++ b/diagrams/azure/containers.py
@@ -0,0 +1,35 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Containers(_Azure):
+    _type = "containers"
+    _icon_dir = "resources/azure/containers"
+
+
+class AppServices(_Containers):
+    _icon = "app-services.png"
+
+
+class BatchAccounts(_Containers):
+    _icon = "batch-accounts.png"
+
+
+class ContainerInstances(_Containers):
+    _icon = "container-instances.png"
+
+
+class ContainerRegistries(_Containers):
+    _icon = "container-registries.png"
+
+
+class KubernetesServices(_Containers):
+    _icon = "kubernetes-services.png"
+
+
+class ServiceFabricClusters(_Containers):
+    _icon = "service-fabric-clusters.png"
+
+
+# Aliases
diff --git a/diagrams/azure/databases.py b/diagrams/azure/databases.py
new file mode 100644
index 00000000..73eb6872
--- /dev/null
+++ b/diagrams/azure/databases.py
@@ -0,0 +1,99 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Databases(_Azure):
+    _type = "databases"
+    _icon_dir = "resources/azure/databases"
+
+
+class CacheRedis(_Databases):
+    _icon = "cache-redis.png"
+
+
+class CosmosDb(_Databases):
+    _icon = "cosmos-db.png"
+
+
+class DataExplorerClusters(_Databases):
+    _icon = "data-explorer-clusters.png"
+
+
+class DataFactory(_Databases):
+    _icon = "data-factory.png"
+
+
+class DatabaseMariadbServer(_Databases):
+    _icon = "database-mariadb-server.png"
+
+
+class DatabaseMigrationServices(_Databases):
+    _icon = "database-migration-services.png"
+
+
+class DatabaseMysqlServer(_Databases):
+    _icon = "database-mysql-server.png"
+
+
+class DatabasePostgresqlServer(_Databases):
+    _icon = "database-postgresql-server.png"
+
+
+class ElasticJobAgents(_Databases):
+    _icon = "elastic-job-agents.png"
+
+
+class InstancePools(_Databases):
+    _icon = "instance-pools.png"
+
+
+class ManagedDatabase(_Databases):
+    _icon = "managed-database.png"
+
+
+class SQLDataWarehouses(_Databases):
+    _icon = "sql-data-warehouses.png"
+
+
+class SQLDatabase(_Databases):
+    _icon = "sql-database.png"
+
+
+class SQLElasticPools(_Databases):
+    _icon = "sql-elastic-pools.png"
+
+
+class SQLManagedInstance(_Databases):
+    _icon = "sql-managed-instance.png"
+
+
+class SQLServerStretchDatabases(_Databases):
+    _icon = "sql-server-stretch-databases.png"
+
+
+class SQLServer(_Databases):
+    _icon = "sql-server.png"
+
+
+class SQLVM(_Databases):
+    _icon = "sql-vm.png"
+
+
+class SQL(_Databases):
+    _icon = "sql.png"
+
+
+class SsisLiftAndShiftIr(_Databases):
+    _icon = "ssis-lift-and-shift-ir.png"
+
+
+class SynapseAnalytics(_Databases):
+    _icon = "synapse-analytics.png"
+
+
+class VirtualClusters(_Databases):
+    _icon = "virtual-clusters.png"
+
+
+# Aliases
diff --git a/diagrams/azure/devops.py b/diagrams/azure/devops.py
index eee9f253..a7c90cdc 100644
--- a/diagrams/azure/devops.py
+++ b/diagrams/azure/devops.py
@@ -12,14 +12,6 @@ class ApplicationInsights(_Devops):
     _icon = "application-insights.png"
 
 
-class Artifacts(_Devops):
-    _icon = "artifacts.png"
-
-
-class Boards(_Devops):
-    _icon = "boards.png"
-
-
 class Devops(_Devops):
     _icon = "devops.png"
 
@@ -32,16 +24,4 @@ class LabServices(_Devops):
     _icon = "lab-services.png"
 
 
-class Pipelines(_Devops):
-    _icon = "pipelines.png"
-
-
-class Repos(_Devops):
-    _icon = "repos.png"
-
-
-class TestPlans(_Devops):
-    _icon = "test-plans.png"
-
-
 # Aliases
diff --git a/diagrams/azure/general.py b/diagrams/azure/general.py
index 8958e975..02618ae1 100644
--- a/diagrams/azure/general.py
+++ b/diagrams/azure/general.py
@@ -8,36 +8,260 @@ class _General(_Azure):
     _icon_dir = "resources/azure/general"
 
 
-class Allresources(_General):
-    _icon = "allresources.png"
+class AllResources(_General):
+    _icon = "all-resources.png"
 
 
-class Azurehome(_General):
-    _icon = "azurehome.png"
+class Backlog(_General):
+    _icon = "backlog.png"
 
 
-class Developertools(_General):
-    _icon = "developertools.png"
+class BizTalk(_General):
+    _icon = "biz-talk.png"
 
 
-class Helpsupport(_General):
-    _icon = "helpsupport.png"
+class BlobBlock(_General):
+    _icon = "blob-block.png"
+
+
+class BlobPage(_General):
+    _icon = "blob-page.png"
+
+
+class Branch(_General):
+    _icon = "branch.png"
+
+
+class Browser(_General):
+    _icon = "browser.png"
+
+
+class Bug(_General):
+    _icon = "bug.png"
+
+
+class Builds(_General):
+    _icon = "builds.png"
+
+
+class Cache(_General):
+    _icon = "cache.png"
+
+
+class Code(_General):
+    _icon = "code.png"
+
+
+class Commit(_General):
+    _icon = "commit.png"
+
+
+class ControlsHorizontal(_General):
+    _icon = "controls-horizontal.png"
+
+
+class Controls(_General):
+    _icon = "controls.png"
+
+
+class CostAlerts(_General):
+    _icon = "cost-alerts.png"
+
+
+class CostAnalysis(_General):
+    _icon = "cost-analysis.png"
+
+
+class CostBudgets(_General):
+    _icon = "cost-budgets.png"
+
+
+class CostManagementAndBilling(_General):
+    _icon = "cost-management-and-billing.png"
+
+
+class CostManagement(_General):
+    _icon = "cost-management.png"
+
+
+class Counter(_General):
+    _icon = "counter.png"
+
+
+class Cubes(_General):
+    _icon = "cubes.png"
+
+
+class Dashboard(_General):
+    _icon = "dashboard.png"
+
+
+class DevConsole(_General):
+    _icon = "dev-console.png"
+
+
+class Download(_General):
+    _icon = "download.png"
+
+
+class Error(_General):
+    _icon = "error.png"
+
+
+class Extensions(_General):
+    _icon = "extensions.png"
+
+
+class File(_General):
+    _icon = "file.png"
+
+
+class Files(_General):
+    _icon = "files.png"
+
+
+class FolderBlank(_General):
+    _icon = "folder-blank.png"
+
+
+class FolderWebsite(_General):
+    _icon = "folder-website.png"
+
+
+class FreeServices(_General):
+    _icon = "free-services.png"
+
+
+class Ftp(_General):
+    _icon = "ftp.png"
+
+
+class Gear(_General):
+    _icon = "gear.png"
+
+
+class GlobeError(_General):
+    _icon = "globe-error.png"
+
+
+class GlobeSuccess(_General):
+    _icon = "globe-success.png"
+
+
+class GlobeWarning(_General):
+    _icon = "globe-warning.png"
+
+
+class Globe(_General):
+    _icon = "globe.png"
+
+
+class Guide(_General):
+    _icon = "guide.png"
+
+
+class Heart(_General):
+    _icon = "heart.png"
+
+
+class HelpAndSupport(_General):
+    _icon = "help-and-support.png"
+
+
+class Image(_General):
+    _icon = "image.png"
 
 
 class Information(_General):
     _icon = "information.png"
 
 
-class Managementgroups(_General):
-    _icon = "managementgroups.png"
+class InputOutput(_General):
+    _icon = "input-output.png"
+
+
+class JourneyHub(_General):
+    _icon = "journey-hub.png"
+
+
+class LaunchPortal(_General):
+    _icon = "launch-portal.png"
+
+
+class Learn(_General):
+    _icon = "learn.png"
+
+
+class LoadTest(_General):
+    _icon = "load-test.png"
+
+
+class Location(_General):
+    _icon = "location.png"
+
+
+class LogStreaming(_General):
+    _icon = "log-streaming.png"
+
+
+class ManagementGroups(_General):
+    _icon = "management-groups.png"
+
+
+class ManagementPortal(_General):
+    _icon = "management-portal.png"
 
 
 class Marketplace(_General):
     _icon = "marketplace.png"
 
 
-class Quickstartcenter(_General):
-    _icon = "quickstartcenter.png"
+class MediaFile(_General):
+    _icon = "media-file.png"
+
+
+class Media(_General):
+    _icon = "media.png"
+
+
+class MobileEngagement(_General):
+    _icon = "mobile-engagement.png"
+
+
+class Mobile(_General):
+    _icon = "mobile.png"
+
+
+class Module(_General):
+    _icon = "module.png"
+
+
+class PowerUp(_General):
+    _icon = "power-up.png"
+
+
+class Power(_General):
+    _icon = "power.png"
+
+
+class Powershell(_General):
+    _icon = "powershell.png"
+
+
+class Preview(_General):
+    _icon = "preview.png"
+
+
+class ProcessExplorer(_General):
+    _icon = "process-explorer.png"
+
+
+class ProductionReadyDatabase(_General):
+    _icon = "production-ready-database.png"
+
+
+class QuickstartCenter(_General):
+    _icon = "quickstart-center.png"
 
 
 class Recent(_General):
@@ -48,32 +272,72 @@ class Reservations(_General):
     _icon = "reservations.png"
 
 
-class Resource(_General):
-    _icon = "resource.png"
+class ResourceExplorer(_General):
+    _icon = "resource-explorer.png"
 
 
-class Resourcegroups(_General):
-    _icon = "resourcegroups.png"
+class ResourceGroupList(_General):
+    _icon = "resource-group-list.png"
 
 
-class Servicehealth(_General):
-    _icon = "servicehealth.png"
+class ResourceGroups(_General):
+    _icon = "resource-groups.png"
 
 
-class Shareddashboard(_General):
-    _icon = "shareddashboard.png"
+class ResourceLinked(_General):
+    _icon = "resource-linked.png"
 
 
-class Subscriptions(_General):
-    _icon = "subscriptions.png"
+class Scale(_General):
+    _icon = "scale.png"
+
+
+class Scheduler(_General):
+    _icon = "scheduler.png"
+
+
+class SearchGrid(_General):
+    _icon = "search-grid.png"
+
+
+class Search(_General):
+    _icon = "search.png"
+
+
+class ServerFarm(_General):
+    _icon = "server-farm.png"
+
 
+class ServiceBus(_General):
+    _icon = "service-bus.png"
 
-class Support(_General):
-    _icon = "support.png"
 
+class ServiceHealth(_General):
+    _icon = "service-health.png"
 
-class Supportrequests(_General):
-    _icon = "supportrequests.png"
+
+class Ssd(_General):
+    _icon = "ssd.png"
+
+
+class StorageAzureFiles(_General):
+    _icon = "storage-azure-files.png"
+
+
+class StorageContainer(_General):
+    _icon = "storage-container.png"
+
+
+class StorageQueue(_General):
+    _icon = "storage-queue.png"
+
+
+class Subscriptions(_General):
+    _icon = "subscriptions.png"
+
+
+class Table(_General):
+    _icon = "table.png"
 
 
 class Tag(_General):
@@ -84,32 +348,40 @@ class Tags(_General):
     _icon = "tags.png"
 
 
-class Templates(_General):
-    _icon = "templates.png"
+class TfsVcRepository(_General):
+    _icon = "tfs-vc-repository.png"
+
+
+class Toolbox(_General):
+    _icon = "toolbox.png"
+
+
+class Versions(_General):
+    _icon = "versions.png"
 
 
-class Twousericon(_General):
-    _icon = "twousericon.png"
+class WebSlots(_General):
+    _icon = "web-slots.png"
 
 
-class Userhealthicon(_General):
-    _icon = "userhealthicon.png"
+class WebTest(_General):
+    _icon = "web-test.png"
 
 
-class Usericon(_General):
-    _icon = "usericon.png"
+class WebsitePower(_General):
+    _icon = "website-power.png"
 
 
-class Userprivacy(_General):
-    _icon = "userprivacy.png"
+class WebsiteStaging(_General):
+    _icon = "website-staging.png"
 
 
-class Userresource(_General):
-    _icon = "userresource.png"
+class Workbooks(_General):
+    _icon = "workbooks.png"
 
 
-class Whatsnew(_General):
-    _icon = "whatsnew.png"
+class Workflow(_General):
+    _icon = "workflow.png"
 
 
 # Aliases
diff --git a/diagrams/azure/identity.py b/diagrams/azure/identity.py
index a7913728..669d7c53 100644
--- a/diagrams/azure/identity.py
+++ b/diagrams/azure/identity.py
@@ -8,10 +8,6 @@ class _Identity(_Azure):
     _icon_dir = "resources/azure/identity"
 
 
-class AccessReview(_Identity):
-    _icon = "access-review.png"
-
-
 class ActiveDirectoryConnectHealth(_Identity):
     _icon = "active-directory-connect-health.png"
 
@@ -32,18 +28,10 @@ class ADIdentityProtection(_Identity):
     _icon = "ad-identity-protection.png"
 
 
-class ADPrivilegedIdentityManagement(_Identity):
-    _icon = "ad-privileged-identity-management.png"
-
-
 class AppRegistrations(_Identity):
     _icon = "app-registrations.png"
 
 
-class ConditionalAccess(_Identity):
-    _icon = "conditional-access.png"
-
-
 class EnterpriseApplications(_Identity):
     _icon = "enterprise-applications.png"
 
@@ -56,10 +44,6 @@ class IdentityGovernance(_Identity):
     _icon = "identity-governance.png"
 
 
-class InformationProtection(_Identity):
-    _icon = "information-protection.png"
-
-
 class ManagedIdentities(_Identity):
     _icon = "managed-identities.png"
 
diff --git a/diagrams/azure/integration.py b/diagrams/azure/integration.py
index 369cd97b..64c147bd 100644
--- a/diagrams/azure/integration.py
+++ b/diagrams/azure/integration.py
@@ -12,12 +12,8 @@ class APIForFhir(_Integration):
     _icon = "api-for-fhir.png"
 
 
-class APIManagement(_Integration):
-    _icon = "api-management.png"
-
-
-class AppConfiguration(_Integration):
-    _icon = "app-configuration.png"
+class APIManagementServices(_Integration):
+    _icon = "api-management-services.png"
 
 
 class DataCatalog(_Integration):
@@ -40,14 +36,6 @@ class IntegrationAccounts(_Integration):
     _icon = "integration-accounts.png"
 
 
-class IntegrationServiceEnvironments(_Integration):
-    _icon = "integration-service-environments.png"
-
-
-class LogicAppsCustomConnector(_Integration):
-    _icon = "logic-apps-custom-connector.png"
-
-
 class LogicApps(_Integration):
     _icon = "logic-apps.png"
 
@@ -56,28 +44,16 @@ class PartnerTopic(_Integration):
     _icon = "partner-topic.png"
 
 
-class SendgridAccounts(_Integration):
-    _icon = "sendgrid-accounts.png"
-
-
-class ServiceBusRelays(_Integration):
-    _icon = "service-bus-relays.png"
-
-
-class ServiceBus(_Integration):
-    _icon = "service-bus.png"
-
-
-class ServiceCatalogManagedApplicationDefinitions(_Integration):
-    _icon = "service-catalog-managed-application-definitions.png"
+class Relays(_Integration):
+    _icon = "relays.png"
 
 
 class SoftwareAsAService(_Integration):
     _icon = "software-as-a-service.png"
 
 
-class StorsimpleDeviceManagers(_Integration):
-    _icon = "storsimple-device-managers.png"
+class SQLDataWarehouses(_Integration):
+    _icon = "sql-data-warehouses.png"
 
 
 class SystemTopic(_Integration):
diff --git a/diagrams/azure/internet_of_things.py b/diagrams/azure/internet_of_things.py
new file mode 100644
index 00000000..a0f88731
--- /dev/null
+++ b/diagrams/azure/internet_of_things.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Internet_Of_Things(_Azure):
+    _type = "internet_of_things"
+    _icon_dir = "resources/azure/internet_of_things"
+
+
+class DigitalTwins(_Internet_Of_Things):
+    _icon = "digital-twins.png"
+
+
+class TimeSeriesInsightsAccessPolicies(_Internet_Of_Things):
+    _icon = "time-series-insights-access-policies.png"
+
+
+# Aliases
diff --git a/diagrams/azure/intune.py b/diagrams/azure/intune.py
new file mode 100644
index 00000000..214c8e21
--- /dev/null
+++ b/diagrams/azure/intune.py
@@ -0,0 +1,35 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Intune(_Azure):
+    _type = "intune"
+    _icon_dir = "resources/azure/intune"
+
+
+class ADRolesAndAdministrators(_Intune):
+    _icon = "ad-roles-and-administrators.png"
+
+
+class DeviceSecurityApple(_Intune):
+    _icon = "device-security-apple.png"
+
+
+class DeviceSecurityGoogle(_Intune):
+    _icon = "device-security-google.png"
+
+
+class DeviceSecurityWindows(_Intune):
+    _icon = "device-security-windows.png"
+
+
+class IntuneForEducation(_Intune):
+    _icon = "intune-for-education.png"
+
+
+class Intune(_Intune):
+    _icon = "intune.png"
+
+
+# Aliases
diff --git a/diagrams/azure/iot.py b/diagrams/azure/iot.py
index 5d6dce8e..ce570b7a 100644
--- a/diagrams/azure/iot.py
+++ b/diagrams/azure/iot.py
@@ -12,40 +12,44 @@ class DeviceProvisioningServices(_Iot):
     _icon = "device-provisioning-services.png"
 
 
-class DigitalTwins(_Iot):
-    _icon = "digital-twins.png"
+class EventHubs(_Iot):
+    _icon = "event-hubs.png"
 
 
-class IotCentralApplications(_Iot):
-    _icon = "iot-central-applications.png"
+class FunctionApps(_Iot):
+    _icon = "function-apps.png"
 
 
-class IotHubSecurity(_Iot):
-    _icon = "iot-hub-security.png"
+class IotCentralApplications(_Iot):
+    _icon = "iot-central-applications.png"
 
 
 class IotHub(_Iot):
     _icon = "iot-hub.png"
 
 
-class Maps(_Iot):
-    _icon = "maps.png"
+class LogicApps(_Iot):
+    _icon = "logic-apps.png"
 
 
-class Sphere(_Iot):
-    _icon = "sphere.png"
+class MapsAccounts(_Iot):
+    _icon = "maps-accounts.png"
 
 
-class TimeSeriesInsightsEnvironments(_Iot):
-    _icon = "time-series-insights-environments.png"
+class NotificationHubs(_Iot):
+    _icon = "notification-hubs.png"
+
+
+class StreamAnalyticsJobs(_Iot):
+    _icon = "stream-analytics-jobs.png"
 
 
-class TimeSeriesInsightsEventsSources(_Iot):
-    _icon = "time-series-insights-events-sources.png"
+class TimeSeriesInsightsEnvironments(_Iot):
+    _icon = "time-series-insights-environments.png"
 
 
-class Windows10IotCoreServices(_Iot):
-    _icon = "windows-10-iot-core-services.png"
+class TimeSeriesInsightsEventSources(_Iot):
+    _icon = "time-series-insights-event-sources.png"
 
 
 # Aliases
diff --git a/diagrams/azure/management_governance.py b/diagrams/azure/management_governance.py
new file mode 100644
index 00000000..f94ccf91
--- /dev/null
+++ b/diagrams/azure/management_governance.py
@@ -0,0 +1,111 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Management_Governance(_Azure):
+    _type = "management_governance"
+    _icon_dir = "resources/azure/management_governance"
+
+
+class ActivityLog(_Management_Governance):
+    _icon = "activity-log.png"
+
+
+class Advisor(_Management_Governance):
+    _icon = "advisor.png"
+
+
+class Alerts(_Management_Governance):
+    _icon = "alerts.png"
+
+
+class ApplicationInsights(_Management_Governance):
+    _icon = "application-insights.png"
+
+
+class Arc(_Management_Governance):
+    _icon = "arc.png"
+
+
+class AutomationAccounts(_Management_Governance):
+    _icon = "automation-accounts.png"
+
+
+class Blueprints(_Management_Governance):
+    _icon = "blueprints.png"
+
+
+class Compliance(_Management_Governance):
+    _icon = "compliance.png"
+
+
+class CostManagementAndBilling(_Management_Governance):
+    _icon = "cost-management-and-billing.png"
+
+
+class DiagnosticsSettings(_Management_Governance):
+    _icon = "diagnostics-settings.png"
+
+
+class Education(_Management_Governance):
+    _icon = "education.png"
+
+
+class Lighthouse(_Management_Governance):
+    _icon = "lighthouse.png"
+
+
+class LogAnalyticsWorkspaces(_Management_Governance):
+    _icon = "log-analytics-workspaces.png"
+
+
+class Machinesazurearc(_Management_Governance):
+    _icon = "machinesazurearc.png"
+
+
+class ManagedApplicationsCenter(_Management_Governance):
+    _icon = "managed-applications-center.png"
+
+
+class Metrics(_Management_Governance):
+    _icon = "metrics.png"
+
+
+class Monitor(_Management_Governance):
+    _icon = "monitor.png"
+
+
+class MyCustomers(_Management_Governance):
+    _icon = "my-customers.png"
+
+
+class OperationLogClassic(_Management_Governance):
+    _icon = "operation-log-classic.png"
+
+
+class Policy(_Management_Governance):
+    _icon = "policy.png"
+
+
+class RecoveryServicesVaults(_Management_Governance):
+    _icon = "recovery-services-vaults.png"
+
+
+class ResourceGraphExplorer(_Management_Governance):
+    _icon = "resource-graph-explorer.png"
+
+
+class ServiceProviders(_Management_Governance):
+    _icon = "service-providers.png"
+
+
+class Solutions(_Management_Governance):
+    _icon = "solutions.png"
+
+
+class UserPrivacy(_Management_Governance):
+    _icon = "user-privacy.png"
+
+
+# Aliases
diff --git a/diagrams/azure/migrate.py b/diagrams/azure/migrate.py
new file mode 100644
index 00000000..4f7028a4
--- /dev/null
+++ b/diagrams/azure/migrate.py
@@ -0,0 +1,31 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Migrate(_Azure):
+    _type = "migrate"
+    _icon_dir = "resources/azure/migrate"
+
+
+class CostManagementAndBilling(_Migrate):
+    _icon = "cost-management-and-billing.png"
+
+
+class DataBoxEdge(_Migrate):
+    _icon = "data-box-edge.png"
+
+
+class DataBox(_Migrate):
+    _icon = "data-box.png"
+
+
+class Migrate(_Migrate):
+    _icon = "migrate.png"
+
+
+class RecoveryServicesVaults(_Migrate):
+    _icon = "recovery-services-vaults.png"
+
+
+# Aliases
diff --git a/diagrams/azure/mixed_reality.py b/diagrams/azure/mixed_reality.py
new file mode 100644
index 00000000..2d5210ed
--- /dev/null
+++ b/diagrams/azure/mixed_reality.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Mixed_Reality(_Azure):
+    _type = "mixed_reality"
+    _icon_dir = "resources/azure/mixed_reality"
+
+
+class RemoteRendering(_Mixed_Reality):
+    _icon = "remote-rendering.png"
+
+
+# Aliases
diff --git a/diagrams/azure/monitor.py b/diagrams/azure/monitor.py
new file mode 100644
index 00000000..4a958a35
--- /dev/null
+++ b/diagrams/azure/monitor.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Monitor(_Azure):
+    _type = "monitor"
+    _icon_dir = "resources/azure/monitor"
+
+
+class SAPAzureMonitor(_Monitor):
+    _icon = "sap-azure-monitor.png"
+
+
+# Aliases
diff --git a/diagrams/azure/networking.py b/diagrams/azure/networking.py
new file mode 100644
index 00000000..6b627c4d
--- /dev/null
+++ b/diagrams/azure/networking.py
@@ -0,0 +1,139 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Networking(_Azure):
+    _type = "networking"
+    _icon_dir = "resources/azure/networking"
+
+
+class ApplicationGateways(_Networking):
+    _icon = "application-gateways.png"
+
+
+class CDNProfiles(_Networking):
+    _icon = "cdn-profiles.png"
+
+
+class Connections(_Networking):
+    _icon = "connections.png"
+
+
+class DDOSProtectionPlans(_Networking):
+    _icon = "ddos-protection-plans.png"
+
+
+class DNSZones(_Networking):
+    _icon = "dns-zones.png"
+
+
+class ExpressrouteCircuits(_Networking):
+    _icon = "expressroute-circuits.png"
+
+
+class FirewallManager(_Networking):
+    _icon = "firewall-manager.png"
+
+
+class Firewalls(_Networking):
+    _icon = "firewalls.png"
+
+
+class FrontDoors(_Networking):
+    _icon = "front-doors.png"
+
+
+class IpGroups(_Networking):
+    _icon = "ip-groups.png"
+
+
+class LoadBalancers(_Networking):
+    _icon = "load-balancers.png"
+
+
+class LocalNetworkGateways(_Networking):
+    _icon = "local-network-gateways.png"
+
+
+class Nat(_Networking):
+    _icon = "nat.png"
+
+
+class NetworkInterfaces(_Networking):
+    _icon = "network-interfaces.png"
+
+
+class NetworkSecurityGroups(_Networking):
+    _icon = "network-security-groups.png"
+
+
+class NetworkWatcher(_Networking):
+    _icon = "network-watcher.png"
+
+
+class PrivateLinkService(_Networking):
+    _icon = "private-link-service.png"
+
+
+class PrivateLink(_Networking):
+    _icon = "private-link.png"
+
+
+class ProximityPlacementGroups(_Networking):
+    _icon = "proximity-placement-groups.png"
+
+
+class PublicIpAddressesClassic(_Networking):
+    _icon = "public-ip-addresses-classic.png"
+
+
+class PublicIpAddresses(_Networking):
+    _icon = "public-ip-addresses.png"
+
+
+class PublicIpPrefixes(_Networking):
+    _icon = "public-ip-prefixes.png"
+
+
+class ReservedIpAddressesClassic(_Networking):
+    _icon = "reserved-ip-addresses-classic.png"
+
+
+class RouteFilters(_Networking):
+    _icon = "route-filters.png"
+
+
+class RouteTables(_Networking):
+    _icon = "route-tables.png"
+
+
+class ServiceEndpointPolicies(_Networking):
+    _icon = "service-endpoint-policies.png"
+
+
+class TrafficManagerProfiles(_Networking):
+    _icon = "traffic-manager-profiles.png"
+
+
+class VirtualNetworkGateways(_Networking):
+    _icon = "virtual-network-gateways.png"
+
+
+class VirtualNetworksClassic(_Networking):
+    _icon = "virtual-networks-classic.png"
+
+
+class VirtualNetworks(_Networking):
+    _icon = "virtual-networks.png"
+
+
+class VirtualWans(_Networking):
+    _icon = "virtual-wans.png"
+
+
+class WebApplicationFirewallPolicieswaf(_Networking):
+    _icon = "web-application-firewall-policieswaf.png"
+
+
+# Aliases
diff --git a/diagrams/azure/other.py b/diagrams/azure/other.py
new file mode 100644
index 00000000..937b096c
--- /dev/null
+++ b/diagrams/azure/other.py
@@ -0,0 +1,59 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Other(_Azure):
+    _type = "other"
+    _icon_dir = "resources/azure/other"
+
+
+class BackupCenter(_Other):
+    _icon = "backup-center.png"
+
+
+class Detonation(_Other):
+    _icon = "detonation.png"
+
+
+class ExpressrouteDirect(_Other):
+    _icon = "expressroute-direct.png"
+
+
+class InstancePools(_Other):
+    _icon = "instance-pools.png"
+
+
+class InternetAnalyzerProfiles(_Other):
+    _icon = "internet-analyzer-profiles.png"
+
+
+class LocalNetworkGateways(_Other):
+    _icon = "local-network-gateways.png"
+
+
+class PeeringService(_Other):
+    _icon = "peering-service.png"
+
+
+class ResourceMover(_Other):
+    _icon = "resource-mover.png"
+
+
+class SshKeys(_Other):
+    _icon = "ssh-keys.png"
+
+
+class TemplateSpecs(_Other):
+    _icon = "template-specs.png"
+
+
+class UniversalPrint(_Other):
+    _icon = "universal-print.png"
+
+
+class WindowsVirtualDesktop(_Other):
+    _icon = "windows-virtual-desktop.png"
+
+
+# Aliases
diff --git a/diagrams/azure/preview.py b/diagrams/azure/preview.py
new file mode 100644
index 00000000..6df05745
--- /dev/null
+++ b/diagrams/azure/preview.py
@@ -0,0 +1,47 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _Preview(_Azure):
+    _type = "preview"
+    _icon_dir = "resources/azure/preview"
+
+
+class CloudShell(_Preview):
+    _icon = "cloud-shell.png"
+
+
+class IotEdge(_Preview):
+    _icon = "iot-edge.png"
+
+
+class PrivateLinkHub(_Preview):
+    _icon = "private-link-hub.png"
+
+
+class Rtos(_Preview):
+    _icon = "rtos.png"
+
+
+class Sphere(_Preview):
+    _icon = "sphere.png"
+
+
+class StaticApps(_Preview):
+    _icon = "static-apps.png"
+
+
+class TimeSeriesDataSets(_Preview):
+    _icon = "time-series-data-sets.png"
+
+
+class WebEnvironment(_Preview):
+    _icon = "web-environment.png"
+
+
+class Workbooks(_Preview):
+    _icon = "workbooks.png"
+
+
+# Aliases
diff --git a/diagrams/azure/security.py b/diagrams/azure/security.py
index f78fb51d..e579d6df 100644
--- a/diagrams/azure/security.py
+++ b/diagrams/azure/security.py
@@ -20,8 +20,8 @@ class Defender(_Security):
     _icon = "defender.png"
 
 
-class ExtendedSecurityUpdates(_Security):
-    _icon = "extended-security-updates.png"
+class Extendedsecurityupdates(_Security):
+    _icon = "extendedsecurityupdates.png"
 
 
 class KeyVaults(_Security):
diff --git a/diagrams/azure/storage.py b/diagrams/azure/storage.py
index 5dcf1f2c..1a703132 100644
--- a/diagrams/azure/storage.py
+++ b/diagrams/azure/storage.py
@@ -8,40 +8,44 @@ class _Storage(_Azure):
     _icon_dir = "resources/azure/storage"
 
 
-class ArchiveStorage(_Storage):
-    _icon = "archive-storage.png"
+class DataBoxEdge(_Storage):
+    _icon = "data-box-edge.png"
 
 
-class Azurefxtedgefiler(_Storage):
-    _icon = "azurefxtedgefiler.png"
+class DataBox(_Storage):
+    _icon = "data-box.png"
 
 
-class BlobStorage(_Storage):
-    _icon = "blob-storage.png"
+class DataLakeStorageGen1(_Storage):
+    _icon = "data-lake-storage-gen1.png"
 
 
-class DataBoxEdgeDataBoxGateway(_Storage):
-    _icon = "data-box-edge-data-box-gateway.png"
+class DataShareInvitations(_Storage):
+    _icon = "data-share-invitations.png"
 
 
-class DataBox(_Storage):
-    _icon = "data-box.png"
+class DataShares(_Storage):
+    _icon = "data-shares.png"
 
 
-class DataLakeStorage(_Storage):
-    _icon = "data-lake-storage.png"
+class HcpCache(_Storage):
+    _icon = "hcp-cache.png"
 
 
-class GeneralStorage(_Storage):
-    _icon = "general-storage.png"
+class ImportExportJobs(_Storage):
+    _icon = "import-export-jobs.png"
 
 
 class NetappFiles(_Storage):
     _icon = "netapp-files.png"
 
 
-class QueuesStorage(_Storage):
-    _icon = "queues-storage.png"
+class RecoveryServicesVaults(_Storage):
+    _icon = "recovery-services-vaults.png"
+
+
+class StackEdge(_Storage):
+    _icon = "stack-edge.png"
 
 
 class StorageAccountsClassic(_Storage):
@@ -52,10 +56,6 @@ class StorageAccounts(_Storage):
     _icon = "storage-accounts.png"
 
 
-class StorageExplorer(_Storage):
-    _icon = "storage-explorer.png"
-
-
 class StorageSyncServices(_Storage):
     _icon = "storage-sync-services.png"
 
@@ -68,8 +68,4 @@ class StorsimpleDeviceManagers(_Storage):
     _icon = "storsimple-device-managers.png"
 
 
-class TableStorage(_Storage):
-    _icon = "table-storage.png"
-
-
 # Aliases
diff --git a/diagrams/azure/web.py b/diagrams/azure/web.py
index b99a61cc..4f689be0 100644
--- a/diagrams/azure/web.py
+++ b/diagrams/azure/web.py
@@ -8,44 +8,12 @@ class _Web(_Azure):
     _icon_dir = "resources/azure/web"
 
 
-class APIConnections(_Web):
-    _icon = "api-connections.png"
-
-
-class AppServiceCertificates(_Web):
-    _icon = "app-service-certificates.png"
-
-
-class AppServiceDomains(_Web):
-    _icon = "app-service-domains.png"
-
-
-class AppServiceEnvironments(_Web):
-    _icon = "app-service-environments.png"
-
-
-class AppServicePlans(_Web):
-    _icon = "app-service-plans.png"
-
-
-class AppServices(_Web):
-    _icon = "app-services.png"
-
-
-class MediaServices(_Web):
-    _icon = "media-services.png"
+class MediaService(_Web):
+    _icon = "media-service.png"
 
 
 class NotificationHubNamespaces(_Web):
     _icon = "notification-hub-namespaces.png"
 
 
-class Search(_Web):
-    _icon = "search.png"
-
-
-class Signalr(_Web):
-    _icon = "signalr.png"
-
-
 # Aliases
diff --git a/docs/nodes/azure.md b/docs/nodes/azure.md
index 88fba3a0..c7bb5aaf 100644
--- a/docs/nodes/azure.md
+++ b/docs/nodes/azure.md
@@ -5,20 +5,32 @@ title: Azure
 
 Node classes list of azure provider.
 
-## azure.analytics
+## azure.ai_machine_learning
 
 
-<img width="30" src="/img/resources/azure/analytics/analysis-services.png" alt="AnalysisServices" style="float: left; padding-right: 5px;" >
-**diagrams.azure.analytics.AnalysisServices**
+<img width="30" src="/img/resources/azure/ai_machine_learning/bot-services.png" alt="BotServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.ai_machine_learning.BotServices**
+
+<img width="30" src="/img/resources/azure/ai_machine_learning/cognitive-services.png" alt="CognitiveServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.ai_machine_learning.CognitiveServices**
+
+<img width="30" src="/img/resources/azure/ai_machine_learning/machine-learning-studio-classic-web-services.png" alt="MachineLearningStudioClassicWebServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.ai_machine_learning.MachineLearningStudioClassicWebServices**
+
+<img width="30" src="/img/resources/azure/ai_machine_learning/machine-learning-studio-web-service-plans.png" alt="MachineLearningStudioWebServicePlans" style="float: left; padding-right: 5px;" >
+**diagrams.azure.ai_machine_learning.MachineLearningStudioWebServicePlans**
+
+<img width="30" src="/img/resources/azure/ai_machine_learning/machine-learning-studio-workspaces.png" alt="MachineLearningStudioWorkspaces" style="float: left; padding-right: 5px;" >
+**diagrams.azure.ai_machine_learning.MachineLearningStudioWorkspaces**
 
-<img width="30" src="/img/resources/azure/analytics/data-explorer-clusters.png" alt="DataExplorerClusters" style="float: left; padding-right: 5px;" >
-**diagrams.azure.analytics.DataExplorerClusters**
+<img width="30" src="/img/resources/azure/ai_machine_learning/translator-text.png" alt="TranslatorText" style="float: left; padding-right: 5px;" >
+**diagrams.azure.ai_machine_learning.TranslatorText**
+
+## azure.analytics
 
-<img width="30" src="/img/resources/azure/analytics/data-factories.png" alt="DataFactories" style="float: left; padding-right: 5px;" >
-**diagrams.azure.analytics.DataFactories**
 
-<img width="30" src="/img/resources/azure/analytics/data-lake-analytics.png" alt="DataLakeAnalytics" style="float: left; padding-right: 5px;" >
-**diagrams.azure.analytics.DataLakeAnalytics**
+<img width="30" src="/img/resources/azure/analytics/analysis-services.png" alt="AnalysisServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.analytics.AnalysisServices**
 
 <img width="30" src="/img/resources/azure/analytics/data-lake-store-gen1.png" alt="DataLakeStoreGen1" style="float: left; padding-right: 5px;" >
 **diagrams.azure.analytics.DataLakeStoreGen1**
@@ -32,8 +44,8 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/analytics/event-hubs.png" alt="EventHubs" style="float: left; padding-right: 5px;" >
 **diagrams.azure.analytics.EventHubs**
 
-<img width="30" src="/img/resources/azure/analytics/hdinsightclusters.png" alt="Hdinsightclusters" style="float: left; padding-right: 5px;" >
-**diagrams.azure.analytics.Hdinsightclusters**
+<img width="30" src="/img/resources/azure/analytics/hd-insight-clusters.png" alt="HDInsightClusters" style="float: left; padding-right: 5px;" >
+**diagrams.azure.analytics.HDInsightClusters**
 
 <img width="30" src="/img/resources/azure/analytics/log-analytics-workspaces.png" alt="LogAnalyticsWorkspaces" style="float: left; padding-right: 5px;" >
 **diagrams.azure.analytics.LogAnalyticsWorkspaces**
@@ -44,6 +56,87 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/analytics/synapse-analytics.png" alt="SynapseAnalytics" style="float: left; padding-right: 5px;" >
 **diagrams.azure.analytics.SynapseAnalytics**
 
+## azure.app_services
+
+
+<img width="30" src="/img/resources/azure/app_services/api-management-services.png" alt="APIManagementServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.app_services.APIManagementServices**
+
+<img width="30" src="/img/resources/azure/app_services/app-service-certificates.png" alt="AppServiceCertificates" style="float: left; padding-right: 5px;" >
+**diagrams.azure.app_services.AppServiceCertificates**
+
+<img width="30" src="/img/resources/azure/app_services/app-service-domains.png" alt="AppServiceDomains" style="float: left; padding-right: 5px;" >
+**diagrams.azure.app_services.AppServiceDomains**
+
+<img width="30" src="/img/resources/azure/app_services/app-service-environments.png" alt="AppServiceEnvironments" style="float: left; padding-right: 5px;" >
+**diagrams.azure.app_services.AppServiceEnvironments**
+
+<img width="30" src="/img/resources/azure/app_services/app-service-plans.png" alt="AppServicePlans" style="float: left; padding-right: 5px;" >
+**diagrams.azure.app_services.AppServicePlans**
+
+<img width="30" src="/img/resources/azure/app_services/app-services.png" alt="AppServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.app_services.AppServices**
+
+<img width="30" src="/img/resources/azure/app_services/cdn-profiles.png" alt="CDNProfiles" style="float: left; padding-right: 5px;" >
+**diagrams.azure.app_services.CDNProfiles**
+
+<img width="30" src="/img/resources/azure/app_services/notification-hubs.png" alt="NotificationHubs" style="float: left; padding-right: 5px;" >
+**diagrams.azure.app_services.NotificationHubs**
+
+<img width="30" src="/img/resources/azure/app_services/search-services.png" alt="SearchServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.app_services.SearchServices**
+
+## azure.azure_stack
+
+
+<img width="30" src="/img/resources/azure/azure_stack/capacity.png" alt="Capacity" style="float: left; padding-right: 5px;" >
+**diagrams.azure.azure_stack.Capacity**
+
+<img width="30" src="/img/resources/azure/azure_stack/infrastructure-backup.png" alt="InfrastructureBackup" style="float: left; padding-right: 5px;" >
+**diagrams.azure.azure_stack.InfrastructureBackup**
+
+<img width="30" src="/img/resources/azure/azure_stack/multi-tenancy.png" alt="MultiTenancy" style="float: left; padding-right: 5px;" >
+**diagrams.azure.azure_stack.MultiTenancy**
+
+<img width="30" src="/img/resources/azure/azure_stack/offers.png" alt="Offers" style="float: left; padding-right: 5px;" >
+**diagrams.azure.azure_stack.Offers**
+
+<img width="30" src="/img/resources/azure/azure_stack/plans.png" alt="Plans" style="float: left; padding-right: 5px;" >
+**diagrams.azure.azure_stack.Plans**
+
+<img width="30" src="/img/resources/azure/azure_stack/stack.png" alt="Stack" style="float: left; padding-right: 5px;" >
+**diagrams.azure.azure_stack.Stack**
+
+<img width="30" src="/img/resources/azure/azure_stack/updates.png" alt="Updates" style="float: left; padding-right: 5px;" >
+**diagrams.azure.azure_stack.Updates**
+
+<img width="30" src="/img/resources/azure/azure_stack/user-subscriptions.png" alt="UserSubscriptions" style="float: left; padding-right: 5px;" >
+**diagrams.azure.azure_stack.UserSubscriptions**
+
+## azure.azure_vmware_solution
+
+
+<img width="30" src="/img/resources/azure/azure_vmware_solution/avs.png" alt="Avs" style="float: left; padding-right: 5px;" >
+**diagrams.azure.azure_vmware_solution.Avs**
+
+## azure.blockchain
+
+
+<img width="30" src="/img/resources/azure/blockchain/abs-member.png" alt="AbsMember" style="float: left; padding-right: 5px;" >
+**diagrams.azure.blockchain.AbsMember**
+
+<img width="30" src="/img/resources/azure/blockchain/blockchain-service.png" alt="BlockchainService" style="float: left; padding-right: 5px;" >
+**diagrams.azure.blockchain.BlockchainService**
+
+<img width="30" src="/img/resources/azure/blockchain/consortium.png" alt="Consortium" style="float: left; padding-right: 5px;" >
+**diagrams.azure.blockchain.Consortium**
+
+<img width="30" src="/img/resources/azure/blockchain/outbound-connection.png" alt="OutboundConnection" style="float: left; padding-right: 5px;" >
+**diagrams.azure.blockchain.OutboundConnection**
+
+<img width="30" src="/img/resources/azure/blockchain/token-service.png" alt="TokenService" style="float: left; padding-right: 5px;" >
+**diagrams.azure.blockchain.TokenService**
+
 ## azure.compute
 
 
@@ -59,29 +152,23 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/compute/batch-accounts.png" alt="BatchAccounts" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.BatchAccounts**
 
-<img width="30" src="/img/resources/azure/compute/citrix-virtual-desktops-essentials.png" alt="CitrixVirtualDesktopsEssentials" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.CitrixVirtualDesktopsEssentials**
-
 <img width="30" src="/img/resources/azure/compute/cloud-services-classic.png" alt="CloudServicesClassic" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.CloudServicesClassic**
 
-<img width="30" src="/img/resources/azure/compute/cloud-services.png" alt="CloudServices" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.CloudServices**
-
-<img width="30" src="/img/resources/azure/compute/cloudsimple-virtual-machines.png" alt="CloudsimpleVirtualMachines" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.CloudsimpleVirtualMachines**
-
 <img width="30" src="/img/resources/azure/compute/container-instances.png" alt="ContainerInstances" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.ContainerInstances**
 
-<img width="30" src="/img/resources/azure/compute/container-registries.png" alt="ContainerRegistries" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.ContainerRegistries**, **ACR** (alias)
+<img width="30" src="/img/resources/azure/compute/container-services-deprecated.png" alt="ContainerServicesDeprecated" style="float: left; padding-right: 5px;" >
+**diagrams.azure.compute.ContainerServicesDeprecated**
 
 <img width="30" src="/img/resources/azure/compute/disk-encryption-sets.png" alt="DiskEncryptionSets" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.DiskEncryptionSets**
 
-<img width="30" src="/img/resources/azure/compute/disk-snapshots.png" alt="DiskSnapshots" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.DiskSnapshots**
+<img width="30" src="/img/resources/azure/compute/disks-classic.png" alt="DisksClassic" style="float: left; padding-right: 5px;" >
+**diagrams.azure.compute.DisksClassic**
+
+<img width="30" src="/img/resources/azure/compute/disks-snapshots.png" alt="DisksSnapshots" style="float: left; padding-right: 5px;" >
+**diagrams.azure.compute.DisksSnapshots**
 
 <img width="30" src="/img/resources/azure/compute/disks.png" alt="Disks" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.Disks**
@@ -95,17 +182,17 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/compute/image-versions.png" alt="ImageVersions" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.ImageVersions**
 
+<img width="30" src="/img/resources/azure/compute/images.png" alt="Images" style="float: left; padding-right: 5px;" >
+**diagrams.azure.compute.Images**
+
 <img width="30" src="/img/resources/azure/compute/kubernetes-services.png" alt="KubernetesServices" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.KubernetesServices**, **AKS** (alias)
 
 <img width="30" src="/img/resources/azure/compute/mesh-applications.png" alt="MeshApplications" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.MeshApplications**
 
-<img width="30" src="/img/resources/azure/compute/os-images.png" alt="OsImages" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.OsImages**
-
-<img width="30" src="/img/resources/azure/compute/sap-hana-on-azure.png" alt="SAPHANAOnAzure" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.SAPHANAOnAzure**
+<img width="30" src="/img/resources/azure/compute/os-images-classic.png" alt="OsImagesClassic" style="float: left; padding-right: 5px;" >
+**diagrams.azure.compute.OsImagesClassic**
 
 <img width="30" src="/img/resources/azure/compute/service-fabric-clusters.png" alt="ServiceFabricClusters" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.ServiceFabricClusters**
@@ -116,101 +203,110 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/compute/spring-cloud.png" alt="SpringCloud" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.SpringCloud**
 
-<img width="30" src="/img/resources/azure/compute/vm-classic.png" alt="VMClassic" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.VMClassic**
+<img width="30" src="/img/resources/azure/compute/virtual-machine.png" alt="VirtualMachine" style="float: left; padding-right: 5px;" >
+**diagrams.azure.compute.VirtualMachine**
 
-<img width="30" src="/img/resources/azure/compute/vm-images.png" alt="VMImages" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.VMImages**
+<img width="30" src="/img/resources/azure/compute/virtual-machines-classic.png" alt="VirtualMachinesClassic" style="float: left; padding-right: 5px;" >
+**diagrams.azure.compute.VirtualMachinesClassic**
 
-<img width="30" src="/img/resources/azure/compute/vm-linux.png" alt="VMLinux" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.VMLinux**
+<img width="30" src="/img/resources/azure/compute/vm-images-classic.png" alt="VMImagesClassic" style="float: left; padding-right: 5px;" >
+**diagrams.azure.compute.VMImagesClassic**
 
-<img width="30" src="/img/resources/azure/compute/vm-scale-set.png" alt="VMScaleSet" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.VMScaleSet**, **VMSS** (alias)
-
-<img width="30" src="/img/resources/azure/compute/vm-windows.png" alt="VMWindows" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.VMWindows**
-
-<img width="30" src="/img/resources/azure/compute/vm.png" alt="VM" style="float: left; padding-right: 5px;" >
-**diagrams.azure.compute.VM**
+<img width="30" src="/img/resources/azure/compute/vm-scale-sets.png" alt="VMScaleSets" style="float: left; padding-right: 5px;" >
+**diagrams.azure.compute.VMScaleSets**
 
 <img width="30" src="/img/resources/azure/compute/workspaces.png" alt="Workspaces" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.Workspaces**
 
-## azure.database
+## azure.containers
+
+
+<img width="30" src="/img/resources/azure/containers/app-services.png" alt="AppServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.containers.AppServices**
+
+<img width="30" src="/img/resources/azure/containers/batch-accounts.png" alt="BatchAccounts" style="float: left; padding-right: 5px;" >
+**diagrams.azure.containers.BatchAccounts**
+
+<img width="30" src="/img/resources/azure/containers/container-instances.png" alt="ContainerInstances" style="float: left; padding-right: 5px;" >
+**diagrams.azure.containers.ContainerInstances**
 
+<img width="30" src="/img/resources/azure/containers/container-registries.png" alt="ContainerRegistries" style="float: left; padding-right: 5px;" >
+**diagrams.azure.containers.ContainerRegistries**
 
-<img width="30" src="/img/resources/azure/database/blob-storage.png" alt="BlobStorage" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.BlobStorage**
+<img width="30" src="/img/resources/azure/containers/kubernetes-services.png" alt="KubernetesServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.containers.KubernetesServices**
 
-<img width="30" src="/img/resources/azure/database/cache-for-redis.png" alt="CacheForRedis" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.CacheForRedis**
+<img width="30" src="/img/resources/azure/containers/service-fabric-clusters.png" alt="ServiceFabricClusters" style="float: left; padding-right: 5px;" >
+**diagrams.azure.containers.ServiceFabricClusters**
 
-<img width="30" src="/img/resources/azure/database/cosmos-db.png" alt="CosmosDb" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.CosmosDb**
+## azure.databases
 
-<img width="30" src="/img/resources/azure/database/data-explorer-clusters.png" alt="DataExplorerClusters" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.DataExplorerClusters**
 
-<img width="30" src="/img/resources/azure/database/data-factory.png" alt="DataFactory" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.DataFactory**
+<img width="30" src="/img/resources/azure/databases/cache-redis.png" alt="CacheRedis" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.CacheRedis**
 
-<img width="30" src="/img/resources/azure/database/data-lake.png" alt="DataLake" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.DataLake**
+<img width="30" src="/img/resources/azure/databases/cosmos-db.png" alt="CosmosDb" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.CosmosDb**
 
-<img width="30" src="/img/resources/azure/database/database-for-mariadb-servers.png" alt="DatabaseForMariadbServers" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.DatabaseForMariadbServers**
+<img width="30" src="/img/resources/azure/databases/data-explorer-clusters.png" alt="DataExplorerClusters" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.DataExplorerClusters**
 
-<img width="30" src="/img/resources/azure/database/database-for-mysql-servers.png" alt="DatabaseForMysqlServers" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.DatabaseForMysqlServers**
+<img width="30" src="/img/resources/azure/databases/data-factory.png" alt="DataFactory" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.DataFactory**
 
-<img width="30" src="/img/resources/azure/database/database-for-postgresql-servers.png" alt="DatabaseForPostgresqlServers" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.DatabaseForPostgresqlServers**
+<img width="30" src="/img/resources/azure/databases/database-mariadb-server.png" alt="DatabaseMariadbServer" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.DatabaseMariadbServer**
 
-<img width="30" src="/img/resources/azure/database/elastic-database-pools.png" alt="ElasticDatabasePools" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.ElasticDatabasePools**
+<img width="30" src="/img/resources/azure/databases/database-migration-services.png" alt="DatabaseMigrationServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.DatabaseMigrationServices**
 
-<img width="30" src="/img/resources/azure/database/elastic-job-agents.png" alt="ElasticJobAgents" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.ElasticJobAgents**
+<img width="30" src="/img/resources/azure/databases/database-mysql-server.png" alt="DatabaseMysqlServer" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.DatabaseMysqlServer**
 
-<img width="30" src="/img/resources/azure/database/instance-pools.png" alt="InstancePools" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.InstancePools**
+<img width="30" src="/img/resources/azure/databases/database-postgresql-server.png" alt="DatabasePostgresqlServer" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.DatabasePostgresqlServer**
 
-<img width="30" src="/img/resources/azure/database/managed-databases.png" alt="ManagedDatabases" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.ManagedDatabases**
+<img width="30" src="/img/resources/azure/databases/elastic-job-agents.png" alt="ElasticJobAgents" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.ElasticJobAgents**
 
-<img width="30" src="/img/resources/azure/database/sql-databases.png" alt="SQLDatabases" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.SQLDatabases**
+<img width="30" src="/img/resources/azure/databases/instance-pools.png" alt="InstancePools" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.InstancePools**
 
-<img width="30" src="/img/resources/azure/database/sql-datawarehouse.png" alt="SQLDatawarehouse" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.SQLDatawarehouse**
+<img width="30" src="/img/resources/azure/databases/managed-database.png" alt="ManagedDatabase" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.ManagedDatabase**
 
-<img width="30" src="/img/resources/azure/database/sql-managed-instances.png" alt="SQLManagedInstances" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.SQLManagedInstances**
+<img width="30" src="/img/resources/azure/databases/sql-data-warehouses.png" alt="SQLDataWarehouses" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.SQLDataWarehouses**
 
-<img width="30" src="/img/resources/azure/database/sql-server-stretch-databases.png" alt="SQLServerStretchDatabases" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.SQLServerStretchDatabases**
+<img width="30" src="/img/resources/azure/databases/sql-database.png" alt="SQLDatabase" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.SQLDatabase**
 
-<img width="30" src="/img/resources/azure/database/sql-servers.png" alt="SQLServers" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.SQLServers**
+<img width="30" src="/img/resources/azure/databases/sql-elastic-pools.png" alt="SQLElasticPools" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.SQLElasticPools**
 
-<img width="30" src="/img/resources/azure/database/sql-vm.png" alt="SQLVM" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.SQLVM**
+<img width="30" src="/img/resources/azure/databases/sql-managed-instance.png" alt="SQLManagedInstance" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.SQLManagedInstance**
 
-<img width="30" src="/img/resources/azure/database/sql.png" alt="SQL" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.SQL**
+<img width="30" src="/img/resources/azure/databases/sql-server-stretch-databases.png" alt="SQLServerStretchDatabases" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.SQLServerStretchDatabases**
 
-<img width="30" src="/img/resources/azure/database/ssis-lift-and-shift-ir.png" alt="SsisLiftAndShiftIr" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.SsisLiftAndShiftIr**
+<img width="30" src="/img/resources/azure/databases/sql-server.png" alt="SQLServer" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.SQLServer**
 
-<img width="30" src="/img/resources/azure/database/synapse-analytics.png" alt="SynapseAnalytics" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.SynapseAnalytics**
+<img width="30" src="/img/resources/azure/databases/sql-vm.png" alt="SQLVM" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.SQLVM**
 
-<img width="30" src="/img/resources/azure/database/virtual-clusters.png" alt="VirtualClusters" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.VirtualClusters**
+<img width="30" src="/img/resources/azure/databases/sql.png" alt="SQL" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.SQL**
 
-<img width="30" src="/img/resources/azure/database/virtual-datacenter.png" alt="VirtualDatacenter" style="float: left; padding-right: 5px;" >
-**diagrams.azure.database.VirtualDatacenter**
+<img width="30" src="/img/resources/azure/databases/ssis-lift-and-shift-ir.png" alt="SsisLiftAndShiftIr" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.SsisLiftAndShiftIr**
+
+<img width="30" src="/img/resources/azure/databases/synapse-analytics.png" alt="SynapseAnalytics" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.SynapseAnalytics**
+
+<img width="30" src="/img/resources/azure/databases/virtual-clusters.png" alt="VirtualClusters" style="float: left; padding-right: 5px;" >
+**diagrams.azure.databases.VirtualClusters**
 
 ## azure.devops
 
@@ -218,12 +314,6 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/devops/application-insights.png" alt="ApplicationInsights" style="float: left; padding-right: 5px;" >
 **diagrams.azure.devops.ApplicationInsights**
 
-<img width="30" src="/img/resources/azure/devops/artifacts.png" alt="Artifacts" style="float: left; padding-right: 5px;" >
-**diagrams.azure.devops.Artifacts**
-
-<img width="30" src="/img/resources/azure/devops/boards.png" alt="Boards" style="float: left; padding-right: 5px;" >
-**diagrams.azure.devops.Boards**
-
 <img width="30" src="/img/resources/azure/devops/devops.png" alt="Devops" style="float: left; padding-right: 5px;" >
 **diagrams.azure.devops.Devops**
 
@@ -233,41 +323,200 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/devops/lab-services.png" alt="LabServices" style="float: left; padding-right: 5px;" >
 **diagrams.azure.devops.LabServices**
 
-<img width="30" src="/img/resources/azure/devops/pipelines.png" alt="Pipelines" style="float: left; padding-right: 5px;" >
-**diagrams.azure.devops.Pipelines**
+## azure.general
 
-<img width="30" src="/img/resources/azure/devops/repos.png" alt="Repos" style="float: left; padding-right: 5px;" >
-**diagrams.azure.devops.Repos**
 
-<img width="30" src="/img/resources/azure/devops/test-plans.png" alt="TestPlans" style="float: left; padding-right: 5px;" >
-**diagrams.azure.devops.TestPlans**
+<img width="30" src="/img/resources/azure/general/all-resources.png" alt="AllResources" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.AllResources**
 
-## azure.general
+<img width="30" src="/img/resources/azure/general/backlog.png" alt="Backlog" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Backlog**
+
+<img width="30" src="/img/resources/azure/general/biz-talk.png" alt="BizTalk" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.BizTalk**
+
+<img width="30" src="/img/resources/azure/general/blob-block.png" alt="BlobBlock" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.BlobBlock**
+
+<img width="30" src="/img/resources/azure/general/blob-page.png" alt="BlobPage" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.BlobPage**
+
+<img width="30" src="/img/resources/azure/general/branch.png" alt="Branch" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Branch**
+
+<img width="30" src="/img/resources/azure/general/browser.png" alt="Browser" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Browser**
+
+<img width="30" src="/img/resources/azure/general/bug.png" alt="Bug" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Bug**
+
+<img width="30" src="/img/resources/azure/general/builds.png" alt="Builds" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Builds**
+
+<img width="30" src="/img/resources/azure/general/cache.png" alt="Cache" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Cache**
+
+<img width="30" src="/img/resources/azure/general/code.png" alt="Code" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Code**
+
+<img width="30" src="/img/resources/azure/general/commit.png" alt="Commit" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Commit**
+
+<img width="30" src="/img/resources/azure/general/controls-horizontal.png" alt="ControlsHorizontal" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ControlsHorizontal**
+
+<img width="30" src="/img/resources/azure/general/controls.png" alt="Controls" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Controls**
+
+<img width="30" src="/img/resources/azure/general/cost-alerts.png" alt="CostAlerts" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.CostAlerts**
+
+<img width="30" src="/img/resources/azure/general/cost-analysis.png" alt="CostAnalysis" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.CostAnalysis**
+
+<img width="30" src="/img/resources/azure/general/cost-budgets.png" alt="CostBudgets" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.CostBudgets**
+
+<img width="30" src="/img/resources/azure/general/cost-management-and-billing.png" alt="CostManagementAndBilling" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.CostManagementAndBilling**
+
+<img width="30" src="/img/resources/azure/general/cost-management.png" alt="CostManagement" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.CostManagement**
+
+<img width="30" src="/img/resources/azure/general/counter.png" alt="Counter" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Counter**
+
+<img width="30" src="/img/resources/azure/general/cubes.png" alt="Cubes" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Cubes**
+
+<img width="30" src="/img/resources/azure/general/dashboard.png" alt="Dashboard" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Dashboard**
+
+<img width="30" src="/img/resources/azure/general/dev-console.png" alt="DevConsole" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.DevConsole**
 
+<img width="30" src="/img/resources/azure/general/download.png" alt="Download" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Download**
 
-<img width="30" src="/img/resources/azure/general/allresources.png" alt="Allresources" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Allresources**
+<img width="30" src="/img/resources/azure/general/error.png" alt="Error" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Error**
 
-<img width="30" src="/img/resources/azure/general/azurehome.png" alt="Azurehome" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Azurehome**
+<img width="30" src="/img/resources/azure/general/extensions.png" alt="Extensions" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Extensions**
 
-<img width="30" src="/img/resources/azure/general/developertools.png" alt="Developertools" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Developertools**
+<img width="30" src="/img/resources/azure/general/file.png" alt="File" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.File**
 
-<img width="30" src="/img/resources/azure/general/helpsupport.png" alt="Helpsupport" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Helpsupport**
+<img width="30" src="/img/resources/azure/general/files.png" alt="Files" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Files**
+
+<img width="30" src="/img/resources/azure/general/folder-blank.png" alt="FolderBlank" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.FolderBlank**
+
+<img width="30" src="/img/resources/azure/general/folder-website.png" alt="FolderWebsite" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.FolderWebsite**
+
+<img width="30" src="/img/resources/azure/general/free-services.png" alt="FreeServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.FreeServices**
+
+<img width="30" src="/img/resources/azure/general/ftp.png" alt="Ftp" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Ftp**
+
+<img width="30" src="/img/resources/azure/general/gear.png" alt="Gear" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Gear**
+
+<img width="30" src="/img/resources/azure/general/globe-error.png" alt="GlobeError" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.GlobeError**
+
+<img width="30" src="/img/resources/azure/general/globe-success.png" alt="GlobeSuccess" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.GlobeSuccess**
+
+<img width="30" src="/img/resources/azure/general/globe-warning.png" alt="GlobeWarning" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.GlobeWarning**
+
+<img width="30" src="/img/resources/azure/general/globe.png" alt="Globe" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Globe**
+
+<img width="30" src="/img/resources/azure/general/guide.png" alt="Guide" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Guide**
+
+<img width="30" src="/img/resources/azure/general/heart.png" alt="Heart" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Heart**
+
+<img width="30" src="/img/resources/azure/general/help-and-support.png" alt="HelpAndSupport" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.HelpAndSupport**
+
+<img width="30" src="/img/resources/azure/general/image.png" alt="Image" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Image**
 
 <img width="30" src="/img/resources/azure/general/information.png" alt="Information" style="float: left; padding-right: 5px;" >
 **diagrams.azure.general.Information**
 
-<img width="30" src="/img/resources/azure/general/managementgroups.png" alt="Managementgroups" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Managementgroups**
+<img width="30" src="/img/resources/azure/general/input-output.png" alt="InputOutput" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.InputOutput**
+
+<img width="30" src="/img/resources/azure/general/journey-hub.png" alt="JourneyHub" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.JourneyHub**
+
+<img width="30" src="/img/resources/azure/general/launch-portal.png" alt="LaunchPortal" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.LaunchPortal**
+
+<img width="30" src="/img/resources/azure/general/learn.png" alt="Learn" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Learn**
+
+<img width="30" src="/img/resources/azure/general/load-test.png" alt="LoadTest" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.LoadTest**
+
+<img width="30" src="/img/resources/azure/general/location.png" alt="Location" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Location**
+
+<img width="30" src="/img/resources/azure/general/log-streaming.png" alt="LogStreaming" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.LogStreaming**
+
+<img width="30" src="/img/resources/azure/general/management-groups.png" alt="ManagementGroups" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ManagementGroups**
+
+<img width="30" src="/img/resources/azure/general/management-portal.png" alt="ManagementPortal" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ManagementPortal**
 
 <img width="30" src="/img/resources/azure/general/marketplace.png" alt="Marketplace" style="float: left; padding-right: 5px;" >
 **diagrams.azure.general.Marketplace**
 
-<img width="30" src="/img/resources/azure/general/quickstartcenter.png" alt="Quickstartcenter" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Quickstartcenter**
+<img width="30" src="/img/resources/azure/general/media-file.png" alt="MediaFile" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.MediaFile**
+
+<img width="30" src="/img/resources/azure/general/media.png" alt="Media" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Media**
+
+<img width="30" src="/img/resources/azure/general/mobile-engagement.png" alt="MobileEngagement" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.MobileEngagement**
+
+<img width="30" src="/img/resources/azure/general/mobile.png" alt="Mobile" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Mobile**
+
+<img width="30" src="/img/resources/azure/general/module.png" alt="Module" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Module**
+
+<img width="30" src="/img/resources/azure/general/power-up.png" alt="PowerUp" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.PowerUp**
+
+<img width="30" src="/img/resources/azure/general/power.png" alt="Power" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Power**
+
+<img width="30" src="/img/resources/azure/general/powershell.png" alt="Powershell" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Powershell**
+
+<img width="30" src="/img/resources/azure/general/preview.png" alt="Preview" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Preview**
+
+<img width="30" src="/img/resources/azure/general/process-explorer.png" alt="ProcessExplorer" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ProcessExplorer**
+
+<img width="30" src="/img/resources/azure/general/production-ready-database.png" alt="ProductionReadyDatabase" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ProductionReadyDatabase**
+
+<img width="30" src="/img/resources/azure/general/quickstart-center.png" alt="QuickstartCenter" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.QuickstartCenter**
 
 <img width="30" src="/img/resources/azure/general/recent.png" alt="Recent" style="float: left; padding-right: 5px;" >
 **diagrams.azure.general.Recent**
@@ -275,26 +524,56 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/general/reservations.png" alt="Reservations" style="float: left; padding-right: 5px;" >
 **diagrams.azure.general.Reservations**
 
-<img width="30" src="/img/resources/azure/general/resource.png" alt="Resource" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Resource**
+<img width="30" src="/img/resources/azure/general/resource-explorer.png" alt="ResourceExplorer" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ResourceExplorer**
+
+<img width="30" src="/img/resources/azure/general/resource-group-list.png" alt="ResourceGroupList" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ResourceGroupList**
+
+<img width="30" src="/img/resources/azure/general/resource-groups.png" alt="ResourceGroups" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ResourceGroups**
+
+<img width="30" src="/img/resources/azure/general/resource-linked.png" alt="ResourceLinked" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ResourceLinked**
+
+<img width="30" src="/img/resources/azure/general/scale.png" alt="Scale" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Scale**
+
+<img width="30" src="/img/resources/azure/general/scheduler.png" alt="Scheduler" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Scheduler**
+
+<img width="30" src="/img/resources/azure/general/search-grid.png" alt="SearchGrid" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.SearchGrid**
+
+<img width="30" src="/img/resources/azure/general/search.png" alt="Search" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Search**
+
+<img width="30" src="/img/resources/azure/general/server-farm.png" alt="ServerFarm" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ServerFarm**
+
+<img width="30" src="/img/resources/azure/general/service-bus.png" alt="ServiceBus" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ServiceBus**
 
-<img width="30" src="/img/resources/azure/general/resourcegroups.png" alt="Resourcegroups" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Resourcegroups**
+<img width="30" src="/img/resources/azure/general/service-health.png" alt="ServiceHealth" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.ServiceHealth**
 
-<img width="30" src="/img/resources/azure/general/servicehealth.png" alt="Servicehealth" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Servicehealth**
+<img width="30" src="/img/resources/azure/general/ssd.png" alt="Ssd" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Ssd**
 
-<img width="30" src="/img/resources/azure/general/shareddashboard.png" alt="Shareddashboard" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Shareddashboard**
+<img width="30" src="/img/resources/azure/general/storage-azure-files.png" alt="StorageAzureFiles" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.StorageAzureFiles**
+
+<img width="30" src="/img/resources/azure/general/storage-container.png" alt="StorageContainer" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.StorageContainer**
+
+<img width="30" src="/img/resources/azure/general/storage-queue.png" alt="StorageQueue" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.StorageQueue**
 
 <img width="30" src="/img/resources/azure/general/subscriptions.png" alt="Subscriptions" style="float: left; padding-right: 5px;" >
 **diagrams.azure.general.Subscriptions**
 
-<img width="30" src="/img/resources/azure/general/support.png" alt="Support" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Support**
-
-<img width="30" src="/img/resources/azure/general/supportrequests.png" alt="Supportrequests" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Supportrequests**
+<img width="30" src="/img/resources/azure/general/table.png" alt="Table" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Table**
 
 <img width="30" src="/img/resources/azure/general/tag.png" alt="Tag" style="float: left; padding-right: 5px;" >
 **diagrams.azure.general.Tag**
@@ -302,32 +581,35 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/general/tags.png" alt="Tags" style="float: left; padding-right: 5px;" >
 **diagrams.azure.general.Tags**
 
-<img width="30" src="/img/resources/azure/general/templates.png" alt="Templates" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Templates**
+<img width="30" src="/img/resources/azure/general/tfs-vc-repository.png" alt="TfsVcRepository" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.TfsVcRepository**
 
-<img width="30" src="/img/resources/azure/general/twousericon.png" alt="Twousericon" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Twousericon**
+<img width="30" src="/img/resources/azure/general/toolbox.png" alt="Toolbox" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Toolbox**
 
-<img width="30" src="/img/resources/azure/general/userhealthicon.png" alt="Userhealthicon" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Userhealthicon**
+<img width="30" src="/img/resources/azure/general/versions.png" alt="Versions" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Versions**
 
-<img width="30" src="/img/resources/azure/general/usericon.png" alt="Usericon" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Usericon**
+<img width="30" src="/img/resources/azure/general/web-slots.png" alt="WebSlots" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.WebSlots**
 
-<img width="30" src="/img/resources/azure/general/userprivacy.png" alt="Userprivacy" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Userprivacy**
+<img width="30" src="/img/resources/azure/general/web-test.png" alt="WebTest" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.WebTest**
 
-<img width="30" src="/img/resources/azure/general/userresource.png" alt="Userresource" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Userresource**
+<img width="30" src="/img/resources/azure/general/website-power.png" alt="WebsitePower" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.WebsitePower**
 
-<img width="30" src="/img/resources/azure/general/whatsnew.png" alt="Whatsnew" style="float: left; padding-right: 5px;" >
-**diagrams.azure.general.Whatsnew**
+<img width="30" src="/img/resources/azure/general/website-staging.png" alt="WebsiteStaging" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.WebsiteStaging**
 
-## azure.identity
+<img width="30" src="/img/resources/azure/general/workbooks.png" alt="Workbooks" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Workbooks**
 
+<img width="30" src="/img/resources/azure/general/workflow.png" alt="Workflow" style="float: left; padding-right: 5px;" >
+**diagrams.azure.general.Workflow**
+
+## azure.identity
 
-<img width="30" src="/img/resources/azure/identity/access-review.png" alt="AccessReview" style="float: left; padding-right: 5px;" >
-**diagrams.azure.identity.AccessReview**
 
 <img width="30" src="/img/resources/azure/identity/active-directory-connect-health.png" alt="ActiveDirectoryConnectHealth" style="float: left; padding-right: 5px;" >
 **diagrams.azure.identity.ActiveDirectoryConnectHealth**
@@ -344,15 +626,9 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/identity/ad-identity-protection.png" alt="ADIdentityProtection" style="float: left; padding-right: 5px;" >
 **diagrams.azure.identity.ADIdentityProtection**
 
-<img width="30" src="/img/resources/azure/identity/ad-privileged-identity-management.png" alt="ADPrivilegedIdentityManagement" style="float: left; padding-right: 5px;" >
-**diagrams.azure.identity.ADPrivilegedIdentityManagement**
-
 <img width="30" src="/img/resources/azure/identity/app-registrations.png" alt="AppRegistrations" style="float: left; padding-right: 5px;" >
 **diagrams.azure.identity.AppRegistrations**
 
-<img width="30" src="/img/resources/azure/identity/conditional-access.png" alt="ConditionalAccess" style="float: left; padding-right: 5px;" >
-**diagrams.azure.identity.ConditionalAccess**
-
 <img width="30" src="/img/resources/azure/identity/enterprise-applications.png" alt="EnterpriseApplications" style="float: left; padding-right: 5px;" >
 **diagrams.azure.identity.EnterpriseApplications**
 
@@ -362,9 +638,6 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/identity/identity-governance.png" alt="IdentityGovernance" style="float: left; padding-right: 5px;" >
 **diagrams.azure.identity.IdentityGovernance**
 
-<img width="30" src="/img/resources/azure/identity/information-protection.png" alt="InformationProtection" style="float: left; padding-right: 5px;" >
-**diagrams.azure.identity.InformationProtection**
-
 <img width="30" src="/img/resources/azure/identity/managed-identities.png" alt="ManagedIdentities" style="float: left; padding-right: 5px;" >
 **diagrams.azure.identity.ManagedIdentities**
 
@@ -377,11 +650,8 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/integration/api-for-fhir.png" alt="APIForFhir" style="float: left; padding-right: 5px;" >
 **diagrams.azure.integration.APIForFhir**
 
-<img width="30" src="/img/resources/azure/integration/api-management.png" alt="APIManagement" style="float: left; padding-right: 5px;" >
-**diagrams.azure.integration.APIManagement**
-
-<img width="30" src="/img/resources/azure/integration/app-configuration.png" alt="AppConfiguration" style="float: left; padding-right: 5px;" >
-**diagrams.azure.integration.AppConfiguration**
+<img width="30" src="/img/resources/azure/integration/api-management-services.png" alt="APIManagementServices" style="float: left; padding-right: 5px;" >
+**diagrams.azure.integration.APIManagementServices**
 
 <img width="30" src="/img/resources/azure/integration/data-catalog.png" alt="DataCatalog" style="float: left; padding-right: 5px;" >
 **diagrams.azure.integration.DataCatalog**
@@ -398,212 +668,365 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/integration/integration-accounts.png" alt="IntegrationAccounts" style="float: left; padding-right: 5px;" >
 **diagrams.azure.integration.IntegrationAccounts**
 
-<img width="30" src="/img/resources/azure/integration/integration-service-environments.png" alt="IntegrationServiceEnvironments" style="float: left; padding-right: 5px;" >
-**diagrams.azure.integration.IntegrationServiceEnvironments**
-
-<img width="30" src="/img/resources/azure/integration/logic-apps-custom-connector.png" alt="LogicAppsCustomConnector" style="float: left; padding-right: 5px;" >
-**diagrams.azure.integration.LogicAppsCustomConnector**
-
 <img width="30" src="/img/resources/azure/integration/logic-apps.png" alt="LogicApps" style="float: left; padding-right: 5px;" >
 **diagrams.azure.integration.LogicApps**
 
 <img width="30" src="/img/resources/azure/integration/partner-topic.png" alt="PartnerTopic" style="float: left; padding-right: 5px;" >
 **diagrams.azure.integration.PartnerTopic**
 
-<img width="30" src="/img/resources/azure/integration/sendgrid-accounts.png" alt="SendgridAccounts" style="float: left; padding-right: 5px;" >
-**diagrams.azure.integration.SendgridAccounts**
-
-<img width="30" src="/img/resources/azure/integration/service-bus-relays.png" alt="ServiceBusRelays" style="float: left; padding-right: 5px;" >
-**diagrams.azure.integration.ServiceBusRelays**
-
-<img width="30" src="/img/resources/azure/integration/service-bus.png" alt="ServiceBus" style="float: left; padding-right: 5px;" >
-**diagrams.azure.integration.ServiceBus**
-
-<img width="30" src="/img/resources/azure/integration/service-catalog-managed-application-definitions.png" alt="ServiceCatalogManagedApplicationDefinitions" style="float: left; padding-right: 5px;" >
-**diagrams.azure.integration.ServiceCatalogManagedApplicationDefinitions**
+<img width="30" src="/img/resources/azure/integration/relays.png" alt="Relays" style="float: left; padding-right: 5px;" >
+**diagrams.azure.integration.Relays**
 
 <img width="30" src="/img/resources/azure/integration/software-as-a-service.png" alt="SoftwareAsAService" style="float: left; padding-right: 5px;" >
 **diagrams.azure.integration.SoftwareAsAService**
 
-<img width="30" src="/img/resources/azure/integration/storsimple-device-managers.png" alt="StorsimpleDeviceManagers" style="float: left; padding-right: 5px;" >
-**diagrams.azure.integration.StorsimpleDeviceManagers**
+<img width="30" src="/img/resources/azure/integration/sql-data-warehouses.png" alt="SQLDataWarehouses" style="float: left; padding-right: 5px;" >
+**diagrams.azure.integration.SQLDataWarehouses**
 
 <img width="30" src="/img/resources/azure/integration/system-topic.png" alt="SystemTopic" style="float: left; padding-right: 5px;" >
 **diagrams.azure.integration.SystemTopic**
 
+## azure.internet_of_things
+
+
+<img width="30" src="/img/resources/azure/internet_of_things/digital-twins.png" alt="DigitalTwins" style="float: left; padding-right: 5px;" >
+**diagrams.azure.internet_of_things.DigitalTwins**
+
+<img width="30" src="/img/resources/azure/internet_of_things/time-series-insights-access-policies.png" alt="TimeSeriesInsightsAccessPolicies" style="float: left; padding-right: 5px;" >
+**diagrams.azure.internet_of_things.TimeSeriesInsightsAccessPolicies**
+
+## azure.intune
+
+
+<img width="30" src="/img/resources/azure/intune/ad-roles-and-administrators.png" alt="ADRolesAndAdministrators" style="float: left; padding-right: 5px;" >
+**diagrams.azure.intune.ADRolesAndAdministrators**
+
+<img width="30" src="/img/resources/azure/intune/device-security-apple.png" alt="DeviceSecurityApple" style="float: left; padding-right: 5px;" >
+**diagrams.azure.intune.DeviceSecurityApple**
+
+<img width="30" src="/img/resources/azure/intune/device-security-google.png" alt="DeviceSecurityGoogle" style="float: left; padding-right: 5px;" >
+**diagrams.azure.intune.DeviceSecurityGoogle**
+
+<img width="30" src="/img/resources/azure/intune/device-security-windows.png" alt="DeviceSecurityWindows" style="float: left; padding-right: 5px;" >
+**diagrams.azure.intune.DeviceSecurityWindows**
+
+<img width="30" src="/img/resources/azure/intune/intune-for-education.png" alt="IntuneForEducation" style="float: left; padding-right: 5px;" >
+**diagrams.azure.intune.IntuneForEducation**
+
+<img width="30" src="/img/resources/azure/intune/intune.png" alt="Intune" style="float: left; padding-right: 5px;" >
+**diagrams.azure.intune.Intune**
+
 ## azure.iot
 
 
 <img width="30" src="/img/resources/azure/iot/device-provisioning-services.png" alt="DeviceProvisioningServices" style="float: left; padding-right: 5px;" >
 **diagrams.azure.iot.DeviceProvisioningServices**
 
-<img width="30" src="/img/resources/azure/iot/digital-twins.png" alt="DigitalTwins" style="float: left; padding-right: 5px;" >
-**diagrams.azure.iot.DigitalTwins**
+<img width="30" src="/img/resources/azure/iot/event-hubs.png" alt="EventHubs" style="float: left; padding-right: 5px;" >
+**diagrams.azure.iot.EventHubs**
+
+<img width="30" src="/img/resources/azure/iot/function-apps.png" alt="FunctionApps" style="float: left; padding-right: 5px;" >
+**diagrams.azure.iot.FunctionApps**
 
 <img width="30" src="/img/resources/azure/iot/iot-central-applications.png" alt="IotCentralApplications" style="float: left; padding-right: 5px;" >
 **diagrams.azure.iot.IotCentralApplications**
 
-<img width="30" src="/img/resources/azure/iot/iot-hub-security.png" alt="IotHubSecurity" style="float: left; padding-right: 5px;" >
-**diagrams.azure.iot.IotHubSecurity**
-
 <img width="30" src="/img/resources/azure/iot/iot-hub.png" alt="IotHub" style="float: left; padding-right: 5px;" >
 **diagrams.azure.iot.IotHub**
 
-<img width="30" src="/img/resources/azure/iot/maps.png" alt="Maps" style="float: left; padding-right: 5px;" >
-**diagrams.azure.iot.Maps**
+<img width="30" src="/img/resources/azure/iot/logic-apps.png" alt="LogicApps" style="float: left; padding-right: 5px;" >
+**diagrams.azure.iot.LogicApps**
+
+<img width="30" src="/img/resources/azure/iot/maps-accounts.png" alt="MapsAccounts" style="float: left; padding-right: 5px;" >
+**diagrams.azure.iot.MapsAccounts**
+
+<img width="30" src="/img/resources/azure/iot/notification-hubs.png" alt="NotificationHubs" style="float: left; padding-right: 5px;" >
+**diagrams.azure.iot.NotificationHubs**
 
-<img width="30" src="/img/resources/azure/iot/sphere.png" alt="Sphere" style="float: left; padding-right: 5px;" >
-**diagrams.azure.iot.Sphere**
+<img width="30" src="/img/resources/azure/iot/stream-analytics-jobs.png" alt="StreamAnalyticsJobs" style="float: left; padding-right: 5px;" >
+**diagrams.azure.iot.StreamAnalyticsJobs**
 
 <img width="30" src="/img/resources/azure/iot/time-series-insights-environments.png" alt="TimeSeriesInsightsEnvironments" style="float: left; padding-right: 5px;" >
 **diagrams.azure.iot.TimeSeriesInsightsEnvironments**
 
-<img width="30" src="/img/resources/azure/iot/time-series-insights-events-sources.png" alt="TimeSeriesInsightsEventsSources" style="float: left; padding-right: 5px;" >
-**diagrams.azure.iot.TimeSeriesInsightsEventsSources**
+<img width="30" src="/img/resources/azure/iot/time-series-insights-event-sources.png" alt="TimeSeriesInsightsEventSources" style="float: left; padding-right: 5px;" >
+**diagrams.azure.iot.TimeSeriesInsightsEventSources**
+
+## azure.management_governance
+
+
+<img width="30" src="/img/resources/azure/management_governance/activity-log.png" alt="ActivityLog" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.ActivityLog**
+
+<img width="30" src="/img/resources/azure/management_governance/advisor.png" alt="Advisor" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Advisor**
+
+<img width="30" src="/img/resources/azure/management_governance/alerts.png" alt="Alerts" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Alerts**
+
+<img width="30" src="/img/resources/azure/management_governance/application-insights.png" alt="ApplicationInsights" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.ApplicationInsights**
+
+<img width="30" src="/img/resources/azure/management_governance/arc.png" alt="Arc" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Arc**
+
+<img width="30" src="/img/resources/azure/management_governance/automation-accounts.png" alt="AutomationAccounts" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.AutomationAccounts**
+
+<img width="30" src="/img/resources/azure/management_governance/blueprints.png" alt="Blueprints" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Blueprints**
 
-<img width="30" src="/img/resources/azure/iot/windows-10-iot-core-services.png" alt="Windows10IotCoreServices" style="float: left; padding-right: 5px;" >
-**diagrams.azure.iot.Windows10IotCoreServices**
+<img width="30" src="/img/resources/azure/management_governance/compliance.png" alt="Compliance" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Compliance**
 
-## azure.migration
+<img width="30" src="/img/resources/azure/management_governance/cost-management-and-billing.png" alt="CostManagementAndBilling" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.CostManagementAndBilling**
 
+<img width="30" src="/img/resources/azure/management_governance/diagnostics-settings.png" alt="DiagnosticsSettings" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.DiagnosticsSettings**
 
-<img width="30" src="/img/resources/azure/migration/data-box-edge.png" alt="DataBoxEdge" style="float: left; padding-right: 5px;" >
-**diagrams.azure.migration.DataBoxEdge**
+<img width="30" src="/img/resources/azure/management_governance/education.png" alt="Education" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Education**
 
-<img width="30" src="/img/resources/azure/migration/data-box.png" alt="DataBox" style="float: left; padding-right: 5px;" >
-**diagrams.azure.migration.DataBox**
+<img width="30" src="/img/resources/azure/management_governance/lighthouse.png" alt="Lighthouse" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Lighthouse**
 
-<img width="30" src="/img/resources/azure/migration/database-migration-services.png" alt="DatabaseMigrationServices" style="float: left; padding-right: 5px;" >
-**diagrams.azure.migration.DatabaseMigrationServices**
+<img width="30" src="/img/resources/azure/management_governance/log-analytics-workspaces.png" alt="LogAnalyticsWorkspaces" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.LogAnalyticsWorkspaces**
 
-<img width="30" src="/img/resources/azure/migration/migration-projects.png" alt="MigrationProjects" style="float: left; padding-right: 5px;" >
-**diagrams.azure.migration.MigrationProjects**
+<img width="30" src="/img/resources/azure/management_governance/machinesazurearc.png" alt="Machinesazurearc" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Machinesazurearc**
 
-<img width="30" src="/img/resources/azure/migration/recovery-services-vaults.png" alt="RecoveryServicesVaults" style="float: left; padding-right: 5px;" >
-**diagrams.azure.migration.RecoveryServicesVaults**
+<img width="30" src="/img/resources/azure/management_governance/managed-applications-center.png" alt="ManagedApplicationsCenter" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.ManagedApplicationsCenter**
 
-## azure.ml
+<img width="30" src="/img/resources/azure/management_governance/metrics.png" alt="Metrics" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Metrics**
 
+<img width="30" src="/img/resources/azure/management_governance/monitor.png" alt="Monitor" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Monitor**
 
-<img width="30" src="/img/resources/azure/ml/batch-ai.png" alt="BatchAI" style="float: left; padding-right: 5px;" >
-**diagrams.azure.ml.BatchAI**
+<img width="30" src="/img/resources/azure/management_governance/my-customers.png" alt="MyCustomers" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.MyCustomers**
 
-<img width="30" src="/img/resources/azure/ml/bot-services.png" alt="BotServices" style="float: left; padding-right: 5px;" >
-**diagrams.azure.ml.BotServices**
+<img width="30" src="/img/resources/azure/management_governance/operation-log-classic.png" alt="OperationLogClassic" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.OperationLogClassic**
 
-<img width="30" src="/img/resources/azure/ml/cognitive-services.png" alt="CognitiveServices" style="float: left; padding-right: 5px;" >
-**diagrams.azure.ml.CognitiveServices**
+<img width="30" src="/img/resources/azure/management_governance/policy.png" alt="Policy" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Policy**
 
-<img width="30" src="/img/resources/azure/ml/genomics-accounts.png" alt="GenomicsAccounts" style="float: left; padding-right: 5px;" >
-**diagrams.azure.ml.GenomicsAccounts**
+<img width="30" src="/img/resources/azure/management_governance/recovery-services-vaults.png" alt="RecoveryServicesVaults" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.RecoveryServicesVaults**
 
-<img width="30" src="/img/resources/azure/ml/machine-learning-service-workspaces.png" alt="MachineLearningServiceWorkspaces" style="float: left; padding-right: 5px;" >
-**diagrams.azure.ml.MachineLearningServiceWorkspaces**
+<img width="30" src="/img/resources/azure/management_governance/resource-graph-explorer.png" alt="ResourceGraphExplorer" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.ResourceGraphExplorer**
 
-<img width="30" src="/img/resources/azure/ml/machine-learning-studio-web-service-plans.png" alt="MachineLearningStudioWebServicePlans" style="float: left; padding-right: 5px;" >
-**diagrams.azure.ml.MachineLearningStudioWebServicePlans**
+<img width="30" src="/img/resources/azure/management_governance/service-providers.png" alt="ServiceProviders" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.ServiceProviders**
 
-<img width="30" src="/img/resources/azure/ml/machine-learning-studio-web-services.png" alt="MachineLearningStudioWebServices" style="float: left; padding-right: 5px;" >
-**diagrams.azure.ml.MachineLearningStudioWebServices**
+<img width="30" src="/img/resources/azure/management_governance/solutions.png" alt="Solutions" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.Solutions**
 
-<img width="30" src="/img/resources/azure/ml/machine-learning-studio-workspaces.png" alt="MachineLearningStudioWorkspaces" style="float: left; padding-right: 5px;" >
-**diagrams.azure.ml.MachineLearningStudioWorkspaces**
+<img width="30" src="/img/resources/azure/management_governance/user-privacy.png" alt="UserPrivacy" style="float: left; padding-right: 5px;" >
+**diagrams.azure.management_governance.UserPrivacy**
 
-## azure.mobile
+## azure.migrate
 
 
-<img width="30" src="/img/resources/azure/mobile/app-service-mobile.png" alt="AppServiceMobile" style="float: left; padding-right: 5px;" >
-**diagrams.azure.mobile.AppServiceMobile**
+<img width="30" src="/img/resources/azure/migrate/cost-management-and-billing.png" alt="CostManagementAndBilling" style="float: left; padding-right: 5px;" >
+**diagrams.azure.migrate.CostManagementAndBilling**
 
-<img width="30" src="/img/resources/azure/mobile/mobile-engagement.png" alt="MobileEngagement" style="float: left; padding-right: 5px;" >
-**diagrams.azure.mobile.MobileEngagement**
+<img width="30" src="/img/resources/azure/migrate/data-box-edge.png" alt="DataBoxEdge" style="float: left; padding-right: 5px;" >
+**diagrams.azure.migrate.DataBoxEdge**
 
-<img width="30" src="/img/resources/azure/mobile/notification-hubs.png" alt="NotificationHubs" style="float: left; padding-right: 5px;" >
-**diagrams.azure.mobile.NotificationHubs**
+<img width="30" src="/img/resources/azure/migrate/data-box.png" alt="DataBox" style="float: left; padding-right: 5px;" >
+**diagrams.azure.migrate.DataBox**
 
-## azure.network
+<img width="30" src="/img/resources/azure/migrate/migrate.png" alt="Migrate" style="float: left; padding-right: 5px;" >
+**diagrams.azure.migrate.Migrate**
 
+<img width="30" src="/img/resources/azure/migrate/recovery-services-vaults.png" alt="RecoveryServicesVaults" style="float: left; padding-right: 5px;" >
+**diagrams.azure.migrate.RecoveryServicesVaults**
 
-<img width="30" src="/img/resources/azure/network/application-gateway.png" alt="ApplicationGateway" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.ApplicationGateway**
+## azure.mixed_reality
 
-<img width="30" src="/img/resources/azure/network/application-security-groups.png" alt="ApplicationSecurityGroups" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.ApplicationSecurityGroups**
 
-<img width="30" src="/img/resources/azure/network/cdn-profiles.png" alt="CDNProfiles" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.CDNProfiles**
+<img width="30" src="/img/resources/azure/mixed_reality/remote-rendering.png" alt="RemoteRendering" style="float: left; padding-right: 5px;" >
+**diagrams.azure.mixed_reality.RemoteRendering**
 
-<img width="30" src="/img/resources/azure/network/connections.png" alt="Connections" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.Connections**
+## azure.monitor
 
-<img width="30" src="/img/resources/azure/network/ddos-protection-plans.png" alt="DDOSProtectionPlans" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.DDOSProtectionPlans**
 
-<img width="30" src="/img/resources/azure/network/dns-private-zones.png" alt="DNSPrivateZones" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.DNSPrivateZones**
+<img width="30" src="/img/resources/azure/monitor/sap-azure-monitor.png" alt="SAPAzureMonitor" style="float: left; padding-right: 5px;" >
+**diagrams.azure.monitor.SAPAzureMonitor**
 
-<img width="30" src="/img/resources/azure/network/dns-zones.png" alt="DNSZones" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.DNSZones**
+## azure.networking
 
-<img width="30" src="/img/resources/azure/network/expressroute-circuits.png" alt="ExpressrouteCircuits" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.ExpressrouteCircuits**
 
-<img width="30" src="/img/resources/azure/network/firewall.png" alt="Firewall" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.Firewall**
+<img width="30" src="/img/resources/azure/networking/application-gateways.png" alt="ApplicationGateways" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.ApplicationGateways**
 
-<img width="30" src="/img/resources/azure/network/front-doors.png" alt="FrontDoors" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.FrontDoors**
+<img width="30" src="/img/resources/azure/networking/cdn-profiles.png" alt="CDNProfiles" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.CDNProfiles**
 
-<img width="30" src="/img/resources/azure/network/load-balancers.png" alt="LoadBalancers" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.LoadBalancers**
+<img width="30" src="/img/resources/azure/networking/connections.png" alt="Connections" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.Connections**
 
-<img width="30" src="/img/resources/azure/network/local-network-gateways.png" alt="LocalNetworkGateways" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.LocalNetworkGateways**
+<img width="30" src="/img/resources/azure/networking/ddos-protection-plans.png" alt="DDOSProtectionPlans" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.DDOSProtectionPlans**
 
-<img width="30" src="/img/resources/azure/network/network-interfaces.png" alt="NetworkInterfaces" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.NetworkInterfaces**
+<img width="30" src="/img/resources/azure/networking/dns-zones.png" alt="DNSZones" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.DNSZones**
 
-<img width="30" src="/img/resources/azure/network/network-security-groups-classic.png" alt="NetworkSecurityGroupsClassic" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.NetworkSecurityGroupsClassic**
+<img width="30" src="/img/resources/azure/networking/expressroute-circuits.png" alt="ExpressrouteCircuits" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.ExpressrouteCircuits**
 
-<img width="30" src="/img/resources/azure/network/network-watcher.png" alt="NetworkWatcher" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.NetworkWatcher**
+<img width="30" src="/img/resources/azure/networking/firewall-manager.png" alt="FirewallManager" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.FirewallManager**
 
-<img width="30" src="/img/resources/azure/network/on-premises-data-gateways.png" alt="OnPremisesDataGateways" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.OnPremisesDataGateways**
+<img width="30" src="/img/resources/azure/networking/firewalls.png" alt="Firewalls" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.Firewalls**
 
-<img width="30" src="/img/resources/azure/network/public-ip-addresses.png" alt="PublicIpAddresses" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.PublicIpAddresses**
+<img width="30" src="/img/resources/azure/networking/front-doors.png" alt="FrontDoors" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.FrontDoors**
 
-<img width="30" src="/img/resources/azure/network/reserved-ip-addresses-classic.png" alt="ReservedIpAddressesClassic" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.ReservedIpAddressesClassic**
+<img width="30" src="/img/resources/azure/networking/ip-groups.png" alt="IpGroups" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.IpGroups**
 
-<img width="30" src="/img/resources/azure/network/route-filters.png" alt="RouteFilters" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.RouteFilters**
+<img width="30" src="/img/resources/azure/networking/load-balancers.png" alt="LoadBalancers" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.LoadBalancers**
 
-<img width="30" src="/img/resources/azure/network/route-tables.png" alt="RouteTables" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.RouteTables**
+<img width="30" src="/img/resources/azure/networking/local-network-gateways.png" alt="LocalNetworkGateways" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.LocalNetworkGateways**
 
-<img width="30" src="/img/resources/azure/network/service-endpoint-policies.png" alt="ServiceEndpointPolicies" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.ServiceEndpointPolicies**
+<img width="30" src="/img/resources/azure/networking/nat.png" alt="Nat" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.Nat**
 
-<img width="30" src="/img/resources/azure/network/subnets.png" alt="Subnets" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.Subnets**
+<img width="30" src="/img/resources/azure/networking/network-interfaces.png" alt="NetworkInterfaces" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.NetworkInterfaces**
 
-<img width="30" src="/img/resources/azure/network/traffic-manager-profiles.png" alt="TrafficManagerProfiles" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.TrafficManagerProfiles**
+<img width="30" src="/img/resources/azure/networking/network-security-groups.png" alt="NetworkSecurityGroups" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.NetworkSecurityGroups**
 
-<img width="30" src="/img/resources/azure/network/virtual-network-classic.png" alt="VirtualNetworkClassic" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.VirtualNetworkClassic**
+<img width="30" src="/img/resources/azure/networking/network-watcher.png" alt="NetworkWatcher" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.NetworkWatcher**
 
-<img width="30" src="/img/resources/azure/network/virtual-network-gateways.png" alt="VirtualNetworkGateways" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.VirtualNetworkGateways**
+<img width="30" src="/img/resources/azure/networking/private-link-service.png" alt="PrivateLinkService" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.PrivateLinkService**
 
-<img width="30" src="/img/resources/azure/network/virtual-networks.png" alt="VirtualNetworks" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.VirtualNetworks**
+<img width="30" src="/img/resources/azure/networking/private-link.png" alt="PrivateLink" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.PrivateLink**
 
-<img width="30" src="/img/resources/azure/network/virtual-wans.png" alt="VirtualWans" style="float: left; padding-right: 5px;" >
-**diagrams.azure.network.VirtualWans**
+<img width="30" src="/img/resources/azure/networking/proximity-placement-groups.png" alt="ProximityPlacementGroups" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.ProximityPlacementGroups**
+
+<img width="30" src="/img/resources/azure/networking/public-ip-addresses-classic.png" alt="PublicIpAddressesClassic" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.PublicIpAddressesClassic**
+
+<img width="30" src="/img/resources/azure/networking/public-ip-addresses.png" alt="PublicIpAddresses" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.PublicIpAddresses**
+
+<img width="30" src="/img/resources/azure/networking/public-ip-prefixes.png" alt="PublicIpPrefixes" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.PublicIpPrefixes**
+
+<img width="30" src="/img/resources/azure/networking/reserved-ip-addresses-classic.png" alt="ReservedIpAddressesClassic" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.ReservedIpAddressesClassic**
+
+<img width="30" src="/img/resources/azure/networking/route-filters.png" alt="RouteFilters" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.RouteFilters**
+
+<img width="30" src="/img/resources/azure/networking/route-tables.png" alt="RouteTables" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.RouteTables**
+
+<img width="30" src="/img/resources/azure/networking/service-endpoint-policies.png" alt="ServiceEndpointPolicies" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.ServiceEndpointPolicies**
+
+<img width="30" src="/img/resources/azure/networking/traffic-manager-profiles.png" alt="TrafficManagerProfiles" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.TrafficManagerProfiles**
+
+<img width="30" src="/img/resources/azure/networking/virtual-network-gateways.png" alt="VirtualNetworkGateways" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.VirtualNetworkGateways**
+
+<img width="30" src="/img/resources/azure/networking/virtual-networks-classic.png" alt="VirtualNetworksClassic" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.VirtualNetworksClassic**
+
+<img width="30" src="/img/resources/azure/networking/virtual-networks.png" alt="VirtualNetworks" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.VirtualNetworks**
+
+<img width="30" src="/img/resources/azure/networking/virtual-wans.png" alt="VirtualWans" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.VirtualWans**
+
+<img width="30" src="/img/resources/azure/networking/web-application-firewall-policieswaf.png" alt="WebApplicationFirewallPolicieswaf" style="float: left; padding-right: 5px;" >
+**diagrams.azure.networking.WebApplicationFirewallPolicieswaf**
+
+## azure.other
+
+
+<img width="30" src="/img/resources/azure/other/backup-center.png" alt="BackupCenter" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.BackupCenter**
+
+<img width="30" src="/img/resources/azure/other/detonation.png" alt="Detonation" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.Detonation**
+
+<img width="30" src="/img/resources/azure/other/expressroute-direct.png" alt="ExpressrouteDirect" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.ExpressrouteDirect**
+
+<img width="30" src="/img/resources/azure/other/instance-pools.png" alt="InstancePools" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.InstancePools**
+
+<img width="30" src="/img/resources/azure/other/internet-analyzer-profiles.png" alt="InternetAnalyzerProfiles" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.InternetAnalyzerProfiles**
+
+<img width="30" src="/img/resources/azure/other/local-network-gateways.png" alt="LocalNetworkGateways" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.LocalNetworkGateways**
+
+<img width="30" src="/img/resources/azure/other/peering-service.png" alt="PeeringService" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.PeeringService**
+
+<img width="30" src="/img/resources/azure/other/resource-mover.png" alt="ResourceMover" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.ResourceMover**
+
+<img width="30" src="/img/resources/azure/other/ssh-keys.png" alt="SshKeys" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.SshKeys**
+
+<img width="30" src="/img/resources/azure/other/template-specs.png" alt="TemplateSpecs" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.TemplateSpecs**
+
+<img width="30" src="/img/resources/azure/other/universal-print.png" alt="UniversalPrint" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.UniversalPrint**
+
+<img width="30" src="/img/resources/azure/other/windows-virtual-desktop.png" alt="WindowsVirtualDesktop" style="float: left; padding-right: 5px;" >
+**diagrams.azure.other.WindowsVirtualDesktop**
+
+## azure.preview
+
+
+<img width="30" src="/img/resources/azure/preview/cloud-shell.png" alt="CloudShell" style="float: left; padding-right: 5px;" >
+**diagrams.azure.preview.CloudShell**
+
+<img width="30" src="/img/resources/azure/preview/iot-edge.png" alt="IotEdge" style="float: left; padding-right: 5px;" >
+**diagrams.azure.preview.IotEdge**
+
+<img width="30" src="/img/resources/azure/preview/private-link-hub.png" alt="PrivateLinkHub" style="float: left; padding-right: 5px;" >
+**diagrams.azure.preview.PrivateLinkHub**
+
+<img width="30" src="/img/resources/azure/preview/rtos.png" alt="Rtos" style="float: left; padding-right: 5px;" >
+**diagrams.azure.preview.Rtos**
+
+<img width="30" src="/img/resources/azure/preview/sphere.png" alt="Sphere" style="float: left; padding-right: 5px;" >
+**diagrams.azure.preview.Sphere**
+
+<img width="30" src="/img/resources/azure/preview/static-apps.png" alt="StaticApps" style="float: left; padding-right: 5px;" >
+**diagrams.azure.preview.StaticApps**
+
+<img width="30" src="/img/resources/azure/preview/time-series-data-sets.png" alt="TimeSeriesDataSets" style="float: left; padding-right: 5px;" >
+**diagrams.azure.preview.TimeSeriesDataSets**
+
+<img width="30" src="/img/resources/azure/preview/web-environment.png" alt="WebEnvironment" style="float: left; padding-right: 5px;" >
+**diagrams.azure.preview.WebEnvironment**
+
+<img width="30" src="/img/resources/azure/preview/workbooks.png" alt="Workbooks" style="float: left; padding-right: 5px;" >
+**diagrams.azure.preview.Workbooks**
 
 ## azure.security
 
@@ -617,8 +1040,8 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/security/defender.png" alt="Defender" style="float: left; padding-right: 5px;" >
 **diagrams.azure.security.Defender**
 
-<img width="30" src="/img/resources/azure/security/extended-security-updates.png" alt="ExtendedSecurityUpdates" style="float: left; padding-right: 5px;" >
-**diagrams.azure.security.ExtendedSecurityUpdates**
+<img width="30" src="/img/resources/azure/security/extendedsecurityupdates.png" alt="Extendedsecurityupdates" style="float: left; padding-right: 5px;" >
+**diagrams.azure.security.Extendedsecurityupdates**
 
 <img width="30" src="/img/resources/azure/security/key-vaults.png" alt="KeyVaults" style="float: left; padding-right: 5px;" >
 **diagrams.azure.security.KeyVaults**
@@ -632,32 +1055,35 @@ Node classes list of azure provider.
 ## azure.storage
 
 
-<img width="30" src="/img/resources/azure/storage/archive-storage.png" alt="ArchiveStorage" style="float: left; padding-right: 5px;" >
-**diagrams.azure.storage.ArchiveStorage**
+<img width="30" src="/img/resources/azure/storage/data-box-edge.png" alt="DataBoxEdge" style="float: left; padding-right: 5px;" >
+**diagrams.azure.storage.DataBoxEdge**
 
-<img width="30" src="/img/resources/azure/storage/azurefxtedgefiler.png" alt="Azurefxtedgefiler" style="float: left; padding-right: 5px;" >
-**diagrams.azure.storage.Azurefxtedgefiler**
+<img width="30" src="/img/resources/azure/storage/data-box.png" alt="DataBox" style="float: left; padding-right: 5px;" >
+**diagrams.azure.storage.DataBox**
 
-<img width="30" src="/img/resources/azure/storage/blob-storage.png" alt="BlobStorage" style="float: left; padding-right: 5px;" >
-**diagrams.azure.storage.BlobStorage**
+<img width="30" src="/img/resources/azure/storage/data-lake-storage-gen1.png" alt="DataLakeStorageGen1" style="float: left; padding-right: 5px;" >
+**diagrams.azure.storage.DataLakeStorageGen1**
 
-<img width="30" src="/img/resources/azure/storage/data-box-edge-data-box-gateway.png" alt="DataBoxEdgeDataBoxGateway" style="float: left; padding-right: 5px;" >
-**diagrams.azure.storage.DataBoxEdgeDataBoxGateway**
+<img width="30" src="/img/resources/azure/storage/data-share-invitations.png" alt="DataShareInvitations" style="float: left; padding-right: 5px;" >
+**diagrams.azure.storage.DataShareInvitations**
 
-<img width="30" src="/img/resources/azure/storage/data-box.png" alt="DataBox" style="float: left; padding-right: 5px;" >
-**diagrams.azure.storage.DataBox**
+<img width="30" src="/img/resources/azure/storage/data-shares.png" alt="DataShares" style="float: left; padding-right: 5px;" >
+**diagrams.azure.storage.DataShares**
 
-<img width="30" src="/img/resources/azure/storage/data-lake-storage.png" alt="DataLakeStorage" style="float: left; padding-right: 5px;" >
-**diagrams.azure.storage.DataLakeStorage**
+<img width="30" src="/img/resources/azure/storage/hcp-cache.png" alt="HcpCache" style="float: left; padding-right: 5px;" >
+**diagrams.azure.storage.HcpCache**
 
-<img width="30" src="/img/resources/azure/storage/general-storage.png" alt="GeneralStorage" style="float: left; padding-right: 5px;" >
-**diagrams.azure.storage.GeneralStorage**
+<img width="30" src="/img/resources/azure/storage/import-export-jobs.png" alt="ImportExportJobs" style="float: left; padding-right: 5px;" >
+**diagrams.azure.storage.ImportExportJobs**
 
 <img width="30" src="/img/resources/azure/storage/netapp-files.png" alt="NetappFiles" style="float: left; padding-right: 5px;" >
 **diagrams.azure.storage.NetappFiles**
 
-<img width="30" src="/img/resources/azure/storage/queues-storage.png" alt="QueuesStorage" style="float: left; padding-right: 5px;" >
-**diagrams.azure.storage.QueuesStorage**
+<img width="30" src="/img/resources/azure/storage/recovery-services-vaults.png" alt="RecoveryServicesVaults" style="float: left; padding-right: 5px;" >
+**diagrams.azure.storage.RecoveryServicesVaults**
+
+<img width="30" src="/img/resources/azure/storage/stack-edge.png" alt="StackEdge" style="float: left; padding-right: 5px;" >
+**diagrams.azure.storage.StackEdge**
 
 <img width="30" src="/img/resources/azure/storage/storage-accounts-classic.png" alt="StorageAccountsClassic" style="float: left; padding-right: 5px;" >
 **diagrams.azure.storage.StorageAccountsClassic**
@@ -665,9 +1091,6 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/storage/storage-accounts.png" alt="StorageAccounts" style="float: left; padding-right: 5px;" >
 **diagrams.azure.storage.StorageAccounts**
 
-<img width="30" src="/img/resources/azure/storage/storage-explorer.png" alt="StorageExplorer" style="float: left; padding-right: 5px;" >
-**diagrams.azure.storage.StorageExplorer**
-
 <img width="30" src="/img/resources/azure/storage/storage-sync-services.png" alt="StorageSyncServices" style="float: left; padding-right: 5px;" >
 **diagrams.azure.storage.StorageSyncServices**
 
@@ -677,38 +1100,11 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/storage/storsimple-device-managers.png" alt="StorsimpleDeviceManagers" style="float: left; padding-right: 5px;" >
 **diagrams.azure.storage.StorsimpleDeviceManagers**
 
-<img width="30" src="/img/resources/azure/storage/table-storage.png" alt="TableStorage" style="float: left; padding-right: 5px;" >
-**diagrams.azure.storage.TableStorage**
-
 ## azure.web
 
 
-<img width="30" src="/img/resources/azure/web/api-connections.png" alt="APIConnections" style="float: left; padding-right: 5px;" >
-**diagrams.azure.web.APIConnections**
-
-<img width="30" src="/img/resources/azure/web/app-service-certificates.png" alt="AppServiceCertificates" style="float: left; padding-right: 5px;" >
-**diagrams.azure.web.AppServiceCertificates**
-
-<img width="30" src="/img/resources/azure/web/app-service-domains.png" alt="AppServiceDomains" style="float: left; padding-right: 5px;" >
-**diagrams.azure.web.AppServiceDomains**
-
-<img width="30" src="/img/resources/azure/web/app-service-environments.png" alt="AppServiceEnvironments" style="float: left; padding-right: 5px;" >
-**diagrams.azure.web.AppServiceEnvironments**
-
-<img width="30" src="/img/resources/azure/web/app-service-plans.png" alt="AppServicePlans" style="float: left; padding-right: 5px;" >
-**diagrams.azure.web.AppServicePlans**
-
-<img width="30" src="/img/resources/azure/web/app-services.png" alt="AppServices" style="float: left; padding-right: 5px;" >
-**diagrams.azure.web.AppServices**
-
-<img width="30" src="/img/resources/azure/web/media-services.png" alt="MediaServices" style="float: left; padding-right: 5px;" >
-**diagrams.azure.web.MediaServices**
+<img width="30" src="/img/resources/azure/web/media-service.png" alt="MediaService" style="float: left; padding-right: 5px;" >
+**diagrams.azure.web.MediaService**
 
 <img width="30" src="/img/resources/azure/web/notification-hub-namespaces.png" alt="NotificationHubNamespaces" style="float: left; padding-right: 5px;" >
 **diagrams.azure.web.NotificationHubNamespaces**
-
-<img width="30" src="/img/resources/azure/web/search.png" alt="Search" style="float: left; padding-right: 5px;" >
-**diagrams.azure.web.Search**
-
-<img width="30" src="/img/resources/azure/web/signalr.png" alt="Signalr" style="float: left; padding-right: 5px;" >
-**diagrams.azure.web.Signalr**
diff --git a/resources/azure/ml/bot-services.png b/resources/azure/ai_machine_learning/bot-services.png
similarity index 98%
rename from resources/azure/ml/bot-services.png
rename to resources/azure/ai_machine_learning/bot-services.png
index 04036722..2b97d147 100644
Binary files a/resources/azure/ml/bot-services.png and b/resources/azure/ai_machine_learning/bot-services.png differ
diff --git a/resources/azure/ml/cognitive-services.png b/resources/azure/ai_machine_learning/cognitive-services.png
similarity index 96%
rename from resources/azure/ml/cognitive-services.png
rename to resources/azure/ai_machine_learning/cognitive-services.png
index 651f7303..98a4b367 100644
Binary files a/resources/azure/ml/cognitive-services.png and b/resources/azure/ai_machine_learning/cognitive-services.png differ
diff --git a/resources/azure/ml/machine-learning-studio-web-services.png b/resources/azure/ai_machine_learning/machine-learning-studio-classic-web-services.png
similarity index 97%
rename from resources/azure/ml/machine-learning-studio-web-services.png
rename to resources/azure/ai_machine_learning/machine-learning-studio-classic-web-services.png
index 6885fc3b..ff9f7141 100644
Binary files a/resources/azure/ml/machine-learning-studio-web-services.png and b/resources/azure/ai_machine_learning/machine-learning-studio-classic-web-services.png differ
diff --git a/resources/azure/ml/machine-learning-studio-web-service-plans.png b/resources/azure/ai_machine_learning/machine-learning-studio-web-service-plans.png
similarity index 98%
rename from resources/azure/ml/machine-learning-studio-web-service-plans.png
rename to resources/azure/ai_machine_learning/machine-learning-studio-web-service-plans.png
index e347017b..aeee6dd0 100644
Binary files a/resources/azure/ml/machine-learning-studio-web-service-plans.png and b/resources/azure/ai_machine_learning/machine-learning-studio-web-service-plans.png differ
diff --git a/resources/azure/ml/machine-learning-studio-workspaces.png b/resources/azure/ai_machine_learning/machine-learning-studio-workspaces.png
similarity index 89%
rename from resources/azure/ml/machine-learning-studio-workspaces.png
rename to resources/azure/ai_machine_learning/machine-learning-studio-workspaces.png
index 781de23d..daf36c39 100644
Binary files a/resources/azure/ml/machine-learning-studio-workspaces.png and b/resources/azure/ai_machine_learning/machine-learning-studio-workspaces.png differ
diff --git a/resources/azure/ai_machine_learning/translator-text.png b/resources/azure/ai_machine_learning/translator-text.png
new file mode 100644
index 00000000..13de9c12
Binary files /dev/null and b/resources/azure/ai_machine_learning/translator-text.png differ
diff --git a/resources/azure/analytics/analysis-services.png b/resources/azure/analytics/analysis-services.png
index efa3daff..ed92c4f6 100644
Binary files a/resources/azure/analytics/analysis-services.png and b/resources/azure/analytics/analysis-services.png differ
diff --git a/resources/azure/analytics/data-explorer-clusters.png b/resources/azure/analytics/data-explorer-clusters.png
deleted file mode 100644
index 2c4f8021..00000000
Binary files a/resources/azure/analytics/data-explorer-clusters.png and /dev/null differ
diff --git a/resources/azure/analytics/data-factories.png b/resources/azure/analytics/data-factories.png
deleted file mode 100644
index 6016899e..00000000
Binary files a/resources/azure/analytics/data-factories.png and /dev/null differ
diff --git a/resources/azure/analytics/data-lake-analytics.png b/resources/azure/analytics/data-lake-analytics.png
deleted file mode 100644
index e561bfc4..00000000
Binary files a/resources/azure/analytics/data-lake-analytics.png and /dev/null differ
diff --git a/resources/azure/analytics/data-lake-store-gen1.png b/resources/azure/analytics/data-lake-store-gen1.png
index 6e861246..f4138971 100644
Binary files a/resources/azure/analytics/data-lake-store-gen1.png and b/resources/azure/analytics/data-lake-store-gen1.png differ
diff --git a/resources/azure/analytics/databricks.png b/resources/azure/analytics/databricks.png
index 42cacf60..0f5338fc 100644
Binary files a/resources/azure/analytics/databricks.png and b/resources/azure/analytics/databricks.png differ
diff --git a/resources/azure/analytics/event-hub-clusters.png b/resources/azure/analytics/event-hub-clusters.png
index dde0c68d..034d14e4 100644
Binary files a/resources/azure/analytics/event-hub-clusters.png and b/resources/azure/analytics/event-hub-clusters.png differ
diff --git a/resources/azure/analytics/event-hubs.png b/resources/azure/analytics/event-hubs.png
index 2677ee0a..ce97ea8e 100644
Binary files a/resources/azure/analytics/event-hubs.png and b/resources/azure/analytics/event-hubs.png differ
diff --git a/resources/azure/analytics/hd-insight-clusters.png b/resources/azure/analytics/hd-insight-clusters.png
new file mode 100644
index 00000000..b757a6b0
Binary files /dev/null and b/resources/azure/analytics/hd-insight-clusters.png differ
diff --git a/resources/azure/analytics/hdinsightclusters.png b/resources/azure/analytics/hdinsightclusters.png
deleted file mode 100644
index 42fc1d14..00000000
Binary files a/resources/azure/analytics/hdinsightclusters.png and /dev/null differ
diff --git a/resources/azure/analytics/log-analytics-workspaces.png b/resources/azure/analytics/log-analytics-workspaces.png
index d3f462ad..7f0bd907 100644
Binary files a/resources/azure/analytics/log-analytics-workspaces.png and b/resources/azure/analytics/log-analytics-workspaces.png differ
diff --git a/resources/azure/analytics/stream-analytics-jobs.png b/resources/azure/analytics/stream-analytics-jobs.png
index a9fceb32..6ff4b703 100644
Binary files a/resources/azure/analytics/stream-analytics-jobs.png and b/resources/azure/analytics/stream-analytics-jobs.png differ
diff --git a/resources/azure/analytics/synapse-analytics.png b/resources/azure/analytics/synapse-analytics.png
index 7966c325..ad84ce66 100644
Binary files a/resources/azure/analytics/synapse-analytics.png and b/resources/azure/analytics/synapse-analytics.png differ
diff --git a/resources/azure/integration/api-management.png b/resources/azure/app_services/api-management-services.png
similarity index 96%
rename from resources/azure/integration/api-management.png
rename to resources/azure/app_services/api-management-services.png
index 1d7db0b9..405db0b7 100644
Binary files a/resources/azure/integration/api-management.png and b/resources/azure/app_services/api-management-services.png differ
diff --git a/resources/azure/web/app-service-certificates.png b/resources/azure/app_services/app-service-certificates.png
similarity index 93%
rename from resources/azure/web/app-service-certificates.png
rename to resources/azure/app_services/app-service-certificates.png
index 1c63f126..37cc1e80 100644
Binary files a/resources/azure/web/app-service-certificates.png and b/resources/azure/app_services/app-service-certificates.png differ
diff --git a/resources/azure/web/app-service-domains.png b/resources/azure/app_services/app-service-domains.png
similarity index 94%
rename from resources/azure/web/app-service-domains.png
rename to resources/azure/app_services/app-service-domains.png
index afeea0c0..42f67e60 100644
Binary files a/resources/azure/web/app-service-domains.png and b/resources/azure/app_services/app-service-domains.png differ
diff --git a/resources/azure/web/app-service-environments.png b/resources/azure/app_services/app-service-environments.png
similarity index 91%
rename from resources/azure/web/app-service-environments.png
rename to resources/azure/app_services/app-service-environments.png
index 6f764a28..60b2c76c 100644
Binary files a/resources/azure/web/app-service-environments.png and b/resources/azure/app_services/app-service-environments.png differ
diff --git a/resources/azure/web/app-service-plans.png b/resources/azure/app_services/app-service-plans.png
similarity index 86%
rename from resources/azure/web/app-service-plans.png
rename to resources/azure/app_services/app-service-plans.png
index 1be8fe61..4f0de937 100644
Binary files a/resources/azure/web/app-service-plans.png and b/resources/azure/app_services/app-service-plans.png differ
diff --git a/resources/azure/web/app-services.png b/resources/azure/app_services/app-services.png
similarity index 98%
rename from resources/azure/web/app-services.png
rename to resources/azure/app_services/app-services.png
index f7ca7fb0..7cd9f4e7 100644
Binary files a/resources/azure/web/app-services.png and b/resources/azure/app_services/app-services.png differ
diff --git a/resources/azure/network/cdn-profiles.png b/resources/azure/app_services/cdn-profiles.png
similarity index 95%
rename from resources/azure/network/cdn-profiles.png
rename to resources/azure/app_services/cdn-profiles.png
index abf28b27..c5c01591 100644
Binary files a/resources/azure/network/cdn-profiles.png and b/resources/azure/app_services/cdn-profiles.png differ
diff --git a/resources/azure/mobile/notification-hubs.png b/resources/azure/app_services/notification-hubs.png
similarity index 91%
rename from resources/azure/mobile/notification-hubs.png
rename to resources/azure/app_services/notification-hubs.png
index ad3129f4..ae838d98 100644
Binary files a/resources/azure/mobile/notification-hubs.png and b/resources/azure/app_services/notification-hubs.png differ
diff --git a/resources/azure/web/search.png b/resources/azure/app_services/search-services.png
similarity index 90%
rename from resources/azure/web/search.png
rename to resources/azure/app_services/search-services.png
index c92d6582..a4702d8b 100644
Binary files a/resources/azure/web/search.png and b/resources/azure/app_services/search-services.png differ
diff --git a/resources/azure/azure_stack/capacity.png b/resources/azure/azure_stack/capacity.png
new file mode 100644
index 00000000..876c17ce
Binary files /dev/null and b/resources/azure/azure_stack/capacity.png differ
diff --git a/resources/azure/azure_stack/infrastructure-backup.png b/resources/azure/azure_stack/infrastructure-backup.png
new file mode 100644
index 00000000..ddeeb61b
Binary files /dev/null and b/resources/azure/azure_stack/infrastructure-backup.png differ
diff --git a/resources/azure/azure_stack/multi-tenancy.png b/resources/azure/azure_stack/multi-tenancy.png
new file mode 100644
index 00000000..83c44dbe
Binary files /dev/null and b/resources/azure/azure_stack/multi-tenancy.png differ
diff --git a/resources/azure/azure_stack/offers.png b/resources/azure/azure_stack/offers.png
new file mode 100644
index 00000000..fd39fc05
Binary files /dev/null and b/resources/azure/azure_stack/offers.png differ
diff --git a/resources/azure/azure_stack/plans.png b/resources/azure/azure_stack/plans.png
new file mode 100644
index 00000000..de4e7472
Binary files /dev/null and b/resources/azure/azure_stack/plans.png differ
diff --git a/resources/azure/azure_stack/stack.png b/resources/azure/azure_stack/stack.png
new file mode 100644
index 00000000..e3bcb8d9
Binary files /dev/null and b/resources/azure/azure_stack/stack.png differ
diff --git a/resources/azure/azure_stack/updates.png b/resources/azure/azure_stack/updates.png
new file mode 100644
index 00000000..09d89e81
Binary files /dev/null and b/resources/azure/azure_stack/updates.png differ
diff --git a/resources/azure/azure_stack/user-subscriptions.png b/resources/azure/azure_stack/user-subscriptions.png
new file mode 100644
index 00000000..b5047ee4
Binary files /dev/null and b/resources/azure/azure_stack/user-subscriptions.png differ
diff --git a/resources/azure/azure_vmware_solution/avs.png b/resources/azure/azure_vmware_solution/avs.png
new file mode 100644
index 00000000..7d4051f9
Binary files /dev/null and b/resources/azure/azure_vmware_solution/avs.png differ
diff --git a/resources/azure/blockchain/abs-member.png b/resources/azure/blockchain/abs-member.png
new file mode 100644
index 00000000..07b934fd
Binary files /dev/null and b/resources/azure/blockchain/abs-member.png differ
diff --git a/resources/azure/blockchain/blockchain-service.png b/resources/azure/blockchain/blockchain-service.png
new file mode 100644
index 00000000..228534c5
Binary files /dev/null and b/resources/azure/blockchain/blockchain-service.png differ
diff --git a/resources/azure/blockchain/consortium.png b/resources/azure/blockchain/consortium.png
new file mode 100644
index 00000000..0c36434b
Binary files /dev/null and b/resources/azure/blockchain/consortium.png differ
diff --git a/resources/azure/blockchain/outbound-connection.png b/resources/azure/blockchain/outbound-connection.png
new file mode 100644
index 00000000..5601c2ab
Binary files /dev/null and b/resources/azure/blockchain/outbound-connection.png differ
diff --git a/resources/azure/blockchain/token-service.png b/resources/azure/blockchain/token-service.png
new file mode 100644
index 00000000..21a4d8db
Binary files /dev/null and b/resources/azure/blockchain/token-service.png differ
diff --git a/resources/azure/compute/app-services.png b/resources/azure/compute/app-services.png
index f7ca7fb0..7cd9f4e7 100644
Binary files a/resources/azure/compute/app-services.png and b/resources/azure/compute/app-services.png differ
diff --git a/resources/azure/compute/automanaged-vm.png b/resources/azure/compute/automanaged-vm.png
index ec8365b5..19e74dc2 100644
Binary files a/resources/azure/compute/automanaged-vm.png and b/resources/azure/compute/automanaged-vm.png differ
diff --git a/resources/azure/compute/availability-sets.png b/resources/azure/compute/availability-sets.png
index 988e9a6c..6dbd62e9 100644
Binary files a/resources/azure/compute/availability-sets.png and b/resources/azure/compute/availability-sets.png differ
diff --git a/resources/azure/compute/batch-accounts.png b/resources/azure/compute/batch-accounts.png
index 8f41434e..bb63e04e 100644
Binary files a/resources/azure/compute/batch-accounts.png and b/resources/azure/compute/batch-accounts.png differ
diff --git a/resources/azure/compute/citrix-virtual-desktops-essentials.png b/resources/azure/compute/citrix-virtual-desktops-essentials.png
deleted file mode 100644
index fc262400..00000000
Binary files a/resources/azure/compute/citrix-virtual-desktops-essentials.png and /dev/null differ
diff --git a/resources/azure/compute/cloud-services-classic.png b/resources/azure/compute/cloud-services-classic.png
index c3fa4d1b..836ff539 100644
Binary files a/resources/azure/compute/cloud-services-classic.png and b/resources/azure/compute/cloud-services-classic.png differ
diff --git a/resources/azure/compute/cloud-services.png b/resources/azure/compute/cloud-services.png
deleted file mode 100644
index 0e403583..00000000
Binary files a/resources/azure/compute/cloud-services.png and /dev/null differ
diff --git a/resources/azure/compute/cloudsimple-virtual-machines.png b/resources/azure/compute/cloudsimple-virtual-machines.png
deleted file mode 100644
index 8c8b1c64..00000000
Binary files a/resources/azure/compute/cloudsimple-virtual-machines.png and /dev/null differ
diff --git a/resources/azure/compute/container-instances.png b/resources/azure/compute/container-instances.png
index 6be6aacc..05caed42 100644
Binary files a/resources/azure/compute/container-instances.png and b/resources/azure/compute/container-instances.png differ
diff --git a/resources/azure/compute/container-registries.png b/resources/azure/compute/container-registries.png
deleted file mode 100644
index 17bd6678..00000000
Binary files a/resources/azure/compute/container-registries.png and /dev/null differ
diff --git a/resources/azure/compute/container-services-deprecated.png b/resources/azure/compute/container-services-deprecated.png
new file mode 100644
index 00000000..309775ac
Binary files /dev/null and b/resources/azure/compute/container-services-deprecated.png differ
diff --git a/resources/azure/compute/disk-encryption-sets.png b/resources/azure/compute/disk-encryption-sets.png
index 17b3126a..0437f8f7 100644
Binary files a/resources/azure/compute/disk-encryption-sets.png and b/resources/azure/compute/disk-encryption-sets.png differ
diff --git a/resources/azure/compute/disks-classic.png b/resources/azure/compute/disks-classic.png
new file mode 100644
index 00000000..3c304be2
Binary files /dev/null and b/resources/azure/compute/disks-classic.png differ
diff --git a/resources/azure/compute/disk-snapshots.png b/resources/azure/compute/disks-snapshots.png
similarity index 94%
rename from resources/azure/compute/disk-snapshots.png
rename to resources/azure/compute/disks-snapshots.png
index b6f6b69b..4585c5ea 100644
Binary files a/resources/azure/compute/disk-snapshots.png and b/resources/azure/compute/disks-snapshots.png differ
diff --git a/resources/azure/compute/disks.png b/resources/azure/compute/disks.png
index effee0b1..3c304be2 100644
Binary files a/resources/azure/compute/disks.png and b/resources/azure/compute/disks.png differ
diff --git a/resources/azure/compute/function-apps.png b/resources/azure/compute/function-apps.png
index b6c7f67d..a011d1e1 100644
Binary files a/resources/azure/compute/function-apps.png and b/resources/azure/compute/function-apps.png differ
diff --git a/resources/azure/compute/image-definitions.png b/resources/azure/compute/image-definitions.png
index de6a2b3d..fdc1b1e6 100644
Binary files a/resources/azure/compute/image-definitions.png and b/resources/azure/compute/image-definitions.png differ
diff --git a/resources/azure/compute/image-versions.png b/resources/azure/compute/image-versions.png
index b62ab430..b88fa35d 100644
Binary files a/resources/azure/compute/image-versions.png and b/resources/azure/compute/image-versions.png differ
diff --git a/resources/azure/compute/images.png b/resources/azure/compute/images.png
new file mode 100644
index 00000000..943863b2
Binary files /dev/null and b/resources/azure/compute/images.png differ
diff --git a/resources/azure/compute/kubernetes-services.png b/resources/azure/compute/kubernetes-services.png
index 11c37ef8..309775ac 100644
Binary files a/resources/azure/compute/kubernetes-services.png and b/resources/azure/compute/kubernetes-services.png differ
diff --git a/resources/azure/compute/mesh-applications.png b/resources/azure/compute/mesh-applications.png
index 468f4e5c..39ec4124 100644
Binary files a/resources/azure/compute/mesh-applications.png and b/resources/azure/compute/mesh-applications.png differ
diff --git a/resources/azure/compute/os-images.png b/resources/azure/compute/os-images-classic.png
similarity index 90%
rename from resources/azure/compute/os-images.png
rename to resources/azure/compute/os-images-classic.png
index fbbcf8e1..2cbecf04 100644
Binary files a/resources/azure/compute/os-images.png and b/resources/azure/compute/os-images-classic.png differ
diff --git a/resources/azure/compute/sap-hana-on-azure.png b/resources/azure/compute/sap-hana-on-azure.png
deleted file mode 100644
index 8641469f..00000000
Binary files a/resources/azure/compute/sap-hana-on-azure.png and /dev/null differ
diff --git a/resources/azure/compute/service-fabric-clusters.png b/resources/azure/compute/service-fabric-clusters.png
index a03a2194..2724ddf7 100644
Binary files a/resources/azure/compute/service-fabric-clusters.png and b/resources/azure/compute/service-fabric-clusters.png differ
diff --git a/resources/azure/compute/shared-image-galleries.png b/resources/azure/compute/shared-image-galleries.png
index 364a0915..581e89e9 100644
Binary files a/resources/azure/compute/shared-image-galleries.png and b/resources/azure/compute/shared-image-galleries.png differ
diff --git a/resources/azure/compute/spring-cloud.png b/resources/azure/compute/spring-cloud.png
index 58fae815..4feec9a0 100644
Binary files a/resources/azure/compute/spring-cloud.png and b/resources/azure/compute/spring-cloud.png differ
diff --git a/resources/azure/compute/vm.png b/resources/azure/compute/virtual-machine.png
similarity index 94%
rename from resources/azure/compute/vm.png
rename to resources/azure/compute/virtual-machine.png
index 99a05570..ad68b157 100644
Binary files a/resources/azure/compute/vm.png and b/resources/azure/compute/virtual-machine.png differ
diff --git a/resources/azure/compute/vm-classic.png b/resources/azure/compute/virtual-machines-classic.png
similarity index 90%
rename from resources/azure/compute/vm-classic.png
rename to resources/azure/compute/virtual-machines-classic.png
index 70cced29..fc20db98 100644
Binary files a/resources/azure/compute/vm-classic.png and b/resources/azure/compute/virtual-machines-classic.png differ
diff --git a/resources/azure/compute/vm-images.png b/resources/azure/compute/vm-images-classic.png
similarity index 90%
rename from resources/azure/compute/vm-images.png
rename to resources/azure/compute/vm-images-classic.png
index fbbcf8e1..2cbecf04 100644
Binary files a/resources/azure/compute/vm-images.png and b/resources/azure/compute/vm-images-classic.png differ
diff --git a/resources/azure/compute/vm-linux.png b/resources/azure/compute/vm-linux.png
deleted file mode 100644
index d5f0f2bb..00000000
Binary files a/resources/azure/compute/vm-linux.png and /dev/null differ
diff --git a/resources/azure/compute/vm-scale-set.png b/resources/azure/compute/vm-scale-sets.png
similarity index 83%
rename from resources/azure/compute/vm-scale-set.png
rename to resources/azure/compute/vm-scale-sets.png
index d2deec75..6b925e29 100644
Binary files a/resources/azure/compute/vm-scale-set.png and b/resources/azure/compute/vm-scale-sets.png differ
diff --git a/resources/azure/compute/vm-windows.png b/resources/azure/compute/vm-windows.png
deleted file mode 100644
index 5239bbb6..00000000
Binary files a/resources/azure/compute/vm-windows.png and /dev/null differ
diff --git a/resources/azure/compute/workspaces.png b/resources/azure/compute/workspaces.png
index fa399bfb..ef1a00b2 100644
Binary files a/resources/azure/compute/workspaces.png and b/resources/azure/compute/workspaces.png differ
diff --git a/resources/azure/containers/app-services.png b/resources/azure/containers/app-services.png
new file mode 100644
index 00000000..7cd9f4e7
Binary files /dev/null and b/resources/azure/containers/app-services.png differ
diff --git a/resources/azure/containers/batch-accounts.png b/resources/azure/containers/batch-accounts.png
new file mode 100644
index 00000000..bb63e04e
Binary files /dev/null and b/resources/azure/containers/batch-accounts.png differ
diff --git a/resources/azure/containers/container-instances.png b/resources/azure/containers/container-instances.png
new file mode 100644
index 00000000..05caed42
Binary files /dev/null and b/resources/azure/containers/container-instances.png differ
diff --git a/resources/azure/containers/container-registries.png b/resources/azure/containers/container-registries.png
new file mode 100644
index 00000000..1995e0dd
Binary files /dev/null and b/resources/azure/containers/container-registries.png differ
diff --git a/resources/azure/containers/kubernetes-services.png b/resources/azure/containers/kubernetes-services.png
new file mode 100644
index 00000000..309775ac
Binary files /dev/null and b/resources/azure/containers/kubernetes-services.png differ
diff --git a/resources/azure/containers/service-fabric-clusters.png b/resources/azure/containers/service-fabric-clusters.png
new file mode 100644
index 00000000..2724ddf7
Binary files /dev/null and b/resources/azure/containers/service-fabric-clusters.png differ
diff --git a/resources/azure/database/blob-storage.png b/resources/azure/database/blob-storage.png
deleted file mode 100644
index 5764c131..00000000
Binary files a/resources/azure/database/blob-storage.png and /dev/null differ
diff --git a/resources/azure/database/data-lake.png b/resources/azure/database/data-lake.png
deleted file mode 100644
index e50ee889..00000000
Binary files a/resources/azure/database/data-lake.png and /dev/null differ
diff --git a/resources/azure/database/database-for-postgresql-servers.png b/resources/azure/database/database-for-postgresql-servers.png
deleted file mode 100644
index 91875ae0..00000000
Binary files a/resources/azure/database/database-for-postgresql-servers.png and /dev/null differ
diff --git a/resources/azure/database/virtual-datacenter.png b/resources/azure/database/virtual-datacenter.png
deleted file mode 100644
index 31ebc4c8..00000000
Binary files a/resources/azure/database/virtual-datacenter.png and /dev/null differ
diff --git a/resources/azure/database/cache-for-redis.png b/resources/azure/databases/cache-redis.png
similarity index 92%
rename from resources/azure/database/cache-for-redis.png
rename to resources/azure/databases/cache-redis.png
index c3919b2a..fbd4c92f 100644
Binary files a/resources/azure/database/cache-for-redis.png and b/resources/azure/databases/cache-redis.png differ
diff --git a/resources/azure/database/cosmos-db.png b/resources/azure/databases/cosmos-db.png
similarity index 98%
rename from resources/azure/database/cosmos-db.png
rename to resources/azure/databases/cosmos-db.png
index 64b9796d..d91308e8 100644
Binary files a/resources/azure/database/cosmos-db.png and b/resources/azure/databases/cosmos-db.png differ
diff --git a/resources/azure/database/data-explorer-clusters.png b/resources/azure/databases/data-explorer-clusters.png
similarity index 92%
rename from resources/azure/database/data-explorer-clusters.png
rename to resources/azure/databases/data-explorer-clusters.png
index cb317abc..cb47577c 100644
Binary files a/resources/azure/database/data-explorer-clusters.png and b/resources/azure/databases/data-explorer-clusters.png differ
diff --git a/resources/azure/database/data-factory.png b/resources/azure/databases/data-factory.png
similarity index 93%
rename from resources/azure/database/data-factory.png
rename to resources/azure/databases/data-factory.png
index 78d97d26..86727b86 100644
Binary files a/resources/azure/database/data-factory.png and b/resources/azure/databases/data-factory.png differ
diff --git a/resources/azure/database/database-for-mariadb-servers.png b/resources/azure/databases/database-mariadb-server.png
similarity index 90%
rename from resources/azure/database/database-for-mariadb-servers.png
rename to resources/azure/databases/database-mariadb-server.png
index 170251e1..7dea5762 100644
Binary files a/resources/azure/database/database-for-mariadb-servers.png and b/resources/azure/databases/database-mariadb-server.png differ
diff --git a/resources/azure/migration/database-migration-services.png b/resources/azure/databases/database-migration-services.png
similarity index 97%
rename from resources/azure/migration/database-migration-services.png
rename to resources/azure/databases/database-migration-services.png
index 9f66d088..a9178354 100644
Binary files a/resources/azure/migration/database-migration-services.png and b/resources/azure/databases/database-migration-services.png differ
diff --git a/resources/azure/database/database-for-mysql-servers.png b/resources/azure/databases/database-mysql-server.png
similarity index 96%
rename from resources/azure/database/database-for-mysql-servers.png
rename to resources/azure/databases/database-mysql-server.png
index a70b63c0..056fd31f 100644
Binary files a/resources/azure/database/database-for-mysql-servers.png and b/resources/azure/databases/database-mysql-server.png differ
diff --git a/resources/azure/databases/database-postgresql-server.png b/resources/azure/databases/database-postgresql-server.png
new file mode 100644
index 00000000..2c31d194
Binary files /dev/null and b/resources/azure/databases/database-postgresql-server.png differ
diff --git a/resources/azure/database/elastic-job-agents.png b/resources/azure/databases/elastic-job-agents.png
similarity index 97%
rename from resources/azure/database/elastic-job-agents.png
rename to resources/azure/databases/elastic-job-agents.png
index dc82cee7..9c711e68 100644
Binary files a/resources/azure/database/elastic-job-agents.png and b/resources/azure/databases/elastic-job-agents.png differ
diff --git a/resources/azure/database/instance-pools.png b/resources/azure/databases/instance-pools.png
similarity index 97%
rename from resources/azure/database/instance-pools.png
rename to resources/azure/databases/instance-pools.png
index ccf66287..f0b6cdf9 100644
Binary files a/resources/azure/database/instance-pools.png and b/resources/azure/databases/instance-pools.png differ
diff --git a/resources/azure/database/managed-databases.png b/resources/azure/databases/managed-database.png
similarity index 94%
rename from resources/azure/database/managed-databases.png
rename to resources/azure/databases/managed-database.png
index 2035ee34..56761f70 100644
Binary files a/resources/azure/database/managed-databases.png and b/resources/azure/databases/managed-database.png differ
diff --git a/resources/azure/database/sql-datawarehouse.png b/resources/azure/databases/sql-data-warehouses.png
similarity index 93%
rename from resources/azure/database/sql-datawarehouse.png
rename to resources/azure/databases/sql-data-warehouses.png
index 2aeeeeaa..a31cd2fe 100644
Binary files a/resources/azure/database/sql-datawarehouse.png and b/resources/azure/databases/sql-data-warehouses.png differ
diff --git a/resources/azure/database/sql-databases.png b/resources/azure/databases/sql-database.png
similarity index 96%
rename from resources/azure/database/sql-databases.png
rename to resources/azure/databases/sql-database.png
index 60d0f169..ce1dcf4d 100644
Binary files a/resources/azure/database/sql-databases.png and b/resources/azure/databases/sql-database.png differ
diff --git a/resources/azure/database/elastic-database-pools.png b/resources/azure/databases/sql-elastic-pools.png
similarity index 95%
rename from resources/azure/database/elastic-database-pools.png
rename to resources/azure/databases/sql-elastic-pools.png
index d5ed1d4a..2308c212 100644
Binary files a/resources/azure/database/elastic-database-pools.png and b/resources/azure/databases/sql-elastic-pools.png differ
diff --git a/resources/azure/database/sql-managed-instances.png b/resources/azure/databases/sql-managed-instance.png
similarity index 97%
rename from resources/azure/database/sql-managed-instances.png
rename to resources/azure/databases/sql-managed-instance.png
index 2cfe47e7..00092e85 100644
Binary files a/resources/azure/database/sql-managed-instances.png and b/resources/azure/databases/sql-managed-instance.png differ
diff --git a/resources/azure/database/sql-server-stretch-databases.png b/resources/azure/databases/sql-server-stretch-databases.png
similarity index 93%
rename from resources/azure/database/sql-server-stretch-databases.png
rename to resources/azure/databases/sql-server-stretch-databases.png
index 2aeeeeaa..a31cd2fe 100644
Binary files a/resources/azure/database/sql-server-stretch-databases.png and b/resources/azure/databases/sql-server-stretch-databases.png differ
diff --git a/resources/azure/database/sql-servers.png b/resources/azure/databases/sql-server.png
similarity index 98%
rename from resources/azure/database/sql-servers.png
rename to resources/azure/databases/sql-server.png
index a45391ba..c3c469fc 100644
Binary files a/resources/azure/database/sql-servers.png and b/resources/azure/databases/sql-server.png differ
diff --git a/resources/azure/database/sql-vm.png b/resources/azure/databases/sql-vm.png
similarity index 89%
rename from resources/azure/database/sql-vm.png
rename to resources/azure/databases/sql-vm.png
index c7ce579d..2b1eba0f 100644
Binary files a/resources/azure/database/sql-vm.png and b/resources/azure/databases/sql-vm.png differ
diff --git a/resources/azure/database/sql.png b/resources/azure/databases/sql.png
similarity index 96%
rename from resources/azure/database/sql.png
rename to resources/azure/databases/sql.png
index d3b46f09..f82aace0 100644
Binary files a/resources/azure/database/sql.png and b/resources/azure/databases/sql.png differ
diff --git a/resources/azure/database/ssis-lift-and-shift-ir.png b/resources/azure/databases/ssis-lift-and-shift-ir.png
similarity index 97%
rename from resources/azure/database/ssis-lift-and-shift-ir.png
rename to resources/azure/databases/ssis-lift-and-shift-ir.png
index 8ff629c5..9fef02d9 100644
Binary files a/resources/azure/database/ssis-lift-and-shift-ir.png and b/resources/azure/databases/ssis-lift-and-shift-ir.png differ
diff --git a/resources/azure/database/synapse-analytics.png b/resources/azure/databases/synapse-analytics.png
similarity index 97%
rename from resources/azure/database/synapse-analytics.png
rename to resources/azure/databases/synapse-analytics.png
index 7966c325..ad84ce66 100644
Binary files a/resources/azure/database/synapse-analytics.png and b/resources/azure/databases/synapse-analytics.png differ
diff --git a/resources/azure/database/virtual-clusters.png b/resources/azure/databases/virtual-clusters.png
similarity index 94%
rename from resources/azure/database/virtual-clusters.png
rename to resources/azure/databases/virtual-clusters.png
index c676bd50..8fa5f6c7 100644
Binary files a/resources/azure/database/virtual-clusters.png and b/resources/azure/databases/virtual-clusters.png differ
diff --git a/resources/azure/devops/application-insights.png b/resources/azure/devops/application-insights.png
index f80e0173..dbd50506 100644
Binary files a/resources/azure/devops/application-insights.png and b/resources/azure/devops/application-insights.png differ
diff --git a/resources/azure/devops/artifacts.png b/resources/azure/devops/artifacts.png
deleted file mode 100644
index dc928c1d..00000000
Binary files a/resources/azure/devops/artifacts.png and /dev/null differ
diff --git a/resources/azure/devops/boards.png b/resources/azure/devops/boards.png
deleted file mode 100644
index 1813eba5..00000000
Binary files a/resources/azure/devops/boards.png and /dev/null differ
diff --git a/resources/azure/devops/devops.png b/resources/azure/devops/devops.png
index 9d124a1f..80bfcd29 100644
Binary files a/resources/azure/devops/devops.png and b/resources/azure/devops/devops.png differ
diff --git a/resources/azure/devops/devtest-labs.png b/resources/azure/devops/devtest-labs.png
index 75b82c12..90300871 100644
Binary files a/resources/azure/devops/devtest-labs.png and b/resources/azure/devops/devtest-labs.png differ
diff --git a/resources/azure/devops/lab-services.png b/resources/azure/devops/lab-services.png
index abbe48da..10b74324 100644
Binary files a/resources/azure/devops/lab-services.png and b/resources/azure/devops/lab-services.png differ
diff --git a/resources/azure/devops/pipelines.png b/resources/azure/devops/pipelines.png
deleted file mode 100644
index 631e082d..00000000
Binary files a/resources/azure/devops/pipelines.png and /dev/null differ
diff --git a/resources/azure/devops/repos.png b/resources/azure/devops/repos.png
deleted file mode 100644
index 636be5d4..00000000
Binary files a/resources/azure/devops/repos.png and /dev/null differ
diff --git a/resources/azure/devops/test-plans.png b/resources/azure/devops/test-plans.png
deleted file mode 100644
index 3543c991..00000000
Binary files a/resources/azure/devops/test-plans.png and /dev/null differ
diff --git a/resources/azure/general/allresources.png b/resources/azure/general/all-resources.png
similarity index 92%
rename from resources/azure/general/allresources.png
rename to resources/azure/general/all-resources.png
index d2b2ccc7..38a6a139 100644
Binary files a/resources/azure/general/allresources.png and b/resources/azure/general/all-resources.png differ
diff --git a/resources/azure/general/azurehome.png b/resources/azure/general/azurehome.png
deleted file mode 100644
index e86046d6..00000000
Binary files a/resources/azure/general/azurehome.png and /dev/null differ
diff --git a/resources/azure/general/backlog.png b/resources/azure/general/backlog.png
new file mode 100644
index 00000000..9a6148d2
Binary files /dev/null and b/resources/azure/general/backlog.png differ
diff --git a/resources/azure/general/biz-talk.png b/resources/azure/general/biz-talk.png
new file mode 100644
index 00000000..e6e67af8
Binary files /dev/null and b/resources/azure/general/biz-talk.png differ
diff --git a/resources/azure/general/blob-block.png b/resources/azure/general/blob-block.png
new file mode 100644
index 00000000..62dc693d
Binary files /dev/null and b/resources/azure/general/blob-block.png differ
diff --git a/resources/azure/general/blob-page.png b/resources/azure/general/blob-page.png
new file mode 100644
index 00000000..db50ab62
Binary files /dev/null and b/resources/azure/general/blob-page.png differ
diff --git a/resources/azure/general/branch.png b/resources/azure/general/branch.png
new file mode 100644
index 00000000..bea3ae63
Binary files /dev/null and b/resources/azure/general/branch.png differ
diff --git a/resources/azure/general/browser.png b/resources/azure/general/browser.png
new file mode 100644
index 00000000..79b81a32
Binary files /dev/null and b/resources/azure/general/browser.png differ
diff --git a/resources/azure/general/bug.png b/resources/azure/general/bug.png
new file mode 100644
index 00000000..5249c76a
Binary files /dev/null and b/resources/azure/general/bug.png differ
diff --git a/resources/azure/general/builds.png b/resources/azure/general/builds.png
new file mode 100644
index 00000000..579005a6
Binary files /dev/null and b/resources/azure/general/builds.png differ
diff --git a/resources/azure/general/cache.png b/resources/azure/general/cache.png
new file mode 100644
index 00000000..7dad36fb
Binary files /dev/null and b/resources/azure/general/cache.png differ
diff --git a/resources/azure/general/code.png b/resources/azure/general/code.png
new file mode 100644
index 00000000..fffc15ad
Binary files /dev/null and b/resources/azure/general/code.png differ
diff --git a/resources/azure/general/commit.png b/resources/azure/general/commit.png
new file mode 100644
index 00000000..5f7c4a7d
Binary files /dev/null and b/resources/azure/general/commit.png differ
diff --git a/resources/azure/general/controls-horizontal.png b/resources/azure/general/controls-horizontal.png
new file mode 100644
index 00000000..7f4a3e65
Binary files /dev/null and b/resources/azure/general/controls-horizontal.png differ
diff --git a/resources/azure/general/controls.png b/resources/azure/general/controls.png
new file mode 100644
index 00000000..5ee6e22f
Binary files /dev/null and b/resources/azure/general/controls.png differ
diff --git a/resources/azure/general/cost-alerts.png b/resources/azure/general/cost-alerts.png
new file mode 100644
index 00000000..90a2d73c
Binary files /dev/null and b/resources/azure/general/cost-alerts.png differ
diff --git a/resources/azure/general/cost-analysis.png b/resources/azure/general/cost-analysis.png
new file mode 100644
index 00000000..ba690262
Binary files /dev/null and b/resources/azure/general/cost-analysis.png differ
diff --git a/resources/azure/general/cost-budgets.png b/resources/azure/general/cost-budgets.png
new file mode 100644
index 00000000..c611e0a3
Binary files /dev/null and b/resources/azure/general/cost-budgets.png differ
diff --git a/resources/azure/general/cost-management-and-billing.png b/resources/azure/general/cost-management-and-billing.png
new file mode 100644
index 00000000..f368503b
Binary files /dev/null and b/resources/azure/general/cost-management-and-billing.png differ
diff --git a/resources/azure/general/cost-management.png b/resources/azure/general/cost-management.png
new file mode 100644
index 00000000..b9b76981
Binary files /dev/null and b/resources/azure/general/cost-management.png differ
diff --git a/resources/azure/general/counter.png b/resources/azure/general/counter.png
new file mode 100644
index 00000000..042cb67c
Binary files /dev/null and b/resources/azure/general/counter.png differ
diff --git a/resources/azure/general/cubes.png b/resources/azure/general/cubes.png
new file mode 100644
index 00000000..5cc596f3
Binary files /dev/null and b/resources/azure/general/cubes.png differ
diff --git a/resources/azure/general/dashboard.png b/resources/azure/general/dashboard.png
new file mode 100644
index 00000000..89a6a307
Binary files /dev/null and b/resources/azure/general/dashboard.png differ
diff --git a/resources/azure/general/dev-console.png b/resources/azure/general/dev-console.png
new file mode 100644
index 00000000..1f577e96
Binary files /dev/null and b/resources/azure/general/dev-console.png differ
diff --git a/resources/azure/general/developertools.png b/resources/azure/general/developertools.png
deleted file mode 100644
index 882de89e..00000000
Binary files a/resources/azure/general/developertools.png and /dev/null differ
diff --git a/resources/azure/general/download.png b/resources/azure/general/download.png
new file mode 100644
index 00000000..7d010f29
Binary files /dev/null and b/resources/azure/general/download.png differ
diff --git a/resources/azure/general/error.png b/resources/azure/general/error.png
new file mode 100644
index 00000000..598ceab4
Binary files /dev/null and b/resources/azure/general/error.png differ
diff --git a/resources/azure/general/extensions.png b/resources/azure/general/extensions.png
new file mode 100644
index 00000000..df89edc8
Binary files /dev/null and b/resources/azure/general/extensions.png differ
diff --git a/resources/azure/general/file.png b/resources/azure/general/file.png
new file mode 100644
index 00000000..493032b1
Binary files /dev/null and b/resources/azure/general/file.png differ
diff --git a/resources/azure/general/files.png b/resources/azure/general/files.png
new file mode 100644
index 00000000..4be3c3d6
Binary files /dev/null and b/resources/azure/general/files.png differ
diff --git a/resources/azure/general/folder-blank.png b/resources/azure/general/folder-blank.png
new file mode 100644
index 00000000..b97b16d8
Binary files /dev/null and b/resources/azure/general/folder-blank.png differ
diff --git a/resources/azure/general/folder-website.png b/resources/azure/general/folder-website.png
new file mode 100644
index 00000000..cb52e6fb
Binary files /dev/null and b/resources/azure/general/folder-website.png differ
diff --git a/resources/azure/general/free-services.png b/resources/azure/general/free-services.png
new file mode 100644
index 00000000..24047c19
Binary files /dev/null and b/resources/azure/general/free-services.png differ
diff --git a/resources/azure/general/ftp.png b/resources/azure/general/ftp.png
new file mode 100644
index 00000000..e0d68b93
Binary files /dev/null and b/resources/azure/general/ftp.png differ
diff --git a/resources/azure/general/gear.png b/resources/azure/general/gear.png
new file mode 100644
index 00000000..87e83942
Binary files /dev/null and b/resources/azure/general/gear.png differ
diff --git a/resources/azure/general/globe-error.png b/resources/azure/general/globe-error.png
new file mode 100644
index 00000000..84d7e285
Binary files /dev/null and b/resources/azure/general/globe-error.png differ
diff --git a/resources/azure/general/globe-success.png b/resources/azure/general/globe-success.png
new file mode 100644
index 00000000..76d96afb
Binary files /dev/null and b/resources/azure/general/globe-success.png differ
diff --git a/resources/azure/general/globe-warning.png b/resources/azure/general/globe-warning.png
new file mode 100644
index 00000000..a5c1bbde
Binary files /dev/null and b/resources/azure/general/globe-warning.png differ
diff --git a/resources/azure/general/globe.png b/resources/azure/general/globe.png
new file mode 100644
index 00000000..1437d797
Binary files /dev/null and b/resources/azure/general/globe.png differ
diff --git a/resources/azure/general/guide.png b/resources/azure/general/guide.png
new file mode 100644
index 00000000..14f7f013
Binary files /dev/null and b/resources/azure/general/guide.png differ
diff --git a/resources/azure/general/heart.png b/resources/azure/general/heart.png
new file mode 100644
index 00000000..6d27b3c8
Binary files /dev/null and b/resources/azure/general/heart.png differ
diff --git a/resources/azure/general/helpsupport.png b/resources/azure/general/help-and-support.png
similarity index 97%
rename from resources/azure/general/helpsupport.png
rename to resources/azure/general/help-and-support.png
index d5172d37..674c6d56 100644
Binary files a/resources/azure/general/helpsupport.png and b/resources/azure/general/help-and-support.png differ
diff --git a/resources/azure/general/image.png b/resources/azure/general/image.png
new file mode 100644
index 00000000..b915fc4d
Binary files /dev/null and b/resources/azure/general/image.png differ
diff --git a/resources/azure/general/information.png b/resources/azure/general/information.png
index 34af9729..5017a7a1 100644
Binary files a/resources/azure/general/information.png and b/resources/azure/general/information.png differ
diff --git a/resources/azure/general/input-output.png b/resources/azure/general/input-output.png
new file mode 100644
index 00000000..51bf0974
Binary files /dev/null and b/resources/azure/general/input-output.png differ
diff --git a/resources/azure/general/journey-hub.png b/resources/azure/general/journey-hub.png
new file mode 100644
index 00000000..0942aa2d
Binary files /dev/null and b/resources/azure/general/journey-hub.png differ
diff --git a/resources/azure/general/launch-portal.png b/resources/azure/general/launch-portal.png
new file mode 100644
index 00000000..b192e668
Binary files /dev/null and b/resources/azure/general/launch-portal.png differ
diff --git a/resources/azure/general/learn.png b/resources/azure/general/learn.png
new file mode 100644
index 00000000..62a7efa5
Binary files /dev/null and b/resources/azure/general/learn.png differ
diff --git a/resources/azure/general/load-test.png b/resources/azure/general/load-test.png
new file mode 100644
index 00000000..743ccf12
Binary files /dev/null and b/resources/azure/general/load-test.png differ
diff --git a/resources/azure/general/location.png b/resources/azure/general/location.png
new file mode 100644
index 00000000..5fa75444
Binary files /dev/null and b/resources/azure/general/location.png differ
diff --git a/resources/azure/general/log-streaming.png b/resources/azure/general/log-streaming.png
new file mode 100644
index 00000000..3739e690
Binary files /dev/null and b/resources/azure/general/log-streaming.png differ
diff --git a/resources/azure/general/managementgroups.png b/resources/azure/general/management-groups.png
similarity index 97%
rename from resources/azure/general/managementgroups.png
rename to resources/azure/general/management-groups.png
index 94044f40..77fcffb3 100644
Binary files a/resources/azure/general/managementgroups.png and b/resources/azure/general/management-groups.png differ
diff --git a/resources/azure/general/management-portal.png b/resources/azure/general/management-portal.png
new file mode 100644
index 00000000..b388c4ab
Binary files /dev/null and b/resources/azure/general/management-portal.png differ
diff --git a/resources/azure/general/marketplace.png b/resources/azure/general/marketplace.png
index 311506f4..4745ef0c 100644
Binary files a/resources/azure/general/marketplace.png and b/resources/azure/general/marketplace.png differ
diff --git a/resources/azure/general/media-file.png b/resources/azure/general/media-file.png
new file mode 100644
index 00000000..06480b18
Binary files /dev/null and b/resources/azure/general/media-file.png differ
diff --git a/resources/azure/general/media.png b/resources/azure/general/media.png
new file mode 100644
index 00000000..db98432f
Binary files /dev/null and b/resources/azure/general/media.png differ
diff --git a/resources/azure/mobile/mobile-engagement.png b/resources/azure/general/mobile-engagement.png
similarity index 87%
rename from resources/azure/mobile/mobile-engagement.png
rename to resources/azure/general/mobile-engagement.png
index fe02c590..49793ee1 100644
Binary files a/resources/azure/mobile/mobile-engagement.png and b/resources/azure/general/mobile-engagement.png differ
diff --git a/resources/azure/mobile/app-service-mobile.png b/resources/azure/general/mobile.png
similarity index 96%
rename from resources/azure/mobile/app-service-mobile.png
rename to resources/azure/general/mobile.png
index a851bea3..65e97bb8 100644
Binary files a/resources/azure/mobile/app-service-mobile.png and b/resources/azure/general/mobile.png differ
diff --git a/resources/azure/general/module.png b/resources/azure/general/module.png
new file mode 100644
index 00000000..124bbc43
Binary files /dev/null and b/resources/azure/general/module.png differ
diff --git a/resources/azure/general/power-up.png b/resources/azure/general/power-up.png
new file mode 100644
index 00000000..5c1300e4
Binary files /dev/null and b/resources/azure/general/power-up.png differ
diff --git a/resources/azure/general/power.png b/resources/azure/general/power.png
new file mode 100644
index 00000000..60a4c5bd
Binary files /dev/null and b/resources/azure/general/power.png differ
diff --git a/resources/azure/general/powershell.png b/resources/azure/general/powershell.png
new file mode 100644
index 00000000..6849b350
Binary files /dev/null and b/resources/azure/general/powershell.png differ
diff --git a/resources/azure/general/preview.png b/resources/azure/general/preview.png
new file mode 100644
index 00000000..1b0fc5b3
Binary files /dev/null and b/resources/azure/general/preview.png differ
diff --git a/resources/azure/general/process-explorer.png b/resources/azure/general/process-explorer.png
new file mode 100644
index 00000000..1f8521c3
Binary files /dev/null and b/resources/azure/general/process-explorer.png differ
diff --git a/resources/azure/general/production-ready-database.png b/resources/azure/general/production-ready-database.png
new file mode 100644
index 00000000..4a4ec10f
Binary files /dev/null and b/resources/azure/general/production-ready-database.png differ
diff --git a/resources/azure/general/quickstartcenter.png b/resources/azure/general/quickstart-center.png
similarity index 98%
rename from resources/azure/general/quickstartcenter.png
rename to resources/azure/general/quickstart-center.png
index 8a8d92ee..7bab2fd7 100644
Binary files a/resources/azure/general/quickstartcenter.png and b/resources/azure/general/quickstart-center.png differ
diff --git a/resources/azure/general/recent.png b/resources/azure/general/recent.png
index 7d7fb4a4..2edda2ce 100644
Binary files a/resources/azure/general/recent.png and b/resources/azure/general/recent.png differ
diff --git a/resources/azure/general/reservations.png b/resources/azure/general/reservations.png
index ec2ebad6..300d97fc 100644
Binary files a/resources/azure/general/reservations.png and b/resources/azure/general/reservations.png differ
diff --git a/resources/azure/general/resource-explorer.png b/resources/azure/general/resource-explorer.png
new file mode 100644
index 00000000..e12e47e4
Binary files /dev/null and b/resources/azure/general/resource-explorer.png differ
diff --git a/resources/azure/general/resource-group-list.png b/resources/azure/general/resource-group-list.png
new file mode 100644
index 00000000..cb245919
Binary files /dev/null and b/resources/azure/general/resource-group-list.png differ
diff --git a/resources/azure/general/resourcegroups.png b/resources/azure/general/resource-groups.png
similarity index 98%
rename from resources/azure/general/resourcegroups.png
rename to resources/azure/general/resource-groups.png
index f0177acf..02025d1f 100644
Binary files a/resources/azure/general/resourcegroups.png and b/resources/azure/general/resource-groups.png differ
diff --git a/resources/azure/general/resource-linked.png b/resources/azure/general/resource-linked.png
new file mode 100644
index 00000000..32290cfc
Binary files /dev/null and b/resources/azure/general/resource-linked.png differ
diff --git a/resources/azure/general/resource.png b/resources/azure/general/resource.png
deleted file mode 100644
index 8dfdc432..00000000
Binary files a/resources/azure/general/resource.png and /dev/null differ
diff --git a/resources/azure/general/scale.png b/resources/azure/general/scale.png
new file mode 100644
index 00000000..88f60320
Binary files /dev/null and b/resources/azure/general/scale.png differ
diff --git a/resources/azure/general/scheduler.png b/resources/azure/general/scheduler.png
new file mode 100644
index 00000000..cb19506b
Binary files /dev/null and b/resources/azure/general/scheduler.png differ
diff --git a/resources/azure/general/search-grid.png b/resources/azure/general/search-grid.png
new file mode 100644
index 00000000..cb245919
Binary files /dev/null and b/resources/azure/general/search-grid.png differ
diff --git a/resources/azure/general/search.png b/resources/azure/general/search.png
new file mode 100644
index 00000000..8eb8ffaa
Binary files /dev/null and b/resources/azure/general/search.png differ
diff --git a/resources/azure/general/server-farm.png b/resources/azure/general/server-farm.png
new file mode 100644
index 00000000..f79c3c90
Binary files /dev/null and b/resources/azure/general/server-farm.png differ
diff --git a/resources/azure/general/service-bus.png b/resources/azure/general/service-bus.png
new file mode 100644
index 00000000..66b8026a
Binary files /dev/null and b/resources/azure/general/service-bus.png differ
diff --git a/resources/azure/general/service-health.png b/resources/azure/general/service-health.png
new file mode 100644
index 00000000..f3b53286
Binary files /dev/null and b/resources/azure/general/service-health.png differ
diff --git a/resources/azure/general/servicehealth.png b/resources/azure/general/servicehealth.png
deleted file mode 100644
index 308f7062..00000000
Binary files a/resources/azure/general/servicehealth.png and /dev/null differ
diff --git a/resources/azure/general/shareddashboard.png b/resources/azure/general/shareddashboard.png
deleted file mode 100644
index 97caf721..00000000
Binary files a/resources/azure/general/shareddashboard.png and /dev/null differ
diff --git a/resources/azure/general/ssd.png b/resources/azure/general/ssd.png
new file mode 100644
index 00000000..dd800fa8
Binary files /dev/null and b/resources/azure/general/ssd.png differ
diff --git a/resources/azure/general/storage-azure-files.png b/resources/azure/general/storage-azure-files.png
new file mode 100644
index 00000000..9c15f7fa
Binary files /dev/null and b/resources/azure/general/storage-azure-files.png differ
diff --git a/resources/azure/general/storage-container.png b/resources/azure/general/storage-container.png
new file mode 100644
index 00000000..a0f5a5ac
Binary files /dev/null and b/resources/azure/general/storage-container.png differ
diff --git a/resources/azure/general/storage-queue.png b/resources/azure/general/storage-queue.png
new file mode 100644
index 00000000..0c4cb4f5
Binary files /dev/null and b/resources/azure/general/storage-queue.png differ
diff --git a/resources/azure/general/subscriptions.png b/resources/azure/general/subscriptions.png
index 9a510f98..18463dd8 100644
Binary files a/resources/azure/general/subscriptions.png and b/resources/azure/general/subscriptions.png differ
diff --git a/resources/azure/general/support.png b/resources/azure/general/support.png
deleted file mode 100644
index 6590fc9a..00000000
Binary files a/resources/azure/general/support.png and /dev/null differ
diff --git a/resources/azure/general/supportrequests.png b/resources/azure/general/supportrequests.png
deleted file mode 100644
index 582ee94e..00000000
Binary files a/resources/azure/general/supportrequests.png and /dev/null differ
diff --git a/resources/azure/general/table.png b/resources/azure/general/table.png
new file mode 100644
index 00000000..48f62b6d
Binary files /dev/null and b/resources/azure/general/table.png differ
diff --git a/resources/azure/general/tag.png b/resources/azure/general/tag.png
index 5d0ee16e..7a6c7fcc 100644
Binary files a/resources/azure/general/tag.png and b/resources/azure/general/tag.png differ
diff --git a/resources/azure/general/tags.png b/resources/azure/general/tags.png
index 58f2b4d5..42e4f29a 100644
Binary files a/resources/azure/general/tags.png and b/resources/azure/general/tags.png differ
diff --git a/resources/azure/general/templates.png b/resources/azure/general/templates.png
deleted file mode 100644
index 263cebb9..00000000
Binary files a/resources/azure/general/templates.png and /dev/null differ
diff --git a/resources/azure/general/tfs-vc-repository.png b/resources/azure/general/tfs-vc-repository.png
new file mode 100644
index 00000000..1d9d916b
Binary files /dev/null and b/resources/azure/general/tfs-vc-repository.png differ
diff --git a/resources/azure/general/toolbox.png b/resources/azure/general/toolbox.png
new file mode 100644
index 00000000..327deb18
Binary files /dev/null and b/resources/azure/general/toolbox.png differ
diff --git a/resources/azure/general/twousericon.png b/resources/azure/general/twousericon.png
deleted file mode 100644
index 9d6d8c1a..00000000
Binary files a/resources/azure/general/twousericon.png and /dev/null differ
diff --git a/resources/azure/general/userhealthicon.png b/resources/azure/general/userhealthicon.png
deleted file mode 100644
index b2e7e0cd..00000000
Binary files a/resources/azure/general/userhealthicon.png and /dev/null differ
diff --git a/resources/azure/general/usericon.png b/resources/azure/general/usericon.png
deleted file mode 100644
index 773ccd09..00000000
Binary files a/resources/azure/general/usericon.png and /dev/null differ
diff --git a/resources/azure/general/userprivacy.png b/resources/azure/general/userprivacy.png
deleted file mode 100644
index 09d22ce3..00000000
Binary files a/resources/azure/general/userprivacy.png and /dev/null differ
diff --git a/resources/azure/general/userresource.png b/resources/azure/general/userresource.png
deleted file mode 100644
index 1418179a..00000000
Binary files a/resources/azure/general/userresource.png and /dev/null differ
diff --git a/resources/azure/general/versions.png b/resources/azure/general/versions.png
new file mode 100644
index 00000000..2c9ebf02
Binary files /dev/null and b/resources/azure/general/versions.png differ
diff --git a/resources/azure/general/web-slots.png b/resources/azure/general/web-slots.png
new file mode 100644
index 00000000..ea603628
Binary files /dev/null and b/resources/azure/general/web-slots.png differ
diff --git a/resources/azure/general/web-test.png b/resources/azure/general/web-test.png
new file mode 100644
index 00000000..1b445625
Binary files /dev/null and b/resources/azure/general/web-test.png differ
diff --git a/resources/azure/general/website-power.png b/resources/azure/general/website-power.png
new file mode 100644
index 00000000..037c2e07
Binary files /dev/null and b/resources/azure/general/website-power.png differ
diff --git a/resources/azure/general/website-staging.png b/resources/azure/general/website-staging.png
new file mode 100644
index 00000000..f0645540
Binary files /dev/null and b/resources/azure/general/website-staging.png differ
diff --git a/resources/azure/general/whatsnew.png b/resources/azure/general/whatsnew.png
deleted file mode 100644
index 2142d2b3..00000000
Binary files a/resources/azure/general/whatsnew.png and /dev/null differ
diff --git a/resources/azure/general/workbooks.png b/resources/azure/general/workbooks.png
new file mode 100644
index 00000000..0da23474
Binary files /dev/null and b/resources/azure/general/workbooks.png differ
diff --git a/resources/azure/general/workflow.png b/resources/azure/general/workflow.png
new file mode 100644
index 00000000..e77a34b5
Binary files /dev/null and b/resources/azure/general/workflow.png differ
diff --git a/resources/azure/identity/access-review.png b/resources/azure/identity/access-review.png
deleted file mode 100644
index 22064e8b..00000000
Binary files a/resources/azure/identity/access-review.png and /dev/null differ
diff --git a/resources/azure/identity/active-directory-connect-health.png b/resources/azure/identity/active-directory-connect-health.png
index 5dea39e6..6566260a 100644
Binary files a/resources/azure/identity/active-directory-connect-health.png and b/resources/azure/identity/active-directory-connect-health.png differ
diff --git a/resources/azure/identity/active-directory.png b/resources/azure/identity/active-directory.png
index b12a71bb..05fcdf3a 100644
Binary files a/resources/azure/identity/active-directory.png and b/resources/azure/identity/active-directory.png differ
diff --git a/resources/azure/identity/ad-b2c.png b/resources/azure/identity/ad-b2c.png
index dab723f4..12d4dd92 100644
Binary files a/resources/azure/identity/ad-b2c.png and b/resources/azure/identity/ad-b2c.png differ
diff --git a/resources/azure/identity/ad-domain-services.png b/resources/azure/identity/ad-domain-services.png
index c4056d91..4d3bd2b0 100644
Binary files a/resources/azure/identity/ad-domain-services.png and b/resources/azure/identity/ad-domain-services.png differ
diff --git a/resources/azure/identity/ad-identity-protection.png b/resources/azure/identity/ad-identity-protection.png
index 503df013..49bc6366 100644
Binary files a/resources/azure/identity/ad-identity-protection.png and b/resources/azure/identity/ad-identity-protection.png differ
diff --git a/resources/azure/identity/ad-privileged-identity-management.png b/resources/azure/identity/ad-privileged-identity-management.png
deleted file mode 100644
index aca32aa5..00000000
Binary files a/resources/azure/identity/ad-privileged-identity-management.png and /dev/null differ
diff --git a/resources/azure/identity/app-registrations.png b/resources/azure/identity/app-registrations.png
index 755dc76e..4ff312ea 100644
Binary files a/resources/azure/identity/app-registrations.png and b/resources/azure/identity/app-registrations.png differ
diff --git a/resources/azure/identity/conditional-access.png b/resources/azure/identity/conditional-access.png
deleted file mode 100644
index e0fa97e2..00000000
Binary files a/resources/azure/identity/conditional-access.png and /dev/null differ
diff --git a/resources/azure/identity/enterprise-applications.png b/resources/azure/identity/enterprise-applications.png
index f14e0c98..f8e61b81 100644
Binary files a/resources/azure/identity/enterprise-applications.png and b/resources/azure/identity/enterprise-applications.png differ
diff --git a/resources/azure/identity/groups.png b/resources/azure/identity/groups.png
index b859b014..fac6955c 100644
Binary files a/resources/azure/identity/groups.png and b/resources/azure/identity/groups.png differ
diff --git a/resources/azure/identity/identity-governance.png b/resources/azure/identity/identity-governance.png
index fe46559a..e70e5a3c 100644
Binary files a/resources/azure/identity/identity-governance.png and b/resources/azure/identity/identity-governance.png differ
diff --git a/resources/azure/identity/information-protection.png b/resources/azure/identity/information-protection.png
deleted file mode 100644
index e7f561cf..00000000
Binary files a/resources/azure/identity/information-protection.png and /dev/null differ
diff --git a/resources/azure/identity/managed-identities.png b/resources/azure/identity/managed-identities.png
index d191007d..b1664dee 100644
Binary files a/resources/azure/identity/managed-identities.png and b/resources/azure/identity/managed-identities.png differ
diff --git a/resources/azure/identity/users.png b/resources/azure/identity/users.png
index 0da5d6d0..eb96ce34 100644
Binary files a/resources/azure/identity/users.png and b/resources/azure/identity/users.png differ
diff --git a/resources/azure/integration/api-for-fhir.png b/resources/azure/integration/api-for-fhir.png
index 801d438b..031fb600 100644
Binary files a/resources/azure/integration/api-for-fhir.png and b/resources/azure/integration/api-for-fhir.png differ
diff --git a/resources/azure/integration/api-management-services.png b/resources/azure/integration/api-management-services.png
new file mode 100644
index 00000000..405db0b7
Binary files /dev/null and b/resources/azure/integration/api-management-services.png differ
diff --git a/resources/azure/integration/app-configuration.png b/resources/azure/integration/app-configuration.png
deleted file mode 100644
index 088ea173..00000000
Binary files a/resources/azure/integration/app-configuration.png and /dev/null differ
diff --git a/resources/azure/integration/data-catalog.png b/resources/azure/integration/data-catalog.png
index 6f571571..35a039ab 100644
Binary files a/resources/azure/integration/data-catalog.png and b/resources/azure/integration/data-catalog.png differ
diff --git a/resources/azure/integration/event-grid-domains.png b/resources/azure/integration/event-grid-domains.png
index 53e285a4..3a7e11dc 100644
Binary files a/resources/azure/integration/event-grid-domains.png and b/resources/azure/integration/event-grid-domains.png differ
diff --git a/resources/azure/integration/event-grid-subscriptions.png b/resources/azure/integration/event-grid-subscriptions.png
index 53e285a4..3a7e11dc 100644
Binary files a/resources/azure/integration/event-grid-subscriptions.png and b/resources/azure/integration/event-grid-subscriptions.png differ
diff --git a/resources/azure/integration/event-grid-topics.png b/resources/azure/integration/event-grid-topics.png
index 04213c30..e6d24b52 100644
Binary files a/resources/azure/integration/event-grid-topics.png and b/resources/azure/integration/event-grid-topics.png differ
diff --git a/resources/azure/integration/integration-accounts.png b/resources/azure/integration/integration-accounts.png
index a729534f..00f027bb 100644
Binary files a/resources/azure/integration/integration-accounts.png and b/resources/azure/integration/integration-accounts.png differ
diff --git a/resources/azure/integration/integration-service-environments.png b/resources/azure/integration/integration-service-environments.png
deleted file mode 100644
index fefb03b3..00000000
Binary files a/resources/azure/integration/integration-service-environments.png and /dev/null differ
diff --git a/resources/azure/integration/logic-apps-custom-connector.png b/resources/azure/integration/logic-apps-custom-connector.png
deleted file mode 100644
index ace467c7..00000000
Binary files a/resources/azure/integration/logic-apps-custom-connector.png and /dev/null differ
diff --git a/resources/azure/integration/logic-apps.png b/resources/azure/integration/logic-apps.png
index b07f52c5..b6be946f 100644
Binary files a/resources/azure/integration/logic-apps.png and b/resources/azure/integration/logic-apps.png differ
diff --git a/resources/azure/integration/partner-topic.png b/resources/azure/integration/partner-topic.png
index 0631a558..05c02c70 100644
Binary files a/resources/azure/integration/partner-topic.png and b/resources/azure/integration/partner-topic.png differ
diff --git a/resources/azure/integration/service-bus-relays.png b/resources/azure/integration/relays.png
similarity index 96%
rename from resources/azure/integration/service-bus-relays.png
rename to resources/azure/integration/relays.png
index f255f05f..0d422fd2 100644
Binary files a/resources/azure/integration/service-bus-relays.png and b/resources/azure/integration/relays.png differ
diff --git a/resources/azure/integration/sendgrid-accounts.png b/resources/azure/integration/sendgrid-accounts.png
deleted file mode 100644
index e4cd7afa..00000000
Binary files a/resources/azure/integration/sendgrid-accounts.png and /dev/null differ
diff --git a/resources/azure/integration/service-bus.png b/resources/azure/integration/service-bus.png
deleted file mode 100644
index b64ad18e..00000000
Binary files a/resources/azure/integration/service-bus.png and /dev/null differ
diff --git a/resources/azure/integration/service-catalog-managed-application-definitions.png b/resources/azure/integration/service-catalog-managed-application-definitions.png
deleted file mode 100644
index 411380d8..00000000
Binary files a/resources/azure/integration/service-catalog-managed-application-definitions.png and /dev/null differ
diff --git a/resources/azure/integration/software-as-a-service.png b/resources/azure/integration/software-as-a-service.png
index de893bc8..909dd973 100644
Binary files a/resources/azure/integration/software-as-a-service.png and b/resources/azure/integration/software-as-a-service.png differ
diff --git a/resources/azure/integration/sql-data-warehouses.png b/resources/azure/integration/sql-data-warehouses.png
new file mode 100644
index 00000000..a31cd2fe
Binary files /dev/null and b/resources/azure/integration/sql-data-warehouses.png differ
diff --git a/resources/azure/integration/storsimple-device-managers.png b/resources/azure/integration/storsimple-device-managers.png
deleted file mode 100644
index b29ce455..00000000
Binary files a/resources/azure/integration/storsimple-device-managers.png and /dev/null differ
diff --git a/resources/azure/integration/system-topic.png b/resources/azure/integration/system-topic.png
index 83e941b3..2fbbcdce 100644
Binary files a/resources/azure/integration/system-topic.png and b/resources/azure/integration/system-topic.png differ
diff --git a/resources/azure/internet_of_things/digital-twins.png b/resources/azure/internet_of_things/digital-twins.png
new file mode 100644
index 00000000..2ac88b72
Binary files /dev/null and b/resources/azure/internet_of_things/digital-twins.png differ
diff --git a/resources/azure/internet_of_things/time-series-insights-access-policies.png b/resources/azure/internet_of_things/time-series-insights-access-policies.png
new file mode 100644
index 00000000..288c9f9b
Binary files /dev/null and b/resources/azure/internet_of_things/time-series-insights-access-policies.png differ
diff --git a/resources/azure/intune/ad-roles-and-administrators.png b/resources/azure/intune/ad-roles-and-administrators.png
new file mode 100644
index 00000000..b9cf98c1
Binary files /dev/null and b/resources/azure/intune/ad-roles-and-administrators.png differ
diff --git a/resources/azure/intune/device-security-apple.png b/resources/azure/intune/device-security-apple.png
new file mode 100644
index 00000000..232ef9ab
Binary files /dev/null and b/resources/azure/intune/device-security-apple.png differ
diff --git a/resources/azure/intune/device-security-google.png b/resources/azure/intune/device-security-google.png
new file mode 100644
index 00000000..1a4b1901
Binary files /dev/null and b/resources/azure/intune/device-security-google.png differ
diff --git a/resources/azure/intune/device-security-windows.png b/resources/azure/intune/device-security-windows.png
new file mode 100644
index 00000000..ccb9c985
Binary files /dev/null and b/resources/azure/intune/device-security-windows.png differ
diff --git a/resources/azure/intune/intune-for-education.png b/resources/azure/intune/intune-for-education.png
new file mode 100644
index 00000000..1219a3d2
Binary files /dev/null and b/resources/azure/intune/intune-for-education.png differ
diff --git a/resources/azure/intune/intune.png b/resources/azure/intune/intune.png
new file mode 100644
index 00000000..1219a3d2
Binary files /dev/null and b/resources/azure/intune/intune.png differ
diff --git a/resources/azure/iot/device-provisioning-services.png b/resources/azure/iot/device-provisioning-services.png
index f0fba925..0c57b53d 100644
Binary files a/resources/azure/iot/device-provisioning-services.png and b/resources/azure/iot/device-provisioning-services.png differ
diff --git a/resources/azure/iot/digital-twins.png b/resources/azure/iot/digital-twins.png
deleted file mode 100644
index ceb39f8a..00000000
Binary files a/resources/azure/iot/digital-twins.png and /dev/null differ
diff --git a/resources/azure/iot/event-hubs.png b/resources/azure/iot/event-hubs.png
new file mode 100644
index 00000000..ce97ea8e
Binary files /dev/null and b/resources/azure/iot/event-hubs.png differ
diff --git a/resources/azure/iot/function-apps.png b/resources/azure/iot/function-apps.png
new file mode 100644
index 00000000..a011d1e1
Binary files /dev/null and b/resources/azure/iot/function-apps.png differ
diff --git a/resources/azure/iot/iot-central-applications.png b/resources/azure/iot/iot-central-applications.png
index 0400504c..0084d5da 100644
Binary files a/resources/azure/iot/iot-central-applications.png and b/resources/azure/iot/iot-central-applications.png differ
diff --git a/resources/azure/iot/iot-hub-security.png b/resources/azure/iot/iot-hub-security.png
deleted file mode 100644
index 2b4d980c..00000000
Binary files a/resources/azure/iot/iot-hub-security.png and /dev/null differ
diff --git a/resources/azure/iot/iot-hub.png b/resources/azure/iot/iot-hub.png
index 664bc23f..61faf434 100644
Binary files a/resources/azure/iot/iot-hub.png and b/resources/azure/iot/iot-hub.png differ
diff --git a/resources/azure/iot/logic-apps.png b/resources/azure/iot/logic-apps.png
new file mode 100644
index 00000000..b6be946f
Binary files /dev/null and b/resources/azure/iot/logic-apps.png differ
diff --git a/resources/azure/iot/maps.png b/resources/azure/iot/maps-accounts.png
similarity index 93%
rename from resources/azure/iot/maps.png
rename to resources/azure/iot/maps-accounts.png
index ed1c5e16..722b475e 100644
Binary files a/resources/azure/iot/maps.png and b/resources/azure/iot/maps-accounts.png differ
diff --git a/resources/azure/iot/notification-hubs.png b/resources/azure/iot/notification-hubs.png
new file mode 100644
index 00000000..ae838d98
Binary files /dev/null and b/resources/azure/iot/notification-hubs.png differ
diff --git a/resources/azure/iot/sphere.png b/resources/azure/iot/sphere.png
deleted file mode 100644
index 5fef9d0c..00000000
Binary files a/resources/azure/iot/sphere.png and /dev/null differ
diff --git a/resources/azure/iot/stream-analytics-jobs.png b/resources/azure/iot/stream-analytics-jobs.png
new file mode 100644
index 00000000..6ff4b703
Binary files /dev/null and b/resources/azure/iot/stream-analytics-jobs.png differ
diff --git a/resources/azure/iot/time-series-insights-environments.png b/resources/azure/iot/time-series-insights-environments.png
index 8ddbc0ca..29ef2233 100644
Binary files a/resources/azure/iot/time-series-insights-environments.png and b/resources/azure/iot/time-series-insights-environments.png differ
diff --git a/resources/azure/iot/time-series-insights-events-sources.png b/resources/azure/iot/time-series-insights-event-sources.png
similarity index 95%
rename from resources/azure/iot/time-series-insights-events-sources.png
rename to resources/azure/iot/time-series-insights-event-sources.png
index 80d33f6c..ffb06004 100644
Binary files a/resources/azure/iot/time-series-insights-events-sources.png and b/resources/azure/iot/time-series-insights-event-sources.png differ
diff --git a/resources/azure/iot/windows-10-iot-core-services.png b/resources/azure/iot/windows-10-iot-core-services.png
deleted file mode 100644
index 54b6f7e8..00000000
Binary files a/resources/azure/iot/windows-10-iot-core-services.png and /dev/null differ
diff --git a/resources/azure/management_governance/activity-log.png b/resources/azure/management_governance/activity-log.png
new file mode 100644
index 00000000..a039075c
Binary files /dev/null and b/resources/azure/management_governance/activity-log.png differ
diff --git a/resources/azure/management_governance/advisor.png b/resources/azure/management_governance/advisor.png
new file mode 100644
index 00000000..d3243325
Binary files /dev/null and b/resources/azure/management_governance/advisor.png differ
diff --git a/resources/azure/management_governance/alerts.png b/resources/azure/management_governance/alerts.png
new file mode 100644
index 00000000..146cf8f8
Binary files /dev/null and b/resources/azure/management_governance/alerts.png differ
diff --git a/resources/azure/management_governance/application-insights.png b/resources/azure/management_governance/application-insights.png
new file mode 100644
index 00000000..dbd50506
Binary files /dev/null and b/resources/azure/management_governance/application-insights.png differ
diff --git a/resources/azure/management_governance/arc.png b/resources/azure/management_governance/arc.png
new file mode 100644
index 00000000..90b9677d
Binary files /dev/null and b/resources/azure/management_governance/arc.png differ
diff --git a/resources/azure/management_governance/automation-accounts.png b/resources/azure/management_governance/automation-accounts.png
new file mode 100644
index 00000000..5abc47c4
Binary files /dev/null and b/resources/azure/management_governance/automation-accounts.png differ
diff --git a/resources/azure/management_governance/blueprints.png b/resources/azure/management_governance/blueprints.png
new file mode 100644
index 00000000..d780a198
Binary files /dev/null and b/resources/azure/management_governance/blueprints.png differ
diff --git a/resources/azure/management_governance/compliance.png b/resources/azure/management_governance/compliance.png
new file mode 100644
index 00000000..69c3c075
Binary files /dev/null and b/resources/azure/management_governance/compliance.png differ
diff --git a/resources/azure/management_governance/cost-management-and-billing.png b/resources/azure/management_governance/cost-management-and-billing.png
new file mode 100644
index 00000000..f368503b
Binary files /dev/null and b/resources/azure/management_governance/cost-management-and-billing.png differ
diff --git a/resources/azure/management_governance/diagnostics-settings.png b/resources/azure/management_governance/diagnostics-settings.png
new file mode 100644
index 00000000..bd9cd6a3
Binary files /dev/null and b/resources/azure/management_governance/diagnostics-settings.png differ
diff --git a/resources/azure/management_governance/education.png b/resources/azure/management_governance/education.png
new file mode 100644
index 00000000..cb8cccc5
Binary files /dev/null and b/resources/azure/management_governance/education.png differ
diff --git a/resources/azure/management_governance/lighthouse.png b/resources/azure/management_governance/lighthouse.png
new file mode 100644
index 00000000..c99f3678
Binary files /dev/null and b/resources/azure/management_governance/lighthouse.png differ
diff --git a/resources/azure/management_governance/log-analytics-workspaces.png b/resources/azure/management_governance/log-analytics-workspaces.png
new file mode 100644
index 00000000..7f0bd907
Binary files /dev/null and b/resources/azure/management_governance/log-analytics-workspaces.png differ
diff --git a/resources/azure/management_governance/machinesazurearc.png b/resources/azure/management_governance/machinesazurearc.png
new file mode 100644
index 00000000..69ce348b
Binary files /dev/null and b/resources/azure/management_governance/machinesazurearc.png differ
diff --git a/resources/azure/management_governance/managed-applications-center.png b/resources/azure/management_governance/managed-applications-center.png
new file mode 100644
index 00000000..8133a3d3
Binary files /dev/null and b/resources/azure/management_governance/managed-applications-center.png differ
diff --git a/resources/azure/management_governance/metrics.png b/resources/azure/management_governance/metrics.png
new file mode 100644
index 00000000..61198f3c
Binary files /dev/null and b/resources/azure/management_governance/metrics.png differ
diff --git a/resources/azure/management_governance/monitor.png b/resources/azure/management_governance/monitor.png
new file mode 100644
index 00000000..1819b645
Binary files /dev/null and b/resources/azure/management_governance/monitor.png differ
diff --git a/resources/azure/management_governance/my-customers.png b/resources/azure/management_governance/my-customers.png
new file mode 100644
index 00000000..fac6955c
Binary files /dev/null and b/resources/azure/management_governance/my-customers.png differ
diff --git a/resources/azure/management_governance/operation-log-classic.png b/resources/azure/management_governance/operation-log-classic.png
new file mode 100644
index 00000000..a039075c
Binary files /dev/null and b/resources/azure/management_governance/operation-log-classic.png differ
diff --git a/resources/azure/management_governance/policy.png b/resources/azure/management_governance/policy.png
new file mode 100644
index 00000000..f0d84496
Binary files /dev/null and b/resources/azure/management_governance/policy.png differ
diff --git a/resources/azure/migration/recovery-services-vaults.png b/resources/azure/management_governance/recovery-services-vaults.png
similarity index 97%
rename from resources/azure/migration/recovery-services-vaults.png
rename to resources/azure/management_governance/recovery-services-vaults.png
index 1275988e..b17f0d50 100644
Binary files a/resources/azure/migration/recovery-services-vaults.png and b/resources/azure/management_governance/recovery-services-vaults.png differ
diff --git a/resources/azure/management_governance/resource-graph-explorer.png b/resources/azure/management_governance/resource-graph-explorer.png
new file mode 100644
index 00000000..1b3aed74
Binary files /dev/null and b/resources/azure/management_governance/resource-graph-explorer.png differ
diff --git a/resources/azure/management_governance/service-providers.png b/resources/azure/management_governance/service-providers.png
new file mode 100644
index 00000000..626311c7
Binary files /dev/null and b/resources/azure/management_governance/service-providers.png differ
diff --git a/resources/azure/management_governance/solutions.png b/resources/azure/management_governance/solutions.png
new file mode 100644
index 00000000..514b39bc
Binary files /dev/null and b/resources/azure/management_governance/solutions.png differ
diff --git a/resources/azure/management_governance/user-privacy.png b/resources/azure/management_governance/user-privacy.png
new file mode 100644
index 00000000..e17f5750
Binary files /dev/null and b/resources/azure/management_governance/user-privacy.png differ
diff --git a/resources/azure/migrate/cost-management-and-billing.png b/resources/azure/migrate/cost-management-and-billing.png
new file mode 100644
index 00000000..f368503b
Binary files /dev/null and b/resources/azure/migrate/cost-management-and-billing.png differ
diff --git a/resources/azure/migration/data-box-edge.png b/resources/azure/migrate/data-box-edge.png
similarity index 97%
rename from resources/azure/migration/data-box-edge.png
rename to resources/azure/migrate/data-box-edge.png
index 76d55602..81740dc1 100644
Binary files a/resources/azure/migration/data-box-edge.png and b/resources/azure/migrate/data-box-edge.png differ
diff --git a/resources/azure/migration/data-box.png b/resources/azure/migrate/data-box.png
similarity index 97%
rename from resources/azure/migration/data-box.png
rename to resources/azure/migrate/data-box.png
index b316d506..93f87af5 100644
Binary files a/resources/azure/migration/data-box.png and b/resources/azure/migrate/data-box.png differ
diff --git a/resources/azure/migration/migration-projects.png b/resources/azure/migrate/migrate.png
similarity index 96%
rename from resources/azure/migration/migration-projects.png
rename to resources/azure/migrate/migrate.png
index 71394c0b..c2735ba0 100644
Binary files a/resources/azure/migration/migration-projects.png and b/resources/azure/migrate/migrate.png differ
diff --git a/resources/azure/migrate/recovery-services-vaults.png b/resources/azure/migrate/recovery-services-vaults.png
new file mode 100644
index 00000000..b17f0d50
Binary files /dev/null and b/resources/azure/migrate/recovery-services-vaults.png differ
diff --git a/resources/azure/mixed_reality/remote-rendering.png b/resources/azure/mixed_reality/remote-rendering.png
new file mode 100644
index 00000000..206b9718
Binary files /dev/null and b/resources/azure/mixed_reality/remote-rendering.png differ
diff --git a/resources/azure/ml/batch-ai.png b/resources/azure/ml/batch-ai.png
deleted file mode 100644
index 935f482e..00000000
Binary files a/resources/azure/ml/batch-ai.png and /dev/null differ
diff --git a/resources/azure/ml/genomics-accounts.png b/resources/azure/ml/genomics-accounts.png
deleted file mode 100644
index 782eba24..00000000
Binary files a/resources/azure/ml/genomics-accounts.png and /dev/null differ
diff --git a/resources/azure/ml/machine-learning-service-workspaces.png b/resources/azure/ml/machine-learning-service-workspaces.png
deleted file mode 100644
index b1e967bb..00000000
Binary files a/resources/azure/ml/machine-learning-service-workspaces.png and /dev/null differ
diff --git a/resources/azure/monitor/sap-azure-monitor.png b/resources/azure/monitor/sap-azure-monitor.png
new file mode 100644
index 00000000..f893e527
Binary files /dev/null and b/resources/azure/monitor/sap-azure-monitor.png differ
diff --git a/resources/azure/network/application-security-groups.png b/resources/azure/network/application-security-groups.png
deleted file mode 100644
index 0e0b6be9..00000000
Binary files a/resources/azure/network/application-security-groups.png and /dev/null differ
diff --git a/resources/azure/network/dns-private-zones.png b/resources/azure/network/dns-private-zones.png
deleted file mode 100644
index 60bd589e..00000000
Binary files a/resources/azure/network/dns-private-zones.png and /dev/null differ
diff --git a/resources/azure/network/on-premises-data-gateways.png b/resources/azure/network/on-premises-data-gateways.png
deleted file mode 100644
index fb1b0ecb..00000000
Binary files a/resources/azure/network/on-premises-data-gateways.png and /dev/null differ
diff --git a/resources/azure/network/subnets.png b/resources/azure/network/subnets.png
deleted file mode 100644
index eb4b1f59..00000000
Binary files a/resources/azure/network/subnets.png and /dev/null differ
diff --git a/resources/azure/network/virtual-network-gateways.png b/resources/azure/network/virtual-network-gateways.png
deleted file mode 100644
index 5e66c940..00000000
Binary files a/resources/azure/network/virtual-network-gateways.png and /dev/null differ
diff --git a/resources/azure/network/application-gateway.png b/resources/azure/networking/application-gateways.png
similarity index 93%
rename from resources/azure/network/application-gateway.png
rename to resources/azure/networking/application-gateways.png
index 33b9bb60..781442ff 100644
Binary files a/resources/azure/network/application-gateway.png and b/resources/azure/networking/application-gateways.png differ
diff --git a/resources/azure/networking/cdn-profiles.png b/resources/azure/networking/cdn-profiles.png
new file mode 100644
index 00000000..c5c01591
Binary files /dev/null and b/resources/azure/networking/cdn-profiles.png differ
diff --git a/resources/azure/network/connections.png b/resources/azure/networking/connections.png
similarity index 72%
rename from resources/azure/network/connections.png
rename to resources/azure/networking/connections.png
index ba2f81ff..35f21cfb 100644
Binary files a/resources/azure/network/connections.png and b/resources/azure/networking/connections.png differ
diff --git a/resources/azure/network/ddos-protection-plans.png b/resources/azure/networking/ddos-protection-plans.png
similarity index 88%
rename from resources/azure/network/ddos-protection-plans.png
rename to resources/azure/networking/ddos-protection-plans.png
index a9f93003..1d419646 100644
Binary files a/resources/azure/network/ddos-protection-plans.png and b/resources/azure/networking/ddos-protection-plans.png differ
diff --git a/resources/azure/network/dns-zones.png b/resources/azure/networking/dns-zones.png
similarity index 98%
rename from resources/azure/network/dns-zones.png
rename to resources/azure/networking/dns-zones.png
index cd0e0546..62a01811 100644
Binary files a/resources/azure/network/dns-zones.png and b/resources/azure/networking/dns-zones.png differ
diff --git a/resources/azure/network/expressroute-circuits.png b/resources/azure/networking/expressroute-circuits.png
similarity index 95%
rename from resources/azure/network/expressroute-circuits.png
rename to resources/azure/networking/expressroute-circuits.png
index cb86bb1e..b5a1c20b 100644
Binary files a/resources/azure/network/expressroute-circuits.png and b/resources/azure/networking/expressroute-circuits.png differ
diff --git a/resources/azure/networking/firewall-manager.png b/resources/azure/networking/firewall-manager.png
new file mode 100644
index 00000000..d9a20eff
Binary files /dev/null and b/resources/azure/networking/firewall-manager.png differ
diff --git a/resources/azure/network/firewall.png b/resources/azure/networking/firewalls.png
similarity index 95%
rename from resources/azure/network/firewall.png
rename to resources/azure/networking/firewalls.png
index d2f12c96..c32220ad 100644
Binary files a/resources/azure/network/firewall.png and b/resources/azure/networking/firewalls.png differ
diff --git a/resources/azure/network/front-doors.png b/resources/azure/networking/front-doors.png
similarity index 95%
rename from resources/azure/network/front-doors.png
rename to resources/azure/networking/front-doors.png
index baa09faf..c2c703c0 100644
Binary files a/resources/azure/network/front-doors.png and b/resources/azure/networking/front-doors.png differ
diff --git a/resources/azure/networking/ip-groups.png b/resources/azure/networking/ip-groups.png
new file mode 100644
index 00000000..330d3f1b
Binary files /dev/null and b/resources/azure/networking/ip-groups.png differ
diff --git a/resources/azure/network/load-balancers.png b/resources/azure/networking/load-balancers.png
similarity index 95%
rename from resources/azure/network/load-balancers.png
rename to resources/azure/networking/load-balancers.png
index 803c5225..56ff014b 100644
Binary files a/resources/azure/network/load-balancers.png and b/resources/azure/networking/load-balancers.png differ
diff --git a/resources/azure/network/local-network-gateways.png b/resources/azure/networking/local-network-gateways.png
similarity index 93%
rename from resources/azure/network/local-network-gateways.png
rename to resources/azure/networking/local-network-gateways.png
index 11e7bf9c..8915e93b 100644
Binary files a/resources/azure/network/local-network-gateways.png and b/resources/azure/networking/local-network-gateways.png differ
diff --git a/resources/azure/networking/nat.png b/resources/azure/networking/nat.png
new file mode 100644
index 00000000..69e03dc5
Binary files /dev/null and b/resources/azure/networking/nat.png differ
diff --git a/resources/azure/network/network-interfaces.png b/resources/azure/networking/network-interfaces.png
similarity index 93%
rename from resources/azure/network/network-interfaces.png
rename to resources/azure/networking/network-interfaces.png
index c60606c9..28178b8c 100644
Binary files a/resources/azure/network/network-interfaces.png and b/resources/azure/networking/network-interfaces.png differ
diff --git a/resources/azure/network/network-security-groups-classic.png b/resources/azure/networking/network-security-groups.png
similarity index 95%
rename from resources/azure/network/network-security-groups-classic.png
rename to resources/azure/networking/network-security-groups.png
index 4a7e8eee..106a8f32 100644
Binary files a/resources/azure/network/network-security-groups-classic.png and b/resources/azure/networking/network-security-groups.png differ
diff --git a/resources/azure/network/network-watcher.png b/resources/azure/networking/network-watcher.png
similarity index 98%
rename from resources/azure/network/network-watcher.png
rename to resources/azure/networking/network-watcher.png
index 1323f62c..47742678 100644
Binary files a/resources/azure/network/network-watcher.png and b/resources/azure/networking/network-watcher.png differ
diff --git a/resources/azure/networking/private-link-service.png b/resources/azure/networking/private-link-service.png
new file mode 100644
index 00000000..f6940e98
Binary files /dev/null and b/resources/azure/networking/private-link-service.png differ
diff --git a/resources/azure/networking/private-link.png b/resources/azure/networking/private-link.png
new file mode 100644
index 00000000..cee5a9eb
Binary files /dev/null and b/resources/azure/networking/private-link.png differ
diff --git a/resources/azure/networking/proximity-placement-groups.png b/resources/azure/networking/proximity-placement-groups.png
new file mode 100644
index 00000000..55025a5f
Binary files /dev/null and b/resources/azure/networking/proximity-placement-groups.png differ
diff --git a/resources/azure/networking/public-ip-addresses-classic.png b/resources/azure/networking/public-ip-addresses-classic.png
new file mode 100644
index 00000000..957bbb36
Binary files /dev/null and b/resources/azure/networking/public-ip-addresses-classic.png differ
diff --git a/resources/azure/network/public-ip-addresses.png b/resources/azure/networking/public-ip-addresses.png
similarity index 83%
rename from resources/azure/network/public-ip-addresses.png
rename to resources/azure/networking/public-ip-addresses.png
index 2cb57240..228d85b3 100644
Binary files a/resources/azure/network/public-ip-addresses.png and b/resources/azure/networking/public-ip-addresses.png differ
diff --git a/resources/azure/networking/public-ip-prefixes.png b/resources/azure/networking/public-ip-prefixes.png
new file mode 100644
index 00000000..18b4181b
Binary files /dev/null and b/resources/azure/networking/public-ip-prefixes.png differ
diff --git a/resources/azure/network/reserved-ip-addresses-classic.png b/resources/azure/networking/reserved-ip-addresses-classic.png
similarity index 94%
rename from resources/azure/network/reserved-ip-addresses-classic.png
rename to resources/azure/networking/reserved-ip-addresses-classic.png
index 086da895..19395b42 100644
Binary files a/resources/azure/network/reserved-ip-addresses-classic.png and b/resources/azure/networking/reserved-ip-addresses-classic.png differ
diff --git a/resources/azure/network/route-filters.png b/resources/azure/networking/route-filters.png
similarity index 96%
rename from resources/azure/network/route-filters.png
rename to resources/azure/networking/route-filters.png
index 797b5119..bc15a994 100644
Binary files a/resources/azure/network/route-filters.png and b/resources/azure/networking/route-filters.png differ
diff --git a/resources/azure/network/route-tables.png b/resources/azure/networking/route-tables.png
similarity index 95%
rename from resources/azure/network/route-tables.png
rename to resources/azure/networking/route-tables.png
index 9d7ff779..4a1cf44a 100644
Binary files a/resources/azure/network/route-tables.png and b/resources/azure/networking/route-tables.png differ
diff --git a/resources/azure/network/service-endpoint-policies.png b/resources/azure/networking/service-endpoint-policies.png
similarity index 94%
rename from resources/azure/network/service-endpoint-policies.png
rename to resources/azure/networking/service-endpoint-policies.png
index e9fa41fe..edf7cfc5 100644
Binary files a/resources/azure/network/service-endpoint-policies.png and b/resources/azure/networking/service-endpoint-policies.png differ
diff --git a/resources/azure/network/traffic-manager-profiles.png b/resources/azure/networking/traffic-manager-profiles.png
similarity index 95%
rename from resources/azure/network/traffic-manager-profiles.png
rename to resources/azure/networking/traffic-manager-profiles.png
index fa7fa8fe..924a86c1 100644
Binary files a/resources/azure/network/traffic-manager-profiles.png and b/resources/azure/networking/traffic-manager-profiles.png differ
diff --git a/resources/azure/networking/virtual-network-gateways.png b/resources/azure/networking/virtual-network-gateways.png
new file mode 100644
index 00000000..b9b2106e
Binary files /dev/null and b/resources/azure/networking/virtual-network-gateways.png differ
diff --git a/resources/azure/network/virtual-network-classic.png b/resources/azure/networking/virtual-networks-classic.png
similarity index 97%
rename from resources/azure/network/virtual-network-classic.png
rename to resources/azure/networking/virtual-networks-classic.png
index 58703249..2505e0a9 100644
Binary files a/resources/azure/network/virtual-network-classic.png and b/resources/azure/networking/virtual-networks-classic.png differ
diff --git a/resources/azure/network/virtual-networks.png b/resources/azure/networking/virtual-networks.png
similarity index 91%
rename from resources/azure/network/virtual-networks.png
rename to resources/azure/networking/virtual-networks.png
index d2f947bb..56e96053 100644
Binary files a/resources/azure/network/virtual-networks.png and b/resources/azure/networking/virtual-networks.png differ
diff --git a/resources/azure/network/virtual-wans.png b/resources/azure/networking/virtual-wans.png
similarity index 97%
rename from resources/azure/network/virtual-wans.png
rename to resources/azure/networking/virtual-wans.png
index 58c17293..e5262a29 100644
Binary files a/resources/azure/network/virtual-wans.png and b/resources/azure/networking/virtual-wans.png differ
diff --git a/resources/azure/networking/web-application-firewall-policieswaf.png b/resources/azure/networking/web-application-firewall-policieswaf.png
new file mode 100644
index 00000000..e6b53e61
Binary files /dev/null and b/resources/azure/networking/web-application-firewall-policieswaf.png differ
diff --git a/resources/azure/other/backup-center.png b/resources/azure/other/backup-center.png
new file mode 100644
index 00000000..039a9e89
Binary files /dev/null and b/resources/azure/other/backup-center.png differ
diff --git a/resources/azure/other/detonation.png b/resources/azure/other/detonation.png
new file mode 100644
index 00000000..c40c793c
Binary files /dev/null and b/resources/azure/other/detonation.png differ
diff --git a/resources/azure/other/expressroute-direct.png b/resources/azure/other/expressroute-direct.png
new file mode 100644
index 00000000..b7e4c3de
Binary files /dev/null and b/resources/azure/other/expressroute-direct.png differ
diff --git a/resources/azure/other/instance-pools.png b/resources/azure/other/instance-pools.png
new file mode 100644
index 00000000..f0b6cdf9
Binary files /dev/null and b/resources/azure/other/instance-pools.png differ
diff --git a/resources/azure/other/internet-analyzer-profiles.png b/resources/azure/other/internet-analyzer-profiles.png
new file mode 100644
index 00000000..e1e59500
Binary files /dev/null and b/resources/azure/other/internet-analyzer-profiles.png differ
diff --git a/resources/azure/other/local-network-gateways.png b/resources/azure/other/local-network-gateways.png
new file mode 100644
index 00000000..8915e93b
Binary files /dev/null and b/resources/azure/other/local-network-gateways.png differ
diff --git a/resources/azure/other/peering-service.png b/resources/azure/other/peering-service.png
new file mode 100644
index 00000000..bb3f9bf6
Binary files /dev/null and b/resources/azure/other/peering-service.png differ
diff --git a/resources/azure/other/resource-mover.png b/resources/azure/other/resource-mover.png
new file mode 100644
index 00000000..c7dbc039
Binary files /dev/null and b/resources/azure/other/resource-mover.png differ
diff --git a/resources/azure/other/ssh-keys.png b/resources/azure/other/ssh-keys.png
new file mode 100644
index 00000000..5bb40148
Binary files /dev/null and b/resources/azure/other/ssh-keys.png differ
diff --git a/resources/azure/other/template-specs.png b/resources/azure/other/template-specs.png
new file mode 100644
index 00000000..1b1eaaf4
Binary files /dev/null and b/resources/azure/other/template-specs.png differ
diff --git a/resources/azure/other/universal-print.png b/resources/azure/other/universal-print.png
new file mode 100644
index 00000000..5d2dff1f
Binary files /dev/null and b/resources/azure/other/universal-print.png differ
diff --git a/resources/azure/other/windows-virtual-desktop.png b/resources/azure/other/windows-virtual-desktop.png
new file mode 100644
index 00000000..44bb8313
Binary files /dev/null and b/resources/azure/other/windows-virtual-desktop.png differ
diff --git a/resources/azure/preview/cloud-shell.png b/resources/azure/preview/cloud-shell.png
new file mode 100644
index 00000000..f68c5db7
Binary files /dev/null and b/resources/azure/preview/cloud-shell.png differ
diff --git a/resources/azure/preview/iot-edge.png b/resources/azure/preview/iot-edge.png
new file mode 100644
index 00000000..58bc8f2e
Binary files /dev/null and b/resources/azure/preview/iot-edge.png differ
diff --git a/resources/azure/preview/private-link-hub.png b/resources/azure/preview/private-link-hub.png
new file mode 100644
index 00000000..719ee3d1
Binary files /dev/null and b/resources/azure/preview/private-link-hub.png differ
diff --git a/resources/azure/preview/rtos.png b/resources/azure/preview/rtos.png
new file mode 100644
index 00000000..b799c1d2
Binary files /dev/null and b/resources/azure/preview/rtos.png differ
diff --git a/resources/azure/preview/sphere.png b/resources/azure/preview/sphere.png
new file mode 100644
index 00000000..630d21fd
Binary files /dev/null and b/resources/azure/preview/sphere.png differ
diff --git a/resources/azure/preview/static-apps.png b/resources/azure/preview/static-apps.png
new file mode 100644
index 00000000..125b12d0
Binary files /dev/null and b/resources/azure/preview/static-apps.png differ
diff --git a/resources/azure/preview/time-series-data-sets.png b/resources/azure/preview/time-series-data-sets.png
new file mode 100644
index 00000000..bb14bb35
Binary files /dev/null and b/resources/azure/preview/time-series-data-sets.png differ
diff --git a/resources/azure/preview/web-environment.png b/resources/azure/preview/web-environment.png
new file mode 100644
index 00000000..fa9b1c4b
Binary files /dev/null and b/resources/azure/preview/web-environment.png differ
diff --git a/resources/azure/preview/workbooks.png b/resources/azure/preview/workbooks.png
new file mode 100644
index 00000000..5a2eff92
Binary files /dev/null and b/resources/azure/preview/workbooks.png differ
diff --git a/resources/azure/security/application-security-groups.png b/resources/azure/security/application-security-groups.png
index 38066668..0150fa2b 100644
Binary files a/resources/azure/security/application-security-groups.png and b/resources/azure/security/application-security-groups.png differ
diff --git a/resources/azure/security/conditional-access.png b/resources/azure/security/conditional-access.png
index 37d5ab17..1c8823f8 100644
Binary files a/resources/azure/security/conditional-access.png and b/resources/azure/security/conditional-access.png differ
diff --git a/resources/azure/security/defender.png b/resources/azure/security/defender.png
index 35ee099b..38b7584f 100644
Binary files a/resources/azure/security/defender.png and b/resources/azure/security/defender.png differ
diff --git a/resources/azure/security/extended-security-updates.png b/resources/azure/security/extendedsecurityupdates.png
similarity index 98%
rename from resources/azure/security/extended-security-updates.png
rename to resources/azure/security/extendedsecurityupdates.png
index b77dfda6..6136aec2 100644
Binary files a/resources/azure/security/extended-security-updates.png and b/resources/azure/security/extendedsecurityupdates.png differ
diff --git a/resources/azure/security/key-vaults.png b/resources/azure/security/key-vaults.png
index bc57429f..8c6c90b1 100644
Binary files a/resources/azure/security/key-vaults.png and b/resources/azure/security/key-vaults.png differ
diff --git a/resources/azure/security/security-center.png b/resources/azure/security/security-center.png
index 2aef4991..2808c034 100644
Binary files a/resources/azure/security/security-center.png and b/resources/azure/security/security-center.png differ
diff --git a/resources/azure/security/sentinel.png b/resources/azure/security/sentinel.png
index 949a3a63..b8dae6b1 100644
Binary files a/resources/azure/security/sentinel.png and b/resources/azure/security/sentinel.png differ
diff --git a/resources/azure/storage/archive-storage.png b/resources/azure/storage/archive-storage.png
deleted file mode 100644
index f80a1066..00000000
Binary files a/resources/azure/storage/archive-storage.png and /dev/null differ
diff --git a/resources/azure/storage/azurefxtedgefiler.png b/resources/azure/storage/azurefxtedgefiler.png
deleted file mode 100644
index 052a8b1d..00000000
Binary files a/resources/azure/storage/azurefxtedgefiler.png and /dev/null differ
diff --git a/resources/azure/storage/blob-storage.png b/resources/azure/storage/blob-storage.png
deleted file mode 100644
index e849152a..00000000
Binary files a/resources/azure/storage/blob-storage.png and /dev/null differ
diff --git a/resources/azure/storage/data-box-edge-data-box-gateway.png b/resources/azure/storage/data-box-edge.png
similarity index 97%
rename from resources/azure/storage/data-box-edge-data-box-gateway.png
rename to resources/azure/storage/data-box-edge.png
index 76d55602..81740dc1 100644
Binary files a/resources/azure/storage/data-box-edge-data-box-gateway.png and b/resources/azure/storage/data-box-edge.png differ
diff --git a/resources/azure/storage/data-box.png b/resources/azure/storage/data-box.png
index b316d506..93f87af5 100644
Binary files a/resources/azure/storage/data-box.png and b/resources/azure/storage/data-box.png differ
diff --git a/resources/azure/storage/data-lake-storage-gen1.png b/resources/azure/storage/data-lake-storage-gen1.png
new file mode 100644
index 00000000..f4138971
Binary files /dev/null and b/resources/azure/storage/data-lake-storage-gen1.png differ
diff --git a/resources/azure/storage/data-lake-storage.png b/resources/azure/storage/data-lake-storage.png
deleted file mode 100644
index 8f22588a..00000000
Binary files a/resources/azure/storage/data-lake-storage.png and /dev/null differ
diff --git a/resources/azure/storage/data-share-invitations.png b/resources/azure/storage/data-share-invitations.png
new file mode 100644
index 00000000..38168982
Binary files /dev/null and b/resources/azure/storage/data-share-invitations.png differ
diff --git a/resources/azure/storage/data-shares.png b/resources/azure/storage/data-shares.png
new file mode 100644
index 00000000..c5277c77
Binary files /dev/null and b/resources/azure/storage/data-shares.png differ
diff --git a/resources/azure/storage/general-storage.png b/resources/azure/storage/general-storage.png
deleted file mode 100644
index 03955bd2..00000000
Binary files a/resources/azure/storage/general-storage.png and /dev/null differ
diff --git a/resources/azure/storage/hcp-cache.png b/resources/azure/storage/hcp-cache.png
new file mode 100644
index 00000000..3a1f0e0d
Binary files /dev/null and b/resources/azure/storage/hcp-cache.png differ
diff --git a/resources/azure/storage/import-export-jobs.png b/resources/azure/storage/import-export-jobs.png
new file mode 100644
index 00000000..632d8991
Binary files /dev/null and b/resources/azure/storage/import-export-jobs.png differ
diff --git a/resources/azure/storage/netapp-files.png b/resources/azure/storage/netapp-files.png
index cda140e6..118c5c87 100644
Binary files a/resources/azure/storage/netapp-files.png and b/resources/azure/storage/netapp-files.png differ
diff --git a/resources/azure/storage/queues-storage.png b/resources/azure/storage/queues-storage.png
deleted file mode 100644
index 565aba78..00000000
Binary files a/resources/azure/storage/queues-storage.png and /dev/null differ
diff --git a/resources/azure/storage/recovery-services-vaults.png b/resources/azure/storage/recovery-services-vaults.png
new file mode 100644
index 00000000..b17f0d50
Binary files /dev/null and b/resources/azure/storage/recovery-services-vaults.png differ
diff --git a/resources/azure/storage/stack-edge.png b/resources/azure/storage/stack-edge.png
new file mode 100644
index 00000000..fca74441
Binary files /dev/null and b/resources/azure/storage/stack-edge.png differ
diff --git a/resources/azure/storage/storage-accounts-classic.png b/resources/azure/storage/storage-accounts-classic.png
index 1379991d..15e9c8cb 100644
Binary files a/resources/azure/storage/storage-accounts-classic.png and b/resources/azure/storage/storage-accounts-classic.png differ
diff --git a/resources/azure/storage/storage-accounts.png b/resources/azure/storage/storage-accounts.png
index 61e3dd1c..82209937 100644
Binary files a/resources/azure/storage/storage-accounts.png and b/resources/azure/storage/storage-accounts.png differ
diff --git a/resources/azure/storage/storage-explorer.png b/resources/azure/storage/storage-explorer.png
deleted file mode 100644
index c623801f..00000000
Binary files a/resources/azure/storage/storage-explorer.png and /dev/null differ
diff --git a/resources/azure/storage/storage-sync-services.png b/resources/azure/storage/storage-sync-services.png
index 6d22924a..e0ce83f5 100644
Binary files a/resources/azure/storage/storage-sync-services.png and b/resources/azure/storage/storage-sync-services.png differ
diff --git a/resources/azure/storage/storsimple-data-managers.png b/resources/azure/storage/storsimple-data-managers.png
index e66b8006..c85e7a96 100644
Binary files a/resources/azure/storage/storsimple-data-managers.png and b/resources/azure/storage/storsimple-data-managers.png differ
diff --git a/resources/azure/storage/storsimple-device-managers.png b/resources/azure/storage/storsimple-device-managers.png
index 35d26d87..0f047959 100644
Binary files a/resources/azure/storage/storsimple-device-managers.png and b/resources/azure/storage/storsimple-device-managers.png differ
diff --git a/resources/azure/storage/table-storage.png b/resources/azure/storage/table-storage.png
deleted file mode 100644
index 7dd762fd..00000000
Binary files a/resources/azure/storage/table-storage.png and /dev/null differ
diff --git a/resources/azure/web/api-connections.png b/resources/azure/web/api-connections.png
deleted file mode 100644
index 3c0db2e6..00000000
Binary files a/resources/azure/web/api-connections.png and /dev/null differ
diff --git a/resources/azure/web/media-services.png b/resources/azure/web/media-service.png
similarity index 96%
rename from resources/azure/web/media-services.png
rename to resources/azure/web/media-service.png
index f787f0f6..f137f63f 100644
Binary files a/resources/azure/web/media-services.png and b/resources/azure/web/media-service.png differ
diff --git a/resources/azure/web/notification-hub-namespaces.png b/resources/azure/web/notification-hub-namespaces.png
index ad3129f4..ae838d98 100644
Binary files a/resources/azure/web/notification-hub-namespaces.png and b/resources/azure/web/notification-hub-namespaces.png differ
diff --git a/resources/azure/web/signalr.png b/resources/azure/web/signalr.png
deleted file mode 100644
index 8596a694..00000000
Binary files a/resources/azure/web/signalr.png and /dev/null differ
diff --git a/website/static/img/resources/azure/ai_machine_learning/bot-services.png b/website/static/img/resources/azure/ai_machine_learning/bot-services.png
new file mode 100644
index 00000000..2b97d147
Binary files /dev/null and b/website/static/img/resources/azure/ai_machine_learning/bot-services.png differ
diff --git a/website/static/img/resources/azure/ai_machine_learning/cognitive-services.png b/website/static/img/resources/azure/ai_machine_learning/cognitive-services.png
new file mode 100644
index 00000000..98a4b367
Binary files /dev/null and b/website/static/img/resources/azure/ai_machine_learning/cognitive-services.png differ
diff --git a/website/static/img/resources/azure/ai_machine_learning/machine-learning-studio-classic-web-services.png b/website/static/img/resources/azure/ai_machine_learning/machine-learning-studio-classic-web-services.png
new file mode 100644
index 00000000..ff9f7141
Binary files /dev/null and b/website/static/img/resources/azure/ai_machine_learning/machine-learning-studio-classic-web-services.png differ
diff --git a/website/static/img/resources/azure/ai_machine_learning/machine-learning-studio-web-service-plans.png b/website/static/img/resources/azure/ai_machine_learning/machine-learning-studio-web-service-plans.png
new file mode 100644
index 00000000..aeee6dd0
Binary files /dev/null and b/website/static/img/resources/azure/ai_machine_learning/machine-learning-studio-web-service-plans.png differ
diff --git a/website/static/img/resources/azure/ai_machine_learning/machine-learning-studio-workspaces.png b/website/static/img/resources/azure/ai_machine_learning/machine-learning-studio-workspaces.png
new file mode 100644
index 00000000..daf36c39
Binary files /dev/null and b/website/static/img/resources/azure/ai_machine_learning/machine-learning-studio-workspaces.png differ
diff --git a/website/static/img/resources/azure/ai_machine_learning/translator-text.png b/website/static/img/resources/azure/ai_machine_learning/translator-text.png
new file mode 100644
index 00000000..13de9c12
Binary files /dev/null and b/website/static/img/resources/azure/ai_machine_learning/translator-text.png differ
diff --git a/website/static/img/resources/azure/analytics/analysis-services.png b/website/static/img/resources/azure/analytics/analysis-services.png
index efa3daff..ed92c4f6 100644
Binary files a/website/static/img/resources/azure/analytics/analysis-services.png and b/website/static/img/resources/azure/analytics/analysis-services.png differ
diff --git a/website/static/img/resources/azure/analytics/data-lake-store-gen1.png b/website/static/img/resources/azure/analytics/data-lake-store-gen1.png
index 6e861246..f4138971 100644
Binary files a/website/static/img/resources/azure/analytics/data-lake-store-gen1.png and b/website/static/img/resources/azure/analytics/data-lake-store-gen1.png differ
diff --git a/website/static/img/resources/azure/analytics/databricks.png b/website/static/img/resources/azure/analytics/databricks.png
index 42cacf60..0f5338fc 100644
Binary files a/website/static/img/resources/azure/analytics/databricks.png and b/website/static/img/resources/azure/analytics/databricks.png differ
diff --git a/website/static/img/resources/azure/analytics/event-hub-clusters.png b/website/static/img/resources/azure/analytics/event-hub-clusters.png
index dde0c68d..034d14e4 100644
Binary files a/website/static/img/resources/azure/analytics/event-hub-clusters.png and b/website/static/img/resources/azure/analytics/event-hub-clusters.png differ
diff --git a/website/static/img/resources/azure/analytics/event-hubs.png b/website/static/img/resources/azure/analytics/event-hubs.png
index 2677ee0a..ce97ea8e 100644
Binary files a/website/static/img/resources/azure/analytics/event-hubs.png and b/website/static/img/resources/azure/analytics/event-hubs.png differ
diff --git a/website/static/img/resources/azure/analytics/hd-insight-clusters.png b/website/static/img/resources/azure/analytics/hd-insight-clusters.png
new file mode 100644
index 00000000..b757a6b0
Binary files /dev/null and b/website/static/img/resources/azure/analytics/hd-insight-clusters.png differ
diff --git a/website/static/img/resources/azure/analytics/log-analytics-workspaces.png b/website/static/img/resources/azure/analytics/log-analytics-workspaces.png
index d3f462ad..7f0bd907 100644
Binary files a/website/static/img/resources/azure/analytics/log-analytics-workspaces.png and b/website/static/img/resources/azure/analytics/log-analytics-workspaces.png differ
diff --git a/website/static/img/resources/azure/analytics/stream-analytics-jobs.png b/website/static/img/resources/azure/analytics/stream-analytics-jobs.png
index a9fceb32..6ff4b703 100644
Binary files a/website/static/img/resources/azure/analytics/stream-analytics-jobs.png and b/website/static/img/resources/azure/analytics/stream-analytics-jobs.png differ
diff --git a/website/static/img/resources/azure/analytics/synapse-analytics.png b/website/static/img/resources/azure/analytics/synapse-analytics.png
index 7966c325..ad84ce66 100644
Binary files a/website/static/img/resources/azure/analytics/synapse-analytics.png and b/website/static/img/resources/azure/analytics/synapse-analytics.png differ
diff --git a/website/static/img/resources/azure/app_services/api-management-services.png b/website/static/img/resources/azure/app_services/api-management-services.png
new file mode 100644
index 00000000..405db0b7
Binary files /dev/null and b/website/static/img/resources/azure/app_services/api-management-services.png differ
diff --git a/website/static/img/resources/azure/app_services/app-service-certificates.png b/website/static/img/resources/azure/app_services/app-service-certificates.png
new file mode 100644
index 00000000..37cc1e80
Binary files /dev/null and b/website/static/img/resources/azure/app_services/app-service-certificates.png differ
diff --git a/website/static/img/resources/azure/app_services/app-service-domains.png b/website/static/img/resources/azure/app_services/app-service-domains.png
new file mode 100644
index 00000000..42f67e60
Binary files /dev/null and b/website/static/img/resources/azure/app_services/app-service-domains.png differ
diff --git a/website/static/img/resources/azure/app_services/app-service-environments.png b/website/static/img/resources/azure/app_services/app-service-environments.png
new file mode 100644
index 00000000..60b2c76c
Binary files /dev/null and b/website/static/img/resources/azure/app_services/app-service-environments.png differ
diff --git a/website/static/img/resources/azure/app_services/app-service-plans.png b/website/static/img/resources/azure/app_services/app-service-plans.png
new file mode 100644
index 00000000..4f0de937
Binary files /dev/null and b/website/static/img/resources/azure/app_services/app-service-plans.png differ
diff --git a/website/static/img/resources/azure/app_services/app-services.png b/website/static/img/resources/azure/app_services/app-services.png
new file mode 100644
index 00000000..7cd9f4e7
Binary files /dev/null and b/website/static/img/resources/azure/app_services/app-services.png differ
diff --git a/website/static/img/resources/azure/app_services/cdn-profiles.png b/website/static/img/resources/azure/app_services/cdn-profiles.png
new file mode 100644
index 00000000..c5c01591
Binary files /dev/null and b/website/static/img/resources/azure/app_services/cdn-profiles.png differ
diff --git a/website/static/img/resources/azure/app_services/notification-hubs.png b/website/static/img/resources/azure/app_services/notification-hubs.png
new file mode 100644
index 00000000..ae838d98
Binary files /dev/null and b/website/static/img/resources/azure/app_services/notification-hubs.png differ
diff --git a/website/static/img/resources/azure/app_services/search-services.png b/website/static/img/resources/azure/app_services/search-services.png
new file mode 100644
index 00000000..a4702d8b
Binary files /dev/null and b/website/static/img/resources/azure/app_services/search-services.png differ
diff --git a/website/static/img/resources/azure/azure_stack/capacity.png b/website/static/img/resources/azure/azure_stack/capacity.png
new file mode 100644
index 00000000..876c17ce
Binary files /dev/null and b/website/static/img/resources/azure/azure_stack/capacity.png differ
diff --git a/website/static/img/resources/azure/azure_stack/infrastructure-backup.png b/website/static/img/resources/azure/azure_stack/infrastructure-backup.png
new file mode 100644
index 00000000..ddeeb61b
Binary files /dev/null and b/website/static/img/resources/azure/azure_stack/infrastructure-backup.png differ
diff --git a/website/static/img/resources/azure/azure_stack/multi-tenancy.png b/website/static/img/resources/azure/azure_stack/multi-tenancy.png
new file mode 100644
index 00000000..83c44dbe
Binary files /dev/null and b/website/static/img/resources/azure/azure_stack/multi-tenancy.png differ
diff --git a/website/static/img/resources/azure/azure_stack/offers.png b/website/static/img/resources/azure/azure_stack/offers.png
new file mode 100644
index 00000000..fd39fc05
Binary files /dev/null and b/website/static/img/resources/azure/azure_stack/offers.png differ
diff --git a/website/static/img/resources/azure/azure_stack/plans.png b/website/static/img/resources/azure/azure_stack/plans.png
new file mode 100644
index 00000000..de4e7472
Binary files /dev/null and b/website/static/img/resources/azure/azure_stack/plans.png differ
diff --git a/website/static/img/resources/azure/azure_stack/stack.png b/website/static/img/resources/azure/azure_stack/stack.png
new file mode 100644
index 00000000..e3bcb8d9
Binary files /dev/null and b/website/static/img/resources/azure/azure_stack/stack.png differ
diff --git a/website/static/img/resources/azure/azure_stack/updates.png b/website/static/img/resources/azure/azure_stack/updates.png
new file mode 100644
index 00000000..09d89e81
Binary files /dev/null and b/website/static/img/resources/azure/azure_stack/updates.png differ
diff --git a/website/static/img/resources/azure/azure_stack/user-subscriptions.png b/website/static/img/resources/azure/azure_stack/user-subscriptions.png
new file mode 100644
index 00000000..b5047ee4
Binary files /dev/null and b/website/static/img/resources/azure/azure_stack/user-subscriptions.png differ
diff --git a/website/static/img/resources/azure/azure_vmware_solution/avs.png b/website/static/img/resources/azure/azure_vmware_solution/avs.png
new file mode 100644
index 00000000..7d4051f9
Binary files /dev/null and b/website/static/img/resources/azure/azure_vmware_solution/avs.png differ
diff --git a/website/static/img/resources/azure/blockchain/abs-member.png b/website/static/img/resources/azure/blockchain/abs-member.png
new file mode 100644
index 00000000..07b934fd
Binary files /dev/null and b/website/static/img/resources/azure/blockchain/abs-member.png differ
diff --git a/website/static/img/resources/azure/blockchain/blockchain-service.png b/website/static/img/resources/azure/blockchain/blockchain-service.png
new file mode 100644
index 00000000..228534c5
Binary files /dev/null and b/website/static/img/resources/azure/blockchain/blockchain-service.png differ
diff --git a/website/static/img/resources/azure/blockchain/consortium.png b/website/static/img/resources/azure/blockchain/consortium.png
new file mode 100644
index 00000000..0c36434b
Binary files /dev/null and b/website/static/img/resources/azure/blockchain/consortium.png differ
diff --git a/website/static/img/resources/azure/blockchain/outbound-connection.png b/website/static/img/resources/azure/blockchain/outbound-connection.png
new file mode 100644
index 00000000..5601c2ab
Binary files /dev/null and b/website/static/img/resources/azure/blockchain/outbound-connection.png differ
diff --git a/website/static/img/resources/azure/blockchain/token-service.png b/website/static/img/resources/azure/blockchain/token-service.png
new file mode 100644
index 00000000..21a4d8db
Binary files /dev/null and b/website/static/img/resources/azure/blockchain/token-service.png differ
diff --git a/website/static/img/resources/azure/compute/app-services.png b/website/static/img/resources/azure/compute/app-services.png
index f7ca7fb0..7cd9f4e7 100644
Binary files a/website/static/img/resources/azure/compute/app-services.png and b/website/static/img/resources/azure/compute/app-services.png differ
diff --git a/website/static/img/resources/azure/compute/automanaged-vm.png b/website/static/img/resources/azure/compute/automanaged-vm.png
index ec8365b5..19e74dc2 100644
Binary files a/website/static/img/resources/azure/compute/automanaged-vm.png and b/website/static/img/resources/azure/compute/automanaged-vm.png differ
diff --git a/website/static/img/resources/azure/compute/availability-sets.png b/website/static/img/resources/azure/compute/availability-sets.png
index 988e9a6c..6dbd62e9 100644
Binary files a/website/static/img/resources/azure/compute/availability-sets.png and b/website/static/img/resources/azure/compute/availability-sets.png differ
diff --git a/website/static/img/resources/azure/compute/batch-accounts.png b/website/static/img/resources/azure/compute/batch-accounts.png
index 8f41434e..bb63e04e 100644
Binary files a/website/static/img/resources/azure/compute/batch-accounts.png and b/website/static/img/resources/azure/compute/batch-accounts.png differ
diff --git a/website/static/img/resources/azure/compute/cloud-services-classic.png b/website/static/img/resources/azure/compute/cloud-services-classic.png
index c3fa4d1b..836ff539 100644
Binary files a/website/static/img/resources/azure/compute/cloud-services-classic.png and b/website/static/img/resources/azure/compute/cloud-services-classic.png differ
diff --git a/website/static/img/resources/azure/compute/container-instances.png b/website/static/img/resources/azure/compute/container-instances.png
index 6be6aacc..05caed42 100644
Binary files a/website/static/img/resources/azure/compute/container-instances.png and b/website/static/img/resources/azure/compute/container-instances.png differ
diff --git a/website/static/img/resources/azure/compute/container-services-deprecated.png b/website/static/img/resources/azure/compute/container-services-deprecated.png
new file mode 100644
index 00000000..309775ac
Binary files /dev/null and b/website/static/img/resources/azure/compute/container-services-deprecated.png differ
diff --git a/website/static/img/resources/azure/compute/disk-encryption-sets.png b/website/static/img/resources/azure/compute/disk-encryption-sets.png
index 17b3126a..0437f8f7 100644
Binary files a/website/static/img/resources/azure/compute/disk-encryption-sets.png and b/website/static/img/resources/azure/compute/disk-encryption-sets.png differ
diff --git a/website/static/img/resources/azure/compute/disks-classic.png b/website/static/img/resources/azure/compute/disks-classic.png
new file mode 100644
index 00000000..3c304be2
Binary files /dev/null and b/website/static/img/resources/azure/compute/disks-classic.png differ
diff --git a/website/static/img/resources/azure/compute/disks-snapshots.png b/website/static/img/resources/azure/compute/disks-snapshots.png
new file mode 100644
index 00000000..4585c5ea
Binary files /dev/null and b/website/static/img/resources/azure/compute/disks-snapshots.png differ
diff --git a/website/static/img/resources/azure/compute/disks.png b/website/static/img/resources/azure/compute/disks.png
index effee0b1..3c304be2 100644
Binary files a/website/static/img/resources/azure/compute/disks.png and b/website/static/img/resources/azure/compute/disks.png differ
diff --git a/website/static/img/resources/azure/compute/function-apps.png b/website/static/img/resources/azure/compute/function-apps.png
index b6c7f67d..a011d1e1 100644
Binary files a/website/static/img/resources/azure/compute/function-apps.png and b/website/static/img/resources/azure/compute/function-apps.png differ
diff --git a/website/static/img/resources/azure/compute/image-definitions.png b/website/static/img/resources/azure/compute/image-definitions.png
index de6a2b3d..fdc1b1e6 100644
Binary files a/website/static/img/resources/azure/compute/image-definitions.png and b/website/static/img/resources/azure/compute/image-definitions.png differ
diff --git a/website/static/img/resources/azure/compute/image-versions.png b/website/static/img/resources/azure/compute/image-versions.png
index b62ab430..b88fa35d 100644
Binary files a/website/static/img/resources/azure/compute/image-versions.png and b/website/static/img/resources/azure/compute/image-versions.png differ
diff --git a/website/static/img/resources/azure/compute/images.png b/website/static/img/resources/azure/compute/images.png
new file mode 100644
index 00000000..943863b2
Binary files /dev/null and b/website/static/img/resources/azure/compute/images.png differ
diff --git a/website/static/img/resources/azure/compute/kubernetes-services.png b/website/static/img/resources/azure/compute/kubernetes-services.png
index 11c37ef8..309775ac 100644
Binary files a/website/static/img/resources/azure/compute/kubernetes-services.png and b/website/static/img/resources/azure/compute/kubernetes-services.png differ
diff --git a/website/static/img/resources/azure/compute/mesh-applications.png b/website/static/img/resources/azure/compute/mesh-applications.png
index 468f4e5c..39ec4124 100644
Binary files a/website/static/img/resources/azure/compute/mesh-applications.png and b/website/static/img/resources/azure/compute/mesh-applications.png differ
diff --git a/website/static/img/resources/azure/compute/os-images-classic.png b/website/static/img/resources/azure/compute/os-images-classic.png
new file mode 100644
index 00000000..2cbecf04
Binary files /dev/null and b/website/static/img/resources/azure/compute/os-images-classic.png differ
diff --git a/website/static/img/resources/azure/compute/service-fabric-clusters.png b/website/static/img/resources/azure/compute/service-fabric-clusters.png
index a03a2194..2724ddf7 100644
Binary files a/website/static/img/resources/azure/compute/service-fabric-clusters.png and b/website/static/img/resources/azure/compute/service-fabric-clusters.png differ
diff --git a/website/static/img/resources/azure/compute/shared-image-galleries.png b/website/static/img/resources/azure/compute/shared-image-galleries.png
index 364a0915..581e89e9 100644
Binary files a/website/static/img/resources/azure/compute/shared-image-galleries.png and b/website/static/img/resources/azure/compute/shared-image-galleries.png differ
diff --git a/website/static/img/resources/azure/compute/spring-cloud.png b/website/static/img/resources/azure/compute/spring-cloud.png
index 58fae815..4feec9a0 100644
Binary files a/website/static/img/resources/azure/compute/spring-cloud.png and b/website/static/img/resources/azure/compute/spring-cloud.png differ
diff --git a/website/static/img/resources/azure/compute/virtual-machine.png b/website/static/img/resources/azure/compute/virtual-machine.png
new file mode 100644
index 00000000..ad68b157
Binary files /dev/null and b/website/static/img/resources/azure/compute/virtual-machine.png differ
diff --git a/website/static/img/resources/azure/compute/virtual-machines-classic.png b/website/static/img/resources/azure/compute/virtual-machines-classic.png
new file mode 100644
index 00000000..fc20db98
Binary files /dev/null and b/website/static/img/resources/azure/compute/virtual-machines-classic.png differ
diff --git a/website/static/img/resources/azure/compute/vm-images-classic.png b/website/static/img/resources/azure/compute/vm-images-classic.png
new file mode 100644
index 00000000..2cbecf04
Binary files /dev/null and b/website/static/img/resources/azure/compute/vm-images-classic.png differ
diff --git a/website/static/img/resources/azure/compute/vm-scale-sets.png b/website/static/img/resources/azure/compute/vm-scale-sets.png
new file mode 100644
index 00000000..6b925e29
Binary files /dev/null and b/website/static/img/resources/azure/compute/vm-scale-sets.png differ
diff --git a/website/static/img/resources/azure/compute/workspaces.png b/website/static/img/resources/azure/compute/workspaces.png
index fa399bfb..ef1a00b2 100644
Binary files a/website/static/img/resources/azure/compute/workspaces.png and b/website/static/img/resources/azure/compute/workspaces.png differ
diff --git a/website/static/img/resources/azure/containers/app-services.png b/website/static/img/resources/azure/containers/app-services.png
new file mode 100644
index 00000000..7cd9f4e7
Binary files /dev/null and b/website/static/img/resources/azure/containers/app-services.png differ
diff --git a/website/static/img/resources/azure/containers/batch-accounts.png b/website/static/img/resources/azure/containers/batch-accounts.png
new file mode 100644
index 00000000..bb63e04e
Binary files /dev/null and b/website/static/img/resources/azure/containers/batch-accounts.png differ
diff --git a/website/static/img/resources/azure/containers/container-instances.png b/website/static/img/resources/azure/containers/container-instances.png
new file mode 100644
index 00000000..05caed42
Binary files /dev/null and b/website/static/img/resources/azure/containers/container-instances.png differ
diff --git a/website/static/img/resources/azure/containers/container-registries.png b/website/static/img/resources/azure/containers/container-registries.png
new file mode 100644
index 00000000..1995e0dd
Binary files /dev/null and b/website/static/img/resources/azure/containers/container-registries.png differ
diff --git a/website/static/img/resources/azure/containers/kubernetes-services.png b/website/static/img/resources/azure/containers/kubernetes-services.png
new file mode 100644
index 00000000..309775ac
Binary files /dev/null and b/website/static/img/resources/azure/containers/kubernetes-services.png differ
diff --git a/website/static/img/resources/azure/containers/service-fabric-clusters.png b/website/static/img/resources/azure/containers/service-fabric-clusters.png
new file mode 100644
index 00000000..2724ddf7
Binary files /dev/null and b/website/static/img/resources/azure/containers/service-fabric-clusters.png differ
diff --git a/website/static/img/resources/azure/databases/cache-redis.png b/website/static/img/resources/azure/databases/cache-redis.png
new file mode 100644
index 00000000..fbd4c92f
Binary files /dev/null and b/website/static/img/resources/azure/databases/cache-redis.png differ
diff --git a/website/static/img/resources/azure/databases/cosmos-db.png b/website/static/img/resources/azure/databases/cosmos-db.png
new file mode 100644
index 00000000..d91308e8
Binary files /dev/null and b/website/static/img/resources/azure/databases/cosmos-db.png differ
diff --git a/website/static/img/resources/azure/databases/data-explorer-clusters.png b/website/static/img/resources/azure/databases/data-explorer-clusters.png
new file mode 100644
index 00000000..cb47577c
Binary files /dev/null and b/website/static/img/resources/azure/databases/data-explorer-clusters.png differ
diff --git a/website/static/img/resources/azure/databases/data-factory.png b/website/static/img/resources/azure/databases/data-factory.png
new file mode 100644
index 00000000..86727b86
Binary files /dev/null and b/website/static/img/resources/azure/databases/data-factory.png differ
diff --git a/website/static/img/resources/azure/databases/database-mariadb-server.png b/website/static/img/resources/azure/databases/database-mariadb-server.png
new file mode 100644
index 00000000..7dea5762
Binary files /dev/null and b/website/static/img/resources/azure/databases/database-mariadb-server.png differ
diff --git a/website/static/img/resources/azure/databases/database-migration-services.png b/website/static/img/resources/azure/databases/database-migration-services.png
new file mode 100644
index 00000000..a9178354
Binary files /dev/null and b/website/static/img/resources/azure/databases/database-migration-services.png differ
diff --git a/website/static/img/resources/azure/databases/database-mysql-server.png b/website/static/img/resources/azure/databases/database-mysql-server.png
new file mode 100644
index 00000000..056fd31f
Binary files /dev/null and b/website/static/img/resources/azure/databases/database-mysql-server.png differ
diff --git a/website/static/img/resources/azure/databases/database-postgresql-server.png b/website/static/img/resources/azure/databases/database-postgresql-server.png
new file mode 100644
index 00000000..2c31d194
Binary files /dev/null and b/website/static/img/resources/azure/databases/database-postgresql-server.png differ
diff --git a/website/static/img/resources/azure/databases/elastic-job-agents.png b/website/static/img/resources/azure/databases/elastic-job-agents.png
new file mode 100644
index 00000000..9c711e68
Binary files /dev/null and b/website/static/img/resources/azure/databases/elastic-job-agents.png differ
diff --git a/website/static/img/resources/azure/databases/instance-pools.png b/website/static/img/resources/azure/databases/instance-pools.png
new file mode 100644
index 00000000..f0b6cdf9
Binary files /dev/null and b/website/static/img/resources/azure/databases/instance-pools.png differ
diff --git a/website/static/img/resources/azure/databases/managed-database.png b/website/static/img/resources/azure/databases/managed-database.png
new file mode 100644
index 00000000..56761f70
Binary files /dev/null and b/website/static/img/resources/azure/databases/managed-database.png differ
diff --git a/website/static/img/resources/azure/databases/sql-data-warehouses.png b/website/static/img/resources/azure/databases/sql-data-warehouses.png
new file mode 100644
index 00000000..a31cd2fe
Binary files /dev/null and b/website/static/img/resources/azure/databases/sql-data-warehouses.png differ
diff --git a/website/static/img/resources/azure/databases/sql-database.png b/website/static/img/resources/azure/databases/sql-database.png
new file mode 100644
index 00000000..ce1dcf4d
Binary files /dev/null and b/website/static/img/resources/azure/databases/sql-database.png differ
diff --git a/website/static/img/resources/azure/databases/sql-elastic-pools.png b/website/static/img/resources/azure/databases/sql-elastic-pools.png
new file mode 100644
index 00000000..2308c212
Binary files /dev/null and b/website/static/img/resources/azure/databases/sql-elastic-pools.png differ
diff --git a/website/static/img/resources/azure/databases/sql-managed-instance.png b/website/static/img/resources/azure/databases/sql-managed-instance.png
new file mode 100644
index 00000000..00092e85
Binary files /dev/null and b/website/static/img/resources/azure/databases/sql-managed-instance.png differ
diff --git a/website/static/img/resources/azure/databases/sql-server-stretch-databases.png b/website/static/img/resources/azure/databases/sql-server-stretch-databases.png
new file mode 100644
index 00000000..a31cd2fe
Binary files /dev/null and b/website/static/img/resources/azure/databases/sql-server-stretch-databases.png differ
diff --git a/website/static/img/resources/azure/databases/sql-server.png b/website/static/img/resources/azure/databases/sql-server.png
new file mode 100644
index 00000000..c3c469fc
Binary files /dev/null and b/website/static/img/resources/azure/databases/sql-server.png differ
diff --git a/website/static/img/resources/azure/databases/sql-vm.png b/website/static/img/resources/azure/databases/sql-vm.png
new file mode 100644
index 00000000..2b1eba0f
Binary files /dev/null and b/website/static/img/resources/azure/databases/sql-vm.png differ
diff --git a/website/static/img/resources/azure/databases/sql.png b/website/static/img/resources/azure/databases/sql.png
new file mode 100644
index 00000000..f82aace0
Binary files /dev/null and b/website/static/img/resources/azure/databases/sql.png differ
diff --git a/website/static/img/resources/azure/databases/ssis-lift-and-shift-ir.png b/website/static/img/resources/azure/databases/ssis-lift-and-shift-ir.png
new file mode 100644
index 00000000..9fef02d9
Binary files /dev/null and b/website/static/img/resources/azure/databases/ssis-lift-and-shift-ir.png differ
diff --git a/website/static/img/resources/azure/databases/synapse-analytics.png b/website/static/img/resources/azure/databases/synapse-analytics.png
new file mode 100644
index 00000000..ad84ce66
Binary files /dev/null and b/website/static/img/resources/azure/databases/synapse-analytics.png differ
diff --git a/website/static/img/resources/azure/databases/virtual-clusters.png b/website/static/img/resources/azure/databases/virtual-clusters.png
new file mode 100644
index 00000000..8fa5f6c7
Binary files /dev/null and b/website/static/img/resources/azure/databases/virtual-clusters.png differ
diff --git a/website/static/img/resources/azure/devops/application-insights.png b/website/static/img/resources/azure/devops/application-insights.png
index f80e0173..dbd50506 100644
Binary files a/website/static/img/resources/azure/devops/application-insights.png and b/website/static/img/resources/azure/devops/application-insights.png differ
diff --git a/website/static/img/resources/azure/devops/devops.png b/website/static/img/resources/azure/devops/devops.png
index 9d124a1f..80bfcd29 100644
Binary files a/website/static/img/resources/azure/devops/devops.png and b/website/static/img/resources/azure/devops/devops.png differ
diff --git a/website/static/img/resources/azure/devops/devtest-labs.png b/website/static/img/resources/azure/devops/devtest-labs.png
index 75b82c12..90300871 100644
Binary files a/website/static/img/resources/azure/devops/devtest-labs.png and b/website/static/img/resources/azure/devops/devtest-labs.png differ
diff --git a/website/static/img/resources/azure/devops/lab-services.png b/website/static/img/resources/azure/devops/lab-services.png
index abbe48da..10b74324 100644
Binary files a/website/static/img/resources/azure/devops/lab-services.png and b/website/static/img/resources/azure/devops/lab-services.png differ
diff --git a/website/static/img/resources/azure/general/all-resources.png b/website/static/img/resources/azure/general/all-resources.png
new file mode 100644
index 00000000..38a6a139
Binary files /dev/null and b/website/static/img/resources/azure/general/all-resources.png differ
diff --git a/website/static/img/resources/azure/general/backlog.png b/website/static/img/resources/azure/general/backlog.png
new file mode 100644
index 00000000..9a6148d2
Binary files /dev/null and b/website/static/img/resources/azure/general/backlog.png differ
diff --git a/website/static/img/resources/azure/general/biz-talk.png b/website/static/img/resources/azure/general/biz-talk.png
new file mode 100644
index 00000000..e6e67af8
Binary files /dev/null and b/website/static/img/resources/azure/general/biz-talk.png differ
diff --git a/website/static/img/resources/azure/general/blob-block.png b/website/static/img/resources/azure/general/blob-block.png
new file mode 100644
index 00000000..62dc693d
Binary files /dev/null and b/website/static/img/resources/azure/general/blob-block.png differ
diff --git a/website/static/img/resources/azure/general/blob-page.png b/website/static/img/resources/azure/general/blob-page.png
new file mode 100644
index 00000000..db50ab62
Binary files /dev/null and b/website/static/img/resources/azure/general/blob-page.png differ
diff --git a/website/static/img/resources/azure/general/branch.png b/website/static/img/resources/azure/general/branch.png
new file mode 100644
index 00000000..bea3ae63
Binary files /dev/null and b/website/static/img/resources/azure/general/branch.png differ
diff --git a/website/static/img/resources/azure/general/browser.png b/website/static/img/resources/azure/general/browser.png
new file mode 100644
index 00000000..79b81a32
Binary files /dev/null and b/website/static/img/resources/azure/general/browser.png differ
diff --git a/website/static/img/resources/azure/general/bug.png b/website/static/img/resources/azure/general/bug.png
new file mode 100644
index 00000000..5249c76a
Binary files /dev/null and b/website/static/img/resources/azure/general/bug.png differ
diff --git a/website/static/img/resources/azure/general/builds.png b/website/static/img/resources/azure/general/builds.png
new file mode 100644
index 00000000..579005a6
Binary files /dev/null and b/website/static/img/resources/azure/general/builds.png differ
diff --git a/website/static/img/resources/azure/general/cache.png b/website/static/img/resources/azure/general/cache.png
new file mode 100644
index 00000000..7dad36fb
Binary files /dev/null and b/website/static/img/resources/azure/general/cache.png differ
diff --git a/website/static/img/resources/azure/general/code.png b/website/static/img/resources/azure/general/code.png
new file mode 100644
index 00000000..fffc15ad
Binary files /dev/null and b/website/static/img/resources/azure/general/code.png differ
diff --git a/website/static/img/resources/azure/general/commit.png b/website/static/img/resources/azure/general/commit.png
new file mode 100644
index 00000000..5f7c4a7d
Binary files /dev/null and b/website/static/img/resources/azure/general/commit.png differ
diff --git a/website/static/img/resources/azure/general/controls-horizontal.png b/website/static/img/resources/azure/general/controls-horizontal.png
new file mode 100644
index 00000000..7f4a3e65
Binary files /dev/null and b/website/static/img/resources/azure/general/controls-horizontal.png differ
diff --git a/website/static/img/resources/azure/general/controls.png b/website/static/img/resources/azure/general/controls.png
new file mode 100644
index 00000000..5ee6e22f
Binary files /dev/null and b/website/static/img/resources/azure/general/controls.png differ
diff --git a/website/static/img/resources/azure/general/cost-alerts.png b/website/static/img/resources/azure/general/cost-alerts.png
new file mode 100644
index 00000000..90a2d73c
Binary files /dev/null and b/website/static/img/resources/azure/general/cost-alerts.png differ
diff --git a/website/static/img/resources/azure/general/cost-analysis.png b/website/static/img/resources/azure/general/cost-analysis.png
new file mode 100644
index 00000000..ba690262
Binary files /dev/null and b/website/static/img/resources/azure/general/cost-analysis.png differ
diff --git a/website/static/img/resources/azure/general/cost-budgets.png b/website/static/img/resources/azure/general/cost-budgets.png
new file mode 100644
index 00000000..c611e0a3
Binary files /dev/null and b/website/static/img/resources/azure/general/cost-budgets.png differ
diff --git a/website/static/img/resources/azure/general/cost-management-and-billing.png b/website/static/img/resources/azure/general/cost-management-and-billing.png
new file mode 100644
index 00000000..f368503b
Binary files /dev/null and b/website/static/img/resources/azure/general/cost-management-and-billing.png differ
diff --git a/website/static/img/resources/azure/general/cost-management.png b/website/static/img/resources/azure/general/cost-management.png
new file mode 100644
index 00000000..b9b76981
Binary files /dev/null and b/website/static/img/resources/azure/general/cost-management.png differ
diff --git a/website/static/img/resources/azure/general/counter.png b/website/static/img/resources/azure/general/counter.png
new file mode 100644
index 00000000..042cb67c
Binary files /dev/null and b/website/static/img/resources/azure/general/counter.png differ
diff --git a/website/static/img/resources/azure/general/cubes.png b/website/static/img/resources/azure/general/cubes.png
new file mode 100644
index 00000000..5cc596f3
Binary files /dev/null and b/website/static/img/resources/azure/general/cubes.png differ
diff --git a/website/static/img/resources/azure/general/dashboard.png b/website/static/img/resources/azure/general/dashboard.png
new file mode 100644
index 00000000..89a6a307
Binary files /dev/null and b/website/static/img/resources/azure/general/dashboard.png differ
diff --git a/website/static/img/resources/azure/general/dev-console.png b/website/static/img/resources/azure/general/dev-console.png
new file mode 100644
index 00000000..1f577e96
Binary files /dev/null and b/website/static/img/resources/azure/general/dev-console.png differ
diff --git a/website/static/img/resources/azure/general/download.png b/website/static/img/resources/azure/general/download.png
new file mode 100644
index 00000000..7d010f29
Binary files /dev/null and b/website/static/img/resources/azure/general/download.png differ
diff --git a/website/static/img/resources/azure/general/error.png b/website/static/img/resources/azure/general/error.png
new file mode 100644
index 00000000..598ceab4
Binary files /dev/null and b/website/static/img/resources/azure/general/error.png differ
diff --git a/website/static/img/resources/azure/general/extensions.png b/website/static/img/resources/azure/general/extensions.png
new file mode 100644
index 00000000..df89edc8
Binary files /dev/null and b/website/static/img/resources/azure/general/extensions.png differ
diff --git a/website/static/img/resources/azure/general/file.png b/website/static/img/resources/azure/general/file.png
new file mode 100644
index 00000000..493032b1
Binary files /dev/null and b/website/static/img/resources/azure/general/file.png differ
diff --git a/website/static/img/resources/azure/general/files.png b/website/static/img/resources/azure/general/files.png
new file mode 100644
index 00000000..4be3c3d6
Binary files /dev/null and b/website/static/img/resources/azure/general/files.png differ
diff --git a/website/static/img/resources/azure/general/folder-blank.png b/website/static/img/resources/azure/general/folder-blank.png
new file mode 100644
index 00000000..b97b16d8
Binary files /dev/null and b/website/static/img/resources/azure/general/folder-blank.png differ
diff --git a/website/static/img/resources/azure/general/folder-website.png b/website/static/img/resources/azure/general/folder-website.png
new file mode 100644
index 00000000..cb52e6fb
Binary files /dev/null and b/website/static/img/resources/azure/general/folder-website.png differ
diff --git a/website/static/img/resources/azure/general/free-services.png b/website/static/img/resources/azure/general/free-services.png
new file mode 100644
index 00000000..24047c19
Binary files /dev/null and b/website/static/img/resources/azure/general/free-services.png differ
diff --git a/website/static/img/resources/azure/general/ftp.png b/website/static/img/resources/azure/general/ftp.png
new file mode 100644
index 00000000..e0d68b93
Binary files /dev/null and b/website/static/img/resources/azure/general/ftp.png differ
diff --git a/website/static/img/resources/azure/general/gear.png b/website/static/img/resources/azure/general/gear.png
new file mode 100644
index 00000000..87e83942
Binary files /dev/null and b/website/static/img/resources/azure/general/gear.png differ
diff --git a/website/static/img/resources/azure/general/globe-error.png b/website/static/img/resources/azure/general/globe-error.png
new file mode 100644
index 00000000..84d7e285
Binary files /dev/null and b/website/static/img/resources/azure/general/globe-error.png differ
diff --git a/website/static/img/resources/azure/general/globe-success.png b/website/static/img/resources/azure/general/globe-success.png
new file mode 100644
index 00000000..76d96afb
Binary files /dev/null and b/website/static/img/resources/azure/general/globe-success.png differ
diff --git a/website/static/img/resources/azure/general/globe-warning.png b/website/static/img/resources/azure/general/globe-warning.png
new file mode 100644
index 00000000..a5c1bbde
Binary files /dev/null and b/website/static/img/resources/azure/general/globe-warning.png differ
diff --git a/website/static/img/resources/azure/general/globe.png b/website/static/img/resources/azure/general/globe.png
new file mode 100644
index 00000000..1437d797
Binary files /dev/null and b/website/static/img/resources/azure/general/globe.png differ
diff --git a/website/static/img/resources/azure/general/guide.png b/website/static/img/resources/azure/general/guide.png
new file mode 100644
index 00000000..14f7f013
Binary files /dev/null and b/website/static/img/resources/azure/general/guide.png differ
diff --git a/website/static/img/resources/azure/general/heart.png b/website/static/img/resources/azure/general/heart.png
new file mode 100644
index 00000000..6d27b3c8
Binary files /dev/null and b/website/static/img/resources/azure/general/heart.png differ
diff --git a/website/static/img/resources/azure/general/help-and-support.png b/website/static/img/resources/azure/general/help-and-support.png
new file mode 100644
index 00000000..674c6d56
Binary files /dev/null and b/website/static/img/resources/azure/general/help-and-support.png differ
diff --git a/website/static/img/resources/azure/general/image.png b/website/static/img/resources/azure/general/image.png
new file mode 100644
index 00000000..b915fc4d
Binary files /dev/null and b/website/static/img/resources/azure/general/image.png differ
diff --git a/website/static/img/resources/azure/general/information.png b/website/static/img/resources/azure/general/information.png
index 34af9729..5017a7a1 100644
Binary files a/website/static/img/resources/azure/general/information.png and b/website/static/img/resources/azure/general/information.png differ
diff --git a/website/static/img/resources/azure/general/input-output.png b/website/static/img/resources/azure/general/input-output.png
new file mode 100644
index 00000000..51bf0974
Binary files /dev/null and b/website/static/img/resources/azure/general/input-output.png differ
diff --git a/website/static/img/resources/azure/general/journey-hub.png b/website/static/img/resources/azure/general/journey-hub.png
new file mode 100644
index 00000000..0942aa2d
Binary files /dev/null and b/website/static/img/resources/azure/general/journey-hub.png differ
diff --git a/website/static/img/resources/azure/general/launch-portal.png b/website/static/img/resources/azure/general/launch-portal.png
new file mode 100644
index 00000000..b192e668
Binary files /dev/null and b/website/static/img/resources/azure/general/launch-portal.png differ
diff --git a/website/static/img/resources/azure/general/learn.png b/website/static/img/resources/azure/general/learn.png
new file mode 100644
index 00000000..62a7efa5
Binary files /dev/null and b/website/static/img/resources/azure/general/learn.png differ
diff --git a/website/static/img/resources/azure/general/load-test.png b/website/static/img/resources/azure/general/load-test.png
new file mode 100644
index 00000000..743ccf12
Binary files /dev/null and b/website/static/img/resources/azure/general/load-test.png differ
diff --git a/website/static/img/resources/azure/general/location.png b/website/static/img/resources/azure/general/location.png
new file mode 100644
index 00000000..5fa75444
Binary files /dev/null and b/website/static/img/resources/azure/general/location.png differ
diff --git a/website/static/img/resources/azure/general/log-streaming.png b/website/static/img/resources/azure/general/log-streaming.png
new file mode 100644
index 00000000..3739e690
Binary files /dev/null and b/website/static/img/resources/azure/general/log-streaming.png differ
diff --git a/website/static/img/resources/azure/general/management-groups.png b/website/static/img/resources/azure/general/management-groups.png
new file mode 100644
index 00000000..77fcffb3
Binary files /dev/null and b/website/static/img/resources/azure/general/management-groups.png differ
diff --git a/website/static/img/resources/azure/general/management-portal.png b/website/static/img/resources/azure/general/management-portal.png
new file mode 100644
index 00000000..b388c4ab
Binary files /dev/null and b/website/static/img/resources/azure/general/management-portal.png differ
diff --git a/website/static/img/resources/azure/general/marketplace.png b/website/static/img/resources/azure/general/marketplace.png
index 311506f4..4745ef0c 100644
Binary files a/website/static/img/resources/azure/general/marketplace.png and b/website/static/img/resources/azure/general/marketplace.png differ
diff --git a/website/static/img/resources/azure/general/media-file.png b/website/static/img/resources/azure/general/media-file.png
new file mode 100644
index 00000000..06480b18
Binary files /dev/null and b/website/static/img/resources/azure/general/media-file.png differ
diff --git a/website/static/img/resources/azure/general/media.png b/website/static/img/resources/azure/general/media.png
new file mode 100644
index 00000000..db98432f
Binary files /dev/null and b/website/static/img/resources/azure/general/media.png differ
diff --git a/website/static/img/resources/azure/general/mobile-engagement.png b/website/static/img/resources/azure/general/mobile-engagement.png
new file mode 100644
index 00000000..49793ee1
Binary files /dev/null and b/website/static/img/resources/azure/general/mobile-engagement.png differ
diff --git a/website/static/img/resources/azure/general/mobile.png b/website/static/img/resources/azure/general/mobile.png
new file mode 100644
index 00000000..65e97bb8
Binary files /dev/null and b/website/static/img/resources/azure/general/mobile.png differ
diff --git a/website/static/img/resources/azure/general/module.png b/website/static/img/resources/azure/general/module.png
new file mode 100644
index 00000000..124bbc43
Binary files /dev/null and b/website/static/img/resources/azure/general/module.png differ
diff --git a/website/static/img/resources/azure/general/power-up.png b/website/static/img/resources/azure/general/power-up.png
new file mode 100644
index 00000000..5c1300e4
Binary files /dev/null and b/website/static/img/resources/azure/general/power-up.png differ
diff --git a/website/static/img/resources/azure/general/power.png b/website/static/img/resources/azure/general/power.png
new file mode 100644
index 00000000..60a4c5bd
Binary files /dev/null and b/website/static/img/resources/azure/general/power.png differ
diff --git a/website/static/img/resources/azure/general/powershell.png b/website/static/img/resources/azure/general/powershell.png
new file mode 100644
index 00000000..6849b350
Binary files /dev/null and b/website/static/img/resources/azure/general/powershell.png differ
diff --git a/website/static/img/resources/azure/general/preview.png b/website/static/img/resources/azure/general/preview.png
new file mode 100644
index 00000000..1b0fc5b3
Binary files /dev/null and b/website/static/img/resources/azure/general/preview.png differ
diff --git a/website/static/img/resources/azure/general/process-explorer.png b/website/static/img/resources/azure/general/process-explorer.png
new file mode 100644
index 00000000..1f8521c3
Binary files /dev/null and b/website/static/img/resources/azure/general/process-explorer.png differ
diff --git a/website/static/img/resources/azure/general/production-ready-database.png b/website/static/img/resources/azure/general/production-ready-database.png
new file mode 100644
index 00000000..4a4ec10f
Binary files /dev/null and b/website/static/img/resources/azure/general/production-ready-database.png differ
diff --git a/website/static/img/resources/azure/general/quickstart-center.png b/website/static/img/resources/azure/general/quickstart-center.png
new file mode 100644
index 00000000..7bab2fd7
Binary files /dev/null and b/website/static/img/resources/azure/general/quickstart-center.png differ
diff --git a/website/static/img/resources/azure/general/recent.png b/website/static/img/resources/azure/general/recent.png
index 7d7fb4a4..2edda2ce 100644
Binary files a/website/static/img/resources/azure/general/recent.png and b/website/static/img/resources/azure/general/recent.png differ
diff --git a/website/static/img/resources/azure/general/reservations.png b/website/static/img/resources/azure/general/reservations.png
index ec2ebad6..300d97fc 100644
Binary files a/website/static/img/resources/azure/general/reservations.png and b/website/static/img/resources/azure/general/reservations.png differ
diff --git a/website/static/img/resources/azure/general/resource-explorer.png b/website/static/img/resources/azure/general/resource-explorer.png
new file mode 100644
index 00000000..e12e47e4
Binary files /dev/null and b/website/static/img/resources/azure/general/resource-explorer.png differ
diff --git a/website/static/img/resources/azure/general/resource-group-list.png b/website/static/img/resources/azure/general/resource-group-list.png
new file mode 100644
index 00000000..cb245919
Binary files /dev/null and b/website/static/img/resources/azure/general/resource-group-list.png differ
diff --git a/website/static/img/resources/azure/general/resource-groups.png b/website/static/img/resources/azure/general/resource-groups.png
new file mode 100644
index 00000000..02025d1f
Binary files /dev/null and b/website/static/img/resources/azure/general/resource-groups.png differ
diff --git a/website/static/img/resources/azure/general/resource-linked.png b/website/static/img/resources/azure/general/resource-linked.png
new file mode 100644
index 00000000..32290cfc
Binary files /dev/null and b/website/static/img/resources/azure/general/resource-linked.png differ
diff --git a/website/static/img/resources/azure/general/scale.png b/website/static/img/resources/azure/general/scale.png
new file mode 100644
index 00000000..88f60320
Binary files /dev/null and b/website/static/img/resources/azure/general/scale.png differ
diff --git a/website/static/img/resources/azure/general/scheduler.png b/website/static/img/resources/azure/general/scheduler.png
new file mode 100644
index 00000000..cb19506b
Binary files /dev/null and b/website/static/img/resources/azure/general/scheduler.png differ
diff --git a/website/static/img/resources/azure/general/search-grid.png b/website/static/img/resources/azure/general/search-grid.png
new file mode 100644
index 00000000..cb245919
Binary files /dev/null and b/website/static/img/resources/azure/general/search-grid.png differ
diff --git a/website/static/img/resources/azure/general/search.png b/website/static/img/resources/azure/general/search.png
new file mode 100644
index 00000000..8eb8ffaa
Binary files /dev/null and b/website/static/img/resources/azure/general/search.png differ
diff --git a/website/static/img/resources/azure/general/server-farm.png b/website/static/img/resources/azure/general/server-farm.png
new file mode 100644
index 00000000..f79c3c90
Binary files /dev/null and b/website/static/img/resources/azure/general/server-farm.png differ
diff --git a/website/static/img/resources/azure/general/service-bus.png b/website/static/img/resources/azure/general/service-bus.png
new file mode 100644
index 00000000..66b8026a
Binary files /dev/null and b/website/static/img/resources/azure/general/service-bus.png differ
diff --git a/website/static/img/resources/azure/general/service-health.png b/website/static/img/resources/azure/general/service-health.png
new file mode 100644
index 00000000..f3b53286
Binary files /dev/null and b/website/static/img/resources/azure/general/service-health.png differ
diff --git a/website/static/img/resources/azure/general/ssd.png b/website/static/img/resources/azure/general/ssd.png
new file mode 100644
index 00000000..dd800fa8
Binary files /dev/null and b/website/static/img/resources/azure/general/ssd.png differ
diff --git a/website/static/img/resources/azure/general/storage-azure-files.png b/website/static/img/resources/azure/general/storage-azure-files.png
new file mode 100644
index 00000000..9c15f7fa
Binary files /dev/null and b/website/static/img/resources/azure/general/storage-azure-files.png differ
diff --git a/website/static/img/resources/azure/general/storage-container.png b/website/static/img/resources/azure/general/storage-container.png
new file mode 100644
index 00000000..a0f5a5ac
Binary files /dev/null and b/website/static/img/resources/azure/general/storage-container.png differ
diff --git a/website/static/img/resources/azure/general/storage-queue.png b/website/static/img/resources/azure/general/storage-queue.png
new file mode 100644
index 00000000..0c4cb4f5
Binary files /dev/null and b/website/static/img/resources/azure/general/storage-queue.png differ
diff --git a/website/static/img/resources/azure/general/subscriptions.png b/website/static/img/resources/azure/general/subscriptions.png
index 9a510f98..18463dd8 100644
Binary files a/website/static/img/resources/azure/general/subscriptions.png and b/website/static/img/resources/azure/general/subscriptions.png differ
diff --git a/website/static/img/resources/azure/general/table.png b/website/static/img/resources/azure/general/table.png
new file mode 100644
index 00000000..48f62b6d
Binary files /dev/null and b/website/static/img/resources/azure/general/table.png differ
diff --git a/website/static/img/resources/azure/general/tag.png b/website/static/img/resources/azure/general/tag.png
index 5d0ee16e..7a6c7fcc 100644
Binary files a/website/static/img/resources/azure/general/tag.png and b/website/static/img/resources/azure/general/tag.png differ
diff --git a/website/static/img/resources/azure/general/tags.png b/website/static/img/resources/azure/general/tags.png
index 58f2b4d5..42e4f29a 100644
Binary files a/website/static/img/resources/azure/general/tags.png and b/website/static/img/resources/azure/general/tags.png differ
diff --git a/website/static/img/resources/azure/general/tfs-vc-repository.png b/website/static/img/resources/azure/general/tfs-vc-repository.png
new file mode 100644
index 00000000..1d9d916b
Binary files /dev/null and b/website/static/img/resources/azure/general/tfs-vc-repository.png differ
diff --git a/website/static/img/resources/azure/general/toolbox.png b/website/static/img/resources/azure/general/toolbox.png
new file mode 100644
index 00000000..327deb18
Binary files /dev/null and b/website/static/img/resources/azure/general/toolbox.png differ
diff --git a/website/static/img/resources/azure/general/versions.png b/website/static/img/resources/azure/general/versions.png
new file mode 100644
index 00000000..2c9ebf02
Binary files /dev/null and b/website/static/img/resources/azure/general/versions.png differ
diff --git a/website/static/img/resources/azure/general/web-slots.png b/website/static/img/resources/azure/general/web-slots.png
new file mode 100644
index 00000000..ea603628
Binary files /dev/null and b/website/static/img/resources/azure/general/web-slots.png differ
diff --git a/website/static/img/resources/azure/general/web-test.png b/website/static/img/resources/azure/general/web-test.png
new file mode 100644
index 00000000..1b445625
Binary files /dev/null and b/website/static/img/resources/azure/general/web-test.png differ
diff --git a/website/static/img/resources/azure/general/website-power.png b/website/static/img/resources/azure/general/website-power.png
new file mode 100644
index 00000000..037c2e07
Binary files /dev/null and b/website/static/img/resources/azure/general/website-power.png differ
diff --git a/website/static/img/resources/azure/general/website-staging.png b/website/static/img/resources/azure/general/website-staging.png
new file mode 100644
index 00000000..f0645540
Binary files /dev/null and b/website/static/img/resources/azure/general/website-staging.png differ
diff --git a/website/static/img/resources/azure/general/workbooks.png b/website/static/img/resources/azure/general/workbooks.png
new file mode 100644
index 00000000..0da23474
Binary files /dev/null and b/website/static/img/resources/azure/general/workbooks.png differ
diff --git a/website/static/img/resources/azure/general/workflow.png b/website/static/img/resources/azure/general/workflow.png
new file mode 100644
index 00000000..e77a34b5
Binary files /dev/null and b/website/static/img/resources/azure/general/workflow.png differ
diff --git a/website/static/img/resources/azure/identity/active-directory-connect-health.png b/website/static/img/resources/azure/identity/active-directory-connect-health.png
index 5dea39e6..6566260a 100644
Binary files a/website/static/img/resources/azure/identity/active-directory-connect-health.png and b/website/static/img/resources/azure/identity/active-directory-connect-health.png differ
diff --git a/website/static/img/resources/azure/identity/active-directory.png b/website/static/img/resources/azure/identity/active-directory.png
index b12a71bb..05fcdf3a 100644
Binary files a/website/static/img/resources/azure/identity/active-directory.png and b/website/static/img/resources/azure/identity/active-directory.png differ
diff --git a/website/static/img/resources/azure/identity/ad-b2c.png b/website/static/img/resources/azure/identity/ad-b2c.png
index dab723f4..12d4dd92 100644
Binary files a/website/static/img/resources/azure/identity/ad-b2c.png and b/website/static/img/resources/azure/identity/ad-b2c.png differ
diff --git a/website/static/img/resources/azure/identity/ad-domain-services.png b/website/static/img/resources/azure/identity/ad-domain-services.png
index c4056d91..4d3bd2b0 100644
Binary files a/website/static/img/resources/azure/identity/ad-domain-services.png and b/website/static/img/resources/azure/identity/ad-domain-services.png differ
diff --git a/website/static/img/resources/azure/identity/ad-identity-protection.png b/website/static/img/resources/azure/identity/ad-identity-protection.png
index 503df013..49bc6366 100644
Binary files a/website/static/img/resources/azure/identity/ad-identity-protection.png and b/website/static/img/resources/azure/identity/ad-identity-protection.png differ
diff --git a/website/static/img/resources/azure/identity/app-registrations.png b/website/static/img/resources/azure/identity/app-registrations.png
index 755dc76e..4ff312ea 100644
Binary files a/website/static/img/resources/azure/identity/app-registrations.png and b/website/static/img/resources/azure/identity/app-registrations.png differ
diff --git a/website/static/img/resources/azure/identity/enterprise-applications.png b/website/static/img/resources/azure/identity/enterprise-applications.png
index f14e0c98..f8e61b81 100644
Binary files a/website/static/img/resources/azure/identity/enterprise-applications.png and b/website/static/img/resources/azure/identity/enterprise-applications.png differ
diff --git a/website/static/img/resources/azure/identity/groups.png b/website/static/img/resources/azure/identity/groups.png
index b859b014..fac6955c 100644
Binary files a/website/static/img/resources/azure/identity/groups.png and b/website/static/img/resources/azure/identity/groups.png differ
diff --git a/website/static/img/resources/azure/identity/identity-governance.png b/website/static/img/resources/azure/identity/identity-governance.png
index fe46559a..e70e5a3c 100644
Binary files a/website/static/img/resources/azure/identity/identity-governance.png and b/website/static/img/resources/azure/identity/identity-governance.png differ
diff --git a/website/static/img/resources/azure/identity/managed-identities.png b/website/static/img/resources/azure/identity/managed-identities.png
index d191007d..b1664dee 100644
Binary files a/website/static/img/resources/azure/identity/managed-identities.png and b/website/static/img/resources/azure/identity/managed-identities.png differ
diff --git a/website/static/img/resources/azure/identity/users.png b/website/static/img/resources/azure/identity/users.png
index 0da5d6d0..eb96ce34 100644
Binary files a/website/static/img/resources/azure/identity/users.png and b/website/static/img/resources/azure/identity/users.png differ
diff --git a/website/static/img/resources/azure/integration/api-for-fhir.png b/website/static/img/resources/azure/integration/api-for-fhir.png
index 801d438b..031fb600 100644
Binary files a/website/static/img/resources/azure/integration/api-for-fhir.png and b/website/static/img/resources/azure/integration/api-for-fhir.png differ
diff --git a/website/static/img/resources/azure/integration/api-management-services.png b/website/static/img/resources/azure/integration/api-management-services.png
new file mode 100644
index 00000000..405db0b7
Binary files /dev/null and b/website/static/img/resources/azure/integration/api-management-services.png differ
diff --git a/website/static/img/resources/azure/integration/data-catalog.png b/website/static/img/resources/azure/integration/data-catalog.png
index 6f571571..35a039ab 100644
Binary files a/website/static/img/resources/azure/integration/data-catalog.png and b/website/static/img/resources/azure/integration/data-catalog.png differ
diff --git a/website/static/img/resources/azure/integration/event-grid-domains.png b/website/static/img/resources/azure/integration/event-grid-domains.png
index 53e285a4..3a7e11dc 100644
Binary files a/website/static/img/resources/azure/integration/event-grid-domains.png and b/website/static/img/resources/azure/integration/event-grid-domains.png differ
diff --git a/website/static/img/resources/azure/integration/event-grid-subscriptions.png b/website/static/img/resources/azure/integration/event-grid-subscriptions.png
index 53e285a4..3a7e11dc 100644
Binary files a/website/static/img/resources/azure/integration/event-grid-subscriptions.png and b/website/static/img/resources/azure/integration/event-grid-subscriptions.png differ
diff --git a/website/static/img/resources/azure/integration/event-grid-topics.png b/website/static/img/resources/azure/integration/event-grid-topics.png
index 04213c30..e6d24b52 100644
Binary files a/website/static/img/resources/azure/integration/event-grid-topics.png and b/website/static/img/resources/azure/integration/event-grid-topics.png differ
diff --git a/website/static/img/resources/azure/integration/integration-accounts.png b/website/static/img/resources/azure/integration/integration-accounts.png
index a729534f..00f027bb 100644
Binary files a/website/static/img/resources/azure/integration/integration-accounts.png and b/website/static/img/resources/azure/integration/integration-accounts.png differ
diff --git a/website/static/img/resources/azure/integration/logic-apps.png b/website/static/img/resources/azure/integration/logic-apps.png
index b07f52c5..b6be946f 100644
Binary files a/website/static/img/resources/azure/integration/logic-apps.png and b/website/static/img/resources/azure/integration/logic-apps.png differ
diff --git a/website/static/img/resources/azure/integration/partner-topic.png b/website/static/img/resources/azure/integration/partner-topic.png
index 0631a558..05c02c70 100644
Binary files a/website/static/img/resources/azure/integration/partner-topic.png and b/website/static/img/resources/azure/integration/partner-topic.png differ
diff --git a/website/static/img/resources/azure/integration/relays.png b/website/static/img/resources/azure/integration/relays.png
new file mode 100644
index 00000000..0d422fd2
Binary files /dev/null and b/website/static/img/resources/azure/integration/relays.png differ
diff --git a/website/static/img/resources/azure/integration/software-as-a-service.png b/website/static/img/resources/azure/integration/software-as-a-service.png
index de893bc8..909dd973 100644
Binary files a/website/static/img/resources/azure/integration/software-as-a-service.png and b/website/static/img/resources/azure/integration/software-as-a-service.png differ
diff --git a/website/static/img/resources/azure/integration/sql-data-warehouses.png b/website/static/img/resources/azure/integration/sql-data-warehouses.png
new file mode 100644
index 00000000..a31cd2fe
Binary files /dev/null and b/website/static/img/resources/azure/integration/sql-data-warehouses.png differ
diff --git a/website/static/img/resources/azure/integration/system-topic.png b/website/static/img/resources/azure/integration/system-topic.png
index 83e941b3..2fbbcdce 100644
Binary files a/website/static/img/resources/azure/integration/system-topic.png and b/website/static/img/resources/azure/integration/system-topic.png differ
diff --git a/website/static/img/resources/azure/internet_of_things/digital-twins.png b/website/static/img/resources/azure/internet_of_things/digital-twins.png
new file mode 100644
index 00000000..2ac88b72
Binary files /dev/null and b/website/static/img/resources/azure/internet_of_things/digital-twins.png differ
diff --git a/website/static/img/resources/azure/internet_of_things/time-series-insights-access-policies.png b/website/static/img/resources/azure/internet_of_things/time-series-insights-access-policies.png
new file mode 100644
index 00000000..288c9f9b
Binary files /dev/null and b/website/static/img/resources/azure/internet_of_things/time-series-insights-access-policies.png differ
diff --git a/website/static/img/resources/azure/intune/ad-roles-and-administrators.png b/website/static/img/resources/azure/intune/ad-roles-and-administrators.png
new file mode 100644
index 00000000..b9cf98c1
Binary files /dev/null and b/website/static/img/resources/azure/intune/ad-roles-and-administrators.png differ
diff --git a/website/static/img/resources/azure/intune/device-security-apple.png b/website/static/img/resources/azure/intune/device-security-apple.png
new file mode 100644
index 00000000..232ef9ab
Binary files /dev/null and b/website/static/img/resources/azure/intune/device-security-apple.png differ
diff --git a/website/static/img/resources/azure/intune/device-security-google.png b/website/static/img/resources/azure/intune/device-security-google.png
new file mode 100644
index 00000000..1a4b1901
Binary files /dev/null and b/website/static/img/resources/azure/intune/device-security-google.png differ
diff --git a/website/static/img/resources/azure/intune/device-security-windows.png b/website/static/img/resources/azure/intune/device-security-windows.png
new file mode 100644
index 00000000..ccb9c985
Binary files /dev/null and b/website/static/img/resources/azure/intune/device-security-windows.png differ
diff --git a/website/static/img/resources/azure/intune/intune-for-education.png b/website/static/img/resources/azure/intune/intune-for-education.png
new file mode 100644
index 00000000..1219a3d2
Binary files /dev/null and b/website/static/img/resources/azure/intune/intune-for-education.png differ
diff --git a/website/static/img/resources/azure/intune/intune.png b/website/static/img/resources/azure/intune/intune.png
new file mode 100644
index 00000000..1219a3d2
Binary files /dev/null and b/website/static/img/resources/azure/intune/intune.png differ
diff --git a/website/static/img/resources/azure/iot/device-provisioning-services.png b/website/static/img/resources/azure/iot/device-provisioning-services.png
index f0fba925..0c57b53d 100644
Binary files a/website/static/img/resources/azure/iot/device-provisioning-services.png and b/website/static/img/resources/azure/iot/device-provisioning-services.png differ
diff --git a/website/static/img/resources/azure/iot/event-hubs.png b/website/static/img/resources/azure/iot/event-hubs.png
new file mode 100644
index 00000000..ce97ea8e
Binary files /dev/null and b/website/static/img/resources/azure/iot/event-hubs.png differ
diff --git a/website/static/img/resources/azure/iot/function-apps.png b/website/static/img/resources/azure/iot/function-apps.png
new file mode 100644
index 00000000..a011d1e1
Binary files /dev/null and b/website/static/img/resources/azure/iot/function-apps.png differ
diff --git a/website/static/img/resources/azure/iot/iot-central-applications.png b/website/static/img/resources/azure/iot/iot-central-applications.png
index 0400504c..0084d5da 100644
Binary files a/website/static/img/resources/azure/iot/iot-central-applications.png and b/website/static/img/resources/azure/iot/iot-central-applications.png differ
diff --git a/website/static/img/resources/azure/iot/iot-hub.png b/website/static/img/resources/azure/iot/iot-hub.png
index 664bc23f..61faf434 100644
Binary files a/website/static/img/resources/azure/iot/iot-hub.png and b/website/static/img/resources/azure/iot/iot-hub.png differ
diff --git a/website/static/img/resources/azure/iot/logic-apps.png b/website/static/img/resources/azure/iot/logic-apps.png
new file mode 100644
index 00000000..b6be946f
Binary files /dev/null and b/website/static/img/resources/azure/iot/logic-apps.png differ
diff --git a/website/static/img/resources/azure/iot/maps-accounts.png b/website/static/img/resources/azure/iot/maps-accounts.png
new file mode 100644
index 00000000..722b475e
Binary files /dev/null and b/website/static/img/resources/azure/iot/maps-accounts.png differ
diff --git a/website/static/img/resources/azure/iot/notification-hubs.png b/website/static/img/resources/azure/iot/notification-hubs.png
new file mode 100644
index 00000000..ae838d98
Binary files /dev/null and b/website/static/img/resources/azure/iot/notification-hubs.png differ
diff --git a/website/static/img/resources/azure/iot/stream-analytics-jobs.png b/website/static/img/resources/azure/iot/stream-analytics-jobs.png
new file mode 100644
index 00000000..6ff4b703
Binary files /dev/null and b/website/static/img/resources/azure/iot/stream-analytics-jobs.png differ
diff --git a/website/static/img/resources/azure/iot/time-series-insights-environments.png b/website/static/img/resources/azure/iot/time-series-insights-environments.png
index 8ddbc0ca..29ef2233 100644
Binary files a/website/static/img/resources/azure/iot/time-series-insights-environments.png and b/website/static/img/resources/azure/iot/time-series-insights-environments.png differ
diff --git a/website/static/img/resources/azure/iot/time-series-insights-event-sources.png b/website/static/img/resources/azure/iot/time-series-insights-event-sources.png
new file mode 100644
index 00000000..ffb06004
Binary files /dev/null and b/website/static/img/resources/azure/iot/time-series-insights-event-sources.png differ
diff --git a/website/static/img/resources/azure/management_governance/activity-log.png b/website/static/img/resources/azure/management_governance/activity-log.png
new file mode 100644
index 00000000..a039075c
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/activity-log.png differ
diff --git a/website/static/img/resources/azure/management_governance/advisor.png b/website/static/img/resources/azure/management_governance/advisor.png
new file mode 100644
index 00000000..d3243325
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/advisor.png differ
diff --git a/website/static/img/resources/azure/management_governance/alerts.png b/website/static/img/resources/azure/management_governance/alerts.png
new file mode 100644
index 00000000..146cf8f8
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/alerts.png differ
diff --git a/website/static/img/resources/azure/management_governance/application-insights.png b/website/static/img/resources/azure/management_governance/application-insights.png
new file mode 100644
index 00000000..dbd50506
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/application-insights.png differ
diff --git a/website/static/img/resources/azure/management_governance/arc.png b/website/static/img/resources/azure/management_governance/arc.png
new file mode 100644
index 00000000..90b9677d
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/arc.png differ
diff --git a/website/static/img/resources/azure/management_governance/automation-accounts.png b/website/static/img/resources/azure/management_governance/automation-accounts.png
new file mode 100644
index 00000000..5abc47c4
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/automation-accounts.png differ
diff --git a/website/static/img/resources/azure/management_governance/blueprints.png b/website/static/img/resources/azure/management_governance/blueprints.png
new file mode 100644
index 00000000..d780a198
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/blueprints.png differ
diff --git a/website/static/img/resources/azure/management_governance/compliance.png b/website/static/img/resources/azure/management_governance/compliance.png
new file mode 100644
index 00000000..69c3c075
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/compliance.png differ
diff --git a/website/static/img/resources/azure/management_governance/cost-management-and-billing.png b/website/static/img/resources/azure/management_governance/cost-management-and-billing.png
new file mode 100644
index 00000000..f368503b
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/cost-management-and-billing.png differ
diff --git a/website/static/img/resources/azure/management_governance/diagnostics-settings.png b/website/static/img/resources/azure/management_governance/diagnostics-settings.png
new file mode 100644
index 00000000..bd9cd6a3
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/diagnostics-settings.png differ
diff --git a/website/static/img/resources/azure/management_governance/education.png b/website/static/img/resources/azure/management_governance/education.png
new file mode 100644
index 00000000..cb8cccc5
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/education.png differ
diff --git a/website/static/img/resources/azure/management_governance/lighthouse.png b/website/static/img/resources/azure/management_governance/lighthouse.png
new file mode 100644
index 00000000..c99f3678
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/lighthouse.png differ
diff --git a/website/static/img/resources/azure/management_governance/log-analytics-workspaces.png b/website/static/img/resources/azure/management_governance/log-analytics-workspaces.png
new file mode 100644
index 00000000..7f0bd907
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/log-analytics-workspaces.png differ
diff --git a/website/static/img/resources/azure/management_governance/machinesazurearc.png b/website/static/img/resources/azure/management_governance/machinesazurearc.png
new file mode 100644
index 00000000..69ce348b
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/machinesazurearc.png differ
diff --git a/website/static/img/resources/azure/management_governance/managed-applications-center.png b/website/static/img/resources/azure/management_governance/managed-applications-center.png
new file mode 100644
index 00000000..8133a3d3
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/managed-applications-center.png differ
diff --git a/website/static/img/resources/azure/management_governance/metrics.png b/website/static/img/resources/azure/management_governance/metrics.png
new file mode 100644
index 00000000..61198f3c
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/metrics.png differ
diff --git a/website/static/img/resources/azure/management_governance/monitor.png b/website/static/img/resources/azure/management_governance/monitor.png
new file mode 100644
index 00000000..1819b645
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/monitor.png differ
diff --git a/website/static/img/resources/azure/management_governance/my-customers.png b/website/static/img/resources/azure/management_governance/my-customers.png
new file mode 100644
index 00000000..fac6955c
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/my-customers.png differ
diff --git a/website/static/img/resources/azure/management_governance/operation-log-classic.png b/website/static/img/resources/azure/management_governance/operation-log-classic.png
new file mode 100644
index 00000000..a039075c
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/operation-log-classic.png differ
diff --git a/website/static/img/resources/azure/management_governance/policy.png b/website/static/img/resources/azure/management_governance/policy.png
new file mode 100644
index 00000000..f0d84496
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/policy.png differ
diff --git a/website/static/img/resources/azure/management_governance/recovery-services-vaults.png b/website/static/img/resources/azure/management_governance/recovery-services-vaults.png
new file mode 100644
index 00000000..b17f0d50
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/recovery-services-vaults.png differ
diff --git a/website/static/img/resources/azure/management_governance/resource-graph-explorer.png b/website/static/img/resources/azure/management_governance/resource-graph-explorer.png
new file mode 100644
index 00000000..1b3aed74
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/resource-graph-explorer.png differ
diff --git a/website/static/img/resources/azure/management_governance/service-providers.png b/website/static/img/resources/azure/management_governance/service-providers.png
new file mode 100644
index 00000000..626311c7
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/service-providers.png differ
diff --git a/website/static/img/resources/azure/management_governance/solutions.png b/website/static/img/resources/azure/management_governance/solutions.png
new file mode 100644
index 00000000..514b39bc
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/solutions.png differ
diff --git a/website/static/img/resources/azure/management_governance/user-privacy.png b/website/static/img/resources/azure/management_governance/user-privacy.png
new file mode 100644
index 00000000..e17f5750
Binary files /dev/null and b/website/static/img/resources/azure/management_governance/user-privacy.png differ
diff --git a/website/static/img/resources/azure/migrate/cost-management-and-billing.png b/website/static/img/resources/azure/migrate/cost-management-and-billing.png
new file mode 100644
index 00000000..f368503b
Binary files /dev/null and b/website/static/img/resources/azure/migrate/cost-management-and-billing.png differ
diff --git a/website/static/img/resources/azure/migrate/data-box-edge.png b/website/static/img/resources/azure/migrate/data-box-edge.png
new file mode 100644
index 00000000..81740dc1
Binary files /dev/null and b/website/static/img/resources/azure/migrate/data-box-edge.png differ
diff --git a/website/static/img/resources/azure/migrate/data-box.png b/website/static/img/resources/azure/migrate/data-box.png
new file mode 100644
index 00000000..93f87af5
Binary files /dev/null and b/website/static/img/resources/azure/migrate/data-box.png differ
diff --git a/website/static/img/resources/azure/migrate/migrate.png b/website/static/img/resources/azure/migrate/migrate.png
new file mode 100644
index 00000000..c2735ba0
Binary files /dev/null and b/website/static/img/resources/azure/migrate/migrate.png differ
diff --git a/website/static/img/resources/azure/migrate/recovery-services-vaults.png b/website/static/img/resources/azure/migrate/recovery-services-vaults.png
new file mode 100644
index 00000000..b17f0d50
Binary files /dev/null and b/website/static/img/resources/azure/migrate/recovery-services-vaults.png differ
diff --git a/website/static/img/resources/azure/mixed_reality/remote-rendering.png b/website/static/img/resources/azure/mixed_reality/remote-rendering.png
new file mode 100644
index 00000000..206b9718
Binary files /dev/null and b/website/static/img/resources/azure/mixed_reality/remote-rendering.png differ
diff --git a/website/static/img/resources/azure/monitor/sap-azure-monitor.png b/website/static/img/resources/azure/monitor/sap-azure-monitor.png
new file mode 100644
index 00000000..f893e527
Binary files /dev/null and b/website/static/img/resources/azure/monitor/sap-azure-monitor.png differ
diff --git a/website/static/img/resources/azure/networking/application-gateways.png b/website/static/img/resources/azure/networking/application-gateways.png
new file mode 100644
index 00000000..781442ff
Binary files /dev/null and b/website/static/img/resources/azure/networking/application-gateways.png differ
diff --git a/website/static/img/resources/azure/networking/cdn-profiles.png b/website/static/img/resources/azure/networking/cdn-profiles.png
new file mode 100644
index 00000000..c5c01591
Binary files /dev/null and b/website/static/img/resources/azure/networking/cdn-profiles.png differ
diff --git a/website/static/img/resources/azure/networking/connections.png b/website/static/img/resources/azure/networking/connections.png
new file mode 100644
index 00000000..35f21cfb
Binary files /dev/null and b/website/static/img/resources/azure/networking/connections.png differ
diff --git a/website/static/img/resources/azure/networking/ddos-protection-plans.png b/website/static/img/resources/azure/networking/ddos-protection-plans.png
new file mode 100644
index 00000000..1d419646
Binary files /dev/null and b/website/static/img/resources/azure/networking/ddos-protection-plans.png differ
diff --git a/website/static/img/resources/azure/networking/dns-zones.png b/website/static/img/resources/azure/networking/dns-zones.png
new file mode 100644
index 00000000..62a01811
Binary files /dev/null and b/website/static/img/resources/azure/networking/dns-zones.png differ
diff --git a/website/static/img/resources/azure/networking/expressroute-circuits.png b/website/static/img/resources/azure/networking/expressroute-circuits.png
new file mode 100644
index 00000000..b5a1c20b
Binary files /dev/null and b/website/static/img/resources/azure/networking/expressroute-circuits.png differ
diff --git a/website/static/img/resources/azure/networking/firewall-manager.png b/website/static/img/resources/azure/networking/firewall-manager.png
new file mode 100644
index 00000000..d9a20eff
Binary files /dev/null and b/website/static/img/resources/azure/networking/firewall-manager.png differ
diff --git a/website/static/img/resources/azure/networking/firewalls.png b/website/static/img/resources/azure/networking/firewalls.png
new file mode 100644
index 00000000..c32220ad
Binary files /dev/null and b/website/static/img/resources/azure/networking/firewalls.png differ
diff --git a/website/static/img/resources/azure/networking/front-doors.png b/website/static/img/resources/azure/networking/front-doors.png
new file mode 100644
index 00000000..c2c703c0
Binary files /dev/null and b/website/static/img/resources/azure/networking/front-doors.png differ
diff --git a/website/static/img/resources/azure/networking/ip-groups.png b/website/static/img/resources/azure/networking/ip-groups.png
new file mode 100644
index 00000000..330d3f1b
Binary files /dev/null and b/website/static/img/resources/azure/networking/ip-groups.png differ
diff --git a/website/static/img/resources/azure/networking/load-balancers.png b/website/static/img/resources/azure/networking/load-balancers.png
new file mode 100644
index 00000000..56ff014b
Binary files /dev/null and b/website/static/img/resources/azure/networking/load-balancers.png differ
diff --git a/website/static/img/resources/azure/networking/local-network-gateways.png b/website/static/img/resources/azure/networking/local-network-gateways.png
new file mode 100644
index 00000000..8915e93b
Binary files /dev/null and b/website/static/img/resources/azure/networking/local-network-gateways.png differ
diff --git a/website/static/img/resources/azure/networking/nat.png b/website/static/img/resources/azure/networking/nat.png
new file mode 100644
index 00000000..69e03dc5
Binary files /dev/null and b/website/static/img/resources/azure/networking/nat.png differ
diff --git a/website/static/img/resources/azure/networking/network-interfaces.png b/website/static/img/resources/azure/networking/network-interfaces.png
new file mode 100644
index 00000000..28178b8c
Binary files /dev/null and b/website/static/img/resources/azure/networking/network-interfaces.png differ
diff --git a/website/static/img/resources/azure/networking/network-security-groups.png b/website/static/img/resources/azure/networking/network-security-groups.png
new file mode 100644
index 00000000..106a8f32
Binary files /dev/null and b/website/static/img/resources/azure/networking/network-security-groups.png differ
diff --git a/website/static/img/resources/azure/networking/network-watcher.png b/website/static/img/resources/azure/networking/network-watcher.png
new file mode 100644
index 00000000..47742678
Binary files /dev/null and b/website/static/img/resources/azure/networking/network-watcher.png differ
diff --git a/website/static/img/resources/azure/networking/private-link-service.png b/website/static/img/resources/azure/networking/private-link-service.png
new file mode 100644
index 00000000..f6940e98
Binary files /dev/null and b/website/static/img/resources/azure/networking/private-link-service.png differ
diff --git a/website/static/img/resources/azure/networking/private-link.png b/website/static/img/resources/azure/networking/private-link.png
new file mode 100644
index 00000000..cee5a9eb
Binary files /dev/null and b/website/static/img/resources/azure/networking/private-link.png differ
diff --git a/website/static/img/resources/azure/networking/proximity-placement-groups.png b/website/static/img/resources/azure/networking/proximity-placement-groups.png
new file mode 100644
index 00000000..55025a5f
Binary files /dev/null and b/website/static/img/resources/azure/networking/proximity-placement-groups.png differ
diff --git a/website/static/img/resources/azure/networking/public-ip-addresses-classic.png b/website/static/img/resources/azure/networking/public-ip-addresses-classic.png
new file mode 100644
index 00000000..957bbb36
Binary files /dev/null and b/website/static/img/resources/azure/networking/public-ip-addresses-classic.png differ
diff --git a/website/static/img/resources/azure/networking/public-ip-addresses.png b/website/static/img/resources/azure/networking/public-ip-addresses.png
new file mode 100644
index 00000000..228d85b3
Binary files /dev/null and b/website/static/img/resources/azure/networking/public-ip-addresses.png differ
diff --git a/website/static/img/resources/azure/networking/public-ip-prefixes.png b/website/static/img/resources/azure/networking/public-ip-prefixes.png
new file mode 100644
index 00000000..18b4181b
Binary files /dev/null and b/website/static/img/resources/azure/networking/public-ip-prefixes.png differ
diff --git a/website/static/img/resources/azure/networking/reserved-ip-addresses-classic.png b/website/static/img/resources/azure/networking/reserved-ip-addresses-classic.png
new file mode 100644
index 00000000..19395b42
Binary files /dev/null and b/website/static/img/resources/azure/networking/reserved-ip-addresses-classic.png differ
diff --git a/website/static/img/resources/azure/networking/route-filters.png b/website/static/img/resources/azure/networking/route-filters.png
new file mode 100644
index 00000000..bc15a994
Binary files /dev/null and b/website/static/img/resources/azure/networking/route-filters.png differ
diff --git a/website/static/img/resources/azure/networking/route-tables.png b/website/static/img/resources/azure/networking/route-tables.png
new file mode 100644
index 00000000..4a1cf44a
Binary files /dev/null and b/website/static/img/resources/azure/networking/route-tables.png differ
diff --git a/website/static/img/resources/azure/networking/service-endpoint-policies.png b/website/static/img/resources/azure/networking/service-endpoint-policies.png
new file mode 100644
index 00000000..edf7cfc5
Binary files /dev/null and b/website/static/img/resources/azure/networking/service-endpoint-policies.png differ
diff --git a/website/static/img/resources/azure/networking/traffic-manager-profiles.png b/website/static/img/resources/azure/networking/traffic-manager-profiles.png
new file mode 100644
index 00000000..924a86c1
Binary files /dev/null and b/website/static/img/resources/azure/networking/traffic-manager-profiles.png differ
diff --git a/website/static/img/resources/azure/networking/virtual-network-gateways.png b/website/static/img/resources/azure/networking/virtual-network-gateways.png
new file mode 100644
index 00000000..b9b2106e
Binary files /dev/null and b/website/static/img/resources/azure/networking/virtual-network-gateways.png differ
diff --git a/website/static/img/resources/azure/networking/virtual-networks-classic.png b/website/static/img/resources/azure/networking/virtual-networks-classic.png
new file mode 100644
index 00000000..2505e0a9
Binary files /dev/null and b/website/static/img/resources/azure/networking/virtual-networks-classic.png differ
diff --git a/website/static/img/resources/azure/networking/virtual-networks.png b/website/static/img/resources/azure/networking/virtual-networks.png
new file mode 100644
index 00000000..56e96053
Binary files /dev/null and b/website/static/img/resources/azure/networking/virtual-networks.png differ
diff --git a/website/static/img/resources/azure/networking/virtual-wans.png b/website/static/img/resources/azure/networking/virtual-wans.png
new file mode 100644
index 00000000..e5262a29
Binary files /dev/null and b/website/static/img/resources/azure/networking/virtual-wans.png differ
diff --git a/website/static/img/resources/azure/networking/web-application-firewall-policieswaf.png b/website/static/img/resources/azure/networking/web-application-firewall-policieswaf.png
new file mode 100644
index 00000000..e6b53e61
Binary files /dev/null and b/website/static/img/resources/azure/networking/web-application-firewall-policieswaf.png differ
diff --git a/website/static/img/resources/azure/other/backup-center.png b/website/static/img/resources/azure/other/backup-center.png
new file mode 100644
index 00000000..039a9e89
Binary files /dev/null and b/website/static/img/resources/azure/other/backup-center.png differ
diff --git a/website/static/img/resources/azure/other/detonation.png b/website/static/img/resources/azure/other/detonation.png
new file mode 100644
index 00000000..c40c793c
Binary files /dev/null and b/website/static/img/resources/azure/other/detonation.png differ
diff --git a/website/static/img/resources/azure/other/expressroute-direct.png b/website/static/img/resources/azure/other/expressroute-direct.png
new file mode 100644
index 00000000..b7e4c3de
Binary files /dev/null and b/website/static/img/resources/azure/other/expressroute-direct.png differ
diff --git a/website/static/img/resources/azure/other/instance-pools.png b/website/static/img/resources/azure/other/instance-pools.png
new file mode 100644
index 00000000..f0b6cdf9
Binary files /dev/null and b/website/static/img/resources/azure/other/instance-pools.png differ
diff --git a/website/static/img/resources/azure/other/internet-analyzer-profiles.png b/website/static/img/resources/azure/other/internet-analyzer-profiles.png
new file mode 100644
index 00000000..e1e59500
Binary files /dev/null and b/website/static/img/resources/azure/other/internet-analyzer-profiles.png differ
diff --git a/website/static/img/resources/azure/other/local-network-gateways.png b/website/static/img/resources/azure/other/local-network-gateways.png
new file mode 100644
index 00000000..8915e93b
Binary files /dev/null and b/website/static/img/resources/azure/other/local-network-gateways.png differ
diff --git a/website/static/img/resources/azure/other/peering-service.png b/website/static/img/resources/azure/other/peering-service.png
new file mode 100644
index 00000000..bb3f9bf6
Binary files /dev/null and b/website/static/img/resources/azure/other/peering-service.png differ
diff --git a/website/static/img/resources/azure/other/resource-mover.png b/website/static/img/resources/azure/other/resource-mover.png
new file mode 100644
index 00000000..c7dbc039
Binary files /dev/null and b/website/static/img/resources/azure/other/resource-mover.png differ
diff --git a/website/static/img/resources/azure/other/ssh-keys.png b/website/static/img/resources/azure/other/ssh-keys.png
new file mode 100644
index 00000000..5bb40148
Binary files /dev/null and b/website/static/img/resources/azure/other/ssh-keys.png differ
diff --git a/website/static/img/resources/azure/other/template-specs.png b/website/static/img/resources/azure/other/template-specs.png
new file mode 100644
index 00000000..1b1eaaf4
Binary files /dev/null and b/website/static/img/resources/azure/other/template-specs.png differ
diff --git a/website/static/img/resources/azure/other/universal-print.png b/website/static/img/resources/azure/other/universal-print.png
new file mode 100644
index 00000000..5d2dff1f
Binary files /dev/null and b/website/static/img/resources/azure/other/universal-print.png differ
diff --git a/website/static/img/resources/azure/other/windows-virtual-desktop.png b/website/static/img/resources/azure/other/windows-virtual-desktop.png
new file mode 100644
index 00000000..44bb8313
Binary files /dev/null and b/website/static/img/resources/azure/other/windows-virtual-desktop.png differ
diff --git a/website/static/img/resources/azure/preview/cloud-shell.png b/website/static/img/resources/azure/preview/cloud-shell.png
new file mode 100644
index 00000000..f68c5db7
Binary files /dev/null and b/website/static/img/resources/azure/preview/cloud-shell.png differ
diff --git a/website/static/img/resources/azure/preview/iot-edge.png b/website/static/img/resources/azure/preview/iot-edge.png
new file mode 100644
index 00000000..58bc8f2e
Binary files /dev/null and b/website/static/img/resources/azure/preview/iot-edge.png differ
diff --git a/website/static/img/resources/azure/preview/private-link-hub.png b/website/static/img/resources/azure/preview/private-link-hub.png
new file mode 100644
index 00000000..719ee3d1
Binary files /dev/null and b/website/static/img/resources/azure/preview/private-link-hub.png differ
diff --git a/website/static/img/resources/azure/preview/rtos.png b/website/static/img/resources/azure/preview/rtos.png
new file mode 100644
index 00000000..b799c1d2
Binary files /dev/null and b/website/static/img/resources/azure/preview/rtos.png differ
diff --git a/website/static/img/resources/azure/preview/sphere.png b/website/static/img/resources/azure/preview/sphere.png
new file mode 100644
index 00000000..630d21fd
Binary files /dev/null and b/website/static/img/resources/azure/preview/sphere.png differ
diff --git a/website/static/img/resources/azure/preview/static-apps.png b/website/static/img/resources/azure/preview/static-apps.png
new file mode 100644
index 00000000..125b12d0
Binary files /dev/null and b/website/static/img/resources/azure/preview/static-apps.png differ
diff --git a/website/static/img/resources/azure/preview/time-series-data-sets.png b/website/static/img/resources/azure/preview/time-series-data-sets.png
new file mode 100644
index 00000000..bb14bb35
Binary files /dev/null and b/website/static/img/resources/azure/preview/time-series-data-sets.png differ
diff --git a/website/static/img/resources/azure/preview/web-environment.png b/website/static/img/resources/azure/preview/web-environment.png
new file mode 100644
index 00000000..fa9b1c4b
Binary files /dev/null and b/website/static/img/resources/azure/preview/web-environment.png differ
diff --git a/website/static/img/resources/azure/preview/workbooks.png b/website/static/img/resources/azure/preview/workbooks.png
new file mode 100644
index 00000000..5a2eff92
Binary files /dev/null and b/website/static/img/resources/azure/preview/workbooks.png differ
diff --git a/website/static/img/resources/azure/security/application-security-groups.png b/website/static/img/resources/azure/security/application-security-groups.png
index 38066668..0150fa2b 100644
Binary files a/website/static/img/resources/azure/security/application-security-groups.png and b/website/static/img/resources/azure/security/application-security-groups.png differ
diff --git a/website/static/img/resources/azure/security/conditional-access.png b/website/static/img/resources/azure/security/conditional-access.png
index 37d5ab17..1c8823f8 100644
Binary files a/website/static/img/resources/azure/security/conditional-access.png and b/website/static/img/resources/azure/security/conditional-access.png differ
diff --git a/website/static/img/resources/azure/security/defender.png b/website/static/img/resources/azure/security/defender.png
index 35ee099b..38b7584f 100644
Binary files a/website/static/img/resources/azure/security/defender.png and b/website/static/img/resources/azure/security/defender.png differ
diff --git a/website/static/img/resources/azure/security/extendedsecurityupdates.png b/website/static/img/resources/azure/security/extendedsecurityupdates.png
new file mode 100644
index 00000000..6136aec2
Binary files /dev/null and b/website/static/img/resources/azure/security/extendedsecurityupdates.png differ
diff --git a/website/static/img/resources/azure/security/key-vaults.png b/website/static/img/resources/azure/security/key-vaults.png
index bc57429f..8c6c90b1 100644
Binary files a/website/static/img/resources/azure/security/key-vaults.png and b/website/static/img/resources/azure/security/key-vaults.png differ
diff --git a/website/static/img/resources/azure/security/security-center.png b/website/static/img/resources/azure/security/security-center.png
index 2aef4991..2808c034 100644
Binary files a/website/static/img/resources/azure/security/security-center.png and b/website/static/img/resources/azure/security/security-center.png differ
diff --git a/website/static/img/resources/azure/security/sentinel.png b/website/static/img/resources/azure/security/sentinel.png
index 949a3a63..b8dae6b1 100644
Binary files a/website/static/img/resources/azure/security/sentinel.png and b/website/static/img/resources/azure/security/sentinel.png differ
diff --git a/website/static/img/resources/azure/storage/data-box-edge.png b/website/static/img/resources/azure/storage/data-box-edge.png
new file mode 100644
index 00000000..81740dc1
Binary files /dev/null and b/website/static/img/resources/azure/storage/data-box-edge.png differ
diff --git a/website/static/img/resources/azure/storage/data-box.png b/website/static/img/resources/azure/storage/data-box.png
index b316d506..93f87af5 100644
Binary files a/website/static/img/resources/azure/storage/data-box.png and b/website/static/img/resources/azure/storage/data-box.png differ
diff --git a/website/static/img/resources/azure/storage/data-lake-storage-gen1.png b/website/static/img/resources/azure/storage/data-lake-storage-gen1.png
new file mode 100644
index 00000000..f4138971
Binary files /dev/null and b/website/static/img/resources/azure/storage/data-lake-storage-gen1.png differ
diff --git a/website/static/img/resources/azure/storage/data-share-invitations.png b/website/static/img/resources/azure/storage/data-share-invitations.png
new file mode 100644
index 00000000..38168982
Binary files /dev/null and b/website/static/img/resources/azure/storage/data-share-invitations.png differ
diff --git a/website/static/img/resources/azure/storage/data-shares.png b/website/static/img/resources/azure/storage/data-shares.png
new file mode 100644
index 00000000..c5277c77
Binary files /dev/null and b/website/static/img/resources/azure/storage/data-shares.png differ
diff --git a/website/static/img/resources/azure/storage/hcp-cache.png b/website/static/img/resources/azure/storage/hcp-cache.png
new file mode 100644
index 00000000..3a1f0e0d
Binary files /dev/null and b/website/static/img/resources/azure/storage/hcp-cache.png differ
diff --git a/website/static/img/resources/azure/storage/import-export-jobs.png b/website/static/img/resources/azure/storage/import-export-jobs.png
new file mode 100644
index 00000000..632d8991
Binary files /dev/null and b/website/static/img/resources/azure/storage/import-export-jobs.png differ
diff --git a/website/static/img/resources/azure/storage/netapp-files.png b/website/static/img/resources/azure/storage/netapp-files.png
index cda140e6..118c5c87 100644
Binary files a/website/static/img/resources/azure/storage/netapp-files.png and b/website/static/img/resources/azure/storage/netapp-files.png differ
diff --git a/website/static/img/resources/azure/storage/recovery-services-vaults.png b/website/static/img/resources/azure/storage/recovery-services-vaults.png
new file mode 100644
index 00000000..b17f0d50
Binary files /dev/null and b/website/static/img/resources/azure/storage/recovery-services-vaults.png differ
diff --git a/website/static/img/resources/azure/storage/stack-edge.png b/website/static/img/resources/azure/storage/stack-edge.png
new file mode 100644
index 00000000..fca74441
Binary files /dev/null and b/website/static/img/resources/azure/storage/stack-edge.png differ
diff --git a/website/static/img/resources/azure/storage/storage-accounts-classic.png b/website/static/img/resources/azure/storage/storage-accounts-classic.png
index 1379991d..15e9c8cb 100644
Binary files a/website/static/img/resources/azure/storage/storage-accounts-classic.png and b/website/static/img/resources/azure/storage/storage-accounts-classic.png differ
diff --git a/website/static/img/resources/azure/storage/storage-accounts.png b/website/static/img/resources/azure/storage/storage-accounts.png
index 61e3dd1c..82209937 100644
Binary files a/website/static/img/resources/azure/storage/storage-accounts.png and b/website/static/img/resources/azure/storage/storage-accounts.png differ
diff --git a/website/static/img/resources/azure/storage/storage-sync-services.png b/website/static/img/resources/azure/storage/storage-sync-services.png
index 6d22924a..e0ce83f5 100644
Binary files a/website/static/img/resources/azure/storage/storage-sync-services.png and b/website/static/img/resources/azure/storage/storage-sync-services.png differ
diff --git a/website/static/img/resources/azure/storage/storsimple-data-managers.png b/website/static/img/resources/azure/storage/storsimple-data-managers.png
index e66b8006..c85e7a96 100644
Binary files a/website/static/img/resources/azure/storage/storsimple-data-managers.png and b/website/static/img/resources/azure/storage/storsimple-data-managers.png differ
diff --git a/website/static/img/resources/azure/storage/storsimple-device-managers.png b/website/static/img/resources/azure/storage/storsimple-device-managers.png
index 35d26d87..0f047959 100644
Binary files a/website/static/img/resources/azure/storage/storsimple-device-managers.png and b/website/static/img/resources/azure/storage/storsimple-device-managers.png differ
diff --git a/website/static/img/resources/azure/web/media-service.png b/website/static/img/resources/azure/web/media-service.png
new file mode 100644
index 00000000..f137f63f
Binary files /dev/null and b/website/static/img/resources/azure/web/media-service.png differ
diff --git a/website/static/img/resources/azure/web/notification-hub-namespaces.png b/website/static/img/resources/azure/web/notification-hub-namespaces.png
index ad3129f4..ae838d98 100644
Binary files a/website/static/img/resources/azure/web/notification-hub-namespaces.png and b/website/static/img/resources/azure/web/notification-hub-namespaces.png differ
diff --git a/website/static/img/resources/onprem/registry/jfrog.png b/website/static/img/resources/onprem/registry/jfrog.png
new file mode 100644
index 00000000..931bfd81
Binary files /dev/null and b/website/static/img/resources/onprem/registry/jfrog.png differ
diff --git a/website/static/img/resources/programming/framework/svelte.png b/website/static/img/resources/programming/framework/svelte.png
new file mode 100644
index 00000000..463cc473
Binary files /dev/null and b/website/static/img/resources/programming/framework/svelte.png differ