diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 45288b4..9ce115b 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -6,7 +6,7 @@ if (NOT TARGET imgui)
 	message("II using FetchContent imgui")
 	FetchContent_Declare(imgui
 		GIT_REPOSITORY https://github.com/ocornut/imgui.git
-		GIT_TAG d4ddc46e7
+		GIT_TAG d6cb3c9 # v1.90.1
 		EXCLUDE_FROM_ALL
 	)
 
diff --git a/plugins/plugin_toxic_games.cpp b/plugins/plugin_toxic_games.cpp
index acfd08a..6efc4ed 100644
--- a/plugins/plugin_toxic_games.cpp
+++ b/plugins/plugin_toxic_games.cpp
@@ -1,21 +1,20 @@
 #include <solanaceae/plugin/solana_plugin_v1.h>
 
-//#include <solanaceae/util/config_model.hpp>
 #include <solanaceae/toxic_games/toxic_games.hpp>
+#include <solanaceae/toxcore/tox_interface.hpp>
 
 #include <memory>
 #include <limits>
 #include <iostream>
 
-#define RESOLVE_INSTANCE(x) static_cast<x*>(solana_api->resolveInstance(#x))
-#define PROVIDE_INSTANCE(x, p, v) solana_api->provideInstance(#x, p, static_cast<x*>(v))
-
 static std::unique_ptr<ToxicGames> g_tg = nullptr;
 
+constexpr const char* plugin_name = "ToxicGames";
+
 extern "C" {
 
 SOLANA_PLUGIN_EXPORT const char* solana_plugin_get_name(void) {
-	return "ToxicGames";
+	return plugin_name;
 }
 
 SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_get_version(void) {
@@ -23,67 +22,40 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_get_version(void) {
 }
 
 SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api) {
-	std::cout << "PLUGIN TG START()\n";
+	std::cout << "PLUGIN " << plugin_name << " START()\n";
 
 	if (solana_api == nullptr) {
 		return 1;
 	}
 
-	//RegistryMessageModel* rmm = nullptr;
-	//ConfigModelI* conf = nullptr;
-	Contact3Registry* cr;
-	ToxI* t;
-	ToxEventProviderI* tep;
-	ToxContactModel2* tcm;
+	try {
+		auto* cr = PLUG_RESOLVE_INSTANCE_VERSIONED(Contact3Registry, "1");
+		auto* t = PLUG_RESOLVE_INSTANCE(ToxI);
+		auto* tep = PLUG_RESOLVE_INSTANCE(ToxEventProviderI);
+		auto* tcm = PLUG_RESOLVE_INSTANCE(ToxContactModel2);
 
-	{ // make sure required types are loaded
-		//rmm = RESOLVE_INSTANCE(RegistryMessageModel);
-		//conf = RESOLVE_INSTANCE(ConfigModelI);
-		cr = RESOLVE_INSTANCE(Contact3Registry);
-		t = RESOLVE_INSTANCE(ToxI);
-		tep = RESOLVE_INSTANCE(ToxEventProviderI);
-		tcm = RESOLVE_INSTANCE(ToxContactModel2);
+		// static store, could be anywhere tho
+		// construct with fetched dependencies
+		g_tg = std::make_unique<ToxicGames>(*cr, *t, *tep, *tcm);
 
-		if (cr == nullptr) {
-			std::cerr << "PLUGIN TG missing Contact3Registry\n";
-			return 2;
-		}
-
-		if (t == nullptr) {
-			std::cerr << "PLUGIN TG missing ToxI\n";
-			return 2;
-		}
-
-		if (tep == nullptr) {
-			std::cerr << "PLUGIN TG missing ToxEventProviderI\n";
-			return 2;
-		}
-
-		if (tcm == nullptr) {
-			std::cerr << "PLUGIN TG missing ToxContactModel2\n";
-			return 2;
-		}
+		// register types
+		PLUG_PROVIDE_INSTANCE(ToxicGames, plugin_name, g_tg.get());
+	} catch (const ResolveException& e) {
+		std::cerr << "PLUGIN " << plugin_name << " " << e.what << "\n";
+		return 2;
 	}
 
-	// static store, could be anywhere tho
-	// construct with fetched dependencies
-	g_tg = std::make_unique<ToxicGames>(*cr, *t, *tep, *tcm);
-
-	// register types
-	PROVIDE_INSTANCE(ToxicGames, "ToxicGames", g_tg.get());
-
 	return 0;
 }
 
 SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) {
-	std::cout << "PLUGIN TG STOP()\n";
+	std::cout << "PLUGIN " << plugin_name << " STOP()\n";
 
 	g_tg.reset();
 }
 
 SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float delta) {
 	(void)delta;
-	//std::cout << "PLUGIN TG TICK()\n";
 	//g_tg->iterate();
 	return std::numeric_limits<float>::max();
 }