diff --git a/README.md b/README.md
index 0b8789f37..3888dc4d7 100644
--- a/README.md
+++ b/README.md
@@ -18,20 +18,15 @@ A full list of supported devices can be found on the wiki [here](https://wiki.ar
 
 #### Want to build? Follow these instructions
 1. Create a central folder like ```C:\Repos```
-2. Clone RGB.NET's [development branch](https://github.com/DarthAffe/RGB.NET/tree/Development) into ```<central folder>\RGB.NET```
-3. Clone Artemis into  ```<central folder>\Artemis```
-4. Clone Artemis.Plugins [master branch](https://github.com/Artemis-RGB/Artemis.Plugins/tree/master) into ```<central folder>\Artemis.Plugins```
-5. Open ```<central folder>\RGB.NET\RGB.NET.sln``` and build with the default config
-6. Open ```<central folder>\Artemis\src\Artemis.sln``` and build as Debug
-7. Open ```<central folder>\Artemis.Plugins\src\Artemis.Plugins.sln``` and build as Debug
-8. Restore Nuget packages
+2. Clone Artemis into  ```<central folder>\Artemis```
+3. Clone Artemis.Plugins [master branch](https://github.com/Artemis-RGB/Artemis.Plugins/tree/master) into ```<central folder>\Artemis.Plugins```
+4. Open ```<central folder>\Artemis\src\Artemis.sln``` and build as Debug
+5. Open ```<central folder>\Artemis.Plugins\src\Artemis.Plugins.sln``` and build as Debug
 
 ##### Alternatively in PowerShell
 ```
-git clone https://github.com/DarthAffe/RGB.NET -b Development RGB.NET
 git clone https://github.com/Artemis-RGB/Artemis Artemis
 git clone https://github.com/Artemis-RGB/Artemis.Plugins Artemis.Plugins
-dotnet build .\RGB.NET\RGB.NET.sln
 dotnet build .\Artemis\src\Artemis.sln
 dotnet build .\Artemis.Plugins\src\Artemis.Plugins.sln
 ``` 
diff --git a/azure-pipelines-pr.yml b/azure-pipelines-pr.yml
index 3e01801ac..b0139714f 100644
--- a/azure-pipelines-pr.yml
+++ b/azure-pipelines-pr.yml
@@ -10,11 +10,6 @@ pr:
 
 resources:
   repositories:
-  - repository: RGBNET
-    type: github
-    endpoint: github.com_SpoinkyNL
-    name: DarthAffe/RGB.NET
-    ref: Development
   - repository: Plugins
     type: github
     endpoint: github.com_SpoinkyNL
@@ -26,7 +21,6 @@ pool:
 
 variables:
   artemisSolution: '**/Artemis.sln'
-  rgbSolution: '**/RGB.NET.sln'
   pluginProjects: '**/Artemis.Plugins.*.csproj'
   BuildId: $(Build.BuildId)
   BuildNumber: $(Build.BuildNumber)
@@ -34,20 +28,11 @@ variables:
   SourceVersion: $(Build.SourceVersion)
   
 steps:
-- checkout: RGBNET
-  path: s/RGB.NET
 - checkout: self
   path: s/Artemis
 - checkout: Plugins
   path: s/Artemis.Plugins
 
-- task: DotNetCoreCLI@2
-  displayName: 'RGB.NET - Build'
-  inputs:
-    command: 'build'
-    projects: '$(rgbSolution)'
-    arguments: '--configuration Release'
-
 - task: DotNetCoreCLI@2
   displayName: 'Artemis - Publish'
   inputs:
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index 8e16ec412..4ebae1d56 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -9,23 +9,17 @@ pr: none
 
 resources:
   repositories:
-  - repository: RGBNET
-    type: github
-    endpoint: github.com_SpoinkyNL
-    name: DarthAffe/RGB.NET
-    ref: Development
   - repository: Plugins
     type: github
     endpoint: github.com_SpoinkyNL
     name: Artemis-RGB/Artemis.Plugins
-    ref: master    
+    ref: master
 
 pool:
   vmImage: 'windows-latest'
 
 variables:
   artemisSolution: '**/Artemis.sln'
-  rgbSolution: '**/RGB.NET.sln'
   pluginProjects: '**/Artemis.Plugins.*.csproj'
   BuildId: $(Build.BuildId)
   BuildNumber: $(Build.BuildNumber)
@@ -33,20 +27,11 @@ variables:
   SourceVersion: $(Build.SourceVersion)
   
 steps:
-- checkout: RGBNET
-  path: s/RGB.NET
 - checkout: self
   path: s/Artemis
 - checkout: Plugins
   path: s/Artemis.Plugins
 
-- task: DotNetCoreCLI@2
-  displayName: 'RGB.NET - Build'
-  inputs:
-    command: 'build'
-    projects: '$(rgbSolution)'
-    arguments: '--configuration Release'
-
 - task: DotNetCoreCLI@2
   displayName: 'Artemis - Publish'
   inputs:
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index abf861767..27a3fcd6a 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -147,6 +147,7 @@
         <PackageReference Include="Ookii.Dialogs.Wpf" Version="3.1.0" />
         <PackageReference Include="RawInput.Sharp" Version="0.0.4" />
         <PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease1" />
+        <PackageReference Include="RGB.NET.Layout" Version="1.0.0-prerelease1" />
         <PackageReference Include="Serilog" Version="2.10.0" />
         <PackageReference Include="SkiaSharp.Views.WPF" Version="2.80.3" />
         <PackageReference Include="SkiaSharp.Vulkan.SharpVk" Version="2.80.3" />