diff --git a/imgui_demo.cpp b/imgui_demo.cpp
index 7544f338..f0f35438 100644
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
@@ -658,6 +658,44 @@ void ImGui::ShowTestWindow(bool* p_open)
         //ImGui::ListBox("##listbox2", &listbox_item_current2, listbox_items, IM_ARRAYSIZE(listbox_items), 4);
         //ImGui::PopItemWidth();
 
+        if (ImGui::TreeNode("Color/Picker Widgets"))
+        {
+            static ImVec4 color = ImColor(114, 144, 154);
+
+            ImGui::Text("Color widget:");
+            ImGui::SameLine(); ShowHelpMarker("Click on the colored square to open a color picker.\nRight-click on the colored square to show options.\nCTRL+click on individual component to input value.\n");
+            ImGui::ColorEdit3("MyColor##1", (float*)&color, ImGuiColorEditFlags_HSV);
+
+            ImGui::Text("Color widget w/ Alpha:");
+            ImGui::ColorEdit4("MyColor##2", (float*)&color);
+
+            ImGui::Text("Color button only:");
+            ImGui::ColorEdit4("MyColor##3", (float*)&color, ImGuiColorEditFlags_NoInputs|ImGuiColorEditFlags_NoLabel);
+
+            ImGui::Text("Color picker:");
+            static bool alpha = false;
+            static bool label = true;
+            static int inputs_mode = 0;
+            static float width = 200.0f;
+            ImGui::Checkbox("With Alpha", &alpha);
+            ImGui::Checkbox("With Label", &label);
+            ImGui::Combo("Mode", &inputs_mode, "All Inputs\0No Inputs\0RGB Input\0HSV Input\0HEX Input\0");
+            ImGui::DragFloat("Width", &width, 1.0f, 1.0f, 999.0f);
+            ImGui::PushItemWidth(width);
+            ImGuiColorEditFlags flags = (label ? 0 : ImGuiColorEditFlags_NoLabel);
+            if (inputs_mode == 1) flags |= ImGuiColorEditFlags_NoInputs;
+            if (inputs_mode == 2) flags |= ImGuiColorEditFlags_RGB;
+            if (inputs_mode == 3) flags |= ImGuiColorEditFlags_HSV;
+            if (inputs_mode == 4) flags |= ImGuiColorEditFlags_HEX;
+            if (alpha)
+                ImGui::ColorPicker4("MyColor##4", (float*)&color, flags);
+            else
+                ImGui::ColorPicker3("MyColor##4", (float*)&color, flags);
+            ImGui::PopItemWidth();
+
+            ImGui::TreePop();
+        }
+
         if (ImGui::TreeNode("Range Widgets"))
         {
             ImGui::Unindent();
@@ -1280,7 +1318,7 @@ void ImGui::ShowTestWindow(bool* p_open)
             }
 
             static ImVec4 color = ImColor(0.8f, 0.5f, 1.0f, 1.0f);
-            ImGui::ColorButton(color);
+            ImGui::ColorButton("##color", color);
             if (ImGui::BeginPopupContextItem("color context menu"))
             {
                 ImGui::Text("Edit color");
@@ -1719,7 +1757,7 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
             if (!filter.PassFilter(name))
                 continue;
             ImGui::PushID(i);
-            ImGui::ColorEdit4(name, (float*)&style.Colors[i], color_edit_flags | ImGuiColorEditFlags_Alpha | ImGuiColorEditFlags_NoOptions);
+            ImGui::ColorEdit4(name, (float*)&style.Colors[i], color_edit_flags | ImGuiColorEditFlags_NoOptions);
             if (memcmp(&style.Colors[i], (ref ? &ref->Colors[i] : &default_style.Colors[i]), sizeof(ImVec4)) != 0)
             {
                 ImGui::SameLine(); if (ImGui::Button("Revert")) style.Colors[i] = ref ? ref->Colors[i] : default_style.Colors[i];