diff --git a/README.md b/README.md
index 66dc2eaf..63a40f08 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,26 @@
 <p align="center">
-  <img width="300" alt="Codeium" src="codeium.svg"/>
+  <img width="300" alt="Windsurf" src="windsurf.png"/>
 </p>
 
 ---
 
 [![Discord](https://img.shields.io/discord/1027685395649015980?label=community&color=5865F2&logo=discord&logoColor=FFFFFF)](https://discord.gg/3XFf78nAx5)
-[![Twitter Follow](https://img.shields.io/badge/style--blue?style=social&logo=twitter&label=Follow%20%40codeiumdev)](https://twitter.com/intent/follow?screen_name=codeiumdev)
-![License](https://img.shields.io/github/license/Exafunction/codeium.vim)
-[![built with Codeium](https://codeium.com/badges/main)](https://codeium.com?repo_name=exafunction%2Fcodeium.vim)
+[![Twitter Follow](https://img.shields.io/badge/style--blue?style=social&logo=twitter&label=Follow%20%40windsurf_ai)](https://twitter.com/intent/follow?screen_name=windsurf_ai)
+![License](https://img.shields.io/github/license/Exafunction/windsurf.vim)
+[![Docs](https://img.shields.io/badge/Windsurf%20Docs-09B6A2)](https://docs.windsurf.com)
+[![Canny Board](https://img.shields.io/badge/Feature%20Requests-6b69ff)](https://windsurf.canny.io/feature-requests/)
+[![built with Windsurf](https://windsurf.com/badges/main)](https://windsurf.com?repo_name=exafunction%2Fwindsurf.vim)
 
 [![Visual Studio](https://img.shields.io/visual-studio-marketplace/i/Codeium.codeium?label=Visual%20Studio&logo=visualstudio)](https://marketplace.visualstudio.com/items?itemName=Codeium.codeium)
 [![JetBrains](https://img.shields.io/jetbrains/plugin/d/20540?label=JetBrains)](https://plugins.jetbrains.com/plugin/20540-codeium/)
 [![Open VSX](https://img.shields.io/open-vsx/dt/Codeium/codeium?label=Open%20VSX)](https://open-vsx.org/extension/Codeium/codeium)
 [![Google Chrome](https://img.shields.io/chrome-web-store/users/hobjkcpmjhlegmobgonaagepfckjkceh?label=Google%20Chrome&logo=googlechrome&logoColor=FFFFFF)](https://chrome.google.com/webstore/detail/codeium/hobjkcpmjhlegmobgonaagepfckjkceh)
 
-# codeium.vim
+# windsurf.vim
 
 _Free, ultrafast Copilot alternative for Vim and Neovim_
 
-Codeium autocompletes your code with AI in all major IDEs. We [launched](https://www.codeium.com/blog/codeium-copilot-alternative-in-vim) this implementation of the Codeium plugin for Vim and Neovim to bring this modern coding superpower to more developers. Check out our [playground](https://www.codeium.com/playground) if you want to quickly try out Codeium online.
+Windsurf autocompletes your code with AI in all major IDEs. We [launched](https://www.windsurf.com/blog/codeium-copilot-alternative-in-vim) this implementation of the Windsurf plugin for Vim and Neovim to bring this modern coding superpower to more developers. Check out our [playground](https://www.windsurf.com/playground) if you want to quickly try out Windsurf online.
 
 Contributions are welcome! Feel free to submit pull requests and issues related to the plugin.
 
@@ -33,13 +35,13 @@ Contributions are welcome! Feel free to submit pull requests and issues related
 1. Install [Vim](https://github.com/vim/vim) (at least 9.0.0185) or [Neovim](https://github.com/neovim/neovim/releases/latest) (at
    least 0.6)
 
-2. Install `Exafunction/codeium.vim` using your vim plugin manager of
+2. Install `Exafunction/windsurf.vim` using your vim plugin manager of
    choice, or manually. See [Installation Options](#-installation-options) below.
 
-3. Run `:Codeium Auth` to set up the plugin and start using Codeium.
+3. Run `:Codeium Auth` to set up the plugin and start using Windsurf.
 
 You can run `:help codeium` for a full list of commands and configuration
-options, or see [this guide](https://www.codeium.com/vim_tutorial) for a quick tutorial on how to use Codeium.
+options, or see [this guide](https://www.windsurf.com/vim_tutorial) for a quick tutorial on how to use Windsurf.
 
 ## 🛠️ Configuration
 
@@ -48,17 +50,19 @@ A few of the most popular options are highlighted below.
 
 ### ⌨️ Keybindings
 
-Codeium provides the following functions to control suggestions:
+Windsurf provides the following functions to control suggestions:
 
-|Action|Function|Default Binding|
-|---|---|---|
-|Clear current suggestion| `codeium#Clear()` |`<C-]>`|
-|Next suggestion| `codeium#CycleCompletions(1)` |`<M-]>`|
-|Previous suggestion| `codeium#CycleCompletions(-1)` |`<M-[>`|
-|Insert suggestion| `codeium#Accept()` |`<Tab>`|
-|Manually trigger suggestion| `codeium#Complete()` |`<M-Bslash>`|
+| Action                       | Function                       | Default Binding |
+| ---------------------------  | ------------------------------ | --------------- |
+| Clear current suggestion     | `codeium#Clear()`              | `<C-]>`         |
+| Next suggestion              | `codeium#CycleCompletions(1)`  | `<M-]>`         |
+| Previous suggestion          | `codeium#CycleCompletions(-1)` | `<M-[>`         |
+| Insert suggestion            | `codeium#Accept()`             | `<Tab>`         |
+| Manually trigger suggestion  | `codeium#Complete()`           | `<M-Bslash>`    |
+| Accept word from suggestion  | `codeium#AcceptNextWord()`     | `<C-k>`         |
+| Accept line from suggestion  | `codeium#AcceptNextLine()`     | `<C-l>`         |
 
-Codeium's default keybindings can be disabled by setting
+Windsurf's default keybindings can be disabled by setting
 
 ```vim
 let g:codeium_disable_bindings = 1
@@ -66,7 +70,7 @@ let g:codeium_disable_bindings = 1
 
 or in Neovim:
 
-```vim
+```lua
 vim.g.codeium_disable_bindings = 1
 ```
 
@@ -75,9 +79,10 @@ use the `g:codeium_no_map_tab` option.
 
 If you'd like to bind the actions above to different keys, this might look something like the following in Vim:
 
-
 ```vim
 imap <script><silent><nowait><expr> <C-g> codeium#Accept()
+imap <script><silent><nowait><expr> <C-h> codeium#AcceptNextWord()
+imap <script><silent><nowait><expr> <C-j> codeium#AcceptNextLine()
 imap <C-;>   <Cmd>call codeium#CycleCompletions(1)<CR>
 imap <C-,>   <Cmd>call codeium#CycleCompletions(-1)<CR>
 imap <C-x>   <Cmd>call codeium#Clear()<CR>
@@ -88,7 +93,7 @@ Or in Neovim (using [wbthomason/packer.nvim](https://github.com/wbthomason/packe
 ```lua
 -- Remove the `use` here if you're using folke/lazy.nvim.
 use {
-  'Exafunction/codeium.vim',
+  'Exafunction/windsurf.vim',
   config = function ()
     -- Change '<C-g>' here to any keycode you like.
     vim.keymap.set('i', '<C-g>', function () return vim.fn['codeium#Accept']() end, { expr = true, silent = true })
@@ -101,10 +106,9 @@ use {
 
 (Make sure that you ran `:Codeium Auth` after installation.)
 
+### ⛔ Disabling Windsurf
 
-### ⛔ Disabling Codeium
-
-Codeium can be disabled for particular filetypes by setting the
+Windsurf can be disabled for particular filetypes by setting the
 `g:codeium_filetypes` variable in your vim config file (vimrc/init.vim):
 
 ```vim
@@ -114,10 +118,10 @@ let g:codeium_filetypes = {
     \ }
 ```
 
-Codeium is enabled by default for most filetypes.
+Windsurf is enabled by default for most filetypes.
 
-You can also _disable_ codeium by default with the `g:codeium_enabled`
-variable:
+You can also _disable_ codeium by default with the `g:codeium_enabled` variable,
+and enable it manually per buffer by running `:CodeiumEnable`:
 
 ```vim
 let g:codeium_enabled = v:false
@@ -125,40 +129,79 @@ let g:codeium_enabled = v:false
 
 or in Neovim:
 
-```vim
+```lua
 vim.g.codeium_enabled = false
 ```
 
-Instead, if you would like to just disable the automatic triggering of
-completions:
+Or you can disable codeium for _all filetypes_ with the `g:codeium_filetypes_disabled_by_default` variable,
+and use the `g:codeium_filetypes` variable to selectively enable codeium for specified filetypes:
+
+```vim
+" let g:codeium_enabled = v:true
+let g:codeium_filetypes_disabled_by_default = v:true
+
+let g:codeium_filetypes = {
+    \ "rust": v:true,
+    \ "typescript": v:true,
+    \ }
+```
+
+If you would like to just disable the automatic triggering of completions:
 
 ```vim
 let g:codeium_manual = v:true
+
+" You might want to use `CycleOrComplete()` instead of `CycleCompletions(1)`.
+" This will make the forward cycling of suggestions also trigger the first
+" suggestion manually.
+imap <C-;> <Cmd>call codeium#CycleOrComplete()<CR>
 ```
 
-### Show Codeium status in statusline
+To disable automatic text rendering of suggestions (the gray text that appears for a suggestion):
+
+```vim
+let g:codeium_render = v:false
+```
 
-Codeium status can be generated by calling the `codeium#GetStatusString()` function. In
+### Show Windsurf status in statusline
+
+Windsurf status can be generated by calling the `codeium#GetStatusString()` function. In
 Neovim, you can use `vim.api.nvim_call_function("codeium#GetStatusString", {})` instead.
-It produces a 3 char long string with Codeium status:
+It produces a 3 char long string with Windsurf status:
+
 - `'3/8'` - third suggestion out of 8
-- `'0'` - Codeium returned no suggestions
-- `'*'` - waiting for Codeium response
+- `'0'` - Windsurf returned no suggestions
+- `'*'` - waiting for Windsurf response
 
-In normal mode, status shows if Codeium is enabled or disabled by showing
+In normal mode, status shows if Windsurf is enabled or disabled by showing
 `'ON'` or `'OFF'`.
 
 In order to show it in status line add following line to your `.vimrc`:
 
 ```set statusline+=\{…\}%3{codeium#GetStatusString()}```
 
-Shorter variant without Codeium logo:
+Shorter variant without Windsurf logo:
 
 ```set statusline+=%3{codeium#GetStatusString()}```
 
 Please check `:help statusline` for further information about building statusline in VIM.
 
-vim-airline supports Codeium out-of-the-box since commit [3854429d](https://github.com/vim-airline/vim-airline/commit/3854429d99c8a2fb555a9837b155f33c957a2202).
+vim-airline supports Windsurf out-of-the-box since commit [3854429d](https://github.com/vim-airline/vim-airline/commit/3854429d99c8a2fb555a9837b155f33c957a2202).
+
+### Launching Windsurf Chat
+
+Calling the `codeium#Chat()` function or using the `Codeium Chat` command will enable search and indexing in the current project and launch Codeium Chat in a new browser window.
+
+```vim
+:call codeium#Chat()
+:Codeium Chat
+```
+
+The project root is determined by looking in Vim's current working directory for some specific files or directories to be present and goes up to parent directories until one is found.  This list of hints is user-configurable and the default value is:
+
+```let g:codeium_workspace_root_hints = ['.bzr','.git','.hg','.svn','_FOSSIL_','package.json']```
+
+Note that launching chat enables telemetry.
 
 ## 💾 Installation Options
 
@@ -166,7 +209,7 @@ vim-airline supports Codeium out-of-the-box since commit [3854429d](https://gith
 
 ```lua
 {
-  'Exafunction/codeium.vim',
+  'Exafunction/windsurf.vim',
   event = 'BufEnter'
 }
 ```
@@ -174,19 +217,19 @@ vim-airline supports Codeium out-of-the-box since commit [3854429d](https://gith
 ### 🔌 vim-plug
 
 ```vim
-Plug 'Exafunction/codeium.vim', { 'branch': 'main' }
+Plug 'Exafunction/windsurf.vim', { 'branch': 'main' }
 ```
 
 ### 📦 Vundle
 
 ```vim
-Plugin 'Exafunction/codeium.vim'
+Plugin 'Exafunction/windsurf.vim'
 ```
 
 ### 📦 packer.nvim:
 
 ```vim
-use 'Exafunction/codeium.vim'
+use 'Exafunction/windsurf.vim'
 ```
 
 ### 💪 Manual
@@ -197,7 +240,7 @@ Run the following. On windows, you can replace `~/.vim` with
 `$HOME/vimfiles`:
 
 ```bash
-git clone https://github.com/Exafunction/codeium.vim ~/.vim/pack/Exafunction/start/codeium.vim
+git clone https://github.com/Exafunction/windsurf.vim ~/.vim/pack/Exafunction/start/windsurf.vim
 ```
 
 #### 💻 Neovim
@@ -206,5 +249,5 @@ Run the following. On windows, you can replace `~/.config` with
 `$HOME/AppData/Local`:
 
 ```bash
-git clone https://github.com/Exafunction/codeium.vim ~/.config/nvim/pack/Exafunction/start/codeium.vim
+git clone https://github.com/Exafunction/windsurf.vim ~/.config/nvim/pack/Exafunction/start/windsurf.vim
 ```
diff --git a/assets/codeium_logo.svg b/assets/codeium_logo.svg
deleted file mode 100644
index 7ca8b3e8..00000000
--- a/assets/codeium_logo.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <g clip-path="url(#clip0_480_1377)">
-        <g clip-path="url(#clip1_480_1377)">
-            <mask id="mask0_480_1377" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="512"
-                height="512">
-                <path
-                    d="M0 41.2893C0 18.4858 18.4863 0 41.2903 0H470.71C493.514 0 512 18.4859 512 41.2893V470.698C512 493.502 493.514 511.988 470.71 511.988H41.2903C18.4863 511.988 0 493.502 0 470.698V41.2893Z"
-                    fill="#D9D9D9" />
-            </mask>
-            <g mask="url(#mask0_480_1377)">
-                <path d="M256 255.994L0 511.988V0L256 255.994Z" fill="#60D5C4" />
-                <path d="M256 255.994L512 511.988V0L256 255.994Z" fill="#60D5C4" />
-                <path d="M256 255.994L512 511.988L0 511.988L256 255.994Z" fill="#71E9D8" />
-                <path d="M256 255.994L512 0L0 0L256 255.994Z" fill="#71E9D8" />
-                <path
-                    d="M443.403 66.0629H68.597C67.1983 66.0629 66.0645 67.1967 66.0645 68.5953V443.392C66.0645 444.791 67.1983 445.925 68.597 445.925H443.403C444.802 445.925 445.935 444.791 445.935 443.392V68.5953C445.935 67.1967 444.802 66.0629 443.403 66.0629Z"
-                    fill="#09B6A2" />
-                <path
-                    d="M160.054 365.958C135.879 365.958 123.791 354.104 123.791 330.396V279.561C123.791 270.689 119.342 266.253 110.443 266.253C107.18 266.253 104.436 265.235 102.211 263.198C100.135 261.162 99.0968 258.544 99.0968 255.344C99.0968 251.999 100.135 249.308 102.211 247.272C104.436 245.236 107.18 244.217 110.443 244.217C119.342 244.217 123.791 239.781 123.791 230.909V180.075C123.791 156.367 135.879 144.513 160.054 144.513C163.317 144.513 165.987 145.603 168.063 147.785C170.139 149.967 171.178 152.658 171.178 155.858C171.178 159.057 170.139 161.676 168.063 163.712C165.987 165.748 163.317 166.766 160.054 166.766C151.007 166.766 146.483 171.202 146.483 180.075V230.909C146.483 236 145.89 240.581 144.703 244.654C143.517 248.726 141.737 252.29 139.364 255.344C144.11 261.308 146.483 269.38 146.483 279.561V330.396C146.483 339.268 151.007 343.704 160.054 343.704C163.317 343.704 165.987 344.722 168.063 346.759C170.139 348.795 171.178 351.486 171.178 354.831C171.178 358.031 170.139 360.649 168.063 362.685C165.987 364.867 163.317 365.958 160.054 365.958V365.958ZM204.465 318.396C200.313 318.396 196.679 316.942 193.564 314.033C190.598 310.978 189.115 307.415 189.115 303.342C189.115 299.124 190.598 295.561 193.564 292.652C196.679 289.597 200.313 288.07 204.465 288.07C208.767 288.07 212.4 289.597 215.367 292.652C218.333 295.561 219.816 299.124 219.816 303.342C219.816 307.415 218.333 310.978 215.367 314.033C212.4 316.942 208.767 318.396 204.465 318.396ZM257.475 318.396C253.323 318.396 249.689 316.942 246.574 314.033C243.608 310.978 242.125 307.415 242.125 303.342C242.125 299.124 243.608 295.561 246.574 292.652C249.689 289.597 253.323 288.07 257.475 288.07C261.777 288.07 265.41 289.597 268.377 292.652C271.343 295.561 272.826 299.124 272.826 303.342C272.826 307.415 271.343 310.978 268.377 314.033C265.41 316.942 261.777 318.396 257.475 318.396ZM310.487 318.396C306.334 318.396 302.7 316.942 299.586 314.033C296.619 310.978 295.136 307.415 295.136 303.342C295.136 299.124 296.619 295.561 299.586 292.652C302.7 289.597 306.334 288.07 310.487 288.07C314.788 288.07 318.422 289.597 321.388 292.652C324.354 295.561 325.837 299.124 325.837 303.342C325.837 307.415 324.354 310.978 321.388 314.033C318.422 316.942 314.788 318.396 310.487 318.396ZM355.043 365.958C351.78 365.958 349.11 364.867 347.034 362.685C344.957 360.649 343.919 358.031 343.919 354.831C343.919 351.486 344.957 348.795 347.034 346.759C349.11 344.722 351.78 343.704 355.043 343.704C364.09 343.704 368.614 339.268 368.614 330.396V279.561C368.614 269.38 370.987 261.308 375.733 255.344C373.36 252.29 371.58 248.726 370.393 244.654C369.207 240.581 368.614 236 368.614 230.909V180.075C368.614 171.202 364.09 166.766 355.043 166.766C351.78 166.766 349.11 165.748 347.034 163.712C344.957 161.676 343.919 159.057 343.919 155.858C343.919 152.658 344.957 149.967 347.034 147.785C349.11 145.603 351.78 144.513 355.043 144.513C379.218 144.513 391.306 156.367 391.306 180.075V230.909C391.306 239.781 395.755 244.217 404.654 244.217C407.917 244.217 410.587 245.236 412.663 247.272C414.888 249.308 416 251.999 416 255.344C416 258.544 414.888 261.162 412.663 263.198C410.587 265.235 407.917 266.253 404.654 266.253C395.755 266.253 391.306 270.689 391.306 279.561V330.396C391.306 354.104 379.218 365.958 355.043 365.958V365.958Z"
-                    fill="white" />
-            </g>
-        </g>
-    </g>
-    <defs>
-        <clipPath id="clip0_480_1377">
-            <rect width="512" height="512" fill="white" />
-        </clipPath>
-        <clipPath id="clip1_480_1377">
-            <rect width="512" height="512" fill="white" />
-        </clipPath>
-    </defs>
-</svg>
diff --git a/assets/simple_logo.svg b/assets/simple_logo.svg
deleted file mode 100644
index 99f47640..00000000
--- a/assets/simple_logo.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<svg width="124" height="124" viewBox="0 0 124 124" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <mask id="mask0_695_100" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="124" height="124">
-        <path
-            d="M0 10C0 4.47715 4.47715 0 10 0H114C119.523 0 124 4.47715 124 10V114C124 119.523 119.523 124 114 124H10C4.47715 124 0 119.523 0 114V10Z"
-            fill="#ffffff" />
-    </mask>
-    <g mask="url(#mask0_695_100)">
-        <path d="M124.18 124L108 107.82V16.1796L124.18 0L124.18 124Z" stroke="black" stroke-width="4" />
-        <path d="M0 0L16.1796 16.1796L16.1796 107.82L0 124L0 0Z" stroke="black" stroke-width="4" />
-        <path d="M0 124.18L16.1796 108L107.82 108L124 124.18L0 124.18Z" stroke="black" stroke-width="4" />
-        <path d="M124 0L107.82 16.1796H16.1796L0 0H124Z" stroke="black" stroke-width="4" />
-        <path
-            d="M107.387 16H16.6133C16.2746 16 16 16.2746 16 16.6133V107.387C16 107.725 16.2746 108 16.6133 108H107.387C107.725 108 108 107.725 108 107.387V16.6133C108 16.2746 107.725 16 107.387 16Z"
-            stroke="black" stroke-width="4" />
-        <path
-            d="M75.196 77.1134C74.1902 77.1134 73.3102 76.7612 72.5559 76.0566C71.8375 75.3169 71.4783 74.4538 71.4783 73.4675C71.4783 72.4459 71.8375 71.5828 72.5559 70.8783C73.3102 70.1386 74.1902 69.7687 75.196 69.7687C76.2377 69.7687 77.1177 70.1386 77.8361 70.8783C78.5545 71.5828 78.9137 72.4459 78.9137 73.4675C78.9137 74.4538 78.5545 75.3169 77.8361 76.0566C77.1177 76.7612 76.2377 77.1134 75.196 77.1134Z"
-            fill="black" />
-        <path
-            d="M62.3573 77.1134C61.3516 77.1134 60.4715 76.7612 59.7172 76.0566C58.9988 75.3169 58.6396 74.4538 58.6396 73.4675C58.6396 72.4459 58.9988 71.5828 59.7172 70.8783C60.4715 70.1386 61.3516 69.7687 62.3573 69.7687C63.399 69.7687 64.2791 70.1386 64.9974 70.8783C65.7158 71.5828 66.075 72.4459 66.075 73.4675C66.075 74.4538 65.7158 75.3169 64.9974 76.0566C64.2791 76.7612 63.399 77.1134 62.3573 77.1134Z"
-            fill="black" />
-        <path
-            d="M49.519 77.1134C48.5132 77.1134 47.6332 76.7612 46.8789 76.0566C46.1605 75.3169 45.8013 74.4538 45.8013 73.4675C45.8013 72.4459 46.1605 71.5828 46.8789 70.8783C47.6332 70.1386 48.5132 69.7687 49.519 69.7687C50.5607 69.7687 51.4407 70.1386 52.1591 70.8783C52.8775 71.5828 53.2367 72.4459 53.2367 73.4675C53.2367 74.4538 52.8775 75.3169 52.1591 76.0566C51.4407 76.7612 50.5607 77.1134 49.519 77.1134Z"
-            fill="black" />
-        <path
-            d="M85.9869 88.6325C85.1967 88.6325 84.5501 88.3683 84.0473 87.8399C83.5444 87.3468 83.2929 86.7127 83.2929 85.9377C83.2929 85.1275 83.5444 84.4758 84.0473 83.9826C84.5501 83.4894 85.1967 83.2429 85.9869 83.2429C88.178 83.2429 89.2736 82.1684 89.2736 80.0196V67.7079C89.2736 65.2421 89.8483 63.287 90.9977 61.8427C90.423 61.1029 89.992 60.2399 89.7046 59.2535C89.4173 58.2672 89.2736 57.1575 89.2736 55.9246V43.6129C89.2736 41.4641 88.178 40.3897 85.9869 40.3897C85.1967 40.3897 84.5501 40.1431 84.0473 39.6499C83.5444 39.1567 83.2929 38.5227 83.2929 37.7477C83.2929 36.9727 83.5444 36.321 84.0473 35.7926C84.5501 35.2642 85.1967 35 85.9869 35C91.8419 35 94.7693 37.871 94.7693 43.6129V55.9246C94.7693 58.0734 95.8469 59.1478 98.0021 59.1478C98.7924 59.1478 99.4389 59.3944 99.9418 59.8876C100.481 60.3808 100.75 61.0325 100.75 61.8427C100.75 62.6177 100.481 63.2517 99.9418 63.7449C99.4389 64.2381 98.7924 64.4847 98.0021 64.4847C95.8469 64.4847 94.7693 65.5591 94.7693 67.7079V80.0196C94.7693 85.7616 91.8419 88.6325 85.9869 88.6325Z"
-            fill="black" />
-        <path
-            d="M38.7631 88.6325C32.9081 88.6325 29.9807 85.7616 29.9807 80.0196V67.7079C29.9807 65.5591 28.9031 64.4847 26.7479 64.4847C25.9576 64.4847 25.2931 64.2381 24.7543 63.7449C24.2514 63.2517 24 62.6177 24 61.8427C24 61.0325 24.2514 60.3808 24.7543 59.8876C25.2931 59.3944 25.9576 59.1478 26.7479 59.1478C28.9031 59.1478 29.9807 58.0734 29.9807 55.9246V43.6129C29.9807 37.871 32.9081 35 38.7631 35C39.5533 35 40.1999 35.2642 40.7027 35.7926C41.2056 36.321 41.4571 36.9727 41.4571 37.7477C41.4571 38.5227 41.2056 39.1567 40.7027 39.6499C40.1999 40.1431 39.5533 40.3897 38.7631 40.3897C36.572 40.3897 35.4764 41.4641 35.4764 43.6129V55.9246C35.4764 57.1575 35.3327 58.2672 35.0454 59.2535C34.758 60.2399 34.327 61.1029 33.7522 61.8427C34.9017 63.287 35.4764 65.2421 35.4764 67.7079V80.0196C35.4764 82.1684 36.572 83.2429 38.7631 83.2429C39.5533 83.2429 40.1999 83.4894 40.7027 83.9826C41.2056 84.4758 41.4571 85.1275 41.4571 85.9377C41.4571 86.7127 41.2056 87.3468 40.7027 87.8399C40.1999 88.3683 39.5533 88.6325 38.7631 88.6325Z"
-            fill="black" />
-        <path
-            d="M10 1.5H114C118.694 1.5 122.5 5.30558 122.5 10V114C122.5 118.694 118.694 122.5 114 122.5H10C5.30558 122.5 1.5 118.694 1.5 114V10C1.5 5.30558 5.30558 1.5 10 1.5Z"
-            stroke="black" stroke-width="3" />
-    </g>
-</svg>
diff --git a/autoload/codeium.vim b/autoload/codeium.vim
index 5c268bbe..61789f38 100644
--- a/autoload/codeium.vim
+++ b/autoload/codeium.vim
@@ -21,7 +21,10 @@ function! codeium#Enabled() abort
 
   let codeium_filetypes = s:default_codeium_enabled
   call extend(codeium_filetypes, get(g:, 'codeium_filetypes', {}))
-  if !get(codeium_filetypes, &filetype, 1)
+
+  let codeium_filetypes_disabled_by_default = get(g:, 'codeium_filetypes_disabled_by_default') || get(b:, 'codeium_filetypes_disabled_by_default')
+
+  if !get(codeium_filetypes, &filetype, !codeium_filetypes_disabled_by_default)
     return v:false
   endif
 
@@ -36,14 +39,14 @@ function! codeium#CompletionText() abort
   endtry
 endfunction
 
-function! codeium#Accept() abort
+function! s:CompletionInserter(current_completion, insert_text) abort
   let default = get(g:, 'codeium_tab_fallback', pumvisible() ? "\<C-N>" : "\t")
 
   if mode() !~# '^[iR]' || !exists('b:_codeium_completions')
     return default
   endif
 
-  let current_completion = s:GetCurrentCompletionItem()
+  let current_completion = a:current_completion
   if current_completion is v:null
     return default
   endif
@@ -55,7 +58,7 @@ function! codeium#Accept() abort
   let start_offset = get(range, 'startOffset', 0)
   let end_offset = get(range, 'endOffset', 0)
 
-  let text = current_completion.completion.text . suffix_text
+  let text = a:insert_text . suffix_text
   if empty(text)
     return default
   endif
@@ -84,6 +87,29 @@ function! codeium#Accept() abort
   return delete_range . insert_text . cursor_text
 endfunction
 
+function! codeium#Accept() abort
+  let current_completion = s:GetCurrentCompletionItem()
+  return s:CompletionInserter(current_completion, current_completion is v:null ? '' : current_completion.completion.text)
+endfunction
+
+function! codeium#AcceptNextWord() abort
+  let current_completion = s:GetCurrentCompletionItem()
+  let completion_parts = current_completion is v:null ? [] : get(current_completion, 'completionParts', [])
+  if len(completion_parts) == 0
+    return ''
+  endif
+  let prefix_text = get(completion_parts[0], 'prefix', '')
+  let completion_text = get(completion_parts[0], 'text', '')
+  let next_word = matchstr(completion_text, '\v^\W*\k*')
+  return s:CompletionInserter(current_completion, prefix_text . next_word)
+endfunction
+
+function! codeium#AcceptNextLine() abort
+  let current_completion = s:GetCurrentCompletionItem()
+  let text = current_completion is v:null ? '' : substitute(current_completion.completion.text, '\v\n.*$', '', '')
+  return s:CompletionInserter(current_completion, text)
+endfunction
+
 function! s:HandleCompletionsResult(out, err, status) abort
   if exists('b:_codeium_completions')
     let response_text = join(a:out, '')
@@ -213,8 +239,11 @@ function! s:RenderCurrentCompletion() abort
     endif
 
     if has('nvim')
+      " Set priority high so that completions appear above LSP inlay hints
+      let priority = get(b:, 'codeium_virtual_text_priority',
+                  \ get(g:, 'codeium_virtual_text_priority', 65535))
       let _virtcol = virtcol([row, _col+diff])
-      let data = {'id': idx + 1, 'hl_mode': 'combine', 'virt_text_win_col': _virtcol - 1}
+      let data = {'id': idx + 1, 'hl_mode': 'combine', 'virt_text_win_col': _virtcol - 1, 'priority': priority }
       if part.type ==# 'COMPLETION_PART_TYPE_INLINE_MASK'
         let data.virt_text = [[text, s:hlgroup]]
       elseif part.type ==# 'COMPLETION_PART_TYPE_BLOCK'
@@ -390,6 +419,106 @@ function! codeium#CycleOrComplete() abort
   endif
 endfunction
 
+function BuildChatUrl(metadata, chat_port, ws_port) abort
+  let config = get(g:, 'codeium_server_config', {})
+  let l:has_enterprise_extension = 'false'
+  if has_key(config, 'api_url') && !empty(config.api_url)
+    let l:has_enterprise_extension = 'true'
+  endif
+
+  " Hard-coded to English locale and allowed telemetry.
+  let l:url = 'http://127.0.0.1:' . a:chat_port . '/?' . 'api_key=' . a:metadata.api_key . '&ide_name=' . a:metadata.ide_name . '&ide_version=' . a:metadata.ide_version . '&extension_name=' . a:metadata.extension_name . '&extension_version=' . a:metadata.extension_version . '&web_server_url=ws://127.0.0.1:' . a:ws_port . '&has_enterprise_extension=' . l:has_enterprise_extension . '&app_name=Vim&locale=en&ide_telemetry_enabled=true&has_index_service=true'
+  return l:url
+endfunction
+
+function! s:LaunchChat(out, err, status) abort
+  let l:metadata = codeium#server#RequestMetadata()
+  let l:processes = json_decode(join(a:out, ''))
+  let l:chat_port = l:processes['chatClientPort']
+  let l:ws_port = l:processes['chatWebServerPort']
+
+  let l:url = BuildChatUrl(l:metadata, l:chat_port, l:ws_port)
+  let l:browser = codeium#command#BrowserCommand()
+  let opened_browser = v:false
+  if !empty(browser)
+    echomsg 'Navigating to ' . l:url
+    try
+      call system(l:browser . ' ' . '"' . l:url . '"')
+      if v:shell_error is# 0
+        let l:opened_browser = v:true
+      endif
+    catch
+    endtry
+
+    if !l:opened_browser
+      echomsg 'Failed to open browser. Please go to the link above.'
+    endif
+  else
+    echomsg 'No available browser found. Please go to ' . l:url
+  endif
+endfunction
+
+let g:codeium_workspace_root_hints = ['.bzr','.git','.hg','.svn','_FOSSIL_','package.json']
+function! s:GetProjectRoot() abort
+  let l:last_dir = ''
+  let l:dir = getcwd()
+  while l:dir != l:last_dir
+    for l:root_hint in g:codeium_workspace_root_hints
+      let l:hint = l:dir . '/' . l:root_hint
+      if isdirectory(l:hint) || filereadable(l:hint)
+        return l:dir
+      endif
+    endfor
+    let l:last_dir = l:dir
+    let l:dir = fnamemodify(l:dir, ':h')
+  endwhile
+  return getcwd()
+endfunction
+
+function! codeium#RefreshContext() abort
+  " current buffer is 1
+  try
+    call codeium#server#Request('RefreshContextForIdeAction', {'active_document': codeium#doc#GetDocument(1, line('.'), col('.'))})
+  catch
+    call codeium#log#Exception()
+  endtry
+endfunction
+
+" This assumes a single workspace is involved per Vim session, for now.
+let s:codeium_workspace_indexed = v:false
+function! codeium#AddTrackedWorkspace() abort
+  if (!codeium#Enabled() || s:codeium_workspace_indexed)
+    return
+  endif
+  let s:codeium_workspace_indexed = v:true
+  try
+    call codeium#server#Request('AddTrackedWorkspace', {'workspace': s:GetProjectRoot()})
+  catch
+    call codeium#log#Exception()
+  endtry
+endfunction
+
+function! codeium#Chat() abort
+  if (!codeium#Enabled())
+    return
+  endif
+  try
+    call codeium#RefreshContext()
+    call codeium#server#Request('GetProcesses', codeium#server#RequestMetadata(), function('s:LaunchChat', []))
+    call codeium#AddTrackedWorkspace()
+    " If user has chat_ports set, they are probably using vim remotely and trying to use chat via port forwarding.
+    " In that case display the url here so that it is easier to copy, as the browser will fail to open automatically. 
+    let chat_ports = get(g:, 'codeium_port_config', {})
+    if has_key(chat_ports, 'chat_client') && !empty(chat_ports.chat_client) && has_key(chat_ports, 'web_server') && !empty(chat_ports.web_server)
+      let l:metadata = codeium#server#RequestMetadata()
+      let l:url = BuildChatUrl(l:metadata, chat_ports.chat_client, chat_ports.web_server)
+      echomsg l:url
+    endif
+  catch
+    call codeium#log#Exception()
+  endtry
+endfunction
+
 function! codeium#GetStatusString(...) abort
   let s:using_codeium_status = 1
   if (!codeium#Enabled())
diff --git a/autoload/codeium/command.vim b/autoload/codeium/command.vim
index 4f5f7658..e7350287 100644
--- a/autoload/codeium/command.vim
+++ b/autoload/codeium/command.vim
@@ -91,7 +91,7 @@ function! s:commands.Auth(...) abort
   endif
 
   while empty(api_key) && tries < 3
-    let command = 'curl -sS ' . register_user_url . ' ' .
+    let command = 'curl -sSL ' . register_user_url . ' ' .
           \ '--header "Content-Type: application/json" ' .
           \ '--data ' . shellescape(json_encode({'firebase_id_token': auth_token}))
     let response = system(command)
@@ -104,7 +104,7 @@ function! s:commands.Auth(...) abort
               \ . 'Would you like to try auth without checking SSL certificate revocation? (y/n): ')
         call inputrestore()
         if useNoSsl ==? 'y'
-            let command = 'curl --ssl-no-revoke -sS ' . register_user_url . ' ' .
+            let command = 'curl --ssl-no-revoke -sSL ' . register_user_url . ' ' .
                   \ '--header "Content-Type: application/json" ' .
                   \ '--data ' . shellescape(json_encode({'firebase_id_token': auth_token}))
             let response = system(command)
@@ -137,6 +137,10 @@ function! s:commands.Auth(...) abort
   endif
 endfunction
 
+function s:commands.Chat(...) abort
+  call codeium#Chat()
+endfunction
+
 function! s:commands.Disable(...) abort
   let g:codeium_enabled = 0
 endfunction
diff --git a/autoload/codeium/doc.vim b/autoload/codeium/doc.vim
index b50b8b59..8084d089 100644
--- a/autoload/codeium/doc.vim
+++ b/autoload/codeium/doc.vim
@@ -103,8 +103,7 @@ function! codeium#doc#GetDocument(bufId, curLine, curCol) abort
         \ 'editor_language': editor_language,
         \ 'language': get(s:language_enum, language, 0),
         \ 'cursor_position': {'row': a:curLine - 1, 'col': a:curCol - 1},
-        \ 'absolute_path': fnamemodify(bufname(a:bufId), ':p'),
-        \ 'relative_path': fnamemodify(bufname(a:bufId), ':')
+        \ 'absolute_path_migrate_me_to_uri': fnamemodify(bufname(a:bufId), ':p'),
         \ }
 
   let line_ending = codeium#util#LineEndingChars(v:null)
diff --git a/autoload/codeium/server.vim b/autoload/codeium/server.vim
index 94d40d62..eba00cf5 100644
--- a/autoload/codeium/server.vim
+++ b/autoload/codeium/server.vim
@@ -1,5 +1,5 @@
-let s:language_server_version = '1.6.13'
-let s:language_server_sha = '3056e905a51e39039573c9a3623a1746671cdf15'
+let s:language_server_version = '1.20.8'
+let s:language_server_sha = '37f12b83df389802b7d4e293b3e1a986aca289c0'
 let s:root = expand('<sfile>:h:h:h')
 let s:bin = v:null
 
@@ -25,8 +25,91 @@ if !exists('s:editor_version')
 endif
 
 let s:server_port = v:null
+if codeium#util#IsUsingRemoteChat()
+  let s:server_port = 42100
+endif
+
 let g:codeium_server_job = v:null
 
+function! s:DetectGlibcVersion() abort
+  if !has('unix') || has('mac')
+    return v:null
+  endif
+
+  try
+    try
+      let ldd_output = system('ldd --version 2>/dev/null')
+      if v:shell_error == 0
+        let match = matchlist(ldd_output, 'ldd (GNU libc) \(\d\+\.\d\+\)')
+        if !empty(match)
+          call codeium#log#Info('Detected glibc version via ldd: ' . match[1])
+          return match[1]
+        endif
+      endif
+    catch
+    endtry
+
+    try
+      let getconf_output = system('getconf GNU_LIBC_VERSION 2>/dev/null')
+      if v:shell_error == 0
+        let match = matchlist(getconf_output, 'glibc \(\d\+\.\d\+\)')
+        if !empty(match)
+          call codeium#log#Info('Detected glibc version via getconf: ' . match[1])
+          return match[1]
+        endif
+      endif
+    catch
+    endtry
+
+    try
+      let libc_output = system('/lib/x86_64-linux-gnu/libc.so.6 2>/dev/null')
+      if v:shell_error == 0
+        let match = matchlist(libc_output, 'GNU C Library.*release version \(\d\+\.\d\+\)')
+        if !empty(match)
+          call codeium#log#Info('Detected glibc version via libc.so.6: ' . match[1])
+          return match[1]
+        endif
+      endif
+    catch
+    endtry
+
+    call codeium#log#Warn('Could not detect glibc version using any method')
+    return v:null
+  catch
+    call codeium#log#Error('Error detecting glibc version: ' . v:exception)
+    return v:null
+  endtry
+endfunction
+
+function! s:CompareVersions(version1, version2) abort
+  let parts1 = split(a:version1, '\.')
+  let parts2 = split(a:version2, '\.')
+  
+  let major1 = str2nr(parts1[0])
+  let minor1 = str2nr(parts1[1])
+  let major2 = str2nr(parts2[0])
+  let minor2 = str2nr(parts2[1])
+  
+  if major1 != major2
+    return major1 < major2 ? -1 : 1
+  endif
+  
+  if minor1 != minor2
+    return minor1 < minor2 ? -1 : 1
+  endif
+  
+  return 0
+endfunction
+
+function! s:IsGlibcVersionLessOrEqual(target_version) abort
+  let current_version = s:DetectGlibcVersion()
+  if current_version is# v:null
+    return v:false
+  endif
+  
+  return s:CompareVersions(current_version, a:target_version) <= 0
+endfunction
+
 function! s:OnExit(result, status, on_complete_cb) abort
   let did_close = has_key(a:result, 'closed')
   if did_close
@@ -69,7 +152,7 @@ function! codeium#server#Request(type, data, ...) abort
       \ '/exa.language_server_pb.LanguageServerService/' . a:type
   let data = json_encode(a:data)
   let args = [
-              \ 'curl', uri,
+              \ 'curl', '-L', uri,
               \ '--header', 'Content-Type: application/json',
               \ '-d@-'
               \ ]
@@ -107,12 +190,33 @@ function! s:FindPort(dir, timer) abort
     if time - getftime(path) <= 5 && getftype(path) ==# 'file'
       call codeium#log#Info('Found port: ' . name)
       let s:server_port = name
+      call s:RequestServerStatus()
       call timer_stop(a:timer)
       break
     endif
   endfor
 endfunction
 
+function! s:RequestServerStatus() abort
+  call codeium#server#Request('GetStatus', {'metadata': codeium#server#RequestMetadata()}, function('s:HandleGetStatusResponse'))
+endfunction
+
+function! s:HandleGetStatusResponse(out, err, status) abort
+  " Check if the request was successful
+  if a:status == 0
+    " Parse the JSON response
+    let response = json_decode(join(a:out, "\n"))
+    let status = get(response, 'status', {})
+    " Check if there is a message in the response and echo it
+    if has_key(status, 'message') && !empty(status.message)
+      echom status.message
+    endif
+  else
+    " Handle error if the status is not 0 or if there is stderr output
+    call codeium#log#Error(join(a:err, "\n"))
+  endif
+endfunction
+
 function! s:SendHeartbeat(timer) abort
   try
     call codeium#server#Request('Heartbeat', {'metadata': codeium#server#RequestMetadata()})
@@ -122,10 +226,33 @@ function! s:SendHeartbeat(timer) abort
 endfunction
 
 function! codeium#server#Start(...) abort
-  silent let os = substitute(system('uname'), '\n', '', '')
-  silent let arch = substitute(system('uname -m'), '\n', '', '')
+  let user_defined_codeium_bin = get(g:, 'codeium_bin', '')
+
+  if user_defined_codeium_bin != '' && filereadable(user_defined_codeium_bin)
+    let s:bin = user_defined_codeium_bin
+    call s:ActuallyStart()
+    return
+  endif
+  let user_defined_os = get(g:, 'codeium_os', '')
+  let user_defined_arch = get(g:, 'codeium_arch', '')
+
+  if user_defined_os != '' && user_defined_arch != ''
+    let os = user_defined_os
+    let arch = user_defined_arch
+  else
+    silent let os = substitute(system('uname'), '\n', '', '')
+    silent let arch = substitute(system('uname -m'), '\n', '', '')
+  endif
   let is_arm = stridx(arch, 'arm') == 0 || stridx(arch, 'aarch64') == 0
 
+  if empty(os)
+    if has("linux")
+      let os = "Linux"
+    elseif has("mac")
+      let os = "Darwin"
+    endif
+  endif
+
   if os ==# 'Linux' && is_arm
     let bin_suffix = 'linux_arm'
   elseif os ==# 'Linux'
@@ -138,6 +265,29 @@ function! codeium#server#Start(...) abort
     let bin_suffix = 'windows_x64.exe'
   endif
 
+  let config = get(g:, 'codeium_server_config', {})
+  if has_key(config, 'portal_url') && !empty(config.portal_url)
+    let has_old_glibc = s:IsGlibcVersionLessOrEqual('2.27')
+    if has_old_glibc
+      call codeium#log#Info('Using legacy language server version 1.46.0 for enterprise customer with glibc <= 2.27')
+      let s:language_server_version = '1.46.0'
+      let s:language_server_sha = 'enterprise-' . s:language_server_version
+    elseif config.portal_url =~# '\.windsurf\.com' || config.portal_url =~# 'dstart\.com'
+      call codeium#log#Info('Using pinned language server version 1.50.100 for enterprise customer')
+      let s:language_server_version = '1.50.100'
+      let s:language_server_sha = 'enterprise-' . s:language_server_version
+    else
+      let response = system('curl -sL ' . config.portal_url . '/api/version')
+      if v:shell_error == '0'
+        let s:language_server_version = response
+        let s:language_server_sha = 'enterprise-' . s:language_server_version
+      else
+        call codeium#log#Error('Failed to fetch version from ' . config.portal_url)
+        call codeium#log#Error(v:shell_error)
+      endif
+    endif
+  endif
+
   let sha = get(codeium#command#LoadConfig(codeium#command#XdgConfigDir()), 'sha', s:language_server_sha)
   let bin_dir = codeium#command#HomeDir() . '/bin/' . sha
   let s:bin = bin_dir . '/language_server_' . bin_suffix
@@ -146,7 +296,14 @@ function! codeium#server#Start(...) abort
   if !filereadable(s:bin)
     call delete(s:bin)
     if sha ==# s:language_server_sha
-      let url = 'https://github.com/Exafunction/codeium/releases/download/language-server-v' . s:language_server_version . '/language_server_' . bin_suffix . '.gz'
+      let config = get(g:, 'codeium_server_config', {})
+      if has_key(config, 'portal_url') && !empty(config.portal_url)
+        let base_url = config.portal_url
+      else
+        let base_url = 'https://github.com/Exafunction/codeium/releases/download'
+      endif
+      let base_url = substitute(base_url, '/\+$', '', '')
+      let url = base_url . '/language-server-v' . s:language_server_version . '/language_server_' . bin_suffix . '.gz'
     else
       let url = 'https://storage.googleapis.com/exafunction-dist/codeium/' . sha . '/language_server_' . bin_suffix . '.gz'
     endif
@@ -172,7 +329,8 @@ function! s:UnzipAndStart(status) abort
     let old_shellredir = &shellredir
     " Switch to powershell.
     let &shell = 'powershell'
-    set shellquote= shellpipe=\| shellxquote=
+    set shellquote=\"
+    set shellpipe=\|
     set shellcmdflag=-NoLogo\ -NoProfile\ -ExecutionPolicy\ RemoteSigned\ -Command
     set shellredir=\|\ Out-File\ -Encoding\ UTF8
     call system('& { . ' . shellescape(s:root . '/powershell/gzip.ps1') . '; Expand-File ' . shellescape(s:bin . '.gz') . ' }')
@@ -200,16 +358,29 @@ endfunction
 
 function! s:ActuallyStart() abort
   let config = get(g:, 'codeium_server_config', {})
+  let chat_ports = get(g:, 'codeium_port_config', {})
   let manager_dir = tempname() . '/codeium/manager'
   call mkdir(manager_dir, 'p')
-
   let args = [
         \ s:bin,
         \ '--api_server_url', get(config, 'api_url', 'https://server.codeium.com'),
-        \ '--manager_dir', manager_dir
+        \ '--enable_local_search', '--enable_index_service', '--search_max_workspace_file_count', '5000',
+        \ '--enable_chat_web_server', '--enable_chat_client'
         \ ]
   if has_key(config, 'api_url') && !empty(config.api_url)
     let args += ['--enterprise_mode']
+    let args += ['--portal_url', get(config, 'portal_url', 'https://codeium.example.com')]
+  endif
+  if !codeium#util#IsUsingRemoteChat()
+    let args += ['--manager_dir', manager_dir]
+  endif
+  " If either of these is set, only one vim window (with any number of buffers) will work with Codeium.
+  " Opening other vim windows won't be able to use Codeium features.
+  if has_key(chat_ports, 'web_server') && !empty(chat_ports.web_server)
+    let args += ['--chat_web_server_port', chat_ports.web_server]
+  endif
+  if has_key(chat_ports, 'chat_client') && !empty(chat_ports.chat_client)
+    let args += ['--chat_client_port', chat_ports.chat_client]
   endif
 
   call codeium#log#Info('Launching server with manager_dir ' . manager_dir)
@@ -223,6 +394,9 @@ function! s:ActuallyStart() abort
                 \ 'err_cb': { channel, data -> codeium#log#Info('[SERVER] ' . data) },
                 \ })
   endif
-  call timer_start(500, function('s:FindPort', [manager_dir]), {'repeat': -1})
+  if !codeium#util#IsUsingRemoteChat()
+    call timer_start(500, function('s:FindPort', [manager_dir]), {'repeat': -1})
+  endif
+
   call timer_start(5000, function('s:SendHeartbeat', []), {'repeat': -1})
 endfunction
diff --git a/autoload/codeium/util.vim b/autoload/codeium/util.vim
index 3d91a446..48eae30b 100644
--- a/autoload/codeium/util.vim
+++ b/autoload/codeium/util.vim
@@ -8,3 +8,8 @@ function! codeium#util#HasSupportedVersion() abort
 
   return s:nvim_virt_text_support || s:vim_virt_text_support
 endfunction
+
+function! codeium#util#IsUsingRemoteChat() abort
+  let chat_ports = get(g:, 'codeium_port_config', {})
+  return has_key(chat_ports, 'chat_client') && !empty(chat_ports.chat_client) && has_key(chat_ports, 'web_server') && !empty(chat_ports.web_server)
+endfunction
diff --git a/codeium.svg b/codeium.svg
deleted file mode 100644
index 7df5eb2d..00000000
--- a/codeium.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg viewBox="0 0 1989 450" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M392.971 32.0294L200 225L392.971 417.971C397.314 413.627 400 407.627 400 401V49C400 42.3726 397.314 36.3726 392.971 32.0294Z" fill="#60D5C4"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M392.971 32.0294L200 225L7.02942 32.0294C11.3726 27.6863 17.3726 25 24 25H376C382.627 25 388.627 27.6863 392.971 32.0294Z" fill="#71E9D8"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.02944 32.0294L200 225L7.02944 417.971C2.68629 413.627 0 407.627 0 401V49C0 42.3726 2.68629 36.3726 7.02944 32.0294Z" fill="#60D5C4"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M392.971 417.971L200 225L7.02942 417.971C11.3726 422.314 17.3726 425 24 425H376C382.627 425 388.627 422.314 392.971 417.971Z" fill="#71E9D8"/>
-<rect x="50" y="75" width="300" height="300" rx="2" fill="#09B6A2"/>
-<path d="M120.8 315.12C101.24 315.12 91.46 305.34 91.46 285.78V243.84C91.46 236.52 87.86 232.86 80.66 232.86C78.02 232.86 75.8 232.02 74 230.34C72.32 228.66 71.48 226.5 71.48 223.86C71.48 221.1 72.32 218.88 74 217.2C75.8 215.52 78.02 214.68 80.66 214.68C87.86 214.68 91.46 211.02 91.46 203.7V161.76C91.46 142.2 101.24 132.42 120.8 132.42C123.44 132.42 125.6 133.32 127.28 135.12C128.96 136.92 129.8 139.14 129.8 141.78C129.8 144.42 128.96 146.58 127.28 148.26C125.6 149.94 123.44 150.78 120.8 150.78C113.48 150.78 109.82 154.44 109.82 161.76V203.7C109.82 207.9 109.34 211.68 108.38 215.04C107.42 218.4 105.98 221.34 104.06 223.86C107.9 228.78 109.82 235.44 109.82 243.84V285.78C109.82 293.1 113.48 296.76 120.8 296.76C123.44 296.76 125.6 297.6 127.28 299.28C128.96 300.96 129.8 303.18 129.8 305.94C129.8 308.58 128.96 310.74 127.28 312.42C125.6 314.22 123.44 315.12 120.8 315.12ZM156.733 275.88C153.373 275.88 150.433 274.68 147.913 272.28C145.513 269.76 144.313 266.82 144.313 263.46C144.313 259.98 145.513 257.04 147.913 254.64C150.433 252.12 153.373 250.86 156.733 250.86C160.213 250.86 163.153 252.12 165.553 254.64C167.953 257.04 169.153 259.98 169.153 263.46C169.153 266.82 167.953 269.76 165.553 272.28C163.153 274.68 160.213 275.88 156.733 275.88ZM199.623 275.88C196.263 275.88 193.323 274.68 190.803 272.28C188.403 269.76 187.203 266.82 187.203 263.46C187.203 259.98 188.403 257.04 190.803 254.64C193.323 252.12 196.263 250.86 199.623 250.86C203.103 250.86 206.043 252.12 208.443 254.64C210.843 257.04 212.043 259.98 212.043 263.46C212.043 266.82 210.843 269.76 208.443 272.28C206.043 274.68 203.103 275.88 199.623 275.88ZM242.514 275.88C239.154 275.88 236.214 274.68 233.694 272.28C231.294 269.76 230.094 266.82 230.094 263.46C230.094 259.98 231.294 257.04 233.694 254.64C236.214 252.12 239.154 250.86 242.514 250.86C245.994 250.86 248.934 252.12 251.334 254.64C253.734 257.04 254.934 259.98 254.934 263.46C254.934 266.82 253.734 269.76 251.334 272.28C248.934 274.68 245.994 275.88 242.514 275.88ZM278.564 315.12C275.924 315.12 273.764 314.22 272.084 312.42C270.404 310.74 269.564 308.58 269.564 305.94C269.564 303.18 270.404 300.96 272.084 299.28C273.764 297.6 275.924 296.76 278.564 296.76C285.884 296.76 289.544 293.1 289.544 285.78V243.84C289.544 235.44 291.464 228.78 295.304 223.86C293.384 221.34 291.944 218.4 290.984 215.04C290.024 211.68 289.544 207.9 289.544 203.7V161.76C289.544 154.44 285.884 150.78 278.564 150.78C275.924 150.78 273.764 149.94 272.084 148.26C270.404 146.58 269.564 144.42 269.564 141.78C269.564 139.14 270.404 136.92 272.084 135.12C273.764 133.32 275.924 132.42 278.564 132.42C298.124 132.42 307.904 142.2 307.904 161.76V203.7C307.904 211.02 311.504 214.68 318.704 214.68C321.344 214.68 323.504 215.52 325.184 217.2C326.984 218.88 327.884 221.1 327.884 223.86C327.884 226.5 326.984 228.66 325.184 230.34C323.504 232.02 321.344 232.86 318.704 232.86C311.504 232.86 307.904 236.52 307.904 243.84V285.78C307.904 305.34 298.124 315.12 278.564 315.12Z" fill="white"/>
-<path d="M592.2 363.6C574.68 363.6 558.96 359.28 545.04 350.64C531.36 342 520.44 330.24 512.28 315.36C504.36 300.48 500.4 283.8 500.4 265.32C500.4 246.84 504.36 230.16 512.28 215.28C520.44 200.4 531.36 188.64 545.04 180C558.96 171.36 574.68 167.04 592.2 167.04C609 167.04 624.24 170.52 637.92 177.48C651.84 184.2 662.4 193.44 669.6 205.2L649.08 230.4C645.24 224.88 640.32 219.84 634.32 215.28C628.32 210.72 621.96 207.12 615.24 204.48C608.52 201.84 602.04 200.52 595.8 200.52C584.28 200.52 573.96 203.4 564.84 209.16C555.96 214.68 548.88 222.36 543.6 232.2C538.32 242.04 535.68 253.08 535.68 265.32C535.68 277.56 538.44 288.6 543.96 298.44C549.48 308.04 556.8 315.72 565.92 321.48C575.04 327.24 585.12 330.12 596.16 330.12C602.64 330.12 608.88 329.04 614.88 326.88C621.12 324.72 627.12 321.48 632.88 317.16C638.64 312.84 644.04 307.56 649.08 301.32L669.6 326.52C661.92 337.32 650.88 346.2 636.48 353.16C622.32 360.12 607.56 363.6 592.2 363.6ZM789.536 363.6C771.056 363.6 754.496 359.4 739.856 351C725.456 342.36 714.056 330.72 705.656 316.08C697.256 301.2 693.056 284.28 693.056 265.32C693.056 246.36 697.256 229.56 705.656 214.92C714.056 200.04 725.456 188.4 739.856 180C754.496 171.36 771.056 167.04 789.536 167.04C807.776 167.04 824.096 171.36 838.496 180C853.136 188.4 864.656 200.04 873.056 214.92C881.456 229.56 885.656 246.36 885.656 265.32C885.656 284.28 881.456 301.2 873.056 316.08C864.656 330.72 853.136 342.36 838.496 351C824.096 359.4 807.776 363.6 789.536 363.6ZM789.536 329.76C800.816 329.76 810.896 327 819.776 321.48C828.656 315.72 835.616 308.04 840.656 298.44C845.696 288.6 848.096 277.56 847.856 265.32C848.096 252.84 845.696 241.8 840.656 232.2C835.616 222.36 828.656 214.68 819.776 209.16C810.896 203.64 800.816 200.88 789.536 200.88C778.256 200.88 768.056 203.76 758.936 209.52C750.056 215.04 743.096 222.72 738.056 232.56C733.016 242.16 730.616 253.08 730.856 265.32C730.616 277.56 733.016 288.6 738.056 298.44C743.096 308.04 750.056 315.72 758.936 321.48C768.056 327 778.256 329.76 789.536 329.76ZM1004.9 363.6C987.621 363.6 972.141 359.4 958.461 351C945.021 342.36 934.341 330.72 926.421 316.08C918.501 301.2 914.541 284.28 914.541 265.32C914.541 246.36 918.381 229.56 926.061 214.92C933.981 200.04 944.661 188.4 958.101 180C971.541 171.36 986.781 167.04 1003.82 167.04C1013.18 167.04 1022.18 168.6 1030.82 171.72C1039.7 174.6 1047.62 178.68 1054.58 183.96C1061.54 189 1066.94 194.64 1070.78 200.88C1074.86 206.88 1076.9 213 1076.9 219.24L1066.1 219.96V93.6H1103.18V360H1066.1V315H1073.3C1073.3 320.76 1071.38 326.52 1067.54 332.28C1063.7 337.8 1058.54 342.96 1052.06 347.76C1045.82 352.56 1038.5 356.4 1030.1 359.28C1021.94 362.16 1013.54 363.6 1004.9 363.6ZM1009.94 331.56C1021.22 331.56 1031.18 328.68 1039.82 322.92C1048.46 317.16 1055.18 309.36 1059.98 299.52C1065.02 289.44 1067.54 278.04 1067.54 265.32C1067.54 252.6 1065.02 241.32 1059.98 231.48C1055.18 221.4 1048.46 213.48 1039.82 207.72C1031.18 201.96 1021.22 199.08 1009.94 199.08C998.661 199.08 988.701 201.96 980.061 207.72C971.421 213.48 964.581 221.4 959.541 231.48C954.741 241.32 952.341 252.6 952.341 265.32C952.341 278.04 954.741 289.44 959.541 299.52C964.581 309.36 971.421 317.16 980.061 322.92C988.701 328.68 998.661 331.56 1009.94 331.56ZM1242.42 363.6C1222.98 363.6 1205.7 359.52 1190.58 351.36C1175.7 342.96 1163.94 331.56 1155.3 317.16C1146.9 302.76 1142.7 286.2 1142.7 267.48C1142.7 252.6 1145.1 239.04 1149.9 226.8C1154.7 214.56 1161.3 204 1169.7 195.12C1178.34 186 1188.54 179.04 1200.3 174.24C1212.3 169.2 1225.26 166.68 1239.18 166.68C1251.42 166.68 1262.82 169.08 1273.38 173.88C1283.94 178.44 1293.06 184.8 1300.74 192.96C1308.66 201.12 1314.66 210.84 1318.74 222.12C1323.06 233.16 1325.1 245.28 1324.86 258.48L1324.5 274.32H1170.06L1161.78 244.8H1292.46L1287.06 250.92V242.28C1286.34 234.36 1283.7 227.28 1279.14 221.04C1274.58 214.8 1268.82 209.88 1261.86 206.28C1254.9 202.68 1247.34 200.88 1239.18 200.88C1226.22 200.88 1215.3 203.4 1206.42 208.44C1197.54 213.24 1190.82 220.44 1186.26 230.04C1181.7 239.4 1179.42 251.04 1179.42 264.96C1179.42 278.16 1182.18 289.68 1187.7 299.52C1193.22 309.12 1201.02 316.56 1211.1 321.84C1221.18 327.12 1232.82 329.76 1246.02 329.76C1255.38 329.76 1264.02 328.2 1271.94 325.08C1280.1 321.96 1288.86 316.32 1298.22 308.16L1316.94 334.44C1311.18 340.2 1304.1 345.24 1295.7 349.56C1287.54 353.88 1278.78 357.36 1269.42 360C1260.3 362.4 1251.3 363.6 1242.42 363.6ZM1371.28 360V171H1408.36V360H1371.28ZM1389.28 129.24C1381.36 129.24 1375.24 127.2 1370.92 123.12C1366.6 119.04 1364.44 113.28 1364.44 105.84C1364.44 98.88 1366.6 93.24 1370.92 88.92C1375.48 84.6 1381.6 82.44 1389.28 82.44C1397.2 82.44 1403.32 84.48 1407.64 88.56C1411.96 92.64 1414.12 98.4 1414.12 105.84C1414.12 112.8 1411.84 118.44 1407.28 122.76C1402.96 127.08 1396.96 129.24 1389.28 129.24ZM1531.6 363.6C1518.16 363.6 1506.4 360.48 1496.32 354.24C1486.48 348 1478.8 339.24 1473.28 327.96C1468 316.68 1465.36 303.24 1465.36 287.64V171H1502.44V277.56C1502.44 288.6 1504.12 298.2 1507.48 306.36C1511.08 314.28 1516.12 320.4 1522.6 324.72C1529.32 329.04 1537.36 331.2 1546.72 331.2C1553.68 331.2 1560.04 330.12 1565.8 327.96C1571.56 325.56 1576.48 322.32 1580.56 318.24C1584.88 314.16 1588.24 309.24 1590.64 303.48C1593.04 297.72 1594.24 291.48 1594.24 284.76V171H1631.32V360H1594.24V320.4L1600.72 316.08C1597.84 324.96 1592.92 333 1585.96 340.2C1579.24 347.4 1571.2 353.16 1561.84 357.48C1552.48 361.56 1542.4 363.6 1531.6 363.6ZM1682.61 360V171H1720.05V211.32L1713.21 215.64C1715.13 209.4 1718.13 203.4 1722.21 197.64C1726.53 191.88 1731.69 186.84 1737.69 182.52C1743.93 177.96 1750.53 174.36 1757.49 171.72C1764.69 169.08 1772.01 167.76 1779.45 167.76C1790.25 167.76 1799.73 169.56 1807.89 173.16C1816.05 176.76 1822.77 182.16 1828.05 189.36C1833.33 196.56 1837.17 205.56 1839.57 216.36L1833.81 214.92L1836.33 208.8C1838.97 203.28 1842.57 198.12 1847.13 193.32C1851.93 188.28 1857.33 183.84 1863.33 180C1869.33 176.16 1875.69 173.16 1882.41 171C1889.13 168.84 1895.73 167.76 1902.21 167.76C1916.37 167.76 1928.01 170.64 1937.13 176.4C1946.49 182.16 1953.45 190.92 1958.01 202.68C1962.81 214.44 1965.21 229.08 1965.21 246.6V360H1927.77V248.76C1927.77 237.96 1926.33 229.2 1923.45 222.48C1920.81 215.52 1916.73 210.36 1911.21 207C1905.69 203.64 1898.61 201.96 1889.97 201.96C1883.25 201.96 1876.89 203.16 1870.89 205.56C1865.13 207.72 1860.09 210.84 1855.77 214.92C1851.45 219 1848.09 223.8 1845.69 229.32C1843.29 234.6 1842.09 240.48 1842.09 246.96V360H1804.65V248.04C1804.65 238.2 1803.21 229.92 1800.33 223.2C1797.45 216.24 1793.25 210.96 1787.73 207.36C1782.21 203.76 1775.49 201.96 1767.57 201.96C1760.85 201.96 1754.61 203.16 1748.85 205.56C1743.09 207.72 1738.05 210.84 1733.73 214.92C1729.41 218.76 1726.05 223.44 1723.65 228.96C1721.25 234.24 1720.05 240 1720.05 246.24V360H1682.61Z" fill="#09B6A2"/>
-</svg>
diff --git a/doc/codeium.txt b/doc/codeium.txt
index 7ecc7f6f..5c33c70d 100644
--- a/doc/codeium.txt
+++ b/doc/codeium.txt
@@ -13,6 +13,9 @@ COMMANDS                                        *:Codeium*
                                                 *:Codeium_Auth*
 :Codeium Auth           Authenticate to Codeium.
 
+                                                *:Codeium_Chat*
+:Codeium Chat           Open Codeium Chat in a browser window
+
                                                 *:Codeium_Disable*
 :Codeium Disable        Disable Codeium completions
 
@@ -86,6 +89,69 @@ g:codeium_tab_fallback  The fallback key when there is no suggestion display
 >
                         let g:codeium_tab_fallback = "\t"
 <
+                                                *g:codeium_bin*
+g:codeium_bin           Manually set the path to the `codeium` language server
+                        binary on your system.
+                        If unset, `codeium.vim` will fetch and download the
+                        binary from the internet.
+>
+                        let g:codeium_bin = "~/.local/bin/codeium_language_server"
+<
+                                                *g:codeium_os*
+g:codeium_os            Manually set the host OS, accepted values are
+                        "Linux", "Darwin", "Windows". if unset, the value will
+                        be obtained using `uname`.
+>
+                        let g:codeium_os = "Linux"
+<
+                                                *g:codeium_arch*
+g:codeium_arch          Manually set the host architecture, accepted values
+                        are "x86_64", "aarch64", "arm". If unset, the value
+                        will be obtained using `uname -m`.
+>
+                        let g:codeium_arch = "x86_64"
+<
+                                                *g:codeium_port_config*
+g:codeium_port_config
+                        Set the ports the chat client and web server use.
+			Pass in web_server and chat_client fields to the mapping to set.
+                        Please note that if this option is set, only one
+			window will work with codeium.
+			It is recommended to set both the web_server and chat_client options
+			if using this. 
+			If you are setting this because you are using vim remotely and want chat to work
+			you will need to forward the two ports you set here, along with port 42100.
+			That window can have as many buffers within it, but any other
+			opened windows will not be able to use Codeium's features.
+>
+                        let g:codeium_port_config = {
+				'web_server': <Your web server port>,
+				'chat_client': <Your chat client port>
+				}
+<
+                                                *g:codeium_virtual_text_priority*
+g:codeium_virtual_text_priority
+                        The priority used for Codeium's virtual text completions
+                        in Neovim. This can control how completions appear when
+                        multiple virtual text items are on the same line, such
+                        as when using LSP inlay hints.
+
+                        The priority can be set on a per-buffer basis by setting
+                        the b:codeium_virtual_text_priority variable. If
+                        neither of these are set, the default priority is 65535,
+                        which will usually place it above any other virtual text.
+>
+                        let g:codeium_virtual_text_priority = 1000
+<
+
+                                                *b:codeium_virtual_text_priority*
+b:codeium_virtual_text_priority
+                        The priority given to Codeium's virtual text completions
+                        for the current buffer in Neovim. If not set,
+                        g:codeium_virtual_text_priority is used.
+>
+                        let b:codeium_virtual_text_priority = 1000
+<
 
 MAPS                                            *codeium-maps*
 
diff --git a/plugin/codeium.vim b/plugin/codeium.vim
index 251bbadf..36f1bd07 100644
--- a/plugin/codeium.vim
+++ b/plugin/codeium.vim
@@ -27,6 +27,7 @@ endfunction
 augroup codeium
   autocmd!
   autocmd InsertEnter,CursorMovedI,CompleteChanged * call codeium#DebouncedComplete()
+  autocmd BufEnter     * if codeium#Enabled()|call codeium#command#StartLanguageServer()|endif
   autocmd BufEnter     * if mode() =~# '^[iR]'|call codeium#DebouncedComplete()|endif
   autocmd InsertLeave  * call codeium#Clear()
   autocmd BufLeave     * if mode() =~# '^[iR]'|call codeium#Clear()|endif
@@ -57,14 +58,16 @@ if !get(g:, 'codeium_disable_bindings')
   if empty(mapcheck('<M-Bslash>', 'i'))
     imap <M-Bslash> <Plug>(codeium-complete)
   endif
+  if empty(mapcheck('<C-k>', 'i'))
+    imap <script><silent><nowait><expr> <C-k> codeium#AcceptNextWord()
+  endif
+  if empty(mapcheck('<C-l>', 'i'))
+    imap <script><silent><nowait><expr> <C-l> codeium#AcceptNextLine()
+  endif
 endif
 
 call s:SetStyle()
 
-if codeium#Enabled()
-  call codeium#command#StartLanguageServer()
-endif
-
 let s:dir = expand('<sfile>:h:h')
 if getftime(s:dir . '/doc/codeium.txt') > getftime(s:dir . '/doc/tags')
   silent! execute 'helptags' fnameescape(s:dir . '/doc')
@@ -105,8 +108,15 @@ endfun
 
 command! CodeiumAuto :silent! call CodeiumAuto()
 
+function! CodeiumChat()
+  call codeium#Chat()
+endfun
+
+command! CodeiumChat :silent! call CodeiumChat()
+
 :amenu Plugin.Codeium.Enable\ \Codeium\ \(\:CodeiumEnable\) :call CodeiumEnable() <Esc>
 :amenu Plugin.Codeium.Disable\ \Codeium\ \(\:CodeiumDisable\) :call CodeiumDisable() <Esc>
 :amenu Plugin.Codeium.Manual\ \Codeium\ \AI\ \Autocompletion\ \(\:CodeiumManual\) :call CodeiumManual() <Esc>
 :amenu Plugin.Codeium.Automatic\ \Codeium\ \AI\ \Completion\ \(\:CodeiumAuto\) :call CodeiumAuto() <Esc>
 :amenu Plugin.Codeium.Toggle\ \Codeium\ \(\:CodeiumToggle\) :call CodeiumToggle() <Esc>
+:amenu Plugin.Codeium.Chat\ \Codeium\ \(\:CodeiumChat\) :call CodeiumChat() <Esc>
diff --git a/windsurf.png b/windsurf.png
new file mode 100644
index 00000000..cd191d57
Binary files /dev/null and b/windsurf.png differ