diff --git a/README.md b/README.md
index adba3f6..b4f90d4 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@
 
 ### 💬 Chat Experience
 - **🔄 Real-time streaming** - Live response display with smooth markdown formatting
-- **🤖 Multiple AI models** - GPT-4o mini, Claude 3 Haiku, Llama 3.3, Mistral Small, o4-mini & more
+- **🤖 Multiple AI models** - GPT-4o mini, Claude 3 Haiku, Llama 3.3, Mistral Small, gpt-5-mini & more
 - **💻 Terminal-native** - Optimized for command-line workflows with interactive menus
 - **⌨️ Smart autocompletion** - Interactive command menus and context-aware suggestions
 - **🔑 Auto-authentication** - Seamless session management with dynamic header refresh
@@ -135,10 +135,10 @@ Never lose important conversations:
 | Model Name         | Integration ID                            | Alias          | Strength         | Best For             | Characteristics              |
 | :----------------- | :---------------------------------------- | :------------- | :------------------- | :----------------------- | :---------------------------------- |
 | **GPT-4o mini**    | gpt-4o-mini                               | gpt-4o-mini    | General purpose      | Everyday questions       | • Fast<br>• Well-balanced           |
-| **Claude 3 Haiku** | claude-3-haiku-20240307                   | claude-3-haiku | Creative writing     | Explanations & summaries | • Clear responses<br>• Concise      |
-| **Llama 3.3 70B**  | meta-llama/Llama-3.3-70B-Instruct-Turbo   | llama          | Programming          | Code-related tasks       | • Technical precision<br>• Detailed |
+| **Claude 3 Haiku** | claude-3-5-haiku-latest                   | claude-3-haiku | Creative writing     | Explanations & summaries | • Clear responses<br>• Concise      |
+| **Llama 3.3 70B**  | meta-llama/Llama-4-Scout-17B-16E-Instruct   | llama          | Programming          | Code-related tasks       | • Technical precision<br>• Detailed |
 | **Mistral Small**  | mistralai/Mistral-Small-24B-Instruct-2501 | mixtral        | Knowledge & analysis | Complex topics           | • Reasoning<br>• Logic-focused      |
-| **o4-mini**        | o4-mini                                   | o4mini         | Speed                | Quick answers            | • Very fast<br>• Compact responses  |
+| **gpt-5-mini**        | gpt-5-mini                                   | o4mini         | Speed                | Quick answers            | • Very fast<br>• Compact responses  |
 
 ## 📦 Installation
 
diff --git a/internal/api/types.go b/internal/api/types.go
index 53b24b2..bc94047 100644
--- a/internal/api/types.go
+++ b/internal/api/types.go
@@ -194,8 +194,8 @@ func GetAvailableModels() []ModelInfo {
 			IsDefault:   false,
 		},
 		{
-			ID:          "o4mini",
-			Name:        "o4-mini",
+			ID:          "gpt-5",
+			Name:        "gpt-5-mini",
 			Description: "Compact and efficient model for basic interactions",
 			IsDefault:   false,
 		},
diff --git a/internal/chat/chat.go b/internal/chat/chat.go
index 3a5bb4c..e3072a7 100644
--- a/internal/chat/chat.go
+++ b/internal/chat/chat.go
@@ -382,11 +382,11 @@ func ProcessInputAndReturn(c *Chat, input string, cfg *config.Config) (string, e
 func shortenModelName(model string) string {
 	displayNames := map[string]models.ModelAlias{
 		"gpt-4o-mini":                               "gpt-4o-mini",
-		"claude-3-haiku-20240307":                   "claude-3-haiku",
-		"meta-llama/Llama-3.3-70B-Instruct-Turbo":   "llama",
+		"claude-3-5-haiku-latest":                   "claude-3-haiku",
+		"meta-llama/Llama-4-Scout-17B-16E-Instruct":   "llama",
 		"mistralai/Mistral-Small-24B-Instruct-2501": "mixtral",
-		"o4-mini": "o4mini",
-		"o3-mini": "o3mini",
+		"gpt-5-mini": "gpt-5",
+		"openai/gpt-oss-120b": "gpt-oss",
 	}
 
 	if shortName, exists := displayNames[model]; exists {
diff --git a/internal/chat/export.go b/internal/chat/export.go
index 843b42d..41b78ec 100644
--- a/internal/chat/export.go
+++ b/internal/chat/export.go
@@ -186,10 +186,11 @@ func sanitizeFilename(name string) string {
 func formatModelName(modelName string) string {
 	displayNames := map[string]string{
 		"gpt-4o-mini":                             "GPT-4o mini",
-		"claude-3-haiku-20240307":                 "Claude 3 Haiku",
-		"meta-llama/Llama-3.3-70B-Instruct-Turbo": "Llama 3.3 70B",
+		"claude-3-5-haiku-latest":                 "Claude 3 Haiku",
+		"meta-llama/Llama-4-Scout-17B-16E-Instruct": "Llama 3.3 70B",
 		"mistralai/Mixtral-8x7B-Instruct-v0.1":    "Mistral 8x7B",
-		"o3-mini":                                 "o3-mini",
+		"gpt-5-mini":                                 "gpt-5",	
+		"openai/gpt-oss-120b": 						"gpt-oss",
 	}
 
 	if shortName, exists := displayNames[modelName]; exists {
diff --git a/internal/models/models.go b/internal/models/models.go
index 6dcb6ef..3da0e18 100644
--- a/internal/models/models.go
+++ b/internal/models/models.go
@@ -27,10 +27,10 @@ type ModelAlias string
 
 const (
 	GPT4Mini Model = "gpt-4o-mini"
-	Claude3  Model = "claude-3-haiku-20240307"
-	Llama    Model = "meta-llama/Llama-3.3-70B-Instruct-Turbo"
+	Claude3  Model = "claude-3-5-haiku-latest"
+	Llama    Model = "meta-llama/Llama-4-Scout-17B-16E-Instruct"
 	Mixtral  Model = "mistralai/Mistral-Small-24B-Instruct-2501"
-	o4mini   Model = "o4-mini"
+	o4mini   Model = "gpt-5-mini"
 
 	GPT4MiniAlias ModelAlias = "gpt-4o-mini"
 	Claude3Alias  ModelAlias = "claude-3-haiku"
@@ -52,7 +52,7 @@ var modelDisplayMap = map[Model]string{
 	Claude3:  "Claude-3-haiku",
 	Llama:    "Llama 3.3",
 	Mixtral:  "Mistral Small 3",
-	o4mini:   "o4-mini",
+	o4mini:   "gpt-5-mini",
 }
 
 func GetModel(alias string) Model {
@@ -216,7 +216,7 @@ func HandleModelChange(chat interface{}, modelArg string) ModelAlias {
 		"Claude-3-haiku",
 		"Llama 3.3",
 		"Mistral Small 3",
-		"o4-mini",
+		"gpt-5-mini",
 		"Cancel",
 	}