diff --git a/config.py b/config.py
index e5bba3a2..2c7a72d8 100644
--- a/config.py
+++ b/config.py
@@ -62,7 +62,7 @@ UPPER_WORDS = {
     ),
     "oci": ("oci",),
     "elastic": ("apm", "siem", "ece", "eck"),
-    "generic": ("vpn",),
+    "generic": ("vpn","ios","xen"),
 }
 
 TITLE_WORDS = {
diff --git a/diagrams/aws/iot.py b/diagrams/aws/iot.py
index 4e30beda..e005a3b4 100644
--- a/diagrams/aws/iot.py
+++ b/diagrams/aws/iot.py
@@ -20,6 +20,10 @@ class Iot1Click(_Iot):
     _icon = "iot-1-click.png"
 
 
+class IotAction(_Iot):
+    _icon = "iot-action.png"
+
+
 class IotAlexaEcho(_Iot):
     _icon = "iot-alexa-echo.png"
 
@@ -60,6 +64,10 @@ class IotEvents(_Iot):
     _icon = "iot-events.png"
 
 
+class IotGreengrassConnector(_Iot):
+    _icon = "iot-greengrass-connector.png"
+
+
 class IotGreengrass(_Iot):
     _icon = "iot-greengrass.png"
 
@@ -68,14 +76,34 @@ class IotHardwareBoard(_Iot):
     _icon = "iot-hardware-board.png"
 
 
+class IotHttp(_Iot):
+    _icon = "iot-http.png"
+
+
+class IotHttp2(_Iot):
+    _icon = "iot-http2.png"
+
+
 class IotJobs(_Iot):
     _icon = "iot-jobs.png"
 
 
+class IotLambda(_Iot):
+    _icon = "iot-lambda.png"
+
+
 class IotMqtt(_Iot):
     _icon = "iot-mqtt.png"
 
 
+class IotPolicyEmergency(_Iot):
+    _icon = "iot-policy-emergency.png"
+
+
+class IotPolicy(_Iot):
+    _icon = "iot-policy.png"
+
+
 class IotRule(_Iot):
     _icon = "iot-rule.png"
 
diff --git a/diagrams/generic/device.py b/diagrams/generic/device.py
new file mode 100644
index 00000000..29745b8e
--- /dev/null
+++ b/diagrams/generic/device.py
@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Generic
+
+
+class _Device(_Generic):
+    _type = "device"
+    _icon_dir = "resources/generic/device"
+
+
+class Mobile(_Device):
+    _icon = "mobile.png"
+
+
+class Tablet(_Device):
+    _icon = "tablet.png"
+
+
+# Aliases
diff --git a/diagrams/generic/os.py b/diagrams/generic/os.py
new file mode 100644
index 00000000..695f2954
--- /dev/null
+++ b/diagrams/generic/os.py
@@ -0,0 +1,39 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Generic
+
+
+class _Os(_Generic):
+    _type = "os"
+    _icon_dir = "resources/generic/os"
+
+
+class Android(_Os):
+    _icon = "android.png"
+
+
+class Centos(_Os):
+    _icon = "centos.png"
+
+
+class IOS(_Os):
+    _icon = "ios.png"
+
+
+class LinuxGeneral(_Os):
+    _icon = "linux-general.png"
+
+
+class Suse(_Os):
+    _icon = "suse.png"
+
+
+class Ubuntu(_Os):
+    _icon = "ubuntu.png"
+
+
+class Windows(_Os):
+    _icon = "windows.png"
+
+
+# Aliases
diff --git a/diagrams/generic/virtualization.py b/diagrams/generic/virtualization.py
new file mode 100644
index 00000000..0695fd01
--- /dev/null
+++ b/diagrams/generic/virtualization.py
@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Generic
+
+
+class _Virtualization(_Generic):
+    _type = "virtualization"
+    _icon_dir = "resources/generic/virtualization"
+
+
+class Virtualbox(_Virtualization):
+    _icon = "virtualbox.png"
+
+
+class Vmware(_Virtualization):
+    _icon = "vmware.png"
+
+
+class XEN(_Virtualization):
+    _icon = "xen.png"
+
+
+# Aliases
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index 5ab1e485..6107fad8 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -143,6 +143,7 @@ Node classes list of aws provider.
 - **diagrams.aws.iot.Freertos**, **FreeRTOS** (alias)
 - **diagrams.aws.iot.InternetOfThings**
 - **diagrams.aws.iot.Iot1Click**
+- **diagrams.aws.iot.IotAction**
 - **diagrams.aws.iot.IotAlexaEcho**
 - **diagrams.aws.iot.IotAlexaSkill**
 - **diagrams.aws.iot.IotAnalytics**
@@ -153,10 +154,16 @@ Node classes list of aws provider.
 - **diagrams.aws.iot.IotDeviceDefender**
 - **diagrams.aws.iot.IotDeviceManagement**
 - **diagrams.aws.iot.IotEvents**
+- **diagrams.aws.iot.IotGreengrassConnector**
 - **diagrams.aws.iot.IotGreengrass**
 - **diagrams.aws.iot.IotHardwareBoard**, **IotBoard** (alias)
+- **diagrams.aws.iot.IotHttp**
+- **diagrams.aws.iot.IotHttp2**
 - **diagrams.aws.iot.IotJobs**
+- **diagrams.aws.iot.IotLambda**
 - **diagrams.aws.iot.IotMqtt**
+- **diagrams.aws.iot.IotPolicyEmergency**
+- **diagrams.aws.iot.IotPolicy**
 - **diagrams.aws.iot.IotRule**
 - **diagrams.aws.iot.IotShadow**
 - **diagrams.aws.iot.IotSitewise**
diff --git a/docs/nodes/generic.md b/docs/nodes/generic.md
index af11a0db..ce9a5f2d 100644
--- a/docs/nodes/generic.md
+++ b/docs/nodes/generic.md
@@ -13,6 +13,11 @@ Node classes list of generic provider.
 
 - **diagrams.generic.compute.Rack**
 
+## generic.device
+
+- **diagrams.generic.device.Mobile**
+- **diagrams.generic.device.Tablet**
+
 ## generic.network
 
 - **diagrams.generic.network.Firewall**
@@ -20,6 +25,16 @@ Node classes list of generic provider.
 - **diagrams.generic.network.Switch**
 - **diagrams.generic.network.VPN**
 
+## generic.os
+
+- **diagrams.generic.os.Android**
+- **diagrams.generic.os.Centos**
+- **diagrams.generic.os.IOS**
+- **diagrams.generic.os.LinuxGeneral**
+- **diagrams.generic.os.Suse**
+- **diagrams.generic.os.Ubuntu**
+- **diagrams.generic.os.Windows**
+
 ## generic.place
 
 - **diagrams.generic.place.Datacenter**
@@ -27,3 +42,9 @@ Node classes list of generic provider.
 ## generic.storage
 
 - **diagrams.generic.storage.Storage**
+
+## generic.virtualization
+
+- **diagrams.generic.virtualization.Virtualbox**
+- **diagrams.generic.virtualization.Vmware**
+- **diagrams.generic.virtualization.XEN**
diff --git a/resources/aws/iot/iot-action.png b/resources/aws/iot/iot-action.png
new file mode 100644
index 00000000..dace7dc9
Binary files /dev/null and b/resources/aws/iot/iot-action.png differ
diff --git a/resources/aws/iot/iot-greengrass-connector.png b/resources/aws/iot/iot-greengrass-connector.png
new file mode 100644
index 00000000..e3e56e52
Binary files /dev/null and b/resources/aws/iot/iot-greengrass-connector.png differ
diff --git a/resources/aws/iot/iot-http.png b/resources/aws/iot/iot-http.png
new file mode 100644
index 00000000..0592af7d
Binary files /dev/null and b/resources/aws/iot/iot-http.png differ
diff --git a/resources/aws/iot/iot-http2.png b/resources/aws/iot/iot-http2.png
new file mode 100644
index 00000000..bfee7e88
Binary files /dev/null and b/resources/aws/iot/iot-http2.png differ
diff --git a/resources/aws/iot/iot-lambda.png b/resources/aws/iot/iot-lambda.png
new file mode 100644
index 00000000..6ff938bc
Binary files /dev/null and b/resources/aws/iot/iot-lambda.png differ
diff --git a/resources/aws/iot/iot-policy-emergency.png b/resources/aws/iot/iot-policy-emergency.png
new file mode 100644
index 00000000..ac08ece8
Binary files /dev/null and b/resources/aws/iot/iot-policy-emergency.png differ
diff --git a/resources/aws/iot/iot-policy.png b/resources/aws/iot/iot-policy.png
new file mode 100644
index 00000000..846e21cf
Binary files /dev/null and b/resources/aws/iot/iot-policy.png differ
diff --git a/resources/generic/device/mobile.png b/resources/generic/device/mobile.png
new file mode 100644
index 00000000..75d942da
Binary files /dev/null and b/resources/generic/device/mobile.png differ
diff --git a/resources/generic/device/tablet.png b/resources/generic/device/tablet.png
new file mode 100644
index 00000000..fd3bff4f
Binary files /dev/null and b/resources/generic/device/tablet.png differ
diff --git a/resources/generic/os/android.png b/resources/generic/os/android.png
new file mode 100644
index 00000000..72eab86f
Binary files /dev/null and b/resources/generic/os/android.png differ
diff --git a/resources/generic/os/centos.png b/resources/generic/os/centos.png
new file mode 100644
index 00000000..483eb992
Binary files /dev/null and b/resources/generic/os/centos.png differ
diff --git a/resources/generic/os/ios.png b/resources/generic/os/ios.png
new file mode 100644
index 00000000..f3d4e34e
Binary files /dev/null and b/resources/generic/os/ios.png differ
diff --git a/resources/generic/os/linux-general.png b/resources/generic/os/linux-general.png
new file mode 100644
index 00000000..1e1a874d
Binary files /dev/null and b/resources/generic/os/linux-general.png differ
diff --git a/resources/generic/os/suse.png b/resources/generic/os/suse.png
new file mode 100644
index 00000000..3b9553c6
Binary files /dev/null and b/resources/generic/os/suse.png differ
diff --git a/resources/generic/os/ubuntu.png b/resources/generic/os/ubuntu.png
new file mode 100644
index 00000000..d1caf5ee
Binary files /dev/null and b/resources/generic/os/ubuntu.png differ
diff --git a/resources/generic/os/windows.png b/resources/generic/os/windows.png
new file mode 100644
index 00000000..2ded497d
Binary files /dev/null and b/resources/generic/os/windows.png differ
diff --git a/resources/generic/virtualization/virtualbox.png b/resources/generic/virtualization/virtualbox.png
new file mode 100644
index 00000000..aefdbff0
Binary files /dev/null and b/resources/generic/virtualization/virtualbox.png differ
diff --git a/resources/generic/virtualization/vmware.png b/resources/generic/virtualization/vmware.png
new file mode 100644
index 00000000..189129c1
Binary files /dev/null and b/resources/generic/virtualization/vmware.png differ
diff --git a/resources/generic/virtualization/xen.png b/resources/generic/virtualization/xen.png
new file mode 100644
index 00000000..71655e1a
Binary files /dev/null and b/resources/generic/virtualization/xen.png differ