diff --git a/display.cfg b/display.cfg
new file mode 100644
index 0000000..35f2540
--- /dev/null
+++ b/display.cfg
@@ -0,0 +1,51 @@
+#####################################################################
+#  Displays
+#####################################################################
+
+[board_pins]
+aliases:
+  # EXP1 header
+  EXP1_1=PE8, EXP1_2=PE7,
+  EXP1_3=PE9, EXP1_4=PE10,
+  EXP1_5=PE12, EXP1_6=PE13,    # Slot in the socket on this side
+  EXP1_7=PE14, EXP1_8=PE15,
+  EXP1_9=<GND>, EXP1_10=<5V>,
+
+  # EXP2 header
+  EXP2_1=PA6, EXP2_2=PA5,
+  EXP2_3=PB1, EXP2_4=PA4,
+  EXP2_5=PB2, EXP2_6=PA7,      # Slot in the socket on this side
+  EXP2_7=PC15, EXP2_8=<RST>,
+  EXP2_9=<GND>, EXP2_10=<5V>
+
+[display]
+# mini12864 LCD Display
+lcd_type: uc1701
+cs_pin: EXP1_3
+a0_pin: EXP1_4
+rst_pin: EXP1_5
+encoder_pins: ^EXP2_5, ^EXP2_3
+click_pin: ^!EXP1_2
+contrast: 63
+spi_software_miso_pin: EXP2_1
+spi_software_mosi_pin: EXP2_6
+spi_software_sclk_pin: EXP2_2
+# display_group: __voron_display
+
+[neopixel btt_mini12864]
+# To control Neopixel RGB in mini12864 display
+pin: EXP1_6
+chain_count: 3
+initial_RED: 0.1
+initial_GREEN: 0.5
+initial_BLUE: 0.0
+color_order: RGB
+
+# Set RGB values on boot up for each Neopixel.
+# Index 1 = display, Index 2 and 3 = Knob
+[delayed_gcode setdisplayneopixel]
+initial_duration: 1
+gcode:
+  SET_LED LED=btt_mini12864 RED=0.50 GREEN=0.00 BLUE=0.00 INDEX=1 TRANSMIT=0
+  SET_LED LED=btt_mini12864 RED=0.13 GREEN=0.16 BLUE=1.00 INDEX=2 TRANSMIT=0
+  SET_LED LED=btt_mini12864 RED=0.13 GREEN=0.16 BLUE=1.00 INDEX=3
diff --git a/fans.cfg b/fans.cfg
new file mode 100644
index 0000000..e3ac7f0
--- /dev/null
+++ b/fans.cfg
@@ -0,0 +1,44 @@
+#####################################################################
+# Fan Control
+#####################################################################
+
+[fan]
+pin: PA8
+kick_start_time: 0.5
+## Depending on your fan, you may need to increase this value
+## if your fan will not start. Can change cycle_time (increase)
+## if your fan is not able to slow down effectively
+off_below: 0.10
+
+[heater_fan hotend_fan]
+pin: PE5
+max_power: 1.0
+kick_start_time: 0.5
+heater: extruder
+heater_temp: 50.0
+## If you are experiencing back flow, you can reduce fan_speed
+#fan_speed: 1.0
+
+[heater_fan side_fan1]
+pin: PD12
+kick_start_time: 0.5
+heater: heater_bed
+heater_temp: 45.0
+fan_speed: 0.40
+
+[heater_fan side_fan2]
+pin: PD13
+kick_start_time: 0.5
+heater: heater_bed
+heater_temp: 45.0
+fan_speed: 0.40
+
+[heater_fan exhaust_fan]
+pin: PD14
+max_power: 1.0
+shutdown_speed: 0.0
+kick_start_time: 5.0
+heater: heater_bed
+heater_temp: 55
+fan_speed: 0.4
+
diff --git a/neopixel.cfg b/neopixel.cfg
new file mode 100644
index 0000000..0fc6332
--- /dev/null
+++ b/neopixel.cfg
@@ -0,0 +1,10 @@
+#####################################################################
+# LED Control
+#####################################################################
+
+[neopixel caselight]
+pin: PB0
+chain_count: 44
+initial_RED: 0.25
+initial_GREEN: 0.25
+initial_BLUE: 0.25
diff --git a/printer.cfg b/printer.cfg
index 6f5ffa9..46759ab 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -41,17 +41,14 @@ square_corner_velocity: 5.0
 
 
 #####################################################################
-# fluidd
+# includes
 #####################################################################
 
 [include fluidd.cfg]
-
-
-#####################################################################
-# Macros
-#####################################################################
-
 [include macros.cfg]
+[include display.cfg]
+[include neopixel.cfg]
+[include fans.cfg]
 
 
 #####################################################################
@@ -279,63 +276,18 @@ samples_tolerance_retries: 3
 
 
 #####################################################################
-# Fan Control
-#####################################################################
-
-[fan]
-## Print Cooling Fan - CNC_FAN0
-pin: PA8
-kick_start_time: 0.5
-## Depending on your fan, you may need to increase this value
-## if your fan will not start. Can change cycle_time (increase)
-## if your fan is not able to slow down effectively
-off_below: 0.10
-
-[heater_fan hotend_fan]
-## Hotend Fan - CNC_FAN1
-pin: PE5
-max_power: 1.0
-kick_start_time: 0.5
-heater: extruder
-heater_temp: 50.0
-## If you are experiencing back flow, you can reduce fan_speed
-#fan_speed: 1.0
-
-[heater_fan controller_fan]
-## Controller fan - CNC_FAN2
-pin: PD12
-kick_start_time: 0.5
-heater: heater_bed
-heater_temp: 45.0
-
-#[heater_fan exhaust_fan]
-## Exhaust fan - CNC_FAN3
-#pin: PD13
-#max_power: 1.0
-#shutdown_speed: 0.0
-#kick_start_time: 5.0
-#heater: heater_bed
-#heater_temp: 60
-#fan_speed: 1.0
-
-
-#####################################################################
-# LED Control
-#####################################################################
-
-#[output_pin caselight]
-# Chamber Lighting - HE1 Connector (Optional)
-#pin: PA3
-#pwm:true
-#shutdown_value: 0
-#value:1
-#cycle_time: 0.01
-
-
-#####################################################################
-# Homing and Gantry Adjustment Routines
+# Filament Sensor
 #####################################################################
 
+[filament_switch_sensor filament_switch]
+switch_pin: ^!PG11
+pause_on_runout: True
+runout_gcode:
+  M117 filament removed
+insert_gcode:
+  M117 filament inserted
+# event_delay: 3.0
+# pause_delay: 0.5
 
 #####################################################################
 # Enclosure Temp Sensor Section
@@ -390,63 +342,6 @@ retries: 5
 retry_tolerance: 0.0075
 max_adjust: 10
 
-
-########################################
-# EXP1 / EXP2 (display) pins
-########################################
-
-[board_pins]
-aliases:
-  # EXP1 header
-  EXP1_1=PE8, EXP1_2=PE7,
-  EXP1_3=PE9, EXP1_4=PE10,
-  EXP1_5=PE12, EXP1_6=PE13,    # Slot in the socket on this side
-  EXP1_7=PE14, EXP1_8=PE15,
-  EXP1_9=<GND>, EXP1_10=<5V>,
-
-  # EXP2 header
-  EXP2_1=PA6, EXP2_2=PA5,
-  EXP2_3=PB1, EXP2_4=PA4,
-  EXP2_5=PB2, EXP2_6=PA7,      # Slot in the socket on this side
-  EXP2_7=PC15, EXP2_8=<RST>,
-  EXP2_9=<GND>, EXP2_10=<5V>
-
-
-#####################################################################
-# Displays
-#####################################################################
-
-[display]
-# mini12864 LCD Display
-lcd_type: uc1701
-cs_pin: EXP1_3
-a0_pin: EXP1_4
-rst_pin: EXP1_5
-encoder_pins: ^EXP2_5, ^EXP2_3
-click_pin: ^!EXP1_2
-contrast: 63
-spi_software_miso_pin: EXP2_1
-spi_software_mosi_pin: EXP2_6
-spi_software_sclk_pin: EXP2_2
-
-[neopixel btt_mini12864]
-# To control Neopixel RGB in mini12864 display
-pin: EXP1_6
-chain_count: 3
-initial_RED: 0.1
-initial_GREEN: 0.5
-initial_BLUE: 0.0
-color_order: RGB
-
-# Set RGB values on boot up for each Neopixel.
-# Index 1 = display, Index 2 and 3 = Knob
-[delayed_gcode setdisplayneopixel]
-initial_duration: 1
-gcode:
-  SET_LED LED=btt_mini12864 RED=0.50 GREEN=0.00 BLUE=0.00 INDEX=1 TRANSMIT=0
-  SET_LED LED=btt_mini12864 RED=0.13 GREEN=0.16 BLUE=1.00 INDEX=2 TRANSMIT=0
-  SET_LED LED=btt_mini12864 RED=0.13 GREEN=0.16 BLUE=1.00 INDEX=3
-
 #*# <---------------------- SAVE_CONFIG ---------------------->
 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
 #*#