diff --git a/main_dashboard.yaml b/main_dashboard.yaml
index 965e4d4..598f87a 100644
--- a/main_dashboard.yaml
+++ b/main_dashboard.yaml
@@ -6523,98 +6523,146 @@ views:
         cards:
           - type: heading
             heading: Wind
-          - type: custom:compass-card
-            indicator_sensors:
-              - sensor: sensor.home_wind_direction_degrees
-                indicator:
-                  type: arrow_inward
-            value_sensors:
-              - sensor: sensor.home_wind_speed
-            header:
-              title:
-                value: Defiance
-          - type: custom:compass-card
-            indicator_sensors:
-              - sensor: sensor.ashland_wind_direction_degrees
-                indicator:
-                  type: arrow_inward
-            value_sensors:
-              - sensor: sensor.ashland_wind_speed
-            header:
-              title:
-                value: Ashland
           - type: custom:windrose-card
             title: Defiance
             data_period:
-              from_hour_of_day: 0
+              hours_to_show: 24
             max_width: 1000
             refresh_interval: 300
-            windspeed_bar_location: right
-            windspeed_bar_full: true
+            windspeed_bar_location: bottom
             wind_direction_entity:
               entity: sensor.home_wind_direction_degrees
             windspeed_entities:
               - entity: sensor.home_wind_speed
                 name: Wind
+                speed_range_beaufort: false
                 speed_unit: mph
+                output_speed_unit: mph
+                output_speed_unit_label: mph
+                windspeed_bar_full: false
+                speed_ranges:
+                  - from_value: 0
+                    color: rgb(0,255,0)
+                  - from_value: 5
+                    color: yellow
+                  - from_value: 10
+                    color: hsl(200,100%,60%)
+                  - from_value: 20
+                    color: orange
+                  - from_value: 40
+                    color: red
+                  - from_value: 60
+                    color: purple
               - entity: sensor.home_wind_gust
                 name: Gust
+                speed_range_beaufort: false
                 speed_unit: mph
-            output_speed_unit: mph
-            output_speed_unit_label: mph
-            cardinal_direction_letters: NESW
+                output_speed_unit: mph
+                output_speed_unit_label: mph
+                windspeed_bar_full: false
+                speed_ranges:
+                  - from_value: 0
+                    color: rgb(0,255,0)
+                  - from_value: 5
+                    color: yellow
+                  - from_value: 10
+                    color: hsl(200,100%,60%)
+                  - from_value: 20
+                    color: orange
+                  - from_value: 40
+                    color: red
+                  - from_value: 60
+                    color: purple
+            direction_labels:
+              cardinal_direction_labels: NESW
+              show_intercardinal_directions: true
+              show_secondary_intercardinal_directions: true
             matching_strategy: direction-first
-            wind_direction_count: 32
-            speed_range_beaufort: false
-            speed_ranges:
-              - from_value: 0
-                color: rgb(0,255,0)
-              - from_value: 5
-                color: yellow
-              - from_value: 10
-                color: hsl(200,100%,60%)
-              - from_value: 20
-                color: orange
-              - from_value: 40
-                color: red
-              - from_value: 60
-                color: purple
+            current_direction:
+              show_arrow: true
+            corner_info:
+              top_left:
+                label: Speed
+                unit: ' mph'
+                entity: sensor.home_wind_speed
+              top_right:
+                unit: ' mph'
+                label: Gust
+                entity: sensor.home_wind_gust
+              bottom_left:
+                unit: °
+                label: Bearing
+                entity: sensor.home_wind_direction_degrees
           - type: custom:windrose-card
             title: Ashland
             data_period:
-              from_hour_of_day: 0
+              hours_to_show: 24
             max_width: 1000
             refresh_interval: 300
-            windspeed_bar_location: right
-            windspeed_bar_full: true
+            windspeed_bar_location: bottom
             wind_direction_entity:
               entity: sensor.ashland_wind_direction_degrees
             windspeed_entities:
               - entity: sensor.ashland_wind_speed
                 name: Wind
+                speed_range_beaufort: false
                 speed_unit: mph
+                output_speed_unit: mph
+                output_speed_unit_label: mph
+                windspeed_bar_full: false
+                speed_ranges:
+                  - from_value: 0
+                    color: rgb(0,255,0)
+                  - from_value: 5
+                    color: yellow
+                  - from_value: 10
+                    color: hsl(200,100%,60%)
+                  - from_value: 20
+                    color: orange
+                  - from_value: 40
+                    color: red
+                  - from_value: 60
+                    color: purple
               - entity: sensor.ashland_wind_gust
                 name: Gust
+                speed_range_beaufort: false
                 speed_unit: mph
-            output_speed_unit: mph
-            output_speed_unit_label: mph
-            cardinal_direction_letters: NESW
+                output_speed_unit: mph
+                output_speed_unit_label: mph
+                windspeed_bar_full: false
+                speed_ranges:
+                  - from_value: 0
+                    color: rgb(0,255,0)
+                  - from_value: 5
+                    color: yellow
+                  - from_value: 10
+                    color: hsl(200,100%,60%)
+                  - from_value: 20
+                    color: orange
+                  - from_value: 40
+                    color: red
+                  - from_value: 60
+                    color: purple
+            direction_labels:
+              cardinal_direction_labels: NESW
+              show_intercardinal_directions: true
+              show_secondary_intercardinal_directions: true
             matching_strategy: direction-first
-            wind_direction_count: 32
-            speed_range_beaufort: false
-            speed_ranges:
-              - from_value: 0
-                color: rgb(0,255,0)
-              - from_value: 5
-                color: yellow
-              - from_value: 10
-                color: hsl(200,100%,60%)
-              - from_value: 20
-                color: orange
-              - from_value: 40
-                color: red
-              - from_value: 60
-                color: purple
+            current_direction:
+              show_arrow: true
+            corner_info:
+              top_left:
+                label: Speed
+                unit: ' mph'
+                entity: sensor.ashland_wind_speed
+              top_right:
+                unit: ' mph'
+                label: Gust
+                entity: sensor.ashland_wind_gust
+              bottom_left:
+                unit: °
+                label: Bearing
+                entity: sensor.ashland_wind_direction_degrees
         column_span: 2
       - type: grid
         cards: