diff --git a/Emerald.sln b/Emerald.sln
index cb5195c2..bb5184e0 100644
--- a/Emerald.sln
+++ b/Emerald.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35103.136
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald.Uno", "Emerald\Emerald.Uno.csproj", "{9D3213F4-E514-4E7D-872A-725DB4872436}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald", "Emerald\Emerald.csproj", "{9D3213F4-E514-4E7D-872A-725DB4872436}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3142BDF3-E95C-4F0F-8701-CF981F6EA3C0}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/Emerald/App.xaml b/Emerald/App.xaml
index f861592b..30649aad 100644
--- a/Emerald/App.xaml
+++ b/Emerald/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Emerald.Uno.App"
+<Application x:Class="Emerald.App"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
diff --git a/Emerald/App.xaml.cs b/Emerald/App.xaml.cs
index ac07a3cd..fddb6cb3 100644
--- a/Emerald/App.xaml.cs
+++ b/Emerald/App.xaml.cs
@@ -1,6 +1,6 @@
 using Uno.Resizetizer;
 
-namespace Emerald.Uno;
+namespace Emerald;
 public partial class App : Application
 {
     /// <summary>
@@ -50,7 +50,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
             MainWindow.Content = rootFrame;
         }
 #if WINDOWS
-        var mica = Emerald.Uno.Helpers.WindowManager.IntializeWindow(MainWindow);
+        var mica = Emerald.Helpers.WindowManager.IntializeWindow(MainWindow);
 #endif
 
         if (rootFrame.Content == null)
diff --git a/Emerald/Emerald.Uno.csproj b/Emerald/Emerald.csproj
similarity index 94%
rename from Emerald/Emerald.Uno.csproj
rename to Emerald/Emerald.csproj
index 9e685211..d6b4ea46 100644
--- a/Emerald/Emerald.Uno.csproj
+++ b/Emerald/Emerald.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Uno.Sdk">
+<Project Sdk="Uno.Sdk">
   <PropertyGroup>
     <TargetFrameworks>
       net8.0-maccatalyst;
@@ -10,9 +10,9 @@
     <UnoSingleProject>true</UnoSingleProject>
 
     <!-- Display name -->
-    <ApplicationTitle>Emerald.Uno</ApplicationTitle>
+    <ApplicationTitle>Emerald</ApplicationTitle>
     <!-- App Identifier -->
-    <ApplicationId>Riverside.Emerald.Uno</ApplicationId>
+    <ApplicationId>Riverside.Emerald</ApplicationId>
     <!-- Versions -->
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <ApplicationVersion>1</ApplicationVersion>
diff --git a/Emerald/Helpers/Converters/BoolToVisibility.cs b/Emerald/Helpers/Converters/BoolToVisibility.cs
index 2fafd1c8..3cd23e81 100644
--- a/Emerald/Helpers/Converters/BoolToVisibility.cs
+++ b/Emerald/Helpers/Converters/BoolToVisibility.cs
@@ -1,7 +1,7 @@
 
 using Microsoft.UI.Xaml.Data;
 
-namespace Emerald.Uno.Helpers.Converters;
+namespace Emerald.Helpers.Converters;
 public class BoolToVisibility : IValueConverter
     {
         public bool Reversed { get; set; }
@@ -15,4 +15,4 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
         {
             throw new InvalidOperationException();
         }
-    }
\ No newline at end of file
+    }
diff --git a/Emerald/Helpers/Extensions.cs b/Emerald/Helpers/Extensions.cs
index 34d20225..62482347 100644
--- a/Emerald/Helpers/Extensions.cs
+++ b/Emerald/Helpers/Extensions.cs
@@ -10,7 +10,7 @@
 using System.Text;
 using Windows.System.Diagnostics;
 
-namespace Emerald.Uno.Helpers;
+namespace Emerald.Helpers;
 
 public static class Extensions
 {
diff --git a/Emerald/Helpers/MarkupExtensions/ConditionString.cs b/Emerald/Helpers/MarkupExtensions/ConditionString.cs
index b73a2c3c..da03abbe 100644
--- a/Emerald/Helpers/MarkupExtensions/ConditionString.cs
+++ b/Emerald/Helpers/MarkupExtensions/ConditionString.cs
@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml.Markup;
 
-namespace Emerald.Uno.Helpers;
+namespace Emerald.Helpers;
 
 [MarkupExtensionReturnType(ReturnType = typeof(string))]
 public class ConditionString : MarkupExtension
diff --git a/Emerald/Helpers/MarkupExtensions/FontIcon.cs b/Emerald/Helpers/MarkupExtensions/FontIcon.cs
index a7e8c816..5731c5f7 100644
--- a/Emerald/Helpers/MarkupExtensions/FontIcon.cs
+++ b/Emerald/Helpers/MarkupExtensions/FontIcon.cs
@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml.Markup;
 
-namespace Emerald.Uno.Helpers;
+namespace Emerald.Helpers;
 
 [MarkupExtensionReturnType(ReturnType = typeof(Microsoft.UI.Xaml.Controls.FontIcon))]
 public sealed class FontIcon : MarkupExtension
diff --git a/Emerald/Helpers/MarkupExtensions/LocalizeString.cs b/Emerald/Helpers/MarkupExtensions/LocalizeString.cs
index 31b5689c..495182dc 100644
--- a/Emerald/Helpers/MarkupExtensions/LocalizeString.cs
+++ b/Emerald/Helpers/MarkupExtensions/LocalizeString.cs
@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml.Markup;
 using CommunityToolkit.Mvvm;
-namespace Emerald.Uno.Helpers;
+namespace Emerald.Helpers;
 
 [MarkupExtensionReturnType(ReturnType = typeof(string))]
 public sealed class Localize : MarkupExtension
diff --git a/Emerald/Helpers/Settings/Enums/MicaTintColor.cs b/Emerald/Helpers/Settings/Enums/MicaTintColor.cs
index 4a97fbb6..3c338142 100644
--- a/Emerald/Helpers/Settings/Enums/MicaTintColor.cs
+++ b/Emerald/Helpers/Settings/Enums/MicaTintColor.cs
@@ -1,4 +1,4 @@
-namespace Emerald.Uno.Helpers.Settings.Enums
+namespace Emerald.Helpers.Settings.Enums
 {
     public enum MicaTintColor : int
     {
diff --git a/Emerald/Helpers/Settings/JSON.cs b/Emerald/Helpers/Settings/JSON.cs
index 3d1a024a..11b1815a 100644
--- a/Emerald/Helpers/Settings/JSON.cs
+++ b/Emerald/Helpers/Settings/JSON.cs
@@ -8,7 +8,7 @@
 using System.Collections.Generic;
 using Windows.UI;
 using Emerald.CoreX.Store.Modrinth;
-namespace Emerald.Uno.Helpers.Settings.JSON;
+namespace Emerald.Helpers.Settings.JSON;
 
 public class JSON : Models.Model
 {
diff --git a/Emerald/Helpers/Settings/SettingsSystem.cs b/Emerald/Helpers/Settings/SettingsSystem.cs
index 53d3c565..5a25b55a 100644
--- a/Emerald/Helpers/Settings/SettingsSystem.cs
+++ b/Emerald/Helpers/Settings/SettingsSystem.cs
@@ -1,4 +1,4 @@
-using Emerald.Uno.Helpers.Settings.JSON;
+using Emerald.Helpers.Settings.JSON;
 using System.Text.Json;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Windows.Storage;
 
-namespace Emerald.Uno.Helpers.Settings;
+namespace Emerald.Helpers.Settings;
 
 public static class SettingsSystem
 {
diff --git a/Emerald/Helpers/WindowManager.cs b/Emerald/Helpers/WindowManager.cs
index 5e16c5ca..63761d89 100644
--- a/Emerald/Helpers/WindowManager.cs
+++ b/Emerald/Helpers/WindowManager.cs
@@ -9,7 +9,7 @@
 using WinRT;
 using WinRT.Interop;
 
-namespace Emerald.Uno.Helpers
+namespace Emerald.Helpers
 {
 #if WINDOWS
     public static class WindowManager
diff --git a/Emerald/MainPage.xaml b/Emerald/MainPage.xaml
index 09b5233f..63a41b90 100644
--- a/Emerald/MainPage.xaml
+++ b/Emerald/MainPage.xaml
@@ -1,12 +1,12 @@
-<Page x:Class="Emerald.Uno.MainPage"
+<Page x:Class="Emerald.MainPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:Emerald.Uno"
+      xmlns:local="using:Emerald"
       xmlns:utu="using:Uno.Toolkit.UI"
-      xmlns:models="using:Emerald.Uno.Models"
-      xmlns:uc="using:Emerald.Uno.UserControls"
-    xmlns:conv="using:Emerald.Uno.Helpers.Converters"
-      xmlns:helpers="using:Emerald.Uno.Helpers">
+      xmlns:models="using:Emerald.Models"
+      xmlns:uc="using:Emerald.UserControls"
+    xmlns:conv="using:Emerald.Helpers.Converters"
+      xmlns:helpers="using:Emerald.Helpers">
   <Page.Resources>
     <conv:BoolToVisibility x:Key="BoolToVisibilty"/>
   </Page.Resources>
diff --git a/Emerald/MainPage.xaml.cs b/Emerald/MainPage.xaml.cs
index 5a8a742b..a2496167 100644
--- a/Emerald/MainPage.xaml.cs
+++ b/Emerald/MainPage.xaml.cs
@@ -1,10 +1,10 @@
-using Emerald.Uno.Helpers;
-using Emerald.Uno.Models;
-using Emerald.Uno.Views.Settings;
+using Emerald.Helpers;
+using Emerald.Models;
+using Emerald.Views.Settings;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 
-namespace Emerald.Uno;
+namespace Emerald;
 
 public sealed partial class MainPage : Page
 {
@@ -24,7 +24,7 @@ private void MainNavigationView_ItemInvoked(NavigationView sender, NavigationVie
     private void MainPage_Loaded(object sender, RoutedEventArgs e)
     {
 #if WINDOWS
-        Emerald.Uno.Helpers.WindowManager.SetTitleBar(App.Current.MainWindow, AppTitleBar);
+        Emerald.Helpers.WindowManager.SetTitleBar(App.Current.MainWindow, AppTitleBar);
 #endif
         NavView.MenuItems.Add(new SquareNavigationViewItem("Home".Localize())
         {
diff --git a/Emerald/Models/Model.cs b/Emerald/Models/Model.cs
index 1374d30e..552f279d 100644
--- a/Emerald/Models/Model.cs
+++ b/Emerald/Models/Model.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using System.ComponentModel;
 
-namespace Emerald.Uno.Models;
+namespace Emerald.Models;
 
 public partial class Model : ObservableObject
 {
diff --git a/Emerald/Models/NavViewHeader.cs b/Emerald/Models/NavViewHeader.cs
index 97c3ab38..093bdbaa 100644
--- a/Emerald/Models/NavViewHeader.cs
+++ b/Emerald/Models/NavViewHeader.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Emerald.Uno.Models;
+namespace Emerald.Models;
 
 public partial class NavViewHeader : Model
 {
diff --git a/Emerald/Models/SquareNavigationViewItem.cs b/Emerald/Models/SquareNavigationViewItem.cs
index ff520d0f..3f9f2ac5 100644
--- a/Emerald/Models/SquareNavigationViewItem.cs
+++ b/Emerald/Models/SquareNavigationViewItem.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Emerald.Uno.Models;
+namespace Emerald.Models;
 
 public partial class SquareNavigationViewItem : Model
 {
diff --git a/Emerald/Package.appxmanifest b/Emerald/Package.appxmanifest
index 76392e52..29558f1d 100644
--- a/Emerald/Package.appxmanifest
+++ b/Emerald/Package.appxmanifest
@@ -7,13 +7,13 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="Emerald.Uno"
+    Name="Emerald"
     Publisher="O=Riverside Valley"
     Version="1.0.0.0" />
 
   <Properties>
-    <DisplayName>Emerald.Uno</DisplayName>
-    <PublisherDisplayName>Emerald.Uno</PublisherDisplayName>
+    <DisplayName>Emerald</DisplayName>
+    <PublisherDisplayName>Emerald</PublisherDisplayName>
   </Properties>
 
   <Dependencies>
@@ -30,8 +30,8 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
-        DisplayName="Emerald.Uno"
-        Description="Emerald.Uno">
+        DisplayName="Emerald"
+        Description="Emerald">
         <uap:SplashScreen />
       </uap:VisualElements>
     </Application>
diff --git a/Emerald/Platforms/Desktop/Program.cs b/Emerald/Platforms/Desktop/Program.cs
index c406e4af..505e2c1b 100644
--- a/Emerald/Platforms/Desktop/Program.cs
+++ b/Emerald/Platforms/Desktop/Program.cs
@@ -1,6 +1,6 @@
 using Uno.UI.Runtime.Skia;
 
-namespace Emerald.Uno;
+namespace Emerald;
 public class Program
 {
     [STAThread]
diff --git a/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs b/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs
index 08b2a160..d26d16e3 100644
--- a/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs
+++ b/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs
@@ -1,6 +1,6 @@
 using UIKit;
 
-namespace Emerald.Uno.MacCatalyst;
+namespace Emerald.MacCatalyst;
 public class EntryPoint
 {
     // This is the main entry point of the application.
diff --git a/Emerald/Properties/launchSettings.json b/Emerald/Properties/launchSettings.json
index bf880023..a8c8aed9 100644
--- a/Emerald/Properties/launchSettings.json
+++ b/Emerald/Properties/launchSettings.json
@@ -9,21 +9,21 @@
   },
   "profiles": {
     // Note: In order to select this profile, you'll need to comment the `Packaged` profile below until this is fixed: https://aka.platform.uno/wasdk-maui-debug-profile-issue
-    "Emerald.Uno (WinAppSDK Unpackaged)": {
+    "Emerald (WinAppSDK Unpackaged)": {
       "commandName": "Project",
       "compatibleTargetFramework": "windows"
     },
-    "Emerald.Uno (WinAppSDK Packaged)": {
+    "Emerald (WinAppSDK Packaged)": {
       "commandName": "MsixPackage",
       "compatibleTargetFramework": "windows"
     },
-    "Emerald.Uno (Desktop)": {
+    "Emerald (Desktop)": {
       "commandName": "Project",
       "compatibleTargetFramework": "desktop"
     },
-    "Emerald.Uno (Desktop WSL2)": {
+    "Emerald (Desktop WSL2)": {
       "commandName": "WSL2",
-      "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Emerald.Uno.dll",
+      "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Emerald.dll",
       "distributionName": "",
       "compatibleTargetFramework": "desktop"
     }
diff --git a/Emerald/Strings/en/Resources.resw b/Emerald/Strings/en/Resources.resw
index 2723b3c3..a311865f 100644
--- a/Emerald/Strings/en/Resources.resw
+++ b/Emerald/Strings/en/Resources.resw
@@ -118,6 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ApplicationName" xml:space="preserve">
-    <value>Emerald.Uno-en</value>
+    <value>Emerald-en</value>
   </data>
 </root>
diff --git a/Emerald/UserControls/Titlebar.xaml b/Emerald/UserControls/Titlebar.xaml
index 6851a77b..76be090a 100644
--- a/Emerald/UserControls/Titlebar.xaml
+++ b/Emerald/UserControls/Titlebar.xaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Emerald.Uno.UserControls.TitleBar"
+    x:Class="Emerald.UserControls.TitleBar"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Emerald.Uno.UserControls"
+    xmlns:local="using:Emerald.UserControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
@@ -27,7 +27,7 @@
                 Margin="8,0,0,0"
                 VerticalAlignment="Center"
                 Style="{ThemeResource CaptionTextBlockStyle}"
-                Text="Emerald.Uno" />
+                Text="Emerald" />
       <TextBlock
                 x:Name="PreviewTitle"
                 Margin="4,0,0,0"
diff --git a/Emerald/UserControls/Titlebar.xaml.cs b/Emerald/UserControls/Titlebar.xaml.cs
index dafb733a..b134aa33 100644
--- a/Emerald/UserControls/Titlebar.xaml.cs
+++ b/Emerald/UserControls/Titlebar.xaml.cs
@@ -15,7 +15,7 @@
 
 // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
-namespace Emerald.Uno.UserControls;
+namespace Emerald.UserControls;
 public sealed partial class TitleBar : UserControl
 {
     public TitleBar()
diff --git a/Emerald/Views/Settings/SettingsPage.xaml b/Emerald/Views/Settings/SettingsPage.xaml
index 90beefd9..4587aa96 100644
--- a/Emerald/Views/Settings/SettingsPage.xaml
+++ b/Emerald/Views/Settings/SettingsPage.xaml
@@ -1,12 +1,12 @@
 <Page
-    x:Class="Emerald.Uno.Views.Settings.SettingsPage"
+    x:Class="Emerald.Views.Settings.SettingsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:helpers="using:Emerald.Uno.Helpers"
-    xmlns:local="using:Emerald.Uno.Views.Settings"
+    xmlns:helpers="using:Emerald.Helpers"
+    xmlns:local="using:Emerald.Views.Settings"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:uc="using:Emerald.Uno.UserControls"
+    xmlns:uc="using:Emerald.UserControls"
     mc:Ignorable="d">
 
   <Page.Resources>
diff --git a/Emerald/Views/Settings/SettingsPage.xaml.cs b/Emerald/Views/Settings/SettingsPage.xaml.cs
index 74339021..9e10d21a 100644
--- a/Emerald/Views/Settings/SettingsPage.xaml.cs
+++ b/Emerald/Views/Settings/SettingsPage.xaml.cs
@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml.Media.Animation;
 using System;
 
-namespace Emerald.Uno.Views.Settings
+namespace Emerald.Views.Settings
 {
     public sealed partial class SettingsPage : Page
     {
diff --git a/Emerald/app.manifest b/Emerald/app.manifest
index a61e665f..7c69768c 100644
--- a/Emerald/app.manifest
+++ b/Emerald/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="Emerald.Uno.Windows.app"/>
+  <assemblyIdentity version="1.0.0.0" name="Emerald.Windows.app"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>