diff --git a/setup.bat b/setup.bat
index 0387244..7dff941 100644
--- a/setup.bat
+++ b/setup.bat
@@ -1,5 +1,4 @@
 @echo off
-setlocal enabledelayedexpansion
 title T-Order Tablet Automation Tool (Multi-Device Loop)
 chcp 949 > nul
 
@@ -12,16 +11,16 @@ set "PKG_PHOTOS=com.synology.projectkailash"
 
 :: °æ·Î ¼³Á¤ (½ºÅ©¸³Æ® ±âÁØ »ó´ë°æ·Î)
 set "SCRIPT_DIR=%~dp0"
-set "SDK_DIR=%SCRIPT_DIR%sdk"
-set "DATA_DIR=%SCRIPT_DIR%data"
+set "SDK_DIR=%SCRIPT_DIR%sdk\"
+set "DATA_DIR=%SCRIPT_DIR%data\"
 
-set "WP_FILE=%DATA_DIR%\wallpaper.jpg"
-set "MDR_FILE=%DATA_DIR%\macrodroid.mdr"
-set "PHOTOS_APK=%DATA_DIR%\photos.apk"
-set "MD_APK=%DATA_DIR%\macrodroid.apk"
+set "WP_FILE=%DATA_DIR%wallpaper.jpg"
+set "MDR_FILE=%DATA_DIR%macrodroid.mdr"
+set "PHOTOS_APK=%DATA_DIR%photos.apk"
+set "MD_APK=%DATA_DIR%macrodroid.apk"
 
 :: ADB °æ·Î ¼³Á¤
-set "ADB=%SDK_DIR%\adb.exe"
+set "ADB=%SDK_DIR%adb.exe"
 :: ------------------
 
 if "%DEBUG_MODE%"=="ON" (set "LOG=") else (set "LOG=>nul 2>&1")
@@ -46,7 +45,6 @@ echo ===========================================================
 
 :CHECK_DEVICE
 echo [%TIME%] [Áغñ] ±â±â ¿¬°á ´ë±â Áß...
-:: ¹«ÇÑ ´ë±â ¹æÁö À§ÇØ ÂªÀº ´ë±â ÈÄ Àç½Ãµµ ·çÇÁ
 "%ADB%" wait-for-device
 echo [È®ÀÎ] ±â±â°¡ ¿¬°áµÇ¾ú½À´Ï´Ù! ÀÛ¾÷À» ½ÃÀÛÇÕ´Ï´Ù.
 timeout /t 2 > nul
@@ -68,8 +66,8 @@ echo ^> 
 echo.
 echo ^> YouTube µî ºÒÇÊ¿äÇÑ ½Ã½ºÅÛ ¾Û Á¦°Å Áß...
 for %%a in (com.google.android.youtube com.google.android.projection.gearhead com.google.android.keep com.teamviewer.host.market com.teamviewer.quicksupport.market) do (
-    "%ADB%" shell pm list packages %%a 2>nul | findstr "%%a" >nul
-    if !errorlevel! equ 0 (
+    "%ADB%" shell pm list packages %%a | findstr "%%a" >nul
+    if not errorlevel 1 (
         echo [Á¦°Å] %%a - µ¥ÀÌÅÍ ÃʱâÈ­ ÈÄ Á¦°Å ÁøÇà.
         "%ADB%" shell "am force-stop %%a; pm clear %%a; pm uninstall --user 0 %%a; pm disable-user --user 0 %%a" %LOG%
     ) else (
@@ -81,50 +79,40 @@ echo ^> STEP 2 
 echo.
 echo STEP 3. ½Ã½ºÅÛ ÃÖÀûÈ­ (µðÁöÅÐ »çÀÌ´ÏÁö ¸ðµå)
 echo -----------------------------------------------------------
-:: ¾Ö´Ï¸ÞÀÌ¼Ç ºñÈ°¼ºÈ­
 "%ADB%" shell settings put global window_animation_scale 0 %LOG%
 "%ADB%" shell settings put global transition_animation_scale 0 %LOG%
 "%ADB%" shell settings put global animator_duration_scale 0 %LOG%
 echo ^> ¾Ö´Ï¸ÞÀÌ¼Ç ºñÈ°¼ºÈ­ ¿Ï·á
 
-:: È­¸é ²¨Áü ¹æÁö (ÃÖ´ë°ª ¼³Á¤)
 "%ADB%" shell settings put system screen_off_timeout 2147483647 %LOG%
 "%ADB%" shell settings put global stay_on_while_plugged_in 3 %LOG%
 echo ^> È­¸é »ó½Ã ÄÑÁü ¼³Á¤ ¿Ï·á
 
-:: È­¸é ¹à±â ÃÖ´ëÈ­ ¹× ÀÚµ¿ ¹à±â ºñÈ°¼ºÈ­
 "%ADB%" shell settings put system screen_brightness_mode 0 %LOG%
 "%ADB%" shell settings put system screen_brightness 255 %LOG%
 echo ^> È­¸é ¹à±â ÃÖ´ë ¼³Á¤ ¿Ï·á
 
-:: ÀÚµ¿ È­¸é ȸÀü È°¼ºÈ­ (½½¶óÀ̵å¼î È­¸é ȸÀü ´ëÀÀ)
 "%ADB%" shell settings put system accelerometer_rotation 1 %LOG%
 echo ^> ÀÚµ¿ ȸÀü È°¼ºÈ­ ¿Ï·á
 
-:: ³»ºñ°ÔÀ̼Ç/»óŹ٠Ȱ¼ºÈ­ (Synology Photos ½½¶óÀ̵å¼î°¡ ÀÚü Àüüȭ¸é ó¸®)
 "%ADB%" shell settings put global policy_control null %LOG%
 echo ^> ½Ã½ºÅÛ UI È°¼ºÈ­ ¿Ï·á
 
-:: ÅÍÄ¡/Å° »ç¿îµå ºñÈ°¼ºÈ­
 "%ADB%" shell settings put system sound_effects_enabled 0 %LOG%
 "%ADB%" shell settings put system haptic_feedback_enabled 0 %LOG%
 echo ^> ÅÍÄ¡ »ç¿îµå ºñÈ°¼ºÈ­ ¿Ï·á
 
-:: ¾Ë¸² ¼û±è (¹æÇØ ±ÝÁö ¸ðµå)
 "%ADB%" shell settings put global zen_mode 2 %LOG%
 echo ^> ¾Ë¸² ¼û±è ¸ðµå È°¼ºÈ­ ¿Ï·á
 
-:: ÀÚµ¿ ¾÷µ¥ÀÌÆ® ºñÈ°¼ºÈ­
 "%ADB%" shell settings put global package_verifier_enable 0 %LOG%
 "%ADB%" shell pm disable-user --user 0 com.google.android.gms.update %LOG%
 echo ^> ÀÚµ¿ ¾÷µ¥ÀÌÆ® ºñÈ°¼ºÈ­ ¿Ï·á
 
-:: ÀýÀü ¸ðµå ºñÈ°¼ºÈ­
 "%ADB%" shell settings put global low_power 0 %LOG%
 "%ADB%" shell dumpsys deviceidle disable %LOG%
 echo ^> ÀýÀü ¸ðµå ºñÈ°¼ºÈ­ ¿Ï·á
 
-:: °³¹ßÀÚ ¿É¼Ç - USB µð¹ö±ë À¯Áö
 "%ADB%" shell settings put global adb_enabled 1 %LOG%
 echo ^> USB µð¹ö±ë À¯Áö ¼³Á¤ ¿Ï·á
 
@@ -150,10 +138,7 @@ if errorlevel 1 (
 
 if exist "%WP_FILE%" (
     "%ADB%" push "%WP_FILE%" /data/local/tmp/wallpaper.jpg %LOG%
-    "%ADB%" shell am start -a android.service.wallpaper.CROP_AND_SET_WALLPAPER ^
-        -d file:///data/local/tmp/wallpaper.jpg -t image/jpeg ^
-        -n com.android.wallpaper/.picker.StandalonePreviewActivity ^
-        --el set_wallpaper 1 --ez finish_on_done true -f 0x10808000 %LOG%
+    "%ADB%" shell am start -a android.service.wallpaper.CROP_AND_SET_WALLPAPER -d file:///data/local/tmp/wallpaper.jpg -t image/jpeg -n com.android.wallpaper/.picker.StandalonePreviewActivity --el set_wallpaper 1 --ez finish_on_done true -f 0x10808000 %LOG%
     
     echo ^> [´ë±â] ¹è°æÈ­¸é ¼³Á¤ ¿Ï·á ´ë±â Áß...
     :WAIT_WP
@@ -201,7 +186,6 @@ echo  [%TIME%] 
 echo  ±â±â ¿¬°áÀ» ÇØÁ¦ÇÏ¸é »õ·Î¿î ±â±â ´ë±â »óÅ·ΠÀüȯµË´Ï´Ù.
 echo ===========================================================
 
-:: ±â±â ¿¬°á ÇØÁ¦ ´ë±â (±â±â¸¦ »ÌÀ» ¶§±îÁö ´ë±â)
 :WAIT_DISCONNECT
 "%ADB%" devices | findstr /v "List" | findstr "device" > nul
 if not errorlevel 1 (