diff --git a/.github/scripts/generate-category.json-files.js b/.github/scripts/generate-category.json-files.js
index ff727e05..e7095f35 100644
--- a/.github/scripts/generate-category.json-files.js
+++ b/.github/scripts/generate-category.json-files.js
@@ -130,15 +130,23 @@ async function main() {
             const subfolderName = filePath.split('/').pop();
             cleanApp.slug = `${owner}/${repo}/${subfolderName}`;
 
+            // Add shortened field names while keeping originals
+            cleanApp.n = cleanApp.name;        // name -> n
+            cleanApp.d = cleanApp.description; // description -> d
+            cleanApp.v = cleanApp.version;     // version -> v
+            cleanApp.s = cleanApp.slug;        // slug -> s
+
             // Include supported-devices if present (apps/scripts only, not themes)
             const isTheme = app.category === 'Themes';
             if (app['supported-devices'] && !isTheme) {
                 cleanApp['supported-devices'] = app['supported-devices'];
+                cleanApp['sd'] = app['supported-devices'];
             }
 
             // Include supported-screen-size if present (themes only)
             if (app['supported-screen-size'] && isTheme) {
                 cleanApp['supported-screen-size'] = app['supported-screen-size'];
+                cleanApp['sss'] = app['supported-screen-size'];
             }
 
             return cleanApp;
diff --git a/.github/scripts/validate-pull-request.js b/.github/scripts/validate-pull-request.js
index 233be77f..4f2cec61 100644
--- a/.github/scripts/validate-pull-request.js
+++ b/.github/scripts/validate-pull-request.js
@@ -720,12 +720,19 @@ async function postPRComment(validationSuccess, individualAppDetails, summary, m
             JSON.parse(fs.readFileSync(process.env.GITHUB_EVENT_PATH, 'utf8')).number :
             null);
 
+    console.log('Environment variables for PR comment:');
+    console.log(`  GITHUB_TOKEN: ${token ? 'present' : 'missing'}`);
+    console.log(`  GITHUB_REPOSITORY: ${repository}`);
+    console.log(`  PR_NUMBER: ${issueNumber}`);
+    console.log(`  GITHUB_EVENT_NAME: ${process.env.GITHUB_EVENT_NAME}`);
+
     if (!token || !repository || !issueNumber) {
         console.log('Missing required environment variables for PR comment');
         return;
     }
 
     const [owner, repo] = repository.split('/');
+    console.log(`Attempting to post comment to ${owner}/${repo}#${issueNumber}`);
 
     // Build individual app sections
     let appDetailsSection = '';
diff --git a/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-240x135px/metadata.json b/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-240x135px/metadata.json
index 66d4b687..d8049d61 100644
--- a/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-240x135px/metadata.json	
+++ b/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-240x135px/metadata.json	
@@ -1,5 +1,6 @@
 {
   "name": "Bruce Theme (GIF)",
+  "slug-name": "GIF-240x135px",
   "description": "A bold, glowing upgrade for your Bruce device with neon energy and shark power.",
   "category": "Themes",
   "version": "1.3.0",
diff --git a/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-320x170px/metadata.json b/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-320x170px/metadata.json
index e1d5ec96..70003f7d 100644
--- a/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-320x170px/metadata.json	
+++ b/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-320x170px/metadata.json	
@@ -1,5 +1,6 @@
 {
   "name": "Bruce Theme (GIF)",
+  "slug-name": "GIF-320x170px",
   "description": "A bold, glowing upgrade for your Bruce device with neon energy and shark power.",
   "category": "Themes",
   "version": "1.3.0",
diff --git a/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-320x240px/metadata.json b/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-320x240px/metadata.json
index baa10c87..af8a1c48 100644
--- a/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-320x240px/metadata.json	
+++ b/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-320x240px/metadata.json	
@@ -1,5 +1,6 @@
 {
   "name": "Bruce Theme (GIF)",
+  "slug-name": "GIF-320x240px",
   "description": "A bold, glowing upgrade for your Bruce device with neon energy and shark power.",
   "category": "Themes",
   "version": "1.3.0",
diff --git a/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-480x222px/metadata.json b/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-480x222px/metadata.json
index 2747da7c..1dea0a9a 100644
--- a/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-480x222px/metadata.json	
+++ b/repositories/emericklaw/Bruce-Theme/Bruce Theme GIF-480x222px/metadata.json	
@@ -1,5 +1,6 @@
 {
   "name": "Bruce Theme (GIF)",
+  "slug-name": "GIF-480x222px",
   "description": "A bold, glowing upgrade for your Bruce device with neon energy and shark power.",
   "category": "Themes",
   "version": "1.3.0",
diff --git a/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-240x135px/metadata.json b/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-240x135px/metadata.json
index 346190df..39025b1d 100644
--- a/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-240x135px/metadata.json	
+++ b/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-240x135px/metadata.json	
@@ -1,5 +1,6 @@
 {
   "name": "Bruce Theme (PNG)",
+  "slug-name": "PNG-240x135px",
   "description": "A bold, glowing upgrade for your Bruce device with neon energy and shark power.",
   "category": "Themes",
   "version": "1.3.0",
diff --git a/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-320x170px/metadata.json b/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-320x170px/metadata.json
index 33d3b05e..67efabf9 100644
--- a/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-320x170px/metadata.json	
+++ b/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-320x170px/metadata.json	
@@ -1,5 +1,6 @@
 {
   "name": "Bruce Theme (PNG)",
+  "slug-name": "PNG-320x170px",
   "description": "A bold, glowing upgrade for your Bruce device with neon energy and shark power.",
   "category": "Themes",
   "version": "1.3.0",
diff --git a/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-320x240px/metadata.json b/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-320x240px/metadata.json
index 1a20364a..9e281f98 100644
--- a/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-320x240px/metadata.json	
+++ b/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-320x240px/metadata.json	
@@ -1,5 +1,6 @@
 {
   "name": "Bruce Theme (PNG)",
+  "slug-name": "PNG-320x240px",
   "description": "A bold, glowing upgrade for your Bruce device with neon energy and shark power.",
   "category": "Themes",
   "version": "1.3.0",
diff --git a/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-480x222px/metadata.json b/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-480x222px/metadata.json
index 82136a00..30ec5ee8 100644
--- a/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-480x222px/metadata.json	
+++ b/repositories/emericklaw/Bruce-Theme/Bruce Theme PNG-480x222px/metadata.json	
@@ -1,5 +1,6 @@
 {
   "name": "Bruce Theme (PNG)",
+  "slug-name": "PNG-480x222px",
   "description": "A bold, glowing upgrade for your Bruce device with neon energy and shark power.",
   "category": "Themes",
   "version": "1.3.0",