diff --git a/config.py b/config.py
index 04608be95..d770019c3 100644
--- a/config.py
+++ b/config.py
@@ -62,7 +62,7 @@
         "api", "cm", "ccm", "crb", "crd", "ds", "etcd", "hpa", "k8s", "ns", "psp", "pv", "pvc", "rb", "rs",
         "sa", "sc", "sts", "svc",
     ),
-    "oci": ("oci",),
+    "oci": ("oci", "oke", "ocir"),
     "elastic": ("apm", "siem", "ece", "eck"),
     "generic": ("vpn", "ios", "xen"),
 }
@@ -357,13 +357,19 @@
     "oci": {
         "compute": {
             "Vm": "VirtualMachine",
-            "VmGrey": "VirtualMachineGrey",
+            "VmWhite": "VirtualMachineWhite",
             "Bm": "BareMetal",
-            "BmGrey": "BareMetalGrey",
+            "BmWhite": "BareMetalWhite",
+            "OCIR": "OCIRegistry",
+            "OCIRWhite": "OCIRegistryWhite",
+            "OKE": "ContainerEngine",
+            "OKEWhite": "ContainerEngineWhite",
         },
         "database": {
+            "AutonomousDatabase": "ADB",
+            "AutonomousDatabaseWhite": "ADBWhite",
             "Databaseservice": "DBService",
-            "DatabaseserviceGrey": "DBServiceGrey",
+            "DatabaseserviceWhite": "DBServiceWhite",
         }
     },
     "programming": {
diff --git a/diagrams/oci/__init__.py b/diagrams/oci/__init__.py
index 67047fca8..7613b8840 100644
--- a/diagrams/oci/__init__.py
+++ b/diagrams/oci/__init__.py
@@ -1,5 +1,5 @@
 """
-OCI provides a set of services for Oracle Cloud provider.
+OCI provides a set of services for Oracle Cloud Infrastructure provider.
 """
 
 from diagrams import Node
@@ -9,4 +9,4 @@ class _OCI(Node):
     _provider = "oci"
     _icon_dir = "resources/oci"
 
-    fontcolor = "#2d3436"
+    fontcolor = "#312D2A"
diff --git a/diagrams/oci/compute.py b/diagrams/oci/compute.py
index 47a10eef7..57733f0ef 100644
--- a/diagrams/oci/compute.py
+++ b/diagrams/oci/compute.py
@@ -8,24 +8,64 @@ class _Compute(_OCI):
     _icon_dir = "resources/oci/compute"
 
 
-class BmGrey(_Compute):
-    _icon = "bm-grey.png"
+class AutoScaleWhite(_Compute):
+    _icon = "autoscale-white.png"
+
+
+class AutoScale(_Compute):
+    _icon = "autoscale.png"
+
+
+class BmWhite(_Compute):
+    _icon = "bm-white.png"
 
 
 class Bm(_Compute):
     _icon = "bm.png"
 
 
-class ContainerGrey(_Compute):
-    _icon = "container-grey.png"
+class ContainerWhite(_Compute):
+    _icon = "container-white.png"
 
 
 class Container(_Compute):
     _icon = "container.png"
 
 
-class VmGrey(_Compute):
-    _icon = "vm-grey.png"
+class FunctionsWhite(_Compute):
+    _icon = "functions-white.png"
+
+
+class Functions(_Compute):
+    _icon = "functions.png"
+
+
+class InstancePoolsWhite(_Compute):
+    _icon = "instancepools.png"
+
+
+class InstancePools(_Compute):
+    _icon = "instancepools.png"
+
+
+class OCIRWhite(_Compute):
+    _icon = "ociregistry-white.png"
+
+
+class OCIR(_Compute):
+    _icon = "ociregistry.png"
+
+
+class OKEWhite(_Compute):
+    _icon = "containerengine-white.png"
+
+
+class OKE(_Compute):
+    _icon = "containerengine.png"
+
+
+class VmWhite(_Compute):
+    _icon = "vm-white.png"
 
 
 class Vm(_Compute):
@@ -35,6 +75,6 @@ class Vm(_Compute):
 # Aliases
 
 VirtualMachine = Vm
-VirtualMachineGrey = VmGrey
+VirtualMachineWhite = VmWhite
 BareMetal = Bm
-BareMetalGrey = BmGrey
+BareMetalWhite = BmWhite
diff --git a/diagrams/oci/connectivity.py b/diagrams/oci/connectivity.py
index 56cf5afb0..7e5ae8c4a 100644
--- a/diagrams/oci/connectivity.py
+++ b/diagrams/oci/connectivity.py
@@ -8,40 +8,40 @@ class _Connectivity(_OCI):
     _icon_dir = "resources/oci/connectivity"
 
 
-class BackboneGrey(_Connectivity):
-    _icon = "backbone-grey.png"
+class BackboneWhite(_Connectivity):
+    _icon = "backbone-white.png"
 
 
 class Backbone(_Connectivity):
     _icon = "backbone.png"
 
 
-class CustomerdatacenterGrey(_Connectivity):
-    _icon = "customerdatacenter-grey.png"
+class CustomerdatacenterWhite(_Connectivity):
+    _icon = "customerdatacenter-white.png"
 
 
 class Customerdatacenter(_Connectivity):
     _icon = "customerdatacenter.png"
 
 
-class CustomerpremisesequipGrey(_Connectivity):
-    _icon = "customerpremisesequip-grey.png"
+class CustomerpremisesequipWhite(_Connectivity):
+    _icon = "customerpremisesequip-white.png"
 
 
 class Customerpremisesequip(_Connectivity):
     _icon = "customerpremisesequip.png"
 
 
-class FastconnectGrey(_Connectivity):
-    _icon = "fastconnect-grey.png"
+class FastconnectWhite(_Connectivity):
+    _icon = "fastconnect-white.png"
 
 
 class Fastconnect(_Connectivity):
     _icon = "fastconnect.png"
 
 
-class VpnGrey(_Connectivity):
-    _icon = "vpn-grey.png"
+class VpnWhite(_Connectivity):
+    _icon = "vpn-white.png"
 
 
 class Vpn(_Connectivity):
diff --git a/diagrams/oci/database.py b/diagrams/oci/database.py
index 77fbf5c60..fe99663b9 100644
--- a/diagrams/oci/database.py
+++ b/diagrams/oci/database.py
@@ -8,8 +8,16 @@ class _Database(_OCI):
     _icon_dir = "resources/oci/database"
 
 
-class DatabaseserviceGrey(_Database):
-    _icon = "databaseservice-grey.png"
+class AutonomousDatabaseWhite(_Database):
+    _icon = "autonomous-white.png"
+
+
+class AutonomousDatabase(_Database):
+    _icon = "autonomous.png"
+
+
+class DatabaseserviceWhite(_Database):
+    _icon = "databaseservice-white.png"
 
 
 class Databaseservice(_Database):
@@ -18,5 +26,7 @@ class Databaseservice(_Database):
 
 # Aliases
 
+ADB = AutonomousDatabase
+ADBWhite = AutonomousDatabaseWhite
 DBService = Databaseservice
-DBServiceGrey = DatabaseserviceGrey
+DBServiceWhite = DatabaseserviceWhite
diff --git a/diagrams/oci/devops.py b/diagrams/oci/devops.py
index 4782dcc3d..0af5715e0 100644
--- a/diagrams/oci/devops.py
+++ b/diagrams/oci/devops.py
@@ -8,16 +8,24 @@ class _Devops(_OCI):
     _icon_dir = "resources/oci/devops"
 
 
-class ApiserviceGrey(_Devops):
-    _icon = "apiservice-grey.png"
+class ApigatewayWhite(_Devops):
+    _icon = "apigateway-white.png"
+
+
+class Apigateway(_Devops):
+    _icon = "apigateway.png"
+
+
+class ApiserviceWhite(_Devops):
+    _icon = "apiservice-white.png"
 
 
 class Apiservice(_Devops):
     _icon = "apiservice.png"
 
 
-class ResourcemgmtGrey(_Devops):
-    _icon = "resourcemgmt-grey.png"
+class ResourcemgmtWhite(_Devops):
+    _icon = "resourcemgmt-white.png"
 
 
 class Resourcemgmt(_Devops):
diff --git a/diagrams/oci/edge.py b/diagrams/oci/edge.py
index 525fd8c03..cd8077f48 100644
--- a/diagrams/oci/edge.py
+++ b/diagrams/oci/edge.py
@@ -8,32 +8,32 @@ class _Edge(_OCI):
     _icon_dir = "resources/oci/edge"
 
 
-class CdnGrey(_Edge):
-    _icon = "cdn-grey.png"
+class CdnWhite(_Edge):
+    _icon = "cdn-white.png"
 
 
 class Cdn(_Edge):
     _icon = "cdn.png"
 
 
-class DnsGrey(_Edge):
-    _icon = "dns-grey.png"
+class DnsWhite(_Edge):
+    _icon = "dns-white.png"
 
 
 class Dns(_Edge):
     _icon = "dns.png"
 
 
-class EmaildeliveryGrey(_Edge):
-    _icon = "emaildelivery-grey.png"
+class EmaildeliveryWhite(_Edge):
+    _icon = "emaildelivery-white.png"
 
 
 class Emaildelivery(_Edge):
     _icon = "emaildelivery.png"
 
 
-class WafGrey(_Edge):
-    _icon = "waf-grey.png"
+class WafWhite(_Edge):
+    _icon = "waf-white.png"
 
 
 class Waf(_Edge):
diff --git a/diagrams/oci/monitoring.py b/diagrams/oci/monitoring.py
index 5a80f5e47..3e1bf659d 100644
--- a/diagrams/oci/monitoring.py
+++ b/diagrams/oci/monitoring.py
@@ -8,80 +8,80 @@ class _Monitoring(_OCI):
     _icon_dir = "resources/oci/monitoring"
 
 
-class AlarmGrey(_Monitoring):
-    _icon = "alarm-grey.png"
+class AlarmWhite(_Monitoring):
+    _icon = "alarm-white.png"
 
 
 class Alarm(_Monitoring):
     _icon = "alarm.png"
 
 
-class EventGrey(_Monitoring):
-    _icon = "event-grey.png"
+class EventWhite(_Monitoring):
+    _icon = "event-white.png"
 
 
 class Event(_Monitoring):
     _icon = "event.png"
 
 
-class HealthcheckGrey(_Monitoring):
-    _icon = "healthcheck-grey.png"
+class HealthcheckWhite(_Monitoring):
+    _icon = "healthcheck-white.png"
 
 
 class Healthcheck(_Monitoring):
     _icon = "healthcheck.png"
 
 
-class LoggingGrey(_Monitoring):
-    _icon = "logging-grey.png"
+class LoggingWhite(_Monitoring):
+    _icon = "logging-white.png"
 
 
 class Logging(_Monitoring):
     _icon = "logging.png"
 
 
-class NotificationsGrey(_Monitoring):
-    _icon = "notifications-grey.png"
+class NotificationsWhite(_Monitoring):
+    _icon = "notifications-white.png"
 
 
 class Notifications(_Monitoring):
     _icon = "notifications.png"
 
 
-class QueuingGrey(_Monitoring):
-    _icon = "queuing-grey.png"
+class QueuingWhite(_Monitoring):
+    _icon = "queuing-white.png"
 
 
 class Queuing(_Monitoring):
     _icon = "queuing.png"
 
 
-class SearchGrey(_Monitoring):
-    _icon = "search-grey.png"
+class SearchWhite(_Monitoring):
+    _icon = "search-white.png"
 
 
 class Search(_Monitoring):
     _icon = "search.png"
 
 
-class StreamingGrey(_Monitoring):
-    _icon = "streaming-grey.png"
+class StreamingWhite(_Monitoring):
+    _icon = "streaming-white.png"
 
 
 class Streaming(_Monitoring):
     _icon = "streaming.png"
 
 
-class TelemetryGrey(_Monitoring):
-    _icon = "telemetry-grey.png"
+class TelemetryWhite(_Monitoring):
+    _icon = "telemetry-white.png"
 
 
 class Telemetry(_Monitoring):
     _icon = "telemetry.png"
 
 
-class WorkflowGrey(_Monitoring):
-    _icon = "workflow-grey.png"
+class WorkflowWhite(_Monitoring):
+    _icon = "workflow-white.png"
 
 
 class Workflow(_Monitoring):
diff --git a/diagrams/oci/network.py b/diagrams/oci/network.py
index b749ab256..f48b169ba 100644
--- a/diagrams/oci/network.py
+++ b/diagrams/oci/network.py
@@ -8,64 +8,72 @@ class _Network(_OCI):
     _icon_dir = "resources/oci/network"
 
 
-class DrgGrey(_Network):
-    _icon = "drg-grey.png"
+class DrgWhite(_Network):
+    _icon = "drg-white.png"
 
 
 class Drg(_Network):
     _icon = "drg.png"
 
 
-class FirewallGrey(_Network):
-    _icon = "firewall-grey.png"
+class FirewallWhite(_Network):
+    _icon = "firewall-white.png"
 
 
 class Firewall(_Network):
     _icon = "firewall.png"
 
 
-class InternetgatewayGrey(_Network):
-    _icon = "internetgateway-grey.png"
+class InternetgatewayWhite(_Network):
+    _icon = "internetgateway-white.png"
 
 
 class Internetgateway(_Network):
     _icon = "internetgateway.png"
 
 
-class LoadbalanceGrey(_Network):
-    _icon = "loadbalance-grey.png"
+class LoadbalanceWhite(_Network):
+    _icon = "loadbalance-white.png"
 
 
 class Loadbalance(_Network):
     _icon = "loadbalance.png"
 
 
-class RoutetableGrey(_Network):
-    _icon = "routetable-grey.png"
+class NATgatewayWhite(_Network):
+    _icon = "natgateway-white.png"
+
+
+class NATgateway(_Network):
+    _icon = "natgateway.png"
+
+
+class RoutetableWhite(_Network):
+    _icon = "routetable-white.png"
 
 
 class Routetable(_Network):
     _icon = "routetable.png"
 
 
-class SecuritylistsGrey(_Network):
-    _icon = "securitylists-grey.png"
+class SecuritylistsWhite(_Network):
+    _icon = "securitylists-white.png"
 
 
 class Securitylists(_Network):
     _icon = "securitylists.png"
 
 
-class ServiceGatewayGrey(_Network):
-    _icon = "service-gateway-grey.png"
+class ServiceGatewayWhite(_Network):
+    _icon = "service-gateway-white.png"
 
 
 class ServiceGateway(_Network):
     _icon = "service-gateway.png"
 
 
-class VcloudnetworkGrey(_Network):
-    _icon = "vcloudnetwork-grey.png"
+class VcloudnetworkWhite(_Network):
+    _icon = "vcloudnetwork-white.png"
 
 
 class Vcloudnetwork(_Network):
diff --git a/diagrams/oci/security.py b/diagrams/oci/security.py
index 04c421ca7..efe157180 100644
--- a/diagrams/oci/security.py
+++ b/diagrams/oci/security.py
@@ -8,84 +8,100 @@ class _Security(_OCI):
     _icon_dir = "resources/oci/security"
 
 
-class AuditGrey(_Security):
-    _icon = "audit-grey.png"
+class AuditWhite(_Security):
+    _icon = "audit-white.png"
 
 
 class Audit(_Security):
     _icon = "audit.png"
 
 
-class CompartmentsGrey(_Security):
-    _icon = "compartments-grey.png"
+class CloudGuardWhite(_Security):
+    _icon = "cloudguard-white.png"
+
+
+class CloudGuard(_Security):
+    _icon = "cloudguard.png"
+
+
+class CompartmentsWhite(_Security):
+    _icon = "compartments-white.png"
 
 
 class Compartments(_Security):
     _icon = "compartments.png"
 
 
-class DdosGrey(_Security):
-    _icon = "ddos-grey.png"
+class DdosWhite(_Security):
+    _icon = "ddos-white.png"
 
 
 class Ddos(_Security):
     _icon = "ddos.png"
 
 
-class EncryptionGrey(_Security):
-    _icon = "encryption-grey.png"
+class EncryptionWhite(_Security):
+    _icon = "encryption-white.png"
 
 
 class Encryption(_Security):
     _icon = "encryption.png"
 
 
-class GroupsGrey(_Security):
-    _icon = "groups-grey.png"
+class GroupsWhite(_Security):
+    _icon = "groups-white.png"
 
 
 class Groups(_Security):
     _icon = "groups.png"
 
 
-class IdAccessGrey(_Security):
-    _icon = "id-access-grey.png"
+class IdAccessWhite(_Security):
+    _icon = "id-access-white.png"
 
 
 class IdAccess(_Security):
     _icon = "id-access.png"
 
 
-class KeymgmtGrey(_Security):
-    _icon = "keymgmt-grey.png"
+class KeymgmtWhite(_Security):
+    _icon = "keymgmt-white.png"
 
 
 class Keymgmt(_Security):
     _icon = "keymgmt.png"
 
 
-class OcidGrey(_Security):
-    _icon = "ocid-grey.png"
+class OcidWhite(_Security):
+    _icon = "ocid-white.png"
 
 
 class Ocid(_Security):
     _icon = "ocid.png"
 
 
-class PoliciesGrey(_Security):
-    _icon = "policies-grey.png"
+class PoliciesWhite(_Security):
+    _icon = "policies-white.png"
 
 
 class Policies(_Security):
     _icon = "policies.png"
 
 
-class TaggingGrey(_Security):
-    _icon = "tagging-grey.png"
+class TaggingWhite(_Security):
+    _icon = "tagging-white.png"
 
 
 class Tagging(_Security):
     _icon = "tagging.png"
 
 
+class VaultWhite(_Security):
+    _icon = "vault-white.png"
+
+
+class Vault(_Security):
+    _icon = "vault.png"
+
+
 # Aliases
diff --git a/diagrams/oci/storage.py b/diagrams/oci/storage.py
index 94f11a253..c37715c85 100644
--- a/diagrams/oci/storage.py
+++ b/diagrams/oci/storage.py
@@ -8,56 +8,56 @@ class _Storage(_OCI):
     _icon_dir = "resources/oci/storage"
 
 
-class BackuprestoreGrey(_Storage):
-    _icon = "backuprestore-grey.png"
+class BackuprestoreWhite(_Storage):
+    _icon = "backuprestore-white.png"
 
 
 class Backuprestore(_Storage):
     _icon = "backuprestore.png"
 
 
-class BlockstorageGrey(_Storage):
-    _icon = "blockstorage-grey.png"
+class BlockstorageWhite(_Storage):
+    _icon = "blockstorage-white.png"
 
 
 class Blockstorage(_Storage):
     _icon = "blockstorage.png"
 
 
-class BucketsGrey(_Storage):
-    _icon = "buckets-grey.png"
+class BucketsWhite(_Storage):
+    _icon = "buckets-white.png"
 
 
 class Buckets(_Storage):
     _icon = "buckets.png"
 
 
-class DatatransferGrey(_Storage):
-    _icon = "datatransfer-grey.png"
+class DatatransferWhite(_Storage):
+    _icon = "datatransfer-white.png"
 
 
 class Datatransfer(_Storage):
     _icon = "datatransfer.png"
 
 
-class FilestorageGrey(_Storage):
-    _icon = "filestorage-grey.png"
+class FilestorageWhite(_Storage):
+    _icon = "filestorage-white.png"
 
 
 class Filestorage(_Storage):
     _icon = "filestorage.png"
 
 
-class ObjectstorageGrey(_Storage):
-    _icon = "objectstorage-grey.png"
+class ObjectstorageWhite(_Storage):
+    _icon = "objectstorage-white.png"
 
 
 class Objectstorage(_Storage):
     _icon = "objectstorage.png"
 
 
-class StoragegatewayGrey(_Storage):
-    _icon = "storagegateway-grey.png"
+class StoragegatewayWhite(_Storage):
+    _icon = "storagegateway-white.png"
 
 
 class Storagegateway(_Storage):
diff --git a/docs/nodes/oci.md b/docs/nodes/oci.md
index 568fe9abe..f752cf826 100644
--- a/docs/nodes/oci.md
+++ b/docs/nodes/oci.md
@@ -7,127 +7,147 @@ Node classes list of oci provider.
 
 ## oci.compute
 
-- **diagrams.oci.compute.BmGrey**, **BareMetalGrey** (alias)
+- **diagrams.oci.compute.AutoScaleWhite**
+- **diagrams.oci.compute.AutoScale**
+- **diagrams.oci.compute.BmWhite**, **BareMetalWhite** (alias)
 - **diagrams.oci.compute.Bm**, **BareMetal** (alias)
-- **diagrams.oci.compute.ContainerGrey**
+- **diagrams.oci.compute.ContainerWhite**
 - **diagrams.oci.compute.Container**
-- **diagrams.oci.compute.VmGrey**, **VirtualMachineGrey** (alias)
+- **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** (aliass)
+- **diagrams.oci.compute.OKE**, **ContainerEngine** (alias)
+- **diagrams.oci.compute.VmWhite**, **VirtualMachineWhite** (alias)
 - **diagrams.oci.compute.Vm**, **VirtualMachine** (alias)
 
 ## oci.connectivity
 
-- **diagrams.oci.connectivity.BackboneGrey**
+- **diagrams.oci.connectivity.BackboneWhite**
 - **diagrams.oci.connectivity.Backbone**
-- **diagrams.oci.connectivity.CustomerdatacenterGrey**
+- **diagrams.oci.connectivity.CustomerdatacenterWhite**
 - **diagrams.oci.connectivity.Customerdatacenter**
-- **diagrams.oci.connectivity.CustomerpremisesequipGrey**
+- **diagrams.oci.connectivity.CustomerpremisesequipWhite**
 - **diagrams.oci.connectivity.Customerpremisesequip**
-- **diagrams.oci.connectivity.FastconnectGrey**
+- **diagrams.oci.connectivity.FastconnectWhite**
 - **diagrams.oci.connectivity.Fastconnect**
-- **diagrams.oci.connectivity.VpnGrey**
+- **diagrams.oci.connectivity.VpnWhite**
 - **diagrams.oci.connectivity.Vpn**
 
 ## oci.database
 
-- **diagrams.oci.database.DatabaseserviceGrey**, **DBServiceGrey** (alias)
+- **diagrams.oci.database.AutonomousDatabaseWhite**, **ADBWhite** (alias)
+- **diagrams.oci.database.AutonomousDatabase**, **ADB** (alias)
+- **diagrams.oci.database.DatabaseserviceWhite**, **DBServiceWhite** (alias)
 - **diagrams.oci.database.Databaseservice**, **DBService** (alias)
 
 ## oci.devops
 
-- **diagrams.oci.devops.ApiserviceGrey**
+- **diagrams.oci.devops.ApigatewayWhite**
+- **diagrams.oci.devops.Apigateway**
+- **diagrams.oci.devops.ApiserviceWhite**
 - **diagrams.oci.devops.Apiservice**
-- **diagrams.oci.devops.ResourcemgmtGrey**
+- **diagrams.oci.devops.ResourcemgmtWhite**
 - **diagrams.oci.devops.Resourcemgmt**
 
 ## oci.edge
 
-- **diagrams.oci.edge.CdnGrey**
+- **diagrams.oci.edge.CdnWhite**
 - **diagrams.oci.edge.Cdn**
-- **diagrams.oci.edge.DnsGrey**
+- **diagrams.oci.edge.DnsWhite**
 - **diagrams.oci.edge.Dns**
-- **diagrams.oci.edge.EmaildeliveryGrey**
+- **diagrams.oci.edge.EmaildeliveryWhite**
 - **diagrams.oci.edge.Emaildelivery**
-- **diagrams.oci.edge.WafGrey**
+- **diagrams.oci.edge.WafWhite**
 - **diagrams.oci.edge.Waf**
 
 ## oci.monitoring
 
-- **diagrams.oci.monitoring.AlarmGrey**
+- **diagrams.oci.monitoring.AlarmWhite**
 - **diagrams.oci.monitoring.Alarm**
-- **diagrams.oci.monitoring.EventGrey**
+- **diagrams.oci.monitoring.EventWhite**
 - **diagrams.oci.monitoring.Event**
-- **diagrams.oci.monitoring.HealthcheckGrey**
+- **diagrams.oci.monitoring.HealthcheckWhite**
 - **diagrams.oci.monitoring.Healthcheck**
-- **diagrams.oci.monitoring.LoggingGrey**
+- **diagrams.oci.monitoring.LoggingWhite**
 - **diagrams.oci.monitoring.Logging**
-- **diagrams.oci.monitoring.NotificationsGrey**
+- **diagrams.oci.monitoring.NotificationsWhite**
 - **diagrams.oci.monitoring.Notifications**
-- **diagrams.oci.monitoring.QueuingGrey**
+- **diagrams.oci.monitoring.QueuingWhite**
 - **diagrams.oci.monitoring.Queuing**
-- **diagrams.oci.monitoring.SearchGrey**
+- **diagrams.oci.monitoring.SearchWhite**
 - **diagrams.oci.monitoring.Search**
-- **diagrams.oci.monitoring.StreamingGrey**
+- **diagrams.oci.monitoring.StreamingWhite**
 - **diagrams.oci.monitoring.Streaming**
-- **diagrams.oci.monitoring.TelemetryGrey**
+- **diagrams.oci.monitoring.TelemetryWhite**
 - **diagrams.oci.monitoring.Telemetry**
-- **diagrams.oci.monitoring.WorkflowGrey**
+- **diagrams.oci.monitoring.WorkflowWhite**
 - **diagrams.oci.monitoring.Workflow**
 
 ## oci.network
 
-- **diagrams.oci.network.DrgGrey**
+- **diagrams.oci.network.DrgWhite**
 - **diagrams.oci.network.Drg**
-- **diagrams.oci.network.FirewallGrey**
+- **diagrams.oci.network.FirewallWhite**
 - **diagrams.oci.network.Firewall**
-- **diagrams.oci.network.InternetgatewayGrey**
+- **diagrams.oci.network.InternetgatewayWhite**
 - **diagrams.oci.network.Internetgateway**
-- **diagrams.oci.network.LoadbalanceGrey**
+- **diagrams.oci.network.LoadbalanceWhite**
 - **diagrams.oci.network.Loadbalance**
-- **diagrams.oci.network.RoutetableGrey**
+- **diagrams.oci.network.NATgatewayWhite**
+- **diagrams.oci.network.NATgateway**
+- **diagrams.oci.network.RoutetableWhite**
 - **diagrams.oci.network.Routetable**
-- **diagrams.oci.network.SecuritylistsGrey**
+- **diagrams.oci.network.SecuritylistsWhite**
 - **diagrams.oci.network.Securitylists**
-- **diagrams.oci.network.ServiceGatewayGrey**
+- **diagrams.oci.network.ServiceGatewayWhite**
 - **diagrams.oci.network.ServiceGateway**
-- **diagrams.oci.network.VcloudnetworkGrey**
+- **diagrams.oci.network.VcloudnetworkWhite**
 - **diagrams.oci.network.Vcloudnetwork**
 
 ## oci.security
 
-- **diagrams.oci.security.AuditGrey**
+- **diagrams.oci.security.AuditWhite**
 - **diagrams.oci.security.Audit**
-- **diagrams.oci.security.CompartmentsGrey**
+- **diagrams.oci.security.CompartmentsWhite**
 - **diagrams.oci.security.Compartments**
-- **diagrams.oci.security.DdosGrey**
+- **diagrams.oci.security.CloudGuardWhite**
+- **diagrams.oci.security.CloudGuard**
+- **diagrams.oci.security.DdosWhite**
 - **diagrams.oci.security.Ddos**
-- **diagrams.oci.security.EncryptionGrey**
+- **diagrams.oci.security.EncryptionWhite**
 - **diagrams.oci.security.Encryption**
-- **diagrams.oci.security.GroupsGrey**
+- **diagrams.oci.security.GroupsWhite**
 - **diagrams.oci.security.Groups**
-- **diagrams.oci.security.IdAccessGrey**
+- **diagrams.oci.security.IdAccessWhite**
 - **diagrams.oci.security.IdAccess**
-- **diagrams.oci.security.KeymgmtGrey**
+- **diagrams.oci.security.KeymgmtWhite**
 - **diagrams.oci.security.Keymgmt**
-- **diagrams.oci.security.OcidGrey**
+- **diagrams.oci.security.OcidWhite**
 - **diagrams.oci.security.Ocid**
-- **diagrams.oci.security.PoliciesGrey**
+- **diagrams.oci.security.PoliciesWhite**
 - **diagrams.oci.security.Policies**
-- **diagrams.oci.security.TaggingGrey**
+- **diagrams.oci.security.TaggingWhite**
 - **diagrams.oci.security.Tagging**
+- **diagrams.oci.security.VaultWhite**
+- **diagrams.oci.security.Vault**
 
 ## oci.storage
 
-- **diagrams.oci.storage.BackuprestoreGrey**
+- **diagrams.oci.storage.BackuprestoreWhite**
 - **diagrams.oci.storage.Backuprestore**
-- **diagrams.oci.storage.BlockstorageGrey**
+- **diagrams.oci.storage.BlockstorageWhite**
 - **diagrams.oci.storage.Blockstorage**
-- **diagrams.oci.storage.BucketsGrey**
+- **diagrams.oci.storage.BucketsWhite**
 - **diagrams.oci.storage.Buckets**
-- **diagrams.oci.storage.DatatransferGrey**
+- **diagrams.oci.storage.DatatransferWhite**
 - **diagrams.oci.storage.Datatransfer**
-- **diagrams.oci.storage.FilestorageGrey**
+- **diagrams.oci.storage.FilestorageWhite**
 - **diagrams.oci.storage.Filestorage**
-- **diagrams.oci.storage.ObjectstorageGrey**
+- **diagrams.oci.storage.ObjectstorageWhite**
 - **diagrams.oci.storage.Objectstorage**
-- **diagrams.oci.storage.StoragegatewayGrey**
+- **diagrams.oci.storage.StoragegatewayWhite**
 - **diagrams.oci.storage.Storagegateway**
diff --git a/resources/oci/compute/autonomous-white.png b/resources/oci/compute/autonomous-white.png
new file mode 100755
index 000000000..6f5180a7c
Binary files /dev/null and b/resources/oci/compute/autonomous-white.png differ
diff --git a/resources/oci/compute/autonomous.png b/resources/oci/compute/autonomous.png
new file mode 100755
index 000000000..005dda775
Binary files /dev/null and b/resources/oci/compute/autonomous.png differ
diff --git a/resources/oci/compute/autoscale-white.png b/resources/oci/compute/autoscale-white.png
new file mode 100755
index 000000000..3cbbbd760
Binary files /dev/null and b/resources/oci/compute/autoscale-white.png differ
diff --git a/resources/oci/compute/autoscale.png b/resources/oci/compute/autoscale.png
new file mode 100755
index 000000000..8b17924a2
Binary files /dev/null and b/resources/oci/compute/autoscale.png differ
diff --git a/resources/oci/compute/bm-grey.png b/resources/oci/compute/bm-grey.png
deleted file mode 100644
index a29863c15..000000000
Binary files a/resources/oci/compute/bm-grey.png and /dev/null differ
diff --git a/resources/oci/compute/bm-white.png b/resources/oci/compute/bm-white.png
new file mode 100755
index 000000000..e4343e34d
Binary files /dev/null and b/resources/oci/compute/bm-white.png differ
diff --git a/resources/oci/compute/bm.png b/resources/oci/compute/bm.png
old mode 100644
new mode 100755
index 991796c12..6a3922c23
Binary files a/resources/oci/compute/bm.png and b/resources/oci/compute/bm.png differ
diff --git a/resources/oci/compute/container-grey.png b/resources/oci/compute/container-grey.png
deleted file mode 100644
index 803adde72..000000000
Binary files a/resources/oci/compute/container-grey.png and /dev/null differ
diff --git a/resources/oci/compute/container-white.png b/resources/oci/compute/container-white.png
new file mode 100755
index 000000000..7e107cdef
Binary files /dev/null and b/resources/oci/compute/container-white.png differ
diff --git a/resources/oci/compute/container.png b/resources/oci/compute/container.png
old mode 100644
new mode 100755
index 189150d83..aa36ca6a8
Binary files a/resources/oci/compute/container.png and b/resources/oci/compute/container.png differ
diff --git a/resources/oci/compute/containerengine-white.png b/resources/oci/compute/containerengine-white.png
new file mode 100755
index 000000000..2a900deaa
Binary files /dev/null and b/resources/oci/compute/containerengine-white.png differ
diff --git a/resources/oci/compute/containerengine.png b/resources/oci/compute/containerengine.png
new file mode 100755
index 000000000..313cdae41
Binary files /dev/null and b/resources/oci/compute/containerengine.png differ
diff --git a/resources/oci/compute/functions-white.png b/resources/oci/compute/functions-white.png
new file mode 100755
index 000000000..3d7c40acf
Binary files /dev/null and b/resources/oci/compute/functions-white.png differ
diff --git a/resources/oci/compute/functions.png b/resources/oci/compute/functions.png
new file mode 100755
index 000000000..048be8fb8
Binary files /dev/null and b/resources/oci/compute/functions.png differ
diff --git a/resources/oci/compute/instancepools-white.png b/resources/oci/compute/instancepools-white.png
new file mode 100755
index 000000000..8846da28b
Binary files /dev/null and b/resources/oci/compute/instancepools-white.png differ
diff --git a/resources/oci/compute/instancepools.png b/resources/oci/compute/instancepools.png
new file mode 100755
index 000000000..b9f152148
Binary files /dev/null and b/resources/oci/compute/instancepools.png differ
diff --git a/resources/oci/compute/natgateway-white.png b/resources/oci/compute/natgateway-white.png
new file mode 100755
index 000000000..12a1307bf
Binary files /dev/null and b/resources/oci/compute/natgateway-white.png differ
diff --git a/resources/oci/compute/natgateway.png b/resources/oci/compute/natgateway.png
new file mode 100755
index 000000000..8491a82a6
Binary files /dev/null and b/resources/oci/compute/natgateway.png differ
diff --git a/resources/oci/compute/ociregistry-white.png b/resources/oci/compute/ociregistry-white.png
new file mode 100755
index 000000000..502c98340
Binary files /dev/null and b/resources/oci/compute/ociregistry-white.png differ
diff --git a/resources/oci/compute/ociregistry.png b/resources/oci/compute/ociregistry.png
new file mode 100755
index 000000000..c86b75343
Binary files /dev/null and b/resources/oci/compute/ociregistry.png differ
diff --git a/resources/oci/compute/vm-grey.png b/resources/oci/compute/vm-grey.png
deleted file mode 100644
index 00f665af3..000000000
Binary files a/resources/oci/compute/vm-grey.png and /dev/null differ
diff --git a/resources/oci/compute/vm-white.png b/resources/oci/compute/vm-white.png
new file mode 100755
index 000000000..b6bd89abb
Binary files /dev/null and b/resources/oci/compute/vm-white.png differ
diff --git a/resources/oci/compute/vm.png b/resources/oci/compute/vm.png
old mode 100644
new mode 100755
index a75443700..d2bcdfda4
Binary files a/resources/oci/compute/vm.png and b/resources/oci/compute/vm.png differ
diff --git a/resources/oci/connectivity/backbone-grey.png b/resources/oci/connectivity/backbone-grey.png
deleted file mode 100644
index 0f7320f6a..000000000
Binary files a/resources/oci/connectivity/backbone-grey.png and /dev/null differ
diff --git a/resources/oci/connectivity/backbone-white.png b/resources/oci/connectivity/backbone-white.png
new file mode 100755
index 000000000..e0655adf2
Binary files /dev/null and b/resources/oci/connectivity/backbone-white.png differ
diff --git a/resources/oci/connectivity/backbone.png b/resources/oci/connectivity/backbone.png
old mode 100644
new mode 100755
index 3ca6e2839..c8cb57e39
Binary files a/resources/oci/connectivity/backbone.png and b/resources/oci/connectivity/backbone.png differ
diff --git a/resources/oci/connectivity/customerdatacenter-grey.png b/resources/oci/connectivity/customerdatacenter-grey.png
deleted file mode 100644
index 54371f411..000000000
Binary files a/resources/oci/connectivity/customerdatacenter-grey.png and /dev/null differ
diff --git a/resources/oci/connectivity/customerdatacenter-white.png b/resources/oci/connectivity/customerdatacenter-white.png
new file mode 100755
index 000000000..df3a6e940
Binary files /dev/null and b/resources/oci/connectivity/customerdatacenter-white.png differ
diff --git a/resources/oci/connectivity/customerdatacenter.png b/resources/oci/connectivity/customerdatacenter.png
old mode 100644
new mode 100755
index a1f6a4c3b..6a991556a
Binary files a/resources/oci/connectivity/customerdatacenter.png and b/resources/oci/connectivity/customerdatacenter.png differ
diff --git a/resources/oci/connectivity/customerpremisesequip-grey.png b/resources/oci/connectivity/customerpremisesequip-grey.png
deleted file mode 100644
index 5345bdde9..000000000
Binary files a/resources/oci/connectivity/customerpremisesequip-grey.png and /dev/null differ
diff --git a/resources/oci/connectivity/customerpremisesequip-white.png b/resources/oci/connectivity/customerpremisesequip-white.png
new file mode 100755
index 000000000..f54912ef5
Binary files /dev/null and b/resources/oci/connectivity/customerpremisesequip-white.png differ
diff --git a/resources/oci/connectivity/customerpremisesequip.png b/resources/oci/connectivity/customerpremisesequip.png
old mode 100644
new mode 100755
index 6408ebf46..8798f2a6a
Binary files a/resources/oci/connectivity/customerpremisesequip.png and b/resources/oci/connectivity/customerpremisesequip.png differ
diff --git a/resources/oci/connectivity/fastconnect-grey.png b/resources/oci/connectivity/fastconnect-grey.png
deleted file mode 100644
index 52840b4c3..000000000
Binary files a/resources/oci/connectivity/fastconnect-grey.png and /dev/null differ
diff --git a/resources/oci/connectivity/fastconnect-white.png b/resources/oci/connectivity/fastconnect-white.png
new file mode 100755
index 000000000..8171667f9
Binary files /dev/null and b/resources/oci/connectivity/fastconnect-white.png differ
diff --git a/resources/oci/connectivity/fastconnect.png b/resources/oci/connectivity/fastconnect.png
old mode 100644
new mode 100755
index eef7b2218..fefbed214
Binary files a/resources/oci/connectivity/fastconnect.png and b/resources/oci/connectivity/fastconnect.png differ
diff --git a/resources/oci/connectivity/vpn-grey.png b/resources/oci/connectivity/vpn-grey.png
deleted file mode 100644
index fd39c76a3..000000000
Binary files a/resources/oci/connectivity/vpn-grey.png and /dev/null differ
diff --git a/resources/oci/connectivity/vpn-white.png b/resources/oci/connectivity/vpn-white.png
new file mode 100755
index 000000000..1e68be3d7
Binary files /dev/null and b/resources/oci/connectivity/vpn-white.png differ
diff --git a/resources/oci/connectivity/vpn.png b/resources/oci/connectivity/vpn.png
old mode 100644
new mode 100755
index 5097bd7a4..479076c14
Binary files a/resources/oci/connectivity/vpn.png and b/resources/oci/connectivity/vpn.png differ
diff --git a/resources/oci/database/databaseservice-grey.png b/resources/oci/database/databaseservice-grey.png
deleted file mode 100644
index f7c6ad74a..000000000
Binary files a/resources/oci/database/databaseservice-grey.png and /dev/null differ
diff --git a/resources/oci/database/databaseservice-white.png b/resources/oci/database/databaseservice-white.png
new file mode 100755
index 000000000..00d7f544a
Binary files /dev/null and b/resources/oci/database/databaseservice-white.png differ
diff --git a/resources/oci/database/databaseservice.png b/resources/oci/database/databaseservice.png
old mode 100644
new mode 100755
index 94efb37ab..be3bcba2d
Binary files a/resources/oci/database/databaseservice.png and b/resources/oci/database/databaseservice.png differ
diff --git a/resources/oci/devops/apigateway-white.png b/resources/oci/devops/apigateway-white.png
new file mode 100755
index 000000000..8cbb2a91e
Binary files /dev/null and b/resources/oci/devops/apigateway-white.png differ
diff --git a/resources/oci/devops/apigateway.png b/resources/oci/devops/apigateway.png
new file mode 100755
index 000000000..d68b2d2f7
Binary files /dev/null and b/resources/oci/devops/apigateway.png differ
diff --git a/resources/oci/devops/apiservice-grey.png b/resources/oci/devops/apiservice-grey.png
deleted file mode 100644
index 0fa1ebd91..000000000
Binary files a/resources/oci/devops/apiservice-grey.png and /dev/null differ
diff --git a/resources/oci/devops/apiservice-white.png b/resources/oci/devops/apiservice-white.png
new file mode 100755
index 000000000..300dc408b
Binary files /dev/null and b/resources/oci/devops/apiservice-white.png differ
diff --git a/resources/oci/devops/apiservice.png b/resources/oci/devops/apiservice.png
old mode 100644
new mode 100755
index 554357ac2..4297ddc17
Binary files a/resources/oci/devops/apiservice.png and b/resources/oci/devops/apiservice.png differ
diff --git a/resources/oci/devops/resourcemgmt-grey.png b/resources/oci/devops/resourcemgmt-grey.png
deleted file mode 100644
index b12bab17c..000000000
Binary files a/resources/oci/devops/resourcemgmt-grey.png and /dev/null differ
diff --git a/resources/oci/devops/resourcemgmt-white.png b/resources/oci/devops/resourcemgmt-white.png
new file mode 100755
index 000000000..486aa911c
Binary files /dev/null and b/resources/oci/devops/resourcemgmt-white.png differ
diff --git a/resources/oci/devops/resourcemgmt.png b/resources/oci/devops/resourcemgmt.png
old mode 100644
new mode 100755
index cf04766b1..a511864e4
Binary files a/resources/oci/devops/resourcemgmt.png and b/resources/oci/devops/resourcemgmt.png differ
diff --git a/resources/oci/edge/cdn-grey.png b/resources/oci/edge/cdn-grey.png
deleted file mode 100644
index d2def89fa..000000000
Binary files a/resources/oci/edge/cdn-grey.png and /dev/null differ
diff --git a/resources/oci/edge/cdn-white.png b/resources/oci/edge/cdn-white.png
new file mode 100755
index 000000000..ca3b53c12
Binary files /dev/null and b/resources/oci/edge/cdn-white.png differ
diff --git a/resources/oci/edge/cdn.png b/resources/oci/edge/cdn.png
old mode 100644
new mode 100755
index 3afe80e15..abe058c5d
Binary files a/resources/oci/edge/cdn.png and b/resources/oci/edge/cdn.png differ
diff --git a/resources/oci/edge/dns-grey.png b/resources/oci/edge/dns-grey.png
deleted file mode 100644
index 6379b6218..000000000
Binary files a/resources/oci/edge/dns-grey.png and /dev/null differ
diff --git a/resources/oci/edge/dns-white.png b/resources/oci/edge/dns-white.png
new file mode 100755
index 000000000..749d73c51
Binary files /dev/null and b/resources/oci/edge/dns-white.png differ
diff --git a/resources/oci/edge/dns.png b/resources/oci/edge/dns.png
old mode 100644
new mode 100755
index 6b8b84aa9..e075c4f7e
Binary files a/resources/oci/edge/dns.png and b/resources/oci/edge/dns.png differ
diff --git a/resources/oci/edge/emaildelivery-grey.png b/resources/oci/edge/emaildelivery-grey.png
deleted file mode 100644
index c879d3c93..000000000
Binary files a/resources/oci/edge/emaildelivery-grey.png and /dev/null differ
diff --git a/resources/oci/edge/emaildelivery-white.png b/resources/oci/edge/emaildelivery-white.png
new file mode 100755
index 000000000..68beb80ce
Binary files /dev/null and b/resources/oci/edge/emaildelivery-white.png differ
diff --git a/resources/oci/edge/emaildelivery.png b/resources/oci/edge/emaildelivery.png
old mode 100644
new mode 100755
index 9f80bd6cd..bc18bb3a7
Binary files a/resources/oci/edge/emaildelivery.png and b/resources/oci/edge/emaildelivery.png differ
diff --git a/resources/oci/edge/waf-grey.png b/resources/oci/edge/waf-grey.png
deleted file mode 100644
index b841500e4..000000000
Binary files a/resources/oci/edge/waf-grey.png and /dev/null differ
diff --git a/resources/oci/edge/waf-white.png b/resources/oci/edge/waf-white.png
new file mode 100755
index 000000000..38d011998
Binary files /dev/null and b/resources/oci/edge/waf-white.png differ
diff --git a/resources/oci/edge/waf.png b/resources/oci/edge/waf.png
old mode 100644
new mode 100755
index 71db3921d..06e28bec5
Binary files a/resources/oci/edge/waf.png and b/resources/oci/edge/waf.png differ
diff --git a/resources/oci/monitoring/alarm-grey.png b/resources/oci/monitoring/alarm-grey.png
deleted file mode 100644
index 0cadc0365..000000000
Binary files a/resources/oci/monitoring/alarm-grey.png and /dev/null differ
diff --git a/resources/oci/monitoring/alarm-white.png b/resources/oci/monitoring/alarm-white.png
new file mode 100755
index 000000000..7eddc27a8
Binary files /dev/null and b/resources/oci/monitoring/alarm-white.png differ
diff --git a/resources/oci/monitoring/alarm.png b/resources/oci/monitoring/alarm.png
old mode 100644
new mode 100755
index 3798d6e59..e506914a3
Binary files a/resources/oci/monitoring/alarm.png and b/resources/oci/monitoring/alarm.png differ
diff --git a/resources/oci/monitoring/event-grey.png b/resources/oci/monitoring/event-grey.png
deleted file mode 100644
index f15da5ebc..000000000
Binary files a/resources/oci/monitoring/event-grey.png and /dev/null differ
diff --git a/resources/oci/monitoring/event-white.png b/resources/oci/monitoring/event-white.png
new file mode 100755
index 000000000..8c3797dc0
Binary files /dev/null and b/resources/oci/monitoring/event-white.png differ
diff --git a/resources/oci/monitoring/event.png b/resources/oci/monitoring/event.png
old mode 100644
new mode 100755
index 8d9235b83..8f06e0adb
Binary files a/resources/oci/monitoring/event.png and b/resources/oci/monitoring/event.png differ
diff --git a/resources/oci/monitoring/healthcheck-grey.png b/resources/oci/monitoring/healthcheck-grey.png
deleted file mode 100644
index 078a49893..000000000
Binary files a/resources/oci/monitoring/healthcheck-grey.png and /dev/null differ
diff --git a/resources/oci/monitoring/healthcheck-white.png b/resources/oci/monitoring/healthcheck-white.png
new file mode 100755
index 000000000..de683069d
Binary files /dev/null and b/resources/oci/monitoring/healthcheck-white.png differ
diff --git a/resources/oci/monitoring/healthcheck.png b/resources/oci/monitoring/healthcheck.png
old mode 100644
new mode 100755
index f15b1964b..4d3845fa8
Binary files a/resources/oci/monitoring/healthcheck.png and b/resources/oci/monitoring/healthcheck.png differ
diff --git a/resources/oci/monitoring/logging-grey.png b/resources/oci/monitoring/logging-grey.png
deleted file mode 100644
index 41fecb03c..000000000
Binary files a/resources/oci/monitoring/logging-grey.png and /dev/null differ
diff --git a/resources/oci/monitoring/logging-white.png b/resources/oci/monitoring/logging-white.png
new file mode 100755
index 000000000..c53b8db6f
Binary files /dev/null and b/resources/oci/monitoring/logging-white.png differ
diff --git a/resources/oci/monitoring/logging.png b/resources/oci/monitoring/logging.png
old mode 100644
new mode 100755
index ac6b45d26..c0501324b
Binary files a/resources/oci/monitoring/logging.png and b/resources/oci/monitoring/logging.png differ
diff --git a/resources/oci/monitoring/notifications-grey.png b/resources/oci/monitoring/notifications-grey.png
deleted file mode 100644
index 1ddb1efc0..000000000
Binary files a/resources/oci/monitoring/notifications-grey.png and /dev/null differ
diff --git a/resources/oci/monitoring/notifications-white.png b/resources/oci/monitoring/notifications-white.png
new file mode 100755
index 000000000..d39aba641
Binary files /dev/null and b/resources/oci/monitoring/notifications-white.png differ
diff --git a/resources/oci/monitoring/notifications.png b/resources/oci/monitoring/notifications.png
old mode 100644
new mode 100755
index 12c80b369..8f07af6a9
Binary files a/resources/oci/monitoring/notifications.png and b/resources/oci/monitoring/notifications.png differ
diff --git a/resources/oci/monitoring/queuing-grey.png b/resources/oci/monitoring/queuing-grey.png
deleted file mode 100644
index fd1284039..000000000
Binary files a/resources/oci/monitoring/queuing-grey.png and /dev/null differ
diff --git a/resources/oci/monitoring/queuing-white.png b/resources/oci/monitoring/queuing-white.png
new file mode 100755
index 000000000..d12e5d279
Binary files /dev/null and b/resources/oci/monitoring/queuing-white.png differ
diff --git a/resources/oci/monitoring/queuing.png b/resources/oci/monitoring/queuing.png
old mode 100644
new mode 100755
index 010170306..66e35d02a
Binary files a/resources/oci/monitoring/queuing.png and b/resources/oci/monitoring/queuing.png differ
diff --git a/resources/oci/monitoring/search-grey.png b/resources/oci/monitoring/search-grey.png
deleted file mode 100644
index 0bb9df1fe..000000000
Binary files a/resources/oci/monitoring/search-grey.png and /dev/null differ
diff --git a/resources/oci/monitoring/search-white.png b/resources/oci/monitoring/search-white.png
new file mode 100755
index 000000000..3024b594d
Binary files /dev/null and b/resources/oci/monitoring/search-white.png differ
diff --git a/resources/oci/monitoring/search.png b/resources/oci/monitoring/search.png
old mode 100644
new mode 100755
index 5351f0cfa..ab6670536
Binary files a/resources/oci/monitoring/search.png and b/resources/oci/monitoring/search.png differ
diff --git a/resources/oci/monitoring/streaming-grey.png b/resources/oci/monitoring/streaming-grey.png
deleted file mode 100644
index 06a50879f..000000000
Binary files a/resources/oci/monitoring/streaming-grey.png and /dev/null differ
diff --git a/resources/oci/monitoring/streaming-white.png b/resources/oci/monitoring/streaming-white.png
new file mode 100755
index 000000000..a54b780a6
Binary files /dev/null and b/resources/oci/monitoring/streaming-white.png differ
diff --git a/resources/oci/monitoring/streaming.png b/resources/oci/monitoring/streaming.png
old mode 100644
new mode 100755
index 69c9e94a1..5eafeb1ac
Binary files a/resources/oci/monitoring/streaming.png and b/resources/oci/monitoring/streaming.png differ
diff --git a/resources/oci/monitoring/telemetry-grey.png b/resources/oci/monitoring/telemetry-grey.png
deleted file mode 100644
index 40c5bdbee..000000000
Binary files a/resources/oci/monitoring/telemetry-grey.png and /dev/null differ
diff --git a/resources/oci/monitoring/telemetry-white.png b/resources/oci/monitoring/telemetry-white.png
new file mode 100755
index 000000000..30dc48b0d
Binary files /dev/null and b/resources/oci/monitoring/telemetry-white.png differ
diff --git a/resources/oci/monitoring/telemetry.png b/resources/oci/monitoring/telemetry.png
old mode 100644
new mode 100755
index ba91b3f61..96783a7b7
Binary files a/resources/oci/monitoring/telemetry.png and b/resources/oci/monitoring/telemetry.png differ
diff --git a/resources/oci/monitoring/workflow-grey.png b/resources/oci/monitoring/workflow-grey.png
deleted file mode 100644
index cdb7a0c49..000000000
Binary files a/resources/oci/monitoring/workflow-grey.png and /dev/null differ
diff --git a/resources/oci/monitoring/workflow-white.png b/resources/oci/monitoring/workflow-white.png
new file mode 100755
index 000000000..9ebb2e927
Binary files /dev/null and b/resources/oci/monitoring/workflow-white.png differ
diff --git a/resources/oci/monitoring/workflow.png b/resources/oci/monitoring/workflow.png
old mode 100644
new mode 100755
index 8fbc7de8c..9a2865e6b
Binary files a/resources/oci/monitoring/workflow.png and b/resources/oci/monitoring/workflow.png differ
diff --git a/resources/oci/network/drg-grey.png b/resources/oci/network/drg-grey.png
deleted file mode 100644
index 8038cf65e..000000000
Binary files a/resources/oci/network/drg-grey.png and /dev/null differ
diff --git a/resources/oci/network/drg-white.png b/resources/oci/network/drg-white.png
new file mode 100755
index 000000000..7e02dc6ac
Binary files /dev/null and b/resources/oci/network/drg-white.png differ
diff --git a/resources/oci/network/drg.png b/resources/oci/network/drg.png
old mode 100644
new mode 100755
index f4d6a9a32..6e821bd0c
Binary files a/resources/oci/network/drg.png and b/resources/oci/network/drg.png differ
diff --git a/resources/oci/network/firewall-grey.png b/resources/oci/network/firewall-grey.png
deleted file mode 100644
index b208e09ab..000000000
Binary files a/resources/oci/network/firewall-grey.png and /dev/null differ
diff --git a/resources/oci/network/firewall-white.png b/resources/oci/network/firewall-white.png
new file mode 100755
index 000000000..c076a307d
Binary files /dev/null and b/resources/oci/network/firewall-white.png differ
diff --git a/resources/oci/network/firewall.png b/resources/oci/network/firewall.png
old mode 100644
new mode 100755
index daefcfc9d..e840b0f96
Binary files a/resources/oci/network/firewall.png and b/resources/oci/network/firewall.png differ
diff --git a/resources/oci/network/internetgateway-grey.png b/resources/oci/network/internetgateway-grey.png
deleted file mode 100644
index 482421bb7..000000000
Binary files a/resources/oci/network/internetgateway-grey.png and /dev/null differ
diff --git a/resources/oci/network/internetgateway-white.png b/resources/oci/network/internetgateway-white.png
new file mode 100755
index 000000000..17bdb1135
Binary files /dev/null and b/resources/oci/network/internetgateway-white.png differ
diff --git a/resources/oci/network/internetgateway.png b/resources/oci/network/internetgateway.png
old mode 100644
new mode 100755
index 6c5c40235..f1c994ff6
Binary files a/resources/oci/network/internetgateway.png and b/resources/oci/network/internetgateway.png differ
diff --git a/resources/oci/network/loadbalance-grey.png b/resources/oci/network/loadbalance-grey.png
deleted file mode 100644
index 633815f1a..000000000
Binary files a/resources/oci/network/loadbalance-grey.png and /dev/null differ
diff --git a/resources/oci/network/loadbalance-white.png b/resources/oci/network/loadbalance-white.png
new file mode 100755
index 000000000..036eb0b2e
Binary files /dev/null and b/resources/oci/network/loadbalance-white.png differ
diff --git a/resources/oci/network/loadbalance.png b/resources/oci/network/loadbalance.png
old mode 100644
new mode 100755
index 2af5d68ea..ed5732222
Binary files a/resources/oci/network/loadbalance.png and b/resources/oci/network/loadbalance.png differ
diff --git a/resources/oci/network/routetable-grey.png b/resources/oci/network/routetable-grey.png
deleted file mode 100644
index 520845934..000000000
Binary files a/resources/oci/network/routetable-grey.png and /dev/null differ
diff --git a/resources/oci/network/routetable-white.png b/resources/oci/network/routetable-white.png
new file mode 100755
index 000000000..d038f3738
Binary files /dev/null and b/resources/oci/network/routetable-white.png differ
diff --git a/resources/oci/network/routetable.png b/resources/oci/network/routetable.png
old mode 100644
new mode 100755
index 9c8862a62..7e98ec5a7
Binary files a/resources/oci/network/routetable.png and b/resources/oci/network/routetable.png differ
diff --git a/resources/oci/network/securitylists-grey.png b/resources/oci/network/securitylists-grey.png
deleted file mode 100644
index d7eb730b4..000000000
Binary files a/resources/oci/network/securitylists-grey.png and /dev/null differ
diff --git a/resources/oci/network/securitylists-white.png b/resources/oci/network/securitylists-white.png
new file mode 100755
index 000000000..c954f7372
Binary files /dev/null and b/resources/oci/network/securitylists-white.png differ
diff --git a/resources/oci/network/securitylists.png b/resources/oci/network/securitylists.png
old mode 100644
new mode 100755
index 2ac7e9757..b2a49539a
Binary files a/resources/oci/network/securitylists.png and b/resources/oci/network/securitylists.png differ
diff --git a/resources/oci/network/service-gateway-grey.png b/resources/oci/network/service-gateway-grey.png
deleted file mode 100644
index fa1b3c3b8..000000000
Binary files a/resources/oci/network/service-gateway-grey.png and /dev/null differ
diff --git a/resources/oci/network/service-gateway-white.png b/resources/oci/network/service-gateway-white.png
new file mode 100755
index 000000000..fd64db916
Binary files /dev/null and b/resources/oci/network/service-gateway-white.png differ
diff --git a/resources/oci/network/service-gateway.png b/resources/oci/network/service-gateway.png
old mode 100644
new mode 100755
index 4f590cb3b..efdab4bfc
Binary files a/resources/oci/network/service-gateway.png and b/resources/oci/network/service-gateway.png differ
diff --git a/resources/oci/network/vcloudnetwork-grey.png b/resources/oci/network/vcloudnetwork-grey.png
deleted file mode 100644
index 837d837f0..000000000
Binary files a/resources/oci/network/vcloudnetwork-grey.png and /dev/null differ
diff --git a/resources/oci/network/vcloudnetwork-white.png b/resources/oci/network/vcloudnetwork-white.png
new file mode 100755
index 000000000..178dda0d7
Binary files /dev/null and b/resources/oci/network/vcloudnetwork-white.png differ
diff --git a/resources/oci/network/vcloudnetwork.png b/resources/oci/network/vcloudnetwork.png
old mode 100644
new mode 100755
index d363e04e7..d7fc78299
Binary files a/resources/oci/network/vcloudnetwork.png and b/resources/oci/network/vcloudnetwork.png differ
diff --git a/resources/oci/security/audit-grey.png b/resources/oci/security/audit-grey.png
deleted file mode 100644
index 7b8400895..000000000
Binary files a/resources/oci/security/audit-grey.png and /dev/null differ
diff --git a/resources/oci/security/audit-white.png b/resources/oci/security/audit-white.png
new file mode 100755
index 000000000..8ab2bea06
Binary files /dev/null and b/resources/oci/security/audit-white.png differ
diff --git a/resources/oci/security/audit.png b/resources/oci/security/audit.png
old mode 100644
new mode 100755
index 6c8c6e0a0..8dbb74835
Binary files a/resources/oci/security/audit.png and b/resources/oci/security/audit.png differ
diff --git a/resources/oci/security/cloudguard-white.png b/resources/oci/security/cloudguard-white.png
new file mode 100755
index 000000000..39450a4f1
Binary files /dev/null and b/resources/oci/security/cloudguard-white.png differ
diff --git a/resources/oci/security/cloudguard.png b/resources/oci/security/cloudguard.png
new file mode 100755
index 000000000..8448f8cfc
Binary files /dev/null and b/resources/oci/security/cloudguard.png differ
diff --git a/resources/oci/security/compartments-grey.png b/resources/oci/security/compartments-grey.png
deleted file mode 100644
index 2491a137f..000000000
Binary files a/resources/oci/security/compartments-grey.png and /dev/null differ
diff --git a/resources/oci/security/compartments-white.png b/resources/oci/security/compartments-white.png
new file mode 100755
index 000000000..f0077d0cd
Binary files /dev/null and b/resources/oci/security/compartments-white.png differ
diff --git a/resources/oci/security/compartments.png b/resources/oci/security/compartments.png
old mode 100644
new mode 100755
index f65e980e1..6642bb564
Binary files a/resources/oci/security/compartments.png and b/resources/oci/security/compartments.png differ
diff --git a/resources/oci/security/ddos-grey.png b/resources/oci/security/ddos-grey.png
deleted file mode 100644
index fb8ecd9fb..000000000
Binary files a/resources/oci/security/ddos-grey.png and /dev/null differ
diff --git a/resources/oci/security/ddos-white.png b/resources/oci/security/ddos-white.png
new file mode 100755
index 000000000..110d8155b
Binary files /dev/null and b/resources/oci/security/ddos-white.png differ
diff --git a/resources/oci/security/ddos.png b/resources/oci/security/ddos.png
old mode 100644
new mode 100755
index 8a991869d..055c94519
Binary files a/resources/oci/security/ddos.png and b/resources/oci/security/ddos.png differ
diff --git a/resources/oci/security/encryption-grey.png b/resources/oci/security/encryption-grey.png
deleted file mode 100644
index c0e148636..000000000
Binary files a/resources/oci/security/encryption-grey.png and /dev/null differ
diff --git a/resources/oci/security/encryption-white.png b/resources/oci/security/encryption-white.png
new file mode 100755
index 000000000..8115bab5c
Binary files /dev/null and b/resources/oci/security/encryption-white.png differ
diff --git a/resources/oci/security/encryption.png b/resources/oci/security/encryption.png
old mode 100644
new mode 100755
index 4bb4cf32d..7d5cf2746
Binary files a/resources/oci/security/encryption.png and b/resources/oci/security/encryption.png differ
diff --git a/resources/oci/security/groups-grey.png b/resources/oci/security/groups-grey.png
deleted file mode 100644
index 0fdb07faa..000000000
Binary files a/resources/oci/security/groups-grey.png and /dev/null differ
diff --git a/resources/oci/security/groups-white.png b/resources/oci/security/groups-white.png
new file mode 100755
index 000000000..3dee4b0ae
Binary files /dev/null and b/resources/oci/security/groups-white.png differ
diff --git a/resources/oci/security/groups.png b/resources/oci/security/groups.png
old mode 100644
new mode 100755
index 6b16e7840..20c42be22
Binary files a/resources/oci/security/groups.png and b/resources/oci/security/groups.png differ
diff --git a/resources/oci/security/id-access-grey.png b/resources/oci/security/id-access-grey.png
deleted file mode 100644
index 61ee635fe..000000000
Binary files a/resources/oci/security/id-access-grey.png and /dev/null differ
diff --git a/resources/oci/security/id-access-white.png b/resources/oci/security/id-access-white.png
new file mode 100755
index 000000000..73acb31cb
Binary files /dev/null and b/resources/oci/security/id-access-white.png differ
diff --git a/resources/oci/security/id-access.png b/resources/oci/security/id-access.png
old mode 100644
new mode 100755
index f9e52afd0..33d59b0e8
Binary files a/resources/oci/security/id-access.png and b/resources/oci/security/id-access.png differ
diff --git a/resources/oci/security/keymgmt-grey.png b/resources/oci/security/keymgmt-grey.png
deleted file mode 100644
index ca51ba994..000000000
Binary files a/resources/oci/security/keymgmt-grey.png and /dev/null differ
diff --git a/resources/oci/security/keymgmt-white.png b/resources/oci/security/keymgmt-white.png
new file mode 100755
index 000000000..c93f0d93a
Binary files /dev/null and b/resources/oci/security/keymgmt-white.png differ
diff --git a/resources/oci/security/keymgmt.png b/resources/oci/security/keymgmt.png
old mode 100644
new mode 100755
index 253b96ac0..9147346c9
Binary files a/resources/oci/security/keymgmt.png and b/resources/oci/security/keymgmt.png differ
diff --git a/resources/oci/security/ocid-grey.png b/resources/oci/security/ocid-grey.png
deleted file mode 100644
index 62af269c7..000000000
Binary files a/resources/oci/security/ocid-grey.png and /dev/null differ
diff --git a/resources/oci/security/ocid-white.png b/resources/oci/security/ocid-white.png
new file mode 100755
index 000000000..b8c70680c
Binary files /dev/null and b/resources/oci/security/ocid-white.png differ
diff --git a/resources/oci/security/ocid.png b/resources/oci/security/ocid.png
old mode 100644
new mode 100755
index c38bef545..027f8fe7f
Binary files a/resources/oci/security/ocid.png and b/resources/oci/security/ocid.png differ
diff --git a/resources/oci/security/policies-grey.png b/resources/oci/security/policies-grey.png
deleted file mode 100644
index 30aac9916..000000000
Binary files a/resources/oci/security/policies-grey.png and /dev/null differ
diff --git a/resources/oci/security/policies-white.png b/resources/oci/security/policies-white.png
new file mode 100755
index 000000000..2e4b858b0
Binary files /dev/null and b/resources/oci/security/policies-white.png differ
diff --git a/resources/oci/security/policies.png b/resources/oci/security/policies.png
old mode 100644
new mode 100755
index 06ef52b9b..f146917fe
Binary files a/resources/oci/security/policies.png and b/resources/oci/security/policies.png differ
diff --git a/resources/oci/security/tagging-grey.png b/resources/oci/security/tagging-grey.png
deleted file mode 100644
index 5734b8902..000000000
Binary files a/resources/oci/security/tagging-grey.png and /dev/null differ
diff --git a/resources/oci/security/tagging-white.png b/resources/oci/security/tagging-white.png
new file mode 100755
index 000000000..79c70ba38
Binary files /dev/null and b/resources/oci/security/tagging-white.png differ
diff --git a/resources/oci/security/tagging.png b/resources/oci/security/tagging.png
old mode 100644
new mode 100755
index eb2d875b1..93d88c483
Binary files a/resources/oci/security/tagging.png and b/resources/oci/security/tagging.png differ
diff --git a/resources/oci/security/vault-white.png b/resources/oci/security/vault-white.png
new file mode 100755
index 000000000..1f7239304
Binary files /dev/null and b/resources/oci/security/vault-white.png differ
diff --git a/resources/oci/security/vault.png b/resources/oci/security/vault.png
new file mode 100755
index 000000000..7b8985127
Binary files /dev/null and b/resources/oci/security/vault.png differ
diff --git a/resources/oci/storage/backuprestore-grey.png b/resources/oci/storage/backuprestore-grey.png
deleted file mode 100644
index d3c357b56..000000000
Binary files a/resources/oci/storage/backuprestore-grey.png and /dev/null differ
diff --git a/resources/oci/storage/backuprestore-white.png b/resources/oci/storage/backuprestore-white.png
new file mode 100755
index 000000000..c2fe1e8bb
Binary files /dev/null and b/resources/oci/storage/backuprestore-white.png differ
diff --git a/resources/oci/storage/backuprestore.png b/resources/oci/storage/backuprestore.png
old mode 100644
new mode 100755
index 6f27a2aa6..fd3406a6b
Binary files a/resources/oci/storage/backuprestore.png and b/resources/oci/storage/backuprestore.png differ
diff --git a/resources/oci/storage/blockstorage-grey.png b/resources/oci/storage/blockstorage-grey.png
deleted file mode 100644
index 7b81a091f..000000000
Binary files a/resources/oci/storage/blockstorage-grey.png and /dev/null differ
diff --git a/resources/oci/storage/blockstorage-white.png b/resources/oci/storage/blockstorage-white.png
new file mode 100755
index 000000000..7abde3e6f
Binary files /dev/null and b/resources/oci/storage/blockstorage-white.png differ
diff --git a/resources/oci/storage/blockstorage.png b/resources/oci/storage/blockstorage.png
old mode 100644
new mode 100755
index 30ef32d0e..86b77d93c
Binary files a/resources/oci/storage/blockstorage.png and b/resources/oci/storage/blockstorage.png differ
diff --git a/resources/oci/storage/buckets-grey.png b/resources/oci/storage/buckets-grey.png
deleted file mode 100644
index fcdc6183a..000000000
Binary files a/resources/oci/storage/buckets-grey.png and /dev/null differ
diff --git a/resources/oci/storage/buckets-white.png b/resources/oci/storage/buckets-white.png
new file mode 100755
index 000000000..78ffa2769
Binary files /dev/null and b/resources/oci/storage/buckets-white.png differ
diff --git a/resources/oci/storage/buckets.png b/resources/oci/storage/buckets.png
old mode 100644
new mode 100755
index 79b7e7d5d..f2361f180
Binary files a/resources/oci/storage/buckets.png and b/resources/oci/storage/buckets.png differ
diff --git a/resources/oci/storage/datatransfer-grey.png b/resources/oci/storage/datatransfer-grey.png
deleted file mode 100644
index 4fdec45a5..000000000
Binary files a/resources/oci/storage/datatransfer-grey.png and /dev/null differ
diff --git a/resources/oci/storage/datatransfer-white.png b/resources/oci/storage/datatransfer-white.png
new file mode 100755
index 000000000..3438d4f95
Binary files /dev/null and b/resources/oci/storage/datatransfer-white.png differ
diff --git a/resources/oci/storage/datatransfer.png b/resources/oci/storage/datatransfer.png
old mode 100644
new mode 100755
index 901f3da0f..b7fb60cf5
Binary files a/resources/oci/storage/datatransfer.png and b/resources/oci/storage/datatransfer.png differ
diff --git a/resources/oci/storage/filestorage-grey.png b/resources/oci/storage/filestorage-grey.png
deleted file mode 100644
index 48f4eca17..000000000
Binary files a/resources/oci/storage/filestorage-grey.png and /dev/null differ
diff --git a/resources/oci/storage/filestorage-white.png b/resources/oci/storage/filestorage-white.png
new file mode 100755
index 000000000..8298764f1
Binary files /dev/null and b/resources/oci/storage/filestorage-white.png differ
diff --git a/resources/oci/storage/filestorage.png b/resources/oci/storage/filestorage.png
old mode 100644
new mode 100755
index d9cc3529e..b80baa1cf
Binary files a/resources/oci/storage/filestorage.png and b/resources/oci/storage/filestorage.png differ
diff --git a/resources/oci/storage/objectstorage-grey.png b/resources/oci/storage/objectstorage-grey.png
deleted file mode 100644
index 5d29eef17..000000000
Binary files a/resources/oci/storage/objectstorage-grey.png and /dev/null differ
diff --git a/resources/oci/storage/objectstorage-white.png b/resources/oci/storage/objectstorage-white.png
new file mode 100755
index 000000000..5e7ef2329
Binary files /dev/null and b/resources/oci/storage/objectstorage-white.png differ
diff --git a/resources/oci/storage/objectstorage.png b/resources/oci/storage/objectstorage.png
old mode 100644
new mode 100755
index 8acb41bb4..f3911d6dc
Binary files a/resources/oci/storage/objectstorage.png and b/resources/oci/storage/objectstorage.png differ
diff --git a/resources/oci/storage/storagegateway-grey.png b/resources/oci/storage/storagegateway-grey.png
deleted file mode 100644
index f5ad2b7dd..000000000
Binary files a/resources/oci/storage/storagegateway-grey.png and /dev/null differ
diff --git a/resources/oci/storage/storagegateway-white.png b/resources/oci/storage/storagegateway-white.png
new file mode 100755
index 000000000..275821a63
Binary files /dev/null and b/resources/oci/storage/storagegateway-white.png differ
diff --git a/resources/oci/storage/storagegateway.png b/resources/oci/storage/storagegateway.png
old mode 100644
new mode 100755
index 095775a41..ce2e9341f
Binary files a/resources/oci/storage/storagegateway.png and b/resources/oci/storage/storagegateway.png differ