   numkey.setNumkeyEventHandler(&numkeyEventHandler);
   numkey.setDebounce(100);
   
-  header.setText("Main Screen");
-  terminal.setColors(WHITE,GRAY2,GRAY1);
+  header.setText("Main Screen",false);
+  terminal.setColors(BLACK,WHITE,WHITE);
     
-  canvas.add(&header,0,0);
-  canvas.add(&btnMain,0,230);
-  canvas.add(&btnDial,80,230);
-  canvas.add(&btnClearTerminal,160,230);  
-  canvas.add(&terminal,0,270);
-  canvas.setScreen(&screen_main);
+  canvas.add(&header,0,0,false);
+  canvas.add(&btnMain,0,230,false);
+  canvas.add(&btnDial,80,230,false);
+  canvas.add(&btnButtons,160,230,false);  
+  canvas.add(&terminal,0,270,false);
+  canvas.setScreen(&screen_main);  
+
+  welcomeMessage();
+}
+
+void setup() {
+  Serial.begin(115200);
+  guiSetup();
 }
 
 //==================================

#include <Button.h>
#include <Dial.h>
#include <Numkey.h>

// Use either of these three and
// its corresponding include above
Canvas_SEEEDTOUCH canvas = Canvas_SEEEDTOUCH(TFT_PORTRAIT,BLACK);
//Canvas_FT6206 canvas = Canvas_FT6206(TFT_PORTRAIT,BLACK);
//Canvas_STMPE610 canvas = Canvas_STMPE610(TFT_PORTRAIT,BLACK);

Display header = Display(240,50,BLUE,WHITE,WHITE,20);
Display title = Display(20);
Terminal terminal = Terminal(240,50);
Numkey numkey = Numkey();

Screen screen_main = Screen(&canvas);
Button btnMain = Button();
Button btnClearTerminal = Button();

Screen screen_dial = Screen(&canvas);
Button btnDial = Button();
Dial dial = Dial();
Button btnPlus = Button(20,GRAY1,WHITE,ILI9341_LIGHTGREY);  //Initialization version for round buttons
Button btnMinus = Button(20,GRAY1,WHITE,ILI9341_LIGHTGREY); //Initialization version for round buttons

const char increment = 1;

//==================================
// EVENT HANDLING ROUTINES
//==================================
void btnMainEventHandler(Button* btn){
  terminal.print("Switched to Main Screen");
  header.setText("Main");
  canvas.setScreen(&screen_main);
}

void btnDialEventHandler(Button* btn){
  // Show the numkey to enter a password
  // The numkey event handler will verify the password
  // and change the screen if the password is correct
  canvas.add(&numkey,60,50);
}

void btnClearTerminalEventHandler(Button* btn){
  terminal.clear();
  Serial.println("Terminal Cleared");
}

void btnPlusEventHandler(Button* btn){

  nk->clear();
}

void welcomeMessage(){
  terminal.print("Welcome to Touchscreen GUI demo",YELLOW);
  terminal.print("This demo shows up some features",GREEN);
  terminal.print("of the library. Enjoy!");  
}

//==================================
// SETUP
//==================================
void guiSetup(){
  canvas.init();

  // ===== MAIN SCREEN =====
