diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index da618d079..81ced9713 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -49,6 +49,7 @@
 #include <driver/radiotext.h>
 
 #include <gui/color.h>
+#include <gui/color_custom.h>
 #include <gui/epgview.h>
 #include <gui/eventlist.h>
 #include <gui/infoviewer.h>
@@ -64,7 +65,6 @@
 #include <gui/infoclock.h>
 #include <system/settings.h>
 #include <system/set_threadname.h>
-#include <gui/customcolor.h>
 
 #include <gui/bouquetlist.h>
 #include <daemonc/remotecontrol.h>
diff --git a/src/gui/color_custom.h b/src/gui/color_custom.h
new file mode 100644
index 000000000..2b3ccc800
--- /dev/null
+++ b/src/gui/color_custom.h
@@ -0,0 +1,60 @@
+#ifndef __color_custom__
+#define __color_custom__
+
+#define COLOR_CUSTOM	0x0
+#ifdef FB_USE_PALETTE
+/*
+#define COL_WHITE	(COLOR_CUSTOM + 0)
+#define COL_RED		(COLOR_CUSTOM + 1)
+#define COL_GREEN	(COLOR_CUSTOM + 2)
+#define COL_BLUE	(COLOR_CUSTOM + 3)
+#define COL_YELLOW	(COLOR_CUSTOM + 4)
+#define COL_BLACK	(COLOR_CUSTOM + 5)
+*/
+#define COL_DARK_RED	0x02
+#define COL_DARK_GREEN	0x03
+#define COL_OLIVE	0x04
+#define COL_DARK_BLUE	0x05
+#define COL_LIGHT_GRAY	0x08
+#define COL_DARK_GRAY	0x09
+#define COL_RED		0x0A
+#define COL_GREEN	0x0B
+#define COL_YELLOW	0x0C
+#define COL_BLUE	0x0D
+#define COL_PURP	0x0E
+#define COL_LIGHT_BLUE	0x0F
+#define COL_WHITE	0x10
+#define COL_BLACK	0x11
+#else
+#define COL_DARK_RED0	0x02
+#define COL_DARK_GREEN0	0x03
+#define COL_OLIVE0 	0x04
+#define COL_DARK_BLUE0	0x05
+#define COL_LIGHT_GRAY0	0x08
+#define COL_DARK_GRAY0	0x09
+#define COL_RED0	0x0A
+#define COL_GREEN0	0x0B
+#define COL_YELLOW0	0x0C
+#define COL_BLUE0	0x0D
+#define COL_PURP0	0x0E
+#define COL_LIGHT_BLUE0	0x0F
+#define COL_WHITE0	0x10
+#define COL_BLACK0	0x11
+
+#define COL_DARK_RED	(CFrameBuffer::getInstance()->realcolor[0x02])
+#define COL_DARK_GREEN	(CFrameBuffer::getInstance()->realcolor[0x03])
+#define COL_OLIVE	(CFrameBuffer::getInstance()->realcolor[0x04])
+#define COL_DARK_BLUE	(CFrameBuffer::getInstance()->realcolor[0x05])
+#define COL_LIGHT_GRAY	(CFrameBuffer::getInstance()->realcolor[0x08])
+#define COL_DARK_GRAY	(CFrameBuffer::getInstance()->realcolor[0x09])
+#define COL_RED		(CFrameBuffer::getInstance()->realcolor[0x0A])
+#define COL_GREEN	(CFrameBuffer::getInstance()->realcolor[0x0B])
+#define COL_YELLOW	(CFrameBuffer::getInstance()->realcolor[0x0C])
+#define COL_BLUE	(CFrameBuffer::getInstance()->realcolor[0x0D])
+#define COL_PURP	(CFrameBuffer::getInstance()->realcolor[0x0E])
+#define COL_LIGHT_BLUE	(CFrameBuffer::getInstance()->realcolor[0x0F])
+#define COL_WHITE	(CFrameBuffer::getInstance()->realcolor[0x10])
+#define COL_BLACK	(CFrameBuffer::getInstance()->realcolor[0x11])
+#endif
+
+#endif
diff --git a/src/gui/components/cc_draw.h b/src/gui/components/cc_draw.h
index ae5557d42..92178deb6 100644
--- a/src/gui/components/cc_draw.h
+++ b/src/gui/components/cc_draw.h
@@ -231,7 +231,7 @@ class CCDraw : public COSDFader, public CComponentsSignals
 		///set shadow color
 		virtual void setColorShadow(fb_pixel_t color){col_shadow = color;}
 		///set all basic framebuffer element colors at once
-		///Note: Possible color values are defined in "gui/color.h" and "gui/customcolor.h"
+		///Note: Possible color values are defined in "gui/color.h" and "gui/color_custom.h"
 		virtual void setColorAll(fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow){col_frame = color_frame; col_body = color_body; col_shadow = color_shadow;};
 
 		///set corner types
diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp
index f86c8e820..b5fd5ddef 100644
--- a/src/gui/components/cc_frm_button.cpp
+++ b/src/gui/components/cc_frm_button.cpp
@@ -29,6 +29,7 @@
 
 #include <global.h>
 #include <neutrino.h>
+#include <gui/color_custom.h>
 #include <system/debug.h>
 #include "cc_frm_button.h"
 
diff --git a/src/gui/components/cc_frm_footer.cpp b/src/gui/components/cc_frm_footer.cpp
index 0aa6f12c6..0eec2443c 100644
--- a/src/gui/components/cc_frm_footer.cpp
+++ b/src/gui/components/cc_frm_footer.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include <neutrino.h>
+#include <gui/color_custom.h>
 #include "cc_frm_footer.h"
 #include <system/debug.h>
 
diff --git a/src/gui/components/cc_item_text.h b/src/gui/components/cc_item_text.h
index 4bc1bbeaa..c29e3a9ae 100644
--- a/src/gui/components/cc_item_text.h
+++ b/src/gui/components/cc_item_text.h
@@ -142,7 +142,7 @@ class CComponentsText : public CCTextScreen, public CComponentsItem, public CBox
 		///set text color
 		virtual void setTextColor(const fb_pixel_t& color_text);
 		///set all basic framebuffer element colors at once
-		///Note: Possible color values are defined in "gui/color.h" and "gui/customcolor.h"
+		///Note: Possible color values are defined in "gui/color.h" and "gui/color_custom.h"
 		virtual void setColorAll(fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0, fb_pixel_t color_text = COL_MENUCONTENT_TEXT)
 					{
 						CCDraw::setColorAll(color_frame, color_body, color_shadow);
diff --git a/src/gui/components/cc_item_tvpic.h b/src/gui/components/cc_item_tvpic.h
index 4f1e22e8b..373a88490 100644
--- a/src/gui/components/cc_item_tvpic.h
+++ b/src/gui/components/cc_item_tvpic.h
@@ -54,7 +54,7 @@ class CComponentsPIP : public CComponentsItem
 		CComponentsPIP(	const int x_pos = 0, const int y_pos = 0, const int percent = 30,
 				CComponentsForm *parent = NULL,
 				int shadow_mode = CC_SHADOW_OFF,
-				fb_pixel_t color_frame = COL_BLACK, fb_pixel_t color_body = COL_BACKGROUND_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
+				fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BACKGROUND_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
 		~CComponentsPIP();
 
 		///set property: width of tv box in pixel
diff --git a/src/gui/customcolor.h b/src/gui/customcolor.h
deleted file mode 100644
index 8d5be708a..000000000
--- a/src/gui/customcolor.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef __custom_color__
-#define __custom_color__
-
-#define COLOR_CUSTOM 0x0
-#ifdef FB_USE_PALETTE
-/*
-#define COL_WHITE (COLOR_CUSTOM + 0)
-#define COL_RED (COLOR_CUSTOM + 1)
-#define COL_GREEN (COLOR_CUSTOM + 2)
-#define COL_BLUE (COLOR_CUSTOM + 3)
-#define COL_YELLOW (COLOR_CUSTOM + 4)
-#define COL_BLACK (COLOR_CUSTOM + 5)
-*/
-#define COL_DARK_RED 0x02
-#define COL_DARK_GREEN 0x03
-#define COL_OLIVE 0x04
-#define COL_DARK_BLUE 0x05
-#define COL_LIGHT_GRAY 0x08
-#define COL_DARK_GRAY 0x09
-#define COL_RED 0x0A
-#define COL_GREEN 0x0B
-#define COL_YELLOW 0x0C
-#define COL_BLUE 0x0D
-#define COL_PURP 0x0E
-#define COL_LIGHT_BLUE 0x0F
-#define COL_WHITE 0x10
-#define COL_BLACK 0x11
-#else
-#define COL_DARK_RED0	 0x02
-#define COL_DARK_GREEN0	 0x03
-#define COL_OLIVE0 	 0x04
-#define COL_DARK_BLUE0	 0x05
-#define COL_LIGHT_GRAY0	 0x08
-#define COL_DARK_GRAY0	 0x09
-#define COL_RED0	 0x0A
-#define COL_GREEN0	 0x0B
-#define COL_YELLOW0	 0x0C
-#define COL_BLUE0	 0x0D
-#define COL_PURP0	 0x0E
-#define COL_LIGHT_BLUE0	 0x0F
-#define COL_WHITE0	 0x10
-#define COL_BLACK0	 0x11
-
-#define COL_DARK_RED			(CFrameBuffer::getInstance()->realcolor[0x02])
-#define COL_DARK_GREEN			(CFrameBuffer::getInstance()->realcolor[0x03])
-#define COL_OLIVE 			(CFrameBuffer::getInstance()->realcolor[0x04])
-#define COL_DARK_BLUE			(CFrameBuffer::getInstance()->realcolor[0x05])
-#define COL_LIGHT_GRAY			(CFrameBuffer::getInstance()->realcolor[0x08])
-#define COL_DARK_GRAY			(CFrameBuffer::getInstance()->realcolor[0x09])
-#define COL_RED				(CFrameBuffer::getInstance()->realcolor[0x0A])
-#define COL_GREEN			(CFrameBuffer::getInstance()->realcolor[0x0B])
-#define COL_YELLOW			(CFrameBuffer::getInstance()->realcolor[0x0C])
-#define COL_BLUE                        (CFrameBuffer::getInstance()->realcolor[0x0D])
-#define COL_PURP 			(CFrameBuffer::getInstance()->realcolor[0x0E])
-#define COL_LIGHT_BLUE 			(CFrameBuffer::getInstance()->realcolor[0x0F])
-#define COL_WHITE                       (CFrameBuffer::getInstance()->realcolor[0x10])
-#define COL_BLACK                       (CFrameBuffer::getInstance()->realcolor[0x11])
-#endif
-
-#endif
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index aff80bae0..521d9b3d7 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -49,7 +49,6 @@
 #include <gui/followscreenings.h>
 #include <gui/moviebrowser/mb.h>
 #include <gui/movieplayer.h>
-#include <gui/customcolor.h>
 #include <gui/pictureviewer.h>
 #include <gui/tmdb.h>
 #include <driver/record.h>
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index d1787597a..43baece81 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -54,9 +54,9 @@
 #include <neutrino.h>
 
 #include <gui/bouquetlist.h>
+#include <gui/color_custom.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/hintbox.h>
-#include <gui/customcolor.h>
 #include <gui/pictureviewer.h>
 #include <gui/movieplayer.h>
 #include <gui/infoclock.h>
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index b1ca798e6..cac2bcf6a 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -48,7 +48,6 @@
 #include "gui/keybind_setup.h"
 #include <gui/widget/icons.h>
 #include <gui/widget/hintbox.h>
-#include <gui/customcolor.h>
 #include <gui/pictureviewer.h>
 #include <gui/movieplayer.h>
 #include <system/helpers.h>
diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp
index dc6f5c2a0..e7e0b80bc 100644
--- a/src/gui/lua/luainstance.cpp
+++ b/src/gui/lua/luainstance.cpp
@@ -28,6 +28,7 @@
 #include <system/helpers.h>
 #include <system/settings.h>
 #include <system/set_threadname.h>
+#include <gui/color_custom.h>
 #include <gui/widget/msgbox.h>
 #include <gui/widget/messagebox.h>
 #include <gui/movieplayer.h>
diff --git a/src/gui/motorcontrol.cpp b/src/gui/motorcontrol.cpp
index d10cdfbb5..50a5ed1f8 100644
--- a/src/gui/motorcontrol.cpp
+++ b/src/gui/motorcontrol.cpp
@@ -33,7 +33,6 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <gui/customcolor.h>
 #include <driver/rcinput.h>
 #include <gui/motorcontrol.h>
 #include <gui/scan_setup.h>
diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp
index acc965264..c63dfdcb2 100644
--- a/src/gui/moviebrowser/mb.cpp
+++ b/src/gui/moviebrowser/mb.cpp
@@ -67,7 +67,6 @@
 #include <utime.h>
 //#include <unistd.h>
 #include <gui/pictureviewer.h>
-#include <gui/customcolor.h>
 #include <driver/record.h>
 #include <driver/display.h>
 //#include <system/helpers.h>
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 9d44bd386..2e26a6818 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -46,6 +46,7 @@
 #include "osd_progressbar_setup.h"
 
 #include <gui/audiomute.h>
+#include <gui/color_custom.h>
 #include <gui/infoclock.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/colorchooser.h>
diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index 4fddbaa3f..f3b48ea68 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -53,8 +53,6 @@
 #include <global.h>
 #include <neutrino.h>
 
-#include <gui/customcolor.h>
-
 #include <zapit/femanager.h>
 #include <zapit/scan.h>
 #include <zapit/zapit.h>
diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp
index e84c52144..5082fec27 100644
--- a/src/gui/screensaver.cpp
+++ b/src/gui/screensaver.cpp
@@ -40,6 +40,7 @@
 #include "audiomute.h"
 #include "screensaver.h"
 #include <system/debug.h>
+#include <gui/color_custom.h>
 #include <gui/infoclock.h>
 #include <zapit/zapit.h>
 
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index dacb6fdd1..f6b7fb0d6 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -39,8 +39,8 @@
 #include <driver/rcinput.h>
 #include <driver/screen_max.h>
 #include <gui/color.h>
+#include <gui/color_custom.h>
 #include <gui/widget/icons.h>
-#include <gui/customcolor.h>
 #include <daemonc/remotecontrol.h>
 #include <zapit/zapit.h>
 #include <zapit/getservices.h>
diff --git a/src/gui/widget/buttons.cpp b/src/gui/widget/buttons.cpp
index a427be80a..a5536f234 100644
--- a/src/gui/widget/buttons.cpp
+++ b/src/gui/widget/buttons.cpp
@@ -28,7 +28,6 @@
 #include <neutrino.h>
 
 #include <gui/widget/buttons.h>
-#include <gui/customcolor.h>
 #include <system/settings.h>
 // #include <driver/stacktrace.h>
 
diff --git a/src/gui/widget/textbox.h b/src/gui/widget/textbox.h
index e895ece0e..cb5f26a24 100644
--- a/src/gui/widget/textbox.h
+++ b/src/gui/widget/textbox.h
@@ -61,7 +61,6 @@
 
 #include <driver/fb_window.h>
 #include <gui/color.h>
-#include <gui/customcolor.h>
 #include <sigc++/signal.h>
 #define TRACE  printf
 #define TRACE_1 printf
diff --git a/src/nhttpd/tuxboxapi/neutrinoapi.cpp b/src/nhttpd/tuxboxapi/neutrinoapi.cpp
index baceef32d..bfd6b216c 100644
--- a/src/nhttpd/tuxboxapi/neutrinoapi.cpp
+++ b/src/nhttpd/tuxboxapi/neutrinoapi.cpp
@@ -29,7 +29,6 @@
 #include <driver/pictureviewer/pictureviewer.h>
 #include <gui/color.h>
 #include <gui/widget/icons.h>
-#include <gui/customcolor.h>
 #include <gui/movieplayer.h>
 #include <daemonc/remotecontrol.h>
 #include <zapit/frontend_c.h>