diff --git a/main_dashboard.yaml b/main_dashboard.yaml
index 9825f01..19c965d 100644
--- a/main_dashboard.yaml
+++ b/main_dashboard.yaml
@@ -6127,16 +6127,76 @@ views:
         cards:
           - type: heading
             heading: Other Stats
-          - 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: Wind
+          - type: custom:windrose-card
+            title: Wind Rose
+            data_period:
+              from_hour_of_day: 0
+            max_width: 1000
+            refresh_interval: 300
+            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
+                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
+            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: entities
             entities:
               - entity: sensor.home_wind_speed
@@ -6151,48 +6211,6 @@ views:
                   - entity: sensor.home_wind_gust
                     name: Gust
                     format: precision1
-                tap_action:
-                  action: fire-dom-event
-                  browser_mod:
-                    service: browser_mod.popup
-                    data:
-                      content:
-                        type: custom:windrose-card
-                        title: Wind direction
-                        data_period:
-                          from_hour_of_day: 0
-                        max_width: 1000
-                        refresh_interval: 300
-                        windspeed_bar_location: right
-                        windspeed_bar_full: true
-                        wind_direction_entity:
-                          entity: sensor.home_wind_direction_degrees
-                        windspeed_entities:
-                          - entity: sensor.home_wind_speed
-                            name: Wind
-                            speed_unit: mph
-                          - entity: sensor.home_wind_gust
-                            name: Gust
-                            speed_unit: mph
-                        output_speed_unit: mph
-                        output_speed_unit_label: mph
-                        cardinal_direction_letters: NESW
-                        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
               - entity: sensor.home_relative_humidity
                 type: custom:multiple-entity-row
                 name: Moisture