diff --git a/firmware/config/boards/kinetis/config/!gen_config.bat b/firmware/config/boards/kinetis/config/!gen_config.bat
index c57969c2b1..84f2acabc2 100644
--- a/firmware/config/boards/kinetis/config/!gen_config.bat
+++ b/firmware/config/boards/kinetis/config/!gen_config.bat
@@ -1,35 +1,3 @@
 @echo off
 
-rem This batch files reads rusefi_config.txt and produses firmware persistent configuration headers
-rem the storage section of rusefi.ini is updated as well
-
-cd ../../../..
-
-pwd
-
-java ^
- -DSystemOut.name=gen_config_kinetis_board ^
- -cp ../java_tools/ConfigDefinition.jar;../java_tools/configuration_definition/lib/snakeyaml.jar ^
- com.rusefi.board_generator.BoardReader ^
- -board kinetis ^
- -firmware_path . ^
- -out config/boards/kinetis/config/tunerstudio ^
- -enumInputFile controllers/algo/rusefi_enums.h ^
- -enumInputFile config/boards/kinetis/rusefi_hw_enums.h
-
-java ^
- -DSystemOut.name=gen_config_kinetis ^
- -Drusefi.generator.lazyfile.enabled=true ^
- -jar ../java_tools/ConfigDefinition.jar ^
- -definition integration/rusefi_config.txt ^
- -ts_destination tunerstudio ^
- -tool kinetis_gen_config.bat ^
- -firing_order controllers/algo/firing_order.h ^
- -with_c_defines false ^
- -initialize_to_zero false ^
- -ts_output_name rusefi_kinetis.ini ^
- -c_defines config/boards/kinetis/config/controllers/algo/rusefi_generated.h ^
- -c_destination config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h ^
- -prepend config/boards/kinetis/config/rusefi_config_kinetis.txt ^
- -prepend config/boards/kinetis/config/tunerstudio/generated/kinetis_prefix.txt
-
+sh.exe gen_config.sh
\ No newline at end of file
diff --git a/firmware/config/boards/kinetis/config/gen_config.sh b/firmware/config/boards/kinetis/config/gen_config.sh
index 8415eab4ef..e851e4ded5 100644
--- a/firmware/config/boards/kinetis/config/gen_config.sh
+++ b/firmware/config/boards/kinetis/config/gen_config.sh
@@ -11,9 +11,9 @@ java \
  -DSystemOut.name=gen_config_kinetis_board \
  -cp ../java_tools/ConfigDefinition.jar \
  com.rusefi.board_generator.BoardReader \
- -board kinetis \
+ -yaml config/boards/kinetis/mapping.yaml \
  -firmware_path . \
- -out config/boards/kinetis/config/tunerstudio \
+ -output_file tunerstudio/generated/kinetis_prefix.txt \
  -enumInputFile controllers/algo/rusefi_enums.h \
  -enumInputFile config/boards/kinetis/rusefi_hw_enums.h
 
diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh
index 59f9408ddb..175f5ec197 100644
--- a/firmware/gen_config_board.sh
+++ b/firmware/gen_config_board.sh
@@ -40,7 +40,7 @@ java -DSystemOut.name=gen_config_board \
 	-cache ${SHORT_BOARDNAME} \
 	-cache_zip_file tunerstudio/generated/cache.zip \
 	-firing_order controllers/algo/firing_order.h \
-	-ts_output_name rusefi_${SHORT_BOARDNAME}.ini \
+	-ts_output_name generated/rusefi_${SHORT_BOARDNAME}.ini \
 	-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
 	-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
 	-prepend tunerstudio/generated/${BOARDNAME}_prefix.txt \
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 9a27778830..f1d39540d0 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -44,6 +44,7 @@
 ! all the sub-structures are going to be nested within the primary structure, that's
 ! needed to get a proper TunerStudio file
 
+
 struct persistent_config_s 
 
 struct_no_prefix engine_configuration_s