diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index 3291fd18c4..576cb1c659 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -63,7 +63,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 19 18:30:10 EDT 2018
+; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 26 17:34:14 EDT 2018
 
 pageSize            = 20000
 page = 1
@@ -956,7 +956,7 @@ page = 1
        ; filter =  Name,        "DisplayName", outputChannel, operator, defaultVal, userAdjustable
         filter = minRPMFilter, "Minimum RPM", RPMValue,           <       , 500,      , true
 
-#if CELSIUS          
+#if CELSIUS
          filter = minCltFilter, "Minimum CLT", coolant,       <       , 60,       , true
 #else
          filter = minCltFilter, "Minimum CLT", coolant,       <       , 160,      , true
@@ -1221,7 +1221,11 @@ fileVersion = { 20171101 }
 
    curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       =  -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  5, 10
       xBins       = iatFuelCorrBins, intake
       yBins       = iatFuelCorr
@@ -1229,7 +1233,11 @@ fileVersion = { 20171101 }
 	
 	curve = cltTimingCorrCurve, "Warmup timing correction"
       columnLabel = "Coolant", "Extra"
+#if CELSIUS
       xAxis       =  -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  50, 10
       xBins       = cltTimingBins, coolant
       yBins       = cltTimingExtra
@@ -1237,7 +1245,11 @@ fileVersion = { 20171101 }
 
 	curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       =  -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  50, 10
       xBins       = cltFuelCorrBins, coolant
       yBins       = cltFuelCorr
@@ -1245,7 +1257,11 @@ fileVersion = { 20171101 }
 
 	curve = crankingCltCurve, "Cranking Coolant Temperature multiplier"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       =  -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  5, 10
       xBins       = crankingFuelBins, coolant
       yBins       = crankingFuelCoef
@@ -1253,7 +1269,7 @@ fileVersion = { 20171101 }
 
 	curve = crankingTpsCurve, "Cranking TPS Multiplier"
       columnLabel = "TPS", "Multiplier"
-      xAxis       =  -40, 120, 10
+      xAxis       =  0, 100, 10
       yAxis       =  0,  5, 10
       xBins       = crankingTpsBins, TPSValue
       yBins       = crankingTpsCoef
@@ -1269,7 +1285,11 @@ fileVersion = { 20171101 }
 
 	curve = cltIdleCurve, "Warmup Idle multiplier"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       = -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  50, 10
       xBins       = cltIdleCorrBins, coolant
       yBins       = cltIdleCorr
@@ -1277,7 +1297,11 @@ fileVersion = { 20171101 }
 
 	curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       = -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  100, 10
       xBins       = iacCoastingBins, coolant
       yBins       = iacCoasting
@@ -1285,7 +1309,11 @@ fileVersion = { 20171101 }
 
 	curve = cltCrankingCurve, "Cranking IAC multiplier"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       = -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  50, 10
       xBins       = cltCrankingCorrBins, coolant
       yBins       = cltCrankingCorr
@@ -1293,7 +1321,11 @@ fileVersion = { 20171101 }
 
 	curve = cltIdleRPMCurve, "Idle Target RPM"
       columnLabel = "Coolant", "RPM"
+#if CELSIUS
       xAxis       = -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0, 8000, 10
       xBins       = cltIdleRpmBins, coolant
       yBins       = cltIdleRpm, RPMValue
@@ -1325,7 +1357,11 @@ fileVersion = { 20171101 }
 
 	curve = warmupTargetAfrCurve, "CLT-based target AFR"
       columnLabel = "Coolant", "Correction"
+#if CELSIUS
       xAxis       = -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  50, 10
       xBins       = warmupTargetAfrBins, coolant
       yBins       = warmupTargetAfr
@@ -1333,7 +1369,11 @@ fileVersion = { 20171101 }
 
     curve = wueAfrTargetOffsetCurve, "AFR Target Temperature Adjustment"
       columnLabel = "Coolant", "AFR Offset"
+#if CELSIUS
       xAxis       = -40, 200, 9
+#else
+      xAxis       = -40, 400, 9
+#endif
       yAxis       =   -3,  1, 5
       xBins       = cltFuelCorrBins, coolant
       yBins       = wueAfrTargetOffset
@@ -1341,7 +1381,11 @@ fileVersion = { 20171101 }
 
     curve = wueAnalyzer_warmup_curve, "Warmup Enrichment"
       columnLabel = "Coolant", "Current WUE", "Coolant", "Corrected"
+#if CELSIUS
       xAxis       = -40, 200, 9
+#else
+      xAxis       = -40, 400, 9
+#endif
       yAxis       =   90,  500, 6
       xBins       = cltFuelCorrBins, coolant
       yBins       = cltFuelCorr
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 36476114f0..71a74ff75e 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -115,7 +115,7 @@ enable2ndByteCanID = false
        ; filter =  Name,        "DisplayName", outputChannel, operator, defaultVal, userAdjustable
         filter = minRPMFilter, "Minimum RPM", RPMValue,           <       , 500,      , true
 
-#if CELSIUS          
+#if CELSIUS
          filter = minCltFilter, "Minimum CLT", coolant,       <       , 60,       , true
 #else
          filter = minCltFilter, "Minimum CLT", coolant,       <       , 160,      , true
@@ -380,7 +380,11 @@ fileVersion = { 20171101 }
 
    curve = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       =  -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  5, 10
       xBins       = iatFuelCorrBins, intake
       yBins       = iatFuelCorr
@@ -388,7 +392,11 @@ fileVersion = { 20171101 }
 	
 	curve = cltTimingCorrCurve, "Warmup timing correction"
       columnLabel = "Coolant", "Extra"
+#if CELSIUS
       xAxis       =  -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  50, 10
       xBins       = cltTimingBins, coolant
       yBins       = cltTimingExtra
@@ -396,7 +404,11 @@ fileVersion = { 20171101 }
 
 	curve = cltFuelCorrCurve, "Warmup fuel manual Multiplier"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       =  -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  50, 10
       xBins       = cltFuelCorrBins, coolant
       yBins       = cltFuelCorr
@@ -404,7 +416,11 @@ fileVersion = { 20171101 }
 
 	curve = crankingCltCurve, "Cranking Coolant Temperature multiplier"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       =  -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  5, 10
       xBins       = crankingFuelBins, coolant
       yBins       = crankingFuelCoef
@@ -412,7 +428,7 @@ fileVersion = { 20171101 }
 
 	curve = crankingTpsCurve, "Cranking TPS Multiplier"
       columnLabel = "TPS", "Multiplier"
-      xAxis       =  -40, 120, 10
+      xAxis       =  0, 100, 10
       yAxis       =  0,  5, 10
       xBins       = crankingTpsBins, TPSValue
       yBins       = crankingTpsCoef
@@ -428,7 +444,11 @@ fileVersion = { 20171101 }
 
 	curve = cltIdleCurve, "Warmup Idle multiplier"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       = -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  50, 10
       xBins       = cltIdleCorrBins, coolant
       yBins       = cltIdleCorr
@@ -436,7 +456,11 @@ fileVersion = { 20171101 }
 
 	curve = iacCoastingCurve, "Coasting IAC Position for Auto-Idle"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       = -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  100, 10
       xBins       = iacCoastingBins, coolant
       yBins       = iacCoasting
@@ -444,7 +468,11 @@ fileVersion = { 20171101 }
 
 	curve = cltCrankingCurve, "Cranking IAC multiplier"
       columnLabel = "Coolant", "Multiplier"
+#if CELSIUS
       xAxis       = -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  50, 10
       xBins       = cltCrankingCorrBins, coolant
       yBins       = cltCrankingCorr
@@ -452,7 +480,11 @@ fileVersion = { 20171101 }
 
 	curve = cltIdleRPMCurve, "Idle Target RPM"
       columnLabel = "Coolant", "RPM"
+#if CELSIUS
       xAxis       = -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0, 8000, 10
       xBins       = cltIdleRpmBins, coolant
       yBins       = cltIdleRpm, RPMValue
@@ -484,7 +516,11 @@ fileVersion = { 20171101 }
 
 	curve = warmupTargetAfrCurve, "CLT-based target AFR"
       columnLabel = "Coolant", "Correction"
+#if CELSIUS
       xAxis       = -40, 120, 10
+#else
+      xAxis       =  -40, 250, 10
+#endif
       yAxis       =  0,  50, 10
       xBins       = warmupTargetAfrBins, coolant
       yBins       = warmupTargetAfr
@@ -492,7 +528,11 @@ fileVersion = { 20171101 }
 
     curve = wueAfrTargetOffsetCurve, "AFR Target Temperature Adjustment"
       columnLabel = "Coolant", "AFR Offset"
+#if CELSIUS
       xAxis       = -40, 200, 9
+#else
+      xAxis       = -40, 400, 9
+#endif
       yAxis       =   -3,  1, 5
       xBins       = cltFuelCorrBins, coolant
       yBins       = wueAfrTargetOffset
@@ -500,7 +540,11 @@ fileVersion = { 20171101 }
 
     curve = wueAnalyzer_warmup_curve, "Warmup Enrichment"
       columnLabel = "Coolant", "Current WUE", "Coolant", "Corrected"
+#if CELSIUS
       xAxis       = -40, 200, 9
+#else
+      xAxis       = -40, 400, 9
+#endif
       yAxis       =   90,  500, 6
       xBins       = cltFuelCorrBins, coolant
       yBins       = cltFuelCorr