diff --git a/tools/configurator/main.tscn b/tools/configurator/main.tscn
index d6146d70..3972fec6 100755
--- a/tools/configurator/main.tscn
+++ b/tools/configurator/main.tscn
@@ -29,6 +29,7 @@ theme = ExtResource("1_36ht7")
 script = ExtResource("1_obpq7")
 
 [node name="Background" type="ColorRect" parent="."]
+visible = false
 layout_mode = 2
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -63,6 +64,8 @@ layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+offset_right = 376.0
+offset_bottom = 105.0
 grow_horizontal = 2
 grow_vertical = 2
 
@@ -115,6 +118,7 @@ layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+offset_bottom = 4.0
 grow_horizontal = 2
 grow_vertical = 2
 
@@ -123,6 +127,7 @@ layout_mode = 2
 theme = ExtResource("1_36ht7")
 
 [node name="General" type="TabBar" parent="MarginContainer/TabContainer"]
+visible = false
 layout_mode = 2
 theme = ExtResource("1_36ht7")
 
@@ -317,26 +322,406 @@ layout_mode = 2
 disabled = true
 text = "Disconnect"
 
+[node name="system_container" type="VBoxContainer" parent="MarginContainer/TabContainer/General"]
+layout_mode = 2
+offset_left = 16.0
+offset_top = 246.0
+offset_right = 444.0
+offset_bottom = 488.0
+
+[node name="system_label" type="Label" parent="MarginContainer/TabContainer/General/system_container"]
+layout_mode = 2
+text = "System"
+
+[node name="system_line" type="HSeparator" parent="MarginContainer/TabContainer/General/system_container"]
+layout_mode = 2
+
+[node name="update_notification" type="CheckButton" parent="MarginContainer/TabContainer/General/system_container"]
+layout_mode = 2
+button_pressed = true
+text = "Update Notification"
+
+[node name="multi_user_container" type="HBoxContainer" parent="MarginContainer/TabContainer/General/system_container"]
+layout_mode = 2
+
+[node name="multi_user_label" type="Label" parent="MarginContainer/TabContainer/General/system_container/multi_user_container"]
+layout_mode = 2
+text = "Multi-User Mode"
+
+[node name="multi_user" type="OptionButton" parent="MarginContainer/TabContainer/General/system_container/multi_user_container"]
+layout_mode = 2
+item_count = 3
+selected = 0
+popup/item_0/text = "Off"
+popup/item_0/id = 0
+popup/item_1/text = "Steam Users"
+popup/item_1/id = 1
+popup/item_2/text = "Custom Users"
+popup/item_2/id = 2
+
+[node name="menu_music" type="CheckButton" parent="MarginContainer/TabContainer/General/system_container"]
+layout_mode = 2
+button_pressed = true
+text = "Menu music
+"
+
+[node name="fancy_audio_player_here" type="Label" parent="MarginContainer/TabContainer/General/system_container"]
+layout_mode = 2
+text = "|| ------( )--------"
+
 [node name="Graphics" type="TabBar" parent="MarginContainer/TabContainer"]
 visible = false
 layout_mode = 2
 theme = ExtResource("1_36ht7")
 
+[node name="decorations_container" type="VBoxContainer" parent="MarginContainer/TabContainer/Graphics"]
+offset_left = 24.0
+offset_top = 69.0
+offset_right = 324.0
+offset_bottom = 306.0
+
+[node name="decorations_label" type="Label" parent="MarginContainer/TabContainer/Graphics/decorations_container"]
+layout_mode = 2
+text = "Decorations"
+
+[node name="decorations_separator" type="HSeparator" parent="MarginContainer/TabContainer/Graphics/decorations_container"]
+layout_mode = 2
+
+[node name="wide_screen" type="CheckButton" parent="MarginContainer/TabContainer/Graphics/decorations_container"]
+layout_mode = 2
+button_pressed = true
+text = "Wide Screen"
+
+[node name="wide_screen_advanced" type="Button" parent="MarginContainer/TabContainer/Graphics/decorations_container/wide_screen"]
+layout_mode = 0
+offset_left = 328.0
+offset_right = 404.0
+offset_bottom = 29.0
+disabled = true
+text = "Advanced"
+
+[node name="borders" type="CheckButton" parent="MarginContainer/TabContainer/Graphics/decorations_container"]
+layout_mode = 2
+text = "Borders"
+
+[node name="borders_advance" type="Button" parent="MarginContainer/TabContainer/Graphics/decorations_container/borders"]
+layout_mode = 0
+offset_left = 328.0
+offset_right = 404.0
+offset_bottom = 29.0
+disabled = true
+text = "Advanced"
+
+[node name="shaders" type="CheckButton" parent="MarginContainer/TabContainer/Graphics/decorations_container"]
+layout_mode = 2
+button_pressed = true
+text = "Shaders
+"
+
+[node name="shaders_button" type="Button" parent="MarginContainer/TabContainer/Graphics/decorations_container/shaders"]
+layout_mode = 0
+offset_left = 328.0
+offset_right = 404.0
+offset_bottom = 29.0
+disabled = true
+text = "Advanced"
+
+[node name="extra_container" type="VBoxContainer" parent="MarginContainer/TabContainer/Graphics"]
+offset_left = 24.0
+offset_top = 269.0
+offset_right = 335.0
+offset_bottom = 499.0
+
+[node name="decorations_label" type="Label" parent="MarginContainer/TabContainer/Graphics/extra_container"]
+layout_mode = 2
+text = "Extra"
+
+[node name="decorations_separator" type="HSeparator" parent="MarginContainer/TabContainer/Graphics/extra_container"]
+layout_mode = 2
+
+[node name="wide_screen" type="CheckButton" parent="MarginContainer/TabContainer/Graphics/extra_container"]
+layout_mode = 2
+button_pressed = true
+text = "Mods"
+
+[node name="wide_screen_advanced" type="Button" parent="MarginContainer/TabContainer/Graphics/extra_container/wide_screen"]
+layout_mode = 0
+offset_left = 328.0
+offset_right = 404.0
+offset_bottom = 29.0
+disabled = true
+text = "Advanced"
+
+[node name="borders" type="CheckButton" parent="MarginContainer/TabContainer/Graphics/extra_container"]
+layout_mode = 2
+disabled = true
+text = "TATE Mode (Coming soon)"
+
 [node name="Controls" type="TabBar" parent="MarginContainer/TabContainer"]
 visible = false
 layout_mode = 2
 theme = ExtResource("1_36ht7")
 
+[node name="buttons_container" type="VBoxContainer" parent="MarginContainer/TabContainer/Controls"]
+offset_left = 24.0
+offset_top = 69.0
+offset_right = 602.0
+offset_bottom = 306.0
+
+[node name="decorations_label" type="Label" parent="MarginContainer/TabContainer/Controls/buttons_container"]
+layout_mode = 2
+text = "Controls"
+
+[node name="decorations_separator" type="HSeparator" parent="MarginContainer/TabContainer/Controls/buttons_container"]
+layout_mode = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/TabContainer/Controls/buttons_container"]
+layout_mode = 2
+
+[node name="wide_screen" type="Label" parent="MarginContainer/TabContainer/Controls/buttons_container/HBoxContainer"]
+layout_mode = 2
+text = "Install/Update Steam 
+Controller Profile"
+
+[node name="wide_screen_advanced" type="Button" parent="MarginContainer/TabContainer/Controls/buttons_container/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 8
+size_flags_vertical = 4
+text = "Install"
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="MarginContainer/TabContainer/Controls/buttons_container"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="MarginContainer/TabContainer/Controls/buttons_container/HBoxContainer2"]
+layout_mode = 2
+text = "Button Layout"
+
+[node name="borders" type="OptionButton" parent="MarginContainer/TabContainer/Controls/buttons_container/HBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 8
+item_count = 2
+selected = 0
+popup/item_0/text = "Classic"
+popup/item_0/id = 0
+popup/item_1/text = "Nintendo"
+popup/item_1/id = 1
+
+[node name="shaders" type="CheckButton" parent="MarginContainer/TabContainer/Controls/buttons_container"]
+layout_mode = 2
+button_pressed = true
+text = "Hotkey Activation Sound
+"
+
+[node name="Tools" type="TabBar" parent="MarginContainer/TabContainer"]
+visible = false
+layout_mode = 2
+theme = ExtResource("1_36ht7")
+
+[node name="tools" type="VBoxContainer" parent="MarginContainer/TabContainer/Tools"]
+offset_left = 16.0
+offset_top = 69.0
+offset_right = 437.0
+offset_bottom = 517.0
+
+[node name="game_control_label" type="Label" parent="MarginContainer/TabContainer/Tools/tools"]
+layout_mode = 2
+text = "General Tools"
+
+[node name="game_control_label2" type="HSeparator" parent="MarginContainer/TabContainer/Tools/tools"]
+layout_mode = 2
+
+[node name="resume" type="Button" parent="MarginContainer/TabContainer/Tools/tools"]
+layout_mode = 2
+text = "Open Emulator..."
+
+[node name="resume2" type="Button" parent="MarginContainer/TabContainer/Tools/tools"]
+layout_mode = 2
+disabled = true
+text = "Install RetroDECK Steam Grids"
+
+[node name="resume4" type="Button" parent="MarginContainer/TabContainer/Tools/tools"]
+layout_mode = 2
+text = "Install PS3 Firmware"
+
+[node name="rewind" type="CheckButton" parent="MarginContainer/TabContainer/Tools/tools"]
+layout_mode = 2
+disabled = true
+text = "Saves Sync (coming soon)"
+
+[node name="quitconfirm" type="CheckButton" parent="MarginContainer/TabContainer/Tools/tools"]
+layout_mode = 2
+toggle_mode = false
+text = "Show Favorites as Steam Games
+"
+
+[node name="tools_2" type="VBoxContainer" parent="MarginContainer/TabContainer/Tools"]
+offset_left = 473.0
+offset_top = 312.0
+offset_right = 944.0
+offset_bottom = 550.0
+
+[node name="game_control_label" type="Label" parent="MarginContainer/TabContainer/Tools/tools_2"]
+layout_mode = 2
+text = "File Maniuplation"
+
+[node name="game_control_label2" type="HSeparator" parent="MarginContainer/TabContainer/Tools/tools_2"]
+layout_mode = 2
+
+[node name="resume3" type="Button" parent="MarginContainer/TabContainer/Tools/tools_2"]
+layout_mode = 2
+disabled = true
+text = "Start FTP Server"
+
+[node name="resume5" type="Button" parent="MarginContainer/TabContainer/Tools/tools_2"]
+layout_mode = 2
+disabled = true
+text = "USB Transfer Tool"
+
+[node name="resume6" type="Button" parent="MarginContainer/TabContainer/Tools/tools_2"]
+layout_mode = 2
+disabled = true
+text = "Backup User Data"
+
+[node name="resume7" type="Button" parent="MarginContainer/TabContainer/Tools/tools_2"]
+layout_mode = 2
+disabled = true
+text = "Compress Games"
+
+[node name="resume8" type="Button" parent="MarginContainer/TabContainer/Tools/tools_2"]
+layout_mode = 2
+disabled = true
+text = "Move User Files"
+
+[node name="game_control_container2" type="VBoxContainer" parent="MarginContainer/TabContainer/Tools"]
+offset_left = 469.0
+offset_top = 69.0
+offset_right = 942.0
+offset_bottom = 517.0
+
+[node name="game_control_label" type="Label" parent="MarginContainer/TabContainer/Tools/game_control_container2"]
+layout_mode = 2
+text = "Scan"
+
+[node name="game_control_label2" type="HSeparator" parent="MarginContainer/TabContainer/Tools/game_control_container2"]
+layout_mode = 2
+
+[node name="resume" type="Button" parent="MarginContainer/TabContainer/Tools/game_control_container2"]
+layout_mode = 2
+disabled = true
+text = "PlayStation 3 Games"
+
+[node name="resume3" type="Button" parent="MarginContainer/TabContainer/Tools/game_control_container2"]
+layout_mode = 2
+disabled = true
+text = "ScummVM Games"
+
+[node name="resume5" type="Button" parent="MarginContainer/TabContainer/Tools/game_control_container2"]
+layout_mode = 2
+text = "Multi-File Structure"
+
+[node name="resume6" type="Button" parent="MarginContainer/TabContainer/Tools/game_control_container2"]
+layout_mode = 2
+disabled = true
+text = "3DS Game Decrypter"
+
+[node name="resume7" type="Button" parent="MarginContainer/TabContainer/Tools/game_control_container2"]
+layout_mode = 2
+text = "BIOS"
+
 [node name="Troubleshooting" type="TabBar" parent="MarginContainer/TabContainer"]
 visible = false
 layout_mode = 2
 theme = ExtResource("1_36ht7")
 
+[node name="game_control_container" type="VBoxContainer" parent="MarginContainer/TabContainer/Troubleshooting"]
+offset_left = 16.0
+offset_top = 61.0
+offset_right = 417.0
+offset_bottom = 361.0
+
+[node name="game_control_label" type="Label" parent="MarginContainer/TabContainer/Troubleshooting/game_control_container"]
+layout_mode = 2
+text = "Troubleshooting"
+
+[node name="game_control_label2" type="HSeparator" parent="MarginContainer/TabContainer/Troubleshooting/game_control_container"]
+layout_mode = 2
+
+[node name="Button" type="Button" parent="MarginContainer/TabContainer/Troubleshooting/game_control_container"]
+layout_mode = 2
+text = "Check Connection"
+
+[node name="Button2" type="Button" parent="MarginContainer/TabContainer/Troubleshooting/game_control_container"]
+layout_mode = 2
+disabled = true
+text = "Show Logs"
+
+[node name="game_control_container2" type="VBoxContainer" parent="MarginContainer/TabContainer/Troubleshooting"]
+offset_left = 16.0
+offset_top = 197.0
+offset_right = 419.0
+offset_bottom = 524.0
+
+[node name="game_control_label" type="Label" parent="MarginContainer/TabContainer/Troubleshooting/game_control_container2"]
+layout_mode = 2
+text = "Reset"
+
+[node name="game_control_label2" type="HSeparator" parent="MarginContainer/TabContainer/Troubleshooting/game_control_container2"]
+layout_mode = 2
+
+[node name="Button" type="Button" parent="MarginContainer/TabContainer/Troubleshooting/game_control_container2"]
+layout_mode = 2
+text = "Single Emulator..."
+
+[node name="Button2" type="Button" parent="MarginContainer/TabContainer/Troubleshooting/game_control_container2"]
+layout_mode = 2
+text = "All Emulators"
+
+[node name="Button3" type="Button" parent="MarginContainer/TabContainer/Troubleshooting/game_control_container2"]
+layout_mode = 2
+text = "Full RetroDECK Reset"
+
 [node name="About" type="TabBar" parent="MarginContainer/TabContainer"]
-visible = false
 layout_mode = 2
 theme = ExtResource("1_36ht7")
 
+[node name="Icon" type="Sprite2D" parent="MarginContainer/TabContainer/About"]
+position = Vector2(102, 146.5)
+scale = Vector2(0.515625, 0.503906)
+texture = ExtResource("1_axfei")
+
+[node name="RichTextLabel" type="RichTextLabel" parent="MarginContainer/TabContainer/About"]
+layout_mode = 0
+offset_left = 279.0
+offset_top = 86.0
+offset_right = 726.0
+offset_bottom = 167.0
+theme_override_font_sizes/normal_font_size = 80
+text = "About RetroDECK"
+
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/TabContainer/About"]
+layout_mode = 0
+offset_left = 328.0
+offset_top = 177.0
+offset_right = 721.0
+offset_bottom = 520.0
+
+[node name="Button" type="Button" parent="MarginContainer/TabContainer/About/VBoxContainer"]
+layout_mode = 2
+text = "Version History"
+
+[node name="Button2" type="Button" parent="MarginContainer/TabContainer/About/VBoxContainer"]
+layout_mode = 2
+disabled = true
+text = "Wiki (coming soon)"
+
+[node name="Button3" type="Button" parent="MarginContainer/TabContainer/About/VBoxContainer"]
+layout_mode = 2
+text = "Credits"
+
+[node name="Label" type="Label" parent="MarginContainer/TabContainer/About/VBoxContainer"]
+layout_mode = 2
+text = "We can add: Info, links, licence, donation"
+
 [node name="CanvasModulate" type="CanvasModulate" parent="MarginContainer/TabContainer"]
 visible = false
 color = Color(0.713726, 0.776471, 1, 1)