diff --git a/src/Files.Shared/Enums/FormFactorMode.cs b/src/Files.Shared/Enums/FormFactorMode.cs
deleted file mode 100644
index 9ac5ae7d9bf0..000000000000
--- a/src/Files.Shared/Enums/FormFactorMode.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Files.Shared.Enums
-{
-    public enum FormFactorMode
-    {
-        Regular = 0,
-        //TouchEnhancedRegular = 1,
-        //Tablet = 2,
-        //Cloud = 3,
-        //Classic = 4
-    }
-}
\ No newline at end of file
diff --git a/src/Files.Shared/Enums/GroupOption.cs b/src/Files.Shared/Enums/GroupOption.cs
new file mode 100644
index 000000000000..c042e2a95569
--- /dev/null
+++ b/src/Files.Shared/Enums/GroupOption.cs
@@ -0,0 +1,17 @@
+namespace Files.Shared.Enums
+{
+    public enum GroupOption : byte
+    {
+        None,
+        Name,
+        DateModified,
+        DateCreated,
+        Size,
+        FileType,
+        SyncStatus, // Cloud drive
+        FileTag,
+        OriginalFolder, // Recycle bin
+        DateDeleted, // Recycle bin
+        FolderPath, // Libraries
+    }
+}
\ No newline at end of file
diff --git a/src/Files.Shared/Enums/SidebarOpacity.cs b/src/Files.Shared/Enums/SidebarOpacity.cs
deleted file mode 100644
index 3a1c2e45ad22..000000000000
--- a/src/Files.Shared/Enums/SidebarOpacity.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Files.Shared.Enums
-{
-    public enum SidebarOpacity
-    {
-        Opaque = 0,
-        IsAcrylicDisabled = 1
-    }
-}
\ No newline at end of file
diff --git a/src/Files.Shared/Enums/SortDirection.cs b/src/Files.Shared/Enums/SortDirection.cs
new file mode 100644
index 000000000000..3c9b42251c5a
--- /dev/null
+++ b/src/Files.Shared/Enums/SortDirection.cs
@@ -0,0 +1,11 @@
+namespace Files.Shared.Enums
+{
+    /// <summary>
+    /// SortDirection is used instead of the CommunityToolkit equivalent because it is tied to the model
+    /// </summary>
+    public enum SortDirection : byte
+    {
+        Ascending = 0,
+        Descending = 1
+    }
+}
\ No newline at end of file
diff --git a/src/Files.Shared/Enums/SortOption.cs b/src/Files.Shared/Enums/SortOption.cs
new file mode 100644
index 000000000000..1312b6add641
--- /dev/null
+++ b/src/Files.Shared/Enums/SortOption.cs
@@ -0,0 +1,15 @@
+namespace Files.Shared.Enums
+{
+    public enum SortOption : byte
+    {
+        Name,
+        DateModified,
+        DateCreated,
+        Size,
+        FileType,
+        SyncStatus,
+        FileTag,
+        OriginalFolder,
+        DateDeleted
+    }
+}
\ No newline at end of file
diff --git a/src/Files.Shared/Enums/SortOptions.cs b/src/Files.Shared/Enums/SortOptions.cs
deleted file mode 100644
index 3e82d42ba9af..000000000000
--- a/src/Files.Shared/Enums/SortOptions.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace Files.Shared.Enums
-{
-    public enum SortOption : byte
-    {
-        Name,
-        DateModified,
-        DateCreated,
-        Size,
-        FileType,
-        SyncStatus,
-        FileTag,
-        OriginalFolder,
-        DateDeleted
-    }
-
-    public enum GroupOption : byte
-    {
-        None,
-        Name,
-        DateModified,
-        DateCreated,
-        Size,
-        FileType,
-        SyncStatus, // Cloud drive
-        FileTag,
-        OriginalFolder, // Recycle bin
-        DateDeleted, // Recycle bin
-        FolderPath, // Libraries
-    }
-
-    public enum SortDirection : byte // We cannot use Microsoft.Toolkit.Uwp.UI.SortDirection since it's UI-tied and we need Model-tied
-    {
-        Ascending = 0,
-        Descending = 1
-    }
-}
\ No newline at end of file