diff --git a/.gitignore b/.gitignore
index cd0f9ed8..73f184b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 .*.swo
 ._*
 .DS_Store
-/Debug/
 /ImgCache/
 /Backup_rar/
 /Debug/
diff --git a/admin/css/style.css b/admin/css/style.css
index 7e84092d..15a27499 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -209,6 +209,11 @@ button {
     background-color: #c1605e;
     cursor: default; }
 
+.btn-text {
+  background: transparent; }
+  .btn-text:hover, .btn-text:active, .btn-text.active {
+    background: #F3F3F0; }
+
 /* 下拉菜单 */
 .btn-drop {
   position: relative; }
@@ -1022,6 +1027,8 @@ a.operate-reply {
   list-style: none;
   border: 1px solid #D9D9D6;
   padding: 6px 12px;
+  max-height: 240px;
+  overflow: auto;
   background-color: #FFF;
   border-radius: 2px; }
 
@@ -1103,7 +1110,8 @@ a.operate-reply {
 #file-list {
   list-style: none;
   margin: 0 10px;
-  padding: 0; }
+  padding: 0;
+  word-break: break-all; }
   #file-list li {
     padding: 8px 0;
     border-top: 1px dashed #D9D9D6; }
@@ -1118,6 +1126,9 @@ a.operate-reply {
   #file-list .info {
     text-transform: uppercase; }
 
+#btn-fullscreen-upload {
+  visibility: hidden; }
+
 /**
 * 附件管理
 */
@@ -1148,24 +1159,25 @@ a.operate-reply {
 /**
  * icons
  */
-.icon-sprite-hack {
-  background: url('../img/icons-s2ebed63329.png'); }
-
-.i-edit, .i-delete, .i-exlink, .mime-office, .mime-text, .mime-image, .mime-html, .mime-archive, .mime-application, .mime-audio, .mime-script, .mime-video, .mime-unknow {
+.i-edit, .i-delete, .i-upload, .i-exlink, .mime-office, .mime-text, .mime-image, .mime-html, .mime-archive, .mime-application, .mime-audio, .mime-script, .mime-video, .mime-unknow {
   width: 16px;
   height: 16px;
   display: inline-block;
   vertical-align: text-bottom;
-  background: url(../img/icons.png) no-repeat; }
-  .i-edit:hover, .i-delete:hover, .i-exlink:hover, .mime-office:hover, .mime-text:hover, .mime-image:hover, .mime-html:hover, .mime-archive:hover, .mime-application:hover, .mime-audio:hover, .mime-script:hover, .mime-video:hover, .mime-unknow:hover {
+  background: url('../img/icons-s93f9ba6074.png') no-repeat;
+  text-indent: -9999em; }
+  .i-edit:hover, .i-delete:hover, .i-upload:hover, .i-exlink:hover, .mime-office:hover, .mime-text:hover, .mime-image:hover, .mime-html:hover, .mime-archive:hover, .mime-application:hover, .mime-audio:hover, .mime-script:hover, .mime-video:hover, .mime-unknow:hover {
     filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=75);
     opacity: 0.75; }
 
 .i-edit {
-  background-position: 0 -32px; }
+  background-position: 0 -48px; }
 
 .i-delete {
-  background-position: 0 -16px; }
+  background-position: 0 -32px; }
+
+.i-upload {
+  background-position: 0 0; }
 
 .i-caret-up, .i-caret-down, .i-caret-left, .i-caret-right {
   display: inline-block;
@@ -1186,35 +1198,35 @@ a.operate-reply {
   border-width: 4px 3px 4px 5px; }
 
 .i-exlink {
-  background-position: 0 0; }
+  background-position: 0 -16px; }
 
 /* 文件类型图标 */
 .mime-office {
-  background-position: 0 -80px; }
+  background-position: 0 -96px; }
 
 .mime-text {
   background-position: 0 -176px; }
 
 .mime-image {
-  background-position: 0 -48px; }
+  background-position: 0 -64px; }
 
 .mime-html {
-  background-position: 0 -96px; }
+  background-position: 0 -112px; }
 
 .mime-archive {
   background-position: 0 -192px; }
 
 .mime-application {
-  background-position: 0 -112px; }
+  background-position: 0 -128px; }
 
 .mime-audio {
-  background-position: 0 -224px; }
+  background-position: 0 -208px; }
 
 .mime-script {
   background-position: 0 -144px; }
 
 .mime-video {
-  background-position: 0 -64px; }
+  background-position: 0 -80px; }
 
 .mime-unknow {
   background-position: 0 -160px; }
@@ -1350,7 +1362,7 @@ a.operate-reply {
     background: #F3F3F0;
     font-size: .92857em; }
   #wmd-preview code {
-    color: #B94A48; }
+    color: #C13; }
   #wmd-preview pre {
     padding: 1em; }
     #wmd-preview pre code {
@@ -1417,18 +1429,24 @@ a.operate-reply {
   margin: 0;
   padding: 10px 20px;
   border-bottom: 1px solid #F3F3F0; }
+.fullscreen #tab-files {
+  position: absolute;
+  top: 52px;
+  right: 20px;
+  width: 280px;
+  z-index: 1001; }
 .fullscreen .wmd-edittab,
 .fullscreen .typecho-post-option,
 .fullscreen .title,
 .fullscreen .url-slug,
 .fullscreen .typecho-page-title,
 .fullscreen .typecho-head-nav,
-.fullscreen .message,
-.fullscreen #upload-panel {
+.fullscreen .message {
   display: none; }
 .fullscreen .wmd-hidetab {
   display: block; }
-.fullscreen .wmd-visualhide {
+.fullscreen .wmd-visualhide,
+.fullscreen #btn-fullscreen-upload {
   visibility: visible; }
 
 /**
diff --git a/admin/img/icons-2x/icon-arrow-down-2x.png b/admin/img/icons-2x/icon-arrow-down-2x.png
deleted file mode 100644
index 1fefa5a0..00000000
Binary files a/admin/img/icons-2x/icon-arrow-down-2x.png and /dev/null differ
diff --git a/admin/img/icons-2x/icon-arrow-up-2x.png b/admin/img/icons-2x/icon-arrow-up-2x.png
deleted file mode 100644
index b7a7e475..00000000
Binary files a/admin/img/icons-2x/icon-arrow-up-2x.png and /dev/null differ
diff --git a/admin/img/icons-2x/icon-upload-2x.png b/admin/img/icons-2x/icon-upload-2x.png
new file mode 100644
index 00000000..fe50c19a
Binary files /dev/null and b/admin/img/icons-2x/icon-upload-2x.png differ
diff --git a/admin/img/icons-s2ebed63329.png b/admin/img/icons-s2ebed63329.png
deleted file mode 100644
index 1a21b00d..00000000
Binary files a/admin/img/icons-s2ebed63329.png and /dev/null differ
diff --git a/admin/img/icons-s93f9ba6074.png b/admin/img/icons-s93f9ba6074.png
new file mode 100644
index 00000000..91cae2f0
Binary files /dev/null and b/admin/img/icons-s93f9ba6074.png differ
diff --git a/admin/img/icons/icon-caret-down.png b/admin/img/icons/icon-caret-down.png
deleted file mode 100644
index 01459bb8..00000000
Binary files a/admin/img/icons/icon-caret-down.png and /dev/null differ
diff --git a/admin/img/icons/icon-caret-up.png b/admin/img/icons/icon-caret-up.png
deleted file mode 100644
index 69d8bb87..00000000
Binary files a/admin/img/icons/icon-caret-up.png and /dev/null differ
diff --git a/admin/img/icons/icon-upload.png b/admin/img/icons/icon-upload.png
new file mode 100644
index 00000000..d39fc572
Binary files /dev/null and b/admin/img/icons/icon-upload.png differ
diff --git a/admin/index.php b/admin/index.php
index 268fab1b..df51ba86 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -10,14 +10,14 @@ $stat = Typecho_Widget::widget('Widget_Stat');
         <?php include 'page-title.php'; ?>
         <div class="colgroup typecho-page-main">
             <div class="col-mb-12 welcome-board" role="main">
-                <p><?php _e('目前有 <em>%s</em> 篇日志, 并有 <em>%s</em> 条关于你的评论在 <em>%s</em> 个分类中.', 
+                <p><?php _e('目前有 <em>%s</em> 篇日志, 并有 <em>%s</em> 条关于你的评论在 <em>%s</em> 个分类中.',
                 $stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?>
                 <br><?php _e('使用下面的链接开始你的故事吧:'); ?></p>
-        
+
                 <ul id="start-link" class="clearfix">
                     <?php if($user->pass('contributor', true)): ?>
                     <li><a href="<?php $options->adminUrl('write-post.php'); ?>"><?php _e('撰写新文章'); ?></a></li>
-                    <?php if($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->waitingCommentsNum > 0): ?> 
+                    <?php if($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->waitingCommentsNum > 0): ?>
                         <li><a href="<?php $options->adminUrl('manage-comments.php?status=waiting'); ?>"><?php _e('待审核的评论'); ?></a>
                         <span class="balloon"><?php $stat->waitingCommentsNum(); ?></span>
                         </li>
@@ -26,7 +26,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                         <span class="balloon"><?php $stat->myWaitingCommentsNum(); ?></span>
                         </li>
                     <?php endif; ?>
-                    <?php if($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->spamCommentsNum > 0): ?> 
+                    <?php if($user->pass('editor', true) && 'on' == $request->get('__typecho_all_comments') && $stat->spamCommentsNum > 0): ?>
                         <li><a href="<?php $options->adminUrl('manage-comments.php?status=spam'); ?>"><?php _e('垃圾评论'); ?></a>
                         <span class="balloon"><?php $stat->spamCommentsNum(); ?></span>
                         </li>
@@ -37,6 +37,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                     <?php endif; ?>
                     <?php if($user->pass('administrator', true)): ?>
                     <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('更换外观'); ?></a></li>
+                    <li><a href="<?php $options->adminUrl('plugins.php'); ?>"><?php _e('插件管理'); ?></a></li>
                     <li><a href="<?php $options->adminUrl('options-general.php'); ?>"><?php _e('系统设置'); ?></a></li>
                     <?php endif; ?>
                     <?php endif; ?>
@@ -124,7 +125,7 @@ $(document).ready(function () {
         $.get('<?php $options->index('/action/ajax?do=feed'); ?>', function (o) {
             for (var i = 0; i < o.length; i ++) {
                 var item = o[i];
-                html += '<li><span>' + item.date + '</span> <a href="' + item.link + '" target="_blank">' + item.title 
+                html += '<li><span>' + item.date + '</span> <a href="' + item.link + '" target="_blank">' + item.title
                     + '</a></li>';
             }
 
@@ -135,9 +136,9 @@ $(document).ready(function () {
 
     function applyUpdate(update) {
         if (update.available) {
-            $('<div class="update-check"><p>' 
+            $('<div class="update-check"><p>'
                 + '<?php _e('您当前使用的版本是 %s'); ?>'.replace('%s', update.current) + '<br />'
-                + '<strong><a href="' + update.link + '" target="_blank">' 
+                + '<strong><a href="' + update.link + '" target="_blank">'
                 + '<?php _e('官方最新版本是 %s'); ?>'.replace('%s', update.latest) + '</a></strong></p></div>')
             .appendTo('.welcome-board').effect('highlight');
         }
diff --git a/admin/scss/_buttons.scss b/admin/scss/_buttons.scss
index 64dd2eb8..b547754b 100644
--- a/admin/scss/_buttons.scss
+++ b/admin/scss/_buttons.scss
@@ -65,6 +65,13 @@ button {
   color: #FFF;
 }
 
+.btn-text {
+  background: transparent;
+  &:hover, &:active, &.active {
+    background: #F3F3F0;
+  }
+}
+
 /* 下拉菜单 */
 .btn-drop {
   position: relative;
diff --git a/admin/scss/_icons.scss b/admin/scss/_icons.scss
index 1d146fe5..a04557ca 100644
--- a/admin/scss/_icons.scss
+++ b/admin/scss/_icons.scss
@@ -5,19 +5,13 @@
 $icons: sprite-map("icons/*.png");
 $icons-2x: sprite-map("icons-2x/*.png");
 
-.icon-sprite-hack {
-  background: $icons;
-}
-// .icon-2x-sprite-hack {
-//   background: $icons-2x;
-// }
-
 %i-16 {
   width: 16px;
   height: 16px;
   display: inline-block;
   vertical-align: text-bottom;
-  background: url(../img/icons.png) no-repeat;
+  background: $icons no-repeat;
+  text-indent: -9999em;
   &:hover {
     @include opacity(0.75);
   }
@@ -31,6 +25,10 @@ $icons-2x: sprite-map("icons-2x/*.png");
   @extend %i-16;
   background-position: sprite-position($icons, icon-delete);
 }
+.i-upload {
+  @extend %i-16;
+  background-position: sprite-position($icons, icon-upload);
+}
 
 // 小箭头
 .i-caret-up, .i-caret-down, .i-caret-left, .i-caret-right {
diff --git a/admin/scss/_mixin.scss b/admin/scss/_mixin.scss
deleted file mode 100644
index 52924c9a..00000000
--- a/admin/scss/_mixin.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@mixin calc($property, $expression) {
-  #{$property}: -moz-calc(#{$expression});
-  #{$property}: -webkit-calc(#{$expression});
-  #{$property}: calc(#{$expression});
-}
\ No newline at end of file
diff --git a/admin/scss/components/_editor.scss b/admin/scss/components/_editor.scss
index d3947337..01f775b4 100644
--- a/admin/scss/components/_editor.scss
+++ b/admin/scss/components/_editor.scss
@@ -108,7 +108,7 @@
     background: #F3F3F0;
     font-size: .92857em;
   }
-  code { color: #B94A48; }
+  code { color: #C13; }
   pre {
     padding: 1em;
     code {
@@ -183,16 +183,26 @@
     padding: 10px 20px;
     border-bottom: 1px solid #F3F3F0;
   }
+
+  // 全屏附件上传
+  #tab-files {
+    position: absolute;
+    top: 52px;
+    right: 20px;
+    width: 280px;
+    z-index: 1001;
+  }
+
   .wmd-edittab,
   .typecho-post-option,
   .title,
   .url-slug,
   .typecho-page-title,
   .typecho-head-nav,
-  .message,
-  #upload-panel { display: none; }
+  .message { display: none; }
   .wmd-hidetab { display: block; }
-  .wmd-visualhide {
+  .wmd-visualhide,
+  #btn-fullscreen-upload {
     visibility: visible;
   }
 }
\ No newline at end of file
diff --git a/admin/scss/style.scss b/admin/scss/style.scss
index a843cca2..71b6d44f 100644
--- a/admin/scss/style.scss
+++ b/admin/scss/style.scss
@@ -10,7 +10,6 @@
 */
 
 @import "compass";
-@import "mixin";
 
 /**
 * Typecho 全局样式
@@ -794,6 +793,8 @@ background: #FFF1A8;
   list-style: none;
   border: 1px solid #D9D9D6;
   padding: 6px 12px;
+  max-height: 240px;
+  overflow: auto;
   background-color: #FFF;
   border-radius: 2px;
 }
@@ -878,6 +879,7 @@ background: #FFF1A8;
   list-style: none;
   margin: 0 10px;
   padding: 0;
+  word-break: break-all;
   li {
     padding: 8px 0;
     border-top: 1px dashed #D9D9D6;
@@ -897,6 +899,10 @@ background: #FFF1A8;
   }
 }
 
+#btn-fullscreen-upload {
+  visibility: hidden;
+}
+
 
 /**
 * 附件管理
diff --git a/admin/write-js.php b/admin/write-js.php
index f7586856..5c5c6246 100644
--- a/admin/write-js.php
+++ b/admin/write-js.php
@@ -256,6 +256,13 @@ $(document).ready(function() {
 
         return false;
     });
+
+    // 全屏上传按钮控制
+    // $('#btn-fullscreen-upload').click(function() {
+    //     $(this).toggleClass('active');
+    //     $('#tab-files').toggle();
+    //     return false;
+    // });
 });
 </script>
 
diff --git a/admin/write-post.php b/admin/write-post.php
index 50e2b4a6..700524aa 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -46,6 +46,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
 
                     <p class="submit clearfix">
                         <span class="right">
+                            <!-- <button type="button" class="btn-text" id="btn-fullscreen-upload"><i class="i-upload"><?php _e('附件'); ?></i></button> -->
                             <input type="hidden" name="cid" value="<?php $post->cid(); ?>" />
                             <button type="submit" name="do" value="save" id="btn-save"><?php _e('保存草稿'); ?></button>
                             <button type="submit" name="do" value="publish" class="primary" id="btn-submit"><?php _e('发布文章'); ?></button>
diff --git a/var/Widget/Options.php b/var/Widget/Options.php
index 9d6e258a..3264840b 100644
--- a/var/Widget/Options.php
+++ b/var/Widget/Options.php
@@ -319,7 +319,7 @@ class Widget_Options extends Typecho_Widget
         if (NULL != $this->attachmentTypes) {
             $attachmentTypes = str_replace(
                 array('@image@', '@media@', '@doc@'), 
-                array('gif,jpg,png,tiff,bmp', 'mp3,wmv,wma,rmvb,rm,avi,flv',
+                array('gif,jpg,jpeg,png,tiff,bmp', 'mp3,wmv,wma,rmvb,rm,avi,flv',
                     'txt,doc,docx,xls,xlsx,ppt,pptx,zip,rar,pdf'), $this->attachmentTypes);
             
             $attachmentTypesResult = array_unique(array_map('trim', explode(',', $attachmentTypes)));
diff --git a/var/Widget/Options/General.php b/var/Widget/Options/General.php
index 5d0bced3..13ebef36 100644
--- a/var/Widget/Options/General.php
+++ b/var/Widget/Options/General.php
@@ -116,7 +116,7 @@ class Widget_Options_General extends Widget_Abstract_Options implements Widget_I
         }
         
         $attachmentTypesOptions = array(
-            '@image@'    =>  _t('图片文件') . ' <code>(gif jpg png tiff bmp)</code>',
+            '@image@'    =>  _t('图片文件') . ' <code>(gif jpg jpeg png tiff bmp)</code>',
             '@media@'    =>  _t('多媒体文件') . ' <code>(mp3 wmv wma rmvb rm avi flv)</code>',
             '@doc@'      =>  _t('常用档案文件') . ' <code>(txt doc docx xls xlsx ppt pptx zip rar pdf)</code>',
             '@other@'    =>  _t('其他格式 %s', ' <input type="text" class="w-50 text-s mono" name="attachmentTypesOther" value="' . htmlspecialchars($attachmentTypesOtherValue) . '" />'),
diff --git a/var/Widget/Upload.php b/var/Widget/Upload.php
index 629dfa8a..fbc06058 100644
--- a/var/Widget/Upload.php
+++ b/var/Widget/Upload.php
@@ -19,7 +19,7 @@
 class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface_Do
 {
     //上传文件目录
-    const UPLOAD_PATH = '/usr/uploads';
+    const UPLOAD_DIR = '/usr/uploads';
 
     /**
      * 创建上传路径
@@ -75,8 +75,8 @@ class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface
 
         $options = Typecho_Widget::widget('Widget_Options');
         $date = new Typecho_Date($options->gmtTime);
-        $path = Typecho_Common::url(self::UPLOAD_PATH, __TYPECHO_ROOT_DIR__)
-            . '/' . $date->year . '/' . $date->month;
+        $path = Typecho_Common::url(defined('__TYPECHO_UPLOAD_DIR__') ? __TYPECHO_UPLOAD_DIR__ : self::UPLOAD_DIR,
+            __TYPECHO_ROOT_DIR__) . '/' . $date->year . '/' . $date->month;
 
         //创建上传目录
         if (!is_dir($path)) {
@@ -112,7 +112,8 @@ class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface
         //返回相对存储路径
         return array(
             'name' => $file['name'],
-            'path' => self::UPLOAD_PATH . '/' . $date->year . '/' . $date->month . '/' . $fileName,
+            'path' => (defined('__TYPECHO_UPLOAD_DIR__') ? __TYPECHO_UPLOAD_DIR__ : self::UPLOAD_DIR) 
+                . '/' . $date->year . '/' . $date->month . '/' . $fileName,
             'size' => $file['size'],
             'type' => $ext,
             'mime' => Typecho_Common::mimeContentType($path)