Updated libaries and core handling.

https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5:-Library-specification
https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification

Merge branch 'lib-1.5-cores' into ide-1.5.x

1 files changed, 153 insertions, 136 deletions

diff --git a/boards.txt b/boards.txt
index f281920..6627cfa 100644
--- a/boards.txt
+++ b/boards.txt
@@ -20,7 +20,7 @@ uno.bootloader.file=optiboot/optiboot_atmega328.hex
 
 uno.build.mcu=atmega328p
 uno.build.f_cpu=16000000L
-uno.build.board=ARDUINO_UNO
+uno.build.board=AVR_UNO
 uno.build.core=arduino
 uno.build.variant=standard
 
@@ -37,33 +37,35 @@ atmega328diecimila.bootloader.unlock_bits=0x3F
 atmega328diecimila.bootloader.lock_bits=0x0F
 
 atmega328diecimila.build.f_cpu=16000000L
-atmega328diecimila.build.board=ARDUINO_DUEMILANOVE
+atmega328diecimila.build.board=AVR_DUEMILANOVE
 atmega328diecimila.build.core=arduino
 atmega328diecimila.build.variant=standard
 
 ## Arduino Duemilanove or Diecimila w/ ATmega328
-menu.cpu.atmega328diecimila.atmega328=ATmega328
+## ---------------------------------------------
+atmega328diecimila.menu.cpu.atmega328=ATmega328
 
-menu.cpu.atmega328diecimila.atmega328.upload.maximum_size=30720
-menu.cpu.atmega328diecimila.atmega328.upload.speed=57600
+atmega328diecimila.menu.cpu.atmega328.upload.maximum_size=30720
+atmega328diecimila.menu.cpu.atmega328.upload.speed=57600
 
-menu.cpu.atmega328diecimila.atmega328.bootloader.high_fuses=0xDA
-menu.cpu.atmega328diecimila.atmega328.bootloader.extended_fuses=0x05
-menu.cpu.atmega328diecimila.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
+atmega328diecimila.menu.cpu.atmega328.bootloader.high_fuses=0xDA
+atmega328diecimila.menu.cpu.atmega328.bootloader.extended_fuses=0x05
+atmega328diecimila.menu.cpu.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
 
-menu.cpu.atmega328diecimila.atmega328.build.mcu=atmega328p
+atmega328diecimila.menu.cpu.atmega328.build.mcu=atmega328p
 
 ## Arduino Duemilanove or Diecimila w/ ATmega168
-menu.cpu.atmega328diecimila.atmega168=ATmega168
+## ---------------------------------------------
+atmega328diecimila.menu.cpu.atmega168=ATmega168
 
-menu.cpu.atmega328diecimila.atmega168.upload.maximum_size=14336
-menu.cpu.atmega328diecimila.atmega168.upload.speed=19200
+atmega328diecimila.menu.cpu.atmega168.upload.maximum_size=14336
+atmega328diecimila.menu.cpu.atmega168.upload.speed=19200
 
-menu.cpu.atmega328diecimila.atmega168.bootloader.high_fuses=0xdd
-menu.cpu.atmega328diecimila.atmega168.bootloader.extended_fuses=0x00
-menu.cpu.atmega328diecimila.atmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
+atmega328diecimila.menu.cpu.atmega168.bootloader.high_fuses=0xdd
+atmega328diecimila.menu.cpu.atmega168.bootloader.extended_fuses=0x00
+atmega328diecimila.menu.cpu.atmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
 
-menu.cpu.atmega328diecimila.atmega168.build.mcu=atmega168
+atmega328diecimila.menu.cpu.atmega168.build.mcu=atmega168
 
 ##############################################################
 
@@ -77,35 +79,37 @@ nano.bootloader.unlock_bits=0x3F
 nano.bootloader.lock_bits=0x0F
 
 nano.build.f_cpu=16000000L
-nano.build.board=ARDUINO_NANO
+nano.build.board=AVR_NANO
 nano.build.core=arduino
 nano.build.variant=eightanaloginputs
 
 ## Arduino Nano w/ ATmega328
-menu.cpu.nano.atmega328=ATmega328
+## -------------------------
+nano.menu.cpu.atmega328=ATmega328
 
-menu.cpu.nano.atmega328.upload.maximum_size=30720
-menu.cpu.nano.atmega328.upload.speed=57600
+nano.menu.cpu.atmega328.upload.maximum_size=30720
+nano.menu.cpu.atmega328.upload.speed=57600
 
-menu.cpu.nano.atmega328.bootloader.low_fuses=0xFF
-menu.cpu.nano.atmega328.bootloader.high_fuses=0xDA
-menu.cpu.nano.atmega328.bootloader.extended_fuses=0x05
-menu.cpu.nano.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
+nano.menu.cpu.atmega328.bootloader.low_fuses=0xFF
+nano.menu.cpu.atmega328.bootloader.high_fuses=0xDA
+nano.menu.cpu.atmega328.bootloader.extended_fuses=0x05
+nano.menu.cpu.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
 
 menu.cpu.nano.atmega328.build.mcu=atmega328p
 
 ## Arduino Nano w/ ATmega168
-menu.cpu.nano.atmega168=ATmega168
+## -------------------------
+nano.menu.cpu.atmega168=ATmega168
 
-menu.cpu.nano.atmega168.upload.maximum_size=14336
-menu.cpu.nano.atmega168.upload.speed=19200
+nano.menu.cpu.atmega168.upload.maximum_size=14336
+nano.menu.cpu.atmega168.upload.speed=19200
 
-menu.cpu.nano.atmega168.bootloader.low_fuses=0xff
-menu.cpu.nano.atmega168.bootloader.high_fuses=0xdd
-menu.cpu.nano.atmega168.bootloader.extended_fuses=0x00
-menu.cpu.nano.atmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
+nano.menu.cpu.atmega168.bootloader.low_fuses=0xff
+nano.menu.cpu.atmega168.bootloader.high_fuses=0xdd
+nano.menu.cpu.atmega168.bootloader.extended_fuses=0x00
+nano.menu.cpu.atmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
 
-menu.cpu.nano.atmega168.build.mcu=atmega168
+nano.menu.cpu.atmega168.build.mcu=atmega168
 
 ##############################################################
 
@@ -127,7 +131,7 @@ mega2560.bootloader.lock_bits=0x0F
 
 mega2560.build.mcu=atmega2560
 mega2560.build.f_cpu=16000000L
-mega2560.build.board=ARDUINO_MEGA2560
+mega2560.build.board=AVR_MEGA2560
 mega2560.build.core=arduino
 mega2560.build.variant=mega
 
@@ -151,7 +155,7 @@ mega.bootloader.lock_bits=0x0F
 
 mega.build.mcu=atmega1280
 mega.build.f_cpu=16000000L
-mega.build.board=ARDUINO_MEGA
+mega.build.board=AVR_MEGA
 mega.build.core=arduino
 mega.build.variant=mega
 
@@ -178,7 +182,7 @@ leonardo.build.mcu=atmega32u4
 leonardo.build.f_cpu=16000000L
 leonardo.build.vid=0x2341
 leonardo.build.pid=0x8036
-leonardo.build.board=ARDUINO_LEONARDO
+leonardo.build.board=AVR_LEONARDO
 leonardo.build.core=arduino
 leonardo.build.variant=leonardo
 leonardo.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
@@ -206,7 +210,7 @@ micro.build.mcu=atmega32u4
 micro.build.f_cpu=16000000L
 micro.build.vid=0x2341
 micro.build.pid=0x8037
-micro.build.board=ARDUINO_MICRO
+micro.build.board=AVR_MICRO
 micro.build.core=arduino
 micro.build.variant=micro
 micro.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
@@ -234,7 +238,7 @@ esplora.build.mcu=atmega32u4
 esplora.build.f_cpu=16000000L
 esplora.build.vid=0x2341
 esplora.build.pid=0x803c
-esplora.build.board=ARDUINO_ESPLORA
+esplora.build.board=AVR_ESPLORA
 esplora.build.core=arduino
 esplora.build.variant=leonardo
 esplora.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
@@ -252,33 +256,35 @@ mini.bootloader.unlock_bits=0x3F
 mini.bootloader.lock_bits=0x0F
 
 mini.build.f_cpu=16000000L
-mini.build.board=ARDUINO_MINI
+mini.build.board=AVR_MINI
 mini.build.core=arduino
 mini.build.variant=eightanaloginputs
 
 ## Arduino Mini w/ ATmega328
-menu.cpu.mini.atmega328=ATmega328
+## -------------------------
+mini.menu.cpu.atmega328=ATmega328
 
-menu.cpu.mini.atmega328.upload.maximum_size=28672
-menu.cpu.mini.atmega328.upload.speed=115200
+mini.menu.cpu.atmega328.upload.maximum_size=28672
+mini.menu.cpu.atmega328.upload.speed=115200
 
-menu.cpu.mini.atmega328.bootloader.high_fuses=0xd8
-menu.cpu.mini.atmega328.bootloader.extended_fuses=0x05
-menu.cpu.mini.atmega328.bootloader.file=optiboot/optiboot_atmega328-Mini.hex
+mini.menu.cpu.atmega328.bootloader.high_fuses=0xd8
+mini.menu.cpu.atmega328.bootloader.extended_fuses=0x05
+mini.menu.cpu.atmega328.bootloader.file=optiboot/optiboot_atmega328-Mini.hex
 
-menu.cpu.mini.atmega328.build.mcu=atmega328p
+mini.menu.cpu.atmega328.build.mcu=atmega328p
 
 ## Arduino Mini w/ ATmega168
-menu.cpu.mini.atmega168=ATmega168
+## -------------------------
+mini.menu.cpu.atmega168=ATmega168
 
-menu.cpu.mini.atmega168.upload.maximum_size=14336
-menu.cpu.mini.atmega168.upload.speed=19200
+mini.menu.cpu.atmega168.upload.maximum_size=14336
+mini.menu.cpu.atmega168.upload.speed=19200
 
-menu.cpu.mini.atmega168.bootloader.high_fuses=0xdd
-menu.cpu.mini.atmega168.bootloader.extended_fuses=0x00
-menu.cpu.mini.atmega168.bootloader.file=atmega/ATmegaBOOT_168_ng.hex
+mini.menu.cpu.atmega168.bootloader.high_fuses=0xdd
+mini.menu.cpu.atmega168.bootloader.extended_fuses=0x00
+mini.menu.cpu.atmega168.bootloader.file=atmega/ATmegaBOOT_168_ng.hex
 
-menu.cpu.mini.atmega168.build.mcu=atmega168
+mini.menu.cpu.atmega168.build.mcu=atmega168
 
 ##############################################################
 
@@ -300,7 +306,7 @@ ethernet.bootloader.lock_bits=0x0F
 ethernet.build.variant=standard
 ethernet.build.mcu=atmega328p
 ethernet.build.f_cpu=16000000L
-ethernet.build.board=ARDUINO_ETHERNET
+ethernet.build.board=AVR_ETHERNET
 ethernet.build.core=arduino
 
 ##############################################################
@@ -322,7 +328,7 @@ fio.bootloader.lock_bits=0x0F
 
 fio.build.mcu=atmega328p
 fio.build.f_cpu=8000000L
-fio.build.board=ARDUINO_FIO
+fio.build.board=AVR_FIO
 fio.build.core=arduino
 fio.build.variant=eightanaloginputs
 
@@ -341,29 +347,31 @@ bt.bootloader.unlock_bits=0x3F
 bt.bootloader.lock_bits=0x0F
 
 bt.build.f_cpu=16000000L
-bt.build.board=ARDUINO_BT
+bt.build.board=AVR_BT
 bt.build.core=arduino
 bt.build.variant=eightanaloginputs
 
 ## Arduino BT w/ ATmega328
-menu.cpu.bt.atmega328=ATmega328
-menu.cpu.bt.atmega328.upload.maximum_size=28672
+## -----------------------
+bt.menu.cpu.atmega328=ATmega328
+bt.menu.cpu.atmega328.upload.maximum_size=28672
 
-menu.cpu.bt.atmega328.bootloader.high_fuses=0xd8
-menu.cpu.bt.atmega328.bootloader.extended_fuses=0x05
-menu.cpu.bt.atmega328.bootloader.file=bt/ATmegaBOOT_168_atmega328_bt.hex
+bt.menu.cpu.atmega328.bootloader.high_fuses=0xd8
+bt.menu.cpu.atmega328.bootloader.extended_fuses=0x05
+bt.menu.cpu.atmega328.bootloader.file=bt/ATmegaBOOT_168_atmega328_bt.hex
 
-menu.cpu.bt.atmega328.build.mcu=atmega328p
+bt.menu.cpu.atmega328.build.mcu=atmega328p
 
 ## Arduino BT w/ ATmega168
-menu.cpu.bt.atmega168=ATmega168
-menu.cpu.bt.atmega168.upload.maximum_size=14336
+## -----------------------
+bt.menu.cpu.atmega168=ATmega168
+bt.menu.cpu.atmega168.upload.maximum_size=14336
 
-menu.cpu.bt.atmega168.bootloader.high_fuses=0xdd
-menu.cpu.bt.atmega168.bootloader.extended_fuses=0x00
-menu.cpu.bt.atmega168.bootloader.file=bt/ATmegaBOOT_168.hex
+bt.menu.cpu.atmega168.bootloader.high_fuses=0xdd
+bt.menu.cpu.atmega168.bootloader.extended_fuses=0x00
+bt.menu.cpu.atmega168.bootloader.file=bt/ATmegaBOOT_168.hex
 
-menu.cpu.bt.atmega168.build.mcu=atmega168
+bt.menu.cpu.atmega168.build.mcu=atmega168
 
 ##############################################################
 
@@ -389,7 +397,7 @@ LilyPadUSB.build.mcu=atmega32u4
 LilyPadUSB.build.f_cpu=8000000L
 LilyPadUSB.build.vid=0x1B4F
 LilyPadUSB.build.pid=0x9208
-LilyPadUSB.build.board=ARDUINO_LILYPAD_USB
+LilyPadUSB.build.board=AVR_LILYPAD_USB
 LilyPadUSB.build.core=arduino
 LilyPadUSB.build.variant=leonardo
 LilyPadUSB.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid}
@@ -406,35 +414,37 @@ lilypad.bootloader.unlock_bits=0x3F
 lilypad.bootloader.lock_bits=0x0F
 
 lilypad.build.f_cpu=8000000L
-lilypad.build.board=ARDUINO_LILYPAD
+lilypad.build.board=AVR_LILYPAD
 lilypad.build.core=arduino
 lilypad.build.variant=standard
 
 ## LilyPad Arduino w/ ATmega328
-menu.cpu.lilypad.atmega328=ATmega328
+## ----------------------------
+lilypad.menu.cpu.atmega328=ATmega328
 
-menu.cpu.lilypad.atmega328.upload.maximum_size=30720
-menu.cpu.lilypad.atmega328.upload.speed=57600
+lilypad.menu.cpu.atmega328.upload.maximum_size=30720
+lilypad.menu.cpu.atmega328.upload.speed=57600
 
-menu.cpu.lilypad.atmega328.bootloader.low_fuses=0xFF
-menu.cpu.lilypad.atmega328.bootloader.high_fuses=0xDA
-menu.cpu.lilypad.atmega328.bootloader.extended_fuses=0x05
-menu.cpu.lilypad.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
+lilypad.menu.cpu.atmega328.bootloader.low_fuses=0xFF
+lilypad.menu.cpu.atmega328.bootloader.high_fuses=0xDA
+lilypad.menu.cpu.atmega328.bootloader.extended_fuses=0x05
+lilypad.menu.cpu.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
 
-menu.cpu.lilypad.atmega328.build.mcu=atmega328p
+lilypad.menu.cpu.atmega328.build.mcu=atmega328p
 
 ## LilyPad Arduino w/ ATmega168
-menu.cpu.lilypad.atmega168=ATmega168
+## ----------------------------
+lilypad.menu.cpu.atmega168=ATmega168
 
-menu.cpu.lilypad.atmega168.upload.maximum_size=14336
-menu.cpu.lilypad.atmega168.upload.speed=19200
+lilypad.menu.cpu.atmega168.upload.maximum_size=14336
+lilypad.menu.cpu.atmega168.upload.speed=19200
 
-menu.cpu.lilypad.atmega168.bootloader.low_fuses=0xe2
-menu.cpu.lilypad.atmega168.bootloader.high_fuses=0xdd
-menu.cpu.lilypad.atmega168.bootloader.extended_fuses=0x00
-menu.cpu.lilypad.atmega168.bootloader.file=lilypad/LilyPadBOOT_168.hex
+lilypad.menu.cpu.atmega168.bootloader.low_fuses=0xe2
+lilypad.menu.cpu.atmega168.bootloader.high_fuses=0xdd
+lilypad.menu.cpu.atmega168.bootloader.extended_fuses=0x00
+lilypad.menu.cpu.atmega168.bootloader.file=lilypad/LilyPadBOOT_168.hex
 
-menu.cpu.lilypad.atmega168.build.mcu=atmega168
+lilypad.menu.cpu.atmega168.build.mcu=atmega168
 
 ##############################################################
 
@@ -447,65 +457,69 @@ pro.bootloader.tool=avrdude
 pro.bootloader.unlock_bits=0x3F
 pro.bootloader.lock_bits=0x0F
 
-pro.build.board=ARDUINO_PRO
+pro.build.board=AVR_PRO
 pro.build.core=arduino
 pro.build.variant=standard
 
 ## Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega328
-menu.cpu.pro.16MHzatmega328=ATmega328 (5V, 16 MHz)
+## -------------------------------------------------
+pro.menu.cpu.16MHzatmega328=ATmega328 (5V, 16 MHz)
 
-menu.cpu.pro.16MHzatmega328.upload.maximum_size=30720
-menu.cpu.pro.16MHzatmega328.upload.speed=57600
+pro.menu.cpu.16MHzatmega328.upload.maximum_size=30720
+pro.menu.cpu.16MHzatmega328.upload.speed=57600
 
-menu.cpu.pro.16MHzatmega328.bootloader.low_fuses=0xFF
-menu.cpu.pro.16MHzatmega328.bootloader.high_fuses=0xDA
-menu.cpu.pro.16MHzatmega328.bootloader.extended_fuses=0x05
-menu.cpu.pro.16MHzatmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
+pro.menu.cpu.16MHzatmega328.bootloader.low_fuses=0xFF
+pro.menu.cpu.16MHzatmega328.bootloader.high_fuses=0xDA
+pro.menu.cpu.16MHzatmega328.bootloader.extended_fuses=0x05
+pro.menu.cpu.16MHzatmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
 
-menu.cpu.pro.16MHzatmega328.build.mcu=atmega328p
-menu.cpu.pro.16MHzatmega328.build.f_cpu=16000000L
+pro.menu.cpu.16MHzatmega328.build.mcu=atmega328p
+pro.menu.cpu.16MHzatmega328.build.f_cpu=16000000L
 
 ## Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega328
-menu.cpu.pro.8MHzatmega328=ATmega328 (3.3V, 8 MHz)
+## --------------------------------------------------
+pro.menu.cpu.8MHzatmega328=ATmega328 (3.3V, 8 MHz)
 
-menu.cpu.pro.8MHzatmega328.upload.maximum_size=30720
-menu.cpu.pro.8MHzatmega328.upload.speed=57600
+pro.menu.cpu.8MHzatmega328.upload.maximum_size=30720
+pro.menu.cpu.8MHzatmega328.upload.speed=57600
 
-menu.cpu.pro.8MHzatmega328.bootloader.low_fuses=0xFF
-menu.cpu.pro.8MHzatmega328.bootloader.high_fuses=0xDA
-menu.cpu.pro.8MHzatmega328.bootloader.extended_fuses=0x05
-menu.cpu.pro.8MHzatmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
+pro.menu.cpu.8MHzatmega328.bootloader.low_fuses=0xFF
+pro.menu.cpu.8MHzatmega328.bootloader.high_fuses=0xDA
+pro.menu.cpu.8MHzatmega328.bootloader.extended_fuses=0x05
+pro.menu.cpu.8MHzatmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
 
-menu.cpu.pro.8MHzatmega328.build.mcu=atmega328p
-menu.cpu.pro.8MHzatmega328.build.f_cpu=8000000L
+pro.menu.cpu.8MHzatmega328.build.mcu=atmega328p
+pro.menu.cpu.8MHzatmega328.build.f_cpu=8000000L
 
 ## Arduino Pro or Pro Mini (5V, 16 MHz) w/ ATmega168
-menu.cpu.pro.16MHzatmega168=ATmega168 (5V, 16 MHz)
+## -------------------------------------------------
+pro.menu.cpu.16MHzatmega168=ATmega168 (5V, 16 MHz)
 
-menu.cpu.pro.16MHzatmega168.upload.maximum_size=14336
-menu.cpu.pro.16MHzatmega168.upload.speed=19200
+pro.menu.cpu.16MHzatmega168.upload.maximum_size=14336
+pro.menu.cpu.16MHzatmega168.upload.speed=19200
 
-menu.cpu.pro.16MHzatmega168.bootloader.low_fuses=0xff
-menu.cpu.pro.16MHzatmega168.bootloader.high_fuses=0xdd
-menu.cpu.pro.16MHzatmega168.bootloader.extended_fuses=0x00
-menu.cpu.pro.16MHzatmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
+pro.menu.cpu.16MHzatmega168.bootloader.low_fuses=0xff
+pro.menu.cpu.16MHzatmega168.bootloader.high_fuses=0xdd
+pro.menu.cpu.16MHzatmega168.bootloader.extended_fuses=0x00
+pro.menu.cpu.16MHzatmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
 
-menu.cpu.pro.16MHzatmega168.build.mcu=atmega168
-menu.cpu.pro.16MHzatmega168.build.f_cpu=16000000L
+pro.menu.cpu.16MHzatmega168.build.mcu=atmega168
+pro.menu.cpu.16MHzatmega168.build.f_cpu=16000000L
 
 ## Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega168
-menu.cpu.pro.8MHzatmega168=ATmega168 (3.3V, 8 MHz)
+## --------------------------------------------------
+pro.menu.cpu.8MHzatmega168=ATmega168 (3.3V, 8 MHz)
 
-menu.cpu.pro.8MHzatmega168.upload.maximum_size=14336
-menu.cpu.pro.8MHzatmega168.upload.speed=19200
+pro.menu.cpu.8MHzatmega168.upload.maximum_size=14336
+pro.menu.cpu.8MHzatmega168.upload.speed=19200
 
-menu.cpu.pro.8MHzatmega168.bootloader.low_fuses=0xc6
-menu.cpu.pro.8MHzatmega168.bootloader.high_fuses=0xdd
-menu.cpu.pro.8MHzatmega168.bootloader.extended_fuses=0x00
-menu.cpu.pro.8MHzatmega168.bootloader.file=atmega/ATmegaBOOT_168_pro_8MHz.hex
+pro.menu.cpu.8MHzatmega168.bootloader.low_fuses=0xc6
+pro.menu.cpu.8MHzatmega168.bootloader.high_fuses=0xdd
+pro.menu.cpu.8MHzatmega168.bootloader.extended_fuses=0x00
+pro.menu.cpu.8MHzatmega168.bootloader.file=atmega/ATmegaBOOT_168_pro_8MHz.hex
 
-menu.cpu.pro.8MHzatmega168.build.mcu=atmega168
-menu.cpu.pro.8MHzatmega168.build.f_cpu=8000000L
+pro.menu.cpu.8MHzatmega168.build.mcu=atmega168
+pro.menu.cpu.8MHzatmega168.build.f_cpu=8000000L
 
 ##############################################################
 
@@ -521,29 +535,32 @@ atmegang.bootloader.lock_bits=0x0F
 
 atmegang.build.mcu=atmegang
 atmegang.build.f_cpu=16000000L
-atmegang.build.board=ARDUINO_NG
+atmegang.build.board=AVR_NG
 atmegang.build.core=arduino
 atmegang.build.variant=standard
 
 ## Arduino NG or older w/ ATmega168
-menu.cpu.atmegang.atmega168=ATmega168
+## --------------------------------
+atmegang.menu.cpu.atmega168=ATmega168
 
-menu.cpu.atmegang.atmega168.upload.maximum_size=14336
+atmegang.menu.cpu.atmega168.upload.maximum_size=14336
 
-menu.cpu.atmegang.atmega168.bootloader.low_fuses=0xff
-menu.cpu.atmegang.atmega168.bootloader.high_fuses=0xdd
-menu.cpu.atmegang.atmega168.bootloader.extended_fuses=0x00
-menu.cpu.atmegang.atmega168.bootloader.file=atmega/ATmegaBOOT_168_ng.hex
+atmegang.menu.cpu.atmega168.bootloader.low_fuses=0xff
+atmegang.menu.cpu.atmega168.bootloader.high_fuses=0xdd
+atmegang.menu.cpu.atmega168.bootloader.extended_fuses=0x00
+atmegang.menu.cpu.atmega168.bootloader.file=atmega/ATmegaBOOT_168_ng.hex
 
-menu.cpu.atmegang.atmega168.build.mcu=atmega168
+atmegang.menu.cpu.atmega168.build.mcu=atmega168
 
 ## Arduino NG or older w/ ATmega8
-menu.cpu.atmegang.atmega8=ATmega8
+## ------------------------------
+atmegang.menu.cpu.atmega8=ATmega8
 
-menu.cpu.atmegang.atmega8.upload.maximum_size=7168
+atmegang.menu.cpu.atmega8.upload.maximum_size=7168
 
-menu.cpu.atmegang.atmega8.bootloader.low_fuses=0xdf
-menu.cpu.atmegang.atmega8.bootloader.high_fuses=0xca
-menu.cpu.atmegang.atmega8.bootloader.file=atmega8/ATmegaBOOT-prod-firmware-2009-11-07.hex
+atmegang.menu.cpu.atmega8.bootloader.low_fuses=0xdf
+atmegang.menu.cpu.atmega8.bootloader.high_fuses=0xca
+atmegang.menu.cpu.atmega8.bootloader.file=atmega8/ATmegaBOOT-prod-firmware-2009-11-07.hex
+
+atmegang.menu.cpu.atmega8.build.mcu=atmega8
 
-menu.cpu.atmegang.atmega8.build.mcu=atmega8