diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt
index 024bbc04..831cdd4f 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt
@@ -7,7 +7,7 @@ import javax.swing.Icon
 
 object CodeGPTAvailableModels {
 
-    val DEFAULT_CHAT_MODEL = CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, INDIVIDUAL)
+    val DEFAULT_CHAT_MODEL = CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, FREE)
     val DEFAULT_CODE_MODEL = CodeGPTModel("GPT-3.5 Turbo Instruct", "gpt-3.5-turbo-instruct", Icons.OpenAI, INDIVIDUAL)
 
     @JvmStatic
@@ -17,6 +17,7 @@ object CodeGPTAvailableModels {
                 CodeGPTModel("o1-mini", "o1-mini", Icons.OpenAI, INDIVIDUAL),
                 CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, FREE),
                 CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, FREE),
+                CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, FREE),
                 CodeGPTModel("Llama 3.1 (405B)", "llama-3.1-405b", Icons.Meta, FREE),
                 CodeGPTModel("DeepSeek Coder V2 - FREE", "deepseek-coder-v2", Icons.DeepSeek, ANONYMOUS),
                 CodeGPTModel("GPT-4o mini - FREE", "gpt-4o-mini", Icons.OpenAI, ANONYMOUS),
@@ -26,6 +27,7 @@ object CodeGPTAvailableModels {
                 CodeGPTModel("o1-mini", "o1-mini", Icons.OpenAI, INDIVIDUAL),
                 CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, FREE),
                 CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, FREE),
+                CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, FREE),
                 CodeGPTModel("Llama 3.1 (405B)", "llama-3.1-405b", Icons.Meta, FREE),
                 CodeGPTModel("DeepSeek Coder V2", "deepseek-coder-v2", Icons.DeepSeek, ANONYMOUS),
                 CodeGPTModel("Qwen 2.5 (72B)", "qwen-2.5-72b", Icons.Qwen, FREE),
@@ -36,7 +38,7 @@ object CodeGPTAvailableModels {
                 CodeGPTModel("o1-mini", "o1-mini", Icons.OpenAI, INDIVIDUAL),
                 CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, FREE),
                 CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, FREE),
-                CodeGPTModel("Claude 3 Opus", "claude-3-opus", Icons.Anthropic, INDIVIDUAL),
+                CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, FREE),
                 CodeGPTModel("Llama 3.1 (405B)", "llama-3.1-405b", Icons.Meta, FREE),
                 CodeGPTModel("DeepSeek Coder V2", "deepseek-coder-v2", Icons.DeepSeek, FREE),
             )
@@ -48,8 +50,8 @@ object CodeGPTAvailableModels {
         CodeGPTModel("o1-mini", "o1-mini", Icons.OpenAI, INDIVIDUAL),
         CodeGPTModel("GPT-4o", "gpt-4o", Icons.OpenAI, FREE),
         CodeGPTModel("GPT-4o mini", "gpt-4o-mini", Icons.OpenAI, ANONYMOUS),
-        CodeGPTModel("Claude 3 Opus", "claude-3-opus", Icons.Anthropic, INDIVIDUAL),
         CodeGPTModel("Claude 3.5 Sonnet", "claude-3.5-sonnet", Icons.Anthropic, FREE),
+        CodeGPTModel("Gemini 1.5 Pro", "gemini-pro-1.5", Icons.Google, FREE),
         CodeGPTModel("Llama 3.1 (405B)", "llama-3.1-405b", Icons.Meta, FREE),
         CodeGPTModel("DeepSeek Coder V2", "deepseek-coder-v2", Icons.DeepSeek, FREE),
         CodeGPTModel("Mixtral (8x22B)", "mixtral-8x22b", Icons.Mistral, FREE),
@@ -59,7 +61,6 @@ object CodeGPTAvailableModels {
     @JvmStatic
     val ALL_CODE_MODELS: List<CodeGPTModel> = listOf(
         DEFAULT_CODE_MODEL,
-        CodeGPTModel("StarCoder (16B)", "starcoder-16b", Icons.CodeGPTModel, FREE),
         CodeGPTModel("StarCoder (7B) - FREE", "starcoder-7b", Icons.CodeGPTModel, FREE),
         CodeGPTModel("WizardCoder Python (34B)", "wizardcoder-python", Icons.CodeGPTModel, FREE),
     )
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/template/CustomServiceCodeCompletionTemplate.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/template/CustomServiceCodeCompletionTemplate.kt
index 7be244e1..3ba22dee 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/template/CustomServiceCodeCompletionTemplate.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/custom/template/CustomServiceCodeCompletionTemplate.kt
@@ -24,7 +24,7 @@ enum class CustomServiceCodeCompletionTemplate(
     FIREWORKS(
         "https://api.fireworks.ai/inference/v1/completions",
         getDefaultHeadersWithAuthentication(),
-        getDefaultBodyParams(mapOf("model" to "accounts/fireworks/models/starcoder-16b"))
+        getDefaultBodyParams(mapOf("model" to "accounts/fireworks/models/starcoder-7b"))
     ),
     OPENAI(
         "https://api.openai.com/v1/completions",
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/UserInputPanel.kt b/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/UserInputPanel.kt
index 8668c736..1c9d1a3c 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/UserInputPanel.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/UserInputPanel.kt
@@ -177,6 +177,7 @@ class UserInputPanel(
                 listOf(
                     "gpt-4o",
                     "gpt-4o-mini",
+                    "gemini-pro-1.5",
                     "claude-3-opus",
                     "claude-3.5-sonnet"
                 ).contains(