diff --git a/src/ofxPiMapper.cpp b/src/ofxPiMapper.cpp
index cefc516..b56a89d 100644
--- a/src/ofxPiMapper.cpp
+++ b/src/ofxPiMapper.cpp
@@ -146,29 +146,29 @@ void ofxPiMapper::toggleInfo(){
 	_application.toggleInfo();
 }
 
-void ofxPiMapper::setMode(ofxPiMapper::Mode m){
-	if(m == PRESENTATION_MODE){
+void ofxPiMapper::setMode(ofx::piMapper::Mode m){
+	if(m == ofx::piMapper::PRESENTATION_MODE){
 		_application.setPresentationMode();
-	}else if(m == TEXTURE_MODE){
+	}else if(m == ofx::piMapper::TEXTURE_MODE){
 		_application.setTextureMode();
-	}else if(m == MAPPING_MODE){
+	}else if(m == ofx::piMapper::MAPPING_MODE){
 		_application.setProjectionMode();
-	}else if(m == SOURCE_MODE){
+	}else if(m == ofx::piMapper::SOURCE_MODE){
 		_application.setSourceMode();
 	}else{
 		ofLogWarning("ofxPiMapper::setMode", "Please specify valid mode");
 	}
 }
 
-ofxPiMapper::Mode ofxPiMapper::getMode(){
+ofx::piMapper::Mode ofxPiMapper::getMode(){
 	if(_application.getState() == ofx::piMapper::PresentationMode::instance()){
-		return PRESENTATION_MODE;
+		return ofx::piMapper::PRESENTATION_MODE;
 	}else if(_application.getState() == ofx::piMapper::TextureMappingMode::instance()){
-		return TEXTURE_MODE;
+		return ofx::piMapper::TEXTURE_MODE;
 	}else if(_application.getState() == ofx::piMapper::ProjectionMappingMode::instance()){
-		return MAPPING_MODE;
+		return ofx::piMapper::MAPPING_MODE;
 	}else{
-		return SOURCE_MODE;
+		return ofx::piMapper::SOURCE_MODE;
 	}
-	return PRESENTATION_MODE;
+	return ofx::piMapper::PRESENTATION_MODE;
 }
diff --git a/src/ofxPiMapper.h b/src/ofxPiMapper.h
index 9f6d98e..d298d47 100644
--- a/src/ofxPiMapper.h
+++ b/src/ofxPiMapper.h
@@ -5,16 +5,10 @@
 #include "FboSource.h"
 #include "Application.h"
 #include "SurfaceType.h"
+#include "Mode.h"
 
 class ofxPiMapper {
 	public:
-		enum Mode {
-			PRESENTATION_MODE,
-			TEXTURE_MODE,
-			MAPPING_MODE,
-			SOURCE_MODE
-		};
-	
 		ofxPiMapper();
 
 		void setup();
@@ -35,8 +29,8 @@ class ofxPiMapper {
 		void toggleInfo();
 	
 		// Modes
-		void setMode(ofxPiMapper::Mode m);
-		ofxPiMapper::Mode getMode();
+		void setMode(ofx::piMapper::Mode m);
+		ofx::piMapper::Mode getMode();
 	
 		// Project
 		void saveProject();