From 7e6d2c27cb7a2b64a0148f803c723f38c31fc1dd Mon Sep 17 00:00:00 2001
From: FoXeNe <dimon20306@mail.ru>
Date: Thu, 12 Feb 2026 17:25:50 +0300
Subject: [PATCH] add fuzzel and change matugen

---
 config/fuzzel/fuzzel.ini                      |  12 +
 config/fuzzel/fuzzel_theme.ini                |   8 +
 config/hypr/custom/keybinds.conf              |   2 +-
 config/hypr/hyprland/keybinds.conf            |   2 -
 config/matugen/config.toml                    |  61 ++--
 config/matugen/templates/ags/_material.scss   |  70 +++++
 .../templates/ags/sourceviewtheme-light.xml   |  95 ++++++
 .../matugen/templates/ags/sourceviewtheme.xml | 121 ++++++++
 config/matugen/templates/colors.css           |   7 -
 config/matugen/templates/colors.json          |  51 +++
 .../matugen/templates/fuzzel/fuzzel_theme.ini |   8 +
 .../{gtk-colors.css => gtk-3.0/gtk.css}       |  11 +-
 config/matugen/templates/gtk-4.0/gtk.css      |  44 +++
 config/matugen/templates/hyprland-colors.conf |   4 -
 config/matugen/templates/hyprland/colors.conf |  32 ++
 .../templates/hyprland/hyprlock-colors.conf   |  12 +
 config/matugen/templates/kde/color.txt        |   1 +
 .../kde/kde-material-you-colors-wrapper.sh    |  48 +++
 config/matugen/templates/kitty-colors.conf    |  27 --
 config/matugen/templates/matugen-cava         | 291 ------------------
 config/matugen/templates/midnight-discord.css |  99 ------
 config/matugen/templates/rofi-colors.rasi     |  47 ---
 config/matugen/templates/spotify-colors.ini   |  14 -
 config/matugen/templates/wallpaper.txt        |   1 +
 config/nvim/lazy-lock.json                    |  16 +-
 config/rofi/colors.rasi                       |  47 ---
 config/rofi/config (Copy).rasi                | 202 ------------
 config/rofi/config.rasi                       | 186 -----------
 config/waybar/Modules                         |   4 +-
 install.sh                                    |   7 +-
 30 files changed, 549 insertions(+), 981 deletions(-)
 create mode 100644 config/fuzzel/fuzzel.ini
 create mode 100644 config/fuzzel/fuzzel_theme.ini
 create mode 100644 config/matugen/templates/ags/_material.scss
 create mode 100644 config/matugen/templates/ags/sourceviewtheme-light.xml
 create mode 100644 config/matugen/templates/ags/sourceviewtheme.xml
 delete mode 100644 config/matugen/templates/colors.css
 create mode 100644 config/matugen/templates/colors.json
 create mode 100644 config/matugen/templates/fuzzel/fuzzel_theme.ini
 rename config/matugen/templates/{gtk-colors.css => gtk-3.0/gtk.css} (69%)
 create mode 100644 config/matugen/templates/gtk-4.0/gtk.css
 delete mode 100644 config/matugen/templates/hyprland-colors.conf
 create mode 100644 config/matugen/templates/hyprland/colors.conf
 create mode 100644 config/matugen/templates/hyprland/hyprlock-colors.conf
 create mode 100644 config/matugen/templates/kde/color.txt
 create mode 100755 config/matugen/templates/kde/kde-material-you-colors-wrapper.sh
 delete mode 100644 config/matugen/templates/kitty-colors.conf
 delete mode 100644 config/matugen/templates/matugen-cava
 delete mode 100644 config/matugen/templates/midnight-discord.css
 delete mode 100644 config/matugen/templates/rofi-colors.rasi
 delete mode 100644 config/matugen/templates/spotify-colors.ini
 create mode 100644 config/matugen/templates/wallpaper.txt
 delete mode 100644 config/rofi/colors.rasi
 delete mode 100644 config/rofi/config (Copy).rasi
 delete mode 100644 config/rofi/config.rasi

diff --git a/config/fuzzel/fuzzel.ini b/config/fuzzel/fuzzel.ini
new file mode 100644
index 0000000..73a2bfd
--- /dev/null
+++ b/config/fuzzel/fuzzel.ini
@@ -0,0 +1,12 @@
+include="~/.config/fuzzel/fuzzel_theme.ini"
+font=Google Sans Flex:weight=medium
+terminal=kitty -1
+prompt=">>  "
+layer=overlay
+
+[border]
+radius=17
+width=1
+
+[dmenu]
+exit-immediately-if-empty=yes
diff --git a/config/fuzzel/fuzzel_theme.ini b/config/fuzzel/fuzzel_theme.ini
new file mode 100644
index 0000000..3aed8f5
--- /dev/null
+++ b/config/fuzzel/fuzzel_theme.ini
@@ -0,0 +1,8 @@
+[colors]
+background=161217ff
+text=e9e0e8ff
+selection=4b454dff
+selection-text=cdc3ceff
+border=4b454ddd
+match=dfb8f6ff
+selection-match=dfb8f6ff
diff --git a/config/hypr/custom/keybinds.conf b/config/hypr/custom/keybinds.conf
index 4a73f32..b759d0a 100644
--- a/config/hypr/custom/keybinds.conf
+++ b/config/hypr/custom/keybinds.conf
@@ -3,8 +3,8 @@
 ##! User
 bind = Ctrl+Super, Slash, exec, xdg-open ~/.config/illogical-impulse/config.json # Edit shell config
 bind = Ctrl+Super+Alt, Slash, exec, xdg-open ~/.config/hypr/custom/keybinds.conf # Edit extra keybinds
+bind = CTRL ALT, S, exec, grim -g "$(slurp)" - | wl-copy
 
-bind = Super, SPACE, exec, rofi -show drun
 ##! Apps
 # bind = Super, Return, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh "${TERMINAL}" "kitty -1" "foot" "alacritty" "wezterm" "konsole" "kgx" "uxterm" "xterm" # Terminal
 # bind = Super, T, exec, ~/.config/hypr/hyprland/scripts/launch_first_available.sh  "${TERMINAL}" "kitty -1" "foot" "alacritty" "wezterm" "konsole" "kgx" "uxterm" "xterm" # [hidden] (terminal) (alt)
diff --git a/config/hypr/hyprland/keybinds.conf b/config/hypr/hyprland/keybinds.conf
index 0569658..32b46b8 100644
--- a/config/hypr/hyprland/keybinds.conf
+++ b/config/hypr/hyprland/keybinds.conf
@@ -1,8 +1,6 @@
 # Lines ending with `# [hidden]` won't be shown on cheatsheet
 # Lines starting with #! are section headings
 
-bind = CTRL ALT, S, exec, grim -g "$(slurp)" - | wl-copy
-
 #!
 ##! Shell
 # These absolutely need to be on top, or they won't work consistently
diff --git a/config/matugen/config.toml b/config/matugen/config.toml
index dc8dc88..1f47d15 100644
--- a/config/matugen/config.toml
+++ b/config/matugen/config.toml
@@ -1,45 +1,34 @@
-[config.wallpaper]
-command = "swww"
-arguments = ["img", "--transition-type", "any", "--transition-fps", "60"]
-set = true
+[config]
+version_check = false
 
-[templates.waybar]
-input_path = '~/.config/matugen/templates/colors.css'
-output_path = '~/.config/waybar/colors.css'
-post_hook = 'pkill -SIGUSR2 waybar'
-
-[templates.kitty]
-input_path = '~/.config/matugen/templates/kitty-colors.conf'
-output_path = '~/.config/kitty/colors.conf'
-post_hook = "kill -SIGUSR1 $(pidof kitty)"
+[templates.m3colors]
+input_path = '~/.config/matugen/templates/colors.json'
+output_path = '~/.local/state/quickshell/user/generated/colors.json'
 
 [templates.hyprland]
-input_path = '~/.config/matugen/templates/hyprland-colors.conf'
-output_path = '~/.config/hypr/colors.conf'
-post_hook = 'hyprctl reload'
+input_path = '~/.config/matugen/templates/hyprland/colors.conf'
+output_path = '~/.config/hypr/hyprland/colors.conf'
+
+[templates.hyprlock]
+input_path = '~/.config/matugen/templates/hyprland/hyprlock-colors.conf'
+output_path = '~/.config/hypr/hyprlock/colors.conf'
+
+[templates.fuzzel]
+input_path = '~/.config/matugen/templates/fuzzel/fuzzel_theme.ini'
+output_path = '~/.config/fuzzel/fuzzel_theme.ini'
 
 [templates.gtk3]
-input_path = '~/.config/matugen/templates/gtk-colors.css'
-output_path = '~/.config/gtk-3.0/colors.css'
+input_path = '~/.config/matugen/templates/gtk-3.0/gtk.css'
+output_path = '~/.config/gtk-3.0/gtk.css'
 
 [templates.gtk4]
-input_path = '~/.config/matugen/templates/gtk-colors.css'
-output_path = '~/.config/gtk-4.0/colors.css'
+input_path = '~/.config/matugen/templates/gtk-4.0/gtk.css'
+output_path = '~/.config/gtk-4.0/gtk.css'
 
-[templates.rofi]
-input_path = '~/.config/matugen/templates/rofi-colors.rasi'
-output_path = '~/.config/rofi/colors.rasi'
-
-[templates.cava]
-input_path = '~/.config/matugen/templates/matugen-cava'
-output_path = '~/.config/cava/config'
-post_hook = "pkill -USR1 cava"
-
-[templates.spicetify]
-input_path = '~/.config/matugen/templates/spotify-colors.ini'
-output_path = '~/.config/spicetify/Themes/text/color.ini'
-
-[templates.vesktop]
-input_path = '~/.config/matugen/templates/midnight-discord.css'
-output_path = '~/.config/vesktop/themes/matugen.css'
+[templates.kde_colors]
+input_path = '~/.config/matugen/templates/kde/color.txt'
+output_path = '~/.local/state/quickshell/user/generated/color.txt'
 
+[templates.wallpaper]
+input_path = '~/.config/matugen/templates/wallpaper.txt'
+output_path = '~/.local/state/quickshell/user/generated/wallpaper/path.txt'
diff --git a/config/matugen/templates/ags/_material.scss b/config/matugen/templates/ags/_material.scss
new file mode 100644
index 0000000..81acbfe
--- /dev/null
+++ b/config/matugen/templates/ags/_material.scss
@@ -0,0 +1,70 @@
+$darkmode: False;
+$transparent: False;
+$background: {{colors.background.default.hex}};
+$onBackground: {{colors.on_background.default.hex}};
+$surface: {{colors.surface.default.hex}};
+$surfaceDim: {{colors.surface_dim.default.hex}};
+$surfaceBright: {{colors.surface_bright.default.hex}};
+$surfaceContainerLowest: {{colors.surface_container_lowest.default.hex}};
+$surfaceContainerLow: {{colors.surface_container_low.default.hex}};
+$surfaceContainer: {{colors.surface_container.default.hex}};
+$surfaceContainerHigh: {{colors.surface_container_high.default.hex}};
+$surfaceContainerHighest: {{colors.surface_container_highest.default.hex}};
+$onSurface: {{colors.on_surface.default.hex}};
+$surfaceVariant: {{colors.surface_variant.default.hex}};
+$onSurfaceVariant: {{colors.on_surface_variant.default.hex}};
+$inverseSurface: {{colors.inverse_surface.default.hex}};
+$inverseOnSurface: {{colors.inverse_on_surface.default.hex}};
+$outline: {{colors.outline.default.hex}};
+$outlineVariant: {{colors.outline_variant.default.hex}};
+$shadow: {{colors.shadow.default.hex}};
+$scrim: {{colors.scrim.default.hex}};
+$primary: {{colors.primary.default.hex}};
+$onPrimary: {{colors.on_primary.default.hex}};
+$primaryContainer: {{colors.primary_container.default.hex}};
+$onPrimaryContainer: {{colors.on_primary_container.default.hex}};
+$inversePrimary: {{colors.inverse_primary.default.hex}};
+$secondary: {{colors.secondary.default.hex}};
+$onSecondary: {{colors.on_secondary.default.hex}};
+$secondaryContainer: {{colors.secondary_container.default.hex}};
+$onSecondaryContainer: {{colors.on_secondary_container.default.hex}};
+$tertiary: {{colors.tertiary.default.hex}};
+$onTertiary: {{colors.on_tertiary.default.hex}};
+$tertiaryContainer: {{colors.tertiary_container.default.hex}};
+$onTertiaryContainer: {{colors.on_tertiary_container.default.hex}};
+$error: {{colors.error.default.hex}};
+$onError: {{colors.on_error.default.hex}};
+$errorContainer: {{colors.error_container.default.hex}};
+$onErrorContainer: {{colors.on_error_container.default.hex}};
+$primaryFixed: {{colors.primary_fixed.default.hex}};
+$primaryFixedDim: {{colors.primary_fixed_dim.default.hex}};
+$onPrimaryFixed: {{colors.on_primary_fixed.default.hex}};
+$onPrimaryFixedVariant: {{colors.on_primary_fixed_variant.default.hex}};
+$secondaryFixed: {{colors.secondary_fixed.default.hex}};
+$secondaryFixedDim: {{colors.secondary_fixed_dim.default.hex}};
+$onSecondaryFixed: {{colors.on_secondary_fixed.default.hex}};
+$onSecondaryFixedVariant: {{colors.on_secondary_fixed_variant.default.hex}};
+$tertiaryFixed: {{colors.tertiary_fixed.default.hex}};
+$tertiaryFixedDim: {{colors.tertiary_fixed_dim.default.hex}};
+$onTertiaryFixed: {{colors.on_tertiary_fixed.default.hex}};
+$onTertiaryFixedVariant: {{colors.on_tertiary_fixed_variant.default.hex}};
+$success: #B5CCBA;
+$onSuccess: #213528;
+$successContainer: #374B3E;
+$onSuccessContainer: #D1E9D6;
+$term0: #0D1C20;
+$term1: #8383FF;
+$term2: #63DFD4;
+$term3: #75FCDD;
+$term4: #76B4BD;
+$term5: #7AAEEA;
+$term6: #81D8D7;
+$term7: #CCDBD5;
+$term8: #B1BCB5;
+$term9: #BCB9FF;
+$term10: #F6FFFD;
+$term11: #FFFFFF;
+$term12: #BEE3E5;
+$term13: #C8DAFF;
+$term14: #E5FFFE;
+$term15: #ADEDF6;
diff --git a/config/matugen/templates/ags/sourceviewtheme-light.xml b/config/matugen/templates/ags/sourceviewtheme-light.xml
new file mode 100644
index 0000000..d501c31
--- /dev/null
+++ b/config/matugen/templates/ags/sourceviewtheme-light.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<style-scheme id="custom-light" _name="Custom" version="1.0">
+  <author>end_4</author>
+  <_description>Catppuccin port but very random</_description>
+
+  <style name="bracket-match"  background="{{ colors.secondary_container.default.hex }}" foreground="{{ colors.on_secondary_container.default.hex }}" bold="true"/>
+  <style name="bracket-mismatch"  background="#E3E6EB" underline="true"/>
+  <style name="c:preprocessor" foreground="#DF8E1D"/>
+  <style name="css:at-rules" foreground="#8839EF"/>
+  <style name="css:color" foreground="#DF8E1D"/>
+  <style name="css:keyword" foreground="#256BF5"/>
+  <style name="current-line"  background="{{ colors.surface_container_highest.default.hex }}"/>
+  <style name="cursor" foreground="#DC8A78"/>
+  <style name="def:base-n-integer" foreground="#DF8E1D"/>
+  <style name="def:boolean" foreground="#DF8E1D"/>
+  <style name="def:builtin" foreground="#DF8E1D"/>
+  <style name="def:character" foreground="#DF8E1D"/>
+  <style name="def:comment" foreground="#9DA1B1"/>
+  <style name="def:complex" foreground="#DF8E1D"/>
+  <style name="def:decimal" foreground="#DF8E1D"/>
+  <style name="def:doc-comment" foreground="#9DA1B1"/>
+  <style name="def:doc-comment-element" foreground="#9DA1B1"/>
+  <style name="def:error" foreground="#D53055" background="#EAEDF2"/>
+  <style name="def:floating-point" foreground="#DF8E1D"/>
+  <style name="def:function" foreground="#256BF5"/>
+  <style name="def:identifier" foreground="#000000"/>
+  <style name="def:keyword" foreground="#8839EF"/>
+  <style name="def:note" foreground="#9DA1B1"/>
+  <style name="def:number" foreground="#FE640B"/>
+  <style name="def:operator" foreground="#8839EF"/>
+  <style name="def:preprocessor" foreground="#256BF5"/>
+  <style name="def:reserved" foreground="#8839EF"/>
+  <style name="def:shebang" foreground="#9DA1B1"/>
+  <style name="def:special-char" foreground="#256BF5"/>
+  <style name="def:special-constant" foreground="#DF8E1D"/>
+  <style name="def:statement" foreground="#8839EF"/>
+  <style name="def:string" foreground="#4AA537"/>
+  <style name="def:type" foreground="#256BF5" italic="true"/>
+  <style name="diff:added-line" foreground="#282D32" background="#ACF2BD"/>
+  <style name="diff:changed-line" foreground="#282D32" background="#F1F2C3"/>
+  <style name="diff:location" foreground="#9DA1B1"/>
+  <style name="diff:removed-line" foreground="#282D32" background="#FFEEF0"/>
+  <style name="draw-spaces" foreground="#3b3a32"/>
+  <style name="html:dtd" foreground="#4AA537"/>
+  <style name="html:tag" foreground="#8839EF"/>
+  <style name="js:function" foreground="#256BF5"/>
+  <style name="line-numbers" foreground="#9699AA" background="#EAEDF2"/>
+  <style name="perl:builtin" foreground="#256BF5"/>
+  <style name="perl:include-statement" foreground="#8839EF"/>
+  <style name="perl:special-variable" foreground="#DF8E1D"/>
+  <style name="perl:variable" foreground="#000000"/>
+  <style name="php:string" foreground="#4AA537"/>
+  <style name="python:builtin-constant" foreground="#8839EF"/>
+  <style name="python:builtin-function" foreground="#256BF5"/>
+  <style name="python:module-handler" foreground="#8839EF"/>
+  <style name="python:special-variable" foreground="#8839EF"/>
+  <style name="ruby:attribute-definition" foreground="#8839EF"/>
+  <style name="ruby:builtin" foreground="#000000"/>
+  <style name="ruby:class-variable" foreground="#000000"/>
+  <style name="ruby:constant" foreground="#000000"/>
+  <style name="ruby:global-variable" foreground="#256BF5"/>
+  <style name="ruby:instance-variable" foreground="#000000"/>
+  <style name="ruby:module-handler" foreground="#8839EF"/>
+  <style name="ruby:predefined-variable" foreground="#DF8E1D"/>
+  <style name="ruby:regex" foreground="#f6aa11"/>
+  <style name="ruby:special-variable" foreground="#8839EF"/>
+  <style name="ruby:symbol" foreground="#DF8E1D"/>
+  <style name="rubyonrails:attribute-definition" foreground="#8839EF"/>
+  <style name="rubyonrails:block-parameter" foreground="#fd971f" italic="true"/>
+  <style name="rubyonrails:builtin" foreground="#000000"/>
+  <style name="rubyonrails:class-inherit" foreground="#256BF5" underline="true" italic="true"/>
+  <style name="rubyonrails:class-name" foreground="#256BF5"/>
+  <style name="rubyonrails:class-variable" foreground="#000000"/>
+  <style name="rubyonrails:complex-interpolation" foreground="#DF8E1D"/>
+  <style name="rubyonrails:constant" foreground="#000000"/>
+  <style name="rubyonrails:global-variable" foreground="#256BF5"/>
+  <style name="rubyonrails:instance-variable" foreground="#000000"/>
+  <style name="rubyonrails:module-handler" foreground="#8839EF"/>
+  <style name="rubyonrails:module-name" foreground="#256BF5"/>
+  <style name="rubyonrails:predefined-variable" foreground="#DF8E1D"/>
+  <style name="rubyonrails:rails" foreground="#000000"/>
+  <style name="rubyonrails:regex" foreground="#f6aa11"/>
+  <style name="rubyonrails:simple-interpolation" foreground="#DF8E1D"/>
+  <style name="rubyonrails:special-variable" foreground="#8839EF"/>
+  <style name="rubyonrails:symbol" foreground="#DF8E1D"/>
+  <style name="search-match"  background="#E3E6EB" bold="true" underline="true"/>
+  <style name="selection" foreground="#f8f8f2" background="#444444"/>
+  <style name="text" foreground="#f8f8f2" background="#222222"/>
+  <style name="xml:attribute-name" foreground="#256BF5"/>
+  <style name="xml:element-name" foreground="#8839EF"/>
+  <style name="xml:entity" foreground="#c8cecc"/>
+  <style name="xml:namespace" foreground="#8839EF"/>
+  <style name="xml:tag" foreground="#8839EF"/>
+
+</style-scheme>
diff --git a/config/matugen/templates/ags/sourceviewtheme.xml b/config/matugen/templates/ags/sourceviewtheme.xml
new file mode 100644
index 0000000..7198099
--- /dev/null
+++ b/config/matugen/templates/ags/sourceviewtheme.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2014 Leo Iannacone <info@leoiannacone.com>
+
+ This file was generated from a textmate theme named Monokai Extended
+ with tm2gtksw2 tool. (Alexandre da Silva)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+-->
+
+<!-- MODIFIED -->
+
+<style-scheme id="custom" _name="Custom" version="1.0">
+  <author>Leo Iannacone</author>
+  <_description>Based on SublimeText Monokai Extended - Generated with tm2gtksw2</_description>
+
+  <style name="bracket-match"  background="{{ colors.secondary_container.default.hex }}" foreground="{{ colors.on_secondary_container.default.hex }}" bold="true"/>
+  <style name="bracket-mismatch"  background="#333333" underline="true"/>
+  <style name="c:preprocessor" foreground="#be84ff"/>
+  <style name="css:at-rules" foreground="#f92672"/>
+  <style name="css:color" foreground="#be84ff"/>
+  <style name="css:keyword" foreground="#66d9ef"/>
+  <style name="current-line"  background="{{ colors.surface_container_highest.default.hex }}"/>
+  <style name="cursor" foreground="#f8f8f0"/>
+  <style name="def:base-n-integer" foreground="#be84ff"/>
+  <style name="def:boolean" foreground="#be84ff"/>
+  <style name="def:builtin" foreground="#be84ff"/>
+  <style name="def:character" foreground="#be84ff"/>
+  <style name="def:comment" foreground="#75715e"/>
+  <style name="def:complex" foreground="#be84ff"/>
+  <style name="def:decimal" foreground="#be84ff"/>
+  <style name="def:doc-comment" foreground="#75715e"/>
+  <style name="def:doc-comment-element" foreground="#75715e"/>
+  <style name="def:error" foreground="#f8f8f0" background="#f92672"/>
+  <style name="def:floating-point" foreground="#be84ff"/>
+  <style name="def:function" foreground="#a6e22e"/>
+  <style name="def:identifier" foreground="#ffffff"/>
+  <style name="def:keyword" foreground="#f92672"/>
+  <style name="def:note" foreground="#75715e"/>
+  <style name="def:number" foreground="#be84ff"/>
+  <style name="def:operator" foreground="#f92672"/>
+  <style name="def:preprocessor" foreground="#66d9ef"/>
+  <style name="def:reserved" foreground="#f92672"/>
+  <style name="def:shebang" foreground="#75715e"/>
+  <style name="def:special-char" foreground="#66d9ef"/>
+  <style name="def:special-constant" foreground="#be84ff"/>
+  <style name="def:statement" foreground="#f92672"/>
+  <style name="def:string" foreground="#e6db74"/>
+  <style name="def:type" foreground="#66d9ef" italic="true"/>
+  <style name="diff:added-line" foreground="#a6e22e"/>
+  <style name="diff:changed-line" foreground="#e6db74"/>
+  <style name="diff:location" foreground="#75715e"/>
+  <style name="diff:removed-line" foreground="#f92672"/>
+  <style name="draw-spaces" foreground="#3b3a32"/>
+  <style name="html:dtd" foreground="#e6db74"/>
+  <style name="html:tag" foreground="#f92672"/>
+  <style name="js:function" foreground="#66d9ef"/>
+  <style name="line-numbers" foreground="#bebeba" background="#333333"/>
+  <style name="perl:builtin" foreground="#a6e22e"/>
+  <style name="perl:include-statement" foreground="#f92672"/>
+  <style name="perl:special-variable" foreground="#be84ff"/>
+  <style name="perl:variable" foreground="#ffffff"/>
+  <style name="php:string" foreground="#e6db74"/>
+  <style name="python:builtin-constant" foreground="#f92672"/>
+  <style name="python:builtin-function" foreground="#a6e22e"/>
+  <style name="python:module-handler" foreground="#f92672"/>
+  <style name="python:special-variable" foreground="#f92672"/>
+  <style name="ruby:attribute-definition" foreground="#f92672"/>
+  <style name="ruby:builtin" foreground="#ffffff"/>
+  <style name="ruby:class-variable" foreground="#ffffff"/>
+  <style name="ruby:constant" foreground="#ffffff"/>
+  <style name="ruby:global-variable" foreground="#a6e22e"/>
+  <style name="ruby:instance-variable" foreground="#ffffff"/>
+  <style name="ruby:module-handler" foreground="#f92672"/>
+  <style name="ruby:predefined-variable" foreground="#be84ff"/>
+  <style name="ruby:regex" foreground="#f6aa11"/>
+  <style name="ruby:special-variable" foreground="#f92672"/>
+  <style name="ruby:symbol" foreground="#be84ff"/>
+  <style name="rubyonrails:attribute-definition" foreground="#f92672"/>
+  <style name="rubyonrails:block-parameter" foreground="#fd971f" italic="true"/>
+  <style name="rubyonrails:builtin" foreground="#ffffff"/>
+  <style name="rubyonrails:class-inherit" foreground="#a6e22e" underline="true" italic="true"/>
+  <style name="rubyonrails:class-name" foreground="#66d9ef"/>
+  <style name="rubyonrails:class-variable" foreground="#ffffff"/>
+  <style name="rubyonrails:complex-interpolation" foreground="#be84ff"/>
+  <style name="rubyonrails:constant" foreground="#ffffff"/>
+  <style name="rubyonrails:global-variable" foreground="#a6e22e"/>
+  <style name="rubyonrails:instance-variable" foreground="#ffffff"/>
+  <style name="rubyonrails:module-handler" foreground="#f92672"/>
+  <style name="rubyonrails:module-name" foreground="#66d9ef"/>
+  <style name="rubyonrails:predefined-variable" foreground="#be84ff"/>
+  <style name="rubyonrails:rails" foreground="#ffffff"/>
+  <style name="rubyonrails:regex" foreground="#f6aa11"/>
+  <style name="rubyonrails:simple-interpolation" foreground="#be84ff"/>
+  <style name="rubyonrails:special-variable" foreground="#f92672"/>
+  <style name="rubyonrails:symbol" foreground="#be84ff"/>
+  <style name="search-match"  background="#333333" bold="true" underline="true"/>
+  <style name="selection" foreground="#f8f8f2" background="#444444"/>
+  <style name="text" foreground="#f8f8f2" background="#222222"/>
+  <style name="xml:attribute-name" foreground="#a6e22e"/>
+  <style name="xml:element-name" foreground="#f92672"/>
+  <style name="xml:entity" foreground="#c8cecc"/>
+  <style name="xml:namespace" foreground="#f92672"/>
+  <style name="xml:tag" foreground="#f92672"/>
+
+
+</style-scheme>
+
diff --git a/config/matugen/templates/colors.css b/config/matugen/templates/colors.css
deleted file mode 100644
index f246856..0000000
--- a/config/matugen/templates/colors.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-* Css Colors
-* Generated with Matugen
-*/
-<* for name, value in colors *>
-    @define-color {{name}} {{value.default.hex}};
-<* endfor *>
diff --git a/config/matugen/templates/colors.json b/config/matugen/templates/colors.json
new file mode 100644
index 0000000..25f80e8
--- /dev/null
+++ b/config/matugen/templates/colors.json
@@ -0,0 +1,51 @@
+{
+  "background": "{{colors.background.default.hex}}",
+  "error": "{{colors.error.default.hex}}",
+  "error_container": "{{colors.error_container.default.hex}}",
+  "inverse_on_surface": "{{colors.inverse_on_surface.default.hex}}",
+  "inverse_primary": "{{colors.inverse_primary.default.hex}}",
+  "inverse_surface": "{{colors.inverse_surface.default.hex}}",
+  "on_background": "{{colors.on_background.default.hex}}",
+  "on_error": "{{colors.on_error.default.hex}}",
+  "on_error_container": "{{colors.on_error_container.default.hex}}",
+  "on_primary": "{{colors.on_primary.default.hex}}",
+  "on_primary_container": "{{colors.on_primary_container.default.hex}}",
+  "on_primary_fixed": "{{colors.on_primary_fixed.default.hex}}",
+  "on_primary_fixed_variant": "{{colors.on_primary_fixed_variant.default.hex}}",
+  "on_secondary": "{{colors.on_secondary.default.hex}}",
+  "on_secondary_container": "{{colors.on_secondary_container.default.hex}}",
+  "on_secondary_fixed": "{{colors.on_secondary_fixed.default.hex}}",
+  "on_secondary_fixed_variant": "{{colors.on_secondary_fixed_variant.default.hex}}",
+  "on_surface": "{{colors.on_surface.default.hex}}",
+  "on_surface_variant": "{{colors.on_surface_variant.default.hex}}",
+  "on_tertiary": "{{colors.on_tertiary.default.hex}}",
+  "on_tertiary_container": "{{colors.on_tertiary_container.default.hex}}",
+  "on_tertiary_fixed": "{{colors.on_tertiary_fixed.default.hex}}",
+  "on_tertiary_fixed_variant": "{{colors.on_tertiary_fixed_variant.default.hex}}",
+  "outline": "{{colors.outline.default.hex}}",
+  "outline_variant": "{{colors.outline_variant.default.hex}}",
+  "primary": "{{colors.primary.default.hex}}",
+  "primary_container": "{{colors.primary_container.default.hex}}",
+  "primary_fixed": "{{colors.primary_fixed.default.hex}}",
+  "primary_fixed_dim": "{{colors.primary_fixed_dim.default.hex}}",
+  "scrim": "{{colors.scrim.default.hex}}",
+  "secondary": "{{colors.secondary.default.hex}}",
+  "secondary_container": "{{colors.secondary_container.default.hex}}",
+  "secondary_fixed": "{{colors.secondary_fixed.default.hex}}",
+  "secondary_fixed_dim": "{{colors.secondary_fixed_dim.default.hex}}",
+  "shadow": "{{colors.shadow.default.hex}}",
+  "surface": "{{colors.surface.default.hex}}",
+  "surface_bright": "{{colors.surface_bright.default.hex}}",
+  "surface_container": "{{colors.surface_container.default.hex}}",
+  "surface_container_high": "{{colors.surface_container_high.default.hex}}",
+  "surface_container_highest": "{{colors.surface_container_highest.default.hex}}",
+  "surface_container_low": "{{colors.surface_container_low.default.hex}}",
+  "surface_container_lowest": "{{colors.surface_container_lowest.default.hex}}",
+  "surface_dim": "{{colors.surface_dim.default.hex}}",
+  "surface_tint": "{{colors.surface_tint.default.hex}}",
+  "surface_variant": "{{colors.surface_variant.default.hex}}",
+  "tertiary": "{{colors.tertiary.default.hex}}",
+  "tertiary_container": "{{colors.tertiary_container.default.hex}}",
+  "tertiary_fixed": "{{colors.tertiary_fixed.default.hex}}",
+  "tertiary_fixed_dim": "{{colors.tertiary_fixed_dim.default.hex}}"
+}
diff --git a/config/matugen/templates/fuzzel/fuzzel_theme.ini b/config/matugen/templates/fuzzel/fuzzel_theme.ini
new file mode 100644
index 0000000..ec7e1a6
--- /dev/null
+++ b/config/matugen/templates/fuzzel/fuzzel_theme.ini
@@ -0,0 +1,8 @@
+[colors]
+background={{colors.background.default.hex_stripped}}ff
+text={{colors.on_background.default.hex_stripped}}ff
+selection={{colors.surface_variant.default.hex_stripped}}ff
+selection-text={{colors.on_surface_variant.default.hex_stripped}}ff
+border={{colors.surface_variant.default.hex_stripped}}dd
+match={{colors.primary.default.hex_stripped}}ff
+selection-match={{colors.primary.default.hex_stripped}}ff
diff --git a/config/matugen/templates/gtk-colors.css b/config/matugen/templates/gtk-3.0/gtk.css
similarity index 69%
rename from config/matugen/templates/gtk-colors.css
rename to config/matugen/templates/gtk-3.0/gtk.css
index 64abe77..c0054f8 100644
--- a/config/matugen/templates/gtk-colors.css
+++ b/config/matugen/templates/gtk-3.0/gtk.css
@@ -3,11 +3,11 @@
 * Generated with Matugen
 */
 
-@define-color accent_color {{colors.primary_fixed_dim.default.hex}};
-@define-color accent_fg_color {{colors.on_primary_fixed.default.hex}};
-@define-color accent_bg_color {{colors.primary_fixed_dim.default.hex}};
-@define-color window_bg_color {{colors.surface_dim.default.hex}};
-@define-color window_fg_color {{colors.on_surface.default.hex}};
+@define-color accent_color {{colors.primary.default.hex}};
+@define-color accent_fg_color {{colors.on_primary.default.hex}};
+@define-color accent_bg_color {{colors.primary.default.hex}};
+@define-color window_bg_color {{colors.background.default.hex}};
+@define-color window_fg_color {{colors.on_background.default.hex}};
 @define-color headerbar_bg_color {{colors.surface_dim.default.hex}};
 @define-color headerbar_fg_color {{colors.on_surface.default.hex}};
 @define-color popover_bg_color {{colors.surface_dim.default.hex}};
@@ -20,4 +20,3 @@
 @define-color sidebar_fg_color @window_fg_color;
 @define-color sidebar_border_color @window_bg_color;
 @define-color sidebar_backdrop_color @window_bg_color;
-
diff --git a/config/matugen/templates/gtk-4.0/gtk.css b/config/matugen/templates/gtk-4.0/gtk.css
new file mode 100644
index 0000000..80b1d69
--- /dev/null
+++ b/config/matugen/templates/gtk-4.0/gtk.css
@@ -0,0 +1,44 @@
+/*
+* GTK Colors
+* Generated with Matugen
+*/
+
+@media (prefers-color-scheme: light) {
+    @define-color accent_color {{colors.primary.light.hex}};
+    @define-color accent_fg_color {{colors.on_primary.light.hex}};
+    @define-color accent_bg_color {{colors.primary.light.hex}};
+    @define-color window_bg_color {{colors.background.light.hex}};
+    @define-color window_fg_color {{colors.on_background.light.hex}};
+    @define-color headerbar_bg_color {{colors.surface_dim.light.hex}};
+    @define-color headerbar_fg_color {{colors.on_surface.light.hex}};
+    @define-color popover_bg_color {{colors.surface_dim.light.hex}};
+    @define-color popover_fg_color {{colors.on_surface.light.hex}};
+    @define-color view_bg_color {{colors.surface.light.hex}};
+    @define-color view_fg_color {{colors.on_surface.light.hex}};
+    @define-color card_bg_color {{colors.surface.light.hex}};
+    @define-color card_fg_color {{colors.on_surface.light.hex}};
+    @define-color sidebar_bg_color @window_bg_color;
+    @define-color sidebar_fg_color @window_fg_color;
+    @define-color sidebar_border_color @window_bg_color;
+    @define-color sidebar_backdrop_color @window_bg_color;
+}
+
+@media (prefers-color-scheme: dark) {
+    @define-color accent_color {{colors.primary.dark.hex}};
+    @define-color accent_fg_color {{colors.on_primary.dark.hex}};
+    @define-color accent_bg_color {{colors.primary.dark.hex}};
+    @define-color window_bg_color {{colors.background.dark.hex}};
+    @define-color window_fg_color {{colors.on_background.dark.hex}};
+    @define-color headerbar_bg_color {{colors.surface_dim.dark.hex}};
+    @define-color headerbar_fg_color {{colors.on_surface.dark.hex}};
+    @define-color popover_bg_color {{colors.surface_dim.dark.hex}};
+    @define-color popover_fg_color {{colors.on_surface.dark.hex}};
+    @define-color view_bg_color {{colors.surface.dark.hex}};
+    @define-color view_fg_color {{colors.on_surface.dark.hex}};
+    @define-color card_bg_color {{colors.surface.dark.hex}};
+    @define-color card_fg_color {{colors.on_surface.dark.hex}};
+    @define-color sidebar_bg_color @window_bg_color;
+    @define-color sidebar_fg_color @window_fg_color;
+    @define-color sidebar_border_color @window_bg_color;
+    @define-color sidebar_backdrop_color @window_bg_color;
+}
diff --git a/config/matugen/templates/hyprland-colors.conf b/config/matugen/templates/hyprland-colors.conf
deleted file mode 100644
index d7e6821..0000000
--- a/config/matugen/templates/hyprland-colors.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-<* for name, value in colors *>
-$image = {{image}}
-${{name}} = rgba({{value.default.hex_stripped}}ff)
-<* endfor *>
diff --git a/config/matugen/templates/hyprland/colors.conf b/config/matugen/templates/hyprland/colors.conf
new file mode 100644
index 0000000..6de9851
--- /dev/null
+++ b/config/matugen/templates/hyprland/colors.conf
@@ -0,0 +1,32 @@
+general {
+    col.active_border = rgba({{colors.outline.default.hex_stripped}}77)
+    col.inactive_border = rgba({{colors.outline_variant.default.hex_stripped}}55)
+}
+
+misc {
+    background_color = rgba({{colors.surface.dark.hex_stripped}}FF)
+}
+
+plugin {
+    hyprbars {
+        # Honestly idk if it works like css, but well, why not
+        bar_text_font = Google Sans Flex Medium, Rubik, Geist, AR One Sans, Reddit Sans, Inter, Roboto, Ubuntu, Noto Sans, sans-serif
+        bar_height = 30
+        bar_padding = 10
+        bar_button_padding = 5
+        bar_precedence_over_border = true
+        bar_part_of_window = true
+
+        bar_color = rgba({{colors.background.default.hex_stripped}}FF)
+        col.text = rgba({{colors.on_background.default.hex_stripped}}FF)
+
+
+        # example buttons (R -> L)
+        # hyprbars-button = color, size, on-click
+        hyprbars-button = rgb({{colors.on_background.default.hex_stripped}}), 13, 󰖭, hyprctl dispatch killactive
+        hyprbars-button = rgb({{colors.on_background.default.hex_stripped}}), 13, 󰖯, hyprctl dispatch fullscreen 1
+        hyprbars-button = rgb({{colors.on_background.default.hex_stripped}}), 13, 󰖰, hyprctl dispatch movetoworkspacesilent special
+    }
+}
+
+windowrule = border_color rgba({{colors.primary.default.hex_stripped}}AA) rgba({{colors.primary.default.hex_stripped}}77), match:pin 1
diff --git a/config/matugen/templates/hyprland/hyprlock-colors.conf b/config/matugen/templates/hyprland/hyprlock-colors.conf
new file mode 100644
index 0000000..c3f8de2
--- /dev/null
+++ b/config/matugen/templates/hyprland/hyprlock-colors.conf
@@ -0,0 +1,12 @@
+# This configuration is generated by matugen
+# Changing these variables with matugen still enabled will overwrite them.
+
+$text_color = rgba({{colors.primary_fixed.default.hex_stripped}}FF)
+$entry_background_color = rgba({{colors.on_primary_fixed.default.hex_stripped}}11)
+$entry_border_color = rgba({{colors.outline.default.hex_stripped}}55)
+$entry_color = rgba({{colors.primary_fixed.default.hex_stripped}}FF)
+$font_family = Google Sans Flex Medium
+$font_family_clock = Google Sans Flex Medium
+$font_material_symbols = Material Symbols Rounded
+
+$background_image = {{image}}
\ No newline at end of file
diff --git a/config/matugen/templates/kde/color.txt b/config/matugen/templates/kde/color.txt
new file mode 100644
index 0000000..3514290
--- /dev/null
+++ b/config/matugen/templates/kde/color.txt
@@ -0,0 +1 @@
+{{colors.source_color.default.hex}}
\ No newline at end of file
diff --git a/config/matugen/templates/kde/kde-material-you-colors-wrapper.sh b/config/matugen/templates/kde/kde-material-you-colors-wrapper.sh
new file mode 100755
index 0000000..058ef15
--- /dev/null
+++ b/config/matugen/templates/kde/kde-material-you-colors-wrapper.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
+
+color=$(tr -d '\n' < "$XDG_STATE_HOME/quickshell/user/generated/color.txt")
+
+current_mode=$(gsettings get org.gnome.desktop.interface color-scheme 2>/dev/null | tr -d "'")
+if [[ "$current_mode" == "prefer-dark" ]]; then
+    mode_flag="-d"
+else
+    mode_flag="-l"
+fi
+
+# Parse --scheme-variant flag
+scheme_variant_str=""
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --scheme-variant)
+            scheme_variant_str="$2"
+            shift 2
+            ;;
+        *)
+            shift
+            ;;
+    esac
+done
+
+# Map string variant to integer
+case "$scheme_variant_str" in
+    scheme-content) sv_num=0 ;;
+    scheme-expressive) sv_num=1 ;;
+    scheme-fidelity) sv_num=2 ;;
+    scheme-monochrome) sv_num=3 ;;
+    scheme-neutral) sv_num=4 ;;
+    scheme-tonal-spot) sv_num=5 ;;
+    scheme-vibrant) sv_num=6 ;;
+    scheme-rainbow) sv_num=7 ;;
+    scheme-fruit-salad) sv_num=8 ;;
+    "") sv_num=5 ;;
+    *)
+        echo "Unknown scheme variant: $scheme_variant_str" >&2
+        exit 1
+        ;;
+esac
+
+source "$(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate"
+kde-material-you-colors "$mode_flag" --color "$color" -sv "$sv_num"
+deactivate
diff --git a/config/matugen/templates/kitty-colors.conf b/config/matugen/templates/kitty-colors.conf
deleted file mode 100644
index 29806f8..0000000
--- a/config/matugen/templates/kitty-colors.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Core Colors
-background            {{ colors.background.default.hex }}
-foreground            {{ colors.on_surface.default.hex }}
-selection_foreground  {{ colors.primary.default.hex }}
-selection_background  {{ colors.on_primary.default.hex }}
-cursor                {{ colors.primary.default.hex }}
-cursor_text_color     {{ colors.surface.default.hex }}
-
-# Regular Colors
-color0  {{ colors.surface.default.hex }}
-color1  {{ colors.error.default.hex }}
-color2  {{ colors.primary.default.hex }}
-color3  {{ colors.tertiary.default.hex }}
-color4  {{ colors.on_primary_container.default.hex }}
-color5  {{ colors.on_secondary_container.default.hex }}
-color6  {{ colors.secondary.default.hex }}
-color7  {{ colors.on_surface.default.hex }}
-
-# Bright Colors
-color8  {{ colors.surface_bright.default.hex }}
-color9  {{ colors.error.default.hex }}
-color10 {{ colors.primary.default.hex }}
-color11 {{ colors.tertiary.default.hex }}
-color12 {{ colors.on_primary_container.default.hex }}
-color13 {{ colors.on_secondary_container.default.hex }} 
-color14 {{ colors.secondary.default.hex }}
-color15 {{ colors.on_surface.default.hex }}
diff --git a/config/matugen/templates/matugen-cava b/config/matugen/templates/matugen-cava
deleted file mode 100644
index dc134ca..0000000
--- a/config/matugen/templates/matugen-cava
+++ /dev/null
@@ -1,291 +0,0 @@
-#  ┳┳┓┏┓┏┳┓┳┳┏┓┏┓┳┓  ┏┓┏┓┓┏┏┓
-#  ┃┃┃┣┫ ┃ ┃┃┃┓┣ ┃┃━━┃ ┣┫┃┃┣┫
-#  ┛ ┗┛┗ ┻ ┗┛┗┛┗┛┛┗  ┗┛┛┗┗┛┛┗
-#                            
-
-
-
-
-
-## Configuration file for CAVA.
-# Remove the ; to change parameters.
-
-[general]
-
-# Smoothing mode. Can be 'normal', 'scientific' or 'waves'. DEPRECATED as of 0.6.0
-; mode = normal
-
-# Accepts only non-negative values.
-; framerate = 60
-
-# 'autosens' will attempt to decrease sensitivity if the bars peak. 1 = on, 0 = off
-# new as of 0.6.0 autosens of low values (dynamic range)
-# 'overshoot' allows bars to overshoot (in % of terminal height) without initiating autosens. DEPRECATED as of 0.6.0
-; autosens = 1
-; overshoot = 20
-
-# Manual sensitivity in %. If autosens is enabled, this will only be the initial value.
-# 200 means double height. Accepts only non-negative values.
-; sensitivity = 100
-
-# The number of bars (0-512). 0 sets it to auto (fill up console).
-# Bars' width and space between bars in number of characters.
-; bars = 0
-; bar_width = 2
-; bar_spacing = 1
-# bar_height is only used for output in "noritake" format
-; bar_height = 32
-
-# For SDL width and space between bars is in pixels, defaults are:
-; bar_width = 20
-; bar_spacing = 5
-
-# sdl_glsl have these default values, they are only used to calulate max number of bars.
-; bar_width = 1
-; bar_spacing = 0
-
-
-# Lower and higher cutoff frequencies for lowest and highest bars
-# the bandwidth of the visualizer.
-# Note: there is a minimum total bandwidth of 43Mhz x number of bars.
-# Cava will automatically increase the higher cutoff if a too low band is specified.
-; lower_cutoff_freq = 50
-; higher_cutoff_freq = 10000
-
-
-# Seconds with no input before cava goes to sleep mode. Cava will not perform FFT or drawing and
-# only check for input once per second. Cava will wake up once input is detected. 0 = disable.
-; sleep_timer = 0
-
-
-[input]
-
-# Audio capturing method. Possible methods are: 'fifo', 'portaudio', 'pipewire', 'alsa', 'pulse', 'sndio', 'oss', 'jack' or 'shmem'
-# Defaults to 'oss', 'pipewire', 'sndio', 'jack', 'pulse', 'alsa', 'portaudio' or 'fifo', in that order, dependent on what support cava was built with.
-# On Mac it defaults to 'portaudio' or 'fifo'
-# On windows this is automatic and no input settings are needed.
-#
-# All input methods uses the same config variable 'source'
-# to define where it should get the audio.
-#
-# For pulseaudio and pipewire 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink
-# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them).
-#
-# For pipewire 'source' will be the object name or object.serial of the device to capture from.
-# Both input and output devices are supported.
-#
-# For alsa 'source' will be the capture device.
-# For fifo 'source' will be the path to fifo-file.
-# For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address
-#
-# For sndio 'source' will be a raw recording audio descriptor or a monitoring sub-device, e.g. 'rsnd/2' or 'snd/1'. Default: 'default'.
-# README.md contains further information on how to setup CAVA for sndio.
-#
-# For oss 'source' will be the path to a audio device, e.g. '/dev/dsp2'. Default: '/dev/dsp', i.e. the default audio device.
-# README.md contains further information on how to setup CAVA for OSS on FreeBSD.
-#
-# For jack 'source' will be the name of the JACK server to connect to, e.g. 'foobar'. Default: 'default'.
-# README.md contains further information on how to setup CAVA for JACK.
-#
- method = pulse
- source = auto
-
- method = pipewire
- source = auto
-
-; method = alsa
-; source = hw:Loopback,1
-
-; method = fifo
-; source = /tmp/mpd.fifo
-
-; method = shmem
-; source = /squeezelite-AA:BB:CC:DD:EE:FF
-
-; method = portaudio
-; source = auto
-
-; method = sndio
-; source = default
-
-; method = oss
-; source = /dev/dsp
-
-; method = jack
-; source = default
-
-# The options 'sample_rate', 'sample_bits', 'channels' and 'autoconnect' can be configured for some input methods:
-#   sample_rate: fifo, pipewire, sndio, oss
-#   sample_bits: fifo, pipewire, sndio, oss
-#   channels:    sndio, oss, jack
-#   autoconnect: jack
-# Other methods ignore these settings.
-#
-# For 'sndio' and 'oss' they are only preferred values, i.e. if the values are not supported
-# by the chosen audio device, the device will use other supported values instead.
-# Example: 48000, 32 and 2, but the device only supports 44100, 16 and 1, then it
-# will use 44100, 16 and 1.
-#
-; sample_rate = 44100
-; sample_bits = 16
-; channels = 2
-; autoconnect = 2
-
-
-[output]
-
-# Output method. Can be 'ncurses', 'noncurses', 'raw', 'noritake', 'sdl'
-# or 'sdl_glsl'.
-# 'noncurses' (default) uses a buffer and cursor movements to only print
-# changes from frame to frame in the terminal. Uses less resources and is less
-# prone to tearing (vsync issues) than 'ncurses'.
-#
-# 'raw' is an 8 or 16 bit (configurable via the 'bit_format' option) data
-# stream of the bar heights that can be used to send to other applications.
-# 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above.
-#
-# 'noritake' outputs a bitmap in the format expected by a Noritake VFD display
-#  in graphic mode. It only support the 3000 series graphical VFDs for now.
-#
-# 'sdl' uses the Simple DirectMedia Layer to render in a graphical context.
-# 'sdl_glsl' uses SDL to create an OpenGL context. Write your own shaders or
-# use one of the predefined ones.
-; method = noncurses
-
-# Orientation of the visualization. Can be 'bottom', 'top', 'left' or 'right'.
-# Default is 'bottom'. Other orientations are only supported on sdl and ncruses
-# output. Note: many fonts have weird glyphs for 'top' and 'right' characters,
-# which can make ncurses not look right.
-; orientation = bottom
-
-# Visual channels. Can be 'stereo' or 'mono'.
-# 'stereo' mirrors both channels with low frequencies in center.
-# 'mono' outputs left to right lowest to highest frequencies.
-# 'mono_option' set mono to either take input from 'left', 'right' or 'average'.
-# set 'reverse' to 1 to display frequencies the other way around.
-; channels = stereo
-; mono_option = average
-; reverse = 0
-
-# Raw output target. A fifo will be created if target does not exist.
-; raw_target = /dev/stdout
-
-# Raw data format. Can be 'binary' or 'ascii'.
-; data_format = binary
-
-# Binary bit format, can be '8bit' (0-255) or '16bit' (0-65530).
-; bit_format = 16bit
-
-# Ascii max value. In 'ascii' mode range will run from 0 to value specified here
-; ascii_max_range = 1000
-
-# Ascii delimiters. In ascii format each bar and frame is separated by a delimiters.
-# Use decimal value in ascii table (i.e. 59 = ';' and 10 = '\n' (line feed)).
-; bar_delimiter = 59
-; frame_delimiter = 10
-
-# sdl window size and position. -1,-1 is centered.
-; sdl_width = 1000
-; sdl_height = 500
-; sdl_x = -1
-; sdl_y= -1
-; sdl_full_screen = 0
-
-# set label on bars on the x-axis. Can be 'frequency' or 'none'. Default: 'none'
-# 'frequency' displays the lower cut off frequency of the bar above.
-# Only supported on ncurses and noncurses output.
-; xaxis = none
-
-# enable alacritty synchronized updates. 1 = on, 0 = off
-# removes flickering in alacritty terminal emulator.
-# defaults to off since the behaviour in other terminal emulators is unknown
-; alacritty_sync = 0
-
-# Shaders for sdl_glsl, located in $HOME/.config/cava/shaders
-; vertex_shader = pass_through.vert
-; fragment_shader = bar_spectrum.frag
-
-; for glsl output mode, keep rendering even if no audio
-; continuous_rendering = 0
-
-# disable console blank (screen saver) in tty
-# (Not supported on FreeBSD)
-; disable_blanking = 0
-
-# show a flat bar at the bottom of the screen when idle, 1 = on, 0 = off
-; show_idle_bar_heads = 1
-
-# show waveform instead of frequency spectrum, 1 = on, 0 = off
-; waveform = 0
-
-[color]
-
-# Colors can be one of seven predefined: black, blue, cyan, green, magenta, red, white, yellow.
-# Or defined by hex code '#xxxxxx' (hex code must be within ''). User defined colors requires
-# a terminal that can change color definitions such as Gnome-terminal or rxvt.
-# default is to keep current terminal color
-; background = default
-; foreground = default
-
-# SDL and sdl_glsl only support hex code colors, these are the default:
-; background = '#111111'
-; foreground = '#33ffff'
-
-# these are default
-# Gradient mode, only hex defined colors are supported,
-# background must also be defined in hex or remain commented out. 1 = on, 0 = off.
-# You can define as many as 8 different colors. They range from bottom to top of screen
-; gradient = 0
-; gradient_count = 8
-; gradient_color_1 = '#59cc33'
-; gradient_color_2 = '#80cc33'
-; gradient_color_3 = '#a6cc33'
-; gradient_color_4 = '#cccc33'
-; gradient_color_5 = '#cca633'
-; gradient_color_6 = '#cc8033'
-; gradient_color_7 = '#cc5933'
-; gradient_color_8 = '#cc3333'
-
-# for matugen
-gradient = 1
-gradient_count = 2
-gradient_color_1 = '{{colors.surface_bright.default.hex}}'
-gradient_color_2 = '{{colors.primary.default.hex}}'
-
-[smoothing]
-
-# Percentage value for integral smoothing. Takes values from 0 - 100.
-# Higher values means smoother, but less precise. 0 to disable.
-# DEPRECATED as of 0.8.0, use noise_reduction instead
-; integral = 77
-
-# Disables or enables the so-called "Monstercat smoothing" with or without "waves". Set to 0 to disable.
-; monstercat = 0
-; waves = 0
-
-# Set gravity percentage for "drop off". Higher values means bars will drop faster.
-# Accepts only non-negative values. 50 means half gravity, 200 means double. Set to 0 to disable "drop off".
-# DEPRECATED as of 0.8.0, use noise_reduction instead
-; gravity = 100
-
-
-# In bar height, bars that would have been lower that this will not be drawn.
-# DEPRECATED as of 0.8.0
-; ignore = 0
-
-# Noise reduction, int 0 - 100. default 77
-# the raw visualization is very noisy, this factor adjusts the integral and gravity filters to keep the signal smooth
-# 100 will be very slow and smooth, 0 will be fast but noisy.
-; noise_reduction = 77
-
-
-[eq]
-
-# This one is tricky. You can have as much keys as you want.
-# Remember to uncomment more than one key! More keys = more precision.
-# Look at readme.md on github for further explanations and examples.
-; 1 = 1 # bass
-; 2 = 1
-; 3 = 1 # midtone
-; 4 = 1
-; 5 = 1 # treble
diff --git a/config/matugen/templates/midnight-discord.css b/config/matugen/templates/midnight-discord.css
deleted file mode 100644
index 90f744e..0000000
--- a/config/matugen/templates/midnight-discord.css
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @name midnight
- * @description A dark, rounded discord theme.
- * @author refact0r
- * @version 1.6.2
- * @invite nz87hXyvcy
- * @website https://github.com/refact0r/midnight-discord
- * @source https://github.com/refact0r/midnight-discord/blob/master/midnight.theme.css
- * @authorId 508863359777505290
- * @authorLink https://www.refact0r.dev
-*/
-
-/* IMPORTANT: make sure to enable dark mode in discord settings for the theme to apply properly!!! */
-
-@import url('https://raw.githubusercontent.com/refact0r/midnight-discord/refs/heads/master/themes/midnight.theme.css');
-
-/* customize things here */
-:root {
-	/* font, change to 'gg sans' for default discord font*/
-	--font: 'figtree';
-
-	/* top left corner text */
-	--corner-text: 'Midnight';
-
-	/* color of status indicators and window controls */
-  --online-indicator: {{colors.inverse_primary.default.hex}};     /* change to #23a55a for default green */
-	--dnd-indicator: {{colors.error.default.hex}};                  /* change to #f13f43 for default red */
-	--idle-indicator: {{colors.tertiary_container.default.hex}};    /* change to #f0b232 for default yellow */
-	--streaming-indicator: {{colors.on_primary.default.hex}};       /* change to #593695 for default purple */
-
-	/* accent colors */
-  --accent-1: {{colors.tertiary.default.hex}};            /* links */
-	--accent-2: {{colors.primary.default.hex}};             /* general unread/mention elements, some icons when active */
-	--accent-3: {{colors.primary.default.hex}};             /* accent buttons */
-	--accent-4: {{colors.surface_bright.default.hex}};      /* accent buttons when hovered */
-	--accent-5: {{colors.primary_fixed_dim.default.hex}};   /* accent buttons when clicked */
-	--mention:  {{colors.surface.default.hex}};             /* mentions & mention messages */
-	--mention-hover: {{colors.surface_bright.default.hex}}; /* mentions & mention messages when hovered */
-
-	/* text colors */
-	--text-0: {{colors.surface.default.hex}};               /* text on colored elements */
-	--text-1: {{colors.on_surface.default.hex}};            /* other normally white text */
-	--text-2: {{colors.on_surface.default.hex}};            /* headings and important text */
-	--text-3: {{colors.on_surface_variant.default.hex}};    /* normal text */
-	--text-4: {{colors.on_surface_variant.default.hex}};    /* icon buttons and channels */
-	--text-5: {{colors.outline.default.hex}};               /* muted channels/chats and timestamps */
-
-	/* background and dark colors */
-  --bg-1: {{colors.primary.default.hex}};                             /* dark buttons when clicked */
-	--bg-2: {{colors.surface_container_high.default.hex}};              /* dark buttons */
-	--bg-3: {{colors.surface_container_low.default.hex}};               /* spacing, secondary elements */
-	--bg-4: {{colors.surface.default.hex}};                             /* main background color */
-	--hover: {{colors.surface_bright.default.hex}};                     /* channels and buttons when hovered */
-	--active: {{colors.surface_bright.default.hex}};                    /* channels and buttons when clicked or selected */
-	--message-hover: {{colors.surface_bright.default.hex}};             /* messages when hovered */
-
-	/* amount of spacing and padding */
-	--spacing: 12px;
-
-	/* animations */
-	/* ALL ANIMATIONS CAN BE DISABLED WITH REDUCED MOTION IN DISCORD SETTINGS */
-	--list-item-transition: 0.2s ease;  /* channels/members/settings hover transition */
-	--unread-bar-transition: 0.2s ease; /* unread bar moving into view transition */
-	--moon-spin-transition: 0.4s ease;  /* moon icon spin */
-	--icon-spin-transition: 1s ease;    /* round icon button spin (settings, emoji, etc.) */
-
-	/* corner roundness (border-radius) */
-	--roundness-xl: 22px; /* roundness of big panel outer corners */
-	--roundness-l: 20px; /* popout panels */
-	--roundness-m: 16px; /* smaller panels, images, embeds */
-	--roundness-s: 12px; /* members, settings inputs */
-	--roundness-xs: 10px; /* channels, buttons */
-	--roundness-xxs: 8px; /* searchbar, small elements */
-
-	/* direct messages moon icon */
-	/* change to block to show, none to hide */
-	--discord-icon: none; /* discord icon */
-	--moon-icon: block; /* moon icon */
-	--moon-icon-url: url('https://upload.wikimedia.org/wikipedia/commons/c/c4/Font_Awesome_5_solid_moon.svg'); /* custom icon url */
-	--moon-icon-size: auto;
-
-	/* filter uncolorable elements to fit theme */
-	/* (just set to none, they're too much work to configure) */
-	--login-bg-filter: saturate(0.3) hue-rotate(-15deg) brightness(0.4); /* login background artwork */
-	--green-to-accent-3-filter: hue-rotate(56deg) saturate(1.43); /* add friend page explore icon */
-	--blurple-to-accent-3-filter: hue-rotate(304deg) saturate(0.84) brightness(1.2); /* add friend page school icon */
-}
-
-/* Selected chat/friend text */
-.selected_f5eb4b,
-.selected_f6f816 .link_d8bfb3 {
-  color: var(--text-0) !important;
-  background: var(--accent-3) !important;
-}
-
-.selected_f6f816 .link_d8bfb3 * {
-  color: var(--text-0) !important;
-  fill: var(--text-0) !important;
-}
diff --git a/config/matugen/templates/rofi-colors.rasi b/config/matugen/templates/rofi-colors.rasi
deleted file mode 100644
index e6506e2..0000000
--- a/config/matugen/templates/rofi-colors.rasi
+++ /dev/null
@@ -1,47 +0,0 @@
-* {
-    primary: {{colors.primary.default.hex}};
-    primary-fixed: {{colors.primary_fixed.default.hex}};
-    primary-fixed-dim: {{colors.primary_fixed_dim.default.hex}};
-    on-primary: {{colors.on_primary.default.hex}};
-    on-primary-fixed: {{colors.on_primary_fixed.default.hex}};
-    on-primary-fixed-variant: {{colors.on_primary_fixed_variant.default.hex}};
-    primary-container: {{colors.primary_container.default.hex}};
-    on-primary-container: {{colors.on_primary_container.default.hex}};
-    secondary: {{colors.secondary.default.hex}};
-    secondary-fixed: {{colors.secondary_fixed.default.hex}};
-    secondary-fixed-dim: {{colors.secondary_fixed_dim.default.hex}};
-    on-secondary: {{colors.on_secondary.default.hex}};
-    on-secondary-fixed: {{colors.on_secondary_fixed.default.hex}};
-    on-secondary-fixed-variant: {{colors.on_secondary_fixed_variant.default.hex}};
-    secondary-container: {{colors.secondary_container.default.hex}};
-    on-secondary-container: {{colors.on_secondary_container.default.hex}};
-    tertiary: {{colors.tertiary.default.hex}};
-    tertiary-fixed: {{colors.tertiary_fixed.default.hex}};
-    tertiary-fixed-dim: {{colors.tertiary_fixed_dim.default.hex}};
-    on-tertiary: {{colors.on_tertiary.default.hex}};
-    on-tertiary-fixed: {{colors.on_tertiary_fixed.default.hex}};
-    on-tertiary-fixed-variant: {{colors.on_tertiary_fixed_variant.default.hex}};
-    tertiary-container: {{colors.tertiary_container.default.hex}};
-    on-tertiary-container: {{colors.on_tertiary_container.default.hex}};
-    error: {{colors.error.default.hex}};
-    on-error: {{colors.on_error.default.hex}};
-    error-container: {{colors.error_container.default.hex}};
-    on-error-container: {{colors.on_error_container.default.hex}};
-    surface: {{colors.surface.default.hex}};
-    on-surface: {{colors.on_surface.default.hex}};
-    on-surface-variant: {{colors.on_surface_variant.default.hex}};
-    outline: {{colors.outline.default.hex}};
-    outline-variant: {{colors.outline_variant.default.hex}};
-    shadow: {{colors.shadow.default.hex}};
-    scrim: {{colors.scrim.default.hex}};
-    inverse-surface: {{colors.inverse_surface.default.hex}};
-    inverse-on-surface: {{colors.inverse_on_surface.default.hex}};
-    inverse-primary: {{colors.inverse_primary.default.hex}};
-    surface-dim: {{colors.surface_dim.default.hex}};
-    surface-bright: {{colors.surface_bright.default.hex}};
-    surface-container-lowest: {{colors.surface_container_lowest.default.hex}};
-    surface-container-low: {{colors.surface_container_low.default.hex}};
-    surface-container: {{colors.surface_container.default.hex}};
-    surface-container-high: {{colors.surface_container_high.default.hex}};
-    surface-container-highest: {{colors.surface_container_highest.default.hex}};
-}
diff --git a/config/matugen/templates/spotify-colors.ini b/config/matugen/templates/spotify-colors.ini
deleted file mode 100644
index 23117b5..0000000
--- a/config/matugen/templates/spotify-colors.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[Spicetify]
-accent             = {{ colors.on_surface.default.hex_stripped }}
-accent-active      = {{ colors.primary.default.hex_stripped }}
-accent-inactive    = {{ colors.surface.default.hex_stripped }}
-banner             = {{ colors.primary.default.hex_stripped }}
-border-active      = {{ colors.outline.default.hex_stripped }}
-border-inactive    = {{ colors.outline_variant.default.hex_stripped }}
-header             = {{ colors.on_surface.default.hex_stripped }}
-highlight          = {{ colors.surface_container_low.default.hex_stripped }}
-main               = {{ colors.surface.default.hex_stripped }}
-notification       = {{ colors.tertiary.default.hex_stripped }}
-notification-error = {{ colors.error.default.hex_stripped }}
-subtext            = {{ colors.on_surface_variant.default.hex_stripped }}
-text               = {{ colors.on_surface.default.hex_stripped }}
diff --git a/config/matugen/templates/wallpaper.txt b/config/matugen/templates/wallpaper.txt
new file mode 100644
index 0000000..33b0c5b
--- /dev/null
+++ b/config/matugen/templates/wallpaper.txt
@@ -0,0 +1 @@
+{{image}}
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 291955b..22dc84f 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,28 +1,28 @@
 {
   "LazyVim": { "branch": "main", "commit": "c64a61734fc9d45470a72603395c02137802bc6f" },
-  "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
+  "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
   "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" },
-  "grug-far.nvim": { "branch": "main", "commit": "1f7a722a9b9f0206a345377c13e62542f484398a" },
+  "gitsigns.nvim": { "branch": "main", "commit": "31217271a7314c343606acb4072a94a039a19fb5" },
+  "grug-far.nvim": { "branch": "main", "commit": "275dbedc96e61a6b8d1dfb28ba51586ddd233dcf" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "3d89e7c92fbd96c5e10e0298fc2b006f21cf9428" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "ae609525ddf01c153c39305730b1791800ffe4fe" },
   "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
   "mini.ai": { "branch": "main", "commit": "9eae720f2b20f6ad28cbfa0ddc524e10dc2c3201" },
   "mini.icons": { "branch": "main", "commit": "efc85e42262cd0c9e1fdbf806c25cb0be6de115c" },
   "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" },
   "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-lint": { "branch": "master", "commit": "b3292aac30b935d4cccf0904053d1c7930df8a20" },
-  "nvim-lspconfig": { "branch": "master", "commit": "79c9a15be5731bc8694840a8fb0c9141c20a80c0" },
-  "nvim-treesitter": { "branch": "main", "commit": "19c729dae6e0eeb79423df0cf37780aa9a7cc3b7" },
+  "nvim-lint": { "branch": "master", "commit": "bcd1a44edbea8cd473af7e7582d3f7ffc60d8e81" },
+  "nvim-lspconfig": { "branch": "master", "commit": "f4e9d367d4e067d7a5fabc9fd3f1349b291eb718" },
+  "nvim-treesitter": { "branch": "main", "commit": "9f2dad22ef8bb14fd1e0a3aa8859cdc88170668b" },
   "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "db15f2e0df2f5db916e511e3fffb682ef2f6354f" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
   "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
diff --git a/config/rofi/colors.rasi b/config/rofi/colors.rasi
deleted file mode 100644
index 904043d..0000000
--- a/config/rofi/colors.rasi
+++ /dev/null
@@ -1,47 +0,0 @@
-* {
-    primary: #80d4dc;
-    primary-fixed: #9df0f8;
-    primary-fixed-dim: #80d4dc;
-    on-primary: #00363a;
-    on-primary-fixed: #002022;
-    on-primary-fixed-variant: #004f54;
-    primary-container: #004f54;
-    on-primary-container: #9df0f8;
-    secondary: #b1cbce;
-    secondary-fixed: #cce8ea;
-    secondary-fixed-dim: #b1cbce;
-    on-secondary: #1b3437;
-    on-secondary-fixed: #051f21;
-    on-secondary-fixed-variant: #324b4d;
-    secondary-container: #324b4d;
-    on-secondary-container: #cce8ea;
-    tertiary: #b7c7ea;
-    tertiary-fixed: #d7e2ff;
-    tertiary-fixed-dim: #b7c7ea;
-    on-tertiary: #21304c;
-    on-tertiary-fixed: #0a1b36;
-    on-tertiary-fixed-variant: #384764;
-    tertiary-container: #384764;
-    on-tertiary-container: #d7e2ff;
-    error: #ffb4ab;
-    on-error: #690005;
-    error-container: #93000a;
-    on-error-container: #ffdad6;
-    surface: #0e1415;
-    on-surface: #dee4e4;
-    on-surface-variant: #bec8c9;
-    outline: #899393;
-    outline-variant: #3f4849;
-    shadow: #000000;
-    scrim: #000000;
-    inverse-surface: #dee4e4;
-    inverse-on-surface: #2b3232;
-    inverse-primary: #006970;
-    surface-dim: #0e1415;
-    surface-bright: #343a3b;
-    surface-container-lowest: #090f10;
-    surface-container-low: #161d1d;
-    surface-container: #1a2121;
-    surface-container-high: #252b2c;
-    surface-container-highest: #303636;
-}
diff --git a/config/rofi/config (Copy).rasi b/config/rofi/config (Copy).rasi
deleted file mode 100644
index aa1cc90..0000000
--- a/config/rofi/config (Copy).rasi	
+++ /dev/null
@@ -1,202 +0,0 @@
-@import "colors.rasi"
-
-/*****----- Configuration -----*****/
-configuration {
-    modi:                       "drun,run,window";
-    show-icons:                 true;
-    icon-theme: 		"Colloid";
-    display-drun:               "APPS";
-    display-run:                "RUN";
-    display-window:             "WINDOW";
-    drun-display-format:        "{name}";
-    window-format:              "{w} · {c} · {t}";
-}
-
-/*****----- Global Properties -----*****/
-* {
-    font:                        "JetBrains Mono Nerd Font 10";
-    background:                  @on-secondary;
-    background-alt:              @secondary-container;
-    foreground:                  #FFFFFF;
-    selected:                    @secondary;
-    active:                      #00CCF5;
-    urgent:                      @error;
-}
-
-/*****----- Main Window -----*****/
-window {
-    /* properties for window widget */
-    transparency:                "real";
-    location:                    center;
-    anchor:                      center;
-    fullscreen:                  false;
-    width:                       1000px;
-    x-offset:                    0px;
-    y-offset:                    0px;
-
-    /* properties for all widgets */
-    enabled:                     true;
-    border-radius:               15px;
-    cursor:                      "default";
-    background-color:            @background;
-}
-
-/*****----- Main Box -----*****/
-mainbox {
-    enabled:                     true;
-    spacing:                     0px;
-    background-color:            transparent;
-    orientation:                 horizontal;
-    children:                    [ "imagebox", "listbox" ];
-}
-
-imagebox {
-    padding:                     20px;
-    background-color:            transparent;
-    background-image:            url("~/.config/hypr/current_wallpaper", height);
-    orientation:                 vertical;
-    children:                    [ "inputbar", "dummy", "mode-switcher" ];
-}
-
-listbox {
-    spacing:                     20px;
-    padding:                     20px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
-}
-
-dummy {
-    background-color:            transparent;
-}
-
-/*****----- Inputbar -----*****/
-inputbar {
-    enabled:                     true;
-    spacing:                     10px;
-    padding:                     15px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @foreground;
-    children:                    [ "textbox-prompt-colon", "entry" ];
-}
-textbox-prompt-colon {
-    enabled:                     true;
-    expand:                      false;
-    str:                         "  ";
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-entry {
-    enabled:                     true;
-    background-color:            inherit;
-    text-color:                  inherit;
-    cursor:                      text;
-    placeholder:                 "Search";
-    placeholder-color:           inherit;
-}
-
-/*****----- Mode Switcher -----*****/
-mode-switcher{
-    enabled:                     true;
-    spacing:                     20px;
-    background-color:            transparent;
-    text-color:                  @foreground;
-}
-button {
-    padding:                     15px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  inherit;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @selected;
-    text-color:                  @foreground;
-}
-
-/*****----- Listview -----*****/
-listview {
-    enabled:                     true;
-    columns:                     1;
-    lines:                       8;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   false;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                true;
-    fixed-columns:               true;
-    
-    spacing:                     10px;
-    background-color:            transparent;
-    text-color:                  @foreground;
-    cursor:                      "default";
-}
-
-/*****----- Elements -----*****/
-element {
-    enabled:                     true;
-    spacing:                     15px;
-    padding:                     8px;
-    border-radius:               10px;
-    background-color:            transparent;
-    text-color:                  @foreground;
-    cursor:                      pointer;
-}
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element normal.active {
-    background-color:            @active;
-    text-color:                  @foreground;
-}
-element selected.normal {
-    background-color:            @selected;
-    text-color:                  @foreground;
-}
-element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element selected.active {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    size:                        32px;
-    cursor:                      inherit;
-}
-element-text {
-    background-color:            transparent;
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:            transparent;
-}
-textbox {
-    padding:                     15px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @foreground;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-error-message {
-    padding:                     15px;
-    border-radius:               20px;
-    background-color:            @background;
-    text-color:                  @foreground;
-}
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
deleted file mode 100644
index ae9acca..0000000
--- a/config/rofi/config.rasi
+++ /dev/null
@@ -1,186 +0,0 @@
-@theme "/dev/null"
-@import "colors.rasi"
-
-configuration {
-	modi: "window,run,drun";
-	display-drun: "Applications";
-	display-window: "Windows";
-	display-run: "Run";
-	drun-display-format: "{icon} {name}";
-	font: "JetBrainsMono Nerd Font 10";
-	show-icons: true;
-	icon-theme: "Colloid";
-}
-
-window {
-    /* properties for window widget */
-    transparency:                "real";
-    location:                    center;
-    anchor:                      center;
-    fullscreen:                  false;
-    width:                       1000px;
-    x-offset:                    0px;
-    y-offset:                    0px;
-
-    /* properties for all widgets */
-    enabled:                     true;
-    border:			 2px solid;
-    border-color:		 @secondary-container;
-    border-radius:               15px;
-    cursor:                      "default";
-    background-color:            @on-primary-fixed;
-}
-
-mainbox {
-    enabled:                     true;
-    spacing:                     0px;
-    background-color:            transparent;
-    orientation:                 horizontal;
-    children:                    [ "imagebox", "listbox" ];
-}
-
-imagebox {
-    padding:                     20px;
-    background-color:            transparent;
-    background-image:            url("~/.config/hypr/current_wallpaper", height);
-    orientation:                 vertical;
-    children:                    [ "inputbar", "dummy", "mode-switcher" ];
-}
-
-listbox {
-    spacing:                     20px;
-    padding:                     20px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
-}
-
-dummy {
-    background-color:            transparent;
-}
-
-inputbar {
-    enabled:                     true;
-    spacing:                     10px;
-    padding:                     15px;
-    border-radius:               10px;
-    background-color:		 @on-primary;
-    text-color:			 @on-surface;
-    children:                    [ "textbox-prompt-colon", "entry" ];
-}
-textbox-prompt-colon {
-    enabled:                     true;
-    expand:                      false;
-    str:                         "  ";
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-entry {
-    enabled:                     true;
-    background-color:            inherit;
-    text-color:                  inherit;
-    cursor:                      text;
-    placeholder:                 "Search";
-    placeholder-color:           inherit;
-}
-
-mode-switcher{
-    enabled:                     true;
-    spacing:                     20px;
-    background-color:            transparent;
-    text-color:                  @primary-fixed;
-}
-button {
-    padding:                     15px;
-    border-radius:               10px;
-    background-color:            @on-primary;
-    text-color:                  inherit;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @primary;
-    text-color:                  @on-secondary;
-}
-
-listview {
-    enabled:                     true;
-    columns:                     1;
-    lines:                       8;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   false;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                true;
-    fixed-columns:               true;
-    
-    spacing:                     10px;
-    background-color:            transparent;
-    text-color:                  @on-surface;
-    cursor:                      "default";
-}
-
-element {
-    enabled:                     true;
-    spacing:                     15px;
-    padding:                     8px;
-    border-radius:               10px;
-    background-color:            transparent;
-    text-color:                  @on-surface;
-    cursor:                      pointer;
-}
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @error;
-    text-color:                  @on-surface;
-}
-element normal.active {
-    background-color:            @primary;
-    text-color:                  @on-surface;
-}
-element selected.normal {
-    background-color:            @primary;
-    text-color:                  @on-secondary;
-}
-element selected.urgent {
-    background-color:            @error;
-    text-color:                  @on-secondary;
-}
-element selected.active {
-    background-color:            @error;
-    text-color:                  @on-secondary;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    size:                        32px;
-    cursor:                      inherit;
-}
-element-text {
-    background-color:            transparent;
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-
-message {
-    background-color:            transparent;
-}
-textbox {
-    padding:                     15px;
-    border-radius:               10px;
-    background-color:            @on-primary;
-    text-color:                  @on-surface;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-error-message {
-    padding:                     15px;
-    border-radius:               20px;
-    background-color:            @on-primary;
-    text-color:                  @on-surface;
-}
diff --git a/config/waybar/Modules b/config/waybar/Modules
index ed3341c..19db817 100644
--- a/config/waybar/Modules
+++ b/config/waybar/Modules
@@ -97,8 +97,8 @@
 
 "clock": {
 	"interval": 1,
-    "format": " {:%I:%M %p}", // AM PM format
-    //"format": " {:%H:%M:%S}",// 24H
+    //"format": " {:%I:%M %p}", // AM PM format
+    "format": " {:%H:%M}",// 24H
 	"format-alt": " {:%H:%M   %Y, %d %B, %A}",
 	"tooltip-format": "<tt><small>{calendar}</small></tt>",
 	"calendar": {
diff --git a/install.sh b/install.sh
index 622fb60..51305b5 100755
--- a/install.sh
+++ b/install.sh
@@ -40,7 +40,7 @@ sudo pacman -S --needed --noconfirm \
   hyprpaper \
   waybar \
   kitty \
-  rofi \
+  fuzzel \
   fish \
   nvim \
   swaync \
@@ -51,7 +51,10 @@ sudo pacman -S --needed --noconfirm \
   noto-fonts \
   noto-fonts-cjk \
   noto-fonts-emoji \
-  7zip
+  7zip \
+  neovim \
+  dolphin \
+  mpv
 
 # pipewire installation and start
 sudo pacman -Syu pipewire pipewire-pulse wireplumber pipewire-alsa pipewire-audio pavucontrol