diff --git a/Clocker/AppDelegate.swift b/Clocker/AppDelegate.swift
index 05b24f4..925a180 100644
--- a/Clocker/AppDelegate.swift
+++ b/Clocker/AppDelegate.swift
@@ -164,12 +164,7 @@ open class AppDelegate: NSObject, NSApplicationDelegate {
         let defaults = UserDefaults.standard
 
         let currentActivationPolicy = NSRunningApplication.current.activationPolicy
-        var activationPolicy: NSApplication.ActivationPolicy = defaults.integer(forKey: CLAppDisplayOptions) == 0 ? .accessory : .regular
-
-        #if DEBUG
-            UserDefaults.standard.set(1, forKey: CLAppDisplayOptions)
-            activationPolicy = .regular
-        #endif
+        let activationPolicy: NSApplication.ActivationPolicy = defaults.integer(forKey: CLAppDisplayOptions) == 0 ? .accessory : .regular
 
         if currentActivationPolicy != activationPolicy {
             NSApp.setActivationPolicy(activationPolicy)
diff --git a/Clocker/Clocker.xcodeproj/xcuserdata/ban.xcuserdatad/xcschemes/xcschememanagement.plist b/Clocker/Clocker.xcodeproj/xcuserdata/ban.xcuserdatad/xcschemes/xcschememanagement.plist
index 0fc8a42..1d89f02 100644
--- a/Clocker/Clocker.xcodeproj/xcuserdata/ban.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Clocker/Clocker.xcodeproj/xcuserdata/ban.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -17,7 +17,7 @@
 		<key>Tests.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
diff --git a/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Contents.json b/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Contents.json
index 30891df..36caf85 100644
--- a/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Contents.json	
+++ b/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Contents.json	
@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Screen Shot 2020-10-11 at 2.19.26 PM.png",
+      "filename" : "Screen Shot 2020-10-11 at 2.16.37 PM.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
diff --git a/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.16.37 PM.png b/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.16.37 PM.png
new file mode 100644
index 0000000..1471d7c
Binary files /dev/null and b/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.16.37 PM.png differ
diff --git a/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.19.26 PM.png b/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.19.26 PM.png
deleted file mode 100644
index 6e343ae..0000000
Binary files a/Clocker/Media.xcassets/Onboarding/Dark Menubar.imageset/Screen Shot 2020-10-11 at 2.19.26 PM.png and /dev/null differ
diff --git a/Clocker/Overall App/AppDefaults.swift b/Clocker/Overall App/AppDefaults.swift
index a98c096..ff33e94 100644
--- a/Clocker/Overall App/AppDefaults.swift	
+++ b/Clocker/Overall App/AppDefaults.swift	
@@ -67,17 +67,6 @@ class AppDefaults {
         if defaults.object(forKey: CLThemeKey) == nil {
             Themer.shared().set(theme: 0)
         }
-
-        // Set default to System theme for Mojave
-        if #available(macOS 10.14, *) {
-            if defaults.bool(forKey: CLDefaultThemeOnMojave) == false {
-                if isDarkModeOn() {
-                    Themer.shared().set(theme: 2)
-                    defaults.set(2, forKey: CLThemeKey)
-                }
-                defaults.set(true, forKey: CLDefaultThemeOnMojave)
-            }
-        }
     }
 
     private class func showCompactModeAlert() {
@@ -126,7 +115,7 @@ class AppDefaults {
                 CLShowMeetingInMenubar: 1,
                 CLTruncateTextLength: 30,
                 CLSelectedCalendars: [],
-                CLAppDisplayOptions: 1,
+                CLAppDisplayOptions: 0,
                 CLMenubarCompactMode: 1,
                 CLDisplayDSTTransitionInfo: 0]
     }
diff --git a/Clocker/Overall App/Strings.swift b/Clocker/Overall App/Strings.swift
index aa2305b..c4db561 100644
--- a/Clocker/Overall App/Strings.swift	
+++ b/Clocker/Overall App/Strings.swift	
@@ -35,6 +35,5 @@ let CLOnboaringTestsLaunchArgument = "isTestingTheOnboardingFlow"
 let CLMenubarCompactMode = "com.abhishek.menubarCompactMode"
 let CLDefaultMenubarMode = "com.abhishek.shouldDefaultToCompactMode"
 let CLInstallHomeIndicatorObject = "installHomeIndicatorObject"
-let CLDefaultThemeOnMojave = "com.abhishek.defaultHasBeenSetOnMacOsMojave"
 let CLSwitchToCompactModeAlert = "com.abhishek.switchToCompactMode"
 let CLDisplayDSTTransitionInfo = "com.abhishek.showDSTTransitionInfo"
diff --git a/Clocker/Preferences/Appearance/AppearanceViewController.swift b/Clocker/Preferences/Appearance/AppearanceViewController.swift
index 9842891..81c6332 100644
--- a/Clocker/Preferences/Appearance/AppearanceViewController.swift
+++ b/Clocker/Preferences/Appearance/AppearanceViewController.swift
@@ -104,8 +104,9 @@ class AppearanceViewController: ParentViewController {
         let shouldDisplayCompact = DataStore.shared().shouldDisplay(.menubarCompactMode)
         menubarMode.setSelected(true, forSegment: shouldDisplayCompact ? 0 : 1)
 
+        // True is Menubar Only and False is Menubar + Dock
         let appDisplayOptions = DataStore.shared().shouldDisplay(.appDisplayOptions)
-        appDisplayControl.setSelected(true, forSegment: appDisplayOptions ? 1 : 0)
+        appDisplayControl.setSelected(true, forSegment: appDisplayOptions ? 0 : 1)
     }
 
     @IBOutlet var timeFormatLabel: NSTextField!