diff --git a/templates/prompts/cohere.jsonnet b/templates/prompts/cohere.jsonnet
index 2335084b..9541e4c2 100644
--- a/templates/prompts/cohere.jsonnet
+++ b/templates/prompts/cohere.jsonnet
@@ -1,18 +1,42 @@
-
 // For Cohere.  Not currently overriding prompts
 
-{
+local prompts = import "default-prompts.jsonnet";
 
-//    "prompt-definition-template": "PROMPT GOES HERE",
+prompts + {
 
-//    "prompt-relationship-template":: "PROMPT GOES HERE",
+    // "system-template":: "PROMPT GOES HERE.",
 
-//    "prompt-topic-template":: "PROMPT GOES HERE",
+    "templates" +:: {
 
-//    "prompt-knowledge-query-template":: "PROMPT GOES HERE",
+        "question" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
 
-//    "prompt-document-query-template":: "PROMPT GOES HERE",
+        "extract-definitions" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
 
-//    "prompt-rows-template":: "PROMPT GOES HERE",
+        "extract-relationships" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-topics" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-rows" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "kg-prompt" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "document-prompt" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+    }
 
 }
+
diff --git a/templates/prompts/gemini.jsonnet b/templates/prompts/gemini.jsonnet
index 12905c7a..b9a1e0c0 100644
--- a/templates/prompts/gemini.jsonnet
+++ b/templates/prompts/gemini.jsonnet
@@ -1,17 +1,42 @@
-
 // For VertexAI Gemini.  Not currently overriding prompts
-{
 
-//    "prompt-definition-template": "PROMPT GOES HERE",
+local prompts = import "default-prompts.jsonnet";
 
-//    "prompt-relationship-template":: "PROMPT GOES HERE",
+prompts + {
 
-//    "prompt-topic-template":: "PROMPT GOES HERE",
+    // "system-template":: "PROMPT GOES HERE.",
 
-//    "prompt-knowledge-query-template":: "PROMPT GOES HERE",
+    "templates" +:: {
 
-//    "prompt-document-query-template":: "PROMPT GOES HERE",
+        "question" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
 
-//    "prompt-rows-template":: "PROMPT GOES HERE",
+        "extract-definitions" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-relationships" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-topics" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-rows" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "kg-prompt" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "document-prompt" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+    }
 
 }
+
diff --git a/templates/prompts/mixtral.jsonnet b/templates/prompts/mixtral.jsonnet
index c5e70477..cd56e7ef 100644
--- a/templates/prompts/mixtral.jsonnet
+++ b/templates/prompts/mixtral.jsonnet
@@ -1,18 +1,42 @@
-
 // For Mixtral.  Not currently overriding prompts
 
-{
+local prompts = import "default-prompts.jsonnet";
 
-//    "prompt-definition-template": "PROMPT GOES HERE",
+prompts + {
 
-//    "prompt-relationship-template":: "PROMPT GOES HERE",
+    // "system-template":: "PROMPT GOES HERE.",
 
-//    "prompt-topic-template":: "PROMPT GOES HERE",
+    "templates" +:: {
 
-//    "prompt-knowledge-query-template":: "PROMPT GOES HERE",
+        "question" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
 
-//    "prompt-document-query-template":: "PROMPT GOES HERE",
+        "extract-definitions" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
 
-//    "prompt-rows-template":: "PROMPT GOES HERE",
+        "extract-relationships" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-topics" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-rows" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "kg-prompt" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "document-prompt" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+    }
 
 }
+
diff --git a/templates/prompts/openai.jsonnet b/templates/prompts/openai.jsonnet
index 0715525e..5d232337 100644
--- a/templates/prompts/openai.jsonnet
+++ b/templates/prompts/openai.jsonnet
@@ -1,23 +1,42 @@
+// For OpenAI LLMs.  Not currently overriding prompts
 
-// For OpenAI LLMs
+local prompts = import "default-prompts.jsonnet";
 
-local base = import "base/base.jsonnet";
-local images = import "values/images.jsonnet";
-local url = import "values/url.jsonnet";
+prompts + {
 
-{
+    // "system-template":: "PROMPT GOES HERE.",
 
-//    "prompt-definition-template": "PROMPT GOES HERE",
+    "templates" +:: {
 
-//    "prompt-relationship-template":: "PROMPT GOES HERE",
+        "question" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
 
-//    "prompt-topic-template":: "PROMPT GOES HERE",
+        "extract-definitions" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
 
-//    "prompt-knowledge-query-template":: "PROMPT GOES HERE",
+        "extract-relationships" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
 
-//    "prompt-document-query-template":: "PROMPT GOES HERE",
+        "extract-topics" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
 
-//    "prompt-rows-template":: "PROMPT GOES HERE",
+        "extract-rows" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "kg-prompt" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "document-prompt" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+    }
 
 }
 
diff --git a/templates/prompts/slm.jsonnet b/templates/prompts/slm.jsonnet
index bd0cbff3..48eb96d0 100644
--- a/templates/prompts/slm.jsonnet
+++ b/templates/prompts/slm.jsonnet
@@ -1,7 +1,44 @@
+// For SLM.  Not currently overriding prompts
 
-// For basic SLMs, use prompt-generic
+local prompts = import "default-prompts.jsonnet";
+
+prompts + {
+
+    // "system-template":: "PROMPT GOES HERE.",
+
+    "templates" +:: {
+
+        "question" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-definitions" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-relationships" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-topics" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "extract-rows" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "kg-prompt" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+        "document-prompt" +:: {
+            // "prompt": "PROMPT GOES HERE",
+        },
+
+    }
+
+}
 
-local prompts = import "components/prompt-generic.jsonnet";
 
-prompts