diff --git a/assets/data/fcd/meta.json b/assets/data/fcd/meta.json
index 6fe967e92..3b4c5dfe3 100644
--- a/assets/data/fcd/meta.json
+++ b/assets/data/fcd/meta.json
@@ -1 +1 @@
-[{"name":"map","version":"2023/03/09/01"},{"name":"shipavatar","version":"2018/09/08/02"},{"name":"shiptag","version":"2022/09/17/01"}]
+[{"name":"map","version":"2023/03/09/01"},{"name":"shipavatar","version":"2018/09/08/02"},{"name":"shiptag","version":"2023/03/24/02"}]
diff --git a/assets/data/fcd/shiptag.json b/assets/data/fcd/shiptag.json
index 669bdb0cf..4794fe118 100644
--- a/assets/data/fcd/shiptag.json
+++ b/assets/data/fcd/shiptag.json
@@ -1 +1 @@
-{"meta":{"name":"shiptag","version":"2022/09/17/01"},"data":{"mapname":["前路掃討部隊","遠征偵察部隊","遠征艦隊先遣隊","地中海連合艦隊","トーチ作戦英軍部隊","トーチ作戦派遣部隊","中央任務部隊","東方任務部隊","西方先遣部隊","西方任務決戦部隊"],"color":["#909090","#90b10d","#0e6106","#924a22","#1876a2","#234052","#ab9d86","#8a802b","#902a49","#4c3f6b"],"fleetname":{"zh-CN":["前路清理部队","远征侦查部队","远征舰队先遣队","地中海联合舰队","火炬作战英军部队","火炬作战派遣部队","中央任务部队","东方任务部队","西方先遣部队","西方任务决战部队"],"zh-TW":["前路清理部隊","遠征偵察部隊","遠征艦隊先遣隊","地中海聯合艦隊","火炬作戰英軍部隊","火炬作戰派遣部隊","中央任務部隊","東方任務部隊","西方先遣部隊","西方任務決戰部隊"],"ja-JP":["前路掃討部隊","遠征偵察部隊","遠征艦隊先遣隊","地中海連合艦隊","トーチ作戦英軍部隊","トーチ作戦派遣部隊","中央任務部隊","東方任務部隊","西方先遣部隊","西方任務決戦部隊"],"en-US":["Advance Patrol Fleet","Expeditionary Reconnaissance Fleet","Expeditionary Fleet Advance Team","Mediterranean Fleet","Op. Torch British Forces","Op. Torch Dispatch Fleet","Central Task Force","Eastern Task Force","Western Advance Fleet","West. Mission Decisive Battle Fleet"]}}}
+{"meta":{"name":"shiptag","version":"2023/03/24/02"},"data":{"mapname":["横須賀防備戦隊","第二水雷戦隊","支援連合艦隊","連合艦隊","空母機動部隊","伊号作戦部隊","逆上陸部隊","決戦連合艦隊"],"color":["#808080","#ffff00","#66cdaa","#228b22","#1e90ff","#fffacd","#d2b48c","#8a2be2"],"fleetname":{"zh-CN":["横须贺防备队","第二鱼雷中队","支持联合舰队","联合舰队","航空母舰特遣部队","伊号作战部队","反向着陆力","果断联合舰队"],"zh-TW":["橫須賀防備隊","第二魚雷中隊 ","支持聯合艦隊","聯合艦隊","航空母艦特遣部隊","伊号作戰部隊","反向著陸力","果斷聯合艦隊"],"ja-JP":["横須賀防備戦隊","第二水雷戦隊","支援連合艦隊","連合艦隊","空母機動部隊","伊号作戦部隊","逆上陸部隊","決戦連合艦隊"],"en-US":["Yokosuka Defense Squadron","2nd Torpedo Squadron","Support Combined Fleet","Combined Fleet","Aircraft Carrier Task Force","I-go Operation Unit","Reverse Landing  Unit","Decisive Battle Combined Fleet"]}}}
diff --git a/fcd/shiptag.cson b/fcd/shiptag.cson
index 111a2253a..091b39002 100644
--- a/fcd/shiptag.cson
+++ b/fcd/shiptag.cson
@@ -3,75 +3,63 @@
 # color: https://material.io/design/color/the-color-system.html#color-usage-and-palettes
 
 mapname: [
-  "前路掃討部隊"
-  "遠征偵察部隊"
-  "遠征艦隊先遣隊"
-  "地中海連合艦隊"
-  "トーチ作戦英軍部隊"
-  "トーチ作戦派遣部隊"
-  "中央任務部隊"
-  "東方任務部隊"
-  "西方先遣部隊"
-  "西方任務決戦部隊"
+  "横須賀防備戦隊"
+  "第二水雷戦隊"
+  "支援連合艦隊"
+  "連合艦隊"
+  "空母機動部隊"
+  "伊号作戦部隊"
+  "逆上陸部隊"
+  "決戦連合艦隊"
 ]
 color: [
-  "#909090"
-  "#90b10d"
-  "#0e6106"
-  "#924a22"
-  "#1876a2"
-  "#234052"
-  "#ab9d86"
-  "#8a802b"
-  "#902a49"
-  "#4c3f6b"
+  "#808080"
+  "#ffff00"
+  "#66cdaa"
+  "#228b22"
+  "#1e90ff"
+  "#fffacd"
+  "#d2b48c"
+  "#8a2be2"
 ]
 fleetname:
   "zh-CN": [
-    "前路清理部队"
-    "远征侦查部队"
-    "远征舰队先遣队"
-    "地中海联合舰队"
-    "火炬作战英军部队"
-    "火炬作战派遣部队"
-    "中央任务部队"
-    "东方任务部队"
-    "西方先遣部队"
-    "西方任务决战部队"
+    "横须贺防备队"
+    "第二鱼雷中队"
+    "支持联合舰队"
+    "联合舰队"
+    "航空母舰特遣部队"
+    "伊号作战部队"
+    "反向着陆力"
+    "果断联合舰队"
   ]
   "zh-TW": [
-    "前路清理部隊"
-    "遠征偵察部隊"
-    "遠征艦隊先遣隊"
-    "地中海聯合艦隊"
-    "火炬作戰英軍部隊"
-    "火炬作戰派遣部隊"
-    "中央任務部隊"
-    "東方任務部隊"
-    "西方先遣部隊"
-    "西方任務決戰部隊"
+    "橫須賀防備隊"
+    "第二魚雷中隊 "
+    "支持聯合艦隊"
+    "聯合艦隊"
+    "航空母艦特遣部隊"
+    "伊号作戰部隊"
+    "反向著陸力"
+    "果斷聯合艦隊"
   ]
   "ja-JP": [
-    "前路掃討部隊"
-    "遠征偵察部隊"
-    "遠征艦隊先遣隊"
-    "地中海連合艦隊"
-    "トーチ作戦英軍部隊"
-    "トーチ作戦派遣部隊"
-    "中央任務部隊"
-    "東方任務部隊"
-    "西方先遣部隊"
-    "西方任務決戦部隊"
+    "横須賀防備戦隊"
+    "第二水雷戦隊"
+    "支援連合艦隊"
+    "連合艦隊"
+    "空母機動部隊"
+    "伊号作戦部隊"
+    "逆上陸部隊"
+    "決戦連合艦隊"
   ]
   "en-US": [
-    "Advance Patrol Fleet"
-    "Expeditionary Reconnaissance Fleet"
-    "Expeditionary Fleet Advance Team"
-    "Mediterranean Fleet"
-    "Op. Torch British Forces"
-    "Op. Torch Dispatch Fleet"
-    "Central Task Force"
-    "Eastern Task Force"
-    "Western Advance Fleet"
-    "West. Mission Decisive Battle Fleet"
+    "Yokosuka Defense Squadron"
+    "2nd Torpedo Squadron"
+    "Support Combined Fleet"
+    "Combined Fleet"
+    "Aircraft Carrier Task Force"
+    "I-go Operation Unit"
+    "Reverse Landing  Unit"
+    "Decisive Battle Combined Fleet"
   ]