diff --git a/main.fish b/main.fish
index 5dbc043..4515f66 100755
--- a/main.fish
+++ b/main.fish
@@ -37,6 +37,7 @@ if test "$argv[1]" = scheme
         mkdir -p $C_STATE/scheme
         cp $src/data/schemes/$argv[2].txt $C_STATE/scheme/current.txt
         echo -n $argv[2] > $C_STATE/scheme/current-name.txt
+        log "Changed scheme to $argv[2]"
     else
         error "Invalid scheme: $argv[2]"
     end
diff --git a/util.fish b/util.fish
index 027b546..a1d9f98 100644
--- a/util.fish
+++ b/util.fish
@@ -22,7 +22,7 @@ function input -a text
     _out blue INPUT $text $argv[2..]
 end
 
-set -q XDG_DATA_HOME && set -l C_DATA $XDG_DATA_HOME/caelestia || set -l C_DATA $HOME/.local/share/caelestia
-set -q XDG_STATE_HOME && set -l C_STATE $XDG_STATE_HOME/caelestia || set -l C_STATE $HOME/.local/state/caelestia
-set -q XDG_CACHE_HOME && set -l C_CACHE $XDG_CACHE_HOME/caelestia || set -l C_CACHE $HOME/.cache/caelestia
-set -q XDG_CONFIG_HOME && set -l CONFIG $XDG_CONFIG_HOME || set -l CONFIG $HOME/.config
+set -q XDG_DATA_HOME && set C_DATA $XDG_DATA_HOME/caelestia || set C_DATA $HOME/.local/share/caelestia
+set -q XDG_STATE_HOME && set C_STATE $XDG_STATE_HOME/caelestia || set C_STATE $HOME/.local/state/caelestia
+set -q XDG_CACHE_HOME && set C_CACHE $XDG_CACHE_HOME/caelestia || set C_CACHE $HOME/.cache/caelestia
+set -q XDG_CONFIG_HOME && set CONFIG $XDG_CONFIG_HOME || set CONFIG $HOME/.config