diff --git a/dotfiles/config/hypr/env_var.conf b/dotfiles/config/hypr/env_var.conf
new file mode 100644
index 0000000..e1a06f2
--- /dev/null
+++ b/dotfiles/config/hypr/env_var.conf
@@ -0,0 +1,52 @@
+# Environment Variables
+# see https://wiki.hyprland.org/Configuring/Environment-variables/ 
+
+# Theming Related Variables
+# Set cursor size. See FAQ below for why you might want this variable set.
+# https://wiki.hyprland.org/FAQ/
+env = XCURSOR_SIZE,24
+
+# Set a GTK theme manually, for those who want to avoid appearance tools such as lxappearance or nwg-look
+#env = GTK_THEME,
+
+# Set your cursor theme. The theme needs to be installed and readable by your user.
+#env = XCURSOR_THEME,
+
+# the line below may help with multiple monitors
+#env = WLR_EGL_NO_MODIFIERS,1
+
+#XDG Specifications
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_TYPE,wayland
+env = XDG_SESSION_DESKTOP,Hyprland
+
+# Toolkit Backend Variables
+
+# GTK: Use wayland if available, fall back to x11 if not.
+#env = GDK_BACKEND,wayland,x11
+
+# QT: Use wayland if available, fall back to x11 if not.
+#env = QT_QPA_PLATFORM,wayland,xcb
+
+# Run SDL2 applications on Wayland. Remove or set to x11 if games that 
+# provide older versions of SDL cause compatibility issues
+#env = SDL_VIDEODRIVER,wayland 
+
+# Clutter package already has wayland enabled, this variable 
+#will force Clutter applications to try and use the Wayland backend
+#env = CLUTTER_BACKEND,wayland 
+
+# QT Variables
+
+# (From the QT documentation) enables automatic scaling, based on the monitor’s pixel density
+# https://doc.qt.io/qt-5/highdpi.html
+#env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+
+# Tell QT applications to use the Wayland backend, and fall back to x11 if Wayland is unavailable
+#env = QT_QPA_PLATFORM,wayland,xcb
+
+# Disables window decorations on QT applications
+#env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+
+#Tells QT based applications to pick your theme from qt5ct, use with Kvantum.
+#env = QT_QPA_PLATFORMTHEME,qt5ct
\ No newline at end of file
diff --git a/dotfiles/config/hypr/hyprland.conf b/dotfiles/config/hypr/hyprland.conf
index e10a561..aa16084 100644
--- a/dotfiles/config/hypr/hyprland.conf
+++ b/dotfiles/config/hypr/hyprland.conf
@@ -20,26 +20,28 @@ monitor=DP-2,2560x1440@75,0x0,1
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
 # Execute your favorite apps at launch
-# exec-once = waybar & hyprpaper & firefox
+exec-once = ~/.config/hypr/scripts/xdg-portal-hyprland # hyprland init parameter
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # Wayland magic (screen sharing etc.)
+exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # More wayland magic (screen sharing etc.)
+exec-once = ~/.config/hypr/scripts/bgaction # swww wallpaper
+exec-once = ~/.local/share/hyprload/hyprload.sh
+#exec = ~/.config/HyprV/hyprv_util setbg
+exec-once = /usr/lib/polkit-kde-authentication-agent-1
 exec-once = waybar # status bar
 exec-once = dunst # notification daemon
-exec-once = fcitx --replace -d # input method
-# exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # Wayland magic (screen sharing etc.)
-# exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # More wayland magic (screen sharing etc.)
-exec-once = ~/.config/hypr/scripts/xdg-portal-hyprland # hyprland init parameter
-# exec-once = cliphist wipe # clear clipboard
-exec-once = /usr/lib/polkit-kde-authentication-agent-1 # root certifaction
-exec-once = ~/.config/hypr/scripts/bgaction # swww wallpaper
-# exec-once = wl-paste --type text --watch cliphist store
-# exec-once = wl-paste --type image --watch cliphist store
-# exec-once = hyprpaper # wallpaper
-# exec-once = ~/.config/hypr/scripts/launch_bar # status bar 
-# exec-once = nm-applet --indicator # Systray app for Network/Wifi
+exec-once = blueman-applet
+exec-once = nm-applet --indicator # Systray app for Network/Wifi
+exec-once = fcitx5 --replace -d # input method
+exec-once = wl-paste --type text --watch cliphist store
+exec-once = wl-paste --type image --watch cliphist store
+exec-once = cliphist wipe # clear clipboard
 exec-once = udiskie &
-exec-once = $HOME/.local/share/hyprload/hyprload.sh
+
 
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
+#source = ~/.config/hypr/env_var.conf
+source = ~/.config/hypr/media-binds.conf
 
 # Some default env vars.
 env = XCURSOR_SIZE,24
@@ -138,6 +140,9 @@ gestures {
 
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
+device:epic mouse V1 {
+    #sensitivity = -0.5
+}
 device:apple-inc.-magic-trackpad-1 {
     #scroll_factor = 1.0
     #middle_button_emulation=0
@@ -153,12 +158,11 @@ windowrulev2 = opacity 1.0 1.0, class:^(Google-chrome)$
 windowrulev2 = animation popin,class:^(Google-chrome)$
 windowrulev2 = opacity 0.8 0.9,class:^(kitty)$
 windowrulev2 = animation popin,class:^(kitty)$,title:^(update-sys)$
-# windowrulev2 = animation popin,class:^(thunar)$
-# windowrulev2 = opacity 0.8 0.8,class:^(thunar)$
 windowrulev2 = animation slide,class:^(wofi)$
 windowrulev2 = move 100%-433 53,class:^(wofi)$,title:^(clippick)$
+windowrulev2 = opacity 0.8 0.8,class:^(VSCodium)$
 windowrulev2 = opacity 0.8 1.0,class:^(obsidian)$
-windowrulev2 = tile,title:^(微信读书)
+windowrulev2 = tile,title:^(微信读书)$
 
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
@@ -168,7 +172,6 @@ $mainMod = SUPER
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, Q, exec, kitty
 bind = $mainMod, R, exec, pkill wofi; wofi --show drun
-# bind = $mainMod, E, exec, kitty ranger
 bind = $mainMod, E, exec, dolphin
 bind = $mainMod, O, exec, obsidian
 bind = $mainMod, P, exec, logseq
@@ -183,7 +186,7 @@ bind = $mainMod, W, exec, google-chrome-stable --profile-directory=Default --app
 # bind = $mainMod, Y, exec, grim -g "$(slurp)" $screen_file
 # bind = $mainMod SHIFT, Y,  exec, grim - | wl-copy
 bind = $mainMod, F, togglefloating, 
-bind = $mainMod SHIFT, P, pseudo, # dwindle
+bind = $mainMod SHIFT, I, pseudo, # dwindle
 bind = $mainMod SHIFT, J, togglesplit, # dwindle
 bind = $mainMod, Space, fullscreen
 
@@ -223,8 +226,15 @@ bind = $mainMod, mouse_up, workspace, e-1
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod SHIFT, mouse:272, resizewindow
 bindm = $mainMod, mouse:273, resizewindow
 
 # Brightness control
-binde = $mainMod SHIFT, P, exec, brightnessctl set 5%+
-binde = $mainMod SHIFT, O, exec, brightnessctl set 5%-
+binde = $mainMod SHIFT, L, exec, ddcutil setvcp 10 + 10
+binde = $mainMod SHIFT, K, exec, ddcutil setvcp 10 - 10
+#binde = $mainMod SHIFT, L, exec, brightnessctl set 5%+
+#binde = $mainMod SHIFT, K, exec, brightnessctl set 5%-
+
+# Sound control
+binde = $mainMod SHIFT, O, exec, pamixer -d 5
+binde = $mainMod SHIFT, P, exec, pamixer -i 5
diff --git a/dotfiles/config/hypr/hyprv_util b/dotfiles/config/hypr/hyprv_util
new file mode 100755
index 0000000..4461dee
--- /dev/null
+++ b/dotfiles/config/hypr/hyprv_util
@@ -0,0 +1,145 @@
+#!/bin/bash
+. ~/.config/HyprV/hyprv.conf
+
+get_theme() {
+    # Check which waybar theme is set
+    THEMEIS=$(readlink -f ~/.config/waybar/style.css | cut -d '-' -f3)
+
+    #if the theme is not dark then we need to switch to it
+    if [[ $THEMEIS == "dark.css" ]]; then
+        SWITCHTO="-dark"
+        MODESTR="Dark"
+    else
+        SWITCHTO=""
+        MODESTR="Light"
+    fi
+}
+
+update_theme() {
+    #set the xfce and GTK theme
+    if [[ $VER == "v4" || $VERTO == "v4-" ]]; then
+        xfconf-query -c xsettings -p /Net/IconThemeName -s "Papirus-Dark"
+        gsettings set org.gnome.desktop.interface icon-theme "Papirus-Dark"
+    else 
+        xfconf-query -c xsettings -p /Net/IconThemeName -s "Adwaita$SWITCHTO"
+        gsettings set org.gnome.desktop.interface icon-theme "Adwaita$SWITCHTO"
+    fi
+
+    xfconf-query -c xsettings -p /Net/ThemeName -s "Adwaita$SWITCHTO"
+    gsettings set org.gnome.desktop.interface gtk-theme "Adwaita$SWITCHTO"
+}
+
+get_ver() {
+    VER=$(readlink -f ~/.config/waybar/config.jsonc | cut -d '-' -f1 | cut -d '/' -f8)
+}
+
+restart_waybar() {
+    #restart the waybar
+    pkill waybar
+    waybar & 
+
+    get_ver   
+
+    if [[ $VER == "v4" ]]; then
+        waybar --config ~/.config/HyprV/waybar/conf/v4-config-bottom.jsonc
+    fi
+
+}
+
+set_current_background() {
+    get_theme
+    get_ver
+    
+    if [[ ! -z "$SET_BG" ]]; then
+        #set the current background
+        if [[ $THEMEIS == "dark.css" ]]; then
+            swww img ~/.config/HyprV/backgrounds/$VER'-background-dark.jpg'
+        else
+            swww img ~/.config/HyprV/backgrounds/$VER'-background.jpg'
+        fi
+    else
+        swww img $SET_BG
+    fi
+}
+
+switch_version() {
+    get_theme
+    get_ver
+    case $VER in
+        v1)
+            #we are on v1 so switch to v2
+            VERTO="v2-"
+            notify-send -h string:x-canonical-private-synchronous:sys-notify -u low "switching to HyprV2"
+        ;;
+        
+        v2)
+            #we are on v2 so switch to v3
+            VERTO="v3-"
+            notify-send -h string:x-canonical-private-synchronous:sys-notify -u low "switching to HyprV3"
+        ;;
+
+        v3)
+            #we are on v3 so switch to v4
+            VERTO="v4-"
+            notify-send -h string:x-canonical-private-synchronous:sys-notify -u low "switching to HyprV4"
+        ;;
+
+        v4)
+            #we are on v4 so switch to v1
+            VERTO="v1-"
+            notify-send -h string:x-canonical-private-synchronous:sys-notify -u low "switching to HyprV1"
+        ;;
+        
+    esac
+    #set the waybar config
+    ln -sf ~/.config/HyprV/waybar/conf/$VERTO'config.jsonc' ~/.config/waybar/config.jsonc
+    #set the waybar theme
+    ln -sf ~/.config/HyprV/waybar/style/$VERTO'style'$SWITCHTO.css ~/.config/waybar/style.css
+    #set the wofi theme
+    ln -sf ~/.config/HyprV/wofi/style/$VERTO'style'$SWITCHTO.css ~/.config/wofi/style.css
+
+    #set the background
+    if [ -z $SET_BG ]; then
+        swww img ~/.config/HyprV/backgrounds/$VERTO'background'$SWITCHTO.jpg --transition-fps 60 --transition-type wipe --transition-duration 2
+    else
+        swww img $SET_BG --transition-fps 60 --transition-type wipe --transition-duration 2
+    fi
+
+    #update the sddm image
+    cp -f ~/.config/HyprV/backgrounds/$VERTO'background'$SWITCHTO.jpg /usr/share/sddm/themes/sdt/wallpaper.jpg
+
+}
+
+switch_keyboard() {
+    hyprctl switchxkblayout $SET_KB next
+}
+
+if [[ "$1" == "vswitch" ]]; then
+    switch_version
+    update_theme
+    restart_waybar
+elif [[ "$1" == "setbg" ]]; then
+    set_current_background
+    update_theme
+    restart_waybar
+elif [[ "$1" == "swkb" ]]; then
+    switch_keyboard
+    restart_waybar
+fi
+
+# need to show the version and tooltip
+get_ver
+
+TOOLTIP='Default Keybinds\n'\
+'SUPER + Q = Start Kitty\n'\
+'SUPER + F4 = Close Window\n'\
+'SUPER + L = Lock Screen\n'\
+'SUPER + M = Logout menu\n'\
+'SUPER + E = File Manager\n'\
+'SUPER + V = Toggle Float\n'\
+'SUPER + SPACE = App Launcher\n'\
+'SUPER + S = Screenshot\n'\
+'SUPER + T = Switch HyprV version\n'\
+'ALT + V = Open clipboard manager'
+
+echo '{"text": "'$VER'", "tooltip": "'$TOOLTIP'"}'
\ No newline at end of file
diff --git a/dotfiles/config/hypr/media-binds.conf b/dotfiles/config/hypr/media-binds.conf
new file mode 100644
index 0000000..953a7b4
--- /dev/null
+++ b/dotfiles/config/hypr/media-binds.conf
@@ -0,0 +1,12 @@
+$SCRIPT = ~/.config/HyprV/waybar/scripts
+
+bind = , xf86audioraisevolume, exec, $SCRIPT/volume --inc 
+bind = , xf86audiolowervolume, exec, $SCRIPT/volume --dec 
+bind = , xf86AudioMicMute, exec, $SCRIPT/volume --toggle-mic 
+bind = , xf86audioMute, exec, $SCRIPT/volume --toggle 
+
+bind = , xf86KbdBrightnessDown, exec, $SCRIPT/kb-brightness --dec 
+bind = , xf86KbdBrightnessUp, exec, $SCRIPT/kb-brightness --inc 
+
+bind = , xf86MonBrightnessDown, exec, $SCRIPT/brightness --dec 
+bind = , xf86MonBrightnessUp, exec, $SCRIPT/brightness --inc 
\ No newline at end of file
diff --git a/dotfiles/config/waybar/config-bottom.jsonc b/dotfiles/config/waybar/config-bottom.jsonc
new file mode 100644
index 0000000..391e4f3
--- /dev/null
+++ b/dotfiles/config/waybar/config-bottom.jsonc
@@ -0,0 +1,63 @@
+{
+    "layer": "top",
+    "position": "bottom",
+    "mod": "dock",
+    "exclusive": true,
+    "passthrough": false,
+    "gtk-layer-shell": true,
+    "height": 25,
+    "modules-left": [
+        "custom/launch_wofi",
+        "custom/launch_firefox",
+        "custom/launch_thunderbird",
+        "custom/launch_kitty",
+        "custom/launch_dolphin"
+    ],
+    "modules-center": ["wlr/taskbar"],
+    "modules-right": ["custom/weather"],
+
+    "custom/launch_firefox": {
+        "format": "",
+        "on-click": "google-chrome-stable",
+        "tooltip": false
+    },
+
+    "custom/launch_thunderbird": {
+        "format": "󰇰",
+        "on-click": "thunderbird",
+        "tooltip": false
+    },
+
+    "custom/launch_dolphin": {
+        "format": "",
+        "on-click": "exec dolphin",
+        "tooltip": false
+    },
+
+    "custom/launch_kitty": {
+        "format": "",
+        "on-click": "exec kitty",
+        "tooltip": false
+    },
+    
+    "custom/launch_wofi": {
+        "format": "󱗼",
+        "on-click": "sh -c '(sleep 0.5s; pkill wofi || wofi -c ~/.config/wofi/config-lmenu)' & disown",
+        "tooltip": false
+    },
+
+    "wlr/taskbar": {
+        "format": "{icon}",
+        "icon-size": 24,
+        "all-outputs": true,
+        "tooltip-format": "{name} - {title}",
+        "on-click": "activate",
+        "on-click-middle": "close",
+        "ignore-list": [
+            "wofi"
+        ],
+	    "app_ids-mapping": {
+	        "steam_app_39210": "Final Fantasy 14"
+	    }
+    }
+}
diff --git a/dotfiles/config/waybar/config.jsonc b/dotfiles/config/waybar/config.jsonc
index d2143f4..1a939c4 100644
--- a/dotfiles/config/waybar/config.jsonc
+++ b/dotfiles/config/waybar/config.jsonc
@@ -6,45 +6,70 @@
     "passthrough": false,
     "gtk-layer-shell": true,
     "height": 50,
-    "modules-left": ["custom/launch_wofi","wlr/workspaces","cpu","memory","disk","hyprland/window"],
-    "modules-center": ["custom/lock_screen","custom/updates","clock","custom/power_btn"],
-    "modules-right": ["temperature","custom/power_profile","battery","backlight","pulseaudio","pulseaudio#microphone","tray","custom/weather","custom/light_dark"],
-    
+    "modules-left": [
+        "custom/launch_wofi",
+        "wlr/workspaces",
+
+        "hyprland/window"
+    ],
+    "modules-center": [
+        "idle_inhibitor",
+        "custom/lock_screen",
+        "custom/power_btn",
+        "custom/updates",
+        "clock",
+        "wlr/taskbar"
+    ],
+    "modules-right": [
+        "custom/weather",
+        "cpu",
+        "memory",
+        "disk",
+        "temperature",
+        "battery",
+        "backlight",
+        "pulseaudio",
+        "pulseaudio#microphone",
+        "tray",
+        "custom/light_dark"
+    ],
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "󰛐",
+            "deactivated": "󰛑"
+        },
+        "tooltip": true
+    },
     "hyprland/window": {
         "format": "{}"
     },
-
     "custom/launch_wofi": {
-        "format": "",
-        "on-click": "pkill wofi; wofi -n",
+        "format": "󱗼",
+        "on-click": "sh -c '(sleep 0.5s; pkill wofi || wofi -c ~/.config/wofi/config-lmenu)' & disown",
         "tooltip": false
     },
-
     "custom/lock_screen": {
         "format": "",
         "on-click": "sh -c '(sleep 0.5s; swaylock)' & disown",
         "tooltip": false
     },
-
     "custom/light_dark": {
         "format": "󰐾",
         "on-click": "~/.config/waybar/scripts/baraction light",
         "tooltip": false
     },
-
     "custom/power_btn": {
         "format": "",
         "on-click": "sh -c '(sleep 0.5s; wlogout --protocol layer-shell)' & disown",
         "tooltip": false
     },
-
     "cpu": {
         "interval": 10,
         "format": " {usage}%",
         "max-length": 10,
         "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
     },
-
     "disk": {
         "interval": 30,
         "format": "󰋊 {percentage_used}%",
@@ -53,7 +78,6 @@
         "tooltip-format": "HDD - {used} used out of {total} on {path} ({percentage_used}%)",
         "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
     },
-
     "memory": {
         "interval": 30,
         "format": " {}%",
@@ -62,7 +86,6 @@
         "tooltip-format": "Memory - {used:0.1f}GB used",
         "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
     },
-
     "custom/updates": {
         "format": "{}",
         "exec": "~/.config/waybar/scripts/update-sys",
@@ -70,7 +93,6 @@
         "interval": 300,
         "tooltip": true
     },
-
     "wlr/workspaces": {
         "disable-scroll": true,
         "all-outputs": true,
@@ -88,65 +110,17 @@
             "10": []
         }
     },
-    
-    "custom/power_profile": {
-        //shows the current power profile and switches to next on click
-        "exec": "asusctl profile -p | sed s:'Active profile is'::",
-        "interval": 30,
-        "format": "󰈐{}", 
-        "on-click": "asusctl profile -n; pkill -SIGRTMIN+8 waybar",
-        "signal": 8
-    },
-
-   "custom/weather": {
-        //shows the current weather and forecast
-        "tooltip" : true,
-        "format" : "{}",
-        "interval" : 30,
-        "exec" : "~/.config/waybar/scripts/waybar-wttr.py",
-        "return-type" : "json"
-    },
-
     "tray": {
         "icon-size": 18,
         "spacing": 10
     },
-
-    "clock": {
-        "format": "{:%I:%M %p}",
-        "tooltip": true,
-        "tooltip-format": "{: %A, %B %e %Y}"
-    },
-
-    "backlight": {
-        "device": "intel_backlight",
-        "format": "{icon} {percent}%",
-        "format-icons": ["", "", ""],
-        "on-scroll-up": "brightnessctl set 1%+",
-        "on-scroll-down": "brightnessctl set 1%-",
-        "min-length": 6
-    },
-
-    "battery": {
-        "states": {
-            "good": 95,
-            "warning": 30,
-            "critical": 20
-        },
-        "format": "{icon} {capacity}%",
-        "format-charging": " {capacity}%",
-        "format-plugged": " {capacity}%",
-        "format-alt": "{time} {icon}",
-        "format-icons": ["", "", "", "", "", "", "", "", "", "", ""]
-    },
-
     "pulseaudio": {
-        "format": "{icon} {volume}%",
+        "format": "{icon}",
         "format-muted": "",
-        "on-click": "pamixer -t",
+        "on-click": "~/.config/waybar/scripts/volume --toggle",
         "on-click-right": "pavucontrol",
-        "on-scroll-up": "pamixer -i 5",
-        "on-scroll-down": "pamixer -d 5",
+        "on-scroll-up": "~/.config/waybar/scripts/volume --inc",
+        "on-scroll-down": "~/.config/waybar/scripts/volume --dec",
         "scroll-step": 5,
         "format-icons": {
             "headphone": "",
@@ -156,25 +130,58 @@
             "portable": "",
             "car": "",
             "default": ["", "", ""]
-        }
+        },
+        "tooltip": true,
+        "tooltip-format": "{icon} at {volume}%"
     },
-
     "pulseaudio#microphone": {
         "format": "{format_source}",
-        "format-source": " {volume}%",
-        "format-source-muted": "",
-        "on-click": "pamixer --default-source -t",
+        "format-source": "",
+        "format-source-muted": "",
+        "on-click": "~/.config/waybar/scripts/volume --toggle-mic",
         "on-click-right": "pavucontrol",
-        "on-scroll-up": "pamixer --default-source -i 5",
-        "on-scroll-down": "pamixer --default-source -d 5",
-        "scroll-step": 5
+        "on-scroll-up": "~/.config/waybar/scripts/volume --mic-inc",
+        "on-scroll-down": "~/.config/waybar/scripts/volume --mic-dec",
+        "scroll-step": 5,
+        "tooltip": true,
+        "tooltip-format": " at {volume}%"
     },
-    
+    "clock": {
+        "format": "{:%H:%M}",
+        "tooltip-format": "{: %A, %e %B %Y}"
+    },
+
+    "custom/weather": {
+        //shows the current weather and forecast
+        "tooltip" : true,
+        "format" : "{}",
+        "interval" : 30,
+        "exec" : "~/.config/waybar/scripts/waybar-wttr.py",
+        "return-type" : "json"
+    },
+
     "temperature": {
         "thermal-zone": 1,
-        "format": " {temperatureC}°C",
+        "format": "",
+        "format-alt-click": "click-right",
+        "format-alt": " {temperatureC}°C",
         "critical-threshold": 70,
-        "format-critical": " {temperatureF}°F",
+        "format-critical": " {temperatureC}°C",
         "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
+    },
+
+    "wlr/taskbar": {
+        "format": "{icon}",
+        "icon-size": 24,
+        "all-outputs": true,
+        "tooltip-format": "{name} - {title}",
+        "on-click": "activate",
+        "on-click-middle": "close",
+        "ignore-list": [
+            "wofi"
+        ],
+	    "app_ids-mapping": {
+	        "steam_app_39210": "Final Fantasy 14"
+	    }
     }
 }
diff --git a/dotfiles/config/waybar/config.jsonc.bak b/dotfiles/config/waybar/config.jsonc.bak
deleted file mode 100644
index d2143f4..0000000
--- a/dotfiles/config/waybar/config.jsonc.bak
+++ /dev/null
@@ -1,180 +0,0 @@
-{
-    "layer": "top",
-    "position": "top",
-    "mod": "dock",
-    "exclusive": true,
-    "passthrough": false,
-    "gtk-layer-shell": true,
-    "height": 50,
-    "modules-left": ["custom/launch_wofi","wlr/workspaces","cpu","memory","disk","hyprland/window"],
-    "modules-center": ["custom/lock_screen","custom/updates","clock","custom/power_btn"],
-    "modules-right": ["temperature","custom/power_profile","battery","backlight","pulseaudio","pulseaudio#microphone","tray","custom/weather","custom/light_dark"],
-    
-    "hyprland/window": {
-        "format": "{}"
-    },
-
-    "custom/launch_wofi": {
-        "format": "",
-        "on-click": "pkill wofi; wofi -n",
-        "tooltip": false
-    },
-
-    "custom/lock_screen": {
-        "format": "",
-        "on-click": "sh -c '(sleep 0.5s; swaylock)' & disown",
-        "tooltip": false
-    },
-
-    "custom/light_dark": {
-        "format": "󰐾",
-        "on-click": "~/.config/waybar/scripts/baraction light",
-        "tooltip": false
-    },
-
-    "custom/power_btn": {
-        "format": "",
-        "on-click": "sh -c '(sleep 0.5s; wlogout --protocol layer-shell)' & disown",
-        "tooltip": false
-    },
-
-    "cpu": {
-        "interval": 10,
-        "format": " {usage}%",
-        "max-length": 10,
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
-    },
-
-    "disk": {
-        "interval": 30,
-        "format": "󰋊 {percentage_used}%",
-        "path": "/",
-        "tooltip": true,
-        "tooltip-format": "HDD - {used} used out of {total} on {path} ({percentage_used}%)",
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
-    },
-
-    "memory": {
-        "interval": 30,
-        "format": " {}%",
-        "max-length": 10,
-        "tooltip": true,
-        "tooltip-format": "Memory - {used:0.1f}GB used",
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
-    },
-
-    "custom/updates": {
-        "format": "{}",
-        "exec": "~/.config/waybar/scripts/update-sys",
-        "on-click": "~/.config/waybar/scripts/update-sys update",
-        "interval": 300,
-        "tooltip": true
-    },
-
-    "wlr/workspaces": {
-        "disable-scroll": true,
-        "all-outputs": true,
-        "on-click": "activate",
-        "persistent_workspaces": {
-            "1": [],
-            "2": [],
-            "3": [],
-            "4": [],
-            "5": [],
-            "6": [],
-            "7": [],
-            "8": [],
-            "9": [],
-            "10": []
-        }
-    },
-    
-    "custom/power_profile": {
-        //shows the current power profile and switches to next on click
-        "exec": "asusctl profile -p | sed s:'Active profile is'::",
-        "interval": 30,
-        "format": "󰈐{}", 
-        "on-click": "asusctl profile -n; pkill -SIGRTMIN+8 waybar",
-        "signal": 8
-    },
-
-   "custom/weather": {
-        //shows the current weather and forecast
-        "tooltip" : true,
-        "format" : "{}",
-        "interval" : 30,
-        "exec" : "~/.config/waybar/scripts/waybar-wttr.py",
-        "return-type" : "json"
-    },
-
-    "tray": {
-        "icon-size": 18,
-        "spacing": 10
-    },
-
-    "clock": {
-        "format": "{:%I:%M %p}",
-        "tooltip": true,
-        "tooltip-format": "{: %A, %B %e %Y}"
-    },
-
-    "backlight": {
-        "device": "intel_backlight",
-        "format": "{icon} {percent}%",
-        "format-icons": ["", "", ""],
-        "on-scroll-up": "brightnessctl set 1%+",
-        "on-scroll-down": "brightnessctl set 1%-",
-        "min-length": 6
-    },
-
-    "battery": {
-        "states": {
-            "good": 95,
-            "warning": 30,
-            "critical": 20
-        },
-        "format": "{icon} {capacity}%",
-        "format-charging": " {capacity}%",
-        "format-plugged": " {capacity}%",
-        "format-alt": "{time} {icon}",
-        "format-icons": ["", "", "", "", "", "", "", "", "", "", ""]
-    },
-
-    "pulseaudio": {
-        "format": "{icon} {volume}%",
-        "format-muted": "",
-        "on-click": "pamixer -t",
-        "on-click-right": "pavucontrol",
-        "on-scroll-up": "pamixer -i 5",
-        "on-scroll-down": "pamixer -d 5",
-        "scroll-step": 5,
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        }
-    },
-
-    "pulseaudio#microphone": {
-        "format": "{format_source}",
-        "format-source": " {volume}%",
-        "format-source-muted": "",
-        "on-click": "pamixer --default-source -t",
-        "on-click-right": "pavucontrol",
-        "on-scroll-up": "pamixer --default-source -i 5",
-        "on-scroll-down": "pamixer --default-source -d 5",
-        "scroll-step": 5
-    },
-    
-    "temperature": {
-        "thermal-zone": 1,
-        "format": " {temperatureC}°C",
-        "critical-threshold": 70,
-        "format-critical": " {temperatureF}°F",
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
-    }
-}
diff --git a/dotfiles/config/waybar/icons/brightness-100.png b/dotfiles/config/waybar/icons/brightness-100.png
new file mode 100644
index 0000000..1e28ac3
Binary files /dev/null and b/dotfiles/config/waybar/icons/brightness-100.png differ
diff --git a/dotfiles/config/waybar/icons/brightness-20.png b/dotfiles/config/waybar/icons/brightness-20.png
new file mode 100644
index 0000000..aee9c52
Binary files /dev/null and b/dotfiles/config/waybar/icons/brightness-20.png differ
diff --git a/dotfiles/config/waybar/icons/brightness-40.png b/dotfiles/config/waybar/icons/brightness-40.png
new file mode 100644
index 0000000..bbedd1c
Binary files /dev/null and b/dotfiles/config/waybar/icons/brightness-40.png differ
diff --git a/dotfiles/config/waybar/icons/brightness-60.png b/dotfiles/config/waybar/icons/brightness-60.png
new file mode 100644
index 0000000..4cd838b
Binary files /dev/null and b/dotfiles/config/waybar/icons/brightness-60.png differ
diff --git a/dotfiles/config/waybar/icons/brightness-80.png b/dotfiles/config/waybar/icons/brightness-80.png
new file mode 100644
index 0000000..6684bdb
Binary files /dev/null and b/dotfiles/config/waybar/icons/brightness-80.png differ
diff --git a/dotfiles/config/waybar/icons/microphone-mute.png b/dotfiles/config/waybar/icons/microphone-mute.png
new file mode 100644
index 0000000..1780e33
Binary files /dev/null and b/dotfiles/config/waybar/icons/microphone-mute.png differ
diff --git a/dotfiles/config/waybar/icons/microphone.png b/dotfiles/config/waybar/icons/microphone.png
new file mode 100644
index 0000000..d1b6d76
Binary files /dev/null and b/dotfiles/config/waybar/icons/microphone.png differ
diff --git a/dotfiles/config/waybar/icons/volume-high.png b/dotfiles/config/waybar/icons/volume-high.png
new file mode 100644
index 0000000..200f17b
Binary files /dev/null and b/dotfiles/config/waybar/icons/volume-high.png differ
diff --git a/dotfiles/config/waybar/icons/volume-low.png b/dotfiles/config/waybar/icons/volume-low.png
new file mode 100644
index 0000000..17cfff7
Binary files /dev/null and b/dotfiles/config/waybar/icons/volume-low.png differ
diff --git a/dotfiles/config/waybar/icons/volume-mid.png b/dotfiles/config/waybar/icons/volume-mid.png
new file mode 100644
index 0000000..1a3ad3a
Binary files /dev/null and b/dotfiles/config/waybar/icons/volume-mid.png differ
diff --git a/dotfiles/config/waybar/icons/volume-mute.png b/dotfiles/config/waybar/icons/volume-mute.png
new file mode 100644
index 0000000..0b9b0c3
Binary files /dev/null and b/dotfiles/config/waybar/icons/volume-mute.png differ
diff --git a/dotfiles/config/waybar/mesu-met.jsonc b/dotfiles/config/waybar/mesu-met.jsonc
new file mode 100644
index 0000000..919e8b2
--- /dev/null
+++ b/dotfiles/config/waybar/mesu-met.jsonc
@@ -0,0 +1,25 @@
+{
+    "clock": {
+        "format": "{:%H:%M}",
+        "tooltip-format": "{: %A, %e %B %Y}"
+    },
+
+    "custom/weather": {
+        //shows the current weather and forecast
+        "tooltip" : true,
+        "format" : "{}",
+        "interval" : 30,
+        "exec" : "~/.config/HyprV/waybar/scripts/waybar-wttr-c.py",
+        "return-type" : "json"
+    },
+
+    "temperature": {
+        "thermal-zone": 1,
+        "format": "",
+        "format-alt-click": "click-right",
+        "format-alt": " {temperatureC}°C",
+        "critical-threshold": 70,
+        "format-critical": " {temperatureC}°C",
+        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
+    }
+}
\ No newline at end of file
diff --git a/dotfiles/config/waybar/scripts/baraction b/dotfiles/config/waybar/scripts/baraction
index 58ebf30..f2578eb 100755
--- a/dotfiles/config/waybar/scripts/baraction
+++ b/dotfiles/config/waybar/scripts/baraction
@@ -14,19 +14,27 @@ ln -sf ~/.config/waybar/style/style$SWITCHTO.css ~/.config/waybar/style.css
 #set the wofi theme
 ln -sf ~/.config/wofi/style/style$SWITCHTO.css ~/.config/wofi/style.css
 
-#set the xfce theme
-xfconf-query -c xsettings -p /Net/ThemeName -s "Adwaita$SWITCHTO"
-xfconf-query -c xsettings -p /Net/IconThemeName -s "Adwaita$SWITCHTO"
-
-#set the GTK theme
-gsettings set org.gnome.desktop.interface gtk-theme "Adwaita$SWITCHTO"
-gsettings set org.gnome.desktop.interface icon-theme "Adwaita$SWITCHTO"
+#set the xfce and GTK theme
+# if [ $VER == "v4" ]; then
+#     xfconf-query -c xsettings -p /Net/IconThemeName -s "Papirus-Dark"
+#     gsettings set org.gnome.desktop.interface icon-theme "Papirus-Dark"
+# else
+#     xfconf-query -c xsettings -p /Net/IconThemeName -s "Adwaita$SWITCHTO"
+#     gsettings set org.gnome.desktop.interface icon-theme "Adwaita$SWITCHTO"
+# fi
 
 #change the background image and be cool about it ;)
 swww img ~/.config/hypr/wallpaper$SWITCHTO.jpg --transition-fps 60 --transition-type wipe --transition-duration 2
 
-#update the sddm image
-ln -sf /usr/share/sddm/themes/sdt/Backgrounds/wallpaper$SWITCHTO.jpg /usr/share/sddm/themes/sdt/wallpaper.jpg
+#reset mako
+sleep 1
+killall -SIGUSR2 dunst
+dunst &
 
 #restart the waybar
-killall -SIGUSR2 waybar
\ No newline at end of file
+#killall -SIGUSR2 waybar <-- start causing web brwsers to close so switched to below...
+pkill waybar
+waybar &
+
+# bottom waybar
+#waybar --config ~/.config/waybar/config-bottom.jsonc
diff --git a/dotfiles/config/waybar/scripts/brightness b/dotfiles/config/waybar/scripts/brightness
new file mode 100755
index 0000000..a57ca9e
--- /dev/null
+++ b/dotfiles/config/waybar/scripts/brightness
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+iDIR="$HOME/.config/waybar/icons"
+
+# Get brightness
+get_backlight() {
+	LIGHT=$(printf "%.0f\n" $(brightnessctl i))
+	echo "${LIGHT}%"
+}
+
+# Get icons
+get_icon() {
+	backlight="$(brightnessctl g)"
+	current="${backlight%%%}"
+	if [[ ("$current" -ge "0") && ("$current" -le "52") ]]; then
+		icon="$iDIR/brightness-20.png"
+	elif [[ ("$current" -ge "52") && ("$current" -le "103") ]]; then
+		icon="$iDIR/brightness-40.png"
+	elif [[ ("$current" -ge "103") && ("$current" -le "155") ]]; then
+		icon="$iDIR/brightness-60.png"
+	elif [[ ("$current" -ge "155") && ("$current" -le "207") ]]; then
+		icon="$iDIR/brightness-80.png"
+	elif [[ ("$current" -ge "180") && ("$current" -le "255") ]]; then
+		icon="$iDIR/brightness-100.png"
+	fi
+}
+
+# Notify
+notify_user() {
+	notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$icon" "Brightness : $(brightnessctl g)"
+}
+
+# Increase brightness
+inc_backlight() {
+	brightnessctl set 10%+ && get_icon && notify_user
+}
+
+# Decrease brightness
+dec_backlight() {
+	brightnessctl set 10%- && get_icon && notify_user
+}
+
+# Execute accordingly
+if [[ "$1" == "--get" ]]; then
+	brightnessctl g
+elif [[ "$1" == "--inc" ]]; then
+	inc_backlight
+elif [[ "$1" == "--dec" ]]; then
+	dec_backlight
+else
+	get_backlight
+fi
diff --git a/dotfiles/config/waybar/scripts/volume b/dotfiles/config/waybar/scripts/volume
new file mode 100755
index 0000000..9463f5e
--- /dev/null
+++ b/dotfiles/config/waybar/scripts/volume
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+iDIR="$HOME/.config/waybar/icons"
+
+# Get Volume
+get_volume() {
+	volume=$(pamixer --get-volume)
+	echo "$volume"
+}
+
+# Get icons
+get_icon() {
+	current=$(get_volume)
+	if [[ "$current" -eq "0" ]]; then
+		echo "$iDIR/volume-mute.png"
+	elif [[ ("$current" -ge "0") && ("$current" -le "30") ]]; then
+		echo "$iDIR/volume-low.png"
+	elif [[ ("$current" -ge "30") && ("$current" -le "60") ]]; then
+		echo "$iDIR/volume-mid.png"
+	elif [[ ("$current" -ge "60") && ("$current" -le "100") ]]; then
+		echo "$iDIR/volume-high.png"
+	fi
+}
+
+# Notify
+notify_user() {
+	notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$(get_icon)" "Volume : $(get_volume) %"
+}
+
+# Increase Volume
+inc_volume() {
+	pamixer -i 5 && notify_user
+}
+
+# Decrease Volume
+dec_volume() {
+	pamixer -d 5 && notify_user
+}
+
+# Toggle Mute
+toggle_mute() {
+	if [ "$(pamixer --get-mute)" == "false" ]; then
+		pamixer -m && notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$iDIR/volume-mute.png" "Volume Switched OFF"
+	elif [ "$(pamixer --get-mute)" == "true" ]; then
+		pamixer -u && notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$(get_icon)" "Volume Switched ON"
+	fi
+}
+
+# Toggle Mic
+toggle_mic() {
+	if [ "$(pamixer --default-source --get-mute)" == "false" ]; then
+		pamixer --default-source -m && notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$iDIR/microphone-mute.png" "Microphone Switched OFF"
+	elif [ "$(pamixer --default-source --get-mute)" == "true" ]; then
+		pamixer -u --default-source u && notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$iDIR/microphone.png" "Microphone Switched ON"
+	fi
+}
+# Get icons
+get_mic_icon() {
+	current=$(pamixer --default-source --get-volume)
+	if [[ "$current" -eq "0" ]]; then
+		echo "$iDIR/microphone.png"
+	elif [[ ("$current" -ge "0") && ("$current" -le "30") ]]; then
+		echo "$iDIR/microphone.png"
+	elif [[ ("$current" -ge "30") && ("$current" -le "60") ]]; then
+		echo "$iDIR/microphone.png"
+	elif [[ ("$current" -ge "60") && ("$current" -le "100") ]]; then
+		echo "$iDIR/microphone.png"
+	fi
+}
+# Notify
+notify_mic_user() {
+	notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$(get_mic_icon)" "Mic-Level : $(pamixer --default-source --get-volume) %"
+}
+
+# Increase MIC Volume
+inc_mic_volume() {
+	pamixer --default-source -i 5 && notify_mic_user
+}
+
+# Decrease MIC Volume
+dec_mic_volume() {
+	pamixer --default-source -d 5 && notify_mic_user
+}
+
+# Execute accordingly
+if [[ "$1" == "--get" ]]; then
+	get_volume
+elif [[ "$1" == "--inc" ]]; then
+	inc_volume
+elif [[ "$1" == "--dec" ]]; then
+	dec_volume
+elif [[ "$1" == "--toggle" ]]; then
+	toggle_mute
+elif [[ "$1" == "--toggle-mic" ]]; then
+	toggle_mic
+elif [[ "$1" == "--get-icon" ]]; then
+	get_icon
+elif [[ "$1" == "--get-mic-icon" ]]; then
+	get_mic_icon
+elif [[ "$1" == "--mic-inc" ]]; then
+	inc_mic_volume
+elif [[ "$1" == "--mic-dec" ]]; then
+	dec_mic_volume
+else
+	get_volume
+fi
diff --git a/dotfiles/config/waybar/style.css b/dotfiles/config/waybar/style.css
index 7d1786f..b1c571a 100644
--- a/dotfiles/config/waybar/style.css
+++ b/dotfiles/config/waybar/style.css
@@ -9,7 +9,7 @@
 
 window#waybar {
     background: rgba(21, 18, 27, 0);
-    color: #cdd6f4;
+    color: #f6f7fc;
 }
 
 tooltip {
@@ -27,22 +27,12 @@ tooltip label{
 
 #workspaces button {
     padding: 5px;
-    color: #313244;
+    color: #f6f7fc;
     margin-right: 5px;
 }
 
 #workspaces button.active {
-    color: #a6adc8;
-}
-
-#workspaces button.focused {
-    color: #a6adc8;
-    background: #eba0ac;
-    border-radius: 10px;
-}
-
-#workspaces button.urgent {
-    color: #11111b;
+    color: #000000;
     background: #a6e3a1;
     border-radius: 10px;
 }
@@ -54,11 +44,16 @@ tooltip label{
 }
 
 #custom-launch_wofi,
+#custom-launch_firefox,
+#custom-launch_thunderbird,
+#custom-launch_thunar,
+#custom-launch_kitty,
 #custom-lock_screen,
 #custom-light_dark,
 #custom-power_btn,
 #custom-power_profile,
 #custom-weather,
+#custom-myhyprv,
 #window,
 #cpu,
 #disk,
@@ -71,65 +66,43 @@ tooltip label{
 #tray,
 #temperature,
 #workspaces,
+#idle_inhibitor,
 #backlight {
-    background: #1e1e2e;
-    opacity: 0.8;
-    padding: 0px 10px;
-    margin: 3px 0px;
-    margin-top: 10px;
+    background: rgba(21, 18, 27, 0);
+    opacity: 1;
+    padding: 0px 8px;
+    margin: 0px 3px;
     border: 0px;
 }
 
-#tray, #custom-lock_screen, #temperature, #backlight, #custom-launch_wofi, #cpu {
-    border-radius: 10px 0px 0px 10px;
-}
-
-#custom-light_dark, #custom-power_btn, #workspaces, #pulseaudio.microphone, #battery, #disk {
-    border-radius: 0px 10px 10px 0px;
-    margin-right: 10px;
-}
-
 #temperature.critical {
     color: #e92d4d;
 }
 
-
 #workspaces {
     padding-right: 0px;
     padding-left: 5px;
 }
 
-#custom-power_profile {
-    color: #a6e3a1;
-    border-left: 0px;
-    border-right: 0px;
-}
-
 #window {
     border-radius: 10px;
-    margin-left: 20px;
+    margin-left: 0px;
+    margin-right: 0px;
+}
+
+#custom-launch_firefox, 
+#custom-launch_thunderbird,
+#custom-launch_thunar,
+#custom-launch_wofi,
+#custom-launch_kitty,
+#custom-weather {
+    margin-left: 0px;
+    border-right: 0px;
+    font-size: 24px;
     margin-right: 20px;
 }
 
-#custom-launch_wofi {
-    color: #89b4fa;
-    margin-left: 10px;
-    border-right: 0px;
+#custom-launch_firefox, 
+#custom-launch_kitty {
+    font-size: 20px;
 }
-
-#pulseaudio {
-    color: #89b4fa;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#pulseaudio.microphone {
-    color: #cba6f7;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#battery {
-    color: #a6e3a1;
-    border-left: 0px;
-}
\ No newline at end of file
diff --git a/dotfiles/config/waybar/style/style-dark.css b/dotfiles/config/waybar/style/style-dark.css
index 7d1786f..b1c571a 100644
--- a/dotfiles/config/waybar/style/style-dark.css
+++ b/dotfiles/config/waybar/style/style-dark.css
@@ -9,7 +9,7 @@
 
 window#waybar {
     background: rgba(21, 18, 27, 0);
-    color: #cdd6f4;
+    color: #f6f7fc;
 }
 
 tooltip {
@@ -27,22 +27,12 @@ tooltip label{
 
 #workspaces button {
     padding: 5px;
-    color: #313244;
+    color: #f6f7fc;
     margin-right: 5px;
 }
 
 #workspaces button.active {
-    color: #a6adc8;
-}
-
-#workspaces button.focused {
-    color: #a6adc8;
-    background: #eba0ac;
-    border-radius: 10px;
-}
-
-#workspaces button.urgent {
-    color: #11111b;
+    color: #000000;
     background: #a6e3a1;
     border-radius: 10px;
 }
@@ -54,11 +44,16 @@ tooltip label{
 }
 
 #custom-launch_wofi,
+#custom-launch_firefox,
+#custom-launch_thunderbird,
+#custom-launch_thunar,
+#custom-launch_kitty,
 #custom-lock_screen,
 #custom-light_dark,
 #custom-power_btn,
 #custom-power_profile,
 #custom-weather,
+#custom-myhyprv,
 #window,
 #cpu,
 #disk,
@@ -71,65 +66,43 @@ tooltip label{
 #tray,
 #temperature,
 #workspaces,
+#idle_inhibitor,
 #backlight {
-    background: #1e1e2e;
-    opacity: 0.8;
-    padding: 0px 10px;
-    margin: 3px 0px;
-    margin-top: 10px;
+    background: rgba(21, 18, 27, 0);
+    opacity: 1;
+    padding: 0px 8px;
+    margin: 0px 3px;
     border: 0px;
 }
 
-#tray, #custom-lock_screen, #temperature, #backlight, #custom-launch_wofi, #cpu {
-    border-radius: 10px 0px 0px 10px;
-}
-
-#custom-light_dark, #custom-power_btn, #workspaces, #pulseaudio.microphone, #battery, #disk {
-    border-radius: 0px 10px 10px 0px;
-    margin-right: 10px;
-}
-
 #temperature.critical {
     color: #e92d4d;
 }
 
-
 #workspaces {
     padding-right: 0px;
     padding-left: 5px;
 }
 
-#custom-power_profile {
-    color: #a6e3a1;
-    border-left: 0px;
-    border-right: 0px;
-}
-
 #window {
     border-radius: 10px;
-    margin-left: 20px;
+    margin-left: 0px;
+    margin-right: 0px;
+}
+
+#custom-launch_firefox, 
+#custom-launch_thunderbird,
+#custom-launch_thunar,
+#custom-launch_wofi,
+#custom-launch_kitty,
+#custom-weather {
+    margin-left: 0px;
+    border-right: 0px;
+    font-size: 24px;
     margin-right: 20px;
 }
 
-#custom-launch_wofi {
-    color: #89b4fa;
-    margin-left: 10px;
-    border-right: 0px;
+#custom-launch_firefox, 
+#custom-launch_kitty {
+    font-size: 20px;
 }
-
-#pulseaudio {
-    color: #89b4fa;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#pulseaudio.microphone {
-    color: #cba6f7;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#battery {
-    color: #a6e3a1;
-    border-left: 0px;
-}
\ No newline at end of file
diff --git a/dotfiles/config/waybar/style/style.css b/dotfiles/config/waybar/style/style.css
index 4443450..36ffd02 100644
--- a/dotfiles/config/waybar/style/style.css
+++ b/dotfiles/config/waybar/style/style.css
@@ -9,11 +9,11 @@
 
 window#waybar {
     background: rgba(21, 18, 27, 0);
-    color: #2b2b2c;
+    color: #f6f7fc;
 }
 
 tooltip {
-    background: #e7e7ec;;
+    background: #e7e7ec;
     opacity: 0.8;
     border-radius: 10px;
     border-width: 2px;
@@ -27,22 +27,12 @@ tooltip label{
 
 #workspaces button {
     padding: 5px;
-    color: #313244;
+    color: #f6f7fc;
     margin-right: 5px;
 }
 
 #workspaces button.active {
-    color: #a6adc8;
-}
-
-#workspaces button.focused {
-    color: #a6adc8;
-    background: #eba0ac;
-    border-radius: 10px;
-}
-
-#workspaces button.urgent {
-    color: #11111b;
+    color: #000000;
     background: #a6e3a1;
     border-radius: 10px;
 }
@@ -54,11 +44,16 @@ tooltip label{
 }
 
 #custom-launch_wofi,
+#custom-launch_firefox,
+#custom-launch_thunderbird,
+#custom-launch_thunar,
+#custom-launch_kitty,
 #custom-lock_screen,
 #custom-light_dark,
 #custom-power_btn,
 #custom-power_profile,
 #custom-weather,
+#custom-myhyprv,
 #window,
 #cpu,
 #disk,
@@ -71,24 +66,15 @@ tooltip label{
 #tray,
 #temperature,
 #workspaces,
+#idle_inhibitor,
 #backlight {
-    background: #e7e7ec;
+    background: rgba(21, 18, 27, 0);
     opacity: 0.8;
-    padding: 0px 10px;
-    margin: 3px 0px;
-    margin-top: 10px;
+    padding: 0px 8px;
+    margin: 0px 3px;
     border: 0px;
 }
 
-#tray, #custom-lock_screen, #temperature, #backlight, #custom-launch_wofi, #cpu {
-    border-radius: 10px 0px 0px 10px;
-}
-
-#custom-light_dark, #custom-power_btn, #workspaces, #pulseaudio.microphone, #battery, #disk{
-    border-radius: 0px 10px 10px 0px;
-    margin-right: 10px;
-}
-
 #temperature.critical {
     color: #e92d4d;
 }
@@ -99,37 +85,25 @@ tooltip label{
     padding-left: 5px;
 }
 
-#custom-power_profile {
-    color: #1d7715;
-    border-left: 0px;
-    border-right: 0px;
-}
-
 #window {
     border-radius: 10px;
     margin-left: 20px;
     margin-right: 20px;
 }
 
-#custom-launch_wofi {
-    color: #407cdd;
-    margin-left: 10px;
+#custom-launch_firefox, 
+#custom-launch_thunderbird,
+#custom-launch_thunar,
+#custom-launch_wofi,
+#custom-launch_kitty,
+#custom-weather {
+    margin-left: 0px;
     border-right: 0px;
+    font-size: 24px;
+    margin-right: 20px;
 }
 
-#pulseaudio {
-    color: #407cdd;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#pulseaudio.microphone {
-    color: #ad6bfd;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#battery {
-    color: #1d7715;
-    border-left: 0px;
-}
+#custom-launch_firefox, 
+#custom-launch_kitty {
+    font-size: 20px;
+}
\ No newline at end of file
diff --git a/dotfiles/config/wofi/config-bmenu b/dotfiles/config/wofi/config-bmenu
new file mode 100644
index 0000000..07b8ae2
--- /dev/null
+++ b/dotfiles/config/wofi/config-bmenu
@@ -0,0 +1,16 @@
+width=375
+height=450
+location=bottom_left
+show=drun
+prompt=Search...
+filter_rate=100
+allow_markup=true
+no_actions=false
+halign=fill
+orientation=vertical
+content_halign=fill
+insensitive=true
+allow_images=true
+image_size=32
+gtk_dark=true
+layer=top
\ No newline at end of file
diff --git a/dotfiles/config/wofi/config-lmenu b/dotfiles/config/wofi/config-lmenu
new file mode 100644
index 0000000..082a1ea
--- /dev/null
+++ b/dotfiles/config/wofi/config-lmenu
@@ -0,0 +1,26 @@
+show=drun
+prompt=Apps
+normal_window=false
+layer=top
+columns=4
+width=50%
+height=50%
+location=0
+orientation=vertical
+halign=fill
+line_wrap=off
+dynamic_lines=false
+allow_markup=true
+allow_images=true
+image_size=32
+exec_search=false
+hide_search=false
+parse_search=false
+insensitive=false
+hide_scroll=true
+no_actions=true
+sort_order=alphabetical
+gtk_dark=true
+filter_rate=100
+key_expand=Tab
+key_exit=Escape
\ No newline at end of file