diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
index 8d8c078..f0c8ad6 100644
--- a/.config/nvim/lua/plugins/cmp.lua
+++ b/.config/nvim/lua/plugins/cmp.lua
@@ -1,32 +1,28 @@
 return {
---  {
---    'milanglacier/minuet-ai.nvim',
---    dependencies = {
---      'nvim-lua/plenary.nvim',
---      'Saghen/blink.cmp'
---    },
---    config = function()
---      require('minuet').setup {
---        provider = 'openai_fim_compatible',
---        n_completions = 1, -- recommend for local model for resource saving
---        -- I recommend beginning with a small context window size and incrementally
---        -- expanding it, depending on your local computing power. A context window
---        -- of 512, serves as an good starting point to estimate your computing
---        -- power. Once you have a reliable estimate of your local computing power,
---        -- you should adjust the context window to a larger value.
---        context_window = 8192,
---        provider_options = {
---          openai_fim_compatible = {
---            -- For Windows users, TERM may not be present in environment variables.
---            -- Consider using APPDATA instead.
---            api_key = 'TERM',
---            name = 'Llama.cpp',
---            end_point = 'http://172.16.10.19:1234/v1/completions',
---            model = 'qwen/qwen3-coder-30b',
---            optional = {
---              max_tokens = 512,
---              top_p = 0.9,
---            },
+  {
+    'milanglacier/minuet-ai.nvim',
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      'Saghen/blink.cmp'
+    },
+    config = function()
+      require('minuet').setup {
+        provider = 'openai_fim_compatible',
+        n_completions = 1, -- recommend for local model for resource saving
+        -- I recommend beginning with a small context window size and incrementally
+        -- expanding it, depending on your local computing power. A context window
+        -- of 512, serves as an good starting point to estimate your computing
+        -- power. Once you have a reliable estimate of your local computing power,
+        -- you should adjust the context window to a larger value.
+        context_window = 512,
+        provider_options = {
+          openai_fim_compatible = {
+            -- For Windows users, TERM may not be present in environment variables.
+            -- Consider using APPDATA instead.
+            api_key = 'TERM',
+            name = 'Llama.cpp',
+            end_point = 'http://127.0.0.1:1234/v1/completions',
+            model = 'codellama-7b-instruct',
 --            template = {
 --              prompt = function(context_before_cursor, context_after_cursor, _)
 --                return '<|fim_prefix|>'
@@ -37,11 +33,11 @@ return {
 --              end,
 --              suffix = false,
 --            },
---          },
---        },
---      }
---    end,
---  },
+          },
+        },
+      }
+    end,
+  },
   {
     'saghen/blink.cmp',
     -- optional: provides snippets for the snippet source
@@ -82,7 +78,7 @@ return {
       -- Default list of enabled providers defined so that you can extend it
       -- elsewhere in your config, without redefining it, due to `opts_extend`
       sources = {
-        default = { 'lsp', 'path', 'snippets', 'buffer' },
+        default = { 'lsp', 'path', 'snippets', 'buffer', 'minuet' },
       },
       -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
       -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
@@ -91,24 +87,23 @@ return {
       -- See the fuzzy documentation for more information
       fuzzy = { implementation = "prefer_rust_with_warning" }
     },
-    opts_extend = { "sources.default" },
---    config = function()
---      require('blink-cmp').setup {
---        sources = {
---          default = { 'lsp', 'path', 'buffer', 'snippets', 'minuet' },
---          providers = {
---            minuet = {
---              name = 'minuet',
---              module = 'minuet.blink',
---              async = true,
---              -- Should match minuet.config.request_timeout * 1000,
---              -- since minuet.config.request_timeout is in seconds
---              timeout_ms = 3000,
---              score_offset = 50, -- Gives minuet higher priority among suggestions
---            },
---          },
---        },
---      }
---    end
+    config = function()
+      require('blink-cmp').setup {
+        sources = {
+          default = { 'lsp', 'path', 'buffer', 'snippets', 'minuet' },
+          providers = {
+            minuet = {
+              name = 'minuet',
+              module = 'minuet.blink',
+              async = true,
+              -- Should match minuet.config.request_timeout * 1000,
+              -- since minuet.config.request_timeout is in seconds
+              timeout_ms = 3000,
+              score_offset = 50, -- Gives minuet higher priority among suggestions
+            },
+          },
+        },
+      }
+    end
   }
 }
diff --git a/.config/starship.toml b/.config/starship.toml
index 075332d..ecf77cf 100644
--- a/.config/starship.toml
+++ b/.config/starship.toml
@@ -1,7 +1,7 @@
 "$schema" = 'https://starship.rs/config-schema.json'
 
 format = """
-[](red)\
+[ ](bg:red)\
 $os\
 $username\
 [](bg:peach fg:red)\
@@ -23,7 +23,7 @@ $python\
 $conda\
 [](fg:sapphire bg:lavender)\
 $time\
-[ ](fg:lavender)\
+[ ](fg:lavender)\
 $cmd_duration
 $line_break\
 $character"""
diff --git a/.config/sway/config b/.config/sway/config
index 25b8a75..184c552 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -61,8 +61,8 @@ client.background        $base
 # Gaps and borders
 gaps inner 0
 gaps outer 0
-default_border normal 2
-default_floating_border normal 2
+default_border pixel 2
+default_floating_border pixel 2
 
 font pango:"JetBrainsMono Nerd Font" Normal 10
 
diff --git a/.config/waybar/config b/.config/waybar/config
index 8d56f3b..223acdb 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -3,16 +3,15 @@
     "position": "top", // Waybar position (top|bottom|left|right)
     // "width": 1280, // Waybar width
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces"],
-    "modules-center": ["pulseaudio", "clock"],
+    "modules-left": ["sway/workspaces", "pulseaudio", "clock"],
     "modules-right": ["tray", "memory", "battery", "custom/power"],
     "sway/workspaces": {
          "disable-scroll": true,
          "sort-by-name": true,
          "format": " {index} {icon} ",
          "format-icons": {
-             "default": "○",
-             "focused": "◉",
+             "default": "◇",
+             "focused": "◈",
          },
      },
     "tray": {
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 49ddf4e..7d66ab0 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -3,35 +3,26 @@
 * {
   font-family: JetBrainsMono Nerd Font;
   min-height: 0;
+  padding: 0;
 }
 
 #waybar {
-  background: transparent;
+  background-color: @base;
   color: @text;
-  margin: 5px 5px;
 }
 
 #workspaces {
-  border-radius: 1rem;
-  margin: 5px;
-  background-color: @surface0;
-  margin-left: 1rem;
+  background-color: @red;
 }
 
 #workspaces button {
-  color: @lavender;
-  border-radius: 1rem;
-  padding: 0.4rem;
+  color: @crust;
+  border: 0;
+  transition-duration: 0;
 }
 
 #workspaces button.active {
   color: @sky;
-  border-radius: 1rem;
-}
-
-#workspaces button:hover {
-  color: @sapphire;
-  border-radius: 1rem;
 }
 
 #custom-music,
@@ -44,12 +35,10 @@
 #custom-power {
   background-color: @surface0;
   padding: 0.5rem 1rem;
-  margin: 5px 0;
 }
 
 #clock {
   color: @blue;
-  border-radius: 0px 1rem 1rem 0px;
   margin-right: 1rem;
 }
 
@@ -70,12 +59,11 @@
 }
 
 #backlight, #battery {
-    border-radius: 0;
+  border-radius: 0;
 }
 
 #pulseaudio {
   color: @maroon;
-  border-radius: 1rem 0px 0px 1rem;
   margin-left: 1rem;
 }
 
@@ -85,17 +73,14 @@
 }
 
 #custom-lock {
-    border-radius: 1rem 0px 0px 1rem;
-    color: @lavender;
+  color: @lavender;
 }
 
 #custom-power {
-    margin-right: 1rem;
-    border-radius: 0px 1rem 1rem 0px;
-    color: @red;
+  background-color: @red;
+  color: @crust;
 }
 
 #tray {
   margin-right: 1rem;
-  border-radius: 1rem;
 }