diff --git a/modules/home-manager/packages/default.nix b/modules/home-manager/packages/default.nix
index 72d1ee2..22cab0f 100644
--- a/modules/home-manager/packages/default.nix
+++ b/modules/home-manager/packages/default.nix
@@ -27,7 +27,8 @@
 
     # chat apps
     threema-desktop
-    (vesktop.override { withSystemVencord = false; })
+    vesktop
+    discord
     element-desktop
 
     # office
diff --git a/modules/home-manager/programs/nixvim/default.nix b/modules/home-manager/programs/nixvim/default.nix
index 935e448..ab344dd 100644
--- a/modules/home-manager/programs/nixvim/default.nix
+++ b/modules/home-manager/programs/nixvim/default.nix
@@ -55,14 +55,6 @@
     mergetool_layout = "mr";
     mergetool_prefer_revision = "local";
 
-    neovide_transparency = 0.8;
-    neovide_padding_top = 10;
-    neovide_padding_bottom = 10;
-    neovide_padding_left = 10;
-    neovide_padding_right = 10;
-    neovide_floating_blur_amount_x = 10;
-    neovide_floating_blur_amount_y = 10;
-    neovide_floating_shadow = false;
     neovide_cursor_vfx_mode = "pixiedust";
   };
 
diff --git a/modules/nixos/theming/discord-b.css b/modules/nixos/theming/discord-b.css
deleted file mode 100644
index 47223e2..0000000
--- a/modules/nixos/theming/discord-b.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @name Matugen
- * @author Theaninova
- * @version 6.9.0
- * @description reactive material theme
- */
-
-@import url(https://mwittrien.github.io/BetterDiscordAddons/Themes/BasicBackground/BasicBackground.css);
-
-:root {
-  --transparencycolor: {{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}};
-  --transparencyalpha: 0.8;
-  --messagetransparency: 0;
-  --guildchanneltransparency: 0;
-  --chatinputtransparency: 0;
-  --memberlisttransparency: 0;
-  --accentcolor: {{colors.surface_variant.default.red}}, {{colors.surface_variant.default.green}}, {{colors.surface_variant.default.blue}};
-
-  --settingsicons: 1;
-  --font: "NotoSans Nerd Font";
-  --textshadow: transparent;
-
-  --background: transparent;
-  --backgroundposition: center;
-  --backgroundsize: cover;
-  --backgroundblur: 0;
-
-  --popout: var(--background);
-  --popoutposition: var(--backgroundposition);
-  --popoutsize: var(--backgroundsize);
-  --popoutblur: var(--backgroundblur);
-
-  --backdrop: rgba({{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}, 0.8);
-  --backdropposition: center;
-  --backdropsize: cover: --backdropblur: 0;
-
-  --textbrightest: {{colors.primary.default.red}}, {{colors.primary.default.green}}, {{colors.primary.default.blue}};
-  --textbrighter: {{colors.on_surface.default.red}}, {{colors.on_surface.default.green}}, {{colors.on_surface.default.blue}};
-  --textbright: {{colors.tertiary.default.red}}, {{colors.tertiary.default.green}}, {{colors.tertiary.default.blue}};
-  --textdark: {{colors.on_surface_variant.default.red}}, {{colors.on_surface_variant.default.green}}, {{colors.on_surface_variant.default.blue}};
-  --textdarker: {{colors.secondary.default.red}}, {{colors.secondary.default.green}}, {{colors.secondary.default.blue}};
-  --textdarkest: {{colors.outline.default.red}}, {{colors.outline.default.green}}, {{colors.outline.default.blue}};
-
-  --text-link: {{colors.primary.default.red}}, {{colors.primary.default.green}}, {{colors.primary.default.blue}};
-
-  --version1_0_5: none; /* DO NOT CHANGE THIS VARIABLE , USED TO HIDE UPDATE NOTICE										*/
-}
diff --git a/modules/nixos/theming/discord.css b/modules/nixos/theming/discord.css
index 88b575a..47223e2 100644
--- a/modules/nixos/theming/discord.css
+++ b/modules/nixos/theming/discord.css
@@ -5,79 +5,43 @@
  * @description reactive material theme
  */
 
-@import url("https://clearvision.github.io/ClearVision-v6/main.css");
+@import url(https://mwittrien.github.io/BetterDiscordAddons/Themes/BasicBackground/BasicBackground.css);
 
 :root {
-  --text-normal: {{colors.on_surface.default.hex}};
-  --main-color: {{colors.primary.default.hex}};
-  --hover-color: {{colors.tertiary.default.hex}};
-  --success-color: {{colors.ok.default.hex}};
-  --danger-color: {{colors.error.default.hex}};
-  --url-color: var(--main-color);
-  --background-image: transparent;
-  --background-shading: 0%;
-  --background-position: center;
-  --background-size: cover;
-  --background-repeat: no-repeat;
-  --background-attachment: fixed;
-  --background-brightness: 100%;
-  --background-contrast: 100%;
-  --background-saturation: 100%;
-  --background-grayscale: 0%;
-  --background-invert: 0%;
-  --background-blur: 0px;
-  --background-overlay: rgba({{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}, 0.8);
-  --user-popout-image: url("https://clearvision.github.io/images/sapphire.jpg");
-  --user-popout-position: center;
-  --user-popout-size: cover;
-  --user-popout-repeat: no-repeat;
-  --user-popout-attachment: fixed;
-  --user-popout-brightness: 100%;
-  --user-popout-contrast: 100%;
-  --user-popout-saturation: 100%;
-  --user-popout-grayscale: 0%;
-  --user-popout-invert: 0%;
-  --user-popout-blur: 3px;
-  --user-modal-image: url("https://clearvision.github.io/images/sapphire.jpg");
-  --user-modal-position: center;
-  --user-modal-size: cover;
-  --user-modal-repeat: no-repeat;
-  --user-modal-attachment: fixed;
-  --user-modal-brightness: 100%;
-  --user-modal-contrast: 100%;
-  --user-modal-saturation: 100%;
-  --user-modal-grayscale: 0%;
-  --user-modal-invert: 0%;
-  --user-modal-blur: 3px;
-  --home-icon: url("https://clearvision.github.io/icons/discord.svg");
-  --home-position: center;
-  --home-size: 40px;
-  --channel-unread: var(--main-color);
-  --channel-color: {{colors.on_surface.default.hex}};
-  --muted-color: {{colors.outline.default.hex}};
-  --online-color: {{colors.green.default.hex}};
-  --idle-color: {{colors.yellow.default.hex}};
-  --dnd-color: {{colors.red.default.hex}};
-  --streaming-color: {{colors.magenta.default.hex}};
-  --offline-color: {{colors.outline.default.hex}};
-  --main-font: NotoSans Nerd Font;
-  --code-font: FiraCode Nerd Font;
-  --channels-width: 220px;
-  --members-width: 240px;
-  --backdrop-overlay: rgba({{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}, 0.8);
-  --backdrop-image: var(--background-image);
-  --backdrop-position: var(--background-position);
-  --backdrop-size: var(--background-size);
-  --backdrop-repeat: var(--background-repeat);
-  --backdrop-attachment: var(--background-attachment);
-  --backdrop-brightness: var(--background-brightness);
-  --backdrop-contrast: var(--background-contrast);
-  --backdrop-saturation: var(--background-saturation);
-  --backdrop-invert: var(--background-invert);
-  --backdrop-grayscale: var(--background-grayscale);
-  --backdrop-sepia: var(--background-sepia);
-  --backdrop-blur: var(--background-blur);
-  --bd-blue: var(--main-color);
-  --bd-blue-hover: var(--hover-color);
-  --bd-blue-active: var(--hover-color);
+  --transparencycolor: {{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}};
+  --transparencyalpha: 0.8;
+  --messagetransparency: 0;
+  --guildchanneltransparency: 0;
+  --chatinputtransparency: 0;
+  --memberlisttransparency: 0;
+  --accentcolor: {{colors.surface_variant.default.red}}, {{colors.surface_variant.default.green}}, {{colors.surface_variant.default.blue}};
+
+  --settingsicons: 1;
+  --font: "NotoSans Nerd Font";
+  --textshadow: transparent;
+
+  --background: transparent;
+  --backgroundposition: center;
+  --backgroundsize: cover;
+  --backgroundblur: 0;
+
+  --popout: var(--background);
+  --popoutposition: var(--backgroundposition);
+  --popoutsize: var(--backgroundsize);
+  --popoutblur: var(--backgroundblur);
+
+  --backdrop: rgba({{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}, 0.8);
+  --backdropposition: center;
+  --backdropsize: cover: --backdropblur: 0;
+
+  --textbrightest: {{colors.primary.default.red}}, {{colors.primary.default.green}}, {{colors.primary.default.blue}};
+  --textbrighter: {{colors.on_surface.default.red}}, {{colors.on_surface.default.green}}, {{colors.on_surface.default.blue}};
+  --textbright: {{colors.tertiary.default.red}}, {{colors.tertiary.default.green}}, {{colors.tertiary.default.blue}};
+  --textdark: {{colors.on_surface_variant.default.red}}, {{colors.on_surface_variant.default.green}}, {{colors.on_surface_variant.default.blue}};
+  --textdarker: {{colors.secondary.default.red}}, {{colors.secondary.default.green}}, {{colors.secondary.default.blue}};
+  --textdarkest: {{colors.outline.default.red}}, {{colors.outline.default.green}}, {{colors.outline.default.blue}};
+
+  --text-link: {{colors.primary.default.red}}, {{colors.primary.default.green}}, {{colors.primary.default.blue}};
+
+  --version1_0_5: none; /* DO NOT CHANGE THIS VARIABLE , USED TO HIDE UPDATE NOTICE										*/
 }
diff --git a/modules/nixos/theming/matugen.nix b/modules/nixos/theming/matugen.nix
index 482c652..9e4e4d4 100644
--- a/modules/nixos/theming/matugen.nix
+++ b/modules/nixos/theming/matugen.nix
@@ -76,17 +76,20 @@ in
             else
               GTK_THEME="adw-gtk3-dark"
             fi
+
             matugen image "$WALLPAPER" --mode "$MODE"
+            sed -i "s/set background=dark/set background=$MODE/g" ${homeCfg.xdg.configHome}/nvim/colors/matugen.vim
+
             dconf write /org/gnome/desktop/interface/gtk-theme "'$GTK_THEME'"
             dconf write /org/gnome/desktop/interface/color-scheme "'prefer-$MODE'"
 
-            for i in $(pgrep -u "$USER" -x nvim); do
-              kill -USR1 "$i"
-            done
-
             if command -v hyprctl &> /dev/null; then
               hyprctl reload
             fi
+
+            for i in $(pgrep -u "$USER" -x nvim); do
+              kill -USR1 "$i"
+            done
           '';
         })
       ];
@@ -160,7 +163,7 @@ in
             output_path = "${homeCfg.xdg.configHome}/gtk-4.0/theme.css";
           };
           vesktop = {
-            input_path = ./discord-b.css;
+            input_path = ./discord.css;
             output_path = "${homeCfg.xdg.configHome}/vesktop/themes/matugen.theme.css";
           };
         };
diff --git a/modules/nixos/theming/nvim.vim b/modules/nixos/theming/nvim.vim
index ccd2897..170ffaf 100644
--- a/modules/nixos/theming/nvim.vim
+++ b/modules/nixos/theming/nvim.vim
@@ -1,16 +1,73 @@
-if exists(g:neovide)
+set background=dark
+
+let g:neovide_transparency = 0.8
+let g:neovide_padding_top = 12
+let g:neovide_padding_bottom = 12
+let g:neovide_padding_left = 12
+let g:neovide_padding_right = 12
+let g:neovide_floating_blur_amount_x = 16
+let g:neovide_floating_blur_amount_y = 16
+let g:neovide_floating_shadow = 0
+
+if exists("g:neovide")
   hi Normal guibg={{colors.surface.default.hex}} guifg={{colors.on_surface.default.hex}}
-	set pumblend=100
+  set pumblend=0
+  set winblend=0
 else
   hi Normal ctermbg=NONE guibg=NONE guifg={{colors.on_surface.default.hex}}
   set noshowmode
 end
 
+let g:terminal_color_0 = "{{colors.surface.default.hex}}"
+let g:terminal_color_1 = "{{colors.red.default.hex}}"
+let g:terminal_color_2 = "{{colors.green.default.hex}}"
+let g:terminal_color_3 = "{{colors.yellow.default.hex}}"
+let g:terminal_color_4 = "{{colors.blue.default.hex}}"
+let g:terminal_color_5 = "{{colors.magenta.default.hex}}"
+let g:terminal_color_6 = "{{colors.cyan.default.hex}}"
+let g:terminal_color_7 = "{{colors.on_surface.default.hex}}"
+
+let g:terminal_color_8 = "{{colors.outline_variant.default.hex}}"
+let g:terminal_color_9 = "{{colors.red.default.hex}}"
+let g:terminal_color_10 = "{{colors.green.default.hex}}"
+let g:terminal_color_11 = "{{colors.yellow.default.hex}}"
+let g:terminal_color_12 = "{{colors.blue.default.hex}}"
+let g:terminal_color_13 = "{{colors.magenta.default.hex}}"
+let g:terminal_color_14 = "{{colors.cyan.default.hex}}"
+let g:terminal_color_15 = "{{colors.on_surface_variant.default.hex}}"
+set termguicolors
+
+hi Pmenu ctermbg=none guibg=none guifg={{colors.on_surface.default.hex}}
+hi PmenuSel guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi CursorColumn guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi CursorLine guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi WildMenu guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi MoreMsg guifg={{colors.primary.default.hex}}
+hi Question guifg={{colors.secondary.default.hex}}
+
+hi Title guifg={{colors.primary.default.hex}}
+hi FloatTitle guifg={{colors.primary.default.hex}}
+hi Visual guifg={{colors.on_primary.default.hex}} guibg={{colors.primary.default.hex}}
+
+hi Folded guibg={{colors.secondary.default.hex}} guifg={{colors.on_secondary.default.hex}}
+hi FoldColumn guibg={{colors.secondary.default.hex}} guifg={{colors.on_secondary.default.hex}}
+
+hi Conceal guibg={{colors.secondary_container.default.hex}} guifg={{colors.on_secondary_container.default.hex}}
+
+hi TabLine guibg={{colors.primary_container.default.hex}} guifg={{colors.on_primary_container.default.hex}}
+hi TabLineFill guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+
+hi SpecialKey guifg={{colors.primary.default.hex}}
+hi Directory guifg={{colors.primary.default.hex}}
+hi Search guifg={{colors.on_tertiary.default.hex}} guibg={{colors.tertiary.default.hex}}
+
 hi CmpItemKindCopilot guifg={{colors.cyan.default.hex}}
 hi CmpItemKindNpm guifg={{colors.red.default.hex}}
 
 hi Error guibg={{colors.error_container.default.hex}} guifg={{colors.on_error_container.default.hex}}
 hi ErrorMsg guibg={{colors.error_container.default.hex}} guifg={{colors.on_error_container.default.hex}}
+hi WarningMsg guibg={{colors.warn_container.default.hex}} guifg={{colors.on_warn_container.default.hex}}
+hi NvimInternalError guibg={{colors.error.default.hex}} guifg={{colors.on_error.default.hex}}
 
 hi DiagnosticError guifg={{colors.error.default.hex}}
 hi DiagnosticWarn guifg={{colors.warn.default.hex}}
@@ -18,6 +75,11 @@ hi DiagnosticInfo guifg={{colors.blue.default.hex}}
 hi DiagnosticHint guifg={{colors.outline.default.hex}}
 hi DiagnosticOk guifg={{colors.ok.default.hex}}
 
+hi RedrawDebugNormal guibg={{colors.surface_variant.default.hex}} guifg={{colors.on_surface_variant.default.hex}}
+hi RedrawDebugClear guibg={{colors.warn.default.hex}} guifg={{colors.on_warn.default.hex}}
+hi RedrawDebugComposed guibg={{colors.ok.default.hex}} guifg={{colors.on_ok.default.hex}}
+hi RedrawDebugRecompose guibg={{colors.error.default.hex}} guifg={{colors.on_error.default.hex}}
+
 hi DiagnosticUnderlineError gui=undercurl guisp={{colors.error.default.hex}}
 hi DiagnosticUnderlineWarn gui=undercurl guisp={{colors.warn.default.hex}}
 hi DiagnosticUnderlineInfo gui=undercurl guisp={{colors.blue.default.hex}}
@@ -25,11 +87,25 @@ hi DiagnosticUnderlineHint gui=undercurl guisp={{colors.outline.default.hex}}
 hi DiagnosticUnderlineOk gui=undercurl guisp={{colors.ok.default.hex}}
 hi DiagnosticDeprecated gui=strikethrough guisp={{colors.error.default.hex}}
 
+hi SpellBad gui=undercurl guisp={{colors.green.default.hex}}
+hi SpellCap gui=undercurl guisp={{colors.green.default.hex}}
+hi SpellRare gui=undercurl guisp={{colors.green.default.hex}}
+hi SpellLocal gui=undercurl guisp={{colors.green.default.hex}}
+
+hi DiffAdd guibg={{colors.green_container.default.hex}} guifg={{colors.on_green_container.default.hex}}
+hi DiffChange guibg={{colors.yellow_container.default.hex}} guifg={{colors.on_yellow_container.default.hex}}
+hi DiffDelete guibg={{colors.red_container.default.hex}} guifg={{colors.on_red_container.default.hex}}
+hi DiffText guibg={{colors.blue_container.default.hex}} guifg={{colors.on_blue_container.default.hex}}
+
+hi NeoTreeGitAdded guifg={{colors.green.default.hex}}
+hi NeoTreeGitDeleted guifg={{colors.red.default.hex}}
+hi NeoTreeGitModified guifg={{colors.yellow.default.hex}}
+hi NeoTreeGitConflict guifg={{colors.error.default.hex}}
+hi NeoTreeGitUntracked guifg={{colors.blue.default.hex}}
+
 hi NonText guifg={{colors.outline_variant.default.hex}}
 hi LineNr guifg={{colors.outline_variant.default.hex}}
 hi CursorLineNr guifg={{colors.on_surface.default.hex}}
-hi CursorColumn guifg={{colors.on_surface.default.hex}}
-hi CursorLine guifg={{colors.on_surface.default.hex}}
 hi SignColumn guibg=none guifg={{colors.on_surface.default.hex}}
 
 hi IblScope guifg={{colors.on_surface.default.hex}}
@@ -63,6 +139,8 @@ hi def link @label.json @property
 hi def link @label.jsonc @label.json
 hi def link @property.typescript @property
 hi def link @lsp.type.property @property
+hi def link @attribute Constant
+hi def link @tag.attribute Constant
 
 hi def link @lsp.type.variable Constant
 hi def link @lsp.typemod.variable.local Identifier
@@ -81,7 +159,6 @@ hi def link @type.builtin Keyword
 hi Number guifg={{colors.cyan.default.hex}}
 hi Function guifg={{colors.cyan.default.hex}}
 
-hi @attribute guifg={{colors.yellow.default.hex}}
 hi Structure guifg={{colors.yellow.default.hex}}
 hi def link PreProc Structure
 hi def link Tag Structure
@@ -93,4 +170,37 @@ hi IlluminatedWordRead gui=none guibg={{colors.surface_container_highest.default
 hi IlluminatedWordWrite gui=none guibg={{colors.surface_container_highest.default.hex}}
 hi MatchParen gui=none guibg={{colors.surface_container_highest.default.hex}}
 
-hi Visual gui=bold guifg={{colors.on_primary.default.hex}} guibg={{colors.primary.default.hex}}
+:lua require('lualine').setup({options = {theme = {
+  \  insert = {
+  \    a = {fg = "{{colors.on_green.default.hex}}", bg = "{{colors.green.default.hex}}", gui = "bold"},
+  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \  },
+  \  normal = {
+  \    a = {fg = "{{colors.on_primary.default.hex}}", bg = "{{colors.primary.default.hex}}", gui = "bold"},
+  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \  },
+  \  command = {
+  \    a = {fg = "{{colors.on_tertiary.default.hex}}", bg = "{{colors.tertiary.default.hex}}", gui = "bold"},
+  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \  },
+  \  visual = {
+  \    a = {fg = "{{colors.on_magenta.default.hex}}", bg = "{{colors.magenta.default.hex}}", gui = "bold"},
+  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \  },
+  \  replace = {
+  \    a = {fg = "{{colors.on_red.default.hex}}", bg = "{{colors.red.default.hex}}", gui = "bold"},
+  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \  },
+  \  inactive = {
+  \    a = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}", gui = "bold"},
+  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    c = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \  },
+  \} } })
+
+lua require('nvim-web-devicons').refresh()