diff --git a/pype/settings/entities/schemas/system_schema/schema_tools.json b/pype/settings/entities/schemas/system_schema/schema_tools.json
index 2c04abc47c..188d2fc8e8 100644
--- a/pype/settings/entities/schemas/system_schema/schema_tools.json
+++ b/pype/settings/entities/schemas/system_schema/schema_tools.json
@@ -1,37 +1,35 @@
 {
-    "key": "tools",
     "type": "dict",
-    "label": "Tools",
+    "key": "tools",
     "collapsible": true,
     "is_file": true,
     "children": [
         {
-            "type": "schema",
-            "name": "schema_arnold"
-        },
-        {
-            "type": "schema",
-            "name": "schema_vray"
-        },
-        {
-            "type": "schema",
-            "name": "schema_yeti"
-        },
-        {
-            "type": "dict",
-            "key": "other",
-            "children": [
-                {
-                    "type": "schema_template",
-                    "name": "template_tool_variant",
-                    "template_data": [
-                        {
-                            "tool_name": "othertools",
-                            "tool_label": "Other Tools and Plugins"
+            "type": "dict-modifiable",
+            "label": "Tools",
+            "key": "tool_groups",
+            "collapsible_key": true,
+            "object_type": {
+                "type": "dict",
+                "children": [
+                    {
+                        "key": "environment",
+                        "label": "Environments",
+                        "type": "raw-json"
+                    },
+                    {
+                        "type": "separator"
+                    },
+                    {
+                        "type": "dict-modifiable",
+                        "key": "variants",
+                        "label": "Variants",
+                        "object_type": {
+                            "type": "raw-json"
                         }
-                    ]
-                }
-            ]
+                    }
+                ]
+            }
         }
     ]
 }
diff --git a/pype/settings/entities/schemas/system_schema/tool_settings/schema_arnold.json b/pype/settings/entities/schemas/system_schema/tool_settings/schema_arnold.json
deleted file mode 100644
index db2be09c83..0000000000
--- a/pype/settings/entities/schemas/system_schema/tool_settings/schema_arnold.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "type": "dict",
-    "key": "mtoa",
-    "label": "Autodesk Arnold",
-    "collapsible": true,
-    "checkbox_key": "enabled",
-    "children": [
-        {
-            "type": "boolean",
-            "key": "enabled",
-            "label": "Enabled"
-        },
-        {
-            "key": "environment",
-            "label": "Environment (mtoa)",
-            "type": "raw-json",
-            "env_group_key": "mtoa"
-        },
-        {
-            "type": "schema_template",
-            "name": "template_tool_variant",
-            "template_data": [
-                {
-                    "tool_label": "Arnold Versions"
-                }
-            ]
-        }
-    ]
-}
diff --git a/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json b/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json
deleted file mode 100644
index 295b3ccac3..0000000000
--- a/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "type": "dict",
-    "key": "vray",
-    "label": "Chaos Group Vray",
-    "collapsible": true,
-    "checkbox_key": "enabled",
-    "children": [
-        {
-            "type": "boolean",
-            "key": "enabled",
-            "label": "Enabled"
-        },
-        {
-            "key": "environment",
-            "label": "Environment",
-            "type": "raw-json",
-            "env_group_key": "vray"
-        },
-        {
-            "type": "schema_template",
-            "name": "template_tool_variant",
-            "template_data": [
-                {
-                    "tool_label": "Vray Versions"
-                }
-            ]
-        }
-    ]
-}
diff --git a/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json b/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json
deleted file mode 100644
index 34bb09da8d..0000000000
--- a/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "type": "dict",
-    "key": "yeti",
-    "label": "Pergrine Labs Yeti",
-    "collapsible": true,
-    "checkbox_key": "enabled",
-    "children": [
-        {
-            "type": "boolean",
-            "key": "enabled",
-            "label": "Enabled"
-        },
-        {
-            "key": "environment",
-            "label": "Environment",
-            "type": "raw-json",
-            "env_group_key": "yeti"
-        },
-        {
-            "type": "schema_template",
-            "name": "template_tool_variant",
-            "template_data": [
-                {
-                    "tool_label": "Yeti Versions"
-                }
-            ]
-        }
-    ]
-}
diff --git a/pype/settings/entities/schemas/system_schema/tool_settings/template_tool_variant.json b/pype/settings/entities/schemas/system_schema/tool_settings/template_tool_variant.json
deleted file mode 100644
index b0ba63469c..0000000000
--- a/pype/settings/entities/schemas/system_schema/tool_settings/template_tool_variant.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-    {
-        "type": "dict-modifiable",
-        "key": "variants",
-        "label": "{tool_label}",
-        "value_is_env_group": true,
-        "object_type": {
-            "type": "raw-json"
-        }
-    }
-]