diff --git a/index.json b/index.json
index 0579a66..579370d 100644
--- a/index.json
+++ b/index.json
@@ -20,8 +20,12 @@
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20Specs.json"
   },
   {
-    "name": "Agent Uptime_By Client (html) v1.4",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20Uptime_By%20Client%20%28html%29%20v1.4.json"
+    "name": "Agent TRMM Install date_descending v1.3",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20TRMM%20Install%20date_descending%20v1.3.json"
+  },
+  {
+    "name": "Agent Uptime_By Client (html) v1.5",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20Uptime_By%20Client%20%28html%29%20v1.5.json"
   },
   {
     "name": "Agent_ListClientThenSite (csv)",
@@ -144,8 +148,8 @@
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Antivirus%20Report.json"
   },
   {
-    "name": "Antivirus Report (csv)",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Antivirus%20Report%20%28csv%29.json"
+    "name": "Antivirus Report v1.1",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Antivirus%20Report%20v1.1.json"
   },
   {
     "name": "Audit Logs (csv)",
diff --git a/templates/Agent TRMM Install date_descending v1.3.json b/templates/Agent TRMM Install date_descending v1.3.json
new file mode 100644
index 0000000..7d10033
--- /dev/null
+++ b/templates/Agent TRMM Install date_descending v1.3.json	
@@ -0,0 +1,15 @@
+{
+  "base_template": {
+    "name": "TRMM_Base v1",
+    "html": "<html>\n\n<head>\n    <style>\n        /* —— PDF page settings —— */\n        @page {\n            margin: 0.5in;\n        }\n\n        /* —— Color palette (theme) —— */\n        :root {\n            --header-bg: #2c3e50;\n            --header-text: #ffffff;\n            --border-color: #dddddd;\n            --table-header-bg: #f2f2f2;\n            --status-ready-bg: #eaf7ec;\n            --status-ready-badge: #28a745;\n            --status-not-ready-bg: #fbebee;\n            --status-not-ready-badge: #dc3545;\n            --status-unknown-bg: #fff9e6;\n            --status-unknown-badge: #ffc107;\n            --badge-already-bg: #17a2b8;\n        }\n\n        /* —— Typography & utilities (structure) —— */\n        body {\n            font-family: sans-serif;\n            color: #333;\n        }\n\n        .section {\n            margin-top: 20px;\n        }\n\n        .text-danger {\n            color: var(--status-not-ready-badge);\n            font-weight: bold;\n        }\n\n        /* —— Header layout (structure) —— */\n        .report-header {\n            background-color: var(--header-bg);\n            color: var(--header-text);\n            padding: 20px;\n            border-radius: 8px;\n            display: flex;\n            align-items: center;\n        }\n\n        .header-logo {\n            width: 80px;\n            margin-right: 25px;\n            flex-shrink: 0;\n        }\n\n        .header-date {\n            margin-left: auto;\n            text-align: right;\n            white-space: nowrap;\n        }\n\n        .report-header h1 {\n            font-size: 24px;\n            margin: 0 0 5px;\n        }\n\n        .report-header h2 {\n            font-size: 16px;\n            margin: 0;\n            opacity: 0.9;\n        }\n\n        /* —— Table basics (structure) —— */\n        .report-table {\n            border-collapse: collapse;\n            width: 100%;\n            font-size: 12px;\n        }\n\n        .report-table th,\n        .report-table td {\n            border: 1px solid var(--border-color);\n            padding: 8px 12px;\n            text-align: left;\n            vertical-align: middle;\n        }\n\n        .report-table thead th {\n            background-color: var(--table-header-bg);\n            font-weight: bold;\n        }\n\n        /* —— Badge shape (structure) —— */\n        .status-badge {\n            display: inline-block;\n            padding: 4px 10px;\n            border-radius: 12px;\n            color: #fff;\n            font-weight: bold;\n            font-size: 11px;\n            text-align: center;\n            white-space: nowrap;\n        }\n\n        /* —— Stub classes for per‑report overrides —— */\n        .status-ready {}\n\n        .status-not-ready {}\n\n        .status-unknown {}\n\n        .badge-ready {}\n\n        .badge-not-ready {}\n\n        .badge-unknown {}\n\n        .badge-already {}\n    </style>\n</head>\n\n<body>\n    {% block content %}{% endblock %}\n</body>\n\n</html>"
+  },
+  "template": {
+    "name": "Agent TRMM Install date_descending v1.3",
+    "template_css": "",
+    "template_md": "{% block content %}\r\n<style>\r\n  @page {\r\n    margin: 0.5in;\r\n    size: letter landscape;\r\n    /* or A4 landscape */\r\n  }\r\n\r\n  /* Style for the filter dropdowns inside the table headers */\r\n  .report-table thead th select {\r\n    width: 100%;\r\n    margin-top: 5px;\r\n    padding: 4px;\r\n    border-radius: 4px;\r\n    border: 1px solid #ccc;\r\n    font-weight: normal; /* Keep dropdown text normal weight */\r\n  }\r\n</style>\r\n\r\n<div class=\"report-header\">\r\n  <div class=\"header-logo\">\r\n    <img src=\"https://github.com/amidaware/reporting-templates/blob/master/assets/gbtnavy%20(256).png?raw=true\" alt=\"Amidaware Logo\" style=\"width: 80px; height: auto;\">\r\n  </div>\r\n  <div class=\"header-titles\">\r\n    <h1>TRMM Agents Installation Report</h1>\r\n    <h2 id=\"report-subtitle\">Client: All | Site: All</h2>\r\n  </div>\r\n  <div class=\"header-date\">\r\n    <h2>Report Date:<br>{{ report_run_timestamp.strftime('%B %d, %Y') }}</h2>\r\n  </div>\r\n</div>\r\n\r\n{% set clients = [] %}\r\n{% set sites = [] %}\r\n{% for item in data_sources.agents %}\r\n  {% if item.site__client__name not in clients %}\r\n    {% set _ = clients.append(item.site__client__name) %}\r\n  {% endif %}\r\n  {% if item.site__name not in sites %}\r\n    {% set _ = sites.append(item.site__name) %}\r\n  {% endif %}\r\n{% endfor %}\r\n\r\n<div class=\"section\">\r\n  <table class=\"report-table\">\r\n    <thead>\r\n      <tr>\r\n        <th>\r\n          Client\r\n          <select id=\"client-filter\">\r\n            <option value=\"all\">All Clients</option>\r\n            {% for client in clients | sort %}\r\n            <option value=\"{{ client }}\">{{ client }}</option>\r\n            {% endfor %}\r\n          </select>\r\n        </th>\r\n        <th>\r\n          Site\r\n          <select id=\"site-filter\">\r\n            <option value=\"all\">All Sites</option>\r\n            {% for site in sites | sort %}\r\n            <option value=\"{{ site }}\">{{ site }}</option>\r\n            {% endfor %}\r\n          </select>\r\n        </th>\r\n        <th>Agent</th>\r\n        <th>User</th>\r\n        <th>Installation Date</th>\r\n      </tr>\r\n    </thead>\r\n    <tbody id=\"report-table-body\">\r\n      {% for item in data_sources.agents %}\r\n      <tr>\r\n        <td>{{ item.site__client__name }}</td>\r\n        <td>{{ item.site__name }}</td>\r\n        <td>{{ item.hostname }}</td>\r\n        <td>{{ item.last_logged_in_user }}</td>\r\n        <td>{% if item.created_time %}{{ item.created_time.strftime('%Y-%m-%d %H:%M') }}{% else %}N/A{% endif %}</td>\r\n      </tr>\r\n      {% endfor %}\r\n    </tbody>\r\n  </table>\r\n</div>\r\n\r\n<script>\r\n  // This script runs after the report is loaded in the browser\r\n  document.addEventListener(\"DOMContentLoaded\", function () {\r\n    const clientFilter = document.getElementById(\"client-filter\");\r\n    const siteFilter = document.getElementById(\"site-filter\");\r\n    const tableBody = document.getElementById(\"report-table-body\");\r\n    const reportSubtitle = document.getElementById(\"report-subtitle\");\r\n    const tableRows = tableBody.getElementsByTagName(\"tr\");\r\n\r\n    function applyFilters() {\r\n      const selectedClient = clientFilter.value;\r\n      const selectedSite = siteFilter.value;\r\n\r\n      // Update the report subtitle to reflect the current filters\r\n      let subtitle = `Client: ${selectedClient === 'all' ? 'All' : selectedClient}`;\r\n      subtitle += ` | Site: ${selectedSite === 'all' ? 'All' : selectedSite}`;\r\n      reportSubtitle.textContent = subtitle;\r\n\r\n      // Loop through all rows in the table and hide/show them based on selections\r\n      for (let i = 0; i < tableRows.length; i++) {\r\n        const row = tableRows[i];\r\n        const clientCell = row.cells[0].textContent.trim();\r\n        const siteCell = row.cells[1].textContent.trim();\r\n\r\n        const clientMatch = (selectedClient === \"all\") || (clientCell === selectedClient);\r\n        const siteMatch = (selectedSite === \"all\") || (siteCell === selectedSite);\r\n\r\n        if (clientMatch && siteMatch) {\r\n          row.style.display = \"\"; // Show the row\r\n        } else {\r\n          row.style.display = \"none\"; // Hide the row\r\n        }\r\n      }\r\n    }\r\n\r\n    // Add event listeners to run the filter function whenever a dropdown is changed\r\n    clientFilter.addEventListener(\"change\", applyFilters);\r\n    siteFilter.addEventListener(\"change\", applyFilters);\r\n  });\r\n</script>\r\n{% endblock %}",
+    "type": "html",
+    "depends_on": [],
+    "template_variables": "data_sources:\r\n  agents:\r\n    model: agent\r\n    select_related:\r\n      - site\r\n      - site__client\r\n    only:\r\n      - hostname\r\n      - last_logged_in_user\r\n      - created_time\r\n      - site__name\r\n      - site__client__name\r\n    order_by:\r\n      - -created_time\r\nreport_run_timestamp: !now"
+  },
+  "assets": []
+}
\ No newline at end of file
diff --git a/templates/Agent Uptime_By Client (html) v1.4.json b/templates/Agent Uptime_By Client (html) v1.4.json
deleted file mode 100644
index 9ef4394..0000000
--- a/templates/Agent Uptime_By Client (html) v1.4.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "base_template": {
-    "name": "Bootstrap Base",
-    "html": "<!doctype html>\n<html lang=\"en\">\n    <head>\n        <style>\n            {{css}}\n        </style>\n        <link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC\" crossorigin=\"anonymous\">\n    </head>\n    <body>\n        {% block content %}{% endblock %}\n    </body>\n</html>"
-  },
-  "template": {
-    "name": "Agent Uptime_By Client (html) v1.4",
-    "template_css": "",
-    "template_md": "{% block content %}\r\n<style>\r\n  @media print {\r\n    .timeline-bar {\r\n      page-break-inside: avoid;\r\n    }\r\n  }\r\n  .small-logo {\r\n    height: 80px;\r\n    width: auto;\r\n  }\r\n  .header-container {\r\n    display: flex;\r\n    justify-content: space-between;\r\n    align-items: center;\r\n    padding-bottom: 10px;\r\n    border-bottom: 2px solid black;\r\n    margin-bottom: 10px;\r\n  }\r\n\r\n  .report-title {\r\n    text-align: right;\r\n  }\r\n\r\n  table {\r\n    width: 100%;\r\n    border-collapse: collapse;\r\n    font-size: 11px;\r\n    margin: 20px 0;\r\n  }\r\n\r\n  th {\r\n    background-color: #004085;\r\n    color: #D4D4D4;\r\n    border: 1px solid black;\r\n    padding: 5px;\r\n    text-align: left;\r\n  }\r\n\r\n  td {\r\n    border: 1px solid black;\r\n    padding: 5px;\r\n    text-align: left;\r\n  }\r\n\r\n  h2,\r\n  h3 {\r\n    margin-top: 10px;\r\n    margin-bottom: 5px;\r\n  }\r\n\r\n  .timeline-container {\r\n    margin-top: 40px;\r\n  }\r\n\r\n  .timeline-row {\r\n    margin-bottom: 10px;\r\n  }\r\n\r\n  .timeline-bar {\r\n    position: relative;\r\n    height: 16px;\r\n    background-color: #ddd;\r\n    width: 100%;\r\n  }\r\n\r\n  .timeline-block {\r\n    position: absolute;\r\n    height: 100%;\r\n    background-color: red;\r\n    border: 1px solid #000;\r\n  }\r\n\r\n  .timeline-label {\r\n    font-size: 11px;\r\n    margin-bottom: 4px;\r\n  }\r\n</style>\r\n\r\n<div class=\"header-container\">\r\n  <img src=\"https://github.com/amidaware/reporting-templates/blob/master/assets/gbtnavy%20(256).png?raw=true\" alt=\"Logo\" class=\"logo small-logo\">\r\n  <div class=\"report-title\">\r\n    <h2>{{client.name}} - Agent Downtime Report</h2>\r\n    <h2>Report Date: {{ report_run_timestamp.strftime('%Y-%m-%d') }}</h2>\r\n  </div>\r\n</div>\r\n\r\n{% set cutoff = timedelta_30_days %}\r\n{% set alert_events = [] %}\r\n\r\n<div class=\"timeline-container\" id=\"timelineChart\">\r\n  <h3>Agent Downtime Timeline (Red = Offline)</h3>\r\n</div>\r\n\r\n<script>\r\n/*!\r\n * html2canvas 1.4.1 | https://html2canvas.hertzen.com | (C) 2023 Niklas von Hertzen\r\n * Included here as inline JS to support Tactical RMM PDF rendering\r\n */\r\n!function(t){function e(e){for(var r,n,o=e[0],i=e[1],c=0,a=[];c<o.length;c++)n=o[c],Object.prototype.hasOwnProperty.call(f,n)&&f[n]&&a.push(f[n][0]),f[n]=0;for(r in i)Object.prototype.hasOwnProperty.call(i,r)&&(t[r]=i[r]);for(u&&u(e);a.length;)a.shift()()}var r={},f={1:0};function n(e){return Object.prototype.hasOwnProperty.call(f,e)?f[e]:0}var o=function(e,r){var f,n,o,i,r=r||[];for(o in e)Object.prototype.hasOwnProperty.call(e,o)&&(n=e[o],Array.isArray(n)?(f=[],n.forEach(function(e){f.push(o+\"=\"+encodeURIComponent(e))}),r.push(f.join(\"&\"))):r.push(o+\"=\"+encodeURIComponent(n)));return r.join(\"&\")};var u=function(){return null};t.html2canvas=function(){return import(\"https://cdn.jsdelivr.net/npm/html2canvas@1.4.1/dist/html2canvas.min.js\")};\r\n</script>\r\n\r\n<table>\r\n  <thead>\r\n    <tr>\r\n      <th>Agent ID</th>\r\n      <th>Message</th>\r\n      <th>Time Off</th>\r\n      <th>Time On</th>\r\n      <th>Downtime (minutes)</th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    {% for item in data_sources.allFieldsAlerts %}\r\n    {% if item.alert_type == \"availability\"\r\n    and item.resolved\r\n    and item.alert_time is defined\r\n    and item.resolved_on is defined\r\n    and item.agent__hostname is defined\r\n    and item.alert_time >= cutoff %}\r\n    {% set downtime = (item.resolved_on - item.alert_time).total_seconds() / 60 %}\r\n    <tr>\r\n      <td>{{ item.agent__hostname }}</td>\r\n      <td>{{ item.message }}</td>\r\n      <td>{{ item.alert_time.strftime('%Y-%m-%d %H:%M') }}</td>\r\n      <td>{{ item.resolved_on.strftime('%Y-%m-%d %H:%M') }}</td>\r\n{% set dt_mins = downtime | round(0, 'floor') %}\r\n{% set dt_days = (dt_mins // 1440) %}\r\n{% set dt_hrs = ((dt_mins % 1440) // 60) %}\r\n{% set dt_min = (dt_mins % 60) %}\r\n<td style=\"padding: 5px;\">\r\n  {% if dt_days > 0 %}{{ dt_days }}d {% endif %}\r\n  {% if dt_hrs > 0 %}{{ dt_hrs }}h {% endif %}\r\n  {% if dt_min > 0 or (dt_days == 0 and dt_hrs == 0) %}{{ dt_min }}m{% endif %}\r\n</td>\r\n\r\n\r\n    </tr>\r\n    {% set _ = alert_events.append({\r\n    \"agent\": item.agent__hostname,\r\n    \"start\": item.alert_time.isoformat(),\r\n    \"end\": item.resolved_on.isoformat()\r\n    }) %}\r\n    {% endif %}\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n\r\n\r\n\r\n<script>\r\ndocument.addEventListener(\"DOMContentLoaded\", function () {\r\n  const events = {{ alert_events | tojson | safe }};\r\n  const container = document.getElementById(\"timelineChart\");\r\n  container.style.margin = \"0 20px\";\r\n\r\n  if (!events.length) {\r\n    const p = document.createElement(\"p\");\r\n    p.textContent = \"No downtime data found.\";\r\n    container.appendChild(p);\r\n    return;\r\n  }\r\n\r\n  const minTime = Math.min(...events.map(e => new Date(e.start).getTime()));\r\n  const maxTime = Math.max(...events.map(e => new Date(e.end).getTime()));\r\n  const range = maxTime - minTime;\r\n\r\n  const grouped = {};\r\n  events.forEach(e => {\r\n    if (!grouped[e.agent]) grouped[e.agent] = { events: [], totalDowntime: 0 };\r\n    const start = new Date(e.start);\r\n    const end = new Date(e.end);\r\n    const minutes = (end - start) / 60000;\r\n    grouped[e.agent].events.push({ start, end });\r\n    grouped[e.agent].totalDowntime += minutes;\r\n  });\r\n\r\n  Object.entries(grouped).forEach(([agent, data]) => {\r\n    const totalMins = Math.round(data.totalDowntime);\r\n    const days = Math.floor(totalMins / 1440);\r\n    const hrs = Math.floor((totalMins % 1440) / 60);\r\n    const min = totalMins % 60;\r\n    const summary = `(Offline ${days} day${days !== 1 ? 's' : ''} ${hrs} hr${hrs !== 1 ? 's' : ''} ${min} min in last 30 days)`;\r\n\r\n    const row = document.createElement(\"div\");\r\n    row.className = \"timeline-row\";\r\n    row.style.marginBottom = \"30px\";\r\n\r\n    const label = document.createElement(\"div\");\r\n    label.className = \"timeline-label\";\r\n    label.innerHTML = `<strong>${agent}</strong> ${summary}`;\r\n    row.appendChild(label);\r\n\r\n    const barWrapper = document.createElement(\"div\");\r\n    barWrapper.style.position = \"relative\";\r\n\r\n    const bar = document.createElement(\"div\");\r\n    bar.className = \"timeline-bar\";\r\n    bar.style.marginBottom = \"4px\";\r\n\r\n    data.events.forEach(({ start, end }) => {\r\n      const offset = ((start.getTime() - minTime) / range) * 100;\r\n      const width = ((end.getTime() - start.getTime()) / range) * 100;\r\n\r\n      const block = document.createElement(\"div\");\r\n      block.className = \"timeline-block\";\r\n      block.style.left = offset + \"%\";\r\n      block.style.width = width + \"%\";\r\n      block.title = `${start.toLocaleString()} – ${end.toLocaleString()}`;\r\n      bar.appendChild(block);\r\n    });\r\n\r\n    const tickRow = document.createElement(\"div\");\r\n    tickRow.style.borderTop = \"1px solid #ccc\";\r\n    tickRow.style.position = \"relative\";\r\n    tickRow.style.height = \"16px\";\r\n\r\n    const totalDays = Math.ceil(range / (1000 * 60 * 60 * 24));\r\n    for (let i = 0; i <= totalDays; i++) {\r\n      const tick = document.createElement(\"div\");\r\n      tick.style.position = \"absolute\";\r\n      tick.style.left = ((i / totalDays) * 100) + \"%\";\r\n      tick.style.height = \"100%\";\r\n      tick.style.borderLeft = \"1px dashed #888\";\r\n      tick.style.fontSize = \"9px\";\r\n      tick.style.color = \"#333\";\r\n      tick.style.paddingLeft = \"2px\";\r\n      tick.style.whiteSpace = \"nowrap\";\r\n\r\n      const dayDate = new Date(minTime + i * 24 * 60 * 60 * 1000);\r\n      tick.textContent = dayDate.toLocaleDateString(undefined, { weekday: 'short', day: 'numeric' });\r\n\r\n      tickRow.appendChild(tick);\r\n    }\r\n\r\n    barWrapper.appendChild(bar);\r\n    barWrapper.appendChild(tickRow);\r\n    row.appendChild(barWrapper);\r\n    container.appendChild(row);\r\n  });\r\n\r\n  // Delay snapshotting to ensure DOM is fully rendered\r\n  setTimeout(() => {\r\n    window.html2canvas = window.html2canvas || window[\"html2canvas\"]; // fallback ref\r\n    if (typeof html2canvas === \"function\") {\r\n      html2canvas(container).then(canvas => {\r\n        const img = document.createElement(\"img\");\r\n        img.src = canvas.toDataURL(\"image/png\");\r\n        img.style.maxWidth = \"100%\";\r\n        img.alt = \"Agent Downtime Timeline Snapshot\";\r\n        container.innerHTML = \"\"; // Clear original\r\n        container.appendChild(img);\r\n      }).catch(err => {\r\n        console.error(\"html2canvas failed:\", err);\r\n      });\r\n    } else {\r\n      console.warn(\"html2canvas not loaded.\");\r\n    }\r\n  }, 300);\r\n});\r\n</script>\r\n\r\n\r\n\r\n\r\n\r\n{% endblock %}",
-    "type": "html",
-    "depends_on": [
-      "client"
-    ],
-    "template_variables": "report_run_timestamp: !now\ntimedelta_30_days: !now days=-30\ndata_sources:\n  allFieldsAlerts:\n    model: alert\n    only:\n      - agent__hostname\n      - message\n      - alert_time\n      - resolved_on\n      - alert_type\n      - agent_id\n      - resolved\n    filter:\n      agent__site__client_id: '{{client.id}}'"
-  },
-  "assets": []
-}
\ No newline at end of file
diff --git a/templates/Agent Uptime_By Client (html) v1.5.json b/templates/Agent Uptime_By Client (html) v1.5.json
new file mode 100644
index 0000000..d54bdd7
--- /dev/null
+++ b/templates/Agent Uptime_By Client (html) v1.5.json	
@@ -0,0 +1,17 @@
+{
+  "base_template": {
+    "name": "TRMM_Base v1",
+    "html": "<html>\n\n<head>\n    <style>\n        /* —— PDF page settings —— */\n        @page {\n            margin: 0.5in;\n        }\n\n        /* —— Color palette (theme) —— */\n        :root {\n            --header-bg: #2c3e50;\n            --header-text: #ffffff;\n            --border-color: #dddddd;\n            --table-header-bg: #f2f2f2;\n            --status-ready-bg: #eaf7ec;\n            --status-ready-badge: #28a745;\n            --status-not-ready-bg: #fbebee;\n            --status-not-ready-badge: #dc3545;\n            --status-unknown-bg: #fff9e6;\n            --status-unknown-badge: #ffc107;\n            --badge-already-bg: #17a2b8;\n        }\n\n        /* —— Typography & utilities (structure) —— */\n        body {\n            font-family: sans-serif;\n            color: #333;\n        }\n\n        .section {\n            margin-top: 20px;\n        }\n\n        .text-danger {\n            color: var(--status-not-ready-badge);\n            font-weight: bold;\n        }\n\n        /* —— Header layout (structure) —— */\n        .report-header {\n            background-color: var(--header-bg);\n            color: var(--header-text);\n            padding: 20px;\n            border-radius: 8px;\n            display: flex;\n            align-items: center;\n        }\n\n        .header-logo {\n            width: 80px;\n            margin-right: 25px;\n            flex-shrink: 0;\n        }\n\n        .header-date {\n            margin-left: auto;\n            text-align: right;\n            white-space: nowrap;\n        }\n\n        .report-header h1 {\n            font-size: 24px;\n            margin: 0 0 5px;\n        }\n\n        .report-header h2 {\n            font-size: 16px;\n            margin: 0;\n            opacity: 0.9;\n        }\n\n        /* —— Table basics (structure) —— */\n        .report-table {\n            border-collapse: collapse;\n            width: 100%;\n            font-size: 12px;\n        }\n\n        .report-table th,\n        .report-table td {\n            border: 1px solid var(--border-color);\n            padding: 8px 12px;\n            text-align: left;\n            vertical-align: middle;\n        }\n\n        .report-table thead th {\n            background-color: var(--table-header-bg);\n            font-weight: bold;\n        }\n\n        /* —— Badge shape (structure) —— */\n        .status-badge {\n            display: inline-block;\n            padding: 4px 10px;\n            border-radius: 12px;\n            color: #fff;\n            font-weight: bold;\n            font-size: 11px;\n            text-align: center;\n            white-space: nowrap;\n        }\n\n        /* —— Stub classes for per‑report overrides —— */\n        .status-ready {}\n\n        .status-not-ready {}\n\n        .status-unknown {}\n\n        .badge-ready {}\n\n        .badge-not-ready {}\n\n        .badge-unknown {}\n\n        .badge-already {}\n    </style>\n</head>\n\n<body>\n    {% block content %}{% endblock %}\n</body>\n\n</html>"
+  },
+  "template": {
+    "name": "Agent Uptime_By Client (html) v1.5",
+    "template_css": "",
+    "template_md": "{% block content %}\r\n<style>\r\n  @media print {\r\n    .timeline-bar {\r\n      page-break-inside: avoid;\r\n    }\r\n  }\r\n\r\n  .small-logo {\r\n    height: 80px;\r\n    width: auto;\r\n  }\r\n\r\n  .timeline-container {\r\n    margin-top: 40px;\r\n    padding-right: 20px;\r\n  }\r\n\r\n  .timeline-row {\r\n    margin-bottom: 10px;\r\n  }\r\n\r\n  .timeline-bar {\r\n    position: relative;\r\n    height: 16px;\r\n    background-color: green;\r\n    width: 100%;\r\n  }\r\n\r\n  .timeline-block {\r\n    box-sizing: border-box;\r\n    position: absolute;\r\n    height: 100%;\r\n    background-color: red;\r\n    border: 1px solid #000;\r\n  }\r\n\r\n  .timeline-label {\r\n    font-size: 11px;\r\n    margin-bottom: 4px;\r\n  }\r\n</style>\r\n\r\n<div class=\"report-header\">\r\n  <img src=\"https://github.com/amidaware/reporting-templates/blob/master/assets/gbtnavy%20(256).png?raw=true\"\r\n       alt=\"Logo\"\r\n       class=\"header-logo small-logo\">\r\n  <div class=\"header-date\">\r\n    <h1>{{ client.name }} - Agent Uptime Report</h1>\r\n    <h2>Report Date: {{ report_run_timestamp.strftime('%Y-%m-%d') }}</h2>\r\n  </div>\r\n</div>\r\n\r\n{% set cutoff = timedelta_30_days %}\r\n{% set alert_events = [] %}\r\n\r\n<div class=\"section timeline-container\" id=\"timelineChart\">\r\n  <h2>Agent Timeline (Green = Online, Red = Offline)</h2>\r\n</div>\r\n\r\n<h2>Downtime List</h2>\r\n\r\n<table class=\"report-table\">\r\n  <thead>\r\n    <tr>\r\n      <th>Agent ID</th>\r\n      <th>Message</th>\r\n      <th>Time Off</th>\r\n      <th>Time On</th>\r\n      <th>Downtime</th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    {% for item in data_sources.allFieldsAlerts %}\r\n      {% if item.alert_type == \"availability\"\r\n            and item.resolved\r\n            and item.alert_time is defined\r\n            and item.resolved_on is defined\r\n            and item.agent__hostname is defined\r\n            and item.alert_time >= cutoff %}\r\n        {% set downtime = (item.resolved_on - item.alert_time).total_seconds() / 60 %}\r\n        <tr>\r\n          <td>{{ item.agent__hostname }}</td>\r\n          <td>{{ item.message }}</td>\r\n          <td>{{ item.alert_time.strftime('%Y-%m-%d %H:%M') }}</td>\r\n          <td>{{ item.resolved_on.strftime('%Y-%m-%d %H:%M') }}</td>\r\n          {% set dt_mins = downtime | round(0, 'floor') %}\r\n          {% set dt_days = dt_mins // 1440 %}\r\n          {% set dt_hrs  = (dt_mins % 1440) // 60 %}\r\n          {% set dt_min  = dt_mins % 60 %}\r\n          <td>\r\n            {% if dt_days > 0 %}{{ dt_days }}d {% endif %}\r\n            {% if dt_hrs  > 0 %}{{ dt_hrs  }}h {% endif %}\r\n            {% if dt_min > 0 or (dt_days == 0 and dt_hrs == 0) %}{{ dt_min }}m{% endif %}\r\n          </td>\r\n        </tr>\r\n        {% set _ = alert_events.append({\r\n          \"agent\": item.agent__hostname,\r\n          \"start\": item.alert_time.isoformat(),\r\n          \"end\":   item.resolved_on.isoformat()\r\n        }) %}\r\n      {% endif %}\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n\r\n<script>\r\n  document.addEventListener(\"DOMContentLoaded\", function () {\r\n    const events = {{ alert_events | tojson | safe }};\r\n    const container = document.getElementById(\"timelineChart\");\r\n    container.style.margin = \"0 20px\";\r\n\r\n    if (!events.length) {\r\n      const p = document.createElement(\"p\");\r\n      p.textContent = \"No downtime data found.\";\r\n      container.appendChild(p);\r\n      return;\r\n    }\r\n\r\n    const minTime = Math.min(...events.map(e => new Date(e.start).getTime()));\r\n    const maxTime = Math.max(...events.map(e => new Date(e.end).getTime()));\r\n    const range   = maxTime - minTime;\r\n\r\n    const grouped = {};\r\n    events.forEach(e => {\r\n      if (!grouped[e.agent]) grouped[e.agent] = { events: [], totalDowntime: 0 };\r\n      const start   = new Date(e.start);\r\n      const end     = new Date(e.end);\r\n      const minutes = (end - start) / 60000;\r\n      grouped[e.agent].events.push({ start, end });\r\n      grouped[e.agent].totalDowntime += minutes;\r\n    });\r\n\r\n    Object.entries(grouped).forEach(([agent, data]) => {\r\n      const totalMins = Math.round(data.totalDowntime);\r\n      const days      = Math.floor(totalMins / 1440);\r\n      const hrs       = Math.floor((totalMins % 1440) / 60);\r\n      const min       = totalMins % 60;\r\n      const summary   = `(Offline ${days} day${days !== 1 ? 's' : ''} ` +\r\n                        `${hrs} hr${hrs !== 1 ? 's' : ''} ${min} min in last 30 days)`;\r\n\r\n      const row  = document.createElement(\"div\");\r\n      row.className = \"timeline-row\";\r\n      row.style.marginBottom = \"30px\";\r\n\r\n      const label = document.createElement(\"div\");\r\n      label.className = \"timeline-label\";\r\n      label.innerHTML = `<strong>${agent}</strong> ${summary}`;\r\n      row.appendChild(label);\r\n\r\n      const barWrapper = document.createElement(\"div\");\r\n      barWrapper.style.position = \"relative\";\r\n\r\n      const bar = document.createElement(\"div\");\r\n      bar.className = \"timeline-bar\";\r\n      bar.style.marginBottom = \"4px\";\r\n\r\n      data.events.forEach(({ start, end }) => {\r\n        const offset = ((start.getTime() - minTime) / range) * 100;\r\n        const width  = ((end.getTime() - start.getTime()) / range) * 100;\r\n\r\n        const block = document.createElement(\"div\");\r\n        block.className = \"timeline-block\";\r\n        block.style.left  = offset + \"%\";\r\n        block.style.width = width  + \"%\";\r\n        block.title = `${start.toLocaleString()} – ${end.toLocaleString()}`;\r\n        bar.appendChild(block);\r\n      });\r\n\r\n      const tickRow = document.createElement(\"div\");\r\n      tickRow.style.borderTop = \"1px solid #ccc\";\r\n      tickRow.style.position  = \"relative\";\r\n      tickRow.style.height    = \"16px\";\r\n\r\n      const totalDays = Math.ceil(range / (1000 * 60 * 60 * 24));\r\n      for (let i = 0; i <= totalDays; i++) {\r\n        const tick = document.createElement(\"div\");\r\n        tick.style.position = \"absolute\";\r\n        tick.style.left     = ((i / totalDays) * 100) + \"%\";\r\n        tick.style.height   = \"100%\";\r\n        tick.style.borderLeft = \"1px dashed #888\";\r\n        tick.style.fontSize   = \"9px\";\r\n        tick.style.color      = \"#333\";\r\n        tick.style.paddingLeft = \"2px\";\r\n        tick.style.whiteSpace  = \"nowrap\";\r\n\r\n        const dayDate = new Date(minTime + i * 24 * 60 * 60 * 1000);\r\n        tick.textContent = dayDate.toLocaleDateString(undefined, {\r\n          weekday: 'short', day: 'numeric'\r\n        });\r\n\r\n        tickRow.appendChild(tick);\r\n      }\r\n\r\n      barWrapper.appendChild(bar);\r\n      barWrapper.appendChild(tickRow);\r\n      row.appendChild(barWrapper);\r\n      container.appendChild(row);\r\n    });\r\n\r\n    setTimeout(() => {\r\n      window.html2canvas = window.html2canvas || window[\"html2canvas\"];\r\n      if (typeof html2canvas === \"function\") {\r\n        html2canvas(container).then(canvas => {\r\n          const img = document.createElement(\"img\");\r\n          img.src = canvas.toDataURL(\"image/png\");\r\n          img.style.maxWidth = \"100%\";\r\n          img.alt = \"Agent Timeline Snapshot\";\r\n          container.innerHTML = \"\";\r\n          container.appendChild(img);\r\n        }).catch(err => console.error(\"html2canvas failed:\", err));\r\n      } else {\r\n        console.warn(\"html2canvas not loaded.\");\r\n      }\r\n    }, 300);\r\n  });\r\n</script>\r\n{% endblock %}",
+    "type": "html",
+    "depends_on": [
+      "client"
+    ],
+    "template_variables": "report_run_timestamp: !now\ntimedelta_30_days: !now days=-30\ndata_sources:\n  allFieldsAlerts:\n    model: alert\n    only:\n      - agent__hostname\n      - message\n      - alert_time\n      - resolved_on\n      - alert_type\n      - agent_id\n      - resolved\n    filter:\n      agent__site__client_id: '{{client.id}}'"
+  },
+  "assets": []
+}
\ No newline at end of file
diff --git a/templates/Antivirus Report (csv).json b/templates/Antivirus Report (csv).json
deleted file mode 100644
index 0a5965f..0000000
--- a/templates/Antivirus Report (csv).json	
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "base_template": null,
-    "template": {
-        "name": "Antivirus Report (csv)",
-        "template_css": "",
-        "template_md": "** Note This requires a custom field \"Antivirus\" and \"Antivirus - Verify Status\" ran with -customfield param **\r\nDevice Name, User, Device OS, Antivirus\r\n{% for item in data_sources.agentsList %}{{item.hostname if item.hostname else 'N/A'}},{{item.last_logged_in_user if item.last_logged_in_user else 'N/A'}},{{item.operating_system|replace(\",\", \"\") if item.operating_system else 'N/A'}},{{item.custom_fields.Antivirus if item.custom_fields.Antivirus else 'N/A'}},\r\n{% endfor %}",
-        "type": "plaintext",
-        "depends_on": [
-            "client"
-        ],
-        "template_variables": "data_sources:\r\n  agentsList:\r\n    filter:\r\n      site__client_id: \"{{client.id}}\"\r\n    custom_fields:\r\n      - Antivirus\r\n    model: agent\r\n    only:\r\n      - hostname\r\n      - operating_system\r\n      - site__name\r\n      - last_logged_in_user"
-    },
-    "assets": []
-}
\ No newline at end of file
diff --git a/templates/Antivirus Report v1.1.json b/templates/Antivirus Report v1.1.json
new file mode 100644
index 0000000..37c79be
--- /dev/null
+++ b/templates/Antivirus Report v1.1.json	
@@ -0,0 +1,17 @@
+{
+  "base_template": {
+    "name": "TRMM_Base v1",
+    "html": "<html>\n\n<head>\n    <style>\n        /* —— PDF page settings —— */\n        @page {\n            margin: 0.5in;\n        }\n\n        /* —— Color palette (theme) —— */\n        :root {\n            --header-bg: #2c3e50;\n            --header-text: #ffffff;\n            --border-color: #dddddd;\n            --table-header-bg: #f2f2f2;\n            --status-ready-bg: #eaf7ec;\n            --status-ready-badge: #28a745;\n            --status-not-ready-bg: #fbebee;\n            --status-not-ready-badge: #dc3545;\n            --status-unknown-bg: #fff9e6;\n            --status-unknown-badge: #ffc107;\n            --badge-already-bg: #17a2b8;\n        }\n\n        /* —— Typography & utilities (structure) —— */\n        body {\n            font-family: sans-serif;\n            color: #333;\n        }\n\n        .section {\n            margin-top: 20px;\n        }\n\n        .text-danger {\n            color: var(--status-not-ready-badge);\n            font-weight: bold;\n        }\n\n        /* —— Header layout (structure) —— */\n        .report-header {\n            background-color: var(--header-bg);\n            color: var(--header-text);\n            padding: 20px;\n            border-radius: 8px;\n            display: flex;\n            align-items: center;\n        }\n\n        .header-logo {\n            width: 80px;\n            margin-right: 25px;\n            flex-shrink: 0;\n        }\n\n        .header-date {\n            margin-left: auto;\n            text-align: right;\n            white-space: nowrap;\n        }\n\n        .report-header h1 {\n            font-size: 24px;\n            margin: 0 0 5px;\n        }\n\n        .report-header h2 {\n            font-size: 16px;\n            margin: 0;\n            opacity: 0.9;\n        }\n\n        /* —— Table basics (structure) —— */\n        .report-table {\n            border-collapse: collapse;\n            width: 100%;\n            font-size: 12px;\n        }\n\n        .report-table th,\n        .report-table td {\n            border: 1px solid var(--border-color);\n            padding: 8px 12px;\n            text-align: left;\n            vertical-align: middle;\n        }\n\n        .report-table thead th {\n            background-color: var(--table-header-bg);\n            font-weight: bold;\n        }\n\n        /* —— Badge shape (structure) —— */\n        .status-badge {\n            display: inline-block;\n            padding: 4px 10px;\n            border-radius: 12px;\n            color: #fff;\n            font-weight: bold;\n            font-size: 11px;\n            text-align: center;\n            white-space: nowrap;\n        }\n\n        /* —— Stub classes for per‑report overrides —— */\n        .status-ready {}\n\n        .status-not-ready {}\n\n        .status-unknown {}\n\n        .badge-ready {}\n\n        .badge-not-ready {}\n\n        .badge-unknown {}\n\n        .badge-already {}\n    </style>\n</head>\n\n<body>\n    {% block content %}{% endblock %}\n</body>\n\n</html>"
+  },
+  "template": {
+    "name": "Antivirus Report v1.1",
+    "template_css": "",
+    "template_md": "{% block content %}\r\n<style>\r\n  @page {\r\n    margin: 0.5in;\r\n    size: letter landscape;\r\n    /* or A4 landscape */\r\n  }\r\n</style>\r\n<div class=\"report-header\">\r\n  <div class=\"header-logo\">\r\n    <img src=\"https://github.com/amidaware/reporting-templates/blob/master/assets/gbtnavy%20(256).png?raw=true\" alt=\"Amidaware Logo\" style=\"width: 80px; height: auto;\">\r\n  </div>\r\n  <div class=\"header-titles\">\r\n    <h1>Audit Log</h1>\r\n    <h2>Client: {{ client.name }}</h2>\r\n  </div>\r\n  <div class=\"header-date\">\r\n    <h2>Report Date:<br>{{ report_run_timestamp.strftime('%B %d, %Y') }}</h2>\r\n  </div>\r\n</div>\r\n\r\n<div class=\"section\">\r\n  <table class=\"report-table\">\r\n    <thead>\r\n      <tr>\r\n        <th>Client</th>\r\n        <th>Site</th>\r\n        <th>Device Name</th>\r\n        <th>User</th>\r\n        <th>Device OS</th>\r\n        <th>Antivirus</th>\r\n      </tr>\r\n    </thead>\r\n    <tbody>\r\n      {% for item in data_sources.agentsList %}\r\n      <tr>\r\n        <td>{{ item.site__client__name }}</td>\r\n        <td>{{ item.site__name }}</td>\r\n        <td>\r\n          <b>{{ item.hostname }}</b><br>\r\n          {% if item.last_seen %}\r\n          <small {% if (report_run_timestamp - item.last_seen).days > 30 %} class=\"text-danger\" {% endif %}>\r\n            Last Seen: {{ item.last_seen.astimezone(ZoneInfo('America/New_York')).strftime('%Y-%m-%d %H:%M:%S') }}\r\n          </small>\r\n          {% else %}\r\n          <small></small>\r\n          {% endif %}\r\n        </td>\r\n        <td>{{ item.last_logged_in_user }}</td>\r\n        <td style=\"word-wrap: break-word;\">{{ item.operating_system }}</td>\r\n        <td style=\"word-wrap: break-word;\">\r\n          {% if item.custom_fields and 'Antivirus' in item.custom_fields %}\r\n            {{ item.custom_fields.Antivirus }}\r\n          {% endif %}\r\n        </td>\r\n      </tr>\r\n      {% endfor %}\r\n    </tbody>\r\n  </table>\r\n</div>\r\n{% endblock %}",
+    "type": "html",
+    "depends_on": [
+      "client"
+    ],
+    "template_variables": "data_sources:\n  agentsList:\n    filter:\n      site__client_id: \"{{client.id}}\"\n    custom_fields:\n      - Antivirus\n    model: agent\n    only:\n      - hostname\n      - site__client__name\n      - site__name\n      - operating_system\n      - site__name\n      - last_seen\n      - last_logged_in_user\nreport_run_timestamp: !now"
+  },
+  "assets": []
+}
\ No newline at end of file
