diff --git a/addons/dialogic/Dialog.tscn b/addons/dialogic/Dialog.tscn
index fa49bbf..40fd4d9 100644
--- a/addons/dialogic/Dialog.tscn
+++ b/addons/dialogic/Dialog.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=14 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/next-indicator.png" type="Texture" id=1]
-[ext_resource path="res://addons/dialogic/Images/background/background-2.png" type="Texture" id=2]
-[ext_resource path="res://addons/dialogic/Fonts/DefaultFont.tres" type="DynamicFont" id=3]
-[ext_resource path="res://addons/dialogic/Fonts/GlossaryFont.tres" type="DynamicFont" id=4]
+[ext_resource path="res://addons/dialogic/Example Assets/next-indicator/next-indicator.png" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Example Assets/backgrounds/background-2.png" type="Texture" id=2]
+[ext_resource path="res://addons/dialogic/Example Assets/Fonts/DefaultFont.tres" type="DynamicFont" id=3]
+[ext_resource path="res://addons/dialogic/Example Assets/Fonts/GlossaryFont.tres" type="DynamicFont" id=4]
 [ext_resource path="res://addons/dialogic/Nodes/glossary_info.gd" type="Script" id=5]
 [ext_resource path="res://addons/dialogic/Nodes/dialog_node.gd" type="Script" id=6]
 [ext_resource path="res://addons/dialogic/Nodes/BackgroundMusic.tscn" type="PackedScene" id=7]
@@ -87,9 +87,9 @@ anchor_left = 0.5
 anchor_top = 1.0
 anchor_right = 0.5
 anchor_bottom = 1.0
-margin_left = -250.0
+margin_left = -455.0
 margin_top = -207.0
-margin_right = 250.0
+margin_right = 455.0
 margin_bottom = -40.0
 __meta__ = {
 "_edit_use_anchors_": false
@@ -145,7 +145,7 @@ anchor_bottom = 1.0
 margin_left = -36.4279
 margin_top = -35.9016
 margin_right = 14.5721
-margin_bottom = 29.4015
+margin_bottom = 25.4599
 rect_scale = Vector2( 0.4, 0.4 )
 texture = ExtResource( 1 )
 stretch_mode = 4
@@ -203,6 +203,17 @@ __meta__ = {
 
 [node name="Tween" type="Tween" parent="TextBubble"]
 
+[node name="CloseDialog" type="Control" parent="TextBubble"]
+margin_right = 40.0
+margin_bottom = 40.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Tween" type="Tween" parent="TextBubble/CloseDialog"]
+
+[node name="Timer" type="Timer" parent="TextBubble/CloseDialog"]
+
 [node name="Options" type="VBoxContainer" parent="."]
 anchor_left = 0.5
 anchor_top = 0.5
@@ -340,7 +351,6 @@ __meta__ = {
 [node name="Timer" type="Timer" parent="DefinitionInfo"]
 
 [node name="WaitSeconds" type="Timer" parent="."]
-
 [connection signal="meta_hover_ended" from="TextBubble/RichTextLabel" to="." method="_on_RichTextLabel_meta_hover_ended"]
 [connection signal="meta_hover_started" from="TextBubble/RichTextLabel" to="." method="_on_RichTextLabel_meta_hover_started"]
 [connection signal="timeout" from="DefinitionInfo/Timer" to="." method="_on_Definition_Timer_timeout"]
diff --git a/addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd b/addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd
index f584b10..3785162 100644
--- a/addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd
+++ b/addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd
@@ -5,7 +5,7 @@ var editor_reference
 var image_node
 
 func _ready():
-	pass
+	$ButtonDelete.icon = get_icon("Remove", "EditorIcons")
 
 
 func _on_ButtonDelete_pressed():
diff --git a/addons/dialogic/Editor/CharacterEditor/PortraitEntry.tscn b/addons/dialogic/Editor/CharacterEditor/PortraitEntry.tscn
index 9495e75..e19a1ce 100644
--- a/addons/dialogic/Editor/CharacterEditor/PortraitEntry.tscn
+++ b/addons/dialogic/Editor/CharacterEditor/PortraitEntry.tscn
@@ -1,6 +1,5 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/Remove.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/CharacterEditor/PortraitEntry.gd" type="Script" id=2]
 
 [node name="PortraitEntry" type="HBoxContainer"]
@@ -21,7 +20,7 @@ __meta__ = {
 
 [node name="PathEdit" type="LineEdit" parent="."]
 margin_left = 164.0
-margin_right = 391.0
+margin_right = 407.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 150, 0 )
 size_flags_horizontal = 3
@@ -29,16 +28,15 @@ editable = false
 selecting_enabled = false
 
 [node name="ButtonSelect" type="Button" parent="."]
-margin_left = 395.0
-margin_right = 419.0
+margin_left = 411.0
+margin_right = 435.0
 margin_bottom = 24.0
 text = "..."
 
 [node name="ButtonDelete" type="Button" parent="."]
-margin_left = 423.0
+margin_left = 439.0
 margin_right = 451.0
 margin_bottom = 24.0
-icon = ExtResource( 1 )
 flat = true
 
 [connection signal="focus_entered" from="NameEdit" to="." method="_on_focus_entered"]
diff --git a/addons/dialogic/Editor/EditorView.tscn b/addons/dialogic/Editor/EditorView.tscn
index e6e08d0..d638046 100644
--- a/addons/dialogic/Editor/EditorView.tscn
+++ b/addons/dialogic/Editor/EditorView.tscn
@@ -8,11 +8,11 @@
 [ext_resource path="res://addons/dialogic/Editor/SettingsEditor/SettingsEditor.tscn" type="PackedScene" id=6]
 [ext_resource path="res://addons/dialogic/Editor/CharacterEditor/CharacterEditor.tscn" type="PackedScene" id=7]
 [ext_resource path="res://addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn" type="PackedScene" id=8]
-[ext_resource path="res://addons/dialogic/Images/ActionCopy.svg" type="Texture" id=11]
+[ext_resource path="res://addons/dialogic/Images/Context Menus/ActionCopy.svg" type="Texture" id=11]
 [ext_resource path="res://addons/dialogic/Editor/DefinitionEditor/DefinitionEditor.tscn" type="PackedScene" id=12]
 [ext_resource path="res://addons/dialogic/Images/Toolbar/add-theme.svg" type="Texture" id=13]
-[ext_resource path="res://addons/dialogic/Images/Remove.svg" type="Texture" id=22]
-[ext_resource path="res://addons/dialogic/Images/Filesystem.svg" type="Texture" id=26]
+[ext_resource path="res://addons/dialogic/Images/Context Menus/Remove.svg" type="Texture" id=22]
+[ext_resource path="res://addons/dialogic/Images/Context Menus/Filesystem.svg" type="Texture" id=26]
 [ext_resource path="res://addons/dialogic/Editor/MasterTree/MasterTree.tscn" type="PackedScene" id=35]
 
 [sub_resource type="Image" id=1]
diff --git a/addons/dialogic/Editor/Pieces/AudioBlock.gd b/addons/dialogic/Editor/Pieces/AudioBlock.gd
index a267160..fe74770 100644
--- a/addons/dialogic/Editor/Pieces/AudioBlock.gd
+++ b/addons/dialogic/Editor/Pieces/AudioBlock.gd
@@ -4,8 +4,6 @@ extends HBoxContainer
 var editor_reference
 var editorPopup
 
-var play_icon = load("res://addons/dialogic/Images/play.svg")
-var stop_icon = load("res://addons/dialogic/Images/stop.svg")
 
 # This is the information of this event and it will get parsed and saved to the JSON file.
 var event_data = {
@@ -16,6 +14,8 @@ var event_data = {
 
 func _ready():
 	load_audio('')
+	$PanelContainer/VBoxContainer/Header/ButtonClear.icon = get_icon("Remove", "EditorIcons")
+	$PanelContainer/VBoxContainer/Header/ButtonPreviewPlay.icon = get_icon("Play", "EditorIcons")
 
 func _on_ButtonAudio_pressed():
 	editor_reference.godot_dialog("*.wav, *.ogg, *.mp3")
@@ -52,11 +52,11 @@ func _on_ButtonPreviewPlay_pressed():
 	else:
 		$PanelContainer/AudioPreview.stream = load(event_data['file'])
 		$PanelContainer/AudioPreview.play()
-		$PanelContainer/VBoxContainer/Header/ButtonPreviewPlay.icon = stop_icon
+		$PanelContainer/VBoxContainer/Header/ButtonPreviewPlay.icon = get_icon("Stop", "EditorIcons")
 
 
 func _on_AudioPreview_finished():
-	$PanelContainer/VBoxContainer/Header/ButtonPreviewPlay.icon = play_icon
+	$PanelContainer/VBoxContainer/Header/ButtonPreviewPlay.icon = get_icon("Play", "EditorIcons")
 
 
 func _on_ButtonClear_pressed():
diff --git a/addons/dialogic/Editor/Pieces/AudioBlock.tscn b/addons/dialogic/Editor/Pieces/AudioBlock.tscn
index 381fe85..14fc754 100644
--- a/addons/dialogic/Editor/Pieces/AudioBlock.tscn
+++ b/addons/dialogic/Editor/Pieces/AudioBlock.tscn
@@ -1,11 +1,9 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://addons/dialogic/Editor/Pieces/AudioBlock.gd" type="Script" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
-[ext_resource path="res://addons/dialogic/Images/Events/audio-event.svg" type="Texture" id=3]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/audio-event.svg" type="Texture" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
-[ext_resource path="res://addons/dialogic/Images/play.svg" type="Texture" id=5]
-[ext_resource path="res://addons/dialogic/Images/Remove.svg" type="Texture" id=7]
 
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
@@ -86,17 +84,15 @@ text = "..."
 
 [node name="ButtonClear" type="Button" parent="PanelContainer/VBoxContainer/Header"]
 margin_left = 384.0
+margin_right = 396.0
+margin_bottom = 28.0
+disabled = true
+
+[node name="ButtonPreviewPlay" type="Button" parent="PanelContainer/VBoxContainer/Header"]
+margin_left = 400.0
 margin_right = 412.0
 margin_bottom = 28.0
 disabled = true
-icon = ExtResource( 7 )
-
-[node name="ButtonPreviewPlay" type="Button" parent="PanelContainer/VBoxContainer/Header"]
-margin_left = 416.0
-margin_right = 450.0
-margin_bottom = 28.0
-disabled = true
-icon = ExtResource( 5 )
 
 [node name="Preview" type="Label" parent="PanelContainer/VBoxContainer/Header"]
 visible = false
@@ -108,7 +104,7 @@ custom_colors/font_color = Color( 1, 1, 1, 0.513726 )
 text = "    ..."
 
 [node name="Spacer" parent="PanelContainer/VBoxContainer/Header" instance=ExtResource( 2 )]
-margin_left = 454.0
+margin_left = 416.0
 margin_right = 1735.0
 margin_bottom = 28.0
 
@@ -119,6 +115,7 @@ margin_bottom = 28.0
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
 
 [node name="AudioPreview" type="AudioStreamPlayer" parent="PanelContainer"]
+
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonAudio" to="." method="_on_ButtonAudio_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonClear" to="." method="_on_ButtonClear_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonPreviewPlay" to="." method="_on_ButtonPreviewPlay_pressed"]
diff --git a/addons/dialogic/Editor/Pieces/BackgroundMusic.gd b/addons/dialogic/Editor/Pieces/BackgroundMusic.gd
index e4fcd52..6d5300c 100644
--- a/addons/dialogic/Editor/Pieces/BackgroundMusic.gd
+++ b/addons/dialogic/Editor/Pieces/BackgroundMusic.gd
@@ -4,8 +4,7 @@ extends HBoxContainer
 var editor_reference
 var editorPopup
 
-var play_icon = load("res://addons/dialogic/Images/play.svg")
-var stop_icon = load("res://addons/dialogic/Images/stop.svg")
+
 
 # This is the information of this event and it will get parsed and saved to the JSON file.
 var event_data = {
@@ -16,6 +15,9 @@ var event_data = {
 
 func _ready():
 	load_audio('')
+	$PanelContainer/VBoxContainer/Header/ButtonClear.icon = get_icon("Remove", "EditorIcons")
+	$PanelContainer/VBoxContainer/Header/ButtonPreviewPlay.icon = get_icon("Play", "EditorIcons")
+
 
 func _on_ButtonAudio_pressed():
 	editor_reference.godot_dialog("*.wav, *.ogg, *.mp3")
@@ -52,11 +54,11 @@ func _on_ButtonPreviewPlay_pressed():
 	else:
 		$PanelContainer/AudioPreview.stream = load(event_data['file'])
 		$PanelContainer/AudioPreview.play()
-		$PanelContainer/VBoxContainer/Header/ButtonPreviewPlay.icon = stop_icon
+		$PanelContainer/VBoxContainer/Header/ButtonPreviewPlay.icon = get_icon("Stop", "EditorIcons")
 
 
 func _on_AudioPreview_finished():
-	$PanelContainer/VBoxContainer/Header/ButtonPreviewPlay.icon = play_icon
+	$PanelContainer/VBoxContainer/Header/ButtonPreviewPlay.icon = get_icon("Play", "EditorIcons")
 
 
 func _on_ButtonClear_pressed():
diff --git a/addons/dialogic/Editor/Pieces/BackgroundMusic.tscn b/addons/dialogic/Editor/Pieces/BackgroundMusic.tscn
index 0672328..2996419 100644
--- a/addons/dialogic/Editor/Pieces/BackgroundMusic.tscn
+++ b/addons/dialogic/Editor/Pieces/BackgroundMusic.tscn
@@ -1,11 +1,9 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://addons/dialogic/Editor/Pieces/BackgroundMusic.gd" type="Script" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
-[ext_resource path="res://addons/dialogic/Images/Events/background-music.svg" type="Texture" id=3]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/background-music.svg" type="Texture" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
-[ext_resource path="res://addons/dialogic/Images/play.svg" type="Texture" id=5]
-[ext_resource path="res://addons/dialogic/Images/Remove.svg" type="Texture" id=7]
 
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
@@ -86,17 +84,15 @@ text = "..."
 
 [node name="ButtonClear" type="Button" parent="PanelContainer/VBoxContainer/Header"]
 margin_left = 400.0
+margin_right = 412.0
+margin_bottom = 28.0
+disabled = true
+
+[node name="ButtonPreviewPlay" type="Button" parent="PanelContainer/VBoxContainer/Header"]
+margin_left = 416.0
 margin_right = 428.0
 margin_bottom = 28.0
 disabled = true
-icon = ExtResource( 7 )
-
-[node name="ButtonPreviewPlay" type="Button" parent="PanelContainer/VBoxContainer/Header"]
-margin_left = 432.0
-margin_right = 466.0
-margin_bottom = 28.0
-disabled = true
-icon = ExtResource( 5 )
 
 [node name="Preview" type="Label" parent="PanelContainer/VBoxContainer/Header"]
 visible = false
@@ -108,7 +104,7 @@ custom_colors/font_color = Color( 1, 1, 1, 0.513726 )
 text = "    ..."
 
 [node name="Spacer" parent="PanelContainer/VBoxContainer/Header" instance=ExtResource( 2 )]
-margin_left = 470.0
+margin_left = 432.0
 margin_right = 1735.0
 margin_bottom = 28.0
 
@@ -119,6 +115,7 @@ margin_bottom = 28.0
 items = [ "Move Up", null, 0, false, false, 0, 0, null, "", false, "Move Down", null, 0, false, false, 1, 0, null, "", false, "", null, 0, false, false, 2, 0, null, "", true, "Remove", null, 0, false, false, 3, 0, null, "", false ]
 
 [node name="AudioPreview" type="AudioStreamPlayer" parent="PanelContainer"]
+
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonAudio" to="." method="_on_ButtonAudio_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonClear" to="." method="_on_ButtonClear_pressed"]
 [connection signal="pressed" from="PanelContainer/VBoxContainer/Header/ButtonPreviewPlay" to="." method="_on_ButtonPreviewPlay_pressed"]
diff --git a/addons/dialogic/Editor/Pieces/CallNode.tscn b/addons/dialogic/Editor/Pieces/CallNode.tscn
index 5640ce5..f63ec41 100644
--- a/addons/dialogic/Editor/Pieces/CallNode.tscn
+++ b/addons/dialogic/Editor/Pieces/CallNode.tscn
@@ -1,10 +1,12 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/Script.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/call-node.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/CallNode.gd" type="Script" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/ChangeScene.tscn b/addons/dialogic/Editor/Pieces/ChangeScene.tscn
index 305b22c..38addbc 100644
--- a/addons/dialogic/Editor/Pieces/ChangeScene.tscn
+++ b/addons/dialogic/Editor/Pieces/ChangeScene.tscn
@@ -2,9 +2,11 @@
 
 [ext_resource path="res://addons/dialogic/Editor/Pieces/ChangeScene.gd" type="Script" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
-[ext_resource path="res://addons/dialogic/Images/Events/change-scene.svg" type="Texture" id=3]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/change-scene.svg" type="Texture" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/ChangeTimeline.tscn b/addons/dialogic/Editor/Pieces/ChangeTimeline.tscn
index 819b3b6..e2f18b0 100644
--- a/addons/dialogic/Editor/Pieces/ChangeTimeline.tscn
+++ b/addons/dialogic/Editor/Pieces/ChangeTimeline.tscn
@@ -2,9 +2,11 @@
 
 [ext_resource path="res://addons/dialogic/Editor/Pieces/ChangeTimeline.gd" type="Script" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
-[ext_resource path="res://addons/dialogic/Images/Events/change-timeline.svg" type="Texture" id=3]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/change-timeline.svg" type="Texture" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn b/addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn
index 134dccc..5c18e99 100644
--- a/addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn
+++ b/addons/dialogic/Editor/Pieces/CharacterJoinBlock.tscn
@@ -3,11 +3,13 @@
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/CharacterJoinBlock.gd" type="Script" id=3]
-[ext_resource path="res://addons/dialogic/Images/character-join.svg" type="Texture" id=4]
-[ext_resource path="res://addons/dialogic/Images/character.svg" type="Texture" id=5]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/character-join.svg" type="Texture" id=4]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/character.svg" type="Texture" id=5]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PortraitPicker.tscn" type="PackedScene" id=7]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CharacterPicker.tscn" type="PackedScene" id=8]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/CharacterLeaveBlock.tscn b/addons/dialogic/Editor/Pieces/CharacterLeaveBlock.tscn
index 4de05e7..b3e3c7a 100644
--- a/addons/dialogic/Editor/Pieces/CharacterLeaveBlock.tscn
+++ b/addons/dialogic/Editor/Pieces/CharacterLeaveBlock.tscn
@@ -2,9 +2,11 @@
 
 [ext_resource path="res://addons/dialogic/Editor/Pieces/CharacterLeaveBlock.gd" type="Script" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
-[ext_resource path="res://addons/dialogic/Images/character-leave.svg" type="Texture" id=3]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/character-leave.svg" type="Texture" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/Choice.tscn b/addons/dialogic/Editor/Pieces/Choice.tscn
index 76472d0..e03597e 100644
--- a/addons/dialogic/Editor/Pieces/Choice.tscn
+++ b/addons/dialogic/Editor/Pieces/Choice.tscn
@@ -1,12 +1,14 @@
 [gd_scene load_steps=8 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/choice.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/choice.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Choice.gd" type="Script" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
-[ext_resource path="res://addons/dialogic/Images/warning.svg" type="Texture" id=6]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/warning.svg" type="Texture" id=6]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CustomLineEdit.tscn" type="PackedScene" id=7]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/CloseDialog.tscn b/addons/dialogic/Editor/Pieces/CloseDialog.tscn
index 8561884..c806d72 100644
--- a/addons/dialogic/Editor/Pieces/CloseDialog.tscn
+++ b/addons/dialogic/Editor/Pieces/CloseDialog.tscn
@@ -1,10 +1,12 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/end-dialog.svg" type="Texture" id=2]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/close-dialog.svg" type="Texture" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/CloseDialog.gd" type="Script" id=4]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=5]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/Common/CharacterPicker.tscn b/addons/dialogic/Editor/Pieces/Common/CharacterPicker.tscn
index 3f8c841..3f8bb34 100644
--- a/addons/dialogic/Editor/Pieces/Common/CharacterPicker.tscn
+++ b/addons/dialogic/Editor/Pieces/Common/CharacterPicker.tscn
@@ -1,8 +1,10 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/character.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/character.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CharacterPicker.gd" type="Script" id=2]
 
+
+
 [node name="CharacterPicker" type="HBoxContainer"]
 margin_right = 106.0
 margin_bottom = 30.0
diff --git a/addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn b/addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn
index f9c22f2..a4e4e24 100644
--- a/addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn
+++ b/addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn
@@ -1,8 +1,9 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/expand-icon.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Pieces/expand-icon.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.gd" type="Script" id=2]
 
+
 [node name="OptionButton" type="MenuButton"]
 margin_left = 1749.0
 margin_right = 1786.0
diff --git a/addons/dialogic/Editor/Pieces/Common/PortraitPicker.tscn b/addons/dialogic/Editor/Pieces/Common/PortraitPicker.tscn
index 53876df..83f67ad 100644
--- a/addons/dialogic/Editor/Pieces/Common/PortraitPicker.tscn
+++ b/addons/dialogic/Editor/Pieces/Common/PortraitPicker.tscn
@@ -1,8 +1,10 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/Portrait.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Portrait.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PortraitPicker.gd" type="Script" id=2]
 
+
+
 [node name="PortraitPicker" type="MenuButton"]
 margin_right = 34.0
 margin_bottom = 30.0
diff --git a/addons/dialogic/Editor/Pieces/Common/VisibleToggle.tscn b/addons/dialogic/Editor/Pieces/Common/VisibleToggle.tscn
index 0691cae..aaebc8a 100644
--- a/addons/dialogic/Editor/Pieces/Common/VisibleToggle.tscn
+++ b/addons/dialogic/Editor/Pieces/Common/VisibleToggle.tscn
@@ -1,9 +1,10 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/open-icon.svg" type="Texture" id=1]
-[ext_resource path="res://addons/dialogic/Images/closed-icon.svg" type="Texture" id=2]
+[ext_resource path="res://addons/dialogic/Images/Pieces/open-icon.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Pieces/closed-icon.svg" type="Texture" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/VisibleToggle.gd" type="Script" id=3]
 
+
 [node name="VisibleToggle" type="CheckBox"]
 margin_right = 30.0
 margin_bottom = 30.0
diff --git a/addons/dialogic/Editor/Pieces/EmitSignal.tscn b/addons/dialogic/Editor/Pieces/EmitSignal.tscn
index 43e63a9..1eae8f4 100644
--- a/addons/dialogic/Editor/Pieces/EmitSignal.tscn
+++ b/addons/dialogic/Editor/Pieces/EmitSignal.tscn
@@ -1,10 +1,12 @@
 [gd_scene load_steps=7 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/signal.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/emit-signal.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/EmitSignal.gd" type="Script" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/EndBranch.tscn b/addons/dialogic/Editor/Pieces/EndBranch.tscn
index 79192f2..a5582ff 100644
--- a/addons/dialogic/Editor/Pieces/EndBranch.tscn
+++ b/addons/dialogic/Editor/Pieces/EndBranch.tscn
@@ -3,7 +3,9 @@
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/EndBranch.gd" type="Script" id=4]
-[ext_resource path="res://addons/dialogic/Images/end-choice.svg" type="Texture" id=5]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/end-branch.svg" type="Texture" id=5]
+
+
 
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
diff --git a/addons/dialogic/Editor/Pieces/IfCondition.tscn b/addons/dialogic/Editor/Pieces/IfCondition.tscn
index 3d7c195..db98b36 100644
--- a/addons/dialogic/Editor/Pieces/IfCondition.tscn
+++ b/addons/dialogic/Editor/Pieces/IfCondition.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=9 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/condition.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/condition.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/IfCondition.gd" type="Script" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/ConditionPicker.tscn" type="PackedScene" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
@@ -8,6 +8,8 @@
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DefinitionPicker.tscn" type="PackedScene" id=7]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=8]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/Question.tscn b/addons/dialogic/Editor/Pieces/Question.tscn
index 14ffd00..c92ecdd 100644
--- a/addons/dialogic/Editor/Pieces/Question.tscn
+++ b/addons/dialogic/Editor/Pieces/Question.tscn
@@ -1,10 +1,12 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/question.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/question.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Question.gd" type="Script" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/SceneEvent.tscn b/addons/dialogic/Editor/Pieces/SceneEvent.tscn
index a900c5b..b7308fb 100644
--- a/addons/dialogic/Editor/Pieces/SceneEvent.tscn
+++ b/addons/dialogic/Editor/Pieces/SceneEvent.tscn
@@ -1,11 +1,13 @@
 [gd_scene load_steps=7 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/Events/scene.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/scene event.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/VisibleToggle.tscn" type="PackedScene" id=4]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/SceneEvent.gd" type="Script" id=5]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=6]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/SetTheme.tscn b/addons/dialogic/Editor/Pieces/SetTheme.tscn
index d666c86..8448f42 100644
--- a/addons/dialogic/Editor/Pieces/SetTheme.tscn
+++ b/addons/dialogic/Editor/Pieces/SetTheme.tscn
@@ -2,9 +2,11 @@
 
 [ext_resource path="res://addons/dialogic/Editor/Pieces/SetTheme.gd" type="Script" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=2]
-[ext_resource path="res://addons/dialogic/Images/theme.svg" type="Texture" id=3]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/set-theme.svg" type="Texture" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/SetValue.tscn b/addons/dialogic/Editor/Pieces/SetValue.tscn
index a121161..5b0cebd 100644
--- a/addons/dialogic/Editor/Pieces/SetValue.tscn
+++ b/addons/dialogic/Editor/Pieces/SetValue.tscn
@@ -1,12 +1,13 @@
 [gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://addons/dialogic/Editor/Pieces/SetValue.gd" type="Script" id=1]
-[ext_resource path="res://addons/dialogic/Images/Resources/definition.svg" type="Texture" id=2]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/set-value.svg" type="Texture" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/DefinitionPicker.tscn" type="PackedScene" id=6]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/OperationPicker.tscn" type="PackedScene" id=7]
 
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/TextBlock.tscn b/addons/dialogic/Editor/Pieces/TextBlock.tscn
index 8f21ebd..170baaf 100644
--- a/addons/dialogic/Editor/Pieces/TextBlock.tscn
+++ b/addons/dialogic/Editor/Pieces/TextBlock.tscn
@@ -2,12 +2,14 @@
 
 [ext_resource path="res://addons/dialogic/Editor/Pieces/TextBlock.gd" type="Script" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/VisibleToggle.tscn" type="PackedScene" id=2]
-[ext_resource path="res://addons/dialogic/Images/dialog.svg" type="Texture" id=3]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/text-event.svg" type="Texture" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/CharacterPicker.tscn" type="PackedScene" id=6]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PortraitPicker.tscn" type="PackedScene" id=7]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=8]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 6.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/Pieces/WaitSeconds.tscn b/addons/dialogic/Editor/Pieces/WaitSeconds.tscn
index 90d8783..b425983 100644
--- a/addons/dialogic/Editor/Pieces/WaitSeconds.tscn
+++ b/addons/dialogic/Editor/Pieces/WaitSeconds.tscn
@@ -1,11 +1,13 @@
 [gd_scene load_steps=8 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/Events/Wait.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/wait-seconds.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/WaitSeconds.gd" type="Script" id=2]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/Spacer.tscn" type="PackedScene" id=3]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/PieceExtraSettings.tscn" type="PackedScene" id=4]
 [ext_resource path="res://addons/dialogic/Editor/Pieces/Common/SpinBoxPreventDnD.gd" type="Script" id=6]
 
+
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 16.0
 content_margin_right = 6.0
diff --git a/addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd b/addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd
index af0d09e..d22341d 100644
--- a/addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd
+++ b/addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd
@@ -4,79 +4,84 @@ extends Control
 var editor_reference
 onready var master_tree = get_node('../MasterTreeContainer/MasterTree')
 onready var settings_editor = get_node('../SettingsEditor')
-var current_theme = ''
+var current_theme : String = ''
 
 # When loading the variables to the input fields in the 
 # load_theme function, every element thinks the value was updated
 # so it has to perform a "saving" of that property. 
 # The loading variable is a way to check if the values should be saved
 # or not.
-var loading = true 
+var loading : bool = true 
 
 # The amazing and revolutionary path system that magically works and you can't
 # complain because "that is not how you are supposed to work". If there was only
 # a way to set an id and then access that node via id...
 # Here you have paths in all its glory. Praise the paths (っ´ω`c)♡
-onready var n = {
-	# Text
-	'theme_text_shadow': $VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer2/CheckBoxShadow,
-	'theme_text_shadow_color': $VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer2/ColorPickerButtonShadow,
-	'theme_text_color': $VBoxContainer/TabContainer/Text/Column/GridContainer/ColorPickerButton,
-	'theme_font': $VBoxContainer/TabContainer/Text/Column/GridContainer/FontButton,
-	'theme_shadow_offset_x': $VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer/ShadowOffsetX,
-	'theme_shadow_offset_y': $VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer/ShadowOffsetY,
-	'theme_text_speed': $VBoxContainer/TabContainer/Text/Column/GridContainer/TextSpeed,
-	'alignment': $VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer3/Alignment,
+onready var n : Dictionary = {
+	# Dialog Text
+	'theme_text_shadow': $"VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer2/CheckBoxShadow",
+	'theme_text_shadow_color': $"VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer2/ColorPickerButtonShadow",
+	'theme_text_color': $"VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/ColorPickerButton",
+	'theme_font': $"VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/FontButton",
+	'theme_shadow_offset_x': $"VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer/ShadowOffsetX",
+	'theme_shadow_offset_y': $"VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer/ShadowOffsetY",
+	'theme_text_speed': $"VBoxContainer/TabContainer/Dialog Text/Column2/GridContainer/TextSpeed",
+	'alignment': $"VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer3/Alignment",
 	
 	# Dialog box
 	'background_texture_button_visible': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer3/CheckBox",
 	'theme_background_image': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer3/BackgroundTextureButton",
 	'theme_next_image': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/NextIndicatorButton",
 	'next_animation': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/NextAnimation",
-	'theme_action_key': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/BoxContainer/ActionOptionButton",
+	'theme_action_key': $"VBoxContainer/TabContainer/Dialog Box/Column3/GridContainer/BoxContainer/ActionOptionButton",
 	'theme_background_color_visible': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer2/CheckBox",
 	'theme_background_color': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer2/ColorPickerButton",
-	'theme_text_margin': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer/TextOffsetV",
-	'theme_text_margin_h': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer/TextOffsetH",
-	'size_w': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer4/BoxSizeW",
-	'size_h': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer4/BoxSizeH", 
-	'bottom_gap': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer5/BottomGap",
+	'theme_text_margin': $"VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer/TextOffsetV",
+	'theme_text_margin_h': $"VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer/TextOffsetH",
+	'size_w': $"VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer4/BoxSizeW",
+	'size_h': $"VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer4/BoxSizeH", 
+	'bottom_gap': $"VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer5/BottomGap",
 	'background_modulation': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer6/CheckBox",
 	'background_modulation_color': $"VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer6/ColorPickerButton",
 	
+	# Character Names
+	'name_auto_color': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/CharacterColor",
+	'name_background_visible': $"VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer2/CheckBox",
+	'name_background': $"VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer2/ColorPickerButton",
+	'name_image': $"VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer3/BackgroundTextureButton",
+	'name_image_visible': $"VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer3/CheckBox",
+	'name_shadow': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer4/ColorPickerButtonShadow",
+	'name_shadow_visible': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer4/CheckBoxShadow",
+	'name_shadow_offset_x': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer/ShadowOffsetX",
+	'name_shadow_offset_y': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer/ShadowOffsetY",
+	'name_bottom_gap': $"VBoxContainer/TabContainer/Name Label/Column3/GridContainer/HBoxContainer5/BottomGap",
+	'name_background_modulation': $"VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer6/CheckBox",
+	'name_background_modulation_color': $"VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer6/ColorPickerButton",
 	
-	# Buttons
+	# Choice Buttons
 	'button_text_color_enabled': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer4/CheckBox2",
 	'button_text_color': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer4/ButtonTextColor",
 	'button_background': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer2/ColorPickerButton",
 	'button_background_visible': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer2/CheckBox",
 	'button_image': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer3/BackgroundTextureButton",
 	'button_image_visible': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer3/CheckBox",
-	'button_offset_x': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer/TextOffsetH",
-	'button_offset_y': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer/TextOffsetV",
-	'button_separation': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/VerticalSeparation",
+	'button_modulation': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer6/CheckBox",
+	'button_modulation_color': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer6/ColorPickerButton",
+	'button_use_native': $"VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/CheckBox",
+	'button_offset_x': $"VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer/HBoxContainer/TextOffsetH",
+	'button_offset_y': $"VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer/HBoxContainer/TextOffsetV",
+	'button_separation': $"VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer/VerticalSeparation",
 	
-	# Definitions
+	# Glossary
 	'glossary_font': $VBoxContainer/TabContainer/Glossary/Column/GridContainer/FontButton,
 	'glossary_color': $VBoxContainer/TabContainer/Glossary/Column/GridContainer/ColorPickerButton,
 	
 	# Text preview
 	'text_preview': $VBoxContainer/HBoxContainer3/TextEdit,
 	
-	# Character Names
-	'name_auto_color': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/CheckBox",
-	'name_background_visible': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer2/CheckBox",
-	'name_background': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer2/ColorPickerButton",
-	'name_image': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer3/BackgroundTextureButton",
-	'name_image_visible': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer3/CheckBox",
-	'name_shadow': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer4/ColorPickerButtonShadow",
-	'name_shadow_visible': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer4/CheckBoxShadow",
-	'name_shadow_offset_x': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer/ShadowOffsetX",
-	'name_shadow_offset_y': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer/ShadowOffsetY",
-	'name_bottom_gap': $"VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer5/BottomGap",
 }
 
-func _ready():
+func _ready() -> void:
 	# Signal connection to free up some memory
 	connect("visibility_changed", self, "_on_visibility_changed")
 	if get_constant("dark_theme", "Editor"):
@@ -86,6 +91,9 @@ func _ready():
 	
 	$DelayPreviewTimer.one_shot = true
 	$DelayPreviewTimer.connect("timeout", self, '_on_DelayPreview_timer_timeout')
+	
+	var title_style = $"VBoxContainer/TabContainer/Dialog Text/Column/SectionTitle".get('custom_styles/normal')
+	title_style.set('bg_color', get_color("prop_category", "Editor"))
 	# Force preview update
 	_on_visibility_changed()
 
@@ -98,11 +106,11 @@ func load_theme(filename):
 	n['theme_action_key'].text = theme.get_value('settings', 'action_key', 'ui_accept')
 	
 	# Background
-	n['theme_background_image'].text = DialogicResources.get_filename_from_path(theme.get_value('background', 'image', 'res://addons/dialogic/Images/background/background-2.png'))
+	n['theme_background_image'].text = DialogicResources.get_filename_from_path(theme.get_value('background', 'image', 'res://addons/dialogic/Example Assets/backgrounds/background-2.png'))
 	n['background_texture_button_visible'].pressed = theme.get_value('background', 'use_image', true)
 	n['theme_background_color'].color = Color(theme.get_value('background', 'color', '#ff000000'))
 	n['theme_background_color_visible'].pressed = theme.get_value('background', 'use_color', false)
-	n['theme_next_image'].text = DialogicResources.get_filename_from_path(theme.get_value('next_indicator', 'image', 'res://addons/dialogic/Images/next-indicator.png'))
+	n['theme_next_image'].text = DialogicResources.get_filename_from_path(theme.get_value('next_indicator', 'image', 'res://addons/dialogic/Example Assets/next-indicator/next-indicator.png'))
 
 	n['background_modulation'].pressed = theme.get_value('background', 'modulation', false)
 	n['background_modulation_color'].color = Color(theme.get_value('background', 'modulation_color', '#ffffffff'))
@@ -119,19 +127,26 @@ func load_theme(filename):
 	n['button_text_color'].color = Color(theme.get_value('buttons', 'text_color', "#ffffffff"))
 	n['button_background'].color = Color(theme.get_value('buttons', 'background_color', "#ff000000"))
 	n['button_background_visible'].pressed = theme.get_value('buttons', 'use_background_color', false)
-	n['button_image'].text = DialogicResources.get_filename_from_path(theme.get_value('buttons', 'image', 'res://addons/dialogic/Images/background/background-2.png'))
+	n['button_image'].text = DialogicResources.get_filename_from_path(theme.get_value('buttons', 'image', 'res://addons/dialogic/Example Assets/backgrounds/background-2.png'))
 	n['button_image_visible'].pressed = theme.get_value('buttons', 'use_image', true)
+	n['button_use_native'].pressed = theme.get_value('buttons', 'use_native', false)
 	n['button_offset_x'].value = theme.get_value('buttons', 'padding', Vector2(5,5)).x
 	n['button_offset_y'].value = theme.get_value('buttons', 'padding', Vector2(5,5)).y
 	n['button_separation'].value = theme.get_value('buttons', 'gap', 5)
+	n['button_modulation'].pressed = theme.get_value('buttons', 'modulation', false)
+	n['button_modulation_color'].color = Color(theme.get_value('buttons', 'modulation_color', '#ffffffff'))
+	
+	
+	
+	toggle_button_customization_fields(not theme.get_value('buttons', 'use_native', false))
 	
 	# Definitions
 	n['glossary_color'].color = Color(theme.get_value('definitions', 'color', "#ffffffff"))
-	n['glossary_font'].text = DialogicResources.get_filename_from_path(theme.get_value('definitions', 'font', "res://addons/dialogic/Fonts/GlossaryFont.tres"))
+	n['glossary_font'].text = DialogicResources.get_filename_from_path(theme.get_value('definitions', 'font', "res://addons/dialogic/Example Assets/Fonts/GlossaryFont.tres"))
 	
 	# Text
 	n['theme_text_speed'].value = theme.get_value('text','speed', 2)
-	n['theme_font'].text = DialogicResources.get_filename_from_path(theme.get_value('text', 'font', 'res://addons/dialogic/Fonts/DefaultFont.tres'))
+	n['theme_font'].text = DialogicResources.get_filename_from_path(theme.get_value('text', 'font', 'res://addons/dialogic/Example Assets/Fonts/DefaultFont.tres'))
 	n['theme_text_color'].color = Color(theme.get_value('text', 'color', '#ffffffff'))
 	n['theme_text_shadow'].pressed = theme.get_value('text', 'shadow', false)
 	n['theme_text_shadow_color'].color = Color(theme.get_value('text', 'shadow_color', '#9e000000'))
@@ -154,7 +169,11 @@ func load_theme(filename):
 	n['name_background_visible'].pressed = theme.get_value('name', 'background_visible', false)
 	n['name_background'].color = Color(theme.get_value('name', 'background', "#ff000000"))
 	n['name_image_visible'].pressed = theme.get_value('name', 'image_visible', false)
-	n['name_image'].text = DialogicResources.get_filename_from_path(theme.get_value('name', 'image', 'res://addons/dialogic/Images/background/background-2.png'))
+
+	n['name_image'].text = DialogicResources.get_filename_from_path(theme.get_value('name', 'image', 'res://addons/dialogic/Example Assets/backgrounds/background-2.png'))
+	n['name_background_modulation'].pressed = theme.get_value('name', 'modulation', false)
+	n['name_background_modulation_color'].color = Color(theme.get_value('name', 'modulation_color', '#ffffffff'))
+
 	
 	
 	n['name_shadow'].color = Color(theme.get_value('name', 'shadow', "#9e000000"))
@@ -184,8 +203,8 @@ func load_theme(filename):
 	_on_PreviewButton_pressed()
 
 
-func new_theme():
-	var theme_file = 'theme-' + str(OS.get_unix_time()) + '.cfg'
+func new_theme() -> void:
+	var theme_file : String = 'theme-' + str(OS.get_unix_time()) + '.cfg'
 	DialogicResources.add_theme(theme_file)
 	master_tree.build_themes(theme_file)
 	load_theme(theme_file)
@@ -195,78 +214,78 @@ func new_theme():
 		settings_editor.set_value('theme', 'default', theme_file)
 
 
-func duplicate_theme(from_filename):
-	var duplicate_theme = 'theme-' + str(OS.get_unix_time()) + '.cfg'
+func duplicate_theme(from_filename) -> void:
+	var duplicate_theme : String = 'theme-' + str(OS.get_unix_time()) + '.cfg'
 	DialogicResources.duplicate_theme(from_filename, duplicate_theme)
 	DialogicResources.set_theme_value(duplicate_theme, 'settings', 'name', duplicate_theme)
 	master_tree.build_themes(duplicate_theme)
 	load_theme(duplicate_theme)
 	
 
-func _on_BackgroundTextureButton_pressed():
+func _on_BackgroundTextureButton_pressed() -> void:
 	editor_reference.godot_dialog("*.png")
 	editor_reference.godot_dialog_connect(self, "_on_background_selected")
 
 
-func _on_background_selected(path, target):
-	if loading == true:
+func _on_background_selected(path, target) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'background','image', path)
 	n['theme_background_image'].text = DialogicResources.get_filename_from_path(path)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_NextIndicatorButton_pressed():
+func _on_NextIndicatorButton_pressed() -> void:
 	editor_reference.godot_dialog("*.png")
 	editor_reference.godot_dialog_connect(self, "_on_indicator_selected")
 
 
-func _on_indicator_selected(path, target):
-	if loading == true:
+func _on_indicator_selected(path, target) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'next_indicator','image', path)
 	n['theme_next_image'].text = DialogicResources.get_filename_from_path(path)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_NextAnimation_item_selected(index):
+func _on_NextAnimation_item_selected(index) -> void:
 	DialogicResources.set_theme_value(current_theme, 'next_indicator', 'animation', n['next_animation'].get_item_text(index))
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_ColorPickerButton_color_changed(color):
-	if loading == true:
+func _on_ColorPickerButton_color_changed(color) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'text','color', '#' + color.to_html())
 	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
 
 
-func _on_ColorPickerButtonShadow_color_changed(color):
-	if loading == true:
+func _on_ColorPickerButtonShadow_color_changed(color) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'text','shadow_color', '#' + color.to_html())
 	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
 
 
-func _on_CheckBoxShadow_toggled(button_pressed):
-	if loading == true:
+func _on_CheckBoxShadow_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'text','shadow', button_pressed)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_ShadowOffset_value_changed(_value):
-	if loading == true:
+func _on_ShadowOffset_value_changed(_value) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'text','shadow_offset', Vector2(n['theme_shadow_offset_x'].value,n['theme_shadow_offset_y'].value))
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_PreviewButton_pressed():
+func _on_PreviewButton_pressed() -> void:
 	for i in $VBoxContainer/Panel.get_children():
 		i.free()
 	var dialogic_node = load("res://addons/dialogic/Dialog.tscn")
-	var preview_dialog = dialogic_node.instance()
+	var preview_dialog: DialogicNode = dialogic_node.instance()
 	preview_dialog.timeline = ''
 	preview_dialog.preview = true
 	preview_dialog.debug_mode = false
@@ -280,24 +299,24 @@ func _on_PreviewButton_pressed():
 		character_file = characters[0]['file']
 	
 	# Loading the theme here because I need it for the parse_alignment
-	preview_dialog.current_theme = preview_dialog.load_theme(current_theme)
+	preview_dialog.current_theme = preview_dialog._load_theme(current_theme)
 	
 	# Creating the one event timeline for the dialog
-	var text = preview_dialog.parse_definitions(n['text_preview'].text)
+	var text = preview_dialog._parse_definitions(n['text_preview'].text)
 	preview_dialog.dialog_script['events'] = [{
 		"character": character_file,
 		"portrait":'',
 		"text": text
 	}]
-	preview_dialog.parse_characters(preview_dialog.dialog_script)
+	preview_dialog._parse_characters(preview_dialog.dialog_script)
 	preview_dialog.settings = DialogicResources.get_settings_config()
 	
 	# Alignment
 	$VBoxContainer/Panel.add_child(preview_dialog)
 	
-	preview_dialog.load_dialog()
+	preview_dialog._init_dialog()
 	# Reloading the theme
-	preview_dialog.current_theme = preview_dialog.load_theme(current_theme)
+	preview_dialog.current_theme = preview_dialog._load_theme(current_theme)
 	
 	
 	# When not performing this step, the dialog name doesn't update the color for some reason
@@ -311,13 +330,13 @@ func _on_PreviewButton_pressed():
 	$VBoxContainer/Panel.rect_size.y = 0
 
 
-func _on_ActionOptionButton_item_selected(index):
-	if loading == true:
+func _on_ActionOptionButton_item_selected(index) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'settings','action_key', n['theme_action_key'].text)
 
 
-func _on_ActionOptionButton_pressed():
+func _on_ActionOptionButton_pressed() -> void:
 	n['theme_action_key'].clear()
 	n['theme_action_key'].add_item('[Select Action]')
 	InputMap.load_from_globals()
@@ -325,28 +344,28 @@ func _on_ActionOptionButton_pressed():
 		n['theme_action_key'].add_item(a)
 
 
-func _on_FontButton_pressed():
+func _on_FontButton_pressed() -> void:
 	editor_reference.godot_dialog("*.tres")
 	editor_reference.godot_dialog_connect(self, "_on_Font_selected")
 
 
-func _on_Font_selected(path, target):
-	if loading == true:
+func _on_Font_selected(path, target) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'text','font', path)
 	n['theme_font'].text = DialogicResources.get_filename_from_path(path)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_textSpeed_value_changed(value):
-	if loading == true:
+func _on_textSpeed_value_changed(value) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'text','speed', value)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_TextMargin_value_changed(value):
-	if loading == true:
+func _on_TextMargin_value_changed(value) -> void:
+	if loading:
 		return
 	var final_vector = Vector2(
 		n['theme_text_margin'].value,
@@ -356,42 +375,42 @@ func _on_TextMargin_value_changed(value):
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_BackgroundColor_CheckBox_toggled(button_pressed):
-	if loading == true:
+func _on_BackgroundColor_CheckBox_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'background', 'use_color', button_pressed)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_BackgroundColor_ColorPickerButton_color_changed(color):
-	if loading == true:
+func _on_BackgroundColor_ColorPickerButton_color_changed(color) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'background', 'color', '#' + color.to_html())
 	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
 
 
-func _on_BackgroundTexture_CheckBox_toggled(button_pressed):
-	if loading == true:
+func _on_BackgroundTexture_CheckBox_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'background', 'use_image', button_pressed)
 	_on_PreviewButton_pressed() # Refreshing the preview
 	
 
-func _on_button_background_visible_toggled(button_pressed):
-	if loading == true:
+func _on_button_background_visible_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'buttons', 'use_background_color', button_pressed)
 
 
-func _on_button_background_color_color_changed(color):
-	if loading == true:
+func _on_button_background_color_color_changed(color) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'buttons', 'background_color', '#' + color.to_html())
 	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
 
 
-func _on_ButtonOffset_value_changed(value):
-	if loading == true:
+func _on_ButtonOffset_value_changed(value) -> void:
+	if loading:
 		return
 	var final_vector = Vector2(
 		n['button_offset_x'].value,
@@ -400,64 +419,84 @@ func _on_ButtonOffset_value_changed(value):
 	DialogicResources.set_theme_value(current_theme, 'buttons', 'padding', final_vector)
 
 
-func _on_VerticalSeparation_value_changed(value):
-	if loading == true:
+func _on_VerticalSeparation_value_changed(value) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'buttons', 'gap', n['button_separation'].value)
 
 
-func _on_button_texture_toggled(button_pressed):
-	if loading == true:
+func _on_button_texture_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'buttons', 'use_image', button_pressed)
 
 
-func _on_ButtonTextureButton_pressed():
+func _on_ButtonTextureButton_pressed() -> void:
 	editor_reference.godot_dialog("*.png")
 	editor_reference.godot_dialog_connect(self, "_on_button_texture_selected")
 
 
-func _on_button_texture_selected(path, target):
-	if loading == true:
+func _on_button_texture_selected(path, target) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'buttons', 'image', path)
 	n['button_image'].text = DialogicResources.get_filename_from_path(path)
 
 
-func _on_ButtonTextColor_color_changed(color):
-	if loading == true:
+func _on_ButtonTextColor_color_changed(color) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'buttons', 'text_color', '#' + color.to_html())
 	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
 
 
-func _on_Custom_Button_Color_toggled(button_pressed):
-	if loading == true:
+func _on_Custom_Button_Color_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'buttons', 'text_color_enabled', button_pressed)
 
 
-func _on_GlossaryColorPicker_color_changed(color):
-	if loading == true:
+func _on_native_button_toggled(button_pressed) -> void:
+	if loading:
+		return
+	DialogicResources.set_theme_value(current_theme, 'buttons', 'use_native', button_pressed)
+	toggle_button_customization_fields(not button_pressed)
+
+func toggle_button_customization_fields(enabled) -> void:
+	var disabled = not enabled
+	n['button_text_color_enabled'].disabled = disabled
+	n['button_text_color'].disabled = disabled
+	n['button_background'].disabled = disabled
+	n['button_background_visible'].disabled = disabled
+	n['button_image'].disabled = disabled
+	n['button_image_visible'].disabled = disabled
+	n['button_modulation'].disabled = disabled
+	n['button_modulation_color'].disabled = disabled
+	n['button_offset_x'].editable = enabled
+	n['button_offset_y'].editable = enabled
+
+
+func _on_GlossaryColorPicker_color_changed(color) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'definitions', 'color', '#' + color.to_html())
 	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
 
 
-func _on_GlossaryFontButton_pressed():
+func _on_GlossaryFontButton_pressed() -> void:
 	editor_reference.godot_dialog("*.tres")
 	editor_reference.godot_dialog_connect(self, "_on_Glossary_Font_selected")
 
 
-func _on_Glossary_Font_selected(path, target):
-	if loading == true:
+func _on_Glossary_Font_selected(path, target) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'definitions', 'font', path)
 	n['glossary_font'].text = DialogicResources.get_filename_from_path(path)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_visibility_changed():
+func _on_visibility_changed() -> void:
 	if visible:
 		# Refreshing the dialog 
 		_on_PreviewButton_pressed()
@@ -468,23 +507,23 @@ func _on_visibility_changed():
 			i.queue_free()
 
 
-func _on_BoxSize_value_changed(value):
-	if loading == true:
+func _on_BoxSize_value_changed(value) -> void:
+	if loading:
 		return
 	var size_value = Vector2(n['size_w'].value, n['size_h'].value)
 	DialogicResources.set_theme_value(current_theme, 'box', 'size', size_value)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_BottomGap_value_changed(value):
-	if loading == true:
+func _on_BottomGap_value_changed(value) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'box', 'bottom_gap', value)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_Alignment_item_selected(index):
-	if loading == true:
+func _on_Alignment_item_selected(index) -> void:
+	if loading:
 		return
 	if index == 0:
 		DialogicResources.set_theme_value(current_theme, 'text', 'alignment', 'Left')
@@ -495,95 +534,124 @@ func _on_Alignment_item_selected(index):
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_Preview_text_changed():
-	if loading == true:
+func _on_Preview_text_changed() -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'text', 'preview', n['text_preview'].text)
 
 
-func _on_name_auto_color_toggled(button_pressed):
-	if loading == true:
+func _on_name_auto_color_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'name', 'auto_color', button_pressed)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_name_background_visible_toggled(button_pressed):
-	if loading == true:
+func _on_name_background_visible_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'name', 'background_visible', button_pressed)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_name_background_color_changed(color):
-	if loading == true:
+func _on_name_background_color_changed(color) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'name', 'background', '#' + color.to_html())
 	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
 
 
-func _on_name_image_visible_toggled(button_pressed):
-	if loading == true:
+func _on_name_image_visible_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'name', 'image_visible', button_pressed)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_name_image_pressed():
+func _on_name_image_pressed() -> void:
 	editor_reference.godot_dialog("*.png")
 	editor_reference.godot_dialog_connect(self, "_on_name_texture_selected")
 
 
-func _on_name_texture_selected(path, target):
-	if loading == true:
+func _on_name_texture_selected(path, target) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'name', 'image', path)
 	n['name_image'].text = DialogicResources.get_filename_from_path(path)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_shadow_visible_toggled(button_pressed):
-	if loading == true:
+func _on_shadow_visible_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'name', 'shadow_visible', button_pressed)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_name_shadow_color_changed(color):
-	if loading == true:
+func _on_name_shadow_color_changed(color) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'name', 'shadow', '#' + color.to_html())
 	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
 
 
-func _on_name_ShadowOffset_value_changed(_value):
-	if loading == true:
+func _on_name_ShadowOffset_value_changed(_value) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'name','shadow_offset', 
 			Vector2(n['name_shadow_offset_x'].value,n['name_shadow_offset_y'].value))
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_name_BottomGap_value_changed(value):
-	if loading == true:
+func _on_name_BottomGap_value_changed(value) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'name', 'bottom_gap', value)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_DelayPreview_timer_timeout():
+func _on_DelayPreview_timer_timeout() -> void:
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_BackgroundTexture_Modulation_toggled(button_pressed):
-	if loading == true:
+func _on_BackgroundTexture_Modulation_toggled(button_pressed) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'background', 'modulation', button_pressed)
 	_on_PreviewButton_pressed() # Refreshing the preview
 
 
-func _on_ColorPicker_Background_texture_modulation_color_changed(color):
-	if loading == true:
+func _on_ColorPicker_Background_texture_modulation_color_changed(color) -> void:
+	if loading:
 		return
 	DialogicResources.set_theme_value(current_theme, 'background', 'modulation_color', '#' + color.to_html())
 	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
+
+
+func _on_ColorPicker_NameLabel_modulation_color_changed(color) -> void:
+	if loading:
+		return
+	DialogicResources.set_theme_value(current_theme, 'name', 'modulation_color', '#' + color.to_html())
+	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
+
+
+func _on_NameLabel_texture_modulation_toggled(button_pressed) -> void:
+	if loading:
+		return
+	DialogicResources.set_theme_value(current_theme, 'name', 'modulation', button_pressed)
+	_on_PreviewButton_pressed() # Refreshing the preview
+
+
+func _on_ChoiceButtons_texture_modulate_toggled(button_pressed) -> void:
+	if loading:
+		return
+	DialogicResources.set_theme_value(current_theme, 'buttons', 'modulation', button_pressed)
+	_on_PreviewButton_pressed() # Refreshing the preview
+
+
+func _on_ColorPicker_ChoiceButtons_modulation_color_changed(color) -> void:
+	if loading:
+		return
+	DialogicResources.set_theme_value(current_theme, 'buttons', 'modulation_color', '#' + color.to_html())
+	$DelayPreviewTimer.start(0.5) # Calling a timer so the update doesn't get triggered many times
+
diff --git a/addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn b/addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn
index 4970f14..4d1c370 100644
--- a/addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn
+++ b/addons/dialogic/Editor/ThemeEditor/ThemeEditor.tscn
@@ -1,39 +1,45 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://addons/dialogic/Images/Plugin/plugin-editor-icon-light-theme.svg" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Editor/ThemeEditor/ThemeEditor.gd" type="Script" id=2]
 
+[sub_resource type="StyleBoxFlat" id=1]
+content_margin_left = 4.0
+content_margin_right = 4.0
+content_margin_top = 4.0
+content_margin_bottom = 4.0
+bg_color = Color( 0.2265, 0.246975, 0.301575, 1 )
+
 [node name="ThemeEditor" type="ScrollContainer"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_right = 261.0
-margin_bottom = 232.0
+margin_right = -6.0
+margin_bottom = -17.0
 script = ExtResource( 2 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
-margin_right = 1285.0
-margin_bottom = 832.0
+margin_right = 1006.0
+margin_bottom = 592.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_constants/separation = 15
 
+[node name="Panel" type="Panel" parent="VBoxContainer"]
+margin_right = 1006.0
+margin_bottom = 300.0
+rect_min_size = Vector2( 0, 300 )
+
 [node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer"]
-margin_right = 1285.0
-margin_bottom = 60.0
+margin_top = 315.0
+margin_right = 1006.0
+margin_bottom = 375.0
 custom_constants/separation = 10
 
-[node name="PreviewButton" type="Button" parent="VBoxContainer/HBoxContainer3"]
-margin_right = 152.0
-margin_bottom = 60.0
-text = "  Preview changes  "
-icon = ExtResource( 1 )
-
 [node name="TextEdit" type="TextEdit" parent="VBoxContainer/HBoxContainer3"]
-margin_left = 162.0
-margin_right = 1285.0
+margin_right = 844.0
 margin_bottom = 60.0
 rect_min_size = Vector2( 400, 60 )
 size_flags_horizontal = 3
@@ -41,86 +47,118 @@ text = "This is preview text. You can use  [color=#A5EFAC]BBCode[/color] to styl
 [wave amp=50 freq=2]You can even use effects![/wave]"
 wrap_enabled = true
 
-[node name="Panel" type="Panel" parent="VBoxContainer"]
-margin_top = 75.0
-margin_right = 1285.0
-margin_bottom = 375.0
-rect_min_size = Vector2( 0, 300 )
+[node name="PreviewButton" type="Button" parent="VBoxContainer/HBoxContainer3"]
+margin_left = 854.0
+margin_right = 1006.0
+margin_bottom = 60.0
+text = "  Preview changes  "
+icon = ExtResource( 1 )
 
 [node name="TabContainer" type="TabContainer" parent="VBoxContainer"]
 margin_top = 390.0
-margin_right = 1285.0
-margin_bottom = 594.0
+margin_right = 1006.0
+margin_bottom = 592.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
 tab_align = 0
 
-[node name="Text" type="HBoxContainer" parent="VBoxContainer/TabContainer"]
+[node name="Dialog Text" type="HBoxContainer" parent="VBoxContainer/TabContainer"]
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 4.0
 margin_top = 32.0
 margin_right = -4.0
 margin_bottom = -4.0
+custom_constants/separation = 10
 
-[node name="Column" type="VBoxContainer" parent="VBoxContainer/TabContainer/Text"]
-margin_right = 316.0
-margin_bottom = 168.0
+[node name="Column" type="VBoxContainer" parent="VBoxContainer/TabContainer/Dialog Text"]
+margin_right = 270.0
+margin_bottom = 166.0
+rect_min_size = Vector2( 270, 0 )
 size_flags_vertical = 3
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Text/Column"]
-margin_right = 316.0
-margin_bottom = 168.0
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Dialog Text/Column"]
+margin_right = 270.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Visuals"
+
+[node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Dialog Text/Column"]
+margin_top = 26.0
+margin_right = 270.0
+margin_bottom = 166.0
 size_flags_horizontal = 3
 custom_constants/hseparation = 10
 columns = 2
 
-[node name="Label5" type="Label" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
+[node name="Label5" type="Label" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer"]
 margin_top = 3.0
-margin_right = 148.0
+margin_right = 102.0
 margin_bottom = 17.0
 size_flags_horizontal = 3
 text = "Font"
 
-[node name="FontButton" type="Button" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
-margin_left = 158.0
-margin_right = 316.0
+[node name="FontButton" type="Button" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer"]
+margin_left = 112.0
+margin_right = 270.0
 margin_bottom = 20.0
 size_flags_vertical = 4
 text = "DefaultFont"
 
-[node name="Label3" type="Label" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
+[node name="Label3" type="Label" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer"]
 margin_top = 32.0
-margin_right = 148.0
+margin_right = 102.0
 margin_bottom = 46.0
 text = "Color"
 
-[node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
-margin_left = 158.0
+[node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer"]
+margin_left = 112.0
 margin_top = 24.0
-margin_right = 316.0
+margin_right = 270.0
 margin_bottom = 54.0
 rect_min_size = Vector2( 50, 30 )
 color = Color( 1, 1, 1, 1 )
 
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
-margin_top = 66.0
-margin_right = 148.0
-margin_bottom = 80.0
+[node name="Label2" type="Label" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer"]
+margin_top = 61.0
+margin_right = 102.0
+margin_bottom = 75.0
+text = "Alignment"
+
+[node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer"]
+margin_left = 112.0
+margin_top = 58.0
+margin_right = 270.0
+margin_bottom = 78.0
+
+[node name="Alignment" type="OptionButton" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer3"]
+margin_right = 158.0
+margin_bottom = 20.0
+size_flags_horizontal = 3
+text = "Left"
+items = [ "Left", null, false, 0, null, "Center", null, false, 1, null, "Right", null, false, 2, null ]
+selected = 0
+
+[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer"]
+margin_top = 90.0
+margin_right = 102.0
+margin_bottom = 104.0
 text = "Shadow"
 
-[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
-margin_left = 158.0
-margin_top = 58.0
-margin_right = 316.0
-margin_bottom = 88.0
+[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer"]
+margin_left = 112.0
+margin_top = 82.0
+margin_right = 270.0
+margin_bottom = 112.0
 
-[node name="CheckBoxShadow" type="CheckBox" parent="VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer2"]
+[node name="CheckBoxShadow" type="CheckBox" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer2"]
 margin_right = 24.0
 margin_bottom = 30.0
 
-[node name="ColorPickerButtonShadow" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer2"]
+[node name="ColorPickerButtonShadow" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer2"]
 margin_left = 28.0
 margin_right = 158.0
 margin_bottom = 30.0
@@ -128,20 +166,20 @@ rect_min_size = Vector2( 50, 30 )
 size_flags_horizontal = 3
 color = Color( 0, 0, 0, 0.619608 )
 
-[node name="Label4" type="Label" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
-margin_top = 97.0
-margin_right = 148.0
-margin_bottom = 111.0
+[node name="Label4" type="Label" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer"]
+margin_top = 121.0
+margin_right = 102.0
+margin_bottom = 135.0
 text = "Shadow Offset"
 
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
-margin_left = 158.0
-margin_top = 92.0
-margin_right = 316.0
-margin_bottom = 116.0
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer"]
+margin_left = 112.0
+margin_top = 116.0
+margin_right = 270.0
+margin_bottom = 140.0
 custom_constants/separation = 10
 
-[node name="ShadowOffsetX" type="SpinBox" parent="VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer"]
+[node name="ShadowOffsetX" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer"]
 margin_right = 74.0
 margin_bottom = 24.0
 value = 2.0
@@ -149,7 +187,7 @@ rounded = true
 allow_lesser = true
 prefix = "X"
 
-[node name="ShadowOffsetY" type="SpinBox" parent="VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer"]
+[node name="ShadowOffsetY" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer"]
 margin_left = 84.0
 margin_right = 158.0
 margin_bottom = 24.0
@@ -158,41 +196,50 @@ rounded = true
 allow_lesser = true
 prefix = "Y"
 
-[node name="Label6" type="Label" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
-margin_top = 125.0
-margin_right = 148.0
-margin_bottom = 139.0
+[node name="VSeparator" type="VSeparator" parent="VBoxContainer/TabContainer/Dialog Text"]
+margin_left = 280.0
+margin_right = 284.0
+margin_bottom = 166.0
+
+[node name="Column2" type="VBoxContainer" parent="VBoxContainer/TabContainer/Dialog Text"]
+margin_left = 294.0
+margin_right = 564.0
+margin_bottom = 166.0
+rect_min_size = Vector2( 270, 0 )
+size_flags_vertical = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Dialog Text/Column2"]
+margin_right = 270.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Behavior"
+
+[node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Dialog Text/Column2"]
+margin_top = 26.0
+margin_right = 270.0
+margin_bottom = 50.0
+size_flags_horizontal = 3
+custom_constants/hseparation = 10
+columns = 2
+
+[node name="Label6" type="Label" parent="VBoxContainer/TabContainer/Dialog Text/Column2/GridContainer"]
+margin_top = 5.0
+margin_right = 186.0
+margin_bottom = 19.0
+size_flags_horizontal = 3
 text = "Speed (bigger = slower)"
 
-[node name="TextSpeed" type="SpinBox" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
-margin_left = 158.0
-margin_top = 120.0
-margin_right = 316.0
-margin_bottom = 144.0
+[node name="TextSpeed" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Text/Column2/GridContainer"]
+margin_left = 196.0
+margin_right = 270.0
+margin_bottom = 24.0
 max_value = 10.0
 value = 2.0
 rounded = true
 
-[node name="Label2" type="Label" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
-margin_top = 151.0
-margin_right = 148.0
-margin_bottom = 165.0
-text = "Alignment"
-
-[node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer/TabContainer/Text/Column/GridContainer"]
-margin_left = 158.0
-margin_top = 148.0
-margin_right = 316.0
-margin_bottom = 168.0
-
-[node name="Alignment" type="OptionButton" parent="VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer3"]
-margin_right = 158.0
-margin_bottom = 20.0
-size_flags_horizontal = 3
-text = "Left"
-items = [ "Left", null, false, 0, null, "Center", null, false, 1, null, "Right", null, false, 2, null ]
-selected = 0
-
 [node name="Dialog Box" type="HBoxContainer" parent="VBoxContainer/TabContainer"]
 visible = false
 anchor_right = 1.0
@@ -201,32 +248,41 @@ margin_left = 4.0
 margin_top = 32.0
 margin_right = -4.0
 margin_bottom = -4.0
+custom_constants/separation = 10
 
 [node name="Column" type="VBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box"]
-margin_right = 1277.0
-margin_bottom = 236.0
-size_flags_horizontal = 3
+margin_right = 270.0
+margin_bottom = 157.0
+rect_min_size = Vector2( 270, 0 )
 size_flags_vertical = 3
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column"]
+margin_right = 270.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Visuals"
+
 [node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column"]
-margin_right = 1277.0
-margin_bottom = 236.0
+margin_top = 26.0
+margin_right = 270.0
+margin_bottom = 154.0
 size_flags_horizontal = 3
 custom_constants/hseparation = 10
 columns = 2
 
 [node name="Label5" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
 margin_top = 5.0
-margin_right = 126.0
+margin_right = 134.0
 margin_bottom = 19.0
+size_flags_horizontal = 3
 text = "Background Color"
 
 [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_left = 136.0
-margin_right = 288.0
+margin_left = 144.0
+margin_right = 270.0
 margin_bottom = 24.0
 
 [node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer2"]
@@ -235,20 +291,20 @@ margin_bottom = 24.0
 
 [node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer2"]
 margin_left = 28.0
-margin_right = 152.0
+margin_right = 126.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
 
 [node name="Label" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
 margin_top = 33.0
-margin_right = 126.0
+margin_right = 134.0
 margin_bottom = 47.0
 text = "Background Texture"
 
 [node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_left = 136.0
+margin_left = 144.0
 margin_top = 28.0
-margin_right = 288.0
+margin_right = 270.0
 margin_bottom = 52.0
 
 [node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer3"]
@@ -258,21 +314,21 @@ pressed = true
 
 [node name="BackgroundTextureButton" type="Button" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer3"]
 margin_left = 28.0
-margin_right = 152.0
+margin_right = 126.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
 text = "background-2"
 
 [node name="Label9" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
 margin_top = 61.0
-margin_right = 126.0
+margin_right = 134.0
 margin_bottom = 75.0
 text = "Texture Modulation"
 
 [node name="HBoxContainer6" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_left = 136.0
+margin_left = 144.0
 margin_top = 56.0
-margin_right = 288.0
+margin_right = 270.0
 margin_bottom = 80.0
 
 [node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer6"]
@@ -281,51 +337,80 @@ margin_bottom = 24.0
 
 [node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer6"]
 margin_left = 28.0
-margin_right = 152.0
+margin_right = 126.0
 margin_bottom = 24.0
 size_flags_horizontal = 3
 
 [node name="Label2" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
 margin_top = 87.0
-margin_right = 126.0
+margin_right = 134.0
 margin_bottom = 101.0
 text = "Next indicator"
 
 [node name="NextIndicatorButton" type="Button" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_left = 136.0
+margin_left = 144.0
 margin_top = 84.0
-margin_right = 288.0
+margin_right = 270.0
 margin_bottom = 104.0
 text = "next-indicator"
 
 [node name="Label4" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
 margin_top = 111.0
-margin_right = 126.0
+margin_right = 134.0
 margin_bottom = 125.0
 text = "Next animation"
 
 [node name="NextAnimation" type="OptionButton" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_left = 136.0
+margin_left = 144.0
 margin_top = 108.0
-margin_right = 288.0
+margin_right = 270.0
 margin_bottom = 128.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="Label6" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_top = 137.0
-margin_right = 126.0
-margin_bottom = 151.0
+[node name="VSeparator" type="VSeparator" parent="VBoxContainer/TabContainer/Dialog Box"]
+margin_left = 280.0
+margin_right = 284.0
+margin_bottom = 157.0
+
+[node name="Column2" type="VBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box"]
+margin_left = 294.0
+margin_right = 564.0
+margin_bottom = 157.0
+rect_min_size = Vector2( 270, 0 )
+size_flags_vertical = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column2"]
+margin_right = 270.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Placement"
+
+[node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column2"]
+margin_top = 26.0
+margin_right = 270.0
+margin_bottom = 106.0
+size_flags_horizontal = 3
+custom_constants/hseparation = 10
+columns = 2
+
+[node name="Label6" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer"]
+margin_top = 5.0
+margin_right = 108.0
+margin_bottom = 19.0
+size_flags_horizontal = 3
 text = "Box padding"
 
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_left = 136.0
-margin_top = 132.0
-margin_right = 288.0
-margin_bottom = 156.0
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer"]
+margin_left = 118.0
+margin_right = 270.0
+margin_bottom = 24.0
 
-[node name="TextOffsetV" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer"]
+[node name="TextOffsetV" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer"]
 margin_right = 74.0
 margin_bottom = 24.0
 max_value = 1e+07
@@ -334,7 +419,7 @@ rounded = true
 allow_greater = true
 allow_lesser = true
 
-[node name="TextOffsetH" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer"]
+[node name="TextOffsetH" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer"]
 margin_left = 78.0
 margin_right = 152.0
 margin_bottom = 24.0
@@ -344,19 +429,19 @@ rounded = true
 allow_greater = true
 allow_lesser = true
 
-[node name="Label7" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_top = 165.0
-margin_right = 126.0
-margin_bottom = 179.0
-text = "Box Size (pixels)"
+[node name="Label7" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer"]
+margin_top = 33.0
+margin_right = 108.0
+margin_bottom = 47.0
+text = "Box size (pixels)"
 
-[node name="HBoxContainer4" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_left = 136.0
-margin_top = 160.0
-margin_right = 288.0
-margin_bottom = 184.0
+[node name="HBoxContainer4" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer"]
+margin_left = 118.0
+margin_top = 28.0
+margin_right = 270.0
+margin_bottom = 52.0
 
-[node name="BoxSizeW" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer4"]
+[node name="BoxSizeW" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer4"]
 margin_right = 74.0
 margin_bottom = 24.0
 value = 100.0
@@ -364,7 +449,7 @@ rounded = true
 allow_greater = true
 allow_lesser = true
 
-[node name="BoxSizeH" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer4"]
+[node name="BoxSizeH" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer4"]
 margin_left = 78.0
 margin_right = 152.0
 margin_bottom = 24.0
@@ -374,19 +459,19 @@ rounded = true
 allow_greater = true
 allow_lesser = true
 
-[node name="Label8" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_top = 193.0
-margin_right = 126.0
-margin_bottom = 207.0
+[node name="Label8" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer"]
+margin_top = 61.0
+margin_right = 108.0
+margin_bottom = 75.0
 text = "Bottom gap"
 
-[node name="HBoxContainer5" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_left = 136.0
-margin_top = 188.0
-margin_right = 288.0
-margin_bottom = 212.0
+[node name="HBoxContainer5" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer"]
+margin_left = 118.0
+margin_top = 56.0
+margin_right = 270.0
+margin_bottom = 80.0
 
-[node name="BottomGap" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer5"]
+[node name="BottomGap" type="SpinBox" parent="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer5"]
 margin_right = 74.0
 margin_bottom = 24.0
 max_value = 999.0
@@ -395,21 +480,49 @@ rounded = true
 allow_greater = true
 allow_lesser = true
 
-[node name="Label3" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_top = 216.0
-margin_right = 126.0
-margin_bottom = 236.0
+[node name="VSeparator2" type="VSeparator" parent="VBoxContainer/TabContainer/Dialog Box"]
+margin_left = 574.0
+margin_right = 578.0
+margin_bottom = 157.0
+
+[node name="Column3" type="VBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box"]
+margin_left = 588.0
+margin_right = 858.0
+margin_bottom = 157.0
+rect_min_size = Vector2( 270, 0 )
+size_flags_vertical = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column3"]
+margin_right = 270.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Behavior"
+
+[node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column3"]
+margin_top = 26.0
+margin_right = 270.0
+margin_bottom = 46.0
+size_flags_horizontal = 3
+custom_constants/hseparation = 10
+columns = 2
+
+[node name="Label3" type="Label" parent="VBoxContainer/TabContainer/Dialog Box/Column3/GridContainer"]
+margin_right = 139.0
+margin_bottom = 20.0
+size_flags_horizontal = 3
 size_flags_vertical = 5
 text = "Action key"
 
-[node name="BoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer"]
-margin_left = 136.0
-margin_top = 216.0
-margin_right = 288.0
-margin_bottom = 236.0
+[node name="BoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Dialog Box/Column3/GridContainer"]
+margin_left = 149.0
+margin_right = 270.0
+margin_bottom = 20.0
 
-[node name="ActionOptionButton" type="OptionButton" parent="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/BoxContainer"]
-margin_right = 152.0
+[node name="ActionOptionButton" type="OptionButton" parent="VBoxContainer/TabContainer/Dialog Box/Column3/GridContainer/BoxContainer"]
+margin_right = 121.0
 margin_bottom = 20.0
 hint_tooltip = "To add/remove actions go to Project > Project Settings > Input Map"
 size_flags_horizontal = 3
@@ -417,152 +530,6 @@ text = "[Select Action]"
 items = [ "[Select Action]", null, false, 0, null, "ui_accept", null, false, 1, null, "ui_select", null, false, 2, null, "ui_cancel", null, false, 3, null, "ui_focus_next", null, false, 4, null, "ui_focus_prev", null, false, 5, null, "ui_left", null, false, 6, null, "ui_right", null, false, 7, null, "ui_up", null, false, 8, null, "ui_down", null, false, 9, null, "ui_page_up", null, false, 10, null, "ui_page_down", null, false, 11, null, "ui_home", null, false, 12, null, "ui_end", null, false, 13, null ]
 selected = 0
 
-[node name="Choice Buttons" type="HBoxContainer" parent="VBoxContainer/TabContainer"]
-visible = false
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_left = 4.0
-margin_top = 32.0
-margin_right = -4.0
-margin_bottom = -4.0
-
-[node name="Column" type="VBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_left = 953.0
-margin_top = 187.0
-margin_right = 945.0
-margin_bottom = 189.0
-size_flags_horizontal = 3
-size_flags_vertical = 3
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column"]
-margin_top = 34.0
-margin_right = 316.0
-margin_bottom = 170.0
-size_flags_horizontal = 3
-custom_constants/hseparation = 10
-columns = 2
-
-[node name="Label5" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
-margin_top = 5.0
-margin_right = 126.0
-margin_bottom = 19.0
-text = "Text Color "
-
-[node name="HBoxContainer4" type="HBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
-margin_left = 136.0
-margin_right = 288.0
-margin_bottom = 24.0
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="CheckBox2" type="CheckBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer4"]
-margin_right = 24.0
-margin_bottom = 24.0
-pressed = true
-
-[node name="ButtonTextColor" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer4"]
-margin_left = 28.0
-margin_right = 152.0
-margin_bottom = 24.0
-size_flags_horizontal = 3
-color = Color( 1, 1, 1, 1 )
-
-[node name="Label7" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
-margin_top = 33.0
-margin_right = 126.0
-margin_bottom = 47.0
-text = "Background Color"
-
-[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
-margin_left = 136.0
-margin_top = 28.0
-margin_right = 288.0
-margin_bottom = 52.0
-
-[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer2"]
-margin_right = 24.0
-margin_bottom = 24.0
-
-[node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer2"]
-margin_left = 28.0
-margin_right = 152.0
-margin_bottom = 24.0
-size_flags_horizontal = 3
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
-margin_top = 61.0
-margin_right = 126.0
-margin_bottom = 75.0
-text = "Background Texture"
-
-[node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
-margin_left = 136.0
-margin_top = 56.0
-margin_right = 288.0
-margin_bottom = 80.0
-
-[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer3"]
-margin_right = 24.0
-margin_bottom = 24.0
-pressed = true
-
-[node name="BackgroundTextureButton" type="Button" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer3"]
-margin_left = 28.0
-margin_right = 152.0
-margin_bottom = 24.0
-size_flags_horizontal = 3
-text = "background-2"
-
-[node name="Label6" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
-margin_top = 89.0
-margin_right = 126.0
-margin_bottom = 103.0
-text = "Box padding"
-
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
-margin_left = 136.0
-margin_top = 84.0
-margin_right = 288.0
-margin_bottom = 108.0
-
-[node name="TextOffsetV" type="SpinBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer"]
-margin_right = 74.0
-margin_bottom = 24.0
-value = 5.0
-rounded = true
-allow_lesser = true
-prefix = "V"
-
-[node name="TextOffsetH" type="SpinBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer"]
-margin_left = 78.0
-margin_right = 152.0
-margin_bottom = 24.0
-value = 5.0
-rounded = true
-allow_lesser = true
-prefix = "H"
-
-[node name="Label2" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
-margin_top = 117.0
-margin_right = 126.0
-margin_bottom = 131.0
-text = "Vertical separation"
-
-[node name="VerticalSeparation" type="SpinBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
-margin_left = 136.0
-margin_top = 112.0
-margin_right = 288.0
-margin_bottom = 136.0
-value = 5.0
-rounded = true
-allow_lesser = true
-
 [node name="Name Label" type="HBoxContainer" parent="VBoxContainer/TabContainer"]
 visible = false
 anchor_right = 1.0
@@ -571,82 +538,52 @@ margin_left = 4.0
 margin_top = 32.0
 margin_right = -4.0
 margin_bottom = -4.0
+custom_constants/separation = 10
 
 [node name="Column" type="VBoxContainer" parent="VBoxContainer/TabContainer/Name Label"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_left = 315.0
-margin_top = 187.0
-margin_right = 307.0
-margin_bottom = 315.0
-size_flags_horizontal = 3
+margin_right = 287.0
+margin_bottom = 157.0
+rect_min_size = Vector2( 270, 0 )
 size_flags_vertical = 3
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column"]
+margin_right = 287.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Text"
+
 [node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Name Label/Column"]
-margin_top = 34.0
-margin_right = 315.0
-margin_bottom = 204.0
+margin_top = 26.0
+margin_right = 287.0
+margin_bottom = 112.0
 columns = 2
 
-[node name="Label5" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
+[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
 margin_top = 5.0
-margin_right = 126.0
+margin_right = 125.0
 margin_bottom = 19.0
-text = "Background Color"
-
-[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_left = 130.0
-margin_right = 288.0
-margin_bottom = 24.0
-
-[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer2"]
-margin_right = 24.0
-margin_bottom = 24.0
-
-[node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer2"]
-margin_left = 28.0
-margin_right = 158.0
-margin_bottom = 24.0
 size_flags_horizontal = 3
+text = "Use character Color"
 
-[node name="Label2" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_top = 33.0
-margin_right = 126.0
-margin_bottom = 47.0
-text = "Background Texture"
-
-[node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_left = 130.0
-margin_top = 28.0
-margin_right = 288.0
-margin_bottom = 52.0
-
-[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer3"]
-margin_right = 24.0
+[node name="CharacterColor" type="CheckBox" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
+margin_left = 129.0
+margin_right = 287.0
 margin_bottom = 24.0
-pressed = true
-
-[node name="BackgroundTextureButton" type="Button" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer3"]
-margin_left = 28.0
-margin_right = 158.0
-margin_bottom = 24.0
-size_flags_horizontal = 3
-text = "background-2"
 
 [node name="Label3" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_top = 64.0
-margin_right = 126.0
-margin_bottom = 78.0
+margin_top = 36.0
+margin_right = 125.0
+margin_bottom = 50.0
 text = "Shadow"
 
 [node name="HBoxContainer4" type="HBoxContainer" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_left = 130.0
-margin_top = 56.0
-margin_right = 288.0
-margin_bottom = 86.0
+margin_left = 129.0
+margin_top = 28.0
+margin_right = 287.0
+margin_bottom = 58.0
 
 [node name="CheckBoxShadow" type="CheckBox" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer4"]
 margin_right = 24.0
@@ -661,16 +598,16 @@ size_flags_horizontal = 3
 color = Color( 0, 0, 0, 0.619608 )
 
 [node name="Label4" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_top = 95.0
-margin_right = 126.0
-margin_bottom = 109.0
+margin_top = 67.0
+margin_right = 125.0
+margin_bottom = 81.0
 text = "Shadow Offset"
 
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_left = 130.0
-margin_top = 90.0
-margin_right = 288.0
-margin_bottom = 114.0
+margin_left = 129.0
+margin_top = 62.0
+margin_right = 287.0
+margin_bottom = 86.0
 custom_constants/separation = 10
 
 [node name="ShadowOffsetX" type="SpinBox" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer"]
@@ -690,19 +627,141 @@ rounded = true
 allow_lesser = true
 prefix = "Y"
 
-[node name="Label8" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_top = 123.0
+[node name="VSeparator" type="VSeparator" parent="VBoxContainer/TabContainer/Name Label"]
+margin_left = 297.0
+margin_right = 301.0
+margin_bottom = 157.0
+
+[node name="Column2" type="VBoxContainer" parent="VBoxContainer/TabContainer/Name Label"]
+margin_left = 311.0
+margin_right = 581.0
+margin_bottom = 157.0
+rect_min_size = Vector2( 270, 0 )
+size_flags_vertical = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column2"]
+margin_right = 270.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Box"
+
+[node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Name Label/Column2"]
+margin_top = 26.0
+margin_right = 270.0
+margin_bottom = 78.0
+columns = 2
+
+[node name="Label5" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer"]
+margin_top = 5.0
+margin_right = 140.0
+margin_bottom = 19.0
+size_flags_horizontal = 3
+text = "Background Color"
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer"]
+margin_left = 144.0
+margin_right = 270.0
+margin_bottom = 24.0
+
+[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer2"]
+margin_right = 24.0
+margin_bottom = 24.0
+
+[node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer2"]
+margin_left = 28.0
 margin_right = 126.0
-margin_bottom = 137.0
+margin_bottom = 24.0
+size_flags_horizontal = 3
+
+[node name="Label2" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer"]
+margin_top = 33.0
+margin_right = 140.0
+margin_bottom = 47.0
+text = "Background Texture"
+
+[node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer"]
+margin_left = 144.0
+margin_top = 28.0
+margin_right = 270.0
+margin_bottom = 52.0
+
+[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer3"]
+margin_right = 24.0
+margin_bottom = 24.0
+pressed = true
+
+[node name="BackgroundTextureButton" type="Button" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer3"]
+margin_left = 28.0
+margin_right = 126.0
+margin_bottom = 24.0
+size_flags_horizontal = 3
+text = "background-2"
+
+[node name="Label9" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer"]
+margin_top = 61.0
+margin_right = 140.0
+margin_bottom = 75.0
+text = "Texture Modulation"
+
+[node name="HBoxContainer6" type="HBoxContainer" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer"]
+margin_left = 144.0
+margin_top = 56.0
+margin_right = 270.0
+margin_bottom = 80.0
+
+[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer6"]
+margin_right = 24.0
+margin_bottom = 24.0
+
+[node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer6"]
+margin_left = 28.0
+margin_right = 126.0
+margin_bottom = 24.0
+size_flags_horizontal = 3
+
+[node name="VSeparator2" type="VSeparator" parent="VBoxContainer/TabContainer/Name Label"]
+margin_left = 591.0
+margin_right = 595.0
+margin_bottom = 157.0
+
+[node name="Column3" type="VBoxContainer" parent="VBoxContainer/TabContainer/Name Label"]
+margin_left = 605.0
+margin_right = 875.0
+margin_bottom = 157.0
+rect_min_size = Vector2( 270, 0 )
+size_flags_vertical = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column3"]
+margin_right = 270.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Placement"
+
+[node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Name Label/Column3"]
+margin_top = 26.0
+margin_right = 270.0
+margin_bottom = 50.0
+columns = 2
+
+[node name="Label8" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column3/GridContainer"]
+margin_top = 5.0
+margin_right = 192.0
+margin_bottom = 19.0
+size_flags_horizontal = 3
 text = "Bottom gap"
 
-[node name="HBoxContainer5" type="HBoxContainer" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_left = 130.0
-margin_top = 118.0
-margin_right = 288.0
-margin_bottom = 142.0
+[node name="HBoxContainer5" type="HBoxContainer" parent="VBoxContainer/TabContainer/Name Label/Column3/GridContainer"]
+margin_left = 196.0
+margin_right = 270.0
+margin_bottom = 24.0
 
-[node name="BottomGap" type="SpinBox" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer5"]
+[node name="BottomGap" type="SpinBox" parent="VBoxContainer/TabContainer/Name Label/Column3/GridContainer/HBoxContainer5"]
 margin_right = 74.0
 margin_bottom = 24.0
 max_value = 999.0
@@ -710,17 +769,218 @@ value = 48.0
 allow_greater = true
 allow_lesser = true
 
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_top = 151.0
-margin_right = 126.0
-margin_bottom = 165.0
-text = "Auto color"
+[node name="Choice Buttons" type="HBoxContainer" parent="VBoxContainer/TabContainer"]
+visible = false
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = 4.0
+margin_top = 32.0
+margin_right = -4.0
+margin_bottom = -4.0
+custom_constants/separation = 10
 
-[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Name Label/Column/GridContainer"]
-margin_left = 130.0
-margin_top = 146.0
-margin_right = 288.0
-margin_bottom = 170.0
+[node name="Column" type="VBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons"]
+margin_right = 270.0
+margin_bottom = 157.0
+rect_min_size = Vector2( 270, 0 )
+size_flags_vertical = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column"]
+margin_right = 270.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Visuals"
+
+[node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column"]
+margin_top = 26.0
+margin_right = 270.0
+margin_bottom = 106.0
+size_flags_horizontal = 3
+custom_constants/hseparation = 10
+columns = 2
+
+[node name="Label5" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
+margin_top = 5.0
+margin_right = 134.0
+margin_bottom = 19.0
+size_flags_horizontal = 3
+text = "Text Color "
+
+[node name="HBoxContainer4" type="HBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
+margin_left = 144.0
+margin_right = 270.0
+margin_bottom = 24.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="CheckBox2" type="CheckBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer4"]
+margin_right = 24.0
+margin_bottom = 24.0
+pressed = true
+
+[node name="ButtonTextColor" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer4"]
+margin_left = 28.0
+margin_right = 126.0
+margin_bottom = 24.0
+size_flags_horizontal = 3
+color = Color( 1, 1, 1, 1 )
+
+[node name="Label7" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
+margin_top = 33.0
+margin_right = 134.0
+margin_bottom = 47.0
+text = "Background Color"
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
+margin_left = 144.0
+margin_top = 28.0
+margin_right = 270.0
+margin_bottom = 52.0
+
+[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer2"]
+margin_right = 24.0
+margin_bottom = 24.0
+
+[node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer2"]
+margin_left = 28.0
+margin_right = 126.0
+margin_bottom = 24.0
+size_flags_horizontal = 3
+
+[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
+margin_top = 61.0
+margin_right = 134.0
+margin_bottom = 75.0
+text = "Background Texture"
+
+[node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
+margin_left = 144.0
+margin_top = 56.0
+margin_right = 270.0
+margin_bottom = 80.0
+
+[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer3"]
+margin_right = 24.0
+margin_bottom = 24.0
+pressed = true
+
+[node name="BackgroundTextureButton" type="Button" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer3"]
+margin_left = 28.0
+margin_right = 126.0
+margin_bottom = 24.0
+size_flags_horizontal = 3
+text = "background-2"
+
+[node name="Label9" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
+margin_top = 89.0
+margin_right = 134.0
+margin_bottom = 103.0
+text = "Texture Modulation"
+
+[node name="HBoxContainer6" type="HBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
+margin_left = 144.0
+margin_top = 84.0
+margin_right = 270.0
+margin_bottom = 108.0
+
+[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer6"]
+margin_right = 24.0
+margin_bottom = 24.0
+
+[node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer6"]
+margin_left = 28.0
+margin_right = 126.0
+margin_bottom = 24.0
+size_flags_horizontal = 3
+
+[node name="Label2" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
+margin_top = 89.0
+margin_right = 134.0
+margin_bottom = 103.0
+text = "Use Native Buttons"
+
+[node name="CheckBox" type="CheckBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer"]
+margin_left = 144.0
+margin_top = 84.0
+margin_right = 270.0
+margin_bottom = 108.0
+
+[node name="VSeparator" type="VSeparator" parent="VBoxContainer/TabContainer/Choice Buttons"]
+margin_left = 280.0
+margin_right = 284.0
+margin_bottom = 157.0
+
+[node name="Column2" type="VBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons"]
+margin_left = 294.0
+margin_right = 575.0
+margin_bottom = 157.0
+rect_min_size = Vector2( 270, 0 )
+size_flags_vertical = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column2"]
+margin_right = 281.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Placement"
+
+[node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column2"]
+margin_top = 26.0
+margin_right = 281.0
+margin_bottom = 78.0
+size_flags_horizontal = 3
+custom_constants/hseparation = 10
+columns = 2
+
+[node name="Label6" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer"]
+margin_top = 5.0
+margin_right = 119.0
+margin_bottom = 19.0
+size_flags_horizontal = 3
+text = "Box padding"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer"]
+margin_left = 129.0
+margin_right = 281.0
+margin_bottom = 24.0
+
+[node name="TextOffsetV" type="SpinBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer/HBoxContainer"]
+margin_right = 74.0
+margin_bottom = 24.0
+value = 5.0
+rounded = true
+allow_lesser = true
+prefix = "V"
+
+[node name="TextOffsetH" type="SpinBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer/HBoxContainer"]
+margin_left = 78.0
+margin_right = 152.0
+margin_bottom = 24.0
+value = 5.0
+rounded = true
+allow_lesser = true
+prefix = "H"
+
+[node name="Label2" type="Label" parent="VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer"]
+margin_top = 33.0
+margin_right = 119.0
+margin_bottom = 47.0
+text = "Vertical separation"
+
+[node name="VerticalSeparation" type="SpinBox" parent="VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer"]
+margin_left = 129.0
+margin_top = 28.0
+margin_right = 281.0
+margin_bottom = 52.0
+value = 5.0
+rounded = true
+allow_lesser = true
 
 [node name="Glossary" type="HBoxContainer" parent="VBoxContainer/TabContainer"]
 visible = false
@@ -730,44 +990,51 @@ margin_left = 4.0
 margin_top = 32.0
 margin_right = -4.0
 margin_bottom = -4.0
+custom_constants/separation = 10
 
 [node name="Column" type="VBoxContainer" parent="VBoxContainer/TabContainer/Glossary"]
-margin_right = 40.0
-margin_bottom = 40.0
+margin_right = 270.0
+margin_bottom = 157.0
+rect_min_size = Vector2( 270, 0 )
+
+[node name="SectionTitle" type="Label" parent="VBoxContainer/TabContainer/Glossary/Column"]
+margin_right = 270.0
+margin_bottom = 22.0
+custom_styles/normal = SubResource( 1 )
+text = "Visuals"
 
 [node name="GridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Glossary/Column"]
-margin_left = 315.0
-margin_top = 429.0
-margin_right = 630.0
-margin_bottom = 483.0
+margin_top = 26.0
+margin_right = 270.0
+margin_bottom = 80.0
 size_flags_horizontal = 3
 custom_constants/hseparation = 10
 columns = 2
 
 [node name="Label5" type="Label" parent="VBoxContainer/TabContainer/Glossary/Column/GridContainer"]
 margin_top = 3.0
-margin_right = 210.0
+margin_right = 165.0
 margin_bottom = 17.0
 size_flags_horizontal = 3
 text = "Font"
 
 [node name="FontButton" type="Button" parent="VBoxContainer/TabContainer/Glossary/Column/GridContainer"]
-margin_left = 220.0
-margin_right = 315.0
+margin_left = 175.0
+margin_right = 270.0
 margin_bottom = 20.0
 size_flags_vertical = 4
 text = "GlossaryFont"
 
 [node name="Label3" type="Label" parent="VBoxContainer/TabContainer/Glossary/Column/GridContainer"]
 margin_top = 32.0
-margin_right = 210.0
+margin_right = 165.0
 margin_bottom = 46.0
 text = "Color"
 
 [node name="ColorPickerButton" type="ColorPickerButton" parent="VBoxContainer/TabContainer/Glossary/Column/GridContainer"]
-margin_left = 220.0
+margin_left = 175.0
 margin_top = 24.0
-margin_right = 315.0
+margin_right = 270.0
 margin_bottom = 54.0
 rect_min_size = Vector2( 50, 30 )
 color = Color( 0.215686, 0.654902, 0.67451, 1 )
@@ -831,16 +1098,16 @@ prefix = "Y"
 [node name="DelayPreviewTimer" type="Timer" parent="."]
 one_shot = true
 
-[connection signal="pressed" from="VBoxContainer/HBoxContainer3/PreviewButton" to="." method="_on_PreviewButton_pressed"]
 [connection signal="text_changed" from="VBoxContainer/HBoxContainer3/TextEdit" to="." method="_on_Preview_text_changed"]
-[connection signal="pressed" from="VBoxContainer/TabContainer/Text/Column/GridContainer/FontButton" to="." method="_on_FontButton_pressed"]
-[connection signal="color_changed" from="VBoxContainer/TabContainer/Text/Column/GridContainer/ColorPickerButton" to="." method="_on_ColorPickerButton_color_changed"]
-[connection signal="toggled" from="VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer2/CheckBoxShadow" to="." method="_on_CheckBoxShadow_toggled"]
-[connection signal="color_changed" from="VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer2/ColorPickerButtonShadow" to="." method="_on_ColorPickerButtonShadow_color_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer/ShadowOffsetX" to="." method="_on_ShadowOffset_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer/ShadowOffsetY" to="." method="_on_ShadowOffset_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Text/Column/GridContainer/TextSpeed" to="." method="_on_textSpeed_value_changed"]
-[connection signal="item_selected" from="VBoxContainer/TabContainer/Text/Column/GridContainer/HBoxContainer3/Alignment" to="." method="_on_Alignment_item_selected"]
+[connection signal="pressed" from="VBoxContainer/HBoxContainer3/PreviewButton" to="." method="_on_PreviewButton_pressed"]
+[connection signal="pressed" from="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/FontButton" to="." method="_on_FontButton_pressed"]
+[connection signal="color_changed" from="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/ColorPickerButton" to="." method="_on_ColorPickerButton_color_changed"]
+[connection signal="item_selected" from="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer3/Alignment" to="." method="_on_Alignment_item_selected"]
+[connection signal="toggled" from="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer2/CheckBoxShadow" to="." method="_on_CheckBoxShadow_toggled"]
+[connection signal="color_changed" from="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer2/ColorPickerButtonShadow" to="." method="_on_ColorPickerButtonShadow_color_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer/ShadowOffsetX" to="." method="_on_ShadowOffset_value_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Text/Column/GridContainer/HBoxContainer/ShadowOffsetY" to="." method="_on_ShadowOffset_value_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Text/Column2/GridContainer/TextSpeed" to="." method="_on_textSpeed_value_changed"]
 [connection signal="toggled" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer2/CheckBox" to="." method="_on_BackgroundColor_CheckBox_toggled"]
 [connection signal="color_changed" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer2/ColorPickerButton" to="." method="_on_BackgroundColor_ColorPickerButton_color_changed"]
 [connection signal="toggled" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer3/CheckBox" to="." method="_on_BackgroundTexture_CheckBox_toggled"]
@@ -849,32 +1116,37 @@ one_shot = true
 [connection signal="color_changed" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer6/ColorPickerButton" to="." method="_on_ColorPicker_Background_texture_modulation_color_changed"]
 [connection signal="pressed" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/NextIndicatorButton" to="." method="_on_NextIndicatorButton_pressed"]
 [connection signal="item_selected" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/NextAnimation" to="." method="_on_NextAnimation_item_selected"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer/TextOffsetV" to="." method="_on_TextMargin_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer/TextOffsetH" to="." method="_on_TextMargin_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer4/BoxSizeW" to="." method="_on_BoxSize_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer4/BoxSizeH" to="." method="_on_BoxSize_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/HBoxContainer5/BottomGap" to="." method="_on_BottomGap_value_changed"]
-[connection signal="item_selected" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/BoxContainer/ActionOptionButton" to="." method="_on_ActionOptionButton_item_selected"]
-[connection signal="pressed" from="VBoxContainer/TabContainer/Dialog Box/Column/GridContainer/BoxContainer/ActionOptionButton" to="." method="_on_ActionOptionButton_pressed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer/TextOffsetV" to="." method="_on_TextMargin_value_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer/TextOffsetH" to="." method="_on_TextMargin_value_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer4/BoxSizeW" to="." method="_on_BoxSize_value_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer4/BoxSizeH" to="." method="_on_BoxSize_value_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Dialog Box/Column2/GridContainer/HBoxContainer5/BottomGap" to="." method="_on_BottomGap_value_changed"]
+[connection signal="item_selected" from="VBoxContainer/TabContainer/Dialog Box/Column3/GridContainer/BoxContainer/ActionOptionButton" to="." method="_on_ActionOptionButton_item_selected"]
+[connection signal="pressed" from="VBoxContainer/TabContainer/Dialog Box/Column3/GridContainer/BoxContainer/ActionOptionButton" to="." method="_on_ActionOptionButton_pressed"]
+[connection signal="toggled" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/CharacterColor" to="." method="_on_name_auto_color_toggled"]
+[connection signal="toggled" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer4/CheckBoxShadow" to="." method="_on_shadow_visible_toggled"]
+[connection signal="color_changed" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer4/ColorPickerButtonShadow" to="." method="_on_name_shadow_color_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer/ShadowOffsetX" to="." method="_on_name_ShadowOffset_value_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer/ShadowOffsetY" to="." method="_on_name_ShadowOffset_value_changed"]
+[connection signal="toggled" from="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer2/CheckBox" to="." method="_on_name_background_visible_toggled"]
+[connection signal="color_changed" from="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer2/ColorPickerButton" to="." method="_on_name_background_color_changed"]
+[connection signal="toggled" from="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer3/CheckBox" to="." method="_on_name_image_visible_toggled"]
+[connection signal="pressed" from="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer3/BackgroundTextureButton" to="." method="_on_name_image_pressed"]
+[connection signal="toggled" from="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer6/CheckBox" to="." method="_on_NameLabel_texture_modulation_toggled"]
+[connection signal="color_changed" from="VBoxContainer/TabContainer/Name Label/Column2/GridContainer/HBoxContainer6/ColorPickerButton" to="." method="_on_ColorPicker_NameLabel_modulation_color_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Name Label/Column3/GridContainer/HBoxContainer5/BottomGap" to="." method="_on_name_BottomGap_value_changed"]
 [connection signal="toggled" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer4/CheckBox2" to="." method="_on_Custom_Button_Color_toggled"]
 [connection signal="color_changed" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer4/ButtonTextColor" to="." method="_on_ButtonTextColor_color_changed"]
 [connection signal="toggled" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer2/CheckBox" to="." method="_on_button_background_visible_toggled"]
 [connection signal="color_changed" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer2/ColorPickerButton" to="." method="_on_button_background_color_color_changed"]
 [connection signal="toggled" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer3/CheckBox" to="." method="_on_button_texture_toggled"]
 [connection signal="pressed" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer3/BackgroundTextureButton" to="." method="_on_ButtonTextureButton_pressed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer/TextOffsetV" to="." method="_on_ButtonOffset_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer/TextOffsetH" to="." method="_on_ButtonOffset_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/VerticalSeparation" to="." method="_on_VerticalSeparation_value_changed"]
-[connection signal="toggled" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer2/CheckBox" to="." method="_on_name_background_visible_toggled"]
-[connection signal="color_changed" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer2/ColorPickerButton" to="." method="_on_name_background_color_changed"]
-[connection signal="toggled" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer3/CheckBox" to="." method="_on_name_image_visible_toggled"]
-[connection signal="pressed" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer3/BackgroundTextureButton" to="." method="_on_name_image_pressed"]
-[connection signal="toggled" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer4/CheckBoxShadow" to="." method="_on_shadow_visible_toggled"]
-[connection signal="color_changed" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer4/ColorPickerButtonShadow" to="." method="_on_name_shadow_color_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer/ShadowOffsetX" to="." method="_on_name_ShadowOffset_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer/ShadowOffsetY" to="." method="_on_name_ShadowOffset_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/HBoxContainer5/BottomGap" to="." method="_on_name_BottomGap_value_changed"]
-[connection signal="toggled" from="VBoxContainer/TabContainer/Name Label/Column/GridContainer/CheckBox" to="." method="_on_name_auto_color_toggled"]
+[connection signal="toggled" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer6/CheckBox" to="." method="_on_ChoiceButtons_texture_modulate_toggled"]
+[connection signal="color_changed" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/HBoxContainer6/ColorPickerButton" to="." method="_on_ColorPicker_ChoiceButtons_modulation_color_changed"]
+[connection signal="toggled" from="VBoxContainer/TabContainer/Choice Buttons/Column/GridContainer/CheckBox" to="." method="_on_native_button_toggled"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer/HBoxContainer/TextOffsetV" to="." method="_on_ButtonOffset_value_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer/HBoxContainer/TextOffsetH" to="." method="_on_ButtonOffset_value_changed"]
+[connection signal="value_changed" from="VBoxContainer/TabContainer/Choice Buttons/Column2/GridContainer/VerticalSeparation" to="." method="_on_VerticalSeparation_value_changed"]
 [connection signal="pressed" from="VBoxContainer/TabContainer/Glossary/Column/GridContainer/FontButton" to="." method="_on_GlossaryFontButton_pressed"]
 [connection signal="color_changed" from="VBoxContainer/TabContainer/Glossary/Column/GridContainer/ColorPickerButton" to="." method="_on_GlossaryColorPicker_color_changed"]
 [connection signal="toggled" from="VBoxContainer/TabContainer/Glossary/Column/GridContainer/HBoxContainer2/CheckBoxShadow" to="." method="_on_CheckBoxShadow_toggled"]
diff --git a/addons/dialogic/Editor/TimelineEditor/TimelineEditor.tscn b/addons/dialogic/Editor/TimelineEditor/TimelineEditor.tscn
index bceb82f..4348fb4 100644
--- a/addons/dialogic/Editor/TimelineEditor/TimelineEditor.tscn
+++ b/addons/dialogic/Editor/TimelineEditor/TimelineEditor.tscn
@@ -1,28 +1,29 @@
 [gd_scene load_steps=25 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/character-join.svg" type="Texture" id=1]
-[ext_resource path="res://addons/dialogic/Images/dialog.svg" type="Texture" id=2]
-[ext_resource path="res://addons/dialogic/Images/Events/audio-event.svg" type="Texture" id=3]
-[ext_resource path="res://addons/dialogic/Images/Events/scene.svg" type="Texture" id=4]
-[ext_resource path="res://addons/dialogic/Images/condition.svg" type="Texture" id=5]
-[ext_resource path="res://addons/dialogic/Images/end-dialog.svg" type="Texture" id=6]
-[ext_resource path="res://addons/dialogic/Images/character-leave.svg" type="Texture" id=7]
-[ext_resource path="res://addons/dialogic/Images/question.svg" type="Texture" id=8]
-[ext_resource path="res://addons/dialogic/Images/end-choice.svg" type="Texture" id=9]
-[ext_resource path="res://addons/dialogic/Images/Events/change-timeline.svg" type="Texture" id=10]
-[ext_resource path="res://addons/dialogic/Images/Resources/definition.svg" type="Texture" id=11]
-[ext_resource path="res://addons/dialogic/Images/choice.svg" type="Texture" id=12]
-[ext_resource path="res://addons/dialogic/Images/tutorials/arrow-down.svg" type="Texture" id=13]
-[ext_resource path="res://addons/dialogic/Images/Events/Wait.svg" type="Texture" id=14]
-[ext_resource path="res://addons/dialogic/Images/Events/change-scene.svg" type="Texture" id=15]
-[ext_resource path="res://addons/dialogic/Images/signal.svg" type="Texture" id=16]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/character-join.svg" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/text-event.svg" type="Texture" id=2]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/audio-event.svg" type="Texture" id=3]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/scene event.svg" type="Texture" id=4]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/condition.svg" type="Texture" id=5]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/close-dialog.svg" type="Texture" id=6]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/character-leave.svg" type="Texture" id=7]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/question.svg" type="Texture" id=8]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/end-branch.svg" type="Texture" id=9]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/change-timeline.svg" type="Texture" id=10]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/set-value.svg" type="Texture" id=11]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/choice.svg" type="Texture" id=12]
+[ext_resource path="res://addons/dialogic/Images/Tutorials/arrow-down.svg" type="Texture" id=13]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/wait-seconds.svg" type="Texture" id=14]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/change-scene.svg" type="Texture" id=15]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/emit-signal.svg" type="Texture" id=16]
 [ext_resource path="res://addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd" type="Script" id=17]
-[ext_resource path="res://addons/dialogic/Images/theme.svg" type="Texture" id=18]
-[ext_resource path="res://addons/dialogic/Images/Events/background-music.svg" type="Texture" id=19]
-[ext_resource path="res://addons/dialogic/Images/Script.svg" type="Texture" id=20]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/set-theme.svg" type="Texture" id=18]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/background-music.svg" type="Texture" id=19]
+[ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/call-node.svg" type="Texture" id=20]
 [ext_resource path="res://addons/dialogic/Editor/TimelineEditor/EventButton.gd" type="Script" id=21]
 [ext_resource path="res://addons/dialogic/Editor/TimelineEditor/TimelineArea.gd" type="Script" id=22]
 
+
 [sub_resource type="StyleBoxFlat" id=1]
 content_margin_left = 5.0
 content_margin_right = 5.0
diff --git a/addons/dialogic/Example Assets/Fonts/DefaultFont.tres b/addons/dialogic/Example Assets/Fonts/DefaultFont.tres
new file mode 100644
index 0000000..cd25a11
--- /dev/null
+++ b/addons/dialogic/Example Assets/Fonts/DefaultFont.tres	
@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://addons/dialogic/Example Assets/Fonts/Overlock/Overlock-Black.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 30
+font_data = ExtResource( 1 )
diff --git a/addons/dialogic/Example Assets/Fonts/GlossaryFont.tres b/addons/dialogic/Example Assets/Fonts/GlossaryFont.tres
new file mode 100644
index 0000000..4fdd2d5
--- /dev/null
+++ b/addons/dialogic/Example Assets/Fonts/GlossaryFont.tres	
@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://addons/dialogic/Example Assets/Fonts/Overlock/Overlock-Black.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 20
+font_data = ExtResource( 1 )
diff --git a/addons/dialogic/Fonts/Overlock/OFL.txt b/addons/dialogic/Example Assets/Fonts/Overlock/OFL.txt
similarity index 100%
rename from addons/dialogic/Fonts/Overlock/OFL.txt
rename to addons/dialogic/Example Assets/Fonts/Overlock/OFL.txt
diff --git a/addons/dialogic/Fonts/Overlock/Overlock-Black.ttf b/addons/dialogic/Example Assets/Fonts/Overlock/Overlock-Black.ttf
similarity index 100%
rename from addons/dialogic/Fonts/Overlock/Overlock-Black.ttf
rename to addons/dialogic/Example Assets/Fonts/Overlock/Overlock-Black.ttf
diff --git a/addons/dialogic/Fonts/Overlock/Overlock-BlackItalic.ttf b/addons/dialogic/Example Assets/Fonts/Overlock/Overlock-BlackItalic.ttf
similarity index 100%
rename from addons/dialogic/Fonts/Overlock/Overlock-BlackItalic.ttf
rename to addons/dialogic/Example Assets/Fonts/Overlock/Overlock-BlackItalic.ttf
diff --git a/addons/dialogic/Fonts/Overlock/Overlock-Bold.ttf b/addons/dialogic/Example Assets/Fonts/Overlock/Overlock-Bold.ttf
similarity index 100%
rename from addons/dialogic/Fonts/Overlock/Overlock-Bold.ttf
rename to addons/dialogic/Example Assets/Fonts/Overlock/Overlock-Bold.ttf
diff --git a/addons/dialogic/Fonts/Overlock/Overlock-BoldItalic.ttf b/addons/dialogic/Example Assets/Fonts/Overlock/Overlock-BoldItalic.ttf
similarity index 100%
rename from addons/dialogic/Fonts/Overlock/Overlock-BoldItalic.ttf
rename to addons/dialogic/Example Assets/Fonts/Overlock/Overlock-BoldItalic.ttf
diff --git a/addons/dialogic/Fonts/Overlock/Overlock-Italic.ttf b/addons/dialogic/Example Assets/Fonts/Overlock/Overlock-Italic.ttf
similarity index 100%
rename from addons/dialogic/Fonts/Overlock/Overlock-Italic.ttf
rename to addons/dialogic/Example Assets/Fonts/Overlock/Overlock-Italic.ttf
diff --git a/addons/dialogic/Fonts/Overlock/Overlock-Regular.ttf b/addons/dialogic/Example Assets/Fonts/Overlock/Overlock-Regular.ttf
similarity index 100%
rename from addons/dialogic/Fonts/Overlock/Overlock-Regular.ttf
rename to addons/dialogic/Example Assets/Fonts/Overlock/Overlock-Regular.ttf
diff --git a/addons/dialogic/Fonts/Overlock/Overlock.tres b/addons/dialogic/Example Assets/Fonts/Overlock/Overlock.tres
similarity index 100%
rename from addons/dialogic/Fonts/Overlock/Overlock.tres
rename to addons/dialogic/Example Assets/Fonts/Overlock/Overlock.tres
diff --git a/addons/dialogic/Images/background/background-1.png b/addons/dialogic/Example Assets/backgrounds/background-1.png
similarity index 100%
rename from addons/dialogic/Images/background/background-1.png
rename to addons/dialogic/Example Assets/backgrounds/background-1.png
diff --git a/addons/dialogic/Images/background/background-1.png.import b/addons/dialogic/Example Assets/backgrounds/background-1.png.import
similarity index 65%
rename from addons/dialogic/Images/background/background-1.png.import
rename to addons/dialogic/Example Assets/backgrounds/background-1.png.import
index 028b941..1a8ec65 100644
--- a/addons/dialogic/Images/background/background-1.png.import
+++ b/addons/dialogic/Example Assets/backgrounds/background-1.png.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/background-1.png-89282dbd6f94191cf4f5c810a2ffab77.stex"
+path="res://.import/background-1.png-1fc779d8fd5d0bc2346042b70def9109.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/background/background-1.png"
-dest_files=[ "res://.import/background-1.png-89282dbd6f94191cf4f5c810a2ffab77.stex" ]
+source_file="res://addons/dialogic/Example Assets/backgrounds/background-1.png"
+dest_files=[ "res://.import/background-1.png-1fc779d8fd5d0bc2346042b70def9109.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/background/background-2.png b/addons/dialogic/Example Assets/backgrounds/background-2.png
similarity index 100%
rename from addons/dialogic/Images/background/background-2.png
rename to addons/dialogic/Example Assets/backgrounds/background-2.png
diff --git a/addons/dialogic/Images/background/background-2.png.import b/addons/dialogic/Example Assets/backgrounds/background-2.png.import
similarity index 65%
rename from addons/dialogic/Images/background/background-2.png.import
rename to addons/dialogic/Example Assets/backgrounds/background-2.png.import
index bf59472..9f1be92 100644
--- a/addons/dialogic/Images/background/background-2.png.import
+++ b/addons/dialogic/Example Assets/backgrounds/background-2.png.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/background-2.png-c129b8b6b93cd7712f1146bde9cee0bf.stex"
+path="res://.import/background-2.png-16cefbac02f843f04a3346ffecedf6b6.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/background/background-2.png"
-dest_files=[ "res://.import/background-2.png-c129b8b6b93cd7712f1146bde9cee0bf.stex" ]
+source_file="res://addons/dialogic/Example Assets/backgrounds/background-2.png"
+dest_files=[ "res://.import/background-2.png-16cefbac02f843f04a3346ffecedf6b6.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/next-indicator.png b/addons/dialogic/Example Assets/next-indicator/next-indicator.png
similarity index 100%
rename from addons/dialogic/Images/next-indicator.png
rename to addons/dialogic/Example Assets/next-indicator/next-indicator.png
diff --git a/addons/dialogic/Images/next-indicator.png.import b/addons/dialogic/Example Assets/next-indicator/next-indicator.png.import
similarity index 64%
rename from addons/dialogic/Images/next-indicator.png.import
rename to addons/dialogic/Example Assets/next-indicator/next-indicator.png.import
index 629709d..d9a9d01 100644
--- a/addons/dialogic/Images/next-indicator.png.import
+++ b/addons/dialogic/Example Assets/next-indicator/next-indicator.png.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/next-indicator.png-b9557c1efa1b225e5de6bb92bce11943.stex"
+path="res://.import/next-indicator.png-e3b7b80d9da791a1d0a061a728b6f781.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/next-indicator.png"
-dest_files=[ "res://.import/next-indicator.png-b9557c1efa1b225e5de6bb92bce11943.stex" ]
+source_file="res://addons/dialogic/Example Assets/next-indicator/next-indicator.png"
+dest_files=[ "res://.import/next-indicator.png-e3b7b80d9da791a1d0a061a728b6f781.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/portraits/df-1.png b/addons/dialogic/Example Assets/portraits/df-1.png
similarity index 100%
rename from addons/dialogic/Images/portraits/df-1.png
rename to addons/dialogic/Example Assets/portraits/df-1.png
diff --git a/addons/dialogic/Images/portraits/df-1.png.import b/addons/dialogic/Example Assets/portraits/df-1.png.import
similarity index 68%
rename from addons/dialogic/Images/portraits/df-1.png.import
rename to addons/dialogic/Example Assets/portraits/df-1.png.import
index 40d729d..83753bd 100644
--- a/addons/dialogic/Images/portraits/df-1.png.import
+++ b/addons/dialogic/Example Assets/portraits/df-1.png.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/df-1.png-6175322ef18a2f4fb7b65fe08bff68d0.stex"
+path="res://.import/df-1.png-dd38cabf6782fa8ec6317d8193b3bb58.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/portraits/df-1.png"
-dest_files=[ "res://.import/df-1.png-6175322ef18a2f4fb7b65fe08bff68d0.stex" ]
+source_file="res://addons/dialogic/Example Assets/portraits/df-1.png"
+dest_files=[ "res://.import/df-1.png-dd38cabf6782fa8ec6317d8193b3bb58.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/portraits/df-2.png b/addons/dialogic/Example Assets/portraits/df-2.png
similarity index 100%
rename from addons/dialogic/Images/portraits/df-2.png
rename to addons/dialogic/Example Assets/portraits/df-2.png
diff --git a/addons/dialogic/Images/portraits/df-2.png.import b/addons/dialogic/Example Assets/portraits/df-2.png.import
similarity index 68%
rename from addons/dialogic/Images/portraits/df-2.png.import
rename to addons/dialogic/Example Assets/portraits/df-2.png.import
index 5150bed..c2a01d3 100644
--- a/addons/dialogic/Images/portraits/df-2.png.import
+++ b/addons/dialogic/Example Assets/portraits/df-2.png.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/df-2.png-f6b53b46f9b25bdd84c1d6e81deed6c2.stex"
+path="res://.import/df-2.png-6e4167303060ad7b046acda78c51329c.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/portraits/df-2.png"
-dest_files=[ "res://.import/df-2.png-f6b53b46f9b25bdd84c1d6e81deed6c2.stex" ]
+source_file="res://addons/dialogic/Example Assets/portraits/df-2.png"
+dest_files=[ "res://.import/df-2.png-6e4167303060ad7b046acda78c51329c.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/portraits/df-3.png b/addons/dialogic/Example Assets/portraits/df-3.png
similarity index 100%
rename from addons/dialogic/Images/portraits/df-3.png
rename to addons/dialogic/Example Assets/portraits/df-3.png
diff --git a/addons/dialogic/Images/portraits/df-3.png.import b/addons/dialogic/Example Assets/portraits/df-3.png.import
similarity index 68%
rename from addons/dialogic/Images/portraits/df-3.png.import
rename to addons/dialogic/Example Assets/portraits/df-3.png.import
index f8d1115..9ac9c05 100644
--- a/addons/dialogic/Images/portraits/df-3.png.import
+++ b/addons/dialogic/Example Assets/portraits/df-3.png.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/df-3.png-6a749eca45736cdcf574fd90eead4619.stex"
+path="res://.import/df-3.png-e1bbeb9edcf0b295ecce73d91ad4c986.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/portraits/df-3.png"
-dest_files=[ "res://.import/df-3.png-6a749eca45736cdcf574fd90eead4619.stex" ]
+source_file="res://addons/dialogic/Example Assets/portraits/df-3.png"
+dest_files=[ "res://.import/df-3.png-e1bbeb9edcf0b295ecce73d91ad4c986.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Fonts/DefaultFont.tres b/addons/dialogic/Fonts/DefaultFont.tres
deleted file mode 100644
index 64f2410..0000000
--- a/addons/dialogic/Fonts/DefaultFont.tres
+++ /dev/null
@@ -1,8 +0,0 @@
-[gd_resource type="DynamicFont" load_steps=2 format=2]
-
-[sub_resource type="DynamicFontData" id=1]
-font_path = "res://addons/dialogic/Fonts/Overlock/Overlock-Black.ttf"
-
-[resource]
-size = 30
-font_data = SubResource( 1 )
diff --git a/addons/dialogic/Fonts/GlossaryFont.tres b/addons/dialogic/Fonts/GlossaryFont.tres
deleted file mode 100644
index 433b3b1..0000000
--- a/addons/dialogic/Fonts/GlossaryFont.tres
+++ /dev/null
@@ -1,8 +0,0 @@
-[gd_resource type="DynamicFont" load_steps=2 format=2]
-
-[sub_resource type="DynamicFontData" id=1]
-font_path = "res://addons/dialogic/Fonts/Overlock/Overlock-Black.ttf"
-
-[resource]
-size = 20
-font_data = SubResource( 1 )
diff --git a/addons/dialogic/Images/Add.svg b/addons/dialogic/Images/Add.svg
deleted file mode 100644
index a241829..0000000
--- a/addons/dialogic/Images/Add.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m7 1v6h-6v2h6v6h2v-6h6v-2h-6v-6z" fill="#e0e0e0"/></svg>
\ No newline at end of file
diff --git a/addons/dialogic/Images/ActionCopy.svg b/addons/dialogic/Images/Context Menus/ActionCopy.svg
similarity index 100%
rename from addons/dialogic/Images/ActionCopy.svg
rename to addons/dialogic/Images/Context Menus/ActionCopy.svg
diff --git a/addons/dialogic/Images/ActionCopy.svg.import b/addons/dialogic/Images/Context Menus/ActionCopy.svg.import
similarity index 66%
rename from addons/dialogic/Images/ActionCopy.svg.import
rename to addons/dialogic/Images/Context Menus/ActionCopy.svg.import
index 6b4f1f3..19b482d 100644
--- a/addons/dialogic/Images/ActionCopy.svg.import
+++ b/addons/dialogic/Images/Context Menus/ActionCopy.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/ActionCopy.svg-63402671dac0d39077ea78c09fc673aa.stex"
+path="res://.import/ActionCopy.svg-5b4013a70fecebd29760cea7953f7539.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/ActionCopy.svg"
-dest_files=[ "res://.import/ActionCopy.svg-63402671dac0d39077ea78c09fc673aa.stex" ]
+source_file="res://addons/dialogic/Images/Context Menus/ActionCopy.svg"
+dest_files=[ "res://.import/ActionCopy.svg-5b4013a70fecebd29760cea7953f7539.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/Filesystem.svg b/addons/dialogic/Images/Context Menus/Filesystem.svg
similarity index 100%
rename from addons/dialogic/Images/Filesystem.svg
rename to addons/dialogic/Images/Context Menus/Filesystem.svg
diff --git a/addons/dialogic/Images/Filesystem.svg.import b/addons/dialogic/Images/Context Menus/Filesystem.svg.import
similarity index 66%
rename from addons/dialogic/Images/Filesystem.svg.import
rename to addons/dialogic/Images/Context Menus/Filesystem.svg.import
index b003295..1c4ab17 100644
--- a/addons/dialogic/Images/Filesystem.svg.import
+++ b/addons/dialogic/Images/Context Menus/Filesystem.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Filesystem.svg-a3ca74f9d2cdc62927955e2f99c73ac1.stex"
+path="res://.import/Filesystem.svg-1b4be5705e8cf2dba5ed5377977d1221.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/Filesystem.svg"
-dest_files=[ "res://.import/Filesystem.svg-a3ca74f9d2cdc62927955e2f99c73ac1.stex" ]
+source_file="res://addons/dialogic/Images/Context Menus/Filesystem.svg"
+dest_files=[ "res://.import/Filesystem.svg-1b4be5705e8cf2dba5ed5377977d1221.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/Remove.svg b/addons/dialogic/Images/Context Menus/Remove.svg
similarity index 100%
rename from addons/dialogic/Images/Remove.svg
rename to addons/dialogic/Images/Context Menus/Remove.svg
diff --git a/addons/dialogic/Images/Remove.svg.import b/addons/dialogic/Images/Context Menus/Remove.svg.import
similarity index 68%
rename from addons/dialogic/Images/Remove.svg.import
rename to addons/dialogic/Images/Context Menus/Remove.svg.import
index 8c7ced4..9d8d5fe 100644
--- a/addons/dialogic/Images/Remove.svg.import
+++ b/addons/dialogic/Images/Context Menus/Remove.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Remove.svg-5fdf7012a90fe887e73fc55cb69bdaf2.stex"
+path="res://.import/Remove.svg-e6ac0bc0ace4deeae8709012158798f8.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/Remove.svg"
-dest_files=[ "res://.import/Remove.svg-5fdf7012a90fe887e73fc55cb69bdaf2.stex" ]
+source_file="res://addons/dialogic/Images/Context Menus/Remove.svg"
+dest_files=[ "res://.import/Remove.svg-e6ac0bc0ace4deeae8709012158798f8.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/Events/audio-event.svg b/addons/dialogic/Images/Event Icons/Main Icons/audio-event.svg
similarity index 100%
rename from addons/dialogic/Images/Events/audio-event.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/audio-event.svg
diff --git a/addons/dialogic/Images/Event Icons/Main Icons/audio-event.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/audio-event.svg.import
new file mode 100644
index 0000000..cef743f
--- /dev/null
+++ b/addons/dialogic/Images/Event Icons/Main Icons/audio-event.svg.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/audio-event.svg-d192398662daf4684b0a1cb09391d1c1.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/audio-event.svg"
+dest_files=[ "res://.import/audio-event.svg-d192398662daf4684b0a1cb09391d1c1.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/addons/dialogic/Images/Events/background-music.svg b/addons/dialogic/Images/Event Icons/Main Icons/background-music.svg
similarity index 100%
rename from addons/dialogic/Images/Events/background-music.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/background-music.svg
diff --git a/addons/dialogic/Images/Events/background-music.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/background-music.svg.import
similarity index 64%
rename from addons/dialogic/Images/Events/background-music.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/background-music.svg.import
index 525fedc..2b125de 100644
--- a/addons/dialogic/Images/Events/background-music.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/background-music.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/background-music.svg-ce4f516e1adc748da06ba03cfc5f5aea.stex"
+path="res://.import/background-music.svg-ed735c7eb8946611ace4908d8c03f881.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/Events/background-music.svg"
-dest_files=[ "res://.import/background-music.svg-ce4f516e1adc748da06ba03cfc5f5aea.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/background-music.svg"
+dest_files=[ "res://.import/background-music.svg-ed735c7eb8946611ace4908d8c03f881.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/Script.svg b/addons/dialogic/Images/Event Icons/Main Icons/call-node.svg
similarity index 100%
rename from addons/dialogic/Images/Script.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/call-node.svg
diff --git a/addons/dialogic/Images/Add.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/call-node.svg.import
similarity index 66%
rename from addons/dialogic/Images/Add.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/call-node.svg.import
index bda439a..f8b4c1a 100644
--- a/addons/dialogic/Images/Add.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/call-node.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Add.svg-841b9d99eb0e55333201a7ce23318272.stex"
+path="res://.import/call-node.svg-18ac09155d5b32a52ebd8691a3af4366.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/Add.svg"
-dest_files=[ "res://.import/Add.svg-841b9d99eb0e55333201a7ce23318272.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/call-node.svg"
+dest_files=[ "res://.import/call-node.svg-18ac09155d5b32a52ebd8691a3af4366.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/Events/change-scene.svg b/addons/dialogic/Images/Event Icons/Main Icons/change-scene.svg
similarity index 100%
rename from addons/dialogic/Images/Events/change-scene.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/change-scene.svg
diff --git a/addons/dialogic/Images/Events/change-scene.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/change-scene.svg.import
similarity index 65%
rename from addons/dialogic/Images/Events/change-scene.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/change-scene.svg.import
index 8dbd836..cff6a0a 100644
--- a/addons/dialogic/Images/Events/change-scene.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/change-scene.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/change-scene.svg-4ec53c6e2be3e1a24d1aeb9767277503.stex"
+path="res://.import/change-scene.svg-6725a8049733078ddbd90a4b2658171a.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/Events/change-scene.svg"
-dest_files=[ "res://.import/change-scene.svg-4ec53c6e2be3e1a24d1aeb9767277503.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/change-scene.svg"
+dest_files=[ "res://.import/change-scene.svg-6725a8049733078ddbd90a4b2658171a.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/Events/change-timeline.svg b/addons/dialogic/Images/Event Icons/Main Icons/change-timeline.svg
similarity index 100%
rename from addons/dialogic/Images/Events/change-timeline.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/change-timeline.svg
diff --git a/addons/dialogic/Images/Events/change-timeline.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/change-timeline.svg.import
similarity index 64%
rename from addons/dialogic/Images/Events/change-timeline.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/change-timeline.svg.import
index 7f08e40..992d01d 100644
--- a/addons/dialogic/Images/Events/change-timeline.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/change-timeline.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/change-timeline.svg-6aceaf7d093889feea334bbe4350d8be.stex"
+path="res://.import/change-timeline.svg-3fc1cb78cceef83db78cae34f53baa54.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/Events/change-timeline.svg"
-dest_files=[ "res://.import/change-timeline.svg-6aceaf7d093889feea334bbe4350d8be.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/change-timeline.svg"
+dest_files=[ "res://.import/change-timeline.svg-3fc1cb78cceef83db78cae34f53baa54.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/character-join.svg b/addons/dialogic/Images/Event Icons/Main Icons/character-join.svg
similarity index 100%
rename from addons/dialogic/Images/character-join.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/character-join.svg
diff --git a/addons/dialogic/Images/character-join.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/character-join.svg.import
similarity index 64%
rename from addons/dialogic/Images/character-join.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/character-join.svg.import
index 699e421..72b42a8 100644
--- a/addons/dialogic/Images/character-join.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/character-join.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/character-join.svg-b66498656c09188cb8737cd2176ed71b.stex"
+path="res://.import/character-join.svg-21df5cf0ef16cc4703da536cc0ba7600.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/character-join.svg"
-dest_files=[ "res://.import/character-join.svg-b66498656c09188cb8737cd2176ed71b.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/character-join.svg"
+dest_files=[ "res://.import/character-join.svg-21df5cf0ef16cc4703da536cc0ba7600.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/character-leave.svg b/addons/dialogic/Images/Event Icons/Main Icons/character-leave.svg
similarity index 100%
rename from addons/dialogic/Images/character-leave.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/character-leave.svg
diff --git a/addons/dialogic/Images/character-leave.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/character-leave.svg.import
similarity index 64%
rename from addons/dialogic/Images/character-leave.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/character-leave.svg.import
index bcf7935..ef38240 100644
--- a/addons/dialogic/Images/character-leave.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/character-leave.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/character-leave.svg-fa5c9db1ebb7a3a9e823282043434e43.stex"
+path="res://.import/character-leave.svg-2d2e80f905152be7ba982e5eab07041e.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/character-leave.svg"
-dest_files=[ "res://.import/character-leave.svg-fa5c9db1ebb7a3a9e823282043434e43.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/character-leave.svg"
+dest_files=[ "res://.import/character-leave.svg-2d2e80f905152be7ba982e5eab07041e.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/choice.svg b/addons/dialogic/Images/Event Icons/Main Icons/choice.svg
similarity index 100%
rename from addons/dialogic/Images/choice.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/choice.svg
diff --git a/addons/dialogic/Images/choice.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/choice.svg.import
similarity index 68%
rename from addons/dialogic/Images/choice.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/choice.svg.import
index cc7cb4c..db8daf6 100644
--- a/addons/dialogic/Images/choice.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/choice.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/choice.svg-26dddb0fed66728e82adce1daf345c4f.stex"
+path="res://.import/choice.svg-13eab5623c86309807d0cbedab2ce888.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/choice.svg"
-dest_files=[ "res://.import/choice.svg-26dddb0fed66728e82adce1daf345c4f.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/choice.svg"
+dest_files=[ "res://.import/choice.svg-13eab5623c86309807d0cbedab2ce888.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/end-dialog.svg b/addons/dialogic/Images/Event Icons/Main Icons/close-dialog.svg
similarity index 100%
rename from addons/dialogic/Images/end-dialog.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/close-dialog.svg
diff --git a/addons/dialogic/Images/Event Icons/Main Icons/close-dialog.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/close-dialog.svg.import
new file mode 100644
index 0000000..31a9fad
--- /dev/null
+++ b/addons/dialogic/Images/Event Icons/Main Icons/close-dialog.svg.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/close-dialog.svg-bb378589acef276803372ba9bd39145a.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/close-dialog.svg"
+dest_files=[ "res://.import/close-dialog.svg-bb378589acef276803372ba9bd39145a.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/addons/dialogic/Images/condition.svg b/addons/dialogic/Images/Event Icons/Main Icons/condition.svg
similarity index 100%
rename from addons/dialogic/Images/condition.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/condition.svg
diff --git a/addons/dialogic/Images/condition.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/condition.svg.import
similarity index 66%
rename from addons/dialogic/Images/condition.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/condition.svg.import
index 8d7becf..35282c9 100644
--- a/addons/dialogic/Images/condition.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/condition.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/condition.svg-409d02a4c99bed93635eb7b1175e09f2.stex"
+path="res://.import/condition.svg-9263ad20f1666fc3284ae39867031dd1.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/condition.svg"
-dest_files=[ "res://.import/condition.svg-409d02a4c99bed93635eb7b1175e09f2.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/condition.svg"
+dest_files=[ "res://.import/condition.svg-9263ad20f1666fc3284ae39867031dd1.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/signal.svg b/addons/dialogic/Images/Event Icons/Main Icons/emit-signal.svg
similarity index 100%
rename from addons/dialogic/Images/signal.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/emit-signal.svg
diff --git a/addons/dialogic/Images/Event Icons/Main Icons/emit-signal.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/emit-signal.svg.import
new file mode 100644
index 0000000..2a7b253
--- /dev/null
+++ b/addons/dialogic/Images/Event Icons/Main Icons/emit-signal.svg.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/emit-signal.svg-e7476cdba0b41b81b70ecd21f85b0b2f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/emit-signal.svg"
+dest_files=[ "res://.import/emit-signal.svg-e7476cdba0b41b81b70ecd21f85b0b2f.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/addons/dialogic/Images/end-choice.svg b/addons/dialogic/Images/Event Icons/Main Icons/end-branch.svg
similarity index 100%
rename from addons/dialogic/Images/end-choice.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/end-branch.svg
diff --git a/addons/dialogic/Images/Event Icons/Main Icons/end-branch.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/end-branch.svg.import
new file mode 100644
index 0000000..678a1c9
--- /dev/null
+++ b/addons/dialogic/Images/Event Icons/Main Icons/end-branch.svg.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/end-branch.svg-393dc31ec86d0bbd6ec737e9a12197f7.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/end-branch.svg"
+dest_files=[ "res://.import/end-branch.svg-393dc31ec86d0bbd6ec737e9a12197f7.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/addons/dialogic/Images/question.svg b/addons/dialogic/Images/Event Icons/Main Icons/question.svg
similarity index 100%
rename from addons/dialogic/Images/question.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/question.svg
diff --git a/addons/dialogic/Images/question.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/question.svg.import
similarity index 66%
rename from addons/dialogic/Images/question.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/question.svg.import
index 8d4695d..b63f796 100644
--- a/addons/dialogic/Images/question.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/question.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/question.svg-bf5ae2a36e0a1da2ab2969033f16641c.stex"
+path="res://.import/question.svg-e8715956b6df35b64adef0a9d414d62b.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/question.svg"
-dest_files=[ "res://.import/question.svg-bf5ae2a36e0a1da2ab2969033f16641c.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/question.svg"
+dest_files=[ "res://.import/question.svg-e8715956b6df35b64adef0a9d414d62b.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/Events/scene.svg b/addons/dialogic/Images/Event Icons/Main Icons/scene event.svg
similarity index 100%
rename from addons/dialogic/Images/Events/scene.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/scene event.svg
diff --git a/addons/dialogic/Images/Event Icons/Main Icons/scene event.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/scene event.svg.import
new file mode 100644
index 0000000..421b5b4
--- /dev/null
+++ b/addons/dialogic/Images/Event Icons/Main Icons/scene event.svg.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/scene event.svg-ccb4261fbe75c7865b6b03f3b71ac8c6.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/scene event.svg"
+dest_files=[ "res://.import/scene event.svg-ccb4261fbe75c7865b6b03f3b71ac8c6.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/addons/dialogic/Images/theme.svg b/addons/dialogic/Images/Event Icons/Main Icons/set-theme.svg
similarity index 100%
rename from addons/dialogic/Images/theme.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/set-theme.svg
diff --git a/addons/dialogic/Images/Events/Wait.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/set-theme.svg.import
similarity index 66%
rename from addons/dialogic/Images/Events/Wait.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/set-theme.svg.import
index d4026f2..afb0c65 100644
--- a/addons/dialogic/Images/Events/Wait.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/set-theme.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Wait.svg-967925959cce4f8e3ee840598b69a612.stex"
+path="res://.import/set-theme.svg-1d90327d314f7032240973a0de491cbf.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/Events/Wait.svg"
-dest_files=[ "res://.import/Wait.svg-967925959cce4f8e3ee840598b69a612.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/set-theme.svg"
+dest_files=[ "res://.import/set-theme.svg-1d90327d314f7032240973a0de491cbf.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/Event Icons/Main Icons/set-value.svg b/addons/dialogic/Images/Event Icons/Main Icons/set-value.svg
new file mode 100644
index 0000000..236ca35
--- /dev/null
+++ b/addons/dialogic/Images/Event Icons/Main Icons/set-value.svg	
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9645 2.62927L12.8459 5.22444C12.6271 5.04546 12.3835 4.89134 12.1151 4.76208C11.8565 4.62287 11.5881 4.55327 11.3097 4.55327C11.0909 4.55327 10.8821 4.59802 10.6832 4.68751C10.4943 4.77699 10.3203 4.89631 10.1612 5.04546C10.0021 5.19461 9.86293 5.36364 9.74361 5.55256C9.6243 5.73154 9.52486 5.91052 9.44532 6.08949L9.14702 6.93964C9.35583 7.37714 9.55966 7.79475 9.75853 8.19248C9.92756 8.53055 10.1016 8.87359 10.2805 9.2216C10.4595 9.55966 10.6087 9.82813 10.728 10.027C10.9169 10.3153 11.1058 10.6136 11.2948 10.9219C11.4837 11.2202 11.6925 11.4936 11.9212 11.7422C12.0206 11.8516 12.1399 11.9261 12.2791 11.9659C12.4283 11.9957 12.5625 12.0107 12.6818 12.0107C12.8707 12.0107 13.0497 11.9858 13.2188 11.9361C13.3878 11.8864 13.5469 11.8217 13.696 11.7422L14.0689 12.2195C13.9297 12.4382 13.7607 12.657 13.5618 12.8757C13.3629 13.0945 13.1442 13.2933 12.9055 13.4723C12.6769 13.6513 12.4283 13.7955 12.1598 13.9048C11.9013 14.0242 11.6378 14.0838 11.3693 14.0838C11.1307 14.0838 10.9169 14.044 10.728 13.9645C10.549 13.8949 10.3849 13.8004 10.2358 13.6811C10.0867 13.5519 9.94745 13.4027 9.81819 13.2337C9.68893 13.0646 9.55469 12.8906 9.41549 12.7117C9.30611 12.5426 9.1868 12.3388 9.05753 12.1001C8.93822 11.8516 8.81393 11.598 8.68466 11.3395C8.5554 11.081 8.42614 10.8324 8.29688 10.5938C8.16762 10.3452 8.04333 10.1364 7.92401 9.96734C7.8743 10.1364 7.82955 10.3054 7.78978 10.4744C7.75001 10.6136 7.70526 10.7578 7.65555 10.907C7.60583 11.0561 7.56109 11.1705 7.52131 11.25C7.37216 11.5682 7.18324 11.8963 6.95455 12.2344C6.72586 12.5724 6.46236 12.8807 6.16407 13.1591C5.87572 13.4276 5.55753 13.6513 5.20952 13.8303C4.86151 13.9993 4.49361 14.0838 4.10583 14.0838C3.75782 14.0838 3.41975 14.0142 3.09162 13.875C2.7635 13.7457 2.46023 13.5717 2.18182 13.353L3.12145 10.8771C3.43964 11.076 3.78765 11.255 4.16549 11.4141C4.54333 11.5632 4.92117 11.6378 5.29901 11.6378C5.41833 11.6378 5.54262 11.6278 5.67188 11.608C5.80114 11.5781 5.92543 11.5384 6.04475 11.4886C6.17401 11.429 6.28836 11.3594 6.38779 11.2798C6.48722 11.1903 6.5618 11.0859 6.61151 10.9666C6.68111 10.8374 6.75569 10.6683 6.83523 10.4595C6.91478 10.2507 6.99432 10.0419 7.07387 9.8331C7.16336 9.59447 7.25285 9.34091 7.34234 9.07245L4.53836 4.5831C4.4091 4.43395 4.25001 4.31464 4.06109 4.22515C3.88211 4.12572 3.69319 4.076 3.49432 4.076C3.32529 4.076 3.1662 4.1108 3.01705 4.1804C2.8679 4.24006 2.72373 4.32458 2.58452 4.43395L2.18182 3.91194C2.32103 3.70313 2.48509 3.4993 2.67401 3.30043C2.87287 3.09162 3.08665 2.90768 3.31535 2.74859C3.54404 2.57955 3.78765 2.44532 4.04617 2.34589C4.30469 2.23651 4.56819 2.18182 4.83665 2.18182C5.16478 2.18182 5.46805 2.26634 5.74645 2.43537C6.02486 2.59447 6.28339 2.79333 6.52202 3.03197C6.76066 3.2706 6.97941 3.52912 7.17827 3.80753C7.37714 4.08594 7.55611 4.34447 7.7152 4.5831C7.79475 4.69248 7.87927 4.83168 7.96876 5.00072C8.06819 5.15981 8.16265 5.3189 8.25214 5.47799C8.36151 5.65697 8.46591 5.85086 8.56535 6.05966C8.66478 5.82103 8.76918 5.58239 8.87856 5.34376C8.96805 5.14489 9.05753 4.94106 9.14702 4.73225C9.24645 4.5135 9.33594 4.32458 9.41549 4.16549C9.56464 3.88708 9.73367 3.62856 9.92259 3.38992C10.1115 3.15128 10.3203 2.94248 10.549 2.7635C10.7876 2.58452 11.0462 2.44532 11.3246 2.34589C11.603 2.23651 11.9063 2.18182 12.2344 2.18182C12.5426 2.18182 12.8409 2.2216 13.1293 2.30114C13.4176 2.38069 13.696 2.49006 13.9645 2.62927Z" fill="white"/>
+</svg>
diff --git a/addons/dialogic/Images/Events/set-value.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/set-value.svg.import
similarity index 66%
rename from addons/dialogic/Images/Events/set-value.svg.import
rename to addons/dialogic/Images/Event Icons/Main Icons/set-value.svg.import
index e57d2cc..9b844bc 100644
--- a/addons/dialogic/Images/Events/set-value.svg.import
+++ b/addons/dialogic/Images/Event Icons/Main Icons/set-value.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/set-value.svg-a9ffb569c3bc80942d1fddebebfaa118.stex"
+path="res://.import/set-value.svg-6fb3742ed5c2df51d2350fc9d9c789b0.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/Events/set-value.svg"
-dest_files=[ "res://.import/set-value.svg-a9ffb569c3bc80942d1fddebebfaa118.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/set-value.svg"
+dest_files=[ "res://.import/set-value.svg-6fb3742ed5c2df51d2350fc9d9c789b0.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/dialog.svg b/addons/dialogic/Images/Event Icons/Main Icons/text-event.svg
similarity index 100%
rename from addons/dialogic/Images/dialog.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/text-event.svg
diff --git a/addons/dialogic/Images/Event Icons/Main Icons/text-event.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/text-event.svg.import
new file mode 100644
index 0000000..c6064c7
--- /dev/null
+++ b/addons/dialogic/Images/Event Icons/Main Icons/text-event.svg.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/text-event.svg-c2eab2588af7e9e8b6272730719be2c6.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/text-event.svg"
+dest_files=[ "res://.import/text-event.svg-c2eab2588af7e9e8b6272730719be2c6.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/addons/dialogic/Images/Events/Wait.svg b/addons/dialogic/Images/Event Icons/Main Icons/wait-seconds.svg
similarity index 100%
rename from addons/dialogic/Images/Events/Wait.svg
rename to addons/dialogic/Images/Event Icons/Main Icons/wait-seconds.svg
diff --git a/addons/dialogic/Images/Event Icons/Main Icons/wait-seconds.svg.import b/addons/dialogic/Images/Event Icons/Main Icons/wait-seconds.svg.import
new file mode 100644
index 0000000..8df4c51
--- /dev/null
+++ b/addons/dialogic/Images/Event Icons/Main Icons/wait-seconds.svg.import	
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/wait-seconds.svg-bfe0671e761c4874421ab49eb39943d7.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/dialogic/Images/Event Icons/Main Icons/wait-seconds.svg"
+dest_files=[ "res://.import/wait-seconds.svg-bfe0671e761c4874421ab49eb39943d7.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/addons/dialogic/Images/Portrait.svg b/addons/dialogic/Images/Event Icons/Portrait.svg
similarity index 100%
rename from addons/dialogic/Images/Portrait.svg
rename to addons/dialogic/Images/Event Icons/Portrait.svg
diff --git a/addons/dialogic/Images/Portrait.svg.import b/addons/dialogic/Images/Event Icons/Portrait.svg.import
similarity index 67%
rename from addons/dialogic/Images/Portrait.svg.import
rename to addons/dialogic/Images/Event Icons/Portrait.svg.import
index 74215aa..2bf9f6c 100644
--- a/addons/dialogic/Images/Portrait.svg.import
+++ b/addons/dialogic/Images/Event Icons/Portrait.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Portrait.svg-d630deb987a3ece30f0222a720e96235.stex"
+path="res://.import/Portrait.svg-f37a4a2fd15fb13cfe91413c3b2384b1.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/Portrait.svg"
-dest_files=[ "res://.import/Portrait.svg-d630deb987a3ece30f0222a720e96235.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/Portrait.svg"
+dest_files=[ "res://.import/Portrait.svg-f37a4a2fd15fb13cfe91413c3b2384b1.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/character.svg b/addons/dialogic/Images/Event Icons/character.svg
similarity index 100%
rename from addons/dialogic/Images/character.svg
rename to addons/dialogic/Images/Event Icons/character.svg
diff --git a/addons/dialogic/Images/character.svg.import b/addons/dialogic/Images/Event Icons/character.svg.import
similarity index 67%
rename from addons/dialogic/Images/character.svg.import
rename to addons/dialogic/Images/Event Icons/character.svg.import
index 70aa6e1..be1e0d9 100644
--- a/addons/dialogic/Images/character.svg.import
+++ b/addons/dialogic/Images/Event Icons/character.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/character.svg-0a84f287343f7947266a159bdf99ea51.stex"
+path="res://.import/character.svg-89c6ba7fbc42ad2d5168608df91b8534.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/character.svg"
-dest_files=[ "res://.import/character.svg-0a84f287343f7947266a159bdf99ea51.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/character.svg"
+dest_files=[ "res://.import/character.svg-89c6ba7fbc42ad2d5168608df91b8534.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/warning.svg b/addons/dialogic/Images/Event Icons/warning.svg
similarity index 100%
rename from addons/dialogic/Images/warning.svg
rename to addons/dialogic/Images/Event Icons/warning.svg
diff --git a/addons/dialogic/Images/warning.svg.import b/addons/dialogic/Images/Event Icons/warning.svg.import
similarity index 69%
rename from addons/dialogic/Images/warning.svg.import
rename to addons/dialogic/Images/Event Icons/warning.svg.import
index f802eb3..6f13b69 100644
--- a/addons/dialogic/Images/warning.svg.import
+++ b/addons/dialogic/Images/Event Icons/warning.svg.import	
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/warning.svg-9eca68c263a27c62e3e4c9e0d7c27b0e.stex"
+path="res://.import/warning.svg-b11873783fddb6d7d28efa2bfd5dde85.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/warning.svg"
-dest_files=[ "res://.import/warning.svg-9eca68c263a27c62e3e4c9e0d7c27b0e.stex" ]
+source_file="res://addons/dialogic/Images/Event Icons/warning.svg"
+dest_files=[ "res://.import/warning.svg-b11873783fddb6d7d28efa2bfd5dde85.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/Events/scene.svg.import b/addons/dialogic/Images/Events/scene.svg.import
deleted file mode 100644
index 1713390..0000000
--- a/addons/dialogic/Images/Events/scene.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/scene.svg-ca26fe974139b6679b31bddcfc26e995.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/Events/scene.svg"
-dest_files=[ "res://.import/scene.svg-ca26fe974139b6679b31bddcfc26e995.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/Events/set-value.svg b/addons/dialogic/Images/Events/set-value.svg
deleted file mode 100644
index fdd873b..0000000
--- a/addons/dialogic/Images/Events/set-value.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5 4H17V18H5V4ZM7 6H15V8H7V6ZM15 10H7V12H15V10ZM7 14H15V16H7V14Z" fill="white"/>
-</svg>
diff --git a/addons/dialogic/Images/Folder.svg b/addons/dialogic/Images/Folder.svg
deleted file mode 100644
index 00ff7a9..0000000
--- a/addons/dialogic/Images/Folder.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m2 2a1 1 0 0 0 -1 1v2 6 2a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-7a1 1 0 0 0 -1-1h-4a1 1 0 0 1 -1-1v-1a1 1 0 0 0 -1-1z" fill="#e0e0e0"/></svg>
\ No newline at end of file
diff --git a/addons/dialogic/Images/Folder.svg.import b/addons/dialogic/Images/Folder.svg.import
deleted file mode 100644
index cf70300..0000000
--- a/addons/dialogic/Images/Folder.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Folder.svg-7c3a7f8f27acdb56a6bac36cd9971e63.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/Folder.svg"
-dest_files=[ "res://.import/Folder.svg-7c3a7f8f27acdb56a6bac36cd9971e63.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/closed-icon.svg b/addons/dialogic/Images/Pieces/closed-icon.svg
similarity index 100%
rename from addons/dialogic/Images/closed-icon.svg
rename to addons/dialogic/Images/Pieces/closed-icon.svg
diff --git a/addons/dialogic/Images/Events/audio-event.svg.import b/addons/dialogic/Images/Pieces/closed-icon.svg.import
similarity index 67%
rename from addons/dialogic/Images/Events/audio-event.svg.import
rename to addons/dialogic/Images/Pieces/closed-icon.svg.import
index fd4f264..ccdfb6c 100644
--- a/addons/dialogic/Images/Events/audio-event.svg.import
+++ b/addons/dialogic/Images/Pieces/closed-icon.svg.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/audio-event.svg-bd534461a0eafdc8864d2de10c52b1e3.stex"
+path="res://.import/closed-icon.svg-b4822d061d964b0ee1a7fa1cc7cd7a4c.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/Events/audio-event.svg"
-dest_files=[ "res://.import/audio-event.svg-bd534461a0eafdc8864d2de10c52b1e3.stex" ]
+source_file="res://addons/dialogic/Images/Pieces/closed-icon.svg"
+dest_files=[ "res://.import/closed-icon.svg-b4822d061d964b0ee1a7fa1cc7cd7a4c.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/expand-icon.svg b/addons/dialogic/Images/Pieces/expand-icon.svg
similarity index 100%
rename from addons/dialogic/Images/expand-icon.svg
rename to addons/dialogic/Images/Pieces/expand-icon.svg
diff --git a/addons/dialogic/Images/expand-icon.svg.import b/addons/dialogic/Images/Pieces/expand-icon.svg.import
similarity index 67%
rename from addons/dialogic/Images/expand-icon.svg.import
rename to addons/dialogic/Images/Pieces/expand-icon.svg.import
index a47f7e4..7dd30f5 100644
--- a/addons/dialogic/Images/expand-icon.svg.import
+++ b/addons/dialogic/Images/Pieces/expand-icon.svg.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/expand-icon.svg-8a88118d19b0202d241c820ea1117a89.stex"
+path="res://.import/expand-icon.svg-1c8e60c84d41732547c2efaeb5ea7d61.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/expand-icon.svg"
-dest_files=[ "res://.import/expand-icon.svg-8a88118d19b0202d241c820ea1117a89.stex" ]
+source_file="res://addons/dialogic/Images/Pieces/expand-icon.svg"
+dest_files=[ "res://.import/expand-icon.svg-1c8e60c84d41732547c2efaeb5ea7d61.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/open-icon.svg b/addons/dialogic/Images/Pieces/open-icon.svg
similarity index 100%
rename from addons/dialogic/Images/open-icon.svg
rename to addons/dialogic/Images/Pieces/open-icon.svg
diff --git a/addons/dialogic/Images/open-icon.svg.import b/addons/dialogic/Images/Pieces/open-icon.svg.import
similarity index 67%
rename from addons/dialogic/Images/open-icon.svg.import
rename to addons/dialogic/Images/Pieces/open-icon.svg.import
index bca6e22..31575ae 100644
--- a/addons/dialogic/Images/open-icon.svg.import
+++ b/addons/dialogic/Images/Pieces/open-icon.svg.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/open-icon.svg-857de37154b7d54e6d8df60da66b9955.stex"
+path="res://.import/open-icon.svg-425ea3b137355c35fcecd5dde0b0ca7b.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/open-icon.svg"
-dest_files=[ "res://.import/open-icon.svg-857de37154b7d54e6d8df60da66b9955.stex" ]
+source_file="res://addons/dialogic/Images/Pieces/open-icon.svg"
+dest_files=[ "res://.import/open-icon.svg-425ea3b137355c35fcecd5dde0b0ca7b.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/Rename.svg b/addons/dialogic/Images/Rename.svg
deleted file mode 100644
index 853f68b..0000000
--- a/addons/dialogic/Images/Rename.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m5 2v2h2v8h-2v2h2c.55228 0 1-.4477 1-1 0 .5523.44772 1 1 1h2v-2h-2v-8h2v-2h-2c-.55228 0-1 .44772-1 1 0-.55228-.44772-1-1-1z" fill="#e0e0e0"/></svg>
diff --git a/addons/dialogic/Images/Rename.svg.import b/addons/dialogic/Images/Rename.svg.import
deleted file mode 100644
index cffc376..0000000
--- a/addons/dialogic/Images/Rename.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Rename.svg-508928498e7f6f3e2fb62b2c606d9f7e.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/Rename.svg"
-dest_files=[ "res://.import/Rename.svg-508928498e7f6f3e2fb62b2c606d9f7e.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/Script.svg.import b/addons/dialogic/Images/Script.svg.import
deleted file mode 100644
index e84cbe6..0000000
--- a/addons/dialogic/Images/Script.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Script.svg-a11888b5cecb4b416a71982e0e80279a.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/Script.svg"
-dest_files=[ "res://.import/Script.svg-a11888b5cecb4b416a71982e0e80279a.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/tutorials/arrow-down.svg b/addons/dialogic/Images/Tutorials/arrow-down.svg
similarity index 100%
rename from addons/dialogic/Images/tutorials/arrow-down.svg
rename to addons/dialogic/Images/Tutorials/arrow-down.svg
diff --git a/addons/dialogic/Images/tutorials/arrow-down.svg.import b/addons/dialogic/Images/Tutorials/arrow-down.svg.import
similarity index 67%
rename from addons/dialogic/Images/tutorials/arrow-down.svg.import
rename to addons/dialogic/Images/Tutorials/arrow-down.svg.import
index 5110cec..34f3edf 100644
--- a/addons/dialogic/Images/tutorials/arrow-down.svg.import
+++ b/addons/dialogic/Images/Tutorials/arrow-down.svg.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/arrow-down.svg-aa9026ffecfa21050a1aa48d0ea5e5c6.stex"
+path="res://.import/arrow-down.svg-82927ec9bdee161b2d27d6f4808e76b4.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/dialogic/Images/tutorials/arrow-down.svg"
-dest_files=[ "res://.import/arrow-down.svg-aa9026ffecfa21050a1aa48d0ea5e5c6.stex" ]
+source_file="res://addons/dialogic/Images/Tutorials/arrow-down.svg"
+dest_files=[ "res://.import/arrow-down.svg-82927ec9bdee161b2d27d6f4808e76b4.stex" ]
 
 [params]
 
diff --git a/addons/dialogic/Images/character-tab.svg b/addons/dialogic/Images/character-tab.svg
deleted file mode 100644
index 8f61682..0000000
--- a/addons/dialogic/Images/character-tab.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="11" cy="6" r="4" fill="white"/>
-<path d="M17 17.4118C17 20 14.3137 20 11 20C7.68629 20 5 20 5 17.4118C5 12.7661 7.68629 9 11 9C14.3137 9 17 12.7661 17 17.4118Z" fill="white"/>
-</svg>
diff --git a/addons/dialogic/Images/character-tab.svg.import b/addons/dialogic/Images/character-tab.svg.import
deleted file mode 100644
index eb54277..0000000
--- a/addons/dialogic/Images/character-tab.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/character-tab.svg-a0a1c677c7be2739c0a81f80d8014bd3.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/character-tab.svg"
-dest_files=[ "res://.import/character-tab.svg-a0a1c677c7be2739c0a81f80d8014bd3.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/closed-icon.svg.import b/addons/dialogic/Images/closed-icon.svg.import
deleted file mode 100644
index 319783a..0000000
--- a/addons/dialogic/Images/closed-icon.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/closed-icon.svg-91a5c6a2403c85992c2ffc91b2926a4d.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/closed-icon.svg"
-dest_files=[ "res://.import/closed-icon.svg-91a5c6a2403c85992c2ffc91b2926a4d.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/dialog.svg.import b/addons/dialogic/Images/dialog.svg.import
deleted file mode 100644
index ee65064..0000000
--- a/addons/dialogic/Images/dialog.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/dialog.svg-52d486697e1a733343fc570f020ad5dd.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/dialog.svg"
-dest_files=[ "res://.import/dialog.svg-52d486697e1a733343fc570f020ad5dd.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/end-choice.svg.import b/addons/dialogic/Images/end-choice.svg.import
deleted file mode 100644
index 8790683..0000000
--- a/addons/dialogic/Images/end-choice.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/end-choice.svg-5459b23a6b0b7cb89ebec22d1814f86b.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/end-choice.svg"
-dest_files=[ "res://.import/end-choice.svg-5459b23a6b0b7cb89ebec22d1814f86b.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/end-dialog.svg.import b/addons/dialogic/Images/end-dialog.svg.import
deleted file mode 100644
index 6195399..0000000
--- a/addons/dialogic/Images/end-dialog.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/end-dialog.svg-e1369f486dad8c81ebe2c430c95cea9c.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/end-dialog.svg"
-dest_files=[ "res://.import/end-dialog.svg-e1369f486dad8c81ebe2c430c95cea9c.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/play.svg b/addons/dialogic/Images/play.svg
deleted file mode 100644
index 2c21805..0000000
--- a/addons/dialogic/Images/play.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 5.79011C5 5.00767 5.85805 4.52834 6.52432 4.93858L15.5391 10.4894C16.1915 10.8911 16.1684 11.8471 15.4973 12.2168L6.48254 17.1832" fill="white" stroke="white"/>
-<rect x="5" y="5" width="2" height="12" fill="white"/>
-</svg>
diff --git a/addons/dialogic/Images/play.svg.import b/addons/dialogic/Images/play.svg.import
deleted file mode 100644
index 7630af6..0000000
--- a/addons/dialogic/Images/play.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/play.svg-1b0a3776bf45f15adaf6e4448afc5e38.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/play.svg"
-dest_files=[ "res://.import/play.svg-1b0a3776bf45f15adaf6e4448afc5e38.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/signal.svg.import b/addons/dialogic/Images/signal.svg.import
deleted file mode 100644
index 84d44d8..0000000
--- a/addons/dialogic/Images/signal.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/signal.svg-2eb8738b3b8e9ec3f81b22962cbf8216.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/signal.svg"
-dest_files=[ "res://.import/signal.svg-2eb8738b3b8e9ec3f81b22962cbf8216.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/stop.svg b/addons/dialogic/Images/stop.svg
deleted file mode 100644
index 9435962..0000000
--- a/addons/dialogic/Images/stop.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="4.5" y="4.5" width="13" height="13" rx="1.5" fill="white" stroke="white"/>
-</svg>
diff --git a/addons/dialogic/Images/stop.svg.import b/addons/dialogic/Images/stop.svg.import
deleted file mode 100644
index a339afa..0000000
--- a/addons/dialogic/Images/stop.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/stop.svg-4ed0018d7fdd0b0ef88c0b3de567c41d.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/stop.svg"
-dest_files=[ "res://.import/stop.svg-4ed0018d7fdd0b0ef88c0b3de567c41d.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/theme.svg.import b/addons/dialogic/Images/theme.svg.import
deleted file mode 100644
index ab19193..0000000
--- a/addons/dialogic/Images/theme.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/theme.svg-64f9e066aefa3908d9d06cf66c434f82.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/theme.svg"
-dest_files=[ "res://.import/theme.svg-64f9e066aefa3908d9d06cf66c434f82.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Images/timeline.svg b/addons/dialogic/Images/timeline.svg
deleted file mode 100644
index cc8a1f6..0000000
--- a/addons/dialogic/Images/timeline.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="2" y="2" width="18" height="3" rx="1" fill="white"/>
-<rect x="2" y="7" width="18" height="3" rx="1" fill="white"/>
-<rect x="2" y="12" width="18" height="3" rx="1" fill="white"/>
-<rect x="2" y="17" width="18" height="3" rx="1" fill="white"/>
-</svg>
diff --git a/addons/dialogic/Images/timeline.svg.import b/addons/dialogic/Images/timeline.svg.import
deleted file mode 100644
index 3a0e138..0000000
--- a/addons/dialogic/Images/timeline.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/timeline.svg-cdf4313c07a817508faabfae361b8292.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/dialogic/Images/timeline.svg"
-dest_files=[ "res://.import/timeline.svg-cdf4313c07a817508faabfae361b8292.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/dialogic/Nodes/Portrait.gd b/addons/dialogic/Nodes/Portrait.gd
index 7126507..2eda6d5 100644
--- a/addons/dialogic/Nodes/Portrait.gd
+++ b/addons/dialogic/Nodes/Portrait.gd
@@ -2,7 +2,7 @@ extends Control
 
 var character_data = {
 	'name': 'Default',
-	'image': "res://addons/dialogic/Images/portraits/df-3.png",
+	'image': "res://addons/dialogic/Example Assets/portraits/df-3.png",
 	'color': Color(0.973511, 1, 0.152344),
 	'file': ''
 }
diff --git a/addons/dialogic/Nodes/Portrait.tscn b/addons/dialogic/Nodes/Portrait.tscn
index 5471731..e8b2da4 100644
--- a/addons/dialogic/Nodes/Portrait.tscn
+++ b/addons/dialogic/Nodes/Portrait.tscn
@@ -1,8 +1,10 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://addons/dialogic/Images/portraits/df-1.png" type="Texture" id=1]
+[ext_resource path="res://addons/dialogic/Example Assets/portraits/df-1.png" type="Texture" id=1]
 [ext_resource path="res://addons/dialogic/Nodes/Portrait.gd" type="Script" id=2]
 
+
+
 [node name="Portrait" type="Control"]
 script = ExtResource( 2 )
 __meta__ = {
diff --git a/addons/dialogic/Nodes/dialog_node.gd b/addons/dialogic/Nodes/dialog_node.gd
index a973689..f9b4448 100644
--- a/addons/dialogic/Nodes/dialog_node.gd
+++ b/addons/dialogic/Nodes/dialog_node.gd
@@ -1,5 +1,6 @@
 tool
 extends Control
+class_name DialogicNode
 
 var last_mouse_mode = null
 var input_next: String = 'ui_accept'
@@ -38,66 +39,105 @@ var questions #for keeping track of the questions answered
 
 onready var tween_node = $TextBubble/Tween
 
-func _ready():
-	# Loading the config files
-	load_config_files()
-	
-	# Checking if the dialog should read the code from a external file
-	if not timeline.empty():
-		dialog_script = set_current_dialog(timeline)
+# Used to detect timeline change
+var runtime_id
+
+
+## *****************************************************************************
+##								PUBLIC METHODS
+## *****************************************************************************
+
+## Starts the dialog for the given timeline.
+##
+## This is exactly the same as using the editor:
+## you can drag and drop the scene located at /addons/dialogic/Dialog.tscn 
+## and set the current timeline via the inspector.
+##
+## @param given_timeline		The timeline to load. You can provide the timeline name or the filename.
+## @param reset					True to reset dialogic saved data such as definitions.
+## @param debug					Debug is disabled by default but can be enabled if needed.
+func start(given_timeline: String, reset: bool=true, debug: bool=false):
+	show()
+	reset_saves = reset
+	debug_mode = debug
+	runtime_id = DialogicUtil.generate_random_id()
+	_load_definitions()
+	_stop_close_dialog()
+	if not given_timeline.empty():
+		dialog_script = null
+		for t in DialogicUtil.get_timeline_list():
+			if t['name'] == given_timeline or t['file'] == given_timeline:
+				dialog_script = _set_current_dialog(t['file'])
+		if dialog_script == null:
+			dialog_script = {
+				"events":[{
+					"character":"",
+					"portrait":"",
+					"text":"[color=red][Dialogic Error][/color] Could not load dialog '[color=red]" + given_timeline + "[/color]'. It seems like the timeline doesn't exists. Maybe the name is wrong?"
+				}]
+			}
 	elif dialog_script.keys().size() == 0:
 		dialog_script = {
-			"events":[{"character":"","portrait":"",
-			"text":"[Dialogic Error] No timeline specified."}]
+			"events":[{
+				"character":"",
+				"portrait":"",
+				"text":"[color=red][Dialogic Error][/color] No timeline specified."
+			}]
 		}
-	
-	# Connecting resize signal
-	get_viewport().connect("size_changed", self, "resize_main")
-	resize_main()
-
-	# Setting everything up for the node to be default
-	$TextBubble/NameLabel.text = ''
-	$Background.visible = false
-	$TextBubble/RichTextLabel.meta_underlined = false
-	$DefinitionInfo.visible = false
-	
-	tween_node.connect("tween_completed", self, '_on_Tween_tween_completed')
-
-	# Getting the character information
-	characters = DialogicUtil.get_character_list()
-
 	if not Engine.is_editor_hint():
-		load_dialog()
+		_init_dialog()
 
 
-func load_config_files():
+## Same as the start method, but using the last timeline saved.
+## 
+## @param fallback				The timeline to load in case no save is found.
+## @param debug					Debug is disabled by default but can be enabled if needed.
+func start_from_save(fallback: String, debug: bool=false):
+	var last = DialogicSingleton.get_current_timeline()
+	if last.empty():
+		last = fallback
+	start(last, false, debug)
+
+
+func load_preview(theme: String):
+	pass
+
+
+## *****************************************************************************
+##								PRIVATE METHODS
+## *****************************************************************************
+
+func _load_definitions():
 	if not Engine.is_editor_hint():
 		if reset_saves:
 			DialogicSingleton.init(reset_saves)
 		definitions = DialogicSingleton.get_definitions()
 	else:
 		definitions = DialogicResources.get_default_definitions()
+
+
+func _load_config_files():
 	settings = DialogicResources.get_settings_config()
 	var theme_file = 'res://addons/dialogic/Editor/ThemeEditor/default-theme.cfg'
 	if settings.has_section('theme'):
 		theme_file = settings.get_value('theme', 'default')
-	current_theme = load_theme(theme_file)
+	current_theme = _load_theme(theme_file)
 
 
-func resize_main():
+func _resize_main():
 	# This function makes sure that the dialog is displayed at the correct
 	# size and position in the screen. 
 	if Engine.is_editor_hint() == false:
 		set_global_position(Vector2(0,0))
 		if ProjectSettings.get_setting("display/window/stretch/mode") != '2d':
 			set_deferred('rect_size', get_viewport().size)
-		dprint("Viewport", get_viewport().size)
+		_dprint("Viewport", get_viewport().size)
 	$TextBubble.rect_position.x = (rect_size.x / 2) - ($TextBubble.rect_size.x / 2)
 	if current_theme != null:
 		$TextBubble.rect_position.y = (rect_size.y) - ($TextBubble.rect_size.y) - current_theme.get_value('box', 'bottom_gap', 40)
 
 
-func set_current_dialog(dialog_path: String):
+func _set_current_dialog(dialog_path: String):
 	current_timeline = dialog_path
 	var dialog_script = DialogicResources.get_timeline_json(dialog_path)
 	# All this parse events should be happening in the same loop ideally
@@ -105,16 +145,16 @@ func set_current_dialog(dialog_path: String):
 	# And keep adding different functions for each parsing operation.
 	if settings.has_section_key('dialog', 'auto_color_names'):
 		if settings.get_value('dialog', 'auto_color_names'):
-			dialog_script = parse_characters(dialog_script)
+			dialog_script = _parse_characters(dialog_script)
 	else:
-		dialog_script = parse_characters(dialog_script)
+		dialog_script = _parse_characters(dialog_script)
 	
-	dialog_script = parse_text_lines(dialog_script)
-	dialog_script = parse_branches(dialog_script)
+	dialog_script = _parse_text_lines(dialog_script)
+	dialog_script = _parse_branches(dialog_script)
 	return dialog_script
 
 
-func parse_characters(dialog_script):
+func _parse_characters(dialog_script):
 	var names = DialogicUtil.get_character_list()
 	# I should use regex here, but this is way easier :)
 	if names.size() > 0:
@@ -130,7 +170,7 @@ func parse_characters(dialog_script):
 	return dialog_script
 
 
-func parse_text_lines(unparsed_dialog_script: Dictionary) -> Dictionary:
+func _parse_text_lines(unparsed_dialog_script: Dictionary) -> Dictionary:
 	var parsed_dialog: Dictionary = unparsed_dialog_script
 	var new_events: Array = []
 	var split_new_lines = true
@@ -172,7 +212,7 @@ func parse_text_lines(unparsed_dialog_script: Dictionary) -> Dictionary:
 	return parsed_dialog
 
 
-func parse_alignment(text):
+func _parse_alignment(text):
 	var alignment = current_theme.get_value('text', 'alignment', 'Left')
 	var fname = current_theme.get_value('settings', 'name', 'none')
 	if alignment == 'Center':
@@ -182,7 +222,7 @@ func parse_alignment(text):
 	return text
 
 
-func parse_branches(dialog_script: Dictionary) -> Dictionary:
+func _parse_branches(dialog_script: Dictionary) -> Dictionary:
 	questions = [] # Resetting the questions
 
 	# Return the same thing if it doesn't have events
@@ -228,10 +268,11 @@ func parse_branches(dialog_script: Dictionary) -> Dictionary:
 	return dialog_script
 
 
-func parse_definitions(text: String, variables: bool = true, glossary: bool = true):
+func _parse_definitions(text: String, variables: bool = true, glossary: bool = true):
 	if Engine.is_editor_hint():
 		# Loading variables again to avoid issues in the preview dialog
-		load_config_files()
+		_load_definitions()
+		_load_config_files()
 
 	var final_text: String = text
 	if variables:
@@ -261,33 +302,7 @@ func _insert_glossary_definitions(text: String):
 		)
 	return final_text;
 
-
-func _process(delta):
-	$TextBubble/NextIndicator.visible = finished
-	if not Engine.is_editor_hint():
-		# Multiple choices
-		if waiting_for_answer:
-			$Options.visible = finished
-		else:
-			$Options.visible = false
-
-
-func _input(event: InputEvent) -> void:
-	if not Engine.is_editor_hint() and event.is_action_pressed(input_next) and not waiting:
-		if tween_node.is_active():
-			# Skip to end if key is pressed during the text animation
-			tween_node.seek(999)
-			finished = true
-		else:
-			if waiting_for_answer == false and waiting_for_input == false:
-				load_dialog()
-		if settings.has_section_key('dialog', 'propagate_input'):
-			var propagate_input: bool = settings.get_value('dialog', 'propagate_input')
-			if not propagate_input:
-				get_tree().set_input_as_handled()
-
-
-func show_dialog():
+func _show_dialog():
 	visible = true
 
 
@@ -295,7 +310,7 @@ func _on_Tween_tween_completed(object, key):
 	finished = true
 
 
-func update_name(character, color: Color = Color.white) -> void:
+func _update_name(character, color: Color = Color.white) -> void:
 	if character.has('name'):
 		var parsed_name = character['name']
 		if character.has('display_name'):
@@ -303,7 +318,7 @@ func update_name(character, color: Color = Color.white) -> void:
 				parsed_name = character['display_name']
 		if character.has('color'):
 			color = character['color']
-		parsed_name = parse_definitions(parsed_name, true, false)
+		parsed_name = _parse_definitions(parsed_name, true, false)
 		$TextBubble/NameLabel.visible = true
 		# Hack to reset the size
 		$TextBubble/NameLabel.rect_min_size = Vector2(0, 0)
@@ -316,19 +331,19 @@ func update_name(character, color: Color = Color.white) -> void:
 		$TextBubble/NameLabel.visible = false
 
 
-func update_text(text):
+func _update_text(text):
 	# Updating the text and starting the animation from 0
-	text = parse_alignment(text)
-	$TextBubble/RichTextLabel.bbcode_text = parse_definitions(text)
+	text = _parse_alignment(text)
+	$TextBubble/RichTextLabel.bbcode_text = _parse_definitions(text)
 	$TextBubble/RichTextLabel.percent_visible = 0
 
 	# The call to this function needs to be deferred.
 	# More info: https://github.com/godotengine/godot/issues/36381
-	call_deferred("start_text_tween")
+	call_deferred("_start_text_tween")
 	return true
 
 
-func start_text_tween():
+func _start_text_tween():
 	# This will start the animation that makes the text appear letter by letter
 	var tween_duration = text_speed * $TextBubble/RichTextLabel.get_total_character_count()
 	tween_node.interpolate_property(
@@ -338,96 +353,100 @@ func start_text_tween():
 	tween_node.start()
 
 
-func on_timeline_start():
+func _on_timeline_start():
 	if not Engine.is_editor_hint():
 		DialogicSingleton.save_definitions()
 		DialogicSingleton.set_current_timeline(current_timeline)
 	emit_signal("event_start", "timeline", current_timeline)
 
 
-func on_timeline_end():
+func _on_timeline_end():
 	if not Engine.is_editor_hint():
 		DialogicSingleton.save_definitions()
 		DialogicSingleton.set_current_timeline('')
 	emit_signal("event_end", "timeline")
 
 
-func load_dialog(skip_add = false):
+func _init_dialog():
+	dialog_index = 0
+	_load_event()
+
+
+func _load_event_at_index(index: int, current_runtime_id: String):
+	if current_runtime_id == runtime_id:
+		dialog_index = index
+		_load_event()
+
+
+func _load_next_event(current_runtime_id: String):
+	# The entire event reading system should be refactored... but not today!
+	if current_runtime_id == runtime_id:
+		dialog_index += 1
+		_load_event()
+
+
+func _load_event():
 	# Emitting signals
 	if dialog_script.has('events'):
 		if dialog_index == 0:
-			on_timeline_start()
+			_on_timeline_start()
 		elif dialog_index == dialog_script['events'].size():
-			on_timeline_end()
+			_on_timeline_end()
 
 	# Hiding definitions popup
 	definition_visible = false
 	$DefinitionInfo.visible = definition_visible
 
 	# This will load the next entry in the dialog_script array.
-	if dialog_script.has('events'):
-		if dialog_index < dialog_script['events'].size():
-			var func_state = event_handler(dialog_script['events'][dialog_index])
-			if (func_state is GDScriptFunctionState):
-				yield(func_state, "completed")
-		else:
-			if Engine.is_editor_hint() == false:
-				queue_free()
-	if skip_add == false:
-		dialog_index += 1
+	if dialog_script.has('events') and dialog_index < dialog_script['events'].size():
+		var func_state = _event_handler(dialog_script['events'][dialog_index])
+		if (func_state is GDScriptFunctionState):
+			yield(func_state, "completed")
+	else:
+		_close_dialog_event()
 
 
-func reset_dialog_extras():
-	$TextBubble/NameLabel.text = ''
-	$TextBubble/NameLabel.visible = false
-
-
-func get_character(character_id):
-	for c in characters:
-		if c['file'] == character_id:
-			return c
-	return {}
-
-
-func event_handler(event: Dictionary):
+func _event_handler(event: Dictionary):
 	# Handling an event and updating the available nodes accordingly.
-	reset_dialog_extras()
+	_reset_dialog_extras()
+	_reset_options()
 	
-	dprint('[D] Current Event: ', event)
+	var current_runtime_id = runtime_id
+	
+	_dprint('[D] Current Event: ', event)
 	match event:
 		{'text', 'character', 'portrait'}:
 			emit_signal("event_start", "text", event)
-			show_dialog()
+			_show_dialog()
 			finished = false
-			var character_data = get_character(event['character'])
-			update_name(character_data)
-			grab_portrait_focus(character_data, event)
-			update_text(event['text'])
+			var character_data = _get_character(event['character'])
+			_update_name(character_data)
+			_grab_portrait_focus(character_data, event)
+			_update_text(event['text'])
 		{'question', 'question_id', 'options', ..}:
 			emit_signal("event_start", "question", event)
-			show_dialog()
+			_show_dialog()
 			finished = false
 			waiting_for_answer = true
 			if event.has('name'):
-				update_name(event['name'])
-			update_text(event['question'])
+				_update_name(event['name'])
+			_update_text(event['question'])
 			if event.has('options'):
 				for o in event['options']:
-					add_choice_button(o)
+					_add_choice_button(o)
 		{'choice', 'question_id'}:
 			emit_signal("event_start", "choice", event)
 			for q in questions:
 				if q['question_id'] == event['question_id']:
 					if q['answered']:
 						# If the option is for an answered question, skip to the end of it.
-						dialog_index = q['end_id']
-						load_dialog(true)
+						_load_event_at_index(q['end_id'], current_runtime_id)
 		{'input', ..}:
 			emit_signal("event_start", "input", event)
-			show_dialog()
+			_show_dialog()
 			finished = false
 			waiting_for_input = true
-			update_text(event['input'])
+			_update_text(event['input'])
 			$TextInputDialog.window_title = event['window_title']
 			$TextInputDialog.popup_centered()
 			$TextInputDialog.connect("confirmed", self, "_on_input_set", [event['variable']])
@@ -435,31 +454,32 @@ func event_handler(event: Dictionary):
 			emit_signal("event_start", "action", event)
 			if event['action'] == 'leaveall':
 				if event['character'] == '[All]':
-					characters_leave_all()
+					_characters_leave_all()
 				else:
 					for p in $Portraits.get_children():
 						if p.character_data['file'] == event['character']:
 							p.fade_out()
 
-				go_to_next_event()
+				_load_next_event(current_runtime_id)
 			elif event['action'] == 'join':
 				if event['character'] == '':
-					go_to_next_event()
+					_load_next_event(current_runtime_id)
 				else:
-					var character_data = get_character(event['character'])
-					var exists = grab_portrait_focus(character_data)
+					var character_data = _get_character(event['character'])
+					var exists = _grab_portrait_focus(character_data)
 					if exists == false:
 						var p = Portrait.instance()
 						var char_portrait = event['portrait']
 						if char_portrait == '':
 							char_portrait = 'Default'
 						p.character_data = character_data
-						p.init(char_portrait, get_character_position(event['position']))
+						p.init(char_portrait, _get_character_position(event['position']))
 						$Portraits.add_child(p)
 						p.fade_in()
-				go_to_next_event()
+				_load_next_event(current_runtime_id)
 		{'scene'}:
 			get_tree().change_scene(event['scene'])
+			_load_next_event(current_runtime_id)
 		{'background'}:
 			emit_signal("event_start", "background", event)
 			$Background.visible = true
@@ -475,7 +495,7 @@ func event_handler(event: Dictionary):
 					$Background.add_child(bg_scene)
 			elif (event['background'] != ''):
 				$Background.texture = load(event['background'])
-			go_to_next_event()
+			_load_next_event(current_runtime_id)
 		{'audio'}, {'audio', 'file'}:
 			emit_signal("event_start", "audio", event)
 			if event['audio'] == 'play' and 'file' in event.keys() and not event['file'].empty():
@@ -483,39 +503,39 @@ func event_handler(event: Dictionary):
 				$FX/AudioStreamPlayer.play()
 			else:
 				$FX/AudioStreamPlayer.stop()
-			go_to_next_event()
+			_load_next_event(current_runtime_id)
 		{'background-music'}, {'background-music', 'file'}:
 			emit_signal("event_start", "background-music", event)
 			if event['background-music'] == 'play' and 'file' in event.keys() and not event['file'].empty():
 				$FX/BackgroundMusic.crossfade_to(event['file'])
 			else:
 				$FX/BackgroundMusic.fade_out()
-			go_to_next_event()
+			_load_next_event(current_runtime_id)
 		{'endbranch', ..}:
 			emit_signal("event_start", "endbranch", event)
-			go_to_next_event()
+			_load_next_event(current_runtime_id)
 		{'change_scene'}:
 			get_tree().change_scene(event['change_scene'])
+			_load_next_event(current_runtime_id)
 		{'emit_signal', ..}:
-			dprint('[!] Emitting signal: dialogic_signal(', event['emit_signal'], ')')
+			_dprint('[!] Emitting signal: dialogic_signal(', event['emit_signal'], ')')
 			emit_signal("dialogic_signal", event['emit_signal'])
-			go_to_next_event()
+			_load_next_event(current_runtime_id)
 		{'close_dialog'}:
 			emit_signal("event_start", "close_dialog", event)
-			close_dialog_event()
+			_close_dialog_event()
 		{'set_theme'}:
 			emit_signal("event_start", "set_theme", event)
 			if event['set_theme'] != '':
-				current_theme = load_theme(event['set_theme'])
-			go_to_next_event()
+				current_theme = _load_theme(event['set_theme'])
+			_load_next_event(current_runtime_id)
 		{'wait_seconds'}:
 			emit_signal("event_start", "wait", event)
-			wait_seconds(event['wait_seconds'])
+			_wait_seconds(event['wait_seconds'])
 			waiting = true
 		{'change_timeline'}:
-			dialog_script = set_current_dialog(event['change_timeline'])
-			dialog_index = -1
-			go_to_next_event()
+			dialog_script = _set_current_dialog(event['change_timeline'])
+			_init_dialog()
 		{'condition', 'definition', 'value', 'question_id', ..}:
 			# Treating this conditional as an option on a regular question event
 			var def_value = null
@@ -530,20 +550,19 @@ func event_handler(event: Dictionary):
 			current_question['answered'] = !condition_met
 			if !condition_met:
 				# condition not met, skipping branch
-				dialog_index = current_question['end_id']
-				load_dialog(true)
+				_load_event_at_index(current_question['end_id'], current_runtime_id)
 			else:
 				# condition met, entering branch
-				go_to_next_event()
+				_load_next_event(current_runtime_id)
 		{'set_value', 'definition', ..}:
 			emit_signal("event_start", "set_value", event)
 			var operation = '='
 			if 'operation' in event and not event['operation'].empty():
 				operation = event["operation"]
 			DialogicSingleton.set_variable_from_id(event['definition'], event['set_value'], operation)
-			go_to_next_event()
+			_load_next_event(current_runtime_id)
 		{'call_node', ..}:
-			dprint('[!] Call Node signal: dialogic_signal(call_node) ', var2str(event['call_node']))
+			_dprint('[!] Call Node signal: dialogic_signal(call_node) ', var2str(event['call_node']))
 			emit_signal("event_start", "call_node", event)
 			$TextBubble.visible = false
 			waiting = true
@@ -566,10 +585,22 @@ func event_handler(event: Dictionary):
 
 			waiting = false
 			$TextBubble.visible = true
-			go_to_next_event()
+			_load_next_event(current_runtime_id)
 		_:
 			visible = false
-			dprint('Other event. ', event)
+			_dprint('Other event. ', event)
+	$Options.visible = waiting_for_answer
+
+func _reset_dialog_extras():
+	$TextBubble/NameLabel.text = ''
+	$TextBubble/NameLabel.visible = false
+
+
+func _get_character(character_id):
+	for c in characters:
+		if c['file'] == character_id:
+			return c
+	return {}
 
 
 func _on_input_set(variable):
@@ -582,58 +613,67 @@ func _on_input_set(variable):
 		$TextInputDialog/LineEdit.text = ''
 		$TextInputDialog.disconnect("confirmed", self, '_on_input_set')
 		$TextInputDialog.visible = false
-		load_dialog()
-		dprint('[!] Input selected: ', input_value)
-		dprint('[!] dialog variables: ', dialog_resource.custom_variables)
+		_load_next_event(runtime_id)
+		_dprint('[!] Input selected: ', input_value)
+		_dprint('[!] dialog variables: ', dialog_resource.custom_variables)
 
 
-func reset_options():
+func _reset_options():
 	# Clearing out the options after one was selected.
 	for option in $Options.get_children():
 		option.queue_free()
 
 
-func add_choice_button(option):
+func _add_choice_button(option):
 	var theme = current_theme
 
 	var button = ChoiceButton.instance()
 	button.text = option['label']
 	# Text
-	button.set('custom_fonts/font', load(theme.get_value('text', 'font', "res://addons/dialogic/Fonts/DefaultFont.tres")))
+	button.set('custom_fonts/font', DialogicUtil.path_fixer_load(theme.get_value('text', 'font', "res://addons/dialogic/Example Assets/Fonts/DefaultFont.tres")))
 
-	var text_color = Color(theme.get_value('text', 'color', "#ffffffff"))
-	button.set('custom_colors/font_color', text_color)
-	button.set('custom_colors/font_color_hover', text_color)
-	button.set('custom_colors/font_color_pressed', text_color)
+	if not theme.get_value('buttons', 'use_native', false):
+		var text_color = Color(theme.get_value('text', 'color', "#ffffffff"))
+		button.set('custom_colors/font_color', text_color)
+		button.set('custom_colors/font_color_hover', text_color)
+		button.set('custom_colors/font_color_pressed', text_color)
 
-	if theme.get_value('buttons', 'text_color_enabled', true):
-		var button_text_color = Color(theme.get_value('buttons', 'text_color', "#ffffffff"))
-		button.set('custom_colors/font_color', button_text_color)
-		button.set('custom_colors/font_color_hover', button_text_color)
-		button.set('custom_colors/font_color_pressed', button_text_color)
+		if theme.get_value('buttons', 'text_color_enabled', true):
+			var button_text_color = Color(theme.get_value('buttons', 'text_color', "#ffffffff"))
+			button.set('custom_colors/font_color', button_text_color)
+			button.set('custom_colors/font_color_hover', button_text_color)
+			button.set('custom_colors/font_color_pressed', button_text_color)
 
-	# Background
-	button.get_node('ColorRect').color = Color(theme.get_value('buttons', 'background_color', '#ff000000'))
-	button.get_node('ColorRect').visible = theme.get_value('buttons', 'use_background_color', false)
+		# Background
+		button.get_node('ColorRect').color = Color(theme.get_value('buttons', 'background_color', '#ff000000'))
+		button.get_node('ColorRect').visible = theme.get_value('buttons', 'use_background_color', false)
 
-	button.get_node('TextureRect').visible = theme.get_value('buttons', 'use_image', true)
-	if theme.get_value('buttons', 'use_image', true):
-		button.get_node('TextureRect').texture = load(theme.get_value('buttons', 'image', "res://addons/dialogic/Images/background/background-2.png"))
+		button.get_node('TextureRect').visible = theme.get_value('buttons', 'use_image', true)
+		if theme.get_value('buttons', 'use_image', true):
+			button.get_node('TextureRect').texture = DialogicUtil.path_fixer_load(theme.get_value('buttons', 'image', "res://addons/dialogic/Example Assets/backgrounds/background-2.png"))
+			if theme.get_value('buttons', 'modulation', false):
+				button.get_node('TextureRect').modulate = Color(theme.get_value('buttons', 'modulation_color', "#ffffffff"))
 
-	var padding = theme.get_value('buttons', 'padding', Vector2(5,5))
-	button.get_node('ColorRect').set('margin_left', -1 * padding.x)
-	button.get_node('ColorRect').set('margin_right',  padding.x)
-	button.get_node('ColorRect').set('margin_top', -1 * padding.y)
-	button.get_node('ColorRect').set('margin_bottom', padding.y)
+		var padding = theme.get_value('buttons', 'padding', Vector2(5,5))
+		button.get_node('ColorRect').set('margin_left', -1 * padding.x)
+		button.get_node('ColorRect').set('margin_right',  padding.x)
+		button.get_node('ColorRect').set('margin_top', -1 * padding.y)
+		button.get_node('ColorRect').set('margin_bottom', padding.y)
 
-	button.get_node('TextureRect').set('margin_left', -1 * padding.x)
-	button.get_node('TextureRect').set('margin_right',  padding.x)
-	button.get_node('TextureRect').set('margin_top', -1 * padding.y)
-	button.get_node('TextureRect').set('margin_bottom', padding.y)
+		button.get_node('TextureRect').set('margin_left', -1 * padding.x)
+		button.get_node('TextureRect').set('margin_right',  padding.x)
+		button.get_node('TextureRect').set('margin_top', -1 * padding.y)
+		button.get_node('TextureRect').set('margin_bottom', padding.y)
+		
+		$Options.set('custom_constants/separation', theme.get_value('buttons', 'gap', 20) + (padding.y*2))
+	else:
+		button.get_node('ColorRect').visible = false
+		button.get_node('TextureRect').visible = false
+		button.set_flat(false)
+		
+		$Options.set('custom_constants/separation', theme.get_value('buttons', 'gap', 20))
 
-	$Options.set('custom_constants/separation', theme.get_value('buttons', 'gap', 20) + (padding.y*2))
-
-	button.connect("pressed", self, "answer_question", [button, option['event_id'], option['question_id']])
+	button.connect("pressed", self, "_answer_question", [button, option['event_id'], option['question_id']])
 
 	$Options.add_child(button)
 
@@ -642,15 +682,15 @@ func add_choice_button(option):
 		Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) # Make sure the cursor is visible for the options selection
 
 
-func answer_question(i, event_id, question_id):
-	dprint('[!] Going to ', event_id + 1, i, 'question_id:', question_id)
-	dprint('')
+func _answer_question(i, event_id, question_id):
+	_dprint('[!] Going to ', event_id + 1, i, 'question_id:', question_id)
+	_dprint('')
 	waiting_for_answer = false
-	dialog_index = event_id + 1
+	dialog_index = event_id
 	questions[question_id]['answered'] = true
-	dprint('    dialog_index = ', dialog_index)
-	reset_options()
-	load_dialog()
+	_dprint('    dialog_index = ', dialog_index)
+	_reset_options()
+	_load_next_event(runtime_id)
 	if last_mouse_mode != null:
 		Input.set_mouse_mode(last_mouse_mode) # Revert to last mouse mode when selection is done
 		last_mouse_mode = null
@@ -659,22 +699,16 @@ func answer_question(i, event_id, question_id):
 func _on_option_selected(option, variable, value):
 	dialog_resource.custom_variables[variable] = value
 	waiting_for_answer = false
-	reset_options()
-	load_dialog()
-	dprint('[!] Option selected: ', option.text, ' value= ' , value)
+	_reset_options()
+	_load_next_event(runtime_id)
+	_dprint('[!] Option selected: ', option.text, ' value= ' , value)
 
 
 func _on_TextInputDialog_confirmed():
 	pass # Replace with function body.
 
 
-func go_to_next_event():
-	# The entire event reading system should be refactored... but not today!
-	dialog_index += 1
-	load_dialog(true)
-
-
-func grab_portrait_focus(character_data, event: Dictionary = {}) -> bool:
+func _grab_portrait_focus(character_data, event: Dictionary = {}) -> bool:
 	var exists = false
 	var visually_focus = true
 	if settings.has_section_key('dialog', 'dim_characters'):
@@ -695,7 +729,7 @@ func grab_portrait_focus(character_data, event: Dictionary = {}) -> bool:
 	return exists
 
 
-func get_character_position(positions) -> String:
+func _get_character_position(positions) -> String:
 	if positions['0']:
 		return 'left'
 	if positions['1']:
@@ -709,21 +743,21 @@ func get_character_position(positions) -> String:
 	return 'left'
 
 
-func deferred_resize(current_size, result):
+func _deferred_resize(current_size, result):
 	#var result = theme.get_value('box', 'size', Vector2(910, 167))
 	$TextBubble.rect_size = result
 	if current_size != $TextBubble.rect_size:
-		resize_main()
+		_resize_main()
 
 
-func load_theme(filename):
+func _load_theme(filename):
 	var theme = DialogicResources.get_theme_config(filename)
 
 	# Box size
-	call_deferred('deferred_resize', $TextBubble.rect_size, theme.get_value('box', 'size', Vector2(910, 167)))
+	call_deferred('_deferred_resize', $TextBubble.rect_size, theme.get_value('box', 'size', Vector2(910, 167)))
 
 	# Text
-	var theme_font = load(theme.get_value('text', 'font', 'res://addons/dialogic/Fonts/DefaultFont.tres'))
+	var theme_font = DialogicUtil.path_fixer_load(theme.get_value('text', 'font', 'res://addons/dialogic/Example Assets/Fonts/DefaultFont.tres'))
 	$TextBubble/RichTextLabel.set('custom_fonts/normal_font', theme_font)
 	$TextBubble/NameLabel.set('custom_fonts/font', theme_font)
 
@@ -754,7 +788,7 @@ func load_theme(filename):
 	$TextBubble/RichTextLabel.set('margin_bottom', text_margin.y * -1)
 
 	# Backgrounds
-	$TextBubble/TextureRect.texture = load(theme.get_value('background','image', "res://addons/dialogic/Images/background/background-2.png"))
+	$TextBubble/TextureRect.texture = DialogicUtil.path_fixer_load(theme.get_value('background','image', "res://addons/dialogic/Example Assets/backgrounds/background-2.png"))
 	$TextBubble/ColorRect.color = Color(theme.get_value('background','color', "#ff000000"))
 
 	if theme.get_value('background', 'modulation', false) == true:
@@ -766,11 +800,11 @@ func load_theme(filename):
 	$TextBubble/TextureRect.visible = theme.get_value('background', 'use_image', true)
 
 	# Next image
-	$TextBubble/NextIndicator.texture = load(theme.get_value('next_indicator', 'image', 'res://addons/dialogic/Images/next-indicator.png'))
+	$TextBubble/NextIndicator.texture = DialogicUtil.path_fixer_load(theme.get_value('next_indicator', 'image', 'res://addons/dialogic/Example Assets/next-indicator/next-indicator.png'))
 	input_next = theme.get_value('settings', 'action_key', 'ui_accept')
 
 	# Definitions
-	var definitions_font = load(theme.get_value('definitions', 'font', 'res://addons/dialogic/Fonts/GlossaryFont.tres'))
+	var definitions_font = DialogicUtil.path_fixer_load(theme.get_value('definitions', 'font', "res://addons/dialogic/Example Assets/Fonts/GlossaryFont.tres"))
 	$DefinitionInfo/VBoxContainer/Title.set('custom_fonts/normal_font', definitions_font)
 	$DefinitionInfo/VBoxContainer/Content.set('custom_fonts/normal_font', definitions_font)
 	$DefinitionInfo/VBoxContainer/Extra.set('custom_fonts/normal_font', definitions_font)
@@ -779,14 +813,17 @@ func load_theme(filename):
 	$TextBubble/NameLabel/ColorRect.visible = theme.get_value('name', 'background_visible', false)
 	$TextBubble/NameLabel/ColorRect.color = Color(theme.get_value('name', 'background', '#282828'))
 	$TextBubble/NameLabel/TextureRect.visible = theme.get_value('name', 'image_visible', false)
-	$TextBubble/NameLabel/TextureRect.texture = load(theme.get_value('name','image', "res://addons/dialogic/Images/background/background-2.png"))
+	$TextBubble/NameLabel/TextureRect.texture = DialogicUtil.path_fixer_load(theme.get_value('name','image', "res://addons/dialogic/Example Assets/backgrounds/background-2.png"))
 	var name_shadow_offset = theme.get_value('name', 'shadow_offset', Vector2(2,2))
 	if theme.get_value('name', 'shadow_visible', true):
 		$TextBubble/NameLabel.set('custom_colors/font_color_shadow', Color(theme.get_value('name', 'shadow', '#9e000000')))
 		$TextBubble/NameLabel.set('custom_constants/shadow_offset_x', name_shadow_offset.x)
 		$TextBubble/NameLabel.set('custom_constants/shadow_offset_y', name_shadow_offset.y)
 	$TextBubble/NameLabel.rect_position.y = theme.get_value('name', 'bottom_gap', 48) * -1
-	
+	if theme.get_value('name', 'modulation', false) == true:
+		$TextBubble/NameLabel/TextureRect.modulate = Color(theme.get_value('name', 'modulation_color', '#ffffffff'))
+	else:
+		$TextBubble/NameLabel/TextureRect.modulate = Color('#ffffffff')
 	
 	# Setting next indicator animation
 	$TextBubble/NextIndicator.self_modulate = Color('#ffffff')
@@ -808,7 +845,7 @@ func _on_RichTextLabel_meta_hover_started(meta):
 				'color': current_theme.get_value('definitions', 'color', '#ffbebebe'),
 			})
 			correct_type = true
-			dprint(d)
+			_dprint(d)
 
 	if correct_type:
 		definition_visible = true
@@ -829,7 +866,7 @@ func _on_Definition_Timer_timeout():
 	$DefinitionInfo.visible = definition_visible
 
 
-func wait_seconds(seconds):
+func _wait_seconds(seconds):
 	$WaitSeconds.start(seconds)
 	$TextBubble.visible = false
 
@@ -839,10 +876,10 @@ func _on_WaitSeconds_timeout():
 	waiting = false
 	$WaitSeconds.stop()
 	$TextBubble.visible = true
-	load_dialog()
+	_load_next_event(runtime_id)
 
 
-func dprint(string, arg1='', arg2='', arg3='', arg4='' ):
+func _dprint(string, arg1='', arg2='', arg3='', arg4='' ):
 	# HAHAHA if you are here wondering what this is...
 	# I ask myself the same question :')
 	if debug_mode:
@@ -878,25 +915,79 @@ func _compare_definitions(def_value: String, event_value: String, condition: Str
 	return condition_met
 
 
-func characters_leave_all():
+func _characters_leave_all():
 	for p in $Portraits.get_children():
 		p.fade_out()
 
 
-func close_dialog_event():
-	var tween = Tween.new()
-	add_child(tween)
+func _close_dialog_event():
+	var tween = $TextBubble/CloseDialog/Tween
 	tween.interpolate_property($TextBubble, "modulate",
 		$TextBubble.modulate, Color('#00ffffff'), 1,
 		Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
 	tween.start()
-	var close_dialog_timer = Timer.new()
-	close_dialog_timer.connect("timeout", self, '_on_close_dialog_timeout')
-	add_child(close_dialog_timer)
-	close_dialog_timer.start(2)
-	characters_leave_all()
+	$TextBubble/CloseDialog/Timer.start(2)
+	_characters_leave_all()
 
 
-func _on_close_dialog_timeout():
-	on_timeline_end()
-	queue_free()
+func _stop_close_dialog():
+	$TextBubble.modulate = Color('#ffffffff')
+	$TextBubble/CloseDialog/Tween.stop_all()
+	$TextBubble/CloseDialog/Timer.stop()
+
+
+func _on_close_dialog_timeout(tween, close_dialog_timer):
+	hide()
+	_on_timeline_end()
+
+
+## *****************************************************************************
+##								OVERRIDES
+## *****************************************************************************
+
+
+func _ready():
+	# Loading the config files
+	_load_config_files()
+	
+	# Connecting resize signal
+	get_viewport().connect("size_changed", self, "_resize_main")
+	_resize_main()
+
+	# Setting everything up for the node to be default
+	$TextBubble/NameLabel.text = ''
+	$Background.visible = false
+	$TextBubble/RichTextLabel.meta_underlined = false
+	$DefinitionInfo.visible = false
+	
+	$TextBubble/CloseDialog/Timer.connect("timeout", self, '_on_close_dialog_timeout')
+	tween_node.connect("tween_completed", self, '_on_Tween_tween_completed')
+
+	# Getting the character information
+	characters = DialogicUtil.get_character_list()
+
+	# Try to start the timeline only if specified
+	if not timeline.empty():
+		start(timeline)
+
+
+func _process(delta):
+	$TextBubble/NextIndicator.visible = finished
+	if waiting_for_answer and Input.is_action_just_released(input_next):
+		if $Options.get_child_count() > 0:
+			$Options.get_child(0).grab_focus()
+
+
+func _input(event: InputEvent) -> void:
+	if not Engine.is_editor_hint() and event.is_action_pressed(input_next) and not waiting:
+		if tween_node.is_active():
+			# Skip to end if key is pressed during the text animation
+			tween_node.seek(999)
+			finished = true
+		else:
+			if waiting_for_answer == false and waiting_for_input == false:
+				_load_next_event(runtime_id)
+		if settings.has_section_key('dialog', 'propagate_input'):
+			var propagate_input: bool = settings.get_value('dialog', 'propagate_input')
+			if not propagate_input:
+				get_tree().set_input_as_handled()
diff --git a/addons/dialogic/Other/DialogicClass.gd b/addons/dialogic/Other/DialogicClass.gd
index fd7827d..fa77991 100644
--- a/addons/dialogic/Other/DialogicClass.gd
+++ b/addons/dialogic/Other/DialogicClass.gd
@@ -12,51 +12,50 @@ extends Node
 class_name Dialogic
 
 
-## Starts the dialog for the given timeline and returns a Dialog node.
-## You must then add it manually to the scene to display the dialog.
+## Adds the dialogic node as a child of the given node
+## The parent node must be of type control
+## To start the timeline, use the start method from the returned node
 ##
-## Example:
-## var new_dialog = Dialogic.start('Your Timeline Name Here')
-## add_child(new_dialog)
-##
-## This is exactly the same as using the editor:
-## you can drag and drop the scene located at /addons/dialogic/Dialog.tscn 
-## and set the current timeline via the inspector.
-##
-## @param timeline				The timeline to load. You can provide the timeline name or the filename.
-## @param reset_saves			True to reset dialogic saved data such as definitions.
+## @param parent				The parent to add the dialogic node to.
 ## @param dialog_scene_path		If you made a custom Dialog scene or moved it from its default path, you can specify its new path here.
-## @param debug_mode			Debug is disabled by default but can be enabled if needed.
-## @returns						A Dialog node to be added into the scene tree.
-static func start(timeline: String, reset_saves: bool=true, dialog_scene_path: String="res://addons/dialogic/Dialog.tscn", debug_mode: bool=false):
+## @returns						The Dialog node or null if the parent was invalid.
+static func add_as_child_of(parent: Node, dialog_scene_path: String="res://addons/dialogic/Dialog.tscn") -> DialogicNode:
+	if parent is Control:
+		var dialog_node = get_instance(dialog_scene_path)
+		parent.add_child(dialog_node)
+		return dialog_node
+	else:
+		printerr("[Dialogic] Node's parent should be a Control")
+		return null
 
-	var dialog:  = load(dialog_scene_path)
-	var d = dialog.instance()
-	d.reset_saves = reset_saves
-	d.debug_mode = debug_mode
-	if not timeline.empty():
-		for t in DialogicUtil.get_timeline_list():
-			if t['name'] == timeline or t['file'] == timeline:
-				d.timeline = t['file']
-				return d
-		d.dialog_script = {
-			"events":[{"character":"","portrait":"",
-			"text":"[Dialogic Error] Loading dialog [color=red]" + timeline + "[/color]. It seems like the timeline doesn't exists. Maybe the name is wrong?"}]
-		}
-	return d
-
-
-## Same as the start method above, but using the last timeline saved.
-## 
-## @param initial_timeline		The timeline to load in case no save is found.
+## Adds the dialogic node as a child of the given node, and below the given node
+## The parent node must be of type control
+## To start the timeline, use the start method from the returned node
+##
+## @param parent				The parent to add the dialogic node to.
+## @param node					The node to add dialogic below.
+## @param dialog_scene_path		If you made a custom Dialog scene or moved it from its default path, you can specify its new path here.
+## @returns						The Dialog node or null if the parent was invalid.
+static func add_as_child_of_below_node(parent: Node, node: Node, dialog_scene_path: String="res://addons/dialogic/Dialog.tscn") -> DialogicNode:
+	if parent is Control:
+		var dialog_node = get_instance(dialog_scene_path)
+		parent.add_child_below_node(node, dialog_node)
+		return dialog_node
+	else:
+		printerr("[Dialogic] Node's parent should be a Control")
+		return null
+
+
+## Gets a DialogicNode instance to be added to the tree
+## This instance can then be added to the tree using add_child()
+## To start the timeline, use the start method from the returned node
+##
 ## @param dialog_scene_path		If you made a custom Dialog scene or moved it from its default path, you can specify its new path here.
-## @param debug_mode			Debug is disabled by default but can be enabled if needed.
 ## @returns						A Dialog node to be added into the scene tree.
-static func start_from_save(initial_timeline: String, dialog_scene_path: String="res://addons/dialogic/Dialog.tscn", debug_mode: bool=false):
-	var current := get_current_timeline()
-	if current.empty():
-		current = initial_timeline
-	return start(current, false, dialog_scene_path, debug_mode)
+static func get_instance(dialog_scene_path: String="res://addons/dialogic/Dialog.tscn") -> DialogicNode:
+	var dialog : = load(dialog_scene_path)
+	return dialog.instance()
+
 
 ## Gets default values for definitions.
 ## 
@@ -76,12 +75,12 @@ static func get_definitions() -> Dictionary:
 ## Definitions are automatically saved on timeline start/end
 ## 
 ## @returns						Error status, OK if all went well
-func save_definitions():
+static func save_definitions():
 	return DialogicSingleton.save_definitions()
 
 
 ## Resets data to default values. This is the same as calling start with reset_saves to true
-func reset_saves():
+static func reset_saves():
 	DialogicSingleton.init(true)
 
 
@@ -135,3 +134,63 @@ static func set_glossary(name: String, title: String, text: String, extra: Strin
 ## @returns						The current timeline filename, or an empty string if none was saved.
 static func get_current_timeline() -> String:
 	return DialogicSingleton.get_current_timeline()
+
+
+## ************************************************************
+## 					DEPRECATED FUNCTIONS
+##		These functions will be removed in future versions
+##					Use at your own risk
+## ************************************************************
+
+
+## /!\ DEPRECATED /!\
+## Use get_instance() instead
+##
+## Starts the dialog for the given timeline and returns a Dialog node.
+## You must then add it manually to the scene to display the dialog.
+##
+## Example:
+## var new_dialog = Dialogic.start('Your Timeline Name Here')
+## add_child(new_dialog)
+##
+## This is exactly the same as using the editor:
+## you can drag and drop the scene located at /addons/dialogic/Dialog.tscn 
+## and set the current timeline via the inspector.
+##
+## @param timeline				The timeline to load. You can provide the timeline name or the filename.
+## @param reset_saves			True to reset dialogic saved data such as definitions.
+## @param dialog_scene_path		If you made a custom Dialog scene or moved it from its default path, you can specify its new path here.
+## @param debug_mode			Debug is disabled by default but can be enabled if needed.
+## @returns						A Dialog node to be added into the scene tree.
+static func start(timeline: String, reset_saves: bool=true, dialog_scene_path: String="res://addons/dialogic/Dialog.tscn", debug_mode: bool=false) -> DialogicNode:
+
+	var dialog:  = load(dialog_scene_path)
+	var d = dialog.instance()
+	d.reset_saves = reset_saves
+	d.debug_mode = debug_mode
+	if not timeline.empty():
+		for t in DialogicUtil.get_timeline_list():
+			if t['name'] == timeline or t['file'] == timeline:
+				d.timeline = t['file']
+				return d
+		d.dialog_script = {
+			"events":[{"character":"","portrait":"",
+			"text":"[Dialogic Error] Loading dialog [color=red]" + timeline + "[/color]. It seems like the timeline doesn't exists. Maybe the name is wrong?"}]
+		}
+	return d
+
+
+## /!\ DEPRECATED /!\
+## Use get_instance() instead
+##
+## Same as the start method above, but using the last timeline saved.
+## 
+## @param initial_timeline		The timeline to load in case no save is found.
+## @param dialog_scene_path		If you made a custom Dialog scene or moved it from its default path, you can specify its new path here.
+## @param debug_mode			Debug is disabled by default but can be enabled if needed.
+## @returns						A Dialog node to be added into the scene tree.
+static func start_from_save(initial_timeline: String, dialog_scene_path: String="res://addons/dialogic/Dialog.tscn", debug_mode: bool=false) -> DialogicNode:
+	var current := get_current_timeline()
+	if current.empty():
+		current = initial_timeline
+	return start(current, false, dialog_scene_path, debug_mode)
diff --git a/addons/dialogic/Other/DialogicUtil.gd b/addons/dialogic/Other/DialogicUtil.gd
index 26680df..3999d0d 100644
--- a/addons/dialogic/Other/DialogicUtil.gd
+++ b/addons/dialogic/Other/DialogicUtil.gd
@@ -108,6 +108,30 @@ static func compare_dicts(dict_1: Dictionary, dict_2: Dictionary) -> bool:
 	return false
 
 
+static func path_fixer_load(path):
+	# This function was added because some of the default assets shipped with
+	# Dialogic 1.0 were moved for version 1.1. If by any chance they still
+	# Use those resources, we redirect the paths from the old place to the new
+	# ones. This can be safely removed and replace all instances of 
+	# DialogicUtil.path_fixer_load(x) with just load(x) on version 2.0
+	# since we will break compatibility.
+	
+	match path:
+		'res://addons/dialogic/Fonts/DefaultFont.tres':
+			return load("res://addons/dialogic/Example Assets/Fonts/DefaultFont.tres")
+		'res://addons/dialogic/Fonts/GlossaryFont.tres':
+			return load('res://addons/dialogic/Example Assets/Fonts/GlossaryFont.tres')
+		'res://addons/dialogic/Images/background/background-1.png':
+			return load('res://addons/dialogic/Example Assets/backgrounds/background-1.png')
+		'res://addons/dialogic/Images/background/background-2.png':
+			return load('res://addons/dialogic/Example Assets/backgrounds/background-2.png')
+		'res://addons/dialogic/Images/next-indicator.png':
+			return load('res://addons/dialogic/Example Assets/next-indicator/next-indicator.png')
+
+	return load(path)
+
+
+
 class DialgicSorter:
 
 	static func key_available(key, a: Dictionary) -> bool:
diff --git a/dialogic/themes/theme-1616657657.cfg b/dialogic/themes/theme-1616657657.cfg
index a15581d..742067e 100644
--- a/dialogic/themes/theme-1616657657.cfg
+++ b/dialogic/themes/theme-1616657657.cfg
@@ -7,6 +7,7 @@ name="theme_normal"
 use_background_color=false
 background_color="#ff3c7c11"
 text_color="#ff30c3f0"
+use_native=true
 
 [box]
 
@@ -16,6 +17,7 @@ size=Vector2( 1800, 200 )
 
 margin=Vector2( 40, 20 )
 alignment="Left"
+shadow=false
 
 [definitions]
 
@@ -26,3 +28,4 @@ color="#ffffffff"
 image_visible=true
 auto_color=true
 shadow_visible=true
+modulation=false
diff --git a/dialogic/timelines/timeline-1616659306.json b/dialogic/timelines/timeline-1616659306.json
index 73db1f1..b6ac879 100644
--- a/dialogic/timelines/timeline-1616659306.json
+++ b/dialogic/timelines/timeline-1616659306.json
@@ -1 +1 @@
-{"events":[{"change_timeline":"timeline-1617871263.json"}],"metadata":{"dialogic-version":"1.1","file":"timeline-1616659306.json","name":"_start"}}
+{"events":[{"change_timeline":"timeline-1616656510.json"}],"metadata":{"dialogic-version":"1.1","file":"timeline-1616659306.json","name":"_start"}}
diff --git a/dialogic/timelines/timeline-1616661658.json b/dialogic/timelines/timeline-1616661658.json
index 9d084d7..4837366 100644
--- a/dialogic/timelines/timeline-1616661658.json
+++ b/dialogic/timelines/timeline-1616661658.json
@@ -1 +1 @@
-{"events":[{"background":"res://backgrounds/meetingRoom.jpg"},{"action":"join","character":"character-1616658403.json","portrait":"","position":{"0":false,"1":true,"2":false,"3":false,"4":false}},{"character":"character-1616658403.json","portrait":"","text":"On peut discuter une minute ?"},{"character":"character-1616658355.json","portrait":"","text":"Euh oui pas de soucis qu’est ce qu’il se passe ?"},{"character":"character-1616658403.json","portrait":"","text":"Je viens d’apprendre que ton projet vient d’être validé mais que c’est le projet de développer un téléphone que l’utilisateur peut ouvrir !\nTu as une idée des répercussions sur l’entreprise que cela va avoir ?\nL’entreprise va perdre beaucoup d’argent à laisser la possibilité aux gens de réparer leurs téléphones en leur laissant l’accès aux composants !\nEt toutes les idées dont je t’avais parlé de technologies innovantes et de designs incroyables sont réduits à néant !\nFranchement je ne sais pas ce qui t’es passé par la tête mais ça me laisse sans voix …\nSur ce je n’ai plus rien à dire au revoir."},{"background":""},{"action":"join","character":"character-1616658373.json","portrait":"","position":{"0":false,"1":false,"2":false,"3":true,"4":false}},{"character":"character-1616658373.json","portrait":"","text":"Re-bonjour ! Quelle belle journée aujourd’hui !\nJ’ai appris que tu avais repris mon idée de pouvoir ouvrir le téléphone dans ton projet de développement.\nC’est une sage décision qui va engendrer tellement de choses positives pour l’entreprise.\nC’est le début d’une nouvelle ère technologique responsable, crois moi !\nOui au recyclage et oui à la seconde vie des appareils !"},{"character":"character-1616658355.json","portrait":"","text":"Je suis content que ce projet provoque un tel enthousiasme en toi !"},{"action":"join","character":"character-1616658435.json","portrait":"","position":{"0":true,"1":false,"2":false,"3":false,"4":false}},{"character":"character-1616658435.json","portrait":"","text":"Il se passe quoi ici ?"},{"character":"character-1616658355.json","portrait":"","text":"Tu n'as pas vu mon mail ?"},{"character":"character-1616658435.json","portrait":"","text":"Ah non.."},{"wait_seconds":1},{"character":"character-1616658435.json","portrait":"","text":"J'ai perdu mon mot de passe\n...\n..."},{"wait_seconds":1},{"action":"leaveall","character":"character-1616658435.json"},{"character":"character-1616658373.json","portrait":"","text":"...\nBon\nEn tout cas je suis ravie de ton choix !\nJe te laisse j’ai une réunion dans 10 min à bientôt !"},{"action":"leaveall","character":"[All]"},{"change_timeline":"timeline-1616662258.json"}],"metadata":{"dialogic-version":"1.1","file":"timeline-1616661658.json","name":"conseq-tel-ouvert-1"}}
+{"events":[{"background":"res://backgrounds/meetingRoom.jpg"},{"action":"join","character":"character-1616658403.json","portrait":"","position":{"0":false,"1":true,"2":false,"3":false,"4":false}},{"character":"","portrait":"","text":"Test"},{"character":"character-1616658403.json","portrait":"","text":"On peut discuter une minute ?"},{"character":"character-1616658355.json","portrait":"","text":"Euh oui pas de soucis qu’est ce qu’il se passe ?"},{"character":"character-1616658403.json","portrait":"","text":"Je viens d’apprendre que ton projet vient d’être validé mais que c’est le projet de développer un téléphone que l’utilisateur peut ouvrir !\nTu as une idée des répercussions sur l’entreprise que cela va avoir ?\nL’entreprise va perdre beaucoup d’argent à laisser la possibilité aux gens de réparer leurs téléphones en leur laissant l’accès aux composants !\nEt toutes les idées dont je t’avais parlé de technologies innovantes et de designs incroyables sont réduits à néant !\nFranchement je ne sais pas ce qui t’es passé par la tête mais ça me laisse sans voix …\nSur ce je n’ai plus rien à dire au revoir."},{"background":""},{"action":"join","character":"character-1616658373.json","portrait":"","position":{"0":false,"1":false,"2":false,"3":true,"4":false}},{"character":"character-1616658373.json","portrait":"","text":"Re-bonjour ! Quelle belle journée aujourd’hui !\nJ’ai appris que tu avais repris mon idée de pouvoir ouvrir le téléphone dans ton projet de développement.\nC’est une sage décision qui va engendrer tellement de choses positives pour l’entreprise.\nC’est le début d’une nouvelle ère technologique responsable, crois moi !\nOui au recyclage et oui à la seconde vie des appareils !"},{"character":"character-1616658355.json","portrait":"","text":"Je suis content que ce projet provoque un tel enthousiasme en toi !"},{"action":"join","character":"character-1616658435.json","portrait":"","position":{"0":true,"1":false,"2":false,"3":false,"4":false}},{"character":"character-1616658435.json","portrait":"","text":"Il se passe quoi ici ?"},{"character":"character-1616658355.json","portrait":"","text":"Tu n'as pas vu mon mail ?"},{"character":"character-1616658435.json","portrait":"","text":"Ah non.."},{"wait_seconds":1},{"character":"character-1616658435.json","portrait":"","text":"J'ai perdu mon mot de passe\n...\n..."},{"wait_seconds":1},{"action":"leaveall","character":"character-1616658435.json"},{"character":"character-1616658373.json","portrait":"","text":"...\nBon\nEn tout cas je suis ravie de ton choix !\nJe te laisse j’ai une réunion dans 10 min à bientôt !"},{"action":"leaveall","character":"[All]"},{"change_timeline":"timeline-1616662258.json"}],"metadata":{"dialogic-version":"1.1","file":"timeline-1616661658.json","name":"conseq-tel-ouvert-1"}}
diff --git a/dialogic/timelines/timeline-1617871263.json b/dialogic/timelines/timeline-1617871263.json
index 9772fbf..6cb7a2a 100644
--- a/dialogic/timelines/timeline-1617871263.json
+++ b/dialogic/timelines/timeline-1617871263.json
@@ -1 +1 @@
-{"events":[{"background":"res://backgrounds/bureauGroupe-2.jpg"},{"action":"join","character":"character-1616658373.json","portrait":"","position":{"0":false,"1":true,"2":false,"3":false,"4":false}},{"character":"character-1616658373.json","portrait":"","text":"Coucou"},{"emit_signal":"setup_minigame mode _test_minigame_end"},{"background":""},{"character":"character-1616658373.json","portrait":"","text":"Coucou toi\nplop"},{"emit_signal":"start_minigame"}],"metadata":{"dialogic-version":"1.1","file":"timeline-1617871263.json","name":"_test_minigame_start"}}
+{"events":[{"background":"res://backgrounds/bureauGroupe-2.jpg"},{"action":"join","character":"character-1616658373.json","portrait":"","position":{"0":false,"1":true,"2":false,"3":false,"4":false}},{"character":"character-1616658373.json","portrait":"","text":"Hello"},{"emit_signal":"setup_minigame mode _test_minigame_end"},{"background":""},{"character":"character-1616658373.json","portrait":"","text":"I explain stuff"},{"emit_signal":"start_minigame"}],"metadata":{"dialogic-version":"1.1","file":"timeline-1617871263.json","name":"_test_minigame_start"}}
diff --git a/dialogic/timelines/timeline-1617874348.json b/dialogic/timelines/timeline-1617874348.json
index 7e54989..0ed1524 100644
--- a/dialogic/timelines/timeline-1617874348.json
+++ b/dialogic/timelines/timeline-1617874348.json
@@ -1 +1 @@
-{"events":[{"action":"join","character":"character-1616658373.json","portrait":"","position":{"0":false,"1":false,"2":false,"3":true,"4":false}},{"character":"character-1616658373.json","portrait":"","text":"Oh bah t'as perdu !\nT'es nul"},{"change_timeline":"timeline-1616661658.json"}],"metadata":{"dialogic-version":"1.1","file":"timeline-1617874348.json","name":"_test_minigame_end"}}
+{"events":[{"action":"join","character":"character-1616658373.json","portrait":"","position":{"0":false,"1":false,"2":false,"3":true,"4":false}},{"character":"character-1616658373.json","portrait":"","text":"you lost"},{"change_timeline":"timeline-1616661658.json"}],"metadata":{"dialogic-version":"1.1","file":"timeline-1617874348.json","name":"_test_minigame_end"}}
diff --git a/project.godot b/project.godot
index 0758860..c0ca4ab 100644
--- a/project.godot
+++ b/project.godot
@@ -24,6 +24,11 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://addons/dialogic/Other/DialogicDefinitionsUtil.gd"
 }, {
+"base": "Control",
+"class": "DialogicNode",
+"language": "GDScript",
+"path": "res://addons/dialogic/Nodes/dialog_node.gd"
+}, {
 "base": "Reference",
 "class": "DialogicResources",
 "language": "GDScript",
@@ -38,6 +43,7 @@ _global_script_class_icons={
 "Dialogic": "",
 "DialogicBackgroundMusic": "",
 "DialogicDefinitionsUtil": "",
+"DialogicNode": "",
 "DialogicResources": "",
 "DialogicUtil": ""
 }
@@ -45,7 +51,7 @@ _global_script_class_icons={
 [application]
 
 config/name="Pir-serious-game-ethics"
-run/main_scene="res://scenes/Main.tscn"
+run/main_scene="res://scenes/MainMenu.tscn"
 config/icon="res://icon.png"
 
 [autoload]
diff --git a/scenes/Main.gd b/scenes/Main.gd
index e37f7cb..3841093 100644
--- a/scenes/Main.gd
+++ b/scenes/Main.gd
@@ -2,11 +2,13 @@ extends Node
 
 onready var mini_game = $MiniGame;
 
-var dialogic_node: Control;
+onready var dialogic_node: DialogicNode;
 
-# Called when the node enters the scene tree for the first time.
 func _ready():
-	start_dialog('_start')
+	dialogic_node = Dialogic.add_as_child_of($Control)
+	$Control.move_child(dialogic_node, 0)
+	dialogic_node.connect('dialogic_signal', self, "_on_Dialogic_signal_received")
+	dialogic_node.start_from_save("_start")
 
 
 func _on_Dialogic_signal_received(value: String):
@@ -26,26 +28,15 @@ func _on_Dialogic_signal_received(value: String):
 				print("wrong type")
 
 
-func close_dialog():
-	dialogic_node.queue_free()
-
-func start_dialog(timeline: String):
-	dialogic_node = Dialogic.start(timeline)
-	add_child_below_node(mini_game, dialogic_node)
-	dialogic_node.connect('dialogic_signal', self, "_on_Dialogic_signal_received")
-
-
-
 func setup_minigame(mode: String, next_timeline: String):
 	mini_game.setup(mode, next_timeline)
 
 
 func start_minigame():
-	close_dialog()
 	mini_game.start()
 
 
 func _on_MiniGame_game_over(next_timeline: String):
 	print("Game over received")
 	print("next timeline: " + next_timeline)
-	start_dialog(next_timeline)
+	dialogic_node.start(next_timeline)
diff --git a/scenes/Main.tscn b/scenes/Main.tscn
index 3e561c1..0da1cff 100644
--- a/scenes/Main.tscn
+++ b/scenes/Main.tscn
@@ -9,5 +9,12 @@ script = ExtResource( 1 )
 
 [node name="MiniGame" parent="." instance=ExtResource( 3 )]
 
-[node name="UI" parent="." instance=ExtResource( 2 )]
+[node name="Control" type="Control" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="UI" parent="Control" instance=ExtResource( 2 )]
 [connection signal="game_over" from="MiniGame" to="." method="_on_MiniGame_game_over"]
diff --git a/scenes/MainMenu.gd b/scenes/MainMenu.gd
new file mode 100644
index 0000000..5b3f01b
--- /dev/null
+++ b/scenes/MainMenu.gd
@@ -0,0 +1,18 @@
+extends Control
+
+
+func load_main_game():
+	get_tree().change_scene("res://scenes/Main.tscn")
+
+
+func _on_NewGameButton_pressed():
+	Dialogic.reset_saves()
+	load_main_game()
+
+
+func _on_ContinueButton_pressed():
+	load_main_game()
+
+
+func _on_ExitButton_pressed():
+	get_tree().quit(0)
diff --git a/scenes/MainMenu.tscn b/scenes/MainMenu.tscn
index 01dd1ed..b99a0e1 100644
--- a/scenes/MainMenu.tscn
+++ b/scenes/MainMenu.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://characters/Evelyne/evelyne.png" type="Texture" id=1]
 [ext_resource path="res://characters/Patrick/Patrick sans Barbe/Pat_cool.png" type="Texture" id=2]
@@ -6,6 +6,7 @@
 [ext_resource path="res://backgrounds/bureauGroupe-2.jpg" type="Texture" id=4]
 [ext_resource path="res://fonts/ButtonFont.tres" type="DynamicFont" id=5]
 [ext_resource path="res://fonts/open-sans/OpenSans-Bold.ttf" type="DynamicFontData" id=6]
+[ext_resource path="res://scenes/MainMenu.gd" type="Script" id=7]
 
 [sub_resource type="DynamicFont" id=1]
 size = 100
@@ -16,6 +17,7 @@ font_data = ExtResource( 6 )
 [node name="MainMenu" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
+script = ExtResource( 7 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -154,3 +156,6 @@ margin_right = 1720.0
 margin_bottom = 1060.0
 text = "Serious Game on Ethics v0.1"
 align = 2
+[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/CenterContainer/VBoxContainer/NewGameButton" to="." method="_on_NewGameButton_pressed"]
+[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/CenterContainer/VBoxContainer/ContinueButton" to="." method="_on_ContinueButton_pressed"]
+[connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/CenterContainer/VBoxContainer/MarginContainer/ExitButton" to="." method="_on_ExitButton_pressed"]
diff --git a/scenes/PauseMenu.gd b/scenes/PauseMenu.gd
index 390d657..7829379 100644
--- a/scenes/PauseMenu.gd
+++ b/scenes/PauseMenu.gd
@@ -1,5 +1,9 @@
 extends Control
 
+func load_main_menu():
+	get_tree().change_scene("res://scenes/MainMenu.tscn")
+
+
 func pause():
 	get_tree().paused = true
 	show()
@@ -30,5 +34,6 @@ func _on_ContinueButton_pressed():
 	unpause()
 
 
-func _on_ExitButton_pressed():
-	get_tree().quit(0)
+func _on_MenuButton_pressed():
+	unpause()
+	load_main_menu()
diff --git a/scenes/PauseMenu.tscn b/scenes/PauseMenu.tscn
index eda57cd..be2e323 100644
--- a/scenes/PauseMenu.tscn
+++ b/scenes/PauseMenu.tscn
@@ -101,7 +101,7 @@ margin_bottom = 780.0
 custom_constants/separation = 50
 alignment = 1
 
-[node name="ExitButton" type="Button" parent="MarginContainer/ColorRect/MarginContainer2/VBoxContainer/HBoxContainer"]
+[node name="MenuButton" type="Button" parent="MarginContainer/ColorRect/MarginContainer2/VBoxContainer/HBoxContainer"]
 margin_left = 353.0
 margin_right = 465.0
 margin_bottom = 48.0
@@ -115,5 +115,5 @@ margin_bottom = 48.0
 custom_fonts/font = ExtResource( 3 )
 text = "Continuer"
 [connection signal="pressed" from="BackgroundButton" to="." method="_on_BackgroundButton_pressed"]
-[connection signal="pressed" from="MarginContainer/ColorRect/MarginContainer2/VBoxContainer/HBoxContainer/ExitButton" to="." method="_on_ExitButton_pressed"]
+[connection signal="pressed" from="MarginContainer/ColorRect/MarginContainer2/VBoxContainer/HBoxContainer/MenuButton" to="." method="_on_MenuButton_pressed"]
 [connection signal="pressed" from="MarginContainer/ColorRect/MarginContainer2/VBoxContainer/HBoxContainer/ContinueButton" to="." method="_on_ContinueButton_pressed"]