diff --git a/Feather.xcodeproj/project.pbxproj b/Feather.xcodeproj/project.pbxproj
index c938febe9..fd8d20efc 100644
--- a/Feather.xcodeproj/project.pbxproj
+++ b/Feather.xcodeproj/project.pbxproj
@@ -20,7 +20,6 @@
 		336D43982DB7454A00206400 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 336D43972DB7454A00206400 /* MobileCoreServices.framework */; };
 		3371F7322DA9ECDD00281AC6 /* Zip in Frameworks */ = {isa = PBXBuildFile; productRef = 3371F7312DA9ECDD00281AC6 /* Zip */; };
 		33CF13392DB5ACFB0021D4C5 /* SWCompression in Frameworks */ = {isa = PBXBuildFile; productRef = 33CF13382DB5ACFB0021D4C5 /* SWCompression */; };
-		570920BE2F98A4F0008C4A83 /* Feather.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 570920BD2F98A4F0008C4A83 /* Feather.xcconfig */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -122,12 +121,10 @@
 				3379C1B52DA869A1004372DA /* Sources */,
 				3379C1B62DA869A1004372DA /* Frameworks */,
 				3379C1B72DA869A1004372DA /* Resources */,
-				3379BC662DC9DB32004372DA /* Copy Acknowledgements */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				339776072DC9D0F800642FFB /* PBXTargetDependency */,
 			);
 			fileSystemSynchronizedGroups = (
 				3379C1BB2DA869A1004372DA /* Feather */,
@@ -194,7 +191,6 @@
 				330F68FF2DC03DF400D8C35D /* XCLocalSwiftPackageReference "NimbleKit" */,
 				3346F8372DC6C68300C7D508 /* XCRemoteSwiftPackageReference "Nuke" */,
 				33693A062DC8BF5B00730215 /* XCLocalSwiftPackageReference "AltSourceKit" */,
-				339776052DC9D05C00642FFB /* XCRemoteSwiftPackageReference "LicensePlist" */,
 				3349E7652DEFB46F00E317ED /* XCLocalSwiftPackageReference "IDeviceKitten" */,
 			);
 			preferredProjectObjectVersion = 77;
@@ -212,29 +208,11 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				570920BE2F98A4F0008C4A83 /* Feather.xcconfig in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		3379BC662DC9DB32004372DA /* Copy Acknowledgements */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Copy Acknowledgements";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "echo \"Will copy acknowledgements\"\n\nACKNOWLEDGEMENTS_DIR=${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/com.mono0926.LicensePlist.Output\nDESTINATION_PATH=${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Settings.bundle/\n\ncp -r \"${ACKNOWLEDGEMENTS_DIR}\"/thewonderofyou.Feather \"${DESTINATION_PATH}\"\ncp -r \"${ACKNOWLEDGEMENTS_DIR}\"/thewonderofyou.Feather.plist \"${DESTINATION_PATH}\"\nrm -rf \"${ACKNOWLEDGEMENTS_DIR}\"\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		3379C1B52DA869A1004372DA /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -245,13 +223,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		339776072DC9D0F800642FFB /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = 339776062DC9D0F800642FFB /* LicensePlistBuildTool */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin XCBuildConfiguration section */
 		3379C1CB2DA869A3004372DA /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -568,14 +539,6 @@
 				minimumVersion = 2.1.2;
 			};
 		};
-		339776052DC9D05C00642FFB /* XCRemoteSwiftPackageReference "LicensePlist" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/mono0926/LicensePlist";
-			requirement = {
-				kind = exactVersion;
-				version = 3.27.1;
-			};
-		};
 		33CF13372DB5ACFB0021D4C5 /* XCRemoteSwiftPackageReference "SWCompression" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/tsolomko/SWCompression";
@@ -634,11 +597,6 @@
 			package = 3371F6F52DA9EBA500281AC6 /* XCRemoteSwiftPackageReference "Zip" */;
 			productName = Zip;
 		};
-		339776062DC9D0F800642FFB /* LicensePlistBuildTool */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 339776052DC9D05C00642FFB /* XCRemoteSwiftPackageReference "LicensePlist" */;
-			productName = "plugin:LicensePlistBuildTool";
-		};
 		33CF13382DB5ACFB0021D4C5 /* SWCompression */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 33CF13372DB5ACFB0021D4C5 /* XCRemoteSwiftPackageReference "SWCompression" */;
diff --git a/Feather.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Feather.xcworkspace/xcshareddata/swiftpm/Package.resolved
index bf5605f0b..5baf97281 100644
--- a/Feather.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Feather.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,14 +1,5 @@
 {
   "pins" : [
-    {
-      "identity" : "apikit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/ishkawa/APIKit.git",
-      "state" : {
-        "revision" : "b839e53b870104798035b279d2a6168b0a2227b1",
-        "version" : "5.4.0"
-      }
-    },
     {
       "identity" : "async-http-client",
       "kind" : "remoteSourceControl",
@@ -45,33 +36,6 @@
         "version" : "4.15.2"
       }
     },
-    {
-      "identity" : "heliumlogger",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Kitura/HeliumLogger.git",
-      "state" : {
-        "revision" : "fc2a71597ae974da5282d751bcc11965964bccce",
-        "version" : "2.0.0"
-      }
-    },
-    {
-      "identity" : "licenseplist",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/mono0926/LicensePlist",
-      "state" : {
-        "revision" : "ab1692c16f4ce50fc134a8f51179f3310d41c5ef",
-        "version" : "3.27.1"
-      }
-    },
-    {
-      "identity" : "loggerapi",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Kitura/LoggerAPI.git",
-      "state" : {
-        "revision" : "4e6b45e850ffa275e8e26a24c6454fd709d5b6ac",
-        "version" : "2.0.0"
-      }
-    },
     {
       "identity" : "multipart-kit",
       "kind" : "remoteSourceControl",
@@ -126,15 +90,6 @@
         "version" : "1.2.1"
       }
     },
-    {
-      "identity" : "swift-argument-parser",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser.git",
-      "state" : {
-        "revision" : "41982a3656a71c768319979febd796c6fd111d5c",
-        "version" : "1.5.0"
-      }
-    },
     {
       "identity" : "swift-asn1",
       "kind" : "remoteSourceControl",
@@ -171,15 +126,6 @@
         "version" : "3.12.3"
       }
     },
-    {
-      "identity" : "swift-html-entities",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Kitura/swift-html-entities.git",
-      "state" : {
-        "revision" : "d8ca73197f59ce260c71bd6d7f6eb8bbdccf508b",
-        "version" : "4.0.1"
-      }
-    },
     {
       "identity" : "swift-http-structured-headers",
       "kind" : "remoteSourceControl",
@@ -297,24 +243,6 @@
         "version" : "2.15.0"
       }
     },
-    {
-      "identity" : "xcodeedit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/tomlokhorst/XcodeEdit.git",
-      "state" : {
-        "revision" : "0e550cdee72844b35431afc3a1e176042be6d0f0",
-        "version" : "2.13.0"
-      }
-    },
-    {
-      "identity" : "yams",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/jpsim/Yams.git",
-      "state" : {
-        "revision" : "b4b8042411dc7bbb696300a34a4bf3ba1b7ad19b",
-        "version" : "5.3.1"
-      }
-    },
     {
       "identity" : "zip",
       "kind" : "remoteSourceControl",
diff --git a/Feather/FeatherApp.swift b/Feather/AppDelegate.swift
similarity index 64%
rename from Feather/FeatherApp.swift
rename to Feather/AppDelegate.swift
index 63ed30db7..1a80ad907 100644
--- a/Feather/FeatherApp.swift
+++ b/Feather/AppDelegate.swift
@@ -1,160 +1,45 @@
 //
-//  FeatherApp.swift
+//  AppDelegate.swift
 //  Feather
 //
-//  Created by samara on 10.04.2025.
+//  Created by samsam on 5/25/26.
 //
 
+import UIKit
 import SwiftUI
 import Nuke
 import IDeviceSwift
 import OSLog
 
-@main
-struct FeatherApp: App {
-	@UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
-	
-	let heartbeat = HeartbeatManager.shared
-	
-	@StateObject var downloadManager = DownloadManager.shared
-	let storage = Storage.shared
-	
-	var body: some Scene {
-		WindowGroup {
-			VStack {
-				DownloadHeaderView(downloadManager: downloadManager)
-					.transition(.move(edge: .top).combined(with: .opacity))
-				VariedTabbarView()
-					.environment(\.managedObjectContext, storage.context)
-					.onOpenURL(perform: _handleURL)
-					.transition(.move(edge: .top).combined(with: .opacity))
-			}
-			.animation(.smooth, value: downloadManager.manualDownloads.description)
-			.onReceive(NotificationCenter.default.publisher(for: .heartbeatInvalidHost)) { _ in
-				DispatchQueue.main.async {
-					UIAlertController.showAlertWithOk(
-						title: "InvalidHostID",
-						message: .localized("Your pairing file is invalid and is incompatible with your device, please import a valid pairing file.")
-					)
-				}
-			}
-			// dear god help me
-			.onAppear {
-				if let style = UIUserInterfaceStyle(rawValue: UserDefaults.standard.integer(forKey: "Feather.userInterfaceStyle")) {
-					UIApplication.topViewController()?.view.window?.overrideUserInterfaceStyle = style
-				}
-				
-				UIApplication.topViewController()?.view.window?.tintColor = UIColor(Color(hex: UserDefaults.standard.string(forKey: "Feather.userTintColor") ?? "#848ef9"))
-			}
-		}
-	}
-	
-	private func _handleURL(_ url: URL) {
-		if url.scheme == "feather" {
-			/// feather://import-certificate?p12=<base64>&mobileprovision=<base64>&password=<base64>
-			if url.host == "import-certificate" {
-				guard
-					let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
-					let queryItems = components.queryItems
-				else {
-					return
-				}
-				
-				func queryValue(_ name: String) -> String? {
-					queryItems.first(where: { $0.name == name })?.value?.removingPercentEncoding
-				}
-				
-				guard
-					let p12Base64 = queryValue("p12"),
-					let provisionBase64 = queryValue("mobileprovision"),
-					let passwordBase64 = queryValue("password"),
-					let passwordData = Data(base64Encoded: passwordBase64),
-					let password = String(data: passwordData, encoding: .utf8)
-				else {
-					return
-				}
-				
-				let generator = UINotificationFeedbackGenerator()
-				generator.prepare()
-				
-				guard
-					let p12URL = FileManager.default.decodeAndWrite(base64: p12Base64, pathComponent: ".p12"),
-					let provisionURL = FileManager.default.decodeAndWrite(base64: provisionBase64, pathComponent: ".mobileprovision"),
-					FR.checkPasswordForCertificate(for: p12URL, with: password, using: provisionURL)
-				else {
-					generator.notificationOccurred(.error)
-					return
-				}
-				
-				FR.handleCertificateFiles(
-					p12URL: p12URL,
-					provisionURL: provisionURL,
-					p12Password: password
-				) { error in
-					if let error = error {
-						UIAlertController.showAlertWithOk(title: .localized("Error"), message: error.localizedDescription)
-					} else {
-						generator.notificationOccurred(.success)
-					}
-				}
-				
-				return
-			}
-			/// feather://export-certificate?callback_template=<template>
-			/// ?callback_template=: This is how we callback to the application requesting the certificate, this will be a url scheme
-			/// 	example: livecontainer%3A%2F%2Fcertificate%3Fcert%3D%24%28BASE64_CERT%29%26password%3D%24%28PASSWORD%29
-			/// 	decoded: livecontainer://certificate?cert=$(BASE64_CERT)&password=$(PASSWORD)
-			/// $(BASE64_CERT) and $(PASSWORD) must be presenting in the callback template so we can replace them with the proper content
-			if url.host == "export-certificate" {
-				guard
-					let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
-				else {
-					return
-				}
-				
-				let queryItems = components.queryItems?.reduce(into: [String: String]()) { $0[$1.name.lowercased()] = $1.value } ?? [:]
-				guard let callbackTemplate = queryItems["callback_template"]?.removingPercentEncoding else { return }
-				
-				FR.exportCertificateAndOpenUrl(using: callbackTemplate)
-			}
-			/// feather://source/<url>
-			if let fullPath = url.validatedScheme(after: "/source/") {
-				FR.handleSource(fullPath) { }
-			}
-			/// feather://install/<url.ipa>
-			if
-				let fullPath = url.validatedScheme(after: "/install/"),
-				let downloadURL = URL(string: fullPath)
-			{
-				_ = DownloadManager.shared.startDownload(from: downloadURL)
-			}
-		} else {
-			if url.pathExtension == "ipa" || url.pathExtension == "tipa" {
-				if FileManager.default.isFileFromFileProvider(at: url) {
-					guard url.startAccessingSecurityScopedResource() else { return }
-					FR.handlePackageFile(url) { _ in }
-				} else {
-					FR.handlePackageFile(url) { _ in }
-				}
-				
-				return
-			}
-		}
-	}
-}
-
-class AppDelegate: NSObject, UIApplicationDelegate {
+@main final class AppDelegate: UIResponder, UIApplicationDelegate {	
 	func application(
 		_ application: UIApplication,
 		didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
 	) -> Bool {
+		let _ = Storage.shared
+		let _ = DownloadManager.shared
+		let _ = HeartbeatManager.shared
+		
 		_createPipeline()
 		_createDocumentsDirectories()
-		ResetView.clearWorkCache()
 		_addDefaultCertificates()
+		
 		return true
 	}
 	
+	func application(
+		_ application: UIApplication,
+		configurationForConnecting connectingSceneSession: UISceneSession,
+		options: UIScene.ConnectionOptions
+	) -> UISceneConfiguration {
+		let config = UISceneConfiguration(
+			name: "Default Configuration",
+			sessionRole: connectingSceneSession.role
+		)
+		config.delegateClass = SceneDelegate.self
+		return config
+	}
+	
 	private func _createPipeline() {
 		DataLoader.sharedUrlCache.diskCapacity = 0
 		
@@ -164,10 +49,13 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 				config.urlCache = nil
 				return DataLoader(configuration: config)
 			}()
-			let dataCache = try? DataCache(name: "thewonderofyou.Feather.datacache") // disk cache
-			let imageCache = Nuke.ImageCache() // memory cache
+			
+			let dataCache = try? DataCache(name: "\(Bundle.main.bundleIdentifier!).datacache")
+			let imageCache = Nuke.ImageCache()
+			
 			dataCache?.sizeLimit = 500 * 1024 * 1024
 			imageCache.costLimit = 100 * 1024 * 1024
+			
 			$0.dataCache = dataCache
 			$0.imageCache = imageCache
 			$0.dataLoader = dataLoader
@@ -243,5 +131,83 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 			Logger.misc.error("Failed to list signing-assets: \(error)")
 		}
 	}
+	
+	func application(_: UIApplication, open url: URL, options _: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+		if url.scheme == "feather" {
+			/// feather://import-certificate?p12=<base64>&mobileprovision=<base64>&password=<base64>
+			if url.host == "import-certificate" {
+				guard
+					let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
+					let queryItems = components.queryItems
+				else {
+					return false
+				}
+				
+				func queryValue(_ name: String) -> String? {
+					queryItems.first(where: { $0.name == name })?.value?.removingPercentEncoding
+				}
+				
+				guard
+					let p12Base64 = queryValue("p12"),
+					let provisionBase64 = queryValue("mobileprovision"),
+					let passwordBase64 = queryValue("password"),
+					let passwordData = Data(base64Encoded: passwordBase64),
+					let password = String(data: passwordData, encoding: .utf8)
+				else {
+					return false
+				}
+				
+				let generator = UINotificationFeedbackGenerator()
+				generator.prepare()
+				
+				guard
+					let p12URL = FileManager.default.decodeAndWrite(base64: p12Base64, pathComponent: ".p12"),
+					let provisionURL = FileManager.default.decodeAndWrite(base64: provisionBase64, pathComponent: ".mobileprovision"),
+					FR.checkPasswordForCertificate(for: p12URL, with: password, using: provisionURL)
+				else {
+					generator.notificationOccurred(.error)
+					return false
+				}
+				
+				FR.handleCertificateFiles(
+					p12URL: p12URL,
+					provisionURL: provisionURL,
+					p12Password: password
+				) { error in
+					if let error = error {
+						UIAlertController.showAlertWithOk(title: .localized("Error"), message: error.localizedDescription)
+					} else {
+						generator.notificationOccurred(.success)
+					}
+				}
+				
+				return true
+			}
+			/// feather://source/<url>
+			if let fullPath = url.validatedScheme(after: "/source/") {
+				FR.handleSource(fullPath) { }
+			}
+			/// feather://install/<url.ipa>
+			if
+				let fullPath = url.validatedScheme(after: "/install/"),
+				let downloadURL = URL(string: fullPath)
+			{
+				_ = DownloadManager.shared.startDownload(from: downloadURL)
+			}
+		} else {
+			if url.pathExtension == "ipa" || url.pathExtension == "tipa" {
+				if FileManager.default.isFileFromFileProvider(at: url) {
+					guard url.startAccessingSecurityScopedResource() else { return false }
+					FR.handlePackageFile(url) { _ in }
+				} else {
+					FR.handlePackageFile(url) { _ in }
+				}
+				
+				return true
+			}
+		}
+		
+		return false
+	}
 
 }
diff --git a/Feather/Resources/Info.plist b/Feather/Resources/Info.plist
index 28cda2a5b..a3f4db054 100644
--- a/Feather/Resources/Info.plist
+++ b/Feather/Resources/Info.plist
@@ -198,18 +198,35 @@
 			</dict>
 		</dict>
 	</array>
-<key>NSAppTransportSecurity</key>
-<dict>
-    <key>NSExceptionDomains</key>
-    <dict>
-        <key>claration.dev</key>
-        <dict>
-            <key>NSIncludesSubdomains</key>
-            <true/>
-            <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
-            <true/>
-        </dict>
-    </dict>
-</dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>claration.dev</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+		</dict>
+	</dict>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+					<key>UISceneDelegateClassName</key>
+					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/Feather/Resources/Settings.bundle/Root.plist b/Feather/Resources/Settings.bundle/Root.plist
deleted file mode 100644
index 4066b21cb..000000000
--- a/Feather/Resources/Settings.bundle/Root.plist
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreferenceSpecifiers</key>
-	<array>
-		<dict>
-			<key>Type</key>
-			<string>PSChildPaneSpecifier</string>
-			<key>Title</key>
-			<string>Acknowledgements</string>
-			<key>File</key>
-			<string>thewonderofyou.Feather</string>
-		</dict>
-	</array>
-	<key>StringsTable</key>
-	<string>Root</string>
-</dict>
-</plist>
diff --git a/Feather/Resources/Settings.bundle/en.lproj/Root.strings b/Feather/Resources/Settings.bundle/en.lproj/Root.strings
deleted file mode 100644
index b4ff77da9..000000000
--- a/Feather/Resources/Settings.bundle/en.lproj/Root.strings
+++ /dev/null
@@ -1,3 +0,0 @@
-/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */
-
-"Acknowledgements" = "Acknowledgements";
diff --git a/Feather/SceneDelegate.swift b/Feather/SceneDelegate.swift
new file mode 100644
index 000000000..962c1e760
--- /dev/null
+++ b/Feather/SceneDelegate.swift
@@ -0,0 +1,40 @@
+//
+//  SceneDelegate.swift
+//  Feather
+//
+//  Created by samsam on 5/25/26.
+//
+
+import UIKit
+import struct SwiftUI.Color
+
+class SceneDelegate: UIResponder, UIWindowSceneDelegate {
+	var window: UIWindow?
+
+	func scene(
+		_ scene: UIScene,
+		willConnectTo session: UISceneSession,
+		options connectionOptions: UIScene.ConnectionOptions
+	) {
+		guard let windowScene = scene as? UIWindowScene else { return }
+		
+		let window = UIWindow(windowScene: windowScene)
+		let controller = TabBarController()
+		window.rootViewController = controller
+		
+		if 
+			let data = UserDefaults.standard.data(forKey: "Feather.userTintColor"),
+			let color = try? NSKeyedUnarchiver.unarchivedObject(ofClass: UIColor.self, from: data) 
+		{
+			window.tintColor = color
+		}
+		
+		window.overrideUserInterfaceStyle = UIUserInterfaceStyle(
+			rawValue: UserDefaults.standard.integer(forKey: "Feather.userInterfaceStyle")
+		) ?? .unspecified
+		
+		window.makeKeyAndVisible()
+		
+		self.window = window
+	}
+}
diff --git a/Feather/Utilities/iconPoc.m b/Feather/Utilities/iconPoc.m
index faf5f9b7a..a6f0b8303 100644
--- a/Feather/Utilities/iconPoc.m
+++ b/Feather/Utilities/iconPoc.m
@@ -253,36 +253,18 @@ - (NSUInteger)platform {
 }
 
 static CGColorRef FRCreateCGColorFromHex(void) {
-	NSString *hex =
-		[NSUserDefaults.standardUserDefaults
-			stringForKey:@"Feather.userTintColor"];
-
-	if (hex.length == 0) {
+	NSData *data = [NSUserDefaults.standardUserDefaults dataForKey:@"Feather.userTintColor"];
+	
+	if (data == nil) {
 		return UIColor.systemGreenColor.CGColor;
 	}
-
-	NSString *sanitized =
-		[[hex stringByTrimmingCharactersInSet:
-			NSCharacterSet.whitespaceAndNewlineCharacterSet]
-			stringByReplacingOccurrencesOfString:@"#" withString:@""];
-
-	unsigned long long rgb = 0;
-	[[NSScanner scannerWithString:sanitized] scanHexLongLong:&rgb];
-
-	CGFloat r = 0, g = 0, b = 0, a = 1;
-
-	if (sanitized.length == 6) {
-		r = ((rgb & 0xFF0000) >> 16) / 255.0;
-		g = ((rgb & 0x00FF00) >> 8)  / 255.0;
-		b = (rgb & 0x0000FF) / 255.0;
-	} else if (sanitized.length == 8) {
-		r = ((rgb & 0xFF000000) >> 24) / 255.0;
-		g = ((rgb & 0x00FF0000) >> 16) / 255.0;
-		b = ((rgb & 0x0000FF00) >> 8)  / 255.0;
-		a = (rgb & 0x000000FF) / 255.0;
-	} else {
+	
+	NSError *error = nil;
+	UIColor *color = [NSKeyedUnarchiver unarchivedObjectOfClass:UIColor.class fromData:data error:&error];
+	
+	if (error != nil || color == nil) {
 		return UIColor.systemGreenColor.CGColor;
 	}
-
-	return [UIColor colorWithRed:r green:g blue:b alpha:a].CGColor;
+	
+	return color.CGColor;
 }
diff --git a/Feather/Views/Settings/AdvancedViewController.swift b/Feather/Views/Settings/AdvancedViewController.swift
new file mode 100644
index 000000000..d2bd6136a
--- /dev/null
+++ b/Feather/Views/Settings/AdvancedViewController.swift
@@ -0,0 +1,193 @@
+//
+//  AdvancedViewController.swift
+//  Feather
+//
+//  Created by samsam on 5/24/26.
+//
+
+import UIKit
+import Nuke
+
+class AdvancedViewController: ThemedTableViewController {
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		title = .localized("Advanced")
+	}
+}
+
+extension AdvancedViewController {
+	override func numberOfSections(in tableView: UITableView) -> Int {
+		2
+	}
+	
+	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+		switch section {
+		case 0: 1
+		case 1: 7
+		default: 0
+		}
+	}
+	
+	override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+		if section == 1 { "Advanced" } else { nil }
+	}
+	
+	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+		let cell = tableView.dequeueReusableCell(
+			withIdentifier: "Cell",
+			for: indexPath
+		)
+
+		var content = cell.defaultContentConfiguration()
+		cell.accessoryType = .none
+		cell.accessoryView = nil
+		content.textProperties.color = .tintColor
+		cell.accessoryType = .disclosureIndicator
+
+		switch (indexPath.section, indexPath.row) {
+		case (0, 0):
+			content.text = "Run in background"
+			content.textProperties.color = .label
+			
+			let toggle = UISwitch()
+			toggle.isOn = UserDefaults.standard.bool(forKey: "Feather.stayInBackground")
+			toggle.addTarget(self, action: #selector(_stayInBackgroundSwitchChanged(_:)), for: .valueChanged)
+			cell.accessoryView = toggle
+			cell.accessoryType = .none
+			cell.selectionStyle = .none
+		case (1, 0): content.text = "Clear Caches"
+		case (1, 1): content.text = "Clear Sources"
+		case (1, 2): content.text = "Clear Signed Apps"
+		case (1, 3): content.text = "Clear Imported Apps"
+		case (1, 4): content.text = "Clear Certificates"
+		case (1, 5): content.text = "Reset Settings"
+		case (1, 6): content.text = "Reset"
+		default: break
+		}
+
+		cell.contentConfiguration = content
+		return cell
+	}
+	
+	@objc private func _stayInBackgroundSwitchChanged(_ sender: UISwitch) {}
+	
+	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+		switch (indexPath.section, indexPath.row) {
+		case (0, 0): return
+		case (1, 0):
+			_resetAlert(title: "Clear Caches", message: _cacheSize()) {
+				_clearCaches()
+			}
+		case (1, 1):
+			_resetAlert(title: "Clear Sources", message: Storage.shared.countContent(for: AltSource.self)) {
+				_clearSources()
+			}
+		case (1, 2):
+			_resetAlert(title: "Clear Signed Apps", message: Storage.shared.countContent(for: Signed.self)) {
+				_clearSources()
+			}
+		case (1, 3):
+			_resetAlert(title: "Clear Imported Apps", message: Storage.shared.countContent(for: Imported.self)) {
+				_clearSources()
+			}
+		case (1, 4):
+			_resetAlert(title: "Clear Certificates", message: Storage.shared.countContent(for: CertificatePair.self)) {
+				_clearSources()
+			}
+		case (1, 5):
+			_resetAlert(title: "Reset Settings") {
+				_resetSettings()
+			}
+		case (1, 6):
+			_resetAlert(title: "Reset") {
+				_resetAll()
+			}
+		default: break
+		}
+		
+		tableView.deselectRow(at: indexPath, animated: true)
+	}
+}
+
+fileprivate func _resetAlert(
+	title: String,
+	message: String = "",
+	action: @escaping () -> Void
+) {
+	let action = UIAlertAction(
+		title: "Continue",
+		style: .destructive
+	) { _ in
+		action()
+		UIApplication.shared.suspendAndReopen()
+	}
+	
+	let style: UIAlertController.Style = UIDevice.current.userInterfaceIdiom == .pad
+		? .alert
+		: .actionSheet
+	
+	var msg = ""
+	if !message.isEmpty { msg = message + "\n" }
+	msg.append(.localized("This action cannot be undone. Would you like to proceed?"))
+
+	UIAlertController.showAlertWithCancel(
+		title: title,
+		message: msg,
+		style: style,
+		actions: [action]
+	)
+}
+
+fileprivate func _cacheSize() -> String {
+	var totalCacheSize = URLCache.shared.currentDiskUsage
+	if let nukeCache = ImagePipeline.shared.configuration.dataCache as? DataCache {
+		totalCacheSize += nukeCache.totalSize
+	}
+	return "\(ByteCountFormatter.string(fromByteCount: Int64(totalCacheSize), countStyle: .file))"
+}
+
+fileprivate func _clearCaches() {
+	URLCache.shared.removeAllCachedResponses()
+	HTTPCookieStorage.shared.removeCookies(since: Date.distantPast)
+	
+	if let dataCache = ImagePipeline.shared.configuration.dataCache as? DataCache {
+		dataCache.removeAll()
+	}
+	
+	if let imageCache = ImagePipeline.shared.configuration.imageCache as? Nuke.ImageCache {
+		imageCache.removeAll()
+	}
+}
+
+fileprivate func _clearSources() {
+	Storage.shared.clearContext(request: AltSource.fetchRequest())
+}
+
+fileprivate func _clearSignedApps() {
+	Storage.shared.clearContext(request: Signed.fetchRequest())
+	try? FileManager.default.removeFileIfNeeded(at: FileManager.default.signed)
+}
+
+fileprivate func _clearImportedApps() {
+	Storage.shared.clearContext(request: Imported.fetchRequest())
+	try? FileManager.default.removeFileIfNeeded(at: FileManager.default.unsigned)
+}
+
+fileprivate func _clearCertificates(resetAll: Bool = false) {
+	if !resetAll { UserDefaults.standard.set(0, forKey: "feather.selectedCert") }
+	Storage.shared.clearContext(request: CertificatePair.fetchRequest())
+	try? FileManager.default.removeFileIfNeeded(at: FileManager.default.certificates)
+}
+
+fileprivate func _resetSettings() {
+	UserDefaults.standard.removePersistentDomain(forName: Bundle.main.bundleIdentifier!)
+}
+
+fileprivate func _resetAll() {
+	_clearCaches()
+	_clearSources()
+	_clearSignedApps()
+	_clearImportedApps()
+	_clearCertificates(resetAll: true)
+	_resetSettings()
+}
diff --git a/Feather/Views/Settings/App Icon/AppIconView.swift b/Feather/Views/Settings/App Icon/AppIconView.swift
deleted file mode 100644
index 32d70b692..000000000
--- a/Feather/Views/Settings/App Icon/AppIconView.swift	
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-//  AppIconView.swift
-//  Feather
-//
-//  Created by samara on 19.06.2025.
-//
-
-import SwiftUI
-import NimbleViews
-
-// MARK: - View extension: Model
-extension AppIconView {
-	struct AltIcon: Identifiable {
-		var displayName: String
-		var author: String
-		var key: String?
-		var image: UIImage
-		var id: String { key ?? displayName }
-		
-		init(displayName: String, author: String, key: String? = nil) {
-			self.displayName = displayName
-			self.author = author
-			self.key = key
-			self.image = altImage(key)
-		}
-	}
-	
-	static func altImage(_ name: String?) -> UIImage {
-		let path = Bundle.main.bundleURL.appendingPathComponent((name ?? "AppIcon60x60") + "@2x.png")
-		return UIImage(contentsOfFile: path.path) ?? UIImage()
-	}
-}
-
-// MARK: - View
-struct AppIconView: View {
-	@Binding var currentIcon: String?
-	
-	// dont translate
-	var sections: [String: [AltIcon]] = [
-		"Main": [
-			AltIcon(displayName: "Feather", author: "Samara", key: nil),
-			AltIcon(displayName: "Feather (macOS)", author: "Samara", key: "V2Mac"),
-			AltIcon(displayName: "Feather v1", author: "Samara", key: "V1"),
-			AltIcon(displayName: "Feather v1 (macOS)", author: "Samara", key: "V1Mac"),
-			AltIcon(displayName: "Feather v0", author: "Samara", key: "V0"),
-			AltIcon(displayName: "Feather Donor", author: "Samara", key: "Donor")
-		],
-		"Wingio": [
-			AltIcon(displayName: "Feather", author: "Wingio", key: "Wing"),
-		]
-	]
-	
-	// MARK: Body
-	var body: some View {
-		NBList(.localized("App Icon")) {
-			ForEach(sections.keys.sorted(), id: \.self) { section in
-				if let icons = sections[section] {
-					NBSection(section) {
-						ForEach(icons) { icon in
-							_icon(icon: icon)
-						}
-					}
-				}
-			}
-		}
-		.onAppear {
-			currentIcon = UIApplication.shared.alternateIconName
-		}
-	}
-}
-
-// MARK: - View extension
-extension AppIconView {
-	@ViewBuilder
-	private func _icon(
-		icon: AppIconView.AltIcon
-	) -> some View {
-		Button {
-			UIApplication.shared.setAlternateIconName(icon.key) { _ in
-				currentIcon = UIApplication.shared.alternateIconName
-			}
-		} label: {
-			HStack(spacing: 18) {
-				Image(uiImage: icon.image)
-					.appIconStyle()
-				
-				NBTitleWithSubtitleView(
-					title: icon.displayName,
-					subtitle: icon.author,
-					linelimit: 0
-				)
-				
-				if currentIcon == icon.key {
-					Image(systemName: "checkmark").bold()
-				}
-			}
-		}
-	}
-}
diff --git a/Feather/Views/Settings/Appearance/AppearanceTintColorView.swift b/Feather/Views/Settings/Appearance/AppearanceTintColorView.swift
deleted file mode 100644
index 115893dca..000000000
--- a/Feather/Views/Settings/Appearance/AppearanceTintColorView.swift
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-//  AppearanceTintColorView.swift
-//  Feather
-//
-//  Created by samara on 14.06.2025.
-//
-
-import SwiftUI
-
-// MARK: - View
-struct AppearanceTintColorView: View {
-	@AppStorage("Feather.userTintColor") private var _selectedColorHex: String = "#848ef9"
-	private let _tintOptions: [(name: String, hex: String)] = [
-		("Default", 		"#848ef9"),
-		("V2", 				"#B496DC"),
-		("Berry",   		"#ff7a83"),
-		("Cool Blue", 		"#4161F1"),
-		("Fuchsia", 		"#FF00FF"),
-		("Protokolle", 		"#4CD964"),
-		("Aidoku", 			"#FF2D55"),
-		("Clock", 			"#FF9500"),
-		("Peculiar", 		"#4860e8"),
-		("Very Peculiar", 	"#5394F7"),
-		("Emily",			"#e18aab")
-	]
-	// MARK: Body
-	var body: some View {
-		ScrollView(.horizontal, showsIndicators: false) {
-			LazyHGrid(rows: [GridItem(.fixed(100))], spacing: 12) {
-				ForEach(_tintOptions, id: \.hex) { option in
-					let color = Color(hex: option.hex)
-					let cornerRadius = {
-						if #available(iOS 26.0, *) {
-							28.0
-						} else {
-							10.5
-						}
-					}()
-					VStack(spacing: 8) {
-						Circle()
-							.fill(color)
-							.frame(width: 30, height: 30)
-							.overlay(
-								Circle()
-									.strokeBorder(Color.black.opacity(0.3), lineWidth: 2)
-							)
-
-						Text(option.name)
-							.font(.subheadline)
-							.foregroundColor(.secondary)
-					}
-					.frame(width: 120, height: 100)
-					.background(Color(uiColor: .secondarySystemGroupedBackground))
-					.clipShape(RoundedRectangle(cornerRadius: cornerRadius, style: .continuous))
-					.overlay(
-						RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
-							.strokeBorder(_selectedColorHex == option.hex ? color : .clear, lineWidth: 2)
-					)
-					.onTapGesture {
-						_selectedColorHex = option.hex
-					}
-					.accessibilityLabel(Text(option.name))
-				}
-			}
-		}
-		.onChange(of: _selectedColorHex) { value in
-			UIApplication.topViewController()?.view.window?.tintColor = UIColor(Color(hex: value))
-		}
-	}
-}
diff --git a/Feather/Views/Settings/Appearance/AppearanceView.swift b/Feather/Views/Settings/Appearance/AppearanceView.swift
deleted file mode 100644
index cba2bd025..000000000
--- a/Feather/Views/Settings/Appearance/AppearanceView.swift
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-//  AppearanceView.swift
-//  Feather
-//
-//  Created by samara on 7.05.2025.
-//
-
-import SwiftUI
-import NimbleViews
-import UIKit
-
-// MARK: - View
-// dear god help me
-struct AppearanceView: View {
-	@AppStorage("Feather.userInterfaceStyle")
-	private var _userIntefacerStyle: Int = UIUserInterfaceStyle.unspecified.rawValue
-	
-	@AppStorage("Feather.shouldTintIcons")
-	private var _shouldTintIcons: Bool = false
-	
-	@AppStorage("Feather.shouldChangeIconsBasedOffStyle")
-	private var _shouldChangeIconsBasedOffStyle: Bool = false
-	
-	@AppStorage("Feather.storeCellAppearance")
-	private var _storeCellAppearance: Int = 0
-	private let _storeCellAppearanceMethods: [(name: String, desc: String)] = [
-		(.localized("Standard"), .localized("Default style for the app, only includes subtitle.")),
-		(.localized("Big Description"), .localized("Adds the localized description of the app."))
-	]
-	
-	@AppStorage("Feather.userTintColor")
-	private var _selectedColorHex: String = "#848ef9"
-	
-	private var _tintColorBinding: Binding<Color> {
-		Binding(
-			get: { Color(hex: _selectedColorHex) },
-			set: { _selectedColorHex = $0.toHex() }
-		)
-	}
-	
-	// MARK: Body
-	var body: some View {
-		NBList(.localized("Appearance")) {
-			Section {
-				Picker(.localized("Appearance"), selection: $_userIntefacerStyle) {
-					ForEach(UIUserInterfaceStyle.allCases.sorted(by: { $0.rawValue < $1.rawValue }), id: \.rawValue) { style in
-						Text(style.label).tag(style.rawValue)
-					}
-				}
-				.pickerStyle(.segmented)
-			}
-			
-			NBSection(.localized("Theme")) {
-				AppearanceTintColorView()
-					.listRowInsets(EdgeInsets())
-					.listRowBackground(EmptyView())
-			}
-			
-			Section {
-				ColorPicker(
-					.localized("Custom Theme Color"),
-					selection: _tintColorBinding,
-					supportsOpacity: false
-				)
-			}
-			
-			if #available(iOS 18.0, *) {
-				NBSection(.localized("Library")) {
-					Toggle(.localized("Dynamic Icons"), isOn: $_shouldChangeIconsBasedOffStyle)
-					if #available(iOS 18.2, *) {
-						Toggle(.localized("Tinted Icons"), isOn: $_shouldTintIcons)
-					}
-				}
-			}
-			
-			NBSection(.localized("Sources")) {
-				Picker(.localized("Store Cell Appearance"), selection: $_storeCellAppearance) {
-					ForEach(0..<_storeCellAppearanceMethods.count, id: \.self) { index in
-						let method = _storeCellAppearanceMethods[index]
-						NBTitleWithSubtitleView(
-							title: method.name,
-							subtitle: method.desc
-						)
-						.tag(index)
-					}
-
-				}
-				.labelsHidden()
-				.pickerStyle(.inline)
-			}
-		}
-		.onChange(of: _userIntefacerStyle) { value in
-			if let style = UIUserInterfaceStyle(rawValue: value) {
-				UIApplication.topViewController()?.view.window?.overrideUserInterfaceStyle = style
-			}
-		}
-	}
-}
diff --git a/Feather/Views/Settings/AppearanceViewController.swift b/Feather/Views/Settings/AppearanceViewController.swift
new file mode 100644
index 000000000..c9319a296
--- /dev/null
+++ b/Feather/Views/Settings/AppearanceViewController.swift
@@ -0,0 +1,244 @@
+//
+//  AppearanceViewController.swift
+//  Feather
+//
+//  Created by samsam on 5/24/26.
+//
+import UIKit
+
+private struct _Icon: Identifiable {
+	var displayName: String
+	var key: String?
+	var image: UIImage
+	var id: String { key ?? displayName }
+	
+	init(displayName: String, key: String? = nil) {
+		self.displayName = displayName
+		self.key = key
+		self.image = _altImage(key)
+	}
+}
+
+fileprivate func _altImage(_ name: String?) -> UIImage {
+	let path = Bundle.main.bundleURL.appendingPathComponent((name ?? "AppIcon60x60") + "@2x.png")
+	return UIImage(contentsOfFile: path.path) ?? UIImage()
+}
+
+final class AppearanceViewController: ThemedTableViewController {
+	var currentIcon: String? = UIApplication.shared.alternateIconName
+	
+	private static let defaultTintColor = UIColor(red: 132/255.0, green: 142/255.0, blue: 249/255.0, alpha: 1.0)
+	private var isCustomTintActive = false
+	
+	private let icons: [_Icon] = [
+		.init(displayName: "Current"),
+		.init(displayName: "Pinky", key: "V2Mac"),
+		.init(displayName: "Classic", key: "V0"),
+		.init(displayName: "Donator", key: "Donor"),
+		.init(displayName: "Wing", key: "Wing"),
+	]
+	
+	private enum SectionType {
+		case colors, customTintOptions, appInfo, icons
+		
+		var headerTitle: String? {
+			switch self {
+			case .colors: return "Colors"
+			case .icons:  return "Icons"
+			default:      return nil
+			}
+		}
+	}
+	
+	private var activeSections: [SectionType] {
+		isCustomTintActive ? [.colors, .customTintOptions, .appInfo, .icons] : [.colors, .appInfo, .icons]
+	}
+	
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		title = "Appearance"
+		isCustomTintActive = calculateIsCustomTintActive()
+	}
+	
+	private func calculateIsCustomTintActive() -> Bool {
+		guard let data = UserDefaults.standard.data(forKey: "Feather.userTintColor"),
+			  let color = try? NSKeyedUnarchiver.unarchivedObject(ofClass: UIColor.self, from: data) else {
+			return false
+		}
+		return color != Self.defaultTintColor
+	}
+}
+
+extension AppearanceViewController {
+	override func numberOfSections(in tableView: UITableView) -> Int {
+		activeSections.count
+	}
+	
+	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+		switch activeSections[section] {
+		case .colors:            2
+		case .customTintOptions: 1
+		case .appInfo:           3
+		case .icons:            icons.count
+		}
+	}
+	
+	override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+		activeSections[section].headerTitle
+	}
+	
+	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+		let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath)
+		var content = cell.defaultContentConfiguration()
+		cell.accessoryView = nil
+		cell.accessoryType = .none
+		
+		switch activeSections[indexPath.section] {
+		case .colors:
+			if indexPath.row == 0 {
+				content.text = "Appearance"
+				let styles = UIUserInterfaceStyle.allCases
+				let segmented = UISegmentedControl(items: styles.map { $0.label })
+				let raw = UserDefaults.standard.integer(forKey: "Feather.userInterfaceStyle")
+				segmented.selectedSegmentIndex = styles.firstIndex(of: UIUserInterfaceStyle(rawValue: raw) ?? .unspecified) ?? 0
+				segmented.addTarget(self, action: #selector(_didChangeStyle), for: .valueChanged)
+				cell.accessoryView = segmented
+			} else {
+				content.text = "Tint Color"
+				cell.accessoryType = .disclosureIndicator
+			}
+			
+		case .customTintOptions:
+			content.text = "Reset to Default"
+			content.textProperties.color = .systemRed
+			
+		case .appInfo:
+			if indexPath.row == 0 {
+				content.text = Bundle.main.name
+				content.secondaryText = "\(Bundle.main.version) • \(Bundle.main.bundleIdentifier!)"
+				content.image = iconTest(Bundle.main.bundleURL)
+				content.imageProperties.maximumSize = CGSize(width: 45, height: 45)
+				content.imageProperties.cornerRadius = 10
+			} else {
+				let isDynamic = indexPath.row == 1
+				content.text = isDynamic ? "Dynamic Icons" : "Tint Icons"
+				let toggle = UISwitch()
+				toggle.isOn = UserDefaults.standard.bool(forKey: isDynamic ? "Feather.shouldChangeIconsBasedOffStyle" : "Feather.shouldTintIcons")
+				toggle.addTarget(self, action: isDynamic ? #selector(_dynamicIconsChanged) : #selector(_tintedIconsChanged), for: .valueChanged)
+				cell.accessoryView = toggle
+			}
+			
+		case .icons:
+			let icon = icons[indexPath.row]
+			content.text = icon.displayName
+			content.image = icon.image
+			content.imageProperties.maximumSize = CGSize(width: 45, height: 45)
+			content.imageProperties.cornerRadius = 10
+			cell.accessoryType = (icon.key == currentIcon) ? .checkmark : .none
+		}
+		
+		cell.contentConfiguration = content
+		return cell
+	}
+	
+	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+		tableView.deselectRow(at: indexPath, animated: true)
+		
+		switch activeSections[indexPath.section] {
+		case .colors where indexPath.row == 1:
+			_openColorWheel()
+		case .customTintOptions:
+			_resetToDefaultTint()
+		case .icons:
+			let icon = icons[indexPath.row]
+			UIApplication.shared.setAlternateIconName(icon.key) { [weak self] _ in
+				DispatchQueue.main.async {
+					self?.currentIcon = UIApplication.shared.alternateIconName
+					self?._reloadIconPreview()
+				}
+			}
+		default:
+			break
+		}
+	}
+}
+
+extension AppearanceViewController {
+	@objc private func _didChangeStyle(_ sender: UISegmentedControl) {
+		let style = UIUserInterfaceStyle.allCases[sender.selectedSegmentIndex]
+		UserDefaults.standard.set(style.rawValue, forKey: "Feather.userInterfaceStyle")
+		view.window?.overrideUserInterfaceStyle = style
+		_reloadIconPreview()
+	}
+	
+	@objc private func _openColorWheel() {
+		let vc = UIColorPickerViewController()
+		if 
+			let data = UserDefaults.standard.data(forKey: "Feather.userTintColor"),
+			let color = try? NSKeyedUnarchiver.unarchivedObject(ofClass: UIColor.self, from: data) 
+		{
+			vc.selectedColor = color
+		}
+		vc.delegate = self
+		present(vc, animated: true)
+	}
+	
+	@objc private func _dynamicIconsChanged(_ sender: UISwitch) {
+		UserDefaults.standard.set(sender.isOn, forKey: "Feather.shouldChangeIconsBasedOffStyle")
+		_reloadIconPreview()
+	}
+	
+	@objc private func _tintedIconsChanged(_ sender: UISwitch) {
+		UserDefaults.standard.set(sender.isOn, forKey: "Feather.shouldTintIcons")
+		_reloadIconPreview()
+	}
+	
+	private func _resetToDefaultTint() {
+		if let data = try? NSKeyedArchiver.archivedData(withRootObject: Self.defaultTintColor, requiringSecureCoding: true) {
+			UserDefaults.standard.set(data, forKey: "Feather.userTintColor")
+		}
+		
+		view.window?.tintColor = Self.defaultTintColor
+		_updateLayoutStructure()
+	}
+	
+	private func _updateLayoutStructure() {
+		let updatedState = calculateIsCustomTintActive()
+		guard isCustomTintActive != updatedState else {
+			_reloadIconPreview()
+			return
+		}
+		
+		isCustomTintActive = updatedState
+		
+		tableView.performBatchUpdates({
+			if updatedState {
+				tableView.insertSections(IndexSet(integer: 1), with: .bottom)
+			} else {
+				tableView.deleteSections(IndexSet(integer: 1), with: .bottom)
+			}
+		}, completion: { [weak self] _ in
+			self?._reloadIconPreview()
+		})
+	}
+	
+	private func _reloadIconPreview() {
+		if let appInfoIndex = activeSections.firstIndex(of: .appInfo) {
+			tableView.reloadRows(at: [IndexPath(row: 0, section: appInfoIndex)], with: .automatic)
+		}
+	}
+}
+
+extension AppearanceViewController: UIColorPickerViewControllerDelegate {
+	func colorPickerViewController(_ viewController: UIColorPickerViewController, didSelect color: UIColor, continuously: Bool) {
+		if let data = try? NSKeyedArchiver.archivedData(
+			withRootObject: color, 
+			requiringSecureCoding: true
+		) {
+			UserDefaults.standard.set(data, forKey: "Feather.userTintColor")
+		}
+		
+		view.window?.tintColor = color
+		_updateLayoutStructure()
+	}
+}
diff --git a/Feather/Views/Settings/Reset/ResetView.swift b/Feather/Views/Settings/Reset/ResetView.swift
deleted file mode 100644
index bce6f8b32..000000000
--- a/Feather/Views/Settings/Reset/ResetView.swift
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-//  ResetView.swift
-//  Feather
-//
-//  Created by samara on 19.06.2025.
-//
-
-import SwiftUI
-import NimbleViews
-import Nuke
-import CoreData
-
-// MARK: - View
-struct ResetView: View {
-	// MARK: Body
-	var body: some View {
-		NBList(.localized("Reset")) {
-			_cache()
-			_coredata()
-			_all()
-		}
-	}
-	
-	private func _cacheSize() -> String {
-		var totalCacheSize = URLCache.shared.currentDiskUsage
-		if let nukeCache = ImagePipeline.shared.configuration.dataCache as? DataCache {
-			totalCacheSize += nukeCache.totalSize
-		}
-		return "\(ByteCountFormatter.string(fromByteCount: Int64(totalCacheSize), countStyle: .file))"
-	}
-	
-	static func resetAlert(
-		title: String,
-		message: String = "",
-		action: @escaping () -> Void
-	) {
-		let action = UIAlertAction(
-			title: .localized("Proceed"),
-			style: .destructive
-		) { _ in
-			action()
-			UIApplication.shared.suspendAndReopen()
-		}
-		
-		let style: UIAlertController.Style = UIDevice.current.userInterfaceIdiom == .pad
-			? .alert
-			: .actionSheet
-		
-		var msg = ""
-		if !message.isEmpty { msg = message + "\n" }
-		msg.append(.localized("This action cannot be undone. Would you like to proceed?"))
-	
-		UIAlertController.showAlertWithCancel(
-			title: title,
-			message: msg,
-			style: style,
-			actions: [action]
-		)
-	}
-}
-
-// MARK: - View extension
-extension ResetView {
-	@ViewBuilder
-	private func _cache() -> some View {
-		Section {
-			Button(.localized("Reset Work Cache"), systemImage: "xmark.rectangle.portrait") {
-				Self.resetAlert(title: .localized("Reset Work Cache")) {
-					Self.clearWorkCache()
-				}
-			}
-			
-			Button(.localized("Reset Network Cache"), systemImage: "xmark.rectangle.portrait") {
-				Self.resetAlert(
-					title: .localized("Reset Network Cache"),
-					message: _cacheSize()
-				) {
-					Self.clearNetworkCache()
-				}
-			}
-		}
-	}
-	
-	@ViewBuilder
-	private func _coredata() -> some View {
-		Section {
-			Button(.localized("Reset Sources"), systemImage: "xmark.circle") {
-				Self.resetAlert(
-					title: .localized("Reset Signed Apps"),
-					message: Storage.shared.countContent(for: AltSource.self)
-				) {
-					Self.resetSources()
-				}
-			}
-			
-			Button(.localized("Reset Signed Apps"), systemImage: "xmark.circle") {
-				Self.resetAlert(
-					title: .localized("Reset Signed Apps"),
-					message: Storage.shared.countContent(for: Signed.self)
-				) {
-					Self.deleteSignedApps()
-				}
-			}
-			
-			Button(.localized("Reset Imported Apps"), systemImage: "xmark.circle") {
-				Self.resetAlert(
-					title: .localized("Reset Imported Apps"),
-					message: Storage.shared.countContent(for: Imported.self)
-				) {
-					Self.deleteImportedApps()
-				}
-			}
-			
-			Button(.localized("Reset Certificates"), systemImage: "xmark.circle") {
-				Self.resetAlert(
-					title: .localized("Reset Certificates"),
-					message: Storage.shared.countContent(for: CertificatePair.self)
-				) {
-					Self.resetCertificates()
-				}
-			}
-		}
-	}
-	
-	@ViewBuilder
-	private func _all() -> some View {
-		Section {
-			Button(.localized("Reset Settings"), systemImage: "xmark.octagon") {
-				Self.resetAlert(title: .localized("Reset Settings")) {
-					Self.resetUserDefaults()
-				}
-			}
-			
-			Button(.localized("Reset All"), systemImage: "xmark.octagon") {
-				Self.resetAlert(title: .localized("Reset All")) {
-					Self.resetAll()
-				}
-			}
-		}
-		.foregroundStyle(.red)
-	}
-}
-
-// MARK: - View extension: reset
-extension ResetView {
-	static func clearWorkCache() {
-		let fileManager = FileManager.default
-		let tmpDirectory = fileManager.temporaryDirectory
-		
-		if let files = try? fileManager.contentsOfDirectory(atPath: tmpDirectory.path()) {
-			for file in files {
-				try? fileManager.removeItem(atPath: tmpDirectory.appendingPathComponent(file).path())
-			}
-		}
-	}
-	
-	static func clearNetworkCache() {
-		URLCache.shared.removeAllCachedResponses()
-		HTTPCookieStorage.shared.removeCookies(since: Date.distantPast)
-		
-		if let dataCache = ImagePipeline.shared.configuration.dataCache as? DataCache {
-			dataCache.removeAll()
-		}
-		
-		if let imageCache = ImagePipeline.shared.configuration.imageCache as? Nuke.ImageCache {
-			imageCache.removeAll()
-		}
-	}
-	
-	static func resetSources() {
-		Storage.shared.clearContext(request: AltSource.fetchRequest())
-	}
-	
-	static func deleteSignedApps() {
-		Storage.shared.clearContext(request: Signed.fetchRequest())
-		try? FileManager.default.removeFileIfNeeded(at: FileManager.default.signed)
-	}
-	
-	static func deleteImportedApps() {
-		Storage.shared.clearContext(request: Imported.fetchRequest())
-		try? FileManager.default.removeFileIfNeeded(at: FileManager.default.unsigned)
-	}
-	
-	static func resetCertificates(resetAll: Bool = false) {
-		if !resetAll { UserDefaults.standard.set(0, forKey: "feather.selectedCert") }
-		Storage.shared.clearContext(request: CertificatePair.fetchRequest())
-		try? FileManager.default.removeFileIfNeeded(at: FileManager.default.certificates)
-	}
-	
-	static func resetUserDefaults() {
-		UserDefaults.standard.removePersistentDomain(forName: Bundle.main.bundleIdentifier!)
-	}
-	
-	static func resetAll() {
-		clearWorkCache()
-		clearNetworkCache()
-		resetSources()
-		deleteSignedApps()
-		deleteImportedApps()
-		resetCertificates(resetAll: true)
-		resetUserDefaults()
-	}
-}
diff --git a/Feather/Views/Settings/SettingsDonationCellView.swift b/Feather/Views/Settings/SettingsDonationCellView.swift
deleted file mode 100644
index b5accf7e4..000000000
--- a/Feather/Views/Settings/SettingsDonationCellView.swift
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-//  SettingsDonationCellView.swift
-//  Feather
-//
-//  Created by samara on 30.04.2025.
-//
-
-#if !NIGHTLY && !DEBUG
-	import SwiftUI
-	import NimbleViews
-
-	struct SettingsDonationCellView: View {
-		var site: String
-	
-		var body: some View {
-			Section {
-				VStack(spacing: 14) {
-					_title()
-					_benefit(
-						.localized("Remove this Alert"),
-						.localized("Remove annoying alerts like these after getting beta access!"),
-						systemName: "heart.text.square.fill"
-					)
-					_benefit(
-						.localized("Exclusive Features"),
-						.localized("After gaining beta access, you're able to use exclusive features that may not be present on releases!"),
-						systemName: "timer"
-					)
-					_benefit(
-						.localized("Show Your Support"),
-						.localized("Show your support by donating! If you're unable to donate, spreading the word works too!"),
-						systemName: "heart.fill"
-					)
-				
-					Button() {
-						UIApplication.open(site)
-					} label: {
-						_sheetButton(.localized("Donate"))
-					}
-					.frame(height: 45)
-				}
-				.padding(.vertical, 12)
-				.buttonStyle(.plain)
-			}
-		}
-	
-		@ViewBuilder
-		private func _title() -> some View {
-			VStack(alignment: .center, spacing: 12) {
-				Image(systemName: "heart")
-					.font(.system(size: 38, weight: .bold))
-					.foregroundStyle(.pink)
-			
-				Text(.localized("Donations"))
-					.font(.title)
-					.bold()
-			}
-			.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
-		}
-	
-		@ViewBuilder
-		private func _benefit(
-			_ title: String,
-			_ desc: String,
-			systemName: String
-		) -> some View {
-			HStack(alignment: .center, spacing: 14) {
-				Image(systemName: systemName)
-					.font(.system(size: 32))
-					.foregroundStyle(.tint)
-					.frame(width: 39, alignment: .center)
-			
-				NBTitleWithSubtitleView(
-					title: title,
-					subtitle: desc
-				).fixedSize(horizontal: false, vertical: true)
-			}
-		}
-	
-		@ViewBuilder
-		private func _sheetButton(_ title: String) -> some View {
-			Text(title)
-				.frame(maxWidth: .infinity, maxHeight: .infinity)
-				.background(Color.accentColor)
-				.foregroundColor(.white)
-				.clipShape(
-					RoundedRectangle(cornerRadius: 12, style: .continuous)
-				)
-				.bold()
-		}
-	}
-
-#endif
diff --git a/Feather/Views/Settings/SettingsView.swift b/Feather/Views/Settings/SettingsView.swift
deleted file mode 100644
index eaf605d29..000000000
--- a/Feather/Views/Settings/SettingsView.swift
+++ /dev/null
@@ -1,204 +0,0 @@
-//
-//  SettingsView.swift
-//  Feather
-//
-//  Created by samara on 10.04.2025.
-//
-
-import SwiftUI
-import NimbleViews
-import UIKit
-import Darwin
-import IDeviceSwift
-
-// MARK: - View
-struct SettingsView: View {
-	@AppStorage("feather.selectedCert") private var _storedSelectedCert: Int = 0
-	@State private var _currentIcon: String? = UIApplication.shared.alternateIconName
-	
-	// MARK: Fetch
-	@FetchRequest(
-		entity: CertificatePair.entity(),
-		sortDescriptors: [NSSortDescriptor(keyPath: \CertificatePair.date, ascending: false)],
-		animation: .snappy
-	) private var _certificates: FetchedResults<CertificatePair>
-	
-	private var selectedCertificate: CertificatePair? {
-		guard
-			_storedSelectedCert >= 0,
-			_storedSelectedCert < _certificates.count
-		else {
-			return nil
-		}
-		return _certificates[_storedSelectedCert]
-	}
-
-    
-	private let _donationsUrl = "https://github.com/sponsors/claration"
-	private let _githubUrl = "https://github.com/claration/Feather"
-    
-	// MARK: Body
-	var body: some View {
-		NBNavigationView(.localized("Settings")) {
-			Form {
-				#if !NIGHTLY && !DEBUG
-					SettingsDonationCellView(site: _donationsUrl)
-				#endif
-                
-				_feedback()
-                
-				Section {
-					NavigationLink(destination: AppearanceView()) {
-						Label(.localized("Appearance"), systemImage: "paintbrush")
-					}
-					NavigationLink(destination: AppIconView(currentIcon: $_currentIcon)) {
-						Label(.localized("App Icon"), systemImage: "app.badge")
-					}
-				}
-                
-				NBSection(.localized("Certificates")) {
-                    
-					if let cert = selectedCertificate {
-						CertificatesCellView(cert: cert)
-					} else {
-						Text(.localized("No Certificate"))
-							.font(.footnote)
-							.foregroundColor(.disabled())
-					}
-					NavigationLink(destination: CertificatesView()) {
-						Label(.localized("Certificates"), systemImage: "checkmark.seal")
-					}
-                 
-				} footer: {
-					Text(.localized("Add and manage certificates used for signing applications."))
-				}
-                
-				NBSection(.localized("Features")) {
-					NavigationLink(destination: ConfigurationView()) {
-						Label(.localized("Signing Options"), systemImage: "signature")
-					}
-					NavigationLink(destination: ArchiveView()) {
-						Label(.localized("Archive & Compression"), systemImage: "archivebox")
-					}
-					NavigationLink(destination: InstallationView()) {
-						Label(.localized("Installation"), systemImage: "arrow.down.circle")
-					}
-				} footer: {
-					Text(.localized("Configure the apps way of installing, its zip compression levels, and custom modifications to apps."))
-				}
-                
-				_directories()
-                
-				Section {
-					NavigationLink(destination: ResetView()) {
-						Label(.localized("Reset"), systemImage: "trash")
-					}
-				} footer: {
-					Text(.localized("Reset the applications sources, certificates, apps, and general contents."))
-				}
-			}
-		}
-	}
-}
-
-// MARK: - View extension
-extension SettingsView {
-	@ViewBuilder
-	private func _feedback() -> some View {
-		Section {
-			NavigationLink(destination: AboutView()) {
-				Label {
-					Text(verbatim: .localized("About %@", arguments: Bundle.main.name))
-				} icon: {
-					FRAppIconView(size: 23)
-				}
-			}
-            
-			Button(.localized("Submit Feedback"), systemImage: "safari") {
-				let bugAction: UIAlertAction = .init(title: .localized("Bug Report"), style: .default) { _ in
-					UIApplication.open(_makeGitHubIssueURL(url: _githubUrl))
-				}
-				
-				let chooseAction: UIAlertAction = .init(title: .localized("Other"), style: .default) { _ in
-					UIApplication.open(URL(string: "\(_githubUrl)/issues/new/choose")!)
-				}
-				
-				UIAlertController.showAlertWithCancel(
-					title: .localized("Submit Feedback"),
-					message: nil,
-					actions: [bugAction, chooseAction]
-				)
-			}
-			Button(.localized("GitHub Repository"), systemImage: "safari") {
-				UIApplication.open(_githubUrl)
-			}
-		} footer: {
-			Text(.localized("If any issues occur within the app please report it via the GitHub repository. When submitting an issue, make sure to submit detailed information."))
-		}
-	}
-    
-	@ViewBuilder
-	private func _directories() -> some View {
-		NBSection(.localized("Misc")) {
-			Button(.localized("Open Documents"), systemImage: "folder") {
-				UIApplication.open(URL.documentsDirectory.toSharedDocumentsURL()!)
-			}
-			Button(.localized("Open Archives"), systemImage: "folder") {
-				UIApplication.open(FileManager.default.archives.toSharedDocumentsURL()!)
-			}
-			Button(.localized("Open Certificates"), systemImage: "folder") {
-				UIApplication.open(FileManager.default.certificates.toSharedDocumentsURL()!)
-			}
-		} footer: {
-			Text(.localized("All of the apps files are contained in the documents directory, here are some quick links to these."))
-		}
-	}
-    
-	private func _makeGitHubIssueURL(url: String) -> String {
-		var configurationSection = "### App Configuration:\n"
-		
-		switch UserDefaults.standard.integer(forKey: "Feather.installationMethod") {
-		case 0: // Server
-			let serverMethod = UserDefaults.standard.integer(forKey: "Feather.serverMethod")
-			let ipFix = UserDefaults.standard.bool(forKey: "Feather.ipFix")
-			let serverType = (serverMethod == 0) ? "Fully Local" : "Semi Local"
-			configurationSection += "- Install method: `Server`\n"
-			configurationSection += "  - Server type: `\(serverType)`\n"
-			configurationSection += "  - IP Fix: `\(ipFix)`\n"
-		case 1: // idevice
-			let pairingPath = HeartbeatManager.pairingFile()
-			let pairingExists = FileManager.default.fileExists(atPath: pairingPath)
-			let pairingStatus = pairingExists ? "`Present`" : "`Not Present`"
-			configurationSection += "- Install method: `idevice`\n"
-			configurationSection += "  - Pairing file: \(pairingStatus)\n"
-		default:
-			configurationSection += "- Install method: `Unknown`\n"
-		}
-        
-		let body = """
-		### Device Information
-		- Device: `\(MobileGestalt().getStringForName("PhysicalHardwareNameString") ?? "Unknown")`
-		- iOS Version: `\(UIDevice.current.systemVersion)`
-		- App Version: `\(Bundle.main.version)`
-		
-		\(configurationSection)
-		
-		### Issue Description
-		<!-- Describe your issue here -->
-		
-		### Steps to Reproduce
-		1. 
-		2. 
-		3. 
-		
-		### Expected Behavior
-		
-		### Actual Behavior
-		"""
-		let encodedTitle = "[Bug] replace this with a descriptive title "
-			.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? ""
-		let encodedBody = body
-			.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? ""
-		return "\(url)/issues/new?template=bug.yml&title=\(encodedTitle)&text=\(encodedBody)"
-	}
-}
diff --git a/Feather/Views/Settings/SettingsViewController.swift b/Feather/Views/Settings/SettingsViewController.swift
new file mode 100644
index 000000000..87af00919
--- /dev/null
+++ b/Feather/Views/Settings/SettingsViewController.swift
@@ -0,0 +1,235 @@
+//
+//  SettingsViewController.swift
+//  Feather
+//
+//  Created by samsam on 5/10/26.
+//
+
+import UIKit
+
+class SettingsViewController: ThemedTableViewController {
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		title = "Settings"
+	}
+}
+
+extension SettingsViewController {
+	override func numberOfSections(in tableView: UITableView) -> Int {
+		2
+	}
+	
+	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+		switch section {
+		case 0: 5
+		case 1: 3
+		default: 0
+		}
+	}
+	
+	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+		let cell = tableView.dequeueReusableCell(
+			withIdentifier: "Cell",
+			for: indexPath
+		)
+		
+		var content = cell.defaultContentConfiguration()
+		cell.accessoryType = .disclosureIndicator
+		
+		switch (indexPath.section, indexPath.row) {
+		case (0, 0):
+			content.image = SectionIcon(symbolName: "textformat", color: .systemBlue).image()
+			content.text = "Appearance"
+		case (0, 1):
+			content.image = SectionIcon(symbolName: "globe.desk.fill", color: .systemIndigo).image()
+			content.text = "Sources"
+		case (0, 2):
+			content.image = SectionIcon(symbolName: "square.grid.2x2.fill", color: .systemRed).image()
+			content.text = "Apps"
+		case (0, 3):
+			content.image = SectionIcon(symbolName: "arrow.down.circle", color: .systemBlue).image()
+			content.text = "Downloads"
+		case (0, 4):
+			content.image = SectionIcon(symbolName: "gearshape.2.fill", color: .systemGray).image()
+			content.text = "Advanced"
+		case (1, 0):
+			content.image = SectionIcon(symbolName: "checkmark.seal.text.page", color: .systemGreen).image()
+			content.text = "Certificates"
+		case (1, 1):
+			content.image = SectionIcon(symbolName: "pencil.line", color: .systemBlue).image()
+			content.text = "Signing"
+		case (1, 2):
+			content.image = SectionIcon(symbolName: "arrow.down.app", color: .systemIndigo).image()
+			content.text = "Installation"
+		default: break
+		}
+		
+		cell.contentConfiguration = content
+		
+		return cell
+	}
+	
+	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+		switch (indexPath.section, indexPath.row) {
+		case (0, 0):
+			navigationController?.pushViewController(AppearanceViewController(), animated: true)
+		case (0, 4):
+			navigationController?.pushViewController(AdvancedViewController(), animated: true)
+		default: break
+		}
+		
+		tableView.deselectRow(at: indexPath, animated: true)
+	}
+}
+
+
+
+
+
+
+//
+
+
+
+extension UIColor {
+	
+	func lighter(_ amount: CGFloat = 0.1) -> UIColor {
+		adjust(brightness: 1 + amount)
+	}
+	
+	func darker(_ amount: CGFloat = 0.1) -> UIColor {
+		adjust(brightness: 1 - amount)
+	}
+	
+	private func adjust(brightness: CGFloat) -> UIColor {
+		var h: CGFloat = 0
+		var s: CGFloat = 0
+		var b: CGFloat = 0
+		var a: CGFloat = 0
+		
+		guard getHue(&h, saturation: &s, brightness: &b, alpha: &a) else {
+			return self
+		}
+		
+		return UIColor(
+			hue: h,
+			saturation: s,
+			brightness: max(min(b * brightness, 1), 0),
+			alpha: a
+		)
+	}
+}
+
+extension UIColor {
+	func appStoreGradientColors() -> [UIColor] {
+		[self.lighter(0.2), self.darker(0.1)]
+	}
+}
+
+public struct SectionIcon {
+	nonisolated(unsafe) private static var cache = [String: UIImage]()
+	
+	private let symbolName: String
+	private let color: UIColor
+	
+	public init(symbolName: String, color: UIColor) {
+		self.symbolName = symbolName
+		self.color = color
+	}
+	
+	public func image(
+		size: CGSize = CGSize(width: 30, height: 30),
+		symbolScale: CGFloat = 0.80
+	) -> UIImage? {
+		
+		let cacheKey = "\(symbolName)-\(color.description)-\(size)"
+		
+		if let cached = SectionIcon.cache[cacheKey] {
+			return cached
+		}
+		
+		let renderer = UIGraphicsImageRenderer(size: size)
+		
+		let image = renderer.image { context in
+			
+			let rect = CGRect(origin: .zero, size: size)
+			
+			var multiplier: CGFloat = 0.2337
+			if #available(iOS 26.0, *) {
+				multiplier = 0.2677
+			}
+			
+			let radius =
+			min(size.width, size.height) * multiplier
+			
+			let path = UIBezierPath(
+				roundedRect: rect,
+				cornerRadius: radius
+			)
+			
+			context.cgContext.saveGState()
+			path.addClip()
+			
+			let colors = color.appStoreGradientColors()
+				.map(\.cgColor) as CFArray
+			
+			if let gradient = CGGradient(
+				colorsSpace: CGColorSpaceCreateDeviceRGB(),
+				colors: colors,
+				locations: [0, 1]
+			) {
+				context.cgContext.drawLinearGradient(
+					gradient,
+					start: CGPoint(x: size.width / 2, y: 0),
+					end: CGPoint(x: size.width / 2, y: size.height),
+					options: []
+				)
+			}
+			
+			context.cgContext.restoreGState()
+			
+			UIColor.label
+				.withAlphaComponent(0.14)
+				.setStroke()
+			
+			path.lineWidth = 1.0
+			path.stroke()
+			
+			guard let symbol = UIImage(systemName: symbolName) else {
+				return
+			}
+			
+			let config = UIImage.SymbolConfiguration(
+				hierarchicalColor: .white
+			)
+			
+			let configuredSymbol =
+			symbol.applyingSymbolConfiguration(config) ?? symbol
+			
+			let maxDim =
+			min(size.width, size.height) * symbolScale
+			
+			let aspect =
+			configuredSymbol.size.width /
+			configuredSymbol.size.height
+			
+			let drawSize = CGSize(
+				width: maxDim * (aspect > 1 ? 1 : aspect),
+				height: maxDim * (aspect > 1 ? 1 / aspect : 1)
+			)
+			
+			let drawRect = CGRect(
+				x: (size.width - drawSize.width) / 2,
+				y: (size.height - drawSize.height) / 2,
+				width: drawSize.width,
+				height: drawSize.height
+			)
+			
+			configuredSymbol.draw(in: drawRect)
+		}
+		
+		SectionIcon.cache[cacheKey] = image
+		
+		return image
+	}
+}
diff --git a/Feather/Views/TabBarController.swift b/Feather/Views/TabBarController.swift
new file mode 100644
index 000000000..a2182ea2c
--- /dev/null
+++ b/Feather/Views/TabBarController.swift
@@ -0,0 +1,75 @@
+//
+//  TabbarController.swift
+//  Feather
+//
+//  Created by samsam on 5/8/26.
+//
+
+import UIKit
+import SwiftUI
+
+final class TabBarController: UITabBarController {
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		
+		if #available(iOS 18.0, *) {
+			self.mode = .tabSidebar
+		}
+		
+		_setupTabs()
+	}
+	
+	private func _setupTabs() {
+		let files = _createNavigation(
+			with: "Files",
+			using: UIImage(systemName: "folder.fill"),
+			controller: UIViewController()
+		)
+		
+		let sources = _createNavigation(
+			with: "Sources",
+			using: UIImage(systemName: "globe.desk.fill"),
+			controller: UIHostingController(rootView: SourcesView().environment(\.managedObjectContext, Storage.shared.context)),
+			withNavigation: false,
+		)
+		
+		let library = _createNavigation(
+			with: "Apps",
+			using: UIImage(systemName: "square.grid.2x2.fill"),
+			controller: UIHostingController(rootView: LibraryView().environment(\.managedObjectContext, Storage.shared.context)),
+			withNavigation: false,
+		)
+		
+		let settings = _createNavigation(
+			with: "Settings",
+			using: UIImage(systemName: "gearshape.2.fill"),
+			controller: SettingsViewController(),
+		)
+		
+		self.setViewControllers([
+			files,
+			sources,
+			library,
+			settings,
+		], animated: false)
+	}
+	
+	#warning("remove swiftui remnants")
+	private func _createNavigation(
+		with title: String,
+		using image: UIImage?,
+		controller: UIViewController,
+		withNavigation: Bool = true
+	) -> UIViewController {
+		if withNavigation {
+			let nav = UINavigationController(rootViewController: controller)
+			nav.tabBarItem.title = title
+			nav.tabBarItem.image = image
+			return nav
+		} else {
+			controller.tabBarItem.title = title
+			controller.tabBarItem.image = image
+			return controller
+		}
+	}
+}
diff --git a/Feather/Views/TabView/Bars/ExtendedTabbarView.swift b/Feather/Views/TabView/Bars/ExtendedTabbarView.swift
deleted file mode 100644
index 7dd029003..000000000
--- a/Feather/Views/TabView/Bars/ExtendedTabbarView.swift
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-//  TabbarController.swift
-//  feather
-//
-//  Created by samara on 5/17/24.
-//  Copyright (c) 2024 Samara M (khcrysalis)
-//
-
-import SwiftUI
-import NukeUI
-
-@available(iOS 18, *)
-struct ExtendedTabbarView: View {
-	@Environment(\.horizontalSizeClass) var horizontalSizeClass
-	@AppStorage("Feather.tabCustomization") var customization = TabViewCustomization()
-	@StateObject var viewModel = SourcesViewModel.shared
-	
-	@State private var _isAddingPresenting = false
-	
-	@FetchRequest(
-		entity: AltSource.entity(),
-		sortDescriptors: [NSSortDescriptor(keyPath: \AltSource.name, ascending: true)],
-		animation: .snappy
-	) private var _sources: FetchedResults<AltSource>
-		
-	var body: some View {
-		TabView {
-			ForEach(TabEnum.defaultTabs, id: \.hashValue) { tab in
-				Tab(tab.title, systemImage: tab.icon) {
-					TabEnum.view(for: tab)
-				}
-			}
-			
-			ForEach(TabEnum.customizableTabs, id: \.hashValue) { tab in
-				Tab(tab.title, systemImage: tab.icon) {
-					TabEnum.view(for: tab)
-				}
-				.customizationID("tab.\(tab.rawValue)")
-				.defaultVisibility(.hidden, for: .tabBar)
-				.customizationBehavior(.reorderable, for: .tabBar, .sidebar)
-				.hidden(horizontalSizeClass == .compact)
-			}
-			
-			TabSection("Sources") {
-				Tab(.localized("All Repositories"), systemImage: "globe.desk") {
-					NavigationStack {
-						SourceAppsView(object: Array(_sources), viewModel: viewModel)
-					}
-				}
-				
-				ForEach(_sources, id: \.identifier) { source in
-					Tab {
-						NavigationStack {
-							SourceAppsView(object: [source], viewModel: viewModel)
-						}
-					} label: {
-						_icon(source.name ?? .localized("Unknown"), iconUrl: source.iconURL)
-					}
-					.swipeActions {
-						Button(.localized("Delete"), systemImage: "trash", role: .destructive) {
-							Storage.shared.deleteSource(for: source)
-						}
-					}
-				}
-			}
-			.sectionActions {
-				Button(.localized("Add Source"), systemImage: "plus") {
-					_isAddingPresenting = true
-				}
-			}
-			.defaultVisibility(.hidden, for: .tabBar)
-			.hidden(horizontalSizeClass == .compact)
-		}
-		.tabViewStyle(.sidebarAdaptable)
-		.tabViewCustomization($customization)
-		.sheet(isPresented: $_isAddingPresenting) {
-			SourcesAddView()
-				.presentationDetents([.medium])
-		}
-	}
-	
-	@ViewBuilder
-	private func _icon(_ title: String, iconUrl: URL?) -> some View {
-		Label {
-			Text(title)
-		} icon: {
-			if let iconURL = iconUrl {
-				LazyImage(url: iconURL) { state in
-					if let image = state.image {
-						image
-					} else {
-						standardIcon
-					}
-				}
-				.processors([.resize(width: 14), .circle()])
-			} else {
-				standardIcon
-			}
-		}
-	}
-
-	
-	var standardIcon: some View {
-		Image(systemName: "app.dashed")
-	}
-}
-
diff --git a/Feather/Views/TabView/Bars/TabbarView.swift b/Feather/Views/TabView/Bars/TabbarView.swift
deleted file mode 100644
index 064d9893a..000000000
--- a/Feather/Views/TabView/Bars/TabbarView.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  TabbarView.swift
-//  feather
-//
-//  Created by samara on 23.03.2025.
-//
-
-import SwiftUI
-
-struct TabbarView: View {
-	@State private var selectedTab: TabEnum = .sources
-
-	var body: some View {
-		TabView(selection: $selectedTab) {
-			ForEach(TabEnum.defaultTabs, id: \.hashValue) { tab in
-				TabEnum.view(for: tab)
-					.tabItem {
-						Label(tab.title, systemImage: tab.icon)
-					}
-					.tag(tab)
-			}
-		}
-	}
-}
diff --git a/Feather/Views/TabView/TabEnum.swift b/Feather/Views/TabView/TabEnum.swift
deleted file mode 100644
index 91c17fc7e..000000000
--- a/Feather/Views/TabView/TabEnum.swift
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-//  TabEnum.swift
-//  feather
-//
-//  Created by samara on 22.03.2025.
-//
-
-import SwiftUI
-import NimbleViews
-
-enum TabEnum: String, CaseIterable, Hashable {
-	case sources
-	case library
-	case settings
-	case certificates
-	
-	var title: String {
-		switch self {
-		case .sources:     	return .localized("Sources")
-		case .library: 		return .localized("Library")
-		case .settings: 	return .localized("Settings")
-		case .certificates:	return .localized("Certificates")
-		}
-	}
-	
-	var icon: String {
-		switch self {
-		case .sources: 		return "globe.desk"
-		case .library: 		return "square.grid.2x2"
-		case .settings: 	return "gearshape.2"
-		case .certificates: return "person.text.rectangle"
-		}
-	}
-	
-	@ViewBuilder
-	static func view(for tab: TabEnum) -> some View {
-		switch tab {
-		case .sources: SourcesView()
-		case .library: LibraryView()
-		case .settings: SettingsView()
-		case .certificates: NBNavigationView(.localized("Certificates")) { CertificatesView() }
-		}
-	}
-	
-	static var defaultTabs: [TabEnum] {
-		return [
-			.sources,
-			.library,
-			.settings
-		]
-	}
-	
-	static var customizableTabs: [TabEnum] {
-		return [
-			.certificates
-		]
-	}
-}
diff --git a/Feather/Views/TabView/VariedTabbarView.swift b/Feather/Views/TabView/VariedTabbarView.swift
deleted file mode 100644
index a857f77dd..000000000
--- a/Feather/Views/TabView/VariedTabbarView.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  VariedTabbarView.swift
-//  Feather
-//
-//  Created by samara on 11.04.2025.
-//
-
-import SwiftUI
-
-struct VariedTabbarView: View {
-	init() {}
-	
-	var body: some View {
-		if #available(iOS 18, *) {
-			ExtendedTabbarView()
-		} else {
-			TabbarView()
-		}
-	}
-}
diff --git a/Feather/Views/ThemedTableViewController.swift b/Feather/Views/ThemedTableViewController.swift
new file mode 100644
index 000000000..5df14c2fd
--- /dev/null
+++ b/Feather/Views/ThemedTableViewController.swift
@@ -0,0 +1,42 @@
+//
+//  ThemedTableViewController.swift
+//  Feather
+//
+//  Created by samsam on 5/24/26.
+//
+
+import UIKit
+
+class ThemedTableViewController: UITableViewController {
+	init() {
+		#if os(iOS)
+		super.init(style: .insetGrouped)
+		#else
+		super.init(style: .grouped)
+		#endif
+	}
+	
+	@available(*, unavailable)
+	required init?(coder: NSCoder) {
+		fatalError("init(coder:) has not been implemented")
+	}
+	
+	open override func viewDidLoad() {
+		super.viewDidLoad()
+		#if os(iOS)
+		self._configureTitleDisplayMode()
+		#endif
+		tableView.register(UITableViewCell.self, forCellReuseIdentifier: "Cell")
+	}
+	
+	#if os(iOS)
+	private func _configureTitleDisplayMode() {
+		if navigationController?.viewControllers.first === self {
+			navigationItem.largeTitleDisplayMode = .always
+			navigationController?.navigationBar.prefersLargeTitles = true
+		} else {
+			navigationItem.largeTitleDisplayMode = .never
+		}
+	}
+	#endif
+}