diff --git a/README.md b/README.md
index 603999cb7edb0c91312f0053b0be8dd8c37f8f60..77f6788756b6d26f11cee167eaca51502787a0e6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Easy Installer
-**Current Version:** v0.14.0
+**Current Version:** v0.15.0
 **Current released Version:** v0.13.3-beta
 
 Members:
@@ -41,7 +41,12 @@ developer:
 - Israel Yago pereira
 
 ## Changelogs
-### v0.14.0 (current-candidate)
+
+### v0.15.0 (candidate)
+- No shortcut created when installing from a non-admin account on Windows
+- e-recovery assets
+
+### v0.14.0
 - Update Readme
 - Update version number to v0.14.0
 - Use of the same unit (Mb, Gb..) on the download progress bar
diff --git a/flash-scripts/windows/install-from-e-recovery.bat b/flash-scripts/windows/install-from-e-recovery.bat
index 21a313b28a58e49d5214eaf5f82009300f035f76..afe42383ce0aa637804dd809209d15e0bab70db5 100644
--- a/flash-scripts/windows/install-from-e-recovery.bat
+++ b/flash-scripts/windows/install-from-e-recovery.bat
@@ -30,7 +30,7 @@ SET ARCHIVE_FILE=%~2
 SET FASTBOOT_FOLDER_PATH=%~3
 
 SET ADB_CMD="%FASTBOOT_FOLDER_PATH%adb"
-"%ADB_CMD%" "sideload" "%ARCHIVE_FILE%"
+%ADB_CMD% sideload %ARCHIVE_FILE%
 if errorlevel==0 (
   echo "Sideload OK"
   exit /b 0
diff --git a/flash-scripts/windows/oneplus-flashingUnlock.bat b/flash-scripts/windows/oneplus-flashingUnlock.bat
index 9e3c74ca7fcec601122305e01f10fea4b2795765..00219cc593703a4afae1b9b46f77f37c0ae4e4e2 100644
--- a/flash-scripts/windows/oneplus-flashingUnlock.bat
+++ b/flash-scripts/windows/oneplus-flashingUnlock.bat
@@ -39,6 +39,7 @@ IF not defined %FASTBOOT_FOLDER_PATH (
 
 SET FASTBOOT_PATH="%FASTBOOT_FOLDER_PATH%fastboot"
 
+	
 %FASTBOOT_PATH% getvar unlocked 2>&1 | findstr "yes"
 if  %errorlevel% == 0 (
 	echo "The device is unlocked"
@@ -48,15 +49,23 @@ if  %errorlevel% == 0 (
 ) else (
 	echo "The device is locked"
 	%FASTBOOT_PATH% flashing unlock
-	if errorlevel 1 ( exit /b 2)
-	echo "Unlocked..."	
 )
 
+
 :fastboot_detect
+setlocal enabledelayedexpansion
 ping 192.0.2.1 -n 1 -w 500 >nul
-%FASTBOOT_PATH% devices 2>&1 | findstr "fastboot"
-if %errorLevel% == 1 (
-	goto :fastboot_detect
+%FASTBOOT_PATH% devices 2>&1 | findstr fastboot
+echo !errorlevel!
+
+if '!errorlevel!' == '0' (
+	%FASTBOOT_PATH% getvar unlocked 2>&1 | findstr "yes"
+	echo !errorlevel!
+	
+	if '!errorLevel!' == '1' (
+		echo "Locked"
+		goto :fastboot_detect
+	)
 )
 
 echo "Unlocked continue process"
diff --git a/src/main/java/ecorp/easy/installer/AppConstants.java b/src/main/java/ecorp/easy/installer/AppConstants.java
index 6f7afe4edadd49b5c3bc7f3ce664467cfcf7ea35..62497b775cb49bb17327486301b551dde42f2a78 100644
--- a/src/main/java/ecorp/easy/installer/AppConstants.java
+++ b/src/main/java/ecorp/easy/installer/AppConstants.java
@@ -27,7 +27,7 @@ import java.nio.file.Paths;
  */
 public abstract class AppConstants {
 
-    public final static String APP_VERSION = "v0.14.0";
+    public final static String APP_VERSION = "v0.15.0";
     public final static String Separator = FileSystems.getDefault().getSeparator();
     public final static String OsName = System.getProperty("os.name");
     public final static String JavaHome = System.getProperty("java.home");
diff --git a/src/main/resources/images/install_instr_e_recovery_apply_update.png b/src/main/resources/images/install_instr_e_recovery_apply_update.png
new file mode 100644
index 0000000000000000000000000000000000000000..316d63b6e07bca4caee74961ac81821b4ca2bd6a
Binary files /dev/null and b/src/main/resources/images/install_instr_e_recovery_apply_update.png differ
diff --git a/src/main/resources/images/install_instr_e_recovery_apply_update_from_adb.png b/src/main/resources/images/install_instr_e_recovery_apply_update_from_adb.png
new file mode 100644
index 0000000000000000000000000000000000000000..502e099723071ec82d15665865fa5b10255252b0
Binary files /dev/null and b/src/main/resources/images/install_instr_e_recovery_apply_update_from_adb.png differ
diff --git a/src/main/resources/images/install_instr_e_recovery_cancel.png b/src/main/resources/images/install_instr_e_recovery_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..07431dce8194ed832d5a74952f346f1006de9525
Binary files /dev/null and b/src/main/resources/images/install_instr_e_recovery_cancel.png differ
diff --git a/src/main/resources/images/install_instr_e_recovery_factory_reset.png b/src/main/resources/images/install_instr_e_recovery_factory_reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..0193924354c1f42f679ab7b5bc1919bcb8444006
Binary files /dev/null and b/src/main/resources/images/install_instr_e_recovery_factory_reset.png differ
diff --git a/src/main/resources/images/install_instr_e_recovery_factory_reset_format_data.png b/src/main/resources/images/install_instr_e_recovery_factory_reset_format_data.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8d45502e9c24bd0fee2462400650af20514a658
Binary files /dev/null and b/src/main/resources/images/install_instr_e_recovery_factory_reset_format_data.png differ
diff --git a/src/main/resources/images/install_instr_e_recovery_factory_reset_format_data_validate=install_instr_e_recovery_factory_reset_format_data_validate.png.png b/src/main/resources/images/install_instr_e_recovery_factory_reset_format_data_validate=install_instr_e_recovery_factory_reset_format_data_validate.png.png
new file mode 100644
index 0000000000000000000000000000000000000000..52534726bf1d90ca2f5419db6c4ade6eabec4e06
Binary files /dev/null and b/src/main/resources/images/install_instr_e_recovery_factory_reset_format_data_validate=install_instr_e_recovery_factory_reset_format_data_validate.png.png differ
diff --git a/src/main/resources/images/install_instr_e_recovery_main.png b/src/main/resources/images/install_instr_e_recovery_main.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e699da8fb98fdbca24d229256548b2dd6f13ab4
Binary files /dev/null and b/src/main/resources/images/install_instr_e_recovery_main.png differ
diff --git a/src/main/resources/images/install_instr_e_recovery_reboot.png b/src/main/resources/images/install_instr_e_recovery_reboot.png
new file mode 100644
index 0000000000000000000000000000000000000000..79f5cd9b03b0662d01d4ab3fd3b43630a4df94d0
Binary files /dev/null and b/src/main/resources/images/install_instr_e_recovery_reboot.png differ
diff --git a/src/main/resources/instructions/imageName.properties b/src/main/resources/instructions/imageName.properties
index 290853573d5006cddc1548dd59ad2f25f5c08577..ada674ecb7ef25870c2eb70f91326862275a0eeb 100644
--- a/src/main/resources/instructions/imageName.properties
+++ b/src/main/resources/instructions/imageName.properties
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 - ECORP SAS 
+# Copyright 2019-2022 - ECORP SAS 
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ install_instr_startRec_pressPowerBixbyVolUp_e_reco=galaxyS9_Recovery_mode_400px.
 install_instr_e_recovery_factory_reset=install_instr_e_recovery_factory_reset.png
 install_instr_e_recovery_factory_reset_format_data=install_instr_e_recovery_factory_reset_format_data.png
 install_instr_e_recovery_factory_reset_format_data_validate=install_instr_e_recovery_factory_reset_format_data_validate.png
-install_instr_e_recovery_back=install_instr_e_recovery_back.png
+#install_instr_e_recovery_back=install_instr_e_recovery_back_NONE.png
 install_instr_e_recovery_apply_update=install_instr_e_recovery_apply_update.png
 install_instr_e_recovery_apply_update_from_adb=install_instr_e_recovery_apply_update_from_adb.png
 install_instr_e_recovery_reboot=install_instr_e_recovery_reboot.png
\ No newline at end of file
diff --git a/src/main/resources/lang/translation.properties b/src/main/resources/lang/translation.properties
index 1f8f5d3f43d792d1f5e9cb3f9d8fa11e75b1ec03..e17910e3f872fed175d037e09c5b899641937426 100644
--- a/src/main/resources/lang/translation.properties
+++ b/src/main/resources/lang/translation.properties
@@ -56,7 +56,7 @@ connect_lbl_3=In the next stages, we will help you activate 'Developer mode' if
 devMode_mTitle_main=Enable the Developer mode
 devMode_mTitle=Enable the Developer mode (Part 1)
 devMode_lbl=Please follow these steps:
-devMode_main= Your phone has just been unlocked, it has restarted
+devMode_main= Your phone has just been unlocked, it has restarted, skip all initialization steps
 devMode_instr_settings=Open the 'Settings' menu
 devMode_instr_build=Type 'Build' in the search bar
 devMode_instr_tap7=Tap 7 times on 'Build number'
@@ -198,6 +198,7 @@ install_instr_choose_e_recovery_validate_wait_for_result= After a while the devi
 install_instr_e_recovery_apply_update= Select "Apply update"
 install_instr_e_recovery_apply_update_from_adb= Select "Apply update from ADB"
 install_instr_e_recovery_apply_update_from_adb_wait_for_result= The installation is in progress, be patient
+install_instr_e_recovery_apply_update_from_adb_accept_sign_fail= A screen that says Signature verification failed, this is expected, please click Continue
 install_instr_e_recovery_factory_reset= Select "Factory reset"
 install_instr_e_recovery_factory_reset_format_data= Select "Format data/factory reset"
 install_instr_e_recovery_factory_reset_cache= Select "Format cache partiton"
diff --git a/src/main/resources/lang/translation_fr_FR.properties b/src/main/resources/lang/translation_fr_FR.properties
index 643c14a6f59f980af01f19cd4a726060dd6e4295..0b672a30026d447887467abbe6b9730c9263daa2 100644
--- a/src/main/resources/lang/translation_fr_FR.properties
+++ b/src/main/resources/lang/translation_fr_FR.properties
@@ -44,7 +44,7 @@ connect_lbl_3=Dans les prochaines étapes, nous vous aiderons à activer le « m
 #devMode & debugADB
 devMode_mTitle=Activer le mode développeur (Partie 1)
 devMode_mTitle_main=Activer le mode développeur
-devMode_main=Votre téléphone vient d'être dévérouillé, il a rédémarré :
+devMode_main=Votre téléphone vient d'être dévérouillé, il redémarre, passez toutes les étapes d'initialisation
 devMode_lbl=Veuillez suivre les étapes suivantes :
 devMode_instr_settings=Ouvrez les « Paramètres »
 devMode_instr_build=Tapez « Numéro » dans la barre de recherche
@@ -315,6 +315,7 @@ install_instr_choose_e_recovery_validate_wait_for_result= Le téléphone va rebo
 install_instr_e_recovery_apply_update= Selectionnez "Apply update"
 install_instr_e_recovery_apply_update_from_adb= Selectionnez "Apply update from ADB"
 install_instr_e_recovery_apply_update_from_adb_wait_for_result= Soyez patient, l'installation est en cours de progression.
+install_instr_e_recovery_apply_update_from_adb_accept_sign_fail= Un écran indique que la vérification de la signature a échoué, c'est normal, veuillez cliquer sur Continuer.
 install_instr_e_recovery_factory_reset= Selectionnez "Factory reset"
 install_instr_e_recovery_factory_reset_format_data= Selectionnez "Format data/factory reset"
 install_instr_e_recovery_factory_reset_cache= Selectionnez "Format cache partiton"
diff --git a/src/main/resources/yaml/OnePlus7Pro_flash.yml b/src/main/resources/yaml/OnePlus7Pro_flash.yml
index 4ac402a3066edbd0175c6d6aa0ca6713f828e004..2704418118896693fafe99cf57f08e82c80fc522 100644
--- a/src/main/resources/yaml/OnePlus7Pro_flash.yml
+++ b/src/main/resources/yaml/OnePlus7Pro_flash.yml
@@ -77,7 +77,6 @@ steps:
         titleIconName: icon-download.png
         instructions:
             - devMode_main 
-            - devMode_lbl
             - devMode_instr_settings
             - devMode_instr_build
             - devMode_instr_tap7
@@ -114,7 +113,7 @@ steps:
         instructions: 
             - install_instr_recoveryInstall
         averageTime: 3
-        script: install-e-recovery 
+        script: install-e-recovery-boot 
         parameters: 
             fastboot_folder_path: ${ADB_FOLDER_PATH}
             twrp_image_path: ${TWRP_IMAGE_PATH}
@@ -136,6 +135,7 @@ steps:
             - install_instr_e_recovery_apply_update
             - install_instr_e_recovery_apply_update_from_adb
             - install_instr_e_recovery_apply_update_from_adb_wait_for_result
+            - install_instr_e_recovery_apply_update_from_adb_accept_sign_fail
         titleKeyIconName: icon-download.png
         script: wait-e-recovery-sideload 
         parameters: 
diff --git a/src/main/resources/yaml/OnePlus7T_flash.yml b/src/main/resources/yaml/OnePlus7T_flash.yml
index 4ac402a3066edbd0175c6d6aa0ca6713f828e004..d00ee101184fc5faa142c86ee20830494fe7126a 100644
--- a/src/main/resources/yaml/OnePlus7T_flash.yml
+++ b/src/main/resources/yaml/OnePlus7T_flash.yml
@@ -77,7 +77,6 @@ steps:
         titleIconName: icon-download.png
         instructions:
             - devMode_main 
-            - devMode_lbl
             - devMode_instr_settings
             - devMode_instr_build
             - devMode_instr_tap7
@@ -136,6 +135,7 @@ steps:
             - install_instr_e_recovery_apply_update
             - install_instr_e_recovery_apply_update_from_adb
             - install_instr_e_recovery_apply_update_from_adb_wait_for_result
+            - install_instr_e_recovery_apply_update_from_adb_accept_sign_fail
         titleKeyIconName: icon-download.png
         script: wait-e-recovery-sideload 
         parameters: 
diff --git a/src/main/resources/yaml/OnePlus8Pro_flash.yml b/src/main/resources/yaml/OnePlus8Pro_flash.yml
index 2afad366a439ef3c9bf1cefbfff6b90cf2a11d10..d00ee101184fc5faa142c86ee20830494fe7126a 100644
--- a/src/main/resources/yaml/OnePlus8Pro_flash.yml
+++ b/src/main/resources/yaml/OnePlus8Pro_flash.yml
@@ -77,7 +77,6 @@ steps:
         titleIconName: icon-download.png
         instructions:
             - devMode_main 
-            - devMode_lbl
             - devMode_instr_settings
             - devMode_instr_build
             - devMode_instr_tap7
@@ -136,6 +135,7 @@ steps:
             - install_instr_e_recovery_apply_update
             - install_instr_e_recovery_apply_update_from_adb
             - install_instr_e_recovery_apply_update_from_adb_wait_for_result
+            - install_instr_e_recovery_apply_update_from_adb_accept_sign_fail
         titleKeyIconName: icon-download.png
         script: wait-e-recovery-sideload 
         parameters: 
@@ -156,7 +156,7 @@ steps:
         script: install-from-e-recovery 
         parameters: 
             device_id: ${DEVICE_ID}
-            patch_path: ${PATCH_PATH}
+            archive_path: ${PATCH_PATH}
             adb_folder_path: ${ADB_FOLDER_PATH}
         okCodes:
             0: ~
diff --git a/src/main/resources/yaml/OnePlus8_flash.yml b/src/main/resources/yaml/OnePlus8_flash.yml
index 4ac402a3066edbd0175c6d6aa0ca6713f828e004..d00ee101184fc5faa142c86ee20830494fe7126a 100644
--- a/src/main/resources/yaml/OnePlus8_flash.yml
+++ b/src/main/resources/yaml/OnePlus8_flash.yml
@@ -77,7 +77,6 @@ steps:
         titleIconName: icon-download.png
         instructions:
             - devMode_main 
-            - devMode_lbl
             - devMode_instr_settings
             - devMode_instr_build
             - devMode_instr_tap7
@@ -136,6 +135,7 @@ steps:
             - install_instr_e_recovery_apply_update
             - install_instr_e_recovery_apply_update_from_adb
             - install_instr_e_recovery_apply_update_from_adb_wait_for_result
+            - install_instr_e_recovery_apply_update_from_adb_accept_sign_fail
         titleKeyIconName: icon-download.png
         script: wait-e-recovery-sideload 
         parameters: 
diff --git a/windows-installer-mui.nsi b/windows-installer-mui.nsi
index 2a2aa8075321371b3374612fe99f93cae4715e93..33edd8d38e9c1b8694bbcf9484a92e2ec289177c 100644
--- a/windows-installer-mui.nsi
+++ b/windows-installer-mui.nsi
@@ -71,6 +71,7 @@ FunctionEnd
 
 # Default section start; every NSIS script has at least one section
 Section
+	SetShellVarContext all
 	SetOutPath "$INSTDIR"
 	# Adds file(s) to be extracted to the current output path ($OUTDIR).
 	File /r "build/image/easy-installer-windows-x64/*"