diff --git a/.env.example b/.env.example
index 83f29aedc..46a21e892 100644
--- a/.env.example
+++ b/.env.example
@@ -43,6 +43,12 @@ OPENAI_LIKE_API_KEY=
 # You only need this environment variable set if you want to use Mistral models
 MISTRAL_API_KEY=
 
+
+# Get LMStudio Base URL from LM Studio Developer Console
+# Make sure to enable CORS
+# Example: http://localhost:1234
+LMSTUDIO_API_BASE_URL=
+
 # Get your xAI API key
 # https://x.ai/api
 # You only need this environment variable set if you want to use xAI models
diff --git a/.github/workflows/github-build-push.yml b/.github/workflows/github-build-push.yml
deleted file mode 100644
index 4d4db05d8..000000000
--- a/.github/workflows/github-build-push.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Build and Push Container
-
-on:
-  push:
-    branches:
-      - main
-    # paths:
-    #   - 'Dockerfile'
-  workflow_dispatch:    
-jobs:
-  build-and-push:
-    runs-on: [ubuntu-latest]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and Push Containers
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            ghcr.io/${{ github.repository }}:latest
-            ghcr.io/${{ github.repository }}:${{ github.sha }}        
diff --git a/README.md b/README.md
index a1132c805..54ae824ed 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,9 @@ This fork of Bolt.new allows you to choose the LLM that you use for each prompt!
 - ✅ Ability to sync files (one way sync) to local folder (@muzafferkadir)
 - ✅ Containerize the application with Docker for easy installation (@aaronbolton)
 - ✅ Publish projects directly to GitHub (@goncaloalves)
-- ⬜ Prevent Bolt from rewriting files as often (Done but need to review PR still)
+- ✅ Ability to enter API keys in the UI (@ali00209)
+- ✅ xAI Grok Beta Integration (@milutinke)
+- ⬜ **HIGH PRIORITY** - Prevent Bolt from rewriting files as often (file locking and diffs)
 - ⬜ **HIGH PRIORITY** - Better prompting for smaller LLMs (code window sometimes doesn't start)
 - ⬜ **HIGH PRIORITY** Load local projects into the app
 - ⬜ **HIGH PRIORITY** - Attach images to prompts
@@ -34,7 +36,6 @@ This fork of Bolt.new allows you to choose the LLM that you use for each prompt!
 - ⬜ Ability to revert code to earlier version
 - ⬜ Prompt caching
 - ⬜ Better prompt enhancing
-- ⬜ Ability to enter API keys in the UI
 - ⬜ Have LLM plan the project in a MD file for better results/transparency
 - ⬜ VSCode Integration with git-like confirmations
 - ⬜ Upload documents for knowledge - UI design templates, a code base to reference coding style, etc.
diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx
index 36a60a822..db20cc7fa 100644
--- a/app/components/chat/BaseChat.tsx
+++ b/app/components/chat/BaseChat.tsx
@@ -51,6 +51,9 @@ const ModelSelector = ({ model, setModel, provider, setProvider, modelList, prov
         <option key="OpenAILike" value="OpenAILike">
           OpenAILike
         </option>
+        <option key="LMStudio" value="LMStudio">
+          LMStudio
+        </option>
       </select>
       <select
         key={provider}
diff --git a/app/lib/.server/llm/api-key.ts b/app/lib/.server/llm/api-key.ts
index f9c027b70..464e334dd 100644
--- a/app/lib/.server/llm/api-key.ts
+++ b/app/lib/.server/llm/api-key.ts
@@ -42,6 +42,8 @@ export function getBaseURL(cloudflareEnv: Env, provider: string) {
   switch (provider) {
     case 'OpenAILike':
       return env.OPENAI_LIKE_API_BASE_URL || cloudflareEnv.OPENAI_LIKE_API_BASE_URL;
+    case 'LMStudio':
+      return env.LMSTUDIO_API_BASE_URL || cloudflareEnv.LMSTUDIO_API_BASE_URL || "http://localhost:1234";
     case 'Ollama':
         let baseUrl = env.OLLAMA_API_BASE_URL || cloudflareEnv.OLLAMA_API_BASE_URL || "http://localhost:11434";
         if (env.RUNNING_IN_DOCKER === 'true') {
diff --git a/app/lib/.server/llm/model.ts b/app/lib/.server/llm/model.ts
index 26c4aa782..1babe7a2c 100644
--- a/app/lib/.server/llm/model.ts
+++ b/app/lib/.server/llm/model.ts
@@ -83,6 +83,15 @@ export function getOpenRouterModel(apiKey: string, model: string) {
   return openRouter.chat(model);
 }
 
+export function getLMStudioModel(baseURL: string, model: string) {
+  const lmstudio = createOpenAI({
+    baseUrl: `${baseURL}/v1`,
+    apiKey: "",
+  });
+
+  return lmstudio(model);
+}
+
 export function getXAIModel(apiKey: string, model: string) {
   const openai = createOpenAI({
     baseURL: 'https://api.x.ai/v1',
@@ -105,13 +114,15 @@ export function getModel(provider: string, model: string, env: Env, apiKeys?: Re
     case 'OpenRouter':
       return getOpenRouterModel(apiKey, model);
     case 'Google':
-      return getGoogleModel(apiKey, model)
+      return getGoogleModel(apiKey, model);
     case 'OpenAILike':
       return getOpenAILikeModel(baseURL,apiKey, model);
     case 'Deepseek':
-      return getDeepseekModel(apiKey, model)
+      return getDeepseekModel(apiKey, model);
     case 'Mistral':
       return  getMistralModel(apiKey, model);
+    case 'LMStudio':
+      return getLMStudioModel(baseURL, model);
     case 'xAI':
       return getXAIModel(apiKey, model);
     default:
diff --git a/app/utils/constants.ts b/app/utils/constants.ts
index 9964aac53..be9bebb0c 100644
--- a/app/utils/constants.ts
+++ b/app/utils/constants.ts
@@ -5,11 +5,10 @@ export const WORK_DIR = `/home/${WORK_DIR_NAME}`;
 export const MODIFICATIONS_TAG_NAME = 'bolt_file_modifications';
 export const MODEL_REGEX = /^\[Model: (.*?)\]\n\n/;
 export const PROVIDER_REGEX = /\[Provider: (.*?)\]\n\n/;
-export const DEFAULT_MODEL = 'claude-3-5-sonnet-20240620';
+export const DEFAULT_MODEL = 'claude-3-5-sonnet-latest';
 export const DEFAULT_PROVIDER = 'Anthropic';
 
 const staticModels: ModelInfo[] = [
-  { name: 'claude-3-5-sonnet-20240620', label: 'Claude 3.5 Sonnet', provider: 'Anthropic' },
   { name: 'gpt-4o', label: 'GPT-4o', provider: 'OpenAI' },
   { name: 'anthropic/claude-3.5-sonnet', label: 'Anthropic: Claude 3.5 Sonnet (OpenRouter)', provider: 'OpenRouter' },
   { name: 'anthropic/claude-3-haiku', label: 'Anthropic: Claude 3 Haiku (OpenRouter)', provider: 'OpenRouter' },
@@ -27,7 +26,10 @@ const staticModels: ModelInfo[] = [
   { name: 'llama-3.2-11b-vision-preview', label: 'Llama 3.2 11b (Groq)', provider: 'Groq' },
   { name: 'llama-3.2-3b-preview', label: 'Llama 3.2 3b (Groq)', provider: 'Groq' },
   { name: 'llama-3.2-1b-preview', label: 'Llama 3.2 1b (Groq)', provider: 'Groq' },
-  { name: 'claude-3-opus-20240229', label: 'Claude 3 Opus', provider: 'Anthropic' },
+  { name: 'claude-3-5-sonnet-latest', label: 'Claude 3.5 Sonnet (new)', provider: 'Anthropic' },
+  { name: 'claude-3-5-sonnet-20240620', label: 'Claude 3.5 Sonnet (old)', provider: 'Anthropic' },
+  { name: 'claude-3-5-haiku-latest', label: 'Claude 3.5 Haiku (new)', provider: 'Anthropic' },
+  { name: 'claude-3-opus-latest', label: 'Claude 3 Opus', provider: 'Anthropic' },
   { name: 'claude-3-sonnet-20240229', label: 'Claude 3 Sonnet', provider: 'Anthropic' },
   { name: 'claude-3-haiku-20240307', label: 'Claude 3 Haiku', provider: 'Anthropic' },
   { name: 'gpt-4o-mini', label: 'GPT-4o Mini', provider: 'OpenAI' },
@@ -133,17 +135,42 @@ async function getOpenRouterModels(): Promise<ModelInfo[]> {
   }));
 }
 
+async function getLMStudioModels(): Promise<ModelInfo[]> {
+  try {
+    const base_url = import.meta.env.LMSTUDIO_API_BASE_URL || "http://localhost:1234";
+    const response = await fetch(`${base_url}/v1/models`);
+    const data = await response.json() as any;
+    return data.data.map((model: any) => ({
+      name: model.id,
+      label: model.id,
+      provider: 'LMStudio',
+    }));
+  } catch (e) {
+    return [];
+  }
+}
+
+
+
 async function initializeModelList(): Promise<void> {
-  const [
+   const [
     ollamaModels,
     openAiLikeModels,
-    openRouterModels] = await Promise.all([
+    openRouterModels,
+     lmstudioModels
+   ] = await Promise.all([
     getOllamaModels(),
     getOpenAILikeModels(),
-    getOpenRouterModels()
+    getOpenRouterModels(),
+     getLMStudioModels(),
   ]);
-  MODEL_LIST = [...ollamaModels, ...openAiLikeModels, ...staticModels, ...openRouterModels];
+  MODEL_LIST = [
+    ...ollamaModels,
+    ...openAiLikeModels,
+    ...staticModels,
+    ...openRouterModels,
+    ...lmstudioModels
+  ];
 }
 initializeModelList().then();
-export { getOllamaModels, getOpenAILikeModels, initializeModelList, getOpenRouterModels };
-x
+export { getOllamaModels,getOpenAILikeModels,getLMStudioModels,initializeModelList, getOpenRouterModels };
diff --git a/vite.config.ts b/vite.config.ts
index 625390702..9c94ceae3 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -27,7 +27,7 @@ export default defineConfig((config) => {
       chrome129IssuePlugin(),
       config.mode === 'production' && optimizeCssModules({ apply: 'build' }),
     ],
-    envPrefix:["VITE_","OPENAI_LIKE_API_","OLLAMA_API_BASE_URL"],
+    envPrefix:["VITE_","OPENAI_LIKE_API_","OLLAMA_API_BASE_URL","LMSTUDIO_API_BASE_URL"],
     css: {
       preprocessorOptions: {
         scss: {
diff --git a/worker-configuration.d.ts b/worker-configuration.d.ts
index 82961ecd6..6db1aa60e 100644
--- a/worker-configuration.d.ts
+++ b/worker-configuration.d.ts
@@ -7,4 +7,5 @@ interface Env {
   OPENAI_LIKE_API_KEY: string;
   OPENAI_LIKE_API_BASE_URL: string;
   DEEPSEEK_API_KEY: string;
+  LMSTUDIO_API_BASE_URL: string;
 }