diff --git a/schema.json b/schema.json
index 72dcb01..7069e80 100644
--- a/schema.json
+++ b/schema.json
@@ -18,7 +18,7 @@
     },
     "ClassicThemeOptions": {
       "additionalProperties": false,
-      "description": "This class is the data model of the theme options for the classic theme.",
+      "description": "This class is the data model of the theme options for the `classic` theme.",
       "properties": {
         "theme": {
           "const": "classic",
@@ -97,7 +97,7 @@
         "margins": {
           "allOf": [
             {
-              "$ref": "#/$defs/rendercv__themes__Margins"
+              "$ref": "#/$defs/Margins"
             }
           ],
           "default": {
@@ -424,7 +424,7 @@
     },
     "EngineeringresumesThemeOptions": {
       "additionalProperties": false,
-      "description": "This class is the data model of the theme options for the engineeringresumes\ntheme.",
+      "description": "This class is the data model of the theme options for the `engineeringresumes`\ntheme.",
       "properties": {
         "theme": {
           "const": "engineeringresumes",
@@ -503,7 +503,7 @@
         "margins": {
           "allOf": [
             {
-              "$ref": "#/$defs/rendercv__themes__engineeringresumes__Margins"
+              "$ref": "#/$defs/MarginsForEngineeringresumes"
             }
           ],
           "default": {
@@ -517,6 +517,15 @@
               "bottom": "0.2 cm",
               "top": "0.3 cm"
             },
+            "entry_area": {
+              "left_and_right": "0 cm",
+              "vertical_between": "0.1 cm"
+            },
+            "highlights_area": {
+              "left": "0 cm",
+              "top": "0.10 cm",
+              "vertical_between_bullet_points": "0.10 cm"
+            },
             "header": {
               "bottom": "0.3 cm",
               "horizontal_between_connections": "0.5 cm",
@@ -562,6 +571,28 @@
       "type": "object",
       "additionalProperties": false
     },
+    "EntryAreaMarginsForEngineeringresumes": {
+      "description": "This class is a data model for the entry area margins.",
+      "properties": {
+        "left_and_right": {
+          "default": "0 cm",
+          "description": "The left margin of entry areas. The default value is 0 cm.",
+          "pattern": "\\d+\\.?\\d* *(cm|in|pt|mm|ex|em)",
+          "title": "Left Margin",
+          "type": "string"
+        },
+        "vertical_between": {
+          "default": "0.1 cm",
+          "description": "The vertical margin between entry areas. The default value is 0.1 cm.",
+          "pattern": "\\d+\\.?\\d* *(cm|in|pt|mm|ex|em)",
+          "title": "Vertical Margin Between Entry Areas",
+          "type": "string"
+        }
+      },
+      "title": "EntryAreaMarginsForEngineeringresumes",
+      "type": "object",
+      "additionalProperties": false
+    },
     "ExperienceEntry": {
       "additionalProperties": false,
       "description": "This class is the data model of `ExperienceEntry`.",
@@ -736,9 +767,193 @@
       "type": "object",
       "additionalProperties": false
     },
+    "HighlightsAreaMarginsForEngineeringresumes": {
+      "description": "This class is a data model for the highlights area margins.",
+      "properties": {
+        "top": {
+          "default": "0.10 cm",
+          "description": "The top margin of highlights areas. The default value is 0.10 cm.",
+          "pattern": "\\d+\\.?\\d* *(cm|in|pt|mm|ex|em)",
+          "title": "Top Margin",
+          "type": "string"
+        },
+        "left": {
+          "default": "0 cm",
+          "description": "The left margin of highlights areas. The default value is 0 cm.",
+          "pattern": "\\d+\\.?\\d* *(cm|in|pt|mm|ex|em)",
+          "title": "Left Margin",
+          "type": "string"
+        },
+        "vertical_between_bullet_points": {
+          "default": "0.10 cm",
+          "description": "The vertical margin between bullet points. The default value is 0.10 cm.",
+          "pattern": "\\d+\\.?\\d* *(cm|in|pt|mm|ex|em)",
+          "title": "Vertical Margin Between Bullet Points",
+          "type": "string"
+        }
+      },
+      "title": "HighlightsAreaMarginsForEngineeringresumes",
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Margins": {
+      "description": "This class is a data model for the margins.",
+      "properties": {
+        "page": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/PageMargins"
+            }
+          ],
+          "default": {
+            "top": "2 cm",
+            "bottom": "2 cm",
+            "left": "2 cm",
+            "right": "2 cm"
+          },
+          "description": "Page margins.",
+          "title": "Page Margins"
+        },
+        "section_title": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/SectionTitleMargins"
+            }
+          ],
+          "default": {
+            "top": "0.3 cm",
+            "bottom": "0.2 cm"
+          },
+          "description": "Section title margins.",
+          "title": "Section Title Margins"
+        },
+        "entry_area": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/EntryAreaMargins"
+            }
+          ],
+          "default": {
+            "left_and_right": "0.2 cm",
+            "vertical_between": "0.2 cm",
+            "date_and_location_width": "4.1 cm"
+          },
+          "description": "Entry area margins.",
+          "title": "Entry Area Margins"
+        },
+        "highlights_area": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/HighlightsAreaMargins"
+            }
+          ],
+          "default": {
+            "top": "0.10 cm",
+            "left": "0.4 cm",
+            "vertical_between_bullet_points": "0.10 cm"
+          },
+          "description": "Highlights area margins.",
+          "title": "Highlights Area Margins"
+        },
+        "header": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/HeaderMargins"
+            }
+          ],
+          "default": {
+            "vertical_between_name_and_connections": "0.3 cm",
+            "bottom": "0.3 cm",
+            "horizontal_between_connections": "0.5 cm"
+          },
+          "description": "Header margins.",
+          "title": "Header Margins"
+        }
+      },
+      "title": "Margins",
+      "type": "object",
+      "additionalProperties": false
+    },
+    "MarginsForEngineeringresumes": {
+      "description": "This class is a data model for the margins.",
+      "properties": {
+        "page": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/PageMargins"
+            }
+          ],
+          "default": {
+            "top": "2 cm",
+            "bottom": "2 cm",
+            "left": "2 cm",
+            "right": "2 cm"
+          },
+          "description": "Page margins.",
+          "title": "Page Margins"
+        },
+        "section_title": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/SectionTitleMargins"
+            }
+          ],
+          "default": {
+            "top": "0.3 cm",
+            "bottom": "0.2 cm"
+          },
+          "description": "Section title margins.",
+          "title": "Section Title Margins"
+        },
+        "entry_area": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/EntryAreaMarginsForEngineeringresumes"
+            }
+          ],
+          "default": {
+            "left_and_right": "0 cm",
+            "vertical_between": "0.1 cm"
+          },
+          "description": "Entry area margins.",
+          "title": "Entry Area Margins"
+        },
+        "highlights_area": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/HighlightsAreaMarginsForEngineeringresumes"
+            }
+          ],
+          "default": {
+            "top": "0.10 cm",
+            "left": "0 cm",
+            "vertical_between_bullet_points": "0.10 cm"
+          },
+          "description": "Highlights area margins.",
+          "title": "Highlights Area Margins"
+        },
+        "header": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/HeaderMargins"
+            }
+          ],
+          "default": {
+            "vertical_between_name_and_connections": "0.3 cm",
+            "bottom": "0.3 cm",
+            "horizontal_between_connections": "0.5 cm"
+          },
+          "description": "Header margins.",
+          "title": "Header Margins"
+        }
+      },
+      "title": "MarginsForEngineeringresumes",
+      "type": "object",
+      "additionalProperties": false
+    },
     "ModerncvThemeOptions": {
       "additionalProperties": false,
-      "description": "This class is the data model of the theme options for the moderncv theme.",
+      "description": "This class is the data model of the theme options for the `moderncv` theme.",
       "properties": {
         "theme": {
           "const": "moderncv",
@@ -1160,7 +1375,7 @@
         "margins": {
           "allOf": [
             {
-              "$ref": "#/$defs/rendercv__themes__Margins"
+              "$ref": "#/$defs/Margins"
             }
           ],
           "default": {
@@ -1251,134 +1466,6 @@
       ],
       "title": "SocialNetwork",
       "type": "object"
-    },
-    "rendercv__themes__Margins": {
-      "description": "This class is a data model for the margins.",
-      "properties": {
-        "page": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/PageMargins"
-            }
-          ],
-          "default": {
-            "top": "2 cm",
-            "bottom": "2 cm",
-            "left": "2 cm",
-            "right": "2 cm"
-          },
-          "description": "Page margins.",
-          "title": "Page Margins"
-        },
-        "section_title": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/SectionTitleMargins"
-            }
-          ],
-          "default": {
-            "top": "0.3 cm",
-            "bottom": "0.2 cm"
-          },
-          "description": "Section title margins.",
-          "title": "Section Title Margins"
-        },
-        "entry_area": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/EntryAreaMargins"
-            }
-          ],
-          "default": {
-            "left_and_right": "0.2 cm",
-            "vertical_between": "0.2 cm",
-            "date_and_location_width": "4.1 cm"
-          },
-          "description": "Entry area margins.",
-          "title": "Entry Area Margins"
-        },
-        "highlights_area": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/HighlightsAreaMargins"
-            }
-          ],
-          "default": {
-            "top": "0.10 cm",
-            "left": "0.4 cm",
-            "vertical_between_bullet_points": "0.10 cm"
-          },
-          "description": "Highlights area margins.",
-          "title": "Highlights Area Margins"
-        },
-        "header": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/HeaderMargins"
-            }
-          ],
-          "default": {
-            "vertical_between_name_and_connections": "0.3 cm",
-            "bottom": "0.3 cm",
-            "horizontal_between_connections": "0.5 cm"
-          },
-          "description": "Header margins.",
-          "title": "Header Margins"
-        }
-      },
-      "title": "Margins",
-      "type": "object",
-      "additionalProperties": false
-    },
-    "rendercv__themes__engineeringresumes__Margins": {
-      "description": "This class is a data model for the margins.",
-      "properties": {
-        "page": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/PageMargins"
-            }
-          ],
-          "default": {
-            "top": "2 cm",
-            "bottom": "2 cm",
-            "left": "2 cm",
-            "right": "2 cm"
-          },
-          "description": "Page margins.",
-          "title": "Page Margins"
-        },
-        "section_title": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/SectionTitleMargins"
-            }
-          ],
-          "default": {
-            "top": "0.3 cm",
-            "bottom": "0.2 cm"
-          },
-          "description": "Section title margins.",
-          "title": "Section Title Margins"
-        },
-        "header": {
-          "allOf": [
-            {
-              "$ref": "#/$defs/HeaderMargins"
-            }
-          ],
-          "default": {
-            "vertical_between_name_and_connections": "0.3 cm",
-            "bottom": "0.3 cm",
-            "horizontal_between_connections": "0.5 cm"
-          },
-          "description": "Header margins.",
-          "title": "Header Margins"
-        }
-      },
-      "title": "Margins",
-      "type": "object",
-      "additionalProperties": false
     }
   },
   "additionalProperties": false,