diff --git a/dream.sh b/dream.sh
index 9ffb421..50dc6e1 100644
--- a/dream.sh
+++ b/dream.sh
@@ -150,20 +150,22 @@ check-and-install() {
   for pkg in "$@"; do
     ((accum++))
     local count="[${accum}/${pkglength}]"
-    echo "$count"
     if ! command-exists $pkg; then
-      pkg-eval spin '"$(pen yellow bold $count Installing" $pkg)'
+      spin "$(pen yellow bold $count)$(pen bold $pkg)"
+      # pkg-eval spin '"$(pen yellow bold $count Installing" $pkg)'
       if run --err err pkg-install $pkg; then
         upclear
-        pkg-eval check '"$(pen bold green ${accum}/${pkglenght} Installed)" $pkg'
+        check "$(pen bold grey Installed) $(pen $pkg $count)"
+        # pkg-eval check '"$(pen bold green ${accum}/${pkglenght} Installed)" $pkg'
       else
         upclear
-        pkg-eval err 'Something went wrong! Could not install "$(pen bold red $count $pkg)"'
+        throw "$(pen bold red Something went wrong! Could not install) $(pen bold grey $pkg $count)"
+        # pkg-eval err 'Something went wrong! Could not install "$(pen bold red $count $pkg)"'
         echo-error "${err:-}"
       fi
     else
       upclear
-      pkg-eval check '$pkg $(pen grey bold "was already installed")'
+      check green bold "$(pen pkg) $(pen grey bold "was already installed")"
     fi
     sleep 0.001
   done