lovelace/lights/lightbulbs.yaml

@@ -2,8 +2,6 @@
   template: card_title
   name: Light Bulbs
 
-- type: "horizontal-stack"
-  cards:
 - type: 'custom:button-card'
   template: card_light_slider_collapse
   variables:
@@ -18,8 +16,6 @@
     ulm_card_light_enable_collapse: false
     ulm_card_light_name: Ceiling 2
   entity: light.ceiling2
-- type: "horizontal-stack"
-  cards:
 - type: 'custom:button-card'
   template: card_light_slider_collapse
   variables:

lovelace/lights/lightgroups.yaml

@@ -2,8 +2,7 @@
   template: card_title
   name: Light Groups
 
-- type: "horizontal-stack"
+
-  cards:
 - type: 'custom:button-card'
   template: card_light_slider_collapse
   variables:

lovelace/lights/lightstripes.yaml

@@ -2,8 +2,6 @@
   template: card_title
   name: Light Stripes
 
-- type: "horizontal-stack"
-  cards:
 - type: 'custom:button-card'
   template: card_light_slider_collapse
   variables:

lovelace/pfsense/gateways.yaml

@@ -1,87 +0,0 @@
-
-- type: "horizontal-stack"
-  cards:
-    - type: 'custom:button-card'
-      template: card_title
-      name: WAN
-      label: IPv4
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_gateway_wan_gw_delay
-      variables:
-        ulm_card_generic_swap_name: Delay
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_gateway_wan_gw_loss
-      variables:
-        ulm_card_generic_swap_name: Loss
-
-
-- type: 'custom:button-card'
-  template: card_title
-  name: Mullvad
-- type: "horizontal-stack"
-  cards:
-    - type: 'custom:button-card'
-      template: card_title
-      name: 1
-      label: IPv4
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_gateway_mullvad1gw_delay
-      variables:
-        ulm_card_generic_swap_name: Delay
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_gateway_mullvad1gw_loss
-      variables:
-        ulm_card_generic_swap_name: Loss
-- type: "horizontal-stack"
-  cards:
-    - type: 'custom:button-card'
-      template: card_title
-      name: 1
-      label: IPv6
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_gateway_mullvad1gwv6_delay
-      variables:
-        ulm_card_generic_swap_name: Delay
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_gateway_mullvad1gwv6_loss
-      variables:
-        ulm_card_generic_swap_name: Loss
-
-- type: "horizontal-stack"
-  cards:
-    - type: 'custom:button-card'
-      template: card_title
-      name: 2
-      label: IPv4
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_gateway_mullvad2gw_delay
-      variables:
-        ulm_card_generic_swap_name: Delay
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_gateway_mullvad2gw_loss
-      variables:
-        ulm_card_generic_swap_name: Loss
-- type: "horizontal-stack"
-  cards:
-    - type: 'custom:button-card'
-      template: card_title
-      name: 2
-      label: IPv6
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_gateway_mullvad2gwv6_delay
-      variables:
-        ulm_card_generic_swap_name: Delay
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_gateway_mullvad2gwv6_loss
-      variables:
-        ulm_card_generic_swap_name: Loss

lovelace/pfsense/load.yaml

@@ -1,36 +0,0 @@
-- type: 'custom:button-card'
-  template: card_title
-  name: Load Average
-
-
-- type: "horizontal-stack"
-  cards:
-    - type: 'custom:button-card'
-      template: card_generic
-      entity: sensor.pfsense_cpu_load_average_one_minute
-      variables:
-        ulm_card_generic_name: 1m
-    - type: 'custom:button-card'
-      template: card_generic
-      entity: sensor.pfsense_cpu_load_average_five_minute
-      variables:
-        ulm_card_generic_name: 5m
-    - type: 'custom:button-card'
-      template: card_generic
-      entity: sensor.pfsense_cpu_load_average_fifteen_minute
-      variables:
-        ulm_card_generic_name: 15m
-
-
-- type: "horizontal-stack"
-  cards:
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_memory_used_percentage
-      variables:
-        ulm_card_generic_swap_name: "Memory Used %"
-    - type: 'custom:button-card'
-      template: card_generic_swap
-      entity: sensor.pfsense_memory_swap_used_percentage
-      variables:
-        ulm_card_generic_swap_name: "Swap Used %"

lovelace/pfsense/notifications.yaml

@@ -1,11 +0,0 @@
-- type: 'custom:button-card'
-  template: card_title
-  name: Notifications
-
-
-- type: 'custom:button-card'
-  template: card_binary_sensor
-  variables:
-    ulm_card_binary_sensor_alert: true
-    ulm_show_last_changed: false
-  entity: binary_sensor.pfsense_pending_notices_present

lovelace/pfsense/rules.yaml

@@ -1,19 +0,0 @@
-- type: 'custom:button-card'
-  template: card_title
-  name: Firewall Rules
-
-- type: 'custom:button-card'
-  template: card_input_boolean
-  entity: switch.pfsense_filter_rule_1602620992_disablemullvadtower
-  variables:
-    ulm_card_input_boolean_name: "LAN: Disable Mullvad PC"
-- type: 'custom:button-card'
-  template: card_input_boolean
-  entity: switch.pfsense_filter_rule_1608907801_disablemullvadnetflixtower
-  variables:
-    ulm_card_input_boolean_name: "LAN: Bypass Netflix PC"
-- type: 'custom:button-card'
-  template: card_input_boolean
-  entity: switch.pfsense_filter_rule_1602623476_route_ipad_netflix_to_wan
-  variables:
-    ulm_card_input_boolean_name: "LAN: Bypass Netflix iPad"

lovelace/pfsense/traffic.yaml

@@ -1,64 +0,0 @@
-- type: 'custom:button-card'
-  template: card_title
-  name: Traffic
-
-
-- type: 'custom:button-card'
-  template: card_graph
-  entity: sensor.pfsense_interface_wan_inbytes_kilobytes_per_second
-  variables:
-    ulm_card_graph_color: "var(--google-blue)"
-    ulm_card_graph_name: WAN Incoming
-    ulm_card_graph_entity: sensor.pfsense_interface_wan_inbytes_kilobytes_per_second
-    ulm_card_graph_color2: "var(--google-green)"
-    ulm_card_graph_entity2: sensor.pfsense_interface_wan_outbytes_kilobytes_per_second
-    ulm_card_graph_type: fill
-    ulm_card_graph_hours: 1
-- type: "horizontal-stack"
-  cards:
-    - type: 'custom:button-card'
-      template: card_graph
-      entity: sensor.pfsense_interface_mullvad1_inbytes_kilobytes_per_second
-      variables:
-        ulm_card_graph_color: "var(--google-blue)"
-        ulm_card_graph_name: Mullvad1 Incoming
-        ulm_card_graph_entity: sensor.pfsense_interface_mullvad1_inbytes_kilobytes_per_second
-        ulm_card_graph_color2: "var(--google-green)"
-        ulm_card_graph_entity2: sensor.pfsense_interface_mullvad1_outbytes_kilobytes_per_second
-        ulm_card_graph_type: fill
-        ulm_card_graph_hours: 1
-    - type: 'custom:button-card'
-      template: card_graph
-      entity: sensor.pfsense_interface_mullvad2_inbytes_kilobytes_per_second
-      variables:
-        ulm_card_graph_color: "var(--google-blue)"
-        ulm_card_graph_name: Mullvad2 Incoming
-        ulm_card_graph_entity: sensor.pfsense_interface_mullvad2_inbytes_kilobytes_per_second
-        ulm_card_graph_color2: "var(--google-green)"
-        ulm_card_graph_entity2: sensor.pfsense_interface_mullvad2_outbytes_kilobytes_per_second
-        ulm_card_graph_type: fill
-        ulm_card_graph_hours: 1
-- type: "horizontal-stack"
-  cards:
-    - type: 'custom:button-card'
-      template: card_graph
-      entity: sensor.pfsense_interface_lan_inbytes_kilobytes_per_second
-      variables:
-        ulm_card_graph_color: "var(--google-blue)"
-        ulm_card_graph_name: LAN Incoming
-        ulm_card_graph_entity: sensor.pfsense_interface_lan_inbytes_kilobytes_per_second
-        ulm_card_graph_color2: "var(--google-green)"
-        ulm_card_graph_entity2: sensor.pfsense_interface_lan_outbytes_kilobytes_per_second
-        ulm_card_graph_type: fill
-        ulm_card_graph_hours: 1
-    - type: 'custom:button-card'
-      template: card_graph
-      entity: sensor.pfsense_interface_backend_inbytes_kilobytes_per_second
-      variables:
-        ulm_card_graph_color: "var(--google-blue)"
-        ulm_card_graph_name: Backend Incoming
-        ulm_card_graph_entity: sensor.pfsense_interface_backend_inbytes_kilobytes_per_second
-        ulm_card_graph_color2: "var(--google-green)"
-        ulm_card_graph_entity2: sensor.pfsense_interface_backend_outbytes_kilobytes_per_second
-        ulm_card_graph_type: fill
-        ulm_card_graph_hours: 1

ui-lovelace.yaml

@@ -11,21 +11,27 @@ views:
   - title: "Overview"
     path: 0
     cards:
+
       - type: "vertical-stack"
         cards:
           !include lovelace/overview/welcome.yaml
+
       - type: "vertical-stack"
         cards:
           !include lovelace/overview/lights.yaml
+
       - type: "vertical-stack"
         cards:
           !include lovelace/overview/climate.yaml
+
       - type: "vertical-stack"
         cards:
           !include lovelace/overview/batteries.yaml
+      
       - type: "vertical-stack"
         cards:
           !include lovelace/overview/energy.yaml
+
       - type: "vertical-stack"
         cards:
           !include lovelace/overview/nas.yaml
@@ -34,35 +40,19 @@ views:
   - title: "Lights"
     path: 1
     cards:
+
       - type: "vertical-stack"
         cards:
           !include lovelace/lights/scenes.yaml
+
       - type: "vertical-stack"
         cards:
-          !include lovelace/lights/lightgroups.yaml
+          !include lovelace/lights//lightgroups.yaml
+
       - type: "vertical-stack"
         cards:
           !include lovelace/lights/lightbulbs.yaml
+
       - type: "vertical-stack"
         cards:
           !include lovelace/lights/lightstripes.yaml
-
-
-  - title: "pfSense"
-    path: 2
-    cards:
-      - type: "vertical-stack"
-        cards:
-          !include lovelace/pfsense/notifications.yaml
-      - type: "vertical-stack"
-        cards:
-          !include lovelace/pfsense/load.yaml
-      - type: "vertical-stack"
-        cards:
-          !include lovelace/pfsense/gateways.yaml
-      - type: "vertical-stack"
-        cards:
-          !include lovelace/pfsense/traffic.yaml
-      - type: "vertical-stack"
-        cards:
-          !include lovelace/pfsense/rules.yaml