diff --git a/sway/i3status.config b/sway/i3status.config
index fed226e..0743507 100644
--- a/sway/i3status.config
+++ b/sway/i3status.config
@@ -11,51 +11,31 @@ general {
   interval = 5
 }
 
-# order - wireless, battery, load, date/time
+# order - wireless, battery, volume, load, date/time
 order += "wireless _first_"
 order += "battery 0"
+order += "volume master"
 order += "load"
 order += "tztime local"
 
-# unused
-#order += "ipv6"
-#order += "disk /"
-#order += "run_watch DHCP"
-#order += "run_watch VPN"
-#order += "ethernet _first_"
-#order += "volume master"
-
+# module configuration
 wireless _first_ {
   format_up = " %essid (%quality)"
   format_down = ""
 }
 
-ethernet _first_ {
-  # if you use %speed, i3status requires root privileges
-  format_up = "E: %ip (%speed)"
-  format_down = "E: down"
-}
-
 battery 0 {
-	last_full_capacity = true
-	hide_seconds = true
-	integer_battery_capacity = true
+  last_full_capacity = true
+  hide_seconds = true
+  integer_battery_capacity = true
   format = "%status %percentage (%remaining)"
-	status_chr = ""
-	status_bat = ""
-	status_full = ""
-}
-
-run_watch DHCP {
-  pidfile = "/var/run/dhclient*.pid"
-}
-
-run_watch VPN {
-  pidfile = "/var/run/vpnc/pid"
+  status_chr = ""
+  status_bat = ""
+  status_full = ""
 }
 
 tztime local {
-	format = "%F %H:%M"
+  format = "%F %H:%M"
 }
 
 load {
@@ -67,9 +47,7 @@ disk "/" {
 }
 
 volume master {
-  format = "♪: %volume"
-  format_muted = "♪: muted (%volume)"
-  device = "default"
-  mixer = "Master"
-  mixer_idx = 0
+  format = "♪%volume"
+  format_muted = "♪%volume"
+  device = "pulse"
 }
diff --git a/sway/sway.config b/sway/sway.config
index abdeb78..9e51ab4 100644
--- a/sway/sway.config
+++ b/sway/sway.config
@@ -140,19 +140,24 @@ output LVDS-1 resolution 1366x768 position 0,0
     # Show the next scratchpad window or hide the focused scratchpad window.
     # If there are multiple scratchpad windows, this command cycles through them.
     bindsym $mod+minus scratchpad show
-
+#
+# Audio:
+#
+    bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 1 toggle
+    bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 1 -5%
+    bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 1 +5%
 #
 # Status Bar:
 #
 bar {
-  status_command i3status
-  font pango:DejaVu Sans Mono, Icons 10
-  position top
-  colors {
-	  statusline #ffffff
-	  background #272822
-	  inactive_workspace #32323200 #32323200 #5c5c5c
-  }
+    status_command i3status
+    font pango:DejaVu Sans Mono, Icons 10
+    position top
+    colors {
+        statusline #ffffff
+        background #272822
+        inactive_workspace #32323200 #32323200 #5c5c5c
+}
 }
 # Read sway-bar(5) for more information about this section.
 
diff --git a/zsh/zlogin b/zsh/zlogin
index 70b7059..55ffd22 100644
--- a/zsh/zlogin
+++ b/zsh/zlogin
@@ -1 +1 @@
-[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx
+[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec sway