diff --git a/Makefile b/Makefile
index 12d49ad..aa0e6ad 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ BUILD		:=	build
 BUILD_DBG	:=	$(TARGET)_dbg
 SOURCES		:=	src \
 				src/common \
-				src/gui \
+				src/mygui \
                 src/language \
 				src/menu \
 				src/menu/tv \
@@ -152,7 +152,7 @@ $(BUILD):
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@$(MAKE) --no-print-directory -C $(CURDIR)/libcontrollerpatcher -f $(CURDIR)/libcontrollerpatcher/Makefile clean
+	#@$(MAKE) --no-print-directory -C $(CURDIR)/libcontrollerpatcher -f $(CURDIR)/libcontrollerpatcher/Makefile clean
 	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).bin $(BUILD_DBG).elf	
 
 #---------------------------------------------------------------------------------
diff --git a/src/menu/MainWindow.h b/src/menu/MainWindow.h
index 4d26fec..ebe934d 100644
--- a/src/menu/MainWindow.h
+++ b/src/menu/MainWindow.h
@@ -22,7 +22,7 @@
 #include <gui/Gui.h>
 #include <system/CMutex.h>
 #include <controller_patcher/ControllerPatcherDefs.h>
-#include "gui/GuiConfigurationScreen.h"
+#include "mygui/GuiConfigurationScreen.h"
 #include "InputGetterMenu.h"
 
 class CVideo;
diff --git a/src/menu/drc/MainWindowDRC.cpp b/src/menu/drc/MainWindowDRC.cpp
index a6873cf..1844b66 100644
--- a/src/menu/drc/MainWindowDRC.cpp
+++ b/src/menu/drc/MainWindowDRC.cpp
@@ -16,7 +16,7 @@
  ****************************************************************************/
 #include "MainWindowDRC.h"
 #include "../../version.h"
-#include <gui/GuiControllerInputDisplay.h>
+#include "mygui/GuiControllerInputDisplay.h"
 
 extern u32 hostIpAddress;
 
diff --git a/src/menu/drc/MainWindowDRC.h b/src/menu/drc/MainWindowDRC.h
index a69579f..77c15de 100644
--- a/src/menu/drc/MainWindowDRC.h
+++ b/src/menu/drc/MainWindowDRC.h
@@ -18,9 +18,9 @@
 #define _MAIN_WINDOW_DRC_H_
 
 #include <gui/Gui.h>
-#include <gui/GuiConfigurationScreen.h>
 #include <language/gettext.h>
 
+#include "mygui/GuiConfigurationScreen.h"
 #include "MenuListDRC.h"
 #include "menu/MainWindow.h"
 #include "MainWindowContent.h"
diff --git a/src/menu/drc/content/ContentController.h b/src/menu/drc/content/ContentController.h
index a44f458..4a89665 100644
--- a/src/menu/drc/content/ContentController.h
+++ b/src/menu/drc/content/ContentController.h
@@ -24,7 +24,7 @@
 #include "ContentTemplate.h"
 #include "menu/drc/MenuElementController.h"
 #include "menu/InputGetterMenu.h"
-#include "gui/GuiControllerInputDisplay.h"
+#include "mygui/GuiControllerInputDisplay.h"
 
 class ContentController : public ContentTemplate{
 public:
diff --git a/src/menu/drc/content/ContentSettings.h b/src/menu/drc/content/ContentSettings.h
index 4a5c272..64842e5 100644
--- a/src/menu/drc/content/ContentSettings.h
+++ b/src/menu/drc/content/ContentSettings.h
@@ -22,8 +22,8 @@
 #include <gui/Gui.h>
 #include <language/gettext.h>
 
-#include "gui/DefaultGuiCheckbox.h"
-#include "gui/DefaultGuiSwitch.h"
+#include "mygui/DefaultGuiCheckBox.h"
+#include "mygui/DefaultGuiSwitch.h"
 #include "ContentTemplate.h"
 
 class ContentSettings : public ContentTemplate{
diff --git a/src/menu/tv/MainWindowTV.h b/src/menu/tv/MainWindowTV.h
index 163b222..778de1a 100644
--- a/src/menu/tv/MainWindowTV.h
+++ b/src/menu/tv/MainWindowTV.h
@@ -22,7 +22,7 @@
 #include <vector>
 #include <queue>
 #include <gui/Gui.h>
-#include "gui/GuiConfigurationScreen.h"
+#include "mygui/GuiConfigurationScreen.h"
 
 #include "TVControllerBanner.h"
 
diff --git a/src/gui/DefaultGuiCheckBox.cpp b/src/mygui/DefaultGuiCheckBox.cpp
similarity index 100%
rename from src/gui/DefaultGuiCheckBox.cpp
rename to src/mygui/DefaultGuiCheckBox.cpp
diff --git a/src/gui/DefaultGuiCheckBox.h b/src/mygui/DefaultGuiCheckBox.h
similarity index 100%
rename from src/gui/DefaultGuiCheckBox.h
rename to src/mygui/DefaultGuiCheckBox.h
diff --git a/src/gui/DefaultGuiSwitch.cpp b/src/mygui/DefaultGuiSwitch.cpp
similarity index 100%
rename from src/gui/DefaultGuiSwitch.cpp
rename to src/mygui/DefaultGuiSwitch.cpp
diff --git a/src/gui/DefaultGuiSwitch.h b/src/mygui/DefaultGuiSwitch.h
similarity index 100%
rename from src/gui/DefaultGuiSwitch.h
rename to src/mygui/DefaultGuiSwitch.h
diff --git a/src/gui/GuiConfigurationScreen.h b/src/mygui/GuiConfigurationScreen.h
similarity index 100%
rename from src/gui/GuiConfigurationScreen.h
rename to src/mygui/GuiConfigurationScreen.h
diff --git a/src/gui/GuiControllerInputDisplay.cpp b/src/mygui/GuiControllerInputDisplay.cpp
similarity index 100%
rename from src/gui/GuiControllerInputDisplay.cpp
rename to src/mygui/GuiControllerInputDisplay.cpp
diff --git a/src/gui/GuiControllerInputDisplay.h b/src/mygui/GuiControllerInputDisplay.h
similarity index 100%
rename from src/gui/GuiControllerInputDisplay.h
rename to src/mygui/GuiControllerInputDisplay.h