diff --git a/Shifty.xcodeproj/xcshareddata/xcschemes/Shifty.xcscheme b/Shifty.xcodeproj/xcshareddata/xcschemes/Shifty.xcscheme
index 45850ff..3950274 100644
--- a/Shifty.xcodeproj/xcshareddata/xcschemes/Shifty.xcscheme
+++ b/Shifty.xcodeproj/xcshareddata/xcschemes/Shifty.xcscheme
@@ -62,13 +62,13 @@
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "show_setup"
-            value = "false"
-            isEnabled = "YES">
+            value = "true"
+            isEnabled = "NO">
          </EnvironmentVariable>
          <EnvironmentVariable
             key = "print_log"
-            value = "false"
-            isEnabled = "YES">
+            value = "true"
+            isEnabled = "NO">
          </EnvironmentVariable>
       </EnvironmentVariables>
       <LocationScenarioReference
diff --git a/Shifty/AppDelegate.swift b/Shifty/AppDelegate.swift
index 179e6a5..9bb7b0f 100644
--- a/Shifty/AppDelegate.swift
+++ b/Shifty/AppDelegate.swift
@@ -102,6 +102,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         updateMenuBarIcon()
         setStatusToggle()
         
+        NightShiftManager.shared.onNightShiftChange {
+            self.updateMenuBarIcon()
+        }
+        
         statusItem.behavior = .terminationOnRemoval
         statusItem.isVisible = true
         
@@ -212,29 +216,40 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     func setStatusToggle() {
-        if prefs.bool(forKey: Keys.isStatusToggleEnabled) {
-            statusItem.menu = nil
-            if let button = statusItem.button {
-                button.action = #selector(statusBarButtonClicked)
-                button.sendAction(on: [.leftMouseUp, .leftMouseDown, .rightMouseUp, .rightMouseDown])
-            }
-        } else {
-            statusItem.menu = statusMenu
+        statusItem.menu = nil
+        if let button = statusItem.button {
+            button.action = #selector(statusBarButtonClicked)
+            button.sendAction(on: [.leftMouseUp, .leftMouseDown, .rightMouseUp, .rightMouseDown])
         }
     }
 
     @objc func statusBarButtonClicked(sender: NSStatusBarButton) {
-        let event = NSApp.currentEvent!
+        guard let event = NSApp.currentEvent else { return }
         
-        if event.type == .rightMouseDown
-            || event.type == .rightMouseUp
-            || event.modifierFlags.contains(.control)
-        {
-            statusItem.menu = statusMenu
-            statusItem.button?.performClick(self)
-            statusItem.menu = nil
-        } else if event.type == .leftMouseUp {
-            statusItemClicked?()
+        if UserDefaults.standard.bool(forKey: Keys.isStatusToggleEnabled) {
+            if event.type == .rightMouseDown
+                || event.type == .rightMouseUp
+                || event.modifierFlags.contains(.control)
+            {
+                statusItem.menu = statusMenu
+                statusItem.button?.performClick(sender)
+                statusItem.menu = nil
+            } else if event.type == .leftMouseUp {
+                statusItemClicked?()
+            }
+        } else {
+            if event.type == .rightMouseUp
+                || (event.type == .leftMouseUp
+                    && event.modifierFlags.contains(.control))
+            {
+                statusItemClicked?()
+            } else if event.type == .leftMouseDown
+                && !event.modifierFlags.contains(.control)
+            {
+                statusItem.menu = statusMenu
+                statusItem.button?.performClick(sender)
+                statusItem.menu = nil
+            }
         }
     }
 
diff --git a/Shifty/Assets.xcassets/Contents.json b/Shifty/Assets.xcassets/Contents.json
index da4a164..73c0059 100644
--- a/Shifty/Assets.xcassets/Contents.json
+++ b/Shifty/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/Shifty/Assets.xcassets/braveIcon.imageset/Contents.json b/Shifty/Assets.xcassets/braveIcon.imageset/Contents.json
new file mode 100644
index 0000000..272c3c9
--- /dev/null
+++ b/Shifty/Assets.xcassets/braveIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "braveIcon.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Shifty/Assets.xcassets/braveIcon.imageset/braveIcon.png b/Shifty/Assets.xcassets/braveIcon.imageset/braveIcon.png
new file mode 100644
index 0000000..c683bc4
Binary files /dev/null and b/Shifty/Assets.xcassets/braveIcon.imageset/braveIcon.png differ
diff --git a/Shifty/Base.lproj/Setup.storyboard b/Shifty/Base.lproj/Setup.storyboard
index 283607b..5139e76 100644
--- a/Shifty/Base.lproj/Setup.storyboard
+++ b/Shifty/Base.lproj/Setup.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="dg9-4W-042">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="dg9-4W-042">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15702"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19455"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -73,7 +73,7 @@
                                 </textFieldCell>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="ldh-Qb-ijW">
-                                <rect key="frame" x="18" y="71" width="315" height="16"/>
+                                <rect key="frame" x="18" y="70" width="315" height="16"/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Click Next to continue setup. It'll just take a minute." id="J4B-E9-KIZ">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -81,7 +81,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="15C-Gh-udT">
-                                <rect key="frame" x="379" y="13" width="82" height="32"/>
+                                <rect key="frame" x="378" y="13" width="84" height="32"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="QTp-dQ-ljg"/>
                                 </constraints>
@@ -97,7 +97,7 @@ DQ
                                 </connections>
                             </button>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="jn8-mZ-J20">
-                                <rect key="frame" x="33" y="135" width="410" height="167"/>
+                                <rect key="frame" x="33" y="146" width="410" height="156"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="410" id="kBb-Cu-wf7"/>
                                 </constraints>
@@ -131,7 +131,7 @@ DQ
                 </viewController>
                 <customObject id="hxG-4G-Y0b" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="75" y="577.5"/>
+            <point key="canvasLocation" x="74.5" y="577"/>
         </scene>
         <!--Website Shifting Setup View Controller-->
         <scene sceneID="4dx-09-CxY">
@@ -142,7 +142,7 @@ DQ
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mxV-uh-tNL">
-                                <rect key="frame" x="33" y="201" width="410" height="166"/>
+                                <rect key="frame" x="61" y="194" width="353" height="173"/>
                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="websiteShiftingScreenshot-en" id="lih-8C-3IP"/>
                             </imageView>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="500" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sJ8-k4-SBk">
@@ -154,7 +154,7 @@ DQ
                                 </textFieldCell>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tfl-ez-xrs">
-                                <rect key="frame" x="18" y="415" width="342" height="35"/>
+                                <rect key="frame" x="18" y="415" width="343" height="35"/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Enable Website Shifting?" id="yjk-M4-AOM">
                                     <font key="font" metaFont="systemSemibold" size="30"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -162,7 +162,7 @@ DQ
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xfN-to-t5F">
-                                <rect key="frame" x="379" y="13" width="82" height="32"/>
+                                <rect key="frame" x="378" y="13" width="84" height="32"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="dVc-ZM-CoK"/>
                                 </constraints>
@@ -178,7 +178,7 @@ DQ
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j4y-h2-U3X">
-                                <rect key="frame" x="288" y="13" width="91" height="32"/>
+                                <rect key="frame" x="295" y="13" width="85" height="32"/>
                                 <buttonCell key="cell" type="push" title="Not now" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="y40-o0-ueU">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -188,7 +188,7 @@ DQ
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oJ6-zk-aYq">
-                                <rect key="frame" x="14" y="13" width="52" height="32"/>
+                                <rect key="frame" x="13" y="13" width="54" height="32"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="4Uh-U4-1SL"/>
                                 </constraints>
@@ -201,22 +201,22 @@ DQ
                                     <segue destination="O2N-Tr-VDU" kind="custom" customClass="SlideBackwardSegue" customModule="Shifty" customModuleProvider="target" id="za5-mC-13N"/>
                                 </connections>
                             </button>
-                            <customView ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eYW-HA-94C">
-                                <rect key="frame" x="157" y="51" width="161" height="140"/>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fxw-jc-XI4">
+                                <rect key="frame" x="155" y="168" width="165" height="16"/>
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Website Shifting supports:" id="bNv-dv-CBp">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <stackView distribution="fillEqually" orientation="horizontal" alignment="top" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" ambiguous="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="C1T-Yo-Rmw">
+                                <rect key="frame" x="155" y="60" width="164" height="98"/>
                                 <subviews>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fxw-jc-XI4">
-                                        <rect key="frame" x="-2" y="124" width="165" height="16"/>
-                                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Website Shifting supports:" id="bNv-dv-CBp">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="C1T-Yo-Rmw">
-                                        <rect key="frame" x="15" y="0.0" width="146" height="116"/>
+                                    <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cR9-Qb-LhN">
+                                        <rect key="frame" x="0.0" y="22" width="76" height="76"/>
                                         <subviews>
                                             <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IYO-zU-rWM">
-                                                <rect key="frame" x="0.0" y="96" width="146" height="20"/>
+                                                <rect key="frame" x="0.0" y="56" width="63" height="20"/>
                                                 <subviews>
                                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fC7-e4-xgu">
                                                         <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
@@ -227,7 +227,7 @@ DQ
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="safariIcon" id="ZFb-5U-9xA"/>
                                                     </imageView>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WWn-Pc-9SO">
-                                                        <rect key="frame" x="26" y="2" width="122" height="16"/>
+                                                        <rect key="frame" x="26" y="2" width="39" height="16"/>
                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Safari" id="4ft-mI-wIN">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -248,7 +248,7 @@ DQ
                                                 </customSpacing>
                                             </stackView>
                                             <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9NB-FN-bPk">
-                                                <rect key="frame" x="0.0" y="72" width="146" height="20"/>
+                                                <rect key="frame" x="0.0" y="28" width="76" height="20"/>
                                                 <subviews>
                                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="p8L-eK-sfO">
                                                         <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
@@ -259,7 +259,7 @@ DQ
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="chromeIcon" id="pZL-lW-eR3"/>
                                                     </imageView>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MmC-i0-VFp">
-                                                        <rect key="frame" x="26" y="2" width="122" height="16"/>
+                                                        <rect key="frame" x="26" y="2" width="52" height="16"/>
                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Chrome" id="shv-ze-VLi">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -280,7 +280,7 @@ DQ
                                                 </customSpacing>
                                             </stackView>
                                             <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ntP-Q2-Hwv">
-                                                <rect key="frame" x="0.0" y="48" width="146" height="20"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="66" height="20"/>
                                                 <subviews>
                                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5vF-9W-6he">
                                                         <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
@@ -291,7 +291,7 @@ DQ
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="operaIcon" id="gVm-c7-zAp"/>
                                                     </imageView>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="p0g-Ne-ZzW">
-                                                        <rect key="frame" x="26" y="2" width="122" height="16"/>
+                                                        <rect key="frame" x="26" y="2" width="42" height="16"/>
                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Opera" id="1Y8-bn-63E">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -311,8 +311,23 @@ DQ
                                                     <real value="3.4028234663852886e+38"/>
                                                 </customSpacing>
                                             </stackView>
+                                        </subviews>
+                                        <visibilityPriorities>
+                                            <integer value="1000"/>
+                                            <integer value="1000"/>
+                                            <integer value="1000"/>
+                                        </visibilityPriorities>
+                                        <customSpacing>
+                                            <real value="3.4028234663852886e+38"/>
+                                            <real value="3.4028234663852886e+38"/>
+                                            <real value="3.4028234663852886e+38"/>
+                                        </customSpacing>
+                                    </stackView>
+                                    <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JfE-hk-VYa">
+                                        <rect key="frame" x="88" y="22" width="76" height="76"/>
+                                        <subviews>
                                             <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LzB-bM-4k7">
-                                                <rect key="frame" x="0.0" y="24" width="59" height="20"/>
+                                                <rect key="frame" x="0.0" y="56" width="59" height="20"/>
                                                 <subviews>
                                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="9YB-3T-x9F">
                                                         <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
@@ -343,8 +358,40 @@ DQ
                                                     <real value="3.4028234663852886e+38"/>
                                                 </customSpacing>
                                             </stackView>
+                                            <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lhL-EI-tXq">
+                                                <rect key="frame" x="0.0" y="28" width="63" height="20"/>
+                                                <subviews>
+                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IMO-Uf-U6s">
+                                                        <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="20" id="PkE-DD-c7R"/>
+                                                            <constraint firstAttribute="height" constant="20" id="QJo-Co-XFu"/>
+                                                        </constraints>
+                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="braveIcon" id="shc-nv-4Q9"/>
+                                                    </imageView>
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uSR-SQ-n8a">
+                                                        <rect key="frame" x="26" y="2" width="39" height="16"/>
+                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Brave" id="vJo-dk-15O">
+                                                            <font key="font" metaFont="system"/>
+                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                        </textFieldCell>
+                                                    </textField>
+                                                </subviews>
+                                                <constraints>
+                                                    <constraint firstItem="uSR-SQ-n8a" firstAttribute="centerY" secondItem="IMO-Uf-U6s" secondAttribute="centerY" id="6Ys-lD-VeN"/>
+                                                </constraints>
+                                                <visibilityPriorities>
+                                                    <integer value="1000"/>
+                                                    <integer value="1000"/>
+                                                </visibilityPriorities>
+                                                <customSpacing>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                    <real value="3.4028234663852886e+38"/>
+                                                </customSpacing>
+                                            </stackView>
                                             <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xdg-mR-Qlo">
-                                                <rect key="frame" x="0.0" y="0.0" width="146" height="20"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="68" height="20"/>
                                                 <subviews>
                                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Hr-jL-37D">
                                                         <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
@@ -355,7 +402,7 @@ DQ
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vivaldiIcon" id="GYy-uD-kEC"/>
                                                     </imageView>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="df5-Zs-JT5">
-                                                        <rect key="frame" x="26" y="2" width="122" height="16"/>
+                                                        <rect key="frame" x="26" y="2" width="44" height="16"/>
                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Vivaldi" id="cXQ-bL-QlF">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -376,66 +423,53 @@ DQ
                                                 </customSpacing>
                                             </stackView>
                                         </subviews>
-                                        <constraints>
-                                            <constraint firstAttribute="trailing" secondItem="9NB-FN-bPk" secondAttribute="trailing" id="0f5-Of-8pZ"/>
-                                            <constraint firstItem="9NB-FN-bPk" firstAttribute="leading" secondItem="C1T-Yo-Rmw" secondAttribute="leading" id="2Ur-lJ-bj5"/>
-                                            <constraint firstItem="ntP-Q2-Hwv" firstAttribute="leading" secondItem="C1T-Yo-Rmw" secondAttribute="leading" id="AtO-jE-sw4"/>
-                                            <constraint firstAttribute="trailing" secondItem="ntP-Q2-Hwv" secondAttribute="trailing" id="bnJ-mV-Uet"/>
-                                            <constraint firstItem="IYO-zU-rWM" firstAttribute="leading" secondItem="C1T-Yo-Rmw" secondAttribute="leading" id="gCm-T3-jL3"/>
-                                            <constraint firstAttribute="trailing" secondItem="xdg-mR-Qlo" secondAttribute="trailing" id="uNi-qa-AMV"/>
-                                            <constraint firstItem="xdg-mR-Qlo" firstAttribute="leading" secondItem="C1T-Yo-Rmw" secondAttribute="leading" id="wyE-WE-ZFK"/>
-                                            <constraint firstAttribute="trailing" secondItem="IYO-zU-rWM" secondAttribute="trailing" id="xjG-B3-lYC"/>
-                                        </constraints>
                                         <visibilityPriorities>
                                             <integer value="1000"/>
                                             <integer value="1000"/>
                                             <integer value="1000"/>
-                                            <integer value="1000"/>
-                                            <integer value="1000"/>
                                         </visibilityPriorities>
                                         <customSpacing>
                                             <real value="3.4028234663852886e+38"/>
                                             <real value="3.4028234663852886e+38"/>
                                             <real value="3.4028234663852886e+38"/>
-                                            <real value="3.4028234663852886e+38"/>
-                                            <real value="3.4028234663852886e+38"/>
                                         </customSpacing>
                                     </stackView>
                                 </subviews>
-                                <constraints>
-                                    <constraint firstItem="C1T-Yo-Rmw" firstAttribute="leading" secondItem="eYW-HA-94C" secondAttribute="leading" constant="15" id="JZN-5e-MUL"/>
-                                    <constraint firstItem="C1T-Yo-Rmw" firstAttribute="top" secondItem="fxw-jc-XI4" secondAttribute="bottom" constant="8" id="QI2-gu-VkG"/>
-                                    <constraint firstItem="fxw-jc-XI4" firstAttribute="top" secondItem="eYW-HA-94C" secondAttribute="top" id="XU3-Ji-YPp"/>
-                                    <constraint firstAttribute="trailing" secondItem="C1T-Yo-Rmw" secondAttribute="trailing" id="bNR-He-t4s"/>
-                                    <constraint firstAttribute="bottom" secondItem="C1T-Yo-Rmw" secondAttribute="bottom" id="caH-1p-00g"/>
-                                    <constraint firstAttribute="trailing" secondItem="fxw-jc-XI4" secondAttribute="trailing" id="hcA-Vw-6ek"/>
-                                    <constraint firstItem="fxw-jc-XI4" firstAttribute="leading" secondItem="eYW-HA-94C" secondAttribute="leading" id="uFx-bu-440"/>
-                                </constraints>
-                            </customView>
+                                <visibilityPriorities>
+                                    <integer value="1000"/>
+                                    <integer value="1000"/>
+                                </visibilityPriorities>
+                                <customSpacing>
+                                    <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
+                                </customSpacing>
+                            </stackView>
                         </subviews>
                         <constraints>
+                            <constraint firstItem="fxw-jc-XI4" firstAttribute="top" secondItem="mxV-uh-tNL" secondAttribute="bottom" constant="10" id="1Zs-hH-6ae"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="mxV-uh-tNL" secondAttribute="trailing" constant="20" id="2HQ-I4-ztv"/>
                             <constraint firstItem="mxV-uh-tNL" firstAttribute="top" secondItem="sJ8-k4-SBk" secondAttribute="bottom" constant="8" id="2a6-RP-Sqm"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="tfl-ez-xrs" secondAttribute="trailing" constant="20" id="2ef-rQ-UOT"/>
+                            <constraint firstItem="C1T-Yo-Rmw" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="NqW-NI-dEn" secondAttribute="leading" constant="20" id="2se-zh-A6a"/>
                             <constraint firstItem="sJ8-k4-SBk" firstAttribute="leading" secondItem="NqW-NI-dEn" secondAttribute="leading" constant="20" id="5i1-dQ-HcI"/>
-                            <constraint firstItem="j4y-h2-U3X" firstAttribute="top" relation="greaterThanOrEqual" secondItem="eYW-HA-94C" secondAttribute="bottom" constant="10" id="7Rh-AC-ufU"/>
                             <constraint firstAttribute="bottom" secondItem="j4y-h2-U3X" secondAttribute="bottom" constant="20" id="8mh-4g-IVL"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="C1T-Yo-Rmw" secondAttribute="trailing" constant="20" id="F02-RZ-1a4"/>
                             <constraint firstItem="tfl-ez-xrs" firstAttribute="top" secondItem="NqW-NI-dEn" secondAttribute="top" id="FCt-7d-E6r"/>
                             <constraint firstAttribute="bottom" secondItem="xfN-to-t5F" secondAttribute="bottom" constant="20" id="Fhy-8K-WLZ"/>
                             <constraint firstItem="tfl-ez-xrs" firstAttribute="leading" secondItem="NqW-NI-dEn" secondAttribute="leading" constant="20" id="KLQ-tt-LUv"/>
                             <constraint firstItem="mxV-uh-tNL" firstAttribute="centerX" secondItem="NqW-NI-dEn" secondAttribute="centerX" id="KXr-tM-LuD"/>
                             <constraint firstItem="xfN-to-t5F" firstAttribute="leading" secondItem="j4y-h2-U3X" secondAttribute="trailing" constant="12" id="LNB-tU-DXX"/>
                             <constraint firstAttribute="bottom" secondItem="oJ6-zk-aYq" secondAttribute="bottom" constant="20" id="Lol-yx-aFr"/>
-                            <constraint firstItem="eYW-HA-94C" firstAttribute="top" secondItem="mxV-uh-tNL" secondAttribute="bottom" constant="10" id="S7e-9b-vOc"/>
+                            <constraint firstItem="oJ6-zk-aYq" firstAttribute="top" secondItem="C1T-Yo-Rmw" secondAttribute="bottom" constant="20" id="S05-1f-q49"/>
                             <constraint firstItem="sJ8-k4-SBk" firstAttribute="top" secondItem="tfl-ez-xrs" secondAttribute="bottom" constant="8" id="Sk9-6E-c2D"/>
                             <constraint firstItem="mxV-uh-tNL" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="NqW-NI-dEn" secondAttribute="leading" constant="20" id="WfU-Nk-o9B"/>
+                            <constraint firstItem="fxw-jc-XI4" firstAttribute="leading" secondItem="C1T-Yo-Rmw" secondAttribute="leading" id="asa-Gm-EUk"/>
                             <constraint firstItem="oJ6-zk-aYq" firstAttribute="leading" secondItem="NqW-NI-dEn" secondAttribute="leading" constant="20" id="fX4-II-rWF"/>
+                            <constraint firstItem="C1T-Yo-Rmw" firstAttribute="centerX" secondItem="NqW-NI-dEn" secondAttribute="centerX" id="hGy-dK-UQw"/>
                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="sJ8-k4-SBk" secondAttribute="trailing" constant="20" id="iQV-Y9-fnX"/>
                             <constraint firstItem="j4y-h2-U3X" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="oJ6-zk-aYq" secondAttribute="trailing" constant="10" id="iVQ-zU-z5t"/>
-                            <constraint firstItem="eYW-HA-94C" firstAttribute="centerX" secondItem="NqW-NI-dEn" secondAttribute="centerX" id="jpt-M3-InM"/>
-                            <constraint firstItem="eYW-HA-94C" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="NqW-NI-dEn" secondAttribute="leading" constant="20" id="kdI-Oa-k6W"/>
                             <constraint firstAttribute="trailing" secondItem="xfN-to-t5F" secondAttribute="trailing" constant="20" id="nk1-v1-GfS"/>
-                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="eYW-HA-94C" secondAttribute="trailing" constant="20" id="zA3-hf-gzf"/>
+                            <constraint firstItem="C1T-Yo-Rmw" firstAttribute="top" secondItem="fxw-jc-XI4" secondAttribute="bottom" constant="10" id="vHm-8g-nhf"/>
                         </constraints>
                     </view>
                     <connections>
@@ -444,7 +478,7 @@ DQ
                 </viewController>
                 <customObject id="hac-oa-XUY" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="622.5" y="577"/>
+            <point key="canvasLocation" x="622.5" y="578"/>
         </scene>
         <!--Accessibility View Controller-->
         <scene sceneID="1wS-7b-mSm">
@@ -455,7 +489,7 @@ DQ
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2a5-C1-Dyc">
-                                <rect key="frame" x="263" y="13" width="198" height="32"/>
+                                <rect key="frame" x="270" y="13" width="192" height="32"/>
                                 <buttonCell key="cell" type="push" title="Open System Preferences" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="lqU-rF-E5t">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -468,7 +502,7 @@ DQ
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CLB-OS-6L8">
-                                <rect key="frame" x="183" y="13" width="82" height="32"/>
+                                <rect key="frame" x="190" y="13" width="84" height="32"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="BrV-W5-n3I"/>
                                 </constraints>
@@ -482,7 +516,7 @@ DQ
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HyY-Eu-arg">
-                                <rect key="frame" x="62" y="13" width="32" height="31"/>
+                                <rect key="frame" x="65" y="18" width="26" height="26"/>
                                 <buttonCell key="cell" type="round" title="?" bezelStyle="circular" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="hnI-7M-qBT">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -492,7 +526,7 @@ DQ
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WXS-J3-zgH">
-                                <rect key="frame" x="14" y="13" width="52" height="32"/>
+                                <rect key="frame" x="13" y="13" width="54" height="32"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="40" id="qYL-7n-j51"/>
                                 </constraints>
@@ -506,7 +540,7 @@ DQ
                                 </connections>
                             </button>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="2Gt-ut-hn7" customClass="AccessibilityView" customModule="Shifty" customModuleProvider="target">
-                                <rect key="frame" x="20" y="61" width="435" height="389"/>
+                                <rect key="frame" x="20" y="60" width="435" height="390"/>
                             </customView>
                         </subviews>
                         <constraints>
@@ -542,7 +576,7 @@ DQ
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="r6Q-C0-71a">
-                                <rect key="frame" x="379" y="13" width="82" height="32"/>
+                                <rect key="frame" x="378" y="13" width="84" height="32"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="70" id="KZf-Ha-bvK"/>
                                 </constraints>
@@ -558,7 +592,7 @@ DQ
                                 </connections>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="22i-XU-Ifo">
-                                <rect key="frame" x="14" y="13" width="52" height="32"/>
+                                <rect key="frame" x="13" y="13" width="54" height="32"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="40" id="xdj-hT-apc"/>
                                 </constraints>
@@ -572,7 +606,7 @@ DQ
                                 </connections>
                             </button>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="BGI-WD-n0c">
-                                <rect key="frame" x="20" y="121" width="435" height="329"/>
+                                <rect key="frame" x="20" y="120" width="435" height="330"/>
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="8NH-cV-yLc">
                                         <rect key="frame" x="0.0" y="95" width="435" height="140"/>
@@ -586,7 +620,7 @@ DQ
                                                 </textFieldCell>
                                             </textField>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YeC-1H-Dey">
-                                                <rect key="frame" x="91" y="31" width="253" height="35"/>
+                                                <rect key="frame" x="90" y="31" width="255" height="35"/>
                                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="You're good to go!" id="uHP-lQ-mpf">
                                                     <font key="font" metaFont="systemSemibold" size="30"/>
                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -624,7 +658,7 @@ DQ
                                 </constraints>
                             </customView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RjY-FG-DwV">
-                                <rect key="frame" x="18" y="85" width="374" height="18"/>
+                                <rect key="frame" x="18" y="83" width="378" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="410" id="Sdu-dz-hVT"/>
                                 </constraints>
@@ -634,7 +668,7 @@ DQ
                                 </buttonCell>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xvQ-7Q-Jp7">
-                                <rect key="frame" x="33" y="55" width="100" height="27"/>
+                                <rect key="frame" x="32" y="53" width="102" height="27"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="90" id="xRu-v5-MUf"/>
                                 </constraints>
@@ -673,9 +707,14 @@ DQ
             <point key="canvasLocation" x="1736" y="578"/>
         </scene>
     </scenes>
+    <inferredMetricsTieBreakers>
+        <segue reference="RBK-ii-duJ"/>
+        <segue reference="OTp-Xx-YUK"/>
+    </inferredMetricsTieBreakers>
     <resources>
-        <image name="NSGoLeftTemplate" width="9" height="12"/>
-        <image name="NSLeftFacingTriangleTemplate" width="9" height="12"/>
+        <image name="NSGoLeftTemplate" width="10" height="14"/>
+        <image name="NSLeftFacingTriangleTemplate" width="10" height="14"/>
+        <image name="braveIcon" width="32" height="32"/>
         <image name="chromeIcon" width="32" height="32"/>
         <image name="edgeIcon" width="32" height="32"/>
         <image name="menuBarScreenshot" width="362" height="155.5"/>
@@ -685,8 +724,4 @@ DQ
         <image name="vivaldiIcon" width="32" height="32"/>
         <image name="websiteShiftingScreenshot-en" width="340" height="167"/>
     </resources>
-    <inferredMetricsTieBreakers>
-        <segue reference="RBK-ii-duJ"/>
-        <segue reference="OTp-Xx-YUK"/>
-    </inferredMetricsTieBreakers>
 </document>
diff --git a/Shifty/BrowserManager.swift b/Shifty/BrowserManager.swift
index 8dfcf53..2202272 100644
--- a/Shifty/BrowserManager.swift
+++ b/Shifty/BrowserManager.swift
@@ -28,6 +28,9 @@ enum SupportedBrowserID: BundleIdentifier {
     case operaBeta = "com.operasoftware.OperaNext"
     case operaDeveloper = "com.operasoftware.OperaDeveloper"
     
+    case brave = "com.brave.Browser"
+    case braveBeta = "com.brave.Browser.beta"
+    
     case vivaldi = "com.vivaldi.Vivaldi"
     
     init?(_ rawValue: String) {
@@ -135,9 +138,9 @@ class BrowserManager {
     }
     
     private func fireNightShiftEvent() {
-        if RuleManager.shared.ruleForSubdomain == .enabled {
+        if RuleManager.shared.ruleForCurrentSubdomain == .enabled {
             NightShiftManager.shared.respond(to: .nightShiftEnableRuleActivated)
-        } else if RuleManager.shared.disabledForDomain || RuleManager.shared.ruleForSubdomain == .disabled {
+        } else if RuleManager.shared.isDisabledForDomain || RuleManager.shared.ruleForCurrentSubdomain == .disabled {
             NightShiftManager.shared.respond(to: .nightShiftDisableRuleActivated)
         } else {
             NightShiftManager.shared.respond(to: .nightShiftDisableRuleDeactivated)
@@ -254,7 +257,10 @@ class BrowserManager {
         
         let tab: Tab?
         switch browserID {
-        case .chrome, .chromeCanary, .chromium, .edge, .edgeBeta, .opera, .operaBeta, .operaDeveloper, .vivaldi:
+        case .chrome, .chromeCanary, .chromium,
+                .edge, .edgeBeta,
+                .opera, .operaBeta, .operaDeveloper,
+                .brave, .braveBeta, .vivaldi:
             tab = window.activeTab
         case .safari, .safariTechnologyPreview:
             do {
diff --git a/Shifty/MainMenu.xib b/Shifty/MainMenu.xib
index 3c35868..058bd15 100644
--- a/Shifty/MainMenu.xib
+++ b/Shifty/MainMenu.xib
@@ -22,10 +22,11 @@
         <customObject id="YHE-ZD-Fjn" userLabel="StatusMenuController" customClass="StatusMenuController" customModule="Shifty" customModuleProvider="target">
             <connections>
                 <outlet property="descriptionMenuItem" destination="zi6-lD-Hd5" id="DcD-QI-A3k"/>
-                <outlet property="disableAppMenuItem" destination="ycw-C3-JG6" id="w7g-sV-odc"/>
+                <outlet property="disableCurrentAppMenuItem" destination="ycw-C3-JG6" id="w7g-sV-odc"/>
                 <outlet property="disableCustomMenuItem" destination="VMR-D3-M60" id="Seo-8A-F4I"/>
                 <outlet property="disableDomainMenuItem" destination="JPo-kA-2ad" id="apR-hI-2G1"/>
                 <outlet property="disableHourMenuItem" destination="lLZ-zs-A2J" id="JBY-cw-D9b"/>
+                <outlet property="disableRunningAppMenuItem" destination="Bq2-vW-0D6" id="SiA-oU-QCK"/>
                 <outlet property="disableSubdomainMenuItem" destination="VgG-sQ-dcu" id="1hP-t7-xvX"/>
                 <outlet property="enableBrowserAutomationMenuItem" destination="Anz-oa-3rV" id="5yd-Qd-JzE"/>
                 <outlet property="moonIcon" destination="QFo-Gz-iR8" id="bkD-8o-fbd"/>
@@ -55,10 +56,10 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                 </menuItem>
                 <menuItem isSeparatorItem="YES" id="9KJ-0B-A9w"/>
-                <menuItem title="Disable for app" id="ycw-C3-JG6">
+                <menuItem title="Disable for current app" id="ycw-C3-JG6">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
-                        <action selector="disableForApp:" target="YHE-ZD-Fjn" id="Akx-Tu-eBm"/>
+                        <action selector="disableForCurrentApp:" target="YHE-ZD-Fjn" id="5x5-Wn-Thl"/>
                     </connections>
                 </menuItem>
                 <menuItem title="Disable for Domain" hidden="YES" indentationLevel="1" id="JPo-kA-2ad">
@@ -79,6 +80,12 @@
                         <action selector="enableBrowserAutomation:" target="YHE-ZD-Fjn" id="KGQ-H9-T8g"/>
                     </connections>
                 </menuItem>
+                <menuItem title="Disable when app is running" id="Bq2-vW-0D6">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="disableForRunningApp:" target="YHE-ZD-Fjn" id="fZt-6e-AtZ"/>
+                    </connections>
+                </menuItem>
                 <menuItem title="Disable for an hour" id="lLZ-zs-A2J">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
@@ -185,7 +192,7 @@
             <connections>
                 <outlet property="shiftSlider" destination="qOz-qT-jic" id="RJ9-eC-U59"/>
             </connections>
-            <point key="canvasLocation" x="144" y="324"/>
+            <point key="canvasLocation" x="144" y="343"/>
         </customView>
     </objects>
     <resources>
diff --git a/Shifty/NightShiftManager.swift b/Shifty/NightShiftManager.swift
index ad5020c..88b8496 100644
--- a/Shifty/NightShiftManager.swift
+++ b/Shifty/NightShiftManager.swift
@@ -12,6 +12,8 @@ import SwiftLog
 class NightShiftManager {
     static let shared = NightShiftManager()
     let client = CBBlueLightClient.shared
+    
+    var nightShiftChangeListeners = [() -> Void]()
 
     var userSet: UserSet = .notSet
     var userInitiatedShift = false
@@ -81,16 +83,11 @@ class NightShiftManager {
             }
             
             self.updateDarkMode()
-
-            DispatchQueue.main.async {
-                let appDelegate = NSApplication.shared.delegate as! AppDelegate
-                appDelegate.updateMenuBarIcon()
-                
-                let prefWindow = appDelegate.preferenceWindowController
-                let prefGeneral = prefWindow.viewControllers.compactMap { childViewController in
-                    return childViewController as? PrefGeneralViewController
-                }.first
-                prefGeneral?.updateSchedule?()
+            
+            for listener in self.nightShiftChangeListeners {
+                DispatchQueue.main.async {
+                    listener()
+                }
             }
         }
         
@@ -108,6 +105,10 @@ class NightShiftManager {
         }
     }
     
+    func onNightShiftChange(_ listener: @escaping () -> Void) {
+        nightShiftChangeListeners.append(listener)
+    }
+    
     func updateDarkMode() {
         if UserDefaults.standard.bool(forKey: Keys.isDarkModeSyncEnabled) {
             let scheduledState = client.scheduledState
diff --git a/Shifty/PrefGeneralViewController.swift b/Shifty/PrefGeneralViewController.swift
index 77f90ac..d369ff7 100644
--- a/Shifty/PrefGeneralViewController.swift
+++ b/Shifty/PrefGeneralViewController.swift
@@ -57,11 +57,6 @@ class PrefGeneralViewController: NSViewController, MASPreferencesViewController
     @IBOutlet weak var toLabel: NSTextField!
     @IBOutlet weak var customTimeStackView: NSStackView!
 
-    let prefs = UserDefaults.standard
-    var setStatusToggle: (() -> Void)?
-    var updateSchedule: (() -> Void)?
-    var updateDarkMode: (() -> Void)?
-
     var appDelegate: AppDelegate!
     var prefWindow: NSWindow!
     
@@ -72,6 +67,10 @@ class PrefGeneralViewController: NSViewController, MASPreferencesViewController
 
         appDelegate = NSApplication.shared.delegate as? AppDelegate
         prefWindow = appDelegate.preferenceWindowController.window
+        
+        NightShiftManager.shared.onNightShiftChange {
+            self.updateSchedule()
+        }
 
         //Hide True Tone settings on unsupported computers
         if #available(macOS 10.14, *) {
@@ -86,31 +85,31 @@ class PrefGeneralViewController: NSViewController, MASPreferencesViewController
         if !ProcessInfo().isOperatingSystemAtLeast(OperatingSystemVersion(majorVersion: 10, minorVersion: 13, patchVersion: 0)) {
             view.wantsLayer = false
         }
-
-        updateSchedule = {
-            switch NightShiftManager.shared.schedule {
-            case .off:
-                self.schedulePopup.select(self.offMenuItem)
-                self.customTimeStackView.isHidden = true
-            case .custom(start: let startTime, end: let endTime):
-                self.schedulePopup.select(self.customMenuItem)
-                let startDate = Date(startTime)
-                let endDate = Date(endTime)
-                
-                self.fromTimePicker.dateValue = startDate
-                self.toTimePicker.dateValue = endDate
-                self.customTimeStackView.isHidden = false
-            case .solar:
-                self.schedulePopup.select(self.sunMenuItem)
-                self.customTimeStackView.isHidden = true
-            }
-        }
     }
 
     override func viewWillAppear() {
         super.viewWillAppear()
 
-        updateSchedule?()
+        updateSchedule()
+    }
+    
+    func updateSchedule() {
+        switch NightShiftManager.shared.schedule {
+        case .off:
+            self.schedulePopup.select(self.offMenuItem)
+            self.customTimeStackView.isHidden = true
+        case .custom(start: let startTime, end: let endTime):
+            self.schedulePopup.select(self.customMenuItem)
+            let startDate = Date(startTime)
+            let endDate = Date(endTime)
+            
+            self.fromTimePicker.dateValue = startDate
+            self.toTimePicker.dateValue = endDate
+            self.customTimeStackView.isHidden = false
+        case .solar:
+            self.schedulePopup.select(self.sunMenuItem)
+            self.customTimeStackView.isHidden = true
+        }
     }
 
     //MARK: IBActions
@@ -149,7 +148,7 @@ class PrefGeneralViewController: NSViewController, MASPreferencesViewController
             if !UIElement.isProcessTrusted() {
                 logw("Accessibility permissions alert shown")
 
-                prefs.set(false, forKey: Keys.isWebsiteControlEnabled)
+                UserDefaults.standard.set(false, forKey: Keys.isWebsiteControlEnabled)
                 NSApp.runModal(for: AccessibilityWindow().window!)
             }
         } else {
diff --git a/Shifty/PrefManager.swift b/Shifty/PrefManager.swift
index 55f4ac1..2368e30 100644
--- a/Shifty/PrefManager.swift
+++ b/Shifty/PrefManager.swift
@@ -16,7 +16,8 @@ enum Keys {
     static let isWebsiteControlEnabled = "isWebsiteControlEnabled"
     static let trueToneControl = "trueToneControl"
     static let analyticsPermission = "fabricCrashlyticsPermission"
-    static let disabledApps = "disabledApps"
+    static let currentAppDisableRules = "disabledApps"
+    static let runningAppDisableRules = "disabledRunningApps"
     static let browserRules = "browserRules"
 
     static let toggleNightShiftShortcut = "toggleNightShiftShortcut"
@@ -55,40 +56,12 @@ class PrefManager {
             Keys.isWebsiteControlEnabled: NSNumber(value: false),
             Keys.trueToneControl: NSNumber(value: false),
             Keys.analyticsPermission: NSNumber(value: false),
-            Keys.disabledApps: NSData(),
+            Keys.currentAppDisableRules: NSData(),
+            Keys.runningAppDisableRules: NSData(),
             Keys.browserRules: NSData(),
             Keys.hasSetupWindowShown: NSNumber(value: false)
             ] as [String : Any]
 
         userDefaults.register(defaults: factoryDefaults)
     }
-
-    func synchronize() {
-        userDefaults.synchronize()
-    }
-
-    func reset() {
-        userDefaults.removeObject(forKey: Keys.isAutoLaunchEnabled)
-        userDefaults.removeObject(forKey: Keys.isStatusToggleEnabled)
-        userDefaults.removeObject(forKey: Keys.isIconSwitchingEnabled)
-        userDefaults.removeObject(forKey: Keys.isDarkModeSyncEnabled)
-        userDefaults.removeObject(forKey: Keys.isWebsiteControlEnabled)
-        userDefaults.removeObject(forKey: Keys.trueToneControl)
-        userDefaults.removeObject(forKey: Keys.disabledApps)
-        userDefaults.removeObject(forKey: Keys.browserRules)
-        userDefaults.removeObject(forKey: Keys.toggleNightShiftShortcut)
-        userDefaults.removeObject(forKey: Keys.incrementColorTempShortcut)
-        userDefaults.removeObject(forKey: Keys.decrementColorTempShortcut)
-        userDefaults.removeObject(forKey: Keys.disableAppShortcut)
-        userDefaults.removeObject(forKey: Keys.disableDomainShortcut)
-        userDefaults.removeObject(forKey: Keys.disableSubdomainShortcut)
-        userDefaults.removeObject(forKey: Keys.disableHourShortcut)
-        userDefaults.removeObject(forKey: Keys.disableCustomShortcut)
-        userDefaults.removeObject(forKey: Keys.toggleTrueToneShortcut)
-        userDefaults.removeObject(forKey: Keys.toggleDarkModeShortcut)
-        userDefaults.removeObject(forKey: Keys.analyticsPermission)
-        userDefaults.removeObject(forKey: Keys.hasSetupWindowShown)
-        
-        synchronize()
-    }
 }
diff --git a/Shifty/PrefShortcutsViewController.swift b/Shifty/PrefShortcutsViewController.swift
index 35b6340..93389ce 100644
--- a/Shifty/PrefShortcutsViewController.swift
+++ b/Shifty/PrefShortcutsViewController.swift
@@ -128,8 +128,8 @@ class PrefShortcutsViewController: NSViewController, MASPreferencesViewControlle
 
         MASShortcutBinder.shared().bindShortcut(withDefaultsKey: Keys.disableAppShortcut) {
             guard let menu = self.statusMenuController else { return }
-            if !menu.disableAppMenuItem.isHidden && menu.disableAppMenuItem.isEnabled {
-                self.statusMenuController?.disableForApp(self)
+            if !menu.disableCurrentAppMenuItem.isHidden && menu.disableCurrentAppMenuItem.isEnabled {
+                self.statusMenuController?.disableForCurrentApp(self)
             } else {
                 NSSound.beep()
             }
diff --git a/Shifty/RuleManager.swift b/Shifty/RuleManager.swift
index d9da9e1..944d68d 100644
--- a/Shifty/RuleManager.swift
+++ b/Shifty/RuleManager.swift
@@ -13,13 +13,67 @@ import ScriptingBridge
 class RuleManager {
     static var shared = RuleManager()
     
-    var disabledApps = Set<AppRule>() {
-        didSet {
-            UserDefaults.standard.set(try? PropertyListEncoder().encode(disabledApps), forKey: Keys.disabledApps)
+    init() {
+        if let appData = UserDefaults.standard.value(forKey: Keys.currentAppDisableRules) as? Data {
+            do {
+                currentAppDisableRules = try PropertyListDecoder().decode(Set<AppRule>.self, from: appData)
+            } catch {
+                logw("Error: \(error.localizedDescription)")
+            }
+        }
+        
+        if let appData = UserDefaults.standard.value(forKey: Keys.runningAppDisableRules) as? Data {
+            do {
+                runningAppDisableRules = try PropertyListDecoder().decode(Set<AppRule>.self, from: appData)
+            } catch let error {
+                logw("Error: \(error.localizedDescription)")
+            }
+        }
+        
+        if let browserData = UserDefaults.standard.value(forKey: Keys.browserRules) as? Data {
+            do {
+                browserRules = try PropertyListDecoder().decode(Set<BrowserRule>.self, from: browserData)
+            } catch let error {
+                logw("Error: \(error.localizedDescription)")
+            }
+        }
+        
+        NSWorkspace.shared.notificationCenter.addObserver(
+            forName: NSWorkspace.didActivateApplicationNotification,
+            object: nil,
+            queue: nil)
+        { notification in
+            self.appSwitched(notification: notification)
+        }
+        
+        NSWorkspace.shared.notificationCenter.addObserver(
+            forName: NSWorkspace.didLaunchApplicationNotification,
+            object: nil,
+            queue: nil)
+        { notification in
+            self.appSwitched(notification: notification)
+        }
+        
+        NSWorkspace.shared.notificationCenter.addObserver(
+            forName: NSWorkspace.didTerminateApplicationNotification,
+            object: nil,
+            queue: nil)
+        { notification in
+            self.appSwitched(notification: notification)
         }
     }
     
+    private var currentAppDisableRules = Set<AppRule>() {
+        didSet {
+            UserDefaults.standard.set(try? PropertyListEncoder().encode(currentAppDisableRules), forKey: Keys.currentAppDisableRules)
+        }
+    }
     
+    private var runningAppDisableRules = Set<AppRule>() {
+        didSet {
+            UserDefaults.standard.set(try? PropertyListEncoder().encode(runningAppDisableRules), forKey: Keys.runningAppDisableRules)
+        }
+    }
     
     var browserRules = Set<BrowserRule>() {
         didSet(newValue) {
@@ -27,177 +81,198 @@ class RuleManager {
         }
     }
     
-    
-    
     var currentApp: NSRunningApplication? {
-        return NSWorkspace.shared.menuBarOwningApplication
+        NSWorkspace.shared.menuBarOwningApplication
     }
     
+    var runningApps: [NSRunningApplication] {
+        NSWorkspace.shared.runningApplications
+    }
     
     
-    var disabledForApp: Bool {
-        get {
-            guard let bundleIdentifier = currentApp?.bundleIdentifier else {
-                logw("Could not obtain bundle identifier of current application")
-                return false
-            }
-            return disabledApps.filter {
-                $0.bundleIdentifier == bundleIdentifier }.count > 0
-        }
-        set(newValue) {
-            guard let bundleIdentifier = currentApp?.bundleIdentifier else {
-                logw("Could not obtain bundle identifier of current application")
-                return
-            }
-            let rule = AppRule(bundleIdentifier: bundleIdentifier, fullScreenOnly: false)
-            if newValue {
-                disabledApps.insert(rule)
-                NightShiftManager.shared.respond(to: .nightShiftDisableRuleActivated)
-            } else {
-                guard let index = disabledApps.firstIndex(of: rule) else { return }
-                disabledApps.remove(at: index)
-                NightShiftManager.shared.respond(to: .nightShiftDisableRuleDeactivated)
-            }
+    var isDisabledForCurrentApp: Bool {
+        guard let bundleIdentifier = currentApp?.bundleIdentifier else {
+            logw("Could not obtain bundle identifier of current application")
+            return false
         }
+        return currentAppDisableRules.filter {
+            $0.bundleIdentifier == bundleIdentifier }.count > 0
+    }
+    
+    func addCurrentAppDisableRule(forApp app: NSRunningApplication) {
+        guard let bundleID = app.bundleIdentifier else { return }
+        let rule = AppRule(bundleIdentifier: bundleID, fullScreenOnly: false)
+        currentAppDisableRules.insert(rule)
+        NightShiftManager.shared.respond(to: .nightShiftDisableRuleActivated)
+    }
+    
+    func removeCurrentAppDisableRule(forApp app: NSRunningApplication) {
+        guard let bundleID = app.bundleIdentifier,
+              let index = currentAppDisableRules.firstIndex(where: {
+                  $0.bundleIdentifier == bundleID
+              }) else { return }
+        
+        currentAppDisableRules.remove(at: index)
+        NightShiftManager.shared.respond(to: .nightShiftDisableRuleDeactivated)
     }
     
     
+    var isDisabledForRunningApp: Bool {
+        disabledCurrentlyRunningApps.count > 0
+    }
     
-    var disabledForDomain: Bool {
-        get {
-            guard let currentDomain = BrowserManager.shared.currentDomain else { return false }
-            let disabledDomain = browserRules.filter {
-                $0.type == .domain && $0.host == currentDomain }.count > 0
-            return disabledDomain
+    /// The currently running apps that Night Shift is disabled for
+    var disabledCurrentlyRunningApps: [NSRunningApplication] {
+        let disabledBundleIDs = Set(runningAppDisableRules.map { $0.bundleIdentifier })
+        return runningApps.filter {
+            guard let bundleID = $0.bundleIdentifier else { return false }
+            return disabledBundleIDs.contains(bundleID)
         }
-        set(newValue) {
-            guard let currentDomain = BrowserManager.shared.currentDomain else { return }
-            let rule = BrowserRule(type: .domain, host: currentDomain)
-            if newValue {
-                browserRules.insert(rule)
-                NightShiftManager.shared.respond(to: .nightShiftDisableRuleActivated)
-            } else {
-                guard let index = browserRules.firstIndex(of: rule) else { return }
+    }
+    
+    func isDisabledWhenRunningApp(_ app: NSRunningApplication) -> Bool {
+        guard let bundleID = app.bundleIdentifier else { return false }
+        return runningAppDisableRules.contains(where: { $0.bundleIdentifier == bundleID })
+    }
+    
+    func addRunningAppDisableRule(forApp app: NSRunningApplication) {
+        guard let bundleID = app.bundleIdentifier else { return }
+        let rule = AppRule(bundleIdentifier: bundleID, fullScreenOnly: false)
+        
+        runningAppDisableRules.insert(rule)
+        NightShiftManager.shared.respond(to: .nightShiftDisableRuleActivated)
+    }
+    
+    func removeRunningAppDisableRule(forApp app: NSRunningApplication) {
+        guard let bundleID = app.bundleIdentifier,
+              let index = runningAppDisableRules.firstIndex(where: {
+                  $0.bundleIdentifier == bundleID
+              }) else { return }
                 
-                if ruleForSubdomain == .enabled {
-                    ruleForSubdomain = .none
-                }
-                browserRules.remove(at: index)
-                NightShiftManager.shared.respond(to: .nightShiftDisableRuleDeactivated)
-            }
+        runningAppDisableRules.remove(at: index)
+        NightShiftManager.shared.respond(to: .nightShiftDisableRuleDeactivated)
+    }
+    
+    
+    var isDisabledForDomain: Bool {
+        guard let currentDomain = BrowserManager.shared.currentDomain else { return false }
+        let disabledDomain = browserRules.filter {
+            $0.type == .domain && $0.host == currentDomain }.count > 0
+        return disabledDomain
+    }
+    
+    func addDomainDisableRule(forDomain domain: String) {
+        let rule = BrowserRule(type: .domain, host: domain)
+        browserRules.insert(rule)
+        
+        NightShiftManager.shared.respond(to: .nightShiftDisableRuleActivated)
+    }
+    
+    func removeDomainDisableRule(forDomain domain: String) {
+        let rule = BrowserRule(type: .domain, host: domain)
+        guard let index = browserRules.firstIndex(of: rule) else { return }
+        browserRules.remove(at: index)
+        
+        if let currentSubdomain = BrowserManager.shared.currentSubdomain,
+           getSubdomainRule(forSubdomain: currentSubdomain) == .enabled
+        {
+            setSubdomainRule(.none, forSubdomain: currentSubdomain)
         }
+        
+        NightShiftManager.shared.respond(to: .nightShiftDisableRuleDeactivated)
     }
     
     
+    func getSubdomainRule(forSubdomain subdomain: String) -> SubdomainRuleType {
+        if isDisabledForDomain {
+            let isEnabled = (browserRules.filter {
+                $0.type == .subdomainEnabled
+                && $0.host == subdomain
+            }.count > 0)
+            if isEnabled {
+                return .enabled
+            }
+        } else {
+            let isDisabled = (browserRules.filter {
+                $0.type == .subdomainDisabled
+                && $0.host == subdomain
+            }.count > 0)
+            if isDisabled {
+                return .disabled
+            }
+        }
+        return .none
+    }
     
-    var ruleForSubdomain: SubdomainRuleType {
-        get {
-            guard let currentSubdomain = BrowserManager.shared.currentSubdomain else { return .none }
+    var ruleForCurrentSubdomain: SubdomainRuleType {
+        guard let currentSubdomain = BrowserManager.shared.currentSubdomain else { return .none }
+        return getSubdomainRule(forSubdomain: currentSubdomain)
+    }
+    
+    func setSubdomainRule(_ ruleType: SubdomainRuleType, forSubdomain subdomain: String) {
+        switch ruleType {
+        case .disabled:
+            let rule = BrowserRule(type: .subdomainDisabled, host: subdomain)
+            browserRules.insert(rule)
+            NightShiftManager.shared.respond(to: .nightShiftDisableRuleActivated)
+        case .enabled:
+            let rule = BrowserRule(type: .subdomainEnabled, host: subdomain)
+            browserRules.insert(rule)
+            NightShiftManager.shared.respond(to: .nightShiftEnableRuleActivated)
+        case .none:
+            var rule: BrowserRule
+            let prevValue = getSubdomainRule(forSubdomain: subdomain)
             
-            if disabledForDomain {
-                let isEnabled = (browserRules.filter {
-                    $0.type == .subdomainEnabled
-                        && $0.host == currentSubdomain
-                    }.count > 0)
-                if isEnabled {
-                    return .enabled
-                }
-            } else {
-                let isDisabled = (browserRules.filter {
-                    $0.type == .subdomainDisabled
-                        && $0.host == currentSubdomain
-                    }.count > 0)
-                if isDisabled {
-                    return .disabled
-                }
+            //Remove rule from set before triggering NightShiftEvent
+            switch prevValue {
+            case .disabled:
+                rule = BrowserRule(type: .subdomainDisabled, host: subdomain)
+            case .enabled:
+                rule = BrowserRule(type: .subdomainEnabled, host: subdomain)
+            case .none:
+                return
             }
-            return .none
-        }
-        set(newValue) {
-            guard let currentSubdomain = BrowserManager.shared.currentSubdomain else { return }
+            guard let index = browserRules.firstIndex(of: rule) else { return }
+            browserRules.remove(at: index)
             
-            switch newValue {
+            switch prevValue {
             case .disabled:
-                let rule = BrowserRule(type: .subdomainDisabled, host: currentSubdomain)
-                browserRules.insert(rule)
-                NightShiftManager.shared.respond(to: .nightShiftDisableRuleActivated)
+                NightShiftManager.shared.respond(to: .nightShiftDisableRuleDeactivated)
             case .enabled:
-                let rule = BrowserRule(type: .subdomainEnabled, host: currentSubdomain)
-                browserRules.insert(rule)
-                NightShiftManager.shared.respond(to: .nightShiftEnableRuleActivated)
+                NightShiftManager.shared.respond(to: .nightShiftEnableRuleDeactivated)
             case .none:
-                var rule: BrowserRule
-                let prevValue = ruleForSubdomain
-                
-                //Remove rule from set before triggering NightShiftEvent
-                switch prevValue {
-                case .disabled:
-                    rule = BrowserRule(type: .subdomainDisabled, host: currentSubdomain)
-                case .enabled:
-                    rule = BrowserRule(type: .subdomainEnabled, host: currentSubdomain)
-                case .none:
-                    return
-                }
-                guard let index = browserRules.firstIndex(of: rule) else { return }
-                browserRules.remove(at: index)
-                
-                switch prevValue {
-                case .disabled:
-                    NightShiftManager.shared.respond(to: .nightShiftDisableRuleDeactivated)
-                case .enabled:
-                    NightShiftManager.shared.respond(to: .nightShiftEnableRuleDeactivated)
-                case .none:
-                    break
-                }
+                break
             }
         }
     }
     
     
-    
     var disableRuleIsActive: Bool {
-        return disabledForApp || (disabledForDomain && ruleForSubdomain != .enabled) || ruleForSubdomain == .disabled
+        return isDisabledForCurrentApp || isDisabledForRunningApp ||
+        (isDisabledForDomain && ruleForCurrentSubdomain != .enabled) ||
+        ruleForCurrentSubdomain == .disabled
     }
     
     
-    
     func removeRulesForCurrentState() {
-        disabledForApp = false
-        disabledForDomain = false
-        ruleForSubdomain = .none
-    }
-    
-    
-
-    init() {
-        NSWorkspace.shared.notificationCenter.addObserver(forName: NSWorkspace.didActivateApplicationNotification,
-                                                          object: nil,
-                                                          queue: nil) {
-            self.appSwitched(notification: $0)
-        }
-        
-        if let appData = UserDefaults.standard.value(forKey: Keys.disabledApps) as? Data {
-            do {
-                disabledApps = try PropertyListDecoder().decode(Set<AppRule>.self, from: appData)
-            } catch let error {
-                logw("Error: \(error.localizedDescription)")
+        if let currentApp = currentApp {
+            removeCurrentAppDisableRule(forApp: currentApp)
+            for app in disabledCurrentlyRunningApps {
+                removeRunningAppDisableRule(forApp: app)
             }
         }
-        
-        if let browserData = UserDefaults.standard.value(forKey: Keys.browserRules) as? Data {
-            do {
-                browserRules = try PropertyListDecoder().decode(Set<BrowserRule>.self, from: browserData)
-            } catch let error {
-                logw("Error: \(error.localizedDescription)")
-            }
+        if let currentDomain = BrowserManager.shared.currentDomain {
+            removeDomainDisableRule(forDomain: currentDomain)
+        }
+        if let currentSubdomain = BrowserManager.shared.currentSubdomain {
+            setSubdomainRule(.none, forSubdomain: currentSubdomain)
         }
     }
     
     
-
     private func appSwitched(notification: Notification) {
         BrowserManager.shared.stopBrowserWatcher()
-        if disabledForApp {
+        if isDisabledForCurrentApp || isDisabledForRunningApp {
             NightShiftManager.shared.respond(to: .nightShiftDisableRuleActivated)
         } else if BrowserManager.shared.currentAppIsSupportedBrowser {
             BrowserManager.shared.updateForSupportedBrowser()
@@ -229,6 +304,7 @@ enum SubdomainRuleType: String, Codable {
 
 struct AppRule: CustomStringConvertible, Hashable, Codable {
     var bundleIdentifier: BundleIdentifier
+    // Currently unused
     var fullScreenOnly: Bool
     
     var description: String {
diff --git a/Shifty/StatusMenuController.swift b/Shifty/StatusMenuController.swift
index b2b6a3b..810512b 100644
--- a/Shifty/StatusMenuController.swift
+++ b/Shifty/StatusMenuController.swift
@@ -18,7 +18,8 @@ class StatusMenuController: NSObject, NSMenuDelegate {
     @IBOutlet weak var trueToneMenuItem: NSMenuItem!
     @IBOutlet weak var sliderMenuItem: NSMenuItem!
     @IBOutlet weak var descriptionMenuItem: NSMenuItem!
-    @IBOutlet weak var disableAppMenuItem: NSMenuItem!
+    @IBOutlet weak var disableCurrentAppMenuItem: NSMenuItem!
+    @IBOutlet weak var disableRunningAppMenuItem: NSMenuItem!
     @IBOutlet weak var disableDomainMenuItem: NSMenuItem!
     @IBOutlet weak var disableSubdomainMenuItem: NSMenuItem!
     @IBOutlet weak var enableBrowserAutomationMenuItem: NSMenuItem!
@@ -125,7 +126,7 @@ class StatusMenuController: NSObject, NSMenuDelegate {
         setDescriptionText()
         
         assignKeyboardShortcutToMenuItem(powerMenuItem, userDefaultsKey: Keys.toggleNightShiftShortcut)
-        assignKeyboardShortcutToMenuItem(disableAppMenuItem, userDefaultsKey: Keys.disableAppShortcut)
+        assignKeyboardShortcutToMenuItem(disableCurrentAppMenuItem, userDefaultsKey: Keys.disableAppShortcut)
         assignKeyboardShortcutToMenuItem(disableDomainMenuItem, userDefaultsKey: Keys.disableDomainShortcut)
         assignKeyboardShortcutToMenuItem(disableSubdomainMenuItem, userDefaultsKey: Keys.disableSubdomainShortcut)
         assignKeyboardShortcutToMenuItem(disableHourMenuItem, userDefaultsKey: Keys.disableHourShortcut)
@@ -193,19 +194,33 @@ class StatusMenuController: NSObject, NSMenuDelegate {
         
         
         //MARK: disable for app
-        if RuleManager.shared.disabledForApp {
-            disableAppMenuItem.state = .on
-            disableAppMenuItem.title = String(format: NSLocalizedString("menu.disabled_for", comment: "Disabled for %@"), currentAppName)
+        if RuleManager.shared.isDisabledForCurrentApp {
+            disableCurrentAppMenuItem.state = .on
+            disableCurrentAppMenuItem.title = String(format: NSLocalizedString("menu.disabled_for", comment: "Disabled for %@"), currentAppName)
         } else {
-            disableAppMenuItem.state = .off
-            disableAppMenuItem.title = String(format: NSLocalizedString("menu.disable_for", comment: "Disable for %@"), currentAppName)
+            disableCurrentAppMenuItem.state = .off
+            disableCurrentAppMenuItem.title = String(format: NSLocalizedString("menu.disable_for", comment: "Disable for %@"), currentAppName)
+        }
+        
+        if let currentApp = RuleManager.shared.currentApp,
+           RuleManager.shared.isDisabledWhenRunningApp(currentApp)
+        {
+            disableRunningAppMenuItem.state = .on
+            disableRunningAppMenuItem.title = String(format: NSLocalizedString(
+                "menu.disabled_for_running_app",
+                comment: "Disabled when %@ is running"), currentAppName)
+        } else {
+            disableRunningAppMenuItem.state = .off
+            disableRunningAppMenuItem.title = String(format: NSLocalizedString(
+                "menu.disable_for_running_app",
+                comment: "Disable when %@ is running"), currentAppName)
         }
         
         
         // MARK: disable for domain
         if BrowserManager.shared.hasValidDomain {
             disableDomainMenuItem.isHidden = false
-            if RuleManager.shared.disabledForDomain {
+            if RuleManager.shared.isDisabledForDomain {
                 disableDomainMenuItem.state = .on
                 disableDomainMenuItem.title = String(format: NSLocalizedString("menu.disabled_for", comment: "Disabled for %@"), currentDomain ?? "")
             } else {
@@ -220,13 +235,13 @@ class StatusMenuController: NSObject, NSMenuDelegate {
         // MARK: disable for subdomain
         if BrowserManager.shared.hasValidSubdomain {
             disableSubdomainMenuItem.isHidden = false
-            if RuleManager.shared.ruleForSubdomain == .enabled {
+            if RuleManager.shared.ruleForCurrentSubdomain == .enabled {
                 disableSubdomainMenuItem.state = .on
                 disableSubdomainMenuItem.title = String(format: NSLocalizedString("menu.enabled_for", comment: "Enabled for %@"), currentSubdomain ?? "")
-            } else if RuleManager.shared.ruleForSubdomain == .disabled {
+            } else if RuleManager.shared.ruleForCurrentSubdomain == .disabled {
                 disableSubdomainMenuItem.state = .on
                 disableSubdomainMenuItem.title = String(format: NSLocalizedString("menu.disabled_for", comment: "Disabled for %@"), currentSubdomain ?? "")
-            } else if RuleManager.shared.disabledForDomain {
+            } else if RuleManager.shared.isDisabledForDomain {
                 disableSubdomainMenuItem.state = .off
                 disableSubdomainMenuItem.title = String(format: NSLocalizedString("menu.enable_for", comment: "Enable for %@"), currentSubdomain ?? "")
             } else {
@@ -295,9 +310,9 @@ class StatusMenuController: NSObject, NSMenuDelegate {
             case .disabled:
                 if NightShiftManager.shared.isDisableRuleActive {
                     trueToneMenuItem.isEnabled = false
-                    if RuleManager.shared.disabledForDomain {
+                    if RuleManager.shared.isDisabledForDomain {
                         trueToneMenuItem.title = String(format: NSLocalizedString("menu.true_tone_disabled_for", comment: "True Tone is disabled for %@"), currentDomain ?? "")
-                    } else if RuleManager.shared.ruleForSubdomain == .disabled {
+                    } else if RuleManager.shared.ruleForCurrentSubdomain == .disabled {
                         trueToneMenuItem.title = String(format: NSLocalizedString("menu.true_tone_disabled_for", comment: "True Tone is disabled for %@"), currentSubdomain ?? "")
                     } else {
                         trueToneMenuItem.title = String(format: NSLocalizedString("menu.true_tone_disabled_for", comment: "True Tone is disabled for %@"), currentAppName)
@@ -420,36 +435,50 @@ class StatusMenuController: NSObject, NSMenuDelegate {
     
     
     
-    @IBAction func disableForApp(_ sender: Any) {
-        if RuleManager.shared.disabledForApp {
-            RuleManager.shared.disabledForApp = false
+    @IBAction func disableForCurrentApp(_ sender: Any) {
+        guard let currentApp = RuleManager.shared.currentApp else { return }
+        
+        if RuleManager.shared.isDisabledForCurrentApp {
+            RuleManager.shared.removeCurrentAppDisableRule(forApp: currentApp)
         } else {
-            RuleManager.shared.disabledForApp = true
+            RuleManager.shared.addCurrentAppDisableRule(forApp: currentApp)
         }
         Event.disableForCurrentApp(state: (sender as? NSMenuItem)?.state == .on).record()
     }
     
-    
+    @IBAction func disableForRunningApp(_ sender: Any) {
+        guard let currentApp = RuleManager.shared.currentApp else { return }
+        
+        if RuleManager.shared.isDisabledForRunningApp {
+            RuleManager.shared.removeRunningAppDisableRule(forApp: currentApp)
+        } else {
+            RuleManager.shared.addRunningAppDisableRule(forApp: currentApp)
+        }
+    }
 
     @IBAction func disableForDomain(_ sender: Any) {
-        if RuleManager.shared.disabledForDomain {
-            RuleManager.shared.disabledForDomain = false
+        guard let currentDomain = BrowserManager.shared.currentDomain else { return }
+        
+        if RuleManager.shared.isDisabledForDomain {
+            RuleManager.shared.removeDomainDisableRule(forDomain: currentDomain)
         } else {
-            RuleManager.shared.disabledForDomain = true
+            RuleManager.shared.addDomainDisableRule(forDomain: currentDomain)
         }
     }
     
     
 
     @IBAction func disableForSubdomain(_ sender: Any) {
-        if RuleManager.shared.ruleForSubdomain == .none {
-            if RuleManager.shared.disabledForDomain {
-                RuleManager.shared.ruleForSubdomain = .enabled
+        guard let currentSubdomain = BrowserManager.shared.currentSubdomain else { return }
+        
+        if RuleManager.shared.ruleForCurrentSubdomain == .none {
+            if RuleManager.shared.isDisabledForDomain {
+                RuleManager.shared.setSubdomainRule(.enabled, forSubdomain: currentSubdomain)
             } else {
-                RuleManager.shared.ruleForSubdomain = .disabled
+                RuleManager.shared.setSubdomainRule(.disabled, forSubdomain: currentSubdomain)
             }
         } else {
-            RuleManager.shared.ruleForSubdomain = .none
+            RuleManager.shared.setSubdomainRule(.none, forSubdomain: currentSubdomain)
         }
     }
     
diff --git a/Shifty/en.lproj/Localizable.strings b/Shifty/en.lproj/Localizable.strings
index e8ae230..3b256fe 100644
--- a/Shifty/en.lproj/Localizable.strings
+++ b/Shifty/en.lproj/Localizable.strings
@@ -13,6 +13,8 @@
 "menu.toggle_off" = "Turn off Night Shift";
 "menu.disable_for" = "Disable for %@";
 "menu.disabled_for" = "Disabled for %@";
+"menu.disable_for_running_app" = "Disable when %@ is running";
+"menu.disabled_for_running_app" = "Disabled when %@ is running";
 "menu.enable_for" = "Enable for %@";
 "menu.enabled_for" = "Enabled for %@";
 
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index e9305f0..3ea4c2d 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -19,15 +19,15 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
     concurrent-ruby (1.0.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.5)
-    ffi (1.9.23)
+    ffi (1.11.1)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
@@ -51,7 +51,7 @@ GEM
     mercenary (0.3.6)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.2)
+    public_suffix (4.0.6)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)