   uint8_t hours;
   uint8_t month;
   uint8_t day;
-} WatchState;
+} Watch_t;
 
 uint8_t _watch_days_per_month[] = {
   31, // jan

       toclear = 8;
       break;
  }
  
  uint8_t clearwidth = RGB_OLED_WIDTH*toclear/8;
  oled.clearWindow(RGB_OLED_WIDTH-clearwidth, ypos, RGB_OLED_WIDTH, FONT_Y*2);
  
  sprintf(_sbuf, "%02d:%02d:%02d", hours, minutes, seconds);
  oled.drawString(_sbuf, xpos, ypos, FONT_SIZE*2, WATCH_COLOR);  
}

/**


If 0 is passed in, nothing happens.
*/
void watch_show(uint8_t changes) {
  if (changes == 0) return;

  uint8_t seconds = Watch.seconds;
  uint8_t minutes = Watch.minutes;
  uint8_t hours = Watch.hours;
  uint8_t day = Watch.day;
  uint8_t month = Watch.month;

  uint8_t xpos = 0, ypos = 0;

  uint8_t toclear;
  switch(changes) {
     case 1:
