diff --git a/admin/css/style.css b/admin/css/style.css
index e374a08f..782f01c3 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -134,6 +134,7 @@ textarea {
 
 textarea {
     resize: vertical;
+    line-height: 1.5;
 }
 
 input.text-s { padding: 5px; }
@@ -563,7 +564,7 @@ margin-top: 25px;
  * 后台分页
  */
 .typecho-pager {
-    margin-top: 20px;
+    margin-top: 30px;
     font-size: 1.14286em;
     text-align: center;
 }
@@ -578,6 +579,7 @@ margin-top: 25px;
 .typecho-pager ul {
     list-style: none;
     float: left;
+    margin: 0;
     padding: 0;
     zoom: 1;
 }
@@ -902,81 +904,48 @@ margin-top: 25px;
 /**
  * 标签页
  */
-.typecho-option-tabs, .typecho-editor-tab {
-    height: 30px;
-    zoom: 1;
-    border-bottom: 2px solid #C5D19D;
+.typecho-option-tabs {
+    list-style: none;
+    margin: 0 0 20px;
+    padding: 0;
 }
 
-.typecho-editor-tab {
-    background: none;
-}
-
-.typecho-option-tabs li, .typecho-editor-tab li {
-    float: left;
-    margin: 4px 0px 0px 5px;
+.typecho-option-tabs a {
+    display: block;
+    padding: 0 10px;
     height: 26px;
-    background: #e8eccd;
-    
-    -moz-border-radius-topleft: 3px;
-    -moz-border-radius-topright: 3px;
-    -webkit-border-top-left-radius: 3px;
-    -webkit-border-top-right-radius: 3px;
-    
-    /* hope IE support border radius, God save me! */
-    border-bottom-top-radius: 3px;
-    border-bottom-top-radius: 3px;
+    line-height: 26px;
+    border-radius: 3px;
+}
+.typecho-option-tabs a:hover {
+    background-color: #E9E9E6;
+    text-decoration: none;
+}
+
+.typecho-option-tabs li {
+    float: left;
+    margin-right: 10px;
 }
 
 .typecho-option-tabs li.right {
     float: right;
-    margin: 4px 5px 0px 0;
+    margin: 0 0 0 10px;
 }
 
-.typecho-editor-tab li {
-    float: right;
-    font-size: 13px;
-    font-weight: bold;
-    margin: 4px 0 0px 2px;
-    cursor: pointer;
-    padding: 0 15px;
-    border: 1px solid #F7FBE9;
-    border-bottom: none;
-    line-height: 24px;
-    color: #333;
-}
-
-.typecho-editor-tab li.current {
-    border: 1px solid #C1CD94;
-    border-bottom: none;
-    background: #D3DBB3;
-}
-
-.typecho-editor-tab li.loading {
-    padding-left: 32px;
-    background-image: url(../images/ajax-loader.gif);
-    background-position: 8px 4px;
-    background-repeat: no-repeat;
+.typecho-option-tabs li.current a {
+    background-color: #E6E6E3;
+    color: #666;
 }
 
 .typecho-option-tabs li:hover, .typecho-option-tabs li.current {
-    background: #C5D19D;
 }
 
 .typecho-option-tabs li a:link, .typecho-option-tabs li a:visited {
-    display: block;
-    outline: none;
-    color: #333;
-    text-decoration: none;
-    padding: 3px 15px;
 }
 
 /**
  * 表格列表页
  */
-.typecho-article-list {
-    margin-top: 25px;
-}
 
 /**
  * 列表页选项
@@ -1033,7 +1002,6 @@ margin-top: 25px;
 
 .typecho-list-operate span.operate-delete, a.operate-delete {
     color: #CC0000;
-    font-weight: bold;
 }
 
 a.operate-edit {
@@ -1058,6 +1026,7 @@ a.operate-reply {
 /** 增加表格标题 by 70 */
 .typecho-list-table-title {
     color: #999;
+    text-align: center;
 }
 
 .typecho-list-table {
@@ -1066,6 +1035,10 @@ a.operate-reply {
     background: #FFF;
 }
 
+.typecho-list-table.deactivate {
+    color: #999;
+}
+
 .typecho-list-table .right {
     text-align: right;
 }
@@ -1364,72 +1337,54 @@ ul.typecho-list-notable li .loading {
  * 模板列表
  */
 .typecho-theme-list {
-    border-collapse: separate;
-    border-spacing: 0;
-    border-top: 1px solid #CAD7A2;
-    border-bottom: 1px solid #CAD7A2;
-} 
+}
+
+.typecho-theme-list .theme-item {
+}
 
 .typecho-theme-list td {
-    line-height: 20px;
-    vertical-align: top;
-    padding: 10px 5px;
 }
 
 .typecho-theme-list td.border-right {
-    border-right: 1px solid #CAD7A2;
 }
 
 .typecho-theme-list td.border-bottom {
-    border-bottom: 1px solid #CAD7A2;
 }
 
 .typecho-theme-list img {
-    background: #FFF;
-    padding: 2px;
-    margin: 0 15px 0 5px;
-    float: left;
+    margin: 1em 0;
+    max-width: 100%;
+    max-height: 240px;
+}
+
+.typecho-theme-list cite {
+    font-style: normal;
+    color: #999;
 }
 
 .typecho-theme-list p {
-    padding: 5px 0;
-    font-size: 13px;
+}
+
+.typecho-theme-list .theme-action {
 }
 
 .typecho-theme-list .activate, .typecho-theme-list .edit {
-    display: none;
 }
 
 .typecho-theme-list h4 {
-    font-weight: bold;
 }
 
 .typecho-theme-list tbody tr:hover td {
-    background: none;
 }
 
-.typecho-theme-list tbody tr td.current, .typecho-theme-list tbody tr td:hover {
-    background: #e3eebd;
+.typecho-theme-list tbody tr.current td {
+    background-color: #FFF9E8;
 }
 
 .typecho-theme-list tbody tr td:hover .activate, .typecho-theme-list tbody tr td:hover .edit {
-    display: block;
-    position: absolute;
-    background: #BD6800;
-    color: #fff;
-    height: 24px;
-    line-height: 24px;
-    padding: 0 5px;
-    font-weight: bold;
-    white-space: nowrap;
-    opacity:0.8;
-    -ms-filter:'alpha(opacity=80)';
-    filter:alpha(opacity=80);
 }
 
 .typecho-theme-list tbody tr td:hover a.activate:hover, .typecho-theme-list tbody tr td:hover a.edit:hover {
-    background: #D29B51;
-    text-decoration: none;
 }
 
 /**
@@ -1588,53 +1543,39 @@ ul.typecho-list-notable li .loading {
  */
 
 .typecho-edit-theme ul {
-    width: 150px;
-    float: left;
-    padding: 10px 0px 10px 10px;
+    list-style: none;
+    margin: 0;
+    padding: 0;
 }
 
 .typecho-edit-theme li {
-    line-height: 25px;
-	height: 25px;
-    margin-bottom: 5px;
-    font-size: 11px;
-	text-align: right;
-    padding: 0px 10px 0px 0px;
+    padding: 3px 10px;
 }
 
 .typecho-edit-theme li a:link, .typecho-edit-theme li a:visited {
-    color: #333;
-    display: block;
 }
 
 .typecho-edit-theme li a:hover {
-    text-decoration: none;
 }
 
 .typecho-edit-theme .current {
-    background: #DEE4C5;
-    -moz-border-radius-topleft: 3px;
-    -moz-border-radius-bottomleft: 3px;
-    -webkit-border-top-left-radius: 3px;
-    -webkit-border-bottom-left-radius: 3px;
-    
-    /* hope IE support border radius, God save me! */
-    border-top-left-radius: 3px;
-    border-bottom-left-radius: 3px;
+    background-color: #E6E6E3;
+}
+.typecho-edit-theme .current a {
+    color: #444;
 }
 
 .typecho-edit-theme .content {
-    width: 780px;
-    float: left;
-    padding: 10px 10px 10px 0px;
 }
 
 .typecho-edit-theme .submit {
-    margin: 20px 0 20px 0;
     text-align: center;
 }
 
 .typecho-edit-theme textarea {
+    font-size: .92857em;
+    line-height: 1.2;
+    height: 500px;
 }
 
 /**
@@ -1642,7 +1583,6 @@ ul.typecho-list-notable li .loading {
  */
 
 .typecho-post-area {
-    margin-bottom: 15px;
 }
 
 .typecho-post-area label.typecho-label {
diff --git a/admin/manage-comments.php b/admin/manage-comments.php
index ab135afa..cf6570b4 100644
--- a/admin/manage-comments.php
+++ b/admin/manage-comments.php
@@ -11,7 +11,7 @@ $comments = Typecho_Widget::widget('Widget_Comments_Admin');
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
             <div class="col-12 typecho-list">
-                <ul class="typecho-option-tabs">
+                <ul class="typecho-option-tabs clearfix">
                     <li<?php if(!isset($request->status) || 'approved' == $request->get('status')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-comments.php'
                     . (isset($request->cid) ? '?cid=' . $request->cid : '')); ?>"><?php _e('已通过'); ?></a></li>
                     <li<?php if('waiting' == $request->get('status')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-comments.php?status=waiting'
diff --git a/admin/manage-metas.php b/admin/manage-metas.php
index 92de8044..e1739340 100644
--- a/admin/manage-metas.php
+++ b/admin/manage-metas.php
@@ -9,7 +9,7 @@ include 'menu.php';
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main manage-metas">
                 <div class="col-8 suffix">
-                    <ul class="typecho-option-tabs">
+                    <ul class="typecho-option-tabs clearfix">
                         <li<?php if(!isset($request->type) || 'category' == $request->get('type')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-metas.php'); ?>"><?php _e('分类'); ?></a></li>
                         <li<?php if('tag' == $request->get('type')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-metas.php?type=tag'); ?>"><?php _e('标签'); ?></a></li>
                     </ul>
@@ -17,7 +17,7 @@ include 'menu.php';
                     <?php if(!isset($request->type) || 'category' == $request->get('type')): ?>
                     <?php Typecho_Widget::widget('Widget_Metas_Category_List')->to($categories); ?>
                     <form method="post" name="manage_categories" class="operate-form">
-                    <div class="typecho-list-operate">
+                    <div class="typecho-list-operate clearfix">
                         <div class="operate">
                         <input type="checkbox" class="typecho-table-select-all" />
                         <div class="btn-group btn-drop">
@@ -84,7 +84,7 @@ include 'menu.php';
                     <?php else: ?>
                     <?php Typecho_Widget::widget('Widget_Metas_Tag_Cloud', 'sort=mid&desc=0')->to($tags); ?>
                     <form method="post" name="manage_tags" class="operate-form">
-                    <div class="typecho-list-operate">
+                    <div class="typecho-list-operate clearfix">
                         <div class="operate">
                         <input type="checkbox" class="typecho-table-select-all" />
                         <div class="btn-group btn-drop">
diff --git a/admin/options-theme.php b/admin/options-theme.php
index 3c48223f..5e8aee58 100644
--- a/admin/options-theme.php
+++ b/admin/options-theme.php
@@ -8,12 +8,12 @@ include 'menu.php';
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <ul class="typecho-option-tabs">
-                <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
-                <li><a href="<?php $options->adminUrl('theme-editor.php'); ?>"><?php _e('编辑当前外观'); ?></a></li>
-                <li class="current"><a href="<?php $options->adminUrl('options-theme.php'); ?>"><?php _e('设置外观'); ?></a></li>
-            </ul>
-            <div class="col-12 start-02">
+            <div class="col-12 col-mb-12">
+                <ul class="typecho-option-tabs clearfix">
+                    <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
+                    <li><a href="<?php $options->adminUrl('theme-editor.php'); ?>"><?php _e('编辑当前外观'); ?></a></li>
+                    <li class="current"><a href="<?php $options->adminUrl('options-theme.php'); ?>"><?php _e('设置外观'); ?></a></li>
+                </ul>
                 <?php Typecho_Widget::widget('Widget_Themes_Config')->config()->render(); ?>
             </div>
         </div>
diff --git a/admin/plugins.php b/admin/plugins.php
index 1e71d231..40c51d4d 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -10,7 +10,7 @@ include 'menu.php';
             <div class="col-12 typecho-list">
                 <?php Typecho_Widget::widget('Widget_Plugins_List_Activated')->to($activatedPlugins); ?>
                 <?php if ($activatedPlugins->have()): ?>
-                <h4 class="typecho-list-table-title"><?php _e('激活的插件'); ?></h4>
+                <!--<h4 class="typecho-list-table-title"><?php _e('激活的插件'); ?></h4>-->
                 <table class="typecho-list-table">
                     <colgroup>
                         <col width="25%"/>
@@ -45,7 +45,7 @@ include 'menu.php';
                                     <?php if ($activatedPlugins->activated): ?>
                                         <?php if ($activatedPlugins->config): ?>
                                             <a href="<?php $options->adminUrl('options-plugin.php?config=' . $activatedPlugins->name); ?>"><?php _e('设置'); ?></a> 
-                                            | 
+                                            &bull; 
                                         <?php endif; ?>
                                         <a lang="<?php _e('你确认要禁用插件 %s 吗?', $activatedPlugins->name); ?>" href="<?php $options->index('/action/plugins-edit?deactivate=' . $activatedPlugins->name); ?>"><?php _e('禁用'); ?></a>
                                     <?php else: ?>
diff --git a/admin/theme-editor.php b/admin/theme-editor.php
index d115b6ea..35dafc0a 100644
--- a/admin/theme-editor.php
+++ b/admin/theme-editor.php
@@ -10,8 +10,8 @@ Typecho_Widget::widget('Widget_Themes_Files')->to($files);
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12">
-                <ul class="typecho-option-tabs">
+            <div class="col-12 col-mb-12">
+                <ul class="typecho-option-tabs clearfix">
                     <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
                     <li class="current"><a href="<?php $options->adminUrl('theme-editor.php'); ?>">
                     <?php if ($options->theme == $files->theme): ?>
@@ -24,31 +24,30 @@ Typecho_Widget::widget('Widget_Themes_Files')->to($files);
                     <li><a href="<?php $options->adminUrl('options-theme.php'); ?>"><?php _e('设置外观'); ?></a></li>
                     <?php endif; ?>
                 </ul>
+            </div>
                 
-                <div class="typecho-edit-theme">
-                    <div>
-                        <ul>
-                            <?php while($files->next()): ?>
-                            <li<?php if($files->current): ?> class="current"<?php endif; ?>>
-                            <a href="<?php $options->adminUrl('theme-editor.php?theme=' . $files->currentTheme() . '&file=' . $files->file); ?>"><?php $files->file(); ?></a></li>
-                            <?php endwhile; ?>
-                        </ul>
-                        <div class="content">
-                        <form method="post" name="theme" id="theme" action="<?php $options->index('/action/themes-edit'); ?>">
-                            <textarea name="content" id="content" <?php if(!$files->currentIsWriteable()): ?>readonly<?php endif; ?>><?php echo $files->currentContent(); ?></textarea>
-                            <div class="submit">
-                                <?php if($files->currentIsWriteable()): ?>
-                                <input type="hidden" name="theme" value="<?php echo $files->currentTheme(); ?>" />
-                                <input type="hidden" name="edit" value="<?php echo $files->currentFile(); ?>" />
-                                <button type="submit"><?php _e('保存文件'); ?></button>
-                                <?php else: ?>
-                                    <h6 class="typecho-list-table-title"><?php _e('此文件无法写入'); ?></h6>
-                                <?php endif; ?>
-                            </div>
-                        </form>
-                        </div>
-                    </div>
+            <div class="typecho-edit-theme">
+                <div class="col-9 content">
+                    <form method="post" name="theme" id="theme" action="<?php $options->index('/action/themes-edit'); ?>">
+                        <textarea name="content" id="content" class="w-100 mono" <?php if(!$files->currentIsWriteable()): ?>readonly<?php endif; ?>><?php echo $files->currentContent(); ?></textarea>
+                        <p class="submit">
+                            <?php if($files->currentIsWriteable()): ?>
+                            <input type="hidden" name="theme" value="<?php echo $files->currentTheme(); ?>" />
+                            <input type="hidden" name="edit" value="<?php echo $files->currentFile(); ?>" />
+                            <button type="submit"><?php _e('保存文件'); ?></button>
+                            <?php else: ?>
+                                <em><?php _e('此文件无法写入'); ?></em>
+                            <?php endif; ?>
+                        </p>
+                    </form>
                 </div>
+                <ul class="col-3">
+                    <li><strong>模板文件</strong></li>
+                    <?php while($files->next()): ?>
+                    <li<?php if($files->current): ?> class="current"<?php endif; ?>>
+                    <a href="<?php $options->adminUrl('theme-editor.php?theme=' . $files->currentTheme() . '&file=' . $files->file); ?>"><?php $files->file(); ?></a></li>
+                    <?php endwhile; ?>
+                </ul>
             </div>
         </div>
     </div>
diff --git a/admin/themes.php b/admin/themes.php
index e72b1195..9072a1b7 100644
--- a/admin/themes.php
+++ b/admin/themes.php
@@ -8,8 +8,8 @@ include 'menu.php';
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12">
-                <ul class="typecho-option-tabs">
+            <div class="col-12 col-mb-12">
+                <ul class="typecho-option-tabs clearfix">
                     <li class="current"><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
                     <li><a href="<?php $options->adminUrl('theme-editor.php'); ?>"><?php _e('编辑当前外观'); ?></a></li>
                     <?php if (Widget_Themes_Config::isExists()): ?>
@@ -19,37 +19,37 @@ include 'menu.php';
                 
                 <table class="typecho-list-table typecho-theme-list" cellspacing="0" cellpadding="0">
                     <colgroup>
-                        <col width="450"/>
-                        <col width="450"/>
+                        <col width="35%" />
+                        <col />
                     </colgroup>
-                    <?php Typecho_Widget::widget('Widget_Themes_List')->to($themes); ?>
-                    <?php while($themes->next()): ?>
-                    <?php $themes->alt('<tr>', ''); ?>
-                    <?php
-                    $borderBottom = ($themes->length - $themes->sequence >= ($themes->length % 2 ? 1 : 2));
-                    ?>
-                    <td id="theme-<?php $themes->name(); ?>" class="<?php if($themes->activated): ?>current <?php endif; $themes->alt('border-right', ''); if ($borderBottom): echo ' border-bottom'; endif; ?>">
-                        <div class="col-2">
-                            <img src="<?php $themes->screen(); ?>" width="120" height="90" align="left" />
-                        </div>
-                        <div class="col-4">
-                        <h4><?php '' != $themes->title ? $themes->title() : $themes->name(); ?></h4>
-                        <cite><?php if($themes->author): ?><?php _e('作者'); ?>: <?php if($themes->homepage): ?><a href="<?php $themes->homepage() ?>"><?php endif; ?><?php $themes->author(); ?><?php if($themes->homepage): ?></a><?php endif; ?>&nbsp;&nbsp;&nbsp;<?php endif; ?>
-                        <?php if($themes->version): ?><?php _e('版本'); ?>: <?php $themes->version() ?><?php endif; ?>
-                        </cite>
-                        <p><?php echo nl2br($themes->description); ?></p>
-                        </div>
-                        <?php if($options->theme != $themes->name): ?>
-                            <a class="edit" href="<?php $options->adminUrl('theme-editor.php?theme=' . $themes->name); ?>"><?php _e('编辑'); ?></a>
-                            <a class="activate" href="<?php $options->index('/action/themes-edit?change=' . $themes->name); ?>"><?php _e('激活'); ?></a>
-                        <?php endif; ?>
-                    </td>
-                    <?php $last = $themes->sequence; ?>
-                    <?php $themes->alt('', '</tr>'); ?>
-                    <?php endwhile; ?>
-                    <?php if($last % 2): ?>
-                    <td>&nbsp;</td></tr>
-                    <?php endif; ?>
+                    
+                    <thead>
+                        <th>截图</th>
+                        <th>详情</th>
+                    </thead>
+
+                    <tbody>
+                        <?php Typecho_Widget::widget('Widget_Themes_List')->to($themes); ?>
+                        <?php while($themes->next()): ?>
+                        <tr id="theme-<?php $themes->name(); ?>" class="<?php if($themes->activated): ?>current<?php endif; ?>">
+                            <td valign="top"><img src="<?php $themes->screen(); ?>" alt="<?php $themes->name(); ?>" /></td>
+                            <td valign="top">
+                                <h3><?php '' != $themes->title ? $themes->title() : $themes->name(); ?></h3>
+                                <cite>
+                                    <?php if($themes->author): ?><?php _e('作者'); ?>: <?php if($themes->homepage): ?><a href="<?php $themes->homepage() ?>"><?php endif; ?><?php $themes->author(); ?><?php if($themes->homepage): ?></a><?php endif; ?> &nbsp;&nbsp;<?php endif; ?>
+                                    <?php if($themes->version): ?><?php _e('版本'); ?>: <?php $themes->version() ?><?php endif; ?>
+                                </cite>
+                                <p><?php echo nl2br($themes->description); ?></p>
+                                <?php if($options->theme != $themes->name): ?>
+                                    <p>
+                                        <a class="edit" href="<?php $options->adminUrl('theme-editor.php?theme=' . $themes->name); ?>"><?php _e('编辑'); ?></a> &nbsp;
+                                        <a class="activate" href="<?php $options->index('/action/themes-edit?change=' . $themes->name); ?>"><?php _e('激活'); ?></a>
+                                    </p>
+                                <?php endif; ?>
+                            </td>
+                        </tr>
+                        <?php endwhile; ?>
+                    </tbody>
                 </table>
             </div>
         </div>