diff --git a/config.py b/config.py
index 85affc3..ce56ade 100644
--- a/config.py
+++ b/config.py
@@ -48,7 +48,7 @@ TMPL_APIDOC = "apidoc.tmpl"
 TMPL_MODULE = "module.tmpl"
 
 UPPER_WORDS = {
-    "aws": ("aws", "api", "ebs", "ec2", "efs", "emr", "rds", "ml", "mq", "nat", "vpc", "waf"),
+    "aws": ("aws", "api", "ebs", "ec2", "efs", "emr", "rds", "ml", "mq", "nat", "vpc", "waf", "sdk"),
     "azure": ("ad", "b2c", "ai", "api", "cdn", "ddos", "dns", "fxt", "hana", "hd", "id", "sap", "sql", "vm"),
     "gcp": ("gcp", "ai", "api", "cdn", "dns", "gke", "gpu", "iap", "ml", "nat", "os", "sdk", "sql", "tpu", "vpn"),
     "k8s": (
@@ -144,6 +144,9 @@ ALIASES = {
         "engagement": {
             "SimpleEmailServiceSes": "SES",
         },
+        "general": {
+            "GenericOfficeBuilding": "OfficeBuilding",
+        },
         "integration": {
             "SimpleNotificationServiceSns": "SNS",
             "SimpleQueueServiceSqs": "SQS",
@@ -151,6 +154,7 @@ ALIASES = {
         },
         "iot": {
             "Freertos": "FreeRTOS",
+            "IotHardwareBoard": "IotBoard",
         },
         "management": {
             "SystemsManager": "SSM",
diff --git a/diagrams/aws/game.py b/diagrams/aws/game.py
new file mode 100644
index 0000000..dcd2e0f
--- /dev/null
+++ b/diagrams/aws/game.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Game(_AWS):
+    _type = "game"
+    _icon_dir = "resources/aws/game"
+
+
+class Gamelift(_Game):
+    _icon = "gamelift.png"
+
+
+# Aliases
diff --git a/diagrams/aws/general.py b/diagrams/aws/general.py
new file mode 100644
index 0000000..80284ba
--- /dev/null
+++ b/diagrams/aws/general.py
@@ -0,0 +1,57 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _General(_AWS):
+    _type = "general"
+    _icon_dir = "resources/aws/general"
+
+
+class Disk(_General):
+    _icon = "disk.png"
+
+
+class General(_General):
+    _icon = "general.png"
+
+
+class GenericDatabase(_General):
+    _icon = "generic-database.png"
+
+
+class GenericFirewall(_General):
+    _icon = "generic-firewall.png"
+
+
+class GenericOfficeBuilding(_General):
+    _icon = "generic-office-building.png"
+
+
+class GenericSamlToken(_General):
+    _icon = "generic-saml-token.png"
+
+
+class GenericSDK(_General):
+    _icon = "generic-sdk.png"
+
+
+class Marketplace(_General):
+    _icon = "marketplace.png"
+
+
+class TradicionalServer(_General):
+    _icon = "tradicional-server.png"
+
+
+class User(_General):
+    _icon = "user.png"
+
+
+class Users(_General):
+    _icon = "users.png"
+
+
+# Aliases
+
+OfficeBuilding = GenericOfficeBuilding
diff --git a/diagrams/aws/iot.py b/diagrams/aws/iot.py
index d413d3e..4e30bed 100644
--- a/diagrams/aws/iot.py
+++ b/diagrams/aws/iot.py
@@ -20,6 +20,14 @@ class Iot1Click(_Iot):
     _icon = "iot-1-click.png"
 
 
+class IotAlexaEcho(_Iot):
+    _icon = "iot-alexa-echo.png"
+
+
+class IotAlexaSkill(_Iot):
+    _icon = "iot-alexa-skill.png"
+
+
 class IotAnalytics(_Iot):
     _icon = "iot-analytics.png"
 
@@ -28,6 +36,14 @@ class IotButton(_Iot):
     _icon = "iot-button.png"
 
 
+class IotCamera(_Iot):
+    _icon = "iot-camera.png"
+
+
+class IotCertificate(_Iot):
+    _icon = "iot-certificate.png"
+
+
 class IotCore(_Iot):
     _icon = "iot-core.png"
 
@@ -48,6 +64,26 @@ class IotGreengrass(_Iot):
     _icon = "iot-greengrass.png"
 
 
+class IotHardwareBoard(_Iot):
+    _icon = "iot-hardware-board.png"
+
+
+class IotJobs(_Iot):
+    _icon = "iot-jobs.png"
+
+
+class IotMqtt(_Iot):
+    _icon = "iot-mqtt.png"
+
+
+class IotRule(_Iot):
+    _icon = "iot-rule.png"
+
+
+class IotShadow(_Iot):
+    _icon = "iot-shadow.png"
+
+
 class IotSitewise(_Iot):
     _icon = "iot-sitewise.png"
 
@@ -56,6 +92,11 @@ class IotThingsGraph(_Iot):
     _icon = "iot-things-graph.png"
 
 
+class IotTopic(_Iot):
+    _icon = "iot-topic.png"
+
+
 # Aliases
 
 FreeRTOS = Freertos
+IotBoard = IotHardwareBoard
diff --git a/diagrams/aws/robotics.py b/diagrams/aws/robotics.py
new file mode 100644
index 0000000..d211174
--- /dev/null
+++ b/diagrams/aws/robotics.py
@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Robotics(_AWS):
+    _type = "robotics"
+    _icon_dir = "resources/aws/robotics"
+
+
+class RobomakerSimulator(_Robotics):
+    _icon = "robomaker-simulator.png"
+
+
+class Robomaker(_Robotics):
+    _icon = "robomaker.png"
+
+
+class Robotics(_Robotics):
+    _icon = "robotics.png"
+
+
+# Aliases
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index 6971abd..1c8feb3 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -90,6 +90,24 @@ Node classes list of aws provider.
 - **diagrams.aws.engagement.Pinpoint**
 - **diagrams.aws.engagement.SimpleEmailServiceSes**, **SES** (alias)
 
+## aws.game
+
+- **diagrams.aws.game.Gamelift**
+
+## aws.general
+
+- **diagrams.aws.general.Disk**
+- **diagrams.aws.general.General**
+- **diagrams.aws.general.GenericDatabase**
+- **diagrams.aws.general.GenericFirewall**
+- **diagrams.aws.general.GenericOfficeBuilding**, **OfficeBuilding** (alias)
+- **diagrams.aws.general.GenericSamlToken**
+- **diagrams.aws.general.GenericSDK**
+- **diagrams.aws.general.Marketplace**
+- **diagrams.aws.general.TradicionalServer**
+- **diagrams.aws.general.User**
+- **diagrams.aws.general.Users**
+
 ## aws.integration
 
 - **diagrams.aws.integration.ApplicationIntegration**
@@ -106,15 +124,25 @@ Node classes list of aws provider.
 - **diagrams.aws.iot.Freertos**, **FreeRTOS** (alias)
 - **diagrams.aws.iot.InternetOfThings**
 - **diagrams.aws.iot.Iot1Click**
+- **diagrams.aws.iot.IotAlexaEcho**
+- **diagrams.aws.iot.IotAlexaSkill**
 - **diagrams.aws.iot.IotAnalytics**
 - **diagrams.aws.iot.IotButton**
+- **diagrams.aws.iot.IotCamera**
+- **diagrams.aws.iot.IotCertificate**
 - **diagrams.aws.iot.IotCore**
 - **diagrams.aws.iot.IotDeviceDefender**
 - **diagrams.aws.iot.IotDeviceManagement**
 - **diagrams.aws.iot.IotEvents**
 - **diagrams.aws.iot.IotGreengrass**
+- **diagrams.aws.iot.IotHardwareBoard**, **IotBoard** (alias)
+- **diagrams.aws.iot.IotJobs**
+- **diagrams.aws.iot.IotMqtt**
+- **diagrams.aws.iot.IotRule**
+- **diagrams.aws.iot.IotShadow**
 - **diagrams.aws.iot.IotSitewise**
 - **diagrams.aws.iot.IotThingsGraph**
+- **diagrams.aws.iot.IotTopic**
 
 ## aws.management
 
@@ -213,6 +241,12 @@ Node classes list of aws provider.
 - **diagrams.aws.network.VPCRouter**
 - **diagrams.aws.network.VPC**
 
+## aws.robotics
+
+- **diagrams.aws.robotics.RobomakerSimulator**
+- **diagrams.aws.robotics.Robomaker**
+- **diagrams.aws.robotics.Robotics**
+
 ## aws.security
 
 - **diagrams.aws.security.Artifact**
diff --git a/resources/aws/game/gamelift.png b/resources/aws/game/gamelift.png
new file mode 100644
index 0000000..2c161ae
Binary files /dev/null and b/resources/aws/game/gamelift.png differ
diff --git a/resources/aws/general/disk.png b/resources/aws/general/disk.png
new file mode 100644
index 0000000..533ee56
Binary files /dev/null and b/resources/aws/general/disk.png differ
diff --git a/resources/aws/general/general.png b/resources/aws/general/general.png
new file mode 100644
index 0000000..779941e
Binary files /dev/null and b/resources/aws/general/general.png differ
diff --git a/resources/aws/general/generic-database.png b/resources/aws/general/generic-database.png
new file mode 100644
index 0000000..b1e7bf1
Binary files /dev/null and b/resources/aws/general/generic-database.png differ
diff --git a/resources/aws/general/generic-firewall.png b/resources/aws/general/generic-firewall.png
new file mode 100644
index 0000000..4f91b1a
Binary files /dev/null and b/resources/aws/general/generic-firewall.png differ
diff --git a/resources/aws/general/generic-office-building.png b/resources/aws/general/generic-office-building.png
new file mode 100644
index 0000000..bb96caa
Binary files /dev/null and b/resources/aws/general/generic-office-building.png differ
diff --git a/resources/aws/general/generic-saml-token.png b/resources/aws/general/generic-saml-token.png
new file mode 100644
index 0000000..0d5fa4c
Binary files /dev/null and b/resources/aws/general/generic-saml-token.png differ
diff --git a/resources/aws/general/generic-sdk.png b/resources/aws/general/generic-sdk.png
new file mode 100644
index 0000000..0ce11f8
Binary files /dev/null and b/resources/aws/general/generic-sdk.png differ
diff --git a/resources/aws/general/marketplace.png b/resources/aws/general/marketplace.png
new file mode 100644
index 0000000..c1c863b
Binary files /dev/null and b/resources/aws/general/marketplace.png differ
diff --git a/resources/aws/general/tradicional-server.png b/resources/aws/general/tradicional-server.png
new file mode 100644
index 0000000..2373ace
Binary files /dev/null and b/resources/aws/general/tradicional-server.png differ
diff --git a/resources/aws/general/user.png b/resources/aws/general/user.png
new file mode 100644
index 0000000..cd17f33
Binary files /dev/null and b/resources/aws/general/user.png differ
diff --git a/resources/aws/general/users.png b/resources/aws/general/users.png
new file mode 100644
index 0000000..d699247
Binary files /dev/null and b/resources/aws/general/users.png differ
diff --git a/resources/aws/iot/iot-alexa-echo.png b/resources/aws/iot/iot-alexa-echo.png
new file mode 100644
index 0000000..3c1b998
Binary files /dev/null and b/resources/aws/iot/iot-alexa-echo.png differ
diff --git a/resources/aws/iot/iot-alexa-skill.png b/resources/aws/iot/iot-alexa-skill.png
new file mode 100644
index 0000000..95c13f0
Binary files /dev/null and b/resources/aws/iot/iot-alexa-skill.png differ
diff --git a/resources/aws/iot/iot-camera.png b/resources/aws/iot/iot-camera.png
new file mode 100644
index 0000000..ecdea67
Binary files /dev/null and b/resources/aws/iot/iot-camera.png differ
diff --git a/resources/aws/iot/iot-certificate.png b/resources/aws/iot/iot-certificate.png
new file mode 100644
index 0000000..be45074
Binary files /dev/null and b/resources/aws/iot/iot-certificate.png differ
diff --git a/resources/aws/iot/iot-hardware-board.png b/resources/aws/iot/iot-hardware-board.png
new file mode 100644
index 0000000..d7224b2
Binary files /dev/null and b/resources/aws/iot/iot-hardware-board.png differ
diff --git a/resources/aws/iot/iot-jobs.png b/resources/aws/iot/iot-jobs.png
new file mode 100644
index 0000000..6690df5
Binary files /dev/null and b/resources/aws/iot/iot-jobs.png differ
diff --git a/resources/aws/iot/iot-mqtt.png b/resources/aws/iot/iot-mqtt.png
new file mode 100644
index 0000000..308866c
Binary files /dev/null and b/resources/aws/iot/iot-mqtt.png differ
diff --git a/resources/aws/iot/iot-rule.png b/resources/aws/iot/iot-rule.png
new file mode 100644
index 0000000..06065cb
Binary files /dev/null and b/resources/aws/iot/iot-rule.png differ
diff --git a/resources/aws/iot/iot-shadow.png b/resources/aws/iot/iot-shadow.png
new file mode 100644
index 0000000..9fc50eb
Binary files /dev/null and b/resources/aws/iot/iot-shadow.png differ
diff --git a/resources/aws/iot/iot-topic.png b/resources/aws/iot/iot-topic.png
new file mode 100644
index 0000000..ef5646b
Binary files /dev/null and b/resources/aws/iot/iot-topic.png differ
diff --git a/resources/aws/robotics/robomaker-simulator.png b/resources/aws/robotics/robomaker-simulator.png
new file mode 100644
index 0000000..3c95e14
Binary files /dev/null and b/resources/aws/robotics/robomaker-simulator.png differ
diff --git a/resources/aws/robotics/robomaker.png b/resources/aws/robotics/robomaker.png
new file mode 100644
index 0000000..7cf8ab7
Binary files /dev/null and b/resources/aws/robotics/robomaker.png differ
diff --git a/resources/aws/robotics/robotics.png b/resources/aws/robotics/robotics.png
new file mode 100644
index 0000000..7b878bb
Binary files /dev/null and b/resources/aws/robotics/robotics.png differ