diff --git a/style/admin/retro-celebrate/basic.css b/style/admin/retro-celebrate/basic.css
index 5b9dfbcdc..9c1ff8970 100644
--- a/style/admin/retro-celebrate/basic.css
+++ b/style/admin/retro-celebrate/basic.css
@@ -617,7 +617,6 @@ h2.caption span
 	overflow: hidden;
 	padding-left: 10px;
 }
-
 .tabs-box li
 {
 	background-color: #EFEFEF;
diff --git a/style/admin/retro-celebrate/center.css b/style/admin/retro-celebrate/center.css
index 16ada3b2d..dd510c080 100644
--- a/style/admin/retro-celebrate/center.css
+++ b/style/admin/retro-celebrate/center.css
@@ -17,10 +17,15 @@
 #part-center-dashboard,
 #part-center-lint
 {
-	height                           : 480px;
+	height                           : 440px;
 	position                         : relative;
 }
 
+#part-center-dashboard h2
+{
+	display                          : none;
+}
+
 #part-center-dashboard .section h3,
 #part-center-lint .section h3
 {
@@ -38,7 +43,7 @@
 {
 	position                         : absolute;
 	left                             : 10px;
-	top                              : 40px;
+	top                              : 0;
 	width                            : 200px;
 }
 
@@ -107,7 +112,7 @@
 {
 	position                         : absolute;
 	left                             : 10px;
-	top                              : 280px;
+	top                              : 240px;
 	width                            : 410px;
 }
 
@@ -147,7 +152,7 @@
 	width                            : 505px;
 	position                         : absolute;
 	right                            : 20px;
-	top                              : 40px;
+	top                              : 0;
 }
 
 #part-center-dashboard #myBlogInfo.section h3
@@ -167,7 +172,7 @@
 #part-center-dashboard #infoPanel
 {
 	border                           : 1px solid #d9dde0;
-	margin-top: 10px;
+	margin-top                       : 10px;
 	padding                          : 9px;
 	width                            : 485px;
 	float                            : right;
diff --git a/style/admin/retro-celebrate/skin.css b/style/admin/retro-celebrate/skin.css
index 8727a706e..a1738cafc 100644
--- a/style/admin/retro-celebrate/skin.css
+++ b/style/admin/retro-celebrate/skin.css
@@ -9,82 +9,135 @@
 
 /* Select ****************************************************************************************/
 
-#part-skin-list .data-inbox,
+#part-skin-current,
+#part-skin-list
+{
+	float                            : left;
+}
+
+#part-skin-current,
 #part-skin-current .data-inbox
 {
-	padding: 10px;
+	width                            : 240px;
+	margin                           : 0;
+	padding                          : 0;
 }
 
-#part-skin-list .section,
-#part-skin-current .section
+#part-skin-list,
+#part-skin-list .data-inbox
 {
-	clear                            : both;
-	margin-bottom                    : 20px;
-	position                         : relative;
+	width                            : 695px;
+}
+
+#part-skin-list
+{
+	padding-left                     : 15px;
 }
 
-#part-skin-list .section .preview,
+/*********** Current Skin ***********/
+
 #part-skin-current .section .preview
 {
 	background-color: #fff;
 	border                           : 1px solid #BBBBBB;
 	padding                          : 3px;
-	/*float                            : left;*/
-	position                         : absolute;
 	width                            : 150px;
+	margin                           : 0 auto;
 }
 
-#part-skin-list .section .preview img,
-#part-skin-current .section .preview img
+#part-skin-current .section .information
 {
-	vertical-align                   : top;
+	margin-left                      : 0;
 }
 
-#part-skin-list .section .information,
-#part-skin-current .section .information
+#part-skin-current #currentInfo
 {
-	margin-left                      : 190px;
+	margin-top                       : 40px;
 }
 
-#part-skin-list .section .information table,
-#part-skin-current .section .information table
+#part-skin-current .information .explain-line .name,
+#part-skin-current .information .title-line .name,
+#part-skin-list .information .explain-line .name,
+#part-skin-list .information .title-line .name
 {
-	width                            : 750px;
+	display                          : none;
 }
 
-#part-skin-list .section .information table tr td,
-#part-skin-current .section .information table tr td
+#part-skin-current .information .explain-line .explain,
+#part-skin-current .information .title-line .explain,
+#part-skin-list .information .explain-line .explain,
+#part-skin-list .information .title-line .explain
 {
-	background-image                 : url("./image/bg_tbody.gif");
-	background-position              : left bottom;
-	padding                          : 8px;
+	padding-left                     : 0;
+	margin-left                      : 0;
 }
 
-#part-skin-list .section .information table tr td.name,
-#part-skin-current .section .information table tr td.name
+#part-skin-current .information .title-line .explain
 {
-	background-position              : right bottom;
 	font-weight                      : bold;
-	text-align                       : right;
-	width                            : 100px;
+	text-align                       : center;
+	background-color                 : #EFEFEF;
+	border-bottom                    : 1px solid #DDD;
+}
+#part-skin-list .information .title-line .explain
+{
+	font-weight                      : bold;
+	text-align                       : center;
+	background-color                 : #EFEFEF;
+	border-bottom                    : 1px solid #DDD;
 }
 
-#part-skin-list .section .information table tr.title-line td.explain .version,
-#part-skin-current .section .information table tr.title-line td.explain .version
+#part-skin-list .information .title-line .explain
 {
-	padding-left                     : 10px;
+	margin-left                      : 0 !important;
 }
 
-#part-skin-list .section .information table tr.explain-line td.name,
-#part-skin-current .section .information table tr.explain-line td.name
+#part-skin-current .information dt
 {
-	background-position              : right top;
+	width                            : 60px;
 }
 
-#part-skin-list .section .information table tr.explain-line td.explain,
-#part-skin-current .section .information table tr.explain-line td.explain
+#part-skin-current .section .information .button-box .edit-button
 {
-	background-position              : left top;
+	left                             : 42px;
+	position                         : absolute;
+	top                              : 170px;
+	width                            : 60px;
+}
+
+#part-skin-current .section .information .button-box .setting-button
+{
+	left                             : 122px;
+	position                         : absolute;
+	top                              : 170px;
+	width                            : 60px;
+}
+
+/*********** Skin list (general) ************/
+#part-skin-list .section .preview
+{
+	border                           : 1px solid #BBBBBB;
+	padding                          : 3px;
+	float                            : left;
+	width                            : 150px;	
+}
+
+#part-skin-list .section,
+#part-skin-current .section
+{
+	margin-bottom                    : 20px;
+	position                         : relative;
+}
+
+#part-skin-list .section .preview img,
+#part-skin-current .section .preview img
+{
+	vertical-align                   : top;
+}
+
+#part-skin-list .section .information
+{
+	margin-left                      : 0;
 }
 
 #part-skin-list .section .information .button-box a,
@@ -101,30 +154,59 @@
 	vertical-align                   : middle;
 }
 
-#customizedTable
+#part-skin-current .information dd
 {
-	height                           : 200px;
+	margin-left                      : 65px;
 }
 
-#part-skin-current .section .information .button-box .edit-button
+/*********** List view ************/
+#part-skin-list #listview-box .section
+{
+	width                            : 650px;
+	min-height                       : 185px;
+	border                           : 1px dotted #EEE;
+	margin-right                     : 15px;
+	padding                          : 10px;
+}
+
+#part-skin-list #listview-box .information dt
 {
-	left                             : 42px;
-	position                         : absolute;
-	top                              : 170px;
 	width                            : 60px;
 }
 
-#part-skin-list .section .information .button-box .preview-button
+#part-skin-list #listview-box .information dd
 {
-	left                             : 5px;
+	width                            : 390px;
+}
+
+#part-skin-list #listview-box .section .information
+{
+	padding-left                     : 180px;
+	min-height                       : 180px;
+}
+
+#part-skin-list #listview-box .information dd
+{
+	margin-left                      : 70px;
+	border-bottom                    : 1px dotted #EEE;
+}
+#part-skin-list #listview-box .information .title-line .explain
+{
+	margin-left                      : 0;
+	width                            : 460px;
+}
+
+#part-skin-list #listview-box .section .information .button-box .preview-button
+{
+	left                             : 15px;
 	position                         : absolute;
 	top                              : 170px;
 	width                            : 60px;
 }
 
-#part-skin-list .section .information .button-box .apply-button
+#part-skin-list #listview-box .section .information .button-box .apply-button
 {
-	left                             : 82px;
+	left                             : 92px;
 	position                         : absolute;
 	top                              : 170px;
 	width                            : 60px;
@@ -146,23 +228,97 @@
 	margin-bottom                    : 100px;
 }
 
+.list-divider
+{
+	height                           : 20px !important;
+}
+
+/*********** Icon view ************/
+#part-skin-list #iconview-box .section
+{
+	width                            : 160px;
+	height                           : 230px;
+	float                            : left;
+	border                           : 1px dotted #EEE;
+	margin-right                     : 10px;
+}
+
+#part-skin-list #iconview-box .section .information
+{
+	padding-left                     : 0;
+	min-height                       : 180px;
+}
+
+#part-skin-list #iconview-box .section .information .license-line,
+#part-skin-list #iconview-box .section .information .maker-line,
+#part-skin-list #iconview-box .section .information .homepage-line,
+#part-skin-list #iconview-box .section .information .email-line,
+#part-skin-list #iconview-box .section .information .explain-line
+{
+	display                          : none;
+}
+
+#part-skin-list #iconview-box .section .information .title-line
+{
+	position                         : relative;
+	top                              : 0;
+	clear                            : both;
+	margin                           : 0;
+	padding                          : 0;
+	background-color                 : #EFEFEF;
+}
+
+#part-skin-list #iconview-box .section .information .button-box .preview-button
+{
+	left                             : 5px;
+	position                         : absolute;
+	top                              : 190px;
+	width                            : 60px;
+}
+
+#part-skin-list #iconview-box .section .information .button-box .apply-button
+{
+	left                             : 82px;
+	position                         : absolute;
+	top                              : 190px;
+	width                            : 60px;
+}
+
+/*********** Search form ************/
 #skin-search-form
 {
     background-color                 : transparent;
     border                           : none;
     margin                           : 0;
     position                         : relative;
-    left                             : 630px;
-    text-align                       : right;
+    left                             : 280px;
+    text-align                       : left;
     top                              : -36px;
-    width                            : 25em;
+    width                            : 40em;
     z-index                          : 1;
 }
-   
-#skin-search-form label
+
+#skin-search-form .section label
 {
     display                          : none;
 }
+#search-box
+{
+	float                            : left;
+}
+
+#viewmode-box
+{
+	float                            : left;
+}
+#viewmode-box dd
+{
+	margin-left                      : 15px;
+}
+#part-skin-list .main-explain-box
+{
+	clear                            : left;
+}
 
 /* Edit ******************************************************************************************/
 
diff --git a/style/admin/retro-celebrate/skin.ie.css b/style/admin/retro-celebrate/skin.ie.css
index bec6a2e2b..a32ec8940 100644
--- a/style/admin/retro-celebrate/skin.ie.css
+++ b/style/admin/retro-celebrate/skin.ie.css
@@ -7,12 +7,43 @@
 {
 	border                           : 1px solid #FFFFFF;
 }
+#skin-search-form
+{
+	left                             : 300px;
+}
 
 #skin-search-form .input-button
 {
     line-height                      : 1.6em !important;
 }
 
+#skin-search-form input.input-text
+{
+	width                            : 150px !important;
+}
+
+#part-skin-current .information dt,
+#part-skin-list .information dt
+{
+	left                             : -60px;
+	margin-left                      : 0 !important;
+}
+
+#part-skin-current .information dt
+{
+	top                              : -4px;
+}
+
+#part-skin-list #listview-box .section
+{
+	height                           : 185px !important;
+}
+
+#search-box
+{
+	top                              : -4px !important;
+}
+
 /* Edit ******************************************************************************************/
 
 #part-skin-edit .section ul
diff --git a/style/admin/retro-celebrate/skin.ie7.css b/style/admin/retro-celebrate/skin.ie7.css
index 89dadc0df..5503ac09f 100644
--- a/style/admin/retro-celebrate/skin.ie7.css
+++ b/style/admin/retro-celebrate/skin.ie7.css
@@ -17,6 +17,55 @@
 
 /* Edit ******************************************************************************************/
 
+<<<<<<< .working
+=======
+#part-skin-list,
+#part-skin-current
+{
+	margin-bottom                    : 20px;
+}
+
+#skin-search-form
+{
+	left                             : 300px;
+}
+
+#part-skin-list .section .preview,
+#part-skin-current .section .preview
+{
+	float                            : left;
+	position                         : static;
+}
+
+#part-skin-current #currentInfo
+{
+	margin-top                       : 200px;
+}
+
+#part-skin-list #iconview-box .section .information .title-line
+{
+	position                         : relative;
+	top                              : 160px;
+	left                             : -158px;
+	width                            : 160px;
+	clear                            : both;
+	margin                           : 0 !important;
+	padding                          : 0 !important;
+	background-color                 : #EFEFEF;
+}
+
+#search-box
+{
+	top                              : -4px !important;
+}
+
+#viewmode-box
+{
+	top                              : -4px !important;
+}
+/* Edit ******************************************************************************************/
+
+>>>>>>> .merge-right.r6058
 #part-skin-edit .section ul
 {
 	height                           : 401px;
@@ -50,3 +99,31 @@
 {
 	padding                          : 0;
 }
+
+#part-skin-current .information dt,
+#part-skin-list .information dt
+{
+	top                              : -4px;
+	margin-left                      : 0 !important;
+}
+
+#part-skin-list .information dl
+{
+	left:-150px;
+}
+
+#part-skin-current .section .information .button-box .edit-button
+{
+	left                             : 42px;
+	position                         : absolute;
+	top                              : -33px;
+	width                            : 60px;
+}
+
+#part-skin-current .section .information .button-box .setting-button
+{
+	left                             : 122px;
+	position                         : absolute;
+	top                              : -33px;
+	width                            : 60px;
+}
diff --git a/style/admin/swallow/basic.css b/style/admin/swallow/basic.css
index 5ea64eed4..2917ba8db 100644
--- a/style/admin/swallow/basic.css
+++ b/style/admin/swallow/basic.css
@@ -510,7 +510,6 @@ h2.caption span
 	overflow: hidden;
 	padding-left: 10px;
 }
-
 .tabs-box li
 {
 	background-color: #EFEFEF;
diff --git a/style/admin/swallow/center.css b/style/admin/swallow/center.css
index 25e80b667..ba4845109 100644
--- a/style/admin/swallow/center.css
+++ b/style/admin/swallow/center.css
@@ -17,10 +17,15 @@
 #part-center-dashboard,
 #part-center-lint
 {
-	height                           : 480px;
+	height                           : 440px;
 	position                         : relative;
 }
 
+#part-center-dashboard h2
+{
+	display                          : none;
+}
+
 #part-center-dashboard .section h3,
 #part-center-lint .section h3
 {
@@ -37,7 +42,7 @@
 {
 	position                         : absolute;
 	left                             : 10px;
-	top                              : 40px;
+	top                              : 0;
 	width                            : 200px;
 }
 
@@ -105,7 +110,7 @@
 
 	position                         : absolute;
 	left                             : 10px;
-	top                              : 280px;
+	top                              : 240px;
 	width                            : 410px;
 }
 
@@ -145,7 +150,7 @@
 	width                            : 505px;
 	position                         : absolute;
 	right                            : 20px;
-	top                              : 40px;
+	top                              : 0;
 }
 
 #part-center-dashboard #myBlogInfo.section h3
@@ -165,7 +170,7 @@
 #part-center-dashboard #infoPanel
 {
 	border                           : 1px solid #d9dde0;
-	margin-top: 10px;
+	margin-top                       : 10px;
 	padding                          : 9px;
 	width                            : 485px;
 	float                            : right;
diff --git a/style/admin/swallow/skin.css b/style/admin/swallow/skin.css
index 35b7fbc48..6558b9d0d 100644
--- a/style/admin/swallow/skin.css
+++ b/style/admin/swallow/skin.css
@@ -9,75 +9,134 @@
 
 /* Select ****************************************************************************************/
 
-#part-skin-list .section,
-#part-skin-current .section
+#part-skin-current,
+#part-skin-list
 {
-	clear                            : both;
-	margin-bottom                    : 20px;
-	position                         : relative;
+	float                            : left;
 }
 
-#part-skin-list .section .preview,
+#part-skin-current,
+#part-skin-current .data-inbox
+{
+	width                            : 240px;
+	margin                           : 0;
+	padding                          : 0;
+}
+
+#part-skin-list,
+#part-skin-list .data-inbox
+{
+	width                            : 695px;
+}
+
+#part-skin-list
+{
+	padding-left                     : 15px;
+}
+
+/*********** Current Skin ***********/
+
 #part-skin-current .section .preview
 {
 	border                           : 1px solid #BBBBBB;
 	padding                          : 3px;
-	/*float                            : left;*/
-	position                         : absolute;
 	width                            : 150px;
+	margin                           : 0 auto;
 }
 
-#part-skin-list .section .preview img,
-#part-skin-current .section .preview img
+#part-skin-current .section .information
 {
-	vertical-align                   : top;
+	margin-left                      : 0;
 }
 
-#part-skin-list .section .information,
-#part-skin-current .section .information
+#part-skin-current #currentInfo
 {
-	margin-left                      : 190px;
+	margin-top                       : 40px;
 }
 
-#part-skin-list .section .information table,
-#part-skin-current .section .information table
+#part-skin-current .information .explain-line .name,
+#part-skin-current .information .title-line .name,
+#part-skin-list .information .explain-line .name,
+#part-skin-list .information .title-line .name
 {
-	width                            : 750px;
+	display                          : none;
 }
 
-#part-skin-list .section .information table tr td,
-#part-skin-current .section .information table tr td
+#part-skin-current .information .explain-line .explain,
+#part-skin-current .information .title-line .explain,
+#part-skin-list .information .explain-line .explain,
+#part-skin-list .information .title-line .explain
 {
-	background-image                 : url("./image/bg_tbody.gif");
-	background-position              : left bottom;
-	padding                          : 8px;
+	padding-left                     : 0;
+	margin-left                      : 0;
 }
 
-#part-skin-list .section .information table tr td.name,
-#part-skin-current .section .information table tr td.name
+#part-skin-current .information .title-line .explain
 {
-	background-position              : right bottom;
 	font-weight                      : bold;
-	text-align                       : right;
-	width                            : 100px;
+	text-align                       : center;
+	background-color                 : #EFEFEF;
+	border-bottom                    : 1px solid #DDD;
+}
+#part-skin-list .information .title-line .explain
+{
+	font-weight                      : bold;
+	text-align                       : center;
+	background-color                 : #EFEFEF;
+	border-bottom                    : 1px solid #DDD;
 }
 
-#part-skin-list .section .information table tr.title-line td.explain .version,
-#part-skin-current .section .information table tr.title-line td.explain .version
+#part-skin-list .information .title-line .explain
 {
-	padding-left                     : 10px;
+	margin-left                      : 0 !important;
+}
+
+#part-skin-current .information dt
+{
+	width                            : 60px;
 }
 
-#part-skin-list .section .information table tr.explain-line td.name,
-#part-skin-current .section .information table tr.explain-line td.name
+#part-skin-current .section .information .button-box .edit-button
 {
-	background-position              : right top;
+	left                             : 42px;
+	position                         : absolute;
+	top                              : 170px;
+	width                            : 60px;
 }
 
-#part-skin-list .section .information table tr.explain-line td.explain,
-#part-skin-current .section .information table tr.explain-line td.explain
+#part-skin-current .section .information .button-box .setting-button
 {
-	background-position              : left top;
+	left                             : 122px;
+	position                         : absolute;
+	top                              : 170px;
+	width                            : 60px;
+}
+
+/*********** Skin list (general) ************/
+#part-skin-list .section .preview
+{
+	border                           : 1px solid #BBBBBB;
+	padding                          : 3px;
+	float                            : left;
+	width                            : 150px;	
+}
+
+#part-skin-list .section,
+#part-skin-current .section
+{
+	margin-bottom                    : 20px;
+	position                         : relative;
+}
+
+#part-skin-list .section .preview img,
+#part-skin-current .section .preview img
+{
+	vertical-align                   : top;
+}
+
+#part-skin-list .section .information
+{
+	margin-left                      : 0;
 }
 
 #part-skin-list .section .information .button-box a,
@@ -94,30 +153,59 @@
 	vertical-align                   : middle;
 }
 
-#customizedTable
+#part-skin-current .information dd
 {
-	height                           : 200px;
+	margin-left                      : 65px;
 }
 
-#part-skin-current .section .information .button-box .edit-button
+/*********** List view ************/
+#part-skin-list #listview-box .section
+{
+	width                            : 650px;
+	min-height                       : 185px;
+	border                           : 1px dotted #EEE;
+	margin-right                     : 15px;
+	padding                          : 10px;
+}
+
+#part-skin-list #listview-box .information dt
 {
-	left                             : 42px;
-	position                         : absolute;
-	top                              : 170px;
 	width                            : 60px;
 }
 
-#part-skin-list .section .information .button-box .preview-button
+#part-skin-list #listview-box .information dd
 {
-	left                             : 5px;
+	width                            : 390px;
+}
+
+#part-skin-list #listview-box .section .information
+{
+	padding-left                     : 180px;
+	min-height                       : 180px;
+}
+
+#part-skin-list #listview-box .information dd
+{
+	margin-left                      : 70px;
+	border-bottom                    : 1px dotted #EEE;
+}
+#part-skin-list #listview-box .information .title-line .explain
+{
+	margin-left                      : 0;
+	width                            : 460px;
+}
+
+#part-skin-list #listview-box .section .information .button-box .preview-button
+{
+	left                             : 15px;
 	position                         : absolute;
 	top                              : 170px;
 	width                            : 60px;
 }
 
-#part-skin-list .section .information .button-box .apply-button
+#part-skin-list #listview-box .section .information .button-box .apply-button
 {
-	left                             : 82px;
+	left                             : 92px;
 	position                         : absolute;
 	top                              : 170px;
 	width                            : 60px;
@@ -139,23 +227,97 @@
 	margin-bottom                    : 100px;
 }
 
+.list-divider
+{
+	height                           : 20px !important;
+}
+
+/*********** Icon view ************/
+#part-skin-list #iconview-box .section
+{
+	width                            : 160px;
+	height                           : 230px;
+	float                            : left;
+	border                           : 1px dotted #EEE;
+	margin-right                     : 10px;
+}
+
+#part-skin-list #iconview-box .section .information
+{
+	padding-left                     : 0;
+	min-height                       : 180px;
+}
+
+#part-skin-list #iconview-box .section .information .license-line,
+#part-skin-list #iconview-box .section .information .maker-line,
+#part-skin-list #iconview-box .section .information .homepage-line,
+#part-skin-list #iconview-box .section .information .email-line,
+#part-skin-list #iconview-box .section .information .explain-line
+{
+	display                          : none;
+}
+
+#part-skin-list #iconview-box .section .information .title-line
+{
+	position                         : relative;
+	top                              : 0;
+	clear                            : both;
+	margin                           : 0;
+	padding                          : 0;
+	background-color                 : #EFEFEF;
+}
+
+#part-skin-list #iconview-box .section .information .button-box .preview-button
+{
+	left                             : 5px;
+	position                         : absolute;
+	top                              : 190px;
+	width                            : 60px;
+}
+
+#part-skin-list #iconview-box .section .information .button-box .apply-button
+{
+	left                             : 82px;
+	position                         : absolute;
+	top                              : 190px;
+	width                            : 60px;
+}
+
+/*********** Search form ************/
 #skin-search-form
 {
     background-color                 : transparent;
     border                           : none;
     margin                           : 0;
     position                         : relative;
-    left                             : 630px;
-    text-align                       : right;
+    left                             : 280px;
+    text-align                       : left;
     top                              : -36px;
-    width                            : 25em;
+    width                            : 40em;
     z-index                          : 1;
 }
-   
-#skin-search-form label
+
+#skin-search-form .section label
 {
     display                          : none;
 }
+#search-box
+{
+	float                            : left;
+}
+
+#viewmode-box
+{
+	float                            : left;
+}
+#viewmode-box dd
+{
+	margin-left                      : 15px;
+}
+#part-skin-list .main-explain-box
+{
+	clear                            : left;
+}
 
 /* Edit ******************************************************************************************/
 
diff --git a/style/admin/swallow/skin.ie.css b/style/admin/swallow/skin.ie.css
index bec6a2e2b..a32ec8940 100644
--- a/style/admin/swallow/skin.ie.css
+++ b/style/admin/swallow/skin.ie.css
@@ -7,12 +7,43 @@
 {
 	border                           : 1px solid #FFFFFF;
 }
+#skin-search-form
+{
+	left                             : 300px;
+}
 
 #skin-search-form .input-button
 {
     line-height                      : 1.6em !important;
 }
 
+#skin-search-form input.input-text
+{
+	width                            : 150px !important;
+}
+
+#part-skin-current .information dt,
+#part-skin-list .information dt
+{
+	left                             : -60px;
+	margin-left                      : 0 !important;
+}
+
+#part-skin-current .information dt
+{
+	top                              : -4px;
+}
+
+#part-skin-list #listview-box .section
+{
+	height                           : 185px !important;
+}
+
+#search-box
+{
+	top                              : -4px !important;
+}
+
 /* Edit ******************************************************************************************/
 
 #part-skin-edit .section ul
diff --git a/style/admin/swallow/skin.ie7.css b/style/admin/swallow/skin.ie7.css
index 89dadc0df..5503ac09f 100644
--- a/style/admin/swallow/skin.ie7.css
+++ b/style/admin/swallow/skin.ie7.css
@@ -17,6 +17,55 @@
 
 /* Edit ******************************************************************************************/
 
+<<<<<<< .working
+=======
+#part-skin-list,
+#part-skin-current
+{
+	margin-bottom                    : 20px;
+}
+
+#skin-search-form
+{
+	left                             : 300px;
+}
+
+#part-skin-list .section .preview,
+#part-skin-current .section .preview
+{
+	float                            : left;
+	position                         : static;
+}
+
+#part-skin-current #currentInfo
+{
+	margin-top                       : 200px;
+}
+
+#part-skin-list #iconview-box .section .information .title-line
+{
+	position                         : relative;
+	top                              : 160px;
+	left                             : -158px;
+	width                            : 160px;
+	clear                            : both;
+	margin                           : 0 !important;
+	padding                          : 0 !important;
+	background-color                 : #EFEFEF;
+}
+
+#search-box
+{
+	top                              : -4px !important;
+}
+
+#viewmode-box
+{
+	top                              : -4px !important;
+}
+/* Edit ******************************************************************************************/
+
+>>>>>>> .merge-right.r6058
 #part-skin-edit .section ul
 {
 	height                           : 401px;
@@ -50,3 +99,31 @@
 {
 	padding                          : 0;
 }
+
+#part-skin-current .information dt,
+#part-skin-list .information dt
+{
+	top                              : -4px;
+	margin-left                      : 0 !important;
+}
+
+#part-skin-list .information dl
+{
+	left:-150px;
+}
+
+#part-skin-current .section .information .button-box .edit-button
+{
+	left                             : 42px;
+	position                         : absolute;
+	top                              : -33px;
+	width                            : 60px;
+}
+
+#part-skin-current .section .information .button-box .setting-button
+{
+	left                             : 122px;
+	position                         : absolute;
+	top                              : -33px;
+	width                            : 60px;
+}