diff --git a/boards.txt b/boards.txt
index c4a693d..270477d 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1,76 +1,118 @@
 menu.cpu=Processor
 menu.clock=Clock
 
-attiny.name=ATtiny
-attiny.bootloader.tool=arduino:avrdude
-attiny.bootloader.unlock_bits=0xff
-attiny.bootloader.lock_bits=0xff
-attiny.build.core=arduino:arduino
-attiny.build.board=attiny
-attiny.upload.tool=arduino:avrdude
+################################################################################
 
-attiny.menu.cpu.attiny25=ATtiny25
-attiny.menu.cpu.attiny25.upload.maximum_size=2048
-attiny.menu.cpu.attiny25.upload.maximum_data_size=128
-attiny.menu.cpu.attiny25.build.mcu=attiny25
-attiny.menu.cpu.attiny25.build.variant=tiny8
+ATtinyX5.name=ATtiny25/45/85
+ATtinyX5.bootloader.tool=arduino:avrdude
+ATtinyX5.bootloader.unlock_bits=0xff
+ATtinyX5.bootloader.lock_bits=0xff
+ATtinyX5.build.core=arduino:arduino
+ATtinyX5.build.board=attiny
+ATtinyX5.upload.tool=arduino:avrdude
 
-attiny.menu.cpu.attiny45=ATtiny45
-attiny.menu.cpu.attiny45.upload.maximum_size=4096
-attiny.menu.cpu.attiny45.upload.maximum_data_size=256
-attiny.menu.cpu.attiny45.build.mcu=attiny45
-attiny.menu.cpu.attiny45.build.variant=tiny8
+ATtinyX5.menu.cpu.attiny25=ATtiny25
+ATtinyX5.menu.cpu.attiny25.upload.maximum_size=2048
+ATtinyX5.menu.cpu.attiny25.upload.maximum_data_size=128
+ATtinyX5.menu.cpu.attiny25.build.mcu=attiny25
+ATtinyX5.menu.cpu.attiny25.build.variant=tiny8
 
-attiny.menu.cpu.attiny85=ATtiny85
-attiny.menu.cpu.attiny85.upload.maximum_size=8192
-attiny.menu.cpu.attiny85.upload.maximum_data_size=512
-attiny.menu.cpu.attiny85.build.mcu=attiny85
-attiny.menu.cpu.attiny85.build.variant=tiny8
+ATtinyX5.menu.cpu.attiny45=ATtiny45
+ATtinyX5.menu.cpu.attiny45.upload.maximum_size=4096
+ATtinyX5.menu.cpu.attiny45.upload.maximum_data_size=256
+ATtinyX5.menu.cpu.attiny45.build.mcu=attiny45
+ATtinyX5.menu.cpu.attiny45.build.variant=tiny8
 
-attiny.menu.cpu.attiny24=ATtiny24
-attiny.menu.cpu.attiny24.upload.maximum_size=2048
-attiny.menu.cpu.attiny24.upload.maximum_data_size=128
-attiny.menu.cpu.attiny24.build.mcu=attiny24
-attiny.menu.cpu.attiny24.build.variant=tiny14
+ATtinyX5.menu.cpu.attiny85=ATtiny85
+ATtinyX5.menu.cpu.attiny85.upload.maximum_size=8192
+ATtinyX5.menu.cpu.attiny85.upload.maximum_data_size=512
+ATtinyX5.menu.cpu.attiny85.build.mcu=attiny85
+ATtinyX5.menu.cpu.attiny85.build.variant=tiny8
 
-attiny.menu.cpu.attiny44=ATtiny44
-attiny.menu.cpu.attiny44.upload.maximum_size=4096
-attiny.menu.cpu.attiny44.upload.maximum_data_size=256
-attiny.menu.cpu.attiny44.build.mcu=attiny44
-attiny.menu.cpu.attiny44.build.variant=tiny14
+ATtinyX5.menu.clock.internal1=1 MHz (internal)
+ATtinyX5.menu.clock.internal1.bootloader.low_fuses=0x62
+ATtinyX5.menu.clock.internal1.bootloader.high_fuses=0xdf
+ATtinyX5.menu.clock.internal1.bootloader.extended_fuses=0xff
+ATtinyX5.menu.clock.internal1.build.f_cpu=1000000L
 
-attiny.menu.cpu.attiny84=ATtiny84
-attiny.menu.cpu.attiny84.upload.maximum_size=8192
-attiny.menu.cpu.attiny84.upload.maximum_data_size=512
-attiny.menu.cpu.attiny84.build.mcu=attiny84
-attiny.menu.cpu.attiny84.build.variant=tiny14
+ATtinyX5.menu.clock.internal8=8 MHz (internal)
+ATtinyX5.menu.clock.internal8.bootloader.low_fuses=0xe2
+ATtinyX5.menu.clock.internal8.bootloader.high_fuses=0xdf
+ATtinyX5.menu.clock.internal8.bootloader.extended_fuses=0xff
+ATtinyX5.menu.clock.internal8.build.f_cpu=8000000L
 
-attiny.menu.clock.internal1=1 MHz (internal)
-attiny.menu.clock.internal1.bootloader.low_fuses=0x62
-attiny.menu.clock.internal1.bootloader.high_fuses=0xdf
-attiny.menu.clock.internal1.bootloader.extended_fuses=0xff
-attiny.menu.clock.internal1.build.f_cpu=1000000L
+ATtinyX5.menu.clock.external8=8 MHz (external)
+ATtinyX5.menu.clock.external8.bootloader.low_fuses=0xfe
+ATtinyX5.menu.clock.external8.bootloader.high_fuses=0xdf
+ATtinyX5.menu.clock.external8.bootloader.extended_fuses=0xff
+ATtinyX5.menu.clock.external8.build.f_cpu=8000000L
 
-attiny.menu.clock.internal8=8 MHz (internal)
-attiny.menu.clock.internal8.bootloader.low_fuses=0xe2
-attiny.menu.clock.internal8.bootloader.high_fuses=0xdf
-attiny.menu.clock.internal8.bootloader.extended_fuses=0xff
-attiny.menu.clock.internal8.build.f_cpu=8000000L
+ATtinyX5.menu.clock.external16=16 MHz (external)
+ATtinyX5.menu.clock.external16.bootloader.low_fuses=0xfe
+ATtinyX5.menu.clock.external16.bootloader.high_fuses=0xdf
+ATtinyX5.menu.clock.external16.bootloader.extended_fuses=0xff
+ATtinyX5.menu.clock.external16.build.f_cpu=16000000L
 
-attiny.menu.clock.external8=8 MHz (external)
-attiny.menu.clock.external8.bootloader.low_fuses=0xfe
-attiny.menu.clock.external8.bootloader.high_fuses=0xdf
-attiny.menu.clock.external8.bootloader.extended_fuses=0xff
-attiny.menu.clock.external8.build.f_cpu=8000000L
+ATtinyX5.menu.clock.external20=20 MHz (external)
+ATtinyX5.menu.clock.external20.bootloader.low_fuses=0xfe
+ATtinyX5.menu.clock.external20.bootloader.high_fuses=0xdf
+ATtinyX5.menu.clock.external20.bootloader.extended_fuses=0xff
+ATtinyX5.menu.clock.external20.build.f_cpu=20000000L
 
-attiny.menu.clock.external16=16 MHz (external)
-attiny.menu.clock.external16.bootloader.low_fuses=0xfe
-attiny.menu.clock.external16.bootloader.high_fuses=0xdf
-attiny.menu.clock.external16.bootloader.extended_fuses=0xff
-attiny.menu.clock.external16.build.f_cpu=16000000L
+################################################################################
 
-attiny.menu.clock.external20=20 MHz (external)
-attiny.menu.clock.external20.bootloader.low_fuses=0xfe
-attiny.menu.clock.external20.bootloader.high_fuses=0xdf
-attiny.menu.clock.external20.bootloader.extended_fuses=0xff
-attiny.menu.clock.external20.build.f_cpu=20000000L
+ATtinyX4.name=ATtiny24/44/84
+ATtinyX4.bootloader.tool=arduino:avrdude
+ATtinyX4.bootloader.unlock_bits=0xff
+ATtinyX4.bootloader.lock_bits=0xff
+ATtinyX4.build.core=arduino:arduino
+ATtinyX4.build.board=attiny
+ATtinyX4.upload.tool=arduino:avrdude
+
+ATtinyX4.menu.cpu.attiny24=ATtiny24
+ATtinyX4.menu.cpu.attiny24.upload.maximum_size=2048
+ATtinyX4.menu.cpu.attiny24.upload.maximum_data_size=128
+ATtinyX4.menu.cpu.attiny24.build.mcu=attiny24
+ATtinyX4.menu.cpu.attiny24.build.variant=tiny14
+
+ATtinyX4.menu.cpu.attiny44=ATtiny44
+ATtinyX4.menu.cpu.attiny44.upload.maximum_size=4096
+ATtinyX4.menu.cpu.attiny44.upload.maximum_data_size=256
+ATtinyX4.menu.cpu.attiny44.build.mcu=attiny44
+ATtinyX4.menu.cpu.attiny44.build.variant=tiny14
+
+ATtinyX4.menu.cpu.attiny84=ATtiny84
+ATtinyX4.menu.cpu.attiny84.upload.maximum_size=8192
+ATtinyX4.menu.cpu.attiny84.upload.maximum_data_size=512
+ATtinyX4.menu.cpu.attiny84.build.mcu=attiny84
+ATtinyX4.menu.cpu.attiny84.build.variant=tiny14
+
+ATtinyX4.menu.clock.internal1=1 MHz (internal)
+ATtinyX4.menu.clock.internal1.bootloader.low_fuses=0x62
+ATtinyX4.menu.clock.internal1.bootloader.high_fuses=0xdf
+ATtinyX4.menu.clock.internal1.bootloader.extended_fuses=0xff
+ATtinyX4.menu.clock.internal1.build.f_cpu=1000000L
+
+ATtinyX4.menu.clock.internal8=8 MHz (internal)
+ATtinyX4.menu.clock.internal8.bootloader.low_fuses=0xe2
+ATtinyX4.menu.clock.internal8.bootloader.high_fuses=0xdf
+ATtinyX4.menu.clock.internal8.bootloader.extended_fuses=0xff
+ATtinyX4.menu.clock.internal8.build.f_cpu=8000000L
+
+ATtinyX4.menu.clock.external8=8 MHz (external)
+ATtinyX4.menu.clock.external8.bootloader.low_fuses=0xfe
+ATtinyX4.menu.clock.external8.bootloader.high_fuses=0xdf
+ATtinyX4.menu.clock.external8.bootloader.extended_fuses=0xff
+ATtinyX4.menu.clock.external8.build.f_cpu=8000000L
+
+ATtinyX4.menu.clock.external16=16 MHz (external)
+ATtinyX4.menu.clock.external16.bootloader.low_fuses=0xfe
+ATtinyX4.menu.clock.external16.bootloader.high_fuses=0xdf
+ATtinyX4.menu.clock.external16.bootloader.extended_fuses=0xff
+ATtinyX4.menu.clock.external16.build.f_cpu=16000000L
+
+ATtinyX4.menu.clock.external20=20 MHz (external)
+ATtinyX4.menu.clock.external20.bootloader.low_fuses=0xfe
+ATtinyX4.menu.clock.external20.bootloader.high_fuses=0xdf
+ATtinyX4.menu.clock.external20.bootloader.extended_fuses=0xff
+ATtinyX4.menu.clock.external20.build.f_cpu=20000000L
\ No newline at end of file