diff --git a/ChangeLog.md b/ChangeLog.md
deleted file mode 100644
index ef6a102..0000000
--- a/ChangeLog.md
+++ /dev/null
@@ -1,61 +0,0 @@
-
-- 2021-1-8
-添加fancybox插件
-添加友情链接页面
-调整配置
-
-
-- 2021-1-7
-修复up酱在手机端文章页面显示错位的问题
-添加部分动画效果
-修复分类页不显示括号的问题的‘()’
-
-- 2021-1-5
-添加twikoo评论系统
-修复页面刷新后toc进度条清0的问题
-添加本地搜索(search插件)
-主题css、js资源url可自定义
-自定义引入外部js、css、等资源
-添加首页显示文章数
-修复当手机端打开导航栏菜单是屏幕大小有变化后，无法上下滚动浏览内容
-添加404页面
-调整部分字体在手机端显示过大的bug
-
-- 2021-1-4
-添加valine评论系统
-添加waline评论系统
-调整手机端页面样式
-添加手机端toc目录
-添加开/关首页是否显示cover图片
-添加文章页是否显示up酱
-添加主题配色
-配置文件添加CDN选项
-添加右侧选项、回到顶部、直达评论、手机端展开toc按钮
-调整up酱显示逻辑
-页面统计采用valine、waline自带的功能(待适配twikoo后也是如此)
-
-
-- 2021-1-3
-添加up酱(回到顶部)
-添加开/关toc滚动条
-添加css压缩
-
-- 2021-1-2
-调整css,从纯css调整到stylue预处理
-添加toc目录,优化a标签锚点滚动
-调整toc长度超出内容区(显示滚动条)
-toc目录进行宽度调整
-更新标签页、分类页、归档页
-标签页、分类页、归档页添加分页
-更新首页cover，不适应可以不写
-调整分页在手机端不对其的情况
-调整部分样式
-
-- 2021-1-1
-修复手机端代码块行号于代码不匹配bug
-调整手机端版权框显示问题
-调整手机端文章底部tag和social-share显示bug
-修复文章无tag时，文章底部显示icon图标的bug
-
-- 2020-12-31
-首发第一个版本1.0.0
\ No newline at end of file
diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index 537b86e..80e09a3 100644
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -5,7 +5,11 @@
             </div>
             <div class="post-description">
                 <p style="-webkit-line-clamp: <%- theme.post_content.line %>">
-                    <%- strip_html(post.content.substring(0, theme.post_content.length)) %>
+                    <%
+                        var content = strip_html(post.content)
+                        content = strip_html(content.substring(0, theme.post_content.length))
+                    %>
+                    <%- content %>
                 </p>
             </div>
             <% if (theme.cover){ %>
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
index 26a721c..d2fd9d1 100644
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@@ -3,6 +3,24 @@ var title = theme.title || config.title
 if(page.title!=null){
     title = page.title + ' | '+title
 }
+var keywords = '';
+if(page.tags!=null){
+    page.tags.forEach(function(tag, i){ 
+        keywords += tag.name+","
+    })
+    keywords = keywords.substring(0,keywords.length-1);
+}else{
+    var keywords = theme.keywords || config.keywords
+}
+
+var description = page.description
+if(description==null){
+    var content = strip_html(page.content)
+    description = content.substring(0, theme.post_content.length)
+}
+
+var url = config.url+"/"+page.path;
+
 %>
 <meta charset="utf-8">
 <meta http-equiv="content-language" content="<%-theme.language || config.language%>">
@@ -10,19 +28,19 @@ if(page.title!=null){
 <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">
 <title><%- title %></title>
 <link rel="icon" href="<%-theme.favicon%>">
-<meta name="keywords" content="<%- page.keywords || theme.keywords || config.keywords %>">
-<meta name="description" content="<%-theme.description || config.description%>" />
+<meta name="keywords" content="<%- keywords || theme.keywords || config.keywords %>">
+<meta name="description" content="<%- description || theme.description || config.description%>" />
 <meta property="site_name" content="<%- theme.title || config.title %>" />
 <meta property="og:type" content="website">
-<meta property="og:url" content="<%-config.url%>">
-<meta property="og:title" content="<%- theme.title || config.title %>" />
+<meta property="og:url" content="<%- url || config.url%>">
+<meta property="og:title" content="<%- title || theme.title || config.title %>" />
 <meta property="og:site_name" content="<%- theme.title || config.title %>" />
-<meta property="og:description" content="<%-theme.description || config.description%>" />
+<meta property="og:description" content="<%- description || theme.description || config.description%>" />
 <meta property="og:locale" content="<%-theme.language || config.language%>">
 <meta name="twitter:card" content="summary">
-<meta name="twitter:title" content="<%- theme.title || config.title %>">
-<meta name="twitter:description" content="<%-theme.description || config.description%>">
-<link rel="dns-prefetch" href="<%-config.url%>">
+<meta name="twitter:title" content="<%- title || theme.title || config.title %>">
+<meta name="twitter:description" content="<%-description || theme.description || config.description%>">
+<link rel="dns-prefetch" href="<%- url || config.url%>">
 
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free/css/all.min.css">
 <script src="https://cdn.jsdelivr.net/npm/jquery@latest/dist/jquery.min.js"></script>
diff --git a/layout/layout.ejs b/layout/layout.ejs
index 0750d32..8550c2a 100644
--- a/layout/layout.ejs
+++ b/layout/layout.ejs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%-theme.language || config.language%>">
 <head>
     <%- partial('_partial/head') %>
     <%- partial('_partial/import_head') %>