diff --git a/Cool b/Cool
index 1013952e..fa75b0d6 160000
--- a/Cool
+++ b/Cool
@@ -1 +1 @@
-Subproject commit 1013952e3edae4997204a966b756dab7e5dba1d3
+Subproject commit fa75b0d63514d7ac94a854c7a2b1a093e650064d
diff --git a/src/App.cpp b/src/App.cpp
index ea69723a..650dfa3e 100644
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -31,6 +31,7 @@
 #include "Cool/Log/Message.h"
 #include "Cool/OSC/OSCChannel.h"
 #include "Cool/OSC/OSCManager.h"
+#include "Cool/Server/ServerManager.hpp"
 #include "Cool/Tips/TipsManager.h"
 #include "Cool/Video/hack_get_global_time_in_seconds.h"
 #include "Cool/View/View.h"
@@ -71,15 +72,6 @@ App::App(Cool::WindowManager& windows, Cool::ViewsManager& views)
 
     _project.camera_3D_manager.hook_events(_preview_view.mouse_events(), command_executor());
     _project.camera_2D_manager.hook_events(_preview_view.mouse_events(), command_executor());
-
-    // serv::init([](std::string_view request) {
-    //     Cool::Log::Debug::info("Scripting", "{}", request);
-    // });
-}
-
-App::~App()
-{
-    // serv::shut_down();
 }
 
 void App::on_shutdown()
@@ -394,6 +386,8 @@ void App::imgui_windows_only_when_inputs_are_allowed()
     Cool::midi_manager().imgui_window();
     // OSC
     Cool::osc_manager().imgui_window();
+    // Server
+    Cool::server_manager().imgui_window();
     // Tips
     _tips_manager.imgui_windows(all_tips());
     // Nodes
@@ -525,6 +519,8 @@ void App::commands_menu()
             Cool::midi_manager().open_config_window();
         if (ImGui::Selectable(ICOMOON_CONNECTION " Open OSC config"))
             Cool::osc_manager().open_config_window();
+        if (ImGui::Selectable(ICOMOON_CONNECTION " Open Server config"))
+            Cool::server_manager().open_config_window();
         if (ImGui::Selectable(ICOMOON_MUSIC " Open Audio config"))
             _project.audio.open_imgui_window();
         if (ImGui::Selectable(ICOMOON_IMAGE " Open output window"))
diff --git a/src/App.h b/src/App.h
index 6e421ffa..960517fd 100644
--- a/src/App.h
+++ b/src/App.h
@@ -23,6 +23,7 @@
 #include "Cool/Midi/MidiManager.h"
 #include "Cool/Nodes/NodesLibrary.h"
 #include "Cool/OSC/OSCManager.h"
+#include "Cool/Server/ServerManager.hpp"
 #include "Cool/StrongTypes/Camera2D.h"
 #include "Cool/Tips/TipsManager.h"
 #include "Cool/View/ForwardingOrRenderView.h"
@@ -41,7 +42,6 @@ using DebugOptionsManager = Cool::DebugOptionsManager<
 class App : public Cool::IApp {
 public:
     explicit App(Cool::WindowManager& windows, Cool::ViewsManager& views);
-    ~App();
     void on_shutdown() override;
 
     void update() override;
@@ -127,7 +127,8 @@ class App : public Cool::IApp {
             ser20::make_nvp("Output view", app._output_view),
             ser20::make_nvp("Webcams config", Cool::WebcamsConfigs::instance()),
             ser20::make_nvp("MIDI config", Cool::midi_manager()),
-            ser20::make_nvp("OSC config", Cool::osc_manager())
+            ser20::make_nvp("OSC config", Cool::osc_manager()),
+            ser20::make_nvp("Server config", Cool::server_manager())
         );
     }
     template<class Archive>