diff --git a/public/tool/add.svg b/public/tool/add.svg
new file mode 100644
index 0000000..2df47b0
--- /dev/null
+++ b/public/tool/add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" stroke="#fff" class="ionicon" viewBox="0 0 512 512"><path fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M256 112v288M400 256H112"/></svg>
diff --git a/src/assets/script/storage.ts b/src/assets/script/storage.ts
index ce6efa7..cf3a28b 100644
--- a/src/assets/script/storage.ts
+++ b/src/assets/script/storage.ts
@@ -40,7 +40,6 @@ export const storage = reactive(readDictConfig({
     { "type": ToolTypes.BUILTIN, "name": "OpenAI", "link": "https://chat.openai.com", "icon": "/tool/openai.svg" },
     { "type": ToolTypes.BUILTIN, "name": "Stack Overflow", "link": "https://stackoverflow.com", "icon": "/tool/stackoverflow.svg" },
     { "type": ToolTypes.BUILTIN, "name": "Light Notes", "link": "https://notes.lightxi.com", "icon": "/tool/lightnotes.ico" },
-    { "type": ToolTypes.BUILTIN, "name": "Twitter", "link": "https://twitter.com", "icon": "/tool/twitter.svg" },
     { "type": ToolTypes.BUILTIN, "name": "Cloudflare", "link": "https://dash.cloudflare.com", "icon": "/tool/cloudflare.svg" },
     { "type": ToolTypes.BUILTIN, "name": "Vercel", "link": "https://vercel.com", "icon": "/tool/vercel.svg" },
     { "type": ToolTypes.BUILTIN, "name": "Codepen", "link": "https://codepen.io", "icon": "/tool/codepen.svg" },
diff --git a/src/assets/script/utils/base.ts b/src/assets/script/utils/base.ts
index b0a6625..dce42cf 100644
--- a/src/assets/script/utils/base.ts
+++ b/src/assets/script/utils/base.ts
@@ -27,6 +27,10 @@ export function contains(els: Element[], target: HTMLElement): boolean {
   return els.some((el: Element) => contain(el, target));
 }
 
+export function swap<T>(arr: T[], i: number, j: number) {
+  [arr[i], arr[j]] = [arr[j], arr[i]];
+}
+
 export function clipboard(text: string) {
   const el = document.createElement("textarea");
   el.value = text;
diff --git a/src/components/InputBox.vue b/src/components/InputBox.vue
index ffe983b..b14bf21 100644
--- a/src/components/InputBox.vue
+++ b/src/components/InputBox.vue
@@ -63,6 +63,15 @@ window.addEventListener('keydown', function (e) {
     toggle();
   }
 });
+
+window.addEventListener('contextmenu', function (e) {
+  e.preventDefault();
+  const target = e.target as HTMLElement;
+  const status = contains([
+    document.getElementById('input') as HTMLElement,
+  ], target);
+  emit('update:modelValue', status);
+});
 </script>
 
 <template>
diff --git a/src/components/ToolBox.vue b/src/components/ToolBox.vue
index d74d03a..bae82eb 100644
--- a/src/components/ToolBox.vue
+++ b/src/components/ToolBox.vue
@@ -7,7 +7,11 @@ import {storage} from "@/assets/script/storage";
 import GithubCard from "@/components/cards/GithubCard.vue";
 import {contextTool} from "@/assets/script/tool";
 import Delete from "@/components/icons/delete.vue";
+import {useI18n} from "vue-i18n";
+import Edit from "@/components/icons/edit.vue";
+import {swap} from "@/assets/script/utils/base";
 
+const { t } = useI18n();
 const props = defineProps<{
   focus: boolean,
 }>();
@@ -37,17 +41,22 @@ window.addEventListener('contextmenu', (e: MouseEvent) => {
   if (!props.focus) {
     e.preventDefault();
     const idx = contextTool(e.target as HTMLElement);
-    if (!context.value && idx !== -1) {
+    if (!context.value && idx >= 0) {
       const x = e.clientX, y = e.clientY;
 
       let target = popupEl.value;
       if (target === null) return;
       target.style.left = x + 'px';
       target.style.top = y + 'px';
+
+      target.style.transform = 'scale(1.03)';
+      setTimeout(() => target && (target.style.transform = 'scale(1)'), 250);
       popupIdx.value = idx;
 
       popup.value = true;
       return;
+    } else if (idx === -2) {
+      return;
     }
 
     context.value = !context.value;
@@ -71,6 +80,7 @@ watch(popup, () => {
   if (!popup.value) {
     requestAnimationFrame(() => {
       popupIdx.value = -1;
+      popupEl.value && (popupEl.value.style.transform = 'scale(.5)');
       setTimeout(() => {
         let target = popupEl.value;
         if (target === null) return;
@@ -87,17 +97,44 @@ function redirect(uri: string) {
 
 function remove() {
   const idx = popupIdx.value;
-  if (idx === -1) return;
+  if (idx < 0) return;
   storage.tools.splice(idx, 1);
   popup.value = false;
 }
+
+const toolContainer = ref<HTMLElement | null>(null);
+
+onMounted(function () {
+  for (const draggable of document.querySelectorAll('.draggable') as NodeListOf<HTMLElement>) {
+    draggable.addEventListener('dragstart', function (e: DragEvent) {
+      if (!e.dataTransfer) return;
+      e.dataTransfer.setData('text/plain', draggable.getAttribute("fy-index") as string);
+      e.dataTransfer.dropEffect = 'move';
+    });
+
+    draggable.addEventListener('dragover', function (e: DragEvent) {
+      e.preventDefault();
+    });
+
+    draggable.addEventListener('drop', function (e: DragEvent) {
+      if (!e.dataTransfer) return;
+      e.preventDefault();
+      const before: number = parseInt(e.dataTransfer.getData('text/plain'));
+      const after: number = parseInt(draggable.getAttribute("fy-index") as string);
+      (!(before === after || [before, after].includes(-2))) &&
+        swap(storage.tools, before, after);
+    });
+  }
+})
 </script>
 
 <template>
   <div class="popup" :class="{'active': popup}" ref="popupEl">
+    <div class="row" @click="">
+      <edit /><span>编辑</span>
+    </div>
     <div class="row" @click="remove">
-      <delete />
-      <span>删除</span>
+      <delete /><span>删除</span>
     </div>
   </div>
   <div class="scroll" ref="element">
@@ -106,16 +143,44 @@ function remove() {
       <WeatherCard />
       <GithubCard />
     </div>
-    <div class="tool-container" :class="{'focus': props.focus}" v-show="!context">
-      <a class="tool" v-for="(tool, idx) in storage.tools" @click="redirect(tool.link)" :key="idx"
-         :fy-index="idx">
-        <img :src="tool.icon"  :alt="tool.name" />
+    <div class="tool-container" ref="toolContainer" :class="{'focus': props.focus}" v-show="!context">
+      <a class="tool draggable" v-for="(tool, idx) in storage.tools" @click="redirect(tool.link)" :key="idx"
+         :fy-index="idx" draggable="true">
+        <img :src="tool.icon" :alt="tool.name" />
         <div>{{ tool.name }}</div>
       </a>
+      <a class="tool add" :fy-index="-2">
+        <img src="/tool/add.svg" alt="add" />
+        <div>{{ t('add') }}</div>
+      </a>
     </div>
   </div>
 </template>
-
+<i18n>
+{
+  "zh": {
+    "add": "添加工具",
+  },
+  "en": {
+    "add": "Add Tool",
+  },
+  "tw": {
+    "add": "添加工具",
+  },
+  "ru": {
+    "add": "Добавить инструмент",
+  },
+  "de": {
+    "add": "Werkzeug hinzufügen",
+  },
+  "fr": {
+    "add": "Ajouter un outil",
+  },
+  "ja": {
+    "add": "ツールを追加",
+  }
+}
+</i18n>
 <style>
 .scroll {
   position: absolute;
@@ -135,12 +200,14 @@ function remove() {
   background: rgb(30,30,30);
   border-radius: 6px;
   box-shadow: 0 0 10px rgba(0,0,0,.2);
-  transition: .25s;
+  transition: .25s cubic-bezier(.60,.05,.1,1);
+  transform-origin: top left;
   opacity: 0;
   pointer-events: none;
   user-select: none;
   z-index: -64;
   padding: 4px;
+  transform: scale(.5);
 }
 
 .popup .row {
@@ -161,7 +228,8 @@ function remove() {
 }
 
 .popup .row svg {
-  fill: #fff;
+  stroke: #fff;
+  stroke-width: 32;
   width: 16px;
   height: 16px;
 }
@@ -247,6 +315,12 @@ function remove() {
   padding: 20px;
   fill: rgba(255,255,255,0.85);
   transition: .2s;
+  backdrop-filter: blur(4px);
+}
+
+.tool.add img {
+  background: rgba(0,0,0,0.5);
+  fill: rgba(255,255,255,0.85);
 }
 
 .tool div {
diff --git a/src/components/icons/delete.vue b/src/components/icons/delete.vue
index eb721d9..2955da6 100644
--- a/src/components/icons/delete.vue
+++ b/src/components/icons/delete.vue
@@ -1,3 +1,3 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M112 112l20 320c.95 18.49 14.4 32 32 32h184c17.67 0 30.87-13.51 32-32l20-320" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32" d="M80 112h352"/><path d="M192 112V72h0a23.93 23.93 0 0124-24h80a23.93 23.93 0 0124 24h0v40M256 176v224M184 176l8 224M328 176l-8 224" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M112 112l20 320c.95 18.49 14.4 32 32 32h184c17.67 0 30.87-13.51 32-32l20-320" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path stroke-linecap="round" stroke-miterlimit="10" stroke-width="32" d="M80 112h352"/><path d="M192 112V72h0a23.93 23.93 0 0124-24h80a23.93 23.93 0 0124 24h0v40M256 176v224M184 176l8 224M328 176l-8 224" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>
 </template>
diff --git a/src/components/icons/edit.vue b/src/components/icons/edit.vue
new file mode 100644
index 0000000..b60e466
--- /dev/null
+++ b/src/components/icons/edit.vue
@@ -0,0 +1,3 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M208 352h-64a96 96 0 010-192h64M304 160h64a96 96 0 010 192h-64M163.29 256h187.42" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="36"/></svg>
+</template>