diff --git a/author.ftl b/author.ftl
deleted file mode 100644
index f233532..0000000
--- a/author.ftl
+++ /dev/null
@@ -1,54 +0,0 @@
-{{!< default}}
-{{!-- The tag above means - insert everything in this file into the {body} of the default.hbs template --}}
-
-{{#author}}
-{{!-- Everything inside the #author tags pulls data from the author --}}
-<header class="site-header outer {{#if cover_image}}" style="background-image: url({{cover_image}}){{else}}no-cover{{/if}}">
-    <div class="inner">
-        {{> "site-nav"}}
-        <div class="site-header-content">
-            {{#if profile_image}}
-                <img class="author-profile-image" src="{{profile_image}}" alt="{{name}}" />
-            {{/if}}
-            <h1 class="site-title">{{name}}</h1>
-            {{#if bio}}
-                <h2 class="author-bio">{{bio}}</h2>
-            {{/if}}
-            <div class="author-meta">
-                {{#if location}}
-                    <div class="author-location">{{location}} <span class="bull">&bull;</span></div>
-                {{/if}}
-                <div class="author-stats">
-                    {{plural ../pagination.total empty='No posts' singular='% post' plural='% posts'}} <span class="bull">&bull;</span>
-                </div>
-                {{#if website}}
-                    <a class="social-link social-link-wb" href="{{website}}" target="_blank" rel="noopener">{{> "icons/website"}}</a>
-                {{/if}}
-                {{#if twitter}}
-                    <a class="social-link social-link-tw" href="{{twitter_url}}" target="_blank" rel="noopener">{{> "icons/twitter"}}</a>
-                {{/if}}
-                {{#if facebook}}
-                    <a class="social-link social-link-fb" href="{{facebook_url}}" target="_blank" rel="noopener">{{> "icons/facebook"}}</a>
-                {{/if}}
-                <a class="social-link social-link-rss" href="https://feedly.com/i/subscription/feed/{{url absolute="true"}}rss/" target="_blank" rel="noopener">{{> "icons/rss"}}</a>
-            </div>
-        </div>
-    </div>
-</header>
-{{/author}}
-
-{{!-- The main content area --}}
-<main id="site-main" class="site-main outer">
-    <div class="inner">
-
-        <div class="post-feed">
-            {{#foreach posts}}
-
-                {{!-- The tag below includes the markup for each post - partials/post-card.hbs --}}
-                {{> "post-card"}}
-
-            {{/foreach}}
-        </div>
-
-    </div>
-</main>
diff --git a/module/options.ftl b/module/options.ftl
index f8f52fc..0c0beda 100644
--- a/module/options.ftl
+++ b/module/options.ftl
@@ -67,6 +67,12 @@
                                         </label>
                                     </div>
                                 </div>
+                                <div class="form-group">
+                                    <label for="casperGeneralLocation" class="col-sm-4 control-label">所在地：</label>
+                                    <div class="col-sm-8">
+                                        <input type="text" class="form-control" id="casperGeneralLocation" name="casper_general_location" value="${options.casper_general_location?if_exists}" >
+                                    </div>
+                                </div>
                             </div>
                             <div class="box-footer">
                                 <button type="button" class="btn btn-primary btn-sm pull-right" onclick="saveThemeOptions('casperGeneralOptions')">保存设置</button>
diff --git a/page.ftl b/page.ftl
index abb70d1..07e71e8 100644
--- a/page.ftl
+++ b/page.ftl
@@ -15,7 +15,7 @@ into the {body} of the default.hbs template -->
 <main id="site-main" class="site-main outer">
     <div class="inner">
 
-        <article class="post-full post page {{#unless feature_image}}no-image{{/unless}}">
+        <article class="post-full post page <#if !post.postThumbnail??>no-image</#if>">
 
             <header class="post-full-header">
                 <h1 class="post-full-title">${post.postTitle}</h1>
diff --git a/page_author.ftl b/page_author.ftl
new file mode 100644
index 0000000..7616522
--- /dev/null
+++ b/page_author.ftl
@@ -0,0 +1,61 @@
+<#include "default.ftl">
+<@default title="${post.postTitle?if_exists} | ${options.blog_title}" keyword="${options.seo_keywords?if_exists}" desc="${options.seo_desc?if_exists}" canonical="${options.blog_url}/p/${post.postUrl?if_exists}" body_class="page-template">
+<#-- The tag above means - insert everything in this file into the {body} of the default.hbs template -->
+<#-- Everything inside the #author tags pulls data from the author -->
+<header class="site-header outer <#if options.casper_general_cover?default('/${themeName}/assets/images/blog-cover.jpg') != ''>" style="background-image: url(${options.casper_general_cover?default('/${themeName}/assets/images/blog-cover.jpg')})<#else>no-cover</#if>">
+    <div class="inner">
+        <#include "partials/site-nav.ftl">
+        <div class="site-header-content">
+            <img class="author-profile-image" src="${user.userAvatar?if_exists}" alt="${user.userDisplayName?if_exists}" />
+            <h1 class="site-title">${user.userDisplayName?if_exists}</h1>
+            <#if user.userDesc??>
+                <h2 class="author-bio">${user.userDesc?if_exists}</h2>
+            </#if>
+            <div class="author-meta">
+            <#if options.casper_general_location??>
+                <div class="author-location">${options.casper_general_location} <span class="bull">&bull;</span></div>
+            </#if>
+            <div class="author-stats">
+            <@articleTag method="postsCount">${postsCount}</@articleTag> 篇文章 <span class="bull">&bull;</span>
+            </div>
+            <a class="social-link social-link-rss" href="/atom.xml" target="_blank" rel="noopener"><#include "partials/icons/rss.ftl"></a>
+            </div>
+        </div>
+    </div>
+</header>
+
+
+<#-- The main content area -->
+<main id="site-main" class="site-main outer">
+    <div class="inner">
+
+        <article class="post-full post page no-image">
+
+            <header class="post-full-header">
+                <h1 class="post-full-title">${post.postTitle}</h1>
+            </header>
+
+            <section class="post-full-content">
+                <div class="post-content">
+                    ${post.postContent}
+                </div>
+            </section>
+
+            <section class="post-full-comments">
+            <#-- If you want to embed comments, this is a good place to do it! -->
+                <#include "module/comment.ftl">
+            </section>
+
+        </article>
+
+    </div>
+</main>
+</@default>
+<@scripts>
+    <script>
+        $(function() {
+            var $postContent = $(".post-full-content");
+            $postContent.fitVids();
+        });
+    </script>
+</@scripts>