diff --git a/plugins/image-source/CMakeLists.txt b/plugins/image-source/CMakeLists.txt
index 4159cf56e..56eb5fc17 100644
--- a/plugins/image-source/CMakeLists.txt
+++ b/plugins/image-source/CMakeLists.txt
@@ -7,6 +7,7 @@ endif()
 
 set(image-source_SOURCES
 	image-source.c
+	color-source.c
 	obs-slideshow.c)
 
 add_library(image-source MODULE
diff --git a/plugins/image-source/color-source.c b/plugins/image-source/color-source.c
new file mode 100644
index 000000000..14f3b014b
--- /dev/null
+++ b/plugins/image-source/color-source.c
@@ -0,0 +1,120 @@
+#include <obs-module.h>
+
+struct color_source {
+	uint32_t color;
+
+	uint32_t width;
+	uint32_t height;
+
+	obs_source_t *src;
+};
+
+static const char *color_source_get_name(void *unused)
+{
+	UNUSED_PARAMETER(unused);
+	return obs_module_text("ColorSource");
+}
+
+static void color_source_update(void *data, obs_data_t *settings)
+{
+	struct color_source *context = data;
+	uint32_t color = (uint32_t)obs_data_get_int(settings, "color");
+	uint32_t width = (uint32_t)obs_data_get_int(settings, "width");
+	uint32_t height = (uint32_t)obs_data_get_int(settings, "height");
+
+	context->color = color;
+	context->width = width;
+	context->height = height;
+}
+
+static void *color_source_create(obs_data_t *settings, obs_source_t *source)
+{
+	UNUSED_PARAMETER(source);
+
+	struct color_source *context = bzalloc(sizeof(struct color_source));
+	context->src = source;
+
+	color_source_update(context, settings);
+
+	return context;
+}
+
+static void color_source_destroy(void *data)
+{
+	bfree(data);
+}
+
+static obs_properties_t *color_source_properties(void *unused)
+{
+	UNUSED_PARAMETER(unused);
+
+	obs_properties_t *props = obs_properties_create();
+
+	obs_properties_add_color(props, "color",
+		obs_module_text("ColorSource.Color"));
+
+	obs_properties_add_int(props, "width",
+		obs_module_text("ColorSource.Width"), 0, 4096, 1);
+
+	obs_properties_add_int(props, "height",
+		obs_module_text("ColorSource.Height"), 0, 4096, 1);
+
+	return props;
+}
+
+static void color_source_render(void *data, gs_effect_t *effect)
+{
+	UNUSED_PARAMETER(effect);
+
+	struct color_source *context = data;
+
+	gs_effect_t    *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
+	gs_eparam_t    *color = gs_effect_get_param_by_name(solid, "color");
+	gs_technique_t *tech  = gs_effect_get_technique(solid, "Solid");
+
+	struct vec4 colorVal;
+	vec4_from_rgba(&colorVal, context->color);
+	gs_effect_set_vec4(color, &colorVal);
+
+	gs_technique_begin(tech);
+	gs_technique_begin_pass(tech, 0);
+
+	gs_draw_sprite(0, 0, context->width, context->height);
+
+	gs_technique_end_pass(tech);
+	gs_technique_end(tech);
+}
+
+static uint32_t color_source_getwidth(void *data)
+{
+	struct color_source *context = data;
+	return context->width;
+}
+
+static uint32_t color_source_getheight(void *data)
+{
+	struct color_source *context = data;
+	return context->height;
+}
+
+static void color_source_defaults(obs_data_t *settings)
+{
+	obs_data_set_default_int(settings, "color", 0xFFFFFFFF);
+	obs_data_set_default_int(settings, "width", 400);
+	obs_data_set_default_int(settings, "height", 400);
+}
+
+struct obs_source_info color_source_info = {
+	.id             = "color_source",
+	.type           = OBS_SOURCE_TYPE_INPUT,
+	.output_flags   = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW,
+	.create         = color_source_create,
+	.destroy        = color_source_destroy,
+	.update         = color_source_update,
+	.get_name       = color_source_get_name,
+	.get_defaults   = color_source_defaults,
+	.get_width      = color_source_getwidth,
+	.get_height     = color_source_getheight,
+	.video_render   = color_source_render,
+	.get_properties = color_source_properties
+};
diff --git a/plugins/image-source/image-source.c b/plugins/image-source/image-source.c
index c28e4ca33..ed87504c1 100644
--- a/plugins/image-source/image-source.c
+++ b/plugins/image-source/image-source.c
@@ -270,10 +270,12 @@ OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("image-source", "en-US")
 
 extern struct obs_source_info slideshow_info;
+extern struct obs_source_info color_source_info;
 
 bool obs_module_load(void)
 {
 	obs_register_source(&image_source_info);
+	obs_register_source(&color_source_info);
 	obs_register_source(&slideshow_info);
 	return true;
 }