diff --git a/blueprints/N/Naruto Shippuden (2007)/0/blueprint.json b/blueprints/N/Naruto Shippuden (2007)/0/blueprint.json
index 0129a2d2..b6e37e31 100644
--- a/blueprints/N/Naruto Shippuden (2007)/0/blueprint.json	
+++ b/blueprints/N/Naruto Shippuden (2007)/0/blueprint.json	
@@ -2,7 +2,7 @@
   "series": {
     "font_id": 0,
     "card_type": "anime",
-    "episode_text_format": "Episode {absolute_episode_number}",
+    "episode_text_format": "EPISODE {absolute_episode_number}",
     "translations": [
       {
         "language_code": "ja",
@@ -91,15 +91,15 @@
       "Prologue of Road to Ninja",
       "Fourth Shinobi World War: Confrontation",
       "Fourth Shinobi World War: Climax",
-      "Kakashi\u2019s Anbu Arc",
+      "Kakashi’s Anbu Arc",
       "Fourth Shinobi World War: Climax",
       "Mecha Arc",
       "Birth of 10 Tails",
       "Hanabi",
       "Birth of 10 Tails",
-      "The Friends\u2019 Paths Arc",
+      "The Friends’ Paths Arc",
       "Birth of 10 Tails",
-      "Naruto\u2019s return to leaf after training",
+      "Naruto’s return to leaf after training",
       "Birth of 10 Tails",
       "Kaguya Otsutsuki Strikes",
       "Jiraiya Shinobi Handbook",
@@ -116,193 +116,813 @@
       "Konoha Hiden"
     ],
     "extra_keys": [
-      "stroke_color"
+      "stroke_color",
+      "kanji_vertical_shift",
+      "kanji_color",
+      "kanji_font_size",
+      "kanji_stroke_width"
     ],
     "extra_values": [
-      "rgb(22,55,138)"
-    ]
+      "rgb(22,55,138)",
+      "45",
+      "rgb(244, 122, 27)",
+      "1.5",
+      "5"
+    ],
+    "template_ids": [],
+    "match_titles": false,
+    "font_color": "rgb(244, 122, 27)",
+    "font_size": 1,
+    "font_kerning": 1,
+    "font_stroke_width": 5,
+    "font_interline_spacing": 50,
+    "font_vertical_shift": 15,
+    "source_files": []
   },
   "episodes": {
     "s0e1": {
       "hide_season_text": true,
+      "template_ids": [],
       "episode_text": "Movie 4"
     },
     "s0e2": {
       "hide_season_text": true,
+      "template_ids": [],
       "episode_text": "Movie 5"
     },
     "s0e3": {
       "hide_season_text": true,
+      "template_ids": [],
       "episode_text": "Movie 6"
     },
     "s0e4": {
       "hide_season_text": true,
+      "template_ids": [],
       "episode_text": "Movie 7"
     },
     "s0e7": {
       "hide_season_text": true,
+      "template_ids": [],
       "episode_text": "Movie 8"
     },
     "s0e10": {
       "hide_season_text": true,
+      "template_ids": [],
       "episode_text": "Movie 9"
     },
     "s0e12": {
       "hide_season_text": true,
+      "template_ids": [],
       "episode_text": "Movie 10"
     },
     "s0e13": {
       "hide_season_text": true,
+      "template_ids": [],
       "episode_text": "Movie 11"
     },
+    "s6e7": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ・クロニクルズ - パート1"
+      ],
+      "template_ids": [],
+      "title": "Kakashi Chronicles - Part 1",
+      "match_title": false
+    },
+    "s6e8": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ・クロニクルズ - パート2"
+      ],
+      "template_ids": [],
+      "title": "Kakashi Chronicles - Part 2",
+      "match_title": false
+    },
+    "s6e15": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "自来也忍者絵巻 - 前編"
+      ],
+      "template_ids": [],
+      "title": "Jiraiya Ninja Scrolls – Part 1",
+      "match_title": false
+    },
+    "s6e16": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "ジライヤ忍者絵巻 第2巻"
+      ],
+      "template_ids": [],
+      "title": "Jiraiya Ninja Scrolls – Part 2",
+      "match_title": false
+    },
+    "s16e1": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：心を隠す仮面"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: A Mask That Hides the Heart",
+      "match_title": false
+    },
+    "s16e2": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：ミナトの死"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: Minato's Death",
+      "match_title": false
+    },
+    "s16e3": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：柱間の細胞"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: Hashirama's Cells",
+      "match_title": false
+    },
+    "s16e4": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：悪党忍者オロチマル"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: The Rogue Ninja Orochimaru",
+      "match_title": false
+    },
+    "s16e5": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：オロチマルの実験台"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: Orochimaru's Test Subjects",
+      "match_title": false
+    },
+    "s16e6": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：それぞれの道"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: Their Own Paths",
+      "match_title": false
+    },
+    "s16e7": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：狙われた写輪眼"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: The Targeted Sharingan",
+      "match_title": false
+    },
+    "s16e8": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ-葉の忍び"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: A Shinobi of the Leaf",
+      "match_title": false
+    },
+    "s16e9": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：ウチハANBU"
+      ],
+      "template_ids": [],
+      "title": "Kakashi:  An Uchiha ANBU",
+      "match_title": false
+    },
+    "s16e10": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：クーデター"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: Coup d'État",
+      "match_title": false
+    },
+    "s16e11": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ 悲劇の夜"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: The Night of the Tragedy",
+      "match_title": false
+    },
+    "s16e12": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：上忍リーダー"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: Jonin Leader",
+      "match_title": false
+    },
+    "s16e13": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシ：7番隊"
+      ],
+      "template_ids": [],
+      "title": "Kakashi: Squad 7",
+      "match_title": false
+    },
+    "s17e1": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "カカシの決意"
+      ],
+      "template_ids": []
+    },
+    "s17e28": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "ルールと同志"
+      ],
+      "template_ids": []
+    },
+    "s19e9": {
+      "extra_keys": [
+        "kanji_font_size"
+      ],
+      "extra_values": [
+        "1.3"
+      ],
+      "template_ids": []
+    },
+    "s19e10": {
+      "extra_keys": [
+        "kanji_font_size"
+      ],
+      "extra_values": [
+        "1.3"
+      ],
+      "template_ids": []
+    },
     "s20e1": {
-      "title": "The Tale of Naruto the Hero - The Loser Ninja"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "負け犬忍者"
+      ],
+      "template_ids": [],
+      "title": "The Loser Ninja",
+      "match_title": false
     },
     "s20e2": {
-      "title": "The Tale of Naruto the Hero - The Search Mission"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "サーチ・ミッション"
+      ],
+      "template_ids": [],
+      "title": "The Search Mission",
+      "match_title": false
     },
     "s20e3": {
-      "title": "The Tale of Naruto the Hero - Team Jiraiya"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "チーム自来也"
+      ],
+      "template_ids": [],
+      "title": "Team Jiraiya",
+      "match_title": false
     },
     "s20e4": {
-      "title": "The Tale of Naruto the Hero - Order of Priority"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "優先順位"
+      ],
+      "template_ids": [],
+      "title": "Order of Priority",
+      "match_title": false
     },
     "s20e5": {
-      "title": "The Tale of Naruto the Hero - The Masked Man"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "マスクマン"
+      ],
+      "template_ids": [],
+      "title": "The Masked Man",
+      "match_title": false
     },
     "s20e6": {
-      "title": "The Tale of Naruto the Hero - The Sealed Power"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "封印された力"
+      ],
+      "template_ids": [],
+      "title": "The Sealed Power",
+      "match_title": false
     },
     "s20e7": {
-      "title": "The Tale of Naruto the Hero - The Rules or a Comrade"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "ルールと同志"
+      ],
+      "template_ids": [],
+      "title": "The Rules or a Comrade",
+      "match_title": false
     },
     "s20e8": {
-      "title": "The Tale of Naruto the Hero - The Child of Prophecy"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "予言の子"
+      ],
+      "template_ids": [],
+      "title": "The Child of Prophecy",
+      "match_title": false
     },
     "s20e9": {
-      "title": "The Tale of Naruto the Hero - The Caged Bird"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "籠の鳥"
+      ],
+      "template_ids": [],
+      "title": "The Caged Bird",
+      "match_title": false
     },
     "s20e10": {
-      "title": "The Tale of Naruto the Hero - Returning Home"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "帰国"
+      ],
+      "template_ids": [],
+      "title": "Returning Home",
+      "match_title": false
     },
     "s20e11": {
-      "title": "The Tale of Naruto the Hero - The Mutual Path"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "相互の道"
+      ],
+      "template_ids": [],
+      "title": "The Mutual Path",
+      "match_title": false
     },
     "s20e12": {
-      "title": "The Tale of Naruto the Hero - The Difference in Power"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "力の差"
+      ],
+      "template_ids": [],
+      "title": "The Difference in Power",
+      "match_title": false
     },
     "s20e13": {
-      "title": "The Tale of Naruto the Hero - Leaving the Village"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "村を離れる"
+      ],
+      "template_ids": [],
+      "title": "Leaving the Village",
+      "match_title": false
     },
     "s20e14": {
-      "title": "The Tale of Naruto the Hero - Pursuers"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "追跡者"
+      ],
+      "template_ids": [],
+      "title": "Pursuers",
+      "match_title": false
     },
     "s20e15": {
-      "title": "The Tale of Naruto the Hero - Collision"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "衝突"
+      ],
+      "template_ids": [],
+      "title": "Collision",
+      "match_title": false
     },
     "s20e16": {
-      "title": "The Tale of Naruto the Hero - Another Moon"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "もうひとつの月"
+      ],
+      "template_ids": [],
+      "title": "Another Moon",
+      "match_title": false
     },
     "s20e17": {
-      "title": "The Tale of Naruto the Hero - Comrade"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "同志"
+      ],
+      "template_ids": [],
+      "title": "Comrade",
+      "match_title": false
     },
     "s20e18": {
-      "title": "The Tale of Naruto the Hero - The Shinobi Unite"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "忍は団結する"
+      ],
+      "template_ids": [],
+      "title": "The Shinobi Unite",
+      "match_title": false
     },
     "s20e19": {
-      "title": "The Tale of Naruto the Hero - Rivals"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "ライバル"
+      ],
+      "template_ids": [],
+      "title": "Rivals",
+      "match_title": false
     },
     "s21e1": {
-      "title": "Light and Darkness: Birth and Death"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "誕生と死"
+      ],
+      "template_ids": [],
+      "title": "Birth and Death",
+      "match_title": false
     },
     "s21e2": {
-      "title": "Light and Darkness: The Genius"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "天才"
+      ],
+      "template_ids": [],
+      "title": "The Genius",
+      "match_title": false
     },
     "s21e3": {
-      "title": "Light and Darkness: The Pain of Living"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "生きることの痛み"
+      ],
+      "template_ids": [],
+      "title": "The Pain of Living",
+      "match_title": false
     },
     "s21e4": {
-      "title": "Light and Darkness: Shisui's Request"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "酒々井のリクエスト"
+      ],
+      "template_ids": [],
+      "title": "Shisui's Request",
+      "match_title": false
     },
     "s21e5": {
-      "title": "Light and Darkness: Moonlit Night"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "月夜"
+      ],
+      "template_ids": [],
+      "title": "Moonlit Night",
+      "match_title": false
     },
     "s21e6": {
-      "title": "Light and Darkness: The Darkness of the Akatsuki"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "アカツキの闇"
+      ],
+      "template_ids": [],
+      "title": "The Darkness of the Akatsuki",
+      "match_title": false
     },
     "s21e7": {
-      "title": "Light and Darkness: Partner"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "パートナー"
+      ],
+      "template_ids": [],
+      "title": "Partner",
+      "match_title": false
     },
     "s21e8": {
-      "title": "Light and Darkness: Truth"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "真実"
+      ],
+      "template_ids": [],
+      "title": "Truth",
+      "match_title": false
+    },
+    "s22e26": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "サスケ物語 第1部 爆発する人間"
+      ],
+      "template_ids": [],
+      "title": "Sasuke’s Story: Part 1: The Exploding Human",
+      "match_title": false
+    },
+    "s22e27": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "サスケ物語 第2部 コロシアム"
+      ],
+      "template_ids": [],
+      "title": "Sasuke’s Story: Part 2: Coliseum",
+      "match_title": false
+    },
+    "s22e28": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "サスケ物語 パート3：風神"
+      ],
+      "template_ids": [],
+      "title": "Sasuke’s Story: Part 3: Fuushin",
+      "match_title": false
+    },
+    "s22e29": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "サスケ物語 パート4：決戦"
+      ],
+      "template_ids": [],
+      "title": "Sasuke’s Story: Part 4: The Ketsuryugan",
+      "match_title": false
+    },
+    "s22e30": {
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "サスケ物語：第5部：最後"
+      ],
+      "template_ids": [],
+      "title": "Sasuke’s Story: Part 5: The Last One",
+      "match_title": false
     },
     "s22e31": {
-      "title": "Part 1: The State of Affairs"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "現状"
+      ],
+      "template_ids": [],
+      "title": "The State of Affairs",
+      "match_title": false
     },
     "s22e32": {
-      "title": "Part 2: Dark Clouds"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "暗雲"
+      ],
+      "template_ids": [],
+      "title": "Dark Clouds",
+      "match_title": false
     },
     "s22e33": {
-      "title": "Part 3: Recklessness"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "無謀さ"
+      ],
+      "template_ids": [],
+      "title": "Recklessness",
+      "match_title": false
     },
     "s22e34": {
-      "title": "Part 4: Cloud of Suspicion"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "疑惑のクラウド"
+      ],
+      "template_ids": [],
+      "title": "Cloud of Suspicion",
+      "match_title": false
     },
     "s22e35": {
-      "title": "Part 5: Dawn"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "夜明け"
+      ],
+      "template_ids": [],
+      "title": "Dawn",
+      "match_title": false
     },
     "s22e36": {
-      "title": "Part 1: Naruto\u2019s Wedding"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "ナルトの結婚式"
+      ],
+      "template_ids": [],
+      "title": "Naruto’s Wedding",
+      "match_title": false
     },
     "s22e37": {
-      "title": "Part 2: A Full-Powered Wedding Gift"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "全力の結婚祝い"
+      ],
+      "template_ids": [],
+      "title": "A Full-Powered Wedding Gift",
+      "match_title": false
     },
     "s22e38": {
-      "title": "Part 3: Steam and Food Pills"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "蒸気薬と食品の丸薬"
+      ],
+      "template_ids": [],
+      "title": "Steam and Food Pills",
+      "match_title": false
     },
     "s22e39": {
-      "title": "Part 4: The Kazekage\u2019s Wedding Gift"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "風影の結婚祝い"
+      ],
+      "template_ids": [],
+      "title": "The Kazekage’s Wedding Gift",
+      "match_title": false
     },
     "s22e40": {
-      "title": "Part 5: The Last Mission"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "ラストミッション"
+      ],
+      "template_ids": [],
+      "title": "The Last Mission",
+      "match_title": false
     },
     "s22e41": {
-      "title": "Part 6: The Outcome of the Secret Mission"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "極秘任務の結末"
+      ],
+      "template_ids": [],
+      "title": "The Outcome of the Secret Mission",
+      "match_title": false
     },
     "s22e42": {
-      "title": "Part 7: The Message"
+      "extra_keys": [
+        "kanji"
+      ],
+      "extra_values": [
+        "メッセージ"
+      ],
+      "template_ids": [],
+      "title": "The Message",
+      "match_title": false
     }
   },
   "fonts": [
     {
       "name": "Naruto (Anime)",
-      "color": "rgb(235,142,52)",
-      "delete_missing": true,
+      "color": "rgb(244, 122, 27)",
       "file": "naruto.ttf",
-      "interline_spacing": 30,
       "replacements_in": [
-        "\u016b",
-        "\u016a",
-        "\u2026",
-        "\u014d",
-        "\u014c"
+        "ū",
+        "Ū",
+        "…",
+        "ō",
+        "Ō",
+        "’",
+        "é",
+        "–",
+        "É"
       ],
       "replacements_out": [
         "u",
         "U",
         "...",
         "o",
-        "O"
-      ],
-      "stroke_width": 5.0
+        "O",
+        "'",
+        "e",
+        "-",
+        "E"
+      ]
     }
   ],
   "creator": "anonfawkes",
   "description": [
-    "Copy of Collin's Naruto Blueprint for Naruto Shipp\u016bden with custom Font and arc season titles."
+    "Copy of Collin's Naruto Blueprint for Naruto Shippūden with custom font, arc season titles, edited episode titles to fit the card and edited kanji to match"
   ],
   "previews": [
     "preview0.jpg"
   ],
   "created": "2023-11-06T23:16:52"
-}
\ No newline at end of file
+}
diff --git a/blueprints/N/Naruto Shippuden (2007)/0/preview0.jpg b/blueprints/N/Naruto Shippuden (2007)/0/preview0.jpg
index 53053ca1..7d6fdc32 100644
Binary files a/blueprints/N/Naruto Shippuden (2007)/0/preview0.jpg and b/blueprints/N/Naruto Shippuden (2007)/0/preview0.jpg differ