diff --git a/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift b/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift
index 80a4eed15..54994cb1f 100644
--- a/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift
+++ b/Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift
@@ -206,7 +206,7 @@ import SwiftUI
 
 struct MastodonConfirmEmailViewController_Previews: PreviewProvider {
     
-    static var previews: some View {
+    static var controls: some View {
         UIViewControllerPreview {
             let viewController = MastodonConfirmEmailViewController()
             return viewController
@@ -214,6 +214,13 @@ struct MastodonConfirmEmailViewController_Previews: PreviewProvider {
         .previewLayout(.fixed(width: 375, height: 800))
     }
     
+    static var previews: some View {
+            Group {
+                controls.colorScheme(.light)
+                controls.colorScheme(.dark)
+            }
+    }
+    
 }
 
 #endif
diff --git a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift
index 06fc4ce23..685709719 100644
--- a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift
+++ b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift
@@ -56,9 +56,6 @@ final class MastodonPickServerViewController: UIViewController, NeedsDependency
 
 extension MastodonPickServerViewController {
     
-    override var preferredStatusBarStyle: UIStatusBarStyle {
-        return .darkContent
-    }
     
     override func viewDidLoad() {
         super.viewDidLoad()
diff --git a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift
index 3c20ed733..007012d3c 100644
--- a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift
+++ b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift
@@ -238,10 +238,6 @@ final class MastodonRegisterViewController: UIViewController, NeedsDependency, O
 
 extension MastodonRegisterViewController {
     
-    override var preferredStatusBarStyle: UIStatusBarStyle {
-        return .darkContent
-    }
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         
diff --git a/Mastodon/Scene/Onboarding/ResendEmail/MastodonResendEmailViewController.swift b/Mastodon/Scene/Onboarding/ResendEmail/MastodonResendEmailViewController.swift
index d97209317..1d3a29cb5 100644
--- a/Mastodon/Scene/Onboarding/ResendEmail/MastodonResendEmailViewController.swift
+++ b/Mastodon/Scene/Onboarding/ResendEmail/MastodonResendEmailViewController.swift
@@ -41,13 +41,9 @@ final class MastodonResendEmailViewController: UIViewController, NeedsDependency
     
 extension MastodonResendEmailViewController {
     
-    override var preferredStatusBarStyle: UIStatusBarStyle {
-        return .darkContent
-    }
-    
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+        setupOnboardingAppearance()
         navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(MastodonResendEmailViewController.cancelBarButtonItemPressed(_:)))
         
         webView.translatesAutoresizingMaskIntoConstraints = false
@@ -72,3 +68,6 @@ extension MastodonResendEmailViewController {
         dismiss(animated: true, completion: nil)
     }
 }
+
+// MARK: - OnboardingViewControllerAppearance
+extension MastodonResendEmailViewController: OnboardingViewControllerAppearance { }
diff --git a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
index de89cd457..3654c9f08 100644
--- a/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
+++ b/Mastodon/Scene/Onboarding/Welcome/WelcomeViewController.swift
@@ -64,10 +64,6 @@ final class WelcomeViewController: UIViewController, NeedsDependency {
 
 extension WelcomeViewController {
     
-    override var preferredStatusBarStyle: UIStatusBarStyle {
-        return .darkContent
-    }
-    
     override func viewDidLoad() {
         super.viewDidLoad()