From e6f483a80403edba8478dddf2bf05f28f522c2a8 Mon Sep 17 00:00:00 2001
From: Ike Kurghinyan <mail@dempfi.com>
Date: Mon, 13 Sep 2021 09:51:38 +0300
Subject: [PATCH] Fix win and autocompletion

---
 ayu-dark.sublime-theme   | 434 +++++++++++++++++++++++++++++++++++++--
 ayu-light.sublime-theme  | 434 +++++++++++++++++++++++++++++++++++++--
 ayu-mirage.sublime-theme | 434 +++++++++++++++++++++++++++++++++++++--
 messages.json            |   1 +
 messages/6.0.1.md        |  27 +++
 src/templates/ui.ts      | 305 +++++++++++++++++++++++++--
 6 files changed, 1570 insertions(+), 65 deletions(-)
 create mode 100644 messages/6.0.1.md

diff --git a/ayu-dark.sublime-theme b/ayu-dark.sublime-theme
index eafe163..a4bfb93 100644
--- a/ayu-dark.sublime-theme
+++ b/ayu-dark.sublime-theme
@@ -1,23 +1,34 @@
 [
 	{
 		"class": "title_bar",
+		"settings": [
+			"!ui_native_titlebar"
+		],
+		"platforms": [
+			"osx",
+			"linux"
+		],
 		"bg": "#0d1017",
 		"fg": "#565b66"
 	},
 	{
 		"class": "title_bar",
 		"settings": [
-			"ui_native_titlebar"
+			"!ui_native_titlebar",
+			"ui_separator"
 		],
-		"bg": "",
-		"fg": ""
+		"platforms": [
+			"osx",
+			"linux"
+		],
+		"bg": "#0b0e14"
 	},
 	{
 		"class": "title_bar",
-		"settings": [
-			"ui_separator"
+		"platforms": [
+			"windows"
 		],
-		"bg": "#0b0e14"
+		"style": "dark"
 	},
 	{
 		"class": "sidebar_container",
@@ -1074,16 +1085,13 @@
 	},
 	{
 		"class": "auto_complete",
-		"row_padding": [
-			12,
-			6
-		],
+		"row_padding": 0,
 		"layer0.tint": "#0f131a",
 		"layer0.opacity": 1
 	},
 	{
 		"class": "table_row",
-		"layer0.tint": "#1b1f26",
+		"layer0.tint": "#47526640",
 		"layer0.opacity": 0
 	},
 	{
@@ -1095,12 +1103,404 @@
 	},
 	{
 		"class": "auto_complete_label",
-		"fg": "#565b66",
+		"fg": "transparent",
 		"match_fg": "#e6b450",
-		"selected_fg": "#bfbdb6",
+		"selected_fg": "transparent",
 		"selected_match_fg": "#e6b450",
 		"fg_blend": true
 	},
+	{
+		"class": "auto_complete_hint",
+		"opacity": 0.7,
+		"font.italic": true
+	},
+	{
+		"class": "kind_container",
+		"content_margin": [
+			6,
+			0,
+			5,
+			0
+		],
+		"layer0.tint": "var(--background)",
+		"layer0.opacity": 0,
+		"layer1.tint": "white",
+		"layer1.opacity": 0
+	},
+	{
+		"class": "kind_container",
+		"parents": [
+			{
+				"class": "auto_complete",
+				"attributes": [
+					"file_light"
+				]
+			}
+		],
+		"layer1.tint": "black"
+	},
+	{
+		"class": "kind_container",
+		"parents": [
+			{
+				"class": "auto_complete"
+			},
+			{
+				"class": "table_row",
+				"attributes": [
+					"selected"
+				]
+			}
+		],
+		"layer1.tint": "white"
+	},
+	{
+		"class": "kind_container",
+		"parents": [
+			{
+				"class": "auto_complete",
+				"attributes": [
+					"file_light"
+				]
+			},
+			{
+				"class": "table_row",
+				"attributes": [
+					"selected"
+				]
+			}
+		],
+		"layer1.tint": "black"
+	},
+	{
+		"class": "kind_label",
+		"font.size": "1.1rem",
+		"font.bold": true,
+		"font.italic": true,
+		"color": "#565b66"
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "quick_panel"
+			}
+		],
+		"font.size": "1.4rem"
+	},
+	{
+		"class": "kind_container kind_function",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#ffb454",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_function"
+			}
+		],
+		"color": "#ffb454"
+	},
+	{
+		"class": "kind_container kind_keyword",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#ff8f40",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_keyword"
+			}
+		],
+		"color": "#ff8f40"
+	},
+	{
+		"class": "kind_container kind_markup",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#39bae6",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_markup"
+			}
+		],
+		"color": "#39bae6"
+	},
+	{
+		"class": "kind_container kind_namespace",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#59c2ff",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_namespace"
+			}
+		],
+		"color": "#59c2ff"
+	},
+	{
+		"class": "kind_container kind_navigation",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#e6b673",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_navigation"
+			}
+		],
+		"color": "#e6b673"
+	},
+	{
+		"class": "kind_container kind_snippet",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#f07178",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_snippet"
+			}
+		],
+		"color": "#f07178"
+	},
+	{
+		"class": "kind_container kind_type",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#59c2ff",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_type"
+			}
+		],
+		"color": "#59c2ff"
+	},
+	{
+		"class": "kind_container kind_variable",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#acb6bf8c",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_variable"
+			}
+		],
+		"color": "#acb6bf8c"
+	},
+	{
+		"class": "kind_container kind_color_redish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#f07178",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_redish"
+			}
+		],
+		"color": "#f07178"
+	},
+	{
+		"class": "kind_container kind_color_orangish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#ff8f40",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_orangish"
+			}
+		],
+		"color": "#ff8f40"
+	},
+	{
+		"class": "kind_container kind_color_yellowish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#ffb454",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_yellowish"
+			}
+		],
+		"color": "#ffb454"
+	},
+	{
+		"class": "kind_container kind_color_greenish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#aad94c",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_greenish"
+			}
+		],
+		"color": "#aad94c"
+	},
+	{
+		"class": "kind_container kind_color_cyanish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#95e6cb",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_cyanish"
+			}
+		],
+		"color": "#95e6cb"
+	},
+	{
+		"class": "kind_container kind_color_bluish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#39bae6",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_bluish"
+			}
+		],
+		"color": "#39bae6"
+	},
+	{
+		"class": "kind_container kind_color_purplish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#d2a6ff",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_purplish"
+			}
+		],
+		"color": "#d2a6ff"
+	},
+	{
+		"class": "kind_container kind_color_pinkish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#f29668",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_pinkish"
+			}
+		],
+		"color": "#f29668"
+	},
+	{
+		"class": "kind_container kind_color_dark",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "black",
+		"layer1.opacity": 0.5
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_dark"
+			}
+		],
+		"color": "white"
+	},
+	{
+		"class": "kind_container kind_color_light",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "white",
+		"layer1.opacity": 1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_light"
+			}
+		],
+		"color": "#555"
+	},
+	{
+		"class": "symbol_container",
+		"content_margin": [
+			4,
+			3,
+			4,
+			3
+		]
+	},
+	{
+		"class": "trigger_container",
+		"content_margin": [
+			4,
+			3,
+			4,
+			3
+		]
+	},
+	{
+		"class": "auto_complete_detail_pane",
+		"layer0.opacity": 1,
+		"layer0.tint": "#0f131a",
+		"content_margin": [
+			8,
+			5,
+			8,
+			5
+		]
+	},
+	{
+		"class": "auto_complete_info",
+		"spacing": 8
+	},
+	{
+		"class": "auto_complete_kind_name_label",
+		"font.size": "0.9rem",
+		"font.italic": true,
+		"border_color": "#565b66"
+	},
+	{
+		"class": "auto_complete_details",
+		"monospace_background_color": "#0f131a"
+	},
 	{
 		"class": "panel_control",
 		"layer0.tint": "#0d1017",
@@ -1453,16 +1853,16 @@
 		"layer1.opacity": 1,
 		"layer1.tint": "#565b66",
 		"layer1.inner_margin": [
-			60,
-			0,
+			42,
+			26,
 			0,
 			0
 		],
 		"content_margin": [
 			50,
-			7,
+			5,
 			10,
-			4
+			5
 		]
 	},
 	{
diff --git a/ayu-light.sublime-theme b/ayu-light.sublime-theme
index 89000df..e9d1e7c 100644
--- a/ayu-light.sublime-theme
+++ b/ayu-light.sublime-theme
@@ -1,23 +1,34 @@
 [
 	{
 		"class": "title_bar",
+		"settings": [
+			"!ui_native_titlebar"
+		],
+		"platforms": [
+			"osx",
+			"linux"
+		],
 		"bg": "#fcfcfc",
 		"fg": "#8a9199"
 	},
 	{
 		"class": "title_bar",
 		"settings": [
-			"ui_native_titlebar"
+			"!ui_native_titlebar",
+			"ui_separator"
 		],
-		"bg": "",
-		"fg": ""
+		"platforms": [
+			"osx",
+			"linux"
+		],
+		"bg": "#f8f9fa"
 	},
 	{
 		"class": "title_bar",
-		"settings": [
-			"ui_separator"
+		"platforms": [
+			"windows"
 		],
-		"bg": "#f8f9fa"
+		"style": "light"
 	},
 	{
 		"class": "sidebar_container",
@@ -1074,16 +1085,13 @@
 	},
 	{
 		"class": "auto_complete",
-		"row_padding": [
-			12,
-			6
-		],
+		"row_padding": 0,
 		"layer0.tint": "#f3f4f5",
 		"layer0.opacity": 1
 	},
 	{
 		"class": "table_row",
-		"layer0.tint": "#6b7d8f2b",
+		"layer0.tint": "#56728f1f",
 		"layer0.opacity": 0
 	},
 	{
@@ -1095,12 +1103,404 @@
 	},
 	{
 		"class": "auto_complete_label",
-		"fg": "#8a9199",
+		"fg": "transparent",
 		"match_fg": "#ffaa33",
-		"selected_fg": "#5c6166",
+		"selected_fg": "transparent",
 		"selected_match_fg": "#ffaa33",
 		"fg_blend": true
 	},
+	{
+		"class": "auto_complete_hint",
+		"opacity": 0.7,
+		"font.italic": true
+	},
+	{
+		"class": "kind_container",
+		"content_margin": [
+			6,
+			0,
+			5,
+			0
+		],
+		"layer0.tint": "var(--background)",
+		"layer0.opacity": 0,
+		"layer1.tint": "white",
+		"layer1.opacity": 0
+	},
+	{
+		"class": "kind_container",
+		"parents": [
+			{
+				"class": "auto_complete",
+				"attributes": [
+					"file_light"
+				]
+			}
+		],
+		"layer1.tint": "black"
+	},
+	{
+		"class": "kind_container",
+		"parents": [
+			{
+				"class": "auto_complete"
+			},
+			{
+				"class": "table_row",
+				"attributes": [
+					"selected"
+				]
+			}
+		],
+		"layer1.tint": "white"
+	},
+	{
+		"class": "kind_container",
+		"parents": [
+			{
+				"class": "auto_complete",
+				"attributes": [
+					"file_light"
+				]
+			},
+			{
+				"class": "table_row",
+				"attributes": [
+					"selected"
+				]
+			}
+		],
+		"layer1.tint": "black"
+	},
+	{
+		"class": "kind_label",
+		"font.size": "1.1rem",
+		"font.bold": true,
+		"font.italic": true,
+		"color": "#8a9199"
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "quick_panel"
+			}
+		],
+		"font.size": "1.4rem"
+	},
+	{
+		"class": "kind_container kind_function",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#f2ae49",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_function"
+			}
+		],
+		"color": "#f2ae49"
+	},
+	{
+		"class": "kind_container kind_keyword",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#fa8d3e",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_keyword"
+			}
+		],
+		"color": "#fa8d3e"
+	},
+	{
+		"class": "kind_container kind_markup",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#55b4d4",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_markup"
+			}
+		],
+		"color": "#55b4d4"
+	},
+	{
+		"class": "kind_container kind_namespace",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#399ee6",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_namespace"
+			}
+		],
+		"color": "#399ee6"
+	},
+	{
+		"class": "kind_container kind_navigation",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#e6ba7e",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_navigation"
+			}
+		],
+		"color": "#e6ba7e"
+	},
+	{
+		"class": "kind_container kind_snippet",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#f07171",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_snippet"
+			}
+		],
+		"color": "#f07171"
+	},
+	{
+		"class": "kind_container kind_type",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#399ee6",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_type"
+			}
+		],
+		"color": "#399ee6"
+	},
+	{
+		"class": "kind_container kind_variable",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#787b8099",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_variable"
+			}
+		],
+		"color": "#787b8099"
+	},
+	{
+		"class": "kind_container kind_color_redish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#f07171",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_redish"
+			}
+		],
+		"color": "#f07171"
+	},
+	{
+		"class": "kind_container kind_color_orangish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#fa8d3e",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_orangish"
+			}
+		],
+		"color": "#fa8d3e"
+	},
+	{
+		"class": "kind_container kind_color_yellowish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#f2ae49",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_yellowish"
+			}
+		],
+		"color": "#f2ae49"
+	},
+	{
+		"class": "kind_container kind_color_greenish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#86b300",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_greenish"
+			}
+		],
+		"color": "#86b300"
+	},
+	{
+		"class": "kind_container kind_color_cyanish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#4cbf99",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_cyanish"
+			}
+		],
+		"color": "#4cbf99"
+	},
+	{
+		"class": "kind_container kind_color_bluish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#55b4d4",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_bluish"
+			}
+		],
+		"color": "#55b4d4"
+	},
+	{
+		"class": "kind_container kind_color_purplish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#a37acc",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_purplish"
+			}
+		],
+		"color": "#a37acc"
+	},
+	{
+		"class": "kind_container kind_color_pinkish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#ed9366",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_pinkish"
+			}
+		],
+		"color": "#ed9366"
+	},
+	{
+		"class": "kind_container kind_color_dark",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "black",
+		"layer1.opacity": 0.5
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_dark"
+			}
+		],
+		"color": "white"
+	},
+	{
+		"class": "kind_container kind_color_light",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "white",
+		"layer1.opacity": 1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_light"
+			}
+		],
+		"color": "#555"
+	},
+	{
+		"class": "symbol_container",
+		"content_margin": [
+			4,
+			3,
+			4,
+			3
+		]
+	},
+	{
+		"class": "trigger_container",
+		"content_margin": [
+			4,
+			3,
+			4,
+			3
+		]
+	},
+	{
+		"class": "auto_complete_detail_pane",
+		"layer0.opacity": 1,
+		"layer0.tint": "#f3f4f5",
+		"content_margin": [
+			8,
+			5,
+			8,
+			5
+		]
+	},
+	{
+		"class": "auto_complete_info",
+		"spacing": 8
+	},
+	{
+		"class": "auto_complete_kind_name_label",
+		"font.size": "0.9rem",
+		"font.italic": true,
+		"border_color": "#8a9199"
+	},
+	{
+		"class": "auto_complete_details",
+		"monospace_background_color": "#f3f4f5"
+	},
 	{
 		"class": "panel_control",
 		"layer0.tint": "#fcfcfc",
@@ -1453,16 +1853,16 @@
 		"layer1.opacity": 1,
 		"layer1.tint": "#8a9199",
 		"layer1.inner_margin": [
-			60,
-			0,
+			42,
+			26,
 			0,
 			0
 		],
 		"content_margin": [
 			50,
-			7,
+			5,
 			10,
-			4
+			5
 		]
 	},
 	{
diff --git a/ayu-mirage.sublime-theme b/ayu-mirage.sublime-theme
index b97fb0b..aeeb54a 100644
--- a/ayu-mirage.sublime-theme
+++ b/ayu-mirage.sublime-theme
@@ -1,23 +1,34 @@
 [
 	{
 		"class": "title_bar",
+		"settings": [
+			"!ui_native_titlebar"
+		],
+		"platforms": [
+			"osx",
+			"linux"
+		],
 		"bg": "#242936",
 		"fg": "#707a8c"
 	},
 	{
 		"class": "title_bar",
 		"settings": [
-			"ui_native_titlebar"
+			"!ui_native_titlebar",
+			"ui_separator"
 		],
-		"bg": "",
-		"fg": ""
+		"platforms": [
+			"osx",
+			"linux"
+		],
+		"bg": "#1f2430"
 	},
 	{
 		"class": "title_bar",
-		"settings": [
-			"ui_separator"
+		"platforms": [
+			"windows"
 		],
-		"bg": "#1f2430"
+		"style": "dark"
 	},
 	{
 		"class": "sidebar_container",
@@ -1074,16 +1085,13 @@
 	},
 	{
 		"class": "auto_complete",
-		"row_padding": [
-			12,
-			6
-		],
+		"row_padding": 0,
 		"layer0.tint": "#1c212b",
 		"layer0.opacity": 1
 	},
 	{
 		"class": "table_row",
-		"layer0.tint": "#171b24",
+		"layer0.tint": "#63759926",
 		"layer0.opacity": 0
 	},
 	{
@@ -1095,12 +1103,404 @@
 	},
 	{
 		"class": "auto_complete_label",
-		"fg": "#707a8c",
+		"fg": "transparent",
 		"match_fg": "#ffcc66",
-		"selected_fg": "#cccac2",
+		"selected_fg": "transparent",
 		"selected_match_fg": "#ffcc66",
 		"fg_blend": true
 	},
+	{
+		"class": "auto_complete_hint",
+		"opacity": 0.7,
+		"font.italic": true
+	},
+	{
+		"class": "kind_container",
+		"content_margin": [
+			6,
+			0,
+			5,
+			0
+		],
+		"layer0.tint": "var(--background)",
+		"layer0.opacity": 0,
+		"layer1.tint": "white",
+		"layer1.opacity": 0
+	},
+	{
+		"class": "kind_container",
+		"parents": [
+			{
+				"class": "auto_complete",
+				"attributes": [
+					"file_light"
+				]
+			}
+		],
+		"layer1.tint": "black"
+	},
+	{
+		"class": "kind_container",
+		"parents": [
+			{
+				"class": "auto_complete"
+			},
+			{
+				"class": "table_row",
+				"attributes": [
+					"selected"
+				]
+			}
+		],
+		"layer1.tint": "white"
+	},
+	{
+		"class": "kind_container",
+		"parents": [
+			{
+				"class": "auto_complete",
+				"attributes": [
+					"file_light"
+				]
+			},
+			{
+				"class": "table_row",
+				"attributes": [
+					"selected"
+				]
+			}
+		],
+		"layer1.tint": "black"
+	},
+	{
+		"class": "kind_label",
+		"font.size": "1.1rem",
+		"font.bold": true,
+		"font.italic": true,
+		"color": "#707a8c"
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "quick_panel"
+			}
+		],
+		"font.size": "1.4rem"
+	},
+	{
+		"class": "kind_container kind_function",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#ffd173",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_function"
+			}
+		],
+		"color": "#ffd173"
+	},
+	{
+		"class": "kind_container kind_keyword",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#ffad66",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_keyword"
+			}
+		],
+		"color": "#ffad66"
+	},
+	{
+		"class": "kind_container kind_markup",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#5ccfe6",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_markup"
+			}
+		],
+		"color": "#5ccfe6"
+	},
+	{
+		"class": "kind_container kind_namespace",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#73d0ff",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_namespace"
+			}
+		],
+		"color": "#73d0ff"
+	},
+	{
+		"class": "kind_container kind_navigation",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#ffdfb3",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_navigation"
+			}
+		],
+		"color": "#ffdfb3"
+	},
+	{
+		"class": "kind_container kind_snippet",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#f28779",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_snippet"
+			}
+		],
+		"color": "#f28779"
+	},
+	{
+		"class": "kind_container kind_type",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#73d0ff",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_type"
+			}
+		],
+		"color": "#73d0ff"
+	},
+	{
+		"class": "kind_container kind_variable",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#b8cfe680",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_variable"
+			}
+		],
+		"color": "#b8cfe680"
+	},
+	{
+		"class": "kind_container kind_color_redish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#f28779",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_redish"
+			}
+		],
+		"color": "#f28779"
+	},
+	{
+		"class": "kind_container kind_color_orangish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#ffad66",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_orangish"
+			}
+		],
+		"color": "#ffad66"
+	},
+	{
+		"class": "kind_container kind_color_yellowish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#ffd173",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_yellowish"
+			}
+		],
+		"color": "#ffd173"
+	},
+	{
+		"class": "kind_container kind_color_greenish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#d5ff80",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_greenish"
+			}
+		],
+		"color": "#d5ff80"
+	},
+	{
+		"class": "kind_container kind_color_cyanish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#95e6cb",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_cyanish"
+			}
+		],
+		"color": "#95e6cb"
+	},
+	{
+		"class": "kind_container kind_color_bluish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#5ccfe6",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_bluish"
+			}
+		],
+		"color": "#5ccfe6"
+	},
+	{
+		"class": "kind_container kind_color_purplish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#dfbfff",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_purplish"
+			}
+		],
+		"color": "#dfbfff"
+	},
+	{
+		"class": "kind_container kind_color_pinkish",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "#f29e74",
+		"layer1.opacity": 0.1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_pinkish"
+			}
+		],
+		"color": "#f29e74"
+	},
+	{
+		"class": "kind_container kind_color_dark",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "black",
+		"layer1.opacity": 0.5
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_dark"
+			}
+		],
+		"color": "white"
+	},
+	{
+		"class": "kind_container kind_color_light",
+		"layer0.opacity": 0.5,
+		"layer1.tint": "white",
+		"layer1.opacity": 1
+	},
+	{
+		"class": "kind_label",
+		"parents": [
+			{
+				"class": "kind_container kind_color_light"
+			}
+		],
+		"color": "#555"
+	},
+	{
+		"class": "symbol_container",
+		"content_margin": [
+			4,
+			3,
+			4,
+			3
+		]
+	},
+	{
+		"class": "trigger_container",
+		"content_margin": [
+			4,
+			3,
+			4,
+			3
+		]
+	},
+	{
+		"class": "auto_complete_detail_pane",
+		"layer0.opacity": 1,
+		"layer0.tint": "#1c212b",
+		"content_margin": [
+			8,
+			5,
+			8,
+			5
+		]
+	},
+	{
+		"class": "auto_complete_info",
+		"spacing": 8
+	},
+	{
+		"class": "auto_complete_kind_name_label",
+		"font.size": "0.9rem",
+		"font.italic": true,
+		"border_color": "#707a8c"
+	},
+	{
+		"class": "auto_complete_details",
+		"monospace_background_color": "#1c212b"
+	},
 	{
 		"class": "panel_control",
 		"layer0.tint": "#242936",
@@ -1453,16 +1853,16 @@
 		"layer1.opacity": 1,
 		"layer1.tint": "#707a8c",
 		"layer1.inner_margin": [
-			60,
-			0,
+			42,
+			26,
 			0,
 			0
 		],
 		"content_margin": [
 			50,
-			7,
+			5,
 			10,
-			4
+			5
 		]
 	},
 	{
diff --git a/messages.json b/messages.json
index 480f899..a025fee 100644
--- a/messages.json
+++ b/messages.json
@@ -32,4 +32,5 @@
   "5.0.3": "messages/5.0.3.md",
   "5.1.0": "messages/5.1.0.md"
   "6.0.0": "messages/6.0.0.md"
+  "6.0.1": "messages/6.0.1.md"
 }
diff --git a/messages/6.0.1.md b/messages/6.0.1.md
new file mode 100644
index 0000000..ce74707
--- /dev/null
+++ b/messages/6.0.1.md
@@ -0,0 +1,27 @@
+**ayu theme for Sublime Text**
+https://github.com/dempfi/ayu/releases
+
+---
+
+ayu from version 3.0.0 supports customization via A File Icon package
+(https://github.com/ihodev/a-file-icon). Please install it for better expereince.
+
+---
+
+# Version 6.0.1
+- Fix for windows title bar
+
+# Version 6.0.0
+
+🎉 This release updates ayu to support Sublime Text 4
+
+- New tab style for separators
+- Updated colors to the latest
+
+---
+
+Breaking changes:
+
+- None
+
+---
diff --git a/src/templates/ui.ts b/src/templates/ui.ts
index 5adcdd6..50f8271 100644
--- a/src/templates/ui.ts
+++ b/src/templates/ui.ts
@@ -4,23 +4,24 @@ export default (scheme: Scheme, kind: string) => [
   // WINDOWS
   {
     "class": "title_bar",
+    "settings": ["!ui_native_titlebar"],
+    "platforms": ["osx", "linux"],
     "bg": scheme.editor.bg.hex(),
     "fg": scheme.ui.fg.hex()
   },
   {
     "class": "title_bar",
-    "settings": ["ui_native_titlebar"],
-    "bg": "",
-    "fg": ""
+    "settings": ["!ui_native_titlebar", "ui_separator"],
+    "platforms": ["osx", "linux"],
+    "bg": scheme.ui.bg.hex()
   },
+
   {
     "class": "title_bar",
-    "settings": ["ui_separator"],
-    "bg": scheme.ui.bg.hex()
+    "platforms": ["windows"],
+    "style": kind === 'light' ? 'light' : 'dark'
   },
 
-
-
   // SIDEBAR
   {
     "class": "sidebar_container",
@@ -754,7 +755,7 @@ export default (scheme: Scheme, kind: string) => [
 
   {
     "class": "auto_complete",
-    "row_padding": [12, 6],
+    "row_padding": 0,
     "layer0.tint": scheme.ui.panel.bg.hex(),
     "layer0.opacity": 1.0
   },
@@ -762,7 +763,7 @@ export default (scheme: Scheme, kind: string) => [
 
   {
     "class": "table_row",
-    "layer0.tint": scheme.ui.line.hex(),
+    "layer0.tint": scheme.ui.selection.active.hex(),
     "layer0.opacity": 0.0
   },
   {
@@ -771,15 +772,291 @@ export default (scheme: Scheme, kind: string) => [
     "layer0.opacity": 1.0
   },
 
-
   {
     "class": "auto_complete_label",
-    "fg": scheme.ui.fg.hex(),
+    "fg": "transparent",
     "match_fg": scheme.common.accent.hex(),
-    "selected_fg": scheme.editor.fg.hex(),
+    "selected_fg": "transparent",
     "selected_match_fg": scheme.common.accent.hex(),
     "fg_blend": true
   },
+  {
+    "class": "auto_complete_hint",
+    "opacity": 0.7,
+    "font.italic": true
+  },
+
+  {
+    "class": "kind_container",
+    // Extra margin on the left makes the
+    // italic kind_label look visually centered
+    "content_margin": [6, 0, 5, 0],
+    "layer0.tint": "var(--background)",
+    "layer0.opacity": 0.0,
+    "layer1.tint": "white",
+    "layer1.opacity": 0.0,
+  },
+  {
+    "class": "kind_container",
+    "parents":[ { "class": "auto_complete", "attributes": ["file_light"] } ],
+    "layer1.tint": "black",
+  },
+  {
+    "class": "kind_container",
+    "parents":
+      [
+        { "class": "auto_complete" },
+        { "class": "table_row", "attributes": ["selected"] },
+      ],
+    "layer1.tint": "white",
+  },
+  {
+    "class": "kind_container",
+    "parents":
+      [
+        { "class": "auto_complete", "attributes": ["file_light"] },
+        { "class": "table_row", "attributes": ["selected"] },
+      ],
+    "layer1.tint": "black",
+  },
+  {
+    "class": "kind_label",
+    "font.size": "1.1rem",
+    "font.bold": true,
+    "font.italic": true,
+    "color": scheme.ui.fg.hex(),
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "quick_panel" }],
+    "font.size": "1.4rem"
+  },
+  {
+    "class": "kind_container kind_function",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.func.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_function" }],
+    "color": scheme.syntax.func.hex(),
+  },
+  {
+    "class": "kind_container kind_keyword",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.keyword.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_keyword" }],
+    "color": scheme.syntax.keyword.hex(),
+  },
+  {
+    "class": "kind_container kind_markup",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.tag.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_markup" }],
+    "color": scheme.syntax.tag.hex()
+  },
+  {
+    "class": "kind_container kind_namespace",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.entity.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_namespace" }],
+    "color": scheme.syntax.entity.hex()
+  },
+  {
+    "class": "kind_container kind_navigation",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.special.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_navigation" }],
+    "color": scheme.syntax.special.hex()
+  },
+  {
+    "class": "kind_container kind_snippet",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.markup.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_snippet" }],
+    "color": scheme.syntax.markup.hex()
+  },
+  {
+    "class": "kind_container kind_type",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.entity.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_type" }],
+    "color": scheme.syntax.entity.hex()
+  },
+  {
+    "class": "kind_container kind_variable",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.comment.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_variable" }],
+    "color": scheme.syntax.comment.hex(),
+  },
+  {
+    "class": "kind_container kind_color_redish",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.markup.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_color_redish" }],
+    "color": scheme.syntax.markup.hex()
+  },
+  {
+    "class": "kind_container kind_color_orangish",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.keyword.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_color_orangish" }],
+    "color": scheme.syntax.keyword.hex()
+  },
+  {
+    "class": "kind_container kind_color_yellowish",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.func.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_color_yellowish" }],
+    "color": scheme.syntax.func.hex()
+  },
+  {
+    "class": "kind_container kind_color_greenish",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.string.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_color_greenish" }],
+    "color": scheme.syntax.string.hex()
+  },
+  {
+    "class": "kind_container kind_color_cyanish",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.regexp.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_color_cyanish" }],
+    "color": scheme.syntax.regexp.hex()
+  },
+  {
+    "class": "kind_container kind_color_bluish",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.tag.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_color_bluish" }],
+    "color": scheme.syntax.tag.hex()
+  },
+  {
+    "class": "kind_container kind_color_purplish",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.constant.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_color_purplish" }],
+    "color": scheme.syntax.constant.hex()
+  },
+  {
+    "class": "kind_container kind_color_pinkish",
+    "layer0.opacity": 0.5,
+    "layer1.tint": scheme.syntax.operator.hex(),
+    "layer1.opacity": 0.1,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_color_pinkish" }],
+    "color": scheme.syntax.operator.hex()
+  },
+  {
+    "class": "kind_container kind_color_dark",
+    "layer0.opacity": 0.5,
+    "layer1.tint": "black",
+    "layer1.opacity": 0.5,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_color_dark" }],
+    "color": "white"
+  },
+  {
+    "class": "kind_container kind_color_light",
+    "layer0.opacity": 0.5,
+    "layer1.tint": "white",
+    "layer1.opacity": 1.0,
+  },
+  {
+    "class": "kind_label",
+    "parents": [{ "class": "kind_container kind_color_light" }],
+    "color": "#555"
+  },
+  {
+    "class": "symbol_container",
+    "content_margin": [4, 3, 4, 3]
+  },
+  {
+    "class": "trigger_container",
+    "content_margin": [4, 3, 4, 3]
+  },
+  {
+    "class": "auto_complete_detail_pane",
+    "layer0.opacity": 1.0,
+    "layer0.tint": scheme.ui.panel.bg.hex(),
+    "content_margin": [8, 5, 8, 5]
+  },
+  {
+    "class": "auto_complete_info",
+    "spacing": 8,
+  },
+  {
+    "class": "auto_complete_kind_name_label",
+    "font.size": "0.9rem",
+    "font.italic": true,
+    "border_color": scheme.ui.fg.hex()
+  },
+  {
+    "class": "auto_complete_details",
+    "monospace_background_color": scheme.ui.panel.bg.hex()
+  },
 
 
 
@@ -1045,8 +1322,8 @@ export default (scheme: Scheme, kind: string) => [
     "layer1.texture": "ayu/assets/input-search.png",
     "layer1.opacity": 1,
     "layer1.tint": scheme.ui.fg.hex(),
-    "layer1.inner_margin": [60, 0, 0, 0],
-    "content_margin": [50, 7, 10, 4]
+    "layer1.inner_margin": [42, 26, 0, 0],
+    "content_margin": [50, 5, 10, 5]
   },