diff --git a/klippy/extras/temperature_sensors.cfg b/klippy/extras/temperature_sensors.cfg
index 6b1fab88396d..d199520a2c89 100644
--- a/klippy/extras/temperature_sensors.cfg
+++ b/klippy/extras/temperature_sensors.cfg
@@ -114,10 +114,88 @@ temperature1: 25
 resistance1: 100000
 beta: 4100
 
-[thermistor Trianglelab T-D500]
-temperature1: 20
-resistance1: 3649000
-temperature2: 200
-resistance2: 8000
-temperature3: 300
-resistance3: 1092
+[adc_temperature Trianglelab T-D500]
+temperature1: 25
+resistance1: 4721000.00
+temperature2: 100
+resistance2: 147700.00
+temperature3: 110
+resistance3: 104200.00
+temperature4: 120
+resistance4: 74560.00
+temperature5: 130
+resistance5: 54130.00
+temperature6: 140
+resistance6: 39810.00
+temperature7: 150
+resistance7: 29650.00
+temperature8: 160
+resistance8: 22340.00
+temperature9: 170
+resistance9: 17020.00
+temperature10: 180
+resistance10: 13100.00
+temperature11: 190
+resistance11: 10190.00
+temperature12: 200
+resistance12: 8000.00
+temperature13: 210
+resistance13: 6337.00
+temperature14: 220
+resistance14: 5062.00
+temperature15: 230
+resistance15: 4077.00
+temperature16: 240
+resistance16: 3309.00
+temperature17: 250
+resistance17: 2705.00
+temperature18: 260
+resistance18: 2228.00
+temperature19: 270
+resistance19: 1846.00
+temperature20: 280
+resistance20: 1540.00
+temperature21: 290
+resistance21: 1293.00
+temperature22: 300
+resistance22: 1092.00
+temperature23: 310
+resistance23: 929.80
+temperature24: 320
+resistance24: 795.80
+temperature25: 330
+resistance25: 684.20
+temperature26: 340
+resistance26: 590.80
+temperature27: 350
+resistance27: 512.20
+temperature28: 360
+resistance28: 445.80
+temperature29: 370
+resistance29: 389.40
+temperature30: 380
+resistance30: 341.20
+temperature31: 390
+resistance31: 300.00
+temperature32: 400
+resistance32: 264.60
+temperature33: 410
+resistance33: 234.00
+temperature34: 420
+resistance34: 207.50
+temperature35: 430
+resistance35: 184.50
+temperature36: 440
+resistance36: 164.50
+temperature37: 450
+resistance37: 146.90
+temperature38: 460
+resistance38: 131.60
+temperature39: 470
+resistance39: 118.10
+temperature40: 480
+resistance40: 106.10
+temperature41: 490
+resistance41: 95.60
+temperature42: 500
+resistance42: 86.30
diff --git a/stereotech_config/630/main_extruder.cfg b/stereotech_config/630/main_extruder.cfg
new file mode 100644
index 000000000000..5ff45b0b9717
--- /dev/null
+++ b/stereotech_config/630/main_extruder.cfg
@@ -0,0 +1,57 @@
+[extruder]
+step_pin: main_extruder_step_pin
+dir_pin: main_extruder_dir_pin
+enable_pin: !main_extruder_enable_pin
+microsteps: 16
+rotation_distance: 3.750
+nozzle_diameter: 0.4
+filament_diameter: 1.75
+heater_pin: main_extruder_heater_pin
+sensor_type: Trianglelab T-D500
+sensor_pin: main_extruder_sensor_pin
+control: pid
+pid_Kp: 13.509
+pid_Ki: 0.566
+pid_Kd: 80.549
+min_temp: -150
+max_temp: 500
+min_extrude_temp: 100
+max_extrude_only_distance: 300.0
+max_extrude_cross_section: 2.56
+fiber: false
+
+[gcode_macro T0]
+variable_flow: 100.0
+gcode:
+    M117 set_extruder
+    {% if printer["gcode_macro T1"].t1_offset_enabled > 0 %}
+        SET_GCODE_OFFSET X_ADJUST={0.0 - printer["gcode_macro SET_NOZZLE_OFFSET"].offset_x|default(0.0)} Y_ADJUST={0.0 - printer["gcode_macro SET_NOZZLE_OFFSET"].offset_y|default(0.0)}
+        SET_GCODE_VARIABLE MACRO=T1 VARIABLE=t1_offset_enabled VALUE=0
+    {% endif %}
+    {% set current_wcs = printer.gcode_move.current_wcs %}
+    {% set move = params.MOVE|default(1)|int %}
+    {% if move %}
+        {% if "x" in printer.toolhead.homed_axes and "y" in printer.toolhead.homed_axes and "z" in printer.toolhead.homed_axes and printer.toolhead.extruder != 'extruder' %}
+            G54
+            MOVE_DOWN_Z_AXIS Z=5
+            G0 X10 Y2 F3600
+        {% endif %}
+    {% endif %}
+    SAVE_EXTRUDER_FLOW
+    ACTIVATE_EXTRUDER extruder=extruder
+    RESTORE_EXTRUDER_FLOW EXTRUDER=extruder
+    SET_WCS WCS={current_wcs}
+    M117
+
+[gcode_macro SAVE_EXTRUDER_FLOW]
+gcode:
+    {% set current_ex = printer.toolhead.extruder %}
+    {% set index_ex = '0' if current_ex == 'extruder' else current_ex[8]|int %}
+    {% set current_ex_factor = printer.gcode_move.extrude_factor|float %}
+    SET_GCODE_VARIABLE MACRO=T{index_ex} VARIABLE=flow VALUE={current_ex_factor * 100.0}
+
+[gcode_macro RESTORE_EXTRUDER_FLOW]
+gcode:
+    {% set extruder = params.EXTRUDER|default('extruder') %}
+    {% set index_ex = '0' if extruder == 'extruder' else extruder[8]|int %}
+    M221 S{printer["gcode_macro T" ~ index_ex].flow}
diff --git a/stereotech_config/630/second_extruder.cfg b/stereotech_config/630/second_extruder.cfg
new file mode 100644
index 000000000000..84389ab25a97
--- /dev/null
+++ b/stereotech_config/630/second_extruder.cfg
@@ -0,0 +1,46 @@
+[extruder1]
+step_pin: second_extruder_step_pin
+dir_pin: second_extruder_dir_pin
+enable_pin: !second_extruder_enable_pin
+microsteps: 16
+rotation_distance: 7.777
+nozzle_diameter: 0.4
+filament_diameter: 1.75
+heater_pin: second_extruder_heater_pin
+sensor_type: Trianglelab T-D500
+sensor_pin: second_extruder_sensor_pin
+control: pid
+pid_Kp: 13.509
+pid_Ki: 0.566
+pid_Kd: 80.549
+min_temp: -150
+max_temp: 500
+min_extrude_temp: 100
+max_extrude_only_distance: 300.0
+max_extrude_cross_section: 2.56
+fiber: false
+offsets: -53.5, 0.0, 0.0
+
+[gcode_macro T1]
+variable_flow: 100.0
+variable_t1_offset_enabled: 0
+gcode:
+    M117 set_extruder1
+    {% if printer["gcode_macro T1"].t1_offset_enabled < 1 %}
+        SET_GCODE_OFFSET X_ADJUST={printer["gcode_macro SET_NOZZLE_OFFSET"].offset_x|default(0.0)} Y_ADJUST={printer["gcode_macro SET_NOZZLE_OFFSET"].offset_y|default(0.0)}
+        SET_GCODE_VARIABLE MACRO=T1 VARIABLE=t1_offset_enabled VALUE=1
+    {% endif %}
+    {% set current_wcs = printer.gcode_move.current_wcs %}
+    {% set move = params.MOVE|default(1)|int %}
+    {% if move %}
+        {% if "x" in printer.toolhead.homed_axes and "y" in printer.toolhead.homed_axes and "z" in printer.toolhead.homed_axes and printer.toolhead.extruder != 'extruder1' %}
+            G54
+            MOVE_DOWN_Z_AXIS Z=5
+            G0 X10 Y2 F3600
+        {% endif %}
+    {% endif %}
+    SAVE_EXTRUDER_FLOW
+    ACTIVATE_EXTRUDER extruder=extruder1
+    RESTORE_EXTRUDER_FLOW EXTRUDER=extruder1
+    SET_WCS WCS={current_wcs}
+    M117
diff --git a/stereotech_config/HTE630-0-C-23.cfg b/stereotech_config/HTE630-0-C-23.cfg
index d656eaf1c32e..326d1a5604e8 100644
--- a/stereotech_config/HTE630-0-C-23.cfg
+++ b/stereotech_config/HTE630-0-C-23.cfg
@@ -26,13 +26,13 @@ path: /home/ste/uploads
 [include config/calibrate/probe_5d_template.cfg]
 [include config/calibrate/probe_v2.cfg]
 
-[include config/5xx/main_extruder_2.cfg]
-[include config/5xx/second_extruder.cfg]
+# sections for extruders
+[include config/630/main_extruder.cfg]
+[include config/630/second_extruder.cfg]
 [include config/common/nozzle_offset.cfg]
 [include config/common/extruder_macros.cfg]
 [include config/common/filament_control.cfg]
 [include config/common/filament_control_second.cfg]
-[include config/common/power_control.cfg]
 
 [include config/530/module_3d.cfg]
 [include config/common/module_3d_macros.cfg]
@@ -41,6 +41,7 @@ path: /home/ste/uploads
 [include config/common/print_macros.cfg]
 [include config/common/variables.cfg]
 [include config/common/diagnostics.cfg]
+[include config/common/power_control.cfg]
 
 [gcode_macro CONSTANTS]
 description: Holds printer constants