diff --git a/modules/editor/components/image_gallery/icon.gif b/modules/editor/components/image_gallery/icon.gif
index f5a20f9d0..d6e714d1d 100644
Binary files a/modules/editor/components/image_gallery/icon.gif and b/modules/editor/components/image_gallery/icon.gif differ
diff --git a/modules/editor/components/image_gallery/lang/ko.lang.php b/modules/editor/components/image_gallery/lang/ko.lang.php
index 24d512ec5..18e302224 100644
--- a/modules/editor/components/image_gallery/lang/ko.lang.php
+++ b/modules/editor/components/image_gallery/lang/ko.lang.php
@@ -9,6 +9,10 @@
     $lang->width = "가로크기"; 
     $lang->height = "세로크기"; 
     $lang->image_list = "이미지 목록"; 
-    $lang->cmd_make_thumbnail = "썸네일 생성"; 
+    $lang->gallery_style = "갤러리형식 "; 
+    $lang->gallery_slide_style = "슬라이드 형식"; 
+    $lang->gallery_list_style = "모두 펼침"; 
+    $lang->gallery_border_color = "테두리색"; 
+    $lang->gallery_bg_color = "배경색"; 
     $lang->about_image_list = "이미지 갤러리에  추가할 파일을 선택하세요. 선택후 드래그 또는 shift+클릭(범위선택), ctrl+클릭(개별선택) 가능합니다";
 ?>
diff --git a/modules/editor/components/image_gallery/tpl/images/blank.gif b/modules/editor/components/image_gallery/tpl/images/blank.gif
new file mode 100644
index 000000000..35d42e808
Binary files /dev/null and b/modules/editor/components/image_gallery/tpl/images/blank.gif differ
diff --git a/modules/editor/components/image_gallery/tpl/images/border_solid.gif b/modules/editor/components/image_gallery/tpl/images/border_solid.gif
new file mode 100644
index 000000000..9fbf79f57
Binary files /dev/null and b/modules/editor/components/image_gallery/tpl/images/border_solid.gif differ
diff --git a/modules/editor/components/image_gallery/tpl/popup.css b/modules/editor/components/image_gallery/tpl/popup.css
index e1a8bd26b..4cd7b0d8e 100644
--- a/modules/editor/components/image_gallery/tpl/popup.css
+++ b/modules/editor/components/image_gallery/tpl/popup.css
@@ -16,9 +16,26 @@
   text-align:center;
 }
 
+.short_header {
+  float:left;
+  width:80px;
+  text-align:left;
+  font-weight:bold;
+  margin:5px;
+  font-size:9pt;
+}
+
+.short_body {
+  float:left;
+  width:90px;
+  text-align:left;
+  margin:5px;
+  font-size:9pt;
+}
+
 .header {
   float:left;
-  width:100px;
+  width:80px;
   clear:left;
   text-align:left;
   font-weight:bold;
@@ -32,7 +49,6 @@
   text-align:left;
   margin:5px;
   font-size:9pt;
-  font-size:9pt;
 }
 
 .image_list {
@@ -67,3 +83,50 @@
   height:16px;
   font-size:9pt;
 }
+
+.editor_color_box {
+  clear:both;
+  height:65px;
+  width:400px;
+  border:1px solid #DDDDDD;
+  padding:2px;
+  margin-bottom:3px;
+}
+
+.editor_color_input {
+  clear:both;
+}
+
+img.bg_preview_color {
+  width:30px;
+  height:16px;
+  border:1px solid #000000;
+  background-color:#FFFFFF;
+}
+
+img.border_preview_color {
+  width:30px;
+  height:16px;
+  border:1px solid #EEEEEE;
+  background-color:#88EE22;
+}
+
+img.color_icon {
+  width:14px;
+  height:14px;
+  border:1px solid #FFFFFF;
+}
+
+img.color_icon_over {
+  width:14px;
+  height:14px;
+  border:1px solid #000000;
+  cursor:pointer;
+}
+
+.table_input {
+  width:40px;
+  height:13px;
+  font-size:9pt;
+  border:1px solid #AAAAAA;
+}
diff --git a/modules/editor/components/image_gallery/tpl/popup.html b/modules/editor/components/image_gallery/tpl/popup.html
index a561f6c18..9e9cbdd10 100644
--- a/modules/editor/components/image_gallery/tpl/popup.html
+++ b/modules/editor/components/image_gallery/tpl/popup.html
@@ -8,14 +8,55 @@
 
     <div class="editor_title">{$lang->image_gallery}</div>
 
-    <div class="header">{$lang->width}</div>
-    <div class="body"><input type="text" class="editor_input" id="width" value="600" />px</div>
+    <div class="short_header">{$lang->width}</div>
+    <div class="short_body"><input type="text" class="editor_input" id="width" value="600" />px</div>
 
-    <div class="header">{$lang->height}</div>
-    <div class="body"><input type="text" class="editor_input" id="height" value="600" />px</div>
+    <div class="short_header">{$lang->height}</div>
+    <div class="short_body"><input type="text" class="editor_input" id="height" value="600" />px</div>
 
-    <div class="header">{$lang->cmd_make_thumbnail}</div>
-    <div class="body"><input type="checkbox" id="make_thumbnail" value="Y" checked="true" /></div>
+    <div class="header">{$lang->gallery_style}</div>
+    <div class="body">
+      <select id="gallery_style">
+        <option value="slide">{$lang->gallery_slide_style}</option>
+        <option value="list">{$lang->gallery_list_style}</option>
+      </select>
+    </div>
+
+    <div class="header">{$lang->gallery_border_color}</div>
+    <div class="body">
+      <div class="editor_color_box">
+        <script type="text/javascript">
+          printColor("border", "{$tpl_path}/images/blank.gif");
+        </script>
+      </div>
+      <div class="editor_color_input">
+        <table border="0" cellspacing="0">
+        <tr>
+          <td><img src="./images/border_solid.gif" alt="blank" class="border_preview_color" id="border_preview_color" /></td>
+          <td>#</td>
+          <td><input type="text" id="border_color_input" size="6" maxlength="6" class="table_input" value="000000" onkeyup="manual_select_color('border',this)"/></td>
+        </tr>
+        </table>
+      </div>
+    </div>
+
+    <div class="header">{$lang->gallery_bg_color}</div>
+    <div class="body">
+      <div class="editor_color_box">
+        <script type="text/javascript">
+          printColor("bg", "{$tpl_path}/images/blank.gif");
+        </script>
+      </div>
+      <div class="editor_color_input">
+        <table border="0" cellspacing="0">
+        <tr>
+          <td><img src="./images/blank.gif" alt="blank" class="bg_preview_color" id="bg_preview_color" /></td>
+          <td>#</td>
+          <td><input type="text" id="bg_color_input" size="6" maxlength="6" class="table_input" value="FFFFFF" onkeyup="manual_select_color('bg',this)"/></td>
+        </tr>
+        </table>
+      </div>
+    </div>
 
     <div class="header">{$lang->image_list}</div>
     <div class="body">
diff --git a/modules/editor/components/image_gallery/tpl/popup.js b/modules/editor/components/image_gallery/tpl/popup.js
index 84c32ff6a..12edb2808 100644
--- a/modules/editor/components/image_gallery/tpl/popup.js
+++ b/modules/editor/components/image_gallery/tpl/popup.js
@@ -11,11 +11,8 @@ function getSlideShow() {
 
         var width = xWidth(selected_node)-6;
         var height = xHeight(selected_node)-6;
-        var make_thumbnail = selected_node.getAttribute("make_thumbnail");
         xGetElementById("width").value = width; 
         xGetElementById("height").value = height; 
-        if(make_thumbnail=="Y") xGetElementById("make_thumbnail").checked = true;
-        else xGetElementById("make_thumbnail").checked = false;
 
         selected_images = xInnerHtml(selected_node);
     }
@@ -64,9 +61,6 @@ function insertSlideShow() {
 
     var width = xGetElementById("width").value;
     var height = xGetElementById("height").value;
-    var make_thumbnail = "N";
-    if(xGetElementById("make_thumbnail").checked) make_thumbnail = "Y";
-    else make_thumbnail = "N";
 
     var images_list = "";
     for(var i=0; i<list.length;i++) {
@@ -76,12 +70,11 @@ function insertSlideShow() {
     if(selected_node) {
         selected_node.setAttribute("width", width);
         selected_node.setAttribute("height", height);
-        selected_node.setAttribute("make_thumbnail", make_thumbnail);
         selected_node.style.width = width+"px";
         selected_node.style.height = height+"px";
         xInnerHtml(selected_node, images_list);
     } else {
-        var text = "<div editor_component=\"image_gallery\" class=\"editor_component_output\" make_thumbnail=\""+make_thumbnail+"\" width=\""+width+"\" height=\""+height+"\" style=\"width:"+width+"px;height:"+height+"px;\" >"+images_list+"</div>";
+        var text = "<div editor_component=\"image_gallery\" class=\"editor_component_output\" width=\""+width+"\" height=\""+height+"\" style=\"width:"+width+"px;height:"+height+"px;\" >"+images_list+"</div>";
         opener.editorFocus(opener.editorPrevSrl);
         var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
         opener.editorReplaceHTML(iframe_obj, text);
@@ -92,4 +85,47 @@ function insertSlideShow() {
     window.close();
 }
 
+/* 색상 클릭시 */
+function select_color(type, code) {
+  xGetElementById(type+"_preview_color").style.backgroundColor = "#"+code;
+  xGetElementById(type+"_color_input").value = code;
+}
+
+/* 수동 색상 변경시 */
+function manual_select_color(type, obj) {
+  if(obj.value.length!=6) return;
+  code = obj.value;
+  xGetElementById(type+"_preview_color").style.backgroundColor = "#"+code;
+}
+
+/* 색상표를 출력 */
+function printColor(type, blank_img_src) {
+  var colorTable = new Array('22','44','66','88','AA','CC','EE');
+  var html = "";
+
+  for(var i=0;i<8;i+=1) html += printColorBlock(type, i.toString(16)+i.toString(16)+i.toString(16)+i.toString(16)+i.toString(16)+i.toString(16), blank_img_src);
+
+  for(var i=0; i<colorTable.length; i+=3) {
+    for(var j=0; j<colorTable.length; j+=2) {
+      for(var k=0; k<colorTable.length; k++) {
+        var code = colorTable[i] + colorTable[j] + colorTable[k];
+        html += printColorBlock(type, code, blank_img_src);
+      }
+    }
+  }
+
+  for(var i=8;i<16;i+=1) html += printColorBlock(type, i.toString(16)+i.toString(16)+i.toString(16)+i.toString(16)+i.toString(16)+i.toString(16), blank_img_src);
+
+  document.write(html);
+}
+
+/* 개별 색상 block 출력 함수 */
+function printColorBlock(type, code, blank_img_src) {
+  if(type=="bg") {
+    return "<div style=\"float:left;background-color:#"+code+"\"><img src=\""+blank_img_src+"\" class=\"color_icon\" onmouseover=\"this.className='color_icon_over'\" onmouseout=\"this.className='color_icon'\" onclick=\"select_color('"+type+"','"+code+"')\" alt=\"color\" \/><\/div>";
+  } else {
+    return "<div style=\"float:left;background-color:#"+code+"\"><img src=\""+blank_img_src+"\" class=\"color_icon\" onmouseover=\"this.className='color_icon_over'\" onmouseout=\"this.className='color_icon'\" onclick=\"select_color('"+type+"','"+code+"')\" alt=\"color\" \/><\/div>";
+  }
+}
+
 xAddEventListener(window, "load", getSlideShow);