diff --git a/dashboards/tor-ddos.json b/dashboards/tor-ddos.json
index 822e8c4..8fd1cc7 100644
--- a/dashboards/tor-ddos.json
+++ b/dashboards/tor-ddos.json
@@ -911,8 +911,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -1023,8 +1022,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1125,8 +1123,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1228,8 +1225,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1343,8 +1339,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1462,8 +1457,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1581,8 +1575,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1700,8 +1693,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1820,8 +1812,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1923,8 +1914,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2026,8 +2016,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2129,8 +2118,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2210,8 +2198,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           }
@@ -2281,8 +2268,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           }
@@ -2352,8 +2338,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           }
@@ -2423,8 +2408,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           }
@@ -2494,8 +2478,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           }
@@ -2565,8 +2548,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           }
@@ -2906,7 +2888,7 @@
       "type": "bargauge"
     }
   ],
-  "refresh": "auto",
+  "refresh": "5m",
   "revision": 1,
   "schemaVersion": 39,
   "tags": [],
@@ -2970,6 +2952,6 @@
   "timezone": "utc",
   "title": "Tor DDoS",
   "uid": "FgvRNta4k",
-  "version": 447,
+  "version": 449,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/dashboards/tor-relay.json b/dashboards/tor-relay.json
index 86a4329..8126d53 100644
--- a/dashboards/tor-relay.json
+++ b/dashboards/tor-relay.json
@@ -778,8 +778,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -879,8 +878,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -980,8 +978,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1080,8 +1077,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1148,7 +1144,6 @@
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
-            "axisSoftMin": 0,
             "axisWidth": 80,
             "barAlignment": 0,
             "drawStyle": "line",
@@ -1181,8 +1176,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1190,7 +1184,7 @@
               }
             ]
           },
-          "unit": "none"
+          "unit": "short"
         },
         "overrides": []
       },
@@ -1200,7 +1194,7 @@
         "x": 0,
         "y": 42
       },
-      "id": 29,
+      "id": 9,
       "options": {
         "legend": {
           "calcs": [],
@@ -1221,16 +1215,16 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "sum by(instance) (rate(tor_relay_destroy_cell_total{instance=~\"$Instance\"}[$__rate_interval]))",
+          "expr": "sum by(type, direction, instance, family, state) (rate(tor_relay_connections{family=~\"$Family\", type=~\"$Type_conn\", instance=~\"$Instance\", direction=~\"$Dir_conn\", state=~\"$State_conn\"}[$__rate_interval]))",
           "fullMetaSearch": false,
-          "includeNullMetadata": false,
+          "includeNullMetadata": true,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Destroy Cell Total",
+      "title": "Connections",
       "type": "timeseries"
     },
     {
@@ -1281,8 +1275,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1290,7 +1283,7 @@
               }
             ]
           },
-          "unit": "short"
+          "unit": "none"
         },
         "overrides": []
       },
@@ -1300,7 +1293,7 @@
         "x": 12,
         "y": 42
       },
-      "id": 9,
+      "id": 1,
       "options": {
         "legend": {
           "calcs": [],
@@ -1321,7 +1314,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "sum by(type, direction, instance, family, state) (rate(tor_relay_connections{family=~\"$Family\", type=~\"$Type_conn\", instance=~\"$Instance\", direction=~\"$Dir_conn\", state=~\"$State_conn\"}[$__rate_interval]))",
+          "expr": "sum by(instance, action) (rate(tor_relay_intro1_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "__auto",
@@ -1330,7 +1323,7 @@
           "useBackend": false
         }
       ],
-      "title": "Connections",
+      "title": "Intro1",
       "type": "timeseries"
     },
     {
@@ -1349,6 +1342,7 @@
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
+            "axisSoftMin": 0,
             "axisWidth": 80,
             "barAlignment": 0,
             "drawStyle": "line",
@@ -1381,8 +1375,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1400,7 +1393,7 @@
         "x": 0,
         "y": 50
       },
-      "id": 28,
+      "id": 29,
       "options": {
         "legend": {
           "calcs": [],
@@ -1421,7 +1414,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "sum by(instance) (rate(tor_relay_drop_cell_total{instance=~\"$Instance\"}[$__rate_interval]))",
+          "expr": "sum by(instance) (rate(tor_relay_destroy_cell_total{instance=~\"$Instance\"}[$__rate_interval]))",
           "fullMetaSearch": false,
           "includeNullMetadata": false,
           "legendFormat": "__auto",
@@ -1430,7 +1423,7 @@
           "useBackend": false
         }
       ],
-      "title": "Drop Cell Total",
+      "title": "Destroy Cell Total",
       "type": "timeseries"
     },
     {
@@ -1481,8 +1474,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1500,7 +1492,7 @@
         "x": 12,
         "y": 50
       },
-      "id": 1,
+      "id": 7,
       "options": {
         "legend": {
           "calcs": [],
@@ -1521,16 +1513,16 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "sum by(instance, action) (rate(tor_relay_intro1_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))",
+          "expr": "avg by(instance) (tor_relay_load_tcp_exhaustion_total{instance=~\"$Instance\"})",
           "fullMetaSearch": false,
-          "includeNullMetadata": true,
+          "includeNullMetadata": false,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Intro1",
+      "title": "Load Tcp Exhaustion",
       "type": "timeseries"
     },
     {
@@ -1549,7 +1541,6 @@
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
-            "axisSoftMin": 0,
             "axisWidth": 80,
             "barAlignment": 0,
             "drawStyle": "line",
@@ -1582,8 +1573,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1601,7 +1591,7 @@
         "x": 0,
         "y": 58
       },
-      "id": 8,
+      "id": 28,
       "options": {
         "legend": {
           "calcs": [],
@@ -1622,16 +1612,16 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "sum by(instance, state) (rate(tor_relay_circuits_total{instance=~\"$Instance\", state=~\"$State_circ_tot\"}[$__rate_interval]))",
+          "expr": "sum by(instance) (rate(tor_relay_drop_cell_total{instance=~\"$Instance\"}[$__rate_interval]))",
           "fullMetaSearch": false,
-          "includeNullMetadata": true,
+          "includeNullMetadata": false,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Circuits",
+      "title": "Drop Cell Total",
       "type": "timeseries"
     },
     {
@@ -1682,8 +1672,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1701,7 +1690,7 @@
         "x": 12,
         "y": 58
       },
-      "id": 7,
+      "id": 11,
       "options": {
         "legend": {
           "calcs": [],
@@ -1722,16 +1711,16 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg by(instance) (tor_relay_load_tcp_exhaustion_total{instance=~\"$Instance\"})",
+          "expr": "avg by(instance) (tor_relay_load_global_rate_limit_reached_total{instance=~\"$Instance\"})",
           "fullMetaSearch": false,
-          "includeNullMetadata": false,
+          "includeNullMetadata": true,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Load Tcp Exhaustion",
+      "title": "Load Global Rate Limit Reached",
       "type": "timeseries"
     },
     {
@@ -1750,6 +1739,7 @@
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
+            "axisSoftMin": 0,
             "axisWidth": 80,
             "barAlignment": 0,
             "drawStyle": "line",
@@ -1782,8 +1772,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1801,7 +1790,7 @@
         "x": 0,
         "y": 66
       },
-      "id": 16,
+      "id": 8,
       "options": {
         "legend": {
           "calcs": [],
@@ -1822,7 +1811,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "sum by(action, type, instance) (rate(tor_relay_load_onionskins_total{instance=~\"$Instance\", action=~\"$Action_load\", type=~\"$Type_load\"}[$__rate_interval]))",
+          "expr": "sum by(instance, state) (rate(tor_relay_circuits_total{instance=~\"$Instance\", state=~\"$State_circ_tot\"}[$__rate_interval]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "__auto",
@@ -1831,7 +1820,7 @@
           "useBackend": false
         }
       ],
-      "title": "Load Onionskins",
+      "title": "Circuits",
       "type": "timeseries"
     },
     {
@@ -1882,8 +1871,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1891,7 +1879,7 @@
               }
             ]
           },
-          "unit": "none"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -1901,7 +1889,7 @@
         "x": 12,
         "y": 66
       },
-      "id": 11,
+      "id": 5,
       "options": {
         "legend": {
           "calcs": [],
@@ -1922,7 +1910,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg by(instance) (tor_relay_load_global_rate_limit_reached_total{instance=~\"$Instance\"})",
+          "expr": "avg by(subsys, instance) (tor_relay_load_oom_bytes_total{instance=~\"$Instance\", subsys=~\"$Subsys\"})",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "__auto",
@@ -1931,7 +1919,7 @@
           "useBackend": false
         }
       ],
-      "title": "Load Global Rate Limit Reached",
+      "title": "Load Oom Bytes",
       "type": "timeseries"
     },
     {
@@ -1982,8 +1970,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2001,7 +1988,7 @@
         "x": 0,
         "y": 74
       },
-      "id": 3,
+      "id": 16,
       "options": {
         "legend": {
           "calcs": [],
@@ -2022,7 +2009,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg by(action, instance) (rate(tor_relay_est_intro_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))",
+          "expr": "sum by(action, type, instance) (rate(tor_relay_load_onionskins_total{instance=~\"$Instance\", action=~\"$Action_load\", type=~\"$Type_load\"}[$__rate_interval]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "__auto",
@@ -2031,7 +2018,7 @@
           "useBackend": false
         }
       ],
-      "title": "Est Intro",
+      "title": "Load Onionskins",
       "type": "timeseries"
     },
     {
@@ -2082,8 +2069,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2091,7 +2077,7 @@
               }
             ]
           },
-          "unit": "bytes"
+          "unit": "none"
         },
         "overrides": []
       },
@@ -2101,7 +2087,7 @@
         "x": 12,
         "y": 74
       },
-      "id": 5,
+      "id": 19,
       "options": {
         "legend": {
           "calcs": [],
@@ -2122,16 +2108,16 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg by(subsys, instance) (tor_relay_load_oom_bytes_total{instance=~\"$Instance\", subsys=~\"$Subsys\"})",
+          "expr": "avg by(instance) (tor_relay_exit_dns_query_total{instance=~\"$Instance\"})",
           "fullMetaSearch": false,
-          "includeNullMetadata": true,
+          "includeNullMetadata": false,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Load Oom Bytes",
+      "title": "Exit Dns Query",
       "type": "timeseries"
     },
     {
@@ -2182,8 +2168,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2201,7 +2186,7 @@
         "x": 0,
         "y": 82
       },
-      "id": 4,
+      "id": 3,
       "options": {
         "legend": {
           "calcs": [],
@@ -2222,7 +2207,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg by(action, instance) (rate(tor_relay_est_rend_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))",
+          "expr": "avg by(action, instance) (rate(tor_relay_est_intro_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "__auto",
@@ -2231,7 +2216,7 @@
           "useBackend": false
         }
       ],
-      "title": "Est Rend",
+      "title": "Est Intro",
       "type": "timeseries"
     },
     {
@@ -2282,8 +2267,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2301,7 +2285,7 @@
         "x": 12,
         "y": 82
       },
-      "id": 19,
+      "id": 17,
       "options": {
         "legend": {
           "calcs": [],
@@ -2322,16 +2306,16 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg by(instance) (tor_relay_exit_dns_query_total{instance=~\"$Instance\"})",
+          "expr": "avg by(reason, instance) (tor_relay_exit_dns_error_total{instance=~\"$Instance\", reason=~\"$Reason\"})",
           "fullMetaSearch": false,
-          "includeNullMetadata": false,
+          "includeNullMetadata": true,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Exit Dns Query",
+      "title": "Exit Dns Error",
       "type": "timeseries"
     },
     {
@@ -2377,14 +2361,12 @@
               "mode": "off"
             }
           },
-          "decimals": 0,
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2402,7 +2384,7 @@
         "x": 0,
         "y": 90
       },
-      "id": 12,
+      "id": 4,
       "options": {
         "legend": {
           "calcs": [],
@@ -2423,7 +2405,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "sum by(action, instance) (rate(tor_relay_rend1_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))",
+          "expr": "avg by(action, instance) (rate(tor_relay_est_rend_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "__auto",
@@ -2432,7 +2414,7 @@
           "useBackend": false
         }
       ],
-      "title": "Rend1",
+      "title": "Est Rend",
       "type": "timeseries"
     },
     {
@@ -2478,13 +2460,13 @@
               "mode": "off"
             }
           },
+          "decimals": 0,
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -2502,7 +2484,7 @@
         "x": 12,
         "y": 90
       },
-      "id": 17,
+      "id": 12,
       "options": {
         "legend": {
           "calcs": [],
@@ -2523,7 +2505,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg by(reason, instance) (tor_relay_exit_dns_error_total{instance=~\"$Instance\", reason=~\"$Reason\"})",
+          "expr": "sum by(action, instance) (rate(tor_relay_rend1_total{instance=~\"$Instance\", action=~\"$Action_circ\"}[$__rate_interval]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "legendFormat": "__auto",
@@ -2532,7 +2514,7 @@
           "useBackend": false
         }
       ],
-      "title": "Exit Dns Error",
+      "title": "Rend1",
       "type": "timeseries"
     }
   ],
@@ -3063,6 +3045,6 @@
   "timezone": "",
   "title": "Tor Relay",
   "uid": "bb0ac200-1fab-4d04-a3b0-859d35ec9ee6",
-  "version": 317,
+  "version": 322,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/dashboards/tor-snowflake-1m.json b/dashboards/tor-snowflake-1m.json
index 8f01004..dcc01f2 100644
--- a/dashboards/tor-snowflake-1m.json
+++ b/dashboards/tor-snowflake-1m.json
@@ -758,8 +758,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -812,7 +811,7 @@
       "type": "timeseries"
     }
   ],
-  "refresh": "",
+  "refresh": "5m",
   "schemaVersion": 39,
   "tags": [],
   "templating": {
@@ -874,6 +873,6 @@
   "timezone": "",
   "title": "Tor Snowflake 1m",
   "uid": "b1cf61bb-53e2-44e9-9f96-af33116dee8a",
-  "version": 59,
+  "version": 60,
   "weekStart": ""
 }
\ No newline at end of file