diff --git a/autogen.sh b/autogen.sh
index d7605a6bd..e364b9b4e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,11 +29,11 @@ fi
 # preprocess the resources
 for pvd in "${providers[@]}"; do
   # convert the svg to png for azure provider
-  if [ "$pvd" = "onprem" ] || [ "$pvd" = "azure" ]; then
+  if [ "$pvd" = "onprem" ] || [ "$pvd" = "azure" ] || [ "$pvd" == "oci" ]; then
     echo "converting the svg to png using inkscape for provider '$pvd'"
     python -m scripts.resource svg2png "$pvd"
   fi
-  if [ "$pvd" == "oci" ] || [ "$pvd" = "ibm" ]; then
+  if [ "$pvd" = "ibm" ]; then
     echo "converting the svg to png using image magick for provider '$pvd'"
     python -m scripts.resource svg2png2 "$pvd"
   fi
diff --git a/diagrams/ibm/network.py b/diagrams/ibm/network.py
index 956d4cfa8..605319d1f 100644
--- a/diagrams/ibm/network.py
+++ b/diagrams/ibm/network.py
@@ -93,19 +93,3 @@ class VpnPolicy(_Network):
 
 
 # Aliases
-
-ACL = Rules
-CIS = InternetServices
-DL = DirectLink
-FIP = FloatingIp
-FloatingIP = FloatingIp
-FW = Firewall
-LB = LoadBalancer
-NLB = LoadBalancer 
-PublicGateway = Gateway
-SecurityGroupRules = Rules
-TG = TransitGateway
-VPC = Vpc
-VPNGateway = VpnGateway
-VPNConnection = VpnConnection
-VPNPolicy = VpnPolicy
diff --git a/diagrams/ibm/security.py b/diagrams/ibm/security.py
index 79486b8fa..ba35efd59 100644
--- a/diagrams/ibm/security.py
+++ b/diagrams/ibm/security.py
@@ -65,4 +65,3 @@ class Vpn(_Security):
 
 
 # Aliases
-VPN = Vpn
diff --git a/diagrams/oci/compute.py b/diagrams/oci/compute.py
index ed268d8cd..3afc3a63b 100644
--- a/diagrams/oci/compute.py
+++ b/diagrams/oci/compute.py
@@ -8,64 +8,40 @@ class _Compute(_OCI):
     _icon_dir = "resources/oci/compute"
 
 
-class AutoscaleWhite(_Compute):
-    _icon = "autoscale-white.png"
+class Apex(_Compute):
+    _icon = "apex.png"
 
 
 class Autoscale(_Compute):
     _icon = "autoscale.png"
 
 
-class BMWhite(_Compute):
-    _icon = "bm-white.png"
-
-
 class BM(_Compute):
     _icon = "bm.png"
 
 
-class ContainerWhite(_Compute):
-    _icon = "container-white.png"
-
-
 class Container(_Compute):
     _icon = "container.png"
 
 
-class FunctionsWhite(_Compute):
-    _icon = "functions-white.png"
-
-
 class Functions(_Compute):
     _icon = "functions.png"
 
 
-class InstancePoolsWhite(_Compute):
-    _icon = "instance-pools-white.png"
-
-
 class InstancePools(_Compute):
     _icon = "instance-pools.png"
 
 
-class OCIRWhite(_Compute):
-    _icon = "ocir-white.png"
-
-
 class OCIR(_Compute):
     _icon = "ocir.png"
 
 
-class OKEWhite(_Compute):
-    _icon = "oke-white.png"
-
-
 class OKE(_Compute):
     _icon = "oke.png"
 
 
-class VMWhite(_Compute):
-    _icon = "vm-white.png"
+class Red(_Compute):
+    _icon = "red.png"
 
 
 class VM(_Compute):
diff --git a/diagrams/oci/connectivity.py b/diagrams/oci/connectivity.py
index 8c51f6022..fedab5bab 100644
--- a/diagrams/oci/connectivity.py
+++ b/diagrams/oci/connectivity.py
@@ -8,18 +8,10 @@ class _Connectivity(_OCI):
     _icon_dir = "resources/oci/connectivity"
 
 
-class BackboneWhite(_Connectivity):
-    _icon = "backbone-white.png"
-
-
 class Backbone(_Connectivity):
     _icon = "backbone.png"
 
 
-class CDNWhite(_Connectivity):
-    _icon = "cdn-white.png"
-
-
 class CDN(_Connectivity):
     _icon = "cdn.png"
 
@@ -28,52 +20,40 @@ class CustomerDatacenter(_Connectivity):
     _icon = "customer-datacenter.png"
 
 
-class CustomerDatacntrWhite(_Connectivity):
-    _icon = "customer-datacntr-white.png"
-
-
-class CustomerPremiseWhite(_Connectivity):
-    _icon = "customer-premise-white.png"
-
-
 class CustomerPremise(_Connectivity):
     _icon = "customer-premise.png"
 
 
-class DisconnectedRegionsWhite(_Connectivity):
-    _icon = "disconnected-regions-white.png"
+class Datacenter(_Connectivity):
+    _icon = "datacenter.png"
 
 
 class DisconnectedRegions(_Connectivity):
     _icon = "disconnected-regions.png"
 
 
-class DNSWhite(_Connectivity):
-    _icon = "dns-white.png"
-
-
 class DNS(_Connectivity):
     _icon = "dns.png"
 
 
-class FastConnectWhite(_Connectivity):
-    _icon = "fast-connect-white.png"
-
-
 class FastConnect(_Connectivity):
     _icon = "fast-connect.png"
 
 
-class NATGatewayWhite(_Connectivity):
-    _icon = "nat-gateway-white.png"
+class LocalPeeringGateway(_Connectivity):
+    _icon = "local-peering-gateway.png"
 
 
 class NATGateway(_Connectivity):
     _icon = "nat-gateway.png"
 
 
-class VPNWhite(_Connectivity):
-    _icon = "vpn-white.png"
+class RemotePeeringGateway(_Connectivity):
+    _icon = "remote-peering-gateway.png"
+
+
+class ServiceConnectorHub(_Connectivity):
+    _icon = "service-connector-hub.png"
 
 
 class VPN(_Connectivity):
diff --git a/diagrams/oci/database.py b/diagrams/oci/database.py
index 840483428..fe0c34536 100644
--- a/diagrams/oci/database.py
+++ b/diagrams/oci/database.py
@@ -8,72 +8,64 @@ class _Database(_OCI):
     _icon_dir = "resources/oci/database"
 
 
-class AutonomousWhite(_Database):
-    _icon = "autonomous-white.png"
+class AutonomousDataWarehouseCs(_Database):
+    _icon = "autonomous-data-warehouse-cs.png"
 
 
-class Autonomous(_Database):
-    _icon = "autonomous.png"
+class AutonomousDataWarehouse(_Database):
+    _icon = "autonomous-data-warehouse.png"
 
 
-class BigdataServiceWhite(_Database):
-    _icon = "bigdata-service-white.png"
+class AutonomousTransactionProcessing(_Database):
+    _icon = "autonomous-transaction-processing.png"
 
 
-class BigdataService(_Database):
-    _icon = "bigdata-service.png"
+class Autonomous(_Database):
+    _icon = "autonomous.png"
 
 
-class DatabaseServiceWhite(_Database):
-    _icon = "database-service-white.png"
+class BigdataService(_Database):
+    _icon = "bigdata-service.png"
 
 
 class DatabaseService(_Database):
     _icon = "database-service.png"
 
 
-class DataflowApacheWhite(_Database):
-    _icon = "dataflow-apache-white.png"
-
-
 class DataflowApache(_Database):
     _icon = "dataflow-apache.png"
 
 
-class DcatWhite(_Database):
-    _icon = "dcat-white.png"
-
-
 class Dcat(_Database):
     _icon = "dcat.png"
 
 
-class DisWhite(_Database):
-    _icon = "dis-white.png"
+class Dcs(_Database):
+    _icon = "dcs.png"
 
 
 class Dis(_Database):
     _icon = "dis.png"
 
 
-class DMSWhite(_Database):
-    _icon = "dms-white.png"
-
-
 class DMS(_Database):
     _icon = "dms.png"
 
 
-class ScienceWhite(_Database):
-    _icon = "science-white.png"
+class Exadata(_Database):
+    _icon = "exadata.png"
 
 
-class Science(_Database):
-    _icon = "science.png"
+class Mysql(_Database):
+    _icon = "mysql.png"
+
+
+class Nosql(_Database):
+    _icon = "nosql.png"
 
 
-class StreamWhite(_Database):
-    _icon = "stream-white.png"
+class Science(_Database):
+    _icon = "science.png"
 
 
 class Stream(_Database):
diff --git a/diagrams/oci/devops.py b/diagrams/oci/devops.py
index 7089868ee..9a278f0f1 100644
--- a/diagrams/oci/devops.py
+++ b/diagrams/oci/devops.py
@@ -8,24 +8,20 @@ class _Devops(_OCI):
     _icon_dir = "resources/oci/devops"
 
 
-class APIGatewayWhite(_Devops):
-    _icon = "api-gateway-white.png"
+class Analytics(_Devops):
+    _icon = "analytics.png"
 
 
 class APIGateway(_Devops):
     _icon = "api-gateway.png"
 
 
-class APIServiceWhite(_Devops):
-    _icon = "api-service-white.png"
-
-
 class APIService(_Devops):
     _icon = "api-service.png"
 
 
-class ResourceMgmtWhite(_Devops):
-    _icon = "resource-mgmt-white.png"
+class MarketPlace(_Devops):
+    _icon = "market-place.png"
 
 
 class ResourceMgmt(_Devops):
diff --git a/diagrams/oci/governance.py b/diagrams/oci/governance.py
index 914919afb..d63bb5a55 100644
--- a/diagrams/oci/governance.py
+++ b/diagrams/oci/governance.py
@@ -8,60 +8,40 @@ class _Governance(_OCI):
     _icon_dir = "resources/oci/governance"
 
 
-class AuditWhite(_Governance):
-    _icon = "audit-white.png"
-
-
 class Audit(_Governance):
     _icon = "audit.png"
 
 
-class CompartmentsWhite(_Governance):
-    _icon = "compartments-white.png"
-
-
 class Compartments(_Governance):
     _icon = "compartments.png"
 
 
-class GroupsWhite(_Governance):
-    _icon = "groups-white.png"
+class FlowLogs(_Governance):
+    _icon = "flow-logs.png"
 
 
 class Groups(_Governance):
     _icon = "groups.png"
 
 
-class LoggingWhite(_Governance):
-    _icon = "logging-white.png"
-
-
 class Logging(_Governance):
     _icon = "logging.png"
 
 
-class OCIDWhite(_Governance):
-    _icon = "ocid-white.png"
-
-
 class OCID(_Governance):
     _icon = "ocid.png"
 
 
-class PoliciesWhite(_Governance):
-    _icon = "policies-white.png"
-
-
 class Policies(_Governance):
     _icon = "policies.png"
 
 
-class TaggingWhite(_Governance):
-    _icon = "tagging-white.png"
-
-
 class Tagging(_Governance):
     _icon = "tagging.png"
 
 
+class User(_Governance):
+    _icon = "user.png"
+
+
 # Aliases
diff --git a/diagrams/oci/ml.py b/diagrams/oci/ml.py
new file mode 100644
index 000000000..ca659641f
--- /dev/null
+++ b/diagrams/oci/ml.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OCI
+
+
+class _Ml(_OCI):
+    _type = "ml"
+    _icon_dir = "resources/oci/ml"
+
+
+class ArtificialIntelligence(_Ml):
+    _icon = "artificial-intelligence.png"
+
+
+class MachineLearning(_Ml):
+    _icon = "machine-learning.png"
+
+
+# Aliases
diff --git a/diagrams/oci/monitoring.py b/diagrams/oci/monitoring.py
index ae05bbaa8..2c655654b 100644
--- a/diagrams/oci/monitoring.py
+++ b/diagrams/oci/monitoring.py
@@ -8,74 +8,38 @@ class _Monitoring(_OCI):
     _icon_dir = "resources/oci/monitoring"
 
 
-class AlarmWhite(_Monitoring):
-    _icon = "alarm-white.png"
-
-
 class Alarm(_Monitoring):
     _icon = "alarm.png"
 
 
-class EmailWhite(_Monitoring):
-    _icon = "email-white.png"
-
-
 class Email(_Monitoring):
     _icon = "email.png"
 
 
-class EventsWhite(_Monitoring):
-    _icon = "events-white.png"
-
-
 class Events(_Monitoring):
     _icon = "events.png"
 
 
-class HealthCheckWhite(_Monitoring):
-    _icon = "health-check-white.png"
-
-
 class HealthCheck(_Monitoring):
     _icon = "health-check.png"
 
 
-class NotificationsWhite(_Monitoring):
-    _icon = "notifications-white.png"
-
-
 class Notifications(_Monitoring):
     _icon = "notifications.png"
 
 
-class QueueWhite(_Monitoring):
-    _icon = "queue-white.png"
-
-
 class Queue(_Monitoring):
     _icon = "queue.png"
 
 
-class SearchWhite(_Monitoring):
-    _icon = "search-white.png"
-
-
 class Search(_Monitoring):
     _icon = "search.png"
 
 
-class TelemetryWhite(_Monitoring):
-    _icon = "telemetry-white.png"
-
-
 class Telemetry(_Monitoring):
     _icon = "telemetry.png"
 
 
-class WorkflowWhite(_Monitoring):
-    _icon = "workflow-white.png"
-
-
 class Workflow(_Monitoring):
     _icon = "workflow.png"
 
diff --git a/diagrams/oci/network.py b/diagrams/oci/network.py
index 6175cb6f9..3c33d5800 100644
--- a/diagrams/oci/network.py
+++ b/diagrams/oci/network.py
@@ -8,64 +8,44 @@ class _Network(_OCI):
     _icon_dir = "resources/oci/network"
 
 
-class DrgWhite(_Network):
-    _icon = "drg-white.png"
+class CloudService(_Network):
+    _icon = "cloud-service.png"
 
 
 class Drg(_Network):
     _icon = "drg.png"
 
 
-class FirewallWhite(_Network):
-    _icon = "firewall-white.png"
-
-
 class Firewall(_Network):
     _icon = "firewall.png"
 
 
-class InternetGatewayWhite(_Network):
-    _icon = "internet-gateway-white.png"
-
-
 class InternetGateway(_Network):
     _icon = "internet-gateway.png"
 
 
-class LoadBalancerWhite(_Network):
-    _icon = "load-balancer-white.png"
-
-
 class LoadBalancer(_Network):
     _icon = "load-balancer.png"
 
 
-class RouteTableWhite(_Network):
-    _icon = "route-table-white.png"
-
-
 class RouteTable(_Network):
     _icon = "route-table.png"
 
 
-class SecurityListsWhite(_Network):
-    _icon = "security-lists-white.png"
+class Router(_Network):
+    _icon = "router.png"
 
 
 class SecurityLists(_Network):
     _icon = "security-lists.png"
 
 
-class ServiceGatewayWhite(_Network):
-    _icon = "service-gateway-white.png"
-
-
 class ServiceGateway(_Network):
     _icon = "service-gateway.png"
 
 
-class VcnWhite(_Network):
-    _icon = "vcn-white.png"
+class Switch(_Network):
+    _icon = "switch.png"
 
 
 class Vcn(_Network):
diff --git a/diagrams/oci/security.py b/diagrams/oci/security.py
index 5075da818..1c40bff04 100644
--- a/diagrams/oci/security.py
+++ b/diagrams/oci/security.py
@@ -8,66 +8,34 @@ class _Security(_OCI):
     _icon_dir = "resources/oci/security"
 
 
-class CloudGuardWhite(_Security):
-    _icon = "cloud-guard-white.png"
-
-
 class CloudGuard(_Security):
     _icon = "cloud-guard.png"
 
 
-class DDOSWhite(_Security):
-    _icon = "ddos-white.png"
-
-
 class DDOS(_Security):
     _icon = "ddos.png"
 
 
-class EncryptionWhite(_Security):
-    _icon = "encryption-white.png"
-
-
 class Encryption(_Security):
     _icon = "encryption.png"
 
 
-class IDAccessWhite(_Security):
-    _icon = "id-access-white.png"
-
-
 class IDAccess(_Security):
     _icon = "id-access.png"
 
 
-class KeyManagementWhite(_Security):
-    _icon = "key-management-white.png"
-
-
 class KeyManagement(_Security):
     _icon = "key-management.png"
 
 
-class MaxSecurityZoneWhite(_Security):
-    _icon = "max-security-zone-white.png"
-
-
 class MaxSecurityZone(_Security):
     _icon = "max-security-zone.png"
 
 
-class VaultWhite(_Security):
-    _icon = "vault-white.png"
-
-
 class Vault(_Security):
     _icon = "vault.png"
 
 
-class WAFWhite(_Security):
-    _icon = "waf-white.png"
-
-
 class WAF(_Security):
     _icon = "waf.png"
 
diff --git a/diagrams/oci/storage.py b/diagrams/oci/storage.py
index e1a57165a..59cc01c41 100644
--- a/diagrams/oci/storage.py
+++ b/diagrams/oci/storage.py
@@ -8,72 +8,44 @@ class _Storage(_OCI):
     _icon_dir = "resources/oci/storage"
 
 
-class BackupRestoreWhite(_Storage):
-    _icon = "backup-restore-white.png"
-
-
 class BackupRestore(_Storage):
     _icon = "backup-restore.png"
 
 
-class BlockStorageCloneWhite(_Storage):
-    _icon = "block-storage-clone-white.png"
-
-
 class BlockStorageClone(_Storage):
     _icon = "block-storage-clone.png"
 
 
-class BlockStorageWhite(_Storage):
-    _icon = "block-storage-white.png"
-
-
 class BlockStorage(_Storage):
     _icon = "block-storage.png"
 
 
-class BucketsWhite(_Storage):
-    _icon = "buckets-white.png"
-
-
 class Buckets(_Storage):
     _icon = "buckets.png"
 
 
-class DataTransferWhite(_Storage):
-    _icon = "data-transfer-white.png"
-
-
 class DataTransfer(_Storage):
     _icon = "data-transfer.png"
 
 
-class ElasticPerformanceWhite(_Storage):
-    _icon = "elastic-performance-white.png"
-
-
 class ElasticPerformance(_Storage):
     _icon = "elastic-performance.png"
 
 
-class FileStorageWhite(_Storage):
-    _icon = "file-storage-white.png"
-
-
 class FileStorage(_Storage):
     _icon = "file-storage.png"
 
 
-class ObjectStorageWhite(_Storage):
-    _icon = "object-storage-white.png"
+class LocalStorage(_Storage):
+    _icon = "local-storage.png"
 
 
 class ObjectStorage(_Storage):
     _icon = "object-storage.png"
 
 
-class StorageGatewayWhite(_Storage):
-    _icon = "storage-gateway-white.png"
+class PersistentVolume(_Storage):
+    _icon = "persistent-volume.png"
 
 
 class StorageGateway(_Storage):
diff --git a/docs/nodes/oci.md b/docs/nodes/oci.md
index fcedc97e9..33100d6c2 100644
--- a/docs/nodes/oci.md
+++ b/docs/nodes/oci.md
@@ -7,167 +7,124 @@ Node classes list of oci provider.
 
 ## oci.compute
 
-- **diagrams.oci.compute.AutoscaleWhite**
+- **diagrams.oci.compute.Apex**
 - **diagrams.oci.compute.Autoscale**
-- **diagrams.oci.compute.BMWhite**, **BareMetalWhite** (alias)
 - **diagrams.oci.compute.BM**, **BareMetal** (alias)
-- **diagrams.oci.compute.ContainerWhite**
 - **diagrams.oci.compute.Container**
-- **diagrams.oci.compute.FunctionsWhite**
 - **diagrams.oci.compute.Functions**
-- **diagrams.oci.compute.InstancePoolsWhite**
 - **diagrams.oci.compute.InstancePools**
-- **diagrams.oci.compute.OCIRWhite**, **OCIRegistryWhite** (alias)
 - **diagrams.oci.compute.OCIR**, **OCIRegistry** (alias)
-- **diagrams.oci.compute.OKEWhite**, **ContainerEngineWhite** (alias)
 - **diagrams.oci.compute.OKE**, **ContainerEngine** (alias)
-- **diagrams.oci.compute.VMWhite**, **VirtualMachineWhite** (alias)
+- **diagrams.oci.compute.Red**
 - **diagrams.oci.compute.VM**, **VirtualMachine** (alias)
 
 ## oci.connectivity
 
-- **diagrams.oci.connectivity.BackboneWhite**
 - **diagrams.oci.connectivity.Backbone**
-- **diagrams.oci.connectivity.CDNWhite**
 - **diagrams.oci.connectivity.CDN**
 - **diagrams.oci.connectivity.CustomerDatacenter**
-- **diagrams.oci.connectivity.CustomerDatacntrWhite**
-- **diagrams.oci.connectivity.CustomerPremiseWhite**
 - **diagrams.oci.connectivity.CustomerPremise**
-- **diagrams.oci.connectivity.DisconnectedRegionsWhite**
+- **diagrams.oci.connectivity.Datacenter**
 - **diagrams.oci.connectivity.DisconnectedRegions**
-- **diagrams.oci.connectivity.DNSWhite**
 - **diagrams.oci.connectivity.DNS**
-- **diagrams.oci.connectivity.FastConnectWhite**
 - **diagrams.oci.connectivity.FastConnect**
-- **diagrams.oci.connectivity.NATGatewayWhite**
+- **diagrams.oci.connectivity.LocalPeeringGateway**
 - **diagrams.oci.connectivity.NATGateway**
-- **diagrams.oci.connectivity.VPNWhite**
+- **diagrams.oci.connectivity.RemotePeeringGateway**
+- **diagrams.oci.connectivity.ServiceConnectorHub**
 - **diagrams.oci.connectivity.VPN**
 
 ## oci.database
 
-- **diagrams.oci.database.AutonomousWhite**, **ADBWhite** (alias)
+- **diagrams.oci.database.AutonomousDataWarehouseCs**
+- **diagrams.oci.database.AutonomousDataWarehouse**
+- **diagrams.oci.database.AutonomousTransactionProcessing**
 - **diagrams.oci.database.Autonomous**, **ADB** (alias)
-- **diagrams.oci.database.BigdataServiceWhite**
 - **diagrams.oci.database.BigdataService**
-- **diagrams.oci.database.DatabaseServiceWhite**, **DBServiceWhite** (alias)
 - **diagrams.oci.database.DatabaseService**, **DBService** (alias)
-- **diagrams.oci.database.DataflowApacheWhite**
 - **diagrams.oci.database.DataflowApache**
-- **diagrams.oci.database.DcatWhite**
 - **diagrams.oci.database.Dcat**
-- **diagrams.oci.database.DisWhite**
+- **diagrams.oci.database.Dcs**
 - **diagrams.oci.database.Dis**
-- **diagrams.oci.database.DMSWhite**
 - **diagrams.oci.database.DMS**
-- **diagrams.oci.database.ScienceWhite**
+- **diagrams.oci.database.Exadata**
+- **diagrams.oci.database.Mysql**
+- **diagrams.oci.database.Nosql**
 - **diagrams.oci.database.Science**
-- **diagrams.oci.database.StreamWhite**
 - **diagrams.oci.database.Stream**
 
 ## oci.devops
 
-- **diagrams.oci.devops.APIGatewayWhite**
+- **diagrams.oci.devops.Analytics**
 - **diagrams.oci.devops.APIGateway**
-- **diagrams.oci.devops.APIServiceWhite**
 - **diagrams.oci.devops.APIService**
-- **diagrams.oci.devops.ResourceMgmtWhite**
+- **diagrams.oci.devops.MarketPlace**
 - **diagrams.oci.devops.ResourceMgmt**
 
 ## oci.governance
 
-- **diagrams.oci.governance.AuditWhite**
 - **diagrams.oci.governance.Audit**
-- **diagrams.oci.governance.CompartmentsWhite**
 - **diagrams.oci.governance.Compartments**
-- **diagrams.oci.governance.GroupsWhite**
+- **diagrams.oci.governance.FlowLogs**
 - **diagrams.oci.governance.Groups**
-- **diagrams.oci.governance.LoggingWhite**
 - **diagrams.oci.governance.Logging**
-- **diagrams.oci.governance.OCIDWhite**
 - **diagrams.oci.governance.OCID**
-- **diagrams.oci.governance.PoliciesWhite**
 - **diagrams.oci.governance.Policies**
-- **diagrams.oci.governance.TaggingWhite**
 - **diagrams.oci.governance.Tagging**
+- **diagrams.oci.governance.User**
+
+## oci.ml
+
+- **diagrams.oci.ml.ArtificialIntelligence**
+- **diagrams.oci.ml.MachineLearning**
 
 ## oci.monitoring
 
-- **diagrams.oci.monitoring.AlarmWhite**
 - **diagrams.oci.monitoring.Alarm**
-- **diagrams.oci.monitoring.EmailWhite**
 - **diagrams.oci.monitoring.Email**
-- **diagrams.oci.monitoring.EventsWhite**
 - **diagrams.oci.monitoring.Events**
-- **diagrams.oci.monitoring.HealthCheckWhite**
 - **diagrams.oci.monitoring.HealthCheck**
-- **diagrams.oci.monitoring.NotificationsWhite**
 - **diagrams.oci.monitoring.Notifications**
-- **diagrams.oci.monitoring.QueueWhite**
 - **diagrams.oci.monitoring.Queue**
-- **diagrams.oci.monitoring.SearchWhite**
 - **diagrams.oci.monitoring.Search**
-- **diagrams.oci.monitoring.TelemetryWhite**
 - **diagrams.oci.monitoring.Telemetry**
-- **diagrams.oci.monitoring.WorkflowWhite**
 - **diagrams.oci.monitoring.Workflow**
 
 ## oci.network
 
-- **diagrams.oci.network.DrgWhite**
+- **diagrams.oci.network.CloudService**
 - **diagrams.oci.network.Drg**
-- **diagrams.oci.network.FirewallWhite**
 - **diagrams.oci.network.Firewall**
-- **diagrams.oci.network.InternetGatewayWhite**
 - **diagrams.oci.network.InternetGateway**
-- **diagrams.oci.network.LoadBalancerWhite**
 - **diagrams.oci.network.LoadBalancer**
-- **diagrams.oci.network.RouteTableWhite**
 - **diagrams.oci.network.RouteTable**
-- **diagrams.oci.network.SecurityListsWhite**
+- **diagrams.oci.network.Router**
 - **diagrams.oci.network.SecurityLists**
-- **diagrams.oci.network.ServiceGatewayWhite**
 - **diagrams.oci.network.ServiceGateway**
-- **diagrams.oci.network.VcnWhite**
+- **diagrams.oci.network.Switch**
 - **diagrams.oci.network.Vcn**
 
 ## oci.security
 
-- **diagrams.oci.security.CloudGuardWhite**
 - **diagrams.oci.security.CloudGuard**
-- **diagrams.oci.security.DDOSWhite**
 - **diagrams.oci.security.DDOS**
-- **diagrams.oci.security.EncryptionWhite**
 - **diagrams.oci.security.Encryption**
-- **diagrams.oci.security.IDAccessWhite**
 - **diagrams.oci.security.IDAccess**
-- **diagrams.oci.security.KeyManagementWhite**
 - **diagrams.oci.security.KeyManagement**
-- **diagrams.oci.security.MaxSecurityZoneWhite**
 - **diagrams.oci.security.MaxSecurityZone**
-- **diagrams.oci.security.VaultWhite**
 - **diagrams.oci.security.Vault**
-- **diagrams.oci.security.WAFWhite**
 - **diagrams.oci.security.WAF**
 
 ## oci.storage
 
-- **diagrams.oci.storage.BackupRestoreWhite**
 - **diagrams.oci.storage.BackupRestore**
-- **diagrams.oci.storage.BlockStorageCloneWhite**
 - **diagrams.oci.storage.BlockStorageClone**
-- **diagrams.oci.storage.BlockStorageWhite**
 - **diagrams.oci.storage.BlockStorage**
-- **diagrams.oci.storage.BucketsWhite**
 - **diagrams.oci.storage.Buckets**
-- **diagrams.oci.storage.DataTransferWhite**
 - **diagrams.oci.storage.DataTransfer**
-- **diagrams.oci.storage.ElasticPerformanceWhite**
 - **diagrams.oci.storage.ElasticPerformance**
-- **diagrams.oci.storage.FileStorageWhite**
 - **diagrams.oci.storage.FileStorage**
-- **diagrams.oci.storage.ObjectStorageWhite**
+- **diagrams.oci.storage.LocalStorage**
 - **diagrams.oci.storage.ObjectStorage**
-- **diagrams.oci.storage.StorageGatewayWhite**
+- **diagrams.oci.storage.PersistentVolume**
 - **diagrams.oci.storage.StorageGateway**
diff --git a/resources/ibm/compute/Instance.png b/resources/ibm/compute/instance.png
similarity index 100%
rename from resources/ibm/compute/Instance.png
rename to resources/ibm/compute/instance.png
diff --git a/resources/ibm/compute/Key.png b/resources/ibm/compute/key.png
similarity index 100%
rename from resources/ibm/compute/Key.png
rename to resources/ibm/compute/key.png
diff --git a/resources/ibm/general/Enterprise.png b/resources/ibm/general/enterprise.png
similarity index 100%
rename from resources/ibm/general/Enterprise.png
rename to resources/ibm/general/enterprise.png
diff --git a/resources/ibm/general/Internet.png b/resources/ibm/general/internet.png
similarity index 100%
rename from resources/ibm/general/Internet.png
rename to resources/ibm/general/internet.png
diff --git a/resources/ibm/network/Bridge.png b/resources/ibm/network/bridge.png
similarity index 100%
rename from resources/ibm/network/Bridge.png
rename to resources/ibm/network/bridge.png
diff --git a/resources/ibm/network/Enterprise.png b/resources/ibm/network/enterprise.png
similarity index 100%
rename from resources/ibm/network/Enterprise.png
rename to resources/ibm/network/enterprise.png
diff --git a/resources/ibm/network/Firewall.png b/resources/ibm/network/firewall.png
similarity index 100%
rename from resources/ibm/network/Firewall.png
rename to resources/ibm/network/firewall.png
diff --git a/resources/ibm/network/Gateway.png b/resources/ibm/network/gateway.png
similarity index 100%
rename from resources/ibm/network/Gateway.png
rename to resources/ibm/network/gateway.png
diff --git a/resources/ibm/network/Region.png b/resources/ibm/network/region.png
similarity index 100%
rename from resources/ibm/network/Region.png
rename to resources/ibm/network/region.png
diff --git a/resources/ibm/network/Router.png b/resources/ibm/network/router.png
similarity index 100%
rename from resources/ibm/network/Router.png
rename to resources/ibm/network/router.png
diff --git a/resources/ibm/network/Rules.png b/resources/ibm/network/rules.png
similarity index 100%
rename from resources/ibm/network/Rules.png
rename to resources/ibm/network/rules.png
diff --git a/resources/ibm/network/Subnet.png b/resources/ibm/network/subnet.png
similarity index 100%
rename from resources/ibm/network/Subnet.png
rename to resources/ibm/network/subnet.png
diff --git a/resources/ibm/network/VPC.png b/resources/ibm/network/vpc.png
similarity index 100%
rename from resources/ibm/network/VPC.png
rename to resources/ibm/network/vpc.png
diff --git a/resources/oci/compute/apex.png b/resources/oci/compute/apex.png
new file mode 100644
index 000000000..ecae05ed1
Binary files /dev/null and b/resources/oci/compute/apex.png differ
diff --git a/resources/oci/compute/autoscale-white.png b/resources/oci/compute/autoscale-white.png
deleted file mode 100644
index dc64d11bb..000000000
Binary files a/resources/oci/compute/autoscale-white.png and /dev/null differ
diff --git a/resources/oci/compute/autoscale.png b/resources/oci/compute/autoscale.png
index f5374d3a5..282d4219a 100644
Binary files a/resources/oci/compute/autoscale.png and b/resources/oci/compute/autoscale.png differ
diff --git a/resources/oci/compute/bm-white.png b/resources/oci/compute/bm-white.png
deleted file mode 100644
index c33833d71..000000000
Binary files a/resources/oci/compute/bm-white.png and /dev/null differ
diff --git a/resources/oci/compute/bm.png b/resources/oci/compute/bm.png
index e9d50b0a0..03a6183d9 100644
Binary files a/resources/oci/compute/bm.png and b/resources/oci/compute/bm.png differ
diff --git a/resources/oci/compute/container-white.png b/resources/oci/compute/container-white.png
deleted file mode 100644
index ba6b09a0c..000000000
Binary files a/resources/oci/compute/container-white.png and /dev/null differ
diff --git a/resources/oci/compute/container.png b/resources/oci/compute/container.png
index 949b46bd8..59fa1c266 100644
Binary files a/resources/oci/compute/container.png and b/resources/oci/compute/container.png differ
diff --git a/resources/oci/compute/functions-white.png b/resources/oci/compute/functions-white.png
deleted file mode 100644
index 6296e39b4..000000000
Binary files a/resources/oci/compute/functions-white.png and /dev/null differ
diff --git a/resources/oci/compute/functions.png b/resources/oci/compute/functions.png
index ec13a2dcd..df2e67f10 100644
Binary files a/resources/oci/compute/functions.png and b/resources/oci/compute/functions.png differ
diff --git a/resources/oci/compute/instance-pools-white.png b/resources/oci/compute/instance-pools-white.png
deleted file mode 100644
index 397bc2766..000000000
Binary files a/resources/oci/compute/instance-pools-white.png and /dev/null differ
diff --git a/resources/oci/compute/instance-pools.png b/resources/oci/compute/instance-pools.png
index d1eacf12d..4167719af 100644
Binary files a/resources/oci/compute/instance-pools.png and b/resources/oci/compute/instance-pools.png differ
diff --git a/resources/oci/compute/ocir-white.png b/resources/oci/compute/ocir-white.png
deleted file mode 100644
index 551050584..000000000
Binary files a/resources/oci/compute/ocir-white.png and /dev/null differ
diff --git a/resources/oci/compute/ocir.png b/resources/oci/compute/ocir.png
index 4f6d9ee24..5e73157da 100644
Binary files a/resources/oci/compute/ocir.png and b/resources/oci/compute/ocir.png differ
diff --git a/resources/oci/compute/oke-white.png b/resources/oci/compute/oke-white.png
deleted file mode 100644
index 645175355..000000000
Binary files a/resources/oci/compute/oke-white.png and /dev/null differ
diff --git a/resources/oci/compute/oke.png b/resources/oci/compute/oke.png
index 61dcd839f..d67b09576 100644
Binary files a/resources/oci/compute/oke.png and b/resources/oci/compute/oke.png differ
diff --git a/resources/oci/compute/red.png b/resources/oci/compute/red.png
new file mode 100644
index 000000000..d83fa62c5
Binary files /dev/null and b/resources/oci/compute/red.png differ
diff --git a/resources/oci/compute/vm-white.png b/resources/oci/compute/vm-white.png
deleted file mode 100644
index 1af7e0e77..000000000
Binary files a/resources/oci/compute/vm-white.png and /dev/null differ
diff --git a/resources/oci/compute/vm.png b/resources/oci/compute/vm.png
index 1b680b633..9b4995abd 100644
Binary files a/resources/oci/compute/vm.png and b/resources/oci/compute/vm.png differ
diff --git a/resources/oci/connectivity/backbone-white.png b/resources/oci/connectivity/backbone-white.png
deleted file mode 100644
index bfe31e80e..000000000
Binary files a/resources/oci/connectivity/backbone-white.png and /dev/null differ
diff --git a/resources/oci/connectivity/backbone.png b/resources/oci/connectivity/backbone.png
index 106b15940..601743de9 100644
Binary files a/resources/oci/connectivity/backbone.png and b/resources/oci/connectivity/backbone.png differ
diff --git a/resources/oci/connectivity/cdn-white.png b/resources/oci/connectivity/cdn-white.png
deleted file mode 100644
index 605b695c9..000000000
Binary files a/resources/oci/connectivity/cdn-white.png and /dev/null differ
diff --git a/resources/oci/connectivity/cdn.png b/resources/oci/connectivity/cdn.png
index 839012b74..330402ea6 100644
Binary files a/resources/oci/connectivity/cdn.png and b/resources/oci/connectivity/cdn.png differ
diff --git a/resources/oci/connectivity/customer-datacntr-white.png b/resources/oci/connectivity/customer-datacntr-white.png
deleted file mode 100644
index 70b7c8d5e..000000000
Binary files a/resources/oci/connectivity/customer-datacntr-white.png and /dev/null differ
diff --git a/resources/oci/connectivity/customer-premise-white.png b/resources/oci/connectivity/customer-premise-white.png
deleted file mode 100644
index d557206cf..000000000
Binary files a/resources/oci/connectivity/customer-premise-white.png and /dev/null differ
diff --git a/resources/oci/connectivity/customer-premise.png b/resources/oci/connectivity/customer-premise.png
index 59dbaf93e..fd376be78 100644
Binary files a/resources/oci/connectivity/customer-premise.png and b/resources/oci/connectivity/customer-premise.png differ
diff --git a/resources/oci/connectivity/datacenter.png b/resources/oci/connectivity/datacenter.png
new file mode 100644
index 000000000..9364d7222
Binary files /dev/null and b/resources/oci/connectivity/datacenter.png differ
diff --git a/resources/oci/connectivity/disconnected-regions-white.png b/resources/oci/connectivity/disconnected-regions-white.png
deleted file mode 100644
index 329d2956b..000000000
Binary files a/resources/oci/connectivity/disconnected-regions-white.png and /dev/null differ
diff --git a/resources/oci/connectivity/disconnected-regions.png b/resources/oci/connectivity/disconnected-regions.png
index 59f6df902..79d5b7905 100644
Binary files a/resources/oci/connectivity/disconnected-regions.png and b/resources/oci/connectivity/disconnected-regions.png differ
diff --git a/resources/oci/connectivity/dns-white.png b/resources/oci/connectivity/dns-white.png
deleted file mode 100644
index 831f66288..000000000
Binary files a/resources/oci/connectivity/dns-white.png and /dev/null differ
diff --git a/resources/oci/connectivity/dns.png b/resources/oci/connectivity/dns.png
index 374c1bb52..76e05b4d9 100644
Binary files a/resources/oci/connectivity/dns.png and b/resources/oci/connectivity/dns.png differ
diff --git a/resources/oci/connectivity/fast-connect-white.png b/resources/oci/connectivity/fast-connect-white.png
deleted file mode 100644
index 57827bb9b..000000000
Binary files a/resources/oci/connectivity/fast-connect-white.png and /dev/null differ
diff --git a/resources/oci/connectivity/fast-connect.png b/resources/oci/connectivity/fast-connect.png
index 9fb1a5323..eb0b88cf0 100644
Binary files a/resources/oci/connectivity/fast-connect.png and b/resources/oci/connectivity/fast-connect.png differ
diff --git a/resources/oci/connectivity/local-peering-gateway.png b/resources/oci/connectivity/local-peering-gateway.png
new file mode 100644
index 000000000..a2f436ed1
Binary files /dev/null and b/resources/oci/connectivity/local-peering-gateway.png differ
diff --git a/resources/oci/connectivity/nat-gateway-white.png b/resources/oci/connectivity/nat-gateway-white.png
deleted file mode 100644
index 2c4d84baa..000000000
Binary files a/resources/oci/connectivity/nat-gateway-white.png and /dev/null differ
diff --git a/resources/oci/connectivity/nat-gateway.png b/resources/oci/connectivity/nat-gateway.png
index b472878c8..1bbc2f8c7 100644
Binary files a/resources/oci/connectivity/nat-gateway.png and b/resources/oci/connectivity/nat-gateway.png differ
diff --git a/resources/oci/connectivity/remote-peering-gateway.png b/resources/oci/connectivity/remote-peering-gateway.png
new file mode 100644
index 000000000..7aba0e86f
Binary files /dev/null and b/resources/oci/connectivity/remote-peering-gateway.png differ
diff --git a/resources/oci/connectivity/service-connector-hub.png b/resources/oci/connectivity/service-connector-hub.png
new file mode 100644
index 000000000..5c74f048d
Binary files /dev/null and b/resources/oci/connectivity/service-connector-hub.png differ
diff --git a/resources/oci/connectivity/vpn-white.png b/resources/oci/connectivity/vpn-white.png
deleted file mode 100644
index be80a9917..000000000
Binary files a/resources/oci/connectivity/vpn-white.png and /dev/null differ
diff --git a/resources/oci/connectivity/vpn.png b/resources/oci/connectivity/vpn.png
index 033748599..1aa104ba3 100644
Binary files a/resources/oci/connectivity/vpn.png and b/resources/oci/connectivity/vpn.png differ
diff --git a/resources/oci/database/autonomous-data-warehouse-cs.png b/resources/oci/database/autonomous-data-warehouse-cs.png
new file mode 100644
index 000000000..85ac5cf4c
Binary files /dev/null and b/resources/oci/database/autonomous-data-warehouse-cs.png differ
diff --git a/resources/oci/database/autonomous-data-warehouse.png b/resources/oci/database/autonomous-data-warehouse.png
new file mode 100644
index 000000000..6d8713d9a
Binary files /dev/null and b/resources/oci/database/autonomous-data-warehouse.png differ
diff --git a/resources/oci/database/autonomous-transaction-processing.png b/resources/oci/database/autonomous-transaction-processing.png
new file mode 100644
index 000000000..6ccdd54b4
Binary files /dev/null and b/resources/oci/database/autonomous-transaction-processing.png differ
diff --git a/resources/oci/database/autonomous-white.png b/resources/oci/database/autonomous-white.png
deleted file mode 100644
index 693951092..000000000
Binary files a/resources/oci/database/autonomous-white.png and /dev/null differ
diff --git a/resources/oci/database/autonomous.png b/resources/oci/database/autonomous.png
index e9859e2d7..fdd4cd512 100644
Binary files a/resources/oci/database/autonomous.png and b/resources/oci/database/autonomous.png differ
diff --git a/resources/oci/database/bigdata-service-white.png b/resources/oci/database/bigdata-service-white.png
deleted file mode 100644
index 76b26db49..000000000
Binary files a/resources/oci/database/bigdata-service-white.png and /dev/null differ
diff --git a/resources/oci/database/bigdata-service.png b/resources/oci/database/bigdata-service.png
index ebb395da7..93d0ab9ee 100644
Binary files a/resources/oci/database/bigdata-service.png and b/resources/oci/database/bigdata-service.png differ
diff --git a/resources/oci/database/database-service-white.png b/resources/oci/database/database-service-white.png
deleted file mode 100644
index 552c56c7e..000000000
Binary files a/resources/oci/database/database-service-white.png and /dev/null differ
diff --git a/resources/oci/database/database-service.png b/resources/oci/database/database-service.png
index 5442cecd5..c81fa6817 100644
Binary files a/resources/oci/database/database-service.png and b/resources/oci/database/database-service.png differ
diff --git a/resources/oci/database/dataflow-apache-white.png b/resources/oci/database/dataflow-apache-white.png
deleted file mode 100644
index cf69c3b5d..000000000
Binary files a/resources/oci/database/dataflow-apache-white.png and /dev/null differ
diff --git a/resources/oci/database/dataflow-apache.png b/resources/oci/database/dataflow-apache.png
index c04b65ba9..9eba90505 100644
Binary files a/resources/oci/database/dataflow-apache.png and b/resources/oci/database/dataflow-apache.png differ
diff --git a/resources/oci/database/dcat-white.png b/resources/oci/database/dcat-white.png
deleted file mode 100644
index dbff953e8..000000000
Binary files a/resources/oci/database/dcat-white.png and /dev/null differ
diff --git a/resources/oci/database/dcat.png b/resources/oci/database/dcat.png
index c1bc05b1e..580184243 100644
Binary files a/resources/oci/database/dcat.png and b/resources/oci/database/dcat.png differ
diff --git a/resources/oci/database/dcs.png b/resources/oci/database/dcs.png
new file mode 100644
index 000000000..05dfbbda5
Binary files /dev/null and b/resources/oci/database/dcs.png differ
diff --git a/resources/oci/database/dis-white.png b/resources/oci/database/dis-white.png
deleted file mode 100644
index 63ab66383..000000000
Binary files a/resources/oci/database/dis-white.png and /dev/null differ
diff --git a/resources/oci/database/dis.png b/resources/oci/database/dis.png
index 1e0dcfe47..75eb146db 100644
Binary files a/resources/oci/database/dis.png and b/resources/oci/database/dis.png differ
diff --git a/resources/oci/database/dms-white.png b/resources/oci/database/dms-white.png
deleted file mode 100644
index 4fcf1fe72..000000000
Binary files a/resources/oci/database/dms-white.png and /dev/null differ
diff --git a/resources/oci/database/dms.png b/resources/oci/database/dms.png
index dd76cb20a..25339f7be 100644
Binary files a/resources/oci/database/dms.png and b/resources/oci/database/dms.png differ
diff --git a/resources/oci/database/exadata.png b/resources/oci/database/exadata.png
new file mode 100644
index 000000000..32216f726
Binary files /dev/null and b/resources/oci/database/exadata.png differ
diff --git a/resources/oci/database/mysql.png b/resources/oci/database/mysql.png
new file mode 100644
index 000000000..d5780b45c
Binary files /dev/null and b/resources/oci/database/mysql.png differ
diff --git a/resources/oci/database/nosql.png b/resources/oci/database/nosql.png
new file mode 100644
index 000000000..70acee6c4
Binary files /dev/null and b/resources/oci/database/nosql.png differ
diff --git a/resources/oci/database/science-white.png b/resources/oci/database/science-white.png
deleted file mode 100644
index 99d8d203c..000000000
Binary files a/resources/oci/database/science-white.png and /dev/null differ
diff --git a/resources/oci/database/science.png b/resources/oci/database/science.png
index c720667c0..854c2e875 100644
Binary files a/resources/oci/database/science.png and b/resources/oci/database/science.png differ
diff --git a/resources/oci/database/stream-white.png b/resources/oci/database/stream-white.png
deleted file mode 100644
index 1406b3069..000000000
Binary files a/resources/oci/database/stream-white.png and /dev/null differ
diff --git a/resources/oci/database/stream.png b/resources/oci/database/stream.png
index 5624c168e..997493771 100644
Binary files a/resources/oci/database/stream.png and b/resources/oci/database/stream.png differ
diff --git a/resources/oci/devops/analytics.png b/resources/oci/devops/analytics.png
new file mode 100644
index 000000000..f59e3f173
Binary files /dev/null and b/resources/oci/devops/analytics.png differ
diff --git a/resources/oci/devops/api-gateway-white.png b/resources/oci/devops/api-gateway-white.png
deleted file mode 100644
index 767a98ff3..000000000
Binary files a/resources/oci/devops/api-gateway-white.png and /dev/null differ
diff --git a/resources/oci/devops/api-gateway.png b/resources/oci/devops/api-gateway.png
index d244cabfb..96e6bc549 100644
Binary files a/resources/oci/devops/api-gateway.png and b/resources/oci/devops/api-gateway.png differ
diff --git a/resources/oci/devops/api-service-white.png b/resources/oci/devops/api-service-white.png
deleted file mode 100644
index ab50a5d66..000000000
Binary files a/resources/oci/devops/api-service-white.png and /dev/null differ
diff --git a/resources/oci/devops/api-service.png b/resources/oci/devops/api-service.png
index 208047b9a..97ae5b61e 100644
Binary files a/resources/oci/devops/api-service.png and b/resources/oci/devops/api-service.png differ
diff --git a/resources/oci/devops/market-place.png b/resources/oci/devops/market-place.png
new file mode 100644
index 000000000..52a4c00e2
Binary files /dev/null and b/resources/oci/devops/market-place.png differ
diff --git a/resources/oci/devops/resource-mgmt-white.png b/resources/oci/devops/resource-mgmt-white.png
deleted file mode 100644
index ccf19009b..000000000
Binary files a/resources/oci/devops/resource-mgmt-white.png and /dev/null differ
diff --git a/resources/oci/devops/resource-mgmt.png b/resources/oci/devops/resource-mgmt.png
index 97cc3975f..89960fad1 100644
Binary files a/resources/oci/devops/resource-mgmt.png and b/resources/oci/devops/resource-mgmt.png differ
diff --git a/resources/oci/governance/audit-white.png b/resources/oci/governance/audit-white.png
deleted file mode 100644
index dc861eb5e..000000000
Binary files a/resources/oci/governance/audit-white.png and /dev/null differ
diff --git a/resources/oci/governance/audit.png b/resources/oci/governance/audit.png
index d5d7b6176..8f0bff6d3 100644
Binary files a/resources/oci/governance/audit.png and b/resources/oci/governance/audit.png differ
diff --git a/resources/oci/governance/compartments-white.png b/resources/oci/governance/compartments-white.png
deleted file mode 100644
index c4271c34b..000000000
Binary files a/resources/oci/governance/compartments-white.png and /dev/null differ
diff --git a/resources/oci/governance/compartments.png b/resources/oci/governance/compartments.png
index 8b9a9de65..886858cdc 100644
Binary files a/resources/oci/governance/compartments.png and b/resources/oci/governance/compartments.png differ
diff --git a/resources/oci/governance/flow-logs.png b/resources/oci/governance/flow-logs.png
new file mode 100644
index 000000000..bf51ff754
Binary files /dev/null and b/resources/oci/governance/flow-logs.png differ
diff --git a/resources/oci/governance/groups-white.png b/resources/oci/governance/groups-white.png
deleted file mode 100644
index 3052cef64..000000000
Binary files a/resources/oci/governance/groups-white.png and /dev/null differ
diff --git a/resources/oci/governance/groups.png b/resources/oci/governance/groups.png
index 34f1064b8..12974eec5 100644
Binary files a/resources/oci/governance/groups.png and b/resources/oci/governance/groups.png differ
diff --git a/resources/oci/governance/logging-white.png b/resources/oci/governance/logging-white.png
deleted file mode 100644
index 99b5db2da..000000000
Binary files a/resources/oci/governance/logging-white.png and /dev/null differ
diff --git a/resources/oci/governance/logging.png b/resources/oci/governance/logging.png
index 50e6836a8..156e0407f 100644
Binary files a/resources/oci/governance/logging.png and b/resources/oci/governance/logging.png differ
diff --git a/resources/oci/governance/ocid-white.png b/resources/oci/governance/ocid-white.png
deleted file mode 100644
index a69576ae2..000000000
Binary files a/resources/oci/governance/ocid-white.png and /dev/null differ
diff --git a/resources/oci/governance/ocid.png b/resources/oci/governance/ocid.png
index c5200b34e..453bc2342 100644
Binary files a/resources/oci/governance/ocid.png and b/resources/oci/governance/ocid.png differ
diff --git a/resources/oci/governance/policies-white.png b/resources/oci/governance/policies-white.png
deleted file mode 100644
index 936271cbe..000000000
Binary files a/resources/oci/governance/policies-white.png and /dev/null differ
diff --git a/resources/oci/governance/policies.png b/resources/oci/governance/policies.png
index 988efa234..f13f79e3d 100644
Binary files a/resources/oci/governance/policies.png and b/resources/oci/governance/policies.png differ
diff --git a/resources/oci/governance/tagging-white.png b/resources/oci/governance/tagging-white.png
deleted file mode 100644
index 1d27cc470..000000000
Binary files a/resources/oci/governance/tagging-white.png and /dev/null differ
diff --git a/resources/oci/governance/tagging.png b/resources/oci/governance/tagging.png
index d8bfb7eb1..435145654 100644
Binary files a/resources/oci/governance/tagging.png and b/resources/oci/governance/tagging.png differ
diff --git a/resources/oci/governance/user.png b/resources/oci/governance/user.png
new file mode 100644
index 000000000..d4b9694b0
Binary files /dev/null and b/resources/oci/governance/user.png differ
diff --git a/resources/oci/ml/artificial-intelligence.png b/resources/oci/ml/artificial-intelligence.png
new file mode 100644
index 000000000..2c26cc951
Binary files /dev/null and b/resources/oci/ml/artificial-intelligence.png differ
diff --git a/resources/oci/ml/machine-learning.png b/resources/oci/ml/machine-learning.png
new file mode 100644
index 000000000..36cb04f8d
Binary files /dev/null and b/resources/oci/ml/machine-learning.png differ
diff --git a/resources/oci/monitoring/alarm-white.png b/resources/oci/monitoring/alarm-white.png
deleted file mode 100644
index e91831b26..000000000
Binary files a/resources/oci/monitoring/alarm-white.png and /dev/null differ
diff --git a/resources/oci/monitoring/alarm.png b/resources/oci/monitoring/alarm.png
index 372e3590c..c484ae8c7 100644
Binary files a/resources/oci/monitoring/alarm.png and b/resources/oci/monitoring/alarm.png differ
diff --git a/resources/oci/monitoring/email-white.png b/resources/oci/monitoring/email-white.png
deleted file mode 100644
index a9201a7ae..000000000
Binary files a/resources/oci/monitoring/email-white.png and /dev/null differ
diff --git a/resources/oci/monitoring/email.png b/resources/oci/monitoring/email.png
index f8d843c87..2dcb67932 100644
Binary files a/resources/oci/monitoring/email.png and b/resources/oci/monitoring/email.png differ
diff --git a/resources/oci/monitoring/events-white.png b/resources/oci/monitoring/events-white.png
deleted file mode 100644
index 6445a2240..000000000
Binary files a/resources/oci/monitoring/events-white.png and /dev/null differ
diff --git a/resources/oci/monitoring/events.png b/resources/oci/monitoring/events.png
index 465be4b63..65e5fe83a 100644
Binary files a/resources/oci/monitoring/events.png and b/resources/oci/monitoring/events.png differ
diff --git a/resources/oci/monitoring/health-check-white.png b/resources/oci/monitoring/health-check-white.png
deleted file mode 100644
index 4b1dea4e2..000000000
Binary files a/resources/oci/monitoring/health-check-white.png and /dev/null differ
diff --git a/resources/oci/monitoring/health-check.png b/resources/oci/monitoring/health-check.png
index 96794e870..cac22cd27 100644
Binary files a/resources/oci/monitoring/health-check.png and b/resources/oci/monitoring/health-check.png differ
diff --git a/resources/oci/monitoring/notifications-white.png b/resources/oci/monitoring/notifications-white.png
deleted file mode 100644
index bf74ef70a..000000000
Binary files a/resources/oci/monitoring/notifications-white.png and /dev/null differ
diff --git a/resources/oci/monitoring/notifications.png b/resources/oci/monitoring/notifications.png
index 059ca8f5a..060704612 100644
Binary files a/resources/oci/monitoring/notifications.png and b/resources/oci/monitoring/notifications.png differ
diff --git a/resources/oci/monitoring/queue-white.png b/resources/oci/monitoring/queue-white.png
deleted file mode 100644
index 9f8751ddf..000000000
Binary files a/resources/oci/monitoring/queue-white.png and /dev/null differ
diff --git a/resources/oci/monitoring/queue.png b/resources/oci/monitoring/queue.png
index 38da334ba..efb6b215b 100644
Binary files a/resources/oci/monitoring/queue.png and b/resources/oci/monitoring/queue.png differ
diff --git a/resources/oci/monitoring/search-white.png b/resources/oci/monitoring/search-white.png
deleted file mode 100644
index 44f6f7cc0..000000000
Binary files a/resources/oci/monitoring/search-white.png and /dev/null differ
diff --git a/resources/oci/monitoring/search.png b/resources/oci/monitoring/search.png
index af5f951dd..1340a8d0c 100644
Binary files a/resources/oci/monitoring/search.png and b/resources/oci/monitoring/search.png differ
diff --git a/resources/oci/monitoring/telemetry-white.png b/resources/oci/monitoring/telemetry-white.png
deleted file mode 100644
index 9421c90bd..000000000
Binary files a/resources/oci/monitoring/telemetry-white.png and /dev/null differ
diff --git a/resources/oci/monitoring/telemetry.png b/resources/oci/monitoring/telemetry.png
index a5d4931ae..fda5be4da 100644
Binary files a/resources/oci/monitoring/telemetry.png and b/resources/oci/monitoring/telemetry.png differ
diff --git a/resources/oci/monitoring/workflow-white.png b/resources/oci/monitoring/workflow-white.png
deleted file mode 100644
index 0971ed5e0..000000000
Binary files a/resources/oci/monitoring/workflow-white.png and /dev/null differ
diff --git a/resources/oci/monitoring/workflow.png b/resources/oci/monitoring/workflow.png
index 9ce2300e8..fb88961c1 100644
Binary files a/resources/oci/monitoring/workflow.png and b/resources/oci/monitoring/workflow.png differ
diff --git a/resources/oci/network/cloud-service.png b/resources/oci/network/cloud-service.png
new file mode 100644
index 000000000..66ed43ab8
Binary files /dev/null and b/resources/oci/network/cloud-service.png differ
diff --git a/resources/oci/network/drg-white.png b/resources/oci/network/drg-white.png
deleted file mode 100644
index 348489777..000000000
Binary files a/resources/oci/network/drg-white.png and /dev/null differ
diff --git a/resources/oci/network/drg.png b/resources/oci/network/drg.png
index b1aaba9b2..01d194260 100644
Binary files a/resources/oci/network/drg.png and b/resources/oci/network/drg.png differ
diff --git a/resources/oci/network/firewall-white.png b/resources/oci/network/firewall-white.png
deleted file mode 100644
index 40f6631e3..000000000
Binary files a/resources/oci/network/firewall-white.png and /dev/null differ
diff --git a/resources/oci/network/firewall.png b/resources/oci/network/firewall.png
index 6c572b43a..cd4b66f5f 100644
Binary files a/resources/oci/network/firewall.png and b/resources/oci/network/firewall.png differ
diff --git a/resources/oci/network/internet-gateway-white.png b/resources/oci/network/internet-gateway-white.png
deleted file mode 100644
index b7a8a01e0..000000000
Binary files a/resources/oci/network/internet-gateway-white.png and /dev/null differ
diff --git a/resources/oci/network/internet-gateway.png b/resources/oci/network/internet-gateway.png
index 1762239a2..60848d0c0 100644
Binary files a/resources/oci/network/internet-gateway.png and b/resources/oci/network/internet-gateway.png differ
diff --git a/resources/oci/network/load-balancer-white.png b/resources/oci/network/load-balancer-white.png
deleted file mode 100644
index 12a3d33c7..000000000
Binary files a/resources/oci/network/load-balancer-white.png and /dev/null differ
diff --git a/resources/oci/network/load-balancer.png b/resources/oci/network/load-balancer.png
index 504a5acd8..15bd2b62c 100644
Binary files a/resources/oci/network/load-balancer.png and b/resources/oci/network/load-balancer.png differ
diff --git a/resources/oci/network/route-table-white.png b/resources/oci/network/route-table-white.png
deleted file mode 100644
index 0826ba4d9..000000000
Binary files a/resources/oci/network/route-table-white.png and /dev/null differ
diff --git a/resources/oci/network/route-table.png b/resources/oci/network/route-table.png
index 3733e06b2..5c3851f81 100644
Binary files a/resources/oci/network/route-table.png and b/resources/oci/network/route-table.png differ
diff --git a/resources/oci/network/router.png b/resources/oci/network/router.png
new file mode 100644
index 000000000..1daf34020
Binary files /dev/null and b/resources/oci/network/router.png differ
diff --git a/resources/oci/network/security-lists-white.png b/resources/oci/network/security-lists-white.png
deleted file mode 100644
index 6151b8b2a..000000000
Binary files a/resources/oci/network/security-lists-white.png and /dev/null differ
diff --git a/resources/oci/network/security-lists.png b/resources/oci/network/security-lists.png
index 8bcc72fe3..fdfcd82df 100644
Binary files a/resources/oci/network/security-lists.png and b/resources/oci/network/security-lists.png differ
diff --git a/resources/oci/network/service-gateway-white.png b/resources/oci/network/service-gateway-white.png
deleted file mode 100644
index b0d820d38..000000000
Binary files a/resources/oci/network/service-gateway-white.png and /dev/null differ
diff --git a/resources/oci/network/service-gateway.png b/resources/oci/network/service-gateway.png
index 548c87aff..d276c6179 100644
Binary files a/resources/oci/network/service-gateway.png and b/resources/oci/network/service-gateway.png differ
diff --git a/resources/oci/network/switch.png b/resources/oci/network/switch.png
new file mode 100644
index 000000000..f8e20b13f
Binary files /dev/null and b/resources/oci/network/switch.png differ
diff --git a/resources/oci/network/vcn-white.png b/resources/oci/network/vcn-white.png
deleted file mode 100644
index e217effe4..000000000
Binary files a/resources/oci/network/vcn-white.png and /dev/null differ
diff --git a/resources/oci/network/vcn.png b/resources/oci/network/vcn.png
index aefa7004c..7507a96f3 100644
Binary files a/resources/oci/network/vcn.png and b/resources/oci/network/vcn.png differ
diff --git a/resources/oci/security/cloud-guard-white.png b/resources/oci/security/cloud-guard-white.png
deleted file mode 100644
index db4a78d1d..000000000
Binary files a/resources/oci/security/cloud-guard-white.png and /dev/null differ
diff --git a/resources/oci/security/cloud-guard.png b/resources/oci/security/cloud-guard.png
index 8c7c8a5ea..ff7085047 100644
Binary files a/resources/oci/security/cloud-guard.png and b/resources/oci/security/cloud-guard.png differ
diff --git a/resources/oci/security/ddos-white.png b/resources/oci/security/ddos-white.png
deleted file mode 100644
index 6657c0b95..000000000
Binary files a/resources/oci/security/ddos-white.png and /dev/null differ
diff --git a/resources/oci/security/ddos.png b/resources/oci/security/ddos.png
index e2fafae40..b3fb256a0 100644
Binary files a/resources/oci/security/ddos.png and b/resources/oci/security/ddos.png differ
diff --git a/resources/oci/security/encryption-white.png b/resources/oci/security/encryption-white.png
deleted file mode 100644
index f85f35774..000000000
Binary files a/resources/oci/security/encryption-white.png and /dev/null differ
diff --git a/resources/oci/security/encryption.png b/resources/oci/security/encryption.png
index 16c1b1252..83e7d1d1a 100644
Binary files a/resources/oci/security/encryption.png and b/resources/oci/security/encryption.png differ
diff --git a/resources/oci/security/id-access-white.png b/resources/oci/security/id-access-white.png
deleted file mode 100644
index 597db4486..000000000
Binary files a/resources/oci/security/id-access-white.png and /dev/null differ
diff --git a/resources/oci/security/id-access.png b/resources/oci/security/id-access.png
index 0beebb1bc..c44862231 100644
Binary files a/resources/oci/security/id-access.png and b/resources/oci/security/id-access.png differ
diff --git a/resources/oci/security/key-management-white.png b/resources/oci/security/key-management-white.png
deleted file mode 100644
index 26cdeeaec..000000000
Binary files a/resources/oci/security/key-management-white.png and /dev/null differ
diff --git a/resources/oci/security/key-management.png b/resources/oci/security/key-management.png
index 83e43330f..c262d744f 100644
Binary files a/resources/oci/security/key-management.png and b/resources/oci/security/key-management.png differ
diff --git a/resources/oci/security/max-security-zone-white.png b/resources/oci/security/max-security-zone-white.png
deleted file mode 100644
index 27da254a6..000000000
Binary files a/resources/oci/security/max-security-zone-white.png and /dev/null differ
diff --git a/resources/oci/security/max-security-zone.png b/resources/oci/security/max-security-zone.png
index 71f98d528..6543108b6 100644
Binary files a/resources/oci/security/max-security-zone.png and b/resources/oci/security/max-security-zone.png differ
diff --git a/resources/oci/security/vault-white.png b/resources/oci/security/vault-white.png
deleted file mode 100644
index 74c18ff86..000000000
Binary files a/resources/oci/security/vault-white.png and /dev/null differ
diff --git a/resources/oci/security/vault.png b/resources/oci/security/vault.png
index 68789b9cc..8ff88ec1d 100644
Binary files a/resources/oci/security/vault.png and b/resources/oci/security/vault.png differ
diff --git a/resources/oci/security/waf-white.png b/resources/oci/security/waf-white.png
deleted file mode 100644
index c938ec282..000000000
Binary files a/resources/oci/security/waf-white.png and /dev/null differ
diff --git a/resources/oci/security/waf.png b/resources/oci/security/waf.png
index e268c9650..34b7c46d1 100644
Binary files a/resources/oci/security/waf.png and b/resources/oci/security/waf.png differ
diff --git a/resources/oci/storage/backup-restore-white.png b/resources/oci/storage/backup-restore-white.png
deleted file mode 100644
index e322b6aa3..000000000
Binary files a/resources/oci/storage/backup-restore-white.png and /dev/null differ
diff --git a/resources/oci/storage/backup-restore.png b/resources/oci/storage/backup-restore.png
index 5d9c34152..03e626b3e 100644
Binary files a/resources/oci/storage/backup-restore.png and b/resources/oci/storage/backup-restore.png differ
diff --git a/resources/oci/storage/block-storage-clone-white.png b/resources/oci/storage/block-storage-clone-white.png
deleted file mode 100644
index a372e484d..000000000
Binary files a/resources/oci/storage/block-storage-clone-white.png and /dev/null differ
diff --git a/resources/oci/storage/block-storage-clone.png b/resources/oci/storage/block-storage-clone.png
index f97b3da82..bff6105fd 100644
Binary files a/resources/oci/storage/block-storage-clone.png and b/resources/oci/storage/block-storage-clone.png differ
diff --git a/resources/oci/storage/block-storage-white.png b/resources/oci/storage/block-storage-white.png
deleted file mode 100644
index d78a1aaa6..000000000
Binary files a/resources/oci/storage/block-storage-white.png and /dev/null differ
diff --git a/resources/oci/storage/block-storage.png b/resources/oci/storage/block-storage.png
index c2408c4ea..e03402ab1 100644
Binary files a/resources/oci/storage/block-storage.png and b/resources/oci/storage/block-storage.png differ
diff --git a/resources/oci/storage/buckets-white.png b/resources/oci/storage/buckets-white.png
deleted file mode 100644
index 2607e45f4..000000000
Binary files a/resources/oci/storage/buckets-white.png and /dev/null differ
diff --git a/resources/oci/storage/buckets.png b/resources/oci/storage/buckets.png
index c93e6910f..e1e7cfc68 100644
Binary files a/resources/oci/storage/buckets.png and b/resources/oci/storage/buckets.png differ
diff --git a/resources/oci/storage/data-transfer-white.png b/resources/oci/storage/data-transfer-white.png
deleted file mode 100644
index 06e72e0ca..000000000
Binary files a/resources/oci/storage/data-transfer-white.png and /dev/null differ
diff --git a/resources/oci/storage/data-transfer.png b/resources/oci/storage/data-transfer.png
index ebdfe816d..0b03ba675 100644
Binary files a/resources/oci/storage/data-transfer.png and b/resources/oci/storage/data-transfer.png differ
diff --git a/resources/oci/storage/elastic-performance-white.png b/resources/oci/storage/elastic-performance-white.png
deleted file mode 100644
index ce8116f99..000000000
Binary files a/resources/oci/storage/elastic-performance-white.png and /dev/null differ
diff --git a/resources/oci/storage/elastic-performance.png b/resources/oci/storage/elastic-performance.png
index 627e2397e..bd3000b50 100644
Binary files a/resources/oci/storage/elastic-performance.png and b/resources/oci/storage/elastic-performance.png differ
diff --git a/resources/oci/storage/file-storage-white.png b/resources/oci/storage/file-storage-white.png
deleted file mode 100644
index 0380d32bc..000000000
Binary files a/resources/oci/storage/file-storage-white.png and /dev/null differ
diff --git a/resources/oci/storage/file-storage.png b/resources/oci/storage/file-storage.png
index c3cb4d9b4..37bf89fb1 100644
Binary files a/resources/oci/storage/file-storage.png and b/resources/oci/storage/file-storage.png differ
diff --git a/resources/oci/storage/local-storage.png b/resources/oci/storage/local-storage.png
new file mode 100644
index 000000000..3da870da2
Binary files /dev/null and b/resources/oci/storage/local-storage.png differ
diff --git a/resources/oci/storage/object-storage-white.png b/resources/oci/storage/object-storage-white.png
deleted file mode 100644
index 838b53539..000000000
Binary files a/resources/oci/storage/object-storage-white.png and /dev/null differ
diff --git a/resources/oci/storage/object-storage.png b/resources/oci/storage/object-storage.png
index 6bba0aa63..acb946705 100644
Binary files a/resources/oci/storage/object-storage.png and b/resources/oci/storage/object-storage.png differ
diff --git a/resources/oci/storage/persistent-volume.png b/resources/oci/storage/persistent-volume.png
new file mode 100644
index 000000000..cd2d8b004
Binary files /dev/null and b/resources/oci/storage/persistent-volume.png differ
diff --git a/resources/oci/storage/storage-gateway-white.png b/resources/oci/storage/storage-gateway-white.png
deleted file mode 100644
index 8b5dad4f8..000000000
Binary files a/resources/oci/storage/storage-gateway-white.png and /dev/null differ
diff --git a/resources/oci/storage/storage-gateway.png b/resources/oci/storage/storage-gateway.png
index 642e47afd..0700a2342 100644
Binary files a/resources/oci/storage/storage-gateway.png and b/resources/oci/storage/storage-gateway.png differ