diff --git a/avr/devices/n25/boot/0BUILD b/avr/devices/n25/boot/0BUILD
index 068003c..a5e91d4 100644
--- a/avr/devices/n25/boot/0BUILD
+++ b/avr/devices/n25/boot/0BUILD
@@ -2,7 +2,7 @@
 
 <gwbuild>
 
-  <target type="AvrHexFile" name="n22_boot" >
+  <target type="AvrHexFile" name="n25_boot" >
 
     <includes type="avrasm" >
       -I $(builddir)
diff --git a/avr/devices/n25/boot/boot.asm b/avr/devices/n25/boot/boot.asm
index 4fb42c7..d0987a0 100644
--- a/avr/devices/n25/boot/boot.asm
+++ b/avr/devices/n25/boot/boot.asm
@@ -18,24 +18,14 @@
 .include "../defs.asm"
 .include "devices/all/defs.asm"
 
+.include "common/calls.asm"
+.include "common/utils_wait.asm"
+
 
 
 ; ***************************************************************************
 ; defines
 
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-
-
 ; ---------------------------------------------------------------------------
 ; LED
 
@@ -56,21 +46,24 @@
 
 ; ---------------------------------------------------------------------------
 ; Reset and interrupt vectors
-  rjmp main ; Reset vector
-  reti ; EXT_INT0
-  reti ; PCI0
-  reti ; OC1A
-  reti ; OVF1
-  reti ; OVF0
-  reti ; ERDY
-  reti ; ACI
-  reti ; ADCC
-  reti ; OC1B
-  reti ; OC0A
-  reti ; OC0B
-  reti ; WATCHDOG
-  reti ; USI_STR
-  reti ; USI_OVF
+
+  rjmp main                   ;  1: Reset vector
+  reti                        ;  2: EXT_INT0
+  reti                        ;  3: PCI0
+  reti                        ;  4: PCI1
+  reti                        ;  5: WDT
+  reti                        ;  6: TIM1_CAPT
+  reti                        ;  7: TIM1_COMPA
+  reti                        ;  8: TIM1_COMPB
+  reti                        ;  9: TIM1_OVF
+  reti                        ; 10: TIM0_COMPA
+  reti                        ; 11: TIM0_COMPB
+  reti                        ; 12: TIM0_OVF
+  reti                        ; 13: ANA_COMP
+  reti                        ; 14: ADC
+  reti                        ; 15: EE_RDY
+  reti                        ; 16: USI_STR
+  reti                        ; 17: USI_OVF
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
@@ -79,7 +72,8 @@ devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; v
 firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 
-firmwareStart:   rjmp main ; will be overwritten when flashing
+firmwareStart:
+  rjmp main ; will be overwritten when flashing
 
 
 
diff --git a/avr/devices/n25/main/0BUILD b/avr/devices/n25/main/0BUILD
index 38ed80d..112ea4d 100644
--- a/avr/devices/n25/main/0BUILD
+++ b/avr/devices/n25/main/0BUILD
@@ -2,7 +2,7 @@
 
 <gwbuild>
 
-  <target type="AvrHexFile" name="n22_firmware" >
+  <target type="AvrHexFile" name="n25_firmware" >
 
     <includes type="avrasm" >
       -I $(builddir)
diff --git a/avr/devices/n25/main/main.asm b/avr/devices/n25/main/main.asm
index fc98377..1cb6359 100644
--- a/avr/devices/n25/main/main.asm
+++ b/avr/devices/n25/main/main.asm
@@ -27,6 +27,8 @@
 ;.include "./data.asm"
 
 .include "devices/all/defs.asm"
+
+.include "common/calls.asm"
 .include "common/utils_wait.asm"
 
 
@@ -95,21 +97,27 @@
 ; ---------------------------------------------------------------------------
 ; Reset and interrupt vectors
 
-        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
-	reti ; EXT_INT0
-	rjmp UART_BitBang_PcintIsr ; PCI0
-	reti ; OC1A
-	reti ; OVF1
-	reti ; OVF0
-	reti ; ERDY
-	reti ; ACI
-        reti ; ADCC
-	reti ; OC1B
-        rjmp baseTimerIrqOC0A ; OC0A
-	reti ; OC0B
-	reti ; WATCHDOG
-	reti ; USI_STR
-	reti ; USI_OVF
+  rjmp BOOTLOADER_ADDR        ;  1: Reset vector  ; use this for flashed system
+  reti                        ;  2: EXT_INT0
+#ifdef MODULES_UART_BITBANG
+  rjmp UART_BitBang_PcintIsr  ;  3: PCI0
+#else
+  reti                        ;  3: PCI0
+#endif
+  reti                        ;  4: PCI1
+  reti                        ;  5: WDT
+  reti                        ;  6: TIM1_CAPT
+  reti                        ;  7: TIM1_COMPA
+  reti                        ;  8: TIM1_COMPB
+  reti                        ;  9: TIM1_OVF
+  rjmp baseTimerIrqOC0A       ; 10: TIM0_COMPA
+  reti                        ; 11: TIM0_COMPB
+  reti                        ; 12: TIM0_OVF
+  reti                        ; 13: ANA_COMP
+  reti                        ; 14: ADC
+  reti                        ; 15: EE_RDY
+  reti                        ; 16: USI_STR
+  reti                        ; 17: USI_OVF
 
 
 devInfoBlock:        ; 12 bytes
@@ -163,12 +171,14 @@ onEveryDay:
 
 onEverySecond:
   ret
+#if 0
   ; debug
   ldi r19, 0x00           ; G
   ldi r18, 0xff           ; R
   ldi r20, 0x55           ; B
   ldi r21, 0xaa           ; W
   rcall SK6812_SetAllColor ; r23 (r16, r17)
+#endif
   ret
 
 
@@ -191,14 +201,16 @@ onEveryLoop:
 
 .include "devices/all/hw_tn84.asm"
 .include "devices/all/includes.asm"
-.include "common/debug.asm"
+;.include "common/debug.asm"
 
 
 
 ; ---------------------------------------------------------------------------
 ; defines for network interface
 
+#ifdef MODULES_UART_BITBANG
 .equ netInterfaceData = uart_bitbang_iface
+#endif