diff --git a/bin/resources/themes/default/controls/controls.xml b/bin/resources/themes/default/controls/controls.xml
index 6c932296..b58620cd 100644
--- a/bin/resources/themes/default/controls/controls.xml
+++ b/bin/resources/themes/default/controls/controls.xml
@@ -43,14 +43,22 @@
         </TreeView>
       </HBox>
       <Control class="splitline_hor_level1"/>
-      <!-- Progress -->
-      <HBox margin="0,10" height="30">
-        <Control width="auto" height="auto" bkimage="../public/animation/ani_loading.gif" valign="center"/>
-        <Progress class="progress_blue" name="progress" value="0" margin="10"/>
-      </HBox>
-      <HBox margin="0,0,0,10" height="30">
-        <Control width="auto" height="auto" bkimage="set_speaker.png" valign="center"/>
-        <Slider class="slider_green" value="70" margin="10"/>
+      <HBox height="85">
+        <VBox margin="0,0,10">
+          <Combo class="list" name="combo" height="30" margin="0,12,0,0" padding="6" bkimage="file='../public/combo/normal.png' corner='5,5,30,5'"/>
+          <RichEdit class="simple input" height="30" margin="0,3" padding="6,6,6" promptmode="true" prompttext="Single line text control" promptcolor="lightcolor"/>
+        </VBox>
+        <!-- Progress -->
+        <VBox>
+          <HBox margin="0,10" height="32">
+            <Control width="auto" height="auto" bkimage="../public/animation/ani_loading.gif" valign="center"/>
+            <Progress class="progress_blue" name="progress" value="0" margin="10"/>
+          </HBox>
+          <HBox margin="0,0,0,10" height="32">
+            <Control width="auto" height="auto" bkimage="set_speaker.png" valign="center"/>
+            <Slider class="slider_green" value="70" margin="10"/>
+          </HBox>
+        </VBox>
       </HBox>
       <Control class="splitline_hor_level1"/>
       <!-- RichEdit -->
diff --git a/docs/Controls/RichEdit.md b/docs/Controls/RichEdit.md
index ba7bc72d..ded183fb 100644
--- a/docs/Controls/RichEdit.md
+++ b/docs/Controls/RichEdit.md
@@ -20,7 +20,6 @@
 | number | false | BOOL | 是否只允许输入数字,如(false) |
 | align | left | STRING | 文字对齐方式,取值left、right、hcenter、top、vcenter、bottom,如(right) |
 | font | -1 | INT | 字体id,如(0) |
-| promptmode | false | BOOL | 是否显示提示文字,如(true) |
 | vscrollbar | false | BOOL | 是否使用竖向滚动条,如(true) |
 | autovscroll | false | BOOL | 是否随输入竖向滚动,如(true) |
 | hscrollbar | false | BOOL | 是否使用横向滚动条,如(true) |
diff --git a/samples/controls/controls_form.cpp b/samples/controls/controls_form.cpp
index aa3539a9..88dd30bb 100644
--- a/samples/controls/controls_form.cpp
+++ b/samples/controls/controls_form.cpp
@@ -70,6 +70,19 @@ void ControlForm::InitWindow()
 		}
 	}
 
+	/* Initialize ComboBox data */
+	ui::Combo* combo = dynamic_cast<ui::Combo*>(FindControl(L"combo"));
+	for (auto i = 0; i < 10; i++)
+	{
+		ui::ListContainerElement* element = new ui::ListContainerElement;
+		element->SetClass(L"listitem");
+		element->SetFixedHeight(30);
+		element->SetBkColor(L"white");
+		element->SetTextPadding({ 6,0,6,0 });
+		element->SetText(nbase::StringPrintf(L"Combo element %d", i));
+		combo->Add(element);
+	}
+
 	/* Load xml file content in global misc thread, and post update RichEdit task to UI thread */
 	StdClosure closure = [this]() {
 		std::streamoff length = 0;
diff --git a/tool_kits/duilib/Control/Combo.cpp b/tool_kits/duilib/Control/Combo.cpp
index f9960deb..19e015ff 100644
--- a/tool_kits/duilib/Control/Combo.cpp
+++ b/tool_kits/duilib/Control/Combo.cpp
@@ -144,8 +144,6 @@ Combo::Combo() :
 	// the items back to the righfull owner/manager when the window closes.
 	m_pLayout.reset(new ListBox(new VLayout));
 	m_pLayout->GetLayout()->SetPadding(UiRect(1, 1, 1, 1));
-	m_pLayout->SetBkColor(L"bk_wnd_lightcolor");
-	m_pLayout->SetBorderColor(L"combobox_border");
 	m_pLayout->SetBorderSize(UiRect(1, 1, 1, 1));
 	m_pLayout->SetAutoDestroy(false);
 	m_pLayout->EnableScrollBar();