diff --git a/install/scripts.fish b/install/scripts.fish
index bc5770b..8594828 100755
--- a/install/scripts.fish
+++ b/install/scripts.fish
@@ -12,7 +12,7 @@ update-repo scripts $dist
 
 # Install to path
 mkdir -p ~/.local/bin
-ln -s $dist/main.fish ~/.local/bin/caelestia
+ln -sf $dist/main.fish ~/.local/bin/caelestia
 
 # Install completions
 mkdir -p $CONFIG/fish/completions
diff --git a/main.fish b/main.fish
index 4515f66..5ff66ad 100755
--- a/main.fish
+++ b/main.fish
@@ -7,8 +7,7 @@ set -l src (dirname (realpath (status filename)))
 if test "$argv[1]" = shell
     # Start shell if no args
     if test -z "$argv[2..]"
-        set -q CAELESTIA_SHELL_DIR && set -l shell_dir $CAELESTIA_SHELL_DIR || set -l shell_dir $CONFIG/shell
-        $shell_dir/run.fish
+        $C_DATA/shell/run.fish
     else
         if contains -- 'caelestia' (astal -l)
             log "Sent command '$argv[2..]' to shell"