diff --git a/.build/import-categories.mjs b/.build/import-categories.mjs
index fc0b7c82b..f302b4cf4 100644
--- a/.build/import-categories.mjs
+++ b/.build/import-categories.mjs
@@ -4,11 +4,11 @@ import { resolve, join, basename } from 'path'
 import { ICONS_SRC_DIR } from './helpers.mjs'
 
 // const extensions = ['heart', 'star', 'off', 'bolt', 'cancel', 'check', 'cog', 'dollar', 'dot', 'eco', 'edit', 'x', 'plus', 'minus', 'shield', 'up', 'down', 'move', 'link', 'ribbon', 'question', 'exclamation', '2', '3', 'code', 'pause', 'pin', 'search', 'share', 'hand', 'infinity', 'ai']
-const extensions = ['off', 'spark']
+const extensions = ['off', 'ai', 'spark']
 
 extensions.forEach(function (extension) {
 
-  glob.sync(join(ICONS_SRC_DIR, `*-${extension}.svg`)).forEach(function (file, i) {
+  glob.sync(join(ICONS_SRC_DIR, `outline/*-${extension}.svg`)).forEach(function (file, i) {
     const fileOriginal = file.replace(`-${extension}.svg`, '.svg')
 
     if (fs.existsSync(fileOriginal)) {
@@ -20,17 +20,17 @@ extensions.forEach(function (extension) {
       if (categoryOriginal || tagsOriginal) {
 
         let data = fs.readFileSync(file).toString()
-        data = data.replace(/(---[\s\S]+?---)/, function (m, headerContent) {
+        data = data.replace(/(\<\!--[\s\S]+?-->)/, function (m, headerContent) {
           console.log('categoryOriginal', fileOriginal, categoryOriginal && categoryOriginal[1], tagsOriginal && tagsOriginal[1])
 
           if (categoryOriginal) {
             headerContent = headerContent.replace(/category: .*\n/, '')
-            headerContent = headerContent.replace(/---/, `---\ncategory: ${categoryOriginal[1]}`)
+            headerContent = headerContent.replace(/\<\!--/, `<!--\ncategory: ${categoryOriginal[1]}`)
           }
 
           if (tagsOriginal) {
             headerContent = headerContent.replace(/tags: .*\n/, '')
-            headerContent = headerContent.replace(/---/, `---\ntags: ${tagsOriginal[1]}`)
+            headerContent = headerContent.replace(/\<\!--/, `<!--\ntags: ${tagsOriginal[1]}`)
           }
 
           return headerContent
diff --git a/icons/outline/adjustments-spark.svg b/icons/outline/adjustments-spark.svg
index fa66ed53c..a3a689cc0 100644
--- a/icons/outline/adjustments-spark.svg
+++ b/icons/outline/adjustments-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [equalizer, sliders, controls, settings, filter]
+category: System
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/badge-ad-off.svg b/icons/outline/badge-ad-off.svg
index 6cdfb5bf3..c7f2057ea 100644
--- a/icons/outline/badge-ad-off.svg
+++ b/icons/outline/badge-ad-off.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [shape, marketing, media, promotion, advertising, advertisement]
+category: Badges
 version: "2.46"
 unicode: "fd8f"
 -->
diff --git a/icons/outline/battery-spark.svg b/icons/outline/battery-spark.svg
index c3871caaa..1c8d1afb2 100644
--- a/icons/outline/battery-spark.svg
+++ b/icons/outline/battery-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [energy, power, electricity]
+category: Devices
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/battery-vertical-off.svg b/icons/outline/battery-vertical-off.svg
index d12a47de5..9b95c6363 100644
--- a/icons/outline/battery-vertical-off.svg
+++ b/icons/outline/battery-vertical-off.svg
@@ -1,6 +1,6 @@
 <!--
-category: Devices
 tags: [energy, power, electricity]
+category: Devices
 unicode: "ff14"
 version: "3.7"
 -->
diff --git a/icons/outline/bed-off.svg b/icons/outline/bed-off.svg
index 97e0eb916..def0f9a3b 100644
--- a/icons/outline/bed-off.svg
+++ b/icons/outline/bed-off.svg
@@ -1,5 +1,5 @@
 <!--
-tags: [sleep, night, bedroom, rest]
+tags: [furniture, sleeping, comfortable, bedroom, mattress, resting, relax, sleep, futon, cozy]
 category: Map
 version: "1.65"
 unicode: "f100"
diff --git a/icons/outline/bookmark-ai.svg b/icons/outline/bookmark-ai.svg
index d3729b53a..0317fd6ec 100644
--- a/icons/outline/bookmark-ai.svg
+++ b/icons/outline/bookmark-ai.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [read, clip, marker, tag]
+category: Document
 version: "2.35"
 unicode: "fc8a"
 -->
diff --git a/icons/outline/briefcase-off.svg b/icons/outline/briefcase-off.svg
index 471c4b31e..4e6532039 100644
--- a/icons/outline/briefcase-off.svg
+++ b/icons/outline/briefcase-off.svg
@@ -1,5 +1,5 @@
 <!--
-tags: [bag, baggage, folder, carrier, documents]
+tags: [bag, baggage, folder, carrier, documents, suitcase, job, work, luggage]
 unicode: "f3cc"
 version: "1.94"
 -->
diff --git a/icons/outline/camera-ai.svg b/icons/outline/camera-ai.svg
index 03289456c..6468bd3da 100644
--- a/icons/outline/camera-ai.svg
+++ b/icons/outline/camera-ai.svg
@@ -1,4 +1,5 @@
 <!--
+tags: [video, photo, aperture]
 category: Media
 unicode: "ffa8"
 version: "3.12"
diff --git a/icons/outline/camera-spark.svg b/icons/outline/camera-spark.svg
index aa942a7b0..00c99614e 100644
--- a/icons/outline/camera-spark.svg
+++ b/icons/outline/camera-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [video, photo, aperture]
+category: Media
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/cube-spark.svg b/icons/outline/cube-spark.svg
index 257c2b867..b162791af 100644
--- a/icons/outline/cube-spark.svg
+++ b/icons/outline/cube-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [3d, pattern, abstract, geometric, shape]
+category: Shapes
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/eye-spark.svg b/icons/outline/eye-spark.svg
index 6763a3711..c12198cf0 100644
--- a/icons/outline/eye-spark.svg
+++ b/icons/outline/eye-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [view, watch]
+category: System
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/file-ai.svg b/icons/outline/file-ai.svg
index 21a7ef0ba..d1e00f9f2 100644
--- a/icons/outline/file-ai.svg
+++ b/icons/outline/file-ai.svg
@@ -1,4 +1,5 @@
 <!--
+tags: [paper, new]
 category: Document
 unicode: "ffa1"
 version: "3.12"
diff --git a/icons/outline/file-spark.svg b/icons/outline/file-spark.svg
index a81f2198b..942d74165 100644
--- a/icons/outline/file-spark.svg
+++ b/icons/outline/file-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [paper, new]
+category: Document
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/file-text-ai.svg b/icons/outline/file-text-ai.svg
index 1bd39b434..db7957613 100644
--- a/icons/outline/file-text-ai.svg
+++ b/icons/outline/file-text-ai.svg
@@ -1,4 +1,5 @@
 <!--
+tags: [data, pdf, txt]
 category: Document
 version: "2.14"
 unicode: "fa27"
diff --git a/icons/outline/file-text-spark.svg b/icons/outline/file-text-spark.svg
index 566dbdb71..e5b21aaea 100644
--- a/icons/outline/file-text-spark.svg
+++ b/icons/outline/file-text-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [data, pdf, txt]
+category: Document
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/flag-spark.svg b/icons/outline/flag-spark.svg
index bc8dfaa1e..403a1ccfa 100644
--- a/icons/outline/flag-spark.svg
+++ b/icons/outline/flag-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [banner, pin, report, map, warning, alert]
+category: Map
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/flask-off.svg b/icons/outline/flask-off.svg
index fca97540d..400d8b304 100644
--- a/icons/outline/flask-off.svg
+++ b/icons/outline/flask-off.svg
@@ -1,5 +1,5 @@
 <!--
-tags: [liquid, container, glass, chemistry]
+tags: [liquid, container, glass, chemistry, test, laboratory, experimental, beta]
 category: Health
 version: "1.65"
 unicode: "f130"
diff --git a/icons/outline/gas-station-off.svg b/icons/outline/gas-station-off.svg
index 22a693b56..816a65370 100644
--- a/icons/outline/gas-station-off.svg
+++ b/icons/outline/gas-station-off.svg
@@ -1,6 +1,6 @@
 <!--
 tags: [fuel, oil, cars, vehicles, shop, distributor]
-category: Map
+category: Vehicles
 version: "1.66"
 unicode: "f137"
 -->
diff --git a/icons/outline/heart-spark.svg b/icons/outline/heart-spark.svg
index 72021a5ef..df7f72664 100644
--- a/icons/outline/heart-spark.svg
+++ b/icons/outline/heart-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [love, emotion, like, favorite, relationship]
+category: Shapes
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/home-spark.svg b/icons/outline/home-spark.svg
index 31854cd6d..f40b75ac8 100644
--- a/icons/outline/home-spark.svg
+++ b/icons/outline/home-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [house, dashboard, living, building]
+category: Buildings
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/mail-ai.svg b/icons/outline/mail-ai.svg
index 4a1d70305..304eaeeee 100644
--- a/icons/outline/mail-ai.svg
+++ b/icons/outline/mail-ai.svg
@@ -1,4 +1,5 @@
 <!--
+tags: [inbox, gmail, email, envelope, message]
 category: Communication
 version: "2.14"
 unicode: "fa31"
diff --git a/icons/outline/mail-spark.svg b/icons/outline/mail-spark.svg
index 8c5fe8e24..26d5a9181 100644
--- a/icons/outline/mail-spark.svg
+++ b/icons/outline/mail-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [inbox, gmail, email, envelope, message]
+category: Communication
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/phone-spark.svg b/icons/outline/phone-spark.svg
index 606fbc978..26535d5d5 100644
--- a/icons/outline/phone-spark.svg
+++ b/icons/outline/phone-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [call, mobile, conversation, landline, answer, number]
+category: Devices
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/photo-ai.svg b/icons/outline/photo-ai.svg
index 8390291c0..b11975703 100644
--- a/icons/outline/photo-ai.svg
+++ b/icons/outline/photo-ai.svg
@@ -1,4 +1,5 @@
 <!--
+tags: [image, picture, landscape, camera]
 category: Media
 version: "2.14"
 unicode: "fa32"
diff --git a/icons/outline/photo-spark.svg b/icons/outline/photo-spark.svg
index 92731d8ac..8e2d30202 100644
--- a/icons/outline/photo-spark.svg
+++ b/icons/outline/photo-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [image, picture, landscape, camera]
+category: Media
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/rosette-discount-check-off.svg b/icons/outline/rosette-discount-check-off.svg
index f06da020c..9799f2cbf 100644
--- a/icons/outline/rosette-discount-check-off.svg
+++ b/icons/outline/rosette-discount-check-off.svg
@@ -1,5 +1,5 @@
 <!--
-tags: [reduction, price, cost, money, shopping, bargain, tick, done, verified, certificate, valid, official, success, invalid]
+tags: [reduction, price, cost, money, shopping, bargain, tick, done, verified, certificate, valid, official, success]
 category: E-commerce
 unicode: "ff10"
 version: "3.7"
diff --git a/icons/outline/route-off.svg b/icons/outline/route-off.svg
index 5d652cc6f..1819c9ded 100644
--- a/icons/outline/route-off.svg
+++ b/icons/outline/route-off.svg
@@ -1,5 +1,5 @@
 <!--
-tags: [path, navigation, map]
+tags: [path, journey, direction, trail, navigate, travel, way, road, travel-route, route-way]
 category: Map
 version: "1.66"
 unicode: "f194"
diff --git a/icons/outline/server-spark.svg b/icons/outline/server-spark.svg
index 892c5ae74..a828c9533 100644
--- a/icons/outline/server-spark.svg
+++ b/icons/outline/server-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [storage, hosting, www]
+category: Devices
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/settings-spark.svg b/icons/outline/settings-spark.svg
index aa41b7054..df00381e1 100644
--- a/icons/outline/settings-spark.svg
+++ b/icons/outline/settings-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [cog, edit, gear, preferences, tools]
+category: System
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"
diff --git a/icons/outline/table-spark.svg b/icons/outline/table-spark.svg
index 9af1b55d7..08b61e8b2 100644
--- a/icons/outline/table-spark.svg
+++ b/icons/outline/table-spark.svg
@@ -1,4 +1,6 @@
 <!--
+tags: [spreadsheet, layout, grid, arrange, row, column]
+category: Database
 -->
 <svg
   xmlns="http://www.w3.org/2000/svg"