diff --git a/platform.txt b/platform.txt
index e989553d4e..15c77e65c1 100644
--- a/platform.txt
+++ b/platform.txt
@@ -10,12 +10,12 @@ version=2.6.0-dev
 
 runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf
 runtime.tools.esptool.path={runtime.platform.path}/tools/esptool
-runtime.tools.signing={runtime.platform.path}/tools/signing.py
-runtime.tools.elf2bin={runtime.platform.path}/tools/elf2bin.py
-runtime.tools.makecorever={runtime.platform.path}/tools/makecorever.py
-runtime.tools.eboot={runtime.platform.path}/bootloaders/eboot/eboot.elf
+runtime.tools.signing={build.core.path}/../../tools/signing.py
+runtime.tools.elf2bin={build.core.path}/../../tools/elf2bin.py
+runtime.tools.makecorever={build.core.path}/../../tools/makecorever.py
+runtime.tools.eboot={build.core.path}/../../bootloaders/eboot/eboot.elf
 runtime.tools.python=python
-runtime.tools.python.windows={runtime.platform.path}/tools/python/python.exe
+runtime.tools.python.windows={build.core.path}/../../tools/python/python.exe
 
 compiler.warning_flags=-w
 compiler.warning_flags.none=-w
@@ -36,8 +36,8 @@ build.float=-u _printf_float -u _scanf_float
 build.led=
 
 compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
-compiler.sdk.path={runtime.platform.path}/tools/sdk
-compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf
+compiler.sdk.path={build.core.path}/../../tools/sdk
+compiler.libc.path={build.core.path}/../../tools/sdk/libc/xtensa-lx106-elf
 compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/{build.lwip_include}" "-I{compiler.libc.path}/include" "-I{build.path}/core"
 
 compiler.c.cmd=xtensa-lx106-elf-gcc
@@ -84,8 +84,10 @@ compiler.elf2hex.extra_flags=
 recipe.hooks.core.prebuild.1.pattern="{runtime.tools.python}" "{runtime.tools.signing}" --mode header --publickey "{build.source.path}/public.key" --out "{build.path}/core/Updater_Signing.h"
 recipe.hooks.core.prebuild.2.pattern="{runtime.tools.python}" "{runtime.tools.makecorever}" --build_path "{build.path}' --platform_path "{runtime.platform.path}" --version "unix-{version}"
 
+
+
 ## Build the app.ld linker file
-recipe.hooks.linking.prelink.1.pattern="{compiler.path}{compiler.c.cmd}" -CC -E -P {build.vtable_flags} "{runtime.platform.path}/tools/sdk/ld/eagle.app.v6.common.ld.h" -o "{build.path}/local.eagle.app.v6.common.ld"
+recipe.hooks.linking.prelink.1.pattern="{compiler.path}{compiler.c.cmd}" -CC -E -P {build.vtable_flags} "{build.core.path}/../../tools/sdk/ld/eagle.app.v6.common.ld.h" -o "{build.path}/local.eagle.app.v6.common.ld"
 
 ## Compile c files
 recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"