diff --git a/.config/sway/config b/.config/sway/config
index e8c1b8a..e1a3bef 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -73,7 +73,7 @@ input * {
     xkb_layout us
     xkb_variant dvp
     xkb_options "caps:escape"
-    scroll_factor 5
+    scroll_factor 3
 }
 
 input type:touchpad {
@@ -249,7 +249,7 @@ bar {
 # Colors:
 #
 client.focused #202020 #202020 #999999 #268bd2 #cb4b16bb
-client.focused_inactive #202020 #202020 #999999 #268bd2 #cb4b16bb
+client.focused_inactive #202020 #202020 #999999 #cb4b16bb #cb4b16bb
 client.unfocused #202020dd #202020dd #999999 #00ff00 #cb4b1600
 client.urgent #202020 #dc322f #fdf6e3 #cb4b1699 #cb4b1600
 #
@@ -263,12 +263,23 @@ bindsym --locked XF86AudioRaiseVolume exec "pactl set-sink-volume @DEFAULT_SINK@
 bindsym --locked XF86AudioLowerVolume exec "pactl set-sink-volume @DEFAULT_SINK@ -2%"
 bindsym --locked XF86AudioMute exec "pactl set-sink-mute @DEFAULT_SINK@ toggle"
 bindsym --locked XF86AudioMicMute exec "pactl set-source-mute @DEFAULT_SOURCE@ toggle"
-bindsym --locked XF86MonBrightnessDown exec "brightnessctl set 5%-"
-bindsym --locked XF86MonBrightnessUp exec "brightnessctl set +5%"
 bindsym --locked XF86AudioPlay exec "playerctl play-pause"
+bindsym --locked XF86AudioPause exec "playerctl pause"
 bindsym --locked XF86AudioNext exec "playerctl next"
 bindsym --locked XF86AudioPrev exec "playerctl previous"
 bindsym --locked XF86AudioStop exec "playerctl stop"
+bindsym --locked XF86MonBrightnessDown exec "brightnessctl set 5%-"
+bindsym --locked XF86MonBrightnessUp exec "brightnessctl set +5%"
+bindsym --locked Shift+XF86AudioLowerVolume exec "brightnessctl set 5%-"
+bindsym --locked Shift+XF86AudioRaiseVolume exec "brightnessctl set +5%"
+# 
+# Screenshot controls:
+#
+set $screenshots $HOME/Pictures/screenshots
+bindsym Print exec grim -t png $screenshots"/Screenshot $(date '+%Y-%m-%d at %H-%m-%S').png"
+bindsym Shift+Print exec grim -g "$(slurp)" -t png $screenshots"/Screenshot $(date '+%Y-%m-%d at %H-%m-%S').png"
+# TODO:
+bindsym $mod+Shift+Print exec grim-upload -s
 #
 # Gaps:
 #
diff --git a/.config/sway/enable b/.config/sway/enable
index c1b174a..243e026 100755
--- a/.config/sway/enable
+++ b/.config/sway/enable
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+mkdir -p enabled
 rm -f enabled/*
 
 for name in "$@"; do
diff --git a/.config/sway/home b/.config/sway/home
index 95a99ae..5f8b1f0 100644
--- a/.config/sway/home
+++ b/.config/sway/home
@@ -22,6 +22,20 @@ default_orientation horizontal
 output "Unknown PL270 0000000000001" position 0 0 transform 90
 output "Apple Computer Inc Color LCD 0x00000000" position 2160 1800 transform 0 scale 1.5
 
+#
+# Controls
+#
+# Remember to configure udev. See https://blog.tcharles.fr/ddc-ci-screen-control-on-linux/
+bindsym --locked Alt+XF86AudioLowerVolume exec "ddcutil setvcp --model PL270 0x10 - 0x0a"
+bindsym --locked Alt+XF86AudioRaiseVolume exec "ddcutil setvcp --model PL270 0x10 + 0x0a"
+
+#
+# Scroll tweaks
+#
+input * {
+    scroll_factor 4
+}
+
 #
 # Switch configuration
 #
diff --git a/.local/bin/brightness b/.local/bin/brightness
deleted file mode 100755
index daac33e..0000000
--- a/.local/bin/brightness
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [[ "$(uname -s)" == "Linux" ]]; then
-	echo $1 | sudo tee /sys/class/backlight/intel_backlight/brightness
-else
-	echo "only works on linux"
-fi
diff --git a/.local/bin/cleanup-desktop b/.local/bin/cleanup-desktop
deleted file mode 100755
index 62c4598..0000000
--- a/.local/bin/cleanup-desktop
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-set -e
-echo "set -ex"
-
-SCREENSHOTS="$HOME/Pictures/screenshots"
-PROJECTS="$HOME/Documents"
-NOTES="$HOME/Documents"
-
-# Move screenshots
-echo "echo Moving screenshots"
-mkdir -p "$SCREENSHOTS"
-for f in ~/Desktop/Screenshot* ~/Desktop/"Screen Recording"*; do
-	if ! [[ -f "$f" ]]; then
-		continue;
-	fi
-	basename="$(basename "$f")"
-	if [[ -e "$SCREENSHOTS/$basename" ]]; then
-		basename="$basename $(date +"%Y%m%d-%H%M%S")"
-	fi
-	echo mv "\"$f\"" "\"$SCREENSHOTS/$basename\""
-done
-
-# Move projects
-echo "echo Moving projects"
-mkdir -p "$PROJECTS"
-for f in ~/Desktop/*; do
-	if ! [[ -d "$f" ]]; then
-		continue;
-	fi
-	basename="$(basename "$f")"
-	if [[ -e "$PROJECTS/$basename" ]]; then
-		basename="$basename $(date +"%Y%m%d-%H%M%S")"
-	fi
-	echo mv "\"$f\"" "\"$PROJECTS/$basename\""
-done
-
-# Move notes
-echo "echo Moving notes"
-mkdir -p "$NOTES"
-for f in ~/Desktop/*.txt; do
-	if ! [[ -f "$f" ]]; then
-		continue;
-	fi
-	basename="$(basename "$f")"
-	if [[ -e "$NOTES/$basename" ]]; then
-		basename="${basename%.txt} $(date +"%Y%m%d-%H%M%S").txt"
-	fi
-	echo mv "\"$f\"" "\"$NOTES/$basename\""
-done
-
-echo "echo Done!"
diff --git a/.local/bin/f b/.local/bin/f
new file mode 100755
index 0000000..5c57524
--- /dev/null
+++ b/.local/bin/f
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ -z $1 ]; then
+	echo "Usage: $0 freq"
+	exit 1
+fi
+
+pkexec cpupower frequency-set --max $1
diff --git a/.zshrc b/.zshrc
index 64a9530..2f6cd30 100644
--- a/.zshrc
+++ b/.zshrc
@@ -28,7 +28,11 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
 	export CLICOLOR=1
 else
 	eval $(dircolors -b $HOME/.dircolors)
-	alias ls='ls --color=auto'
+	if [[ -L ~/.config/sway/enabled/home ]]; then
+		alias ls='ls --color=auto -l -h'
+	else
+		alias ls='ls --color=auto'
+	fi
 fi
 zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}