diff --git a/src/Application/Application.h b/src/Application/Application.h
index a126a9d..6bbb065 100644
--- a/src/Application/Application.h
+++ b/src/Application/Application.h
@@ -45,6 +45,7 @@ class Application {
 		void onMousePressed(ofMouseEventArgs & args);
 		// Then we catch GUI events with this one and create commands
 		void onGuiEvent(GuiEvent & e);
+		// Every state should have it's own GUI layer
 	
 		void addFboSource(FboSource & fboSource);
 	
diff --git a/src/Application/Gui.cpp b/src/Application/Gui.cpp
index 43d0234..c60f40f 100644
--- a/src/Application/Gui.cpp
+++ b/src/Application/Gui.cpp
@@ -15,7 +15,7 @@ Gui * Gui::instance(){
 void Gui::notifyEvent(ofMouseEventArgs & args){
 	GuiEvent e;
 	e.args = args;
-	e.type = 1;
+	e.type = GuiEventType::SURFACE_HIT;
 	ofNotifyEvent(event, e, this);
 }
 
diff --git a/src/Application/Gui.h b/src/Application/Gui.h
index 1dcd0be..ecc6278 100644
--- a/src/Application/Gui.h
+++ b/src/Application/Gui.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ofEvents.h"
+#include "GuiEventType.h"
 
 namespace ofx {
 namespace piMapper {