diff --git a/firmware/controllers/algo/ignition_state.txt b/firmware/controllers/algo/ignition_state.txt
index 6f81e4bc9f..f6ef799c3e 100644
--- a/firmware/controllers/algo/ignition_state.txt
+++ b/firmware/controllers/algo/ignition_state.txt
@@ -2,15 +2,15 @@ struct_no_prefix ignition_state_s
 float baseDwell
 	floatms_t sparkDwell;@@GAUGE_COIL_DWELL_TIME@@
 	angle_t dwellAngle;ignition dwell duration\nas crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell
-	int16_t autoscale cltTimingCorrection;;"deg",{1/@@PACK_MULT_PERCENT@@}, 0, -20, 20, 2, Timing
-	int16_t autoscale timingIatCorrection;;"deg",{1/@@PACK_MULT_PERCENT@@}, 0, -20, 20, 2
-	int16_t autoscale timingPidCorrection;;"deg",{1/@@PACK_MULT_PERCENT@@}, 0, -20, 20, 2
+	int16_t autoscale cltTimingCorrection;;"deg",{1/@@PACK_MULT_PERCENT@@}, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@
+	int16_t autoscale timingIatCorrection;;"deg",{1/@@PACK_MULT_PERCENT@@}, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@
+	int16_t autoscale timingPidCorrection;;"deg",{1/@@PACK_MULT_PERCENT@@}, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@
 
 
 float dwellVoltageCorrection
 
-    float luaTimingAdd;
-    float luaTimingMult;
+    float luaTimingAdd;;"deg",{1, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@
+    float luaTimingMult;;"deg",{1, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@
 
 ! ignition_state
 end_struct
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index e6fe9bb323..c8189275fe 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -1812,6 +1812,8 @@ end_struct
 #define GAUGE_NAME_TRG_ERR "Trigger Error Counter"
 #define GAUGE_NAME_TRG_GAP "Trigger Sync Latest Ratio"
 
+#define GAUGE_CATEGORY_TIMING "Timing"
+
 #define GAUGE_NAME_VVT_B1I "VVT: bank 1 intake"
 #define GAUGE_NAME_VVT_B1E "VVT: bank 1 exhaust"
 #define GAUGE_NAME_VVT_B2I "VVT: bank 2 intake"
diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java
index da6a7958f1..1e1ca16231 100644
--- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java
+++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java
@@ -164,14 +164,15 @@ public class OutputsTest {
     public void sensorStruct() {
         String test = "struct total\n" +
                 "    struct pid_status_s\n" +
-                "    \tfloat iTerm;;\"v\", 1, 0, -10000, 10000, 4, Alternator\n" +
-                "    \tfloat dTerm;;\"v\", 1, 0, -10000, 10000, 4, Alternator\n" +
+                "    \tfloat iTerm;;\"v\", 1, 0, -10000, 10000, 4, @@GAUGE_CATEGORY@@\n" +
+                "    \tfloat dTerm;;\"v\", 1, 0, -10000, 10000, 4, @@GAUGE_CATEGORY@@\n" +
                 "    end_struct\n" +
                 "\tpid_status_s alternatorStatus\n" +
                 "\tpid_status_s idleStatus\n" +
                 "end_struct\n";
 
         ReaderStateImpl state = new ReaderStateImpl();
+        state.getVariableRegistry().register("GAUGE_CATEGORY", "Alternator");
         DataLogConsumer dataLogConsumer = new DataLogConsumer(null);
         GaugeConsumer gaugeConsumer = new GaugeConsumer(null);
         state.readBufferedReader(test, dataLogConsumer, gaugeConsumer);