diff --git a/test.sh b/test.sh
index cbcb01b..e83cf01 100755
--- a/test.sh
+++ b/test.sh
@@ -39,18 +39,18 @@ for file in "$MATCH_DIR"/*.y*ml; do
         while IFS= read -r line; do
             line_num=$((line_num + 1))
             
-            # Check if this is a trigger line
-            if echo "$line" | grep -qE '^\s*-\s*trigger:'; then
+            # Check if this is a replace line (comes first due to alphabetical ordering)
+            if echo "$line" | grep -qE '^\s*-\s*replace:'; then
+                replace_line=$line_num
+                replace_value=$(echo "$line" | sed 's/.*replace:\s*"\([^"]*\)".*/\1/')
+                trigger_value=""  # Reset trigger value for new entry
+                trigger_line=""   # Reset trigger line
+            # Check if this is a trigger line (should be right after replace)
+            elif echo "$line" | grep -qE '^\s*trigger:'; then
                 trigger_line=$line_num
                 trigger_value=$(echo "$line" | sed 's/.*trigger:\s*"\([^"]*\)".*/\1/')
-                replace_value=""  # Reset replace value for new trigger
-                replace_line=""   # Reset replace line
-            # Check if this is a replace line (should be right after trigger)
-            elif echo "$line" | grep -qE '^\s*replace:'; then
-                replace_value=$(echo "$line" | sed 's/.*replace:\s*"\([^"]*\)".*/\1/')
-                replace_line=$line_num
                 # Save trigger data: trigger|replace|file|trigger_line|replace_line
-                if [ -n "$trigger_value" ]; then
+                if [ -n "$replace_value" ]; then
                     echo "$trigger_value|$replace_value|$(basename "$file")|$trigger_line|$replace_line" >> "$ALL_TRIGGERS_DATA"
                 fi
             fi
@@ -140,8 +140,8 @@ REPLACE_VALUES=$(mktemp)
 # Read gifs.yml file and extract replace values
 echo -e "${CYAN}${BOLD}Scanning gifs.yml for replace values...${RESET}"
 if [ -f "$MATCH_DIR/gifs.yml" ]; then
-    # We match lines like: `    replace: "https://c.tenor.com/some-value/tenor.gif"`
-    grep -E '^\s*replace:' "$MATCH_DIR/gifs.yml" | sed 's/.*replace:\s*"\([^"]*\)".*/\1/' >> "$REPLACE_VALUES"
+    # We match lines like: `  - replace: "https://c.tenor.com/some-value/tenor.gif"`
+    grep -E '^\s*-\s*replace:' "$MATCH_DIR/gifs.yml" | sed 's/.*replace:\s*"\([^"]*\)".*/\1/' >> "$REPLACE_VALUES"
 else
     echo -e "${RED}${BOLD}Error:${RESET} ${RED}gifs.yml file not found in $MATCH_DIR directory!${RESET}"
     rm "$REPLACE_VALUES"