diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 7d6c986d96a..8685ec1c999 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -28,25 +28,43 @@
 /*************************************************************************/
 #include "color_picker.h"
 
+#include "scene/gui/separator.h"
+#include "scene/main/viewport.h"
+#include "os/os.h"
+#include "os/input.h"
+#include "os/keyboard.h"
 
+void update_material(Ref<CanvasItemMaterial>mat,const Color& p_color) {
+	if (!mat.is_valid())
+		return;
+	Ref<Shader> sdr = mat->get_shader();
+	if (!sdr.is_valid())
+		return;
 
+		mat->set_shader_param("R",p_color.r);
+		mat->set_shader_param("G",p_color.g);
+		mat->set_shader_param("B",p_color.b);
+		mat->set_shader_param("H",p_color.get_h());
+		mat->set_shader_param("S",p_color.get_s());
+		mat->set_shader_param("V",p_color.get_v());
+		mat->set_shader_param("A",p_color.a);
+}
 
 void ColorPicker::_notification(int p_what) {
 
 
 	switch(p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
-
+			uv_material->set_shader(get_shader("uv_editor"));
+			w_material->set_shader(get_shader("w_editor"));
+			update_material(uv_material,color);
+			update_material(w_material,color);
 			_update_controls();
 		} break;
 
-/*		case NOTIFICATION_DRAW: {
-
-			int w = get_constant("color_width");
-			int h = ms.height;
-			VisualServer::get_singleton()->canvas_item_add_rect(get_canvas_item(),Rect2(0,0,w,h),color);
-
-		} break;*/
+		case NOTIFICATION_ENTER_TREE: {
+			btn_pick->set_icon(get_icon("screen_picker", "ColorPicker"));
+		}
 	}
 }
 
@@ -64,10 +82,16 @@ void ColorPicker::_update_controls() {
 
 }
 
-
 void ColorPicker::set_color(const Color& p_color) {
 
 	color=p_color;
+	h=color.get_h();
+	s=color.get_s();
+	v=color.get_v();
+	update_material(uv_material, color);
+	update_material(w_material, color);
+	uv_edit->get_child(0)->cast_to<Control>()->update();
+	w_edit->get_child(0)->cast_to<Control>()->update();
 	_update_color();
 
 }
@@ -77,7 +101,7 @@ void ColorPicker::set_edit_alpha(bool p_show) {
 	edit_alpha=p_show;
 	_update_controls();
 	_update_color();
-	color_box->update();
+	sample->update();
 }
 
 bool ColorPicker::is_editing_alpha() const {
@@ -90,35 +114,17 @@ void ColorPicker::_value_changed(double) {
 	if (updating)
 		return;
 
-	switch(mode) {
-
-		case MODE_RGB: {
-
-			for(int i=0;i<4;i++) {
-				color.components[i] = scroll[i]->get_val() / 255.0;
-			}
-
-		} break;
-		case MODE_HSV: {
-
-			color.set_hsv( CLAMP(scroll[0]->get_val()/359,0,0.9972), scroll[1]->get_val()/100, scroll[2]->get_val()/100 );
-			color.a=scroll[3]->get_val()/100.0;
-
-		} break;
-		case MODE_RAW: {
-
-			for(int i=0;i<4;i++) {
-				color.components[i] = scroll[i]->get_val();
-			}
-
-		} break;
-
+	for(int i=0;i<3;i++) {
+		color.components[i] = scroll[i]->get_val()/(raw_mode_enabled?1.0:255.0);
 	}
+	color.components[3] = scroll[3]->get_val()/255.0;
 
+	update_material(uv_material,color);
+	update_material(w_material,color);
 
 	html->set_text(color.to_html(edit_alpha && color.a<1));
 
-	color_box->update();
+	sample->update();
 
 	emit_signal("color_changed",color);
 
@@ -138,144 +144,325 @@ void ColorPicker::_update_color() {
 
 	updating=true;
 
-	switch(mode) {
-
-		case MODE_RAW: {
-
-			static const char*_lt[4]={"R","G","B","A"};
-
-			for(int i=0;i<4;i++) {
-				scroll[i]->set_max(255);
-				scroll[i]->set_step(0.01);
-				scroll[i]->set_val(color.components[i]);
-				labels[i]->set_text(_lt[i]);
-			}
-		} break;
-		case MODE_RGB: {
-
-			static const char*_lt[4]={"R","G","B","A"};
-
-			for(int i=0;i<4;i++) {
-				scroll[i]->set_max(255);
-				scroll[i]->set_step(1);
-				scroll[i]->set_val(color.components[i]*255);
-				labels[i]->set_text(_lt[i]);
-			}
-
-		} break;
-		case MODE_HSV: {
-
-			static const char*_lt[4]={"H","S","V","A"};
-
-			for(int i=0;i<4;i++) {
-				labels[i]->set_text(_lt[i]);
-			}
-
-			scroll[0]->set_max(359);
-			scroll[0]->set_step(0.01);
-			scroll[0]->set_val( color.get_h()*359 );
-
-			scroll[1]->set_max(100);
-			scroll[1]->set_step(0.01);
-			scroll[1]->set_val( color.get_s()*100 );
-
-			scroll[2]->set_max(100);
-			scroll[2]->set_step(0.01);
-			scroll[2]->set_val( color.get_v()*100 );
-
-			scroll[3]->set_max(100);
-			scroll[3]->set_step(0.01);
-			scroll[3]->set_val( color.a*100);
-
-		} break;
+	for(int i=0;i<4;i++) {
+		scroll[i]->set_max(255);
+		scroll[i]->set_step(0.01);
+		if (raw_mode_enabled && i != 3)
+			scroll[i]->set_val(color.components[i]);
+		else
+			scroll[i]->set_val(color.components[i]*255);
 	}
 
-
 	html->set_text(color.to_html(edit_alpha && color.a<1));
 
-	color_box->update();
+	sample->update();
 	updating=false;
 }
 
+void ColorPicker::_update_presets()
+{
+	Size2 size=bt_add_preset->get_size();
+	preset->set_custom_minimum_size(Size2(size.width*presets.size(),size.height));
+	Image i(size.x*presets.size(),size.y, false, Image::FORMAT_RGB);
+	for (int y=0;y<size.y;y++)
+		for (int x=0;x<size.x*presets.size();x++)
+			i.put_pixel(x,y,presets[(int)x/size.x]);
+	Ref<ImageTexture> t;
+	t.instance();
+	t->create_from_image(i);
+	preset->set_texture(t);
+}
+
 Color ColorPicker::get_color() const {
 
 	return color;
 }
 
+void ColorPicker::add_preset(const Color &p_color)
+{
+	if (presets.find(p_color)) {
+		presets.move_to_back(presets.find(p_color));
+	} else {
+		presets.push_back(p_color);
+	}
+	_update_presets();
+	if (presets.size()==10)
+		bt_add_preset->hide();
+}
 
-void ColorPicker::set_mode(Mode p_mode) {
 
-	ERR_FAIL_INDEX(p_mode,3);
-	mode=p_mode;
-	if (mode_box->get_selected()!=p_mode)
-		mode_box->select(p_mode);
+void ColorPicker::set_raw_mode(bool p_enabled) {
 
+	if (raw_mode_enabled==p_enabled)
+		return;
+	raw_mode_enabled=p_enabled;
+	if (btn_mode->is_pressed()!=p_enabled)
+		btn_mode->set_pressed(p_enabled);
+	
 	_update_controls();
 	_update_color();
 }
 
-ColorPicker::Mode ColorPicker::get_mode() const {
+bool ColorPicker::is_raw_mode() const {
 
-	return mode;
+	return raw_mode_enabled;
 }
 
-void ColorPicker::_color_box_draw() {
+void ColorPicker::_sample_draw() {
+	sample->draw_rect(Rect2(Point2(),Size2(256,20)),color);
+}
 
-	color_box->draw_rect( Rect2( Point2(), color_box->get_size()), color);
+void ColorPicker::_hsv_draw(int p_wich,Control* c)
+{
+	if (!c)
+		return;
+	if (p_wich==0) {
+		int x=c->get_size().x*color.get_s();
+		int y=c->get_size().y-c->get_size().y*color.get_v();
+		c->draw_line(Point2(x,0),Point2(x,c->get_size().y),color.inverted());
+		c->draw_line(Point2(0,y),Point2(c->get_size().x,y),color.inverted());
+		c->draw_line(Point2(x,y),Point2(x,y),Color(1,1,1),2);
+	} else if (p_wich==1) {
+		int y=c->get_size().y-c->get_size().y*color.get_h();
+		Color col=Color();
+		col.set_hsv(color.get_h(),1,1);
+		c->draw_line(Point2(0,y),Point2(c->get_size().x,y),col.inverted());
+	}
+}
+
+void ColorPicker::_uv_input(const InputEvent &ev) {
+	if (ev.type == InputEvent::MOUSE_BUTTON) {
+		const InputEventMouseButton &bev = ev.mouse_button;
+		if (bev.pressed) {
+			changing_color = true;
+			float x = CLAMP((float)bev.x,0,256);
+			float y = CLAMP((float)bev.y,0,256);
+			s=x/256;
+			v=1.0-y/256.0;
+			color.set_hsv(h,s,v,color.a);
+			set_color(color);
+			_update_color();
+			emit_signal("color_changed", color);
+		} else {
+			changing_color = false;
+		}
+	} else if (ev.type == InputEvent::MOUSE_MOTION) {
+		const InputEventMouse &bev = ev.mouse_motion;
+		if (!changing_color)
+			return;
+		float x = CLAMP((float)bev.x,0,256);
+		float y = CLAMP((float)bev.y,0,256);
+		s=x/256;
+		v=1.0-y/256.0;
+		color.set_hsv(h,s,v,color.a);
+		set_color(color);
+		_update_color();
+		emit_signal("color_changed", color);
+	}
+}
+
+void ColorPicker::_w_input(const InputEvent &ev) {
+	if (ev.type == InputEvent::MOUSE_BUTTON) {
+		const InputEventMouseButton &bev = ev.mouse_button;
+		if (bev.pressed) {
+			changing_color = true;
+			h=1-((float)bev.y)/256.0;
+			
+		} else {
+			changing_color = false;
+		}
+		color.set_hsv(h,s,v,color.a);
+		set_color(color);
+		_update_color();
+		emit_signal("color_changed", color);
+	} else if (ev.type == InputEvent::MOUSE_MOTION) {
+		const InputEventMouse &bev = ev.mouse_motion;
+		if (!changing_color)
+			return;
+		float y = CLAMP((float)bev.y,0,256);
+		h=1.0-y/256.0;
+		color.set_hsv(h,s,v,color.a);
+		set_color(color);
+		_update_color();
+		emit_signal("color_changed", color);
+	}
+}
+
+void ColorPicker::_preset_input(const InputEvent &ev) {
+	if (ev.type == InputEvent::MOUSE_BUTTON) {
+		const InputEventMouseButton &bev = ev.mouse_button;
+		if (bev.pressed && bev.button_index==BUTTON_LEFT) {
+			int index = bev.x/(preset->get_size().x/presets.size());
+			set_color(presets[index]);
+		} else if (bev.pressed && bev.button_index==BUTTON_RIGHT) {
+			int index = bev.x/(preset->get_size().x/presets.size());
+			presets.erase(presets[index]);
+			_update_presets();
+			bt_add_preset->show();
+		}
+		_update_color();
+		emit_signal("color_changed", color);
+	} else if (ev.type == InputEvent::MOUSE_MOTION) {
+		const InputEventMouse &mev = ev.mouse_motion;
+		int index = mev.x/(preset->get_size().x/presets.size());
+		if (index<0 || index >= presets.size())
+			return;
+		preset->set_tooltip("Color: #"+presets[index].to_html(presets[index].a<1)+"\n"
+							"LMB: Set color\n"
+							"RMB: Remove preset");
+	}
+}
+
+void ColorPicker::_screen_input(const InputEvent &ev)
+{
+	if (ev.type==InputEvent::MOUSE_BUTTON) {
+		const InputEventMouseButton &bev = ev.mouse_button;
+		if (bev.button_index==BUTTON_LEFT&&!bev.pressed) {
+			emit_signal("color_changed", color);
+			screen->hide();
+		}
+	} else if (ev.type==InputEvent::MOUSE_MOTION) {
+		const InputEventMouse &mev = ev.mouse_motion;
+		Viewport *r=get_tree()->get_root();
+		if (!r->get_rect().has_point(Point2(mev.global_x,mev.global_y)))
+			return;
+		Image img =r->get_screen_capture();
+		if (!img.empty())
+			last_capture=img;
+			r->queue_screen_capture();
+		if (!last_capture.empty())
+			set_color(last_capture.get_pixel(mev.global_x,mev.global_y));
+	}
+}
+
+void ColorPicker::_add_preset_pressed() {
+	add_preset(color);
+}
+
+void ColorPicker::_screen_pick_pressed()
+{
+	Viewport *r=get_tree()->get_root();
+	if (!screen) {
+		screen=memnew( Control );
+		r->add_child(screen);
+		screen->set_area_as_parent_rect();
+		screen->connect("input_event",this,"_screen_input");
+	}
+	screen->raise();
+	screen->show();
+	r->queue_screen_capture();
 }
 
 void ColorPicker::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("set_color","color"),&ColorPicker::set_color);
 	ObjectTypeDB::bind_method(_MD("get_color"),&ColorPicker::get_color);
-	ObjectTypeDB::bind_method(_MD("set_mode","mode"),&ColorPicker::set_mode);
-	ObjectTypeDB::bind_method(_MD("get_mode"),&ColorPicker::get_mode);
+	ObjectTypeDB::bind_method(_MD("set_raw_mode","mode"),&ColorPicker::set_raw_mode);
+	ObjectTypeDB::bind_method(_MD("is_raw_mode"),&ColorPicker::is_raw_mode);
 	ObjectTypeDB::bind_method(_MD("set_edit_alpha","show"),&ColorPicker::set_edit_alpha);
 	ObjectTypeDB::bind_method(_MD("is_editing_alpha"),&ColorPicker::is_editing_alpha);
+	ObjectTypeDB::bind_method(_MD("add_preset"), &ColorPicker::add_preset);
 	ObjectTypeDB::bind_method(_MD("_value_changed"),&ColorPicker::_value_changed);
 	ObjectTypeDB::bind_method(_MD("_html_entered"),&ColorPicker::_html_entered);
-	ObjectTypeDB::bind_method(_MD("_color_box_draw"),&ColorPicker::_color_box_draw);
+	ObjectTypeDB::bind_method(_MD("_add_preset_pressed"), &ColorPicker::_add_preset_pressed);
+	ObjectTypeDB::bind_method(_MD("_screen_pick_pressed"), &ColorPicker::_screen_pick_pressed);
+	ObjectTypeDB::bind_method(_MD("_sample_draw"),&ColorPicker::_sample_draw);
+	ObjectTypeDB::bind_method(_MD("_hsv_draw"),&ColorPicker::_hsv_draw);
+	ObjectTypeDB::bind_method(_MD("_uv_input"),&ColorPicker::_uv_input);
+	ObjectTypeDB::bind_method(_MD("_w_input"),&ColorPicker::_w_input);
+	ObjectTypeDB::bind_method(_MD("_preset_input"),&ColorPicker::_preset_input);
+	ObjectTypeDB::bind_method(_MD("_screen_input"),&ColorPicker::_screen_input);
 
 	ADD_SIGNAL( MethodInfo("color_changed",PropertyInfo(Variant::COLOR,"color")));
 }
 
+ColorPicker::ColorPicker() :
+	BoxContainer(true) {
 
-
-
-ColorPicker::ColorPicker() {
-
-
-	//edit_alpha=false;
 	updating=true;
 	edit_alpha=true;
+	raw_mode_enabled=false;
+	changing_color=false;
+	screen=NULL;
+
+	HBoxContainer *hb_smpl = memnew( HBoxContainer );
+	btn_pick = memnew( ToolButton );
+	btn_pick->connect("pressed",this,"_screen_pick_pressed");
+
+	sample = memnew( TextureFrame );
+	sample->set_h_size_flags(SIZE_EXPAND_FILL);
+	sample->connect("draw",this,"_sample_draw");
+
+	hb_smpl->add_child(sample);
+	hb_smpl->add_child(btn_pick);
+	add_child(hb_smpl);
+
+	HBoxContainer *hb_edit = memnew( HBoxContainer );
+
+	uv_edit= memnew ( TextureFrame );
+	Image i(256, 256, false, Image::FORMAT_RGB);
+	for (int y=0;y<256;y++)
+		for (int x=0;x<256;x++)
+			i.put_pixel(x,y,Color());
+	Ref<ImageTexture> t;
+	t.instance();
+	t->create_from_image(i);
+	uv_edit->set_texture(t);
+	uv_edit->set_ignore_mouse(false);
+	uv_edit->set_custom_minimum_size(Size2(256,256));
+	uv_edit->connect("input_event", this, "_uv_input");
+	Control *c= memnew( Control );
+	uv_edit->add_child(c);
+	c->set_area_as_parent_rect();
+	c->set_stop_mouse(false);
+	c->set_material(memnew ( CanvasItemMaterial ));
+	Vector<Variant> args=Vector<Variant>();
+	args.push_back(0);
+	args.push_back(c);
+	c->connect("draw",this,"_hsv_draw",args);
+
+	add_child(hb_edit);
+	w_edit= memnew( TextureFrame );
+	i = Image(15, 256, false, Image::FORMAT_RGB);
+	for (int y=0;y<256;y++)
+		for (int x=0;x<15;x++)
+			i.put_pixel(x,y,Color());
+	Ref<ImageTexture> tw;
+	tw.instance();
+	tw->create_from_image(i);
+	w_edit->set_texture(tw);
+	w_edit->set_ignore_mouse(false);
+	w_edit->set_custom_minimum_size(Size2(15,256));
+	w_edit->connect("input_event", this, "_w_input");
+	c= memnew( Control );
+	w_edit->add_child(c);
+	c->set_area_as_parent_rect();
+	c->set_stop_mouse(false);
+	c->set_material(memnew ( CanvasItemMaterial ));
+	args.clear();
+	args.push_back(1);
+	args.push_back(c);
+	c->connect("draw",this,"_hsv_draw",args);
+	
+	hb_edit->add_child(uv_edit);
+	hb_edit->add_child(memnew( VSeparator ));
+	hb_edit->add_child(w_edit);
 
 	VBoxContainer *vbl = memnew( VBoxContainer );
 	add_child(vbl);
 
-	mode_box = memnew( OptionButton );
-	mode_box->add_item("RGB");
-	mode_box->add_item("HSV");
-	mode_box->add_item("RAW");
-	mode_box->connect("item_selected",this,"set_mode");
-
-	color_box=memnew( Control );
-	color_box->set_v_size_flags(SIZE_EXPAND_FILL);
-	vbl->add_child(color_box);
-	color_box->connect("draw",this,"_color_box_draw");
-
-	vbl->add_child(mode_box);
-
+	add_child(memnew( HSeparator ));
 
 	VBoxContainer *vbr = memnew( VBoxContainer );
 	add_child(vbr);
 	vbr->set_h_size_flags(SIZE_EXPAND_FILL);
-
+	const char* lt[4] = {"R","G","B","A"};
 
 	for(int i=0;i<4;i++) {
 
 		HBoxContainer *hbc = memnew( HBoxContainer );
 
-		labels[i]=memnew( Label );
+		labels[i]=memnew( Label(lt[i]) );
 		hbc->add_child(labels[i]);
 
 		scroll[i]=memnew( HSlider );
@@ -294,10 +481,14 @@ ColorPicker::ColorPicker() {
 
 		vbr->add_child(hbc);
 
-
 	}
 
 	HBoxContainer *hhb = memnew( HBoxContainer );
+	
+	btn_mode = memnew( CheckButton );
+	btn_mode->set_text("RAW Mode");
+	btn_mode->connect("toggled", this, "set_raw_mode");
+	hhb->add_child(btn_mode);
 	vbr->add_child(hhb);
 	html_num = memnew( Label );
 	hhb->add_child(html_num);
@@ -309,11 +500,49 @@ ColorPicker::ColorPicker() {
 	html->set_h_size_flags(SIZE_EXPAND_FILL);
 
 
-	mode=MODE_RGB;
 	_update_controls();
 	_update_color();
 	updating=false;
 
+	uv_material.instance();
+	Ref<Shader> s_uv = get_shader("uv_editor");
+	uv_material->set_shader(s_uv);
+
+	w_material.instance();
+	
+	Ref<Shader> s_w = get_shader("w_editor");
+	w_material->set_shader(s_w);
+
+	uv_edit->set_material(uv_material);
+	w_edit->set_material(w_material);
+
+	set_color(Color(1,1,1));
+
+	i.create(256,20,false,Image::FORMAT_RGB);
+	for (int y=0;y<20;y++)
+		for(int x=0;x<256;x++)
+			if ((x/4+y/4)%2)
+				i.put_pixel(x,y,Color(1,1,1));
+			else
+				i.put_pixel(x,y,Color(0.6,0.6,0.6));
+	Ref<ImageTexture> t_smpl;
+	t_smpl.instance();
+	t_smpl->create_from_image(i);
+	sample->set_texture(t_smpl);
+
+	HBoxContainer *bbc = memnew( HBoxContainer );
+	add_child(bbc);
+
+	preset = memnew( TextureFrame );
+	bbc->add_child(preset);
+	preset->set_ignore_mouse(false);
+	preset->connect("input_event", this, "_preset_input");
+
+	bt_add_preset = memnew ( Button );
+	bt_add_preset->set_icon(get_icon("add_preset"));
+	bt_add_preset->set_tooltip("Add current color as a preset");
+	bt_add_preset->connect("pressed", this, "_add_preset_pressed");
+	bbc->add_child(bt_add_preset);
 }
 
 
@@ -331,7 +560,7 @@ void ColorPickerButton::_color_changed(const Color& p_color) {
 
 void ColorPickerButton::pressed() {
 
-	Size2 ms = Size2(350, picker->get_combined_minimum_size().height+10);
+	Size2 ms = Size2(300, picker->get_combined_minimum_size().height+10);
 	popup->set_pos(get_global_pos()-Size2(0,ms.height));
 	popup->set_size(ms);
 	popup->popup();
@@ -347,7 +576,6 @@ void ColorPickerButton::_notification(int p_what) {
 	}
 }
 
-
 void ColorPickerButton::set_color(const Color& p_color){
 
 
diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h
index 95c26a9c6fc..c6c7fe537df 100644
--- a/scene/gui/color_picker.h
+++ b/scene/gui/color_picker.h
@@ -36,25 +36,29 @@
 #include "scene/gui/button.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/option_button.h"
+#include "scene/gui/texture_frame.h"
+#include "scene/gui/tool_button.h"
+#include "scene/gui/check_button.h"
+#include "scene/resources/material.h"
 
-class ColorPicker : public HBoxContainer {
+class ColorPicker : public BoxContainer {
 
-	OBJ_TYPE(ColorPicker,HBoxContainer);
-public:
+	OBJ_TYPE(ColorPicker,BoxContainer);
 
-	enum Mode {
-		MODE_RGB,
-		MODE_HSV,
-		MODE_RAW
-	};
 private:
 
-	Mode mode;
-
-	OptionButton *mode_box;
-
-	Control *color_box;
+	Control *screen;
+	Image last_capture;
+	TextureFrame *uv_edit;
+	TextureFrame *w_edit;
+	TextureFrame *sample;
+	TextureFrame *preset;
+	Button *bt_add_preset;
+	List<Color> presets;
+	ToolButton *btn_pick;
+	CheckButton *btn_mode;
+	Ref<CanvasItemMaterial> uv_material;
+	Ref<CanvasItemMaterial> w_material;
 	HSlider *scroll[4];
 	SpinBox *values[4];
 	Label *labels[4];
@@ -64,13 +68,25 @@ private:
 	Size2i ms;
 
 	Color color;
+	bool raw_mode_enabled;
 	bool updating;
+	bool changing_color;
+	float h,s,v;
 
 	void _html_entered(const String& p_html);
 	void _value_changed(double);
 	void _update_controls();
 	void _update_color();
-	void _color_box_draw();
+	void _update_presets();
+	void _sample_draw();
+	void _hsv_draw(int p_wich,Control *c);
+
+	void _uv_input(const InputEvent& p_input);
+	void _w_input(const InputEvent& p_input);
+	void _preset_input(const InputEvent& p_input);
+	void _screen_input(const InputEvent& p_input);
+	void _add_preset_pressed();
+	void _screen_pick_pressed();
 protected:
 
 	void _notification(int);
@@ -83,15 +99,14 @@ public:
 	void set_color(const Color& p_color);
 	Color get_color() const;
 
-	void set_mode(Mode p_mode);
-	Mode get_mode() const;
+	void add_preset(const Color& p_color);
+	void set_raw_mode(bool p_enabled);
+	bool is_raw_mode() const;
 
 
 	ColorPicker();
 };
 
-VARIANT_ENUM_CAST( ColorPicker::Mode );
-
 class ColorPickerButton : public Button {
 
 	OBJ_TYPE(ColorPickerButton,Button);
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 1af3f4c9e8d..90c72989bd5 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -109,6 +109,11 @@ bool Control::_set(const StringName& p_name, const Variant& p_value) {
 			data.icon_override.erase(dname);
 			notification(NOTIFICATION_THEME_CHANGED);
 			update();
+		} else if (name.begins_with("custom_shaders/")) {
+			String dname = name.get_slicec('/',1);
+			data.shader_override.erase(dname);
+			notification(NOTIFICATION_THEME_CHANGED);
+			update();
 		} else if (name.begins_with("custom_styles/")) {
 			String dname = name.get_slicec('/',1);
 			data.style_override.erase(dname);
@@ -137,6 +142,10 @@ bool Control::_set(const StringName& p_name, const Variant& p_value) {
 			String dname = name.get_slicec('/',1);
 			notification(NOTIFICATION_THEME_CHANGED);
 			add_icon_override(dname,p_value);
+		} else if (name.begins_with("custom_shaders/")) {
+			String dname = name.get_slicec('/',1);
+			add_shader_override(dname,p_value);
+			notification(NOTIFICATION_THEME_CHANGED);
 		} else if (name.begins_with("custom_styles/")) {
 			String dname = name.get_slicec('/',1);
 			add_style_override(dname,p_value);
@@ -189,6 +198,10 @@ bool Control::_get(const StringName& p_name,Variant &r_ret) const {
 		String name = sname.get_slicec('/',1);
 
 		r_ret= data.icon_override.has(name)?Variant(data.icon_override[name]):Variant();
+	} else if (sname.begins_with("custom_shaders/")) {
+		String name = sname.get_slicec('/',1);
+
+		r_ret= data.shader_override.has(name)?Variant(data.shader_override[name]):Variant();
 	} else if (sname.begins_with("custom_styles/")) {
 		String name = sname.get_slicec('/',1);
 
@@ -236,6 +249,18 @@ void Control::_get_property_list( List<PropertyInfo> *p_list) const {
 			p_list->push_back( PropertyInfo(Variant::OBJECT,"custom_icons/"+E->get(),PROPERTY_HINT_RESOURCE_TYPE, "Texture",hint) );
 		}
 	}
+	{
+		List<StringName> names;
+		theme->get_shader_list(get_type_name(),&names);
+		for(List<StringName>::Element *E=names.front();E;E=E->next()) {
+
+			uint32_t hint= PROPERTY_USAGE_EDITOR|PROPERTY_USAGE_CHECKABLE;
+			if (data.shader_override.has(E->get()))
+				hint|=PROPERTY_USAGE_STORAGE|PROPERTY_USAGE_CHECKED;
+
+			p_list->push_back( PropertyInfo(Variant::OBJECT,"custom_shaders/"+E->get(),PROPERTY_HINT_RESOURCE_TYPE, "CanvasItemShader,CanvasItemShaderGraph",hint) );
+		}
+	}
 	{
 		List<StringName> names;
 		theme->get_stylebox_list(get_type_name(),&names);
@@ -650,6 +675,35 @@ Ref<Texture> Control::get_icon(const StringName& p_name,const StringName& p_type
 
 }
 
+Ref<Shader> Control::get_shader(const StringName& p_name,const StringName& p_type) const {
+	if (p_type==StringName()) {
+
+		const Ref<Shader>* sdr = data.shader_override.getptr(p_name);
+		if (sdr)
+			return *sdr;
+	}
+
+	StringName type = p_type?p_type:get_type_name();
+
+	// try with custom themes
+	Control *theme_owner = data.theme_owner;
+
+	while(theme_owner) {
+
+		if (theme_owner->data.theme->has_shader(p_name, type))
+			return data.theme_owner->data.theme->get_shader(p_name, type );
+		Control *parent = theme_owner->get_parent()?theme_owner->get_parent()->cast_to<Control>():NULL;
+
+		if (parent)
+			theme_owner=parent->data.theme_owner;
+		else
+			theme_owner=NULL;
+
+	}
+
+	return Theme::get_default()->get_shader( p_name, type );
+}
+
 Ref<StyleBox> Control::get_stylebox(const StringName& p_name,const StringName& p_type) const {
 		
 	if (p_type==StringName()) {
@@ -796,7 +850,37 @@ bool Control::has_icon(const StringName& p_name,const StringName& p_type) const
 	}
 
 	return Theme::get_default()->has_icon( p_name, type );
+	
+}
 
+bool Control::has_shader(const StringName &p_name, const StringName &p_type) const
+{
+	if (p_type==StringName()) {
+		const Ref<Shader>* sdr = data.shader_override.getptr(p_name);
+		if (sdr)
+			return true;
+	}
+
+	StringName type = p_type?p_type:get_type_name();
+
+	// try with custom themes
+	Control *theme_owner = data.theme_owner;
+
+	while(theme_owner) {
+
+		if (theme_owner->data.theme->has_shader(p_name, type))
+			return true;
+		Control *parent = theme_owner->get_parent()?theme_owner->get_parent()->cast_to<Control>():NULL;
+
+		if (parent)
+			theme_owner=parent->data.theme_owner;
+		else
+			theme_owner=NULL;
+
+	}
+
+	return Theme::get_default()->has_shader( p_name, type );
+	
 }
 bool Control::has_stylebox(const StringName& p_name,const StringName& p_type) const {
 		
@@ -1261,7 +1345,14 @@ void Control::add_icon_override(const StringName& p_name, const Ref<Texture>& p_
 	data.icon_override[p_name]=p_icon;
 	notification(NOTIFICATION_THEME_CHANGED);
 	update();
+	
+}
 
+void Control::add_shader_override(const StringName &p_name, const Ref<Shader> &p_shader) {
+	ERR_FAIL_COND(p_shader.is_null());
+	data.shader_override[p_name]=p_shader;
+	notification(NOTIFICATION_THEME_CHANGED);
+	update();
 }
 void Control::add_style_override(const StringName& p_name, const Ref<StyleBox>& p_style) {
 
@@ -2011,8 +2102,9 @@ void Control::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("set_theme","theme:Theme"),&Control::set_theme);
 	ObjectTypeDB::bind_method(_MD("get_theme:Theme"),&Control::get_theme);
-
+	
 	ObjectTypeDB::bind_method(_MD("add_icon_override","name","texture:Texture"),&Control::add_icon_override);
+	ObjectTypeDB::bind_method(_MD("add_shader_override","name","shader:Shader"),&Control::add_shader_override);
 	ObjectTypeDB::bind_method(_MD("add_style_override","name","stylebox:StyleBox"),&Control::add_style_override);
 	ObjectTypeDB::bind_method(_MD("add_font_override","name","font:Font"),&Control::add_font_override);
 	ObjectTypeDB::bind_method(_MD("add_color_override","name","color"),&Control::add_color_override);
diff --git a/scene/gui/control.h b/scene/gui/control.h
index 59fd3a41488..ab777a6a6cd 100644
--- a/scene/gui/control.h
+++ b/scene/gui/control.h
@@ -142,6 +142,7 @@ private:
 		NodePath focus_neighbour[4];
 
 		HashMap<StringName, Ref<Texture>, StringNameHasher > icon_override;
+		HashMap<StringName, Ref<Shader>, StringNameHasher > shader_override;
 		HashMap<StringName, Ref<StyleBox>, StringNameHasher > style_override;
 		HashMap<StringName, Ref<Font>, StringNameHasher > font_override;
 		HashMap<StringName, Color, StringNameHasher > color_override;
@@ -315,18 +316,21 @@ public:
 	/* SKINNING */
 	
 	void add_icon_override(const StringName& p_name, const Ref<Texture>& p_icon);
+	void add_shader_override(const StringName& p_name, const Ref<Shader>& p_shader);
 	void add_style_override(const StringName& p_name, const Ref<StyleBox>& p_style);
 	void add_font_override(const StringName& p_name, const Ref<Font>& p_font);
 	void add_color_override(const StringName& p_name, const Color& p_color);
 	void add_constant_override(const StringName& p_name, int p_constant);
 
 	Ref<Texture> get_icon(const StringName& p_name,const StringName& p_type=StringName()) const;
+	Ref<Shader> get_shader(const StringName &p_name, const StringName &p_type=StringName()) const;
 	Ref<StyleBox> get_stylebox(const StringName& p_name,const StringName& p_type=StringName()) const;
 	Ref<Font> get_font(const StringName& p_name,const StringName& p_type=StringName()) const;
 	Color get_color(const StringName& p_name,const StringName& p_type=StringName()) const;
 	int get_constant(const StringName& p_name,const StringName& p_type=StringName()) const;
 
 	bool has_icon(const StringName& p_name,const StringName& p_type=StringName()) const;
+	bool has_shader(const StringName& p_name,const StringName& p_type=StringName()) const;
 	bool has_stylebox(const StringName& p_name,const StringName& p_type=StringName()) const;
 	bool has_font(const StringName& p_name,const StringName& p_type=StringName()) const;
 	bool has_color(const StringName& p_name,const StringName& p_type=StringName()) const;
@@ -358,7 +362,7 @@ public:
 
 	Control();	
 	~Control();
-
+	
 };
 
 VARIANT_ENUM_CAST(Control::AnchorType);
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index f0b3519b4ab..f713b9e979c 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -80,6 +80,13 @@ static Ref<Texture> make_icon(T p_src) {
 	return texture;
 }
 
+static Ref<Shader> make_shader(const char*vertex_code,const char*fragment_code,const char*lighting_code) {
+	Ref<Shader> shader = (memnew( Shader(Shader::MODE_CANVAS_ITEM) ));
+	shader->set_code(vertex_code, fragment_code, lighting_code);
+
+	return shader;
+}
+
 static Ref<Font> make_font(int p_height,int p_ascent, int p_valign, int p_charcount, const int *p_chars,const Ref<Texture> &p_texture) {
 
 
@@ -767,7 +774,11 @@ void make_default_theme() {
 	t->set_constant("label_width","ColorPicker", 20);
 	t->set_constant("hseparator","ColorPicker", 4);
 
-
+	t->set_icon("screen_picker","ColorPicker", make_icon( icon_color_pick_png ) );
+	t->set_icon("add_preset","ColorPicker", make_icon( icon_add_png ) );
+	
+	t->set_shader("uv_editor", "ColorPicker", make_shader("", uv_editor_shader_code, ""));
+	t->set_shader("w_editor", "ColorPicker", make_shader("", w_editor_shader_code, ""));
 
 	// TooltipPanel
 
diff --git a/scene/resources/default_theme/icon_add.png b/scene/resources/default_theme/icon_add.png
new file mode 100644
index 00000000000..26283ca67ce
Binary files /dev/null and b/scene/resources/default_theme/icon_add.png differ
diff --git a/scene/resources/default_theme/icon_color_pick.png b/scene/resources/default_theme/icon_color_pick.png
new file mode 100644
index 00000000000..28967638344
Binary files /dev/null and b/scene/resources/default_theme/icon_color_pick.png differ
diff --git a/scene/resources/default_theme/make_png_header.py b/scene/resources/default_theme/make_header.py
similarity index 53%
rename from scene/resources/default_theme/make_png_header.py
rename to scene/resources/default_theme/make_header.py
index 0f0ce1808f3..2d3f989e015 100644
--- a/scene/resources/default_theme/make_png_header.py
+++ b/scene/resources/default_theme/make_header.py
@@ -3,9 +3,6 @@ import os;
 import glob;
 import string;
 
-pixmaps = glob.glob("*.png");
-
-pixmaps.sort();
 
 #Generate include files
 
@@ -15,27 +12,61 @@ f.write("// THIS FILE HAS BEEN AUTOGENERATED, DONT EDIT!!\n");
 
 f.write("\n\n");
 
-f.write("\n\n\n");
-	
+#Generate png image block
+
+pixmaps = glob.glob("*.png");
+
+pixmaps.sort();
+
+f.write("\n\n\n");
 
-	
 for x in pixmaps:
-	
+
 	var_str=x[:-4]+"_png";
-	
+
 	f.write("static const unsigned char "+ var_str +"[]={\n");
-	
+
 	pngf=open(x,"rb");
-	
+
 	b=pngf.read(1);
 	while(len(b)==1):
 		f.write(hex(ord(b)))
 		b=pngf.read(1);
 		if (len(b)==1):
 			f.write(",")
-			
+
 	f.write("\n};\n\n\n");
 	pngf.close();
-	
-f.close();
 
+#Generate shaders block
+
+shaders = glob.glob("*.gsl")
+
+shaders.sort();
+
+f.write("\n\n\n");
+
+for x in shaders:
+
+	var_str=x[:-4]+"_shader_code";
+
+	f.write("static const char *"+ var_str +"=\n");
+
+	sf=open(x,"rb");
+
+
+	b=sf.readline();
+	while(b!=""):
+		if (b.endswith("\r\n")):
+			b=b[:-2]
+		if (b.endswith("\n")):
+			b=b[:-1]
+		f.write("			\""+b)
+		b=sf.readline();
+		if (b!=""):
+			f.write("\"\n")
+
+	f.write("\";\n\n\n");
+	sf.close();
+
+f.close();
diff --git a/scene/resources/default_theme/theme_data.h b/scene/resources/default_theme/theme_data.h
index e0b5736d994..4c440ab99a5 100644
--- a/scene/resources/default_theme/theme_data.h
+++ b/scene/resources/default_theme/theme_data.h
@@ -179,11 +179,21 @@ static const unsigned char hsplitter_png[]={
 };
 
 
+static const unsigned char icon_add_png[]={
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x12,0x0,0x0,0xb,0x12,0x1,0xd2,0xdd,0x7e,0xfc,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xec,0x49,0x44,0x41,0x54,0x38,0x8d,0xdd,0x92,0x41,0x4a,0xc4,0x30,0x18,0x85,0xbf,0x67,0x93,0xc,0xd9,0x28,0xb9,0x41,0xcf,0x21,0x7a,0x28,0xdd,0xcd,0x5,0x14,0x57,0x73,0x28,0xe7,0x20,0xbd,0x41,0x70,0x5c,0x14,0x93,0xe,0xbf,0xb,0xdb,0x61,0x5a,0x5a,0x70,0xab,0xf,0x2,0x21,0xfc,0xf9,0xf2,0xde,0x23,0xf0,0xe7,0xa5,0xb5,0xc3,0x9c,0xf3,0xae,0x94,0xf2,0xda,0xf7,0xfd,0x13,0x40,0x8c,0xf1,0x10,0x42,0xd8,0xa7,0x94,0xbe,0x96,0xb3,0x6e,0x3,0x6c,0x92,0x4e,0x40,0x1,0x90,0xf4,0x1,0xd8,0xda,0xe0,0xc,0x90,0x73,0xde,0x1,0x66,0x66,0xc1,0xcc,0x9a,0xb,0xcd,0xcc,0x99,0x59,0xc8,0x39,0x3,0xe8,0xda,0xc9,0xc,0x50,0x4a,0x79,0x91,0xf4,0x69,0x66,0xcd,0x30,0xc,0xf,0x40,0x3,0x30,0xee,0x91,0x74,0x36,0xb3,0x5b,0xe0,0x79,0xb5,0x83,0xae,0xeb,0x6c,0xb2,0x3d,0x5e,0x9e,0x5c,0x9c,0xc7,0x5,0x10,0xda,0xb6,0xbd,0xdc,0xbb,0xd9,0xe8,0xe0,0xd7,0x9a,0x45,0x88,0x31,0x1e,0x24,0x9d,0xa6,0x8,0xb5,0xd6,0x47,0x0,0xef,0xfd,0xbb,0x73,0xee,0x78,0x15,0x61,0x1d,0x10,0x42,0xd8,0x33,0x96,0x8,0x50,0x6b,0xbd,0x7,0x70,0xce,0x1d,0xbd,0xf7,0x6f,0x92,0xa,0x8b,0xd8,0x33,0xc0,0xd4,0x6e,0xce,0x19,0x49,0x53,0x66,0x24,0xd,0x92,0x4a,0x4a,0xa9,0xb0,0xd0,0xd6,0x3f,0xd0,0x68,0x35,0xf0,0x63,0xe9,0x6e,0xf9,0xf2,0x3f,0xd2,0x37,0xb9,0xed,0x67,0x29,0x9e,0xb,0x7f,0x1a,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+};
+
+
 static const unsigned char icon_close_png[]={
 0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xd9,0xb,0x17,0x6,0x11,0xd,0x6a,0x1e,0x9a,0x6f,0x0,0x0,0x0,0x5e,0x49,0x44,0x41,0x54,0x38,0xcb,0xd5,0x53,0xcb,0xe,0xc0,0x30,0x8,0x12,0xb2,0xff,0xff,0x65,0x77,0x5a,0xb3,0x36,0xf8,0x48,0xcc,0xe,0xf3,0xd4,0x3,0xa2,0x40,0x85,0x9b,0xdb,0xa4,0x68,0xc3,0x1a,0x13,0x5c,0xcf,0x3,0x86,0xa5,0xc5,0xcd,0xa1,0xc0,0xa,0x43,0xd5,0xf4,0x6,0x56,0x3,0x36,0x9,0x11,0x49,0xb6,0x1d,0x54,0xa,0x6a,0x83,0x48,0x1a,0xbb,0xc0,0xc8,0x97,0x6f,0x62,0xac,0x4c,0x4c,0x9,0x4e,0xc3,0xaa,0x74,0xd8,0x89,0x2a,0x23,0x61,0xf7,0x23,0x85,0x11,0xff,0xff,0x98,0x6e,0x7,0x20,0x33,0x1a,0x5b,0xf5,0xcc,0xfe,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
+static const unsigned char icon_color_pick_png[]={
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x11,0x0,0x0,0xb,0x11,0x1,0x7f,0x64,0x5f,0x91,0x0,0x0,0x0,0x18,0x74,0x45,0x58,0x74,0x53,0x6f,0x66,0x74,0x77,0x61,0x72,0x65,0x0,0x70,0x61,0x69,0x6e,0x74,0x2e,0x6e,0x65,0x74,0x20,0x34,0x2e,0x30,0x2e,0x36,0xfc,0x8c,0x63,0xdf,0x0,0x0,0x1,0xf7,0x49,0x44,0x41,0x54,0x38,0x4f,0x8d,0x90,0xbd,0x6b,0x53,0x51,0x18,0xc6,0xaf,0x26,0xed,0x62,0x70,0x71,0xd0,0xc1,0x2f,0x70,0xa9,0xda,0x4d,0xc7,0x8e,0xd6,0x42,0xc5,0x52,0xa5,0x42,0xa1,0xa4,0xb6,0x20,0x75,0x50,0xf4,0x52,0x41,0x1d,0x6a,0x87,0x96,0xfe,0x1,0x42,0xa1,0x20,0x52,0x71,0x56,0x50,0xf3,0xd5,0x94,0x24,0xed,0x50,0x5d,0xc4,0x41,0xa9,0x70,0xd3,0xc4,0xe7,0x9c,0xa0,0xc5,0xf,0x1c,0x2,0x6,0x29,0x4d,0xe2,0x7d,0x7d,0x4e,0x72,0xc,0xe9,0x7,0xb5,0xf,0xfc,0x48,0xee,0xcd,0xf3,0x7b,0xcf,0x7b,0xe2,0xfc,0x2f,0xc5,0x62,0x31,0x98,0xc8,0xfd,0x8,0x5c,0x8c,0xa1,0xa5,0x3f,0x81,0xe0,0x8d,0x14,0x4e,0xdc,0xcd,0x60,0x6a,0x64,0x1e,0x3,0x3d,0x31,0x84,0x6c,0x6d,0x6b,0x6,0xe6,0x10,0x1c,0x4a,0xe2,0xc0,0xf3,0x8f,0xab,0x7b,0x87,0x53,0x2a,0x40,0xf9,0x24,0xe5,0xa7,0xf7,0x17,0xf0,0xe7,0x5e,0x6,0x55,0x3e,0x7f,0xee,0x8c,0xe0,0xa0,0xad,0x3b,0x8e,0x88,0x34,0x30,0x19,0x4c,0x22,0x70,0x2b,0x85,0xa3,0x7d,0x71,0x1c,0xb9,0x1c,0x47,0x68,0x34,0x8d,0x35,0xca,0xe2,0xa6,0x21,0xe1,0x39,0xf8,0x5d,0x11,0xac,0x9f,0x8b,0xe0,0x71,0xad,0x6c,0xd2,0x2c,0x9b,0xf4,0xc6,0x70,0xfc,0xda,0x3c,0xd6,0x2e,0xc5,0xf0,0x75,0x38,0x89,0x99,0xb1,0x5,0xf8,0x77,0xd2,0xf0,0xaf,0xc4,0x51,0x3d,0x1f,0x41,0x99,0xb2,0x22,0xa7,0x6d,0x7d,0xeb,0x0,0x9e,0x70,0xa6,0x27,0x8a,0x32,0xd7,0x14,0x6e,0x20,0xdc,0xc0,0xe7,0xea,0x3e,0x4f,0x2f,0x71,0xc0,0x7,0xca,0x61,0xd2,0x62,0xeb,0xf5,0x1,0xcd,0x59,0xfe,0xa4,0xdd,0x47,0x6f,0x21,0xdd,0x51,0xf8,0x1c,0xe2,0xf3,0x2a,0xc2,0x3f,0xce,0x6c,0xf0,0x8e,0xc3,0x7,0x29,0xef,0xb3,0xd5,0x7a,0x9a,0x7,0x14,0xa,0x85,0x3e,0x52,0xc9,0x2b,0x5d,0x19,0x5d,0xc4,0x2c,0xcb,0x25,0xb3,0x9,0x87,0xc9,0x85,0x28,0xbe,0xf3,0xfb,0x31,0xbe,0xdb,0x63,0xeb,0xf5,0xfc,0xbb,0x2,0xc5,0xe,0x52,0x22,0x42,0x6e,0xba,0x8b,0xd8,0x3f,0xf5,0x46,0xe5,0x79,0xaa,0x50,0x32,0x54,0x49,0xe7,0xb6,0x3,0x28,0xb4,0x91,0xa2,0x95,0x27,0x49,0x90,0x3c,0xcb,0x42,0xcb,0xf8,0x92,0xfa,0x6d,0x65,0x9f,0xbc,0x22,0xad,0x56,0xad,0x87,0xc5,0x10,0xf1,0x88,0x91,0x9f,0x90,0x9a,0x6c,0x9f,0x7f,0x26,0x96,0xf5,0x59,0x4a,0x2e,0x79,0x49,0x4e,0x91,0x8d,0x1b,0xb0,0xf4,0x42,0xe7,0xb5,0x60,0x36,0xb7,0x8a,0xeb,0x5e,0xb8,0x49,0x36,0xd7,0xe9,0x30,0x1b,0x1a,0x89,0xb4,0x6e,0x27,0xf7,0xea,0xf7,0x4a,0x30,0xb1,0x52,0x46,0xd8,0x2b,0xe3,0x41,0xf6,0xcb,0x66,0x79,0x33,0x1b,0xc2,0x92,0xa7,0x1e,0xe6,0x4,0x57,0xbd,0x75,0xb8,0xd9,0x5f,0x5a,0xeb,0x1d,0x65,0x43,0x23,0x2c,0xb5,0xab,0xc,0x4,0x23,0x9e,0xe0,0xb6,0x57,0xd1,0x2b,0x35,0xf9,0xdb,0x4e,0xb2,0xa1,0x11,0x16,0xf,0x61,0x3a,0x57,0x55,0xaf,0x61,0x44,0x43,0x8a,0x1c,0xb6,0x3f,0xef,0x2e,0x14,0xda,0xc9,0x98,0xf9,0xb4,0xaf,0x76,0x19,0xc7,0xf9,0xb,0x8e,0xb3,0xf3,0x95,0xda,0x15,0xd3,0x79,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+};
+
+
 static const unsigned char icon_folder_png[]={
 0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0xf,0x14,0x33,0x39,0x1,0xd2,0x43,0x4c,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x36,0x49,0x44,0x41,0x54,0x38,0x8d,0xc5,0x92,0xcd,0x4a,0xc3,0x40,0x14,0x85,0xbf,0x7b,0x67,0x12,0x48,0x3,0x12,0x62,0x45,0xfa,0x30,0x7d,0x5,0x5d,0xfa,0x8,0xbe,0x88,0x3e,0x45,0x5f,0xc1,0x9d,0x4b,0x77,0x3e,0x81,0x2e,0xa4,0x15,0xa5,0x10,0xb2,0xc8,0xa2,0x9b,0x41,0x2c,0x62,0x4c,0x66,0x5c,0x34,0x8a,0x3f,0x95,0x26,0x2b,0xf,0xc,0xcc,0x9d,0x3b,0xe7,0xce,0x39,0x87,0x81,0xff,0x86,0x14,0x45,0x11,0xb6,0x35,0xe2,0x38,0xbe,0x9c,0x4c,0x26,0x47,0xce,0xb9,0x78,0x4b,0x3b,0x64,0x59,0xf6,0x6,0x20,0x65,0x59,0x56,0xde,0xfb,0x43,0x40,0x80,0x0,0x34,0xdd,0xa5,0x28,0x49,0x92,0x73,0x11,0x79,0xf9,0x49,0x16,0x91,0xd5,0x78,0x3c,0x9e,0x1,0x58,0x63,0x4c,0xe9,0xbd,0x3f,0x0,0xc,0x20,0xa3,0xd1,0xe8,0x2c,0x84,0x10,0x1,0x88,0xc8,0x6b,0x37,0xf8,0x9b,0xea,0x10,0xc2,0xa7,0x2a,0xa9,0xaa,0xea,0xa2,0xae,0xeb,0x63,0x40,0xd3,0x34,0x3d,0x5d,0xaf,0xd7,0xb3,0xde,0xfe,0x45,0x9e,0xd4,0x18,0x53,0x0,0x1e,0xd0,0x10,0x42,0xda,0x97,0xc,0x78,0x55,0xad,0x54,0x44,0x96,0x80,0xfd,0xf0,0x37,0x64,0x80,0x31,0x66,0xa1,0xaa,0xfa,0x8,0x68,0x77,0xb8,0x7,0xd4,0x83,0x6,0x88,0xc8,0x3,0x80,0x31,0x66,0xde,0x34,0xcd,0x94,0x4d,0x98,0x7d,0x10,0xab,0xea,0xad,0xe6,0x79,0xbe,0x4,0x88,0xa2,0xe8,0xba,0xae,0xeb,0xe9,0x17,0x35,0x3b,0xa1,0xaa,0x37,0xf6,0x4b,0x71,0x7,0x24,0x7d,0xc9,0x0,0x79,0x9e,0xcf,0x2d,0x80,0x88,0x3c,0xf,0x79,0x99,0x4d,0xd8,0x1e,0xba,0xf4,0x55,0x75,0xd5,0xed,0xdb,0x6e,0xed,0x42,0x63,0xad,0xbd,0x7,0xb0,0xce,0x39,0x6d,0xdb,0xf6,0x44,0x55,0x17,0x49,0x92,0xec,0xff,0xf1,0xfb,0x7e,0x29,0x50,0xd5,0x2b,0xe7,0x9c,0x8,0x80,0x73,0xce,0x74,0x92,0xa2,0x1,0x36,0xda,0x2c,0xcb,0xda,0x77,0xe3,0x5,0x64,0xf1,0xba,0x53,0xe9,0x44,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
@@ -519,3 +529,42 @@ static const unsigned char vsplitter_png[]={
 };
 
 
+
+
+
+static const char *uv_editor_shader_code=
+			"vec3 nd1sl2=vec3(UV,0);"
+			"uniform float H=0;"
+			"float nd4sl0=H;"
+			"float nd7sl0=nd1sl2.x;"
+			"float nd7sl1=nd1sl2.y;"
+			"float nd7sl2=nd1sl2.z;"
+			"float nd2sl1def=-1;"
+			"float nd2sl0=nd7sl1*nd2sl1def;"
+			"float nd6sl1def=1;"
+			"float nd6sl0=nd2sl0+nd6sl1def;"
+			"vec3 nd3sl0=vec3(nd4sl0,nd7sl0,nd6sl0);"
+			"vec3 nd5sl0;"
+			"{"
+			"	vec3 c = nd3sl0;"
+			"	vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);"
+			"	vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);"
+			"	nd5sl0=c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);"
+			"}"
+			"COLOR.rgb=nd5sl0;";
+
+
+static const char *w_editor_shader_code=
+			"vec3 nd1sl2=vec3(UV,0);"
+			"float nd2sl1=1-nd1sl2.y;"
+			"vec3 nd3sl0=vec3(nd2sl1,1,1);"
+			"vec3 nd6sl0;"
+			"{"
+			"	vec3 c = nd3sl0;"
+			"	vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);"
+			"	vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);"
+			"	nd6sl0=c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);"
+			"}"
+			"COLOR.rgb=nd6sl0;";
+
+
diff --git a/scene/resources/default_theme/uv_editor.gsl b/scene/resources/default_theme/uv_editor.gsl
new file mode 100644
index 00000000000..8c24e76dd5c
--- /dev/null
+++ b/scene/resources/default_theme/uv_editor.gsl
@@ -0,0 +1,19 @@
+vec3 nd1sl2=vec3(UV,0);
+uniform float H=0;
+float nd4sl0=H;
+float nd7sl0=nd1sl2.x;
+float nd7sl1=nd1sl2.y;
+float nd7sl2=nd1sl2.z;
+float nd2sl1def=-1;
+float nd2sl0=nd7sl1*nd2sl1def;
+float nd6sl1def=1;
+float nd6sl0=nd2sl0+nd6sl1def;
+vec3 nd3sl0=vec3(nd4sl0,nd7sl0,nd6sl0);
+vec3 nd5sl0;
+{
+	vec3 c = nd3sl0;
+	vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
+	vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
+	nd5sl0=c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
+}
+COLOR.rgb=nd5sl0;
\ No newline at end of file
diff --git a/scene/resources/default_theme/w_editor.gsl b/scene/resources/default_theme/w_editor.gsl
new file mode 100644
index 00000000000..6d2dd9a0bba
--- /dev/null
+++ b/scene/resources/default_theme/w_editor.gsl
@@ -0,0 +1,11 @@
+vec3 nd1sl2=vec3(UV,0);
+float nd2sl1=1-nd1sl2.y;
+vec3 nd3sl0=vec3(nd2sl1,1,1);
+vec3 nd6sl0;
+{
+	vec3 c = nd3sl0;
+	vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
+	vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
+	nd6sl0=c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
+}
+COLOR.rgb=nd6sl0;
\ No newline at end of file
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
index e2413f7d84f..685b2e07e1b 100644
--- a/scene/resources/theme.cpp
+++ b/scene/resources/theme.cpp
@@ -266,7 +266,52 @@ void Theme::get_icon_list(StringName p_type, List<StringName> *p_list) const {
 
 		p_list->push_back(*key);
 	}
+	
+}
 
+void Theme::set_shader(const StringName &p_name,const StringName &p_type,const Ref<Shader>& p_shader) {
+	bool new_value=!shader_map.has(p_type) || !shader_map[p_type].has(p_name);
+
+	shader_map[p_type][p_name]=p_shader;	
+
+	if (new_value) {
+		_change_notify();
+		emit_changed();;
+	}
+}
+
+Ref<Shader> Theme::get_shader(const StringName &p_name, const StringName &p_type) const {
+	if (shader_map.has(p_type) && shader_map[p_type].has(p_name) && shader_map[p_type][p_name].is_valid()) {
+		return shader_map[p_type][p_name];
+	} else {
+		return NULL;
+	}
+}
+
+bool Theme::has_shader(const StringName &p_name, const StringName &p_type) const {
+	return (shader_map.has(p_type) && shader_map[p_type].has(p_name) && shader_map[p_type][p_name].is_valid());
+}
+
+void Theme::clear_shader(const StringName &p_name, const StringName &p_type) {
+	ERR_FAIL_COND(!shader_map.has(p_type));
+	ERR_FAIL_COND(!shader_map[p_type].has(p_name));
+
+	shader_map[p_type].erase(p_name);
+	_change_notify();
+	emit_changed();;
+}
+
+void Theme::get_shader_list(const StringName &p_type, List<StringName> *p_list) const {
+	if (!shader_map.has(p_type))
+		return;
+
+	const StringName *key=NULL;
+
+	while((key=shader_map[p_type].next(key))) {
+
+		p_list->push_back(*key);
+	}
+	
 }
 
 
diff --git a/scene/resources/theme.h b/scene/resources/theme.h
index f0747fb3c47..180f55381d6 100644
--- a/scene/resources/theme.h
+++ b/scene/resources/theme.h
@@ -33,6 +33,7 @@
 #include "scene/resources/font.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
+#include "scene/resources/shader.h"
 #include "io/resource_loader.h"
 
 /**
@@ -48,6 +49,7 @@ class Theme : public Resource {
 	HashMap<StringName,HashMap<StringName,Ref<Texture>,StringNameHasher >, StringNameHasher >  icon_map;
 	HashMap<StringName,HashMap<StringName,Ref<StyleBox>,StringNameHasher >,StringNameHasher > style_map;
 	HashMap<StringName,HashMap<StringName,Ref<Font>,StringNameHasher >,StringNameHasher > font_map;
+	HashMap<StringName,HashMap<StringName,Ref<Shader>,StringNameHasher >, StringNameHasher >  shader_map;
 	HashMap<StringName,HashMap<StringName,Color,StringNameHasher >,StringNameHasher > color_map;
 	HashMap<StringName,HashMap<StringName,int,StringNameHasher>,StringNameHasher > constant_map;
 protected:
@@ -86,7 +88,13 @@ public:
 	bool has_icon(const StringName& p_name,const StringName& p_type) const;
 	void clear_icon(const StringName& p_name,const StringName& p_type);
 	void get_icon_list(StringName p_type, List<StringName> *p_list) const;
-	
+
+	void set_shader(const StringName& p_name,const StringName& p_type,const Ref<Shader>& p_shader);
+	Ref<Shader> get_shader(const StringName& p_name,const StringName& p_type) const;
+	bool has_shader(const StringName& p_name,const StringName& p_type) const;
+	void clear_shader(const StringName& p_name,const StringName& p_type);
+	void get_shader_list(const StringName& p_name, List<StringName> *p_list) const;
+
 	void set_stylebox(const StringName& p_name,const StringName& p_type,const Ref<StyleBox>& p_style);
 	Ref<StyleBox> get_stylebox(const StringName& p_name,const StringName& p_type) const;
 	bool has_stylebox(const StringName& p_name,const StringName& p_type) const;
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index cc7db571454..286a8f25b1d 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -595,7 +595,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 			color_picker->show();
 			color_picker->set_edit_alpha(hint!=PROPERTY_HINT_COLOR_NO_ALPHA);
 			color_picker->set_color(v);
-			set_size( Size2(350, color_picker->get_combined_minimum_size().height+10));
+			set_size( Size2(300, color_picker->get_combined_minimum_size().height+10));
 			/*
 			int ofs=80;
 			int m=10;