diff --git a/firmware/firmloader.bat b/firmware/firmloader.bat
index 3807e56..4717545 100644
--- a/firmware/firmloader.bat
+++ b/firmware/firmloader.bat
@@ -1,5 +1,6 @@
+@call ..\sdk\setvars.bat
 sjasmplus firmware.asm
 zx7b firmware_strings.rom firmware.rom.zx7b 
 sjasmplus bootloader.asm
 bin2hex bootloader.rom
-copy /y bootloader.hex ..\cores\Spectrum\bootloader_hex.txt
\ No newline at end of file
+copy /y bootloader.hex ..\cores\Spectrum\bootloader_hex.txt
diff --git a/firmware/make.bat b/firmware/make.bat
index 42b2476..0c170c6 100644
--- a/firmware/make.bat
+++ b/firmware/make.bat
@@ -1,3 +1,4 @@
+@call ..\sdk\setvars.bat
 echo  define version 1 > version.asm
 sjasmplus firmware.asm
 fcut      firmware_strings.rom  7e00 -7e00  strings.bin
diff --git a/firmware/scroll/scroll.bat b/firmware/scroll/scroll.bat
index 0eda417..2540a9e 100644
--- a/firmware/scroll/scroll.bat
+++ b/firmware/scroll/scroll.bat
@@ -1,3 +1,4 @@
+@call ..\..\sdk\setvars.bat
 FuenteABin
 Png2Rcs fondo.png fondo.rcs -a fondo.atr
 sjasmplus scroll.asm
diff --git a/hardware/kartusho/amstrad/manic.bat b/hardware/kartusho/amstrad/manic.bat
index 449e9c5..b392bbd 100644
--- a/hardware/kartusho/amstrad/manic.bat
+++ b/hardware/kartusho/amstrad/manic.bat
@@ -1,3 +1,4 @@
+@call ..\..\..\sdk\setvars.bat
 rem 51F0-A4FF ep 6e3f
 rem b900-bf7f
 fcut Manic.sna 52F0 4a30 Manic.bin
diff --git a/hardware/kartusho/roms/_make.bat b/hardware/kartusho/roms/_make.bat
index d7be2ce..ff65177 100644
--- a/hardware/kartusho/roms/_make.bat
+++ b/hardware/kartusho/roms/_make.bat
@@ -1,3 +1,4 @@
+@call ..\..\..\sdk\setvars.bat
 genMenu
 rcs screen.scr screen.rcs
 fcut screen.rcs 0 1800 screen.cut
diff --git a/hardware/kartusho/snapshots/makev4.bat b/hardware/kartusho/snapshots/makev4.bat
index 431c634..8a27b0f 100644
--- a/hardware/kartusho/snapshots/makev4.bat
+++ b/hardware/kartusho/snapshots/makev4.bat
@@ -1,3 +1,4 @@
+@call ..\..\..\sdk\setvars.bat
 genMenu 1
 rcs screen.scr screen.rcs
 fcut screen.rcs 0 1000 screen.cut
diff --git a/hardware/kartusho/snapshots/makevROM.bat b/hardware/kartusho/snapshots/makevROM.bat
index a41f1ea..b759207 100644
--- a/hardware/kartusho/snapshots/makevROM.bat
+++ b/hardware/kartusho/snapshots/makevROM.bat
@@ -1,3 +1,4 @@
+@call ..\..\..\sdk\setvars.bat
 genMenu 0
 rcs screen.scr screen.rcs
 fcut screen.rcs 0 1000 screen.cut
diff --git a/hardware/kartusho/snapshots/sjasmplus.exe b/hardware/kartusho/snapshots/sjasmplus.exe
deleted file mode 100644
index a69ce5b..0000000
Binary files a/hardware/kartusho/snapshots/sjasmplus.exe and /dev/null differ
diff --git a/hardware/kartusho/roms/sjasmplus.exe b/sdk/bin/sjasmplus.exe
similarity index 100%
rename from hardware/kartusho/roms/sjasmplus.exe
rename to sdk/bin/sjasmplus.exe
diff --git a/sdk/setvars.bat b/sdk/setvars.bat
index bfee4aa..3c7499b 100644
--- a/sdk/setvars.bat
+++ b/sdk/setvars.bat
@@ -2,4 +2,4 @@
 if not x%ZXUNOSDK% == x exit /b
 set ZXUNOSDK=%~dp0
 set ZXUNOSDK=%ZXUNOSDK:~0,-1%
-set PATH=%ZXUNOSDK%;%PATH%
+set PATH=%ZXUNOSDK%\bin;%PATH%