diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 8e2adbb..d69d4ce 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -221,17 +221,16 @@ bindsym $mod+r mode "resize"
 # Audio
 #
 
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle
+bindsym XF86AudioRaiseVolume exec volumectl -u up
+bindsym XF86AudioLowerVolume exec volumectl -u down
+bindsym XF86AudioMute exec volumectl toggle-mute
+bindsym XF86AudioMicMute exec volumectl -m toggle-mute
 
 #
 # Brightness
 #
-bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 5%- 
-bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set 5%+ 
-
+bindsym XF86MonBrightnessUp exec lightctl up
+bindsym XF86MonBrightnessDown exec lightctl down
 
 #
 # Decoration
diff --git a/sway/.config/sway/config.d/misc_autostart b/sway/.config/sway/config.d/misc_autostart
index 2f2f681..b33a802 100644
--- a/sway/.config/sway/config.d/misc_autostart
+++ b/sway/.config/sway/config.d/misc_autostart
@@ -6,9 +6,10 @@ exec_always blueman-applet
 exec_always /usr/bin/nm-applet --indicator
 exec_always nextcloud
 exec_always /usr/libexec/goa-daemon --replace
-exec_always gammastep-indicator
-exec_always pkill kanshi; exec_always kanshi
+exec gammastep-indicator
 exec mako 
+exec "avizo-service"
+exec_always pkill kanshi; exec_always kanshi
 
 exec swaymsg "workspace $ws1; exec firefox;"
 exec swaymsg "workspace $ws2; exec thunderbird;"