Bugfixes

[MGatner]

• Fixes a couple bugs where empty schema portions could overwrite legit ones
• Fixes a bug with "singleton" getting the wrong variable type
• Fixes the Debug Toolbar collector's display on Dark Mode toolbars

[MGatner]

This PR made me aware that the old Action was in place, so I'm updating that as well.