diff --git a/pyproject.toml b/pyproject.toml
index 152aa0a..b09b7c0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "avogenerators"
-version = "2.0"
+version = "2.0.0"
 authors =  [
     { name = "Allison Vacanti", email = "allison.vacanti@kitware.com" },
     { name = "Kyle Lutz", email = "kyle.lutz@kitware.com" },
@@ -76,7 +76,7 @@ input-format = "cjson"
 support.molecular = true
 support.periodic = false
 user-options = "src/avogenerators/nwchem/options.json"
-highlight-styles = "src/avogenerators/nwchem/syntax.json"
+highlight-styles = "src/avogenerators/nwchem/syntax.toml"
 
 [[tool.avogadro.input-generators]]
 identifier = "orca"
diff --git a/src/avogenerators/dalton/options.json b/src/avogenerators/dalton/options.json
index 88b150b..2ce21ec 100644
--- a/src/avogenerators/dalton/options.json
+++ b/src/avogenerators/dalton/options.json
@@ -1,59 +1,57 @@
 {
-  "userOptions": {
-    "Title": {
-      "type": "string",
-      "default": "job"
-    },
-    "Calculation Type": {
-      "type": "stringList",
-      "default": 1,
-      "values": [
-        "Single Point",
-        "Optimize + Frequencies",
-        "Frequencies",
-        "Optimize"
-      ]
-    },
-    "Theory": {
-      "type": "stringList",
-      "default": 1,
-      "values": [
-        "SCF",
-        "DFT",
-        "MP2",
-        "CCSD",
-        "CCS",
-        "CC2"
-      ]
-    },
-    "Basis": {
-      "type": "stringList",
-      "default": 4,
-      "values": [
-        "STO-3G",
-        "3-21 G",
-        "6-31 G(d)",
-        "6-31 G(d,p)",
-        "cc-pVDZ",
-        "cc-pVTZ",
-        "aug-cc-pVDZ",
-        "aug-cc-pVTZ"
-      ]
-    },
-    "Filename Base": {
-      "type": "string",
-      "default": "job"
-    },
-    "Functional": {
-      "type": "stringList",
-      "default": 0,
-      "values": [
-        "B3LYP",
-        "CAMB3LYP",
-        "BP86",
-        "KT3",
-        "PBE"
-      ]
-    }
+  "Title": {
+    "type": "string",
+    "default": "job"
+  },
+  "Calculation Type": {
+    "type": "stringList",
+    "default": 1,
+    "values": [
+      "Single Point",
+      "Optimize + Frequencies",
+      "Frequencies",
+      "Optimize"
+    ]
+  },
+  "Theory": {
+    "type": "stringList",
+    "default": 1,
+    "values": [
+      "SCF",
+      "DFT",
+      "MP2",
+      "CCSD",
+      "CCS",
+      "CC2"
+    ]
+  },
+  "Basis": {
+    "type": "stringList",
+    "default": 4,
+    "values": [
+      "STO-3G",
+      "3-21 G",
+      "6-31 G(d)",
+      "6-31 G(d,p)",
+      "cc-pVDZ",
+      "cc-pVTZ",
+      "aug-cc-pVDZ",
+      "aug-cc-pVTZ"
+    ]
+  },
+  "Filename Base": {
+    "type": "string",
+    "default": "job"
+  },
+  "Functional": {
+    "type": "stringList",
+    "default": 0,
+    "values": [
+      "B3LYP",
+      "CAMB3LYP",
+      "BP86",
+      "KT3",
+      "PBE"
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/avogenerators/gamessuk/options.json b/src/avogenerators/gamessuk/options.json
index b3c2e64..f69764e 100644
--- a/src/avogenerators/gamessuk/options.json
+++ b/src/avogenerators/gamessuk/options.json
@@ -1,64 +1,62 @@
 {
-  "userOptions": {
-    "Title": {
-      "type": "string",
-      "default": ""
-    },
-    "Calculation Type": {
-      "type": "stringList",
-      "default": 1,
-      "values": [
-        "Single Point",
-        "Equilibrium Geometry",
-        "Frequencies",
-        "Transition State"
-      ]
-    },
-    "Theory": {
-      "type": "stringList",
-      "default": 2,
-      "values": [
-        "RHF",
-        "MP2",
-        "B3LYP",
-        "BLYP",
-        "SVWN",
-        "B97",
-        "HCTH",
-        "FT97"
-      ]
-    },
-    "Basis": {
-      "type": "stringList",
-      "default": 2,
-      "values": [
-        "STO-3G",
-        "3-21G",
-        "6-31G",
-        "6-31G(d)",
-        "cc-pVDZ",
-        "cc-pVTZ"
-      ]
-    },
-    "Filename Base": {
-      "type": "string",
-      "default": "job"
-    },
-    "Charge": {
-      "type": "integer",
-      "default": 0,
-      "minimum": -9,
-      "maximum": 9
-    },
-    "Multiplicity": {
-      "type": "integer",
-      "default": 1,
-      "minimum": 1,
-      "maximum": 6
-    },
-    "Direct SCF Mode": {
-      "type": "boolean",
-      "default": false
-    }
+  "Title": {
+    "type": "string",
+    "default": ""
+  },
+  "Calculation Type": {
+    "type": "stringList",
+    "default": 1,
+    "values": [
+      "Single Point",
+      "Equilibrium Geometry",
+      "Frequencies",
+      "Transition State"
+    ]
+  },
+  "Theory": {
+    "type": "stringList",
+    "default": 2,
+    "values": [
+      "RHF",
+      "MP2",
+      "B3LYP",
+      "BLYP",
+      "SVWN",
+      "B97",
+      "HCTH",
+      "FT97"
+    ]
+  },
+  "Basis": {
+    "type": "stringList",
+    "default": 2,
+    "values": [
+      "STO-3G",
+      "3-21G",
+      "6-31G",
+      "6-31G(d)",
+      "cc-pVDZ",
+      "cc-pVTZ"
+    ]
+  },
+  "Filename Base": {
+    "type": "string",
+    "default": "job"
+  },
+  "Charge": {
+    "type": "integer",
+    "default": 0,
+    "minimum": -9,
+    "maximum": 9
+  },
+  "Multiplicity": {
+    "type": "integer",
+    "default": 1,
+    "minimum": 1,
+    "maximum": 6
+  },
+  "Direct SCF Mode": {
+    "type": "boolean",
+    "default": false
   }
-}
+}
\ No newline at end of file
diff --git a/src/avogenerators/gaussian/options.json b/src/avogenerators/gaussian/options.json
index 2fc4abc..4773e7a 100644
--- a/src/avogenerators/gaussian/options.json
+++ b/src/avogenerators/gaussian/options.json
@@ -1,113 +1,111 @@
-{
-  "userOptions": [
-    {
-      "tabName": "Standard",
-      "Title": {
-        "type": "string",
-        "default": ""
-      },
-      "Calculation Type": {
-        "type": "stringList",
-        "default": 1,
-        "values": [
-          "Single Point",
-          "Equilibrium Geometry",
-          "Frequencies"
-        ]
-      },
-      "Theory": {
-        "type": "stringList",
-        "default": 3,
-        "values": [
-          "AM1",
-          "PM3",
-          "RHF",
-          "B3LYP",
-          "WB97XD",
-          "MP2",
-          "CCSD"
-        ]
-      },
-      "Basis": {
-        "type": "stringList",
-        "default": 2,
-        "values": [
-          "STO-3G",
-          "3-21G",
-          "6-31G(d)",
-          "6-31G(d,p)",
-          "LANL2DZ",
-          "cc-pVDZ",
-          "cc-pVTZ",
-          "cc-pVQZ",
-          "cc-pV5Z",
-          "cc-pV6Z",
-          "aug-cc-pVDZ",
-          "aug-cc-pVTZ",
-          "aug-cc-pVQZ",
-          "aug-cc-pV5Z",
-          "aug-cc-pV6Z",
-          "Def2SV",
-          "Def2TZV",
-          "Def2QZV",
-          "Def2SVP",
-          "Def2TZVP",
-          "Def2QZVP",
-          "Def2SVPP",
-          "Def2TZVPP",
-          "Def2QZVPP"
-        ]
-      },
-      "Filename Base": {
-        "type": "string",
-        "default": "job"
-      },
-      "Processor Cores": {
-        "type": "integer",
-        "default": 8,
-        "minimum": 1
-      },
-      "Memory": {
-        "type": "integer",
-        "default": 28,
-        "minimum": 1
-      },
-      "Multiplicity": {
-        "type": "integer",
-        "default": 1,
-        "minimum": 1,
-        "maximum": 5
-      },
-      "Charge": {
-        "type": "integer",
-        "default": 0,
-        "minimum": -9,
-        "maximum": 9
-      },
-      "Output Format": {
-        "type": "stringList",
-        "default": 0,
-        "values": [
-          "Standard",
-          "Molden",
-          "Molekel"
-        ]
-      },
-      "Write Checkpoint File": {
-        "type": "boolean",
-        "default": true
-      }
+[
+  {
+    "tabName": "Standard",
+    "Title": {
+      "type": "string",
+      "default": ""
     },
-    {
-      "tabName": "Alternate",
-      "Alternate Theory": {
-        "type": "string",
-        "default": ""
-      },
-      "Alternate Basis Set": {
-        "type": "string",
-        "default": ""
-      }
+    "Calculation Type": {
+      "type": "stringList",
+      "default": 1,
+      "values": [
+        "Single Point",
+        "Equilibrium Geometry",
+        "Frequencies"
+      ]
+    },
+    "Theory": {
+      "type": "stringList",
+      "default": 3,
+      "values": [
+        "AM1",
+        "PM3",
+        "RHF",
+        "B3LYP",
+        "WB97XD",
+        "MP2",
+        "CCSD"
+      ]
+    },
+    "Basis": {
+      "type": "stringList",
+      "default": 2,
+      "values": [
+        "STO-3G",
+        "3-21G",
+        "6-31G(d)",
+        "6-31G(d,p)",
+        "LANL2DZ",
+        "cc-pVDZ",
+        "cc-pVTZ",
+        "cc-pVQZ",
+        "cc-pV5Z",
+        "cc-pV6Z",
+        "aug-cc-pVDZ",
+        "aug-cc-pVTZ",
+        "aug-cc-pVQZ",
+        "aug-cc-pV5Z",
+        "aug-cc-pV6Z",
+        "Def2SV",
+        "Def2TZV",
+        "Def2QZV",
+        "Def2SVP",
+        "Def2TZVP",
+        "Def2QZVP",
+        "Def2SVPP",
+        "Def2TZVPP",
+        "Def2QZVPP"
+      ]
+    },
+    "Filename Base": {
+      "type": "string",
+      "default": "job"
+    },
+    "Processor Cores": {
+      "type": "integer",
+      "default": 8,
+      "minimum": 1
+    },
+    "Memory": {
+      "type": "integer",
+      "default": 28,
+      "minimum": 1
+    },
+    "Multiplicity": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 1,
+      "maximum": 5
+    },
+    "Charge": {
+      "type": "integer",
+      "default": 0,
+      "minimum": -9,
+      "maximum": 9
+    },
+    "Output Format": {
+      "type": "stringList",
+      "default": 0,
+      "values": [
+        "Standard",
+        "Molden",
+        "Molekel"
+      ]
+    },
+    "Write Checkpoint File": {
+      "type": "boolean",
+      "default": true
+    }
+  },
+  {
+    "tabName": "Alternate",
+    "Alternate Theory": {
+      "type": "string",
+      "default": ""
+    },
+    "Alternate Basis Set": {
+      "type": "string",
+      "default": ""
     }
-  ]
-}
+  }
+]
\ No newline at end of file
diff --git a/src/avogenerators/molpro/options.json b/src/avogenerators/molpro/options.json
index e808337..0c5e784 100644
--- a/src/avogenerators/molpro/options.json
+++ b/src/avogenerators/molpro/options.json
@@ -1,65 +1,63 @@
 {
-  "userOptions": {
-    "Title": {
-      "type": "string",
-      "default": ""
-    },
-    "Calculation Type": {
-      "type": "stringList",
-      "default": 1,
-      "values": [
-        "Single Point",
-        "Equilibrium Geometry",
-        "Frequencies"
-      ]
-    },
-    "Theory": {
-      "type": "stringList",
-      "default": 2,
-      "values": [
-        "RHF",
-        "MP2",
-        "B3LYP",
-        "CCSD",
-        "CCSD(T)"
-      ]
-    },
-    "Basis": {
-      "type": "stringList",
-      "default": 2,
-      "values": [
-        "STO-3G",
-        "3-21G",
-        "6-31G",
-        "6-31G(d)",
-        "6-31G(d,p)",
-        "6-31+G(d)",
-        "6-311G(d)",
-        "cc-pVDZ",
-        "cc-pVTZ",
-        "AUG-cc-pVDZ",
-        "AUG-cc-pVTZ"
-      ]
-    },
-    "Filename Base": {
-      "type": "string",
-      "default": "job"
-    },
-    "Charge": {
-      "type": "integer",
-      "default": 0,
-      "minimum": -9,
-      "maximum": 9
-    },
-    "Multiplicity": {
-      "type": "integer",
-      "default": 1,
-      "minimum": 1,
-      "maximum": 6
-    },
-    "Use Pre-2009.1 Format": {
-      "type": "boolean",
-      "default": false
-    }
+  "Title": {
+    "type": "string",
+    "default": ""
+  },
+  "Calculation Type": {
+    "type": "stringList",
+    "default": 1,
+    "values": [
+      "Single Point",
+      "Equilibrium Geometry",
+      "Frequencies"
+    ]
+  },
+  "Theory": {
+    "type": "stringList",
+    "default": 2,
+    "values": [
+      "RHF",
+      "MP2",
+      "B3LYP",
+      "CCSD",
+      "CCSD(T)"
+    ]
+  },
+  "Basis": {
+    "type": "stringList",
+    "default": 2,
+    "values": [
+      "STO-3G",
+      "3-21G",
+      "6-31G",
+      "6-31G(d)",
+      "6-31G(d,p)",
+      "6-31+G(d)",
+      "6-311G(d)",
+      "cc-pVDZ",
+      "cc-pVTZ",
+      "AUG-cc-pVDZ",
+      "AUG-cc-pVTZ"
+    ]
+  },
+  "Filename Base": {
+    "type": "string",
+    "default": "job"
+  },
+  "Charge": {
+    "type": "integer",
+    "default": 0,
+    "minimum": -9,
+    "maximum": 9
+  },
+  "Multiplicity": {
+    "type": "integer",
+    "default": 1,
+    "minimum": 1,
+    "maximum": 6
+  },
+  "Use Pre-2009.1 Format": {
+    "type": "boolean",
+    "default": false
   }
-}
+}
\ No newline at end of file
diff --git a/src/avogenerators/mopac/options.json b/src/avogenerators/mopac/options.json
index 1f4d439..c5bbb4e 100644
--- a/src/avogenerators/mopac/options.json
+++ b/src/avogenerators/mopac/options.json
@@ -1,118 +1,116 @@
 {
-  "userOptions": {
-    "Title": {
-      "type": "string",
-      "default": ""
-    },
-    "Processor Cores": {
-      "type": "integer",
-      "default": 1,
-      "minimum": 1
-    },
-    "Calculation Type": {
-      "type": "stringList",
-      "default": 1,
-      "values": [
-        "Single Point",
-        "Equilibrium Geometry",
-        "Frequencies",
-        "Transition State"
-      ]
-    },
-    "Theory": {
-      "type": "stringList",
-      "default": 3,
-      "values": [
-        "AM1",
-        "PM3",
-        "PM6",
-        "PM7",
-        "RM1",
-        "MNDO",
-        "MNDOD"
-      ]
-    },
-    "Filename Base": {
-      "type": "string",
-      "default": "job"
-    },
-    "Multiplicity": {
-      "type": "integer",
-      "default": 1,
-      "minimum": 1,
-      "maximum": 6
-    },
-    "Charge": {
-      "type": "integer",
-      "default": 0,
-      "minimum": -9,
-      "maximum": 9
-    },
-    "COSMO": {
-      "type": "boolean",
-      "default": true
-    },
-    "Solvent": {
-      "type": "stringList",
-      "default": "Water",
-      "toolTip": "Solvent",
-      "values": [
-        "OTHER",
-        "Acetic acid",
-        "Acetone",
-        "Acetonitrile",
-        "Anisole",
-        "Benzene",
-        "Bromobenzene",
-        "Carbon disulfide",
-        "Carbon tetrachloride",
-        "Chlorobenzene",
-        "Chloroform",
-        "Cyclohexane",
-        "Dibutyl ether",
-        "o-Dichlorobenzene",
-        "1,2-Dichloroethane",
-        "Dichloromethane",
-        "Diethylamine",
-        "Diethylether",
-        "1,2-Dimethoxyethane",
-        "N,N-Dimethylacetamide",
-        "N,N-Dimethylformamide",
-        "Dimethylsulfoxide",
-        "1,4-Dioxane",
-        "Ethanol",
-        "Ethyl acetate",
-        "Ethyl benzoate",
-        "Formamide",
-        "Hexamethylphosphoramide",
-        "Isopropyl lcohol",
-        "Methanol",
-        "2-Methyl-2-propanol",
-        "Nitrobenzene",
-        "Nitromethane",
-        "Pyridine",
-        "Tetrahydrofuran",
-        "Toluene",
-        "Trichloroethylene",
-        "Triethylamine",
-        "Trifluoroacetic acid",
-        "2,2,2-Trifluoroethanol",
-        "Water",
-        "o-Xylene"
-      ]
-    },
-    "Other Solvent Dielectric": {
-      "type": "string",
-      "default": "0.00"
-    },
-    "HF Type": {
-      "type": "stringList",
-      "default": "RHF",
-      "toolTip": "Open or closed shell",
-      "values": [
-        "RHF",
-        "UHF"
-      ]
-    }
+  "Title": {
+    "type": "string",
+    "default": ""
+  },
+  "Processor Cores": {
+    "type": "integer",
+    "default": 1,
+    "minimum": 1
+  },
+  "Calculation Type": {
+    "type": "stringList",
+    "default": 1,
+    "values": [
+      "Single Point",
+      "Equilibrium Geometry",
+      "Frequencies",
+      "Transition State"
+    ]
+  },
+  "Theory": {
+    "type": "stringList",
+    "default": 3,
+    "values": [
+      "AM1",
+      "PM3",
+      "PM6",
+      "PM7",
+      "RM1",
+      "MNDO",
+      "MNDOD"
+    ]
+  },
+  "Filename Base": {
+    "type": "string",
+    "default": "job"
+  },
+  "Multiplicity": {
+    "type": "integer",
+    "default": 1,
+    "minimum": 1,
+    "maximum": 6
+  },
+  "Charge": {
+    "type": "integer",
+    "default": 0,
+    "minimum": -9,
+    "maximum": 9
+  },
+  "COSMO": {
+    "type": "boolean",
+    "default": true
+  },
+  "Solvent": {
+    "type": "stringList",
+    "default": "Water",
+    "toolTip": "Solvent",
+    "values": [
+      "OTHER",
+      "Acetic acid",
+      "Acetone",
+      "Acetonitrile",
+      "Anisole",
+      "Benzene",
+      "Bromobenzene",
+      "Carbon disulfide",
+      "Carbon tetrachloride",
+      "Chlorobenzene",
+      "Chloroform",
+      "Cyclohexane",
+      "Dibutyl ether",
+      "o-Dichlorobenzene",
+      "1,2-Dichloroethane",
+      "Dichloromethane",
+      "Diethylamine",
+      "Diethylether",
+      "1,2-Dimethoxyethane",
+      "N,N-Dimethylacetamide",
+      "N,N-Dimethylformamide",
+      "Dimethylsulfoxide",
+      "1,4-Dioxane",
+      "Ethanol",
+      "Ethyl acetate",
+      "Ethyl benzoate",
+      "Formamide",
+      "Hexamethylphosphoramide",
+      "Isopropyl lcohol",
+      "Methanol",
+      "2-Methyl-2-propanol",
+      "Nitrobenzene",
+      "Nitromethane",
+      "Pyridine",
+      "Tetrahydrofuran",
+      "Toluene",
+      "Trichloroethylene",
+      "Triethylamine",
+      "Trifluoroacetic acid",
+      "2,2,2-Trifluoroethanol",
+      "Water",
+      "o-Xylene"
+    ]
+  },
+  "Other Solvent Dielectric": {
+    "type": "string",
+    "default": "0.00"
+  },
+  "HF Type": {
+    "type": "stringList",
+    "default": "RHF",
+    "toolTip": "Open or closed shell",
+    "values": [
+      "RHF",
+      "UHF"
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/avogenerators/nwchem/options.json b/src/avogenerators/nwchem/options.json
index c3dcee2..ca89f98 100644
--- a/src/avogenerators/nwchem/options.json
+++ b/src/avogenerators/nwchem/options.json
@@ -1,58 +1,56 @@
 {
-  "userOptions": {
-    "Title": {
-      "type": "string",
-      "default": ""
-    },
-    "Calculation Type": {
-      "type": "stringList",
-      "default": 1,
-      "values": [
-        "Single Point",
-        "Equilibrium Geometry",
-        "Frequencies"
-      ]
-    },
-    "Theory": {
-      "type": "stringList",
-      "default": 1,
-      "values": [
-        "RHF",
-        "B3LYP",
-        "MP2",
-        "CCSD"
-      ]
-    },
-    "Basis": {
-      "type": "stringList",
-      "default": 2,
-      "values": [
-        "STO-3G",
-        "3-21 G",
-        "6-31 G(d)",
-        "6-31 G(d,p)",
-        "6-31+ G(d)",
-        "6-311 G(d)",
-        "cc-pVDZ",
-        "cc-pVTZ",
-        "LANL2DZ"
-      ]
-    },
-    "Multiplicity": {
-      "type": "integer",
-      "default": 1,
-      "minimum": 1,
-      "maximum": 5
-    },
-    "Charge": {
-      "type": "integer",
-      "default": 0,
-      "minimum": -9,
-      "maximum": 9
-    },
-    "Filename Base": {
-      "type": "string",
-      "default": "job"
-    }
+  "Title": {
+    "type": "string",
+    "default": ""
+  },
+  "Calculation Type": {
+    "type": "stringList",
+    "default": 1,
+    "values": [
+      "Single Point",
+      "Equilibrium Geometry",
+      "Frequencies"
+    ]
+  },
+  "Theory": {
+    "type": "stringList",
+    "default": 1,
+    "values": [
+      "RHF",
+      "B3LYP",
+      "MP2",
+      "CCSD"
+    ]
+  },
+  "Basis": {
+    "type": "stringList",
+    "default": 2,
+    "values": [
+      "STO-3G",
+      "3-21 G",
+      "6-31 G(d)",
+      "6-31 G(d,p)",
+      "6-31+ G(d)",
+      "6-311 G(d)",
+      "cc-pVDZ",
+      "cc-pVTZ",
+      "LANL2DZ"
+    ]
+  },
+  "Multiplicity": {
+    "type": "integer",
+    "default": 1,
+    "minimum": 1,
+    "maximum": 5
+  },
+  "Charge": {
+    "type": "integer",
+    "default": 0,
+    "minimum": -9,
+    "maximum": 9
+  },
+  "Filename Base": {
+    "type": "string",
+    "default": "job"
   }
-}
+}
\ No newline at end of file
diff --git a/src/avogenerators/nwchem/syntax.json b/src/avogenerators/nwchem/syntax.json
deleted file mode 100644
index 06d0558..0000000
--- a/src/avogenerators/nwchem/syntax.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
-  "highlightStyles": [
-    {
-      "style": "default",
-      "rules": [
-        {
-          "patterns": [
-            {
-              "regexp": "\\b[+-]?[.0-9]+(?:[eEdD][+-]?[.0-9]+)?\\b"
-            }
-          ],
-          "format": {
-            "preset": "literal"
-          }
-        },
-        {
-          "patterns": [
-            {
-              "regexp": "\\b(?:re)?start\\b"
-            },
-            {
-              "regexp": "\\b(?:scratch|permanent)?_dir\\b"
-            },
-            {
-              "regexp": "\\bmemory\\b"
-            },
-            {
-              "regexp": "\\becho\\b"
-            },
-            {
-              "regexp": "\\btitle\\b"
-            },
-            {
-              "regexp": "\\b(?:no)?print\\b"
-            },
-            {
-              "regexp": "\\b(?:un)?set\\b"
-            },
-            {
-              "regexp": "\\bstop\\b"
-            },
-            {
-              "regexp": "\\btask\\b"
-            },
-            {
-              "regexp": "\\becce_print\\b"
-            },
-            {
-              "regexp": "\\bcharge\\b"
-            },
-            {
-              "regexp": "\\bgeometry\\b"
-            },
-            {
-              "regexp": "\\bbasis\\b"
-            },
-            {
-              "regexp": "\\bspherical\\b"
-            },
-            {
-              "regexp": "\\blibrary\\b"
-            },
-            {
-              "regexp": "\\bend\\b"
-            },
-            {
-              "regexp": "\\bxc\\b"
-            },
-            {
-              "regexp": "\\bmult\\b"
-            },
-            {
-              "regexp": "\\bfreeze atomic\\b"
-            },
-            {
-              "regexp": "\\b(?:no)?center\\b"
-            },
-            {
-              "regexp": "\\bbqbq\\b"
-            },
-            {
-              "regexp": "\\bnuc(?:l(?:eus)?)?\\b"
-            },
-            {
-              "regexp": "\\bscf\\b"
-            },
-            {
-              "regexp": "\\bdft\\b"
-            },
-            {
-              "regexp": "\\bmp2\\b"
-            },
-            {
-              "regexp": "\\bccsd\\b"
-            },
-            {
-              "regexp": "\\bunits\\b"
-            },
-            {
-              "regexp": "\\bautosym\\b"
-            }
-          ],
-          "format": {
-            "preset": "keyword"
-          }
-        },
-        {
-          "patterns": [
-            {
-              "regexp": "\\*\\s+library\\s+([^\\n]+)"
-            },
-            {
-              "regexp": "\\*\\s+library\\s+([^\\n]+)"
-            },
-            {
-              "regexp": "\\*\\s+library\\s+([^\\n]+)"
-            },
-            {
-              "regexp": "\\*\\s+library\\s+([^\\n]+)"
-            },
-            {
-              "regexp": "\\*\\s+library\\s+([^\\n]+)"
-            },
-            {
-              "regexp": "\\*\\s+library\\s+([^\\n]+)"
-            },
-            {
-              "regexp": "\\*\\s+library\\s+([^\\n]+)"
-            },
-            {
-              "regexp": "\\*\\s+library\\s+([^\\n]+)"
-            },
-            {
-              "regexp": "\\*\\s+library\\s+([^\\n]+)"
-            },
-            {
-              "regexp": "units\\s+(an|angstroms|au|atom|bohr|nm|nanometers|pm|picometers)"
-            },
-            {
-              "regexp": "(?:re)?start\\s+([^;\\n]+)"
-            },
-            {
-              "regexp": "\\bprint\\s+(xyz)"
-            },
-            {
-              "regexp": "\\autosym\\s+([-\\d.eEdD+]+)"
-            },
-            {
-              "regexp": "\\bnuc(?:l(?:eus)?)?\\s+([^\\s;]+)"
-            },
-            {
-              "regexp": "\\bbasis\\s+(spherical)\\b"
-            },
-            {
-              "regexp": "\\bxc\\s+([^\\n]+)\\b"
-            },
-            {
-              "regexp": "\\btask\\s+((?:mc)?scf|(:?so)?dft|(:?direct_|ri)?mp2|ccsd(:?\\(t\\))?|selci|md|pspw|band|tce)\\s+(energy|gradient|optimize|saddle|hessian|freq(?:uencies)?|property|(?:thermo)?dynamics)\\b"
-            }
-          ],
-          "format": {
-            "preset": "property"
-          }
-        },
-        {
-          "patterns": [
-            {
-              "regexp": "title\\s+\"(.+)\""
-            }
-          ],
-          "format": {
-            "preset": "title"
-          }
-        },
-        {
-          "patterns": [
-            {
-              "regexp": "#[^\n]*"
-            }
-          ],
-          "format": {
-            "preset": "comment"
-          }
-        }
-      ]
-    }
-  ]
-}
diff --git a/src/avogenerators/nwchem/syntax.toml b/src/avogenerators/nwchem/syntax.toml
new file mode 100644
index 0000000..0fac58e
--- /dev/null
+++ b/src/avogenerators/nwchem/syntax.toml
@@ -0,0 +1,72 @@
+[[default.rules]]
+format.preset = "literal"
+patterns = [
+    { regexp = '\b[+-]?[.0-9]+(?:[eEdD][+-]?[.0-9]+)?\b' },
+]
+
+[[default.rules]]
+format.preset = "keyword"
+patterns = [
+    { regexp = '\b(?:re)?start\b' },
+    { regexp = '\b(?:scratch|permanent)?_dir\b' },
+    { regexp = '\bmemory\b' },
+    { regexp = '\becho\b' },
+    { regexp = '\btitle\b' },
+    { regexp = '\b(?:no)?print\b' },
+    { regexp = '\b(?:un)?set\b' },
+    { regexp = '\bstop\b' },
+    { regexp = '\btask\b' },
+    { regexp = '\becce_print\b' },
+    { regexp = '\bcharge\b' },
+    { regexp = '\bgeometry\b' },
+    { regexp = '\bbasis\b' },
+    { regexp = '\bspherical\b' },
+    { regexp = '\blibrary\b' },
+    { regexp = '\bend\b' },
+    { regexp = '\bxc\b' },
+    { regexp = '\bmult\b' },
+    { regexp = '\bfreeze atomic\b' },
+    { regexp = '\b(?:no)?center\b' },
+    { regexp = '\bbqbq\b' },
+    { regexp = '\bnuc(?:l(?:eus)?)?\b' },
+    { regexp = '\bscf\b' },
+    { regexp = '\bdft\b' },
+    { regexp = '\bmp2\b' },
+    { regexp = '\bccsd\b' },
+    { regexp = '\bunits\b' },
+    { regexp = '\bautosym\b' },
+]
+
+[[default.rules]]
+format.preset = "property"
+patterns = [
+    { regexp = '\*\s+library\s+([^\n]+)' },
+    { regexp = '\*\s+library\s+([^\n]+)' },
+    { regexp = '\*\s+library\s+([^\n]+)' },
+    { regexp = '\*\s+library\s+([^\n]+)' },
+    { regexp = '\*\s+library\s+([^\n]+)' },
+    { regexp = '\*\s+library\s+([^\n]+)' },
+    { regexp = '\*\s+library\s+([^\n]+)' },
+    { regexp = '\*\s+library\s+([^\n]+)' },
+    { regexp = '\*\s+library\s+([^\n]+)' },
+    { regexp = 'units\s+(an|angstroms|au|atom|bohr|nm|nanometers|pm|picometers)' },
+    { regexp = '(?:re)?start\s+([^;\\n]+)' },
+    { regexp = '\bprint\s+(xyz)' },
+    { regexp = '\autosym\s+([-\d.eEdD+]+)' },
+    { regexp = '\bnuc(?:l(?:eus)?)?\s+([^\s;]+)' },
+    { regexp = '\bbasis\s+(spherical)\b' },
+    { regexp = '\bxc\s+([^\n]+)\b' },
+    { regexp = '\btask\s+((?:mc)?scf|(:?so)?dft|(:?direct_|ri)?mp2|ccsd(:?\(t\))?|selci|md|pspw|band|tce)\s+(energy|gradient|optimize|saddle|hessian|freq(?:uencies)?|property|(?:thermo)?dynamics)\b' },
+]
+
+[[default.rules]]
+format.preset = "title"
+patterns = [
+    { regexp = 'title\s+"(.+)"' },
+]
+
+[[default.rules]]
+format.preset = "comment"
+patterns = [
+    { regexp = '#[^\n]*' },
+]
diff --git a/src/avogenerators/orca/options.json b/src/avogenerators/orca/options.json
index 74897fd..85422d2 100644
--- a/src/avogenerators/orca/options.json
+++ b/src/avogenerators/orca/options.json
@@ -1,213 +1,211 @@
-{
-  "userOptions": [
-    {
-      "tabName": "Basic",
-      "Title": {
-        "type": "string",
-        "default": "",
-        "toolTip": "Title of the input file"
-      },
-      "Processor Cores": {
-        "type": "integer",
-        "default": 1,
-        "minimum": 1
-      },
-      "Memory": {
-        "type": "integer",
-        "default": 16,
-        "minimum": 1
-      },
-      "Calculation Type": {
-        "type": "stringList",
-        "default": 1,
-        "values": [
-          "Single Point",
-          "Geometry Optimization",
-          "Frequencies",
-          "Transition State",
-          "Dynamics"
-        ],
-        "toolTip": "Type of calculation to perform"
-      },
-      "Print Molecular Orbitals": {
-        "type": "boolean",
-        "default": true
-      },
-      "Use Symmetry": {
-        "type": "boolean",
-        "default": false
-      },
-      "Constrain Geometry": {
-        "type": "boolean",
-        "default": false,
-        "toolTip": "Use constrained geometry optimization"
-      },
-      "Theory": {
-        "type": "stringList",
-        "default": 7,
-        "values": [
-          "HF",
-          "MP2",
-          "CCSD",
-          "CCSD(T)",
-          "BLYP",
-          "PBE",
-          "PBE0",
-          "revPBE",
-          "B3LYP",
-          "B97-3C",
-          "M06L",
-          "M062X",
-          "wB97X-D3"
-        ]
-      },
-      "RI Approximation": {
-        "type": "stringList",
-        "default": 0,
-        "values": [
-          "None",
-          "NORI",
-          "RIJK",
-          "RIJONX",
-          "RIJCOSX"
-        ]
-      },
-      "Dispersion Correction": {
-        "type": "stringList",
-        "default": 0,
-        "values": [
-          "None",
-          "D3ZERO",
-          "D3BJ",
-          "D4"
-        ],
-        "toolTip": "Any added dispersion corrections",
-        "hide": true
-      },
-      "Basis": {
-        "type": "stringList",
-        "default": 8,
-        "values": [
-          "6-31G(d)",
-          "cc-pVDZ",
-          "cc-pVTZ",
-          "cc-pVQZ",
-          "aug-cc-pVDZ",
-          "aug-cc-pVTZ",
-          "aug-cc-pVQZ",
-          "def2-SVP",
-          "def2-TZVP",
-          "def2-QZVP",
-          "def2-TZVPP",
-          "def2-QZVPP",
-          "def2-TZVPPD",
-          "def2-QZVPPD",
-          "ma-def2-SVP",
-          "ma-def2-TZVP",
-          "ma-def2-QZVP"
-        ],
-        "toolTip": "Gaussian basis set"
-      },
-      "Solvent": {
-        "type": "stringList",
-        "default": 0,
-        "values": [
-          "None (gas)",
-          "-",
-          "Water",
-          "Acetonitrile",
-          "Acetone",
-          "Ethanol",
-          "Methanol",
-          "CCl4",
-          "CH2Cl2",
-          "Chloroform",
-          "DMSO",
-          "DMF",
-          "Hexane",
-          "Toluene",
-          "Pyridine",
-          "THF",
-          "Toluene"
-        ],
-        "toolTip": "Solvent"
-      },
-      "Solvation Model": {
-        "type": "stringList",
-        "default": 0,
-        "values": [
-          "CPCM",
-          "SMD"
-        ],
-        "toolTip": "Solvation Method"
-      },
-      "Filename Base": {
-        "type": "string",
-        "default": "job"
-      },
-      "Charge": {
-        "type": "integer",
-        "default": 0,
-        "minimum": -9,
-        "maximum": 9,
-        "toolTip": "Total charge of the system"
-      },
-      "Multiplicity": {
-        "type": "integer",
-        "default": 1,
-        "minimum": 1,
-        "maximum": 6,
-        "toolTip": "Total spin multiplicity of the system"
-      }
-    },
-    {
-      "tabName": "Dynamics",
-      "AIMD TimeStep": {
-        "type": "string",
-        "default": "0.5_fs"
-      },
-      "AIMD Initvel": {
-        "type": "string",
-        "default": "350"
-      },
-      "AIMD Thermostat Temp": {
-        "type": "integer",
-        "default": 300,
-        "maximum": 1000,
-        "minimum": 0
-      },
-      "AIMD Thermostat Time": {
-        "type": "string",
-        "default": "10_fs"
-      },
-      "AIMD RunTime": {
-        "type": "integer",
-        "default": 200
-      }
-    },
-    {
-      "tabName": "Excited States",
-      "Excited State Method": {
-        "type": "stringList",
-        "default": 0,
-        "values": [
-          "None",
-          "CIS",
-          "CIS(D)",
-          "TDDFT",
-          "EOM-CCSD"
-        ]
-      },
-      "Number of States": {
-        "type": "integer",
-        "default": 3,
-        "minimum": 1
-      },
-      "Target State": {
-        "type": "integer",
-        "default": 1,
-        "minimum": 1
-      }
+[
+  {
+    "tabName": "Basic",
+    "Title": {
+      "type": "string",
+      "default": "",
+      "toolTip": "Title of the input file"
+    },
+    "Processor Cores": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 1
+    },
+    "Memory": {
+      "type": "integer",
+      "default": 16,
+      "minimum": 1
+    },
+    "Calculation Type": {
+      "type": "stringList",
+      "default": 1,
+      "values": [
+        "Single Point",
+        "Geometry Optimization",
+        "Frequencies",
+        "Transition State",
+        "Dynamics"
+      ],
+      "toolTip": "Type of calculation to perform"
+    },
+    "Print Molecular Orbitals": {
+      "type": "boolean",
+      "default": true
+    },
+    "Use Symmetry": {
+      "type": "boolean",
+      "default": false
+    },
+    "Constrain Geometry": {
+      "type": "boolean",
+      "default": false,
+      "toolTip": "Use constrained geometry optimization"
+    },
+    "Theory": {
+      "type": "stringList",
+      "default": 7,
+      "values": [
+        "HF",
+        "MP2",
+        "CCSD",
+        "CCSD(T)",
+        "BLYP",
+        "PBE",
+        "PBE0",
+        "revPBE",
+        "B3LYP",
+        "B97-3C",
+        "M06L",
+        "M062X",
+        "wB97X-D3"
+      ]
+    },
+    "RI Approximation": {
+      "type": "stringList",
+      "default": 0,
+      "values": [
+        "None",
+        "NORI",
+        "RIJK",
+        "RIJONX",
+        "RIJCOSX"
+      ]
+    },
+    "Dispersion Correction": {
+      "type": "stringList",
+      "default": 0,
+      "values": [
+        "None",
+        "D3ZERO",
+        "D3BJ",
+        "D4"
+      ],
+      "toolTip": "Any added dispersion corrections",
+      "hide": true
+    },
+    "Basis": {
+      "type": "stringList",
+      "default": 8,
+      "values": [
+        "6-31G(d)",
+        "cc-pVDZ",
+        "cc-pVTZ",
+        "cc-pVQZ",
+        "aug-cc-pVDZ",
+        "aug-cc-pVTZ",
+        "aug-cc-pVQZ",
+        "def2-SVP",
+        "def2-TZVP",
+        "def2-QZVP",
+        "def2-TZVPP",
+        "def2-QZVPP",
+        "def2-TZVPPD",
+        "def2-QZVPPD",
+        "ma-def2-SVP",
+        "ma-def2-TZVP",
+        "ma-def2-QZVP"
+      ],
+      "toolTip": "Gaussian basis set"
+    },
+    "Solvent": {
+      "type": "stringList",
+      "default": 0,
+      "values": [
+        "None (gas)",
+        "-",
+        "Water",
+        "Acetonitrile",
+        "Acetone",
+        "Ethanol",
+        "Methanol",
+        "CCl4",
+        "CH2Cl2",
+        "Chloroform",
+        "DMSO",
+        "DMF",
+        "Hexane",
+        "Toluene",
+        "Pyridine",
+        "THF",
+        "Toluene"
+      ],
+      "toolTip": "Solvent"
+    },
+    "Solvation Model": {
+      "type": "stringList",
+      "default": 0,
+      "values": [
+        "CPCM",
+        "SMD"
+      ],
+      "toolTip": "Solvation Method"
+    },
+    "Filename Base": {
+      "type": "string",
+      "default": "job"
+    },
+    "Charge": {
+      "type": "integer",
+      "default": 0,
+      "minimum": -9,
+      "maximum": 9,
+      "toolTip": "Total charge of the system"
+    },
+    "Multiplicity": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 1,
+      "maximum": 6,
+      "toolTip": "Total spin multiplicity of the system"
+    }
+  },
+  {
+    "tabName": "Dynamics",
+    "AIMD TimeStep": {
+      "type": "string",
+      "default": "0.5_fs"
+    },
+    "AIMD Initvel": {
+      "type": "string",
+      "default": "350"
+    },
+    "AIMD Thermostat Temp": {
+      "type": "integer",
+      "default": 300,
+      "maximum": 1000,
+      "minimum": 0
+    },
+    "AIMD Thermostat Time": {
+      "type": "string",
+      "default": "10_fs"
+    },
+    "AIMD RunTime": {
+      "type": "integer",
+      "default": 200
+    }
+  },
+  {
+    "tabName": "Excited States",
+    "Excited State Method": {
+      "type": "stringList",
+      "default": 0,
+      "values": [
+        "None",
+        "CIS",
+        "CIS(D)",
+        "TDDFT",
+        "EOM-CCSD"
+      ]
+    },
+    "Number of States": {
+      "type": "integer",
+      "default": 3,
+      "minimum": 1
+    },
+    "Target State": {
+      "type": "integer",
+      "default": 1,
+      "minimum": 1
     }
-  ]
-}
+  }
+]
\ No newline at end of file
diff --git a/src/avogenerators/psi4/options.json b/src/avogenerators/psi4/options.json
index f40ef83..0869fb9 100644
--- a/src/avogenerators/psi4/options.json
+++ b/src/avogenerators/psi4/options.json
@@ -1,107 +1,105 @@
 {
-  "userOptions": {
-    "Title": {
-      "type": "string",
-      "default": "",
-      "toolTip": "Title of the input file"
-    },
-    "Processor Cores": {
-      "type": "integer",
-      "default": 1,
-      "minimum": 1
-    },
-    "Memory": {
-      "type": "integer",
-      "default": 16,
-      "minimum": 1
-    },
-    "Calculation Type": {
-      "type": "stringList",
-      "default": 1,
-      "toolTip": "Type of calculation to perform",
-      "values": [
-        "Single Point",
-        "Geometry Optimization",
-        "Frequencies"
-      ]
-    },
-    "Theory": {
-      "type": "stringList",
-      "default": 7,
-      "toolTip": "Hamiltonian or DFT method to use",
-      "values": [
-        "HF",
-        "MP2",
-        "CCSD",
-        "CCSD(T)",
-        "B3LYP-D",
-        "B97-D",
-        "B97-D3BJ",
-        "REVPBE",
-        "REVPBE-D3BJ",
-        "wB97X-D",
-        "M06-2X",
-        "MO6-L",
-        "SAPT0",
-        "SAPT2",
-        "SAPT2-ct",
-        "SAPT2+",
-        "SAPT2+-ct",
-        "SAPT2+(3)",
-        "SAPT2+(3)-ct",
-        "SAPT2+3",
-        "SAPT2+3-ct"
-      ]
-    },
-    "Basis": {
-      "type": "stringList",
-      "default": 11,
-      "toolTip": "Gaussian basis set",
-      "values": [
-        "6-31G(d)",
-        "cc-pVDZ",
-        "cc-pVTZ",
-        "cc-pVQZ",
-        "cc-pV5Z",
-        "cc-pV6Z",
-        "aug-cc-pVDZ",
-        "aug-cc-pVTZ",
-        "aug-cc-pVQZ",
-        "aug-cc-pV5Z",
-        "aug-cc-pV6Z",
-        "def2-SVP",
-        "def2-SVPD",
-        "def2-TZVP",
-        "def2-QZVP",
-        "pc-2",
-        "aug-pc-2"
-      ]
-    },
-    "Alternate Basis Set": {
-      "type": "boolean",
-      "default": false
-    },
-    "Alternate Basis Set Name": {
-      "type": "string",
-      "default": ""
-    },
-    "Filename Base": {
-      "type": "string",
-      "default": "job"
-    },
-    "Charge": {
-      "type": "integer",
-      "default": 0,
-      "toolTip": "Total charge of the system",
-      "minimum": -9,
-      "maximum": 9
-    },
-    "Multiplicity": {
-      "type": "integer",
-      "default": 1,
-      "toolTip": "Total spin multiplicity of the system",
-      "minimum": 1,
-      "maximum": 6
-    }
+  "Title": {
+    "type": "string",
+    "default": "",
+    "toolTip": "Title of the input file"
+  },
+  "Processor Cores": {
+    "type": "integer",
+    "default": 1,
+    "minimum": 1
+  },
+  "Memory": {
+    "type": "integer",
+    "default": 16,
+    "minimum": 1
+  },
+  "Calculation Type": {
+    "type": "stringList",
+    "default": 1,
+    "toolTip": "Type of calculation to perform",
+    "values": [
+      "Single Point",
+      "Geometry Optimization",
+      "Frequencies"
+    ]
+  },
+  "Theory": {
+    "type": "stringList",
+    "default": 7,
+    "toolTip": "Hamiltonian or DFT method to use",
+    "values": [
+      "HF",
+      "MP2",
+      "CCSD",
+      "CCSD(T)",
+      "B3LYP-D",
+      "B97-D",
+      "B97-D3BJ",
+      "REVPBE",
+      "REVPBE-D3BJ",
+      "wB97X-D",
+      "M06-2X",
+      "MO6-L",
+      "SAPT0",
+      "SAPT2",
+      "SAPT2-ct",
+      "SAPT2+",
+      "SAPT2+-ct",
+      "SAPT2+(3)",
+      "SAPT2+(3)-ct",
+      "SAPT2+3",
+      "SAPT2+3-ct"
+    ]
+  },
+  "Basis": {
+    "type": "stringList",
+    "default": 11,
+    "toolTip": "Gaussian basis set",
+    "values": [
+      "6-31G(d)",
+      "cc-pVDZ",
+      "cc-pVTZ",
+      "cc-pVQZ",
+      "cc-pV5Z",
+      "cc-pV6Z",
+      "aug-cc-pVDZ",
+      "aug-cc-pVTZ",
+      "aug-cc-pVQZ",
+      "aug-cc-pV5Z",
+      "aug-cc-pV6Z",
+      "def2-SVP",
+      "def2-SVPD",
+      "def2-TZVP",
+      "def2-QZVP",
+      "pc-2",
+      "aug-pc-2"
+    ]
+  },
+  "Alternate Basis Set": {
+    "type": "boolean",
+    "default": false
+  },
+  "Alternate Basis Set Name": {
+    "type": "string",
+    "default": ""
+  },
+  "Filename Base": {
+    "type": "string",
+    "default": "job"
+  },
+  "Charge": {
+    "type": "integer",
+    "default": 0,
+    "toolTip": "Total charge of the system",
+    "minimum": -9,
+    "maximum": 9
+  },
+  "Multiplicity": {
+    "type": "integer",
+    "default": 1,
+    "toolTip": "Total spin multiplicity of the system",
+    "minimum": 1,
+    "maximum": 6
   }
-}
+}
\ No newline at end of file
diff --git a/src/avogenerators/pyscf/options.json b/src/avogenerators/pyscf/options.json
index 694367d..ee1fbd9 100644
--- a/src/avogenerators/pyscf/options.json
+++ b/src/avogenerators/pyscf/options.json
@@ -1,50 +1,48 @@
 {
-  "userOptions": {
-    "Title": {
-      "type": "string",
-      "default": ""
-    },
-    "Calculation Type": {
-      "type": "stringList",
-      "default": 0,
-      "values": [
-        "Single Point"
-      ]
-    },
-    "Theory": {
-      "type": "stringList",
-      "default": 0,
-      "values": [
-        "RHF",
-        "ROHF",
-        "UHF",
-        "MP2"
-      ]
-    },
-    "Basis": {
-      "type": "stringList",
-      "default": 0,
-      "values": [
-        "STO-3G",
-        "3-21g",
-        "cc-pvdz"
-      ]
-    },
-    "Filename Base": {
-      "type": "string",
-      "default": "job"
-    },
-    "Charge": {
-      "type": "integer",
-      "default": 0,
-      "minimum": -9,
-      "maximum": 9
-    },
-    "Multiplicity": {
-      "type": "integer",
-      "default": 1,
-      "minimum": 1,
-      "maximum": 6
-    }
+  "Title": {
+    "type": "string",
+    "default": ""
+  },
+  "Calculation Type": {
+    "type": "stringList",
+    "default": 0,
+    "values": [
+      "Single Point"
+    ]
+  },
+  "Theory": {
+    "type": "stringList",
+    "default": 0,
+    "values": [
+      "RHF",
+      "ROHF",
+      "UHF",
+      "MP2"
+    ]
+  },
+  "Basis": {
+    "type": "stringList",
+    "default": 0,
+    "values": [
+      "STO-3G",
+      "3-21g",
+      "cc-pvdz"
+    ]
+  },
+  "Filename Base": {
+    "type": "string",
+    "default": "job"
+  },
+  "Charge": {
+    "type": "integer",
+    "default": 0,
+    "minimum": -9,
+    "maximum": 9
+  },
+  "Multiplicity": {
+    "type": "integer",
+    "default": 1,
+    "minimum": 1,
+    "maximum": 6
   }
-}
+}
\ No newline at end of file
diff --git a/src/avogenerators/qchem/options.json b/src/avogenerators/qchem/options.json
index a9d06a0..f45ef75 100644
--- a/src/avogenerators/qchem/options.json
+++ b/src/avogenerators/qchem/options.json
@@ -1,62 +1,60 @@
 {
-  "userOptions": {
-    "Title": {
-      "type": "string",
-      "default": ""
-    },
-    "Calculation Type": {
-      "type": "stringList",
-      "default": 1,
-      "values": [
-        "Single Point",
-        "Equilibrium Geometry",
-        "Frequencies"
-      ]
-    },
-    "Theory": {
-      "type": "stringList",
-      "default": 2,
-      "values": [
-        "HF",
-        "MP2",
-        "B3LYP",
-        "B3LYP5",
-        "EDF1",
-        "M062X",
-        "CCSD"
-      ]
-    },
-    "Basis": {
-      "type": "stringList",
-      "default": 2,
-      "values": [
-        "STO-3G",
-        "3-21G",
-        "6-31G(d)",
-        "6-31G(d,p)",
-        "6-31+G(d)",
-        "6-311G(d)",
-        "cc-pVDZ",
-        "cc-pVTZ",
-        "LANL2DZ",
-        "LACVP"
-      ]
-    },
-    "Filename Base": {
-      "type": "string",
-      "default": "job"
-    },
-    "Charge": {
-      "type": "integer",
-      "default": 0,
-      "minimum": -9,
-      "maximum": 9
-    },
-    "Multiplicity": {
-      "type": "integer",
-      "default": 1,
-      "minimum": 1,
-      "maximum": 6
-    }
+  "Title": {
+    "type": "string",
+    "default": ""
+  },
+  "Calculation Type": {
+    "type": "stringList",
+    "default": 1,
+    "values": [
+      "Single Point",
+      "Equilibrium Geometry",
+      "Frequencies"
+    ]
+  },
+  "Theory": {
+    "type": "stringList",
+    "default": 2,
+    "values": [
+      "HF",
+      "MP2",
+      "B3LYP",
+      "B3LYP5",
+      "EDF1",
+      "M062X",
+      "CCSD"
+    ]
+  },
+  "Basis": {
+    "type": "stringList",
+    "default": 2,
+    "values": [
+      "STO-3G",
+      "3-21G",
+      "6-31G(d)",
+      "6-31G(d,p)",
+      "6-31+G(d)",
+      "6-311G(d)",
+      "cc-pVDZ",
+      "cc-pVTZ",
+      "LANL2DZ",
+      "LACVP"
+    ]
+  },
+  "Filename Base": {
+    "type": "string",
+    "default": "job"
+  },
+  "Charge": {
+    "type": "integer",
+    "default": 0,
+    "minimum": -9,
+    "maximum": 9
+  },
+  "Multiplicity": {
+    "type": "integer",
+    "default": 1,
+    "minimum": 1,
+    "maximum": 6
   }
-}
+}
\ No newline at end of file
diff --git a/src/avogenerators/terachem/options.json b/src/avogenerators/terachem/options.json
index 6eabcae..df84bc3 100644
--- a/src/avogenerators/terachem/options.json
+++ b/src/avogenerators/terachem/options.json
@@ -1,73 +1,71 @@
 {
-  "userOptions": {
-    "Title": {
-      "type": "string",
-      "default": ""
-    },
-    "Calculation Type": {
-      "type": "stringList",
-      "default": 2,
-      "values": [
-        "Single Point",
-        "Gradient",
-        "Equilibrium Geometry"
-      ]
-    },
-    "Theory": {
-      "type": "stringList",
-      "default": 2,
-      "values": [
-        "HF",
-        "BLYP",
-        "B3LYP",
-        "B3LYP1",
-        "B3LYP5",
-        "PBE",
-        "REVPBE"
-      ]
-    },
-    "Filename Base": {
-      "type": "string",
-      "default": "job"
-    },
-    "Unrestricted": {
-      "type": "boolean",
-      "default": false
-    },
-    "Basis": {
-      "type": "stringList",
-      "default": 2,
-      "values": [
-        "STO-3G",
-        "3-21G",
-        "6-31G(d)",
-        "6-31G(d,p)",
-        "6-31+G(d)",
-        "6-311G(d)",
-        "cc-pVDZ"
-      ]
-    },
-    "Dispersion": {
-      "type": "stringList",
-      "default": 0,
-      "values": [
-        "Off",
-        "On",
-        "D2",
-        "D3"
-      ]
-    },
-    "Charge": {
-      "type": "integer",
-      "default": 0,
-      "minimum": -9,
-      "maximum": 9
-    },
-    "Multiplicity": {
-      "type": "integer",
-      "default": 1,
-      "minimum": 1,
-      "maximum": 6
-    }
+  "Title": {
+    "type": "string",
+    "default": ""
+  },
+  "Calculation Type": {
+    "type": "stringList",
+    "default": 2,
+    "values": [
+      "Single Point",
+      "Gradient",
+      "Equilibrium Geometry"
+    ]
+  },
+  "Theory": {
+    "type": "stringList",
+    "default": 2,
+    "values": [
+      "HF",
+      "BLYP",
+      "B3LYP",
+      "B3LYP1",
+      "B3LYP5",
+      "PBE",
+      "REVPBE"
+    ]
+  },
+  "Filename Base": {
+    "type": "string",
+    "default": "job"
+  },
+  "Unrestricted": {
+    "type": "boolean",
+    "default": false
+  },
+  "Basis": {
+    "type": "stringList",
+    "default": 2,
+    "values": [
+      "STO-3G",
+      "3-21G",
+      "6-31G(d)",
+      "6-31G(d,p)",
+      "6-31+G(d)",
+      "6-311G(d)",
+      "cc-pVDZ"
+    ]
+  },
+  "Dispersion": {
+    "type": "stringList",
+    "default": 0,
+    "values": [
+      "Off",
+      "On",
+      "D2",
+      "D3"
+    ]
+  },
+  "Charge": {
+    "type": "integer",
+    "default": 0,
+    "minimum": -9,
+    "maximum": 9
+  },
+  "Multiplicity": {
+    "type": "integer",
+    "default": 1,
+    "minimum": 1,
+    "maximum": 6
   }
-}
+}
\ No newline at end of file