From 137db6af40a293b077e3faf973ff8bc1d659252e Mon Sep 17 00:00:00 2001
From: Jared Goodwin <jared.goodwin@immy.bot>
Date: Mon, 21 Aug 2023 12:05:29 -0700
Subject: [PATCH] Remove branding properties that no longer exist.

---
 Agent.Installer.Win/MainWindow.xaml           |   19 +-
 Agent.Installer.Win/Models/BrandingInfo.cs    |   18 -
 .../ViewModels/MainWindowViewModel.cs         |   22 -
 ...821190450_Remove_TitleBranding.Designer.cs | 1201 ++++++++++++++++
 .../20230821190450_Remove_TitleBranding.cs    |  117 ++
 .../PostgreSqlDbContextModelSnapshot.cs       |   29 +-
 ...821190440_Remove_TitleBranding.Designer.cs | 1204 +++++++++++++++++
 .../20230821190440_Remove_TitleBranding.cs    |  117 ++
 .../SqlServerDbContextModelSnapshot.cs        |   29 +-
 ...821190428_Remove_TitleBranding.Designer.cs | 1197 ++++++++++++++++
 .../20230821190428_Remove_TitleBranding.cs    |  117 ++
 .../Sqlite/SqliteDbContextModelSnapshot.cs    |   29 +-
 Server/Pages/Branding.razor                   |   65 +-
 Server/Services/DataService.cs                |   24 +-
 submodules/Immense.RemoteControl              |    2 +-
 15 files changed, 3976 insertions(+), 214 deletions(-)
 create mode 100644 Server/Migrations/PostgreSql/20230821190450_Remove_TitleBranding.Designer.cs
 create mode 100644 Server/Migrations/PostgreSql/20230821190450_Remove_TitleBranding.cs
 create mode 100644 Server/Migrations/SqlServer/20230821190440_Remove_TitleBranding.Designer.cs
 create mode 100644 Server/Migrations/SqlServer/20230821190440_Remove_TitleBranding.cs
 create mode 100644 Server/Migrations/Sqlite/20230821190428_Remove_TitleBranding.Designer.cs
 create mode 100644 Server/Migrations/Sqlite/20230821190428_Remove_TitleBranding.cs

diff --git a/Agent.Installer.Win/MainWindow.xaml b/Agent.Installer.Win/MainWindow.xaml
index 3f1b4520..fcd6eb9d 100644
--- a/Agent.Installer.Win/MainWindow.xaml
+++ b/Agent.Installer.Win/MainWindow.xaml
@@ -6,7 +6,6 @@
         xmlns:ViewModels="clr-namespace:Remotely.Agent.Installer.Win.ViewModels"
         xmlns:local="clr-namespace:Remotely.Agent.Installer.Win"
         mc:Ignorable="d"
-        WindowStyle="None"
         ResizeMode="CanResizeWithGrip"
         AllowsTransparency="True"
         MouseLeftButtonDown="Window_MouseLeftButtonDown"
@@ -21,25 +20,11 @@
     </Window.DataContext>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
             <RowDefinition />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <Border Height="50" Background="{Binding TitleBackgroundColor}">
-            <DockPanel Margin="10,0,0,0">
-                <DockPanel>
-                    <Image Height="50" Width="50"  Margin="0,0,10,0" Source="{Binding Icon}"></Image>
-                    <TextBlock Foreground="{Binding TitleForegroundColor}" FontWeight="Bold" FontSize="20" VerticalAlignment="Center">
-                        <Run Text="{Binding ProductName}"></Run>
-                        <Run Text="Installer"></Run>
-                    </TextBlock>
-                </DockPanel>
-                <Button Style="{StaticResource TitlebarButton}" Click="CloseButton_Click" Content="X" Foreground="{Binding TitleButtonForegroundColor}" Background="{Binding TitleBackgroundColor}" />
-                <Button Style="{StaticResource TitlebarButton}" Click="MinimizeButton_Click" Content="____" Foreground="{Binding TitleButtonForegroundColor}" Background="{Binding TitleBackgroundColor}"/>
-            </DockPanel>
-        </Border>
-        <Grid Grid.Row="1" Margin="10,15,10,0">
+        <Grid Grid.Row="0" Margin="10,15,10,0">
 
             <StackPanel>
                 <TextBlock Style="{StaticResource SectionHeader}" Text="{Binding HeaderMessage}" Margin="0,0,0,10"></TextBlock>
@@ -122,7 +107,7 @@
 
         </Grid>
 
-        <DockPanel Margin="10" Grid.Row="2">
+        <DockPanel Margin="10" Grid.Row="1">
             <Button DockPanel.Dock="Left" 
                     HorizontalAlignment="Left" 
                     Style="{StaticResource NormalButton}" 
diff --git a/Agent.Installer.Win/Models/BrandingInfo.cs b/Agent.Installer.Win/Models/BrandingInfo.cs
index c10237f6..3d9d077f 100644
--- a/Agent.Installer.Win/Models/BrandingInfo.cs
+++ b/Agent.Installer.Win/Models/BrandingInfo.cs
@@ -7,22 +7,4 @@ public class BrandingInfo
     public string Product { get; set; } = "Remotely";
 
     public string? Icon { get; set; }
-
-    public byte TitleForegroundRed { get; set; } = 29;
-
-    public byte TitleForegroundGreen { get; set; } = 144;
-
-    public byte TitleForegroundBlue { get; set; } = 241;
-
-    public byte TitleBackgroundRed { get; set; } = 70;
-
-    public byte TitleBackgroundGreen { get; set; } = 70;
-
-    public byte TitleBackgroundBlue { get; set; } = 70;
-
-    public byte ButtonForegroundRed { get; set; } = 255;
-
-    public byte ButtonForegroundGreen { get; set; } = 255;
-
-    public byte ButtonForegroundBlue { get; set; } = 255;
 }
diff --git a/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs b/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs
index c4977af8..2f887031 100644
--- a/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs
+++ b/Agent.Installer.Win/ViewModels/MainWindowViewModel.cs
@@ -190,9 +190,6 @@ public class MainWindowViewModel : ViewModelBase
         }
     }
 
-    public SolidColorBrush? TitleBackgroundColor { get; set; }
-    public SolidColorBrush? TitleButtonForegroundColor { get; set; }
-    public SolidColorBrush? TitleForegroundColor { get; set; }
     public ICommand UninstallCommand => new RelayCommand(async (param) => { await Uninstall(); });
     private string? DeviceAlias { get; set; }
     private string? DeviceGroup { get; set; }
@@ -280,25 +277,6 @@ public class MainWindowViewModel : ViewModelBase
                 ProductName = brandingInfo.Product;
             }
 
-            TitleBackgroundColor = new SolidColorBrush(Color.FromRgb(
-                brandingInfo?.TitleBackgroundRed ?? 70,
-                brandingInfo?.TitleBackgroundGreen ?? 70,
-                brandingInfo?.TitleBackgroundBlue ?? 70));
-
-            TitleForegroundColor = new SolidColorBrush(Color.FromRgb(
-               brandingInfo?.TitleForegroundRed ?? 29,
-               brandingInfo?.TitleForegroundGreen ?? 144,
-               brandingInfo?.TitleForegroundBlue ?? 241));
-
-            TitleButtonForegroundColor = new SolidColorBrush(Color.FromRgb(
-               brandingInfo?.ButtonForegroundRed ?? 255,
-               brandingInfo?.ButtonForegroundGreen ?? 255,
-               brandingInfo?.ButtonForegroundBlue ?? 255));
-
-            TitleBackgroundColor.Freeze();
-            TitleForegroundColor.Freeze();
-            TitleButtonForegroundColor.Freeze();
-
             Icon = GetBitmapImageIcon(brandingInfo);
         }
         catch (Exception ex)
diff --git a/Server/Migrations/PostgreSql/20230821190450_Remove_TitleBranding.Designer.cs b/Server/Migrations/PostgreSql/20230821190450_Remove_TitleBranding.Designer.cs
new file mode 100644
index 00000000..8f913091
--- /dev/null
+++ b/Server/Migrations/PostgreSql/20230821190450_Remove_TitleBranding.Designer.cs
@@ -0,0 +1,1201 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Remotely.Server.Data;
+
+#nullable disable
+
+namespace Remotely.Server.Migrations.PostgreSql
+{
+    [DbContext(typeof(PostgreSqlDbContext))]
+    [Migration("20230821190450_Remove_TitleBranding")]
+    partial class Remove_TitleBranding
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("DeviceGroupRemotelyUser", b =>
+                {
+                    b.Property<string>("DeviceGroupsID")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UsersId")
+                        .HasColumnType("text");
+
+                    b.HasKey("DeviceGroupsID", "UsersId");
+
+                    b.HasIndex("UsersId");
+
+                    b.ToTable("DeviceGroupRemotelyUser");
+                });
+
+            modelBuilder.Entity("DeviceGroupScriptSchedule", b =>
+                {
+                    b.Property<string>("DeviceGroupsID")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ScriptSchedulesId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("DeviceGroupsID", "ScriptSchedulesId");
+
+                    b.HasIndex("ScriptSchedulesId");
+
+                    b.ToTable("DeviceGroupScriptSchedule");
+                });
+
+            modelBuilder.Entity("DeviceScriptRun", b =>
+                {
+                    b.Property<string>("DevicesID")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ScriptRunsId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("DevicesID", "ScriptRunsId");
+
+                    b.HasIndex("ScriptRunsId");
+
+                    b.ToTable("DeviceScriptRun");
+                });
+
+            modelBuilder.Entity("DeviceScriptSchedule", b =>
+                {
+                    b.Property<string>("DevicesID")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ScriptSchedulesId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("DevicesID", "ScriptSchedulesId");
+
+                    b.HasIndex("ScriptSchedulesId");
+
+                    b.ToTable("DeviceScriptSchedule");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("RemotelyUsers", (string)null);
+
+                    b.HasDiscriminator<string>("Discriminator").HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Alert", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Details")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("UserID");
+
+                    b.ToTable("Alerts");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ApiToken", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset?>("LastUsed")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Secret")
+                        .HasColumnType("text");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("ApiTokens");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.BrandingInfo", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<byte[]>("Icon")
+                        .IsRequired()
+                        .HasColumnType("bytea");
+
+                    b.Property<string>("OrganizationId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Product")
+                        .IsRequired()
+                        .HasMaxLength(25)
+                        .HasColumnType("character varying(25)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("BrandingInfos");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Device", b =>
+                {
+                    b.Property<string>("ID")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AgentVersion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Alias")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<double>("CpuUtilization")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("CurrentUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceGroupID")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Drives")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Is64Bit")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("LastOnline")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("MacAddresses")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(5000)
+                        .HasColumnType("character varying(5000)");
+
+                    b.Property<int>("OSArchitecture")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("OSDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Platform")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ProcessorCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PublicIP")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServerVerificationToken")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tags")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<double>("TotalMemory")
+                        .HasColumnType("double precision");
+
+                    b.Property<double>("TotalStorage")
+                        .HasColumnType("double precision");
+
+                    b.Property<double>("UsedMemory")
+                        .HasColumnType("double precision");
+
+                    b.Property<double>("UsedStorage")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceGroupID");
+
+                    b.HasIndex("DeviceName");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.DeviceGroup", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("DeviceGroups");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.InviteLink", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("DateSent")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("InvitedUser")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsAdmin")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ResetUrl")
+                        .HasColumnType("text");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("InviteLinks");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Organization", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BrandingInfoId")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDefaultOrganization")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("OrganizationName")
+                        .IsRequired()
+                        .HasMaxLength(25)
+                        .HasColumnType("character varying(25)");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SavedScript", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("FolderPath")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<bool>("GenerateAlertOnError")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsQuickScript")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("SendEmailOnError")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("SendErrorEmailTo")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Shell")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatorId");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("SavedScripts");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptResult", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ErrorOutput")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("HadErrors")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("InputType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<TimeSpan>("RunTime")
+                        .HasColumnType("interval");
+
+                    b.Property<Guid?>("SavedScriptId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("ScheduleId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ScriptInput")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ScriptRunId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SenderConnectionID")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SenderUserName")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Shell")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("StandardOutput")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("TimeStamp")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("SavedScriptId");
+
+                    b.HasIndex("ScheduleId");
+
+                    b.HasIndex("ScriptRunId");
+
+                    b.ToTable("ScriptResults");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptRun", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Initiator")
+                        .HasColumnType("text");
+
+                    b.Property<int>("InputType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("RunAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("RunOnNextConnect")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("SavedScriptId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("ScheduleId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("SavedScriptId");
+
+                    b.HasIndex("ScheduleId");
+
+                    b.ToTable("ScriptRuns");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptSchedule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Interval")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTimeOffset?>("LastRun")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("NextRun")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("RunOnNextConnect")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("SavedScriptId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("StartAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatorId");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("ScriptSchedules");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SharedFile", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContentType")
+                        .HasColumnType("text");
+
+                    b.Property<byte[]>("FileContents")
+                        .IsRequired()
+                        .HasColumnType("bytea");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationID")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("Timestamp")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("SharedFiles");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.RemotelyUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsAdministrator")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsServerAdmin")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TempPassword")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserOptions")
+                        .HasColumnType("text");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("UserName");
+
+                    b.HasDiscriminator().HasValue("RemotelyUser");
+                });
+
+            modelBuilder.Entity("DeviceGroupRemotelyUser", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.DeviceGroup", null)
+                        .WithMany()
+                        .HasForeignKey("DeviceGroupsID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", null)
+                        .WithMany()
+                        .HasForeignKey("UsersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DeviceGroupScriptSchedule", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.DeviceGroup", null)
+                        .WithMany()
+                        .HasForeignKey("DeviceGroupsID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", null)
+                        .WithMany()
+                        .HasForeignKey("ScriptSchedulesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DeviceScriptRun", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", null)
+                        .WithMany()
+                        .HasForeignKey("DevicesID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptRun", null)
+                        .WithMany()
+                        .HasForeignKey("ScriptRunsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DeviceScriptSchedule", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", null)
+                        .WithMany()
+                        .HasForeignKey("DevicesID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", null)
+                        .WithMany()
+                        .HasForeignKey("ScriptSchedulesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Alert", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", "Device")
+                        .WithMany("Alerts")
+                        .HasForeignKey("DeviceID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("Alerts")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", "User")
+                        .WithMany("Alerts")
+                        .HasForeignKey("UserID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.Navigation("Device");
+
+                    b.Navigation("Organization");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ApiToken", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ApiTokens")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.BrandingInfo", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithOne("BrandingInfo")
+                        .HasForeignKey("Remotely.Shared.Entities.BrandingInfo", "OrganizationId");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Device", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.DeviceGroup", "DeviceGroup")
+                        .WithMany("Devices")
+                        .HasForeignKey("DeviceGroupID");
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("Devices")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DeviceGroup");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.DeviceGroup", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("DeviceGroups")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.InviteLink", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("InviteLinks")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SavedScript", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", "Creator")
+                        .WithMany("SavedScripts")
+                        .HasForeignKey("CreatorId")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("SavedScripts")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptResult", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", "Device")
+                        .WithMany("ScriptResults")
+                        .HasForeignKey("DeviceID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ScriptResults")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.SavedScript", "SavedScript")
+                        .WithMany("ScriptResults")
+                        .HasForeignKey("SavedScriptId");
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", "Schedule")
+                        .WithMany()
+                        .HasForeignKey("ScheduleId");
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptRun", "ScriptRun")
+                        .WithMany("Results")
+                        .HasForeignKey("ScriptRunId");
+
+                    b.Navigation("Device");
+
+                    b.Navigation("Organization");
+
+                    b.Navigation("SavedScript");
+
+                    b.Navigation("Schedule");
+
+                    b.Navigation("ScriptRun");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptRun", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ScriptRuns")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.SavedScript", "SavedScript")
+                        .WithMany("ScriptRuns")
+                        .HasForeignKey("SavedScriptId");
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", "Schedule")
+                        .WithMany("ScriptRuns")
+                        .HasForeignKey("ScheduleId");
+
+                    b.Navigation("Organization");
+
+                    b.Navigation("SavedScript");
+
+                    b.Navigation("Schedule");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptSchedule", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", "Creator")
+                        .WithMany("ScriptSchedules")
+                        .HasForeignKey("CreatorId")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ScriptSchedules")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SharedFile", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("SharedFiles")
+                        .HasForeignKey("OrganizationID");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.RemotelyUser", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("RemotelyUsers")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Device", b =>
+                {
+                    b.Navigation("Alerts");
+
+                    b.Navigation("ScriptResults");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.DeviceGroup", b =>
+                {
+                    b.Navigation("Devices");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Organization", b =>
+                {
+                    b.Navigation("Alerts");
+
+                    b.Navigation("ApiTokens");
+
+                    b.Navigation("BrandingInfo");
+
+                    b.Navigation("DeviceGroups");
+
+                    b.Navigation("Devices");
+
+                    b.Navigation("InviteLinks");
+
+                    b.Navigation("RemotelyUsers");
+
+                    b.Navigation("SavedScripts");
+
+                    b.Navigation("ScriptResults");
+
+                    b.Navigation("ScriptRuns");
+
+                    b.Navigation("ScriptSchedules");
+
+                    b.Navigation("SharedFiles");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SavedScript", b =>
+                {
+                    b.Navigation("ScriptResults");
+
+                    b.Navigation("ScriptRuns");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptRun", b =>
+                {
+                    b.Navigation("Results");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptSchedule", b =>
+                {
+                    b.Navigation("ScriptRuns");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.RemotelyUser", b =>
+                {
+                    b.Navigation("Alerts");
+
+                    b.Navigation("SavedScripts");
+
+                    b.Navigation("ScriptSchedules");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Server/Migrations/PostgreSql/20230821190450_Remove_TitleBranding.cs b/Server/Migrations/PostgreSql/20230821190450_Remove_TitleBranding.cs
new file mode 100644
index 00000000..43e8e983
--- /dev/null
+++ b/Server/Migrations/PostgreSql/20230821190450_Remove_TitleBranding.cs
@@ -0,0 +1,117 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Remotely.Server.Migrations.PostgreSql
+{
+    /// <inheritdoc />
+    public partial class Remove_TitleBranding : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ButtonForegroundBlue",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "ButtonForegroundGreen",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "ButtonForegroundRed",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleBackgroundBlue",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleBackgroundGreen",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleBackgroundRed",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleForegroundBlue",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleForegroundGreen",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleForegroundRed",
+                table: "BrandingInfos");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<byte>(
+                name: "ButtonForegroundBlue",
+                table: "BrandingInfos",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "ButtonForegroundGreen",
+                table: "BrandingInfos",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "ButtonForegroundRed",
+                table: "BrandingInfos",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleBackgroundBlue",
+                table: "BrandingInfos",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleBackgroundGreen",
+                table: "BrandingInfos",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleBackgroundRed",
+                table: "BrandingInfos",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleForegroundBlue",
+                table: "BrandingInfos",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleForegroundGreen",
+                table: "BrandingInfos",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleForegroundRed",
+                table: "BrandingInfos",
+                type: "smallint",
+                nullable: false,
+                defaultValue: (byte)0);
+        }
+    }
+}
diff --git a/Server/Migrations/PostgreSql/PostgreSqlDbContextModelSnapshot.cs b/Server/Migrations/PostgreSql/PostgreSqlDbContextModelSnapshot.cs
index 59accfd7..0f18c6f1 100644
--- a/Server/Migrations/PostgreSql/PostgreSqlDbContextModelSnapshot.cs
+++ b/Server/Migrations/PostgreSql/PostgreSqlDbContextModelSnapshot.cs
@@ -17,7 +17,7 @@ namespace Remotely.Server.Migrations.PostgreSql
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("ProductVersion", "7.0.10")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -357,15 +357,6 @@ namespace Remotely.Server.Migrations.PostgreSql
                         .ValueGeneratedOnAdd()
                         .HasColumnType("text");
 
-                    b.Property<byte>("ButtonForegroundBlue")
-                        .HasColumnType("smallint");
-
-                    b.Property<byte>("ButtonForegroundGreen")
-                        .HasColumnType("smallint");
-
-                    b.Property<byte>("ButtonForegroundRed")
-                        .HasColumnType("smallint");
-
                     b.Property<byte[]>("Icon")
                         .IsRequired()
                         .HasColumnType("bytea");
@@ -378,24 +369,6 @@ namespace Remotely.Server.Migrations.PostgreSql
                         .HasMaxLength(25)
                         .HasColumnType("character varying(25)");
 
-                    b.Property<byte>("TitleBackgroundBlue")
-                        .HasColumnType("smallint");
-
-                    b.Property<byte>("TitleBackgroundGreen")
-                        .HasColumnType("smallint");
-
-                    b.Property<byte>("TitleBackgroundRed")
-                        .HasColumnType("smallint");
-
-                    b.Property<byte>("TitleForegroundBlue")
-                        .HasColumnType("smallint");
-
-                    b.Property<byte>("TitleForegroundGreen")
-                        .HasColumnType("smallint");
-
-                    b.Property<byte>("TitleForegroundRed")
-                        .HasColumnType("smallint");
-
                     b.HasKey("Id");
 
                     b.HasIndex("OrganizationId")
diff --git a/Server/Migrations/SqlServer/20230821190440_Remove_TitleBranding.Designer.cs b/Server/Migrations/SqlServer/20230821190440_Remove_TitleBranding.Designer.cs
new file mode 100644
index 00000000..6e3728bb
--- /dev/null
+++ b/Server/Migrations/SqlServer/20230821190440_Remove_TitleBranding.Designer.cs
@@ -0,0 +1,1204 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Remotely.Server.Data;
+
+#nullable disable
+
+namespace Remotely.Server.Migrations.SqlServer
+{
+    [DbContext(typeof(SqlServerDbContext))]
+    [Migration("20230821190440_Remove_TitleBranding")]
+    partial class Remove_TitleBranding
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("DeviceGroupRemotelyUser", b =>
+                {
+                    b.Property<string>("DeviceGroupsID")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("UsersId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("DeviceGroupsID", "UsersId");
+
+                    b.HasIndex("UsersId");
+
+                    b.ToTable("DeviceGroupRemotelyUser");
+                });
+
+            modelBuilder.Entity("DeviceGroupScriptSchedule", b =>
+                {
+                    b.Property<string>("DeviceGroupsID")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("ScriptSchedulesId")
+                        .HasColumnType("int");
+
+                    b.HasKey("DeviceGroupsID", "ScriptSchedulesId");
+
+                    b.HasIndex("ScriptSchedulesId");
+
+                    b.ToTable("DeviceGroupScriptSchedule");
+                });
+
+            modelBuilder.Entity("DeviceScriptRun", b =>
+                {
+                    b.Property<string>("DevicesID")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("ScriptRunsId")
+                        .HasColumnType("int");
+
+                    b.HasKey("DevicesID", "ScriptRunsId");
+
+                    b.HasIndex("ScriptRunsId");
+
+                    b.ToTable("DeviceScriptRun");
+                });
+
+            modelBuilder.Entity("DeviceScriptSchedule", b =>
+                {
+                    b.Property<string>("DevicesID")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("ScriptSchedulesId")
+                        .HasColumnType("int");
+
+                    b.HasKey("DevicesID", "ScriptSchedulesId");
+
+                    b.HasIndex("ScriptSchedulesId");
+
+                    b.ToTable("DeviceScriptSchedule");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex")
+                        .HasFilter("[NormalizedName] IS NOT NULL");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex")
+                        .HasFilter("[NormalizedUserName] IS NOT NULL");
+
+                    b.ToTable("RemotelyUsers", (string)null);
+
+                    b.HasDiscriminator<string>("Discriminator").HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Alert", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<DateTimeOffset>("CreatedOn")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("Details")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DeviceID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("UserID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("UserID");
+
+                    b.ToTable("Alerts");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ApiToken", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<DateTimeOffset?>("LastUsed")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Secret")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("ApiTokens");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.BrandingInfo", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<byte[]>("Icon")
+                        .IsRequired()
+                        .HasColumnType("varbinary(max)");
+
+                    b.Property<string>("OrganizationId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Product")
+                        .IsRequired()
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique()
+                        .HasFilter("[OrganizationId] IS NOT NULL");
+
+                    b.ToTable("BrandingInfos");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Device", b =>
+                {
+                    b.Property<string>("ID")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("AgentVersion")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Alias")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<double>("CpuUtilization")
+                        .HasColumnType("float");
+
+                    b.Property<string>("CurrentUser")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DeviceGroupID")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("DeviceName")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Drives")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("Is64Bit")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTimeOffset>("LastOnline")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("MacAddresses")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(5000)
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("OSArchitecture")
+                        .HasColumnType("int");
+
+                    b.Property<string>("OSDescription")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Platform")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ProcessorCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("PublicIP")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ServerVerificationToken")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Tags")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<double>("TotalMemory")
+                        .HasColumnType("float");
+
+                    b.Property<double>("TotalStorage")
+                        .HasColumnType("float");
+
+                    b.Property<double>("UsedMemory")
+                        .HasColumnType("float");
+
+                    b.Property<double>("UsedStorage")
+                        .HasColumnType("float");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceGroupID");
+
+                    b.HasIndex("DeviceName");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.DeviceGroup", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("DeviceGroups");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.InviteLink", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<DateTimeOffset>("DateSent")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("InvitedUser")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsAdmin")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("ResetUrl")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("InviteLinks");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Organization", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("BrandingInfoId")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDefaultOrganization")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("OrganizationName")
+                        .IsRequired()
+                        .HasMaxLength(25)
+                        .HasColumnType("nvarchar(25)");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SavedScript", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("FolderPath")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<bool>("GenerateAlertOnError")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsQuickScript")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<bool>("SendEmailOnError")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("SendErrorEmailTo")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Shell")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatorId");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("SavedScripts");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptResult", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("DeviceID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("ErrorOutput")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("HadErrors")
+                        .HasColumnType("bit");
+
+                    b.Property<int>("InputType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<TimeSpan>("RunTime")
+                        .HasColumnType("time");
+
+                    b.Property<Guid?>("SavedScriptId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int?>("ScheduleId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ScriptInput")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("ScriptRunId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("SenderConnectionID")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("SenderUserName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Shell")
+                        .HasColumnType("int");
+
+                    b.Property<string>("StandardOutput")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTimeOffset>("TimeStamp")
+                        .HasColumnType("datetimeoffset");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("SavedScriptId");
+
+                    b.HasIndex("ScheduleId");
+
+                    b.HasIndex("ScriptRunId");
+
+                    b.ToTable("ScriptResults");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptRun", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Initiator")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("InputType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<DateTimeOffset>("RunAt")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<bool>("RunOnNextConnect")
+                        .HasColumnType("bit");
+
+                    b.Property<Guid?>("SavedScriptId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int?>("ScheduleId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("SavedScriptId");
+
+                    b.HasIndex("ScheduleId");
+
+                    b.ToTable("ScriptRuns");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptSchedule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("Interval")
+                        .HasColumnType("int");
+
+                    b.Property<DateTimeOffset?>("LastRun")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTimeOffset>("NextRun")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<bool>("RunOnNextConnect")
+                        .HasColumnType("bit");
+
+                    b.Property<Guid>("SavedScriptId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTimeOffset>("StartAt")
+                        .HasColumnType("datetimeoffset");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatorId");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("ScriptSchedules");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SharedFile", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("ContentType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<byte[]>("FileContents")
+                        .IsRequired()
+                        .HasColumnType("varbinary(max)");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrganizationID")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<DateTimeOffset>("Timestamp")
+                        .HasColumnType("datetimeoffset");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("SharedFiles");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.RemotelyUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsAdministrator")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsServerAdmin")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("TempPassword")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserOptions")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("UserName");
+
+                    b.HasDiscriminator().HasValue("RemotelyUser");
+                });
+
+            modelBuilder.Entity("DeviceGroupRemotelyUser", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.DeviceGroup", null)
+                        .WithMany()
+                        .HasForeignKey("DeviceGroupsID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", null)
+                        .WithMany()
+                        .HasForeignKey("UsersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DeviceGroupScriptSchedule", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.DeviceGroup", null)
+                        .WithMany()
+                        .HasForeignKey("DeviceGroupsID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", null)
+                        .WithMany()
+                        .HasForeignKey("ScriptSchedulesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DeviceScriptRun", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", null)
+                        .WithMany()
+                        .HasForeignKey("DevicesID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptRun", null)
+                        .WithMany()
+                        .HasForeignKey("ScriptRunsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DeviceScriptSchedule", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", null)
+                        .WithMany()
+                        .HasForeignKey("DevicesID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", null)
+                        .WithMany()
+                        .HasForeignKey("ScriptSchedulesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Alert", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", "Device")
+                        .WithMany("Alerts")
+                        .HasForeignKey("DeviceID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("Alerts")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", "User")
+                        .WithMany("Alerts")
+                        .HasForeignKey("UserID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.Navigation("Device");
+
+                    b.Navigation("Organization");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ApiToken", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ApiTokens")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.BrandingInfo", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithOne("BrandingInfo")
+                        .HasForeignKey("Remotely.Shared.Entities.BrandingInfo", "OrganizationId");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Device", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.DeviceGroup", "DeviceGroup")
+                        .WithMany("Devices")
+                        .HasForeignKey("DeviceGroupID");
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("Devices")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DeviceGroup");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.DeviceGroup", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("DeviceGroups")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.InviteLink", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("InviteLinks")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SavedScript", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", "Creator")
+                        .WithMany("SavedScripts")
+                        .HasForeignKey("CreatorId")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("SavedScripts")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptResult", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", "Device")
+                        .WithMany("ScriptResults")
+                        .HasForeignKey("DeviceID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ScriptResults")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.SavedScript", "SavedScript")
+                        .WithMany("ScriptResults")
+                        .HasForeignKey("SavedScriptId");
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", "Schedule")
+                        .WithMany()
+                        .HasForeignKey("ScheduleId");
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptRun", "ScriptRun")
+                        .WithMany("Results")
+                        .HasForeignKey("ScriptRunId");
+
+                    b.Navigation("Device");
+
+                    b.Navigation("Organization");
+
+                    b.Navigation("SavedScript");
+
+                    b.Navigation("Schedule");
+
+                    b.Navigation("ScriptRun");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptRun", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ScriptRuns")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.SavedScript", "SavedScript")
+                        .WithMany("ScriptRuns")
+                        .HasForeignKey("SavedScriptId");
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", "Schedule")
+                        .WithMany("ScriptRuns")
+                        .HasForeignKey("ScheduleId");
+
+                    b.Navigation("Organization");
+
+                    b.Navigation("SavedScript");
+
+                    b.Navigation("Schedule");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptSchedule", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", "Creator")
+                        .WithMany("ScriptSchedules")
+                        .HasForeignKey("CreatorId")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ScriptSchedules")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SharedFile", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("SharedFiles")
+                        .HasForeignKey("OrganizationID");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.RemotelyUser", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("RemotelyUsers")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Device", b =>
+                {
+                    b.Navigation("Alerts");
+
+                    b.Navigation("ScriptResults");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.DeviceGroup", b =>
+                {
+                    b.Navigation("Devices");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Organization", b =>
+                {
+                    b.Navigation("Alerts");
+
+                    b.Navigation("ApiTokens");
+
+                    b.Navigation("BrandingInfo");
+
+                    b.Navigation("DeviceGroups");
+
+                    b.Navigation("Devices");
+
+                    b.Navigation("InviteLinks");
+
+                    b.Navigation("RemotelyUsers");
+
+                    b.Navigation("SavedScripts");
+
+                    b.Navigation("ScriptResults");
+
+                    b.Navigation("ScriptRuns");
+
+                    b.Navigation("ScriptSchedules");
+
+                    b.Navigation("SharedFiles");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SavedScript", b =>
+                {
+                    b.Navigation("ScriptResults");
+
+                    b.Navigation("ScriptRuns");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptRun", b =>
+                {
+                    b.Navigation("Results");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptSchedule", b =>
+                {
+                    b.Navigation("ScriptRuns");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.RemotelyUser", b =>
+                {
+                    b.Navigation("Alerts");
+
+                    b.Navigation("SavedScripts");
+
+                    b.Navigation("ScriptSchedules");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Server/Migrations/SqlServer/20230821190440_Remove_TitleBranding.cs b/Server/Migrations/SqlServer/20230821190440_Remove_TitleBranding.cs
new file mode 100644
index 00000000..7ecacd9a
--- /dev/null
+++ b/Server/Migrations/SqlServer/20230821190440_Remove_TitleBranding.cs
@@ -0,0 +1,117 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Remotely.Server.Migrations.SqlServer
+{
+    /// <inheritdoc />
+    public partial class Remove_TitleBranding : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ButtonForegroundBlue",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "ButtonForegroundGreen",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "ButtonForegroundRed",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleBackgroundBlue",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleBackgroundGreen",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleBackgroundRed",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleForegroundBlue",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleForegroundGreen",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleForegroundRed",
+                table: "BrandingInfos");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<byte>(
+                name: "ButtonForegroundBlue",
+                table: "BrandingInfos",
+                type: "tinyint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "ButtonForegroundGreen",
+                table: "BrandingInfos",
+                type: "tinyint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "ButtonForegroundRed",
+                table: "BrandingInfos",
+                type: "tinyint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleBackgroundBlue",
+                table: "BrandingInfos",
+                type: "tinyint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleBackgroundGreen",
+                table: "BrandingInfos",
+                type: "tinyint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleBackgroundRed",
+                table: "BrandingInfos",
+                type: "tinyint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleForegroundBlue",
+                table: "BrandingInfos",
+                type: "tinyint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleForegroundGreen",
+                table: "BrandingInfos",
+                type: "tinyint",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleForegroundRed",
+                table: "BrandingInfos",
+                type: "tinyint",
+                nullable: false,
+                defaultValue: (byte)0);
+        }
+    }
+}
diff --git a/Server/Migrations/SqlServer/SqlServerDbContextModelSnapshot.cs b/Server/Migrations/SqlServer/SqlServerDbContextModelSnapshot.cs
index 61bf7f1d..26b1a6f1 100644
--- a/Server/Migrations/SqlServer/SqlServerDbContextModelSnapshot.cs
+++ b/Server/Migrations/SqlServer/SqlServerDbContextModelSnapshot.cs
@@ -17,7 +17,7 @@ namespace Remotely.Server.Migrations.SqlServer
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("ProductVersion", "7.0.10")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -359,15 +359,6 @@ namespace Remotely.Server.Migrations.SqlServer
                         .ValueGeneratedOnAdd()
                         .HasColumnType("nvarchar(450)");
 
-                    b.Property<byte>("ButtonForegroundBlue")
-                        .HasColumnType("tinyint");
-
-                    b.Property<byte>("ButtonForegroundGreen")
-                        .HasColumnType("tinyint");
-
-                    b.Property<byte>("ButtonForegroundRed")
-                        .HasColumnType("tinyint");
-
                     b.Property<byte[]>("Icon")
                         .IsRequired()
                         .HasColumnType("varbinary(max)");
@@ -380,24 +371,6 @@ namespace Remotely.Server.Migrations.SqlServer
                         .HasMaxLength(25)
                         .HasColumnType("nvarchar(25)");
 
-                    b.Property<byte>("TitleBackgroundBlue")
-                        .HasColumnType("tinyint");
-
-                    b.Property<byte>("TitleBackgroundGreen")
-                        .HasColumnType("tinyint");
-
-                    b.Property<byte>("TitleBackgroundRed")
-                        .HasColumnType("tinyint");
-
-                    b.Property<byte>("TitleForegroundBlue")
-                        .HasColumnType("tinyint");
-
-                    b.Property<byte>("TitleForegroundGreen")
-                        .HasColumnType("tinyint");
-
-                    b.Property<byte>("TitleForegroundRed")
-                        .HasColumnType("tinyint");
-
                     b.HasKey("Id");
 
                     b.HasIndex("OrganizationId")
diff --git a/Server/Migrations/Sqlite/20230821190428_Remove_TitleBranding.Designer.cs b/Server/Migrations/Sqlite/20230821190428_Remove_TitleBranding.Designer.cs
new file mode 100644
index 00000000..2854c560
--- /dev/null
+++ b/Server/Migrations/Sqlite/20230821190428_Remove_TitleBranding.Designer.cs
@@ -0,0 +1,1197 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Remotely.Server.Data;
+
+#nullable disable
+
+namespace Remotely.Server.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteDbContext))]
+    [Migration("20230821190428_Remove_TitleBranding")]
+    partial class Remove_TitleBranding
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.10");
+
+            modelBuilder.Entity("DeviceGroupRemotelyUser", b =>
+                {
+                    b.Property<string>("DeviceGroupsID")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UsersId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("DeviceGroupsID", "UsersId");
+
+                    b.HasIndex("UsersId");
+
+                    b.ToTable("DeviceGroupRemotelyUser");
+                });
+
+            modelBuilder.Entity("DeviceGroupScriptSchedule", b =>
+                {
+                    b.Property<string>("DeviceGroupsID")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ScriptSchedulesId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("DeviceGroupsID", "ScriptSchedulesId");
+
+                    b.HasIndex("ScriptSchedulesId");
+
+                    b.ToTable("DeviceGroupScriptSchedule");
+                });
+
+            modelBuilder.Entity("DeviceScriptRun", b =>
+                {
+                    b.Property<string>("DevicesID")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ScriptRunsId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("DevicesID", "ScriptRunsId");
+
+                    b.HasIndex("ScriptRunsId");
+
+                    b.ToTable("DeviceScriptRun");
+                });
+
+            modelBuilder.Entity("DeviceScriptSchedule", b =>
+                {
+                    b.Property<string>("DevicesID")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ScriptSchedulesId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("DevicesID", "ScriptSchedulesId");
+
+                    b.HasIndex("ScriptSchedulesId");
+
+                    b.ToTable("DeviceScriptSchedule");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LockoutEnd")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("RemotelyUsers", (string)null);
+
+                    b.HasDiscriminator<string>("Discriminator").HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Alert", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedOn")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Details")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("UserID");
+
+                    b.ToTable("Alerts");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ApiToken", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastUsed")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Secret")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("ApiTokens");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.BrandingInfo", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("Icon")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Product")
+                        .IsRequired()
+                        .HasMaxLength(25)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("BrandingInfos");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Device", b =>
+                {
+                    b.Property<string>("ID")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AgentVersion")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Alias")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("CpuUtilization")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("CurrentUser")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceGroupID")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Drives")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Is64Bit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastOnline")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MacAddresses")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(5000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("OSArchitecture")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("OSDescription")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Platform")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ProcessorCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("PublicIP")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ServerVerificationToken")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tags")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("TotalMemory")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("TotalStorage")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("UsedMemory")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("UsedStorage")
+                        .HasColumnType("REAL");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceGroupID");
+
+                    b.HasIndex("DeviceName");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.DeviceGroup", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("DeviceGroups");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.InviteLink", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DateSent")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InvitedUser")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAdmin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResetUrl")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("InviteLinks");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Organization", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BrandingInfoId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDefaultOrganization")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("OrganizationName")
+                        .IsRequired()
+                        .HasMaxLength(25)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SavedScript", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FolderPath")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("GenerateAlertOnError")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsQuickScript")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SendEmailOnError")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SendErrorEmailTo")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Shell")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatorId");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("SavedScripts");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptResult", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ErrorOutput")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("HadErrors")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("InputType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<TimeSpan>("RunTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SavedScriptId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ScheduleId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ScriptInput")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ScriptRunId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SenderConnectionID")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SenderUserName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Shell")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("StandardOutput")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TimeStamp")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("SavedScriptId");
+
+                    b.HasIndex("ScheduleId");
+
+                    b.HasIndex("ScriptRunId");
+
+                    b.ToTable("ScriptResults");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptRun", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Initiator")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("InputType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RunAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RunOnNextConnect")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SavedScriptId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ScheduleId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("SavedScriptId");
+
+                    b.HasIndex("ScheduleId");
+
+                    b.ToTable("ScriptRuns");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptSchedule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastRun")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NextRun")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RunOnNextConnect")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("SavedScriptId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StartAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatorId");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("ScriptSchedules");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SharedFile", b =>
+                {
+                    b.Property<string>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContentType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("FileContents")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationID")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Timestamp")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.ToTable("SharedFiles");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.RemotelyUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsAdministrator")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsServerAdmin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("OrganizationID")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TempPassword")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserOptions")
+                        .HasColumnType("TEXT");
+
+                    b.HasIndex("OrganizationID");
+
+                    b.HasIndex("UserName");
+
+                    b.HasDiscriminator().HasValue("RemotelyUser");
+                });
+
+            modelBuilder.Entity("DeviceGroupRemotelyUser", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.DeviceGroup", null)
+                        .WithMany()
+                        .HasForeignKey("DeviceGroupsID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", null)
+                        .WithMany()
+                        .HasForeignKey("UsersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DeviceGroupScriptSchedule", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.DeviceGroup", null)
+                        .WithMany()
+                        .HasForeignKey("DeviceGroupsID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", null)
+                        .WithMany()
+                        .HasForeignKey("ScriptSchedulesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DeviceScriptRun", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", null)
+                        .WithMany()
+                        .HasForeignKey("DevicesID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptRun", null)
+                        .WithMany()
+                        .HasForeignKey("ScriptRunsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DeviceScriptSchedule", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", null)
+                        .WithMany()
+                        .HasForeignKey("DevicesID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", null)
+                        .WithMany()
+                        .HasForeignKey("ScriptSchedulesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Alert", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", "Device")
+                        .WithMany("Alerts")
+                        .HasForeignKey("DeviceID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("Alerts")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", "User")
+                        .WithMany("Alerts")
+                        .HasForeignKey("UserID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.Navigation("Device");
+
+                    b.Navigation("Organization");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ApiToken", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ApiTokens")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.BrandingInfo", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithOne("BrandingInfo")
+                        .HasForeignKey("Remotely.Shared.Entities.BrandingInfo", "OrganizationId");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Device", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.DeviceGroup", "DeviceGroup")
+                        .WithMany("Devices")
+                        .HasForeignKey("DeviceGroupID");
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("Devices")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DeviceGroup");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.DeviceGroup", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("DeviceGroups")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.InviteLink", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("InviteLinks")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SavedScript", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", "Creator")
+                        .WithMany("SavedScripts")
+                        .HasForeignKey("CreatorId")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("SavedScripts")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptResult", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Device", "Device")
+                        .WithMany("ScriptResults")
+                        .HasForeignKey("DeviceID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ScriptResults")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.SavedScript", "SavedScript")
+                        .WithMany("ScriptResults")
+                        .HasForeignKey("SavedScriptId");
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", "Schedule")
+                        .WithMany()
+                        .HasForeignKey("ScheduleId");
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptRun", "ScriptRun")
+                        .WithMany("Results")
+                        .HasForeignKey("ScriptRunId");
+
+                    b.Navigation("Device");
+
+                    b.Navigation("Organization");
+
+                    b.Navigation("SavedScript");
+
+                    b.Navigation("Schedule");
+
+                    b.Navigation("ScriptRun");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptRun", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ScriptRuns")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.SavedScript", "SavedScript")
+                        .WithMany("ScriptRuns")
+                        .HasForeignKey("SavedScriptId");
+
+                    b.HasOne("Remotely.Shared.Entities.ScriptSchedule", "Schedule")
+                        .WithMany("ScriptRuns")
+                        .HasForeignKey("ScheduleId");
+
+                    b.Navigation("Organization");
+
+                    b.Navigation("SavedScript");
+
+                    b.Navigation("Schedule");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptSchedule", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.RemotelyUser", "Creator")
+                        .WithMany("ScriptSchedules")
+                        .HasForeignKey("CreatorId")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("ScriptSchedules")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SharedFile", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("SharedFiles")
+                        .HasForeignKey("OrganizationID");
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.RemotelyUser", b =>
+                {
+                    b.HasOne("Remotely.Shared.Entities.Organization", "Organization")
+                        .WithMany("RemotelyUsers")
+                        .HasForeignKey("OrganizationID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Device", b =>
+                {
+                    b.Navigation("Alerts");
+
+                    b.Navigation("ScriptResults");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.DeviceGroup", b =>
+                {
+                    b.Navigation("Devices");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.Organization", b =>
+                {
+                    b.Navigation("Alerts");
+
+                    b.Navigation("ApiTokens");
+
+                    b.Navigation("BrandingInfo");
+
+                    b.Navigation("DeviceGroups");
+
+                    b.Navigation("Devices");
+
+                    b.Navigation("InviteLinks");
+
+                    b.Navigation("RemotelyUsers");
+
+                    b.Navigation("SavedScripts");
+
+                    b.Navigation("ScriptResults");
+
+                    b.Navigation("ScriptRuns");
+
+                    b.Navigation("ScriptSchedules");
+
+                    b.Navigation("SharedFiles");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.SavedScript", b =>
+                {
+                    b.Navigation("ScriptResults");
+
+                    b.Navigation("ScriptRuns");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptRun", b =>
+                {
+                    b.Navigation("Results");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.ScriptSchedule", b =>
+                {
+                    b.Navigation("ScriptRuns");
+                });
+
+            modelBuilder.Entity("Remotely.Shared.Entities.RemotelyUser", b =>
+                {
+                    b.Navigation("Alerts");
+
+                    b.Navigation("SavedScripts");
+
+                    b.Navigation("ScriptSchedules");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Server/Migrations/Sqlite/20230821190428_Remove_TitleBranding.cs b/Server/Migrations/Sqlite/20230821190428_Remove_TitleBranding.cs
new file mode 100644
index 00000000..15774689
--- /dev/null
+++ b/Server/Migrations/Sqlite/20230821190428_Remove_TitleBranding.cs
@@ -0,0 +1,117 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Remotely.Server.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class Remove_TitleBranding : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ButtonForegroundBlue",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "ButtonForegroundGreen",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "ButtonForegroundRed",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleBackgroundBlue",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleBackgroundGreen",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleBackgroundRed",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleForegroundBlue",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleForegroundGreen",
+                table: "BrandingInfos");
+
+            migrationBuilder.DropColumn(
+                name: "TitleForegroundRed",
+                table: "BrandingInfos");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<byte>(
+                name: "ButtonForegroundBlue",
+                table: "BrandingInfos",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "ButtonForegroundGreen",
+                table: "BrandingInfos",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "ButtonForegroundRed",
+                table: "BrandingInfos",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleBackgroundBlue",
+                table: "BrandingInfos",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleBackgroundGreen",
+                table: "BrandingInfos",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleBackgroundRed",
+                table: "BrandingInfos",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleForegroundBlue",
+                table: "BrandingInfos",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleForegroundGreen",
+                table: "BrandingInfos",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: (byte)0);
+
+            migrationBuilder.AddColumn<byte>(
+                name: "TitleForegroundRed",
+                table: "BrandingInfos",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: (byte)0);
+        }
+    }
+}
diff --git a/Server/Migrations/Sqlite/SqliteDbContextModelSnapshot.cs b/Server/Migrations/Sqlite/SqliteDbContextModelSnapshot.cs
index d54d244d..09dcc5cc 100644
--- a/Server/Migrations/Sqlite/SqliteDbContextModelSnapshot.cs
+++ b/Server/Migrations/Sqlite/SqliteDbContextModelSnapshot.cs
@@ -15,7 +15,7 @@ namespace Remotely.Server.Migrations.Sqlite
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "7.0.9");
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.10");
 
             modelBuilder.Entity("DeviceGroupRemotelyUser", b =>
                 {
@@ -349,15 +349,6 @@ namespace Remotely.Server.Migrations.Sqlite
                         .ValueGeneratedOnAdd()
                         .HasColumnType("TEXT");
 
-                    b.Property<byte>("ButtonForegroundBlue")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<byte>("ButtonForegroundGreen")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<byte>("ButtonForegroundRed")
-                        .HasColumnType("INTEGER");
-
                     b.Property<byte[]>("Icon")
                         .IsRequired()
                         .HasColumnType("BLOB");
@@ -370,24 +361,6 @@ namespace Remotely.Server.Migrations.Sqlite
                         .HasMaxLength(25)
                         .HasColumnType("TEXT");
 
-                    b.Property<byte>("TitleBackgroundBlue")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<byte>("TitleBackgroundGreen")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<byte>("TitleBackgroundRed")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<byte>("TitleForegroundBlue")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<byte>("TitleForegroundGreen")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<byte>("TitleForegroundRed")
-                        .HasColumnType("INTEGER");
-
                     b.HasKey("Id");
 
                     b.HasIndex("OrganizationId")
diff --git a/Server/Pages/Branding.razor b/Server/Pages/Branding.razor
index f70bba18..d866add0 100644
--- a/Server/Pages/Branding.razor
+++ b/Server/Pages/Branding.razor
@@ -3,7 +3,7 @@
 @attribute [Authorize(Policy = PolicyNames.OrganizationAdminRequired)]
 @inject IDataService DataService
 @inject IToastService ToastService
-@inject IJsInterop JsInterop 
+@inject IJsInterop JsInterop
 @using Remotely.Server.Models
 @using System.ComponentModel.DataAnnotations
 
@@ -11,16 +11,6 @@
 
 <AlertBanner Message="@_alertMessage" />
 
-<div class="row">
-    <div class="col-sm-8 col-lg-6 col-xl-5">
-        <div class="form-group">
-            <label class="mb-1">Branding Areas</label>
-            <br />
-            <img class="img-fluid" src="/images/Remotely_Desktop.png" />
-        </div>
-    </div>
-</div>
-
 <div class="row">
     <div class="col-sm-8 col-lg-6 col-xl-5">
         <EditForm OnValidSubmit="HandleValidSubmit" Model="_inputModel">
@@ -32,31 +22,23 @@
                 <ValidationMessage For="() => _inputModel.ProductName" />
             </div>
 
-            @if (!string.IsNullOrWhiteSpace(_base64Icon))
-            {
-                <div class="form-group mb-4">
-                    <label class="text-info font-weight-bold">Current Icon</label>
-                    <br />
+            <div class="form-group mb-4">
+                <label class="text-info font-weight-bold d-block">Current Icon</label>
+                <br />
+                @if (!string.IsNullOrWhiteSpace(_base64Icon))
+                {
                     <img class="img-fluid" src="data:image/png;base64,@_base64Icon" />
-                </div>
-            }
+                }
+                else
+                {
+                    <img class="img-fluid" src="/images/Remotely_Icon.png" />
+                }
+            </div>
 
             <div class="form-group mb-5">
                 <label class="text-info font-weight-bold">New Icon</label>
                 <InputFile type="file" accept="image/png" class="form-control" OnChange="IconUploadInputChanged" />
             </div>
-            <div class="form-group mb-5">
-                <label class="text-info font-weight-bold">Title Foreground</label>
-                <ColorPicker @bind-Color="_inputModel.TitleForegroundColor" />
-            </div>
-            <div class="form-group mb-5">
-                <label class="text-info font-weight-bold">Title Background</label>
-                <ColorPicker @bind-Color="_inputModel.TitleBackgroundColor" />
-            </div>
-            <div class="form-group mb-5">
-                <label class="text-info font-weight-bold">Button Color</label>
-                <ColorPicker @bind-Color="_inputModel.TitleButtonColor" />
-            </div>
             <div class="form-group text-right">
                 <button class="btn btn-secondary mr-3" type="button" @onclick="ResetBranding">Reset</button>
                 <button class="btn btn-primary" type="submit">Submit</button>
@@ -76,10 +58,6 @@
         [Display(Name = "Product Name")]
         public string ProductName { get; set; } = string.Empty;
 
-        public ColorPickerModel TitleForegroundColor { get; set; } = new();
-        public ColorPickerModel TitleBackgroundColor { get; set; } = new();
-        public ColorPickerModel TitleButtonColor { get; set; } = new();
-
         public byte[] IconBytes { get; set; } = Array.Empty<byte>();
     }
 
@@ -97,10 +75,7 @@
         await DataService.UpdateBrandingInfo(
             User.OrganizationID,
             _inputModel.ProductName,
-            _inputModel.IconBytes,
-            _inputModel.TitleForegroundColor,
-            _inputModel.TitleBackgroundColor,
-            _inputModel.TitleButtonColor);
+            _inputModel.IconBytes);
 
         if (_inputModel?.IconBytes?.Any() == true)
         {
@@ -139,7 +114,7 @@
             return;
         }
 
-        var brandingResult= await DataService.GetBrandingInfo(orgResult.Value.ID);
+        var brandingResult = await DataService.GetBrandingInfo(orgResult.Value.ID);
 
         if (!brandingResult.IsSuccess)
         {
@@ -154,18 +129,6 @@
         {
             _base64Icon = Convert.ToBase64String(brandingInfo.Icon);
         }
-
-        _inputModel.TitleForegroundColor.Red = brandingInfo.TitleForegroundRed;
-        _inputModel.TitleForegroundColor.Green = brandingInfo.TitleForegroundGreen;
-        _inputModel.TitleForegroundColor.Blue = brandingInfo.TitleForegroundBlue;
-
-        _inputModel.TitleBackgroundColor.Red = brandingInfo.TitleBackgroundRed;
-        _inputModel.TitleBackgroundColor.Green = brandingInfo.TitleBackgroundGreen;
-        _inputModel.TitleBackgroundColor.Blue = brandingInfo.TitleBackgroundBlue;
-
-        _inputModel.TitleButtonColor.Red = brandingInfo.ButtonForegroundRed;
-        _inputModel.TitleButtonColor.Green = brandingInfo.ButtonForegroundGreen;
-        _inputModel.TitleButtonColor.Blue = brandingInfo.ButtonForegroundBlue;
     }
 
     private async Task ResetBranding()
diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
index d2d7c35b..1ad7d7c7 100644
--- a/Server/Services/DataService.cs
+++ b/Server/Services/DataService.cs
@@ -206,12 +206,9 @@ public interface IDataService
     Task<bool> TempPasswordSignIn(string email, string password);
 
     Task UpdateBrandingInfo(
-                                                                                                                                                                                                                                                string organizationId,
+        string organizationId,
         string productName,
-        byte[] iconBytes,
-        ColorPickerModel titleForeground,
-        ColorPickerModel titleBackground,
-        ColorPickerModel titleButtonForeground);
+        byte[] iconBytes);
 
     Task<Result<Device>> UpdateDevice(DeviceSetupOptions deviceOptions, string organizationId);
 
@@ -2043,10 +2040,7 @@ public class DataService : IDataService
     public async Task UpdateBrandingInfo(
         string organizationId,
         string productName,
-        byte[] iconBytes,
-        ColorPickerModel titleForeground,
-        ColorPickerModel titleBackground,
-        ColorPickerModel titleButtonForeground)
+        byte[] iconBytes)
     {
         using var dbContext = _appDbFactory.GetContext();
 
@@ -2068,18 +2062,6 @@ public class DataService : IDataService
             organization.BrandingInfo.Icon = iconBytes;
         }
 
-        organization.BrandingInfo.TitleBackgroundRed = titleBackground.Red;
-        organization.BrandingInfo.TitleBackgroundGreen = titleBackground.Green;
-        organization.BrandingInfo.TitleBackgroundBlue = titleBackground.Blue;
-
-        organization.BrandingInfo.TitleForegroundRed = titleForeground.Red;
-        organization.BrandingInfo.TitleForegroundGreen = titleForeground.Green;
-        organization.BrandingInfo.TitleForegroundBlue = titleForeground.Blue;
-
-        organization.BrandingInfo.ButtonForegroundRed = titleButtonForeground.Red;
-        organization.BrandingInfo.ButtonForegroundGreen = titleButtonForeground.Green;
-        organization.BrandingInfo.ButtonForegroundBlue = titleButtonForeground.Blue;
-
         await dbContext.SaveChangesAsync();
     }
 
diff --git a/submodules/Immense.RemoteControl b/submodules/Immense.RemoteControl
index 8d542429..ea0b95b5 160000
--- a/submodules/Immense.RemoteControl
+++ b/submodules/Immense.RemoteControl
@@ -1 +1 @@
-Subproject commit 8d542429b749d462903c15d4668ef932777370c8
+Subproject commit ea0b95b5dba6ed39b5aaa3087c07b635c64b7ea2