diff --git a/lib/git-crypt.sh b/lib/git-crypt.sh
index 3417f05..8dfef4c 100644
--- a/lib/git-crypt.sh
+++ b/lib/git-crypt.sh
@@ -154,7 +154,7 @@ gcrypt_print_key_instructions() {
   local genome_name="$1"
   local v_url="${VAULTWARDEN_URL:-https://your-vaultwarden.com}"
 
-  echo -e "\n  ── ${BOLD}Key Management: ${genome_name}${NC} ──\n"
+  printf "\n  ── %b ──\n\n" "${BOLD}Key Management: ${genome_name}${NC}"
   echo "  1. Encode the key to base64:"
   echo "       base64 < ${KEYS_DIR}/${genome_name}.key"
   echo ""
diff --git a/lib/output.sh b/lib/output.sh
index 1a65c90..0626fef 100644
--- a/lib/output.sh
+++ b/lib/output.sh
@@ -15,11 +15,12 @@ else
   GREEN='' YELLOW='' CYAN='' RED='' BOLD='' NC=''
 fi
 
-info()    { echo -e "${CYAN}[INFO]${NC}    $*"; }
-success() { echo -e "${GREEN}[OK]${NC}      $*"; }
-warn()    { echo -e "${YELLOW}[WARN]${NC}    $*"; }
-error()   { echo -e "${RED}[ERROR]${NC}   $*" >&2; }
-step()    { echo -e "\n${BOLD}${YELLOW}━━━ $* ━━━${NC}"; }
+info()    { printf "%b\n"   "${CYAN}[INFO]${NC}    $*"; }
+success() { printf "%b\n"   "${GREEN}[OK]${NC}      $*"; }
+warn()    { printf "%b\n"   "${YELLOW}[WARN]${NC}    $*"; }
+error()   { printf "%b\n"   "${RED}[ERROR]${NC}   $*" >&2; }
+die()     { error "$*"; exit 1; }
+step()    { printf "\n%b\n" "${BOLD}${YELLOW}━━━ $* ━━━${NC}"; }
 
 box() {
   local max_len=0
@@ -28,9 +29,9 @@ box() {
   done
   local border
   border=$(printf '─%.0s' $(seq 1 $((max_len + 2))))
-  echo -e "${CYAN}┌${border}┐${NC}"
+  printf "%b\n" "${CYAN}┌${border}┐${NC}"
   for line in "$@"; do
     printf "${CYAN}│${NC} %-${max_len}s ${CYAN}│${NC}\n" "$line"
   done
-  echo -e "${CYAN}└${border}┘${NC}"
+  printf "%b\n" "${CYAN}└${border}┘${NC}"
 }