diff --git a/resources/images/spot_button_off.png b/resources/images/spot_button_off.png
index 39b7434..7ee3f59 100644
--- a/resources/images/spot_button_off.png
+++ b/resources/images/spot_button_off.png
diff --git a/resources/images/spot_button_on.png b/resources/images/spot_button_on.png
index f840f9e..69c3ed1 100644
--- a/resources/images/spot_button_on.png
+++ b/resources/images/spot_button_on.png
diff --git a/resources/images/spot_jelly_off.png b/resources/images/spot_jelly_off.png
index 8db76ca..52bcd82 100644
--- a/resources/images/spot_jelly_off.png
+++ b/resources/images/spot_jelly_off.png
diff --git a/resources/images/spot_jelly_on.png b/resources/images/spot_jelly_on.png
index 0454abe..d5f00e2 100644
--- a/resources/images/spot_jelly_on.png
+++ b/resources/images/spot_jelly_on.png
diff --git a/resources/scripts/animated-buttons.json b/resources/scripts/animated-buttons.json
index 19af1d3..e0a1b4a 100644
--- a/resources/scripts/animated-buttons.json
+++ b/resources/scripts/animated-buttons.json
@@ -79,9 +79,9 @@
       "sizeAspectRatio": false,
       "visible": true,
       "color": [
-        1,
-        1,
-        1,
+        0,
+        0,
+        0,
         1
       ],
       "image": {
@@ -111,9 +111,9 @@
       "sizeAspectRatio": false,
       "visible": true,
       "color": [
-        1,
-        1,
-        1,
+        0,
+        0,
+        0,
         1
       ],
       "image": {
@@ -147,9 +147,9 @@
       ],
       "sizeAspectRatio": false,
       "color": [
-        1,
-        1,
-        1,
+        0,
+        0,
+        0,
         1
       ],
       "image": {
@@ -195,7 +195,7 @@
     },
     {
       "type": "Control",
-      "name": "Left Black",
+      "name": "Left Crop",
       "relayout-enabled": false,
       "position": [
         144.5,
@@ -209,9 +209,9 @@
       ],
       "sizeAspectRatio": false,
       "background-color": [
-        0,
-        0,
-        0,
+        1,
+        1,
+        1,
         1
       ],
       "color": [
@@ -224,7 +224,7 @@
     },
     {
       "type": "Control",
-      "name": "Right Black",
+      "name": "Right Crop",
       "relayout-enabled": false,
       "position": [
         629.5,
@@ -238,9 +238,9 @@
       ],
       "sizeAspectRatio": false,
       "background-color": [
-        0,
-        0,
-        0,
+        1,
+        1,
+        1,
         1
       ],
       "color": [
@@ -427,7 +427,7 @@
           "timelineColor": "#b0e8f9"
         },
         {
-          "actor": "Left Black",
+          "actor": "Left Crop",
           "property": "position",
           "value": [
             144.5,
@@ -457,7 +457,7 @@
           "timelineColor": "#a2cfea"
         },
         {
-          "actor": "Right Black",
+          "actor": "Right Crop",
           "property": "position",
           "value": [
             629.5,
@@ -627,7 +627,7 @@
           "timelineColor": "#b0e8f9"
         },
         {
-          "actor": "Left Black",
+          "actor": "Left Crop",
           "property": "position",
           "value": [
             -95,
@@ -657,7 +657,7 @@
           "timelineColor": "#a2cfea"
         },
         {
-          "actor": "Right Black",
+          "actor": "Right Crop",
           "property": "position",
           "value": [
             383,
diff --git a/resources/scripts/animated-colors.json b/resources/scripts/animated-colors.json
index bcb6133..bb0a140 100644
--- a/resources/scripts/animated-colors.json
+++ b/resources/scripts/animated-colors.json
@@ -18,7 +18,6 @@
   "stage": [
     {
       "type": "Control",
-      "draw-mode": "OVERLAY_2D",
       "actors": [
         {
           "type": "Control",
diff --git a/resources/scripts/button.json b/resources/scripts/button.json
index 9b3d46e..481d11d 100644
--- a/resources/scripts/button.json
+++ b/resources/scripts/button.json
@@ -26,12 +26,9 @@
       "anchor-point": "TOP_CENTER",
       "position": [0, 0, 0],
       "size": [400, 200, 0],
-      "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png",
-      "selected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-2.png",
-      "label-actor": {
-        "type": "TextLabel",
-        "text": "Normal"
-      }
+      "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png",
+      "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-2.png",
+      "label-text": "Normal"
     },
 
     // Second Button
@@ -41,14 +38,11 @@
       "anchor-point": "CENTER",
       "position": [0, 0, 0],
       "size": [400, 200, 0],
-      "label-actor": {
-        "type": "TextLabel",
-        "text": "Disabled"
-      },
       "disabled": true,
-      "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png",
-      "selected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-2.png",
-      "disabled-state-actor": "{DALI_IMAGE_DIR}blocks-brick-3.png"
+      "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png",
+      "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-2.png",
+      "disabled-state-image": "{DALI_IMAGE_DIR}blocks-brick-3.png",
+      "label-text": "Disabled"
     },
 
     // Third Button
@@ -59,13 +53,10 @@
       "anchor-point": "BOTTOM_CENTER",
       "position": [0, 0, 0],
       "size": [400, 200, 0],
-      "label-actor": {
-        "type": "TextLabel",
-        "text": "Toggle"
-      },
       "togglable": true,
-      "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png",
-      "selected-state-actor": "{DALI_IMAGE_DIR}blocks-paddle.png",
+      "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png",
+      "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-3.png",
+      "label-text": "Toggle",
       "signals": [{
         "name": "selected",
         "action": "set",
diff --git a/resources/scripts/timing.json b/resources/scripts/timing.json
index e3864f1..00cb973 100644
--- a/resources/scripts/timing.json
+++ b/resources/scripts/timing.json
@@ -14,6 +14,10 @@
   },
   "stage": [
     {
+    "type": "Actor",
+    "parent-origin": "CENTER",
+    "anchor-point": "CENTER",
+    "actors": [{
       "type": "color-control",
       "name": "Container 1",
       "position": [
@@ -84,6 +88,7 @@
         55,
         0
       ]
+    }]
     },
     {
       "type": "Control",