diff --git a/config-files/mako/config b/config-files/mako/config
index 538098a..ec6be71 100755
--- a/config-files/mako/config
+++ b/config-files/mako/config
@@ -4,3 +4,4 @@ border-size=6
 border-radius=20
 border-color=#1515157F
 icons=1
+default-timeout=6000
diff --git a/config-files/waybar/config b/config-files/waybar/config
index 0d61a3c..fe6fa7e 100755
--- a/config-files/waybar/config
+++ b/config-files/waybar/config
@@ -5,7 +5,7 @@
         "position": "top",
         "modules-left": ["wlr/taskbar"],
         "modules-center": ["clock"],
-        "modules-right": ["bluetooth","temperature","cpu","memory","pulseaudio","network","custom/search","custom/poweroff"],
+        "modules-right": ["temperature","memory","tray","custom/search","custom/poweroff"],
         "fixed-center": true,
         "spacing": 20,
         "custom/poweroff":
@@ -26,49 +26,16 @@
             "format": "{:%a  %H:%M  %d-%m-%y}",
             "tooltip": false
         },
-        "pulseaudio":
+        "tray":
         {
-            "format": "{icon} {volume}%",
-            "format-muted": "",
-            "format-icons":
-            {
-                "default": ""
-            },
-            "scroll-step": 1,
-            "on-click": "pavucontrol"
-        },
-        "network":
-        {
-            "interface": "enp24s0",
-            "format": "{ifname}",
-            "format-wifi": "{essid} ",
-            "format-ethernet": "",
-            "format-disconnected": "",
-            "tooltip-format": "{ifname} via {gwaddr} ",
-            "tooltip-format-wifi": "{essid} ({signalStrength}%) ",
-            "tooltip-format-ethernet": "{ifname} {ipaddr} ",
-            "tooltip-format-disconnected": "Disconnected"
-        },
-        "bluetooth":
-        {
-            "format": "",
-            "format-connected": "",
-            "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
-            "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
-            "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
-            "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
-            "on-click": "blueman-manager"
+            "icon-size": 20,
+            "spacing": 20
         },
         "memory":
         {
             "interval": 30,
             "format": " {}%"
         },
-        "cpu":
-        {
-            "interval": 10,
-            "format": " {}%"
-        },
         "temperature":
         {
             "format": " {temperatureC}°C"
@@ -77,7 +44,6 @@
         {
             "format": "{icon}",
             "icon-size": 20,
-            "icon-theme": "Numix-Circle",
             "tooltip-format": "{title}",
             "on-click": "activate",
             "on-click-middle": "close"
@@ -110,19 +76,18 @@
             "format": "{:%a  %H:%M  %d-%m-%y}",
             "tooltip": false
         },
-        "wlr/taskbar":
-        {
-            "format": "{icon}",
-            "icon-size": 20,
-            "icon-theme": "Numix-Circle",
-            "tooltip-format": "{title}",
-            "on-click": "activate",
-            "on-click-middle": "close"
-        },
         "tray": 
         {
             "icon-size": 20,
             "spacing": 20
+        },
+        "wlr/taskbar":
+        {
+            "format": "{icon}",
+            "icon-size": 20,
+            "tooltip-format": "{title}",
+            "on-click": "activate",
+            "on-click-middle": "close"
         }
     }
 ]
diff --git a/config-files/waybar/style.css b/config-files/waybar/style.css
index 0a42fb4..70d9a04 100755
--- a/config-files/waybar/style.css
+++ b/config-files/waybar/style.css
@@ -22,6 +22,7 @@ tooltip
   border: 1px solid rgba(0, 0, 0, 0.5);
   border-radius: 20;
 }
+
 tooltip label 
 {
   color: white;
diff --git a/config-files/wayfire/wayfire.ini b/config-files/wayfire/wayfire.ini
index 6660ae6..33884f6 100755
--- a/config-files/wayfire/wayfire.ini
+++ b/config-files/wayfire/wayfire.ini
@@ -19,15 +19,16 @@ zoom_enabled_for = none
 
 [autostart]
 audio = pipewire
+audio_notify = sleep 5; dbus-launch pa-notify -t 2
 automount = udiskie -As
 autostart_wf_shell = false
 background = wf-background
 bar = waybar
 element = element-desktop --hidden
 idle = swayidle -w timeout 590 gtklock before-sleep gtklock
+network = sleep 5; nm-applet --indicator
 notifications = mako
 outputs = kanshi
-portal = /usr/libexec/xdg-desktop-portal
 
 [blur]
 blur_by_default = type is "toplevel"
@@ -48,34 +49,34 @@ saturation = 1.000000
 toggle = none
 
 [command]
-binding_volumeup = KEY_VOLUMEUP
-binding_volumedown = KEY_VOLUMEDOWN
-binding_mute = KEY_MUTE
 binding_filer = <super> KEY_F
 binding_firefox = <super> KEY_B
 binding_gamma = <super> KEY_G
 binding_kanshi = <super> KEY_K
 binding_launcher = <super> KEY_S
 binding_matrix = <super> KEY_E
+binding_mute = KEY_MUTE
 binding_screenshot = <shift> KEY_SYSRQ
 binding_screenshot_interactive = KEY_SYSRQ
 binding_terminal = <super> KEY_T
+binding_volumedown = KEY_VOLUMEDOWN
+binding_volumeup = KEY_VOLUMEUP
 binding_vscode = <super> KEY_V
 binding_waybar = <super> KEY_W
 binding_wlogout = <super> KEY_P
-command_volumeup = pamixer -i 5 -u
-command_volumedown = pamixer -d 5 -u
-command_mute = pamixer -t
 command_filer = Thunar
 command_firefox = firefox
 command_gamma = wlsunset -l 52.0 -L 5.9 -t 3000
 command_kanshi = kanshi
 command_launcher = wofi --show drun
 command_matrix = element-desktop
+command_mute = pamixer -t
 command_screenshot = grim $(date '+%F_%T').png
 command_screenshot_interactive = slurp | grim -g - $(date '+%F_%T').png
 command_terminal = foot
-command_vscode = code-oss
+command_volumedown = pamixer -d 5 -u
+command_volumeup = pamixer -i 5 -u
+command_vscode = ~/packages/vscode/code
 command_waybar = pkill -9 waybar; waybar
 command_wlogout = wlogout
 
@@ -86,7 +87,7 @@ focus_button_with_modifiers = false
 focus_buttons = BTN_LEFT | BTN_MIDDLE | BTN_RIGHT
 focus_buttons_passthrough = true
 max_render_time = -1
-plugins = alpha animate autostart command cube expo grid idle move oswitch place resize vswitch window-rules wm-actions zoom blur fast-switcher wobbly preserve-output
+plugins = alpha animate autostart command cube expo grid idle move oswitch place resize vswitch window-rules wm-actions zoom blur fast-switcher wobbly preserve-output wrot
 preferred_decoration_mode = server
 vheight = 3
 vwidth = 3
@@ -110,12 +111,12 @@ speed_zoom = 0.070000
 zoom = 0.100000
 
 [decoration]
-active_color = \#000000FF
-border_size = 0
+active_color = \#000000CA
+border_size = 2
 button_order = 
 font = Roboto
 ignore_views = none
-inactive_color = \#000000FF
+inactive_color = \#0000009C
 title_height = 0
 
 [expo]
@@ -141,7 +142,7 @@ move_fingers = 3
 [fast-switcher]
 activate = <alt> KEY_TAB
 activate_backward = <alt> <shift> KEY_TAB
-inactive_alpha = 0.700000
+inactive_alpha = 1.000000
 
 [fisheye]
 radius = 450.000000
diff --git a/void-desktop-install.txt b/void-desktop-install.txt
index 7e525ca..d6ae0a2 100755
--- a/void-desktop-install.txt
+++ b/void-desktop-install.txt
@@ -215,12 +215,13 @@ Post install:
     }
     Taskbar:
     {
-        # xbps-install -Sy Waybar fontmanager papirus-icon-theme fonts-roboto-ttf font-awesome noto-fonts-ttf noto-fonts-cjk
+        # xbps-install -Sy Waybar network-manager-applet fontmanager papirus-icon-theme fonts-roboto-ttf font-awesome noto-fonts-ttf noto-fonts-cjk
         $ cp -r void-desktop/config-files/waybar .config/
         $ vim .config/wayfire.ini:
         {
             > [autostart]
             > bar = waybar
+            > network = sleep 5; nm-applet --indicator
         }
     }
     Tasklauncher:
@@ -250,7 +251,7 @@ Post install:
     }
     Audio:
     {
-        # xbps-install alsa-pipewire pipewire wireplumber pavucontrol pamixer
+        # xbps-install alsa-pipewire pipewire wireplumber pavucontrol pamixer pa-notify
         # mkdir /etc/pipewire
         # cp /usr/share/pipewire/pipewire.conf /etc/pipewire/
         # vim /etc/pipewire/pipewire.conf:
@@ -267,6 +268,7 @@ Post install:
         {
             > [autostart]
             > audio = pipewire
+            > audio_notify = sleep 5; dbus-launch pa-notify -t 2
         }
     }
     Lockscreen:
@@ -317,7 +319,7 @@ Post install:
     }
     Steam:
     {
-        # xbps-install steam wine winetricks protontricks
+        # xbps-install steam wine winetricks protontricks gamemode gamescope
     }
     virt-manager:
     {
@@ -327,11 +329,7 @@ Post install:
     {
         default-applications:
         {
-            # xbps-install -Sy firefox vscode foot thunar element-desktop mpv baobab gimp grim slurp libreoffice-base
-        }
-        foot-openssh:
-        {
-            $ TERM=xterm-256color
+            # xbps-install -Sy firefox vscode foot thunar element-desktop mpv baobab gimp grim slurp
         }
     }
 }
\ No newline at end of file