From 508aa89ab7075ee678a4e49bbdbf19d00777a5d4 Mon Sep 17 00:00:00 2001
From: trollodel <33117082+trollodel@users.noreply.github.com>
Date: Sun, 20 Mar 2022 13:04:49 +0100
Subject: [PATCH] Convert usages of EditorNode to EditorPlugin

---
 editor/animation_track_editor.cpp             |   1 +
 editor/editor_audio_buses.cpp                 |   3 -
 editor/editor_audio_buses.h                   |   3 +-
 editor/editor_feature_profile.h               |   2 +
 editor/editor_locale_dialog.cpp               |   1 +
 editor/editor_node.cpp                        |  19 +-
 editor/editor_node.h                          |   1 +
 editor/editor_plugin.cpp                      |  10 +-
 editor/editor_plugin.h                        |  29 +--
 editor/editor_run.cpp                         |   1 +
 editor/filesystem_dock.cpp                    |   2 +
 editor/plugins/abstract_polygon_2d_editor.h   |   1 +
 .../plugins/animation_blend_space_1d_editor.h |   1 +
 .../plugins/animation_blend_space_2d_editor.h |   1 +
 .../animation_blend_tree_editor_plugin.h      |   2 +
 .../animation_player_editor_plugin.cpp        |  33 +--
 .../plugins/animation_player_editor_plugin.h  |   3 +-
 .../plugins/animation_state_machine_editor.h  |   1 +
 .../plugins/animation_tree_editor_plugin.cpp  |   7 +-
 .../plugins/asset_library_editor_plugin.cpp   |   3 +-
 editor/plugins/audio_stream_editor_plugin.cpp |  18 +-
 editor/plugins/audio_stream_editor_plugin.h   |   2 +-
 editor/plugins/camera_3d_editor_plugin.cpp    |   1 -
 editor/plugins/canvas_item_editor_plugin.cpp  | 197 ++++++++++--------
 editor/plugins/canvas_item_editor_plugin.h    |  12 +-
 .../collision_shape_2d_editor_plugin.cpp      |  29 ++-
 .../collision_shape_2d_editor_plugin.h        |   5 +-
 editor/plugins/control_editor_plugin.cpp      |  13 +-
 editor/plugins/control_editor_plugin.h        |   7 +-
 .../cpu_particles_2d_editor_plugin.cpp        |   2 -
 .../plugins/cpu_particles_2d_editor_plugin.h  |   6 +-
 .../cpu_particles_3d_editor_plugin.cpp        |   3 +-
 editor/plugins/curve_editor_plugin.cpp        |  73 ++++---
 editor/plugins/curve_editor_plugin.h          |   9 +-
 editor/plugins/debugger_editor_plugin.cpp     |   4 +-
 editor/plugins/font_editor_plugin.cpp         |   2 +-
 editor/plugins/font_editor_plugin.h           |   1 +
 .../gpu_particles_2d_editor_plugin.cpp        |   9 +-
 .../plugins/gpu_particles_2d_editor_plugin.h  |   5 +-
 .../gpu_particles_3d_editor_plugin.cpp        |  11 +-
 .../plugins/gpu_particles_3d_editor_plugin.h  |   7 +-
 ..._particles_collision_sdf_editor_plugin.cpp |   2 +-
 ...pu_particles_collision_sdf_editor_plugin.h |   1 +
 editor/plugins/gradient_editor_plugin.cpp     |  21 +-
 editor/plugins/gradient_editor_plugin.h       |   8 +-
 .../gradient_texture_2d_editor_plugin.h       |   2 +
 .../light_occluder_2d_editor_plugin.cpp       |   3 +-
 editor/plugins/lightmap_gi_editor_plugin.cpp  |   2 +-
 editor/plugins/line_2d_editor_plugin.cpp      |   3 +
 editor/plugins/material_editor_plugin.h       |   1 +
 editor/plugins/mesh_editor_plugin.h           |   3 +
 .../mesh_instance_3d_editor_plugin.cpp        |  27 +--
 .../plugins/mesh_instance_3d_editor_plugin.h  |   6 +-
 editor/plugins/mesh_library_editor_plugin.cpp |  10 +-
 editor/plugins/mesh_library_editor_plugin.h   |   2 +-
 editor/plugins/multimesh_editor_plugin.cpp    |  11 +-
 editor/plugins/multimesh_editor_plugin.h      |   5 +-
 .../navigation_polygon_editor_plugin.cpp      |   2 +
 editor/plugins/node_3d_editor_plugin.cpp      |  62 +++---
 editor/plugins/node_3d_editor_plugin.h        |  12 +-
 .../occluder_instance_3d_editor_plugin.cpp    |   2 +-
 editor/plugins/path_2d_editor_plugin.cpp      |  10 +-
 editor/plugins/path_2d_editor_plugin.h        |   4 +-
 editor/plugins/path_3d_editor_plugin.cpp      |  13 +-
 editor/plugins/path_3d_editor_plugin.h        |   1 +
 editor/plugins/polygon_2d_editor_plugin.cpp   |   1 +
 editor/plugins/polygon_2d_editor_plugin.h     |   4 +
 editor/plugins/polygon_3d_editor_plugin.cpp   |  10 +-
 editor/plugins/polygon_3d_editor_plugin.h     |   4 +-
 editor/plugins/replication_editor_plugin.cpp  |  21 +-
 editor/plugins/replication_editor_plugin.h    |   7 +-
 .../resource_preloader_editor_plugin.cpp      |  25 ++-
 .../resource_preloader_editor_plugin.h        |   9 +-
 editor/plugins/script_editor_plugin.cpp       |  29 +--
 editor/plugins/script_editor_plugin.h         |   5 +-
 editor/plugins/shader_editor_plugin.cpp       |  25 ++-
 editor/plugins/shader_editor_plugin.h         |   6 +-
 editor/plugins/shader_file_editor_plugin.cpp  |   8 +-
 editor/plugins/skeleton_2d_editor_plugin.cpp  |  17 +-
 editor/plugins/skeleton_2d_editor_plugin.h    |   5 +-
 editor/plugins/skeleton_3d_editor_plugin.cpp  |  41 ++--
 editor/plugins/skeleton_3d_editor_plugin.h    |  14 +-
 .../plugins/skeleton_ik_3d_editor_plugin.cpp  |   4 +-
 editor/plugins/sprite_2d_editor_plugin.cpp    |  16 +-
 editor/plugins/sprite_2d_editor_plugin.h      |   6 +-
 .../plugins/sprite_frames_editor_plugin.cpp   |  31 ++-
 editor/plugins/sprite_frames_editor_plugin.h  |   8 +-
 .../sub_viewport_preview_editor_plugin.h      |   1 +
 editor/plugins/text_control_editor_plugin.cpp |  20 +-
 editor/plugins/text_control_editor_plugin.h   |   4 +-
 editor/plugins/texture_3d_editor_plugin.h     |   1 +
 editor/plugins/texture_editor_plugin.h        |   3 +
 .../plugins/texture_layered_editor_plugin.h   |   1 +
 .../plugins/texture_region_editor_plugin.cpp  |  36 ++--
 editor/plugins/texture_region_editor_plugin.h |  12 +-
 editor/plugins/theme_editor_plugin.cpp        |  85 ++++----
 editor/plugins/theme_editor_plugin.h          |  17 +-
 editor/plugins/theme_editor_preview.cpp       |   5 +
 editor/plugins/tiles/tile_data_editors.cpp    |   2 +
 editor/plugins/tiles/tiles_editor_plugin.cpp  |  18 +-
 .../plugins/version_control_editor_plugin.cpp |  43 ++--
 .../plugins/version_control_editor_plugin.h   |   2 +
 .../plugins/visual_shader_editor_plugin.cpp   | 123 ++++++-----
 editor/plugins/visual_shader_editor_plugin.h  |   7 +-
 editor/plugins/voxel_gi_editor_plugin.cpp     |   2 +-
 editor/plugins/voxel_gi_editor_plugin.h       |   1 +
 editor/scene_tree_dock.h                      |   3 +-
 main/main.cpp                                 |   1 +
 modules/csg/editor/csg_gizmos.cpp             |   1 +
 .../editor_scene_exporter_gltf_plugin.cpp     |   6 +-
 .../editor_scene_exporter_gltf_plugin.h       |   1 +
 .../gridmap/editor/grid_map_editor_plugin.cpp |   6 +-
 .../gridmap/editor/grid_map_editor_plugin.h   |   5 +-
 .../editor/navigation_mesh_editor_plugin.cpp  |   3 +-
 .../editor/navigation_mesh_editor_plugin.h    |   1 +
 115 files changed, 865 insertions(+), 594 deletions(-)

diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index 53631c1e3b4e..f90fdff48fba 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -37,6 +37,7 @@
 #include "editor/editor_scale.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
 #include "scene/animation/animation_player.h"
+#include "scene/gui/option_button.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"
 #include "scene/scene_string_names.h"
diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp
index 4474d6893ad3..ac77695790ea 100644
--- a/editor/editor_audio_buses.cpp
+++ b/editor/editor_audio_buses.cpp
@@ -1367,9 +1367,6 @@ bool AudioBusesEditorPlugin::handles(Object *p_node) const {
 	return (Object::cast_to<AudioBusLayout>(p_node) != nullptr);
 }
 
-void AudioBusesEditorPlugin::make_visible(bool p_visible) {
-}
-
 AudioBusesEditorPlugin::AudioBusesEditorPlugin(EditorAudioBuses *p_node) {
 	audio_bus_editor = p_node;
 }
diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h
index 81a6e5b86d02..586975650f9e 100644
--- a/editor/editor_audio_buses.h
+++ b/editor/editor_audio_buses.h
@@ -46,6 +46,8 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
 
+class EditorFileDialog;
+
 class EditorAudioBuses;
 
 class EditorAudioBus : public PanelContainer {
@@ -269,7 +271,6 @@ class AudioBusesEditorPlugin : public EditorPlugin {
 	bool has_main_screen() const override { return false; }
 	virtual void edit(Object *p_node) override;
 	virtual bool handles(Object *p_node) const override;
-	virtual void make_visible(bool p_visible) override;
 
 	AudioBusesEditorPlugin(EditorAudioBuses *p_node);
 	~AudioBusesEditorPlugin();
diff --git a/editor/editor_feature_profile.h b/editor/editor_feature_profile.h
index 19df8a968677..5e8c8f17a4c2 100644
--- a/editor/editor_feature_profile.h
+++ b/editor/editor_feature_profile.h
@@ -40,6 +40,8 @@
 #include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
 
+class EditorFileDialog;
+
 class EditorFeatureProfile : public RefCounted {
 	GDCLASS(EditorFeatureProfile, RefCounted);
 
diff --git a/editor/editor_locale_dialog.cpp b/editor/editor_locale_dialog.cpp
index abef0dc35367..2d0263cb8395 100644
--- a/editor/editor_locale_dialog.cpp
+++ b/editor/editor_locale_dialog.cpp
@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
+#include "scene/gui/box_container.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 99e30593a99b..7fdfea2a9db0 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -107,6 +107,7 @@
 #include "editor/filesystem_dock.h"
 #include "editor/import/dynamic_font_import_settings.h"
 #include "editor/import/editor_import_collada.h"
+#include "editor/import/editor_import_plugin.h"
 #include "editor/import/resource_importer_bitmask.h"
 #include "editor/import/resource_importer_bmfont.h"
 #include "editor/import/resource_importer_csv_translation.h"
@@ -3236,7 +3237,7 @@ void EditorNode::add_editor_plugin(EditorPlugin *p_editor, bool p_config_changed
 		singleton->distraction_free->raise();
 	}
 	singleton->editor_data.add_editor_plugin(p_editor);
-	singleton->add_child(p_editor);
+	singleton->editor_plugins_container->add_child(p_editor);
 	if (p_config_changed) {
 		p_editor->enable_plugin();
 	}
@@ -6956,6 +6957,9 @@ EditorNode::EditorNode() {
 	audio_preview_gen = memnew(AudioStreamPreviewGenerator);
 	add_child(audio_preview_gen);
 
+	editor_plugins_container = memnew(Node);
+	add_child(editor_plugins_container);
+
 	add_editor_plugin(memnew(DebuggerEditorPlugin(debug_menu)));
 	add_editor_plugin(memnew(DebugAdapterServer()));
 
@@ -6982,6 +6986,10 @@ EditorNode::EditorNode() {
 
 	gui_base->add_child(disk_changed);
 
+	// Add interface before adding plugins
+	editor_interface = memnew(EditorInterface);
+	add_child(editor_interface);
+
 	add_editor_plugin(memnew(AnimationPlayerEditorPlugin));
 	add_editor_plugin(memnew(CanvasItemEditorPlugin));
 	add_editor_plugin(memnew(Node3DEditorPlugin));
@@ -6998,11 +7006,6 @@ EditorNode::EditorNode() {
 		WARN_PRINT("Asset Library not available, as it requires SSL to work.");
 	}
 
-	// Add interface before adding plugins.
-
-	editor_interface = memnew(EditorInterface);
-	add_child(editor_interface);
-
 	// More visually meaningful to have this later.
 	raise_bottom_panel_item(AnimationPlayerEditor::get_singleton());
 	add_editor_plugin(memnew(ReplicationEditorPlugin));
@@ -7240,6 +7243,10 @@ EditorNode::EditorNode() {
 	String exec = OS::get_singleton()->get_executable_path();
 	// Save editor executable path for third-party tools.
 	EditorSettings::get_singleton()->set_project_metadata("editor_metadata", "executable_path", exec);
+
+	// Move EditorInterface and the EditorPlugin container to the top, so they are the last nodes to free.
+	editor_interface->raise();
+	editor_plugins_container->raise();
 }
 
 EditorNode::~EditorNode() {
diff --git a/editor/editor_node.h b/editor/editor_node.h
index c6c1f09938f4..40965da93eec 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -271,6 +271,7 @@ class EditorNode : public Node {
 	ProjectExportDialog *project_export = nullptr;
 	ProjectSettingsEditor *project_settings_editor = nullptr;
 
+	Node *editor_plugins_container = nullptr;
 	Vector<EditorPlugin *> editor_plugins;
 	bool _initializing_plugins = false;
 	Map<String, EditorPlugin *> addon_name_to_plugin;
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
index 5166200ee3ef..93ba095a6d4a 100644
--- a/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -30,13 +30,17 @@
 
 #include "editor_plugin.h"
 
+#include "editor/debugger/editor_debugger_node.h"
 #include "editor/editor_command_palette.h"
 #include "editor/editor_export.h"
 #include "editor/editor_node.h"
 #include "editor/editor_paths.h"
 #include "editor/editor_resource_preview.h"
 #include "editor/editor_settings.h"
+#include "editor/editor_translation_parser.h"
 #include "editor/filesystem_dock.h"
+#include "editor/import/editor_import_plugin.h"
+#include "editor/import/resource_importer_scene.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
@@ -373,6 +377,10 @@ EditorInterface::EditorInterface() {
 	singleton = this;
 }
 
+EditorInterface::~EditorInterface() {
+	singleton = nullptr;
+}
+
 ///////////////////////////////////////////
 void EditorPlugin::add_custom_type(const String &p_type, const String &p_base, const Ref<Script> &p_script, const Ref<Texture2D> &p_icon) {
 	EditorNode::get_editor_data().add_custom_type(p_type, p_base, p_script, p_icon);
@@ -881,7 +889,7 @@ void EditorPlugin::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("make_bottom_panel_item_visible", "item"), &EditorPlugin::make_bottom_panel_item_visible);
 	ClassDB::bind_method(D_METHOD("hide_bottom_panel"), &EditorPlugin::hide_bottom_panel);
 
-	ClassDB::bind_method(D_METHOD("get_undo_redo"), &EditorPlugin::_get_undo_redo);
+	ClassDB::bind_method(D_METHOD("get_undo_redo"), &EditorPlugin::get_undo_redo);
 	ClassDB::bind_method(D_METHOD("add_undo_redo_inspector_hook_callback", "callable"), &EditorPlugin::add_undo_redo_inspector_hook_callback);
 	ClassDB::bind_method(D_METHOD("remove_undo_redo_inspector_hook_callback", "callable"), &EditorPlugin::remove_undo_redo_inspector_hook_callback);
 	ClassDB::bind_method(D_METHOD("queue_save_layout"), &EditorPlugin::queue_save_layout);
diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h
index 1a5be7a89b75..c3c5955bd9e8 100644
--- a/editor/editor_plugin.h
+++ b/editor/editor_plugin.h
@@ -32,19 +32,22 @@
 #define EDITOR_PLUGIN_H
 
 #include "core/io/config_file.h"
-#include "core/object/undo_redo.h"
-#include "editor/debugger/editor_debugger_node.h"
-#include "editor/editor_inspector.h"
-#include "editor/editor_translation_parser.h"
-#include "editor/import/editor_import_plugin.h"
-#include "editor/import/resource_importer_scene.h"
-#include "editor/script_create_dialog.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/main/node.h"
-#include "scene/resources/texture.h"
+#include "scene/gui/control.h"
 
+class UndoRedo;
 class Node3D;
-class Camera3D;
+class Button;
+class PopupMenu;
+class EditorImportPlugin;
+class EditorInspectorPlugin;
+class EditorInspector;
+class EditorTranslationParserPlugin;
+class EditorImportPlugin;
+class EditorExportPlugin;
+class EditorSceneFormatImporter;
+class EditorScenePostImportPlugin;
+class ScriptCreateDialog;
 class EditorCommandPalette;
 class EditorSelection;
 class EditorExport;
@@ -124,6 +127,7 @@ class EditorInterface : public Node {
 	bool is_distraction_free_mode_enabled() const;
 
 	EditorInterface();
+	~EditorInterface();
 };
 
 class EditorPlugin : public Node {
@@ -131,8 +135,6 @@ class EditorPlugin : public Node {
 	friend class EditorData;
 	UndoRedo *undo_redo = nullptr;
 
-	UndoRedo *_get_undo_redo() { return undo_redo; }
-
 	bool input_event_forwarding_always_enabled = false;
 	bool force_draw_over_forwarding_enabled = false;
 
@@ -144,7 +146,6 @@ class EditorPlugin : public Node {
 	void _notification(int p_what);
 
 	static void _bind_methods();
-	UndoRedo &get_undo_redo() { return *undo_redo; }
 
 	void add_custom_type(const String &p_type, const String &p_base, const Ref<Script> &p_script, const Ref<Texture2D> &p_icon);
 	void remove_custom_type(const String &p_type);
@@ -207,6 +208,8 @@ class EditorPlugin : public Node {
 		AFTER_GUI_INPUT_DESELECT
 	};
 
+	UndoRedo *get_undo_redo() { return undo_redo; }
+
 	//TODO: send a resource for editing to the editor node?
 
 	void add_control_to_container(CustomControlContainer p_location, Control *p_control);
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp
index 574acdff1c0e..20e86a0b375f 100644
--- a/editor/editor_run.cpp
+++ b/editor/editor_run.cpp
@@ -31,6 +31,7 @@
 #include "editor_run.h"
 
 #include "core/config/project_settings.h"
+#include "editor/debugger/editor_debugger_node.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "servers/display_server.h"
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index a45568db48d6..357df2c3fd1c 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -42,6 +42,8 @@
 #include "editor/editor_resource_preview.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/import/editor_import_plugin.h"
+#include "editor/import/resource_importer_scene.h"
 #include "editor/import_dock.h"
 #include "editor/scene_tree_dock.h"
 #include "editor/shader_create_dialog.h"
diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h
index b0483cbb628e..7ce253204927 100644
--- a/editor/plugins/abstract_polygon_2d_editor.h
+++ b/editor/plugins/abstract_polygon_2d_editor.h
@@ -34,6 +34,7 @@
 #include "editor/editor_plugin.h"
 #include "scene/2d/polygon_2d.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/dialogs.h"
 
 class CanvasItemEditor;
 
diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/plugins/animation_blend_space_1d_editor.h
index 816c2555ca21..7b3d0c640fa3 100644
--- a/editor/plugins/animation_blend_space_1d_editor.h
+++ b/editor/plugins/animation_blend_space_1d_editor.h
@@ -37,6 +37,7 @@
 #include "scene/animation/animation_blend_space_1d.h"
 #include "scene/gui/button.h"
 #include "scene/gui/graph_edit.h"
+#include "scene/gui/panel_container.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/tree.h"
 
diff --git a/editor/plugins/animation_blend_space_2d_editor.h b/editor/plugins/animation_blend_space_2d_editor.h
index db54e84254d9..e512ed43cf75 100644
--- a/editor/plugins/animation_blend_space_2d_editor.h
+++ b/editor/plugins/animation_blend_space_2d_editor.h
@@ -37,6 +37,7 @@
 #include "scene/animation/animation_blend_space_2d.h"
 #include "scene/gui/button.h"
 #include "scene/gui/graph_edit.h"
+#include "scene/gui/panel_container.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/tree.h"
 
diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h
index cacf8379f9cf..2e6df8c19468 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.h
+++ b/editor/plugins/animation_blend_tree_editor_plugin.h
@@ -32,11 +32,13 @@
 #define ANIMATION_BLEND_TREE_EDITOR_PLUGIN_H
 
 #include "editor/editor_plugin.h"
+#include "editor/editor_properties.h"
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "editor/property_editor.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/gui/button.h"
 #include "scene/gui/graph_edit.h"
+#include "scene/gui/panel_container.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/tree.h"
 
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index 17a1bd1048c4..e3734db215a9 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -106,11 +106,14 @@ void AnimationPlayerEditor::_notification(int p_what) {
 
 			get_tree()->connect("node_removed", callable_mp(this, &AnimationPlayerEditor::_node_removed));
 
-			add_theme_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("panel"), SNAME("Panel")));
+			Control *gui_base = plugin->get_editor_interface()->get_base_control();
+
+			add_theme_style_override("panel", gui_base->get_theme_stylebox(SNAME("panel"), SNAME("Panel")));
 		} break;
 
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			add_theme_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("panel"), SNAME("Panel")));
+			Control *gui_base = plugin->get_editor_interface()->get_base_control();
+			add_theme_style_override("panel", gui_base->get_theme_stylebox(SNAME("panel"), SNAME("Panel")));
 		} break;
 
 		case NOTIFICATION_TRANSLATION_CHANGED:
@@ -171,6 +174,7 @@ void AnimationPlayerEditor::_autoplay_pressed() {
 	}
 
 	String current = animation->get_item_text(animation->get_selected());
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	if (player->get_autoplay() == current) {
 		//unset
 		undo_redo->create_action(TTR("Toggle Autoplay"));
@@ -375,6 +379,8 @@ void AnimationPlayerEditor::_animation_remove_confirmed() {
 	Ref<AnimationLibrary> al = player->get_animation_library(player->find_animation_library(anim));
 	ERR_FAIL_COND(al.is_null());
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
+
 	undo_redo->create_action(TTR("Remove Animation"));
 	if (player->get_autoplay() == current) {
 		undo_redo->add_do_method(player, "set_autoplay", "");
@@ -444,6 +450,7 @@ void AnimationPlayerEditor::_animation_name_edited() {
 		return;
 	}
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	switch (name_dialog_op) {
 		case TOOL_RENAME_ANIM: {
 			String current = animation->get_item_text(animation->get_selected());
@@ -533,6 +540,7 @@ void AnimationPlayerEditor::_blend_editor_next_changed(const int p_idx) {
 
 	String current = animation->get_item_text(animation->get_selected());
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Blend Next Changed"));
 	undo_redo->add_do_method(player, "animation_set_next", current, blend_editor.next->get_item_text(p_idx));
 	undo_redo->add_undo_method(player, "animation_set_next", current, player->animation_get_next(current));
@@ -619,6 +627,7 @@ void AnimationPlayerEditor::_blend_edited() {
 	float blend_time = selected->get_range(1);
 	float prev_blend_time = player->get_blend_time(current, to);
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Change Blend Time"));
 	undo_redo->add_do_method(player, "set_blend_time", current, to, blend_time);
 	undo_redo->add_undo_method(player, "set_blend_time", current, to, prev_blend_time);
@@ -640,8 +649,8 @@ Dictionary AnimationPlayerEditor::get_state() const {
 	Dictionary d;
 
 	d["visible"] = is_visible_in_tree();
-	if (EditorNode::get_singleton()->get_edited_scene() && is_visible_in_tree() && player) {
-		d["player"] = EditorNode::get_singleton()->get_edited_scene()->get_path_to(player);
+	if (plugin->get_editor_interface()->get_edited_scene_root() && is_visible_in_tree() && player) {
+		d["player"] = plugin->get_editor_interface()->get_edited_scene_root()->get_path_to(player);
 		d["animation"] = player->get_assigned_animation();
 		d["track_editor_state"] = track_editor->get_state();
 	}
@@ -653,16 +662,16 @@ void AnimationPlayerEditor::set_state(const Dictionary &p_state) {
 	if (!p_state.has("visible") || !p_state["visible"]) {
 		return;
 	}
-	if (!EditorNode::get_singleton()->get_edited_scene()) {
+	if (!plugin->get_editor_interface()->get_edited_scene_root()) {
 		return;
 	}
 
 	if (p_state.has("player")) {
-		Node *n = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["player"]);
-		if (Object::cast_to<AnimationPlayer>(n) && EditorNode::get_singleton()->get_editor_selection()->is_selected(n)) {
+		Node *n = plugin->get_editor_interface()->get_edited_scene_root()->get_node(p_state["player"]);
+		if (Object::cast_to<AnimationPlayer>(n) && plugin->get_editor_interface()->get_selection()->is_selected(n)) {
 			player = Object::cast_to<AnimationPlayer>(n);
 			_update_player();
-			EditorNode::get_singleton()->make_bottom_panel_item_visible(this);
+			plugin->make_bottom_panel_item_visible(this);
 			set_process(true);
 			ensure_visibility();
 
@@ -685,7 +694,7 @@ void AnimationPlayerEditor::_animation_resource_edit() {
 	String current = _get_current();
 	if (current != String()) {
 		Ref<Animation> anim = player->get_animation(current);
-		EditorNode::get_singleton()->edit_resource(anim);
+		plugin->get_editor_interface()->edit_resource(anim);
 	}
 }
 
@@ -1721,7 +1730,6 @@ void AnimationPlayerEditorPlugin::_update_keying() {
 }
 
 void AnimationPlayerEditorPlugin::edit(Object *p_object) {
-	anim_editor->set_undo_redo(&get_undo_redo());
 	if (!p_object) {
 		return;
 	}
@@ -1734,7 +1742,7 @@ bool AnimationPlayerEditorPlugin::handles(Object *p_object) const {
 
 void AnimationPlayerEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
-		EditorNode::get_singleton()->make_bottom_panel_item_visible(anim_editor);
+		make_bottom_panel_item_visible(anim_editor);
 		anim_editor->set_process(true);
 		anim_editor->ensure_visibility();
 	}
@@ -1742,8 +1750,7 @@ void AnimationPlayerEditorPlugin::make_visible(bool p_visible) {
 
 AnimationPlayerEditorPlugin::AnimationPlayerEditorPlugin() {
 	anim_editor = memnew(AnimationPlayerEditor(this));
-	anim_editor->set_undo_redo(EditorNode::get_undo_redo());
-	EditorNode::get_singleton()->add_bottom_panel_item(TTR("Animation"), anim_editor);
+	add_control_to_bottom_panel(anim_editor, TTR("Animation"));
 }
 
 AnimationPlayerEditorPlugin::~AnimationPlayerEditorPlugin() {
diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h
index 0cc04460ca8f..78a6b60bb1b4 100644
--- a/editor/plugins/animation_player_editor_plugin.h
+++ b/editor/plugins/animation_player_editor_plugin.h
@@ -36,6 +36,7 @@
 #include "editor/plugins/animation_library_editor.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/dialogs.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_button.h"
@@ -100,7 +101,6 @@ class AnimationPlayerEditor : public VBoxContainer {
 	LineEdit *name = nullptr;
 	OptionButton *library = nullptr;
 	Label *name_title = nullptr;
-	UndoRedo *undo_redo = nullptr;
 
 	Ref<Texture2D> autoplay_icon;
 	Ref<Texture2D> reset_icon;
@@ -232,7 +232,6 @@ class AnimationPlayerEditor : public VBoxContainer {
 
 	void ensure_visibility();
 
-	void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; }
 	void edit(AnimationPlayer *p_player);
 	void forward_force_draw_over_viewport(Control *p_overlay);
 
diff --git a/editor/plugins/animation_state_machine_editor.h b/editor/plugins/animation_state_machine_editor.h
index bf3f7e93cf5f..a8395b1e22b3 100644
--- a/editor/plugins/animation_state_machine_editor.h
+++ b/editor/plugins/animation_state_machine_editor.h
@@ -37,6 +37,7 @@
 #include "scene/animation/animation_node_state_machine.h"
 #include "scene/gui/button.h"
 #include "scene/gui/graph_edit.h"
+#include "scene/gui/panel_container.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/tree.h"
 
diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp
index 7ea6906d72f2..ad8a8769fc4a 100644
--- a/editor/plugins/animation_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_tree_editor_plugin.cpp
@@ -40,7 +40,6 @@
 #include "core/math/delaunay_2d.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_file_dialog.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
@@ -261,11 +260,11 @@ void AnimationTreeEditorPlugin::make_visible(bool p_visible) {
 		//editor->hide_animation_player_editors();
 		//editor->animation_panel_make_visible(true);
 		button->show();
-		EditorNode::get_singleton()->make_bottom_panel_item_visible(anim_tree_editor);
+		make_bottom_panel_item_visible(anim_tree_editor);
 		anim_tree_editor->set_process(true);
 	} else {
 		if (anim_tree_editor->is_visible_in_tree()) {
-			EditorNode::get_singleton()->hide_bottom_panel();
+			hide_bottom_panel();
 		}
 		button->hide();
 		anim_tree_editor->set_process(false);
@@ -276,7 +275,7 @@ AnimationTreeEditorPlugin::AnimationTreeEditorPlugin() {
 	anim_tree_editor = memnew(AnimationTreeEditor);
 	anim_tree_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
 
-	button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("AnimationTree"), anim_tree_editor);
+	button = add_control_to_bottom_panel(anim_tree_editor, TTR("AnimationTree"));
 	button->hide();
 }
 
diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp
index 157eed02f498..ba67ea3fbed4 100644
--- a/editor/plugins/asset_library_editor_plugin.cpp
+++ b/editor/plugins/asset_library_editor_plugin.cpp
@@ -35,7 +35,6 @@
 #include "core/os/keyboard.h"
 #include "core/version.h"
 #include "editor/editor_file_dialog.h"
-#include "editor/editor_node.h"
 #include "editor/editor_paths.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
@@ -1562,7 +1561,7 @@ void AssetLibraryEditorPlugin::make_visible(bool p_visible) {
 AssetLibraryEditorPlugin::AssetLibraryEditorPlugin() {
 	addon_library = memnew(EditorAssetLibrary);
 	addon_library->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	EditorNode::get_singleton()->get_main_control()->add_child(addon_library);
+	get_editor_interface()->get_editor_main_control()->add_child(addon_library);
 	addon_library->set_anchors_and_offsets_preset(Control::PRESET_WIDE);
 	addon_library->hide();
 }
diff --git a/editor/plugins/audio_stream_editor_plugin.cpp b/editor/plugins/audio_stream_editor_plugin.cpp
index a60e49ca9db7..20754dfc0cde 100644
--- a/editor/plugins/audio_stream_editor_plugin.cpp
+++ b/editor/plugins/audio_stream_editor_plugin.cpp
@@ -34,9 +34,11 @@
 #include "core/io/resource_loader.h"
 #include "core/os/keyboard.h"
 #include "editor/audio_stream_preview.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
+#include "scene/gui/label.h"
 
 void AudioStreamEditor::_notification(int p_what) {
 	switch (p_what) {
@@ -205,9 +207,11 @@ void AudioStreamEditor::edit(Ref<AudioStream> p_stream) {
 void AudioStreamEditor::_bind_methods() {
 }
 
-AudioStreamEditor::AudioStreamEditor() {
+AudioStreamEditor::AudioStreamEditor(EditorPlugin *p_plugin) {
 	set_custom_minimum_size(Size2(1, 100) * EDSCALE);
 
+	Control *gui_base = p_plugin->get_editor_interface()->get_base_control();
+
 	_player = memnew(AudioStreamPlayer);
 	_player->connect("finished", callable_mp(this, &AudioStreamEditor::_on_finished));
 	add_child(_player);
@@ -247,14 +251,14 @@ AudioStreamEditor::AudioStreamEditor() {
 	_current_label = memnew(Label);
 	_current_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
 	_current_label->set_h_size_flags(SIZE_EXPAND_FILL);
-	_current_label->add_theme_font_override("font", EditorNode::get_singleton()->get_gui_base()->get_theme_font(SNAME("status_source"), SNAME("EditorFonts")));
-	_current_label->add_theme_font_size_override("font_size", EditorNode::get_singleton()->get_gui_base()->get_theme_font_size(SNAME("status_source_size"), SNAME("EditorFonts")));
+	_current_label->add_theme_font_override("font", gui_base->get_theme_font(SNAME("status_source"), SNAME("EditorFonts")));
+	_current_label->add_theme_font_size_override("font_size", gui_base->get_theme_font_size(SNAME("status_source_size"), SNAME("EditorFonts")));
 	_current_label->set_modulate(Color(1, 1, 1, 0.5));
 	hbox->add_child(_current_label);
 
 	_duration_label = memnew(Label);
-	_duration_label->add_theme_font_override("font", EditorNode::get_singleton()->get_gui_base()->get_theme_font(SNAME("status_source"), SNAME("EditorFonts")));
-	_duration_label->add_theme_font_size_override("font_size", EditorNode::get_singleton()->get_gui_base()->get_theme_font_size(SNAME("status_source_size"), SNAME("EditorFonts")));
+	_duration_label->add_theme_font_override("font", gui_base->get_theme_font(SNAME("status_source"), SNAME("EditorFonts")));
+	_duration_label->add_theme_font_size_override("font_size", gui_base->get_theme_font_size(SNAME("status_source_size"), SNAME("EditorFonts")));
 	hbox->add_child(_duration_label);
 }
 
@@ -276,7 +280,7 @@ void AudioStreamEditorPlugin::make_visible(bool p_visible) {
 }
 
 AudioStreamEditorPlugin::AudioStreamEditorPlugin() {
-	audio_editor = memnew(AudioStreamEditor);
+	audio_editor = memnew(AudioStreamEditor(this));
 	add_control_to_container(CONTAINER_PROPERTY_EDITOR_BOTTOM, audio_editor);
 	audio_editor->hide();
 }
diff --git a/editor/plugins/audio_stream_editor_plugin.h b/editor/plugins/audio_stream_editor_plugin.h
index 0d927bddd501..745de92c2065 100644
--- a/editor/plugins/audio_stream_editor_plugin.h
+++ b/editor/plugins/audio_stream_editor_plugin.h
@@ -69,7 +69,7 @@ class AudioStreamEditor : public ColorRect {
 
 public:
 	void edit(Ref<AudioStream> p_stream);
-	AudioStreamEditor();
+	AudioStreamEditor(EditorPlugin *p_plugin);
 };
 
 class AudioStreamEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/camera_3d_editor_plugin.cpp b/editor/plugins/camera_3d_editor_plugin.cpp
index 141837244a6a..8eea419f30c7 100644
--- a/editor/plugins/camera_3d_editor_plugin.cpp
+++ b/editor/plugins/camera_3d_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "camera_3d_editor_plugin.h"
 
-#include "editor/editor_node.h"
 #include "node_3d_editor_plugin.h"
 
 void Camera3DEditor::_node_removed(Node *p_node) {
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index a90e151adb70..052b0815d417 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -421,15 +421,16 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, unsig
 
 	if (((is_snap_active && snap_guides && (p_modes & SNAP_GUIDES)) || (p_forced_modes & SNAP_GUIDES)) && fmod(rotation, (real_t)360.0) == 0.0) {
 		// Guides
-		if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) {
-			Array vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_");
+		Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
+		if (edited_scene && edited_scene->has_meta("_edit_vertical_guides_")) {
+			Array vguides = edited_scene->get_meta("_edit_vertical_guides_");
 			for (int i = 0; i < vguides.size(); i++) {
 				_snap_if_closer_float(p_target.x, output.x, snap_target[0], vguides[i], SNAP_TARGET_GUIDE);
 			}
 		}
 
-		if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_horizontal_guides_")) {
-			Array hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_");
+		if (edited_scene && edited_scene->has_meta("_edit_horizontal_guides_")) {
+			Array hguides = edited_scene->get_meta("_edit_horizontal_guides_");
 			for (int i = 0; i < hguides.size(); i++) {
 				_snap_if_closer_float(p_target.y, output.y, snap_target[1], hguides[i], SNAP_TARGET_GUIDE);
 			}
@@ -625,7 +626,7 @@ void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_no
 }
 
 void CanvasItemEditor::_get_canvas_items_at_pos(const Point2 &p_pos, Vector<_SelectResult> &r_items, bool p_allow_locked) {
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
+	Node *scene = plugin->get_editor_interface()->get_edited_scene_root();
 
 	_find_canvas_items_at_pos(p_pos, scene, r_items);
 
@@ -678,9 +679,9 @@ void CanvasItemEditor::_find_canvas_items_in_rect(const Rect2 &p_rect, Node *p_n
 	}
 
 	CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node);
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
+	Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
 
-	bool editable = p_node == scene || p_node->get_owner() == scene || p_node == scene->get_deepest_editable_node(p_node);
+	bool editable = p_node == edited_scene || p_node->get_owner() == edited_scene || p_node == edited_scene->get_deepest_editable_node(p_node);
 	bool lock_children = p_node->has_meta("_edit_group_") && p_node->get_meta("_edit_group_");
 	bool locked = _is_node_locked(p_node);
 
@@ -741,7 +742,7 @@ bool CanvasItemEditor::_select_click_on_item(CanvasItem *item, Point2 p_click_po
 			// Reselect
 			if (Engine::get_singleton()->is_editor_hint()) {
 				selected_from_canvas = true;
-				EditorNode::get_singleton()->edit_node(item);
+				plugin->get_editor_interface()->edit_node(item);
 			}
 		}
 	}
@@ -839,6 +840,8 @@ void CanvasItemEditor::_commit_canvas_item_state(List<CanvasItem *> p_canvas_ite
 		return;
 	}
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
+
 	undo_redo->create_action(action_name);
 	for (CanvasItem *canvas_item : modified_canvas_items) {
 		CanvasItemEditorSelectedItem *se = editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
@@ -899,12 +902,14 @@ void CanvasItemEditor::_add_node_pressed(int p_result) {
 		}
 		case ADD_MOVE: {
 			if (p_result == ADD_MOVE) {
-				nodes_to_move = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list();
+				nodes_to_move = plugin->get_editor_interface()->get_selection()->get_selected_node_list();
 			}
 			if (nodes_to_move.is_empty()) {
 				return;
 			}
 
+			UndoRedo *undo_redo = plugin->get_undo_redo();
+
 			undo_redo->create_action(TTR("Move Node(s) to Position"));
 			for (Node *node : nodes_to_move) {
 				CanvasItem *ci = Object::cast_to<CanvasItem>(node);
@@ -997,16 +1002,17 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 	Ref<InputEventMouseMotion> m = p_event;
 
 	if (drag_type == DRAG_NONE) {
-		if (show_guides && show_rulers && EditorNode::get_singleton()->get_edited_scene()) {
+		Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
+		if (show_guides && show_rulers && edited_scene) {
 			Transform2D xform = viewport_scrollable->get_transform() * transform;
 			// Retrieve the guide lists
 			Array vguides;
-			if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) {
-				vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_");
+			if (edited_scene->has_meta("_edit_vertical_guides_")) {
+				vguides = edited_scene->get_meta("_edit_vertical_guides_");
 			}
 			Array hguides;
-			if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_horizontal_guides_")) {
-				hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_");
+			if (edited_scene->has_meta("_edit_horizontal_guides_")) {
+				hguides = edited_scene->get_meta("_edit_horizontal_guides_");
 			}
 
 			// Hover over guides
@@ -1096,20 +1102,23 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 
 		// Release confirms the guide move
 		if (b.is_valid() && b->get_button_index() == MouseButton::LEFT && !b->is_pressed()) {
-			if (show_guides && EditorNode::get_singleton()->get_edited_scene()) {
+			Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
+			if (show_guides && edited_scene) {
 				Transform2D xform = viewport_scrollable->get_transform() * transform;
 
 				// Retrieve the guide lists
 				Array vguides;
-				if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) {
-					vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_");
+				if (edited_scene->has_meta("_edit_vertical_guides_")) {
+					vguides = edited_scene->get_meta("_edit_vertical_guides_");
 				}
 				Array hguides;
-				if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_horizontal_guides_")) {
-					hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_");
+				if (edited_scene->has_meta("_edit_horizontal_guides_")) {
+					hguides = edited_scene->get_meta("_edit_horizontal_guides_");
 				}
 
 				Point2 edited = snap_point(xform.affine_inverse().xform(b->get_position()), SNAP_GRID | SNAP_PIXEL | SNAP_OTHER_NODES);
+				UndoRedo *undo_redo = plugin->get_undo_redo();
+
 				if (drag_type == DRAG_V_GUIDE) {
 					Array prev_vguides = vguides.duplicate();
 					if (b->get_position().x > RULER_WIDTH) {
@@ -1117,15 +1126,15 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 						if (dragged_guide_index >= 0) {
 							vguides[dragged_guide_index] = edited.x;
 							undo_redo->create_action(TTR("Move Vertical Guide"));
-							undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", vguides);
-							undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", prev_vguides);
+							undo_redo->add_do_method(edited_scene, "set_meta", "_edit_vertical_guides_", vguides);
+							undo_redo->add_undo_method(edited_scene, "set_meta", "_edit_vertical_guides_", prev_vguides);
 							undo_redo->add_undo_method(viewport, "update");
 							undo_redo->commit_action();
 						} else {
 							vguides.push_back(edited.x);
 							undo_redo->create_action(TTR("Create Vertical Guide"));
-							undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", vguides);
-							undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", prev_vguides);
+							undo_redo->add_do_method(edited_scene, "set_meta", "_edit_vertical_guides_", vguides);
+							undo_redo->add_undo_method(edited_scene, "set_meta", "_edit_vertical_guides_", prev_vguides);
 							undo_redo->add_undo_method(viewport, "update");
 							undo_redo->commit_action();
 						}
@@ -1134,11 +1143,11 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 							vguides.remove_at(dragged_guide_index);
 							undo_redo->create_action(TTR("Remove Vertical Guide"));
 							if (vguides.is_empty()) {
-								undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "remove_meta", "_edit_vertical_guides_");
+								undo_redo->add_do_method(edited_scene, "remove_meta", "_edit_vertical_guides_");
 							} else {
-								undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", vguides);
+								undo_redo->add_do_method(edited_scene, "set_meta", "_edit_vertical_guides_", vguides);
 							}
-							undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", prev_vguides);
+							undo_redo->add_undo_method(edited_scene, "set_meta", "_edit_vertical_guides_", prev_vguides);
 							undo_redo->add_undo_method(viewport, "update");
 							undo_redo->commit_action();
 						}
@@ -1150,15 +1159,15 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 						if (dragged_guide_index >= 0) {
 							hguides[dragged_guide_index] = edited.y;
 							undo_redo->create_action(TTR("Move Horizontal Guide"));
-							undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", hguides);
-							undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", prev_hguides);
+							undo_redo->add_do_method(edited_scene, "set_meta", "_edit_horizontal_guides_", hguides);
+							undo_redo->add_undo_method(edited_scene, "set_meta", "_edit_horizontal_guides_", prev_hguides);
 							undo_redo->add_undo_method(viewport, "update");
 							undo_redo->commit_action();
 						} else {
 							hguides.push_back(edited.y);
 							undo_redo->create_action(TTR("Create Horizontal Guide"));
-							undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", hguides);
-							undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", prev_hguides);
+							undo_redo->add_do_method(edited_scene, "set_meta", "_edit_horizontal_guides_", hguides);
+							undo_redo->add_undo_method(edited_scene, "set_meta", "_edit_horizontal_guides_", prev_hguides);
 							undo_redo->add_undo_method(viewport, "update");
 							undo_redo->commit_action();
 						}
@@ -1167,11 +1176,11 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 							hguides.remove_at(dragged_guide_index);
 							undo_redo->create_action(TTR("Remove Horizontal Guide"));
 							if (hguides.is_empty()) {
-								undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "remove_meta", "_edit_horizontal_guides_");
+								undo_redo->add_do_method(edited_scene, "remove_meta", "_edit_horizontal_guides_");
 							} else {
-								undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", hguides);
+								undo_redo->add_do_method(edited_scene, "set_meta", "_edit_horizontal_guides_", hguides);
 							}
-							undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", prev_hguides);
+							undo_redo->add_undo_method(edited_scene, "set_meta", "_edit_horizontal_guides_", prev_hguides);
 							undo_redo->add_undo_method(viewport, "update");
 							undo_redo->commit_action();
 						}
@@ -1184,10 +1193,10 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 						vguides.push_back(edited.x);
 						hguides.push_back(edited.y);
 						undo_redo->create_action(TTR("Create Horizontal and Vertical Guides"));
-						undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", vguides);
-						undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", hguides);
-						undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", prev_vguides);
-						undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", prev_hguides);
+						undo_redo->add_do_method(edited_scene, "set_meta", "_edit_vertical_guides_", vguides);
+						undo_redo->add_do_method(edited_scene, "set_meta", "_edit_horizontal_guides_", hguides);
+						undo_redo->add_undo_method(edited_scene, "set_meta", "_edit_vertical_guides_", prev_vguides);
+						undo_redo->add_undo_method(edited_scene, "set_meta", "_edit_horizontal_guides_", prev_hguides);
 						undo_redo->add_undo_method(viewport, "update");
 						undo_redo->commit_action();
 					}
@@ -1467,7 +1476,7 @@ bool CanvasItemEditor::_gui_input_open_scene_on_double_click(const Ref<InputEven
 		List<CanvasItem *> selection = _get_edited_canvas_items();
 		if (selection.size() == 1) {
 			CanvasItem *canvas_item = selection[0];
-			if (!canvas_item->get_scene_file_path().is_empty() && canvas_item != EditorNode::get_singleton()->get_edited_scene()) {
+			if (!canvas_item->get_scene_file_path().is_empty() && canvas_item != plugin->get_editor_interface()->get_edited_scene_root()) {
 				EditorNode::get_singleton()->open_request(canvas_item->get_scene_file_path());
 				return true;
 			}
@@ -2248,10 +2257,10 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 					if (_is_node_locked(item)) {
 						locked = 1;
 					} else {
-						Node *scene = EditorNode::get_singleton()->get_edited_scene();
+						Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
 						Node *node = item;
 
-						while (node && node != scene->get_parent()) {
+						while (node && node != edited_scene->get_parent()) {
 							CanvasItem *canvas_item_tmp = Object::cast_to<CanvasItem>(node);
 							if (canvas_item_tmp && node->has_meta("_edit_group_")) {
 								locked = 2;
@@ -2266,7 +2275,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 					} else if (locked == 2) {
 						suffix = " (" + TTR("Grouped") + ")";
 					}
-					selection_menu->add_item((String)item->get_name() + suffix);
+					selection_menu->add_item(String(item->get_name()) + suffix);
 					selection_menu->set_item_icon(i, icon);
 					selection_menu->set_item_metadata(i, node_path);
 					selection_menu->set_item_tooltip(i, String(item->get_name()) + "\nType: " + item->get_class() + "\nPath: " + node_path);
@@ -2290,7 +2299,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 					break;
 				}
 			}
-			for (Node *node : EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list()) {
+			for (Node *node : plugin->get_editor_interface()->get_selection()->get_selected_node_list()) {
 				if (Object::cast_to<CanvasItem>(node)) {
 					add_node_menu->add_icon_item(get_theme_icon(SNAME("ToolMove"), SNAME("EditorIcons")), TTR("Move Node(s) Here"), ADD_MOVE);
 					break;
@@ -2308,8 +2317,8 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 			// Single item selection
 			Point2 click = transform.affine_inverse().xform(b->get_position());
 
-			Node *scene = EditorNode::get_singleton()->get_edited_scene();
-			if (!scene) {
+			Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
+			if (!edited_scene) {
 				return true;
 			}
 
@@ -2381,8 +2390,8 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 	if (drag_type == DRAG_BOX_SELECTION) {
 		if (b.is_valid() && !b->is_pressed() && b->get_button_index() == MouseButton::LEFT) {
 			// Confirms box selection
-			Node *scene = EditorNode::get_singleton()->get_edited_scene();
-			if (scene) {
+			Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
+			if (edited_scene) {
 				List<CanvasItem *> selitems;
 
 				Point2 bsfrom = drag_from;
@@ -2394,7 +2403,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 					SWAP(bsfrom.y, bsto.y);
 				}
 
-				_find_canvas_items_in_rect(Rect2(bsfrom, bsto - bsfrom), scene, &selitems);
+				_find_canvas_items_in_rect(Rect2(bsfrom, bsto - bsfrom), edited_scene, &selitems);
 				if (selitems.size() == 1 && editor_selection->get_selected_node_list().is_empty()) {
 					EditorNode::get_singleton()->push_item(selitems[0]);
 				}
@@ -2713,8 +2722,9 @@ void CanvasItemEditor::_draw_guides() {
 	Transform2D xform = viewport_scrollable->get_transform() * transform;
 
 	// Guides already there
-	if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) {
-		Array vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_");
+	Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
+	if (edited_scene && edited_scene->has_meta("_edit_vertical_guides_")) {
+		Array vguides = edited_scene->get_meta("_edit_vertical_guides_");
 		for (int i = 0; i < vguides.size(); i++) {
 			if (drag_type == DRAG_V_GUIDE && i == dragged_guide_index) {
 				continue;
@@ -2724,8 +2734,8 @@ void CanvasItemEditor::_draw_guides() {
 		}
 	}
 
-	if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_horizontal_guides_")) {
-		Array hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_");
+	if (edited_scene && edited_scene->has_meta("_edit_horizontal_guides_")) {
+		Array hguides = edited_scene->get_meta("_edit_horizontal_guides_");
 		for (int i = 0; i < hguides.size(); i++) {
 			if (drag_type == DRAG_H_GUIDE && i == dragged_guide_index) {
 				continue;
@@ -3559,7 +3569,7 @@ void CanvasItemEditor::_draw_axis() {
 void CanvasItemEditor::_draw_invisible_nodes_positions(Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
 	ERR_FAIL_COND(!p_node);
 
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
+	Node *scene = plugin->get_editor_interface()->get_edited_scene_root();
 	if (p_node != scene && p_node->get_owner() != scene && !scene->is_editable_instance(p_node->get_owner())) {
 		return;
 	}
@@ -3629,8 +3639,8 @@ void CanvasItemEditor::_draw_hover() {
 void CanvasItemEditor::_draw_locks_and_groups(Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
 	ERR_FAIL_COND(!p_node);
 
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
-	if (p_node != scene && p_node->get_owner() != scene && !scene->is_editable_instance(p_node->get_owner())) {
+	Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
+	if (p_node != edited_scene && p_node->get_owner() != edited_scene && !edited_scene->is_editable_instance(p_node->get_owner())) {
 		return;
 	}
 	CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node);
@@ -3710,9 +3720,11 @@ void CanvasItemEditor::_draw_viewport() {
 	_draw_grid();
 	_draw_ruler_tool();
 	_draw_axis();
-	if (EditorNode::get_singleton()->get_edited_scene()) {
-		_draw_locks_and_groups(EditorNode::get_singleton()->get_edited_scene());
-		_draw_invisible_nodes_positions(EditorNode::get_singleton()->get_edited_scene());
+
+	Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
+	if (edited_scene) {
+		_draw_locks_and_groups(edited_scene);
+		_draw_invisible_nodes_positions(edited_scene);
 	}
 	_draw_selection();
 
@@ -3920,7 +3932,7 @@ void CanvasItemEditor::edit(CanvasItem *p_canvas_item) {
 void CanvasItemEditor::_update_context_menu_stylebox() {
 	// This must be called when the theme changes to follow the new accent color.
 	Ref<StyleBoxFlat> context_menu_stylebox = memnew(StyleBoxFlat);
-	const Color accent_color = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("accent_color"), SNAME("Editor"));
+	const Color accent_color = plugin->get_editor_interface()->get_base_control()->get_theme_color(SNAME("accent_color"), SNAME("Editor"));
 	context_menu_stylebox->set_bg_color(accent_color * Color(1, 1, 1, 0.1));
 	// Add an underline to the StyleBox, but prevent its minimum vertical size from changing.
 	context_menu_stylebox->set_border_color(accent_color);
@@ -3946,8 +3958,9 @@ void CanvasItemEditor::_update_scrollbars() {
 
 	// Calculate scrollable area.
 	Rect2 canvas_item_rect = Rect2(Point2(), screen_rect);
-	if (EditorNode::get_singleton()->is_inside_tree() && EditorNode::get_singleton()->get_edited_scene()) {
-		Rect2 content_rect = _get_encompassing_rect(EditorNode::get_singleton()->get_edited_scene());
+	Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
+	if (EditorNode::get_singleton()->is_inside_tree() && edited_scene) {
+		Rect2 content_rect = _get_encompassing_rect(edited_scene);
 		canvas_item_rect.expand_to(content_rect.position);
 		canvas_item_rect.expand_to(content_rect.position + content_rect.size);
 	}
@@ -4305,6 +4318,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			viewport->update();
 		} break;
 		case LOCK_SELECTED: {
+			UndoRedo *undo_redo = plugin->get_undo_redo();
 			undo_redo->create_action(TTR("Lock Selected"));
 
 			List<Node *> selection = editor_selection->get_selected_node_list();
@@ -4327,6 +4341,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			undo_redo->commit_action();
 		} break;
 		case UNLOCK_SELECTED: {
+			UndoRedo *undo_redo = plugin->get_undo_redo();
 			undo_redo->create_action(TTR("Unlock Selected"));
 
 			List<Node *> selection = editor_selection->get_selected_node_list();
@@ -4349,6 +4364,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			undo_redo->commit_action();
 		} break;
 		case GROUP_SELECTED: {
+			UndoRedo *undo_redo = plugin->get_undo_redo();
 			undo_redo->create_action(TTR("Group Selected"));
 
 			List<Node *> selection = editor_selection->get_selected_node_list();
@@ -4371,6 +4387,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			undo_redo->commit_action();
 		} break;
 		case UNGROUP_SELECTED: {
+			UndoRedo *undo_redo = plugin->get_undo_redo();
 			undo_redo->create_action(TTR("Ungroup Selected"));
 
 			List<Node *> selection = editor_selection->get_selected_node_list();
@@ -4440,6 +4457,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			if (!pose_clipboard.size()) {
 				break;
 			}
+			UndoRedo *undo_redo = plugin->get_undo_redo();
 
 			undo_redo->create_action(TTR("Paste Pose"));
 			for (const PoseClipboard &E : pose_clipboard) {
@@ -4493,21 +4511,22 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 
 		} break;
 		case CLEAR_GUIDES: {
-			Node *const root = EditorNode::get_singleton()->get_edited_scene();
+			Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
+			UndoRedo *undo_redo = plugin->get_undo_redo();
 
-			if (root && (root->has_meta("_edit_horizontal_guides_") || root->has_meta("_edit_vertical_guides_"))) {
+			if (edited_scene && (edited_scene->has_meta("_edit_horizontal_guides_") || edited_scene->has_meta("_edit_vertical_guides_"))) {
 				undo_redo->create_action(TTR("Clear Guides"));
-				if (root->has_meta("_edit_horizontal_guides_")) {
-					Array hguides = root->get_meta("_edit_horizontal_guides_");
+				if (edited_scene->has_meta("_edit_horizontal_guides_")) {
+					Array hguides = edited_scene->get_meta("_edit_horizontal_guides_");
 
-					undo_redo->add_do_method(root, "remove_meta", "_edit_horizontal_guides_");
-					undo_redo->add_undo_method(root, "set_meta", "_edit_horizontal_guides_", hguides);
+					undo_redo->add_do_method(edited_scene, "remove_meta", "_edit_horizontal_guides_");
+					undo_redo->add_undo_method(edited_scene, "set_meta", "_edit_horizontal_guides_", hguides);
 				}
-				if (root->has_meta("_edit_vertical_guides_")) {
-					Array vguides = root->get_meta("_edit_vertical_guides_");
+				if (edited_scene->has_meta("_edit_vertical_guides_")) {
+					Array vguides = edited_scene->get_meta("_edit_vertical_guides_");
 
-					undo_redo->add_do_method(root, "remove_meta", "_edit_vertical_guides_");
-					undo_redo->add_undo_method(root, "set_meta", "_edit_vertical_guides_", vguides);
+					undo_redo->add_do_method(edited_scene, "remove_meta", "_edit_vertical_guides_");
+					undo_redo->add_undo_method(edited_scene, "set_meta", "_edit_vertical_guides_", vguides);
 				}
 				undo_redo->add_undo_method(viewport, "update");
 				undo_redo->commit_action();
@@ -4528,8 +4547,9 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 		} break;
 		case SKELETON_MAKE_BONES: {
 			Map<Node *, Object *> &selection = editor_selection->get_selection();
-			Node *editor_root = EditorNode::get_singleton()->get_edited_scene()->get_tree()->get_edited_scene_root();
+			Node *editor_root = plugin->get_editor_interface()->get_edited_scene_root()->get_tree()->get_edited_scene_root();
 
+			UndoRedo *undo_redo = plugin->get_undo_redo();
 			undo_redo->create_action(TTR("Create Custom Bone2D(s) from Node(s)"));
 			for (const KeyValue<Node *, Object *> &E : selection) {
 				Node2D *n2d = Object::cast_to<Node2D>(E.key);
@@ -4883,7 +4903,8 @@ void CanvasItemEditor::focus_selection() {
 	_focus_selection(VIEW_CENTER_TO_SELECTION);
 }
 
-CanvasItemEditor::CanvasItemEditor() {
+CanvasItemEditor::CanvasItemEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	zoom = 1.0 / MAX(1, EDSCALE);
 	view_offset = Point2(-150 - RULER_WIDTH, -95 - RULER_WIDTH);
 	previous_update_view_offset = view_offset; // Moves the view a little bit to the left so that (0,0) is visible. The values a relative to a 16/10 screen
@@ -4899,8 +4920,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	snap_target[0] = SNAP_TARGET_NONE;
 	snap_target[1] = SNAP_TARGET_NONE;
 
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
-	editor_selection = EditorNode::get_singleton()->get_editor_selection();
+	editor_selection = plugin->get_editor_interface()->get_selection();
 	editor_selection->add_editor_plugin(this);
 	editor_selection->connect("selection_changed", callable_mp((CanvasItem *)this, &CanvasItem::update));
 	editor_selection->connect("selection_changed", callable_mp(this, &CanvasItemEditor::_selection_changed));
@@ -4952,7 +4972,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	panner.instantiate();
 	panner->set_callbacks(callable_mp(this, &CanvasItemEditor::_scroll_callback), callable_mp(this, &CanvasItemEditor::_pan_callback), callable_mp(this, &CanvasItemEditor::_zoom_callback));
 
-	viewport = memnew(CanvasItemEditorViewport(this));
+	viewport = memnew(CanvasItemEditorViewport(this, p_plugin));
 	viewport_scrollable->add_child(viewport);
 	viewport->set_mouse_filter(MOUSE_FILTER_PASS);
 	viewport->set_anchors_and_offsets_preset(Control::PRESET_WIDE);
@@ -5329,7 +5349,6 @@ CanvasItemEditor::CanvasItemEditor() {
 CanvasItemEditor *CanvasItemEditor::singleton = nullptr;
 
 void CanvasItemEditorPlugin::edit(Object *p_object) {
-	canvas_item_editor->set_undo_redo(&get_undo_redo());
 	canvas_item_editor->edit(Object::cast_to<CanvasItem>(p_object));
 }
 
@@ -5359,9 +5378,9 @@ void CanvasItemEditorPlugin::set_state(const Dictionary &p_state) {
 }
 
 CanvasItemEditorPlugin::CanvasItemEditorPlugin() {
-	canvas_item_editor = memnew(CanvasItemEditor);
+	canvas_item_editor = memnew(CanvasItemEditor(this));
 	canvas_item_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	EditorNode::get_singleton()->get_main_control()->add_child(canvas_item_editor);
+	get_editor_interface()->get_editor_main_control()->add_child(canvas_item_editor);
 	canvas_item_editor->set_anchors_and_offsets_preset(Control::PRESET_WIDE);
 	canvas_item_editor->hide();
 }
@@ -5481,14 +5500,15 @@ void CanvasItemEditorViewport::_create_nodes(Node *parent, Node *child, String &
 
 	Ref<Texture2D> texture = Ref<Texture2D>(Object::cast_to<Texture2D>(ResourceCache::get(path)));
 
+	Node *edited_node = plugin->get_editor_interface()->get_edited_scene_root();
 	if (parent) {
 		editor_data->get_undo_redo().add_do_method(parent, "add_child", child, true);
-		editor_data->get_undo_redo().add_do_method(child, "set_owner", EditorNode::get_singleton()->get_edited_scene());
+		editor_data->get_undo_redo().add_do_method(child, "set_owner", edited_node);
 		editor_data->get_undo_redo().add_do_reference(child);
 		editor_data->get_undo_redo().add_undo_method(parent, "remove_child", child);
 	} else { // If no parent is selected, set as root node of the scene.
 		editor_data->get_undo_redo().add_do_method(EditorNode::get_singleton(), "set_edited_scene", child);
-		editor_data->get_undo_redo().add_do_method(child, "set_owner", EditorNode::get_singleton()->get_edited_scene());
+		editor_data->get_undo_redo().add_do_method(child, "set_owner", edited_node);
 		editor_data->get_undo_redo().add_do_reference(child);
 		editor_data->get_undo_redo().add_undo_method(EditorNode::get_singleton(), "set_edited_scene", (Object *)nullptr);
 	}
@@ -5496,8 +5516,8 @@ void CanvasItemEditorViewport::_create_nodes(Node *parent, Node *child, String &
 	if (parent) {
 		String new_name = parent->validate_child_name(child);
 		EditorDebuggerNode *ed = EditorDebuggerNode::get_singleton();
-		editor_data->get_undo_redo().add_do_method(ed, "live_debug_create_node", EditorNode::get_singleton()->get_edited_scene()->get_path_to(parent), child->get_class(), new_name);
-		editor_data->get_undo_redo().add_undo_method(ed, "live_debug_remove_node", NodePath(String(EditorNode::get_singleton()->get_edited_scene()->get_path_to(parent)) + "/" + new_name));
+		editor_data->get_undo_redo().add_do_method(ed, "live_debug_create_node", edited_node->get_path_to(parent), child->get_class(), new_name);
+		editor_data->get_undo_redo().add_undo_method(ed, "live_debug_remove_node", NodePath(String(plugin->get_editor_interface()->get_edited_scene_root()->get_path_to(parent)) + "/" + new_name));
 	}
 
 	if (Object::cast_to<TouchScreenButton>(child) || Object::cast_to<TextureButton>(child)) {
@@ -5541,7 +5561,7 @@ bool CanvasItemEditorViewport::_create_instance(Node *parent, String &path, cons
 		return false;
 	}
 
-	Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
+	Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
 
 	if (!edited_scene->get_scene_file_path().is_empty()) { // cyclical instancing
 		if (_cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
@@ -5719,8 +5739,8 @@ void CanvasItemEditorViewport::drop_data(const Point2 &p_point, const Variant &p
 		return;
 	}
 
-	List<Node *> selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list();
-	Node *root_node = EditorNode::get_singleton()->get_edited_scene();
+	List<Node *> selected_nodes = plugin->get_editor_interface()->get_selection()->get_selected_node_list();
+	Node *root_node = plugin->get_editor_interface()->get_edited_scene_root();
 	if (selected_nodes.size() > 0) {
 		Node *selected_node = selected_nodes[0];
 		target_node = root_node;
@@ -5802,7 +5822,8 @@ void CanvasItemEditorViewport::_notification(int p_what) {
 void CanvasItemEditorViewport::_bind_methods() {
 }
 
-CanvasItemEditorViewport::CanvasItemEditorViewport(CanvasItemEditor *p_canvas_item_editor) {
+CanvasItemEditorViewport::CanvasItemEditorViewport(CanvasItemEditor *p_canvas_item_editor, EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	default_texture_node_type = "Sprite2D";
 	// Node2D
 	texture_node_types.push_back("Sprite2D");
@@ -5822,10 +5843,10 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(CanvasItemEditor *p_canvas_it
 	preview_node = memnew(Control);
 
 	accept = memnew(AcceptDialog);
-	EditorNode::get_singleton()->get_gui_base()->add_child(accept);
+	plugin->get_editor_interface()->get_base_control()->add_child(accept);
 
 	selector = memnew(AcceptDialog);
-	EditorNode::get_singleton()->get_gui_base()->add_child(selector);
+	plugin->get_editor_interface()->get_base_control()->add_child(selector);
 	selector->set_title(TTR("Change Default Type"));
 	selector->connect("confirmed", callable_mp(this, &CanvasItemEditorViewport::_on_change_type_confirmed));
 	selector->connect("cancelled", callable_mp(this, &CanvasItemEditorViewport::_on_change_type_closed));
diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h
index 26852ea8ed5d..65898bc20655 100644
--- a/editor/plugins/canvas_item_editor_plugin.h
+++ b/editor/plugins/canvas_item_editor_plugin.h
@@ -35,7 +35,9 @@
 #include "editor/editor_zoom_widget.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
+#include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/split_container.h"
@@ -182,6 +184,8 @@ class CanvasItemEditor : public VBoxContainer {
 
 	bool selection_menu_additive_selection;
 
+	EditorPlugin *plugin;
+
 	Tool tool = TOOL_SELECT;
 	Control *viewport = nullptr;
 	Control *viewport_scrollable = nullptr;
@@ -400,8 +404,6 @@ class CanvasItemEditor : public VBoxContainer {
 	void _prepare_grid_menu();
 	void _on_grid_menu_id_pressed(int p_id);
 
-	UndoRedo *undo_redo = nullptr;
-
 	List<CanvasItem *> _get_edited_canvas_items(bool retrieve_locked = false, bool remove_canvas_item_if_parent_in_selection = true);
 	Rect2 _get_encompassing_rect_from_list(List<CanvasItem *> p_list);
 	void _expand_encompassing_rect_using_children(Rect2 &r_rect, const Node *p_node, bool &r_first, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D(), bool include_locked_nodes = true);
@@ -550,14 +552,13 @@ class CanvasItemEditor : public VBoxContainer {
 	Tool get_current_tool() { return tool; }
 	void set_current_tool(Tool p_tool);
 
-	void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; }
 	void edit(CanvasItem *p_canvas_item);
 
 	void focus_selection();
 
 	EditorSelection *editor_selection = nullptr;
 
-	CanvasItemEditor();
+	CanvasItemEditor(EditorPlugin *p_plugin);
 };
 
 class CanvasItemEditorPlugin : public EditorPlugin {
@@ -595,6 +596,7 @@ class CanvasItemEditorViewport : public Control {
 	EditorData *editor_data = nullptr;
 	CanvasItemEditor *canvas_item_editor = nullptr;
 	Control *preview_node = nullptr;
+	EditorPlugin *plugin = nullptr;
 	AcceptDialog *accept = nullptr;
 	AcceptDialog *selector = nullptr;
 	Label *selector_label = nullptr;
@@ -629,7 +631,7 @@ class CanvasItemEditorViewport : public Control {
 	virtual bool can_drop_data(const Point2 &p_point, const Variant &p_data) const override;
 	virtual void drop_data(const Point2 &p_point, const Variant &p_data) override;
 
-	CanvasItemEditorViewport(CanvasItemEditor *p_canvas_item_editor);
+	CanvasItemEditorViewport(CanvasItemEditor *p_canvas_item_editor, EditorPlugin *p_plugin);
 	~CanvasItemEditorViewport();
 };
 
diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp
index af20064a8dfd..326dbf646200 100644
--- a/editor/plugins/collision_shape_2d_editor_plugin.cpp
+++ b/editor/plugins/collision_shape_2d_editor_plugin.cpp
@@ -31,8 +31,8 @@
 #include "collision_shape_2d_editor_plugin.h"
 
 #include "canvas_item_editor_plugin.h"
+#include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_node.h"
 #include "scene/resources/capsule_shape_2d.h"
 #include "scene/resources/circle_shape_2d.h"
 #include "scene/resources/concave_polygon_shape_2d.h"
@@ -116,6 +116,7 @@ Variant CollisionShape2DEditor::get_handle_value(int idx) const {
 }
 
 void CollisionShape2DEditor::set_handle(int idx, Point2 &p_point) {
+	CanvasItemEditor *canvas_item_editor = CanvasItemEditor::get_singleton();
 	switch (shape_type) {
 		case CAPSULE_SHAPE: {
 			if (idx < 2) {
@@ -218,6 +219,8 @@ void CollisionShape2DEditor::set_handle(int idx, Point2 &p_point) {
 }
 
 void CollisionShape2DEditor::commit_handle(int idx, Variant &p_org) {
+	UndoRedo *undo_redo = plugin->get_undo_redo();
+	CanvasItemEditor *canvas_item_editor = CanvasItemEditor::get_singleton();
 	undo_redo->create_action(TTR("Set Handle"));
 
 	switch (shape_type) {
@@ -333,7 +336,7 @@ bool CollisionShape2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_e
 	}
 
 	Ref<InputEventMouseButton> mb = p_event;
-	Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
+	Transform2D xform = CanvasItemEditor::get_singleton()->get_canvas_transform() * node->get_global_transform();
 
 	if (mb.is_valid()) {
 		Vector2 gpoint = mb->get_position();
@@ -383,6 +386,8 @@ bool CollisionShape2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_e
 			return false;
 		}
 
+		CanvasItemEditor *canvas_item_editor = CanvasItemEditor::get_singleton();
+
 		Vector2 cpoint = canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(mm->get_position()));
 		cpoint = original_transform.affine_inverse().xform(cpoint);
 		last_point = cpoint;
@@ -438,7 +443,7 @@ void CollisionShape2DEditor::_get_current_shape_type() {
 		shape_type = -1;
 	}
 
-	canvas_item_editor->update_viewport();
+	CanvasItemEditor::get_singleton()->update_viewport();
 }
 
 void CollisionShape2DEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
@@ -460,7 +465,7 @@ void CollisionShape2DEditor::forward_canvas_draw_over_viewport(Control *p_overla
 		return;
 	}
 
-	Transform2D gt = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
+	Transform2D gt = CanvasItemEditor::get_singleton()->get_canvas_transform() * node->get_global_transform();
 
 	Ref<Texture2D> h = get_theme_icon(SNAME("EditorHandle"), SNAME("EditorIcons"));
 	Vector2 size = h->get_size() * 0.5;
@@ -560,10 +565,6 @@ void CollisionShape2DEditor::_notification(int p_what) {
 }
 
 void CollisionShape2DEditor::edit(Node *p_node) {
-	if (!canvas_item_editor) {
-		canvas_item_editor = CanvasItemEditor::get_singleton();
-	}
-
 	if (p_node) {
 		node = Object::cast_to<CollisionShape2D>(p_node);
 
@@ -576,18 +577,16 @@ void CollisionShape2DEditor::edit(Node *p_node) {
 		node = nullptr;
 	}
 
-	canvas_item_editor->update_viewport();
+	CanvasItemEditor::get_singleton()->update_viewport();
 }
 
 void CollisionShape2DEditor::_bind_methods() {
 	ClassDB::bind_method("_get_current_shape_type", &CollisionShape2DEditor::_get_current_shape_type);
 }
 
-CollisionShape2DEditor::CollisionShape2DEditor() {
+CollisionShape2DEditor::CollisionShape2DEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	node = nullptr;
-	canvas_item_editor = nullptr;
-
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
 
 	edit_handle = -1;
 	pressed = false;
@@ -610,8 +609,8 @@ void CollisionShape2DEditorPlugin::make_visible(bool visible) {
 }
 
 CollisionShape2DEditorPlugin::CollisionShape2DEditorPlugin() {
-	collision_shape_2d_editor = memnew(CollisionShape2DEditor);
-	EditorNode::get_singleton()->get_gui_base()->add_child(collision_shape_2d_editor);
+	collision_shape_2d_editor = memnew(CollisionShape2DEditor(this));
+	get_editor_interface()->get_base_control()->add_child(collision_shape_2d_editor);
 }
 
 CollisionShape2DEditorPlugin::~CollisionShape2DEditorPlugin() {
diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h
index da9e9f339fd0..5d46d0445c7b 100644
--- a/editor/plugins/collision_shape_2d_editor_plugin.h
+++ b/editor/plugins/collision_shape_2d_editor_plugin.h
@@ -61,8 +61,7 @@ class CollisionShape2DEditor : public Control {
 		Point2(1, -1),
 	};
 
-	UndoRedo *undo_redo = nullptr;
-	CanvasItemEditor *canvas_item_editor = nullptr;
+	EditorPlugin *plugin = nullptr;
 	CollisionShape2D *node = nullptr;
 
 	Vector<Point2> handles;
@@ -90,7 +89,7 @@ class CollisionShape2DEditor : public Control {
 	void forward_canvas_draw_over_viewport(Control *p_overlay);
 	void edit(Node *p_node);
 
-	CollisionShape2DEditor();
+	CollisionShape2DEditor(EditorPlugin *p_plugin);
 };
 
 class CollisionShape2DEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/control_editor_plugin.cpp b/editor/plugins/control_editor_plugin.cpp
index 5ca8216d4df8..653472c119e2 100644
--- a/editor/plugins/control_editor_plugin.cpp
+++ b/editor/plugins/control_editor_plugin.cpp
@@ -455,6 +455,7 @@ bool EditorInspectorPluginControl::parse_property(Object *p_object, const Varian
 void ControlEditorToolbar::_set_anchors_and_offsets_preset(Control::LayoutPreset p_preset) {
 	List<Node *> selection = editor_selection->get_selected_node_list();
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Change Anchors and Offsets"));
 
 	for (Node *E : selection) {
@@ -496,6 +497,7 @@ void ControlEditorToolbar::_set_anchors_and_offsets_preset(Control::LayoutPreset
 void ControlEditorToolbar::_set_anchors_and_offsets_to_keep_ratio() {
 	List<Node *> selection = editor_selection->get_selected_node_list();
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Change Anchors and Offsets"));
 
 	for (Node *E : selection) {
@@ -528,6 +530,7 @@ void ControlEditorToolbar::_set_anchors_and_offsets_to_keep_ratio() {
 void ControlEditorToolbar::_set_anchors_preset(Control::LayoutPreset p_preset) {
 	List<Node *> selection = editor_selection->get_selected_node_list();
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Change Anchors"));
 	for (Node *E : selection) {
 		Control *control = Object::cast_to<Control>(E);
@@ -543,6 +546,7 @@ void ControlEditorToolbar::_set_anchors_preset(Control::LayoutPreset p_preset) {
 void ControlEditorToolbar::_set_container_h_preset(Control::SizeFlags p_preset) {
 	List<Node *> selection = editor_selection->get_selected_node_list();
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Change Horizontal Size Flags"));
 	for (Node *E : selection) {
 		Control *control = Object::cast_to<Control>(E);
@@ -558,6 +562,7 @@ void ControlEditorToolbar::_set_container_h_preset(Control::SizeFlags p_preset)
 void ControlEditorToolbar::_set_container_v_preset(Control::SizeFlags p_preset) {
 	List<Node *> selection = editor_selection->get_selected_node_list();
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Change Horizontal Size Flags"));
 	for (Node *E : selection) {
 		Control *control = Object::cast_to<Control>(E);
@@ -947,7 +952,8 @@ void ControlEditorToolbar::_notification(int p_what) {
 	}
 }
 
-ControlEditorToolbar::ControlEditorToolbar() {
+ControlEditorToolbar::ControlEditorToolbar(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	anchor_presets_menu = memnew(MenuButton);
 	anchor_presets_menu->set_shortcut_context(this);
 	anchor_presets_menu->set_text(TTR("Anchors"));
@@ -992,8 +998,7 @@ ControlEditorToolbar::ControlEditorToolbar() {
 	p = container_v_presets_menu->get_popup();
 	p->connect("id_pressed", callable_mp(this, &ControlEditorToolbar::_popup_callback));
 
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
-	editor_selection = EditorNode::get_singleton()->get_editor_selection();
+	editor_selection = plugin->get_editor_interface()->get_selection();
 	editor_selection->add_editor_plugin(this);
 	editor_selection->connect("selection_changed", callable_mp(this, &ControlEditorToolbar::_selection_changed));
 
@@ -1003,7 +1008,7 @@ ControlEditorToolbar::ControlEditorToolbar() {
 ControlEditorToolbar *ControlEditorToolbar::singleton = nullptr;
 
 ControlEditorPlugin::ControlEditorPlugin() {
-	toolbar = memnew(ControlEditorToolbar);
+	toolbar = memnew(ControlEditorToolbar(this));
 	toolbar->hide();
 	add_control_to_container(CONTAINER_CANVAS_EDITOR_MENU, toolbar);
 
diff --git a/editor/plugins/control_editor_plugin.h b/editor/plugins/control_editor_plugin.h
index 96451f7dcf79..50dc18ac0576 100644
--- a/editor/plugins/control_editor_plugin.h
+++ b/editor/plugins/control_editor_plugin.h
@@ -31,12 +31,15 @@
 #ifndef CONTROL_EDITOR_PLUGIN_H
 #define CONTROL_EDITOR_PLUGIN_H
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/control.h"
+#include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/margin_container.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/texture_rect.h"
@@ -128,7 +131,7 @@ class EditorInspectorPluginControl : public EditorInspectorPlugin {
 class ControlEditorToolbar : public HBoxContainer {
 	GDCLASS(ControlEditorToolbar, HBoxContainer);
 
-	UndoRedo *undo_redo = nullptr;
+	EditorPlugin *plugin = nullptr;
 	EditorSelection *editor_selection = nullptr;
 
 	enum MenuOption {
@@ -233,7 +236,7 @@ class ControlEditorToolbar : public HBoxContainer {
 
 	static ControlEditorToolbar *get_singleton() { return singleton; }
 
-	ControlEditorToolbar();
+	ControlEditorToolbar(EditorPlugin *p_plugin);
 };
 
 class ControlEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.cpp b/editor/plugins/cpu_particles_2d_editor_plugin.cpp
index 79025041d301..bcc8b1d6f1a4 100644
--- a/editor/plugins/cpu_particles_2d_editor_plugin.cpp
+++ b/editor/plugins/cpu_particles_2d_editor_plugin.cpp
@@ -33,7 +33,6 @@
 #include "canvas_item_editor_plugin.h"
 #include "core/io/image_loader.h"
 #include "editor/editor_file_dialog.h"
-#include "editor/editor_node.h"
 #include "scene/2d/cpu_particles_2d.h"
 #include "scene/gui/separator.h"
 #include "scene/resources/particles_material.h"
@@ -238,7 +237,6 @@ void CPUParticles2DEditorPlugin::_bind_methods() {
 
 CPUParticles2DEditorPlugin::CPUParticles2DEditorPlugin() {
 	particles = nullptr;
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
 
 	toolbar = memnew(HBoxContainer);
 	add_control_to_container(CONTAINER_CANVAS_EDITOR_MENU, toolbar);
diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.h b/editor/plugins/cpu_particles_2d_editor_plugin.h
index cc59bc924fa3..7a31d337522e 100644
--- a/editor/plugins/cpu_particles_2d_editor_plugin.h
+++ b/editor/plugins/cpu_particles_2d_editor_plugin.h
@@ -35,8 +35,11 @@
 #include "scene/2d/collision_polygon_2d.h"
 #include "scene/2d/cpu_particles_2d.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/check_box.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/option_button.h"
 
-class EditorPlugin;
 class SpinBox;
 class EditorFileDialog;
 
@@ -70,7 +73,6 @@ class CPUParticles2DEditorPlugin : public EditorPlugin {
 
 	String source_emission_file;
 
-	UndoRedo *undo_redo = nullptr;
 	void _file_selected(const String &p_file);
 	void _menu_callback(int p_idx);
 	void _generate_emission_mask();
diff --git a/editor/plugins/cpu_particles_3d_editor_plugin.cpp b/editor/plugins/cpu_particles_3d_editor_plugin.cpp
index 775c2dbb2a7c..6dbe22666d7b 100644
--- a/editor/plugins/cpu_particles_3d_editor_plugin.cpp
+++ b/editor/plugins/cpu_particles_3d_editor_plugin.cpp
@@ -30,7 +30,6 @@
 
 #include "cpu_particles_3d_editor_plugin.h"
 
-#include "editor/editor_node.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/scene_tree_editor.h"
 #include "scene/gui/menu_button.h"
@@ -126,7 +125,7 @@ void CPUParticles3DEditorPlugin::make_visible(bool p_visible) {
 
 CPUParticles3DEditorPlugin::CPUParticles3DEditorPlugin() {
 	particles_editor = memnew(CPUParticles3DEditor);
-	EditorNode::get_singleton()->get_main_control()->add_child(particles_editor);
+	get_editor_interface()->get_editor_main_control()->add_child(particles_editor);
 
 	particles_editor->hide();
 }
diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp
index 6d1a86765ab9..af24bfbad7a5 100644
--- a/editor/plugins/curve_editor_plugin.cpp
+++ b/editor/plugins/curve_editor_plugin.cpp
@@ -30,14 +30,16 @@
 
 #include "curve_editor_plugin.h"
 
-#include "canvas_item_editor_plugin.h"
 #include "core/core_string_names.h"
 #include "core/input/input.h"
+#include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
+#include "editor/plugins/canvas_item_editor_plugin.h"
 
-CurveEditor::CurveEditor() {
+CurveEditor::CurveEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	_selected_point = -1;
 	_hover_point = -1;
 	_selected_tangent = TANGENT_NONE;
@@ -138,14 +140,14 @@ void CurveEditor::gui_input(const Ref<InputEvent> &p_event) {
 		if (!mb.is_pressed() && _dragging && mb.get_button_index() == MouseButton::LEFT) {
 			_dragging = false;
 			if (_has_undo_data) {
-				UndoRedo &ur = *EditorNode::get_singleton()->get_undo_redo();
+				UndoRedo *undo_redo = plugin->get_undo_redo();
 
-				ur.create_action(_selected_tangent == TANGENT_NONE ? TTR("Modify Curve Point") : TTR("Modify Curve Tangent"));
-				ur.add_do_method(*_curve_ref, "_set_data", _curve_ref->get_data());
-				ur.add_undo_method(*_curve_ref, "_set_data", _undo_data);
+				undo_redo->create_action(_selected_tangent == TANGENT_NONE ? TTR("Modify Curve Point") : TTR("Modify Curve Tangent"));
+				undo_redo->add_do_method(*_curve_ref, "_set_data", _curve_ref->get_data());
+				undo_redo->add_undo_method(*_curve_ref, "_set_data", _undo_data);
 				// Note: this will trigger one more "changed" signal even if nothing changes,
 				// but it's ok since it would have fired every frame during the drag anyways
-				ur.commit_action();
+				undo_redo->commit_action();
 
 				_has_undo_data = false;
 			}
@@ -300,13 +302,13 @@ void CurveEditor::on_preset_item_selected(int preset_id) {
 			break;
 	}
 
-	UndoRedo &ur = *EditorNode::get_singleton()->get_undo_redo();
-	ur.create_action(TTR("Load Curve Preset"));
+	UndoRedo *undo_redo = plugin->get_undo_redo();
+	undo_redo->create_action(TTR("Load Curve Preset"));
 
-	ur.add_do_method(&curve, "_set_data", curve.get_data());
-	ur.add_undo_method(&curve, "_set_data", previous_data);
+	undo_redo->add_do_method(&curve, "_set_data", curve.get_data());
+	undo_redo->add_undo_method(&curve, "_set_data", previous_data);
 
-	ur.commit_action();
+	undo_redo->commit_action();
 }
 
 void CurveEditor::_curve_changed() {
@@ -434,8 +436,8 @@ CurveEditor::TangentIndex CurveEditor::get_tangent_at(Vector2 pos) const {
 void CurveEditor::add_point(Vector2 pos) {
 	ERR_FAIL_COND(_curve_ref.is_null());
 
-	UndoRedo &ur = *EditorNode::get_singleton()->get_undo_redo();
-	ur.create_action(TTR("Remove Curve Point"));
+	UndoRedo *undo_redo = plugin->get_undo_redo();
+	undo_redo->create_action(TTR("Remove Curve Point"));
 
 	Vector2 point_pos = get_world_pos(pos);
 	if (point_pos.y < 0.0) {
@@ -448,22 +450,22 @@ void CurveEditor::add_point(Vector2 pos) {
 	int i = _curve_ref->add_point(point_pos);
 	_curve_ref->remove_point(i);
 
-	ur.add_do_method(*_curve_ref, "add_point", point_pos);
-	ur.add_undo_method(*_curve_ref, "remove_point", i);
+	undo_redo->add_do_method(*_curve_ref, "add_point", point_pos);
+	undo_redo->add_undo_method(*_curve_ref, "remove_point", i);
 
-	ur.commit_action();
+	undo_redo->commit_action();
 }
 
 void CurveEditor::remove_point(int index) {
 	ERR_FAIL_COND(_curve_ref.is_null());
 
-	UndoRedo &ur = *EditorNode::get_singleton()->get_undo_redo();
-	ur.create_action(TTR("Remove Curve Point"));
+	UndoRedo *undo_redo = plugin->get_undo_redo();
+	undo_redo->create_action(TTR("Remove Curve Point"));
 
 	Curve::Point p = _curve_ref->get_point(index);
 
-	ur.add_do_method(*_curve_ref, "remove_point", index);
-	ur.add_undo_method(*_curve_ref, "add_point", p.position, p.left_tangent, p.right_tangent, p.left_mode, p.right_mode);
+	undo_redo->add_do_method(*_curve_ref, "remove_point", index);
+	undo_redo->add_undo_method(*_curve_ref, "add_point", p.position, p.left_tangent, p.right_tangent, p.left_mode, p.right_mode);
 
 	if (index == _selected_point) {
 		set_selected_point(-1);
@@ -473,14 +475,14 @@ void CurveEditor::remove_point(int index) {
 		set_hover_point_index(-1);
 	}
 
-	ur.commit_action();
+	undo_redo->commit_action();
 }
 
 void CurveEditor::toggle_linear(TangentIndex tangent) {
 	ERR_FAIL_COND(_curve_ref.is_null());
 
-	UndoRedo &ur = *EditorNode::get_singleton()->get_undo_redo();
-	ur.create_action(TTR("Toggle Curve Linear Tangent"));
+	UndoRedo *undo_redo = plugin->get_undo_redo();
+	undo_redo->create_action(TTR("Toggle Curve Linear Tangent"));
 
 	if (tangent == TANGENT_NONE) {
 		tangent = _selected_tangent;
@@ -492,8 +494,8 @@ void CurveEditor::toggle_linear(TangentIndex tangent) {
 		Curve::TangentMode prev_mode = _curve_ref->get_point_left_mode(_selected_point);
 		Curve::TangentMode mode = is_linear ? Curve::TANGENT_FREE : Curve::TANGENT_LINEAR;
 
-		ur.add_do_method(*_curve_ref, "set_point_left_mode", _selected_point, mode);
-		ur.add_undo_method(*_curve_ref, "set_point_left_mode", _selected_point, prev_mode);
+		undo_redo->add_do_method(*_curve_ref, "set_point_left_mode", _selected_point, mode);
+		undo_redo->add_undo_method(*_curve_ref, "set_point_left_mode", _selected_point, prev_mode);
 
 	} else {
 		bool is_linear = _curve_ref->get_point_right_mode(_selected_point) == Curve::TANGENT_LINEAR;
@@ -501,11 +503,11 @@ void CurveEditor::toggle_linear(TangentIndex tangent) {
 		Curve::TangentMode prev_mode = _curve_ref->get_point_right_mode(_selected_point);
 		Curve::TangentMode mode = is_linear ? Curve::TANGENT_FREE : Curve::TANGENT_LINEAR;
 
-		ur.add_do_method(*_curve_ref, "set_point_right_mode", _selected_point, mode);
-		ur.add_undo_method(*_curve_ref, "set_point_right_mode", _selected_point, prev_mode);
+		undo_redo->add_do_method(*_curve_ref, "set_point_right_mode", _selected_point, mode);
+		undo_redo->add_undo_method(*_curve_ref, "set_point_right_mode", _selected_point, prev_mode);
 	}
 
-	ur.commit_action();
+	undo_redo->commit_action();
 }
 
 void CurveEditor::set_selected_point(int index) {
@@ -771,15 +773,18 @@ void EditorInspectorPluginCurve::parse_begin(Object *p_object) {
 	ERR_FAIL_COND(!curve);
 	Ref<Curve> c(curve);
 
-	CurveEditor *editor = memnew(CurveEditor);
+	CurveEditor *editor = memnew(CurveEditor(plugin));
 	editor->set_curve(curve);
 	add_custom_control(editor);
 }
 
+EditorInspectorPluginCurve::EditorInspectorPluginCurve(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
+}
+
 CurveEditorPlugin::CurveEditorPlugin() {
-	Ref<EditorInspectorPluginCurve> curve_plugin;
-	curve_plugin.instantiate();
-	EditorInspector::add_inspector_plugin(curve_plugin);
+	Ref<EditorInspectorPluginCurve> curve_plugin = memnew(EditorInspectorPluginCurve(this));
+	add_inspector_plugin(curve_plugin);
 
 	get_editor_interface()->get_resource_previewer()->add_preview_generator(memnew(CurvePreviewGenerator));
 }
diff --git a/editor/plugins/curve_editor_plugin.h b/editor/plugins/curve_editor_plugin.h
index 5cf3b16a0629..173191e31376 100644
--- a/editor/plugins/curve_editor_plugin.h
+++ b/editor/plugins/curve_editor_plugin.h
@@ -31,6 +31,7 @@
 #ifndef CURVE_EDITOR_PLUGIN_H
 #define CURVE_EDITOR_PLUGIN_H
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "editor/editor_resource_preview.h"
 #include "scene/resources/curve.h"
@@ -40,7 +41,7 @@ class CurveEditor : public Control {
 	GDCLASS(CurveEditor, Control);
 
 public:
-	CurveEditor();
+	CurveEditor(EditorPlugin *p_plugin);
 
 	Size2 get_minimum_size() const override;
 
@@ -96,6 +97,8 @@ class CurveEditor : public Control {
 	void _draw();
 
 private:
+	EditorPlugin *plugin;
+
 	Transform2D _world_to_view;
 
 	Ref<Curve> _curve_ref;
@@ -119,9 +122,13 @@ class CurveEditor : public Control {
 class EditorInspectorPluginCurve : public EditorInspectorPlugin {
 	GDCLASS(EditorInspectorPluginCurve, EditorInspectorPlugin);
 
+	EditorPlugin *plugin;
+
 public:
 	virtual bool can_handle(Object *p_object) override;
 	virtual void parse_begin(Object *p_object) override;
+
+	EditorInspectorPluginCurve(EditorPlugin *p_plugin);
 };
 
 class CurveEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/debugger_editor_plugin.cpp b/editor/plugins/debugger_editor_plugin.cpp
index c8d5aa3fdcdb..875a28e006f7 100644
--- a/editor/plugins/debugger_editor_plugin.cpp
+++ b/editor/plugins/debugger_editor_plugin.cpp
@@ -33,8 +33,8 @@
 #include "core/os/keyboard.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/editor_debugger_server.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 #include "editor/fileserver/editor_file_server.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "scene/gui/menu_button.h"
@@ -53,7 +53,7 @@ DebuggerEditorPlugin::DebuggerEditorPlugin(MenuButton *p_debug_menu) {
 	file_server = memnew(EditorFileServer);
 
 	EditorDebuggerNode *debugger = memnew(EditorDebuggerNode);
-	Button *db = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Debugger"), debugger);
+	Button *db = add_control_to_bottom_panel(debugger, TTR("Debugger"));
 	// Add separation for the warning/error icon that is displayed later.
 	db->add_theme_constant_override("hseparation", 6 * EDSCALE);
 	debugger->set_tool_button(db);
diff --git a/editor/plugins/font_editor_plugin.cpp b/editor/plugins/font_editor_plugin.cpp
index b9de621bcb5a..a783cb758320 100644
--- a/editor/plugins/font_editor_plugin.cpp
+++ b/editor/plugins/font_editor_plugin.cpp
@@ -102,5 +102,5 @@ bool EditorInspectorPluginFont::parse_property(Object *p_object, const Variant::
 FontEditorPlugin::FontEditorPlugin() {
 	Ref<EditorInspectorPluginFont> fd_plugin;
 	fd_plugin.instantiate();
-	EditorInspector::add_inspector_plugin(fd_plugin);
+	add_inspector_plugin(fd_plugin);
 }
diff --git a/editor/plugins/font_editor_plugin.h b/editor/plugins/font_editor_plugin.h
index 3f0700d880f3..c080349b54c1 100644
--- a/editor/plugins/font_editor_plugin.h
+++ b/editor/plugins/font_editor_plugin.h
@@ -31,6 +31,7 @@
 #ifndef FONT_EDITOR_PLUGIN_H
 #define FONT_EDITOR_PLUGIN_H
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "scene/resources/font.h"
 #include "scene/resources/text_line.h"
diff --git a/editor/plugins/gpu_particles_2d_editor_plugin.cpp b/editor/plugins/gpu_particles_2d_editor_plugin.cpp
index b15aec87d9be..2302f0dc23b2 100644
--- a/editor/plugins/gpu_particles_2d_editor_plugin.cpp
+++ b/editor/plugins/gpu_particles_2d_editor_plugin.cpp
@@ -61,7 +61,7 @@ void GPUParticles2DEditorPlugin::_file_selected(const String &p_file) {
 }
 
 void GPUParticles2DEditorPlugin::_selection_changed() {
-	List<Node *> selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list();
+	List<Node *> selected_nodes = get_editor_interface()->get_selection()->get_selected_node_list();
 
 	if (selected_particles.is_empty() && selected_nodes.is_empty()) {
 		return;
@@ -111,7 +111,7 @@ void GPUParticles2DEditorPlugin::_menu_callback(int p_idx) {
 			cpu_particles->set_process_mode(particles->get_process_mode());
 			cpu_particles->set_z_index(particles->get_z_index());
 
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			UndoRedo *ur = get_undo_redo();
 			ur->create_action(TTR("Convert to CPUParticles2D"));
 			ur->add_do_method(SceneTreeDock::get_singleton(), "replace_node", particles, cpu_particles, true, false);
 			ur->add_do_reference(cpu_particles);
@@ -159,6 +159,8 @@ void GPUParticles2DEditorPlugin::_generate_visibility_rect() {
 		particles->set_emitting(false);
 	}
 
+	UndoRedo *undo_redo = get_undo_redo();
+
 	undo_redo->create_action(TTR("Generate Visibility Rect"));
 	undo_redo->add_do_method(particles, "set_visibility_rect", rect);
 	undo_redo->add_undo_method(particles, "set_visibility_rect", particles->get_visibility_rect());
@@ -359,7 +361,7 @@ void GPUParticles2DEditorPlugin::_notification(int p_what) {
 			menu->get_popup()->connect("id_pressed", callable_mp(this, &GPUParticles2DEditorPlugin::_menu_callback));
 			menu->set_icon(menu->get_theme_icon(SNAME("GPUParticles2D"), SNAME("EditorIcons")));
 			file->connect("file_selected", callable_mp(this, &GPUParticles2DEditorPlugin::_file_selected));
-			EditorNode::get_singleton()->get_editor_selection()->connect("selection_changed", callable_mp(this, &GPUParticles2DEditorPlugin::_selection_changed));
+			get_editor_interface()->get_selection()->connect("selection_changed", callable_mp(this, &GPUParticles2DEditorPlugin::_selection_changed));
 		} break;
 	}
 }
@@ -369,7 +371,6 @@ void GPUParticles2DEditorPlugin::_bind_methods() {
 
 GPUParticles2DEditorPlugin::GPUParticles2DEditorPlugin() {
 	particles = nullptr;
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
 
 	toolbar = memnew(HBoxContainer);
 	add_control_to_container(CONTAINER_CANVAS_EDITOR_MENU, toolbar);
diff --git a/editor/plugins/gpu_particles_2d_editor_plugin.h b/editor/plugins/gpu_particles_2d_editor_plugin.h
index 75f68617d14d..8f7d6ccab393 100644
--- a/editor/plugins/gpu_particles_2d_editor_plugin.h
+++ b/editor/plugins/gpu_particles_2d_editor_plugin.h
@@ -35,6 +35,10 @@
 #include "scene/2d/collision_polygon_2d.h"
 #include "scene/2d/gpu_particles_2d.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/check_box.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/option_button.h"
 #include "scene/gui/spin_box.h"
 
 class EditorFileDialog;
@@ -75,7 +79,6 @@ class GPUParticles2DEditorPlugin : public EditorPlugin {
 
 	String source_emission_file;
 
-	UndoRedo *undo_redo = nullptr;
 	void _file_selected(const String &p_file);
 	void _menu_callback(int p_idx);
 	void _generate_visibility_rect();
diff --git a/editor/plugins/gpu_particles_3d_editor_plugin.cpp b/editor/plugins/gpu_particles_3d_editor_plugin.cpp
index 35cbff53f43f..4c81dc0f794a 100644
--- a/editor/plugins/gpu_particles_3d_editor_plugin.cpp
+++ b/editor/plugins/gpu_particles_3d_editor_plugin.cpp
@@ -271,7 +271,7 @@ void GPUParticles3DEditor::_menu_option(int p_option) {
 			cpu_particles->set_visible(node->is_visible());
 			cpu_particles->set_process_mode(node->get_process_mode());
 
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			UndoRedo *ur = plugin->get_undo_redo();
 			ur->create_action(TTR("Convert to CPUParticles3D"));
 			ur->add_do_method(SceneTreeDock::get_singleton(), "replace_node", node, cpu_particles, true, false);
 			ur->add_do_reference(cpu_particles);
@@ -321,7 +321,7 @@ void GPUParticles3DEditor::_generate_aabb() {
 		node->set_emitting(false);
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Generate Visibility AABB"));
 	ur->add_do_method(node, "set_visibility_aabb", rect);
 	ur->add_undo_method(node, "set_visibility_aabb", node->get_visibility_aabb());
@@ -408,7 +408,8 @@ void GPUParticles3DEditor::_generate_emission_points() {
 void GPUParticles3DEditor::_bind_methods() {
 }
 
-GPUParticles3DEditor::GPUParticles3DEditor() {
+GPUParticles3DEditor::GPUParticles3DEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	node = nullptr;
 	particles_editor_hb = memnew(HBoxContainer);
 	Node3DEditor::get_singleton()->add_control_to_menu_panel(particles_editor_hb);
@@ -460,8 +461,8 @@ void GPUParticles3DEditorPlugin::make_visible(bool p_visible) {
 }
 
 GPUParticles3DEditorPlugin::GPUParticles3DEditorPlugin() {
-	particles_editor = memnew(GPUParticles3DEditor);
-	EditorNode::get_singleton()->get_main_control()->add_child(particles_editor);
+	particles_editor = memnew(GPUParticles3DEditor(this));
+	get_editor_interface()->get_editor_main_control()->add_child(particles_editor);
 
 	particles_editor->hide();
 }
diff --git a/editor/plugins/gpu_particles_3d_editor_plugin.h b/editor/plugins/gpu_particles_3d_editor_plugin.h
index 190fb9954bf0..be888fe368fb 100644
--- a/editor/plugins/gpu_particles_3d_editor_plugin.h
+++ b/editor/plugins/gpu_particles_3d_editor_plugin.h
@@ -33,6 +33,9 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/3d/gpu_particles_3d.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/option_button.h"
 #include "scene/gui/spin_box.h"
 
 class SceneTreeDialog;
@@ -67,6 +70,8 @@ class GPUParticles3DEditorBase : public Control {
 class GPUParticles3DEditor : public GPUParticles3DEditorBase {
 	GDCLASS(GPUParticles3DEditor, GPUParticles3DEditorBase);
 
+	EditorPlugin *plugin = nullptr;
+
 	ConfirmationDialog *generate_aabb = nullptr;
 	SpinBox *generate_seconds = nullptr;
 	GPUParticles3D *node = nullptr;
@@ -95,7 +100,7 @@ class GPUParticles3DEditor : public GPUParticles3DEditorBase {
 
 public:
 	void edit(GPUParticles3D *p_particles);
-	GPUParticles3DEditor();
+	GPUParticles3DEditor(EditorPlugin *p_plugin);
 };
 
 class GPUParticles3DEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp
index 643a4704252f..b34e656f700a 100644
--- a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp
+++ b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp
@@ -182,7 +182,7 @@ GPUParticlesCollisionSDF3DEditorPlugin::GPUParticlesCollisionSDF3DEditorPlugin()
 	bake_hb->hide();
 	bake = memnew(Button);
 	bake->set_flat(true);
-	bake->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Bake"), SNAME("EditorIcons")));
+	bake->set_icon(get_editor_interface()->get_base_control()->get_theme_icon(SNAME("Bake"), SNAME("EditorIcons")));
 	bake->set_text(TTR("Bake SDF"));
 	bake->connect("pressed", callable_mp(this, &GPUParticlesCollisionSDF3DEditorPlugin::_bake));
 	bake_hb->add_child(bake);
diff --git a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h
index 684279039a61..578c616f8922 100644
--- a/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h
+++ b/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h
@@ -33,6 +33,7 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/3d/gpu_particles_collision_3d.h"
+#include "scene/gui/box_container.h"
 #include "scene/resources/material.h"
 
 struct EditorProgress;
diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp
index e9d7808684f9..1a4fb35de683 100644
--- a/editor/plugins/gradient_editor_plugin.cpp
+++ b/editor/plugins/gradient_editor_plugin.cpp
@@ -30,10 +30,11 @@
 
 #include "gradient_editor_plugin.h"
 
-#include "canvas_item_editor_plugin.h"
-#include "editor/editor_node.h"
+#include "core/object/undo_redo.h"
 #include "editor/editor_scale.h"
-#include "node_3d_editor_plugin.h"
+#include "editor/editor_settings.h"
+#include "editor/plugins/canvas_item_editor_plugin.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
 
 Size2 GradientEditor::get_minimum_size() const {
 	return Size2(0, 60) * EDSCALE;
@@ -54,7 +55,7 @@ void GradientEditor::_gradient_changed() {
 
 void GradientEditor::_ramp_changed() {
 	editing = true;
-	UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Gradient Edited"));
 	undo_redo->add_do_method(gradient.ptr(), "set_offsets", get_offsets());
 	undo_redo->add_do_method(gradient.ptr(), "set_colors", get_colors());
@@ -84,7 +85,8 @@ void GradientEditor::reverse_gradient() {
 	update();
 }
 
-GradientEditor::GradientEditor() {
+GradientEditor::GradientEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	editing = false;
 }
 
@@ -117,7 +119,7 @@ void EditorInspectorPluginGradient::parse_begin(Object *p_object) {
 	Gradient *gradient = Object::cast_to<Gradient>(p_object);
 	Ref<Gradient> g(gradient);
 
-	editor = memnew(GradientEditor);
+	editor = memnew(GradientEditor(plugin));
 	editor->set_gradient(g);
 	add_custom_control(editor);
 
@@ -135,12 +137,15 @@ void EditorInspectorPluginGradient::parse_begin(Object *p_object) {
 	reverse_btn->set_tooltip(TTR("Reverse/mirror gradient."));
 }
 
+EditorInspectorPluginGradient::EditorInspectorPluginGradient(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
+}
+
 void EditorInspectorPluginGradient::_reverse_button_pressed() {
 	editor->reverse_gradient();
 }
 
 GradientEditorPlugin::GradientEditorPlugin() {
-	Ref<EditorInspectorPluginGradient> plugin;
-	plugin.instantiate();
+	Ref<EditorInspectorPluginGradient> plugin = memnew(EditorInspectorPluginGradient(this));
 	add_inspector_plugin(plugin);
 }
diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/plugins/gradient_editor_plugin.h
index 26bf76fecd49..2d3ada4e1883 100644
--- a/editor/plugins/gradient_editor_plugin.h
+++ b/editor/plugins/gradient_editor_plugin.h
@@ -31,12 +31,15 @@
 #ifndef GRADIENT_EDITOR_PLUGIN_H
 #define GRADIENT_EDITOR_PLUGIN_H
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "scene/gui/gradient_edit.h"
 
 class GradientEditor : public GradientEdit {
 	GDCLASS(GradientEditor, GradientEdit);
 
+	EditorPlugin *plugin;
+
 	bool editing;
 	Ref<Gradient> gradient;
 
@@ -50,7 +53,7 @@ class GradientEditor : public GradientEdit {
 	virtual Size2 get_minimum_size() const override;
 	void set_gradient(const Ref<Gradient> &p_gradient);
 	void reverse_gradient();
-	GradientEditor();
+	GradientEditor(EditorPlugin *p_plugin);
 };
 
 class GradientReverseButton : public BaseButton {
@@ -65,6 +68,7 @@ class GradientReverseButton : public BaseButton {
 class EditorInspectorPluginGradient : public EditorInspectorPlugin {
 	GDCLASS(EditorInspectorPluginGradient, EditorInspectorPlugin);
 
+	EditorPlugin *plugin = nullptr;
 	GradientEditor *editor = nullptr;
 	HBoxContainer *gradient_tools_hbox = nullptr;
 	GradientReverseButton *reverse_btn = nullptr;
@@ -74,6 +78,8 @@ class EditorInspectorPluginGradient : public EditorInspectorPlugin {
 public:
 	virtual bool can_handle(Object *p_object) override;
 	virtual void parse_begin(Object *p_object) override;
+
+	EditorInspectorPluginGradient(EditorPlugin *p_plugin);
 };
 
 class GradientEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.h b/editor/plugins/gradient_texture_2d_editor_plugin.h
index 4ce64ce1dc13..f9f7e2734cc9 100644
--- a/editor/plugins/gradient_texture_2d_editor_plugin.h
+++ b/editor/plugins/gradient_texture_2d_editor_plugin.h
@@ -31,8 +31,10 @@
 #ifndef GRADIENT_TEXTURE_2D_EDITOR
 #define GRADIENT_TEXTURE_2D_EDITOR
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "editor/editor_spin_slider.h"
+#include "scene/gui/box_container.h"
 
 class GradientTexture2DEditorRect : public Control {
 	GDCLASS(GradientTexture2DEditorRect, Control);
diff --git a/editor/plugins/light_occluder_2d_editor_plugin.cpp b/editor/plugins/light_occluder_2d_editor_plugin.cpp
index 4fbc8188b92c..68b24cf77012 100644
--- a/editor/plugins/light_occluder_2d_editor_plugin.cpp
+++ b/editor/plugins/light_occluder_2d_editor_plugin.cpp
@@ -30,6 +30,8 @@
 
 #include "light_occluder_2d_editor_plugin.h"
 
+#include "core/object/undo_redo.h"
+
 Ref<OccluderPolygon2D> LightOccluder2DEditor::_ensure_occluder() const {
 	Ref<OccluderPolygon2D> occluder = node->get_occluder_polygon();
 	if (!occluder.is_valid()) {
@@ -93,7 +95,6 @@ void LightOccluder2DEditor::_create_resource() {
 	if (!node) {
 		return;
 	}
-
 	undo_redo->create_action(TTR("Create Occluder Polygon"));
 	undo_redo->add_do_method(node, "set_occluder_polygon", Ref<OccluderPolygon2D>(memnew(OccluderPolygon2D)));
 	undo_redo->add_undo_method(node, "set_occluder_polygon", Variant(REF()));
diff --git a/editor/plugins/lightmap_gi_editor_plugin.cpp b/editor/plugins/lightmap_gi_editor_plugin.cpp
index aef97f059a9d..b9db75d8f9fe 100644
--- a/editor/plugins/lightmap_gi_editor_plugin.cpp
+++ b/editor/plugins/lightmap_gi_editor_plugin.cpp
@@ -129,7 +129,7 @@ void LightmapGIEditorPlugin::_bind_methods() {
 LightmapGIEditorPlugin::LightmapGIEditorPlugin() {
 	bake = memnew(Button);
 	bake->set_flat(true);
-	bake->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Bake"), SNAME("EditorIcons")));
+	bake->set_icon(get_editor_interface()->get_base_control()->get_theme_icon(SNAME("Bake"), SNAME("EditorIcons")));
 	bake->set_text(TTR("Bake Lightmaps"));
 	bake->hide();
 	bake->connect("pressed", Callable(this, "_bake"));
diff --git a/editor/plugins/line_2d_editor_plugin.cpp b/editor/plugins/line_2d_editor_plugin.cpp
index 31053f90b85b..706961757583 100644
--- a/editor/plugins/line_2d_editor_plugin.cpp
+++ b/editor/plugins/line_2d_editor_plugin.cpp
@@ -30,6 +30,8 @@
 
 #include "line_2d_editor_plugin.h"
 
+#include "core/object/undo_redo.h"
+
 Node2D *Line2DEditor::_get_node() const {
 	return node;
 }
@@ -52,6 +54,7 @@ void Line2DEditor::_set_polygon(int p_idx, const Variant &p_polygon) const {
 
 void Line2DEditor::_action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon) {
 	Node2D *node = _get_node();
+
 	undo_redo->add_do_method(node, "set_points", p_polygon);
 	undo_redo->add_undo_method(node, "set_points", p_previous);
 }
diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h
index 9c6247d59bfe..970e5030daa7 100644
--- a/editor/plugins/material_editor_plugin.h
+++ b/editor/plugins/material_editor_plugin.h
@@ -31,6 +31,7 @@
 #ifndef MATERIAL_EDITOR_PLUGIN_H
 #define MATERIAL_EDITOR_PLUGIN_H
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "editor/property_editor.h"
 #include "scene/3d/camera_3d.h"
diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h
index 3554b3c1e98c..09439cb710dd 100644
--- a/editor/plugins/mesh_editor_plugin.h
+++ b/editor/plugins/mesh_editor_plugin.h
@@ -31,11 +31,14 @@
 #ifndef MESH_EDITOR_PLUGIN_H
 #define MESH_EDITOR_PLUGIN_H
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/gui/subviewport_container.h"
+#include "scene/gui/texture_button.h"
+#include "scene/main/viewport.h"
 #include "scene/resources/material.h"
 
 class MeshEditor : public SubViewportContainer {
diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
index d33803213a38..f2c91fbfe65f 100644
--- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp
+++ b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
@@ -30,7 +30,8 @@
 
 #include "mesh_instance_3d_editor_plugin.h"
 
-#include "editor/editor_node.h"
+#include "core/object/undo_redo.h"
+#include "editor/editor_data.h"
 #include "editor/editor_scale.h"
 #include "node_3d_editor_plugin.h"
 #include "scene/3d/collision_shape_3d.h"
@@ -59,8 +60,8 @@ void MeshInstance3DEditor::_menu_option(int p_option) {
 
 	switch (p_option) {
 		case MENU_OPTION_CREATE_STATIC_TRIMESH_BODY: {
-			EditorSelection *editor_selection = EditorNode::get_singleton()->get_editor_selection();
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			EditorSelection *editor_selection = plugin->get_editor_interface()->get_selection();
+			UndoRedo *ur = plugin->get_undo_redo();
 
 			List<Node *> selection = editor_selection->get_selected_node_list();
 
@@ -143,7 +144,7 @@ void MeshInstance3DEditor::_menu_option(int p_option) {
 
 			Node *owner = node->get_owner();
 
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			UndoRedo *ur = plugin->get_undo_redo();
 
 			ur->create_action(TTR("Create Trimesh Static Shape"));
 
@@ -172,7 +173,7 @@ void MeshInstance3DEditor::_menu_option(int p_option) {
 				err_dialog->popup_centered();
 				return;
 			}
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			UndoRedo *ur = plugin->get_undo_redo();
 
 			if (simplify) {
 				ur->create_action(TTR("Create Simplified Convex Shape"));
@@ -211,7 +212,7 @@ void MeshInstance3DEditor::_menu_option(int p_option) {
 				err_dialog->popup_centered();
 				return;
 			}
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			UndoRedo *ur = plugin->get_undo_redo();
 
 			ur->create_action(TTR("Create Multiple Convex Shapes"));
 
@@ -245,7 +246,7 @@ void MeshInstance3DEditor::_menu_option(int p_option) {
 
 			Node *owner = node == get_tree()->get_edited_scene_root() ? node : node->get_owner();
 
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			UndoRedo *ur = plugin->get_undo_redo();
 			ur->create_action(TTR("Create Navigation Mesh"));
 
 			ur->add_do_method(node, "add_child", nmi, true);
@@ -423,7 +424,7 @@ void MeshInstance3DEditor::_create_outline_mesh() {
 		owner = node;
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 
 	ur->create_action(TTR("Create Outline"));
 
@@ -438,13 +439,15 @@ void MeshInstance3DEditor::_create_outline_mesh() {
 void MeshInstance3DEditor::_bind_methods() {
 }
 
-MeshInstance3DEditor::MeshInstance3DEditor() {
+MeshInstance3DEditor::MeshInstance3DEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
+
 	options = memnew(MenuButton);
 	options->set_switch_on_hover(true);
 	Node3DEditor::get_singleton()->add_control_to_menu_panel(options);
 
 	options->set_text(TTR("Mesh"));
-	options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("MeshInstance3D"), SNAME("EditorIcons")));
+	options->set_icon(plugin->get_editor_interface()->get_base_control()->get_theme_icon(SNAME("MeshInstance3D"), SNAME("EditorIcons")));
 
 	options->get_popup()->add_item(TTR("Create Trimesh Static Body"), MENU_OPTION_CREATE_STATIC_TRIMESH_BODY);
 	options->get_popup()->set_item_tooltip(-1, TTR("Creates a StaticBody3D and assigns a polygon-based collision shape to it automatically.\nThis is the most accurate (but slowest) option for collision detection."));
@@ -517,8 +520,8 @@ void MeshInstance3DEditorPlugin::make_visible(bool p_visible) {
 }
 
 MeshInstance3DEditorPlugin::MeshInstance3DEditorPlugin() {
-	mesh_editor = memnew(MeshInstance3DEditor);
-	EditorNode::get_singleton()->get_main_control()->add_child(mesh_editor);
+	mesh_editor = memnew(MeshInstance3DEditor(this));
+	get_editor_interface()->get_editor_main_control()->add_child(mesh_editor);
 
 	mesh_editor->options->hide();
 }
diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.h b/editor/plugins/mesh_instance_3d_editor_plugin.h
index 36d8eacd98d6..0a2cb889cd64 100644
--- a/editor/plugins/mesh_instance_3d_editor_plugin.h
+++ b/editor/plugins/mesh_instance_3d_editor_plugin.h
@@ -33,11 +33,15 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/spin_box.h"
 
 class MeshInstance3DEditor : public Control {
 	GDCLASS(MeshInstance3DEditor, Control);
 
+	EditorPlugin *plugin;
+
 	enum Menu {
 		MENU_OPTION_CREATE_STATIC_TRIMESH_BODY,
 		MENU_OPTION_CREATE_TRIMESH_COLLISION_SHAPE,
@@ -78,7 +82,7 @@ class MeshInstance3DEditor : public Control {
 
 public:
 	void edit(MeshInstance3D *p_mesh);
-	MeshInstance3DEditor();
+	MeshInstance3DEditor(EditorPlugin *p_plugin);
 };
 
 class MeshInstance3DEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/plugins/mesh_library_editor_plugin.cpp
index 423ec5f4edd8..d9de22c7fcc0 100644
--- a/editor/plugins/mesh_library_editor_plugin.cpp
+++ b/editor/plugins/mesh_library_editor_plugin.cpp
@@ -31,8 +31,8 @@
 #include "mesh_library_editor_plugin.h"
 
 #include "editor/editor_file_dialog.h"
-#include "editor/editor_node.h"
 #include "editor/editor_settings.h"
+#include "editor/inspector_dock.h"
 #include "main/main.h"
 #include "node_3d_editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
@@ -254,7 +254,7 @@ void MeshLibraryEditor::_menu_cbk(int p_option) {
 void MeshLibraryEditor::_bind_methods() {
 }
 
-MeshLibraryEditor::MeshLibraryEditor() {
+MeshLibraryEditor::MeshLibraryEditor(EditorPlugin *p_plugin) {
 	file = memnew(EditorFileDialog);
 	file->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
 	//not for now?
@@ -272,7 +272,7 @@ MeshLibraryEditor::MeshLibraryEditor() {
 	Node3DEditor::get_singleton()->add_control_to_menu_panel(menu);
 	menu->set_position(Point2(1, 1));
 	menu->set_text(TTR("MeshLibrary"));
-	menu->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("MeshLibrary"), SNAME("EditorIcons")));
+	menu->set_icon(p_plugin->get_editor_interface()->get_base_control()->get_theme_icon(SNAME("MeshLibrary"), SNAME("EditorIcons")));
 	menu->get_popup()->add_item(TTR("Add Item"), MENU_OPTION_ADD_ITEM);
 	menu->get_popup()->add_item(TTR("Remove Selected Item"), MENU_OPTION_REMOVE_ITEM);
 	menu->get_popup()->add_separator();
@@ -317,9 +317,9 @@ void MeshLibraryEditorPlugin::make_visible(bool p_visible) {
 }
 
 MeshLibraryEditorPlugin::MeshLibraryEditorPlugin() {
-	mesh_library_editor = memnew(MeshLibraryEditor);
+	mesh_library_editor = memnew(MeshLibraryEditor(this));
 
-	EditorNode::get_singleton()->get_main_control()->add_child(mesh_library_editor);
+	get_editor_interface()->get_editor_main_control()->add_child(mesh_library_editor);
 	mesh_library_editor->set_anchors_and_offsets_preset(Control::PRESET_TOP_WIDE);
 	mesh_library_editor->set_end(Point2(0, 22));
 	mesh_library_editor->hide();
diff --git a/editor/plugins/mesh_library_editor_plugin.h b/editor/plugins/mesh_library_editor_plugin.h
index 85ead3553426..126e460a34e3 100644
--- a/editor/plugins/mesh_library_editor_plugin.h
+++ b/editor/plugins/mesh_library_editor_plugin.h
@@ -75,7 +75,7 @@ class MeshLibraryEditor : public Control {
 	void edit(const Ref<MeshLibrary> &p_mesh_library);
 	static Error update_library_file(Node *p_base_scene, Ref<MeshLibrary> ml, bool p_merge = true, bool p_apply_xforms = false);
 
-	MeshLibraryEditor();
+	MeshLibraryEditor(EditorPlugin *p_plugin);
 };
 
 class MeshLibraryEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp
index 850c673c1279..d078ed4330b5 100644
--- a/editor/plugins/multimesh_editor_plugin.cpp
+++ b/editor/plugins/multimesh_editor_plugin.cpp
@@ -30,9 +30,8 @@
 
 #include "multimesh_editor_plugin.h"
 
-#include "editor/editor_node.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/scene_tree_editor.h"
-#include "node_3d_editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/gui/box_container.h"
 
@@ -264,13 +263,13 @@ void MultiMeshEditor::_browse(bool p_source) {
 void MultiMeshEditor::_bind_methods() {
 }
 
-MultiMeshEditor::MultiMeshEditor() {
+MultiMeshEditor::MultiMeshEditor(EditorPlugin *p_plugin) {
 	options = memnew(MenuButton);
 	options->set_switch_on_hover(true);
 	Node3DEditor::get_singleton()->add_control_to_menu_panel(options);
 
 	options->set_text("MultiMesh");
-	options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("MultiMeshInstance3D"), SNAME("EditorIcons")));
+	options->set_icon(p_plugin->get_editor_interface()->get_base_control()->get_theme_icon(SNAME("MultiMeshInstance3D"), SNAME("EditorIcons")));
 
 	options->get_popup()->add_item(TTR("Populate Surface"));
 	options->get_popup()->connect("id_pressed", callable_mp(this, &MultiMeshEditor::_menu_option));
@@ -378,8 +377,8 @@ void MultiMeshEditorPlugin::make_visible(bool p_visible) {
 }
 
 MultiMeshEditorPlugin::MultiMeshEditorPlugin() {
-	multimesh_editor = memnew(MultiMeshEditor);
-	EditorNode::get_singleton()->get_main_control()->add_child(multimesh_editor);
+	multimesh_editor = memnew(MultiMeshEditor(this));
+	get_editor_interface()->get_editor_main_control()->add_child(multimesh_editor);
 
 	multimesh_editor->options->hide();
 }
diff --git a/editor/plugins/multimesh_editor_plugin.h b/editor/plugins/multimesh_editor_plugin.h
index 9f5e85216c2d..b8ea07e1d74a 100644
--- a/editor/plugins/multimesh_editor_plugin.h
+++ b/editor/plugins/multimesh_editor_plugin.h
@@ -33,6 +33,9 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/3d/multimesh_instance_3d.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/option_button.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 
@@ -79,7 +82,7 @@ class MultiMeshEditor : public Control {
 
 public:
 	void edit(MultiMeshInstance3D *p_multimesh);
-	MultiMeshEditor();
+	MultiMeshEditor(EditorPlugin *p_plugin);
 };
 
 class MultiMeshEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/navigation_polygon_editor_plugin.cpp b/editor/plugins/navigation_polygon_editor_plugin.cpp
index 17eaf45bb52a..6c3516d87ee9 100644
--- a/editor/plugins/navigation_polygon_editor_plugin.cpp
+++ b/editor/plugins/navigation_polygon_editor_plugin.cpp
@@ -30,6 +30,8 @@
 
 #include "navigation_polygon_editor_plugin.h"
 
+#include "core/object/undo_redo.h"
+
 Ref<NavigationPolygon> NavigationPolygonEditor::_ensure_navpoly() const {
 	Ref<NavigationPolygon> navpoly = node->get_navigation_polygon();
 	if (!navpoly.is_valid()) {
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
index 855fc2b2a9b8..3572d2df86db 100644
--- a/editor/plugins/node_3d_editor_plugin.cpp
+++ b/editor/plugins/node_3d_editor_plugin.cpp
@@ -478,7 +478,7 @@ void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {
 
 	if (!p_allow_locked) {
 		// Replace the node by the group if grouped
-		while (node && node != EditorNode::get_singleton()->get_edited_scene()->get_parent()) {
+		while (node && node != plugin->get_editor_interface()->get_edited_scene_root()->get_parent()) {
 			Node3D *selected_tmp = Object::cast_to<Node3D>(node);
 			if (selected_tmp && node->has_meta("_edit_group_")) {
 				selected = selected_tmp;
@@ -498,12 +498,12 @@ void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {
 			if (!editor_selection->is_selected(selected)) {
 				editor_selection->clear();
 				editor_selection->add_node(selected);
-				EditorNode::get_singleton()->edit_node(selected);
+				plugin->get_editor_interface()->edit_node(selected);
 			}
 		}
 
 		if (editor_selection->get_selected_node_list().size() == 1) {
-			EditorNode::get_singleton()->edit_node(editor_selection->get_selected_node_list()[0]);
+			plugin->get_editor_interface()->edit_node(editor_selection->get_selected_node_list()[0]);
 		}
 	}
 }
@@ -789,7 +789,7 @@ void Node3DEditorViewport::_select_region() {
 		// Replace the node by the group if grouped
 		if (item->is_class("Node3D")) {
 			Node3D *sel = Object::cast_to<Node3D>(item);
-			while (item && item != EditorNode::get_singleton()->get_edited_scene()->get_parent()) {
+			while (item && item != plugin->get_editor_interface()->get_edited_scene_root()->get_parent()) {
 				Node3D *selected_tmp = Object::cast_to<Node3D>(item);
 				if (selected_tmp && item->has_meta("_edit_group_")) {
 					sel = selected_tmp;
@@ -823,7 +823,7 @@ void Node3DEditorViewport::_select_region() {
 	}
 
 	if (editor_selection->get_selected_node_list().size() == 1) {
-		EditorNode::get_singleton()->edit_node(editor_selection->get_selected_node_list()[0]);
+		plugin->get_editor_interface()->edit_node(editor_selection->get_selected_node_list()[0]);
 	}
 }
 
@@ -1271,7 +1271,7 @@ bool Node3DEditorViewport ::_is_node_locked(const Node *p_node) {
 void Node3DEditorViewport::_list_select(Ref<InputEventMouseButton> b) {
 	_find_items_at_pos(b->get_position(), selection_results, spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT);
 
-	Node *scene = EditorNode::get_singleton()->get_edited_scene();
+	Node *scene = plugin->get_editor_interface()->get_edited_scene_root();
 
 	for (int i = 0; i < selection_results.size(); i++) {
 		Node3D *item = selection_results[i].item;
@@ -1306,7 +1306,7 @@ void Node3DEditorViewport::_list_select(Ref<InputEventMouseButton> b) {
 			if (_is_node_locked(spat)) {
 				locked = 1;
 			} else {
-				Node *ed_scene = EditorNode::get_singleton()->get_edited_scene();
+				Node *ed_scene = plugin->get_editor_interface()->get_edited_scene_root();
 				Node *node = spat;
 
 				while (node && node != ed_scene->get_parent()) {
@@ -3568,7 +3568,7 @@ void Node3DEditorViewport::set_state(const Dictionary &p_state) {
 		preview_camera->disconnect("toggled", callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
 	}
 	if (p_state.has("previewing")) {
-		Node *pv = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["previewing"]);
+		Node *pv = plugin->get_editor_interface()->get_edited_scene_root()->get_node(p_state["previewing"]);
 		if (Object::cast_to<Camera3D>(pv)) {
 			previewing = Object::cast_to<Camera3D>(pv);
 			previewing->connect("tree_exiting", callable_mp(this, &Node3DEditorViewport::_preview_exited_scene));
@@ -3609,7 +3609,7 @@ Dictionary Node3DEditorViewport::get_state() const {
 	d["half_res"] = subviewport_container->get_stretch_shrink() > 1;
 	d["cinematic_preview"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW));
 	if (previewing) {
-		d["previewing"] = EditorNode::get_singleton()->get_edited_scene()->get_path_to(previewing);
+		d["previewing"] = plugin->get_editor_interface()->get_edited_scene_root()->get_path_to(previewing);
 	}
 	if (lock_rotation) {
 		d["lock_rotation"] = lock_rotation;
@@ -3863,8 +3863,8 @@ bool Node3DEditorViewport::_create_instance(Node *parent, String &path, const Po
 		return false;
 	}
 
-	if (!EditorNode::get_singleton()->get_edited_scene()->get_scene_file_path().is_empty()) { // cyclical instancing
-		if (_cyclical_dependency_exists(EditorNode::get_singleton()->get_edited_scene()->get_scene_file_path(), instantiated_scene)) {
+	if (!plugin->get_editor_interface()->get_edited_scene_root()->get_scene_file_path().is_empty()) { // cyclical instancing
+		if (_cyclical_dependency_exists(plugin->get_editor_interface()->get_edited_scene_root()->get_scene_file_path(), instantiated_scene)) {
 			memdelete(instantiated_scene);
 			return false;
 		}
@@ -3875,14 +3875,14 @@ bool Node3DEditorViewport::_create_instance(Node *parent, String &path, const Po
 	}
 
 	editor_data->get_undo_redo().add_do_method(parent, "add_child", instantiated_scene, true);
-	editor_data->get_undo_redo().add_do_method(instantiated_scene, "set_owner", EditorNode::get_singleton()->get_edited_scene());
+	editor_data->get_undo_redo().add_do_method(instantiated_scene, "set_owner", plugin->get_editor_interface()->get_edited_scene_root());
 	editor_data->get_undo_redo().add_do_reference(instantiated_scene);
 	editor_data->get_undo_redo().add_undo_method(parent, "remove_child", instantiated_scene);
 
 	String new_name = parent->validate_child_name(instantiated_scene);
 	EditorDebuggerNode *ed = EditorDebuggerNode::get_singleton();
-	editor_data->get_undo_redo().add_do_method(ed, "live_debug_instance_node", EditorNode::get_singleton()->get_edited_scene()->get_path_to(parent), path, new_name);
-	editor_data->get_undo_redo().add_undo_method(ed, "live_debug_remove_node", NodePath(String(EditorNode::get_singleton()->get_edited_scene()->get_path_to(parent)) + "/" + new_name));
+	editor_data->get_undo_redo().add_do_method(ed, "live_debug_instance_node", plugin->get_editor_interface()->get_edited_scene_root()->get_path_to(parent), path, new_name);
+	editor_data->get_undo_redo().add_undo_method(ed, "live_debug_remove_node", NodePath(String(plugin->get_editor_interface()->get_edited_scene_root()->get_path_to(parent)) + "/" + new_name));
 
 	Node3D *node3d = Object::cast_to<Node3D>(instantiated_scene);
 	if (node3d) {
@@ -3999,8 +3999,8 @@ void Node3DEditorViewport::drop_data_fw(const Point2 &p_point, const Variant &p_
 		selected_files = d["files"];
 	}
 
-	List<Node *> selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list();
-	Node *root_node = EditorNode::get_singleton()->get_edited_scene();
+	List<Node *> selected_nodes = editor_selection->get_selected_node_list();
+	Node *root_node = plugin->get_editor_interface()->get_edited_scene_root();
 	if (selected_nodes.size() == 1) {
 		Node *selected_node = selected_nodes[0];
 		target_node = root_node;
@@ -4437,7 +4437,7 @@ void Node3DEditorViewport::shortcut_changed_callback(const Ref<Shortcut> p_short
 	}
 }
 
-Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p_index) {
+Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, EditorPlugin *p_plugin, int p_index) {
 	cpu_time_history_index = 0;
 	gpu_time_history_index = 0;
 
@@ -4450,9 +4450,10 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 	_edit.gizmo_handle_secondary = false;
 
 	index = p_index;
+	plugin = p_plugin;
 	editor_data = SceneTreeDock::get_singleton()->get_editor_data();
-	editor_selection = EditorNode::get_singleton()->get_editor_selection();
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	editor_selection = plugin->get_editor_interface()->get_selection();
+	undo_redo = plugin->get_undo_redo();
 
 	orthogonal = false;
 	auto_orthogonal = false;
@@ -6356,7 +6357,7 @@ void fragment() {
 void Node3DEditor::_update_context_menu_stylebox() {
 	// This must be called when the theme changes to follow the new accent color.
 	Ref<StyleBoxFlat> context_menu_stylebox = memnew(StyleBoxFlat);
-	const Color accent_color = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("accent_color"), SNAME("Editor"));
+	const Color accent_color = plugin->get_editor_interface()->get_base_control()->get_theme_color(SNAME("accent_color"), SNAME("Editor"));
 	context_menu_stylebox->set_bg_color(accent_color * Color(1, 1, 1, 0.1));
 	// Add an underline to the StyleBox, but prevent its minimum vertical size from changing.
 	context_menu_stylebox->set_border_color(accent_color);
@@ -7107,7 +7108,7 @@ void Node3DEditor::_request_gizmo(Object *p_obj) {
 
 	bool is_selected = (sp == selected);
 
-	Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
+	Node *edited_scene = plugin->get_editor_interface()->get_edited_scene_root();
 	if (edited_scene && (sp == edited_scene || (sp->get_owner() && edited_scene->is_ancestor_of(sp)))) {
 		for (int i = 0; i < gizmo_plugins_by_priority.size(); ++i) {
 			Ref<EditorNode3DGizmo> seg = gizmo_plugins_by_priority.write[i]->get_gizmo(sp);
@@ -7475,17 +7476,20 @@ void Node3DEditor::_sun_direction_angle_set() {
 	_preview_settings_changed();
 }
 
-Node3DEditor::Node3DEditor() {
+Node3DEditor::Node3DEditor(EditorPlugin *p_plugin) {
+	singleton = this;
+
+	plugin = p_plugin;
+
 	gizmo.visible = true;
 	gizmo.scale = 1.0;
 
 	viewport_environment = Ref<Environment>(memnew(Environment));
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	undo_redo = plugin->get_undo_redo();
 	VBoxContainer *vbc = this;
 
 	custom_camera = nullptr;
-	singleton = this;
-	editor_selection = EditorNode::get_singleton()->get_editor_selection();
+	editor_selection = plugin->get_editor_interface()->get_selection();
 	editor_selection->add_editor_plugin(this);
 
 	snap_enabled = false;
@@ -7717,7 +7721,7 @@ Node3DEditor::Node3DEditor() {
 	p->set_hide_on_checkable_item_selection(false);
 
 	accept = memnew(AcceptDialog);
-	EditorNode::get_singleton()->get_gui_base()->add_child(accept);
+	plugin->get_editor_interface()->get_base_control()->add_child(accept);
 
 	p->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/1_viewport", TTR("1 Viewport"), KeyModifierMask::CMD + Key::KEY_1), MENU_VIEW_USE_1_VIEWPORT);
 	p->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/2_viewports", TTR("2 Viewports"), KeyModifierMask::CMD + Key::KEY_2), MENU_VIEW_USE_2_VIEWPORTS);
@@ -7764,7 +7768,7 @@ Node3DEditor::Node3DEditor() {
 	shader_split->add_child(viewport_base);
 	viewport_base->set_v_size_flags(SIZE_EXPAND_FILL);
 	for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
-		viewports[i] = memnew(Node3DEditorViewport(this, i));
+		viewports[i] = memnew(Node3DEditorViewport(this, plugin, i));
 		viewports[i]->connect("toggle_maximize_view", callable_mp(this, &Node3DEditor::_toggle_maximize_view));
 		viewports[i]->connect("clicked", callable_mp(this, &Node3DEditor::_update_camera_override_viewport));
 		viewports[i]->assign_pending_data_pointers(preview_node, &preview_bounds, accept);
@@ -8214,9 +8218,9 @@ void Node3DEditor::remove_gizmo_plugin(Ref<EditorNode3DGizmoPlugin> p_plugin) {
 }
 
 Node3DEditorPlugin::Node3DEditorPlugin() {
-	spatial_editor = memnew(Node3DEditor);
+	spatial_editor = memnew(Node3DEditor(this));
 	spatial_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	EditorNode::get_singleton()->get_main_control()->add_child(spatial_editor);
+	get_editor_interface()->get_editor_main_control()->add_child(spatial_editor);
 
 	spatial_editor->hide();
 }
diff --git a/editor/plugins/node_3d_editor_plugin.h b/editor/plugins/node_3d_editor_plugin.h
index d5d50c743c5f..d9f2eeb798d7 100644
--- a/editor/plugins/node_3d_editor_plugin.h
+++ b/editor/plugins/node_3d_editor_plugin.h
@@ -40,6 +40,7 @@
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/3d/world_environment.h"
 #include "scene/gui/color_picker.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/split_container.h"
@@ -51,6 +52,10 @@ class EditorData;
 class Node3DEditor;
 class Node3DEditorViewport;
 class SubViewportContainer;
+class ConfirmationDialog;
+class AcceptDialog;
+class CheckBox;
+class OptionButton;
 class DirectionalLight3D;
 class WorldEnvironment;
 
@@ -181,6 +186,8 @@ class Node3DEditorViewport : public Control {
 	};
 
 private:
+	EditorPlugin *plugin;
+
 	double cpu_time_history[FRAME_TIME_HISTORY];
 	int cpu_time_history_index;
 	double gpu_time_history[FRAME_TIME_HISTORY];
@@ -442,7 +449,7 @@ class Node3DEditorViewport : public Control {
 	SubViewport *get_viewport_node() { return viewport; }
 	Camera3D *get_camera_3d() { return camera; } // return the default camera object.
 
-	Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p_index);
+	Node3DEditorViewport(Node3DEditor *p_spatial_editor, EditorPlugin *p_plugin, int p_index);
 	~Node3DEditorViewport();
 };
 
@@ -537,6 +544,7 @@ class Node3DEditor : public VBoxContainer {
 	};
 
 private:
+	EditorPlugin *plugin = nullptr;
 	EditorSelection *editor_selection = nullptr;
 
 	Node3DEditorViewportContainer *viewport_base = nullptr;
@@ -861,7 +869,7 @@ class Node3DEditor : public VBoxContainer {
 	void edit(Node3D *p_spatial);
 	void clear();
 
-	Node3DEditor();
+	Node3DEditor(EditorPlugin *p_plugin);
 	~Node3DEditor();
 };
 
diff --git a/editor/plugins/occluder_instance_3d_editor_plugin.cpp b/editor/plugins/occluder_instance_3d_editor_plugin.cpp
index 79cf4c394eb3..1eef780dcf2a 100644
--- a/editor/plugins/occluder_instance_3d_editor_plugin.cpp
+++ b/editor/plugins/occluder_instance_3d_editor_plugin.cpp
@@ -104,7 +104,7 @@ void OccluderInstance3DEditorPlugin::_bind_methods() {
 OccluderInstance3DEditorPlugin::OccluderInstance3DEditorPlugin() {
 	bake = memnew(Button);
 	bake->set_flat(true);
-	bake->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Bake"), SNAME("EditorIcons")));
+	bake->set_icon(get_editor_interface()->get_base_control()->get_theme_icon(SNAME("Bake"), SNAME("EditorIcons")));
 	bake->set_text(TTR("Bake Occluders"));
 	bake->hide();
 	bake->connect("pressed", Callable(this, "_bake"));
diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp
index 9e666ef70a63..fc38be2787b5 100644
--- a/editor/plugins/path_2d_editor_plugin.cpp
+++ b/editor/plugins/path_2d_editor_plugin.cpp
@@ -30,12 +30,12 @@
 
 #include "path_2d_editor_plugin.h"
 
-#include "canvas_item_editor_plugin.h"
 #include "core/io/file_access.h"
+#include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/plugins/canvas_item_editor_plugin.h"
 
 void Path2DEditor::_notification(int p_what) {
 	switch (p_what) {
@@ -516,9 +516,9 @@ void Path2DEditor::_handle_option_pressed(int p_option) {
 	}
 }
 
-Path2DEditor::Path2DEditor() {
+Path2DEditor::Path2DEditor(EditorPlugin *p_plugin) {
 	canvas_item_editor = nullptr;
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	undo_redo = p_plugin->get_undo_redo();
 	mirror_handle_angle = true;
 	mirror_handle_length = true;
 	on_edge = false;
@@ -610,7 +610,7 @@ void Path2DEditorPlugin::make_visible(bool p_visible) {
 }
 
 Path2DEditorPlugin::Path2DEditorPlugin() {
-	path2d_editor = memnew(Path2DEditor);
+	path2d_editor = memnew(Path2DEditor(this));
 	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(path2d_editor);
 	path2d_editor->hide();
 }
diff --git a/editor/plugins/path_2d_editor_plugin.h b/editor/plugins/path_2d_editor_plugin.h
index ff74aeedf733..17b0f3e0468c 100644
--- a/editor/plugins/path_2d_editor_plugin.h
+++ b/editor/plugins/path_2d_editor_plugin.h
@@ -33,6 +33,8 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/2d/path_2d.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/separator.h"
 
 class CanvasItemEditor;
@@ -104,7 +106,7 @@ class Path2DEditor : public HBoxContainer {
 	bool forward_gui_input(const Ref<InputEvent> &p_event);
 	void forward_canvas_draw_over_viewport(Control *p_overlay);
 	void edit(Node *p_path2d);
-	Path2DEditor();
+	Path2DEditor(EditorPlugin *p_plugin);
 };
 
 class Path2DEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/path_3d_editor_plugin.cpp b/editor/plugins/path_3d_editor_plugin.cpp
index e52b2749087f..68576c5d5b6f 100644
--- a/editor/plugins/path_3d_editor_plugin.cpp
+++ b/editor/plugins/path_3d_editor_plugin.cpp
@@ -32,9 +32,10 @@
 
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
+#include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_node.h"
-#include "node_3d_editor_plugin.h"
+#include "editor/editor_settings.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/resources/curve.h"
 
 String Path3DGizmo::get_handle_name(int p_id, bool p_secondary) const {
@@ -379,7 +380,7 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_spatial_gui_input(Camera
 				}
 			}
 
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			UndoRedo *ur = get_undo_redo();
 			if (closest_seg != -1) {
 				//subdivide
 
@@ -420,22 +421,20 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_spatial_gui_input(Camera
 
 				// Find the offset and point index of the place to break up.
 				// Also check for the control points.
+				UndoRedo *ur = get_undo_redo();
 				if (dist_to_p < click_dist) {
-					UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
 					ur->create_action(TTR("Remove Path Point"));
 					ur->add_do_method(c.ptr(), "remove_point", i);
 					ur->add_undo_method(c.ptr(), "add_point", c->get_point_position(i), c->get_point_in(i), c->get_point_out(i), i);
 					ur->commit_action();
 					return EditorPlugin::AFTER_GUI_INPUT_STOP;
 				} else if (dist_to_p_out < click_dist) {
-					UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
 					ur->create_action(TTR("Remove Out-Control Point"));
 					ur->add_do_method(c.ptr(), "set_point_out", i, Vector3());
 					ur->add_undo_method(c.ptr(), "set_point_out", i, c->get_point_out(i));
 					ur->commit_action();
 					return EditorPlugin::AFTER_GUI_INPUT_STOP;
 				} else if (dist_to_p_in < click_dist) {
-					UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
 					ur->create_action(TTR("Remove In-Control Point"));
 					ur->add_do_method(c.ptr(), "set_point_in", i, Vector3());
 					ur->add_undo_method(c.ptr(), "set_point_in", i, c->get_point_in(i));
@@ -514,7 +513,7 @@ void Path3DEditorPlugin::_close_curve() {
 	if (c->get_point_position(0) == c->get_point_position(c->get_point_count() - 1)) {
 		return;
 	}
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = get_undo_redo();
 	ur->create_action(TTR("Close Curve"));
 	ur->add_do_method(c.ptr(), "add_point", c->get_point_position(0), c->get_point_in(0), c->get_point_out(0), -1);
 	ur->add_undo_method(c.ptr(), "remove_point", c->get_point_count());
diff --git a/editor/plugins/path_3d_editor_plugin.h b/editor/plugins/path_3d_editor_plugin.h
index 72c24732c098..ca6531ff76f4 100644
--- a/editor/plugins/path_3d_editor_plugin.h
+++ b/editor/plugins/path_3d_editor_plugin.h
@@ -35,6 +35,7 @@
 #include "editor/plugins/node_3d_editor_gizmos.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/path_3d.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/separator.h"
 
 class Path3DGizmo : public EditorNode3DGizmo {
diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp
index 8566e92b22ca..b61041998e78 100644
--- a/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/input_event.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/undo_redo.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h
index 4403d1e9c74f..e62127f31443 100644
--- a/editor/plugins/polygon_2d_editor_plugin.h
+++ b/editor/plugins/polygon_2d_editor_plugin.h
@@ -35,8 +35,12 @@
 
 class HSlider;
 class Panel;
+class MenuButton;
 class ScrollContainer;
 class SpinBox;
+class HScrollBar;
+class VScrollBar;
+class TextureRect;
 class ViewPanner;
 
 class Polygon2DEditor : public AbstractPolygon2DEditor {
diff --git a/editor/plugins/polygon_3d_editor_plugin.cpp b/editor/plugins/polygon_3d_editor_plugin.cpp
index 2d4812c55b64..2429cd7eedd3 100644
--- a/editor/plugins/polygon_3d_editor_plugin.cpp
+++ b/editor/plugins/polygon_3d_editor_plugin.cpp
@@ -35,8 +35,8 @@
 #include "core/input/input.h"
 #include "core/io/file_access.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "node_3d_editor_plugin.h"
 #include "scene/3d/camera_3d.h"
@@ -524,9 +524,9 @@ void Polygon3DEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_polygon_draw"), &Polygon3DEditor::_polygon_draw);
 }
 
-Polygon3DEditor::Polygon3DEditor() {
+Polygon3DEditor::Polygon3DEditor(EditorPlugin *p_plugin) {
 	node = nullptr;
-	undo_redo = EditorNode::get_undo_redo();
+	undo_redo = p_plugin->get_undo_redo();
 
 	add_child(memnew(VSeparator));
 	button_create = memnew(Button);
@@ -561,7 +561,7 @@ Polygon3DEditor::Polygon3DEditor() {
 	handle_material->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
 	handle_material->set_flag(StandardMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
 	handle_material->set_flag(StandardMaterial3D::FLAG_SRGB_VERTEX_COLOR, true);
-	Ref<Texture2D> handle = EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Editor3DHandle"), SNAME("EditorIcons"));
+	Ref<Texture2D> handle = p_plugin->get_editor_interface()->get_base_control()->get_theme_icon(SNAME("Editor3DHandle"), SNAME("EditorIcons"));
 	handle_material->set_point_size(handle->get_width());
 	handle_material->set_texture(StandardMaterial3D::TEXTURE_ALBEDO, handle);
 
@@ -596,7 +596,7 @@ void Polygon3DEditorPlugin::make_visible(bool p_visible) {
 }
 
 Polygon3DEditorPlugin::Polygon3DEditorPlugin() {
-	polygon_editor = memnew(Polygon3DEditor);
+	polygon_editor = memnew(Polygon3DEditor(this));
 	Node3DEditor::get_singleton()->add_control_to_menu_panel(polygon_editor);
 
 	polygon_editor->hide();
diff --git a/editor/plugins/polygon_3d_editor_plugin.h b/editor/plugins/polygon_3d_editor_plugin.h
index 3ad7a4df58e8..e81dc6036e62 100644
--- a/editor/plugins/polygon_3d_editor_plugin.h
+++ b/editor/plugins/polygon_3d_editor_plugin.h
@@ -34,6 +34,8 @@
 #include "editor/editor_plugin.h"
 #include "scene/3d/collision_polygon_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/menu_button.h"
 #include "scene/resources/immediate_mesh.h"
 
 class CanvasItemEditor;
@@ -91,7 +93,7 @@ class Polygon3DEditor : public HBoxContainer {
 public:
 	virtual EditorPlugin::AfterGUIInput forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event);
 	void edit(Node *p_node);
-	Polygon3DEditor();
+	Polygon3DEditor(EditorPlugin *p_plugin);
 	~Polygon3DEditor();
 };
 
diff --git a/editor/plugins/replication_editor_plugin.cpp b/editor/plugins/replication_editor_plugin.cpp
index 2a7b3c7a556d..a8c80fcf98e0 100644
--- a/editor/plugins/replication_editor_plugin.cpp
+++ b/editor/plugins/replication_editor_plugin.cpp
@@ -38,7 +38,8 @@
 #include "scene/multiplayer/multiplayer_synchronizer.h"
 
 /// ReplicationEditor
-ReplicationEditor::ReplicationEditor() {
+ReplicationEditor::ReplicationEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	set_v_size_flags(SIZE_EXPAND_FILL);
 	set_custom_minimum_size(Size2(0, 200) * EDSCALE);
 
@@ -97,7 +98,7 @@ void ReplicationEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE:
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			add_theme_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("panel"), SNAME("Panel")));
+			add_theme_style_override("panel", plugin->get_editor_interface()->get_base_control()->get_theme_stylebox(SNAME("panel"), SNAME("Panel")));
 		} break;
 
 		case NOTIFICATION_VISIBILITY_CHANGED: {
@@ -125,7 +126,7 @@ void ReplicationEditor::_add_pressed() {
 	if (prop.is_empty()) {
 		return;
 	}
-	UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Add property"));
 	config = current->get_replication_config();
 	if (config.is_null()) {
@@ -150,7 +151,7 @@ void ReplicationEditor::_tree_item_edited() {
 	int column = tree->get_edited_column();
 	ERR_FAIL_COND(column < 1 || column > 2);
 	const NodePath prop = ti->get_metadata(0);
-	UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	bool value = ti->is_checked(column);
 	String method;
 	if (column == 1) {
@@ -186,7 +187,7 @@ void ReplicationEditor::_dialog_closed(bool p_confirmed) {
 		int idx = config->property_get_index(prop);
 		bool spawn = config->property_get_spawn(prop);
 		bool sync = config->property_get_sync(prop);
-		UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
+		UndoRedo *undo_redo = plugin->get_undo_redo();
 		undo_redo->create_action(TTR("Remove Property"));
 		undo_redo->add_do_method(config.ptr(), "remove_property", prop);
 		undo_redo->add_undo_method(config.ptr(), "add_property", prop, idx);
@@ -329,7 +330,7 @@ void ReplicationEditor::property_keyed(const String &p_property) {
 	path += ":" + p_property;
 
 	NodePath prop = path;
-	UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Add property"));
 	undo_redo->add_do_method(config.ptr(), "add_property", prop);
 	undo_redo->add_undo_method(config.ptr(), "remove_property", prop);
@@ -340,8 +341,8 @@ void ReplicationEditor::property_keyed(const String &p_property) {
 
 /// ReplicationEditorPlugin
 ReplicationEditorPlugin::ReplicationEditorPlugin() {
-	repl_editor = memnew(ReplicationEditor);
-	EditorNode::get_singleton()->add_bottom_panel_item(TTR("Replication"), repl_editor);
+	repl_editor = memnew(ReplicationEditor(this));
+	add_control_to_bottom_panel(repl_editor, TTR("Replication"));
 }
 
 ReplicationEditorPlugin::~ReplicationEditorPlugin() {
@@ -376,7 +377,7 @@ void ReplicationEditorPlugin::_node_removed(Node *p_node) {
 	if (p_node && p_node == repl_editor->get_current()) {
 		repl_editor->edit(nullptr);
 		if (repl_editor->is_visible_in_tree()) {
-			EditorNode::get_singleton()->hide_bottom_panel();
+			hide_bottom_panel();
 		}
 	}
 }
@@ -391,6 +392,6 @@ bool ReplicationEditorPlugin::handles(Object *p_object) const {
 
 void ReplicationEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
-		EditorNode::get_singleton()->make_bottom_panel_item_visible(repl_editor);
+		make_bottom_panel_item_visible(repl_editor);
 	}
 }
diff --git a/editor/plugins/replication_editor_plugin.h b/editor/plugins/replication_editor_plugin.h
index 08e86d1617d4..b46c3530254c 100644
--- a/editor/plugins/replication_editor_plugin.h
+++ b/editor/plugins/replication_editor_plugin.h
@@ -32,16 +32,21 @@
 #define REPLICATION_EDITOR_PLUGIN_H
 
 #include "editor/editor_plugin.h"
+#include "scene/gui/box_container.h"
 #include "scene/resources/scene_replication_config.h"
 
 class ConfirmationDialog;
 class MultiplayerSynchronizer;
 class Tree;
+class AcceptDialog;
+class LineEdit;
 
 class ReplicationEditor : public VBoxContainer {
 	GDCLASS(ReplicationEditor, VBoxContainer);
 
 private:
+	EditorPlugin *plugin;
+
 	MultiplayerSynchronizer *current = nullptr;
 
 	AcceptDialog *error_dialog = nullptr;
@@ -76,7 +81,7 @@ class ReplicationEditor : public VBoxContainer {
 	MultiplayerSynchronizer *get_current() const { return current; }
 	void property_keyed(const String &p_property);
 
-	ReplicationEditor();
+	ReplicationEditor(EditorPlugin *p_plugin);
 	~ReplicationEditor() {}
 };
 
diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp
index eafc53c72b3e..eb41fd7c08c8 100644
--- a/editor/plugins/resource_preloader_editor_plugin.cpp
+++ b/editor/plugins/resource_preloader_editor_plugin.cpp
@@ -70,6 +70,7 @@ void ResourcePreloaderEditor::_files_load_request(const Vector<String> &p_paths)
 			name = basename + " " + itos(counter);
 		}
 
+		UndoRedo *undo_redo = plugin->get_undo_redo();
 		undo_redo->create_action(TTR("Add Resource"));
 		undo_redo->add_do_method(preloader, "add_resource", name, resource);
 		undo_redo->add_undo_method(preloader, "remove_resource", name);
@@ -114,6 +115,8 @@ void ResourcePreloaderEditor::_item_edited() {
 		}
 
 		RES samp = preloader->get_resource(old_name);
+
+		UndoRedo *undo_redo = plugin->get_undo_redo();
 		undo_redo->create_action(TTR("Rename Resource"));
 		undo_redo->add_do_method(preloader, "remove_resource", old_name);
 		undo_redo->add_do_method(preloader, "add_resource", new_name, samp);
@@ -126,6 +129,7 @@ void ResourcePreloaderEditor::_item_edited() {
 }
 
 void ResourcePreloaderEditor::_remove_resource(const String &p_to_remove) {
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Delete Resource"));
 	undo_redo->add_do_method(preloader, "remove_resource", p_to_remove);
 	undo_redo->add_undo_method(preloader, "add_resource", p_to_remove, preloader->get_resource(p_to_remove));
@@ -159,6 +163,7 @@ void ResourcePreloaderEditor::_paste_pressed() {
 		name = basename + " " + itos(counter);
 	}
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Paste Resource"));
 	undo_redo->add_do_method(preloader, "add_resource", name, r);
 	undo_redo->add_undo_method(preloader, "remove_resource", name);
@@ -219,11 +224,11 @@ void ResourcePreloaderEditor::_cell_button_pressed(Object *p_item, int p_column,
 
 	if (p_id == BUTTON_OPEN_SCENE) {
 		String rpath = item->get_text(p_column);
-		EditorInterface::get_singleton()->open_scene_from_path(rpath);
+		plugin->get_editor_interface()->open_scene_from_path(rpath);
 
 	} else if (p_id == BUTTON_EDIT_RESOURCE) {
 		RES r = preloader->get_resource(item->get_text(0));
-		EditorInterface::get_singleton()->edit_resource(r);
+		plugin->get_editor_interface()->edit_resource(r);
 
 	} else if (p_id == BUTTON_REMOVE) {
 		_remove_resource(item->get_text(0));
@@ -313,6 +318,8 @@ void ResourcePreloaderEditor::drop_data_fw(const Point2 &p_point, const Variant
 				name = basename + "_" + itos(counter);
 			}
 
+			UndoRedo *undo_redo = plugin->get_undo_redo();
+
 			undo_redo->create_action(TTR("Add Resource"));
 			undo_redo->add_do_method(preloader, "add_resource", name, r);
 			undo_redo->add_undo_method(preloader, "remove_resource", name);
@@ -338,8 +345,9 @@ void ResourcePreloaderEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_drop_data_fw"), &ResourcePreloaderEditor::drop_data_fw);
 }
 
-ResourcePreloaderEditor::ResourcePreloaderEditor() {
-	//add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("panel","Panel"));
+ResourcePreloaderEditor::ResourcePreloaderEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
+	//add_style_override("panel", plugin->get_editor_interface()->get_base_control()->get_stylebox("panel","Panel"));
 
 	VBoxContainer *vbc = memnew(VBoxContainer);
 	add_child(vbc);
@@ -383,7 +391,6 @@ ResourcePreloaderEditor::ResourcePreloaderEditor() {
 }
 
 void ResourcePreloaderEditorPlugin::edit(Object *p_object) {
-	preloader_editor->set_undo_redo(&get_undo_redo());
 	ResourcePreloader *s = Object::cast_to<ResourcePreloader>(p_object);
 	if (!s) {
 		return;
@@ -400,11 +407,11 @@ void ResourcePreloaderEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
 		//preloader_editor->show();
 		button->show();
-		EditorNode::get_singleton()->make_bottom_panel_item_visible(preloader_editor);
+		make_bottom_panel_item_visible(preloader_editor);
 		//preloader_editor->set_process(true);
 	} else {
 		if (preloader_editor->is_visible_in_tree()) {
-			EditorNode::get_singleton()->hide_bottom_panel();
+			hide_bottom_panel();
 		}
 		button->hide();
 		//preloader_editor->hide();
@@ -413,10 +420,10 @@ void ResourcePreloaderEditorPlugin::make_visible(bool p_visible) {
 }
 
 ResourcePreloaderEditorPlugin::ResourcePreloaderEditorPlugin() {
-	preloader_editor = memnew(ResourcePreloaderEditor);
+	preloader_editor = memnew(ResourcePreloaderEditor(this));
 	preloader_editor->set_custom_minimum_size(Size2(0, 250) * EDSCALE);
 
-	button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("ResourcePreloader"), preloader_editor);
+	button = add_control_to_bottom_panel(preloader_editor, TTR("ResourcePreloader"));
 	button->hide();
 
 	//preloader_editor->set_anchor( MARGIN_TOP, Control::ANCHOR_END);
diff --git a/editor/plugins/resource_preloader_editor_plugin.h b/editor/plugins/resource_preloader_editor_plugin.h
index 0b799c13c6f0..a975710da1c7 100644
--- a/editor/plugins/resource_preloader_editor_plugin.h
+++ b/editor/plugins/resource_preloader_editor_plugin.h
@@ -33,6 +33,7 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/gui/dialogs.h"
+#include "scene/gui/panel_container.h"
 #include "scene/gui/tree.h"
 #include "scene/main/resource_preloader.h"
 
@@ -47,6 +48,8 @@ class ResourcePreloaderEditor : public PanelContainer {
 		BUTTON_REMOVE
 	};
 
+	EditorPlugin *plugin = nullptr;
+
 	Button *load = nullptr;
 	Button *paste = nullptr;
 	Tree *tree = nullptr;
@@ -66,8 +69,6 @@ class ResourcePreloaderEditor : public PanelContainer {
 	void _cell_button_pressed(Object *p_item, int p_column, int p_id);
 	void _item_edited();
 
-	UndoRedo *undo_redo = nullptr;
-
 	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
 	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
 	void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
@@ -78,10 +79,8 @@ class ResourcePreloaderEditor : public PanelContainer {
 	static void _bind_methods();
 
 public:
-	void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; }
-
 	void edit(ResourcePreloader *p_preloader);
-	ResourcePreloaderEditor();
+	ResourcePreloaderEditor(EditorPlugin *p_plugin);
 };
 
 class ResourcePreloaderEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index 906edb006c5d..4336a14d5240 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -1400,7 +1400,7 @@ void ScriptEditor::_menu_option(int p_option) {
 
 				es->_run();
 
-				EditorNode::get_undo_redo()->clear_history();
+				plugin->get_undo_redo()->clear_history();
 			} break;
 			case FILE_CLOSE: {
 				if (current->is_unsaved()) {
@@ -1628,7 +1628,7 @@ void ScriptEditor::_notification(int p_what) {
 			filter_scripts->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
 			filter_methods->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
 
-			filename->add_theme_style_override("normal", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("normal"), SNAME("LineEdit")));
+			filename->add_theme_style_override("normal", plugin->get_editor_interface()->get_base_control()->get_theme_stylebox(SNAME("normal"), SNAME("LineEdit")));
 
 			recent_scripts->reset_size();
 
@@ -1658,7 +1658,7 @@ void ScriptEditor::_notification(int p_what) {
 				find_in_files_button->show();
 			} else {
 				if (find_in_files->is_visible_in_tree()) {
-					EditorNode::get_singleton()->hide_bottom_panel();
+					plugin->hide_bottom_panel();
 				}
 				find_in_files_button->hide();
 			}
@@ -1973,7 +1973,7 @@ void ScriptEditor::_update_script_names() {
 	}
 
 	Set<Ref<Script>> used;
-	Node *edited = EditorNode::get_singleton()->get_edited_scene();
+	Node *edited = plugin->get_editor_interface()->get_edited_scene_root();
 	if (edited) {
 		_find_scripts(edited, edited, used);
 	}
@@ -2678,7 +2678,7 @@ void ScriptEditor::_save_layout() {
 		return;
 	}
 
-	EditorNode::get_singleton()->save_layout();
+	plugin->queue_save_layout();
 }
 
 void ScriptEditor::_editor_settings_changed() {
@@ -3584,7 +3584,7 @@ void ScriptEditor::_start_find_in_files(bool with_replace) {
 	find_in_files->set_replace_text(find_in_files_dialog->get_replace_text());
 	find_in_files->start_search();
 
-	EditorNode::get_singleton()->make_bottom_panel_item_visible(find_in_files);
+	plugin->make_bottom_panel_item_visible(find_in_files);
 }
 
 void ScriptEditor::_on_find_in_files_modified_files(PackedStringArray paths) {
@@ -3633,9 +3633,12 @@ void ScriptEditor::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("script_close", PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script")));
 }
 
-ScriptEditor::ScriptEditor() {
+ScriptEditor::ScriptEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	current_theme = "";
 
+	Control *base_control = plugin->get_editor_interface()->get_base_control();
+
 	script_editor_cache.instantiate();
 	script_editor_cache->load(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("script_editor_cache.cfg"));
 
@@ -3696,7 +3699,7 @@ ScriptEditor::ScriptEditor() {
 	filename = memnew(Label);
 	filename->set_clip_text(true);
 	filename->set_h_size_flags(SIZE_EXPAND_FILL);
-	filename->add_theme_style_override("normal", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("normal"), SNAME("LineEdit")));
+	filename->add_theme_style_override("normal", base_control->get_theme_stylebox(SNAME("normal"), SNAME("LineEdit")));
 	buttons_hbox->add_child(filename);
 
 	members_overview_alphabeta_sort_button = memnew(Button);
@@ -3935,7 +3938,7 @@ ScriptEditor::ScriptEditor() {
 	find_in_files_dialog->connect(FindInFilesDialog::SIGNAL_REPLACE_REQUESTED, callable_mp(this, &ScriptEditor::_start_find_in_files), varray(true));
 	add_child(find_in_files_dialog);
 	find_in_files = memnew(FindInFilesPanel);
-	find_in_files_button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Search Results"), find_in_files);
+	find_in_files_button = plugin->add_control_to_bottom_panel(find_in_files, TTR("Search Results"));
 	find_in_files->set_custom_minimum_size(Size2(0, 200) * EDSCALE);
 	find_in_files->connect(FindInFilesPanel::SIGNAL_RESULT_SELECTED, callable_mp(this, &ScriptEditor::_on_find_in_files_result_selected));
 	find_in_files->connect(FindInFilesPanel::SIGNAL_FILES_MODIFIED, callable_mp(this, &ScriptEditor::_on_find_in_files_modified_files));
@@ -3951,8 +3954,8 @@ ScriptEditor::ScriptEditor() {
 
 	ScriptServer::edit_request_func = _open_script_request;
 
-	add_theme_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("ScriptEditorPanel"), SNAME("EditorStyles")));
-	tab_container->add_theme_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("ScriptEditor"), SNAME("EditorStyles")));
+	add_theme_style_override("panel", base_control->get_theme_stylebox(SNAME("ScriptEditorPanel"), SNAME("EditorStyles")));
+	tab_container->add_theme_style_override("panel", base_control->get_theme_stylebox(SNAME("ScriptEditor"), SNAME("EditorStyles")));
 }
 
 ScriptEditor::~ScriptEditor() {
@@ -4037,8 +4040,8 @@ void ScriptEditorPlugin::edited_scene_changed() {
 }
 
 ScriptEditorPlugin::ScriptEditorPlugin() {
-	script_editor = memnew(ScriptEditor);
-	EditorNode::get_singleton()->get_main_control()->add_child(script_editor);
+	script_editor = memnew(ScriptEditor(this));
+	get_editor_interface()->get_editor_main_control()->add_child(script_editor);
 	script_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 
 	script_editor->hide();
diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h
index 7885ffe2c5a2..7dfae6055e87 100644
--- a/editor/plugins/script_editor_plugin.h
+++ b/editor/plugins/script_editor_plugin.h
@@ -35,7 +35,6 @@
 #include "editor/code_editor.h"
 #include "editor/editor_help.h"
 #include "editor/editor_help_search.h"
-#include "editor/editor_plugin.h"
 #include "editor/script_create_dialog.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/line_edit.h"
@@ -43,6 +42,7 @@
 #include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
 #include "scene/main/timer.h"
 #include "scene/resources/text_file.h"
@@ -241,6 +241,7 @@ class ScriptEditor : public PanelContainer {
 		DISPLAY_DIR_AND_NAME,
 		DISPLAY_FULL_PATH,
 	};
+	EditorPlugin *plugin = nullptr;
 
 	HBoxContainer *menu_hb = nullptr;
 	MenuButton *file_menu = nullptr;
@@ -522,7 +523,7 @@ class ScriptEditor : public PanelContainer {
 
 	static void register_create_script_editor_function(CreateScriptEditorFunc p_func);
 
-	ScriptEditor();
+	ScriptEditor(EditorPlugin *p_plugin);
 	~ScriptEditor();
 };
 
diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp
index 070f1fac1e46..564ac9bebf17 100644
--- a/editor/plugins/shader_editor_plugin.cpp
+++ b/editor/plugins/shader_editor_plugin.cpp
@@ -35,7 +35,6 @@
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/version_generated.gen.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/project_settings_editor.h"
@@ -188,9 +187,10 @@ void ShaderTextEditor::_load_theme_settings() {
 	}
 
 	if (warnings_panel) {
+		Control *control_base = plugin->get_editor_interface()->get_base_control();
 		// Warnings panel
-		warnings_panel->add_theme_font_override("normal_font", EditorNode::get_singleton()->get_gui_base()->get_theme_font(SNAME("main"), SNAME("EditorFonts")));
-		warnings_panel->add_theme_font_size_override("normal_font_size", EditorNode::get_singleton()->get_gui_base()->get_theme_font_size(SNAME("main_size"), SNAME("EditorFonts")));
+		warnings_panel->add_theme_font_override("normal_font", control_base->get_theme_font(SNAME("main"), SNAME("EditorFonts")));
+		warnings_panel->add_theme_font_size_override("normal_font_size", control_base->get_theme_font_size(SNAME("main_size"), SNAME("EditorFonts")));
 	}
 }
 
@@ -336,7 +336,8 @@ void ShaderTextEditor::_update_warning_panel() {
 void ShaderTextEditor::_bind_methods() {
 }
 
-ShaderTextEditor::ShaderTextEditor() {
+ShaderTextEditor::ShaderTextEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	syntax_highlighter.instantiate();
 	get_text_editor()->set_syntax_highlighter(syntax_highlighter);
 }
@@ -691,7 +692,7 @@ void ShaderEditor::_make_context_menu(bool p_selection, Vector2 p_position) {
 	context_menu->popup();
 }
 
-ShaderEditor::ShaderEditor() {
+ShaderEditor::ShaderEditor(EditorPlugin *p_plugin) {
 	GLOBAL_DEF("debug/shader_language/warnings/enable", true);
 	GLOBAL_DEF("debug/shader_language/warnings/treat_warnings_as_errors", false);
 	for (int i = 0; i < (int)ShaderWarning::WARNING_MAX; i++) {
@@ -699,7 +700,7 @@ ShaderEditor::ShaderEditor() {
 	}
 	_update_warnings(false);
 
-	shader_editor = memnew(ShaderTextEditor);
+	shader_editor = memnew(ShaderTextEditor(p_plugin));
 	shader_editor->set_v_size_flags(SIZE_EXPAND_FILL);
 	shader_editor->add_theme_constant_override("separation", 0);
 	shader_editor->set_anchors_and_offsets_preset(Control::PRESET_WIDE);
@@ -777,6 +778,8 @@ ShaderEditor::ShaderEditor() {
 	bookmarks_menu->connect("about_to_popup", callable_mp(this, &ShaderEditor::_update_bookmark_list));
 	bookmarks_menu->connect("index_pressed", callable_mp(this, &ShaderEditor::_bookmark_item_pressed));
 
+	Control *base_control = p_plugin->get_editor_interface()->get_base_control();
+
 	help_menu = memnew(MenuButton);
 	help_menu->set_text(TTR("Help"));
 	help_menu->set_switch_on_hover(true);
@@ -789,7 +792,7 @@ ShaderEditor::ShaderEditor() {
 	hbc->add_child(edit_menu);
 	hbc->add_child(goto_menu);
 	hbc->add_child(help_menu);
-	hbc->add_theme_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("ScriptEditorPanel"), SNAME("EditorStyles")));
+	hbc->add_theme_style_override("panel", base_control->get_theme_stylebox(SNAME("ScriptEditorPanel"), SNAME("EditorStyles")));
 
 	VSplitContainer *editor_box = memnew(VSplitContainer);
 	main_container->add_child(editor_box);
@@ -849,12 +852,12 @@ bool ShaderEditorPlugin::handles(Object *p_object) const {
 void ShaderEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
 		button->show();
-		EditorNode::get_singleton()->make_bottom_panel_item_visible(shader_editor);
+		make_bottom_panel_item_visible(shader_editor);
 
 	} else {
 		button->hide();
 		if (shader_editor->is_visible_in_tree()) {
-			EditorNode::get_singleton()->hide_bottom_panel();
+			hide_bottom_panel();
 		}
 		shader_editor->apply_shaders();
 	}
@@ -873,10 +876,10 @@ void ShaderEditorPlugin::apply_changes() {
 }
 
 ShaderEditorPlugin::ShaderEditorPlugin() {
-	shader_editor = memnew(ShaderEditor);
+	shader_editor = memnew(ShaderEditor(this));
 
 	shader_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
-	button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Shader"), shader_editor);
+	button = add_control_to_bottom_panel(shader_editor, TTR("Shader"));
 	button->hide();
 
 	_2d = false;
diff --git a/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h
index 067711c75cce..fec1fe66220e 100644
--- a/editor/plugins/shader_editor_plugin.h
+++ b/editor/plugins/shader_editor_plugin.h
@@ -51,6 +51,8 @@ class ShaderTextEditor : public CodeTextEditor {
 		_ALWAYS_INLINE_ bool operator()(const ShaderWarning &p_a, const ShaderWarning &p_b) const { return (p_a.get_line() < p_b.get_line()); }
 	};
 
+	EditorPlugin *plugin;
+
 	Ref<CodeHighlighter> syntax_highlighter;
 	RichTextLabel *warnings_panel = nullptr;
 	Ref<Shader> shader;
@@ -75,7 +77,7 @@ class ShaderTextEditor : public CodeTextEditor {
 
 	Ref<Shader> get_edited_shader() const;
 	void set_edited_shader(const Ref<Shader> &p_shader);
-	ShaderTextEditor();
+	ShaderTextEditor(EditorPlugin *p_plugin);
 };
 
 class ShaderEditor : public PanelContainer {
@@ -154,7 +156,7 @@ class ShaderEditor : public PanelContainer {
 	virtual Size2 get_minimum_size() const override { return Size2(0, 200); }
 	void save_external_data(const String &p_str = "");
 
-	ShaderEditor();
+	ShaderEditor(EditorPlugin *p_plugin);
 };
 
 class ShaderEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/shader_file_editor_plugin.cpp b/editor/plugins/shader_file_editor_plugin.cpp
index 4458555de217..f50658ad8c82 100644
--- a/editor/plugins/shader_file_editor_plugin.cpp
+++ b/editor/plugins/shader_file_editor_plugin.cpp
@@ -34,10 +34,10 @@
 #include "core/io/resource_saver.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/property_editor.h"
+#include "scene/gui/item_list.h"
 #include "servers/display_server.h"
 #include "servers/rendering/shader_types.h"
 
@@ -303,12 +303,12 @@ bool ShaderFileEditorPlugin::handles(Object *p_object) const {
 void ShaderFileEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
 		button->show();
-		EditorNode::get_singleton()->make_bottom_panel_item_visible(shader_editor);
+		make_bottom_panel_item_visible(shader_editor);
 
 	} else {
 		button->hide();
 		if (shader_editor->is_visible_in_tree()) {
-			EditorNode::get_singleton()->hide_bottom_panel();
+			hide_bottom_panel();
 		}
 	}
 }
@@ -317,7 +317,7 @@ ShaderFileEditorPlugin::ShaderFileEditorPlugin() {
 	shader_editor = memnew(ShaderFileEditor);
 
 	shader_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
-	button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("ShaderFile"), shader_editor);
+	button = add_control_to_bottom_panel(shader_editor, TTR("ShaderFile"));
 	button->hide();
 }
 
diff --git a/editor/plugins/skeleton_2d_editor_plugin.cpp b/editor/plugins/skeleton_2d_editor_plugin.cpp
index 5a1505c2326f..c91135157663 100644
--- a/editor/plugins/skeleton_2d_editor_plugin.cpp
+++ b/editor/plugins/skeleton_2d_editor_plugin.cpp
@@ -30,8 +30,8 @@
 
 #include "skeleton_2d_editor_plugin.h"
 
-#include "canvas_item_editor_plugin.h"
-#include "editor/editor_node.h"
+#include "core/object/undo_redo.h"
+#include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/2d/mesh_instance_2d.h"
 #include "scene/gui/box_container.h"
 #include "thirdparty/misc/clipper.hpp"
@@ -59,7 +59,7 @@ void Skeleton2DEditor::_menu_option(int p_option) {
 				err_dialog->popup_centered();
 				return;
 			}
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			UndoRedo *ur = plugin->get_undo_redo();
 			ur->create_action(TTR("Set Rest Pose to Bones"));
 			for (int i = 0; i < node->get_bone_count(); i++) {
 				Bone2D *bone = node->get_bone(i);
@@ -75,7 +75,7 @@ void Skeleton2DEditor::_menu_option(int p_option) {
 				err_dialog->popup_centered();
 				return;
 			}
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			UndoRedo *ur = plugin->get_undo_redo();
 			ur->create_action(TTR("Create Rest Pose from Bones"));
 			for (int i = 0; i < node->get_bone_count(); i++) {
 				Bone2D *bone = node->get_bone(i);
@@ -91,13 +91,14 @@ void Skeleton2DEditor::_menu_option(int p_option) {
 void Skeleton2DEditor::_bind_methods() {
 }
 
-Skeleton2DEditor::Skeleton2DEditor() {
+Skeleton2DEditor::Skeleton2DEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	options = memnew(MenuButton);
 
 	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(options);
 
 	options->set_text(TTR("Skeleton2D"));
-	options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Skeleton2D"), SNAME("EditorIcons")));
+	options->set_icon(plugin->get_editor_interface()->get_base_control()->get_theme_icon(SNAME("Skeleton2D"), SNAME("EditorIcons")));
 
 	options->get_popup()->add_item(TTR("Reset to Rest Pose"), MENU_OPTION_SET_REST);
 	options->get_popup()->add_separator();
@@ -129,8 +130,8 @@ void Skeleton2DEditorPlugin::make_visible(bool p_visible) {
 }
 
 Skeleton2DEditorPlugin::Skeleton2DEditorPlugin() {
-	sprite_editor = memnew(Skeleton2DEditor);
-	EditorNode::get_singleton()->get_main_control()->add_child(sprite_editor);
+	sprite_editor = memnew(Skeleton2DEditor(this));
+	get_editor_interface()->get_editor_main_control()->add_child(sprite_editor);
 	make_visible(false);
 
 	//sprite_editor->options->hide();
diff --git a/editor/plugins/skeleton_2d_editor_plugin.h b/editor/plugins/skeleton_2d_editor_plugin.h
index 295725b75139..ff3732bc50a0 100644
--- a/editor/plugins/skeleton_2d_editor_plugin.h
+++ b/editor/plugins/skeleton_2d_editor_plugin.h
@@ -33,6 +33,8 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/2d/skeleton_2d.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/spin_box.h"
 
 class Skeleton2DEditor : public Control {
@@ -43,6 +45,7 @@ class Skeleton2DEditor : public Control {
 		MENU_OPTION_MAKE_REST,
 	};
 
+	EditorPlugin *plugin = nullptr;
 	Skeleton2D *node = nullptr;
 
 	MenuButton *options = nullptr;
@@ -59,7 +62,7 @@ class Skeleton2DEditor : public Control {
 
 public:
 	void edit(Skeleton2D *p_sprite);
-	Skeleton2DEditor();
+	Skeleton2DEditor(EditorPlugin *p_plugin);
 };
 
 class Skeleton2DEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp
index 065683d6327a..05455fc7089a 100644
--- a/editor/plugins/skeleton_3d_editor_plugin.cpp
+++ b/editor/plugins/skeleton_3d_editor_plugin.cpp
@@ -111,6 +111,8 @@ void BoneTransformEditor::_value_changed(const String &p_property, Variant p_val
 	if (updating) {
 		return;
 	}
+
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	if (skeleton) {
 		undo_redo->create_action(TTR("Set Bone Transform"), UndoRedo::MERGE_ENDS);
 		undo_redo->add_undo_property(skeleton, p_property, skeleton->get(p_property));
@@ -119,9 +121,8 @@ void BoneTransformEditor::_value_changed(const String &p_property, Variant p_val
 	}
 }
 
-BoneTransformEditor::BoneTransformEditor(Skeleton3D *p_skeleton) :
-		skeleton(p_skeleton) {
-	undo_redo = EditorNode::get_undo_redo();
+BoneTransformEditor::BoneTransformEditor(Skeleton3D *p_skeleton, EditorPlugin *p_plugin) :
+		skeleton(p_skeleton), plugin(p_plugin) {
 }
 
 void BoneTransformEditor::set_keyable(const bool p_keyable) {
@@ -262,7 +263,7 @@ void Skeleton3DEditor::init_pose(const bool p_all_bones) {
 		return;
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Bone Transform"), UndoRedo::MERGE_ENDS);
 	if (p_all_bones) {
 		for (int i = 0; i < bone_len; i++) {
@@ -301,8 +302,7 @@ void Skeleton3DEditor::insert_keys(const bool p_all_bones) {
 	bool scl_enabled = key_scale_button->is_pressed();
 
 	int bone_len = skeleton->get_bone_count();
-	Node *root = EditorNode::get_singleton()->get_tree()->get_root();
-	String path = root->get_path_to(skeleton);
+	String path = skeleton->get_path();
 
 	AnimationTrackEditor *te = AnimationPlayerEditor::get_singleton()->get_track_editor();
 	te->make_insert_queue();
@@ -335,7 +335,7 @@ void Skeleton3DEditor::pose_to_rest(const bool p_all_bones) {
 		return;
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Bone Rest"), UndoRedo::MERGE_ENDS);
 	if (p_all_bones) {
 		for (int i = 0; i < bone_len; i++) {
@@ -355,7 +355,7 @@ void Skeleton3DEditor::pose_to_rest(const bool p_all_bones) {
 }
 
 void Skeleton3DEditor::create_physical_skeleton() {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ERR_FAIL_COND(!get_tree());
 	Node *owner = skeleton == get_tree()->get_edited_scene_root() ? skeleton : skeleton->get_owner();
 
@@ -510,7 +510,7 @@ void Skeleton3DEditor::move_skeleton_bone(NodePath p_skeleton_path, int32_t p_se
 	Node *node = get_node_or_null(p_skeleton_path);
 	Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(node);
 	ERR_FAIL_NULL(skeleton);
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Bone Parentage"));
 	// If the target is a child of ourselves, we move only *us* and not our children.
 	if (skeleton->is_bone_parent_of(p_target_boneidx, p_selected_boneidx)) {
@@ -628,8 +628,9 @@ void Skeleton3DEditor::create_editors() {
 	skeleton_options = memnew(MenuButton);
 	ne->add_control_to_menu_panel(skeleton_options);
 
+	Control *base_control = plugin->get_editor_interface()->get_base_control();
 	skeleton_options->set_text(TTR("Skeleton3D"));
-	skeleton_options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Skeleton3D"), SNAME("EditorIcons")));
+	skeleton_options->set_icon(base_control->get_theme_icon(SNAME("Skeleton3D"), SNAME("EditorIcons")));
 
 	// Skeleton options.
 	PopupMenu *p = skeleton_options->get_popup();
@@ -730,7 +731,7 @@ void Skeleton3DEditor::create_editors() {
 	joint_tree->set_drag_forwarding(this);
 	s_con->add_child(joint_tree);
 
-	pose_editor = memnew(BoneTransformEditor(skeleton));
+	pose_editor = memnew(BoneTransformEditor(skeleton, plugin));
 	pose_editor->set_label(TTR("Bone Transform"));
 	pose_editor->set_visible(false);
 	add_child(pose_editor);
@@ -797,10 +798,11 @@ void Skeleton3DEditor::edit_mode_toggled(const bool pressed) {
 	_update_gizmo_visible();
 }
 
-Skeleton3DEditor::Skeleton3DEditor(EditorInspectorPluginSkeleton *e_plugin, Skeleton3D *p_skeleton) :
-		editor_plugin(e_plugin),
+Skeleton3DEditor::Skeleton3DEditor(EditorInspectorPluginSkeleton *p_inspector_plugin, EditorPlugin *p_plugin, Skeleton3D *p_skeleton) :
+		inspector_plugin(p_inspector_plugin),
 		skeleton(p_skeleton) {
 	singleton = this;
+	plugin = p_plugin;
 
 	// Handle.
 	handle_material = Ref<ShaderMaterial>(memnew(ShaderMaterial));
@@ -831,7 +833,8 @@ void fragment() {
 }
 )");
 	handle_material->set_shader(handle_shader);
-	Ref<Texture2D> handle = EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("EditorBoneHandle"), SNAME("EditorIcons"));
+	Control *base_control = plugin->get_editor_interface()->get_base_control();
+	Ref<Texture2D> handle = base_control->get_theme_icon(SNAME("EditorBoneHandle"), SNAME("EditorIcons"));
 	handle_material->set_shader_param("point_size", handle->get_width());
 	handle_material->set_shader_param("texture_albedo", handle);
 
@@ -1022,14 +1025,18 @@ void EditorInspectorPluginSkeleton::parse_begin(Object *p_object) {
 	Skeleton3D *skeleton = Object::cast_to<Skeleton3D>(p_object);
 	ERR_FAIL_COND(!skeleton);
 
-	skel_editor = memnew(Skeleton3DEditor(this, skeleton));
+	skel_editor = memnew(Skeleton3DEditor(this, plugin, skeleton));
 	add_custom_control(skel_editor);
 }
 
+EditorInspectorPluginSkeleton::EditorInspectorPluginSkeleton(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
+}
+
 Skeleton3DEditorPlugin::Skeleton3DEditorPlugin() {
-	skeleton_plugin = memnew(EditorInspectorPluginSkeleton);
+	skeleton_plugin = memnew(EditorInspectorPluginSkeleton(this));
 
-	EditorInspector::add_inspector_plugin(skeleton_plugin);
+	add_inspector_plugin(skeleton_plugin);
 
 	Ref<Skeleton3DGizmoPlugin> gizmo_plugin = Ref<Skeleton3DGizmoPlugin>(memnew(Skeleton3DGizmoPlugin));
 	Node3DEditor::get_singleton()->add_gizmo_plugin(gizmo_plugin);
diff --git a/editor/plugins/skeleton_3d_editor_plugin.h b/editor/plugins/skeleton_3d_editor_plugin.h
index 911e39a34f7a..7396fed27386 100644
--- a/editor/plugins/skeleton_3d_editor_plugin.h
+++ b/editor/plugins/skeleton_3d_editor_plugin.h
@@ -61,10 +61,9 @@ class BoneTransformEditor : public VBoxContainer {
 	Rect2 background_rects[5];
 
 	Skeleton3D *skeleton = nullptr;
+	EditorPlugin *plugin = nullptr;
 	// String property;
 
-	UndoRedo *undo_redo = nullptr;
-
 	bool toggle_enabled = false;
 	bool updating = false;
 
@@ -80,7 +79,7 @@ class BoneTransformEditor : public VBoxContainer {
 	void _notification(int p_what);
 
 public:
-	BoneTransformEditor(Skeleton3D *p_skeleton);
+	BoneTransformEditor(Skeleton3D *p_skeleton, EditorPlugin *p_plugin);
 
 	// Which transform target to modify.
 	void set_target(const String &p_prop);
@@ -108,7 +107,9 @@ class Skeleton3DEditor : public VBoxContainer {
 		Transform3D relative_rest; // Relative to skeleton node.
 	};
 
-	EditorInspectorPluginSkeleton *editor_plugin = nullptr;
+	EditorPlugin *plugin = nullptr;
+
+	EditorInspectorPluginSkeleton *inspector_plugin = nullptr;
 
 	Skeleton3D *skeleton = nullptr;
 
@@ -211,7 +212,7 @@ class Skeleton3DEditor : public VBoxContainer {
 	Quaternion get_bone_original_rotation() const { return bone_original_rotation; };
 	Vector3 get_bone_original_scale() const { return bone_original_scale; };
 
-	Skeleton3DEditor(EditorInspectorPluginSkeleton *e_plugin, Skeleton3D *skeleton);
+	Skeleton3DEditor(EditorInspectorPluginSkeleton *p_inspector_plugin, EditorPlugin *p_plugin, Skeleton3D *skeleton);
 	~Skeleton3DEditor();
 };
 
@@ -221,10 +222,13 @@ class EditorInspectorPluginSkeleton : public EditorInspectorPlugin {
 	friend class Skeleton3DEditorPlugin;
 
 	Skeleton3DEditor *skel_editor = nullptr;
+	EditorPlugin *plugin = nullptr;
 
 public:
 	virtual bool can_handle(Object *p_object) override;
 	virtual void parse_begin(Object *p_object) override;
+
+	EditorInspectorPluginSkeleton(EditorPlugin *p_plugin);
 };
 
 class Skeleton3DEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/skeleton_ik_3d_editor_plugin.cpp b/editor/plugins/skeleton_ik_3d_editor_plugin.cpp
index 7dc34a0874b8..6bc6283b7cb3 100644
--- a/editor/plugins/skeleton_ik_3d_editor_plugin.cpp
+++ b/editor/plugins/skeleton_ik_3d_editor_plugin.cpp
@@ -30,8 +30,8 @@
 
 #include "skeleton_ik_3d_editor_plugin.h"
 
-#include "editor/editor_node.h"
 #include "scene/3d/skeleton_ik_3d.h"
+#include "scene/gui/button.h"
 
 void SkeletonIK3DEditorPlugin::_play() {
 	if (!skeleton_ik) {
@@ -83,7 +83,7 @@ void SkeletonIK3DEditorPlugin::_bind_methods() {
 
 SkeletonIK3DEditorPlugin::SkeletonIK3DEditorPlugin() {
 	play_btn = memnew(Button);
-	play_btn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Play"), SNAME("EditorIcons")));
+	play_btn->set_icon(get_editor_interface()->get_base_control()->get_theme_icon(SNAME("Play"), SNAME("EditorIcons")));
 	play_btn->set_text(TTR("Play IK"));
 	play_btn->set_toggle_mode(true);
 	play_btn->hide();
diff --git a/editor/plugins/sprite_2d_editor_plugin.cpp b/editor/plugins/sprite_2d_editor_plugin.cpp
index 6a638753244f..0237430cd75d 100644
--- a/editor/plugins/sprite_2d_editor_plugin.cpp
+++ b/editor/plugins/sprite_2d_editor_plugin.cpp
@@ -32,7 +32,6 @@
 
 #include "canvas_item_editor_plugin.h"
 #include "core/math/geometry_2d.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/scene_tree_dock.h"
 #include "scene/2d/collision_polygon_2d.h"
@@ -337,7 +336,7 @@ void Sprite2DEditor::_convert_to_mesh_2d_node() {
 	MeshInstance2D *mesh_instance = memnew(MeshInstance2D);
 	mesh_instance->set_mesh(mesh);
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Convert to MeshInstance2D"));
 	ur->add_do_method(SceneTreeDock::get_singleton(), "replace_node", node, mesh_instance, true, false);
 	ur->add_do_reference(mesh_instance);
@@ -395,7 +394,7 @@ void Sprite2DEditor::_convert_to_polygon_2d_node() {
 	polygon_2d_instance->set_polygon(polygon);
 	polygon_2d_instance->set_polygons(polys);
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Convert to Polygon2D"));
 	ur->add_do_method(SceneTreeDock::get_singleton(), "replace_node", node, polygon_2d_instance, true, false);
 	ur->add_do_reference(polygon_2d_instance);
@@ -417,7 +416,7 @@ void Sprite2DEditor::_create_collision_polygon_2d_node() {
 		CollisionPolygon2D *collision_polygon_2d_instance = memnew(CollisionPolygon2D);
 		collision_polygon_2d_instance->set_polygon(outline);
 
-		UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+		UndoRedo *ur = plugin->get_undo_redo();
 		ur->create_action(TTR("Create CollisionPolygon2D Sibling"));
 		ur->add_do_method(this, "_add_as_sibling_or_child", node, collision_polygon_2d_instance);
 		ur->add_do_reference(collision_polygon_2d_instance);
@@ -450,7 +449,7 @@ void Sprite2DEditor::_create_light_occluder_2d_node() {
 		LightOccluder2D *light_occluder_2d_instance = memnew(LightOccluder2D);
 		light_occluder_2d_instance->set_occluder_polygon(polygon);
 
-		UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+		UndoRedo *ur = plugin->get_undo_redo();
 		ur->create_action(TTR("Create LightOccluder2D Sibling"));
 		ur->add_do_method(this, "_add_as_sibling_or_child", node, light_occluder_2d_instance);
 		ur->add_do_reference(light_occluder_2d_instance);
@@ -516,7 +515,8 @@ void Sprite2DEditor::_bind_methods() {
 	ClassDB::bind_method("_add_as_sibling_or_child", &Sprite2DEditor::_add_as_sibling_or_child);
 }
 
-Sprite2DEditor::Sprite2DEditor() {
+Sprite2DEditor::Sprite2DEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	options = memnew(MenuButton);
 
 	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(options);
@@ -597,8 +597,8 @@ void Sprite2DEditorPlugin::make_visible(bool p_visible) {
 }
 
 Sprite2DEditorPlugin::Sprite2DEditorPlugin() {
-	sprite_editor = memnew(Sprite2DEditor);
-	EditorNode::get_singleton()->get_main_control()->add_child(sprite_editor);
+	sprite_editor = memnew(Sprite2DEditor(this));
+	get_editor_interface()->get_editor_main_control()->add_child(sprite_editor);
 	make_visible(false);
 
 	//sprite_editor->options->hide();
diff --git a/editor/plugins/sprite_2d_editor_plugin.h b/editor/plugins/sprite_2d_editor_plugin.h
index 8e3dc19c7e16..a3df837c26f5 100644
--- a/editor/plugins/sprite_2d_editor_plugin.h
+++ b/editor/plugins/sprite_2d_editor_plugin.h
@@ -33,6 +33,8 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/2d/sprite_2d.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/spin_box.h"
 
 class Sprite2DEditor : public Control {
@@ -45,6 +47,8 @@ class Sprite2DEditor : public Control {
 		MENU_OPTION_CREATE_LIGHT_OCCLUDER_2D
 	};
 
+	EditorPlugin *plugin;
+
 	Menu selected_menu_item;
 
 	Sprite2D *node = nullptr;
@@ -92,7 +96,7 @@ class Sprite2DEditor : public Control {
 
 public:
 	void edit(Sprite2D *p_sprite);
-	Sprite2DEditor();
+	Sprite2DEditor(EditorPlugin *p_plugin);
 };
 
 class Sprite2DEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp
index 87b5b829e063..d8572c9c0b31 100644
--- a/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -228,6 +228,7 @@ void SpriteFramesEditor::_sheet_add_frames() {
 	int frame_count_y = split_sheet_v->get_value();
 	Size2 frame_size(texture_size.width / frame_count_x, texture_size.height / frame_count_y);
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Add Frame"));
 
 	int fc = frames->get_frame_count(edited_anim);
@@ -376,6 +377,7 @@ void SpriteFramesEditor::_file_load_request(const Vector<String> &p_path, int p_
 		return;
 	}
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Add Frame"));
 	int fc = frames->get_frame_count(edited_anim);
 
@@ -420,6 +422,7 @@ void SpriteFramesEditor::_paste_pressed() {
 		return; ///beh should show an error i guess
 	}
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Paste Frame"));
 	undo_redo->add_do_method(frames, "add_frame", edited_anim, r);
 	undo_redo->add_undo_method(frames, "remove_frame", edited_anim, frames->get_frame_count(edited_anim));
@@ -457,6 +460,7 @@ void SpriteFramesEditor::_empty_pressed() {
 
 	Ref<Texture2D> r;
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Add Empty"));
 	undo_redo->add_do_method(frames, "add_frame", edited_anim, r, from);
 	undo_redo->add_undo_method(frames, "remove_frame", edited_anim, from);
@@ -480,6 +484,7 @@ void SpriteFramesEditor::_empty2_pressed() {
 
 	Ref<Texture2D> r;
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Add Empty"));
 	undo_redo->add_do_method(frames, "add_frame", edited_anim, r, from + 1);
 	undo_redo->add_undo_method(frames, "remove_frame", edited_anim, from + 1);
@@ -503,6 +508,7 @@ void SpriteFramesEditor::_up_pressed() {
 	sel = to_move;
 	sel -= 1;
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Delete Resource"));
 	undo_redo->add_do_method(frames, "set_frame", edited_anim, to_move, frames->get_frame(edited_anim, to_move - 1));
 	undo_redo->add_do_method(frames, "set_frame", edited_anim, to_move - 1, frames->get_frame(edited_anim, to_move));
@@ -528,6 +534,7 @@ void SpriteFramesEditor::_down_pressed() {
 	sel = to_move;
 	sel += 1;
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Delete Resource"));
 	undo_redo->add_do_method(frames, "set_frame", edited_anim, to_move, frames->get_frame(edited_anim, to_move + 1));
 	undo_redo->add_do_method(frames, "set_frame", edited_anim, to_move + 1, frames->get_frame(edited_anim, to_move));
@@ -550,6 +557,7 @@ void SpriteFramesEditor::_delete_pressed() {
 		return;
 	}
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Delete Resource"));
 	undo_redo->add_do_method(frames, "remove_frame", edited_anim, to_delete);
 	undo_redo->add_undo_method(frames, "add_frame", edited_anim, frames->get_frame(edited_anim, to_delete), to_delete);
@@ -634,8 +642,9 @@ void SpriteFramesEditor::_animation_name_edited() {
 	}
 
 	List<Node *> nodes;
-	_find_anim_sprites(EditorNode::get_singleton()->get_edited_scene(), &nodes, Ref<SpriteFrames>(frames));
+	_find_anim_sprites(plugin->get_editor_interface()->get_edited_scene_root(), &nodes, Ref<SpriteFrames>(frames));
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Rename Animation"));
 	undo_redo->add_do_method(frames, "rename_animation", edited_anim, name);
 	undo_redo->add_undo_method(frames, "rename_animation", name, edited_anim);
@@ -663,8 +672,9 @@ void SpriteFramesEditor::_animation_add() {
 	}
 
 	List<Node *> nodes;
-	_find_anim_sprites(EditorNode::get_singleton()->get_edited_scene(), &nodes, Ref<SpriteFrames>(frames));
+	_find_anim_sprites(plugin->get_editor_interface()->get_edited_scene_root(), &nodes, Ref<SpriteFrames>(frames));
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Add Animation"));
 	undo_redo->add_do_method(frames, "add_animation", name);
 	undo_redo->add_undo_method(frames, "remove_animation", name);
@@ -697,6 +707,7 @@ void SpriteFramesEditor::_animation_remove() {
 }
 
 void SpriteFramesEditor::_animation_remove_confirmed() {
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Remove Animation"));
 	undo_redo->add_do_method(frames, "remove_animation", edited_anim);
 	undo_redo->add_undo_method(frames, "add_animation", edited_anim);
@@ -720,6 +731,7 @@ void SpriteFramesEditor::_animation_loop_changed() {
 		return;
 	}
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Change Animation Loop"));
 	undo_redo->add_do_method(frames, "set_animation_loop", edited_anim, anim_loop->is_pressed());
 	undo_redo->add_undo_method(frames, "set_animation_loop", edited_anim, frames->get_animation_loop(edited_anim));
@@ -733,6 +745,7 @@ void SpriteFramesEditor::_animation_fps_changed(double p_value) {
 		return;
 	}
 
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Change Animation FPS"), UndoRedo::MERGE_ENDS);
 	undo_redo->add_do_method(frames, "set_animation_speed", edited_anim, p_value);
 	undo_redo->add_undo_method(frames, "set_animation_speed", edited_anim, frames->get_animation_speed(edited_anim));
@@ -989,6 +1002,7 @@ void SpriteFramesEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 				reorder = true;
 			}
 
+			UndoRedo *undo_redo = plugin->get_undo_redo();
 			if (reorder) { //drop is from reordering frames
 				int from_frame = -1;
 				if (d.has("frame")) {
@@ -1032,7 +1046,8 @@ void SpriteFramesEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_drop_data_fw"), &SpriteFramesEditor::drop_data_fw);
 }
 
-SpriteFramesEditor::SpriteFramesEditor() {
+SpriteFramesEditor::SpriteFramesEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	VBoxContainer *vbc_animlist = memnew(VBoxContainer);
 	add_child(vbc_animlist);
 	vbc_animlist->set_custom_minimum_size(Size2(150, 0) * EDSCALE);
@@ -1307,8 +1322,6 @@ SpriteFramesEditor::SpriteFramesEditor() {
 }
 
 void SpriteFramesEditorPlugin::edit(Object *p_object) {
-	frames_editor->set_undo_redo(&get_undo_redo());
-
 	SpriteFrames *s;
 	AnimatedSprite2D *animated_sprite = Object::cast_to<AnimatedSprite2D>(p_object);
 	if (animated_sprite) {
@@ -1340,19 +1353,19 @@ bool SpriteFramesEditorPlugin::handles(Object *p_object) const {
 void SpriteFramesEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
 		button->show();
-		EditorNode::get_singleton()->make_bottom_panel_item_visible(frames_editor);
+		make_bottom_panel_item_visible(frames_editor);
 	} else {
 		button->hide();
 		if (frames_editor->is_visible_in_tree()) {
-			EditorNode::get_singleton()->hide_bottom_panel();
+			hide_bottom_panel();
 		}
 	}
 }
 
 SpriteFramesEditorPlugin::SpriteFramesEditorPlugin() {
-	frames_editor = memnew(SpriteFramesEditor);
+	frames_editor = memnew(SpriteFramesEditor(this));
 	frames_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
-	button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("SpriteFrames"), frames_editor);
+	button = add_control_to_bottom_panel(frames_editor, TTR("SpriteFrames"));
 	button->hide();
 }
 
diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h
index b0213012a2cf..7743ade05708 100644
--- a/editor/plugins/sprite_frames_editor_plugin.h
+++ b/editor/plugins/sprite_frames_editor_plugin.h
@@ -48,6 +48,8 @@ class EditorFileDialog;
 class SpriteFramesEditor : public HSplitContainer {
 	GDCLASS(SpriteFramesEditor, HSplitContainer);
 
+	EditorPlugin *plugin;
+
 	Button *load = nullptr;
 	Button *load_sheet = nullptr;
 	Button *_delete = nullptr;
@@ -129,8 +131,6 @@ class SpriteFramesEditor : public HSplitContainer {
 
 	bool updating;
 
-	UndoRedo *undo_redo = nullptr;
-
 	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
 	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
 	void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
@@ -155,10 +155,8 @@ class SpriteFramesEditor : public HSplitContainer {
 	static void _bind_methods();
 
 public:
-	void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; }
-
 	void edit(SpriteFrames *p_frames);
-	SpriteFramesEditor();
+	SpriteFramesEditor(EditorPlugin *p_plugin);
 };
 
 class SpriteFramesEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/sub_viewport_preview_editor_plugin.h b/editor/plugins/sub_viewport_preview_editor_plugin.h
index 269553ffb1c8..83bf0a4a5bd6 100644
--- a/editor/plugins/sub_viewport_preview_editor_plugin.h
+++ b/editor/plugins/sub_viewport_preview_editor_plugin.h
@@ -31,6 +31,7 @@
 #ifndef SUB_VIEWPORT_PREVIEW_EDITOR_PLUGIN_H
 #define SUB_VIEWPORT_PREVIEW_EDITOR_PLUGIN_H
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "editor/plugins/texture_editor_plugin.h"
 #include "scene/main/viewport.h"
diff --git a/editor/plugins/text_control_editor_plugin.cpp b/editor/plugins/text_control_editor_plugin.cpp
index 4290888e9454..bc9979c61a0e 100644
--- a/editor/plugins/text_control_editor_plugin.cpp
+++ b/editor/plugins/text_control_editor_plugin.cpp
@@ -285,7 +285,7 @@ void TextControlEditor::_set_font() {
 		return;
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Font"));
 
 	int count = edited_controls.size();
@@ -341,7 +341,7 @@ void TextControlEditor::_font_size_selected(double p_size) {
 		return;
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Font Size"));
 
 	int count = edited_controls.size();
@@ -374,7 +374,7 @@ void TextControlEditor::_outline_size_selected(double p_size) {
 		return;
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Font Outline Size"));
 
 	int count = edited_controls.size();
@@ -400,7 +400,7 @@ void TextControlEditor::_font_color_changed(const Color &p_color) {
 		return;
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Font Color"), UndoRedo::MERGE_ENDS);
 
 	int count = edited_controls.size();
@@ -433,7 +433,7 @@ void TextControlEditor::_outline_color_changed(const Color &p_color) {
 		return;
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Font Outline Color"), UndoRedo::MERGE_ENDS);
 
 	int count = edited_controls.size();
@@ -459,7 +459,7 @@ void TextControlEditor::_clear_formatting() {
 		return;
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Clear Control Formatting"));
 
 	int count = edited_controls.size();
@@ -530,7 +530,8 @@ void TextControlEditor::edit(Object *p_object) {
 		_update_control();
 	} else if (multi_node && handles(multi_node)) {
 		int count = multi_node->get_node_count();
-		Node *scene = EditorNode::get_singleton()->get_edited_scene();
+
+		Node *scene = plugin->get_editor_interface()->get_edited_scene_root();
 
 		for (int i = 0; i < count; ++i) {
 			Control *child = Object::cast_to<Control>(scene->get_node(multi_node->get_node(i)));
@@ -572,7 +573,8 @@ bool TextControlEditor::handles(Object *p_object) const {
 	}
 }
 
-TextControlEditor::TextControlEditor() {
+TextControlEditor::TextControlEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 	add_child(memnew(VSeparator));
 
 	font_list = memnew(OptionButton);
@@ -653,7 +655,7 @@ void TextControlEditorPlugin::make_visible(bool p_visible) {
 }
 
 TextControlEditorPlugin::TextControlEditorPlugin() {
-	text_ctl_editor = memnew(TextControlEditor);
+	text_ctl_editor = memnew(TextControlEditor(this));
 	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(text_ctl_editor);
 
 	text_ctl_editor->hide();
diff --git a/editor/plugins/text_control_editor_plugin.h b/editor/plugins/text_control_editor_plugin.h
index a475f6eba398..f1e073f81543 100644
--- a/editor/plugins/text_control_editor_plugin.h
+++ b/editor/plugins/text_control_editor_plugin.h
@@ -52,6 +52,8 @@ class TextControlEditor : public HBoxContainer {
 		FONT_INFO_ID = 100,
 	};
 
+	EditorPlugin *plugin;
+
 	Map<String, Map<String, String>> fonts;
 
 	OptionButton *font_list = nullptr;
@@ -92,7 +94,7 @@ class TextControlEditor : public HBoxContainer {
 	void edit(Object *p_object);
 	bool handles(Object *p_object) const;
 
-	TextControlEditor();
+	TextControlEditor(EditorPlugin *p_plugin);
 };
 
 /*************************************************************************/
diff --git a/editor/plugins/texture_3d_editor_plugin.h b/editor/plugins/texture_3d_editor_plugin.h
index 2f7f6f83bbf9..46443ec4ceb2 100644
--- a/editor/plugins/texture_3d_editor_plugin.h
+++ b/editor/plugins/texture_3d_editor_plugin.h
@@ -31,6 +31,7 @@
 #ifndef TEXTURE_3D_EDITOR_PLUGIN_H
 #define TEXTURE_3D_EDITOR_PLUGIN_H
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "scene/gui/spin_box.h"
 #include "scene/resources/shader.h"
diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h
index 9beada556c2e..f51dd4deaeb9 100644
--- a/editor/plugins/texture_editor_plugin.h
+++ b/editor/plugins/texture_editor_plugin.h
@@ -31,7 +31,10 @@
 #ifndef TEXTURE_EDITOR_PLUGIN_H
 #define TEXTURE_EDITOR_PLUGIN_H
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
+#include "scene/gui/margin_container.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/resources/texture.h"
 
 class TexturePreview : public MarginContainer {
diff --git a/editor/plugins/texture_layered_editor_plugin.h b/editor/plugins/texture_layered_editor_plugin.h
index 830916e954d8..be8888a3e6d0 100644
--- a/editor/plugins/texture_layered_editor_plugin.h
+++ b/editor/plugins/texture_layered_editor_plugin.h
@@ -31,6 +31,7 @@
 #ifndef TEXTURE_LAYERED_EDITOR_PLUGIN_H
 #define TEXTURE_LAYERED_EDITOR_PLUGIN_H
 
+#include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "scene/gui/spin_box.h"
 #include "scene/resources/shader.h"
diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp
index adb85902466f..7c2f26a6419b 100644
--- a/editor/plugins/texture_region_editor_plugin.cpp
+++ b/editor/plugins/texture_region_editor_plugin.cpp
@@ -32,27 +32,31 @@
 
 #include "core/core_string_names.h"
 #include "core/input/input.h"
+#include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
 #include "scene/gui/check_box.h"
+#include "scene/gui/separator.h"
 #include "scene/gui/view_panner.h"
 
-void draw_margin_line(Control *edit_draw, Vector2 from, Vector2 to) {
+void TextureRegionEditor::_draw_margin_line(Control *edit_draw, Vector2 from, Vector2 to) {
 	Vector2 line = (to - from).normalized() * 10;
 
 	// Draw a translucent background line to make the foreground line visible on any background.
+	Control *theme_base = plugin->get_editor_interface()->get_base_control()->get_parent_control();
+
 	edit_draw->draw_line(
 			from,
 			to,
-			EditorNode::get_singleton()->get_theme_base()->get_theme_color(SNAME("mono_color"), SNAME("Editor")).inverted() * Color(1, 1, 1, 0.5),
+			theme_base->get_theme_color(SNAME("mono_color"), SNAME("Editor")).inverted() * Color(1, 1, 1, 0.5),
 			Math::round(2 * EDSCALE));
 
 	while (from.distance_squared_to(to) > 200) {
 		edit_draw->draw_line(
 				from,
 				from + line,
-				EditorNode::get_singleton()->get_theme_base()->get_theme_color(SNAME("mono_color"), SNAME("Editor")),
+				theme_base->get_theme_color(SNAME("mono_color"), SNAME("Editor")),
 				Math::round(2 * EDSCALE));
 
 		from += line * 2;
@@ -254,10 +258,10 @@ void TextureRegionEditor::_region_draw() {
 			-mtx.basis_xform(Vector2(margins[3], 0)) + Vector2(endpoints[2].x - draw_ofs.x * draw_zoom, 0)
 		};
 
-		draw_margin_line(edit_draw, pos[0], pos[0] + Vector2(edit_draw->get_size().x, 0));
-		draw_margin_line(edit_draw, pos[1], pos[1] + Vector2(edit_draw->get_size().x, 0));
-		draw_margin_line(edit_draw, pos[2], pos[2] + Vector2(0, edit_draw->get_size().y));
-		draw_margin_line(edit_draw, pos[3], pos[3] + Vector2(0, edit_draw->get_size().y));
+		_draw_margin_line(edit_draw, pos[0], pos[0] + Vector2(edit_draw->get_size().x, 0));
+		_draw_margin_line(edit_draw, pos[1], pos[1] + Vector2(edit_draw->get_size().x, 0));
+		_draw_margin_line(edit_draw, pos[2], pos[2] + Vector2(0, edit_draw->get_size().y));
+		_draw_margin_line(edit_draw, pos[3], pos[3] + Vector2(0, edit_draw->get_size().y));
 	}
 }
 
@@ -349,6 +353,8 @@ void TextureRegionEditor::_region_input(const Ref<InputEvent> &p_input) {
 								rect.expand_to(r.position);
 								rect.expand_to(r.get_end());
 							}
+
+							UndoRedo *undo_redo = plugin->get_undo_redo();
 							undo_redo->create_action(TTR("Set Region Rect"));
 							if (atlas_tex.is_valid()) {
 								undo_redo->add_do_method(atlas_tex.ptr(), "set_region", rect);
@@ -408,6 +414,7 @@ void TextureRegionEditor::_region_input(const Ref<InputEvent> &p_input) {
 				}
 
 			} else if (!mb->is_pressed() && drag) {
+				UndoRedo *undo_redo = plugin->get_undo_redo();
 				if (edited_margin >= 0) {
 					undo_redo->create_action(TTR("Set Margin"));
 					static Side side[4] = { SIDE_TOP, SIDE_BOTTOM, SIDE_LEFT, SIDE_RIGHT };
@@ -982,13 +989,14 @@ Vector2 TextureRegionEditor::snap_point(Vector2 p_target) const {
 	return p_target;
 }
 
-TextureRegionEditor::TextureRegionEditor() {
+TextureRegionEditor::TextureRegionEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
+
 	node_sprite_2d = nullptr;
 	node_sprite_3d = nullptr;
 	node_ninepatch = nullptr;
 	obj_styleBox = Ref<StyleBoxTexture>(nullptr);
 	atlas_tex = Ref<AtlasTexture>(nullptr);
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
 
 	snap_step = Vector2(10, 10);
 	snap_separation = Vector2(0, 0);
@@ -1146,11 +1154,11 @@ void TextureRegionEditorPlugin::make_visible(bool p_visible) {
 		is_node_configured |= region_editor->get_sprite_2d() && region_editor->get_sprite_2d()->is_region_enabled();
 		is_node_configured |= region_editor->get_sprite_3d() && region_editor->get_sprite_3d()->is_region_enabled();
 		if ((is_node_configured && !manually_hidden) || texture_region_button->is_pressed()) {
-			EditorNode::get_singleton()->make_bottom_panel_item_visible(region_editor);
+			make_bottom_panel_item_visible(region_editor);
 		}
 	} else {
 		if (region_editor->is_visible_in_tree()) {
-			EditorNode::get_singleton()->hide_bottom_panel();
+			hide_bottom_panel();
 			manually_hidden = false;
 		}
 		texture_region_button->hide();
@@ -1202,11 +1210,11 @@ void TextureRegionEditorPlugin::_bind_methods() {
 TextureRegionEditorPlugin::TextureRegionEditorPlugin() {
 	manually_hidden = false;
 
-	region_editor = memnew(TextureRegionEditor);
+	region_editor = memnew(TextureRegionEditor(this));
 	region_editor->set_custom_minimum_size(Size2(0, 200) * EDSCALE);
 	region_editor->hide();
 	region_editor->connect("visibility_changed", callable_mp(this, &TextureRegionEditorPlugin::_editor_visiblity_changed));
 
-	texture_region_button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("TextureRegion"), region_editor);
+	texture_region_button = add_control_to_bottom_panel(region_editor, TTR("TextureRegion"));
 	texture_region_button->hide();
 }
diff --git a/editor/plugins/texture_region_editor_plugin.h b/editor/plugins/texture_region_editor_plugin.h
index 1e1cc2b7b290..1b7d9f0e1ede 100644
--- a/editor/plugins/texture_region_editor_plugin.h
+++ b/editor/plugins/texture_region_editor_plugin.h
@@ -35,7 +35,9 @@
 #include "editor/editor_plugin.h"
 #include "scene/2d/sprite_2d.h"
 #include "scene/3d/sprite_3d.h"
+#include "scene/gui/box_container.h"
 #include "scene/gui/nine_patch_rect.h"
+#include "scene/gui/option_button.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
 
@@ -52,6 +54,9 @@ class TextureRegionEditor : public VBoxContainer {
 	};
 
 	friend class TextureRegionEditorPlugin;
+
+	EditorPlugin *plugin = nullptr;
+
 	OptionButton *snap_mode_button = nullptr;
 	Button *zoom_in = nullptr;
 	Button *zoom_reset = nullptr;
@@ -68,8 +73,6 @@ class TextureRegionEditor : public VBoxContainer {
 	VScrollBar *vscroll = nullptr;
 	HScrollBar *hscroll = nullptr;
 
-	UndoRedo *undo_redo = nullptr;
-
 	Vector2 draw_ofs;
 	float draw_zoom;
 	bool updating_scroll;
@@ -99,6 +102,9 @@ class TextureRegionEditor : public VBoxContainer {
 	int drag_index;
 
 	Ref<ViewPanner> panner;
+
+	void _draw_margin_line(Control *edit_draw, Vector2 from, Vector2 to);
+
 	void _scroll_callback(Vector2 p_scroll_vec, bool p_alt);
 	void _pan_callback(Vector2 p_scroll_vec);
 	void _zoom_callback(Vector2 p_scroll_vec, Vector2 p_origin, bool p_alt);
@@ -139,7 +145,7 @@ class TextureRegionEditor : public VBoxContainer {
 	Sprite3D *get_sprite_3d();
 
 	void edit(Object *p_obj);
-	TextureRegionEditor();
+	TextureRegionEditor(EditorPlugin *p_plugin);
 };
 
 class TextureRegionEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp
index e17bea0f2a7c..8b26f545d07d 100644
--- a/editor/plugins/theme_editor_plugin.cpp
+++ b/editor/plugins/theme_editor_plugin.cpp
@@ -787,7 +787,7 @@ void ThemeItemImportTree::_import_selected() {
 
 	ProgressDialog::get_singleton()->end_task("import_theme_items");
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Import Theme Items"));
 
 	ur->add_do_method(*edited_theme, "clear");
@@ -880,7 +880,9 @@ void ThemeItemImportTree::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("items_imported"));
 }
 
-ThemeItemImportTree::ThemeItemImportTree() {
+ThemeItemImportTree::ThemeItemImportTree(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
+
 	HBoxContainer *import_items_filter_hb = memnew(HBoxContainer);
 	add_child(import_items_filter_hb);
 	Label *import_items_filter_label = memnew(Label);
@@ -1478,7 +1480,7 @@ void ThemeItemEditorDialog::_item_tree_button_pressed(Object *p_item, int p_colu
 			String item_name = item->get_text(0);
 			int data_type = item->get_parent()->get_metadata(0);
 
-			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			UndoRedo *ur = plugin->get_undo_redo();
 			ur->create_action(TTR("Remove Theme Item"));
 			ur->add_do_method(*edited_theme, "clear_theme_item", (Theme::DataType)data_type, item_name, edited_item_type);
 			ur->add_undo_method(*edited_theme, "set_theme_item", (Theme::DataType)data_type, item_name, edited_item_type, edited_theme->get_theme_item((Theme::DataType)data_type, item_name, edited_item_type));
@@ -1497,7 +1499,7 @@ void ThemeItemEditorDialog::_add_theme_type(const String &p_new_text) {
 	const String new_type = edit_add_type_value->get_text().strip_edges();
 	edit_add_type_value->clear();
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Add Theme Type"));
 
 	ur->add_do_method(*edited_theme, "add_type", new_type);
@@ -1509,7 +1511,7 @@ void ThemeItemEditorDialog::_add_theme_type(const String &p_new_text) {
 }
 
 void ThemeItemEditorDialog::_add_theme_item(Theme::DataType p_data_type, String p_item_name, String p_item_type) {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Create Theme Item"));
 
 	switch (p_data_type) {
@@ -1554,7 +1556,7 @@ void ThemeItemEditorDialog::_remove_theme_type(const String &p_theme_type) {
 	Ref<Theme> old_snapshot = edited_theme->duplicate();
 	Ref<Theme> new_snapshot = edited_theme->duplicate();
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Remove Theme Type"));
 
 	new_snapshot->remove_type(p_theme_type);
@@ -1577,7 +1579,7 @@ void ThemeItemEditorDialog::_remove_data_type_items(Theme::DataType p_data_type,
 	Ref<Theme> old_snapshot = edited_theme->duplicate();
 	Ref<Theme> new_snapshot = edited_theme->duplicate();
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Remove Data Type Items From Theme"));
 
 	new_snapshot->get_theme_item_list(p_data_type, p_item_type, &names);
@@ -1606,7 +1608,7 @@ void ThemeItemEditorDialog::_remove_class_items() {
 	Ref<Theme> old_snapshot = edited_theme->duplicate();
 	Ref<Theme> new_snapshot = edited_theme->duplicate();
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Remove Class Items From Theme"));
 
 	for (int dt = 0; dt < Theme::DATA_TYPE_MAX; dt++) {
@@ -1642,7 +1644,7 @@ void ThemeItemEditorDialog::_remove_custom_items() {
 	Ref<Theme> old_snapshot = edited_theme->duplicate();
 	Ref<Theme> new_snapshot = edited_theme->duplicate();
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Remove Custom Items From Theme"));
 
 	for (int dt = 0; dt < Theme::DATA_TYPE_MAX; dt++) {
@@ -1678,7 +1680,7 @@ void ThemeItemEditorDialog::_remove_all_items() {
 	Ref<Theme> old_snapshot = edited_theme->duplicate();
 	Ref<Theme> new_snapshot = edited_theme->duplicate();
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Remove All Items From Theme"));
 
 	for (int dt = 0; dt < Theme::DATA_TYPE_MAX; dt++) {
@@ -1782,7 +1784,7 @@ void ThemeItemEditorDialog::_confirm_edit_theme_item() {
 	if (item_popup_mode == CREATE_THEME_ITEM) {
 		_add_theme_item(edit_item_data_type, theme_item_name->get_text(), edited_item_type);
 	} else if (item_popup_mode == RENAME_THEME_ITEM) {
-		UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+		UndoRedo *ur = plugin->get_undo_redo();
 		ur->create_action(TTR("Rename Theme Item"));
 
 		ur->add_do_method(*edited_theme, "rename_theme_item", edit_item_data_type, edit_item_old_name, theme_item_name->get_text(), edited_item_type);
@@ -1879,11 +1881,12 @@ void ThemeItemEditorDialog::set_edited_theme(const Ref<Theme> &p_theme) {
 	edited_theme = p_theme;
 }
 
-ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_editor) {
+ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_editor, EditorPlugin *p_plugin) {
 	set_title(TTR("Manage Theme Items"));
 	get_ok_button()->set_text(TTR("Close"));
 	set_hide_on_ok(false); // Closing may require a confirmation in some cases.
 
+	plugin = p_plugin;
 	theme_type_editor = p_theme_type_editor;
 
 	tc = memnew(TabContainer);
@@ -2049,12 +2052,12 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 	tc->add_child(import_tc);
 	tc->set_tab_title(1, TTR("Import Items"));
 
-	import_default_theme_items = memnew(ThemeItemImportTree);
+	import_default_theme_items = memnew(ThemeItemImportTree(plugin));
 	import_tc->add_child(import_default_theme_items);
 	import_tc->set_tab_title(0, TTR("Default Theme"));
 	import_default_theme_items->connect("items_imported", callable_mp(this, &ThemeItemEditorDialog::_update_edit_types));
 
-	import_editor_theme_items = memnew(ThemeItemImportTree);
+	import_editor_theme_items = memnew(ThemeItemImportTree(plugin));
 	import_tc->add_child(import_editor_theme_items);
 	import_tc->set_tab_title(1, TTR("Editor Theme"));
 	import_editor_theme_items->connect("items_imported", callable_mp(this, &ThemeItemEditorDialog::_update_edit_types));
@@ -2082,7 +2085,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 	import_another_file_hb->add_child(import_another_theme_dialog);
 	import_another_theme_dialog->connect("file_selected", callable_mp(this, &ThemeItemEditorDialog::_select_another_theme_cbk));
 
-	import_other_theme_items = memnew(ThemeItemImportTree);
+	import_other_theme_items = memnew(ThemeItemImportTree(plugin));
 	import_other_theme_items->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	import_another_theme_vb->add_child(import_other_theme_items);
 
@@ -2804,7 +2807,7 @@ void ThemeTypeEditor::_add_default_type_items() {
 
 	updating = false;
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Override All Default Theme Items"));
 
 	ur->add_do_method(*edited_theme, "merge_with", new_snapshot);
@@ -2824,7 +2827,7 @@ void ThemeTypeEditor::_item_add_cbk(int p_data_type, Control *p_control) {
 	}
 
 	String item_name = le->get_text().strip_edges();
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Add Theme Item"));
 
 	switch (p_data_type) {
@@ -2869,7 +2872,7 @@ void ThemeTypeEditor::_item_add_lineedit_cbk(String p_value, int p_data_type, Co
 }
 
 void ThemeTypeEditor::_item_override_cbk(int p_data_type, String p_item_name) {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Override Theme Item"));
 
 	switch (p_data_type) {
@@ -2908,7 +2911,7 @@ void ThemeTypeEditor::_item_override_cbk(int p_data_type, String p_item_name) {
 }
 
 void ThemeTypeEditor::_item_remove_cbk(int p_data_type, String p_item_name) {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Remove Theme Item"));
 
 	switch (p_data_type) {
@@ -2986,7 +2989,7 @@ void ThemeTypeEditor::_item_rename_confirmed(int p_data_type, String p_item_name
 		return;
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Rename Theme Item"));
 
 	switch (p_data_type) {
@@ -3042,7 +3045,7 @@ void ThemeTypeEditor::_item_rename_canceled(int p_data_type, String p_item_name,
 }
 
 void ThemeTypeEditor::_color_item_changed(Color p_value, String p_item_name) {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Color Item in Theme"), UndoRedo::MERGE_ENDS);
 	ur->add_do_method(*edited_theme, "set_color", p_item_name, edited_type, p_value);
 	ur->add_undo_method(*edited_theme, "set_color", p_item_name, edited_type, edited_theme->get_color(p_item_name, edited_type));
@@ -3050,7 +3053,7 @@ void ThemeTypeEditor::_color_item_changed(Color p_value, String p_item_name) {
 }
 
 void ThemeTypeEditor::_constant_item_changed(float p_value, String p_item_name) {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Constant Item in Theme"));
 	ur->add_do_method(*edited_theme, "set_constant", p_item_name, edited_type, p_value);
 	ur->add_undo_method(*edited_theme, "set_constant", p_item_name, edited_type, edited_theme->get_constant(p_item_name, edited_type));
@@ -3058,7 +3061,7 @@ void ThemeTypeEditor::_constant_item_changed(float p_value, String p_item_name)
 }
 
 void ThemeTypeEditor::_font_size_item_changed(float p_value, String p_item_name) {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Font Size Item in Theme"));
 	ur->add_do_method(*edited_theme, "set_font_size", p_item_name, edited_type, p_value);
 	ur->add_undo_method(*edited_theme, "set_font_size", p_item_name, edited_type, edited_theme->get_font_size(p_item_name, edited_type));
@@ -3070,7 +3073,7 @@ void ThemeTypeEditor::_edit_resource_item(RES p_resource, bool p_edit) {
 }
 
 void ThemeTypeEditor::_font_item_changed(Ref<Font> p_value, String p_item_name) {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Font Item in Theme"));
 
 	ur->add_do_method(*edited_theme, "set_font", p_item_name, edited_type, p_value.is_valid() ? p_value : Ref<Font>());
@@ -3087,7 +3090,7 @@ void ThemeTypeEditor::_font_item_changed(Ref<Font> p_value, String p_item_name)
 }
 
 void ThemeTypeEditor::_icon_item_changed(Ref<Texture2D> p_value, String p_item_name) {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Icon Item in Theme"));
 
 	ur->add_do_method(*edited_theme, "set_icon", p_item_name, edited_type, p_value.is_valid() ? p_value : Ref<Texture2D>());
@@ -3104,7 +3107,7 @@ void ThemeTypeEditor::_icon_item_changed(Ref<Texture2D> p_value, String p_item_n
 }
 
 void ThemeTypeEditor::_stylebox_item_changed(Ref<StyleBox> p_value, String p_item_name) {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Stylebox Item in Theme"));
 
 	ur->add_do_method(*edited_theme, "set_stylebox", p_item_name, edited_type, p_value.is_valid() ? p_value : Ref<StyleBox>());
@@ -3147,7 +3150,7 @@ void ThemeTypeEditor::_on_pin_leader_button_pressed(Control *p_editor, String p_
 		stylebox = Object::cast_to<EditorResourcePicker>(p_editor)->get_edited_resource();
 	}
 
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Pin Stylebox"));
 	ur->add_do_method(this, "_pin_leading_stylebox", p_item_name, stylebox);
 
@@ -3180,7 +3183,7 @@ void ThemeTypeEditor::_pin_leading_stylebox(String p_item_name, Ref<StyleBox> p_
 }
 
 void ThemeTypeEditor::_on_unpin_leader_button_pressed() {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Unpin Stylebox"));
 	ur->add_do_method(this, "_unpin_leading_stylebox");
 	ur->add_undo_method(this, "_pin_leading_stylebox", leading_stylebox.item_name, leading_stylebox.stylebox);
@@ -3247,7 +3250,7 @@ void ThemeTypeEditor::_update_stylebox_from_leading() {
 }
 
 void ThemeTypeEditor::_type_variation_changed(const String p_value) {
-	UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *ur = plugin->get_undo_redo();
 	ur->create_action(TTR("Set Theme Type Variation"));
 
 	if (p_value.is_empty()) {
@@ -3353,7 +3356,9 @@ bool ThemeTypeEditor::is_stylebox_pinned(Ref<StyleBox> p_stylebox) {
 	return leading_stylebox.pinned && leading_stylebox.stylebox == p_stylebox;
 }
 
-ThemeTypeEditor::ThemeTypeEditor() {
+ThemeTypeEditor::ThemeTypeEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
+
 	VBoxContainer *main_vb = memnew(VBoxContainer);
 	add_child(main_vb);
 
@@ -3514,7 +3519,9 @@ void ThemeEditor::_add_preview_tab(ThemeEditorPreview *p_preview_tab, const Stri
 
 	preview_tabs->add_tab(p_preview_name, p_icon);
 	preview_tabs_content->add_child(p_preview_tab);
-	preview_tabs->set_tab_button_icon(preview_tabs->get_tab_count() - 1, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("close"), SNAME("TabBar")));
+	Control *base_control = plugin->get_editor_interface()->get_base_control();
+
+	preview_tabs->set_tab_button_icon(preview_tabs->get_tab_count() - 1, base_control->get_theme_icon(SNAME("close"), SNAME("TabBar")));
 	p_preview_tab->connect("control_picked", callable_mp(this, &ThemeEditor::_preview_control_picked));
 
 	preview_tabs->set_current_tab(preview_tabs->get_tab_count() - 1);
@@ -3586,7 +3593,9 @@ void ThemeEditor::_notification(int p_what) {
 	}
 }
 
-ThemeEditor::ThemeEditor() {
+ThemeEditor::ThemeEditor(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
+
 	HBoxContainer *top_menu = memnew(HBoxContainer);
 	add_child(top_menu);
 
@@ -3618,9 +3627,9 @@ ThemeEditor::ThemeEditor() {
 	theme_edit_button->connect("pressed", callable_mp(this, &ThemeEditor::_theme_edit_button_cbk));
 	top_menu->add_child(theme_edit_button);
 
-	theme_type_editor = memnew(ThemeTypeEditor);
+	theme_type_editor = memnew(ThemeTypeEditor(plugin));
 
-	theme_edit_dialog = memnew(ThemeItemEditorDialog(theme_type_editor));
+	theme_edit_dialog = memnew(ThemeItemEditorDialog(theme_type_editor, plugin));
 	theme_edit_dialog->hide();
 	top_menu->add_child(theme_edit_dialog);
 
@@ -3757,10 +3766,10 @@ bool ThemeEditorPlugin::handles(Object *p_node) const {
 void ThemeEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
 		button->show();
-		EditorNode::get_singleton()->make_bottom_panel_item_visible(theme_editor);
+		make_bottom_panel_item_visible(theme_editor);
 	} else {
 		if (theme_editor->is_visible_in_tree()) {
-			EditorNode::get_singleton()->hide_bottom_panel();
+			hide_bottom_panel();
 		}
 
 		button->hide();
@@ -3768,9 +3777,9 @@ void ThemeEditorPlugin::make_visible(bool p_visible) {
 }
 
 ThemeEditorPlugin::ThemeEditorPlugin() {
-	theme_editor = memnew(ThemeEditor);
+	theme_editor = memnew(ThemeEditor(this));
 	theme_editor->set_custom_minimum_size(Size2(0, 200) * EDSCALE);
 
-	button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Theme"), theme_editor);
+	button = add_control_to_bottom_panel(theme_editor, TTR("Theme"));
 	button->hide();
 }
diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h
index 4b49fbb1864f..53d0439db07d 100644
--- a/editor/plugins/theme_editor_plugin.h
+++ b/editor/plugins/theme_editor_plugin.h
@@ -38,8 +38,10 @@
 #include "scene/gui/item_list.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/option_button.h"
+#include "scene/gui/panel_container.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/tab_bar.h"
+#include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
 #include "scene/resources/theme.h"
@@ -49,6 +51,8 @@ class EditorFileDialog;
 class ThemeItemImportTree : public VBoxContainer {
 	GDCLASS(ThemeItemImportTree, VBoxContainer);
 
+	EditorPlugin *plugin;
+
 	Ref<Theme> edited_theme;
 	Ref<Theme> base_theme;
 
@@ -178,7 +182,7 @@ class ThemeItemImportTree : public VBoxContainer {
 
 	bool has_selected_items() const;
 
-	ThemeItemImportTree();
+	ThemeItemImportTree(EditorPlugin *p_plugin);
 };
 
 class ThemeTypeEditor;
@@ -186,6 +190,8 @@ class ThemeTypeEditor;
 class ThemeItemEditorDialog : public AcceptDialog {
 	GDCLASS(ThemeItemEditorDialog, AcceptDialog);
 
+	EditorPlugin *plugin = nullptr;
+
 	ThemeTypeEditor *theme_type_editor = nullptr;
 
 	Ref<Theme> edited_theme;
@@ -277,7 +283,7 @@ class ThemeItemEditorDialog : public AcceptDialog {
 public:
 	void set_edited_theme(const Ref<Theme> &p_theme);
 
-	ThemeItemEditorDialog(ThemeTypeEditor *p_theme_editor);
+	ThemeItemEditorDialog(ThemeTypeEditor *p_theme_editor, EditorPlugin *p_plugin);
 };
 
 class ThemeTypeDialog : public ConfirmationDialog {
@@ -319,6 +325,7 @@ class ThemeTypeDialog : public ConfirmationDialog {
 class ThemeTypeEditor : public MarginContainer {
 	GDCLASS(ThemeTypeEditor, MarginContainer);
 
+	EditorPlugin *plugin;
 	Ref<Theme> edited_theme;
 	String edited_type;
 	bool updating = false;
@@ -409,12 +416,14 @@ class ThemeTypeEditor : public MarginContainer {
 	void select_type(String p_type_name);
 	bool is_stylebox_pinned(Ref<StyleBox> p_stylebox);
 
-	ThemeTypeEditor();
+	ThemeTypeEditor(EditorPlugin *p_plugin);
 };
 
 class ThemeEditor : public VBoxContainer {
 	GDCLASS(ThemeEditor, VBoxContainer);
 
+	EditorPlugin *plugin;
+
 	Ref<Theme> theme;
 
 	TabBar *preview_tabs = nullptr;
@@ -446,7 +455,7 @@ class ThemeEditor : public VBoxContainer {
 	void edit(const Ref<Theme> &p_theme);
 	Ref<Theme> get_edited_theme();
 
-	ThemeEditor();
+	ThemeEditor(EditorPlugin *p_plugin);
 };
 
 class ThemeEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/theme_editor_preview.cpp b/editor/plugins/theme_editor_preview.cpp
index 252a19a7db84..13139bbe9730 100644
--- a/editor/plugins/theme_editor_preview.cpp
+++ b/editor/plugins/theme_editor_preview.cpp
@@ -36,8 +36,13 @@
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "scene/gui/button.h"
+#include "scene/gui/check_box.h"
 #include "scene/gui/color_picker.h"
+#include "scene/gui/option_button.h"
 #include "scene/gui/progress_bar.h"
+#include "scene/gui/separator.h"
+#include "scene/gui/slider.h"
+#include "scene/gui/tab_container.h"
 #include "scene/resources/packed_scene.h"
 
 constexpr double REFRESH_TIMER = 1.5;
diff --git a/editor/plugins/tiles/tile_data_editors.cpp b/editor/plugins/tiles/tile_data_editors.cpp
index 6c12573cc4ec..39090f6fc834 100644
--- a/editor/plugins/tiles/tile_data_editors.cpp
+++ b/editor/plugins/tiles/tile_data_editors.cpp
@@ -35,6 +35,8 @@
 #include "core/math/geometry_2d.h"
 #include "core/os/keyboard.h"
 
+#include "scene/gui/option_button.h"
+
 #include "editor/editor_node.h"
 #include "editor/editor_properties.h"
 #include "editor/editor_scale.h"
diff --git a/editor/plugins/tiles/tiles_editor_plugin.cpp b/editor/plugins/tiles/tiles_editor_plugin.cpp
index 543304346ec8..20f19068c5fc 100644
--- a/editor/plugins/tiles/tiles_editor_plugin.cpp
+++ b/editor/plugins/tiles/tiles_editor_plugin.cpp
@@ -161,9 +161,9 @@ void TilesEditorPlugin::_update_editors() {
 	// Update visibility of bottom panel buttons.
 	if (tileset_editor_button->is_pressed() && !tile_set.is_valid()) {
 		if (tile_map) {
-			EditorNode::get_singleton()->make_bottom_panel_item_visible(tilemap_editor);
+			make_bottom_panel_item_visible(tilemap_editor);
 		} else {
-			EditorNode::get_singleton()->hide_bottom_panel();
+			hide_bottom_panel();
 		}
 	}
 }
@@ -190,15 +190,15 @@ void TilesEditorPlugin::make_visible(bool p_visible) {
 		tileset_editor_button->set_visible(tile_set.is_valid());
 		tilemap_editor_button->set_visible(tile_map);
 		if (tile_map) {
-			EditorNode::get_singleton()->make_bottom_panel_item_visible(tilemap_editor);
+			make_bottom_panel_item_visible(tilemap_editor);
 		} else {
-			EditorNode::get_singleton()->make_bottom_panel_item_visible(tileset_editor);
+			make_bottom_panel_item_visible(tileset_editor);
 		}
 
 	} else {
 		tileset_editor_button->hide();
 		tilemap_editor_button->hide();
-		EditorNode::get_singleton()->hide_bottom_panel();
+		hide_bottom_panel();
 	}
 }
 
@@ -353,7 +353,7 @@ void TilesEditorPlugin::edit(Object *p_object) {
 			tile_map_id = p_object->get_instance_id();
 			tile_map = Object::cast_to<TileMap>(ObjectDB::get_instance(tile_map_id));
 			tile_set = tile_map->get_tileset();
-			EditorNode::get_singleton()->make_bottom_panel_item_visible(tilemap_editor);
+			make_bottom_panel_item_visible(tilemap_editor);
 		} else if (p_object->is_class("TileSet")) {
 			tile_set = Ref<TileSet>(p_object);
 			if (tile_map) {
@@ -362,7 +362,7 @@ void TilesEditorPlugin::edit(Object *p_object) {
 					tile_map_id = ObjectID();
 				}
 			}
-			EditorNode::get_singleton()->make_bottom_panel_item_visible(tileset_editor);
+			make_bottom_panel_item_visible(tileset_editor);
 		}
 	}
 
@@ -403,9 +403,9 @@ TilesEditorPlugin::TilesEditorPlugin() {
 	pattern_preview_thread.start(_thread_func, this);
 
 	// Bottom buttons.
-	tileset_editor_button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("TileSet"), tileset_editor);
+	tileset_editor_button = add_control_to_bottom_panel(tileset_editor, TTR("TileSet"));
 	tileset_editor_button->hide();
-	tilemap_editor_button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("TileMap"), tilemap_editor);
+	tilemap_editor_button = add_control_to_bottom_panel(tilemap_editor, TTR("TileMap"));
 	tilemap_editor_button->hide();
 
 	// Initialization.
diff --git a/editor/plugins/version_control_editor_plugin.cpp b/editor/plugins/version_control_editor_plugin.cpp
index 443d5975cd3a..07b31ba43206 100644
--- a/editor/plugins/version_control_editor_plugin.cpp
+++ b/editor/plugins/version_control_editor_plugin.cpp
@@ -191,14 +191,15 @@ void VersionControlEditorPlugin::_stage_selected() {
 	TreeItem *root = stage_files->get_root();
 	if (root) {
 		TreeItem *file_entry = root->get_first_child();
+		Control *base_control = get_editor_interface()->get_base_control();
 		while (file_entry) {
 			if (file_entry->is_checked(0)) {
 				EditorVCSInterface::get_singleton()->stage_file(file_entry->get_metadata(0));
-				file_entry->set_icon_modulate(0, EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("success_color"), SNAME("Editor")));
+				file_entry->set_icon_modulate(0, base_control->get_theme_color(SNAME("success_color"), SNAME("Editor")));
 				staged_files_count++;
 			} else {
 				EditorVCSInterface::get_singleton()->unstage_file(file_entry->get_metadata(0));
-				file_entry->set_icon_modulate(0, EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("error_color"), SNAME("Editor")));
+				file_entry->set_icon_modulate(0, base_control->get_theme_color(SNAME("error_color"), SNAME("Editor")));
 			}
 
 			file_entry = file_entry->get_next();
@@ -218,9 +219,10 @@ void VersionControlEditorPlugin::_stage_all() {
 	TreeItem *root = stage_files->get_root();
 	if (root) {
 		TreeItem *file_entry = root->get_first_child();
+		Control *base_control = get_editor_interface()->get_base_control();
 		while (file_entry) {
 			EditorVCSInterface::get_singleton()->stage_file(file_entry->get_metadata(0));
-			file_entry->set_icon_modulate(0, EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("success_color"), SNAME("Editor")));
+			file_entry->set_icon_modulate(0, base_control->get_theme_color(SNAME("success_color"), SNAME("Editor")));
 			file_entry->set_checked(0, true);
 			staged_files_count++;
 
@@ -244,17 +246,19 @@ void VersionControlEditorPlugin::_display_file_diff(String p_file_path) {
 
 	diff_file_name->set_text(p_file_path);
 
+	Control *base_control = get_editor_interface()->get_base_control();
+
 	diff->clear();
-	diff->push_font(EditorNode::get_singleton()->get_gui_base()->get_theme_font(SNAME("source"), SNAME("EditorFonts")));
+	diff->push_font(base_control->get_theme_font(SNAME("source"), SNAME("EditorFonts")));
 	for (int i = 0; i < diff_content.size(); i++) {
 		Dictionary line_result = diff_content[i];
 
 		if (line_result["status"] == "+") {
-			diff->push_color(EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("success_color"), SNAME("Editor")));
+			diff->push_color(base_control->get_theme_color(SNAME("success_color"), SNAME("Editor")));
 		} else if (line_result["status"] == "-") {
-			diff->push_color(EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("error_color"), SNAME("Editor")));
+			diff->push_color(base_control->get_theme_color(SNAME("error_color"), SNAME("Editor")));
 		} else {
-			diff->push_color(EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("font_color"), SNAME("Label")));
+			diff->push_color(base_control->get_theme_color(SNAME("font_color"), SNAME("Label")));
 		}
 
 		diff->add_text((String)line_result["content"]);
@@ -327,11 +331,11 @@ void VersionControlEditorPlugin::_commit_message_gui_input(const Ref<InputEvent>
 
 void VersionControlEditorPlugin::register_editor() {
 	if (!EditorVCSInterface::get_singleton()) {
-		EditorNode::get_singleton()->add_control_to_dock(EditorNode::DOCK_SLOT_RIGHT_UL, version_commit_dock);
+		add_control_to_dock(DOCK_SLOT_RIGHT_UL, version_commit_dock);
 		TabContainer *dock_vbc = (TabContainer *)version_commit_dock->get_parent_control();
 		dock_vbc->set_tab_title(dock_vbc->get_tab_idx_from_control(version_commit_dock), TTR("Commit"));
 
-		Button *vc = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Version Control"), version_control_dock);
+		Button *vc = add_control_to_bottom_panel(version_control_dock, TTR("Version Control"));
 		set_version_control_tool_button(vc);
 	}
 }
@@ -364,8 +368,8 @@ void VersionControlEditorPlugin::shut_down() {
 		memdelete(EditorVCSInterface::get_singleton());
 		EditorVCSInterface::set_singleton(nullptr);
 
-		EditorNode::get_singleton()->remove_control_from_dock(version_commit_dock);
-		EditorNode::get_singleton()->remove_bottom_panel_item(version_control_dock);
+		remove_control_from_docks(version_commit_dock);
+		remove_control_from_bottom_panel(version_control_dock);
 	}
 }
 
@@ -461,10 +465,13 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	staging_area_label->set_text(TTR("Staging area"));
 	stage_tools->add_child(staging_area_label);
 
+	// Don't use EditorInterface here as it's not initialized yet
+	Control *base_control = EditorNode::get_singleton()->get_gui_base();
+
 	refresh_button = memnew(Button);
 	refresh_button->set_tooltip(TTR("Detect new changes"));
 	refresh_button->set_text(TTR("Refresh"));
-	refresh_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")));
+	refresh_button->set_icon(base_control->get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")));
 	refresh_button->connect("pressed", callable_mp(this, &VersionControlEditorPlugin::_refresh_stage_area));
 	stage_tools->add_child(refresh_button);
 
@@ -489,11 +496,11 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	change_type_to_strings[CHANGE_TYPE_DELETED] = TTR("Deleted");
 	change_type_to_strings[CHANGE_TYPE_TYPECHANGE] = TTR("Typechange");
 
-	change_type_to_color[CHANGE_TYPE_NEW] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("success_color"), SNAME("Editor"));
-	change_type_to_color[CHANGE_TYPE_MODIFIED] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("warning_color"), SNAME("Editor"));
-	change_type_to_color[CHANGE_TYPE_RENAMED] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("disabled_font_color"), SNAME("Editor"));
-	change_type_to_color[CHANGE_TYPE_DELETED] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("error_color"), SNAME("Editor"));
-	change_type_to_color[CHANGE_TYPE_TYPECHANGE] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("font_color"), SNAME("Editor"));
+	change_type_to_color[CHANGE_TYPE_NEW] = base_control->get_theme_color(SNAME("success_color"), SNAME("Editor"));
+	change_type_to_color[CHANGE_TYPE_MODIFIED] = base_control->get_theme_color(SNAME("warning_color"), SNAME("Editor"));
+	change_type_to_color[CHANGE_TYPE_RENAMED] = base_control->get_theme_color(SNAME("disabled_font_color"), SNAME("Editor"));
+	change_type_to_color[CHANGE_TYPE_DELETED] = base_control->get_theme_color(SNAME("error_color"), SNAME("Editor"));
+	change_type_to_color[CHANGE_TYPE_TYPECHANGE] = base_control->get_theme_color(SNAME("font_color"), SNAME("Editor"));
 
 	stage_buttons = memnew(HSplitContainer);
 	stage_buttons->set_dragger_visibility(SplitContainer::DRAGGER_HIDDEN_COLLAPSED);
@@ -560,7 +567,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 
 	diff_refresh_button = memnew(Button);
 	diff_refresh_button->set_tooltip(TTR("Detect changes in file diff"));
-	diff_refresh_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")));
+	diff_refresh_button->set_icon(base_control->get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")));
 	diff_refresh_button->connect("pressed", callable_mp(this, &VersionControlEditorPlugin::_refresh_file_diff));
 	diff_hbc->add_child(diff_refresh_button);
 
diff --git a/editor/plugins/version_control_editor_plugin.h b/editor/plugins/version_control_editor_plugin.h
index 39a56de772f8..94b88fd4304b 100644
--- a/editor/plugins/version_control_editor_plugin.h
+++ b/editor/plugins/version_control_editor_plugin.h
@@ -34,6 +34,8 @@
 #include "editor/editor_plugin.h"
 #include "editor/editor_vcs_interface.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/dialogs.h"
+#include "scene/gui/option_button.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/text_edit.h"
diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp
index 1e7648bc43ec..f890078ea8b5 100644
--- a/editor/plugins/visual_shader_editor_plugin.cpp
+++ b/editor/plugins/visual_shader_editor_plugin.cpp
@@ -42,6 +42,7 @@
 #include "editor/editor_scale.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/menu_button.h"
+#include "scene/gui/option_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/window.h"
@@ -97,7 +98,8 @@ static Ref<StyleBoxEmpty> make_empty_stylebox(float p_margin_left = -1, float p_
 
 ///////////////////
 
-VisualShaderGraphPlugin::VisualShaderGraphPlugin() {
+VisualShaderGraphPlugin::VisualShaderGraphPlugin(EditorPlugin *p_plugin) {
+	plugin = p_plugin;
 }
 
 void VisualShaderGraphPlugin::_bind_methods() {
@@ -508,7 +510,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) {
 			curve->get_texture()->connect("changed", ce, varray(p_id));
 		}
 
-		CurveEditor *curve_editor = memnew(CurveEditor);
+		CurveEditor *curve_editor = memnew(CurveEditor(plugin));
 		node->add_child(curve_editor);
 		register_curve_editor(p_id, 0, curve_editor);
 		curve_editor->set_custom_minimum_size(Size2(300, 0));
@@ -526,7 +528,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) {
 			curve_xyz->get_texture()->connect("changed", ce, varray(p_id));
 		}
 
-		CurveEditor *curve_editor_x = memnew(CurveEditor);
+		CurveEditor *curve_editor_x = memnew(CurveEditor(plugin));
 		node->add_child(curve_editor_x);
 		register_curve_editor(p_id, 0, curve_editor_x);
 		curve_editor_x->set_custom_minimum_size(Size2(300, 0));
@@ -535,7 +537,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) {
 			curve_editor_x->set_curve(curve_xyz->get_texture()->get_curve_x());
 		}
 
-		CurveEditor *curve_editor_y = memnew(CurveEditor);
+		CurveEditor *curve_editor_y = memnew(CurveEditor(plugin));
 		node->add_child(curve_editor_y);
 		register_curve_editor(p_id, 1, curve_editor_y);
 		curve_editor_y->set_custom_minimum_size(Size2(300, 0));
@@ -544,7 +546,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) {
 			curve_editor_y->set_curve(curve_xyz->get_texture()->get_curve_y());
 		}
 
-		CurveEditor *curve_editor_z = memnew(CurveEditor);
+		CurveEditor *curve_editor_z = memnew(CurveEditor(plugin));
 		node->add_child(curve_editor_z);
 		register_curve_editor(p_id, 2, curve_editor_z);
 		curve_editor_z->set_custom_minimum_size(Size2(300, 0));
@@ -702,6 +704,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) {
 			hb->add_child(custom_editor);
 			custom_editor->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		} else {
+			Control *base_control = plugin->get_editor_interface()->get_base_control();
 			if (valid_left) {
 				if (is_group) {
 					OptionButton *type_box = memnew(OptionButton);
@@ -726,7 +729,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) {
 					name_box->connect("focus_exited", callable_mp(editor, &VisualShaderEditor::_port_name_focus_out), varray(name_box, p_id, i, false), CONNECT_DEFERRED);
 
 					Button *remove_btn = memnew(Button);
-					remove_btn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")));
+					remove_btn->set_icon(base_control->get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")));
 					remove_btn->set_tooltip(TTR("Remove") + " " + name_left);
 					remove_btn->connect("pressed", callable_mp(editor, &VisualShaderEditor::_remove_input_port), varray(p_id, i), CONNECT_DEFERRED);
 					hb->add_child(remove_btn);
@@ -753,7 +756,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) {
 			if (valid_right) {
 				if (is_group) {
 					Button *remove_btn = memnew(Button);
-					remove_btn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")));
+					remove_btn->set_icon(base_control->get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")));
 					remove_btn->set_tooltip(TTR("Remove") + " " + name_left);
 					remove_btn->connect("pressed", callable_mp(editor, &VisualShaderEditor::_remove_output_port), varray(p_id, i), CONNECT_DEFERRED);
 					hb->add_child(remove_btn);
@@ -1454,27 +1457,30 @@ void VisualShaderEditor::_update_options_menu() {
 			node_desc->set_text(options[i].description);
 			is_first_item = false;
 		}
+
+		Control *base_control = plugin->get_editor_interface()->get_base_control();
+
 		switch (options[i].return_type) {
 			case VisualShaderNode::PORT_TYPE_SCALAR:
-				item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("float"), SNAME("EditorIcons")));
+				item->set_icon(0, base_control->get_theme_icon(SNAME("float"), SNAME("EditorIcons")));
 				break;
 			case VisualShaderNode::PORT_TYPE_SCALAR_INT:
-				item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("int"), SNAME("EditorIcons")));
+				item->set_icon(0, base_control->get_theme_icon(SNAME("int"), SNAME("EditorIcons")));
 				break;
 			case VisualShaderNode::PORT_TYPE_VECTOR_2D:
-				item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")));
+				item->set_icon(0, base_control->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")));
 				break;
 			case VisualShaderNode::PORT_TYPE_VECTOR_3D:
-				item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")));
+				item->set_icon(0, base_control->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")));
 				break;
 			case VisualShaderNode::PORT_TYPE_BOOLEAN:
-				item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("bool"), SNAME("EditorIcons")));
+				item->set_icon(0, base_control->get_theme_icon(SNAME("bool"), SNAME("EditorIcons")));
 				break;
 			case VisualShaderNode::PORT_TYPE_TRANSFORM:
-				item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")));
+				item->set_icon(0, base_control->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")));
 				break;
 			case VisualShaderNode::PORT_TYPE_SAMPLER:
-				item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("ImageTexture"), SNAME("EditorIcons")));
+				item->set_icon(0, base_control->get_theme_icon(SNAME("ImageTexture"), SNAME("EditorIcons")));
 				break;
 			default:
 				break;
@@ -3640,8 +3646,7 @@ void VisualShaderEditor::_notification(int p_what) {
 				error_label->add_theme_font_size_override("font_size", get_theme_font_size(SNAME("status_source_size"), SNAME("EditorFonts")));
 				error_label->add_theme_color_override("font_color", error_color);
 			}
-
-			tools->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Tools"), SNAME("EditorIcons")));
+			tools->set_icon(get_theme_icon(SNAME("Tools"), SNAME("EditorIcons")));
 
 			if (p_what == NOTIFICATION_THEME_CHANGED && is_visible_in_tree()) {
 				_update_graph();
@@ -3945,7 +3950,7 @@ void VisualShaderEditor::_input_select_item(Ref<VisualShaderNodeInput> p_input,
 
 	bool type_changed = p_input->get_input_type_by_name(p_name) != p_input->get_input_type_by_name(prev_name);
 
-	UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Visual Shader Input Type Changed"));
 
 	undo_redo->add_do_method(p_input.ptr(), "set_input_name", p_name);
@@ -3991,7 +3996,7 @@ void VisualShaderEditor::_uniform_select_item(Ref<VisualShaderNodeUniformRef> p_
 
 	bool type_changed = p_uniform_ref->get_uniform_type_by_name(p_name) != p_uniform_ref->get_uniform_type_by_name(prev_name);
 
-	UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("UniformRef Name Changed"));
 
 	undo_redo->add_do_method(p_uniform_ref.ptr(), "set_uniform_name", p_name);
@@ -4035,7 +4040,7 @@ void VisualShaderEditor::_varying_select_item(Ref<VisualShaderNodeVarying> p_var
 
 	bool is_getter = Ref<VisualShaderNodeVaryingGetter>(p_varying.ptr()).is_valid();
 
-	UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	UndoRedo *undo_redo = plugin->get_undo_redo();
 	undo_redo->create_action(TTR("Varying Name Changed"));
 
 	undo_redo->add_do_method(p_varying.ptr(), "set_varying_name", p_name);
@@ -4165,22 +4170,22 @@ void VisualShaderEditor::_update_varying_tree() {
 			if (i == 0) {
 				item->select(0);
 			}
-
+			Control *base_control = plugin->get_editor_interface()->get_base_control();
 			switch (varying->type) {
 				case VisualShader::VARYING_TYPE_FLOAT:
-					item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("float"), SNAME("EditorIcons")));
+					item->set_icon(0, base_control->get_theme_icon(SNAME("float"), SNAME("EditorIcons")));
 					break;
 				case VisualShader::VARYING_TYPE_VECTOR_2D:
-					item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")));
+					item->set_icon(0, base_control->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")));
 					break;
 				case VisualShader::VARYING_TYPE_VECTOR_3D:
-					item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")));
+					item->set_icon(0, base_control->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")));
 					break;
 				case VisualShader::VARYING_TYPE_COLOR:
-					item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Color"), SNAME("EditorIcons")));
+					item->set_icon(0, base_control->get_theme_icon(SNAME("Color"), SNAME("EditorIcons")));
 					break;
 				case VisualShader::VARYING_TYPE_TRANSFORM:
-					item->set_icon(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")));
+					item->set_icon(0, base_control->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")));
 					break;
 				default:
 					break;
@@ -4530,8 +4535,10 @@ void VisualShaderEditor::_bind_methods() {
 
 VisualShaderEditor *VisualShaderEditor::singleton = nullptr;
 
-VisualShaderEditor::VisualShaderEditor() {
+VisualShaderEditor::VisualShaderEditor(EditorPlugin *p_plugin) {
 	singleton = this;
+
+	plugin = p_plugin;
 	ShaderLanguage::get_keyword_list(&keyword_list);
 
 	graph = memnew(GraphEdit);
@@ -5446,13 +5453,13 @@ VisualShaderEditor::VisualShaderEditor() {
 
 	_update_options_menu();
 
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
+	undo_redo = plugin->get_undo_redo();
 
 	Ref<VisualShaderNodePluginDefault> default_plugin;
 	default_plugin.instantiate();
 	add_plugin(default_plugin);
 
-	graph_plugin.instantiate();
+	graph_plugin.reference_ptr(memnew(VisualShaderGraphPlugin(plugin)));
 
 	property_editor = memnew(CustomPropertyEditor);
 	add_child(property_editor);
@@ -5475,13 +5482,13 @@ void VisualShaderEditorPlugin::make_visible(bool p_visible) {
 		//editor->hide_animation_player_editors();
 		//editor->animation_panel_make_visible(true);
 		button->show();
-		EditorNode::get_singleton()->make_bottom_panel_item_visible(visual_shader_editor);
+		make_bottom_panel_item_visible(visual_shader_editor);
 		visual_shader_editor->update_nodes();
 		visual_shader_editor->set_process_input(true);
 		//visual_shader_editor->set_process(true);
 	} else {
 		if (visual_shader_editor->is_visible_in_tree()) {
-			EditorNode::get_singleton()->hide_bottom_panel();
+			hide_bottom_panel();
 		}
 		button->hide();
 		visual_shader_editor->set_process_input(false);
@@ -5490,10 +5497,10 @@ void VisualShaderEditorPlugin::make_visible(bool p_visible) {
 }
 
 VisualShaderEditorPlugin::VisualShaderEditorPlugin() {
-	visual_shader_editor = memnew(VisualShaderEditor);
+	visual_shader_editor = memnew(VisualShaderEditor(this));
 	visual_shader_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
 
-	button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("VisualShader"), visual_shader_editor);
+	button = add_control_to_bottom_panel(visual_shader_editor, TTR("VisualShader"));
 	button->hide();
 }
 
@@ -5525,14 +5532,16 @@ class VisualShaderNodePluginInputEditor : public OptionButton {
 
 	void setup(const Ref<VisualShaderNodeInput> &p_input) {
 		input = p_input;
+		Control *base_control = EditorNode::get_singleton()->get_gui_base();
+
 		Ref<Texture2D> type_icon[7] = {
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("float"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("int"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("bool"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("ImageTexture"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("float"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("int"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("bool"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("ImageTexture"), SNAME("EditorIcons")),
 		};
 
 		add_item("[None]");
@@ -5573,13 +5582,13 @@ class VisualShaderNodePluginVaryingEditor : public OptionButton {
 
 	void setup(const Ref<VisualShaderNodeVarying> &p_varying, VisualShader::Type p_type) {
 		varying = p_varying;
-
+		Control *base_control = EditorNode::get_singleton()->get_gui_base();
 		Ref<Texture2D> type_icon[] = {
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("float"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Color"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("float"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Color"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")),
 		};
 
 		bool is_getter = Ref<VisualShaderNodeVaryingGetter>(p_varying.ptr()).is_valid();
@@ -5652,15 +5661,16 @@ class VisualShaderNodePluginUniformRefEditor : public OptionButton {
 	void setup(const Ref<VisualShaderNodeUniformRef> &p_uniform_ref) {
 		uniform_ref = p_uniform_ref;
 
+		Control *base_control = EditorNode::get_singleton()->get_gui_base();
 		Ref<Texture2D> type_icon[8] = {
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("float"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("int"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("bool"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Color"), SNAME("EditorIcons")),
-			EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("ImageTexture"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("float"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("int"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("bool"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("Color"), SNAME("EditorIcons")),
+			base_control->get_theme_icon(SNAME("ImageTexture"), SNAME("EditorIcons")),
 		};
 
 		add_item("[None]");
@@ -6009,7 +6019,6 @@ bool EditorInspectorShaderModePlugin::parse_property(Object *p_object, const Var
 }
 
 //////////////////////////////////
-
 void VisualShaderNodePortPreview::_shader_changed() {
 	if (shader.is_null()) {
 		return;
@@ -6032,9 +6041,9 @@ void VisualShaderNodePortPreview::_shader_changed() {
 	material->set_shader(preview_shader);
 
 	//find if a material is also being edited and copy parameters to this one
-
-	for (int i = EditorNode::get_singleton()->get_editor_selection_history()->get_path_size() - 1; i >= 0; i--) {
-		Object *object = ObjectDB::get_instance(EditorNode::get_singleton()->get_editor_selection_history()->get_path_object(i));
+	EditorSelectionHistory *selection_history = EditorNode::get_singleton()->get_editor_selection_history();
+	for (int i = selection_history->get_path_size() - 1; i >= 0; i--) {
+		Object *object = ObjectDB::get_instance(selection_history->get_path_object(i));
 		ShaderMaterial *src_mat;
 		if (!object) {
 			continue;
diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h
index 4087fc583c6d..31f7bc63965b 100644
--- a/editor/plugins/visual_shader_editor_plugin.h
+++ b/editor/plugins/visual_shader_editor_plugin.h
@@ -58,6 +58,8 @@ class VisualShaderGraphPlugin : public RefCounted {
 	GDCLASS(VisualShaderGraphPlugin, RefCounted);
 
 private:
+	EditorPlugin *plugin;
+
 	struct InputPort {
 		Button *default_input_button = nullptr;
 	};
@@ -124,7 +126,7 @@ class VisualShaderGraphPlugin : public RefCounted {
 	void update_theme();
 	VisualShader::Type get_shader_type() const;
 
-	VisualShaderGraphPlugin();
+	VisualShaderGraphPlugin(EditorPlugin *p_plugin);
 	~VisualShaderGraphPlugin();
 };
 
@@ -132,6 +134,7 @@ class VisualShaderEditor : public VBoxContainer {
 	GDCLASS(VisualShaderEditor, VBoxContainer);
 	friend class VisualShaderGraphPlugin;
 
+	EditorPlugin *plugin;
 	CustomPropertyEditor *property_editor = nullptr;
 	int editing_node = -1;
 	int editing_port = -1;
@@ -490,7 +493,7 @@ class VisualShaderEditor : public VBoxContainer {
 
 	virtual Size2 get_minimum_size() const override;
 	void edit(VisualShader *p_visual_shader);
-	VisualShaderEditor();
+	VisualShaderEditor(EditorPlugin *p_plugin);
 };
 
 class VisualShaderEditorPlugin : public EditorPlugin {
diff --git a/editor/plugins/voxel_gi_editor_plugin.cpp b/editor/plugins/voxel_gi_editor_plugin.cpp
index 6fc6c1ad3949..bf0b5f39cf8d 100644
--- a/editor/plugins/voxel_gi_editor_plugin.cpp
+++ b/editor/plugins/voxel_gi_editor_plugin.cpp
@@ -152,7 +152,7 @@ VoxelGIEditorPlugin::VoxelGIEditorPlugin() {
 	bake_hb->hide();
 	bake = memnew(Button);
 	bake->set_flat(true);
-	bake->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Bake"), SNAME("EditorIcons")));
+	bake->set_icon(get_editor_interface()->get_base_control()->get_theme_icon(SNAME("Bake"), SNAME("EditorIcons")));
 	bake->set_text(TTR("Bake VoxelGI"));
 	bake->connect("pressed", callable_mp(this, &VoxelGIEditorPlugin::_bake));
 	bake_hb->add_child(bake);
diff --git a/editor/plugins/voxel_gi_editor_plugin.h b/editor/plugins/voxel_gi_editor_plugin.h
index 621e98beef66..3614f03a1b80 100644
--- a/editor/plugins/voxel_gi_editor_plugin.h
+++ b/editor/plugins/voxel_gi_editor_plugin.h
@@ -33,6 +33,7 @@
 
 #include "editor/editor_plugin.h"
 #include "scene/3d/voxel_gi.h"
+#include "scene/gui/box_container.h"
 #include "scene/resources/material.h"
 
 class EditorFileDialog;
diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h
index 599fb01203d0..9a0d28132f64 100644
--- a/editor/scene_tree_dock.h
+++ b/editor/scene_tree_dock.h
@@ -36,6 +36,7 @@
 #include "editor/groups_editor.h"
 #include "editor/quick_open.h"
 #include "editor/reparent_dialog.h"
+#include "editor/scene_tree_editor.h"
 #include "editor/script_create_dialog.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/box_container.h"
@@ -43,8 +44,8 @@
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/popup_menu.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
-#include "scene_tree_editor.h"
 
 #include "modules/modules_enabled.gen.h" // For regex.
 #ifdef MODULE_REGEX_ENABLED
diff --git a/main/main.cpp b/main/main.cpp
index f20ec94fa558..450f52532133 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -79,6 +79,7 @@
 #endif
 
 #ifdef TOOLS_ENABLED
+#include "editor/debugger/editor_debugger_node.h"
 #include "editor/doc_data_class_path.gen.h"
 #include "editor/doc_tools.h"
 #include "editor/editor_node.h"
diff --git a/modules/csg/editor/csg_gizmos.cpp b/modules/csg/editor/csg_gizmos.cpp
index be2981025243..19de14272a4d 100644
--- a/modules/csg/editor/csg_gizmos.cpp
+++ b/modules/csg/editor/csg_gizmos.cpp
@@ -32,6 +32,7 @@
 
 #ifdef TOOLS_ENABLED
 
+#include "core/object/undo_redo.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/camera_3d.h"
diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
index 23a7b7fed633..d03b92867d99 100644
--- a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
+++ b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
@@ -56,7 +56,7 @@ bool SceneExporterGLTFPlugin::has_main_screen() const {
 
 SceneExporterGLTFPlugin::SceneExporterGLTFPlugin() {
 	file_export_lib = memnew(EditorFileDialog);
-	EditorNode::get_singleton()->get_gui_base()->add_child(file_export_lib);
+	get_editor_interface()->get_base_control()->add_child(file_export_lib);
 	file_export_lib->connect("file_selected", callable_mp(this, &SceneExporterGLTFPlugin::_gltf2_dialog_action));
 	file_export_lib->set_title(TTR("Export Library"));
 	file_export_lib->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE);
@@ -70,7 +70,7 @@ SceneExporterGLTFPlugin::SceneExporterGLTFPlugin() {
 }
 
 void SceneExporterGLTFPlugin::_gltf2_dialog_action(String p_file) {
-	Node *root = EditorNode::get_singleton()->get_tree()->get_edited_scene_root();
+	Node *root = get_editor_interface()->get_edited_scene_root();
 	if (!root) {
 		EditorNode::get_singleton()->show_accept(TTR("This operation can't be done without a scene."), TTR("OK"));
 		return;
@@ -93,7 +93,7 @@ void SceneExporterGLTFPlugin::_gltf2_dialog_action(String p_file) {
 }
 
 void SceneExporterGLTFPlugin::convert_scene_to_gltf2() {
-	Node *root = EditorNode::get_singleton()->get_tree()->get_edited_scene_root();
+	Node *root = get_editor_interface()->get_edited_scene_root();
 	if (!root) {
 		EditorNode::get_singleton()->show_accept(TTR("This operation can't be done without a scene."), TTR("OK"));
 		return;
diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h
index 5af46bc75284..f029260540c7 100644
--- a/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h
+++ b/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h
@@ -33,6 +33,7 @@
 
 #ifdef TOOLS_ENABLED
 
+#include "editor/editor_file_dialog.h"
 #include "editor/editor_plugin.h"
 #include "editor_scene_importer_gltf.h"
 
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp
index 68968325dd46..c997353a79c4 100644
--- a/modules/gridmap/editor/grid_map_editor_plugin.cpp
+++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp
@@ -1137,8 +1137,8 @@ void GridMapEditor::_bind_methods() {
 	ClassDB::bind_method("_set_selection", &GridMapEditor::_set_selection);
 }
 
-GridMapEditor::GridMapEditor() {
-	undo_redo = EditorNode::get_singleton()->get_undo_redo();
+GridMapEditor::GridMapEditor(EditorPlugin *p_plugin) {
+	undo_redo = p_plugin->get_undo_redo();
 
 	int mw = EDITOR_DEF("editors/grid_map/palette_min_width", 230);
 	Control *ec = memnew(Control);
@@ -1467,7 +1467,7 @@ GridMapEditorPlugin::GridMapEditorPlugin() {
 	EDITOR_DEF("editors/grid_map/editor_side", 1);
 	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "editors/grid_map/editor_side", PROPERTY_HINT_ENUM, "Left,Right"));
 
-	grid_map_editor = memnew(GridMapEditor);
+	grid_map_editor = memnew(GridMapEditor(this));
 	switch ((int)EditorSettings::get_singleton()->get("editors/grid_map/editor_side")) {
 		case 0: { // Left.
 			Node3DEditor::get_singleton()->add_control_to_left_panel(grid_map_editor);
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.h b/modules/gridmap/editor/grid_map_editor_plugin.h
index 3b293975026b..15966879dbf5 100644
--- a/modules/gridmap/editor/grid_map_editor_plugin.h
+++ b/modules/gridmap/editor/grid_map_editor_plugin.h
@@ -35,7 +35,10 @@
 
 #include "../grid_map.h"
 #include "editor/editor_plugin.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
+#include "scene/gui/menu_button.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 
@@ -227,7 +230,7 @@ class GridMapEditor : public VBoxContainer {
 	EditorPlugin::AfterGUIInput forward_spatial_input_event(Camera3D *p_camera, const Ref<InputEvent> &p_event);
 
 	void edit(GridMap *p_gridmap);
-	GridMapEditor();
+	GridMapEditor(EditorPlugin *p_plugin);
 	~GridMapEditor();
 };
 
diff --git a/modules/navigation/editor/navigation_mesh_editor_plugin.cpp b/modules/navigation/editor/navigation_mesh_editor_plugin.cpp
index c243e3e6e306..ce353098169e 100644
--- a/modules/navigation/editor/navigation_mesh_editor_plugin.cpp
+++ b/modules/navigation/editor/navigation_mesh_editor_plugin.cpp
@@ -35,7 +35,6 @@
 #include "../navigation_mesh_generator.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_saver.h"
-#include "editor/editor_node.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/gui/box_container.h"
 
@@ -145,7 +144,7 @@ void NavigationMeshEditorPlugin::make_visible(bool p_visible) {
 
 NavigationMeshEditorPlugin::NavigationMeshEditorPlugin() {
 	navigation_mesh_editor = memnew(NavigationMeshEditor);
-	EditorNode::get_singleton()->get_main_control()->add_child(navigation_mesh_editor);
+	get_editor_interface()->get_editor_main_control()->add_child(navigation_mesh_editor);
 	add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU, navigation_mesh_editor->bake_hbox);
 	navigation_mesh_editor->hide();
 	navigation_mesh_editor->bake_hbox->hide();
diff --git a/modules/navigation/editor/navigation_mesh_editor_plugin.h b/modules/navigation/editor/navigation_mesh_editor_plugin.h
index bc9e4185b7d9..f95f84e6ae92 100644
--- a/modules/navigation/editor/navigation_mesh_editor_plugin.h
+++ b/modules/navigation/editor/navigation_mesh_editor_plugin.h
@@ -34,6 +34,7 @@
 #ifdef TOOLS_ENABLED
 
 #include "editor/editor_plugin.h"
+#include "scene/gui/dialogs.h"
 
 class NavigationRegion3D;