diff --git a/Mariana-Theme-Light.sublime-theme b/Mariana-Theme-Light.sublime-theme
index 01af4627..0140d8f1 100644
--- a/Mariana-Theme-Light.sublime-theme
+++ b/Mariana-Theme-Light.sublime-theme
@@ -460,11 +460,11 @@
     {
         "class": "fold_button_control",
         "layer0.texture": "mariana-theme/assets/light/arrow_right.png",
-        "layer0.opacity": 1,
+        "layer0.opacity": 0.4,
         "layer0.inner_margin": 0,
         "content_margin": [
-            4,
-            4
+            12,
+            12
         ]
     },
     {
@@ -472,14 +472,22 @@
         "attributes": [
             "hover"
         ],
-        "layer0.opacity": 0.8
+        "layer0.opacity": 1,
+        "content_margin": [
+            12,
+            12
+        ]
     },
     {
         "class": "fold_button_control",
         "attributes": [
             "expanded"
         ],
-        "layer0.texture": "mariana-theme/assets/light/arrow_down.png"
+        "layer0.texture": "mariana-theme/assets/light/arrow_down.png",
+        "content_margin": [
+            12,
+            12
+        ]
     },
     {
         "class": "dialog",
@@ -719,43 +727,11 @@
             }
         ]
     },
-    {
-        "class": "close_button",
-        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
-        "layer0.opacity": 1,
-        "content_margin": [
-            8,
-            8
-        ]
-    },
-    {
-        "class": "close_button",
-        "attributes": [
-            "hover"
-        ],
-        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
-        "layer0.opacity": 1
-    },
-    {
-        "class": "close_button",
-        "attributes": [
-            "dirty"
-        ],
-        "layer0.texture": "mariana-theme/assets/light/dirty_icon.png"
-    },
-    {
-        "class": "close_button",
-        "attributes": [
-            "hover",
-            "dirty"
-        ],
-        "layer0.texture": "mariana-theme/assets/light/dirty_icon.png"
-    },
     {
         "class": "panel_control",
         "layer0.tint": [
             "background",
-            0.9
+            0.94
         ],
         "layer0.inner_margin": [
             2,
@@ -814,6 +790,38 @@
             "interpolation": "smoothstep"
         }
     },
+    {
+        "class": "close_button",
+        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
+        "layer0.opacity": 1,
+        "content_margin": [
+            8,
+            8
+        ]
+    },
+    {
+        "class": "close_button",
+        "attributes": [
+            "hover"
+        ],
+        "layer0.texture": "mariana-theme/assets/light/icon_close.png",
+        "layer0.opacity": 1
+    },
+    {
+        "class": "close_button",
+        "attributes": [
+            "dirty"
+        ],
+        "layer0.texture": "mariana-theme/assets/light/dirty_icon.png"
+    },
+    {
+        "class": "close_button",
+        "attributes": [
+            "hover",
+            "dirty"
+        ],
+        "layer0.texture": "mariana-theme/assets/light/dirty_icon.png"
+    },
     {
         "class": "overlay_control",
         "layer0.texture": "mariana-theme/assets/light/overlay_bg.png",
@@ -868,7 +876,7 @@
         ],
         "layer0.tint": [
             "foreground",
-            1
+            0.9
         ]
     },
     {
@@ -926,7 +934,7 @@
         ],
         "layer0.tint": [
             "foreground",
-            1
+            0.9
         ],
         "layer1.opacity": 0
     },
@@ -1406,76 +1414,6 @@
         ],
         "font.italic": false
     },
-    {
-        "class": "status_bar",
-        "layer0.tint": [
-            "hsl",
-            242,
-            15,
-            36
-        ],
-        "layer0.opacity": 1,
-        "content_margin": [
-            10,
-            2,
-            0,
-            2
-        ]
-    },
-    {
-        "class": "panel_button_control",
-        "layer0.texture": "mariana-theme/assets/light/overflow_menu.png",
-        "layer0.opacity": 1,
-        "content_margin": [
-            8,
-            8
-        ]
-    },
-    {
-        "class": "panel_button_control",
-        "attributes": [
-            "hover"
-        ],
-        "layer0.texture": "mariana-theme/assets/light/overflow_menu.png"
-    },
-    {
-        "class": "status_container",
-        "content_margin": [
-            8,
-            0,
-            0,
-            0
-        ]
-    },
-    {
-        "class": "status_button",
-        "content_margin": [
-            10,
-            0,
-            10,
-            0
-        ],
-        "min_size": [
-            80,
-            0
-        ]
-    },
-    {
-        "class": "label_control",
-        "parents": [
-            {
-                "class": "status_bar"
-            }
-        ],
-        "font.size": 11,
-        "color": [
-            "hsl",
-            220,
-            0,
-            100
-        ],
-        "font.bold": false
-    },
     {
         "class": "tabset_control",
         "layer0.opacity": 1,
@@ -1832,6 +1770,76 @@
             "interpolation": "smoothstep"
         }
     },
+    {
+        "class": "status_bar",
+        "layer0.tint": [
+            "hsl",
+            242,
+            15,
+            36
+        ],
+        "layer0.opacity": 1,
+        "content_margin": [
+            10,
+            2,
+            0,
+            2
+        ]
+    },
+    {
+        "class": "panel_button_control",
+        "layer0.texture": "mariana-theme/assets/light/overflow_menu.png",
+        "layer0.opacity": 1,
+        "content_margin": [
+            8,
+            8
+        ]
+    },
+    {
+        "class": "panel_button_control",
+        "attributes": [
+            "hover"
+        ],
+        "layer0.texture": "mariana-theme/assets/light/overflow_menu.png"
+    },
+    {
+        "class": "status_container",
+        "content_margin": [
+            8,
+            0,
+            0,
+            0
+        ]
+    },
+    {
+        "class": "status_button",
+        "content_margin": [
+            10,
+            0,
+            10,
+            0
+        ],
+        "min_size": [
+            80,
+            0
+        ]
+    },
+    {
+        "class": "label_control",
+        "parents": [
+            {
+                "class": "status_bar"
+            }
+        ],
+        "font.size": 11,
+        "color": [
+            "hsl",
+            220,
+            0,
+            100
+        ],
+        "font.bold": false
+    },
     {
         "class": "title_bar",
         "bg": [
diff --git a/examples/hello.json b/examples/hello.json
deleted file mode 100644
index e69de29b..00000000
diff --git a/examples/index.html b/examples/index.html
index 1d53cef3..cbb676f9 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -8,7 +8,6 @@
     <title>Bootstrap</title>
     <!-- Bootstrap core CSS -->
     <link href="./dist/css/bootstrap.css" rel="stylesheet">
-
     <!-- Documentation extras -->
     <link href="./assets/css/docs.css" rel="stylesheet">
     <link href="./assets/css/pygments-manni.css" rel="stylesheet">
diff --git a/src/themes/light/code_folding.json b/src/themes/light/code_folding.json
index 88ba64fa..faf7e5e2 100644
--- a/src/themes/light/code_folding.json
+++ b/src/themes/light/code_folding.json
@@ -2,18 +2,20 @@
     {
         "class": "fold_button_control",
         "layer0.texture": "mariana-theme/assets/light/arrow_right.png",
-        "layer0.opacity": 1.0,
+        "layer0.opacity": 0.4,
         "layer0.inner_margin": 0,
-        "content_margin": [4, 4]
+        "content_margin": [12, 12]
     },
     {
         "class": "fold_button_control",
         "attributes": ["hover"],
-        "layer0.opacity": 0.8
+        "layer0.opacity": 1.0,
+        "content_margin": [12, 12]
     },
     {
         "class": "fold_button_control",
         "attributes": ["expanded"],
-        "layer0.texture": "mariana-theme/assets/light/arrow_down.png"
+        "layer0.texture": "mariana-theme/assets/light/arrow_down.png",
+        "content_margin": [12, 12]
     }
 ]
diff --git a/src/themes/light/panels.json b/src/themes/light/panels.json
index 1a971d2c..f7fb7ab5 100644
--- a/src/themes/light/panels.json
+++ b/src/themes/light/panels.json
@@ -1,7 +1,7 @@
 [
     {
         "class": "panel_control",
-        "layer0.tint": ["background", 0.9],
+        "layer0.tint": ["background", 0.94],
         "layer0.inner_margin": [2, 2, 2, 2],
         "layer0.opacity": 1.0,
         "content_margin": [6, 12, 6, 12]