diff --git a/portfolio/site.hs b/portfolio/site.hs
index 2fc2a9e..7b96a22 100644
--- a/portfolio/site.hs
+++ b/portfolio/site.hs
@@ -545,7 +545,7 @@ isUpcoming :: UTCTime -> Item a -> Compiler Bool
 isUpcoming cutoff item = do
     metadata <- getMetadata (itemIdentifier item)
     case lookupString "date" metadata of
-        Nothing   -> return False
+        Nothing -> return False
         Just ds ->
             case parseTimeM True defaultTimeLocale "%Y-%m-%d" ds of
                 Nothing   -> return False
@@ -558,6 +558,16 @@ langDict "nl" =
     constField "filter-plamo-building" "Aan het bouwen" <>
     constField "filter-plamo-built" "Gebouwd" <>
     constField "filter-plamo-complete" "Compleet" <>
+    constField "filter-plamo-category-aircraft" "Luchtvaartuig" <>
+    constField "filter-plamo-category-armoured-car" "Pantserwagen" <>
+    constField "filter-plamo-category-automobile" "Automobiel" <>
+    constField "filter-plamo-category-fantasy-vehicle" "Fantasie-voertuig" <>
+    constField "filter-plamo-category-figure" "Figuur" <>
+    constField "filter-plamo-category-gundam" "Gundam" <>
+    constField "filter-plamo-category-mecha" "Mecha" <>
+    constField "filter-plamo-category-motorcycle" "Motorfiets" <>
+    constField "filter-plamo-category-spacecraft" "Ruimtevaartuig" <>
+    constField "filter-plamo-category-tractor" "Trekker" <>
     constField "filter-plamo-series-msg" "Mobile Suit Gundam" <>
     constField "filter-plamo-series-msg-pocket" "Mobile Suit Gundam 0080: War in the Pocket" <>
     constField "filter-plamo-series-msg-stardust" "Mobile Suit Gundam 0083: Stardust Memory" <>
@@ -574,6 +584,18 @@ langDict "nl" =
     constField "filter-plamo-series-gundam-wing-endless-waltz" "Gundam Wing: Endless Waltz" <>
     constField "filter-plamo-series-mfg-gundam" "Mobile Fighter G Gundam" <>
     constField "filter-plamo-series-gundam-bf-try" "Gundam Build Fighters Try" <>
+    constField "filter-plamo-series-dragonball" "Dragonball" <>
+    constField "filter-plamo-series-dragonball-z" "Dragonball Z" <>
+    constField "filter-plamo-series-ikaruga" "Ikaruga" <>
+    constField "filter-plamo-series-kampf-riesen-mars" "Kampf Riesen Mars 1941/1945" <>
+    constField "filter-plamo-series-kyoukai-senki" "Kyōkai Senki, Amaim Warrior at the Borderline" <>
+    constField "filter-plamo-series-maschinen-krieger" "Maschinen Krieger" <>
+    constField "filter-plamo-series-nausicaa" "Nausicaä of the Valley of the Wind" <>
+    constField "filter-plamo-series-patlabor" "Mobile Police Patlabor" <>
+    constField "filter-plamo-series-pokemon" "Pokémon" <>
+    constField "filter-plamo-series-space-battleship-yamato" "Space Battleship Yamato" <>
+    constField "filter-plamo-series-transformers" "Transformers" <>
+    constField "filter-plamo-series-xenoblade-x" "Xenoblade Chronicles X" <>
     constField "switcher" "Taal" <>
     constField "title-japan" "Japan" <>
     constField "title-plamo" "Plamo" <>
@@ -586,6 +608,7 @@ langDict "nl" =
     constField "table-plamo-model-info" "Model-informatie" <>
     constField "table-plamo-status" "Status" <>
     constField "table-plamo-model" "Model" <>
+    constField "table-plamo-category" "Categorie" <>
     constField "table-plamo-scale" "Schaal" <>
     constField "table-plamo-series" "Serie" <>
     constField "table-plamo-manufacturer" "Fabrikant" <>
@@ -607,6 +630,16 @@ langDict "jp" =
     constField "filter-plamo-building" "製作中" <>
     constField "filter-plamo-built" "組立完了" <>
     constField "filter-plamo-complete" "完成" <>
+    constField "filter-plamo-category-aircraft" "航空機" <>
+    constField "filter-plamo-category-armoured-car" "装甲車" <>
+    constField "filter-plamo-category-automobile" "自動車" <>
+    constField "filter-plamo-category-fantasy-vehicle" "ファンタジーの乗り物" <>
+    constField "filter-plamo-category-figure" "フィギュア" <>
+    constField "filter-plamo-category-gundam" "ガンダム" <>
+    constField "filter-plamo-category-mecha" "メカ" <>
+    constField "filter-plamo-category-motorcycle" "オートバイ" <>
+    constField "filter-plamo-category-spacecraft" "宇宙機" <>
+    constField "filter-plamo-category-tractor" "トラクター" <>
     constField "filter-plamo-series-msg" "機動戦士ガンダム" <>
     constField "filter-plamo-series-msg-pocket" "機動戦士ガンダム0080 ポケットの中の戦争" <>
     constField "filter-plamo-series-msg-stardust" "機動戦士ガンダム0083スターダストメモリー" <>
@@ -623,6 +656,18 @@ langDict "jp" =
     constField "filter-plamo-series-msg-zeta" "機動戦士Ζガンダム" <>
     constField "filter-plamo-series-mfg-gundam" "機動武闘伝Gガンダム" <>
     constField "filter-plamo-series-gundam-bf-try" "ガンダムビルドファイターズトライ" <>
+    constField "filter-plamo-series-dragonball" "ドラゴンボール" <>
+    constField "filter-plamo-series-dragonball-z" "ドラゴンボールZ" <>
+    constField "filter-plamo-series-ikaruga" "斑鳩" <>
+    constField "filter-plamo-series-kampf-riesen-mars" "Kampf Riesen Mars 1941/1945" <>
+    constField "filter-plamo-series-kyoukai-senki" "境界戦機" <>
+    constField "filter-plamo-series-maschinen-krieger" "マシーネンクリーガー" <>
+    constField "filter-plamo-series-nausicaa" "風の谷のナウシカ" <>
+    constField "filter-plamo-series-patlabor" "機動警察パトレイバー" <>
+    constField "filter-plamo-series-pokemon" "ポケットモンスター" <>
+    constField "filter-plamo-series-space-battleship-yamato" "宇宙戦艦ヤマト" <>
+    constField "filter-plamo-series-transformers" "トランスフォーマー" <>
+    constField "filter-plamo-series-xenoblade-x" "ゼノブレイドクロス" <>
     constField "switcher" "言語" <>
     constField "title-japan" "日本" <>
     constField "title-plamo" "プラモ" <>
@@ -635,6 +680,7 @@ langDict "jp" =
     constField "table-plamo-model-info" "モデル情報" <>
     constField "table-plamo-status" "現在の状態" <>
     constField "table-plamo-model" "モデル" <>
+    constField "table-plamo-category" "カテゴリ" <>
     constField "table-plamo-scale" "スケール" <>
     constField "table-plamo-series" "シリーズ" <>
     constField "table-plamo-manufacturer" "メーカー" <>
@@ -656,6 +702,16 @@ langDict "en" =
     constField "filter-plamo-building" "Building" <>
     constField "filter-plamo-built" "Built" <>
     constField "filter-plamo-complete" "Complete" <>
+    constField "filter-plamo-category-aircraft" "Aircraft" <>
+    constField "filter-plamo-category-armoured-car" "Armoured car" <>
+    constField "filter-plamo-category-automobile" "Automobile" <>
+    constField "filter-plamo-category-fantasy-vehicle" "Fantasy vehicle" <>
+    constField "filter-plamo-category-figure" "Figure" <>
+    constField "filter-plamo-category-gundam" "Gundam" <>
+    constField "filter-plamo-category-mecha" "Mecha" <>
+    constField "filter-plamo-category-motorcycle" "Motorcycle" <>
+    constField "filter-plamo-category-spacecraft" "Spacecraft" <>
+    constField "filter-plamo-category-tractor" "Tractor" <>
     constField "filter-plamo-series-msg" "Mobile Suit Gundam" <>
     constField "filter-plamo-series-msg-pocket" "Mobile Suit Gundam 0080: War in the Pocket" <>
     constField "filter-plamo-series-msg-stardust" "Mobile Suit Gundam 0083: Stardust Memory" <>
@@ -672,6 +728,18 @@ langDict "en" =
     constField "filter-plamo-series-gundam-wing-endless-waltz" "Gundam Wing: Endless Waltz" <>
     constField "filter-plamo-series-mfg-gundam" "Mobile Fighter G Gundam" <>
     constField "filter-plamo-series-gundam-bf-try" "Gundam Build Fighters Try" <>
+    constField "filter-plamo-series-dragonball" "Dragonball" <>
+    constField "filter-plamo-series-dragonball-z" "Dragonball Z" <>
+    constField "filter-plamo-series-ikaruga" "Ikaruga" <>
+    constField "filter-plamo-series-kampf-riesen-mars" "Kampf Riesen Mars 1941/1945" <>
+    constField "filter-plamo-series-kyoukai-senki" "Kyōkai Senki, Amaim Warrior at the Borderline" <>
+    constField "filter-plamo-series-maschinen-krieger" "Maschinen Krieger" <>
+    constField "filter-plamo-series-nausicaa" "Nausicaä of the Valley of the Wind" <>
+    constField "filter-plamo-series-patlabor" "Mobile Police Patlabor" <>
+    constField "filter-plamo-series-pokemon" "Pokémon" <>
+    constField "filter-plamo-series-space-battleship-yamato" "Space Battleship Yamato" <>
+    constField "filter-plamo-series-transformers" "Transformers" <>
+    constField "filter-plamo-series-xenoblade-x" "Xenoblade Chronicles X" <>
     constField "switcher" "Language" <>
     constField "title-japan" "Japan" <>
     constField "title-plamo" "Plamo" <>
@@ -684,6 +752,7 @@ langDict "en" =
     constField "table-plamo-model-info" "Model information" <>
     constField "table-plamo-status" "Status" <>
     constField "table-plamo-model" "Model" <>
+    constField "table-plamo-category" "Category" <>
     constField "table-plamo-scale" "Scale" <>
     constField "table-plamo-series" "Series" <>
     constField "table-plamo-manufacturer" "Manufacturer" <>
diff --git a/portfolio/templates/model-kits.html b/portfolio/templates/model-kits.html
index 4a277de..b4168fa 100644
--- a/portfolio/templates/model-kits.html
+++ b/portfolio/templates/model-kits.html
@@ -34,6 +34,81 @@
     </div>
   </fieldset>
 
+  <!-- Category -->
+  <legend>$table-plamo-category$</legend>
+  <fieldset class="filter-group row row-cols-1 row-cols-sm-1 row-cols-md-2 row-cols-lg-4 p-1" data-filter="category">
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-category-aircraft$" checked>
+        $filter-plamo-category-aircraft$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-category-armoured-car$" checked>
+        $filter-plamo-category-armoured-car$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-category-automobile$" checked>
+        $filter-plamo-category-automobile$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-category-fantasy-vehicle$" checked>
+        $filter-plamo-category-fantasy-vehicle$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-category-figure$" checked>
+        $filter-plamo-category-figure$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-category-gundam$" checked>
+        $filter-plamo-category-gundam$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-category-mecha$" checked>
+        $filter-plamo-category-mecha$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-category-motorcycle$" checked>
+        $filter-plamo-category-motorcycle$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-category-spacecraft$" checked>
+        $filter-plamo-category-spacecraft$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-category-tractor$" checked>
+        $filter-plamo-category-tractor$
+      </label>
+    </div>
+  </fieldset>
+
   <!-- Manufacturer -->
   <legend>$table-plamo-manufacturer$</legend>
   <fieldset class="filter-group row row-cols-1 row-cols-sm-1 row-cols-md-2 row-cols-lg-4 p-1" data-filter="manufacturer">
@@ -74,8 +149,8 @@
 
     <div class="col">
       <label>
-        <input class="me-2" type="checkbox" value="Finemolds" checked>
-        <span class="fi fi-jp me-1" title="JP"></span>Finemolds
+        <input class="me-2" type="checkbox" value="Fine Molds" checked>
+        <span class="fi fi-jp me-1" title="JP"></span>Fine Molds
       </label>
     </div>
 
@@ -278,6 +353,90 @@
         $filter-plamo-series-gundam-bf-try$
       </label>
     </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-dragonball$" checked>
+        $filter-plamo-series-dragonball$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-dragonball-z$" checked>
+        $filter-plamo-series-dragonball-z$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-ikaruga$" checked>
+        $filter-plamo-series-ikaruga$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-kampf-riesen-mars$" checked>
+        $filter-plamo-series-kampf-riesen-mars$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-kyoukai-senki$" checked>
+        $filter-plamo-series-kyoukai-senki$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-maschinen-krieger$" checked>
+        $filter-plamo-series-maschinen-krieger$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-nausicaa$" checked>
+        $filter-plamo-series-nausicaa$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-patlabor$" checked>
+        $filter-plamo-series-patlabor$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-pokemon$" checked>
+        $filter-plamo-series-pokemon$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-space-battleship-yamato$" checked>
+        $filter-plamo-series-space-battleship-yamato$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-transformers$" checked>
+        $filter-plamo-series-transformers$
+      </label>
+    </div>
+
+    <div class="col">
+      <label>
+        <input class="me-2" type="checkbox" value="$filter-plamo-series-xenoblade-x$" checked>
+        $filter-plamo-series-xenoblade-x$
+      </label>
+    </div>
   </fieldset>
 </div>
 
@@ -291,7 +450,7 @@
 
 <div class="row row-cols-md-1 row-cols-lg-2 row-cols-xxl-3 g-4 p-1">
     $for(kits)$
-    <div class="col kit" data-status="$status$" data-manufacturer="$manufacturer$" data-series="$series$">
+    <div class="col kit" data-status="$status$" data-manufacturer="$manufacturer$" data-series="$series$" data-category="$category$">
       <div class="card h-100 mb-3" style="max-width: 500px; min-width: 300px;">
         <div class="row g-0">
           <a href="$url$"><h5 class="card-title text-center mt-1">$title$</h5></a>
@@ -353,6 +512,9 @@ document.addEventListener("DOMContentLoaded", function () {
 
         const series = kit.dataset.series;
         counts[series] = (counts[series] || 0) + 1;
+
+        const category = kit.dataset.category;
+        counts[category] = (counts[category] || 0) + 1;
     });
 
     // Update each filter label with the count.