diff --git a/Meetio.json b/Meetio.json
index 2dc703f6..6fbd17db 100644
--- a/Meetio.json
+++ b/Meetio.json
@@ -583,9 +583,133 @@
             "layer0.opacity": 1
         },
         {
-            "class": "grid_layout_control",
-            "border_color": "color(var(color_accent) blenda(var(color_black) 30%))",
-            "border_size": 2
+            "class": "text_line_control",
+            "layer0.opacity": 1,
+            "layer0.inner_margin": [
+                20,
+                5,
+                20,
+                5
+            ],
+            "layer0.tint": "var(input_background_color)",
+            "layer1.tint": "var(input_border_color)",
+            "layer1.opacity": 1,
+            "layer1.inner_margin": "var(input_border_size)",
+            "layer1.draw_center": false,
+            "tint_index": 1,
+            "content_margin": [
+                12,
+                8,
+                12,
+                8
+            ],
+            "color_scheme_tint": "var(input_background_color)"
+        },
+        {
+            "class": "text_line_control",
+            "platforms": [
+                "osx",
+                "linux"
+            ],
+            "parents": [
+                {
+                    "class": "overlay_control"
+                }
+            ],
+            "layer1.opacity": 0,
+            "content_margin": [
+                52,
+                10,
+                10,
+                10
+            ],
+            "settings": [
+                "meetio_input_search_icon"
+            ]
+        },
+        {
+            "class": "text_line_control",
+            "parents": [
+                {
+                    "class": "overlay_control"
+                }
+            ],
+            "layer1.opacity": 0,
+            "layer2.inner_margin": [
+                52,
+                48,
+                0,
+                0
+            ],
+            "layer2.draw_center": false,
+            "layer2.texture": "Meetio/assets/default/icon_search.png",
+            "layer2.tint": "var(color_accent)",
+            "layer2.opacity": 1,
+            "settings": [
+                "meetio_input_search_icon"
+            ]
+        },
+        {
+            "class": "text_line_control",
+            "platforms": [
+                "osx",
+                "linux"
+            ],
+            "parents": [
+                {
+                    "class": "switch_project_window"
+                }
+            ],
+            "layer1.opacity": 0,
+            "content_margin": [
+                52,
+                10,
+                10,
+                10
+            ],
+            "settings": [
+                "meetio_input_search_icon"
+            ]
+        },
+        {
+            "class": "text_line_control",
+            "parents": [
+                {
+                    "class": "switch_project_window"
+                }
+            ],
+            "layer2.inner_margin": [
+                52,
+                48,
+                0,
+                0
+            ],
+            "layer2.draw_center": false,
+            "layer2.texture": "Meetio/assets/default/icon_search.png",
+            "layer2.tint": "var(color_accent)",
+            "layer2.opacity": 1,
+            "layer1.opacity": 0,
+            "settings": [
+                "meetio_input_search_icon"
+            ]
+        },
+        {
+            "class": "dropdown_button_control",
+            "layer0.texture": "Meetio/assets/default/overflow_menu.png",
+            "layer0.tint": "var(color_accent)",
+            "layer0.opacity": 1,
+            "layer0.inner_margin": 0,
+            "content_margin": [
+                12,
+                12
+            ]
+        },
+        {
+            "class": "dropdown_button_control",
+            "attributes": [
+                "hover"
+            ],
+            "layer0.opacity": 0.8
         },
         {
             "class": "disclosure_button_control",
@@ -767,133 +891,56 @@
             "layer0.opacity": 1
         },
         {
-            "class": "text_line_control",
+            "class": "grid_layout_control",
+            "border_color": "color(var(color_accent) blenda(var(color_black) 30%))",
+            "border_size": 2
+        },
+        {
+            "class": "close_button",
+            "layer0.texture": "Meetio/assets/default/icon_close.png",
+            "layer0.tint": "var(color_accent)",
             "layer0.opacity": 1,
             "layer0.inner_margin": [
-                20,
-                5,
-                20,
-                5
+                3,
+                3
             ],
-            "layer0.tint": "var(input_background_color)",
-            "layer1.tint": "var(input_border_color)",
-            "layer1.opacity": 1,
-            "layer1.inner_margin": "var(input_border_size)",
-            "layer1.draw_center": false,
-            "tint_index": 1,
             "content_margin": [
-                12,
                 8,
-                12,
                 8
-            ],
-            "color_scheme_tint": "var(input_background_color)"
-        },
-        {
-            "class": "text_line_control",
-            "platforms": [
-                "osx",
-                "linux"
-            ],
-            "parents": [
-                {
-                    "class": "overlay_control"
-                }
-            ],
-            "layer1.opacity": 0,
-            "content_margin": [
-                52,
-                10,
-                10,
-                10
-            ],
-            "settings": [
-                "meetio_input_search_icon"
             ]
         },
         {
-            "class": "text_line_control",
+            "class": "close_button",
             "parents": [
                 {
-                    "class": "overlay_control"
+                    "class": "tree_row",
+                    "attributes": [
+                        "hover"
+                    ]
                 }
             ],
-            "layer1.opacity": 0,
-            "layer2.inner_margin": [
-                52,
-                48,
-                0,
-                0
-            ],
-            "layer2.draw_center": false,
-            "layer2.texture": "Meetio/assets/default/icon_search.png",
-            "layer2.tint": "var(color_accent)",
-            "layer2.opacity": 1,
-            "settings": [
-                "meetio_input_search_icon"
-            ]
+            "layer0.opacity": 1
         },
         {
-            "class": "text_line_control",
-            "platforms": [
-                "osx",
-                "linux"
-            ],
-            "parents": [
-                {
-                    "class": "switch_project_window"
-                }
-            ],
-            "layer1.opacity": 0,
-            "content_margin": [
-                52,
-                10,
-                10,
-                10
+            "class": "close_button",
+            "attributes": [
+                "dirty"
             ],
             "settings": [
-                "meetio_input_search_icon"
-            ]
-        },
-        {
-            "class": "text_line_control",
-            "parents": [
-                {
-                    "class": "switch_project_window"
-                }
-            ],
-            "layer2.inner_margin": [
-                52,
-                48,
-                0,
-                0
+                "meetio_tabs_diff_highlight",
+                "highlight_modified_tabs"
             ],
-            "layer2.draw_center": false,
-            "layer2.texture": "Meetio/assets/default/icon_search.png",
-            "layer2.tint": "var(color_accent)",
-            "layer2.opacity": 1,
-            "layer1.opacity": 0,
-            "settings": [
-                "meetio_input_search_icon"
-            ]
-        },
-        {
-            "class": "dropdown_button_control",
-            "layer0.texture": "Meetio/assets/default/overflow_menu.png",
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 1,
-            "layer0.inner_margin": 0,
-            "content_margin": [
-                12,
-                12
-            ]
+            "layer0.texture": "Meetio/assets/default/dirty_icon.png",
+            "layer0.tint": "var(color_accent)"
         },
         {
-            "class": "dropdown_button_control",
+            "class": "close_button",
             "attributes": [
-                "hover"
+                "hover",
+                "dirty"
             ],
-            "layer0.opacity": 0.8
+            "layer0.texture": "Meetio/assets/default/dirty_icon.png",
+            "layer0.tint": "var(color_accent)"
         },
         {
             "class": "label_control",
@@ -946,47 +993,21 @@
             ]
         },
         {
-            "class": "close_button",
-            "layer0.texture": "Meetio/assets/default/icon_close.png",
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 1,
-            "layer0.inner_margin": [
-                0,
-                0
-            ],
-            "content_margin": [
-                8,
-                7
-            ]
-        },
-        {
-            "class": "close_button",
-            "parents": [
-                {
-                    "class": "tree_row",
-                    "attributes": [
-                        "hover"
-                    ]
-                }
+            "class": "progress_bar_control",
+            "layer0.tint": [
+                "background",
+                0.94
             ],
             "layer0.opacity": 1
         },
         {
-            "class": "close_button",
-            "attributes": [
-                "dirty"
-            ],
-            "layer0.texture": "Meetio/assets/default/dirty_icon.png",
-            "layer0.tint": "var(color_accent)"
-        },
-        {
-            "class": "close_button",
-            "attributes": [
-                "hover",
-                "dirty"
-            ],
-            "layer0.texture": "Meetio/assets/default/dirty_icon.png",
-            "layer0.tint": "var(color_accent)"
+            "class": "progress_gauge_control",
+            "layer0.tint": "var(color_accent)",
+            "layer0.opacity": 1,
+            "content_margin": [
+                0,
+                8
+            ]
         },
         {
             "class": "panel_control",
@@ -1144,23 +1165,6 @@
                 "interpolation": "smoothstep"
             }
         },
-        {
-            "class": "progress_bar_control",
-            "layer0.tint": [
-                "background",
-                0.94
-            ],
-            "layer0.opacity": 1
-        },
-        {
-            "class": "progress_gauge_control",
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 1,
-            "content_margin": [
-                0,
-                8
-            ]
-        },
         {
             "class": "mini_quick_panel_row",
             "layer0.tint": [
@@ -2025,6 +2029,14 @@
             ],
             "layer0.opacity": 0.8
         },
+        {
+            "class": "title_bar",
+            "settings": [
+                "meetio_titlebar"
+            ],
+            "bg": "var(title_bar_background)",
+            "fg": "var(title_bar_foreground_color)"
+        },
         {
             "class": "tool_tip_control",
             "layer0.tint": "var(tooltip_background_color)",
@@ -2038,14 +2050,6 @@
             "class": "tool_tip_label_control",
             "fg": "var(tooltip_label_foreground_color)"
         },
-        {
-            "class": "title_bar",
-            "settings": [
-                "meetio_titlebar"
-            ],
-            "bg": "var(title_bar_background)",
-            "fg": "var(title_bar_foreground_color)"
-        },
         {
             "class": "vcs_status_badge",
             "parents": [
diff --git a/examples/file.css b/examples/file.css
index cc792909..055fa770 100644
--- a/examples/file.css
+++ b/examples/file.css
@@ -1,8 +1,6 @@
-
-
 :root {
     --accent-color: #0ea;
-};
+}
 
 body {
   font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif;
diff --git a/schemes/Meetio-Lighter.sublime-color-scheme b/schemes/Meetio-Lighter.sublime-color-scheme
index a44650b9..153f93cf 100644
--- a/schemes/Meetio-Lighter.sublime-color-scheme
+++ b/schemes/Meetio-Lighter.sublime-color-scheme
@@ -47,6 +47,16 @@
         "tags_options": "stippled_underline"
     },
     "rules": [
+        {
+            "foreground": "#ABABABFF",
+            "scope": "col_2D2B2AFF",
+            "background": "#2D2B2AFF"
+        },
+        {
+            "foreground": "#727272FF",
+            "scope": "col_F5F2F0FF",
+            "background": "#F5F2F0FF"
+        },
         {
             "foreground": "#FBFBFBFF",
             "scope": "col_6772E4FF",
diff --git a/src/themes/files/open_files.json b/src/themes/files/open_files.json
index 3a678566..8fea4301 100644
--- a/src/themes/files/open_files.json
+++ b/src/themes/files/open_files.json
@@ -4,8 +4,8 @@
         "layer0.texture": "Meetio/assets/default/icon_close.png",
         "layer0.tint": "var(color_accent)",
         "layer0.opacity": 1,
-        "layer0.inner_margin": [0, 0],
-        "content_margin": [8, 7]
+        "layer0.inner_margin": [3, 3],
+        "content_margin": [8, 8]
     },
     {
         "class": "close_button",
@@ -15,6 +15,7 @@
     {
         "class": "close_button",
         "attributes": ["dirty"],
+        "settings": ["meetio_tabs_diff_highlight", "highlight_modified_tabs"],
         "layer0.texture": "Meetio/assets/default/dirty_icon.png",
         "layer0.tint": "var(color_accent)"
     },