diff --git a/Assets/DefaultTheme.tres b/Assets/DefaultTheme.tres
index 36c8589..82410ce 100644
--- a/Assets/DefaultTheme.tres
+++ b/Assets/DefaultTheme.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=229 format=3 uid="uid://b8rk41gjual2b"]
+[gd_resource type="Theme" load_steps=236 format=3 uid="uid://b8rk41gjual2b"]
 
 [ext_resource type="FontFile" uid="uid://501bous51s3p" path="res://Assets/Fonts/Inter-Regular.ttf" id="1_a74l0"]
 [ext_resource type="Texture2D" uid="uid://blqywcg2e22in" path="res://Assets/Icons/checked.svg" id="2_jlkvh"]
@@ -115,13 +115,17 @@ content_margin_left = 4.0
 content_margin_top = 6.0
 content_margin_right = 4.0
 content_margin_bottom = 4.0
-bg_color = Color(0.145098, 0.145098, 0.145098, 1)
+bg_color = Color(0.14902, 0.14902, 0.14902, 1)
+draw_center = false
 border_color = Color(0.0870588, 0.0870588, 0.0870588, 1)
 corner_radius_bottom_right = 3
 corner_radius_bottom_left = 3
 corner_detail = 3
 anti_aliasing = false
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8loco"]
+bg_color = Color(0.321569, 0.321569, 0.321569, 1)
+
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_jduyo"]
 content_margin_left = 5.0
 content_margin_top = 4.0
@@ -1700,7 +1704,7 @@ corner_radius_bottom_left = 3
 corner_detail = 3
 anti_aliasing = false
 
-[sub_resource type="Image" id="Image_t5di3"]
+[sub_resource type="Image" id="Image_hry0s"]
 data = {
 "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 3, 255, 255, 255, 41, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 40, 255, 255, 255, 3, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 41, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 40, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 67, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 67, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 67, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 67, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 40, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 74, 255, 255, 255, 40, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 3, 255, 255, 255, 40, 255, 255, 255, 67, 255, 255, 255, 67, 255, 255, 255, 40, 255, 255, 255, 3, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0),
 "format": "RGBA8",
@@ -1710,7 +1714,7 @@ data = {
 }
 
 [sub_resource type="ImageTexture" id="ImageTexture_bk0hb"]
-image = SubResource("Image_t5di3")
+image = SubResource("Image_hry0s")
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_0hke8"]
 content_margin_left = 7.0
@@ -1723,7 +1727,7 @@ texture_margin_top = 6.0
 texture_margin_right = 6.0
 texture_margin_bottom = 6.0
 
-[sub_resource type="Image" id="Image_sbqmm"]
+[sub_resource type="Image" id="Image_4rrmf"]
 data = {
 "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 6, 248, 248, 248, 102, 249, 249, 249, 168, 249, 249, 249, 168, 248, 248, 248, 101, 213, 213, 213, 6, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 248, 248, 248, 102, 249, 249, 249, 186, 249, 249, 249, 186, 249, 249, 249, 186, 249, 249, 249, 186, 248, 248, 248, 101, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 249, 249, 249, 168, 249, 249, 249, 186, 249, 249, 249, 186, 249, 249, 249, 186, 249, 249, 249, 186, 249, 249, 249, 168, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 249, 249, 249, 168, 249, 249, 249, 186, 249, 249, 249, 186, 249, 249, 249, 186, 249, 249, 249, 186, 248, 248, 248, 168, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 248, 248, 248, 101, 249, 249, 249, 186, 249, 249, 249, 186, 249, 249, 249, 186, 249, 249, 249, 186, 250, 250, 250, 99, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 213, 213, 213, 6, 248, 248, 248, 101, 249, 249, 249, 168, 248, 248, 248, 168, 250, 250, 250, 99, 213, 213, 213, 6, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0),
 "format": "RGBA8",
@@ -1733,7 +1737,7 @@ data = {
 }
 
 [sub_resource type="ImageTexture" id="ImageTexture_uc42h"]
-image = SubResource("Image_sbqmm")
+image = SubResource("Image_4rrmf")
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_asndq"]
 content_margin_left = 6.0
@@ -1746,7 +1750,7 @@ texture_margin_top = 5.0
 texture_margin_right = 5.0
 texture_margin_bottom = 5.0
 
-[sub_resource type="Image" id="Image_mj1m7"]
+[sub_resource type="Image" id="Image_xd5fw"]
 data = {
 "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 213, 213, 213, 6, 180, 180, 180, 102, 181, 181, 181, 168, 181, 181, 181, 168, 179, 179, 179, 101, 170, 170, 170, 6, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 180, 180, 180, 102, 180, 180, 180, 186, 180, 180, 180, 186, 180, 180, 180, 186, 180, 180, 180, 186, 179, 179, 179, 101, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 181, 181, 181, 168, 180, 180, 180, 186, 180, 180, 180, 186, 180, 180, 180, 186, 180, 180, 180, 186, 181, 181, 181, 168, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 181, 181, 181, 168, 180, 180, 180, 186, 180, 180, 180, 186, 180, 180, 180, 186, 180, 180, 180, 186, 179, 179, 179, 168, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 179, 179, 179, 101, 180, 180, 180, 186, 180, 180, 180, 186, 180, 180, 180, 186, 180, 180, 180, 186, 181, 181, 181, 99, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 170, 170, 170, 6, 179, 179, 179, 101, 181, 181, 181, 168, 179, 179, 179, 168, 181, 181, 181, 99, 170, 170, 170, 6, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0),
 "format": "RGBA8",
@@ -1756,7 +1760,7 @@ data = {
 }
 
 [sub_resource type="ImageTexture" id="ImageTexture_y6fi8"]
-image = SubResource("Image_mj1m7")
+image = SubResource("Image_xd5fw")
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_7amsq"]
 content_margin_left = 7.0
@@ -1769,7 +1773,7 @@ texture_margin_top = 6.0
 texture_margin_right = 6.0
 texture_margin_bottom = 6.0
 
-[sub_resource type="Image" id="Image_5ft7l"]
+[sub_resource type="Image" id="Image_jkmfx"]
 data = {
 "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 7, 255, 255, 255, 19, 255, 255, 255, 19, 255, 255, 255, 7, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 19, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 19, 255, 255, 255, 21, 255, 255, 255, 21, 255, 255, 255, 19, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 7, 255, 255, 255, 19, 255, 255, 255, 19, 255, 255, 255, 6, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0),
 "format": "RGBA8",
@@ -1779,7 +1783,7 @@ data = {
 }
 
 [sub_resource type="ImageTexture" id="ImageTexture_lfhcu"]
-image = SubResource("Image_5ft7l")
+image = SubResource("Image_jkmfx")
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_tef5f"]
 content_margin_left = 0.0
@@ -1913,72 +1917,68 @@ corner_radius_top_right = 4
 corner_radius_bottom_right = 4
 corner_radius_bottom_left = 4
 
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_0uu8j"]
-content_margin_left = 6.0
-content_margin_top = 5.0
-content_margin_right = 6.0
-content_margin_bottom = 5.0
-bg_color = Color(0.130588, 0.130588, 0.130588, 1)
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_uqdmw"]
+content_margin_left = 8.0
+content_margin_top = 4.0
+content_margin_right = 8.0
+content_margin_bottom = 4.0
+bg_color = Color(0.116078, 0.116078, 0.116078, 1)
 border_color = Color(0.101569, 0.101569, 0.101569, 1)
-corner_radius_top_left = 3
-corner_radius_top_right = 3
-corner_radius_bottom_right = 3
-corner_radius_bottom_left = 3
 corner_detail = 3
 anti_aliasing = false
 
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_40oom"]
-content_margin_left = 6.0
-content_margin_top = 5.0
-content_margin_right = 6.0
-content_margin_bottom = 5.0
-bg_color = Color(1, 1, 1, 0.11)
-border_color = Color(1, 1, 1, 0.05)
-corner_radius_top_left = 3
-corner_radius_top_right = 3
-corner_radius_bottom_right = 3
-corner_radius_bottom_left = 3
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ru5vq"]
+content_margin_left = 16.0
+content_margin_top = 4.0
+content_margin_right = 16.0
+content_margin_bottom = 4.0
+bg_color = Color(0.116078, 0.116078, 0.116078, 1)
+border_color = Color(0.101569, 0.101569, 0.101569, 1)
 corner_detail = 3
 anti_aliasing = false
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_pe0jj"]
-content_margin_left = 6.0
-content_margin_top = 5.0
-content_margin_right = 6.0
-content_margin_bottom = 5.0
+content_margin_left = 16.0
+content_margin_top = 4.0
+content_margin_right = 16.0
+content_margin_bottom = 4.0
+bg_color = Color(0.116078, 0.116078, 0.116078, 1)
+border_width_bottom = 1
+border_color = Color(1, 1, 1, 1)
+corner_detail = 3
+anti_aliasing = false
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dyudt"]
+content_margin_left = 16.0
+content_margin_top = 4.0
+content_margin_right = 16.0
+content_margin_bottom = 4.0
 bg_color = Color(0.116078, 0.116078, 0.116078, 1)
 border_color = Color(0.101569, 0.101569, 0.101569, 1)
-corner_radius_top_left = 3
-corner_radius_top_right = 3
-corner_radius_bottom_right = 3
-corner_radius_bottom_left = 3
 corner_detail = 3
 anti_aliasing = false
 
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tbd5c"]
-content_margin_left = 6.0
-content_margin_top = 5.0
-content_margin_right = 6.0
-content_margin_bottom = 5.0
-bg_color = Color(0.101569, 0.101569, 0.101569, 1)
-border_color = Color(0.101569, 0.101569, 0.101569, 1)
-corner_radius_top_left = 3
-corner_radius_top_right = 3
-corner_radius_bottom_right = 3
-corner_radius_bottom_left = 3
-corner_detail = 3
-anti_aliasing = false
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_sra54"]
+bg_color = Color(0.14902, 0.14902, 0.14902, 1)
+draw_center = false
+border_width_bottom = 1
+border_color = Color(0.223529, 0.223529, 0.223529, 1)
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_l5ore"]
-content_margin_left = 6.0
-content_margin_top = 4.0
-content_margin_right = 6.0
-content_margin_bottom = 4.0
-bg_color = Color(1, 1, 1, 0.0588235)
-corner_radius_top_left = 4
-corner_radius_top_right = 4
-corner_radius_bottom_right = 4
-corner_radius_bottom_left = 4
+content_margin_left = 0.0
+content_margin_top = 0.0
+content_margin_right = 0.0
+content_margin_bottom = 0.0
+bg_color = Color(0.223529, 0.223529, 0.223529, 1)
+corner_detail = 4
+anti_aliasing = false
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_woj82"]
+content_margin_left = 0.0
+content_margin_top = 0.0
+content_margin_right = 0.0
+content_margin_bottom = 0.0
+bg_color = Color(0.298039, 0.298039, 0.298039, 1)
 corner_detail = 4
 anti_aliasing = false
 
@@ -2081,7 +2081,7 @@ content_margin_left = 6.0
 content_margin_top = 4.0
 content_margin_right = 6.0
 content_margin_bottom = 4.0
-bg_color = Color(0.116078, 0.116078, 0.116078, 1)
+bg_color = Color(0.0862745, 0.0862745, 0.0862745, 1)
 corner_detail = 3
 anti_aliasing = false
 
@@ -2142,7 +2142,7 @@ corner_detail = 3
 anti_aliasing = false
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_wdhdm"]
-bg_color = Color(0.116078, 0.116078, 0.116078, 1)
+bg_color = Color(0.0862745, 0.0862745, 0.0862745, 1)
 corner_detail = 3
 anti_aliasing = false
 
@@ -2159,11 +2159,7 @@ shadow_size = 3
 anti_aliasing = false
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_yg4d4"]
-bg_color = Color(1, 1, 1, 0.0588235)
-corner_radius_top_left = 4
-corner_radius_top_right = 4
-corner_radius_bottom_right = 4
-corner_radius_bottom_left = 4
+bg_color = Color(0.2, 0.2, 0.2, 1)
 
 [sub_resource type="StyleBoxLine" id="StyleBoxLine_f3cpk"]
 color = Color(1, 1, 1, 0.1)
@@ -2174,14 +2170,14 @@ color = Color(1, 1, 1, 0.1)
 grow_end = 8.0
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cbgao"]
-content_margin_left = 6.0
-content_margin_top = 6.0
-content_margin_right = 6.0
-content_margin_bottom = 6.0
-bg_color = Color(0.11, 0.11, 0.11, 1)
+content_margin_left = 0.0
+content_margin_top = 4.0
+content_margin_right = 0.0
+content_margin_bottom = 4.0
+bg_color = Color(0.14902, 0.14902, 0.14902, 1)
 
 [sub_resource type="StyleBoxLine" id="StyleBoxLine_rijeh"]
-color = Color(1, 1, 1, 0.0784314)
+color = Color(0.223529, 0.223529, 0.223529, 1)
 grow_begin = -6.0
 grow_end = -6.0
 
@@ -2312,23 +2308,20 @@ corner_detail = 3
 anti_aliasing = false
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lgkqp"]
-content_margin_left = 11.0
-content_margin_top = 5.0
-content_margin_right = 11.0
-content_margin_bottom = 5.0
+content_margin_left = 16.0
+content_margin_right = 16.0
 bg_color = Color(0.145098, 0.145098, 0.145098, 1)
-border_width_top = 2
-border_color = Color(0.278333, 0.490098, 0.775392, 1)
+draw_center = false
+border_width_bottom = 1
+border_color = Color(0.270588, 0.537255, 1, 1)
 corner_detail = 3
 anti_aliasing = false
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6fhxt"]
-content_margin_left = 11.0
-content_margin_top = 5.0
-content_margin_right = 11.0
-content_margin_bottom = 5.0
 bg_color = Color(0.116078, 0.116078, 0.116078, 1)
-border_color = Color(0, 0, 0, 0)
+draw_center = false
+border_width_bottom = 1
+border_color = Color(0.223529, 0.223529, 0.223529, 1)
 corner_radius_top_left = 3
 corner_radius_top_right = 3
 corner_detail = 3
@@ -2337,12 +2330,33 @@ anti_aliasing = false
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_kwdgv"]
 bg_color = Color(1, 1, 1, 0)
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_4rrmf"]
+content_margin_left = 16.0
+content_margin_right = 16.0
+bg_color = Color(0.145098, 0.145098, 0.145098, 1)
+draw_center = false
+border_width_bottom = 1
+border_color = Color(0.321569, 0.321569, 0.321569, 1)
+corner_detail = 3
+anti_aliasing = false
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_xd5fw"]
+content_margin_left = 16.0
+content_margin_right = 16.0
+bg_color = Color(0.145098, 0.145098, 0.145098, 1)
+draw_center = false
+border_width_bottom = 1
+border_color = Color(0.223529, 0.223529, 0.223529, 1)
+corner_detail = 3
+anti_aliasing = false
+
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_o0sc5"]
 content_margin_left = 0.0
 content_margin_top = 0.0
 content_margin_right = 0.0
 content_margin_bottom = 0.0
 bg_color = Color(0.116078, 0.116078, 0.116078, 1)
+draw_center = false
 corner_radius_top_left = 3
 corner_radius_top_right = 3
 corner_detail = 3
@@ -2442,7 +2456,7 @@ content_margin_left = 7.0
 content_margin_top = 2.0
 content_margin_right = 7.0
 content_margin_bottom = 2.0
-bg_color = Color(0.101961, 0.101961, 0.101961, 1)
+bg_color = Color(0.0862745, 0.0862745, 0.0862745, 1)
 border_color = Color(0.101569, 0.101569, 0.101569, 1)
 corner_radius_top_left = 4
 corner_radius_top_right = 4
@@ -2454,8 +2468,10 @@ content_margin_left = 6.0
 content_margin_top = 4.0
 content_margin_right = 6.0
 content_margin_bottom = 4.0
-bg_color = Color(0.06, 0.06, 0.06, 1)
-corner_detail = 3
+bg_color = Color(0.14902, 0.14902, 0.14902, 1)
+draw_center = false
+border_width_bottom = 1
+border_color = Color(0.14902, 0.14902, 0.14902, 1)
 anti_aliasing = false
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qr21i"]
@@ -2472,6 +2488,16 @@ corner_radius_bottom_left = 8
 corner_detail = 4
 anti_aliasing = false
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_jkmfx"]
+bg_color = Color(0.14902, 0.14902, 0.14902, 1)
+border_width_bottom = 1
+border_color = Color(0.223529, 0.223529, 0.223529, 1)
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_hry0s"]
+draw_center = false
+border_width_bottom = 1
+border_color = Color(0.223529, 0.223529, 0.223529, 1)
+
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_68sxm"]
 content_margin_left = 3.0
 content_margin_right = 3.0
@@ -2677,8 +2703,10 @@ AssetLib/colors/status_color = Color(0.5, 0.5, 0.5, 1)
 AssetLib/icons/dismiss = null
 AssetLib/styles/bg = SubResource("StyleBoxEmpty_6c8sw")
 AssetLib/styles/panel = SubResource("StyleBoxFlat_0c4py")
+AudioClip/base_type = &"Panel"
 AudioClip/colors/deselected_modulate = Color(0.552941, 0.552941, 0.552941, 1)
 AudioClip/colors/selected_modulate = Color(1, 1, 1, 1)
+AudioClip/styles/panel = SubResource("StyleBoxFlat_8loco")
 BottomPanelButton/styles/hover = SubResource("StyleBoxFlat_jduyo")
 BottomPanelButton/styles/hover_pressed = SubResource("StyleBoxFlat_jduyo")
 BottomPanelButton/styles/normal = SubResource("StyleBoxFlat_sxnkh")
@@ -4250,10 +4278,12 @@ MenuBar/colors/icon_normal_color = Color(1, 1, 1, 1)
 MenuBar/colors/icon_pressed_color = Color(0.387843, 0.712549, 1.15, 1)
 MenuBar/constants/h_separation = 4
 MenuBar/constants/outline_size = 0
-MenuBar/styles/disabled = SubResource("StyleBoxFlat_0uu8j")
-MenuBar/styles/hover = SubResource("StyleBoxFlat_40oom")
+MenuBar/styles/disabled = SubResource("StyleBoxFlat_uqdmw")
+MenuBar/styles/hover = SubResource("StyleBoxFlat_ru5vq")
 MenuBar/styles/normal = SubResource("StyleBoxFlat_pe0jj")
-MenuBar/styles/pressed = SubResource("StyleBoxFlat_tbd5c")
+MenuBar/styles/pressed = SubResource("StyleBoxFlat_dyudt")
+MenuBarPanel/base_type = &"Panel"
+MenuBarPanel/styles/panel = SubResource("StyleBoxFlat_sra54")
 MenuButton/colors/font_color = Color(0.786274, 0.786274, 0.786274, 1)
 MenuButton/colors/font_focus_color = Color(0.893137, 0.893137, 0.893137, 1)
 MenuButton/colors/font_hover_color = Color(0.893137, 0.893137, 0.893137, 1)
@@ -4263,7 +4293,7 @@ MenuButton/constants/outline_size = 0
 MenuButton/styles/disabled = SubResource("StyleBoxFlat_l5ore")
 MenuButton/styles/disabled_mirrored = SubResource("StyleBoxFlat_l5ore")
 MenuButton/styles/focus = SubResource("StyleBoxFlat_l5ore")
-MenuButton/styles/hover = SubResource("StyleBoxFlat_5kevk")
+MenuButton/styles/hover = SubResource("StyleBoxFlat_woj82")
 MenuButton/styles/hover_mirrored = SubResource("StyleBoxFlat_5kevk")
 MenuButton/styles/hover_pressed = SubResource("StyleBoxFlat_jccna")
 MenuButton/styles/hover_pressed_mirrored = SubResource("StyleBoxFlat_jccna")
@@ -4398,10 +4428,10 @@ TabBar/styles/tab_hovered = SubResource("StyleBoxFlat_tmq75")
 TabBar/styles/tab_selected = SubResource("StyleBoxFlat_lgkqp")
 TabBar/styles/tab_unselected = SubResource("StyleBoxFlat_6fhxt")
 TabContainer/colors/drop_mark_color = Color(0.278333, 0.490098, 0.775392, 1)
-TabContainer/colors/font_hovered_color = Color(0.786274, 0.786274, 0.786274, 1)
-TabContainer/colors/font_outline_color = Color(0, 0, 0, 0)
-TabContainer/colors/font_selected_color = Color(0.786274, 0.786274, 0.786274, 1)
-TabContainer/colors/font_unselected_color = Color(1, 1, 1, 0.235294)
+TabContainer/colors/font_hovered_color = Color(0.956863, 0.956863, 0.956863, 1)
+TabContainer/colors/font_outline_color = Color(0.96, 0.96, 0.96, 0)
+TabContainer/colors/font_selected_color = Color(0.956863, 0.956863, 0.956863, 1)
+TabContainer/colors/font_unselected_color = Color(0.75, 0.75, 0.75, 1)
 TabContainer/constants/outline_size = 0
 TabContainer/constants/side_margin = 0
 TabContainer/icons/decrement = null
@@ -4414,9 +4444,9 @@ TabContainer/icons/menu_highlight = null
 TabContainer/styles/panel = SubResource("StyleBoxFlat_0c4py")
 TabContainer/styles/tab_disabled = SubResource("StyleBoxFlat_lrq1b")
 TabContainer/styles/tab_focus = SubResource("StyleBoxFlat_kwdgv")
-TabContainer/styles/tab_hovered = SubResource("StyleBoxFlat_tmq75")
+TabContainer/styles/tab_hovered = SubResource("StyleBoxFlat_4rrmf")
 TabContainer/styles/tab_selected = SubResource("StyleBoxFlat_lgkqp")
-TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_6fhxt")
+TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_xd5fw")
 TabContainer/styles/tabbar_background = SubResource("StyleBoxFlat_o0sc5")
 TabContainerOdd/styles/panel = SubResource("StyleBoxFlat_plrjc")
 TabContainerOdd/styles/tab_selected = SubResource("StyleBoxFlat_ecmpj")
@@ -4438,8 +4468,8 @@ TextEdit/styles/read_only = SubResource("StyleBoxFlat_6ucq2")
 ThemeEditor/colors/preview_picker_overlay_color = Color(0.1, 0.1, 0.1, 0.25)
 ThemeEditor/styles/preview_picker_label = SubResource("StyleBoxFlat_jtsa3")
 ThemeEditor/styles/preview_picker_overlay = SubResource("StyleBoxFlat_qixj3")
-Timeline/colors/line_primary_color = Color(0.25, 0.25, 0.25, 1)
-Timeline/colors/line_secondary_color = Color(0.2, 0.2, 0.2, 1)
+Timeline/colors/line_primary_color = Color(0.223529, 0.223529, 0.223529, 1)
+Timeline/colors/line_secondary_color = Color(0.14902, 0.14902, 0.14902, 1)
 Timeline/constants/time_label_offset_x = 30
 Timeline/constants/time_label_offset_y = 20
 Timeline/styles/background = SubResource("StyleBoxFlat_k6s8r")
@@ -4449,6 +4479,10 @@ TooltipLabel/colors/font_shadow_color = Color(0, 0, 0, 0)
 TooltipPanel/styles/panel = SubResource("StyleBoxFlat_qr21i")
 TopBarOptionButton/font_sizes/font_size = 14
 TopBarOptionButton/fonts/font = ExtResource("1_a74l0")
+Track/base_type = &"PanelContainer"
+Track/styles/panel = SubResource("StyleBoxFlat_jkmfx")
+Transport/base_type = &"PanelContainer"
+Transport/styles/panel = SubResource("StyleBoxFlat_hry0s")
 Tree/colors/children_hl_line_color = Color(1, 1, 1, 0.0196078)
 Tree/colors/custom_button_font_highlight = Color(0.893137, 0.893137, 0.893137, 1)
 Tree/colors/drop_position_color = Color(1, 1, 1, 0.392157)
diff --git a/Assets/Fonts/Inter-Regular.ttf.import b/Assets/Fonts/Inter-Regular.ttf.import
index b2dd5d7..94dd781 100644
--- a/Assets/Fonts/Inter-Regular.ttf.import
+++ b/Assets/Fonts/Inter-Regular.ttf.import
@@ -23,6 +23,7 @@ allow_system_fallback=true
 force_autohinter=false
 hinting=1
 subpixel_positioning=1
+keep_rounding_remainders=true
 oversampling=0.0
 Fallbacks=null
 fallbacks=[]
diff --git a/Assets/Fonts/InterVariable.ttf.import b/Assets/Fonts/InterVariable.ttf.import
index e035bad..85011ed 100644
--- a/Assets/Fonts/InterVariable.ttf.import
+++ b/Assets/Fonts/InterVariable.ttf.import
@@ -23,6 +23,7 @@ allow_system_fallback=true
 force_autohinter=false
 hinting=1
 subpixel_positioning=1
+keep_rounding_remainders=true
 oversampling=0.0
 Fallbacks=null
 fallbacks=[]
diff --git a/Assets/Icons/audio_track_2.svg b/Assets/Icons/audio_track_2.svg
new file mode 100644
index 0000000..7dd397c
--- /dev/null
+++ b/Assets/Icons/audio_track_2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M560-131v-82q90-26 145-100t55-168q0-94-55-168T560-749v-82q124 28 202 125.5T840-481q0 127-78 224.5T560-131ZM120-360v-240h160l200-200v640L280-360H120Zm440 40v-322q47 22 73.5 66t26.5 96q0 51-26.5 94.5T560-320Z"/></svg>
\ No newline at end of file
diff --git a/Assets/Icons/audio_track_2.svg.import b/Assets/Icons/audio_track_2.svg.import
new file mode 100644
index 0000000..dc6e0e5
--- /dev/null
+++ b/Assets/Icons/audio_track_2.svg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://doq1jqfntrjrc"
+path="res://.godot/imported/audio_track_2.svg-73627df2be28a19ef8ff0e0571aff244.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Icons/audio_track_2.svg"
+dest_files=["res://.godot/imported/audio_track_2.svg-73627df2be28a19ef8ff0e0571aff244.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=8.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false
diff --git a/AudioEditor.csproj b/AudioEditor.csproj
index 37f6f33..c921004 100644
--- a/AudioEditor.csproj
+++ b/AudioEditor.csproj
@@ -1,8 +1,6 @@
-<Project Sdk="Godot.NET.Sdk/4.3.0">
+<Project Sdk="Godot.NET.Sdk/4.4.1">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
-    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
   <ItemGroup>
diff --git a/AudioEditor.csproj.old b/AudioEditor.csproj.old
new file mode 100644
index 0000000..37f6f33
--- /dev/null
+++ b/AudioEditor.csproj.old
@@ -0,0 +1,11 @@
+<Project Sdk="Godot.NET.Sdk/4.3.0">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
+    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="NAudio" Version="2.2.1" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Controls/AudioClip.tscn b/Controls/AudioClip.tscn
index 41bc0c4..4f517ee 100644
--- a/Controls/AudioClip.tscn
+++ b/Controls/AudioClip.tscn
@@ -1,15 +1,7 @@
-[gd_scene load_steps=4 format=3 uid="uid://dmmgalpx4fcc7"]
+[gd_scene load_steps=3 format=3 uid="uid://dmmgalpx4fcc7"]
 
-[ext_resource type="Script" path="res://Scripts/AudioClip.gd" id="1_iy5jd"]
-[ext_resource type="Script" path="res://Source/Waveform.cs" id="2_43oho"]
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8tb17"]
-border_width_left = 2
-border_width_top = 2
-border_width_right = 2
-border_width_bottom = 2
-border_color = Color(0.273873, 0.273873, 0.273873, 1)
-border_blend = true
+[ext_resource type="Script" uid="uid://cxgi7wpdim7xs" path="res://Scripts/AudioClip.gd" id="1_iy5jd"]
+[ext_resource type="Script" uid="uid://wrxkvb8fkmlp" path="res://Source/Waveform.cs" id="2_43oho"]
 
 [node name="AudioClip" type="Panel"]
 modulate = Color(0.552956, 0.552956, 0.552956, 1)
@@ -21,7 +13,7 @@ anchor_right = 0.104
 anchor_bottom = 0.059
 offset_right = 0.319992
 offset_bottom = 0.279995
-theme_override_styles/panel = SubResource("StyleBoxFlat_8tb17")
+theme_type_variation = &"AudioClip"
 script = ExtResource("1_iy5jd")
 
 [node name="Panel" type="Panel" parent="."]
diff --git a/Controls/AudioTrack.tscn b/Controls/AudioTrack.tscn
index 6740183..a9dfd06 100644
--- a/Controls/AudioTrack.tscn
+++ b/Controls/AudioTrack.tscn
@@ -1,6 +1,7 @@
-[gd_scene load_steps=6 format=3 uid="uid://dlb5xpe1t8rrk"]
+[gd_scene load_steps=7 format=3 uid="uid://dlb5xpe1t8rrk"]
 
 [ext_resource type="PackedScene" uid="uid://c3kajrpp2ux7" path="res://Controls/Track.tscn" id="1_envsv"]
+[ext_resource type="Texture2D" uid="uid://doq1jqfntrjrc" path="res://Assets/Icons/audio_track_2.svg" id="2_g74u4"]
 [ext_resource type="Texture2D" uid="uid://cc0dy71y8shcx" path="res://Assets/Icons/record.svg" id="2_iwhga"]
 [ext_resource type="Texture2D" uid="uid://c8napjmkltpr" path="res://Assets/Icons/slider_grabber.svg" id="3_y81l0"]
 
@@ -34,6 +35,9 @@ layout_mode = 2
 toggle_mode = true
 text = "S"
 
+[node name="TrackIcon" parent="PanelContainer/HBoxContainer/Body/HBoxContainer/NameIconControls/IconAndName" index="0"]
+texture = ExtResource("2_g74u4")
+
 [node name="Record" type="Button" parent="PanelContainer/HBoxContainer/Body/HBoxContainer/NameIconControls/IconAndName" index="2"]
 self_modulate = Color(1, 0.373852, 0.504338, 1)
 layout_mode = 2
diff --git a/Controls/Track.tscn b/Controls/Track.tscn
index b64a569..737a757 100644
--- a/Controls/Track.tscn
+++ b/Controls/Track.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Theme" uid="uid://b8rk41gjual2b" path="res://Assets/DefaultTheme.tres" id="1_tbi88"]
 [ext_resource type="Texture2D" uid="uid://bwfbs4jxbia3o" path="res://Assets/Icons/microphone_track.svg" id="2_r2pin"]
-[ext_resource type="Script" path="res://Scripts/Track.gd" id="2_rsf0h"]
+[ext_resource type="Script" uid="uid://nq2n8r8tq3nt" path="res://Scripts/Track.gd" id="2_rsf0h"]
 [ext_resource type="FontFile" uid="uid://ctw3g5gundhpj" path="res://Assets/Fonts/InterVariable.ttf" id="3_12y3l"]
 
 [sub_resource type="FontVariation" id="FontVariation_lbdn3"]
@@ -29,6 +29,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+theme_type_variation = &"Track"
 
 [node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer"]
 clip_children = 1
@@ -37,8 +38,9 @@ layout_mode = 2
 [node name="ColorStrip" type="ColorRect" parent="PanelContainer/HBoxContainer"]
 self_modulate = Color(0.699653, 0.699654, 0.699653, 1)
 clip_contents = true
-custom_minimum_size = Vector2(4, 0)
+custom_minimum_size = Vector2(2, 0)
 layout_mode = 2
+color = Color(0.435294, 0.435294, 0.435294, 1)
 
 [node name="Body" type="MarginContainer" parent="PanelContainer/HBoxContainer"]
 layout_mode = 2
diff --git a/Controls/Transport.tscn b/Controls/Transport.tscn
index 2a50c9b..9622fe8 100644
--- a/Controls/Transport.tscn
+++ b/Controls/Transport.tscn
@@ -12,6 +12,8 @@ mouse_filter = 2
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
 layout_mode = 2
+theme_override_constants/separation = 16
+alignment = 1
 
 [node name="Controls" type="MarginContainer" parent="HBoxContainer"]
 layout_mode = 2
@@ -25,7 +27,7 @@ theme_override_constants/margin_bottom = 8
 layout_mode = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
-theme_override_constants/separation = 8
+theme_override_constants/separation = 0
 
 [node name="Play" type="Button" parent="HBoxContainer/Controls/HBoxContainer"]
 modulate = Color(0.253333, 1, 0.2, 1)
diff --git a/Scripts/AudioClip.gd.uid b/Scripts/AudioClip.gd.uid
new file mode 100644
index 0000000..b0495b2
--- /dev/null
+++ b/Scripts/AudioClip.gd.uid
@@ -0,0 +1 @@
+uid://cxgi7wpdim7xs
diff --git a/Scripts/NestablePopupMenu.gd.uid b/Scripts/NestablePopupMenu.gd.uid
new file mode 100644
index 0000000..1d77f6d
--- /dev/null
+++ b/Scripts/NestablePopupMenu.gd.uid
@@ -0,0 +1 @@
+uid://cscqkg5w0nqaf
diff --git a/Scripts/Timeline.gd.uid b/Scripts/Timeline.gd.uid
new file mode 100644
index 0000000..38dbcd9
--- /dev/null
+++ b/Scripts/Timeline.gd.uid
@@ -0,0 +1 @@
+uid://2t7cikq15q48
diff --git a/Scripts/Track.gd.uid b/Scripts/Track.gd.uid
new file mode 100644
index 0000000..aeb56aa
--- /dev/null
+++ b/Scripts/Track.gd.uid
@@ -0,0 +1 @@
+uid://nq2n8r8tq3nt
diff --git a/Source/AudioFileAnalyzer.cs.uid b/Source/AudioFileAnalyzer.cs.uid
new file mode 100644
index 0000000..3e606b7
--- /dev/null
+++ b/Source/AudioFileAnalyzer.cs.uid
@@ -0,0 +1 @@
+uid://bhypae8nci75e
diff --git a/Source/ProjectController.cs.uid b/Source/ProjectController.cs.uid
new file mode 100644
index 0000000..1f211b1
--- /dev/null
+++ b/Source/ProjectController.cs.uid
@@ -0,0 +1 @@
+uid://dtomx04m445em
diff --git a/Source/Waveform.cs.uid b/Source/Waveform.cs.uid
new file mode 100644
index 0000000..faf2808
--- /dev/null
+++ b/Source/Waveform.cs.uid
@@ -0,0 +1 @@
+uid://wrxkvb8fkmlp
diff --git a/Views/MainView.tscn b/Views/MainView.tscn
index 54c61fa..5927da1 100644
--- a/Views/MainView.tscn
+++ b/Views/MainView.tscn
@@ -1,16 +1,16 @@
-[gd_scene load_steps=17 format=3 uid="uid://cr2f68sbsegai"]
+[gd_scene load_steps=16 format=3 uid="uid://cr2f68sbsegai"]
 
 [ext_resource type="Theme" uid="uid://b8rk41gjual2b" path="res://Assets/DefaultTheme.tres" id="1_s6hk6"]
-[ext_resource type="Script" path="res://addons/dockable_container/dockable_container.gd" id="2_7b0h5"]
-[ext_resource type="Script" path="res://Scripts/NestablePopupMenu.gd" id="2_lsrne"]
+[ext_resource type="Script" uid="uid://mw1o44i8qxmk" path="res://addons/dockable_container/dockable_container.gd" id="2_7b0h5"]
+[ext_resource type="Script" uid="uid://cscqkg5w0nqaf" path="res://Scripts/NestablePopupMenu.gd" id="2_lsrne"]
 [ext_resource type="Texture2D" uid="uid://vd53o7va0tni" path="res://Assets/Icons/tracks.svg" id="2_nidjn"]
 [ext_resource type="Texture2D" uid="uid://dxl2qel0qbxrn" path="res://Assets/Icons/mixer.svg" id="3_4tblp"]
-[ext_resource type="Script" path="res://addons/dockable_container/layout_panel.gd" id="3_4twnq"]
-[ext_resource type="Script" path="res://addons/dockable_container/layout.gd" id="4_ixaqo"]
+[ext_resource type="Script" uid="uid://otsc040yabxa" path="res://addons/dockable_container/layout_panel.gd" id="3_4twnq"]
+[ext_resource type="Script" uid="uid://sgl6svfbs2v6" path="res://addons/dockable_container/layout.gd" id="4_ixaqo"]
 [ext_resource type="PackedScene" uid="uid://bgh1og6p43lsp" path="res://Controls/Transport.tscn" id="5_aq6v8"]
 [ext_resource type="PackedScene" uid="uid://bpd6g2b3s7tqa" path="res://Views/TrackView.tscn" id="5_rgxdu"]
 [ext_resource type="PackedScene" uid="uid://v4oljx3qrk5q" path="res://Views/Timeline.tscn" id="7_xu70y"]
-[ext_resource type="Script" path="res://Source/ProjectController.cs" id="11_gc3ui"]
+[ext_resource type="Script" uid="uid://dtomx04m445em" path="res://Source/ProjectController.cs" id="11_gc3ui"]
 
 [sub_resource type="Resource" id="Resource_pfnfv"]
 resource_name = "Tabs"
@@ -36,9 +36,6 @@ script = ExtResource("4_ixaqo")
 root = SubResource("Resource_xnlko")
 hidden_tabs = {}
 
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3f3qp"]
-bg_color = Color(0.180005, 0.180005, 0.180005, 1)
-
 [node name="MainView" type="Control"]
 layout_mode = 3
 anchors_preset = 15
@@ -59,12 +56,12 @@ grow_vertical = 2
 [node name="MenuBar" type="MenuBar" parent="VBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
-theme_override_font_sizes/font_size = 13
 flat = true
 
 [node name="File" type="PopupMenu" parent="VBoxContainer/MenuBar"]
 item_count = 3
 item_0/text = "New..."
+item_0/id = 0
 item_1/text = "Open..."
 item_1/id = 1
 item_2/id = 2
@@ -75,12 +72,14 @@ script = ExtResource("2_lsrne")
 auto_translate_mode = 1
 item_count = 2
 item_0/text = "Audio Clip"
+item_0/id = 0
 item_1/text = "Label Clip"
 item_1/id = 1
 
 [node name="Export" type="PopupMenu" parent="VBoxContainer/MenuBar/File"]
 item_count = 2
 item_0/text = "Project"
+item_0/id = 0
 item_1/text = "Region"
 item_1/id = 1
 
@@ -88,6 +87,7 @@ item_1/id = 1
 auto_translate_mode = 1
 item_count = 2
 item_0/text = "Add Audio Track"
+item_0/id = 0
 item_1/text = "Add Label Track"
 item_1/id = 1
 
@@ -99,6 +99,7 @@ item_0/text = "Tracks"
 item_0/icon = ExtResource("2_nidjn")
 item_0/checkable = 1
 item_0/checked = true
+item_0/id = 0
 item_1/text = "Mixer"
 item_1/icon = ExtResource("3_4tblp")
 item_1/checkable = 1
@@ -110,6 +111,7 @@ auto_translate_mode = 1
 hide_on_checkable_item_selection = false
 item_count = 2
 item_0/text = "Project Settings"
+item_0/id = 0
 item_1/text = "System Settings"
 item_1/id = 1
 
@@ -122,6 +124,7 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
+theme_type_variation = &"MenuBarPanel"
 
 [node name="VSplitContainer" type="VSplitContainer" parent="VBoxContainer"]
 layout_mode = 2
@@ -129,6 +132,7 @@ size_flags_vertical = 3
 
 [node name="Transport" parent="VBoxContainer/VSplitContainer" instance=ExtResource("5_aq6v8")]
 layout_mode = 2
+size_flags_horizontal = 1
 
 [node name="HSplitContainer" type="HSplitContainer" parent="VBoxContainer/VSplitContainer"]
 layout_mode = 2
@@ -178,7 +182,6 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
-theme_override_styles/panel = SubResource("StyleBoxFlat_3f3qp")
 
 [node name="ProjectController" type="Node" parent="."]
 script = ExtResource("11_gc3ui")
diff --git a/Views/Timeline.tscn b/Views/Timeline.tscn
index b0cd6da..27dfee3 100644
--- a/Views/Timeline.tscn
+++ b/Views/Timeline.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://v4oljx3qrk5q"]
 
-[ext_resource type="Script" path="res://Scripts/Timeline.gd" id="1_h2mev"]
+[ext_resource type="Script" uid="uid://2t7cikq15q48" path="res://Scripts/Timeline.gd" id="1_h2mev"]
 [ext_resource type="PackedScene" uid="uid://dmmgalpx4fcc7" path="res://Controls/AudioClip.tscn" id="2_an2hv"]
 
 [node name="Timeline" type="Container"]
diff --git a/Views/TrackView.tscn b/Views/TrackView.tscn
index 7da74d5..0940fec 100644
--- a/Views/TrackView.tscn
+++ b/Views/TrackView.tscn
@@ -52,5 +52,6 @@ flat = false
 icon_alignment = 1
 item_count = 2
 popup/item_0/text = "Audio Track"
+popup/item_0/id = 0
 popup/item_1/text = "Label Track"
 popup/item_1/id = 1
diff --git a/addons/dockable_container/dockable_container.gd.uid b/addons/dockable_container/dockable_container.gd.uid
new file mode 100644
index 0000000..b5abbb4
--- /dev/null
+++ b/addons/dockable_container/dockable_container.gd.uid
@@ -0,0 +1 @@
+uid://mw1o44i8qxmk
diff --git a/addons/dockable_container/dockable_panel.gd.uid b/addons/dockable_container/dockable_panel.gd.uid
new file mode 100644
index 0000000..f94c56e
--- /dev/null
+++ b/addons/dockable_container/dockable_panel.gd.uid
@@ -0,0 +1 @@
+uid://cvb3prw3wrl8y
diff --git a/addons/dockable_container/dockable_panel_reference_control.gd.uid b/addons/dockable_container/dockable_panel_reference_control.gd.uid
new file mode 100644
index 0000000..1d33a37
--- /dev/null
+++ b/addons/dockable_container/dockable_panel_reference_control.gd.uid
@@ -0,0 +1 @@
+uid://c2aoiosenaiwf
diff --git a/addons/dockable_container/drag_n_drop_panel.gd.uid b/addons/dockable_container/drag_n_drop_panel.gd.uid
new file mode 100644
index 0000000..0b91839
--- /dev/null
+++ b/addons/dockable_container/drag_n_drop_panel.gd.uid
@@ -0,0 +1 @@
+uid://ivfobwd6lvm1
diff --git a/addons/dockable_container/inspector_plugin/editor_inspector_plugin.gd.uid b/addons/dockable_container/inspector_plugin/editor_inspector_plugin.gd.uid
new file mode 100644
index 0000000..e57e2b1
--- /dev/null
+++ b/addons/dockable_container/inspector_plugin/editor_inspector_plugin.gd.uid
@@ -0,0 +1 @@
+uid://d1l3xaxj0w3vy
diff --git a/addons/dockable_container/inspector_plugin/layout_editor_property.gd.uid b/addons/dockable_container/inspector_plugin/layout_editor_property.gd.uid
new file mode 100644
index 0000000..2fe455d
--- /dev/null
+++ b/addons/dockable_container/inspector_plugin/layout_editor_property.gd.uid
@@ -0,0 +1 @@
+uid://cbpxkf5rmukr3
diff --git a/addons/dockable_container/layout.gd.uid b/addons/dockable_container/layout.gd.uid
new file mode 100644
index 0000000..a9aeff8
--- /dev/null
+++ b/addons/dockable_container/layout.gd.uid
@@ -0,0 +1 @@
+uid://sgl6svfbs2v6
diff --git a/addons/dockable_container/layout_node.gd.uid b/addons/dockable_container/layout_node.gd.uid
new file mode 100644
index 0000000..c4f7cc6
--- /dev/null
+++ b/addons/dockable_container/layout_node.gd.uid
@@ -0,0 +1 @@
+uid://8ooorbaky8jx
diff --git a/addons/dockable_container/layout_panel.gd.uid b/addons/dockable_container/layout_panel.gd.uid
new file mode 100644
index 0000000..ca0316e
--- /dev/null
+++ b/addons/dockable_container/layout_panel.gd.uid
@@ -0,0 +1 @@
+uid://otsc040yabxa
diff --git a/addons/dockable_container/layout_split.gd.uid b/addons/dockable_container/layout_split.gd.uid
new file mode 100644
index 0000000..f964a4f
--- /dev/null
+++ b/addons/dockable_container/layout_split.gd.uid
@@ -0,0 +1 @@
+uid://dd7uypdhptv1n
diff --git a/addons/dockable_container/plugin.gd.uid b/addons/dockable_container/plugin.gd.uid
new file mode 100644
index 0000000..b92c69f
--- /dev/null
+++ b/addons/dockable_container/plugin.gd.uid
@@ -0,0 +1 @@
+uid://bb6danhejnf2o
diff --git a/addons/dockable_container/samples/TestScene.gd.uid b/addons/dockable_container/samples/TestScene.gd.uid
new file mode 100644
index 0000000..e0f73d0
--- /dev/null
+++ b/addons/dockable_container/samples/TestScene.gd.uid
@@ -0,0 +1 @@
+uid://bwo33n0cfouad
diff --git a/addons/dockable_container/samples/TestScene.tscn b/addons/dockable_container/samples/TestScene.tscn
index 80ca9cc..8d7adfe 100644
--- a/addons/dockable_container/samples/TestScene.tscn
+++ b/addons/dockable_container/samples/TestScene.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=16 format=3 uid="uid://drlvhuchtk6if"]
 
-[ext_resource type="Script" path="res://addons/dockable_container/dockable_container.gd" id="1"]
-[ext_resource type="Script" path="res://addons/dockable_container/layout.gd" id="2"]
-[ext_resource type="Script" path="res://addons/dockable_container/samples/TestScene.gd" id="4"]
-[ext_resource type="Script" path="res://addons/dockable_container/layout_split.gd" id="4_yhgfb"]
-[ext_resource type="Script" path="res://addons/dockable_container/layout_panel.gd" id="5"]
+[ext_resource type="Script" uid="uid://mw1o44i8qxmk" path="res://addons/dockable_container/dockable_container.gd" id="1"]
+[ext_resource type="Script" uid="uid://sgl6svfbs2v6" path="res://addons/dockable_container/layout.gd" id="2"]
+[ext_resource type="Script" uid="uid://bwo33n0cfouad" path="res://addons/dockable_container/samples/TestScene.gd" id="4"]
+[ext_resource type="Script" uid="uid://dd7uypdhptv1n" path="res://addons/dockable_container/layout_split.gd" id="4_yhgfb"]
+[ext_resource type="Script" uid="uid://otsc040yabxa" path="res://addons/dockable_container/layout_panel.gd" id="5"]
 
 [sub_resource type="Resource" id="Resource_8aoc2"]
 resource_name = "Tabs"
diff --git a/addons/dockable_container/split_handle.gd.uid b/addons/dockable_container/split_handle.gd.uid
new file mode 100644
index 0000000..fb6ad39
--- /dev/null
+++ b/addons/dockable_container/split_handle.gd.uid
@@ -0,0 +1 @@
+uid://dkagjri75ub62
diff --git a/project.godot b/project.godot
index e59f50a..1e0dbd2 100644
--- a/project.godot
+++ b/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="AudioEditor"
 run/main_scene="res://Views/MainView.tscn"
-config/features=PackedStringArray("4.3", "C#", "GL Compatibility")
+config/features=PackedStringArray("4.4", "C#", "GL Compatibility")
 run/low_processor_mode=true
 boot_splash/show_image=false
 config/icon="res://icon.svg"
@@ -47,3 +47,4 @@ enabled=PackedStringArray("res://addons/dockable_container/plugin.cfg")
 
 renderer/rendering_method="gl_compatibility"
 renderer/rendering_method.mobile="gl_compatibility"
+environment/defaults/default_clear_color=Color(0.0862745, 0.0862745, 0.0862745, 1)