diff --git a/settings.json b/settings.json
index 2d7b7da..912d940 100644
--- a/settings.json
+++ b/settings.json
@@ -1,119 +1,159 @@
-// Zed settings
-//
-// For information on how to configure Zed, see the Zed
-// documentation: https://zed.dev/docs/configuring-zed
-//
-// To see all of Zed's default settings without changing your
-// custom settings, run `zed: open default settings` from the
-// command palette (cmd-shift-p / ctrl-shift-p)
-{
-  "disable_ai": false,
-  "project_panel": {
-    "dock": "right"
-  },
-  "outline_panel": {
-    "dock": "right"
-  },
-  "collaboration_panel": {
-    "dock": "right"
-  },
-  "git_panel": {
-    "dock": "right"
-  },
-  "icon_theme": "Material Icon Theme",
-  "cli_default_open_behavior": "existing_window",
-  "language_models": {
-    "ollama": {
-      "api_url": "http://localhost:11434",
-      "auto_discover": true
-      },
-    "openai_compatible": {
-      "citadel": {
-      "api_url": "http://localhost:11434/v1",
-      "available_models": [
-                {
-                  "name": "qwen3.6:12b",
-                  "max_tokens": 265000,
-                  "max_output_tokens": 128000,
-                  "reasoning_effort": "high",
-                  "capabilities": {
-                    "tools": true,
-                    "images": true,
-                    "parallel_tool_calls": true,
-                    "prompt_cache_key": false,
-                    "chat_completions": true,
-                    "interleaved_reasoning": true,
-                    "max_tokens_parameter": true
-                  }
-                }
-              ]
-      },
-      "daedalus": {
-      "api_url": "http://10.100.104.41:11434/v1",
-      "available_models": [
-                {
-                  "name": "qwen3.6:12b",
-                  "max_tokens": 265000,
-                  "max_output_tokens": 128000,
-                  "reasoning_effort": "high",
-                  "capabilities": {
-                    "tools": true,
-                    "images": true,
-                    "parallel_tool_calls": true,
-                    "prompt_cache_key": false,
-                    "chat_completions": true,
-                    "interleaved_reasoning": true,
-                    "max_tokens_parameter": true
-                  }
-                }
-              ]
-            }
-          }
-        },
-  "agent_servers": {
-    "pi-acp": {
-      "type": "registry"
-    }
-  },
-  "edit_predictions": {
-    "open_ai_compatible_api": {
-      "max_output_tokens": 6
-    },
-    "mode": "subtle",
-    "allow_data_collection": "no",
-    "ollama": {
-      "max_output_tokens": 6,
-      "prompt_format": "qwen",
-      "model": "nate/instinct:latest",
-      "api_url": "http://localhost:11434"
-    },
-    "provider": "ollama"
-  },
-  "session": {
-    "trust_all_worktrees": true
-  },
-  "agent": {
-    "sidebar_side": "right",
-    "dock": "left",
-    "thinking_display": "always_expanded",
-    "enabled": false,
-    "button": false,
-    "favorite_models": [],
-    "model_parameters": []
-  },
-  "show_signature_help_after_edits": false,
-  "auto_signature_help": false,
-  "minimap": {
-    "show": "always"
-  },
-  "show_completions_on_input": false,
-  "show_edit_predictions": true,
-  "base_keymap": "VSCode",
-  "ui_font_size": 16,
-  "buffer_font_size": 15,
-  "theme": {
-    "mode": "system",
-    "light": "One Light",
-    "dark": "Carbonfox - blurred",
-  },
-}
+// Zed settings
+//
+// For information on how to configure Zed, see the Zed
+// documentation: https://zed.dev/docs/configuring-zed
+//
+// To see all of Zed's default settings without changing your
+// custom settings, run `zed: open default settings` from the
+// command palette (cmd-shift-p / ctrl-shift-p)
+
+// -----------------------
+// UI Configuration
+// -----------------------
+{
+  "theme": {
+    "mode": "system",
+    "light": "One Light",
+    "dark": "Carbonfox - blurred",
+  },
+  "icon_theme": "Material Icon Theme",
+  "minimap": {
+    "show": "always"
+  },
+  "base_keymap": "VSCode",
+  "ui_font_size": 16,
+  "buffer_font_size": 15,
+  "cli_default_open_behavior": "existing_window",
+  "project_panel": {
+    "dock": "right"
+  },
+  "outline_panel": {
+    "dock": "right"
+  },
+  "collaboration_panel": {
+    "dock": "right"
+  },
+  "git_panel": {
+    "dock": "right"
+  },
+  "git_hosting_providers": [
+    {
+      "provider": "gitea",
+      "name": "Luminari",
+      "base_url": "https://git.nukem.me"
+    }
+  ],
+
+// -----------------------
+// AI Configuration
+// -----------------------
+
+  "disable_ai": false,
+  "language_models": {
+    "ollama": {
+      "api_url": "http://10.100.104.40:11434",
+      "auto_discover": true
+      },
+    "openai_compatible": {
+      "citadel": {
+      "api_url": "http://localhost:11434/v1",
+      "available_models": [
+                {
+                  "name": "qwen3.6:12b",
+                  "max_tokens": 16384,
+                  "max_output_tokens": 16384,
+                  "reasoning_effort": "high",
+                  "capabilities": {
+                    "tools": true,
+                    "images": true,
+                    "parallel_tool_calls": true,
+                    "prompt_cache_key": false,
+                    "chat_completions": true,
+                    "interleaved_reasoning": true,
+                    "max_tokens_parameter": true
+                  }
+                },
+                {
+                  "name": "qwen3.5:2b",
+                  "max_tokens": 2048,
+                  "max_output_tokens": 2048,
+                  "reasoning_effort": "high",
+                  "capabilities": {
+                    "tools": false,
+                    "images": false,
+                    "parallel_tool_calls": false,
+                    "prompt_cache_key": false,
+                    "chat_completions": true,
+                    "interleaved_reasoning": false,
+                    "max_tokens_parameter": true
+                  }
+                }
+              ]
+      },
+      "daedalus": {
+      "api_url": "http://10.100.104.41:11434/v1",
+      "available_models": [
+                {
+                  "name": "qwen3.6:12b",
+                  "max_tokens": 265000,
+                  "max_output_tokens": 128000,
+                  "reasoning_effort": "high",
+                  "capabilities": {
+                    "tools": true,
+                    "images": true,
+                    "parallel_tool_calls": true,
+                    "prompt_cache_key": false,
+                    "chat_completions": true,
+                    "interleaved_reasoning": true,
+                    "max_tokens_parameter": true
+                  }
+                }
+              ]
+            }
+          }
+        },
+  "agent_servers": {
+    "Pi": {
+      "type": "custom",
+      "command": "pi"
+    },
+    "pi-acp": {
+      "type": "registry"
+    }
+  },
+  "show_completions_on_input": false,
+  "show_edit_predictions": true,
+  "edit_predictions": {
+    "provider": "ollama",
+    "mode": "subtle",
+    "ollama": {
+      "max_output_tokens": 64,
+      "prompt_format": "qwen",
+      "model": "nate/instinct:latest",
+      "api_url": "http://localhost:11434"
+    },
+    "open_ai_compatible_api": {
+      "max_output_tokens": 64
+    },
+    "allow_data_collection": "no",
+  },
+  "agent": {
+    "sidebar_side": "right",
+    "dock": "right",
+    "thinking_display": "always_expanded",
+    "enabled": true,
+    "button": true,
+    "favorite_models": [],
+    "model_parameters": [],
+    "commit_message_model": {
+      "provider": "citadel",
+      "model": "qwen3.5:2b"
+      },
+    "commit_message_instructions": "Use the Conventional Commits format: <type>(<scope>): <description>."
+    },
+  "session": {
+    "trust_all_worktrees": true
+  },
+  "show_signature_help_after_edits": false,
+  "auto_signature_help": false,
+}