diff --git a/current.html.tmpl b/current.html.tmpl
index 5790e4c..b62c30e 100644
--- a/current.html.tmpl
+++ b/current.html.tmpl
@@ -51,7 +51,7 @@
           <img src="daywinddir.png"   alt="Hi Wind" />
           <img src="dayinside.png"    alt="Inside" />
           <img src="daywindvec.png"   alt="Wind Vector" />
-          #if $period2.pm2_5.has_data
+          #if $Extras.has_key('optionalAccessories') and $period2.pm2_5.has_data
           <img src="dayaqi.png"       alt="Air Quality" />
           #end if
           #if $Extras.has_key('optionalAccessories') and $period2.radiation.has_data
diff --git a/include/chart.inc b/include/chart.inc
index d1796c2..d57f6fc 100644
--- a/include/chart.inc
+++ b/include/chart.inc
@@ -187,7 +187,7 @@
 	</td>
       </tr>
       #end if
-      #if $period2.pm2_5.has_data
+      #if $Extras.has_key('optionalAccessories') and $period2.pm2_5.has_data
       <tr>
 	<td class="stats_label">
 	  AQI Range
diff --git a/include/current.inc b/include/current.inc
index 3b265d8..8d16e67 100644
--- a/include/current.inc
+++ b/include/current.inc
@@ -42,16 +42,33 @@
                 <td class="stats_data">$current.extraTemp1</td>
               </tr>
               #end if
-	      #if $day.pm2_5.has_data
+              #if $Extras.has_key('optionalAccessories') and $day.pm2_5.has_data
+              #set pmdata = '%.2f, %.2f, %.2f %s' % ($current.pm1_0.raw, $current.pm2_5.raw, $current.pm10_0.raw, $unit.label.pm2_5)
+	      #if $current.pm2_5_aqi.raw > 300
+	        #set pmcolor = '581845'
+	      #else if $current.pm2_5_aqi.raw > 200
+	        #set pmcolor = 'F80000'
+	      #else if $current.pm2_5_aqi.raw > 150
+	        #set pmcolor = '900C3F'
+	      #else if $current.pm2_5_aqi.raw > 100
+	        #set pmcolor = 'F39C12'
+	      #else if $current.pm2_5_aqi.raw > 50
+	        #set pmcolor = 'F8F800'
+	      #end if
               <tr>
-                <td class="stats_label">PM2.5 Concentration</td>
-                <td class="stats_data">$current.pm2_5</td>
+                <td class="stats_label">PM1, 2.5, 10 Concentration</td>
+                <td class="stats_data">$pmdata</td>
               </tr>
               <tr>
                 <td class="stats_label">AQI</td>
-                <td class="stats_data">$current.pm2_5_aqi</td>
+                #if $current.pm2_5_aqi.raw >= 50
+                <td class="stats_data" bgcolor="#$pmcolor">
+                #else
+                <td>
+                #end if
+                $current.pm2_5_aqi</td>
               </tr>
-	      #end if
+              #end if
               #if $Extras.has_key('optionalAccessories') and $day.UV.has_data
               <tr>
                 <td class="stats_label">UV</td>
diff --git a/month.html.tmpl b/month.html.tmpl
index 055d1e4..4163cf8 100644
--- a/month.html.tmpl
+++ b/month.html.tmpl
@@ -31,7 +31,7 @@
           <img src="monthwinddir.png" alt="Hi Wind" />
           <img src="monthinside.png" alt="Inside" />
           <img src="monthwindvec.png" alt="Wind Vector" />
-          #if $period2.pm2_5_aqi.has_data
+          #if $Extras.has_key('optionalAccessories') and $period2.pm2_5.has_data
           <img src="monthaqi.png" alt="Air Quality" />
           #end if
           #if $Extras.has_key('optionalAccessories') and $period2.UV.has_data
diff --git a/skin.conf b/skin.conf
index d582421..63d6270 100644
--- a/skin.conf
+++ b/skin.conf
@@ -682,7 +682,7 @@
             [[[[windvec]]]]
                 plot_type = vector
 
-        [[[monthaqi]]]
+        [[[yearaqi]]]
             yscale = 0, None, 20
             [[[[pm2_5_aqi]]]]
 
diff --git a/week.html.tmpl b/week.html.tmpl
index 33c0685..5922e34 100644
--- a/week.html.tmpl
+++ b/week.html.tmpl
@@ -31,7 +31,7 @@
           <img src="weekwinddir.png" alt="Hi Wind" />
           <img src="weekinside.png" alt="Inside" />
           <img src="weekwindvec.png" alt="Wind Vector" />
-          #if $period2.pm2_5_aqi.has_data
+          #if $Extras.has_key('optionalAccessories') and $period2.pm2_5.has_data
           <img src="weekaqi.png" alt="Air Quality" />
           #end if
           #if $Extras.has_key('optionalAccessories') and $period2.UV.has_data
diff --git a/year.html.tmpl b/year.html.tmpl
index d656df4..79811fd 100644
--- a/year.html.tmpl
+++ b/year.html.tmpl
@@ -145,15 +145,15 @@
                 </td>
               </tr>
               #end if
-              #if $year.pm2_5.has_data
+              #if $Extras.has_key('optionalAccessories') and $year.pm2_5.has_data
               <tr>
                 <td class="stats_label">
                   High AQI<br/>
                   Low AQI
                 </td>
                 <td class="stats_data">
-                  $year.pm2_5_aqi.max at $year.pm2_5_aqi.maxtime<br/>
-                  $year.pm2_5_aqi.min at $year.pm2_5_aqi.mintime
+                  $year.pm2_5_aqi.max at $year.pm2_5.maxtime<br/>
+                  $year.pm2_5_aqi.min at $year.pm2_5.mintime
                 </td>
               </tr>
               #end if
@@ -242,7 +242,7 @@
           <img src="yearwinddir.png" alt="Hi Wind" />
           <img src="yearinside.png" alt="Inside" />
           <img src="yearwindvec.png" alt="Wind Vector" />
-	  #if $year.pm2_5_aqi.has_data
+	  #if $Extras.has_key('optionalAccessories') and $year.pm2_5.has_data
 	  <img src="yearaqi.png" alt="Air Quality" />
 	  #end if
           #if $Extras.has_key('optionalAccessories') and $year.UV.has_data