#ifndef _OSWALD_SCREENS_H
#define _OSWALD_SCREENS_H
-void idle_handle_user_buttons(watch_button button);
-void idle_handle_events(u16t event, void *data);
-void draw_accel_screen(void);
-void accel_handle_events(u16t event, void *data);
+event_ret_t idle_handle_events(uint16_t event, void *data);
-void draw_datetime_setup_screen(void);
-void datetime_setup_events(u16t event, void *data);
+event_ret_t accel_handle_events(uint16_t event, void *data);
-void draw_menu_test_screen(void);
-void test_menu_handle_events(u16t event, void *data);
+event_ret_t datetime_setup_events(uint16_t event, void *data);
-#endif
+event_ret_t alarm_setup_events(uint16_t event, void *data);
+
+event_ret_t test_menu_handle_events(uint16_t event, void *data);
+
+event_ret_t stop_watch_handle_events(uint16_t event, void *data);
+
+event_ret_t alarm_handle_events(uint16_t event, void *data);
+event_ret_t bluetooth_screen_events(uint16_t event, void *data);
+
+event_ret_t info_screen_handle_events(uint16_t event, void *data);
+
+#endif