diff --git a/files/settings/i3.config b/files/settings/i3.config
index 17b4557..c6d4c52 100644
--- a/files/settings/i3.config
+++ b/files/settings/i3.config
@@ -149,34 +149,33 @@ bindsym $ctrl+$shift+3 workspace $ws3; exec codium-flatpak;
 ## Brightness ##
 # Use the bracket keys to change the brightness.
 # light requires sudo privileges unless video group and udev are configured.
-bindsym $mod+bracketleft exec --no-startup-id "light -U 5; notify-send 'Brightness -' $(light -G)"
-bindsym $mod+bracketright exec --no-startup-id "light -A 5; notify-send 'Brightness +' $(light -G)"
-bindsym shift+$mod+bracketleft exec --no-startup-id "light -U 20; notify-send 'Brightness ---' $(light -G)"
-bindsym shift+$mod+bracketright exec --no-startup-id "light -A 20; notify-send 'Brightness +++' $(light -G)"
+bindsym $mod+bracketleft        exec --no-startup-id 'light -U 5;  notify-send "Brightness -  " $(light -G)'
+bindsym $mod+bracketright       exec --no-startup-id 'light -A 5;  notify-send "Brightness +  " $(light -G)'
+bindsym shift+$mod+bracketleft  exec --no-startup-id 'light -U 20; notify-send "Brightness ---" $(light -G)'
+bindsym shift+$mod+bracketright exec --no-startup-id 'light -A 20; notify-send "Brightness +++" $(light -G)'
 
 # Also get the actual brightness keys to work!!
-bindsym XF86MonBrightnessUp exec --no-startup-id "light -A 5; notify-send 'Brightness +' $(light -G)"
-bindsym XF86MonBrightnessDown exec --no-startup-id "light -U 5; notify-send 'Brightness -' $(light -G)"
-bindsym shift+XF86MonBrightnessUp exec --no-startup-id "light -A 20; notify-send 'Brightness +++' $(light -G)"
-bindsym shift+XF86MonBrightnessDown exec --no-startup-id "light -U 20; notify-send 'Brightness ---' $(light -G)"
+bindsym XF86MonBrightnessUp         exec --no-startup-id 'light -A 5;  notify-send "Brightness +  " $(light -G)'
+bindsym XF86MonBrightnessDown       exec --no-startup-id 'light -U 5;  notify-send "Brightness -  " $(light -G)'
+bindsym shift+XF86MonBrightnessUp   exec --no-startup-id 'light -A 20; notify-send "Brightness +++" $(light -G)'
+bindsym shift+XF86MonBrightnessDown exec --no-startup-id 'light -U 20; notify-send "Brightness ---" $(light -G)'
 
 
 ## Volume ##
 # The volume function is from https://git.hyperling.com/me/env-ansible
-# TBD: Why is the displayed volume not showing up like `light -G` above?
 
 # Use the comma and period keys to change volume.
-bindsym $mod+comma exec --no-startup-id bash -c 'source /usr/local/bin/volume.function && volume -5 && notify-send "Volume -" $(volume)'
-bindsym $mod+period exec --no-startup-id bash -c "source /usr/local/bin/volume.function && volume +5 && notify-send 'Volume +' $(volume)"
-bindsym shift+$mod+comma exec --no-startup-id bash -c "source /usr/local/bin/volume.function && volume -25 && notify-send 'Volume ---' $(volume)"
-bindsym shift+$mod+period exec --no-startup-id bash -c "source /usr/local/bin/volume.function && volume +25 && notify-send 'Volume +++' $(volume)"
+bindsym $mod+comma        exec --no-startup-id bash -c 'source /usr/local/bin/volume.function && volume -5  && notify-send "Volume -  " $(volume)'
+bindsym $mod+period       exec --no-startup-id bash -c 'source /usr/local/bin/volume.function && volume +5  && notify-send "Volume +  " $(volume)'
+bindsym shift+$mod+comma  exec --no-startup-id bash -c 'source /usr/local/bin/volume.function && volume -25 && notify-send "Volume ---" $(volume)'
+bindsym shift+$mod+period exec --no-startup-id bash -c 'source /usr/local/bin/volume.function && volume +25 && notify-send "Volume +++" $(volume)'
 
 # Actual volume keys.
-bindsym XF86AudioMute exec --no-startup-id bash -c "source /usr/local/bin/volume.function && volume mute && notify-send 'Volume Muted' $(volume)"
-bindsym XF86AudioRaiseVolume exec --no-startup-id bash -c "source /usr/local/bin/volume.function && volume +5 && notify-send 'Volume +' $(volume)"
-bindsym XF86AudioLowerVolume exec --no-startup-id bash -c "source /usr/local/bin/volume.function && volume -5 && notify-send 'Volume -' $(volume)"
-bindsym shift+XF86AudioRaiseVolume exec --no-startup-id bash -c "source /usr/local/bin/volume.function && volume +25 && notify-send 'Volume +++' $(volume)"
-bindsym shift+XF86AudioLowerVolume exec --no-startup-id bash -c "source /usr/local/bin/volume.function && volume -25 && notify-send 'Volume ---' $(volume)"
+bindsym XF86AudioMute              exec --no-startup-id bash -c 'source /usr/local/bin/volume.function && volume mute && notify-send "Volume Muted" $(volume)'
+bindsym XF86AudioRaiseVolume       exec --no-startup-id bash -c 'source /usr/local/bin/volume.function && volume +5   && notify-send "Volume +    " $(volume)'
+bindsym XF86AudioLowerVolume       exec --no-startup-id bash -c 'source /usr/local/bin/volume.function && volume -5   && notify-send "Volume -    " $(volume)'
+bindsym shift+XF86AudioRaiseVolume exec --no-startup-id bash -c 'source /usr/local/bin/volume.function && volume +25  && notify-send "Volume +++  " $(volume)'
+bindsym shift+XF86AudioLowerVolume exec --no-startup-id bash -c 'source /usr/local/bin/volume.function && volume -25  && notify-send "Volume ---  " $(volume)'
 
 
 # Define names for default workspaces for which we configure key bindings later on.