diff --git a/OpenRGB b/OpenRGB
index b5f46e3..85625a3 160000
--- a/OpenRGB
+++ b/OpenRGB
@@ -1 +1 @@
-Subproject commit b5f46e3f1de03595656c682fc2f068b66e735e63
+Subproject commit 85625a37b25ed0eea519df6a6b0822f54605db21
diff --git a/OpenRGBE131ReceiverDialog.cpp b/OpenRGBE131ReceiverDialog.cpp
index d3e2d98..8ea81ff 100644
--- a/OpenRGBE131ReceiverDialog.cpp
+++ b/OpenRGBE131ReceiverDialog.cpp
@@ -6,8 +6,10 @@
 #include <QMessageBox>
 #include <QSignalMapper>
 #include "filesystem.h"
+#include "RGBController.h"
 #include <e131.h>
 #include <fstream>
+#include "json.hpp"
 
 #ifndef _WIN32
 #include <unistd.h>
@@ -16,6 +18,8 @@
 
 #define MAX_LEDS_PER_UNIVERSE  170
 
+using json = nlohmann::json;
+
 void DeviceListChanged_Callback(void * this_ptr)
 {
     OpenRGBE131ReceiverDialog * this_obj = (OpenRGBE131ReceiverDialog *)this_ptr;
@@ -72,7 +76,7 @@ public:
     CheckBoxParameter   parameter;
 };
 
-OpenRGBE131ReceiverDialog::OpenRGBE131ReceiverDialog(ResourceManager* manager, QWidget *parent) : QWidget(parent),  ui(new Ui::OpenRGBE131ReceiverDialog)
+OpenRGBE131ReceiverDialog::OpenRGBE131ReceiverDialog(ResourceManagerInterface* manager, QWidget *parent) : QWidget(parent),  ui(new Ui::OpenRGBE131ReceiverDialog)
 {
     ui->setupUi(this);
 
diff --git a/OpenRGBE131ReceiverDialog.h b/OpenRGBE131ReceiverDialog.h
index bc712e1..5b780fb 100644
--- a/OpenRGBE131ReceiverDialog.h
+++ b/OpenRGBE131ReceiverDialog.h
@@ -1,7 +1,7 @@
 #ifndef OPENRGBE131RECEIVERDIALOG_H
 #define OPENRGBE131RECEIVERDIALOG_H
 
-#include "ResourceManager.h"
+#include "ResourceManagerInterface.h"
 
 #include <QWidget>
 
@@ -14,7 +14,7 @@ class OpenRGBE131ReceiverDialog : public QWidget
     Q_OBJECT
 
 public:
-    explicit OpenRGBE131ReceiverDialog(ResourceManager* manager, QWidget *parent = nullptr);
+    explicit OpenRGBE131ReceiverDialog(ResourceManagerInterface* manager, QWidget *parent = nullptr);
     ~OpenRGBE131ReceiverDialog();
 
     void AutoMap();
@@ -39,7 +39,7 @@ private slots:
     void CheckBox_updated_slot(QObject* checkbox_argument);
 
 private:
-    ResourceManager*                resource_manager;
+    ResourceManagerInterface       *resource_manager;
     Ui::OpenRGBE131ReceiverDialog  *ui;
 
     bool                            online;
diff --git a/OpenRGBE131ReceiverPlugin.cpp b/OpenRGBE131ReceiverPlugin.cpp
index 03605bd..6f486a9 100644
--- a/OpenRGBE131ReceiverPlugin.cpp
+++ b/OpenRGBE131ReceiverPlugin.cpp
@@ -33,7 +33,7 @@ unsigned int OpenRGBPlugin::GetPluginAPIVersion()
     return(OPENRGB_PLUGIN_API_VERSION);
 }
 
-void OpenRGBPlugin::Load(bool dark_theme, ResourceManager* resource_manager_ptr)
+void OpenRGBPlugin::Load(ResourceManagerInterface* resource_manager_ptr)
 {
     /*-----------------------------------------------------*\
     | Save the arguments to Initialize based on what you    |
diff --git a/OpenRGBE131ReceiverPlugin.h b/OpenRGBE131ReceiverPlugin.h
index c3df1e8..3c2cc79 100644
--- a/OpenRGBE131ReceiverPlugin.h
+++ b/OpenRGBE131ReceiverPlugin.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "OpenRGBPluginInterface.h"
+#include "ResourceManagerInterface.h"
 
 #include <QObject>
 #include <QString>
@@ -35,10 +36,10 @@ public:
     /*-------------------------------------------------------------------------------------------------*\
     | Plugin Functionality                                                                              |
     \*-------------------------------------------------------------------------------------------------*/
-    virtual void                Load(bool dark_theme, ResourceManager* resource_manager_ptr)        override;
+    virtual void                Load(ResourceManagerInterface* resource_manager_ptr)        override;
     virtual QWidget*            GetWidget()                                                         override;
     virtual QMenu*              GetTrayMenu()                                                       override;
     virtual void                Unload()                                                            override;
 private:
-    ResourceManager*        resource_manager;
+    ResourceManagerInterface*        resource_manager;
 };
diff --git a/OpenRGBE131ReceiverPlugin.pro b/OpenRGBE131ReceiverPlugin.pro
index 8c4364f..c2d7b28 100644
--- a/OpenRGBE131ReceiverPlugin.pro
+++ b/OpenRGBE131ReceiverPlugin.pro
@@ -74,7 +74,37 @@ GIT_COMMIT_ID   = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PR
 #-----------------------------------------------------------------------------------------------#
 DEFINES +=                                                                                      \
     VERSION_STRING=\\"\"\"$$VERSION_STR\\"\"\"                                                  \
-    GIT_COMMIT_ID=\\"\"\"$$GIT_COMMIT_ID\\"\"\"
+    BUILDDATE_STRING=\\"\"\"$$BUILDDATE\\"\"\"                                                  \
+    GIT_COMMIT_ID=\\"\"\"$$GIT_COMMIT_ID\\"\"\"                                                 \
+    GIT_COMMIT_DATE=\\"\"\"$$GIT_COMMIT_DATE\\"\"\"                                             \
+    GIT_BRANCH=\\"\"\"$$GIT_BRANCH\\"\"\"                                                       \
+    LATEST_BUILD_URL=\\"\"\"$$LATEST_BUILD_URL\\"\"\"                                           \
+
+
+#-----------------------------------------------------------------------------------------------#
+# OpenRGB Plugin SDK                                                                            #
+#-----------------------------------------------------------------------------------------------#
+INCLUDEPATH +=                                                                                  \
+    OpenRGB                                                                                     \
+    OpenRGB/RGBController                                                                       \
+    OpenRGB/dependencies/json                                                                   \
+    OpenRGB/qt                                                                                  \
+    OpenRGB/i2c_smbus                                                                           \
+    OpenRGB/net_port                                                                            \
+
+HEADERS +=                                                                                      \
+    OpenRGB/Colors.h                                                                            \
+    OpenRGB/OpenRGBPluginInterface.h                                                            \
+    OpenRGB/ResourceManagerInterface.h                                                          \
+
+SOURCES +=                                                                                      \
+    OpenRGB/RGBController/RGBController.cpp                                                     \
+    OpenRGB/RGBController/RGBController_Network.cpp                                             \
+    OpenRGB/NetworkServer.cpp                                                                   \
+    OpenRGB/NetworkClient.cpp                                                                   \
+    OpenRGB/NetworkProtocol.cpp                                                                 \
+    OpenRGB/LogManager.cpp                                                                      \
+    OpenRGB/net_port/net_port.cpp                                                               \
 
 #-----------------------------------------------------------------------------------------------#
 # Plugin Project Files                                                                          #
@@ -95,31 +125,8 @@ HEADERS +=
 FORMS +=                                                                                        \
     OpenRGBE131ReceiverDialog.ui
 
-#-----------------------------------------------------------------------------------------------#
-# OpenRGB Plugin SDK                                                                            #
-#-----------------------------------------------------------------------------------------------#
-INCLUDEPATH +=                                                                                  \
-    OpenRGB/                                                                                    \
-    OpenRGB/dependencies/json                                                                   \
-    OpenRGB/i2c_smbus                                                                           \
-    OpenRGB/net_port                                                                            \
-    OpenRGB/RGBController                                                                       \
-    OpenRGB/dependencies/hidapi                                                                 \
-    OpenRGB/hidapi_wrapper                                                                      \
-
-HEADERS +=                                                                                      \
-    OpenRGB/NetworkClient.h                                                                     \
-    OpenRGB/NetworkProtocol.h                                                                   \
-    OpenRGB/NetworkServer.h                                                                     \
-    OpenRGB/OpenRGBPluginInterface.h                                                            \
-    OpenRGB/ProfileManager.h                                                                    \
-    OpenRGB/ResourceManager.h                                                                   \
-    OpenRGB/SettingsManager.h                                                                   \
-    OpenRGB/dependencies/json/json.hpp                                                          \
-    OpenRGB/i2c_smbus/i2c_smbus.h                                                               \
-    OpenRGB/net_port/net_port.h                                                                 \
-    OpenRGB/RGBController/RGBController.h                                                       \
-
+RESOURCES +=                                                                                    \
+    resources.qrc
 #-----------------------------------------------------------------------------------------------#
 # Windows-specific Configuration                                                                #
 #-----------------------------------------------------------------------------------------------#
@@ -163,5 +170,3 @@ macx: {
     CONFIG += c++17
 }
 
-RESOURCES +=                                                                                    \
-    resources.qrc