diff --git a/.gitattributes b/.gitattributes
index 17098d8b73..2b6bff35eb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,5 @@
 *.png binary
 *.zip binary
 *.mp3 binary
+
+demo/public/api/camera_proxy_stream/* binary
diff --git a/demo/public/api/camera_proxy_stream/camera.backyard b/demo/public/api/camera_proxy_stream/camera.backyard
index 25120b26bf..d2c9a88111 100644
Binary files a/demo/public/api/camera_proxy_stream/camera.backyard and b/demo/public/api/camera_proxy_stream/camera.backyard differ
diff --git a/demo/public/api/camera_proxy_stream/camera.driveway b/demo/public/api/camera_proxy_stream/camera.driveway
index 746c30267e..072a0b152e 100644
Binary files a/demo/public/api/camera_proxy_stream/camera.driveway and b/demo/public/api/camera_proxy_stream/camera.driveway differ
diff --git a/demo/public/api/camera_proxy_stream/camera.patio b/demo/public/api/camera_proxy_stream/camera.patio
index 746c30267e..072a0b152e 100644
Binary files a/demo/public/api/camera_proxy_stream/camera.patio and b/demo/public/api/camera_proxy_stream/camera.patio differ
diff --git a/demo/public/api/camera_proxy_stream/camera.porch b/demo/public/api/camera_proxy_stream/camera.porch
index 3527dc52bf..8f1c740dda 100644
Binary files a/demo/public/api/camera_proxy_stream/camera.porch and b/demo/public/api/camera_proxy_stream/camera.porch differ
diff --git a/demo/src/configs/arsaboo/entities.ts b/demo/src/configs/arsaboo/entities.ts
index 3b1bf64e2d..a018a15e3d 100644
--- a/demo/src/configs/arsaboo/entities.ts
+++ b/demo/src/configs/arsaboo/entities.ts
@@ -6170,7 +6170,7 @@ export const demoEntitiesArsaboo: () => Entity[] = () =>
     },
     "light.lifx5": {
       entity_id: "light.lifx5",
-      state: "off",
+      state: "on",
       attributes: {
         min_mireds: 111,
         max_mireds: 400,
diff --git a/demo/src/configs/arsaboo/lovelace.ts b/demo/src/configs/arsaboo/lovelace.ts
index 5574cc2761..5dbf740726 100644
--- a/demo/src/configs/arsaboo/lovelace.ts
+++ b/demo/src/configs/arsaboo/lovelace.ts
@@ -135,10 +135,10 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
                 off: "brightness(80%) saturate(0.8)",
               },
               style: {
-                top: "48%",
+                top: "40%",
                 left: "11%",
                 width: "7%",
-                padding: "50px 50px 100px 50px",
+                padding: "10px",
               },
             },
             {
@@ -218,10 +218,10 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
                 off: "brightness(80%) saturate(0.8)",
               },
               style: {
-                top: "38%",
+                top: "34%",
                 left: "50%",
                 width: "7%",
-                padding: "50px 50px 100px 50px",
+                padding: "10px",
               },
             },
             {
@@ -299,10 +299,10 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
                 off: "brightness(80%) saturate(0.8)",
               },
               style: {
-                top: "98%",
+                top: "92%",
                 left: "20%",
                 width: "7%",
-                padding: "50px 50px 100px 50px",
+                padding: "10px",
               },
             },
             {
@@ -337,10 +337,10 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
                 off: "brightness(80%) saturate(0.8)",
               },
               style: {
-                top: "68%",
+                top: "60%",
                 left: "78%",
                 width: "7%",
-                padding: "50px 50px 100px 50px",
+                padding: "10px",
               },
             },
             {
@@ -358,11 +358,10 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
                 off: "brightness(80%) saturate(0.8)",
               },
               style: {
-                top: "81%",
-                left: "63%",
+                top: "84%",
+                left: "82%",
                 width: "7%",
-                padding: "0 50px 100px 50px",
-                transform: "none",
+                padding: "10px",
               },
             },
             {
@@ -491,7 +490,7 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
                 top: "70%",
                 left: "80%",
                 width: "7%",
-                padding: "50px 50px 100px 50px",
+                padding: "10px",
               },
             },
             {