diff --git a/.gitignore b/.gitignore
index 0a3e52af..37f6b902 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,7 @@ yarn-error.log*
 next-env.d.ts
 dev
 
-public/prompts.json
\ No newline at end of file
+public/prompts.json
+
+.vscode
+.idea
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index bd3337f9..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "typescript.tsdk": "node_modules\\typescript\\lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true
-}
\ No newline at end of file
diff --git a/README.md b/README.md
index 5b479942..edf7f1db 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-<img src="./static/icon.svg" alt="icon"/>
+<img src="./docs/images/icon.svg" alt="icon"/>
 
 <h1 align="center">ChatGPT Next Web</h1>
 
@@ -13,45 +13,56 @@ One-Click to deploy your own ChatGPT web UI.
 
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/Yidadaa/ChatGPT-Next-Web)
 
-![cover](./static/cover.png)
+![cover](./docs/images/cover.png)
 
 </div>
 
 ## Features
 
 - **Deploy for free with one-click** on Vercel in under 1 minute
-- Responsive design, and dark mode
+- Responsive design, dark mode and PWA
 - Fast first screen loading speed (~100kb)
 - Awesome prompts powered by [awesome-chatgpt-prompts-zh](https://github.com/PlexPt/awesome-chatgpt-prompts-zh) and [awesome-chatgpt-prompts](https://github.com/f/awesome-chatgpt-prompts)
 - Automatically compresses chat history to support long conversations while also saving your tokens
 - One-click export all chat history with full Markdown support
 - I18n supported
 
+## Roadmap
+
+- [x] System Prompt: pin a user defined prompt as system prompt [#138](https://github.com/Yidadaa/ChatGPT-Next-Web/issues/138)
+- [ ] User Prompt: user can edit and save custom prompts to prompt list
+- [ ] Desktop App with tauri
+- [ ] Self-host Model: support llama, alpaca, ChatGLM, BELLE etc.
+- [ ] Plugins: support network search, caculator, any other apis etc. [#165](https://github.com/Yidadaa/ChatGPT-Next-Web/issues/165)
+
+### Not in Plan
+
+- User login, accounts, cloud sync
+- UI text customize
+
 ## 主要功能
 
 - 在 1 分钟内使用 Vercel **免费一键部署**
-- 精心设计的 UI，响应式设计，支持深色模式
+- 精心设计的 UI，响应式设计，支持深色模式，支持 PWA
 - 极快的首屏加载速度（~100kb）
 - 海量的内置 prompt 列表，来自[中文](https://github.com/PlexPt/awesome-chatgpt-prompts-zh)和[英文](https://github.com/f/awesome-chatgpt-prompts)
 - 自动压缩上下文聊天记录，在节省 Token 的同时支持超长对话
 - 一键导出聊天记录，完整的 Markdown 支持
 - 拥有自己的域名？好上加好，绑定后即可在任何地方**无障碍**快速访问
 
+## 开发计划 
+- [x] 为每个对话设置系统 Prompt [#138](https://github.com/Yidadaa/ChatGPT-Next-Web/issues/138)
+- [ ] 允许用户自行编辑内置 Prompt 列表
+- [ ] 使用 tauri 打包桌面应用
+- [ ] 支持自部署的大语言模型
+- [ ] 插件机制，支持联网搜索、计算器、调用其他平台 api [#165](https://github.com/Yidadaa/ChatGPT-Next-Web/issues/165)
 
-## 开发计划 Roadmap
-
-- [x] System Prompt: pin a user defined prompt as system prompt 为每个对话设置系统 Prompt [#138](https://github.com/Yidadaa/ChatGPT-Next-Web/issues/138)
-- [ ] User Prompt: user can edit and save custom prompts to prompt list 允许用户自行编辑内置 Prompt 列表
-- [ ] Self-host Model: support llama, alpaca, ChatGLM, BELLE etc. 支持自部署的大语言模型
-- [ ] Plugins: support network search, caculator, any other apis etc. 插件机制，支持联网搜索、计算器、调用其他平台 api [#165](https://github.com/Yidadaa/ChatGPT-Next-Web/issues/165)
-
-### 不会开发的功能 Not in Plan
-
-- User login, accounts, cloud sync
-- UI text customize
+### 不会开发的功能
 - 界面文字自定义
 - 用户登录、账号管理、消息云同步
 
+
+
 ## Get Started
 > [简体中文 > 如何开始使用](./README_CN.md#开始使用)
 
@@ -157,9 +168,9 @@ bash <(curl -s https://raw.githubusercontent.com/Yidadaa/ChatGPT-Next-Web/main/s
 ```
 ## Screenshots
 
-![Settings](./static/settings.png)
+![Settings](./docs/images/settings.png)
 
-![More](./static/more.png)
+![More](./docs/images/more.png)
 
 
 ## Special Thanks
diff --git a/app/utils.ts b/app/utils.ts
index 93f7561a..33ddbcdc 100644
--- a/app/utils.ts
+++ b/app/utils.ts
@@ -3,7 +3,7 @@ import { showToast } from "./components/ui-lib";
 import Locale from "./locales";
 
 export function trimTopic(topic: string) {
-  return topic.replace(/[，。！？、,.!?]*$/, "");
+  return topic.replace(/[，。！？”“"、,.!?]*$/, "");
 }
 
 export async function copyToClipboard(text: string) {
diff --git a/docs/images/cover.png b/docs/images/cover.png
new file mode 100644
index 00000000..20fbf6a8
Binary files /dev/null and b/docs/images/cover.png differ
diff --git a/static/icon.svg b/docs/images/icon.svg
similarity index 100%
rename from static/icon.svg
rename to docs/images/icon.svg
diff --git a/docs/images/more.png b/docs/images/more.png
new file mode 100644
index 00000000..dfdb3580
Binary files /dev/null and b/docs/images/more.png differ
diff --git a/docs/images/settings.png b/docs/images/settings.png
new file mode 100644
index 00000000..e1cdd07e
Binary files /dev/null and b/docs/images/settings.png differ
diff --git a/static/cover.png b/static/cover.png
deleted file mode 100644
index 0587bd29..00000000
Binary files a/static/cover.png and /dev/null differ
diff --git a/static/more.png b/static/more.png
deleted file mode 100644
index 683a16f0..00000000
Binary files a/static/more.png and /dev/null differ
diff --git a/static/settings.png b/static/settings.png
deleted file mode 100644
index 22d841c3..00000000
Binary files a/static/settings.png and /dev/null differ