diff --git a/qController.Standard/Pages/WorkspacePage.xaml.cs b/qController.Standard/Pages/WorkspacePage.xaml.cs
index 6fce328..a47b4cd 100644
--- a/qController.Standard/Pages/WorkspacePage.xaml.cs
+++ b/qController.Standard/Pages/WorkspacePage.xaml.cs
@@ -1,12 +1,15 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using QControlKit;
-using qController.ViewModels;
 using Serilog;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 using Acr.UserDialogs;
-using System.Windows.Input;
+
+using qController.ViewModels;
+
+using QControlKit;
+using QControlKit.Events;
+using QControlKit.Constants;
 
 namespace qController
 {
diff --git a/qController.Standard/ViewModels/QBrowserViewModel.cs b/qController.Standard/ViewModels/QBrowserViewModel.cs
index 5962a7e..83de634 100644
--- a/qController.Standard/ViewModels/QBrowserViewModel.cs
+++ b/qController.Standard/ViewModels/QBrowserViewModel.cs
@@ -1,9 +1,11 @@
-using QControlKit;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using Xamarin.Forms;
 
+using QControlKit;
+using QControlKit.Events;
+
 namespace qController.ViewModels
 {
     public class QBrowserViewModel : INotifyPropertyChanged
diff --git a/qController.Standard/ViewModels/QCueViewModel.cs b/qController.Standard/ViewModels/QCueViewModel.cs
index 26164ad..195ffcc 100644
--- a/qController.Standard/ViewModels/QCueViewModel.cs
+++ b/qController.Standard/ViewModels/QCueViewModel.cs
@@ -1,9 +1,12 @@
-using QControlKit;
-using Serilog;
+using Serilog;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using Xamarin.Forms;
 
+using QControlKit;
+using QControlKit.Constants;
+using QControlKit.Events;
+
 namespace qController.ViewModels
 {
     public class QCueViewModel : INotifyPropertyChanged
diff --git a/qController.Standard/ViewModels/QServerViewModel.cs b/qController.Standard/ViewModels/QServerViewModel.cs
index a46caec..b002666 100644
--- a/qController.Standard/ViewModels/QServerViewModel.cs
+++ b/qController.Standard/ViewModels/QServerViewModel.cs
@@ -1,9 +1,11 @@
-using QControlKit;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using Xamarin.Forms;
 
+using QControlKit;
+using QControlKit.Events;
+
 namespace qController.ViewModels
 {
     public class QServerViewModel : ObservableCollection<QWorkspaceViewModel>, INotifyPropertyChanged
diff --git a/qController.Standard/ViewModels/QWorkspaceViewModel.cs b/qController.Standard/ViewModels/QWorkspaceViewModel.cs
index aac4d88..edd8f7a 100644
--- a/qController.Standard/ViewModels/QWorkspaceViewModel.cs
+++ b/qController.Standard/ViewModels/QWorkspaceViewModel.cs
@@ -1,8 +1,5 @@
-using qController.QItems;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using QControlKit;
+using QControlKit;
+
 namespace qController.ViewModels
 {
     public class QWorkspaceViewModel