diff --git a/Home_Assistant/blueprints/hasp_Core_Functionality.yaml b/Home_Assistant/blueprints/hasp_Core_Functionality.yaml
index c5f05f1..4eba5c3 100644
--- a/Home_Assistant/blueprints/hasp_Core_Functionality.yaml
+++ b/Home_Assistant/blueprints/hasp_Core_Functionality.yaml
@@ -365,91 +365,7 @@ action:
                 [{% for p in range(1,12) %}"p[{{p}}].b[1].font={{page1font}}","p[{{p}}].b[1].txt=\"{{page1text}}\"",{% endfor %}
                 {% for p in range(1,12) %}"p[{{p}}].b[2].font={{page2font}}","p[{{p}}].b[2].txt=\"{% if page_scroll %}{{page_names.get("page" ~ p)}}{% else %}{{page2text}}{% endif %}\"",{% endfor %}
                 {% for p in range(1,12) %}"p[{{p}}].b[3].font={{page3font}}","p[{{p}}].b[3].txt=\"{{page3text}}\""{% if not loop.last %},{% endif %}{% endfor %}]
-<<<<<<< HEAD
 
-=======
-          - delay: "00:00:01" # give MQTT discovery a second to find our RGB theme lights
-          - service: mqtt.publish # apply selected foreground color to page select buttons
-            data:
-              topic: "{{jsoncommandtopic}}"
-              payload: >-
-                {%- set color = namespace() -%}
-                {%- for entity in device_entities(haspdevice) -%}
-                  {%- if entity|regex_search("^light\..*_selected_foreground_color(?:_\d+|)$") -%}
-                    {%- set color.source=entity -%}
-                  {%- endif -%}
-                {%- endfor -%}
-                {%- set brightness = state_attr(color.source, "brightness")|int / 255 -%}
-                {%- set red=(state_attr(color.source, "rgb_color")[0] * brightness)|int -%}
-                {%- set green=(state_attr(color.source, "rgb_color")[1] * brightness)|int -%}
-                {%- set blue=(state_attr(color.source, "rgb_color")[2] * brightness)|int -%}
-                {%- set colorcode = (red|bitwise_and(248)*256) + (green|bitwise_and(252)*8) + (blue|bitwise_and(248)/8)|int -%}
-                [{%- if not page_scroll -%}{%- for p in range(1,12) %}{%- if p == page1page|int %}"p[{{p}}].b[1].pco={{colorcode}}"{%- else -%}"p[{{p}}].b[1].pco2={{colorcode}}"{%- endif -%},{%- endfor -%}
-                {%- else -%}{%- for p in range(1,12) %}"p[{{p}}].b[1].pco2={{colorcode}}",{%- endfor -%}{%- endif -%}
-                {%- for p in range(1,12) %}{%- if p == page2page|int %}"p[{{p}}].b[2].pco={{colorcode}}"{%- else -%}"p[{{p}}].b[2].pco2={{colorcode}}"{%- endif -%},{%- endfor -%}
-                {%- if not page_scroll -%}{%- for p in range(1,12) %}{%- if p == page3page|int %}"p[{{p}}].b[3].pco={{colorcode}}"{%- else -%}"p[{{p}}].b[3].pco2={{colorcode}}"{%- endif -%}{% if not loop.last %},{% endif %}{%- endfor -%}
-                {%- else -%}{%- for p in range(1,12) %}"p[{{p}}].b[3].pco2={{colorcode}}"{% if not loop.last %},{% endif %}{%- endfor -%}{%- endif -%}]
-          - service: mqtt.publish # apply selected background color to page select buttons
-            data:
-              topic: "{{jsoncommandtopic}}"
-              payload: >-
-                {%- set color = namespace() -%}
-                {%- for entity in device_entities(haspdevice) -%}
-                  {%- if entity|regex_search("^light\..*_selected_background_color(?:_\d+|)$") -%}
-                    {%- set color.source=entity -%}
-                  {%- endif -%}
-                {%- endfor -%}
-                {%- set brightness = state_attr(color.source, "brightness")|int / 255 -%}
-                {%- set red=(state_attr(color.source, "rgb_color")[0] * brightness)|int -%}
-                {%- set green=(state_attr(color.source, "rgb_color")[1] * brightness)|int -%}
-                {%- set blue=(state_attr(color.source, "rgb_color")[2] * brightness)|int -%}
-                {%- set colorcode = (red|bitwise_and(248)*256) + (green|bitwise_and(252)*8) + (blue|bitwise_and(248)/8)|int -%}
-                [{%- if not page_scroll -%}{%- for p in range(1,12) %}{%- if p == page1page|int %}"p[{{p}}].b[1].bco={{colorcode}}"{%- else -%}"p[{{p}}].b[1].bco2={{colorcode}}"{%- endif -%},{%- endfor -%}
-                {% else %}{%- for p in range(1,12) %}"p[{{p}}].b[1].bco2={{colorcode}}",{%- endfor -%}{%- endif -%}
-                {%- for p in range(1,12) %}{%- if p == page2page|int %}"p[{{p}}].b[2].bco={{colorcode}}"{%- else -%}"p[{{p}}].b[2].bco2={{colorcode}}"{%- endif -%},{%- endfor -%}
-                {%- if not page_scroll -%}{%- for p in range(1,12) %}{%- if p == page3page|int %}"p[{{p}}].b[3].bco={{colorcode}}"{%- else -%}"p[{{p}}].b[3].bco2={{colorcode}}"{%- endif -%}{% if not loop.last %},{% endif %}{%- endfor -%}
-                {% else %}{%- for p in range(1,12) %}"p[{{p}}].b[3].bco2={{colorcode}}"{% if not loop.last %},{% endif %}{%- endfor -%}{%- endif -%}]
-          - service: mqtt.publish # apply unselected foreground color to page select buttons
-            data:
-              topic: "{{jsoncommandtopic}}"
-              payload: >-
-                {%- set color = namespace() -%}
-                {%- for entity in device_entities(haspdevice) -%}
-                  {%- if entity|regex_search("^light\..*_unselected_foreground_color(?:_\d+|)$") -%}
-                    {%- set color.source=entity -%}
-                  {%- endif -%}
-                {%- endfor -%}
-                {%- set brightness = state_attr(color.source, "brightness")|int / 255 -%}
-                {%- set red=(state_attr(color.source, "rgb_color")[0] * brightness)|int -%}
-                {%- set green=(state_attr(color.source, "rgb_color")[1] * brightness)|int -%}
-                {%- set blue=(state_attr(color.source, "rgb_color")[2] * brightness)|int -%}
-                {%- set colorcode = (red|bitwise_and(248)*256) + (green|bitwise_and(252)*8) + (blue|bitwise_and(248)/8)|int -%}
-                [{%- if not page_scroll -%}{%- for p in range(1,12) %}{%- if p == page1page|int %}"p[{{p}}].b[1].pco2={{colorcode}}"{%- else -%}"p[{{p}}].b[1].pco={{colorcode}}"{%- endif -%},{%- endfor -%}
-                {% else %}{%- for p in range(1,12) %}"p[{{p}}].b[1].pco={{colorcode}}",{%- endfor -%}{%- endif -%}
-                {%- for p in range(1,12) %}{%- if p == page2page|int %}"p[{{p}}].b[2].pco2={{colorcode}}"{%- else -%}"p[{{p}}].b[2].pco={{colorcode}}"{%- endif -%},{%- endfor -%}
-                {%- if not page_scroll -%}{%- for p in range(1,12) %}{%- if p == page3page|int %}"p[{{p}}].b[3].pco2={{colorcode}}"{%- else -%}"p[{{p}}].b[3].pco={{colorcode}}"{%- endif -%}{% if not loop.last %},{% endif %}{%- endfor -%}
-                {% else %}{%- for p in range(1,12) %}"p[{{p}}].b[3].pco={{colorcode}}"{% if not loop.last %},{% endif %}{%- endfor -%}{%- endif -%}]
-          - service: mqtt.publish # apply unselected background color to page select buttons
-            data:
-              topic: "{{jsoncommandtopic}}"
-              payload: >-
-                {%- set color = namespace() -%}
-                {%- for entity in device_entities(haspdevice) -%}
-                  {%- if entity|regex_search("^light\..*_unselected_background_color(?:_\d+|)$") -%}
-                    {%- set color.source=entity -%}
-                  {%- endif -%}
-                {%- endfor -%}
-                {%- set brightness = state_attr(color.source, "brightness")|int / 255 -%}
-                {%- set red=(state_attr(color.source, "rgb_color")[0] * brightness)|int -%}
-                {%- set green=(state_attr(color.source, "rgb_color")[1] * brightness)|int -%}
-                {%- set blue=(state_attr(color.source, "rgb_color")[2] * brightness)|int -%}
-                {%- set colorcode = (red|bitwise_and(248)*256) + (green|bitwise_and(252)*8) + (blue|bitwise_and(248)/8)|int -%}
-                [{%- if not page_scroll -%}{%- for p in range(1,12) %}{%- if p == page1page|int %}"p[{{p}}].b[1].bco2={{colorcode}}"{%- else -%}"p[{{p}}].b[1].bco={{colorcode}}"{%- endif -%},{%- endfor -%}
-                {% else %}{%- for p in range(1,12) %}"p[{{p}}].b[1].bco={{colorcode}}",{%- endfor -%}{%- endif -%}
-                {%- for p in range(1,12) %}{%- if p == page2page|int %}"p[{{p}}].b[2].bco2={{colorcode}}"{%- else -%}"p[{{p}}].b[2].bco={{colorcode}}"{%- endif -%},{%- endfor -%}
-                {%- if not page_scroll -%}{%- for p in range(1,12) %}{%- if p == page3page|int %}"p[{{p}}].b[3].bco2={{colorcode}}"{%- else -%}"p[{{p}}].b[3].bco={{colorcode}}"{%- endif -%}{% if not loop.last %},{% endif %}{%- endfor -%}
-                {% else %}{%- for p in range(1,12) %}"p[{{p}}].b[3].bco={{colorcode}}"{% if not loop.last %},{% endif %}{%- endfor -%}{%- endif -%}]
->>>>>>> 7ab5075d13da52a0f5f1d0e63073aa2343368652
           - choose:
               #########################################################################
               # Create a notification with the lovelace entity card YAML