diff --git a/CamTimer.ioc b/CamTimer.ioc
index a5b6d12..fd8857d 100644
--- a/CamTimer.ioc
+++ b/CamTimer.ioc
@@ -1,5 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
 File.Version=6
+GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
 Mcu.Family=STM32F1
 Mcu.IP0=NVIC
@@ -13,16 +14,19 @@ Mcu.Name=STM32F103C(8-B)Tx
 Mcu.Package=LQFP48
 Mcu.Pin0=PC14-OSC32_IN
 Mcu.Pin1=PC15-OSC32_OUT
-Mcu.Pin10=PA9
-Mcu.Pin11=PA10
-Mcu.Pin12=PA13
-Mcu.Pin13=PA14
-Mcu.Pin14=PB8
-Mcu.Pin15=VP_RTC_VS_RTC_Activate
-Mcu.Pin16=VP_RTC_VS_RTC_Calendar
-Mcu.Pin17=VP_RTC_No_RTC_Output
-Mcu.Pin18=VP_SYS_VS_Systick
+Mcu.Pin10=PB12
+Mcu.Pin11=PB13
+Mcu.Pin12=PB14
+Mcu.Pin13=PA9
+Mcu.Pin14=PA10
+Mcu.Pin15=PA13
+Mcu.Pin16=PA14
+Mcu.Pin17=PB8
+Mcu.Pin18=VP_RTC_VS_RTC_Activate
+Mcu.Pin19=VP_RTC_VS_RTC_Calendar
 Mcu.Pin2=PD0-OSC_IN
+Mcu.Pin20=VP_RTC_No_RTC_Output
+Mcu.Pin21=VP_SYS_VS_Systick
 Mcu.Pin3=PD1-OSC_OUT
 Mcu.Pin4=PA1
 Mcu.Pin5=PA2
@@ -30,7 +34,7 @@ Mcu.Pin6=PA3
 Mcu.Pin7=PA4
 Mcu.Pin8=PA5
 Mcu.Pin9=PA7
-Mcu.PinsNb=19
+Mcu.PinsNb=22
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103C8Tx
@@ -75,6 +79,21 @@ PA7.Mode=TX_Only_Simplex_Unidirect_Master
 PA7.Signal=SPI1_MOSI
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX
+PB12.GPIOParameters=GPIO_PuPd,GPIO_Label
+PB12.GPIO_Label=ButtonLeft
+PB12.GPIO_PuPd=GPIO_PULLUP
+PB12.Locked=true
+PB12.Signal=GPIO_Input
+PB13.GPIOParameters=GPIO_PuPd,GPIO_Label
+PB13.GPIO_Label=ButtonPress
+PB13.GPIO_PuPd=GPIO_PULLUP
+PB13.Locked=true
+PB13.Signal=GPIO_Input
+PB14.GPIOParameters=GPIO_PuPd,GPIO_Label
+PB14.GPIO_Label=ButtonRight
+PB14.GPIO_PuPd=GPIO_PULLUP
+PB14.Locked=true
+PB14.Signal=GPIO_Input
 PB8.GPIOParameters=GPIO_Label
 PB8.GPIO_Label=LED
 PB8.Locked=true
@@ -98,7 +117,7 @@ PD0-OSC_IN.Signal=RCC_OSC_IN
 PD1-OSC_OUT.Mode=HSE-External-Oscillator
 PD1-OSC_OUT.Signal=RCC_OSC_OUT
 PinOutPanel.RotationAngle=0
-ProjectManager.AskForMigrate=true
+ProjectManager.AskForMigrate=false
 ProjectManager.BackupPrevious=false
 ProjectManager.CompilerOptimize=6
 ProjectManager.ComputerToolchain=false
diff --git a/CamTimer.xml b/CamTimer.xml
index 695a106..212a84d 100644
--- a/CamTimer.xml
+++ b/CamTimer.xml
@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE targetDefinitions [ 
-	<!ELEMENT targetDefinitions (board)>
-	<!ELEMENT board (name, dbgIF+, dbgDEV, mcuId)>
-	<!ELEMENT name (#PCDATA)>
-	<!ELEMENT dbgIF (#PCDATA)>
-	<!ELEMENT dbgDEV (#PCDATA)>
-	<!ELEMENT mcuId (#PCDATA)>
-	<!ATTLIST board id CDATA #REQUIRED>
-]>
-
-<targetDefinitions>
-  <board id="camtimer">
-    <name>CamTimer</name>
-    <dbgIF>SWD</dbgIF>
-    <dbgDEV>ST-Link</dbgDEV>
-    <mcuId>stm32f103c8tx</mcuId>
-  </board>
-</targetDefinitions>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE targetDefinitions [
+<!ELEMENT targetDefinitions (board)>
+<!ELEMENT board (name,dbgIF+,dbgDEV,mcuId)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT dbgIF (#PCDATA)>
+<!ELEMENT dbgDEV (#PCDATA)>
+<!ELEMENT mcuId (#PCDATA)>
+<!ATTLIST board id CDATA #REQUIRED>
+]>
+<targetDefinitions>
+  <board id="CamTimer">
+    <name>CamTimer</name>
+    <dbgIF>SWD</dbgIF>
+    <dbgDEV>ST-Link</dbgDEV>
+    <mcuId>stm32f103c8tx</mcuId>
+  </board>
+</targetDefinitions>