diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index 54332ba..0000000
--- a/.clang-format
+++ /dev/null
@@ -1,105 +0,0 @@
-BasedOnStyle: WebKit
-
-AllowAllArgumentsOnNextLine: true
-BreakConstructorInitializers: BeforeComma
-BreakInheritanceList: BeforeComma
-ReflowComments: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-
-AccessModifierOffset: -2
-AlignAfterOpenBracket: AlwaysBreak
-AlignEscapedNewlinesLeft: true
-AlignOperands: true
-AlignTrailingComments: true
-AlignConsecutiveDeclarations: false
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: false
-AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: true
-
-BraceWrapping:
-  AfterClass:      true
-  AfterControlStatement: true
-  AfterEnum:       true
-  AfterFunction:   true
-  AfterNamespace:  true
-  AfterStruct:     true
-  AfterUnion:      true
-  BeforeCatch:     true
-  BeforeElse:      true
-  IndentBraces:    false
-
-BinPackArguments: false
-BinPackParameters: false
-ExperimentalAutoDetectBinPacking: false
-AllowAllParametersOfDeclarationOnNextLine: false
-BreakBeforeBinaryOperators: All
-BreakBeforeBraces: Allman
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 79
-CommentPragmas: '^ IWYU pragma:'
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-IndentCaseLabels: true
-IndentWidth: 2
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: true
-Language: Cpp
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Left
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
-SpacesInCStyleCastParentheses: false
-SpacesInContainerLiterals: true
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-SpaceBeforeCpp11BracedList: false
-Standard: c++20
-TabWidth: 2
-UseTab: Never
-CommentPragmas: '^ clang-format:'
-StatementMacros: ['E_SIGNAL', 'PROPERTY', 'W_SIGNAL', 'W_PROPERTY', 'W_SLOT']
-SortIncludes: true
-IncludeBlocks: Regroup
-IncludeCategories:
-  - Regex:           '^"'
-    Priority:        1
-  - Regex:           '^<(Vst|Vst3|Audio|Magnetism|Control|ControlSurface|RemoteScenario|Explorer|Protocols|Process|State|Device|Media|Midi|JS|Curve|Inspector|Automation|Dataflow|Fx|Library|Mapping|Loop|Recording|PluginSettings|Gfx|Nodal|Pd|LV2|Mixer|Video|Effect|Execution|Engine|LocalTree)'
-    Priority:        2
-  - Regex:           '^<score/'
-    Priority:        3
-  - Regex:           '^<core/'
-    Priority:        4
-  - Regex:           '^<ossia/detail/config'
-    Priority:        5
-  - Regex:           '^<ossia/'
-    Priority:        6
-  - Regex:           '^<ossia-qt/'
-    Priority:        6
-  - Regex:           '^<boost'
-    Priority:        7
-  - Regex:           '^<Q'
-    Priority:        8
-  - Regex:           '<([[:alnum:]_]+\/?)+.(h|hpp)>'
-    Priority:        9
-  - Regex:           '<[[:alnum:]]+>'
-    Priority:        800
-
diff --git a/3rdparty/OrbbecSDK_v2 b/3rdparty/OrbbecSDK_v2
new file mode 160000
index 0000000..a798662
--- /dev/null
+++ b/3rdparty/OrbbecSDK_v2
@@ -0,0 +1 @@
+Subproject commit a798662ed637a41d165cd63dee1022127a49db5a
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a49bcb8..59fab3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,31 +1,40 @@
 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
+if(NOT (WIN32 OR APPLE OR LINUX))
+  return()
+endif()
+
 if(NOT TARGET score_lib_base)
   include("${SCORE_SOURCE_DIR}/cmake/ScoreExternalAddon.cmake")
 endif()
 
 project(score_addon_orbbec LANGUAGES CXX)
 
+set(OB_BUILD_EXAMPLES 0)
+set(OB_BUILD_TESTS 0)
+set(OB_BUILD_DOCS 0)
+set(OB_BUILD_TOOLS 0)
+add_subdirectory(3rdparty/OrbbecSDK_v2 SYSTEM)
+
 # General initialization
 score_common_setup()
 
 # Creation of the library
 add_library(score_addon_orbbec
-  Orbbec/Device.cpp
-  Orbbec/Device.hpp
-  Orbbec/ProtocolFactory.cpp
-  Orbbec/ProtocolFactory.hpp
-  Orbbec/ProtocolSettingsWidget.cpp
-  Orbbec/ProtocolSettingsWidget.hpp
-  Orbbec/SpecificSettings.hpp
-  Orbbec/SpecificSettingsSerialization.cpp
+  Orbbec/OrbbecInputDevice.hpp
+  Orbbec/OrbbecInputDevice.cpp
 
   score_addon_orbbec.hpp
   score_addon_orbbec.cpp
 )
 
 # Link
-target_link_libraries(score_addon_orbbec PUBLIC score_plugin_engine)
+target_link_libraries(score_addon_orbbec PUBLIC
+    score_plugin_engine
+    score_plugin_media
+    score_plugin_gfx
+    ob::OrbbecSDK
+)
 
 # Target-specific options
 setup_score_plugin(score_addon_orbbec)
diff --git a/Orbbec/ApplicationPlugin.cpp b/Orbbec/ApplicationPlugin.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/Orbbec/ApplicationPlugin.hpp b/Orbbec/ApplicationPlugin.hpp
new file mode 100644
index 0000000..2c71aaf
--- /dev/null
+++ b/Orbbec/ApplicationPlugin.hpp
@@ -0,0 +1,17 @@
+#pragma once
+#include <score/plugins/application/GUIApplicationPlugin.hpp>
+
+#include <libobsensor/ObSensor.hpp>
+
+namespace Gfx::Orbbec
+{
+class ApplicationPlugin
+    : public QObject
+    , public score::GUIApplicationPlugin
+{
+public:
+  using GUIApplicationPlugin::GUIApplicationPlugin;
+
+  ob::Context orbbec;
+};
+}
diff --git a/Orbbec/Device.cpp b/Orbbec/Device.cpp
deleted file mode 100644
index 7e9dcd8..0000000
--- a/Orbbec/Device.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "Device.hpp"
-
-#include "SpecificSettings.hpp"
-
-#include <Explorer/DocumentPlugin/DeviceDocumentPlugin.hpp>
-
-#include <score/document/DocumentContext.hpp>
-
-#include <ossia/network/generic/generic_device.hpp>
-#include <ossia/network/local/local.hpp>
-
-#include <QDebug>
-
-#include <wobjectimpl.h>
-
-W_OBJECT_IMPL(Orbbec::DeviceImplementation)
-
-namespace Orbbec
-{
-DeviceImplementation::DeviceImplementation(
-    const Device::DeviceSettings& settings,
-    const Explorer::DeviceDocumentPlugin& plugin,
-    const score::DocumentContext&)
-    : OwningDeviceInterface{settings}
-    , m_ctx{plugin}
-{
-  m_capas.canRefreshTree = true;
-  m_capas.canAddNode = false;
-  m_capas.canRemoveNode = false;
-  m_capas.canRenameNode = false;
-  m_capas.canSetProperties = false;
-  m_capas.canSerialize = false;
-}
-
-DeviceImplementation::~DeviceImplementation() { }
-
-bool DeviceImplementation::reconnect()
-{
-  disconnect();
-
-  try
-  {
-    const auto& set
-        = m_settings.deviceSpecificSettings.value<SpecificSettings>();
-    qDebug() << "Orbbec created with: " << set.control;
-
-    // Needed by most protocols:
-    auto& ctx = m_ctx.networkContext();
-
-    auto protocol = std::make_unique<ossia::net::multiplex_protocol>();
-    auto dev = std::make_unique<ossia::net::generic_device>(
-        std::move(protocol), settings().name.toStdString());
-
-    m_dev = std::move(dev);
-    deviceChanged(nullptr, m_dev.get());
-  }
-  catch (const std::runtime_error& e)
-  {
-    qDebug() << "Orbbec error: " << e.what();
-  }
-  catch (...)
-  {
-    qDebug() << "Orbbec error";
-  }
-
-  return connected();
-}
-
-void DeviceImplementation::disconnect()
-{
-  OwningDeviceInterface::disconnect();
-}
-}
\ No newline at end of file
diff --git a/Orbbec/Device.hpp b/Orbbec/Device.hpp
deleted file mode 100644
index 2a08ccb..0000000
--- a/Orbbec/Device.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-#include <Device/Protocol/DeviceInterface.hpp>
-
-namespace Explorer
-{
-class DeviceDocumentPlugin;
-}
-
-namespace Orbbec
-{
-class DeviceImplementation final : public Device::OwningDeviceInterface
-{
-  W_OBJECT(DeviceImplementation)
-public:
-  DeviceImplementation(
-      const Device::DeviceSettings& settings,
-      const Explorer::DeviceDocumentPlugin& plugin,
-      const score::DocumentContext& ctx);
-  ~DeviceImplementation();
-
-  bool reconnect() override;
-  void disconnect() override;
-
-private:
-  const Explorer::DeviceDocumentPlugin& m_ctx;
-};
-}
\ No newline at end of file
diff --git a/Orbbec/OrbbecInputDevice.cpp b/Orbbec/OrbbecInputDevice.cpp
new file mode 100644
index 0000000..c9317c8
--- /dev/null
+++ b/Orbbec/OrbbecInputDevice.cpp
@@ -0,0 +1,382 @@
+#include "OrbbecInputDevice.hpp"
+
+#include "Orbbec/ApplicationPlugin.hpp"
+
+#include <State/Widgets/AddressFragmentLineEdit.hpp>
+
+#include <Gfx/GfxApplicationPlugin.hpp>
+#include <Gfx/GfxExecContext.hpp>
+#include <Gfx/Graph/VideoNode.hpp>
+#include <Video/CameraInput.hpp>
+#include <Video/FrameQueue.hpp>
+#include <Video/GStreamerCompatibility.hpp>
+#include <Video/GpuFormats.hpp>
+#include <Video/VideoInterface.hpp>
+
+#include <score/serialization/MimeVisitor.hpp>
+
+#include <ossia/detail/flicks.hpp>
+#include <ossia/detail/fmt.hpp>
+
+#include <ossia-qt/name_utils.hpp>
+
+#include <QComboBox>
+#include <QDebug>
+#include <QElapsedTimer>
+#include <QFormLayout>
+#include <QLabel>
+#include <QMenu>
+#include <QMimeData>
+
+#include <wobjectimpl.h>
+
+#include <functional>
+
+extern "C" {
+#include <libavformat/avformat.h>
+}
+
+#include <libobsensor/ObSensor.hpp>
+
+namespace Gfx::Orbbec
+{
+
+class InputDevice final : public Gfx::GfxInputDevice
+{
+  W_OBJECT(InputDevice)
+public:
+  using GfxInputDevice::GfxInputDevice;
+  ~InputDevice();
+
+private:
+  bool reconnect() override;
+  ossia::net::device_base* getDevice() const override { return m_dev.get(); }
+
+  Gfx::video_texture_input_protocol* m_protocol{};
+  mutable std::unique_ptr<Gfx::video_texture_input_device> m_dev;
+};
+
+}
+
+W_OBJECT_IMPL(Gfx::Orbbec::InputDevice)
+
+namespace Gfx::Orbbec
+{
+
+class InputStream final : public ::Video::ExternalInput
+{
+public:
+  explicit InputStream(
+      std::shared_ptr<ob::Config> conf, std::shared_ptr<ob::Device> device) noexcept
+      : m_config{conf}
+      , m_device{device}
+  {
+    realTime = true;
+  }
+
+  ~InputStream() noexcept { stop(); }
+
+  bool start() noexcept override
+  {
+    if(m_running)
+      return false;
+
+    m_pipeline.start(m_config, [&](std::shared_ptr<ob::FrameSet> output) {
+      {
+        std::lock_guard<std::mutex> lock(m_frames_mtx);
+        using namespace std;
+        m_frameset.swap(output);
+      }
+      on_data();
+    });
+
+    m_running.store(true, std::memory_order_release);
+    return true;
+  }
+
+  void stop() noexcept override
+  {
+    // Stop the running status
+    m_running.store(false, std::memory_order_release);
+
+    m_pipeline.stop();
+
+    // Remove frames that were in flight
+    m_frames.drain();
+  }
+
+  AVFrame* dequeue_frame() noexcept override { return m_frames.dequeue(); }
+
+  void release_frame(AVFrame* frame) noexcept override { m_frames.release(frame); }
+
+private:
+  AVPixelFormat get_pixelfmt(OBFormat fmt)
+  {
+    switch(fmt)
+    {
+      case OB_FORMAT_YUYV:
+      case OB_FORMAT_YUY2:
+      case OB_FORMAT_GRAY:
+        return AVPixelFormat::AV_PIX_FMT_YUYV422;
+        return AVPixelFormat::AV_PIX_FMT_YUYV422;
+      case OB_FORMAT_UYVY:
+        return AVPixelFormat::AV_PIX_FMT_UYVY422;
+      case OB_FORMAT_NV12:
+        return AVPixelFormat::AV_PIX_FMT_NV12;
+      case OB_FORMAT_NV21:
+        return AVPixelFormat::AV_PIX_FMT_NV21;
+      case OB_FORMAT_MJPG:
+        return AVPixelFormat::AV_PIX_FMT_YUVJ420P;
+      case OB_FORMAT_Y16:
+      case OB_FORMAT_RLE:
+      case OB_FORMAT_RVL:
+      case OB_FORMAT_Z16:
+        return AVPixelFormat::AV_PIX_FMT_GRAY16LE;
+
+      case OB_FORMAT_Y8:
+        return AVPixelFormat::AV_PIX_FMT_GRAY8;
+
+      // Y10..14: SDK will unpack into Y16 by default
+      case OB_FORMAT_Y10:
+        return AVPixelFormat::AV_PIX_FMT_GRAY16LE;
+      case OB_FORMAT_Y12:
+      case OB_FORMAT_YV12: // Y12: left / YV12: right
+        return AVPixelFormat::AV_PIX_FMT_GRAY16LE;
+      case OB_FORMAT_Y14:
+        return AVPixelFormat::AV_PIX_FMT_GRAY16LE;
+
+      case OB_FORMAT_I420:
+        return AVPixelFormat::AV_PIX_FMT_YUV420P;
+      case OB_FORMAT_RGB:
+        return AV_PIX_FMT_RGB24;
+      case OB_FORMAT_BGR:
+        return AV_PIX_FMT_BGR24;
+      case OB_FORMAT_BGRA:
+        return AV_PIX_FMT_BGRA;
+      case OB_FORMAT_RGBA:
+        return AV_PIX_FMT_RGBA;
+
+      case OB_FORMAT_BYR2: // V4L2_PIX_FMT_SBGGR8 / bayer
+        return AV_PIX_FMT_BAYER_BGGR8;
+
+      case OB_FORMAT_UNKNOWN:
+      case OB_FORMAT_Y11:
+      case OB_FORMAT_H264:
+      case OB_FORMAT_H265:
+      case OB_FORMAT_HEVC:
+      case OB_FORMAT_ACCEL:
+      case OB_FORMAT_GYRO:
+      case OB_FORMAT_POINT:
+      case OB_FORMAT_RGB_POINT:
+      case OB_FORMAT_COMPRESSED:
+      case OB_FORMAT_BA81: // V4L2_PIX_FMT_SBGGR8 / bayer... but orbbec doc says "Is same as Y8, using for right ir stream" ???
+      case OB_FORMAT_RW16:
+      default:
+        return AV_PIX_FMT_NONE;
+    }
+    return AV_PIX_FMT_NONE;
+  }
+
+  void on_data()
+  {
+    if(!m_running)
+      return;
+    if(!m_frameset)
+      return;
+    if(!m_frameset->colorFrame())
+      return;
+
+    auto& color = *m_frameset->colorFrame();
+    void* p = color.data();
+    std::size_t sz = color.dataSize();
+    if(sz <= 1)
+      return;
+
+    auto pixfmt = get_pixelfmt(color.getFormat());
+    if(pixfmt == AV_PIX_FMT_NONE)
+      return;
+
+    ::Video::AVFramePointer frame = m_frames.newFrame();
+
+    frame->format = pixfmt;
+    frame->width = color.getWidth();
+    frame->height = color.getHeight();
+
+    // Here we need to copy the buffer.
+    const auto storage = ::Video::initFrameBuffer(*frame, sz);
+    if(::Video::initFrameFromRawData(frame.get(), storage, sz))
+    {
+      // Copy the content as we're going on *adventures*
+      memcpy(storage, p, sz);
+
+      m_frames.enqueue(frame.release());
+    }
+  }
+
+  ::Video::FrameQueue m_frames;
+
+  std::atomic_bool m_running{};
+
+  std::shared_ptr<ob::Config> m_config;
+  std::shared_ptr<ob::Device> m_device;
+  ob::Pipeline m_pipeline;
+  std::mutex m_frames_mtx;
+  std::shared_ptr<ob::FrameSet> m_frameset = nullptr;
+};
+
+InputDevice::~InputDevice() { }
+
+bool InputDevice::reconnect()
+{
+  disconnect();
+
+  try
+  {
+    auto set = this->settings().deviceSpecificSettings.value<SharedInputSettings>();
+
+    auto plug = m_ctx.findPlugin<Gfx::DocumentPlugin>();
+    auto& orbbec_app = m_ctx.app.guiApplicationPlugin<Orbbec::ApplicationPlugin>();
+    if(plug)
+    {
+      auto config = std::make_shared<ob::Config>();
+      auto device = std::shared_ptr<ob::Device>{};
+
+      {
+        auto deviceList = orbbec_app.orbbec.queryDeviceList();
+        for(int i = 0; i < (int)deviceList->deviceCount(); i++)
+        {
+          auto dev = deviceList->getDevice(i);
+          auto dev_info = dev->getDeviceInfo();
+          if(dev_info->serialNumber() == set.path)
+          {
+            device = dev;
+            break;
+          }
+        }
+
+        if(!device && deviceList->deviceCount() > 0)
+          device = deviceList->getDevice(0);
+        if(!device)
+          return false;
+      }
+
+      auto sensorList = device->getSensorList();
+
+      for(int i = 0; i < (int)sensorList->getCount(); i++)
+      {
+        auto type = sensorList->getSensorType(i);
+        if(ob::TypeHelper::isVideoSensorType(type))
+          config->enableStream(type);
+      }
+      auto stream = std::make_shared<InputStream>(config, device);
+
+      m_protocol = new Gfx::video_texture_input_protocol{std::move(stream), plug->exec};
+      m_dev = std::make_unique<Gfx::video_texture_input_device>(
+          std::unique_ptr<ossia::net::protocol_base>(m_protocol),
+          this->settings().name.toStdString());
+    }
+  }
+  catch(std::exception& e)
+  {
+    qDebug() << "Could not connect: " << e.what();
+  }
+  catch(...)
+  {
+    // TODO save the reason of the non-connection.
+  }
+
+  return connected();
+}
+
+QString InputFactory::prettyName() const noexcept
+{
+  return QObject::tr("Orbbec Input");
+}
+
+QUrl InputFactory::manual() const noexcept
+{
+  return QUrl("https://ossia.io/score-docs/devices/orbbec-device.html");
+}
+
+Device::DeviceInterface* InputFactory::makeDevice(
+    const Device::DeviceSettings& settings, const Explorer::DeviceDocumentPlugin& plugin,
+    const score::DocumentContext& ctx)
+{
+  return new InputDevice(settings, ctx);
+}
+
+const Device::DeviceSettings& InputFactory::defaultSettings() const noexcept
+{
+  static const Device::DeviceSettings settings = [&]() {
+    Device::DeviceSettings s;
+    s.protocol = concreteKey();
+    s.name = "Orbbec Input";
+    SharedInputSettings specif;
+    specif.path = "";
+    s.deviceSpecificSettings = QVariant::fromValue(specif);
+    return s;
+  }();
+  return settings;
+}
+
+class OrbbecEnumerator : public Device::DeviceEnumerator
+{
+public:
+  const score::GUIApplicationContext& context;
+  const ob::Context& orbbec;
+
+  explicit OrbbecEnumerator(const score::GUIApplicationContext& ctx)
+      : context{ctx}
+      , orbbec{ctx.applicationPlugin<Orbbec::ApplicationPlugin>().orbbec}
+  {
+  }
+
+  void enumerate(std::function<void(const QString&, const Device::DeviceSettings&)> f)
+      const override
+  {
+    auto deviceList = orbbec.queryDeviceList();
+    for(uint32_t index = 0; index < deviceList->getCount(); index++)
+    {
+      auto device = deviceList->getDevice(index);
+      auto deviceInfo = device->getDeviceInfo();
+
+      Device::DeviceSettings set;
+      SharedInputSettings specif;
+      set.name = QString("%1 (%2)")
+                     .arg(deviceInfo->getName())
+                     .arg(deviceInfo->getSerialNumber());
+      set.protocol = InputFactory::static_concreteKey();
+      specif.path = deviceInfo->getSerialNumber();
+      set.deviceSpecificSettings = QVariant::fromValue(specif);
+      f(set.name, set);
+    }
+  }
+};
+
+Device::DeviceEnumerators
+InputFactory::getEnumerators(const score::DocumentContext& ctx) const
+{
+  return {{"Cameras", new OrbbecEnumerator{ctx.app}}};
+}
+
+Device::ProtocolSettingsWidget* InputFactory::makeSettingsWidget()
+{
+  return new InputSettingsWidget;
+}
+
+InputSettingsWidget::InputSettingsWidget(QWidget* parent)
+    : SharedInputSettingsWidget{parent}
+{
+  m_deviceNameEdit->setText("Orbbec In");
+  ((QLabel*)m_layout->labelForField(m_shmPath))->setText("Orbbec label");
+  setSettings(InputFactory{}.defaultSettings());
+}
+
+Device::DeviceSettings InputSettingsWidget::getSettings() const
+{
+  auto set = SharedInputSettingsWidget::getSettings();
+  set.protocol = InputFactory::static_concreteKey();
+  return set;
+}
+
+}
diff --git a/Orbbec/OrbbecInputDevice.hpp b/Orbbec/OrbbecInputDevice.hpp
new file mode 100644
index 0000000..35fa779
--- /dev/null
+++ b/Orbbec/OrbbecInputDevice.hpp
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <Device/Protocol/DeviceInterface.hpp>
+#include <Device/Protocol/DeviceSettings.hpp>
+
+#include <Gfx/GfxInputDevice.hpp>
+#include <Gfx/SharedInputSettings.hpp>
+
+#include <ossia/gfx/texture_parameter.hpp>
+#include <ossia/network/base/device.hpp>
+#include <ossia/network/base/protocol.hpp>
+
+#include <QLineEdit>
+
+class QComboBox;
+namespace Gfx::Orbbec {
+class InputFactory final : public SharedInputProtocolFactory
+{
+    SCORE_CONCRETE("a3bd48ba-f5db-43b7-aa92-2b1a37a88a79")
+public:
+  QString prettyName() const noexcept override;
+  QUrl manual() const noexcept override;
+  Device::DeviceEnumerators
+  getEnumerators(const score::DocumentContext& ctx) const override;
+
+  Device::DeviceInterface* makeDevice(
+      const Device::DeviceSettings& settings,
+      const Explorer::DeviceDocumentPlugin& plugin,
+      const score::DocumentContext& ctx) override;
+  const Device::DeviceSettings& defaultSettings() const noexcept override;
+
+  Device::ProtocolSettingsWidget* makeSettingsWidget() override;
+};
+
+class InputSettingsWidget final : public SharedInputSettingsWidget
+{
+public:
+  InputSettingsWidget(QWidget* parent = nullptr);
+
+  Device::DeviceSettings getSettings() const override;
+};
+
+} // namespace Gfx::Orbbec
diff --git a/Orbbec/ProtocolFactory.cpp b/Orbbec/ProtocolFactory.cpp
deleted file mode 100644
index 13e2eb4..0000000
--- a/Orbbec/ProtocolFactory.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "ProtocolFactory.hpp"
-
-#include "Device.hpp"
-#include "ProtocolSettingsWidget.hpp"
-#include "SpecificSettings.hpp"
-
-#include <State/Widgets/AddressFragmentLineEdit.hpp>
-
-#include <score/application/ApplicationContext.hpp>
-#include <score/widgets/SignalUtils.hpp>
-
-#include <ossia/detail/config.hpp>
-
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QObject>
-
-namespace Orbbec
-{
-
-QString ProtocolFactory::prettyName() const noexcept
-{
-  return QObject::tr("Orbbec");
-}
-
-QString ProtocolFactory::category() const noexcept
-{
-  return StandardCategories::lights;
-}
-
-Device::DeviceEnumerators
-ProtocolFactory::getEnumerators(const score::DocumentContext& ctx) const
-{
-  return {};
-}
-
-Device::DeviceInterface* ProtocolFactory::makeDevice(
-    const Device::DeviceSettings& settings,
-    const Explorer::DeviceDocumentPlugin& plugin,
-    const score::DocumentContext& ctx)
-{
-  return new Orbbec::DeviceImplementation{settings, plugin, ctx};
-}
-
-const Device::DeviceSettings& ProtocolFactory::defaultSettings() const noexcept
-{
-  static const Device::DeviceSettings& settings = [&]
-  {
-    Device::DeviceSettings s;
-    s.protocol = concreteKey();
-    s.name = "Orbbec";
-    SpecificSettings settings;
-    s.deviceSpecificSettings = QVariant::fromValue(settings);
-    return s;
-  }();
-
-  return settings;
-}
-
-Device::ProtocolSettingsWidget* ProtocolFactory::makeSettingsWidget()
-{
-  return new ProtocolSettingsWidget;
-}
-
-QVariant ProtocolFactory::makeProtocolSpecificSettings(
-    const VisitorVariant& visitor) const
-{
-  return makeProtocolSpecificSettings_T<SpecificSettings>(visitor);
-}
-
-void ProtocolFactory::serializeProtocolSpecificSettings(
-    const QVariant& data,
-    const VisitorVariant& visitor) const
-{
-  serializeProtocolSpecificSettings_T<SpecificSettings>(data, visitor);
-}
-
-bool ProtocolFactory::checkCompatibility(
-    const Device::DeviceSettings& a,
-    const Device::DeviceSettings& b) const noexcept
-{
-  return false;
-}
-}
diff --git a/Orbbec/ProtocolFactory.hpp b/Orbbec/ProtocolFactory.hpp
deleted file mode 100644
index a1982b2..0000000
--- a/Orbbec/ProtocolFactory.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-#include <Explorer/DefaultProtocolFactory.hpp>
-
-namespace Orbbec
-{
-
-class ProtocolFactory final : public Protocols::DefaultProtocolFactory
-{
-  SCORE_CONCRETE("da91ff7f-84df-4d23-94e2-908059fb25da")
-
-  QString prettyName() const noexcept override;
-  QString category() const noexcept override;
-  Device::DeviceEnumerators
-  getEnumerators(const score::DocumentContext& ctx) const override;
-
-  Device::DeviceInterface* makeDevice(
-      const Device::DeviceSettings& settings,
-      const Explorer::DeviceDocumentPlugin& plugin,
-      const score::DocumentContext& ctx) override;
-
-  const Device::DeviceSettings& defaultSettings() const noexcept override;
-
-  Device::ProtocolSettingsWidget* makeSettingsWidget() override;
-
-  QVariant
-  makeProtocolSpecificSettings(const VisitorVariant& visitor) const override;
-
-  void serializeProtocolSpecificSettings(
-      const QVariant& data,
-      const VisitorVariant& visitor) const override;
-
-  bool checkCompatibility(
-      const Device::DeviceSettings& a,
-      const Device::DeviceSettings& b) const noexcept override;
-};
-}
diff --git a/Orbbec/ProtocolSettingsWidget.cpp b/Orbbec/ProtocolSettingsWidget.cpp
deleted file mode 100644
index 3d424e9..0000000
--- a/Orbbec/ProtocolSettingsWidget.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "ProtocolSettingsWidget.hpp"
-
-#include "ProtocolFactory.hpp"
-#include "SpecificSettings.hpp"
-
-#include <Library/LibrarySettings.hpp>
-#include <State/Widgets/AddressFragmentLineEdit.hpp>
-
-#include <score/application/ApplicationContext.hpp>
-#include <score/model/tree/TreeNodeItemModel.hpp>
-#include <score/tools/FindStringInFile.hpp>
-
-#include <ossia/detail/config.hpp>
-
-#include <ossia/detail/flat_map.hpp>
-
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QDirIterator>
-#include <QFormLayout>
-#include <QHeaderView>
-#include <QLabel>
-#include <QPushButton>
-#include <QTableWidget>
-#include <QTimer>
-#include <QTreeWidget>
-#include <QVariant>
-
-#include <wobjectimpl.h>
-
-W_OBJECT_IMPL(Orbbec::ProtocolSettingsWidget)
-
-namespace Orbbec
-{
-ProtocolSettingsWidget::ProtocolSettingsWidget(QWidget* parent)
-    : Device::ProtocolSettingsWidget(parent)
-{
-  m_deviceNameEdit = new State::AddressFragmentLineEdit{this};
-  m_deviceNameEdit->setText("Orbbec");
-
-  m_control = new QSpinBox{this};
-  m_control->setRange(1, 65535);
-
-  auto layout = new QFormLayout;
-  layout->addRow(tr("Name"), m_deviceNameEdit);
-  layout->addRow(tr("Control"), m_control);
-
-  setLayout(layout);
-}
-
-ProtocolSettingsWidget::~ProtocolSettingsWidget() { }
-
-Device::DeviceSettings ProtocolSettingsWidget::getSettings() const
-{
-  // TODO should be = m_settings to follow the other patterns.
-  Device::DeviceSettings s;
-  s.name = m_deviceNameEdit->text();
-  s.protocol = ProtocolFactory::static_concreteKey();
-
-  SpecificSettings settings{};
-  settings.control = this->m_control->value();
-  s.deviceSpecificSettings = QVariant::fromValue(settings);
-
-  return s;
-}
-
-void ProtocolSettingsWidget::setSettings(
-    const Device::DeviceSettings& settings)
-{
-  m_deviceNameEdit->setText(settings.name);
-  const auto& specif
-      = settings.deviceSpecificSettings.value<SpecificSettings>();
-  m_control->setValue(specif.control);
-}
-}
\ No newline at end of file
diff --git a/Orbbec/ProtocolSettingsWidget.hpp b/Orbbec/ProtocolSettingsWidget.hpp
deleted file mode 100644
index 7cf50b6..0000000
--- a/Orbbec/ProtocolSettingsWidget.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-#include <Device/Protocol/DeviceSettings.hpp>
-#include <Device/Protocol/ProtocolSettingsWidget.hpp>
-
-#include <Orbbec/SpecificSettings.hpp>
-
-#include <variant>
-#include <verdigris>
-
-class QLineEdit;
-class QSpinBox;
-class QTableWidget;
-class QPushButton;
-
-namespace Orbbec
-{
-class ProtocolSettingsWidget final : public Device::ProtocolSettingsWidget
-{
-  W_OBJECT(ProtocolSettingsWidget)
-
-public:
-  ProtocolSettingsWidget(QWidget* parent = nullptr);
-  virtual ~ProtocolSettingsWidget();
-  Device::DeviceSettings getSettings() const override;
-  void setSettings(const Device::DeviceSettings& settings) override;
-
-private:
-  QLineEdit* m_deviceNameEdit{};
-  QSpinBox* m_control{};
-};
-}
diff --git a/Orbbec/SpecificSettings.hpp b/Orbbec/SpecificSettings.hpp
deleted file mode 100644
index dda502d..0000000
--- a/Orbbec/SpecificSettings.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-#include <score/tools/std/StringHash.hpp>
-
-#include <verdigris>
-
-namespace Orbbec
-{
-struct SpecificSettings
-{
-  int control{1234};
-};
-}
-
-Q_DECLARE_METATYPE(Orbbec::SpecificSettings)
-W_REGISTER_ARGTYPE(Orbbec::SpecificSettings)
\ No newline at end of file
diff --git a/Orbbec/SpecificSettingsSerialization.cpp b/Orbbec/SpecificSettingsSerialization.cpp
deleted file mode 100644
index 35f3b9f..0000000
--- a/Orbbec/SpecificSettingsSerialization.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "SpecificSettings.hpp"
-
-#include <score/serialization/DataStreamVisitor.hpp>
-#include <score/serialization/JSONVisitor.hpp>
-
-template <>
-void DataStreamReader::read(const Orbbec::SpecificSettings& n)
-{
-  m_stream << n.control;
-  insertDelimiter();
-}
-
-template <>
-void DataStreamWriter::write(Orbbec::SpecificSettings& n)
-{
-  m_stream >> n.control;
-  checkDelimiter();
-}
-
-template <>
-void JSONReader::read(const Orbbec::SpecificSettings& n)
-{
-  obj["Control"] = n.control;
-}
-
-template <>
-void JSONWriter::write(Orbbec::SpecificSettings& n)
-{
-  n.control <<= obj["Control"];
-}
\ No newline at end of file
diff --git a/score_addon_orbbec.cpp b/score_addon_orbbec.cpp
index cc55afa..653a02b 100644
--- a/score_addon_orbbec.cpp
+++ b/score_addon_orbbec.cpp
@@ -2,20 +2,26 @@
 
 #include <score/plugins/FactorySetup.hpp>
 
-#include <Orbbec/ProtocolFactory.hpp>
+#include <Orbbec/ApplicationPlugin.hpp>
+#include <Orbbec/OrbbecInputDevice.hpp>
 
 score_addon_orbbec::score_addon_orbbec() { }
 
 score_addon_orbbec::~score_addon_orbbec() { }
 
+score::GUIApplicationPlugin *score_addon_orbbec::make_guiApplicationPlugin(
+    const score::GUIApplicationContext &app)
+{
+    return new Gfx::Orbbec::ApplicationPlugin{app};
+}
+
 std::vector<score::InterfaceBase*>
 score_addon_orbbec::factories(
     const score::ApplicationContext& ctx,
     const score::InterfaceKey& key) const
 {
-  return instantiate_factories<
-      score::ApplicationContext,
-      FW<Device::ProtocolFactory, Orbbec::ProtocolFactory>>(ctx, key);
+    return instantiate_factories<score::ApplicationContext,
+                                 FW<Device::ProtocolFactory, Gfx::Orbbec::InputFactory>>(ctx, key);
 }
 
 #include <score/plugins/PluginInstances.hpp>
diff --git a/score_addon_orbbec.hpp b/score_addon_orbbec.hpp
index 664faa3..da4f049 100644
--- a/score_addon_orbbec.hpp
+++ b/score_addon_orbbec.hpp
@@ -25,4 +25,6 @@ class score_addon_orbbec final
   std::vector<score::InterfaceBase*> factories(
       const score::ApplicationContext& ctx,
       const score::InterfaceKey& key) const override;
+
+  score::GUIApplicationPlugin *make_guiApplicationPlugin(const score::GUIApplicationContext &app);
 };